# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1272880113 -10800
# Node ID f7ac710697a9ad4013dd32fc8316cb3e71caa969
# Parent  16d8024aca5ecb53a58136eb5711a4ca2e0dd577
Revision: 201015
Kit: 201018

diff -r 16d8024aca5e -r f7ac710697a9 .hgignore
--- a/.hgignore	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,91 +0,0 @@
-# A note on the rules: there are two rules for each specific name (but not
-# for file extensions), since e.g. "^tmp$" matches "tmp" in the root directory
-# (i.e. the same directory this .hgignore file is in) and "/tmp$"" matches
-# "tmp" in any subdirectory of the root. A simple rule "tmp$" will not do,
-# since it will erroneously match anything ending in "tmp", e.g. "myfiletmp",
-# anywhere in the directory hierarchy.
-
-# Sadly "bld.inf", "*.mmp" and "*.def" files cannot be blindly ignored, since
-# the code base contains some native S60 projects, for which these files are 
-# not generated automatically.
-
-# Make sure were using the regular expression syntax, not globbing.
-syntax: regexp
-
-# Doxygen generated directories and files.
-^doc/html$
-^warn.log$
-
-# Directory names.
-^\.project$
-/\.project$
-^\.cproject$
-/\.cproject$
-^\.settings$
-/\.settings$
-^debug$
-/debug$
-^include$
-^lib$
-/lib$
-^moc$
-/moc$
-^obj$
-/obj$
-^rcc$
-/rcc$
-^release$
-/release$
-^tmp$
-/tmp$
-
-# File names.
-^\.qmake\.cache$
-^ABLD\.BAT$
-/ABLD\.BAT$
-#^bld\.inf$
-#/bld\.inf$
-#^hb_install\.prf$
-^Makefile$
-/Makefile$
-^mocinclude\.tmp$
-/mocinclude\.tmp$
-^Thumbs\.db$
-/Thumbs\.db$
-
-# File name patterns.
-^Makefile.*\..*$
-/Makefile.*\..*$
-^moc_.*\.cpp$
-/moc_.*\.cpp$
-^object_script\..*$
-/object_script\..*$
-^qrc_.*\.cpp$
-/qrc_.*\.cpp$
-/tmp[^/]*$
-
-# File name extensions.
-\.a$
-\.bak$
-#\.def$
-\.dll$
-\.exe$
-\.idb$
-\.ilk$
-\.loc$
-#\.mmp$
-\.moc$
-\.ncb$
-\.o$
-\.orig$
-\.pdb$
-\.pkg$
-\.pro.user$
-\.qtplugin$
-\.rss$
-\.sln$
-\.so$
-\.suo$
-\.tmp$
-\.user$
-\.vcproj$
diff -r 16d8024aca5e -r f7ac710697a9 .hgtags
--- a/.hgtags	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-64c088fd2ea9233468fe78fa3b03815ca5e4ed9a 2009wk43_rc
-9cca9b080fb8b97af7f6ca231dabe81e7b60e9bb 2009wk45_rc
-305fca935bd3ce99104d9dfae7dd315196c8b539 2009wk45_rel
-f886944847e0f1a30f644b208a510c06d4bce16c 2009wk47_rc
-b2573244822ac22ce8f45483038431deaaa42a5a 2009wk47_rel
-9c54211907201561ad0c4594a66337b0aff425b2 2009wk49_rc
-26b32fc7fe4e78a965784b6ffa20a07c499feae5 2009wk49_rel
-ad72741060e856c0cca0fb4464964e0acb2783ee 2009wk51_rc
-48d1a3fe7329ce30dbbb7da2cf53334b396c62ca 2009wk51_rel
-8edc9c016146b105b161e63b6997e5cd99db81ac 2010wk01_rc
-dc09ab1f87dcd30dc427f76933a5665230ef5ddc 2010wk01_rel
-2226bd800fa892b23d9162a68dc8640117d2098a 2010wk03_rc
-13118c2a39ba3493d8b54720986790c31df11613 2010wk03_rel
-93363accdd925f660a1f00114c0630a82573a716 2010wk05_rc
-2b1f641fc97721fc15093ebc8590e301c3167f99 2010wk05_rel
-c2282fdbd50b77c958aa46189d6f0f8bd3655390 2010wk07_rc
-b8fbfceed610a8e9330abd442d61cc65f6b3a328 2010wk07_rel
-d716412824619678bc5cd2336bcbbba58126a343 2010wk09_rc
-3e5f7322b8657a6d4df32eae730bde7f90f53a1c 2010wk09_rel
-8b138c1b4967d1ee566e1dbcfe7d3c3afe04ddd9 2010wk11_rc
diff -r 16d8024aca5e -r f7ac710697a9 bin/themeindexer_symbian.exe
Binary file bin/themeindexer_symbian.exe has changed
diff -r 16d8024aca5e -r f7ac710697a9 config.tests/maemo/dui/dui.pro
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/config.tests/maemo/dui/dui.pro	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,34 @@
+#
+#############################################################################
+##
+## 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_dui
+DEPENDPATH += .
+INCLUDEPATH += /usr/include/dui /usr/local/include/dui
+LIBS += -ldui
+
+SOURCES += main.cpp
diff -r 16d8024aca5e -r f7ac710697a9 config.tests/maemo/dui/main.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/config.tests/maemo/dui/main.cpp	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,32 @@
+/****************************************************************************
+**
+** 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 <duiapplication.h>
+
+int main()
+{
+    DuiApplication *app = DuiApplication::instance();
+    app = 0;
+}
diff -r 16d8024aca5e -r f7ac710697a9 config.tests/symbian/advancedtactile/advancedtactile.pro
--- a/config.tests/symbian/advancedtactile/advancedtactile.pro	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +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 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_advancedtactile
-DEPENDPATH += .
-INCLUDEPATH += .
-CONFIG -= qt
-symbian {
-    LIBS += -ltacticon
-    INCLUDEPATH += $${EPOCROOT}epoc32/include/platform/mw
-}
-
-# Input
-SOURCES += main.cpp
diff -r 16d8024aca5e -r f7ac710697a9 config.tests/symbian/advancedtactile/main.cpp
--- a/config.tests/symbian/advancedtactile/main.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +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 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 <Exception>
-#include <tacticon.h>
-
-int main()
-{
-    RTacticon tacticon;
-}
diff -r 16d8024aca5e -r f7ac710697a9 configure.py
--- a/configure.py	Mon Apr 19 14:02:13 2010 +0300
+++ b/configure.py	Mon May 03 12:48:33 2010 +0300
@@ -30,6 +30,7 @@
 import os
 import sys
 import shutil
+import fnmatch
 import tempfile
 import optparse
 if sys.version_info[0] == 2 and sys.version_info[1] < 4:
@@ -82,6 +83,38 @@
         code = -1
     return [code, output]
 
+def read_file(filepath):
+    content = ""
+    try:
+        file = open(filepath, "r")
+        content = file.read()
+        file.close()
+    except IOError, e:
+        print(e)
+    return content
+
+def grep(path, pattern, include = [], exclude = []):
+    result = {}
+    expr = re.compile(pattern)
+    for root, dirs, files in os.walk(path):
+        for filename in files:
+            accept = True
+            for ipattern in include:
+                if not fnmatch.fnmatch(filename, ipattern):
+                    accept = False
+            for epattern in exclude:
+                if fnmatch.fnmatch(filename, epattern):
+                    accept = False
+            if accept:
+                filepath = os.path.normpath(os.path.join(root, filename))
+                content = read_file(filepath)
+                for match in expr.finditer(content):
+                    if match.group(1):
+                        if filename not in result:
+                            result[filename] = []
+                        result[filename].append(match.group(1))
+    return result
+
 # ============================================================================
 # OptionParser
 # ============================================================================
@@ -119,6 +152,10 @@
                          help="Build in debug mode.")
         group.add_option("--debug_and_release", action="store_const", dest="config", const="debug_and_release",
                          help="Build in both debug and release modes.")
+        group.add_option("--debug-output", action="store_false", dest="debug_output",
+                         help="Do not suppress debug and warning output (suppressed by default in release mode).")
+        group.add_option("--no-debug-output", action="store_true", dest="no_debug_output",
+                         help="Suppress debug and warning output (not supporessed by default in debug mode).")
         if platform != "symbian":
             group.add_option("--silent", action="store_true", dest="silent",
                              help="Suppress verbose compiler output.")
@@ -200,6 +237,10 @@
                              help="DEPRECATED: Qt 4.6 includes QApplication::symbianEventFilter().")
             group.add_option("--qt-s60-eventfilter", action="store_true", dest="s60eventfilter",
                              help="DEPRECATED: Qt 4.6 includes QApplication::symbianEventFilter().")
+        group.add_option("--dui", action="store_true", dest="dui",
+                         help="Assumes that Maemo Direct UI is available without performing a compilation test.")
+        group.add_option("--no-dui", action="store_false", dest="dui",
+                         help="Assumes that Maemo Direct UI is not available without performing a compilation test.")
         self.add_option_group(group)
         self.set_defaults(qtmobility=None)
         self.set_defaults(qtanimation=None)
@@ -534,6 +575,7 @@
     test.setup(sourcedir, currentdir)
     print("INFO: Detecting available features...")
     patterns = { "symbian" : ["\\*\\*\\*", "Errors caused tool to abort"],
+                 "maemo"   : ["\\*\\*\\*"],
                  "unix"    : ["\\*\\*\\*"],
                  "win32"   : ["\\*\\*\\*"] }
     if options.qtmobility == None:
@@ -542,15 +584,16 @@
     if options.qtmobility:
         config.add_value("DEFINES", "HB_HAVE_QT_MOBILITY")
     if platform.name() == "symbian":
-        advanced_tactile_result = test.compile("config.tests/symbian/advancedtactile", patterns.get(platform.name(), None))
-        if advanced_tactile_result:
-            config.add_value("CONFIG", "advanced_tactile_support")
-        print("INFO:\tAdvanced Tactile:\t\t%s" % advanced_tactile_result)
-        #sgimagelite_result = test.compile("config.tests/symbian/sgimagelite", patterns.get(platform.name(), None))
-        #if sgimagelite_result:
-        #    config.add_value("CONFIG", "sgimage")
-        #print("INFO:\tSgImage-Lite:\t\t\t%s" % sgimagelite_result)
-        print("NOTE:\t(For SgImage-Lite support, pass --qmake-options \"CONFIG+=sgimage\")")
+        sgimagelite_result = test.compile("config.tests/symbian/sgimagelite", patterns.get(platform.name(), None))
+        if sgimagelite_result:
+            config.add_value("CONFIG", "sgimagelite_support")
+        print("INFO:\tSgImage-Lite:\t\t\t%s" % sgimagelite_result)
+    if options.dui == None:
+        options.dui = test.compile("config.tests/maemo/dui", patterns.get(platform.name(), None))
+        print("INFO:\tDirect UI:\t\t\t%s" % options.dui)
+    if options.dui:
+        config.add_value("CONFIG", "hb_maemo_dui")
+        config.add_value("DEFINES", "HB_MAEMO_DUI")
 
     config.set_value("HB_BIN_DIR", ConfigFile.format_dir(basedir + "/bin"))
     config.set_value("HB_LIB_DIR", ConfigFile.format_dir(basedir + "/lib"))
@@ -574,8 +617,12 @@
         config.add_value("DEFINES", "HB_EFFECTS")
     if options.textMeasurement:
         config.add_value("DEFINES", "HB_TEXT_MEASUREMENT_UTILITY")
+	if platform.name() != "symbian" and options.developer:
+		config.add_value("DEFINES", "HB_CSS_INSPECTOR")
     if options.defines:
         config.add_value("DEFINES", " ".join(options.defines.split(",")))
+    if options.developer:
+        config.add_value("DEFINES", "HB_DEVELOPER")
 
     if options.verbose:
         print("INFO: Writing hb_install.prf")
@@ -626,18 +673,34 @@
         config.add_value("CONFIG", "coverage")
     if options.config:
         config.add_value("CONFIG", options.config)
+    if options.debug_output != None:
+        config.add_value("CONFIG", "debug_output")
+    if options.no_debug_output != None:
+        config.add_value("CONFIG", "no_debug_output")
 
-    # disable debug & warning outputs for non-developer symbian-armv5-release builds
-    if not options.developer and platform.name() == "symbian":
-        config._lines.append("no_output = \\ \n")
-        config._lines.append("\"$${LITERAL_HASH}if defined(ARMV5) && defined(UREL)\" \\ \n")
-        config._lines.append("\"MACRO\tQT_NO_DEBUG_OUTPUT\" \\ \n")
-        config._lines.append("\"MACRO\tQT_NO_WARNING_OUTPUT\" \\ \n")
-        config._lines.append("\"$${LITERAL_HASH}endif\" \n")
-        config._lines.append("MMP_RULES += no_output \n")
+    # debug & warning outputs:
+    #   - release
+    #       - disabled by default
+    #       - can be enabled by passing --debug_output option
+    #   - debug
+    #       - enabled by default
+    #       - can be disabled by passing --no_debug_output option
+    config._lines.append("CONFIG(release, debug|release) {\n")
+    config._lines.append("    debug_output|developer {\n")
+    config._lines.append("        # debug/warning output enabled {\n")
+    config._lines.append("    } else {\n")
+    config._lines.append("        DEFINES += QT_NO_DEBUG_OUTPUT\n")
+    config._lines.append("        DEFINES += QT_NO_WARNING_OUTPUT\n")
+    config._lines.append("    }\n")
+    config._lines.append("} else {\n")
+    config._lines.append("    no_debug_output {\n")
+    config._lines.append("        DEFINES += QT_NO_DEBUG_OUTPUT\n")
+    config._lines.append("        DEFINES += QT_NO_WARNING_OUTPUT\n")
+    config._lines.append("    }\n")
+    config._lines.append("}\n")
 
     # TODO: is there any better way to expose functions to the whole source tree?
-    config._lines.append("include(%s)\n" % (os.path.splitdrive(sourcedir)[1] + "/src/functions.prf"))
+    config._lines.append("include(%s)\n" % (os.path.splitdrive(sourcedir)[1] + "/src/hbfunctions.prf"))
 
     if options.verbose:
         print("INFO: Writing .qmake.cache")
@@ -688,6 +751,31 @@
             outputdir = os.path.join(currentdir, "coverage")
             if not os.path.exists(outputdir):
                 os.makedirs(outputdir)
+        # nag about tests that are commented out
+        result = grep(sourcedir + "/tsrc", "#\s*SUBDIRS\s*\+=\s*(\S+)", ["*.pr?"])
+        maxlen = 0
+        for profile in result:
+            maxlen = max(maxlen, len(profile))
+        if len(result):
+            print ""
+            print "###############################################################################"
+            print "%s THE FOLLOWING TESTS ARE COMMENTED OUT:" % "WARNING:".ljust(maxlen + 1)
+            for profile, subdirs in result.iteritems():
+                line = (profile + ":").ljust(maxlen + 2)
+                init = len(line)
+                while len(subdirs):
+                    if len(line) > init:
+                        line += ", "
+                    if len(line) + len(subdirs[-1]) < 80:
+                        line += subdirs.pop()
+                    elif len(line) == init and init + len(subdirs[-1]) >= 79:
+                        line += subdirs.pop()
+                    else:
+                        print line
+                        line = "".ljust(maxlen + 2)
+                if len(line) > init:
+                    print line
+            print "###############################################################################"
 
     # print summary
     print("")
diff -r 16d8024aca5e -r f7ac710697a9 hb.prf
--- a/hb.prf	Mon Apr 19 14:02:13 2010 +0300
+++ b/hb.prf	Mon May 03 12:48:33 2010 +0300
@@ -27,7 +27,7 @@
 # default collections
 isEmpty(HB):HB = hbcore hbwidgets hbutils # hbinput hbfeedback
 QT *= core gui svg network
-symbian:CONFIG += symbian_i18n
+symbian:CONFIG += symbian_i18n skin_icon
 
 include(hb_install.prf)
 
@@ -73,5 +73,5 @@
 
 !isEmpty(LINKAGE) {
     LIBS += -L$${HB_LIB_DIR} $${LINKAGE}
-    unix:!symbian:!isEmpty(QMAKE_RPATH):QMAKE_LFLAGS += $${QMAKE_RPATH}$${HB_LIB_DIR}
+    QMAKE_RPATHDIR *= $${HB_LIB_DIR}
 }
diff -r 16d8024aca5e -r f7ac710697a9 hb.pro
--- a/hb.pro	Mon Apr 19 14:02:13 2010 +0300
+++ b/hb.pro	Mon May 03 12:48:33 2010 +0300
@@ -60,6 +60,7 @@
 }
 isEmpty(HB_THEMES_DIR):index.commands += echo HB_THEMES_DIR environment variable not set
 else {
+    index.path = .
     index.name = hbdefault
     index.source = $$PWD/src/hbcore/resources/themes/icons/hbdefault
     index.targets = $$HB_THEMES_DIR
@@ -71,9 +72,9 @@
         !isEmpty(index.commands):index.commands += &&
         index.commands += $$THEMEINDEXER -n $$index.name -s $$index.source -t $$index.target
     }
+    QMAKE_EXTRA_TARGETS += index
+    INSTALLS += index
 }
-QMAKE_EXTRA_TARGETS += index
-INSTALLS += index
 
 !contains(HB_NOMAKE_PARTS, tests):exists(tsrc) {
     test.depends = sub-src
diff -r 16d8024aca5e -r f7ac710697a9 src/functions.prf
--- a/src/functions.prf	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,107 +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 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.
-##
-#############################################################################
-#
-
-defineReplace(hbLibraryTarget) {
-    unset(LIBRARY_NAME)
-    LIBRARY_NAME = $$1
-    # the following leads to ugly vcproj names but had to be commented
-    # out, because it broke vcproj generator dependency checks
-    #!debug_and_release|build_pass { <-- 
-        CONFIG(debug, debug|release) {
-            mac:RET = $$member(LIBRARY_NAME, 0)_debug
-   	        else:win32:RET = $$member(LIBRARY_NAME, 0)d
-        }
-    #}
-    isEmpty(RET):RET = $$LIBRARY_NAME
-    return($$RET)
-}
-
-# params: <collection/library>
-# eg. hbAddLibrary(hbcore/HbCore)
-defineTest(hbAddLibrary) {
-    PARTS = $$split(1, "/")
-    COLLECTION = $$lower($$first(PARTS))
-    LIBRARY = $$last(PARTS)
-
-    INCLUDEPATH *= $${HB_BUILD_DIR}/include/$${COLLECTION}
-    INCLUDEPATH *= $${HB_BUILD_DIR}/include/$${COLLECTION}/private
-    DEPENDPATH *= $${HB_BUILD_DIR}/include/$${COLLECTION}
-    DEPENDPATH *= $${HB_BUILD_DIR}/include/$${COLLECTION}/private
-
-    LIBS *= -L$${HB_BUILD_DIR}/lib
-    LIBS *= -l$$hbLibraryTarget($$LIBRARY)
-    unix:!symbian:!isEmpty(QMAKE_RPATH):QMAKE_LFLAGS *= $${QMAKE_RPATH}$${HB_BUILD_DIR}/lib
-    unix:HB_COVERAGE_EXCLUDE += \"*/$$COLLECTION/*\"
-
-    export(LIBS)
-    export(INCLUDEPATH)
-    export(DEPENDPATH)
-    export(QMAKE_LFLAGS)
-    export(HB_COVERAGE_EXCLUDE)
-    return(true)
-}
-
-# params: <collection>
-# NOTE: PUBLIC_HEADERS, INTERNAL_HEADERS, CONVENIENCE_HEADERS
-# eg. hbExportHeaders(hbcore)
-defineTest(hbExportHeaders) {
-    for(PUBLIC_HEADER, PUBLIC_HEADERS) {
-        PUBLIC_HEADER = $$section(PUBLIC_HEADER, ":", 1)
-        EXPORT_PATH = $$sprintf($$HB_EXPORT_DIR, $$1, $$basename(PUBLIC_HEADER))
-        BLD_INF_RULES.prj_exports *= "$$PUBLIC_HEADER $$EXPORT_PATH"
-    }
-    # DO NOT EXPORT PRIVATE HEADERS!
-    #for(INTERNAL_HEADER, INTERNAL_HEADERS) {
-    #    INTERNAL_HEADER = $$section(INTERNAL_HEADER, ":", 1)
-    #    EXPORT_PATH = $$sprintf($$HB_PRIVATE_EXPORT_DIR, $$1, $$basename(INTERNAL_HEADER))
-    #    BLD_INF_RULES.prj_exports *= "$$INTERNAL_HEADER $$EXPORT_PATH"
-    #}
-    for(CONVENIENCE_HEADER, CONVENIENCE_HEADERS) {
-        CONVENIENCE_HEADER = $$section(CONVENIENCE_HEADER, ":", 1)
-        EXPORT_PATH = $$sprintf($$HB_EXPORT_DIR, $$1, $$basename(CONVENIENCE_HEADER))
-        BLD_INF_RULES.prj_exports *= "$$CONVENIENCE_HEADER $$EXPORT_PATH"
-    }
-    export(BLD_INF_RULES.prj_exports)
-    return(true)
-}
-
-# params: <path>
-# eg. features.path = $$hbNativePath($$[QMAKE_MKSPECS]/features)
-defineReplace(hbNativePath) {
-    symbian|win32:!win32-g++ {
-        unixstyle = false
-    } else:win32-g++:isEmpty(QMAKE_SH) {
-        unixstyle = false
-    } else {
-        unixstyle = true
-    }
-    $$unixstyle {
-        return($$quote(\"$$replace(1, "\\", "/")\"))
-    } else {
-        return($$quote(\"$$replace(1, "/", "\\")\"))
-    }
-}
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcommon.pri
--- a/src/hbcommon.pri	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcommon.pri	Mon May 03 12:48:33 2010 +0300
@@ -56,8 +56,8 @@
     for(pubheader, $$list($$lower($$unique(PUBLIC_HEADERS)))) {
         contains(pubheader, .*_p.h$):warning($$basename(pubheader) is listed in PUBLIC_HEADERS but has a \"_p.h\" suffix.)
     }
-    for(privheader, $$list($$lower($$unique(INTERNAL_HEADERS)))) {
-        !contains(privheader, .*_p.h$):warning($$basename(privheader) is listed in INTERNAL_HEADERS but has no \"_p.h\" suffix.)
+    for(privheader, $$list($$lower($$unique(PRIVATE_HEADERS)))) {
+        !contains(privheader, .*_p.h$):warning($$basename(privheader) is listed in PRIVATE_HEADERS but has no \"_p.h\" suffix.)
     }
 }
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/3rdparty/qtsingleapplication/src/qtlocalpeer.cpp
--- a/src/hbcore/3rdparty/qtsingleapplication/src/qtlocalpeer.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/3rdparty/qtsingleapplication/src/qtlocalpeer.cpp	Mon May 03 12:48:33 2010 +0300
@@ -25,6 +25,7 @@
 #include "qtlocalpeer.h"
 #include <QtCore/QCoreApplication>
 #include <QtCore/QTime>
+#include <QtCore/QDebug>
 
 //Delete these lines.
 #if defined(Q_OS_SYMBIAN)
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/activity/activity.pri
--- a/src/hbcore/activity/activity.pri	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/activity/activity.pri	Mon May 03 12:48:33 2010 +0300
@@ -28,9 +28,11 @@
 INCLUDEPATH += $$PWD
 DEPENDPATH += $$PWD
 
-PUBLIC_HEADERS += $$PWD/hbactivitymanager.h 
+PUBLIC_HEADERS += $$PWD/hbactivitymanager.h
 
 INTERNAL_HEADERS += $$PWD/hbactivitymanager_p.h \
-                  $$PWD/hbactivityplugininterface_p.h
+                    $$PWD/hbactivityplugininterface_p.h \
+                    $$PWD/hbactivitycommandlineparser_p.h \
 
-SOURCES += $$PWD/hbactivitymanager.cpp
+SOURCES +=  $$PWD/hbactivitymanager.cpp \
+            $$PWD/hbactivitycommandlineparser_p.cpp \
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/activity/hbactivitycommandlineparser_p.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/activity/hbactivitycommandlineparser_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,67 @@
+/****************************************************************************
+**
+** 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 "hbactivitycommandlineparser_p.h"
+#include <QUrl>
+
+/*!
+	@alpha
+    @hbcore
+    \class HbActivityCommandLineParser
+    \brief The HbActivityCommandLineParser class is responsible for parsing 
+    activity URI passed as command line argument.
+*/
+
+/*!
+    Searches \a commandLineArguments for pair of "-activity" marker and 
+    activity URI, which should have following syntax:
+    
+    appto://UID3?activityname=activity-name-value&key1=value
+    
+    If both marker and URI are found, \a reason is set to 
+    Hb::ActivationReasonActivity, and \a activityId and \a parameters are
+    filled with parsed values.    
+*/
+void HbActivityCommandLineParser::parseUri(const QStringList &commandLineArguments, Hb::ActivationReason &reason, QString &id, QVariantHash &params)
+{
+    int activityMarkerIndex = commandLineArguments.indexOf("-activity");
+    if (activityMarkerIndex != -1 && commandLineArguments.count() - 1 > activityMarkerIndex) {
+        QUrl activityUri(commandLineArguments.at(activityMarkerIndex+1));        
+        if (activityUri.scheme() == "appto") {
+            QList<QPair<QString, QString> > parameters = activityUri.queryItems();            
+            for (QList<QPair<QString, QString> >::const_iterator i = parameters.constBegin(); i != parameters.constEnd(); ++i) {
+                params.insert(i->first, i->second);
+            }
+            
+            if (params.contains("activityname") && !params.value("activityname").toString().isEmpty()) {
+                // all necessary data is present
+                reason = Hb::ActivationReasonActivity;
+                id = params.value("activityname").toString();
+            } else {
+                params.clear();
+            }
+        }
+    }
+}
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/activity/hbactivitycommandlineparser_p.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/activity/hbactivitycommandlineparser_p.h	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,43 @@
+/****************************************************************************
+**
+** 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 HBACTIVITYCOMMANDLINEPARSER_H
+#define HBACTIVITYCOMMANDLINEPARSER_H
+
+#include <QStringList>
+#include <QVariantHash>
+
+#include <hbglobal.h>
+#include <hbnamespace.h>
+
+class HbActivityCommandLineParser
+{
+
+public:
+    static void parseUri(const QStringList &commandLineParams, Hb::ActivationReason &reason, QString &id, QVariantHash &params);
+    
+};
+
+#endif // HBACTIVITYCOMMANDLINEPARSER_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/activity/hbactivitymanager.cpp
--- a/src/hbcore/activity/hbactivitymanager.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/activity/hbactivitymanager.cpp	Mon May 03 12:48:33 2010 +0300
@@ -27,6 +27,7 @@
 #include "hbactivitymanager_p.h"
 
 #include <QPluginLoader>
+#include <QLibrary>
 #include <QDir>
 
 #include "hbmainwindow.h"
@@ -51,19 +52,8 @@
 /*!
 \internal
 */
-HbActivityManagerPrivate::HbActivityManagerPrivate(HbActivityManager *q) : mActivityPlugin(0)
+HbActivityManagerPrivate::HbActivityManagerPrivate(HbActivityManager *q) : q(q), mActivityPlugin(0)
 {
-#ifdef Q_OS_SYMBIAN
-    QPluginLoader *loader = new QPluginLoader("/resource/qt/plugins/hbactivityplugin.qtplugin");
-    mActivityPlugin = qobject_cast<HbActivityPluginInterface*>(loader->instance());
-    if (mActivityPlugin) {
-        q->connect(mActivityPlugin, SIGNAL(activityRequested(QString)), SIGNAL(activityRequested(QString)));
-    } else {
-        qWarning("Cannot load activity plugin. Features related to activities won't be available.");
-    }
-#else
-    Q_UNUSED(q);
-#endif
 }
 
 /*!
@@ -71,7 +61,51 @@
 */
 HbActivityManagerPrivate::~HbActivityManagerPrivate()
 {
-    delete mActivityPlugin;
+}
+
+/*!
+\internal
+*/
+HbActivityPluginInterface *HbActivityManagerPrivate::activityPlugin() const
+{
+    if (!mActivityPlugin) {
+        QStringList pluginPathList;
+#if defined(Q_OS_SYMBIAN)
+        QStringList cDriveList;
+        QStringList romList;
+
+        foreach (const QString &libraryPath, qApp->libraryPaths()) {
+            QString absolutePath = QDir(libraryPath).absolutePath();
+            cDriveList << absolutePath.replace(0, 1, 'C');
+            romList << absolutePath.replace(0, 1, 'Z');
+        }
+        pluginPathList << cDriveList << romList;
+#else
+        pluginPathList << qApp->libraryPaths();
+#endif
+
+        foreach (const QString &path, pluginPathList) {
+            QDir dir(path);
+            QString filePath = dir.filePath("hbactivityplugin");
+            QLibrary library(filePath);
+            if (library.load()) {
+                QPluginLoader loader(dir.filePath(library.fileName()));
+                QObject *pluginInstance = loader.instance();
+                if (pluginInstance) {
+                    mActivityPlugin = qobject_cast<HbActivityPluginInterface*>(pluginInstance);
+                    if (mActivityPlugin) {
+                        q->connect(pluginInstance, SIGNAL(activityRequested(QString)), q, SIGNAL(activityRequested(QString)));
+                    } else {
+#if defined(Q_OS_SYMBIAN)
+                        qWarning("Cannot load activity plugin. Features related to activities won't be available.");
+#endif
+                        loader.unload();
+                    }
+                }
+            }
+        }
+    }
+    return mActivityPlugin;
 }
 
 /*!
@@ -80,8 +114,9 @@
 bool HbActivityManagerPrivate::addActivity(const QString &activityId, const QVariant &data, const QVariantHash &parameters)
 {
     bool result(false);
-    if (mActivityPlugin) {
-        result = mActivityPlugin->addActivity(activityId, data, parameters);
+    HbActivityPluginInterface *plugin = activityPlugin();
+    if (plugin) {
+        result = plugin->addActivity(activityId, data, parameters);
     }
     return result;
 }
@@ -92,8 +127,9 @@
 bool HbActivityManagerPrivate::removeActivity(const QString &activityId)
 {
     bool result(false);
-    if (mActivityPlugin) {
-        result = mActivityPlugin->removeActivity(activityId);
+    HbActivityPluginInterface *plugin = activityPlugin();
+    if (plugin) {
+        result = plugin->removeActivity(activityId);
     }
     return result;
 }
@@ -102,9 +138,10 @@
 \internal
 */
 QList<QVariantHash> HbActivityManagerPrivate::activities() const
-{    
-    if (mActivityPlugin) {
-        return mActivityPlugin->activities();
+{
+    HbActivityPluginInterface *plugin = activityPlugin();
+    if (plugin) {
+        return plugin->activities();
     } else {
         return QList<QVariantHash>();
     }
@@ -116,10 +153,11 @@
 bool HbActivityManagerPrivate::updateActivity(const QString &activityId, const QVariant &data, const QVariantHash &parameters)
 {
     bool result(false);
-    if (mActivityPlugin) {
-        result = mActivityPlugin->updateActivity(activityId, data, parameters);
+    HbActivityPluginInterface *plugin = activityPlugin();
+    if (plugin) {
+        result = plugin->updateActivity(activityId, data, parameters);
     }
-    return result;    
+    return result;
 }
 
 /*!
@@ -128,8 +166,9 @@
 QVariant HbActivityManagerPrivate::activityData(const QString &activityId) const
 {
     QVariant result;
-    if (mActivityPlugin) {
-        result = mActivityPlugin->activityData(activityId);
+    HbActivityPluginInterface *plugin = activityPlugin();
+    if (plugin) {
+        result = plugin->activityData(activityId);
     }
     return result;
 }
@@ -140,10 +179,11 @@
 bool HbActivityManagerPrivate::waitActivity()
 {
     bool result(false);
-    if (mActivityPlugin) {
-        result = mActivityPlugin->waitActivity();
+    HbActivityPluginInterface *plugin = activityPlugin();
+    if (plugin) {
+        result = plugin->waitActivity();
     }
-    return result;    
+    return result;
 }
 
 /*!
@@ -151,7 +191,7 @@
     \a parent. Parent of this object.
  */
 HbActivityManager::HbActivityManager(QObject *parent) : QObject(parent), d_ptr(new HbActivityManagerPrivate(this))
-{   
+{
 }
 
 /*!
@@ -225,3 +265,4 @@
     Q_D(HbActivityManager);
     return d->waitActivity();
 }
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/activity/hbactivitymanager_p.h
--- a/src/hbcore/activity/hbactivitymanager_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/activity/hbactivitymanager_p.h	Mon May 03 12:48:33 2010 +0300
@@ -44,8 +44,11 @@
     bool waitActivity();
     
 private:
-    HbActivityPluginInterface *mActivityPlugin;
+    HbActivityPluginInterface *activityPlugin() const;
     
+private:
+    HbActivityManager *q;
+    mutable HbActivityPluginInterface *mActivityPlugin;
 };
 
 #endif // HBACTIVITYMANAGER_P_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/activity/hbactivityplugininterface_p.h
--- a/src/hbcore/activity/hbactivityplugininterface_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/activity/hbactivityplugininterface_p.h	Mon May 03 12:48:33 2010 +0300
@@ -27,20 +27,17 @@
 #define HBACTIVITYPLUGININTERFACE_P_H
 
 #include <QtPlugin>
-#include <QObject>
 #include <QVariant>
 #include <QString>
 #include <QList>
 #include <QVariantHash>
 
-class HbActivityPluginInterface : public QObject
+class HbActivityPluginInterface
 {
-    Q_OBJECT
+public:
+    virtual ~HbActivityPluginInterface() {}
 
 public:
-    HbActivityPluginInterface(QObject *parent = 0) : QObject(parent) {}
-    
-public:
     virtual bool addActivity(const QString &activityId, const QVariant &data, const QVariantHash &parameters) = 0;
     virtual bool removeActivity(const QString &activityId) = 0;
     virtual bool updateActivity(const QString &activityId, const QVariant &data, const QVariantHash &parameters) = 0;
@@ -49,8 +46,8 @@
     virtual bool waitActivity() = 0;
 
 signals:
+    // signal must be re-declared in the plugin implementation
     void activityRequested(const QString &activityId);
-    
 };
 
 Q_DECLARE_INTERFACE(HbActivityPluginInterface, "HbActivityPluginInterface/1.0")
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/core/core.pri
--- a/src/hbcore/core/core.pri	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/core/core.pri	Mon May 03 12:48:33 2010 +0300
@@ -40,37 +40,39 @@
 PUBLIC_HEADERS += $$PWD/hbs60events.h
 PUBLIC_HEADERS += $$PWD/hbcommoncrkeys.h
 
-INTERNAL_HEADERS += $$PWD/hbmemorymanager_p.h
-INTERNAL_HEADERS += $$PWD/hbheapmemorymanager_p.h
-INTERNAL_HEADERS += $$PWD/hbsharedmemoryallocators_p.h
-INTERNAL_HEADERS += $$PWD/hbsharedmemorymanager_p.h
-INTERNAL_HEADERS += $$PWD/hbsharedmemorymanagerut_p.h
-INTERNAL_HEADERS += $$PWD/hbmemoryutils_p.h
-INTERNAL_HEADERS += $$PWD/hbsmartpointer_p.h
-INTERNAL_HEADERS += $$PWD/hbsmartoffset_p.h
-INTERNAL_HEADERS += $$PWD/hbvector_p.h
-INTERNAL_HEADERS += $$PWD/hbstring_p.h
-INTERNAL_HEADERS += $$PWD/hbvariant_p.h
-INTERNAL_HEADERS += $$PWD/hbstringvector_p.h
-INTERNAL_HEADERS += $$PWD/hbaction_p.h
-INTERNAL_HEADERS += $$PWD/hbgesture_p.h
-INTERNAL_HEADERS += $$PWD/hbgesturefilter_p.h
-INTERNAL_HEADERS += $$PWD/hbgraphicsscene_p.h
-INTERNAL_HEADERS += $$PWD/hbglobal_p.h
-INTERNAL_HEADERS += $$PWD/hbinstance_p.h
-INTERNAL_HEADERS += $$PWD/hbnamespace_p.h
-INTERNAL_HEADERS += $$PWD/hbstandarddirs_p.h
-INTERNAL_HEADERS += $$PWD/hbtestabilityinterface_p.h
-INTERNAL_HEADERS += $$PWD/hbthemeperf_p.h
-INTERNAL_HEADERS += $$PWD/hbstringdata_p.h
-INTERNAL_HEADERS += $$PWD/hbthemeindex_p.h
-INTERNAL_HEADERS += $$PWD/hbmainwindoworientation_p.h
-INTERNAL_HEADERS += $$PWD/hborientationstatus_p.h
-INTERNAL_HEADERS += $$PWD/hbsensorlistener_p.h
-INTERNAL_HEADERS += $$PWD/hbapplication_p.h
+PRIVATE_HEADERS += $$PWD/hbmemorymanager_p.h
+PRIVATE_HEADERS += $$PWD/hbheapmemorymanager_p.h
+PRIVATE_HEADERS += $$PWD/hbsharedmemoryallocators_p.h
+PRIVATE_HEADERS += $$PWD/hbsharedmemorymanager_p.h
+PRIVATE_HEADERS += $$PWD/hbsharedmemorymanagerut_p.h
+PRIVATE_HEADERS += $$PWD/hbmemoryutils_p.h
+PRIVATE_HEADERS += $$PWD/hbsmartpointer_p.h
+PRIVATE_HEADERS += $$PWD/hbsmartoffset_p.h
+PRIVATE_HEADERS += $$PWD/hbvector_p.h
+PRIVATE_HEADERS += $$PWD/hbstring_p.h
+PRIVATE_HEADERS += $$PWD/hbvariant_p.h
+PRIVATE_HEADERS += $$PWD/hbstringvector_p.h
+PRIVATE_HEADERS += $$PWD/hbaction_p.h
+PRIVATE_HEADERS += $$PWD/hbgesture_p.h
+PRIVATE_HEADERS += $$PWD/hbgesturefilter_p.h
+PRIVATE_HEADERS += $$PWD/hbgraphicsscene_p.h
+PRIVATE_HEADERS += $$PWD/hbglobal_p.h
+PRIVATE_HEADERS += $$PWD/hbinstance_p.h
+PRIVATE_HEADERS += $$PWD/hbnamespace_p.h
+PRIVATE_HEADERS += $$PWD/hbstandarddirs_p.h
+PRIVATE_HEADERS += $$PWD/hbtestabilityinterface_p.h
+PRIVATE_HEADERS += $$PWD/hbthemeperf_p.h
+PRIVATE_HEADERS += $$PWD/hbstringdata_p.h
+PRIVATE_HEADERS += $$PWD/hbthemeindex_p.h
+PRIVATE_HEADERS += $$PWD/hbmainwindoworientation_p.h
+PRIVATE_HEADERS += $$PWD/hborientationstatus_p.h
+PRIVATE_HEADERS += $$PWD/hbsensorlistener_p.h
+PRIVATE_HEADERS += $$PWD/hblocalechangenotifier_p.h
+PRIVATE_HEADERS += $$PWD/hbapplication_p.h
+PRIVATE_HEADERS += $$PWD/hbthemesystemeffect_p.h
 symbian {
-	INTERNAL_HEADERS += $$PWD/hbcorepskeys_p.h
-	INTERNAL_HEADERS += $$PWD/hbsensornotifyhandler_p.h
+	PRIVATE_HEADERS += $$PWD/hbcorepskeys_p.h
+	PRIVATE_HEADERS += $$PWD/hbsensornotifyhandler_p.h
 }
 
 SOURCES += $$PWD/hbaction.cpp
@@ -96,7 +98,9 @@
 SOURCES += $$PWD/hbmainwindoworientation.cpp
 SOURCES += $$PWD/hborientationstatus.cpp
 SOURCES += $$PWD/hbsensorlistener.cpp
+SOURCES += $$PWD/hblocalechangenotifier_p.cpp
+SOURCES += $$PWD/hbthemesystemeffect.cpp
 symbian {
-	SOURCES += $$PWD/hbsensornotifyhandler_p.cpp
+    SOURCES += $$PWD/hbsensornotifyhandler_p.cpp
 }
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/core/hbaction.cpp
--- a/src/hbcore/core/hbaction.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/core/hbaction.cpp	Mon May 03 12:48:33 2010 +0300
@@ -107,7 +107,8 @@
 /*!
     Constructs a new HbAction with softkey \a action and \a parent.
 
-    \deprecated HbAction::HbAction(Hb::SoftKeyAction, QObject *) is deprecated.
+    \deprecated HbAction::HbAction(Hb::SoftKeyAction, QObject *)
+    is deprecated.
     Use HbAction::HbAction(Hb::NavigationAction, QObject *) instead.
 */
 HbAction::HbAction(Hb::SoftKeyAction action, QObject* parent)
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/core/hbapplication.cpp
--- a/src/hbcore/core/hbapplication.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/core/hbapplication.cpp	Mon May 03 12:48:33 2010 +0300
@@ -25,8 +25,10 @@
 
 #include "hbapplication.h"
 #include "hbapplication_p.h"
-#include "hbsplashscreen_p.h"
+#include "hbsplashscreen.h"
 #include "hbactivitymanager.h"
+#include "hbactivitycommandlineparser_p.h"
+#include "hbiconloader_p.h"
 #include <QTime>
 #include <QUrl>
 
@@ -35,12 +37,8 @@
 #include <qsymbianevent.h>
 #endif // Q_OS_SYMBIAN
 
-// ### TODO remove this and do it in mainwindow_p once QGestureManager problems are fixed
 #ifdef HB_GESTURE_FW
-#include "hbmousepangesturerecognizer_p.h"
-#include "hbswipegesturerecognizer_p.h"
-#include "hbtapgesturerecognizer_p.h"
-#include "hbtapandholdgesturerecognizer_p.h"
+#include "hbgesturerecognizers_p.h"
 #endif
 
 /*!
@@ -68,7 +66,9 @@
     Unless the Hb::NoSplash flag is passed, the HbApplication constructor will
     try to show a suitable splash screen for the application. On some platforms
     there will be no splash screens available at all and thus nothing will be
-    shown.
+    shown. (note that even when an application uses QApplication instead of
+    HbApplication, the splash screen can still be started/stopped manually via
+    the HbSplashScreen class)
 
     Applications that support the 'activities' concept may check the start-up
     reason like this:
@@ -126,11 +126,11 @@
     // Show the splash screen (start() also makes sure it is really drawn before
     // continuing with anything else).
 
-    HbSplash::Flags splashFlags = HbSplash::Default;
+    HbSplashScreen::Flags splashFlags = HbSplashScreen::Default;
     if (flags & Hb::SplashFixedVertical) {
-        splashFlags |= HbSplash::FixedVertical;
+        splashFlags |= HbSplashScreen::FixedVertical;
     } else if (flags & Hb::SplashFixedHorizontal) {
-        splashFlags |= HbSplash::FixedHorizontal;
+        splashFlags |= HbSplashScreen::FixedHorizontal;
     }
 
 #ifdef Q_OS_SYMBIAN
@@ -147,8 +147,6 @@
 
 static void initialize()
 {
-// ### TODO remove this and enable HbMainWindowPrivate::initGestures once
-// the QGestureManager problems are fixed.
 #ifdef HB_GESTURE_FW
     QGestureRecognizer::unregisterRecognizer(Qt::TapGesture);
     QGestureRecognizer::unregisterRecognizer(Qt::TapAndHoldGesture);
@@ -157,7 +155,7 @@
 
     QGestureRecognizer::registerRecognizer(new HbTapGestureRecognizer);
     QGestureRecognizer::registerRecognizer(new HbTapAndHoldGestureRecognizer);
-    QGestureRecognizer::registerRecognizer(new HbMousePanGestureRecognizer);
+    QGestureRecognizer::registerRecognizer(new HbPanGestureRecognizer);
     QGestureRecognizer::registerRecognizer(new HbSwipeGestureRecognizer);
 #endif
 }
@@ -227,7 +225,6 @@
 #include <hbtoucharea_p.h>
 #include "hbgraphicsscene_p.h"
 
-#ifdef BUILD_HB_INTERNAL
 static void forceRefresh()
 {
     foreach (HbMainWindow *window, hbInstance->allMainWindows()) {
@@ -235,7 +232,6 @@
         QApplication::sendEvent(window, &event);
     }
 }
-#endif
 
 /*!
     Handles the S60 events.
@@ -267,49 +263,45 @@
 
         }
             return false; //continue handling in QApplication::s60ProcessEvent
-		case KChangeDirection:{
-			TUint8* dataptr = aEvent->EventData();
-			switch(*dataptr){
-				case 0:
-					HbApplication::setLayoutDirection(Qt::LeftToRight);
-					break;
-				case 1:
-					HbApplication::setLayoutDirection(Qt::RightToLeft);
-					break;
-				default:
-					qWarning("HbApplication::s60EventFilter: Unknown layout direction received");
-					break;
-				}
-			}
-			return false;
-		case KChangeOrientation:{
-			TUint8* dataptr = aEvent->EventData();
-			switch(*dataptr){
-				case 0:
-					hbInstance->setOrientation(Qt::Vertical);
-					break;
-				case 1:
-					hbInstance->setOrientation(Qt::Horizontal);
-					break;
-				default:
-					qWarning("HbApplication::s60EventFilter: Unknown orientation received");
-					break;
-				}
-			}
-			return false;
-		case KChangeDeviceProfile:{
-			TUint8* dataptr = aEvent->EventData();
-			QStringList names = HbDeviceProfile::profileNames();
-			if(*dataptr > names.count() - 1){
-				qWarning("HbApplication::s60EventFilter: Unknown device profile received");
-			}else{
-				HbDeviceProfile profile(names.value(*dataptr));
-				HbDeviceProfileManager::select(profile);
-				HbInstancePrivate::d_ptr()->setOrientation(profile.orientation(),false);
-			}
-			}
-			return false;
-#ifdef BUILD_HB_INTERNAL
+        case KChangeDirection:{
+            TUint8* dataptr = aEvent->EventData();
+            switch(*dataptr){
+                case 0:
+                    HbApplication::setLayoutDirection(Qt::LeftToRight);
+                    break;
+                case 1:
+                    HbApplication::setLayoutDirection(Qt::RightToLeft);
+                    break;
+                default:
+                    qWarning("HbApplication::s60EventFilter: Unknown layout direction received");
+                    break;
+                }
+            }
+            return false;
+        case KChangeDeviceProfile:{
+            TUint8* dataptr = aEvent->EventData();
+            QStringList names = HbDeviceProfile::profileNames();
+            if(*dataptr > names.count() - 1){
+                qWarning("HbApplication::s60EventFilter: Unknown device profile received");
+            }else{
+                HbDeviceProfile profile(names.value(*dataptr));
+                HbDeviceProfileManager::select(profile);
+                QList<HbMainWindow*> windows = hbInstance->allMainWindows();
+                HbMainWindow *w = windows.at(0);
+                w->setOrientation(profile.orientation());
+            }
+            }
+            return false;
+        case EEventWindowVisibilityChanged:{
+                // Get the Visiblity notification from the window server.
+                const TWsVisibilityChangedEvent *visChangedEvent = aEvent->VisibilityChanged();
+                if ( visChangedEvent->iFlags & TWsVisibilityChangedEvent::ENotVisible ) {
+                    // App is not visible
+                    HbIconLoader *loader = HbIconLoader::global();
+                    loader->handleForegroundLost();
+                }
+            }
+            return QApplication::symbianEventFilter(event);
         case KChangeTouchAreaVis:{
                 TUint8* dataptr = aEvent->EventData();
                 HbTouchAreaPrivate::setOutlineDrawing(*dataptr == 1);
@@ -334,7 +326,6 @@
                 forceRefresh();
             }
             return false;
-#endif
         default:
             return QApplication::symbianEventFilter(event);
         }
@@ -345,26 +336,7 @@
 HbApplicationPrivate::HbApplicationPrivate(HbApplication *parent)
     : QObject(parent), q_ptr(parent), mActivateReason(Hb::ActivationReasonNormal)
 {
-    QStringList commandLineArguments = qApp->arguments();
-    int activityMarkerIndex = commandLineArguments.indexOf("-activity");
-    if (activityMarkerIndex != -1 && commandLineArguments.count() - 1 > activityMarkerIndex) {
-        QUrl activityUri(commandLineArguments.at(activityMarkerIndex+1));        
-        if (activityUri.scheme() == "appto") {
-            typedef QPair<QString, QString> ParamType;
-            QList<ParamType> parameters = activityUri.queryItems();            
-            foreach (const ParamType &param, parameters) {
-                mActivateParams.insert(param.first, param.second);
-            }
-            if (mActivateParams.contains("activityname") && !mActivateParams.value("activityname").toString().isEmpty()) {
-                // all necessary data is present
-                mActivateReason = Hb::ActivationReasonActivity;
-                mActivateId = mActivateParams.value("activityname").toString();
-            } else {
-                mActivateParams.clear();
-            }
-        }
-    }
-    
+    HbActivityCommandLineParser::parseUri(qApp->arguments(), mActivateReason, mActivateId, mActivateParams);
     mActivityManager = new HbActivityManager(this);
     connect(mActivityManager, SIGNAL(activityRequested(QString)), this, SLOT(prepareActivityData(QString)));
 }
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/core/hbevent.cpp
--- a/src/hbcore/core/hbevent.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/core/hbevent.cpp	Mon May 03 12:48:33 2010 +0300
@@ -31,6 +31,7 @@
 const int HbEvent::DeviceProfileChanged = registerEventType();
 const int HbEvent::SleepModeEnter = registerEventType();
 const int HbEvent::SleepModeExit = registerEventType();
+const int HbEvent::WindowLayoutDirectionChanged = registerEventType();
 
 /*!
     @stable
@@ -57,12 +58,16 @@
                   the event can be catched in event(QEvent *event) method.
 
     SleepModeEnter - This event is sent by the system when the phone enters to the sleep mode. 
-                   If your application/component needs to take some action when entering the
-                   sleep mode then you can do it in event(QEvent *event) method.
+                     If your application/component needs to take some action when entering the
+                     sleep mode then you can do it in event(QEvent *event) method.
     
     SleepModeExit - This event is sent by the system when the phone exist from the sleep mode.
-                   If your application/component needs to take some action when exiting the
-                   sleep mode then you can do it in event(QEvent *event) method.
+                    If your application/component needs to take some action when exiting the
+                    sleep mode then you can do it in event(QEvent *event) method.
+
+    DeviceProfileChanged - This event is sent by the system when layout direction of the main
+                           window changes. If your application/component needs to take some
+                           action upon this event you can do it in event(QEvent *event) method.
 
     Example of how to send HbEvent
     \snippet{gui/hbwidget.cpp,1}
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/core/hbevent.h
--- a/src/hbcore/core/hbevent.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/core/hbevent.h	Mon May 03 12:48:33 2010 +0300
@@ -45,6 +45,7 @@
     static const int DeviceProfileChanged;
     static const int SleepModeEnter;
     static const int SleepModeExit;
+    static const int WindowLayoutDirectionChanged;
     HbEvent(int eventType);
 };
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/core/hbgesturefilter.cpp
--- a/src/hbcore/core/hbgesturefilter.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/core/hbgesturefilter.cpp	Mon May 03 12:48:33 2010 +0300
@@ -40,7 +40,6 @@
 #include "hbgesturefilter.h"
 #include "hbgesturefilter_p.h"
 #include "hbgesture.h"
-#include "hblongpressvisualizer_p.h"
 #include "hbgraphicsscenemouseevent.h"
 #include "hbinstance.h"
 
@@ -109,7 +108,6 @@
     panLastScenePos(),
     gestureTimer(),
     allGestures(HbGesture::none),
-    longPressAnimation(0),
     longPressTimer(0),
     longPressDelayTimer(0)
 {
@@ -121,7 +119,6 @@
     gestures.clear();
     delete longPressTimer;
     delete longPressDelayTimer;
-    delete longPressAnimation;
 }
 
 
@@ -330,12 +327,6 @@
 {
     if (!d->longPressDelayCancelled) {
 
-        if(d->p.longPressAnimation)
-        {
-            delete d->p.longPressAnimation;
-            d->p.longPressAnimation = 0;
-        }
-
         //Delay timer has exceeded, start the long press.
         if ( !d->p.longPressTimer )
         {
@@ -343,21 +334,6 @@
             connect( d->p.longPressTimer, SIGNAL(finished()), this, SLOT(completeLongPress()) );
         }
 
-        if (showLongpressAnimation) {
-            Q_ASSERT( d->p.longPressAnimation == 0 ); // Is deleted and nulled if finished or stopped!
-
-            if(scene()) {
-                d->p.longPressAnimation = new HbLongPressVisualizer(0);
-                d->p.longPressAnimation->setZValue(200000);
-
-                d->p.longPressTimer->setFrameRange(0, 100);
-                connect( d->p.longPressTimer, SIGNAL(frameChanged(int)),
-                         d->p.longPressAnimation, SLOT(setFrame(int)) );
-
-                scene()->addItem(d->p.longPressAnimation);
-                d->p.longPressAnimation->start(d->p.touchDownScenePos);
-            }
-        }
         d->p.longPressTimer->setCurrentTime(0);
         d->p.longPressTimer->start();
 
@@ -384,11 +360,8 @@
                 // If gesture matches, do a callback, which emits the signal.
                 if ( gesture->direction() == HbGesture::longpress ) {
                     //Delete the long press animation before the callback.
-                    delete d->p.longPressAnimation;
-                    d->p.longPressAnimation=0;
                     d->longPressCompleted = true;
 
-                    //Start of snippet 1
                     // Create custom Hb Event and add position data
                     HbGraphicsSceneMouseEvent longPressEvent(HbGraphicsSceneMouseEvent::LongPress);
                     longPressEvent.setAccepted(false);
@@ -409,7 +382,6 @@
                             }
                         }
                     }
-                    //End of snippet 1
 
                     gesture->longPressCallback( d->p.touchDownScenePos );
                 }
@@ -420,9 +392,6 @@
 	else {
             d->longPressCompleted = false;
 	}
-	
-    delete d->p.longPressAnimation;
-    d->p.longPressAnimation=0;
 }
 
 /*!
@@ -435,9 +404,6 @@
     d->longPressCompleted = false;
     d->longPressDelayCancelled = true;
 
-    delete d->p.longPressAnimation;
-    d->p.longPressAnimation=0;
-
     if (d->p.longPressDelayTimer)
         d->p.longPressDelayTimer->stop();
     if (d->p.longPressTimer)
@@ -531,10 +497,6 @@
 
         //Mouse panning
         if (d->panning && !d->mouseReleased && timestamp > HB_FLICK_MAX_DURATION) {
-            if (d->p.longPressAnimation != 0 && !d->withinThreshold) {
-                cancelLongPress();
-            }
-
             QPointF lastPanPos(scenePos);
 
             // Exit if panning outside widget
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/core/hbgesturefilter.h
--- a/src/hbcore/core/hbgesturefilter.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/core/hbgesturefilter.h	Mon May 03 12:48:33 2010 +0300
@@ -40,7 +40,6 @@
 class HbGesture;
 class HbGestureFilterPrivate;
 class HbGestureSceneFilterPrivate;
-class HbLongPressVisualizer;
 
 class HB_CORE_EXPORT HbGestureFilter : public QObject
 {
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/core/hbgesturefilter_p.h
--- a/src/hbcore/core/hbgesturefilter_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/core/hbgesturefilter_p.h	Mon May 03 12:48:33 2010 +0300
@@ -28,7 +28,6 @@
 
 #include "hbgesturefilter.h"
 #include "hbgesture.h"
-#include "hblongpressvisualizer_p.h"
 #include <QTime>
 #include <QPointer>
 #include <QGraphicsWidget>
@@ -54,7 +53,6 @@
     QPointF panLastScenePos;
     QTime gestureTimer;
     HbGesture::Direction allGestures;
-    HbLongPressVisualizer *longPressAnimation;
     QTimeLine *longPressTimer;
     QTimeLine *longPressDelayTimer;
 };
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/core/hbglobal.h
--- a/src/hbcore/core/hbglobal.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/core/hbglobal.h	Mon May 03 12:48:33 2010 +0300
@@ -34,6 +34,10 @@
 HB_EXPORT_macro_is_obsolete_Please_use_HB_YOURMODULE_EXPORT_instead \
 { &HB_EXPORT_macro_is_obsolete_Please_use_HB_YOURMODULE_EXPORT_instead; }; class
 
+#define HB_DECL_DEPRECATED Q_DECL_DEPRECATED
+#define HB_DECL_VARIABLE_DEPRECATED Q_DECL_VARIABLE_DEPRECATED
+#define HB_DECL_CONSTRUCTOR_DEPRECATED Q_DECL_CONSTRUCTOR_DEPRECATED
+
 #ifndef HB_BOOTSTRAPPED
 
 #  ifdef BUILD_HB_CORE
@@ -72,7 +76,7 @@
 #    define HB_FEEDBACK_EXPORT Q_DECL_IMPORT
 #  endif // BUILD_HB_FEEDBACK
 
-#  ifdef BUILD_HB_INTERNAL
+#  ifdef HB_DEVELOPER
 #    if defined(BUILD_HB_CORE) || defined(BUILD_HB_WIDGETS)
 #      define HB_AUTOTEST_EXPORT Q_DECL_EXPORT
 #    else
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/core/hbgraphicsscene.cpp
--- a/src/hbcore/core/hbgraphicsscene.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/core/hbgraphicsscene.cpp	Mon May 03 12:48:33 2010 +0300
@@ -168,18 +168,6 @@
     return mPopupManager;
 }
 
-bool HbGraphicsScenePrivate::hasAlreadyInputFrameworkFocus(HbInputMethod *activeMethod, QObject *editorWidget) const
-{
-    if (activeMethod) {
-         HbInputFocusObject *focusObject = activeMethod->focusObject();
-         if (focusObject) {
-             return focusObject->object() == editorWidget;
-         } 
-    }
-
-    return false;
-}
-
 /*!
     Constructor
 */
@@ -195,6 +183,7 @@
         view->setOptimizationFlag( QGraphicsView::IndirectPainting, true );
     } 
 #endif
+    setStickyFocus(true);
 }
 
 /*!
@@ -232,15 +221,15 @@
 {
     QGraphicsScene::mousePressEvent(mouseEvent);
 
-    // If focused item is not HbWidget then we send event to close the input panel
+    // 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"))) {
+        if(focusedObject && !focusedObject->inherits("HbWidget") &&
+           ((focusedObject->flags() & QGraphicsItem::ItemAcceptsInputMethod) == 0)) {
             QInputContext *ic = qApp->inputContext();
             if (ic) {
-                QEvent *closeEvent = new QEvent(QEvent::CloseSoftwareInputPanel);
-                qDebug() << "focus HbGraphicsScene::mousePressEvent CloseSoftwareInputPanel";
+                QEvent *closeEvent = new QEvent(QEvent::CloseSoftwareInputPanel);             
                 ic->filterEvent(closeEvent);
                 delete closeEvent;
             }
@@ -292,13 +281,13 @@
         // 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 twice, as most widgets try to create their
+        // 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.
-        QMetaObject::invokeMethod(this, "_q_polishItems");
-        QApplication::sendPostedEvents(0, QEvent::LayoutRequest);
-        QMetaObject::invokeMethod(this, "_q_polishItems");
-        QApplication::sendPostedEvents(0, QEvent::LayoutRequest);
+        for (int i = 0; i < 3; ++i) {
+            QMetaObject::invokeMethod(this, "_q_polishItems");
+            QApplication::sendPostedEvents(0, QEvent::LayoutRequest);
+        }
         d->mPolishWidgets = false;
     }
     QGraphicsScene::drawBackground(painter,rect);
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/core/hbgraphicsscene_p.h
--- a/src/hbcore/core/hbgraphicsscene_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/core/hbgraphicsscene_p.h	Mon May 03 12:48:33 2010 +0300
@@ -54,8 +54,6 @@
 
     HbPopupManager* popupManager();
 
-    bool hasAlreadyInputFrameworkFocus(HbInputMethod *activeMethod, QObject *editorWidget) const;
-
 public:
     HbGraphicsScene *q_ptr;
     HbPopupManager *mPopupManager;
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/core/hbgraphicsscenemouseevent.cpp
--- a/src/hbcore/core/hbgraphicsscenemouseevent.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/core/hbgraphicsscenemouseevent.cpp	Mon May 03 12:48:33 2010 +0300
@@ -42,7 +42,6 @@
 const int HbGraphicsSceneMouseEvent::LongPress = registerEventType();
 
 /*!
-    @deprecated,
     @hbcore
 	\class HbGraphicsSceneMouseEvent
     \brief HbGraphicsSceneMouseEvent is a class having support for Hb specific events.
@@ -79,6 +78,9 @@
 /*!
     Constructs a HbGraphicsSceneMouseEvent with \a type.
     \a eventType - type of event
+
+    \deprecated HbGraphicsSceneMouseEvent::HbGraphicsSceneMouseEvent(int)
+    is deprecated.
 */
 
 HbGraphicsSceneMouseEvent::HbGraphicsSceneMouseEvent(int eventType)
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/core/hbinstance.cpp
--- a/src/hbcore/core/hbinstance.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/core/hbinstance.cpp	Mon May 03 12:48:33 2010 +0300
@@ -35,6 +35,7 @@
 #include "hbmainwindow_p.h"
 #include "hbdeviceprofile.h"
 #include "hbglobal_p.h"
+#include "hblocalechangenotifier_p.h"
 
 #include <hbfeedbackmanager.h>
 
@@ -47,23 +48,34 @@
 #endif //HB_TESTABILITY
 // end testability
 
-#if defined(Q_WS_S60)
-#include <QDesktopWidget> // For orientation checking in HbInstance constructor
-#include <aknappui.h> // For forcing orientation to change on setOrientation
-#endif
-
 #ifdef HB_SETTINGS_WINDOW
 #include <hbsettingswindow_p.h>
 #include <QShortcut>
 #endif
 
+#ifdef HB_GESTURE_FW
+#include "hbgesturerecognizers_p.h"
+#endif
+
+#ifdef HB_CSS_INSPECTOR
+#include "hbcssinspector_p.h"
+#endif
+
 /*!
     @beta
     @hbcore
-	\class HbInstance
-    \brief HbInstance is the application process' global instance.
+    \class HbInstance
+    \brief HbInstance manages global settings and objects in the application.
 
-    HbInstance can be used to access objects such as style, theme or interaction manager.
+    HbInstance can be used to access objects such as style, theme or interaction
+    manager.  It can be used both with and without HbApplication,
+    i.e. applications instantiating QApplication instead of HbApplication can
+    still use HbInstance to access various Hb-specific features.
+
+    Note however that instantiating either QApplication or HbApplication is
+    still mandatory before calling HbInstance::instance() (or using
+    hbInstance).
+
     The example below shows how hbInstance global pointer can be used to access theme name:
     
     \dontinclude ultimatecodesnippet/main.cpp
@@ -82,10 +94,9 @@
     \relates HbInstance
 
     A global pointer referring to the unique application object. It is
-    equivalent to the pointer returned by the QCoreApplication::instance().
+    equivalent to the pointer returned by the HbInstance::instance().
 
-    \sa QCoreApplication::instance()
-
+    \sa HbInstance::instance()
 */
 
 /*!
@@ -100,6 +111,7 @@
 #ifdef Q_OS_SYMBIAN    
     ,testabilityEnabled(false)
 #endif //Q_OS_SYMBIAN
+    ,mLocaleChangeNotifier(0)
 {
     // initialization of dynamics parts of feedback manager
     HbFeedbackManager::instance();
@@ -184,6 +196,21 @@
       } 
     }
 #endif //end testability
+    mLocaleChangeNotifier = q_check_ptr(new HbLocaleChangeNotifier());
+
+#ifdef HB_GESTURE_FW
+    QGestureRecognizer::unregisterRecognizer(Qt::TapGesture);
+    QGestureRecognizer::unregisterRecognizer(Qt::TapAndHoldGesture);
+    QGestureRecognizer::unregisterRecognizer(Qt::PanGesture);
+    QGestureRecognizer::unregisterRecognizer(Qt::SwipeGesture);
+    QGestureRecognizer::unregisterRecognizer(Qt::PinchGesture);
+
+    QGestureRecognizer::registerRecognizer(new HbTapGestureRecognizer);
+    QGestureRecognizer::registerRecognizer(new HbTapAndHoldGestureRecognizer);
+    QGestureRecognizer::registerRecognizer(new HbPanGestureRecognizer);
+    QGestureRecognizer::registerRecognizer(new HbSwipeGestureRecognizer);
+    QGestureRecognizer::registerRecognizer(new HbPinchGestureRecognizer);
+#endif
 }
 
 /*!
@@ -195,6 +222,9 @@
 	delete mStyle;
     delete mLibraryPaths;
     
+    delete mLocaleChangeNotifier;
+    mLocaleChangeNotifier = 0;
+    
 #ifdef HB_TESTABILITY
     //remove the testability plugin if it exists
     //makes sure that all resources used by the plugin
@@ -224,7 +254,7 @@
     QShortcut *shortcut = new QShortcut(QKeySequence("Ctrl+Alt+Shift+S"), window);
     connect(shortcut, SIGNAL(activated()), this, SLOT(showHideSettingsWindow()));
     HbSettingsWindow::instance()->refresh();
-#ifdef CSS_INSPECTOR
+#ifdef HB_CSS_INSPECTOR
     QShortcut *cssShortcut = new QShortcut(QKeySequence("Ctrl+Alt+Shift+C"), window);
     connect(cssShortcut, SIGNAL(activated()), this, SLOT(showHideCssWindow()));
     HbCssInspectorWindow::instance()->refresh();
@@ -243,7 +273,7 @@
 #ifdef HB_SETTINGS_WINDOW
     if (result && mWindows.isEmpty()) {
         HbSettingsWindow::instance()->close();
-#ifdef CSS_INSPECTOR
+#ifdef HB_CSS_INSPECTOR
         HbCssInspectorWindow::instance()->close();
 #endif
     } else {
@@ -259,35 +289,6 @@
 /*!
 \internal
 */
-Qt::Orientation HbInstancePrivate::orientation() const
-{
-    return mCurrentProfile.orientation();
-}
-
-/*!
-\internal
-*/
-void HbInstancePrivate::setOrientation(Qt::Orientation orientation, bool animate)
-{
-    if(HbDeviceProfile(mCurrentProfile.alternateProfileName()).isNull()) {
-        qWarning("HbInstancePrivate::setOrientation the alternate profile is NULL");
-    }
-
-    if (mCurrentProfile.orientation() != orientation) {
-        mCurrentProfile = HbDeviceProfile(mCurrentProfile.alternateProfileName());
-    }
-
-    foreach (HbMainWindow *window, mWindows) {
-        // Call directly the private part of the HbMainWindow, since if calling
-        // public API's setOrientation it will disable automatic orientation
-        // switching.
-        HbMainWindowPrivate::d_ptr(window)->setTransformedOrientation(orientation, animate);
-    }
-}
-
-/*!
-\internal
-*/
 void HbInstancePrivate::select(const HbDeviceProfile &profile)
 {
     HbDeviceProfile oldProfile = mCurrentProfile;
@@ -335,7 +336,7 @@
 }
 #endif
 
-#ifdef CSS_INSPECTOR
+#ifdef HB_CSS_INSPECTOR
 void HbInstancePrivate::showHideCssWindow()
 {
     if (HbCssInspectorWindow::instance()->isVisible()) {
@@ -410,6 +411,9 @@
  */
 HbInstance* HbInstance::instance()
 {
+    if (!QCoreApplication::instance()) {
+        qWarning("HbInstance: No application instance present.");
+    }
     static HbInstance theInstance;
     return &theInstance;
 }
@@ -428,36 +432,6 @@
     return d->mWindows;
 }
 
-/*!
-    \deprecated HbInstance::orientation() const
-        is deprecated. Use HbMainWindow orientation API.
-    
-    Returns the application's current orientation.
-
-    \sa setOrientation() HbWidget::mainWindow() HbMainWindow::orientation()
- */
-Qt::Orientation HbInstance::orientation() const
-{
-    HB_DEPRECATED(" HbInstance::orientation() is deprecated, use HbMainWindow orientation API!");
-    return d->orientation();
-}
-
-/*!
-    \deprecated HbInstance::setOrientation(Qt::Orientation, bool)
-    is deprecated. Use HbMainWindow orientation API.
-
-    Sets the \a orientation of the application. It affects all windows in
-    the application, which have automatic orientation enabled 
-    (no explicitly set orientation). Orientation switch animation can be
-    skipped by using the boolean parameter.
-
-    \sa orientation() HbMainWindow::setOrientation()
- */
-void HbInstance::setOrientation(Qt::Orientation orientation, bool animate)
-{
-    HB_DEPRECATED(" HbInstance::setOrientation() is deprecated, use HbMainWindow orientation API!");
-    d->setOrientation(orientation, animate);
-}
 
 /*!
 	Returns the platform style object. Note that widgets can use HbWidget's style()-method to get the 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/core/hbinstance.h
--- a/src/hbcore/core/hbinstance.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/core/hbinstance.h	Mon May 03 12:48:33 2010 +0300
@@ -48,9 +48,6 @@
     
     QList<HbMainWindow *> allMainWindows() const;
 
-    Qt::Orientation orientation() const;    // deprecated
-    void setOrientation(Qt::Orientation orientation, bool animate = true); // deprecated
-
     HbStyle *style() const;
     HbTheme *theme() const;
     HbTypefaceInfo *typefaceInfo() const;
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/core/hbinstance_p.h
--- a/src/hbcore/core/hbinstance_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/core/hbinstance_p.h	Mon May 03 12:48:33 2010 +0300
@@ -28,7 +28,6 @@
 
 #include <hbinstance.h>
 #include "hbdeviceprofile.h"
-#include <hbcssinspector_p.h>
 
 class HbTypefaceInfo;
 
@@ -42,6 +41,8 @@
 const TUint32 HbTestabilityKey  = 0x1;  
 #endif
 
+class HbLocaleChangeNotifier;
+
 class HbInstancePrivate : public QObject
 {
     Q_OBJECT
@@ -51,9 +52,6 @@
     ~HbInstancePrivate();
     void addWindow(HbMainWindow *window);
     bool removeWindow(HbMainWindow *window);
-
-    Qt::Orientation orientation() const;
-    void setOrientation(Qt::Orientation orientation, bool animate);
     void select(const HbDeviceProfile &display);
     HbDeviceProfile profile();
 
@@ -64,7 +62,7 @@
 #ifdef HB_SETTINGS_WINDOW
     void showHideSettingsWindow();
 #endif
-#ifdef CSS_INSPECTOR
+#ifdef HB_CSS_INSPECTOR
     void showHideCssWindow();
 #endif
 
@@ -92,7 +90,9 @@
      bool testabilityEnabled;
 #endif //Q_OS_SYMBIAN
 #endif //HB_TESTABILITY
-    
+
+     HbLocaleChangeNotifier* mLocaleChangeNotifier;
+     
     // Provided for HbMainWindow & friends who have to access
     // HbInstancePrivate in order to add/remove windows.
     // NOTE: Still kept as private to track dependencies...
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/core/hblocalechangenotifier_p.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/core/hblocalechangenotifier_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,91 @@
+/****************************************************************************
+**
+** 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 <qglobal.h>
+#include <QLocale>
+#include <QCoreApplication>
+#include <hbinstance.h>
+
+#ifdef Q_OS_SYMBIAN
+#include <e32std_private.h>
+#endif // Q_OS_SYMBIAN
+
+#include "hblocalechangenotifier_p.h"
+#include "hbfeaturemanager_p.h"
+
+
+#ifdef Q_OS_SYMBIAN
+HbLocaleChangeNotifier::HbLocaleChangeNotifier()
+    : CActive(CActive::EPriorityStandard)
+{
+    CActiveScheduler::Add(this);
+    iStatus = KRequestPending;
+    iProperty.Attach(KUidSystemCategory, KLocaleLanguageKey);
+    iProperty.Subscribe(iStatus);
+    SetActive();
+}
+
+#else // Q_OS_SYMBIAN
+
+HbLocaleChangeNotifier::HbLocaleChangeNotifier()
+{
+}
+#endif // Q_OS_SYMBIAN
+
+
+HbLocaleChangeNotifier::~HbLocaleChangeNotifier()
+{
+#ifdef Q_OS_SYMBIAN
+    Cancel();
+    iProperty.Close();
+#endif // Q_OS_SYMBIAN
+}
+
+#ifdef Q_OS_SYMBIAN
+void HbLocaleChangeNotifier::RunL()
+{
+
+    iProperty.Subscribe(iStatus);
+    SetActive();
+
+    // To reset QLocale's cached data
+    QSystemLocale dummy;
+    
+    if ( HbFeatureManager::instance()->featureStatus(HbFeatureManager::LanguageSwitch) ) {
+        foreach (HbMainWindow *window, HbInstance::instance()->allMainWindows()) {
+            QApplication::postEvent(window, new QEvent(QEvent::LocaleChange));
+        }
+    }
+}
+#endif // Q_OS_SYMBIAN
+
+#ifdef Q_OS_SYMBIAN
+void HbLocaleChangeNotifier::DoCancel()
+{
+    iProperty.Cancel();
+}
+#endif // Q_OS_SYMBIAN
+
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/core/hblocalechangenotifier_p.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/core/hblocalechangenotifier_p.h	Mon May 03 12:48:33 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 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 HBLOCALECHANGENOTIFIER_P_H
+#define HBLOCALECHANGENOTIFIER_P_H
+
+#ifdef Q_OS_SYMBIAN
+#include <e32base.h>
+#include <e32property.h>
+
+class HbLocaleChangeNotifier : public CActive
+{
+public:
+    HbLocaleChangeNotifier();
+    ~HbLocaleChangeNotifier();
+
+private:
+    void RunL();
+    void DoCancel();
+
+private:
+    RProperty iProperty;
+};
+
+#else // Q_OS_SYMBIAN
+
+class HbLocaleChangeNotifier 
+{
+public:
+    HbLocaleChangeNotifier();
+    ~HbLocaleChangeNotifier();
+};
+#endif // Q_OS_SYMBIAN
+
+#endif // HBLOCALECHANGENOTIFIER_P_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/core/hbmainwindoworientation.cpp
--- a/src/hbcore/core/hbmainwindoworientation.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/core/hbmainwindoworientation.cpp	Mon May 03 12:48:33 2010 +0300
@@ -44,6 +44,7 @@
 void HbMainWindowOrientation::setFixedOrientation(Qt::Orientation fixedOrientation)
 {
     mOrientation = fixedOrientation;
+    mFixedOrientation = true;
 }
 
 //Returns the latest orientation interpreted from sensor data
@@ -105,7 +106,8 @@
 
 HbMainWindowOrientation::HbMainWindowOrientation(QObject *parent)
     : QObject(parent),
-    mSensorListener(0)
+    mSensorListener(0),
+    mFixedOrientation(false)
 {
     //Get mainwindows from instance. Can't use mainWindow() method from HbWidget,
     //because this class is not inherited from it
@@ -126,8 +128,10 @@
     mOrientation = mDefaultOrientation;
 
     mSensorListener = new HbSensorListener(*this, mDefaultOrientation);
-    
+
     mForegroundWatcher = HbForegroundWatcher::instance();
+    mForegroundWatcher->setSensorListener(mSensorListener);
+
     connect(mForegroundWatcher, SIGNAL(foregroundGained()), SLOT(handleForegroundGained()));
     connect(mForegroundWatcher, SIGNAL(foregroundLost()), SLOT(handleForegroundLost()));
 
@@ -149,7 +153,14 @@
 
 void HbMainWindowOrientation::sensorStatusChanged(bool status, bool notify)
 {
-    notifyOrientationChange(status, notify);
+    if (status) {
+        foreach(HbMainWindow *window, mWindowList) {
+            if (!mFixedOrientation && !HbMainWindowPrivate::d_ptr(window)->mUserOrientationSwitch) {
+                HbMainWindowPrivate::d_ptr(window)->mAutomaticOrientationSwitch = true;
+            }
+        }
+    }
+    notifyOrientationChange(false, notify);
 }
 
 // Notifies orientation change only if
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/core/hbmainwindoworientation_p.h
--- a/src/hbcore/core/hbmainwindoworientation_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/core/hbmainwindoworientation_p.h	Mon May 03 12:48:33 2010 +0300
@@ -32,6 +32,7 @@
 
 class HbMainWindow;
 class HbForegroundWatcher;
+class HbSleepModeListener;
 
 class HB_AUTOTEST_EXPORT HbMainWindowOrientation : public QObject, 
     public HbSensorListenerObserver
@@ -65,6 +66,7 @@
     HbForegroundWatcher *mForegroundWatcher;
     bool mForeground;
     HbSensorListener *mSensorListener;
+    bool mFixedOrientation;
     Qt::Orientation mOrientation;
     Qt::Orientation mDefaultOrientation;
     QList<HbMainWindow *> mWindowList;
@@ -73,6 +75,7 @@
     friend class HbSettingsWindow;
     friend class TestHbSensorOrientation;
 #endif
+    friend class HbForegroundWatcher;
 };
 
 #endif //HBMAINWINDOWORIENTATION_P_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/core/hbmemoryutils_p.h
--- a/src/hbcore/core/hbmemoryutils_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/core/hbmemoryutils_p.h	Mon May 03 12:48:33 2010 +0300
@@ -30,6 +30,7 @@
 #include <QFileInfo>
 #include <QStringList>
 
+#include "hbsmartoffset_p.h"
 #include "hbmemorymanager_p.h"
 
 /*
@@ -55,19 +56,13 @@
     static T * create(HbMemoryManager::MemoryType memType)
     {
         GET_MEMORY_MANAGER(memType);
+        T* temp = 0;
         if (manager->isWritable()) {
-            try{
-                int offset = manager->alloc(sizeof(T));
-                T* temp = new((char*)manager->base() + offset) T(memType);
-                //if successful return temp, else flow won't reach here and the exception will be caught
-                return temp;
-                }
-            catch(std::bad_alloc &badAlloc){
-                Q_UNUSED(badAlloc)
-                return 0;
-            }
+            HbSmartOffset offset(manager->alloc(sizeof(T)), memType);
+            temp = new((char*)manager->base() + offset.get()) T(memType);
+            offset.release();
         }
-        return 0;
+        return temp;
     }
     /*
     * To create instance of on object of type T in memory of given type. The object is copy of the 
@@ -80,20 +75,14 @@
     static T * create(const T &other, HbMemoryManager::MemoryType memType)
     {
         GET_MEMORY_MANAGER(memType);
+        T* temp = 0;        
         if (manager->isWritable()) {
-            try{
-                int offset = manager->alloc(sizeof(T));
-                T* temp = new((char*)manager->base() + offset) T(other, memType);
-                return temp;
-            }
-            catch(std::bad_alloc &badAlloc){
-                Q_UNUSED(badAlloc)
-                return 0;
-            }
+            HbSmartOffset offset(manager->alloc(sizeof(T)),memType);
+            temp = new((char*)manager->base() + offset.get()) T(other, memType);
+            offset.release();
         }
-        return 0;
+        return temp;
     }
-    
     /*
     * To release the instant properly by taking care of the type of memory
     * (assming that memory allocated for the object is same as its memoryType)
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/core/hbnamespace.cpp
--- a/src/hbcore/core/hbnamespace.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/core/hbnamespace.cpp	Mon May 03 12:48:33 2010 +0300
@@ -586,3 +586,50 @@
     \var Hb::ActivationReason Hb::ActivationReasonNormal
     Application was started by other means.
  */ 
+
+/*!
+    \deprecated Hb::ItemType_FormViewItem
+        is deprecated.
+*/
+
+/*!
+    \deprecated Hb::ItemType_FormView
+        is deprecated.
+*/
+
+/*!
+    \deprecated Hb::ItemType_AbstractItemContainer
+        is deprecated.
+*/
+
+/*!
+    \deprecated Hb::ItemType_AbstractItemView
+        is deprecated.
+*/
+
+/*!
+    \deprecated Hb::ItemType_AbstractViewItem
+        is deprecated.
+*/
+
+/*!
+    \deprecated Hb::ItemType_ItemHighlight
+        is deprecated.
+*/
+
+/*!
+    \deprecated Hb::ItemType_ListWidgetViewItem
+        is deprecated.
+*/
+
+/*!
+    \deprecated Hb::ItemType_Highlight
+        is deprecated.
+*/
+
+/*!
+    \deprecated Hb::ItemType_RoundRobinLabel
+        is deprecated.
+*/
+
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/core/hbnamespace.h
--- a/src/hbcore/core/hbnamespace.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/core/hbnamespace.h	Mon May 03 12:48:33 2010 +0300
@@ -150,7 +150,6 @@
         ItemType_Popup,
         ItemType_Dialog,
         ItemType_MessageBox,
-        ItemType_ProgressNote,
         ItemType_ProgressDialog,
         ItemType_AbstractButton,
         ItemType_AbstractItem,
@@ -217,6 +216,8 @@
         ItemType_DateTimePicker,
         ItemType_MarqueeItem,
         ItemType_IndexFeedback,
+        ItemType_SelectionDialog,
+        ItemType_SelectionDialogContentWidget,
         ItemType_Last = QGraphicsItem::UserType + 20000
     };
 
@@ -275,10 +276,10 @@
     enum Edge {
         LeftEdge = 0,
         TopEdge,
+        CenterHEdge,
+        CenterVEdge,
         RightEdge,
-        BottomEdge,
-        CenterHEdge,
-        CenterVEdge
+        BottomEdge
     };
 
     enum ResourceType {
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/core/hbnamespace_p.h
--- a/src/hbcore/core/hbnamespace_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/core/hbnamespace_p.h	Mon May 03 12:48:33 2010 +0300
@@ -56,7 +56,6 @@
         ItemType_TitlePane,
         ItemType_MessageBoxContentWidget,
         ItemType_MessageNoteContentWidget,
-        ItemType_ProgressNoteContentWidget,
         ItemType_ProgressDialogContentWidget,
         ItemType_GraphicsItemGroup,
         ItemType_BackgroundItem,
@@ -147,12 +146,14 @@
     static const int PopupPriorityCount = 256;
 
     // The number of popups that can have the same priority
-    static const int PopupCountWithSamePriority = 256;
+    static const int PopupCountWithSamePriority = 64;
 
-    static const qreal PopupWithDifferentPriorityZValueUnit  = (PopupZValueRangeEnd-PopupZValueDefaultOffset)/256;
+    static const qreal PopupWithDifferentPriorityZValueUnit  = (PopupZValueRangeEnd-PopupZValueDefaultOffset)/PopupPriorityCount;
     static const qreal PopupWithSamePriorityZValueUnit       = PopupWithDifferentPriorityZValueUnit / PopupCountWithSamePriority;
     static const qreal PopupBackgroundItemZValueUnit         = PopupWithSamePriorityZValueUnit / 2;
     static const qreal FadingItemZValueUnit                  = PopupBackgroundItemZValueUnit / 2;
+    static const qreal VKBValueUnit                          = FadingItemZValueUnit / 2;
+    static const qreal SelectionControlHandlesValueUnit      = VKBValueUnit / 2;
 
     enum SoftKeyId
     {
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/core/hborientationstatus.cpp
--- a/src/hbcore/core/hborientationstatus.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/core/hborientationstatus.cpp	Mon May 03 12:48:33 2010 +0300
@@ -26,6 +26,7 @@
 
 #ifdef Q_OS_SYMBIAN
 #include "hbcorepskeys_p.h"
+#include "hbforegroundwatcher_p.h"
 
 // UID for process checking (write orientation value only when in theme server)
 const TUid KWriterServerUid = KHbPsOrientationCategoryUid;
@@ -98,6 +99,7 @@
 #endif
 {
 #ifdef Q_OS_SYMBIAN
+    HbForegroundWatcher::instance()->setSensorListener(mSensorListener);
     // Create orientation property
     RProperty::Define(
             KHbPsOrientationCategoryUid, KHbPsOrientationKey, RProperty::EInt, KRdPolicy, KWrPolicy);
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/core/hbsensorlistener.cpp
--- a/src/hbcore/core/hbsensorlistener.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/core/hbsensorlistener.cpp	Mon May 03 12:48:33 2010 +0300
@@ -47,7 +47,8 @@
 mObserver(observer),
 mDefaultOrientation(defaultOrientation),
 mOrientation(mDefaultOrientation),
-mEnabled(false)
+mEnabled(false),
+mSettingsEnabled(false)
 #ifdef Q_OS_SYMBIAN
 ,
 mNotifyHandler(0),
@@ -114,6 +115,7 @@
 #else
     QSettings mSettings("Nokia", "HbStartUpDeskTopSensors");
     bool enable = mSettings.value("SensorsEnabled").toBool();
+    mSettingsEnabled = enable;
     enableSensors(enable, false);
 #endif
 }
@@ -123,6 +125,8 @@
     mEnabled = enable;
 #ifdef Q_OS_SYMBIAN    
     enableSensorListening(enable);
+#else
+    mSettingsEnabled = enable;
 #endif    
     if (notify) {
         mObserver.sensorStatusChanged(enable, true);
@@ -131,7 +135,10 @@
 
 bool HbSensorListener::isEnabled() const
 {
-    return mEnabled;
+    if (mSettingsEnabled) {
+        return mEnabled;
+    }
+    return false;
 }
 
 #ifdef Q_OS_SYMBIAN
@@ -150,6 +157,7 @@
 void HbSensorListener::cenrepValueChanged(TInt aValue, bool notify)
 {
     bool enable = (aValue == 0)? false : true;
+    mSettingsEnabled = enable;
     enableSensors(enable, notify);
 }
 #endif
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/core/hbsensorlistener_p.h
--- a/src/hbcore/core/hbsensorlistener_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/core/hbsensorlistener_p.h	Mon May 03 12:48:33 2010 +0300
@@ -44,6 +44,7 @@
 public:
     virtual void sensorOrientationChanged(Qt::Orientation newOrientation) = 0;
     virtual void sensorStatusChanged(bool status, bool notify) = 0;
+    virtual ~HbSensorListenerObserver() {}
 };
 
 class HB_AUTOTEST_EXPORT HbSensorListener 
@@ -90,6 +91,7 @@
     Qt::Orientation mDefaultOrientation;
     Qt::Orientation mOrientation;
     bool mEnabled;
+    bool mSettingsEnabled;
 #ifdef Q_OS_SYMBIAN
     HbSensorNotifyHandler* mNotifyHandler;
     CSensrvChannel* mSensrvChannel;
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/core/hbsensornotifyhandler_p.cpp
--- a/src/hbcore/core/hbsensornotifyhandler_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/core/hbsensornotifyhandler_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -84,7 +84,7 @@
      TInt value = 0;
      TInt error = mRepository->Get(KHbSensorCenrepKey, value);
      if (error == KErrNone) {
-         mObserver.cenrepValueChanged(value);
+        mObserver.cenrepValueChanged(value);
      }
      // Re-subscribe
      error = mRepository->NotifyRequest(KHbSensorCenrepKey, iStatus);
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/core/hbsharedmemoryallocators_p.h
--- a/src/hbcore/core/hbsharedmemoryallocators_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/core/hbsharedmemoryallocators_p.h	Mon May 03 12:48:33 2010 +0300
@@ -83,6 +83,9 @@
     void writeReport(QTextStream &reportWriter);
 #endif
 
+    int freeBytes();
+    int allocatedBytes();
+
 private:
     struct TreeNode
     {
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/core/hbsharedmemorymanager_p.cpp
--- a/src/hbcore/core/hbsharedmemorymanager_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/core/hbsharedmemorymanager_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -226,3 +226,21 @@
     delete memManager;
     memManager = 0;
 }
+
+/**
+ * gets the free memory reported by main allocator
+ */
+int HbSharedMemoryManager::freeSharedMemory()
+{
+    HbSplayTreeAllocator *splayAllocator = static_cast<HbSplayTreeAllocator*>(mainAllocator);
+    return splayAllocator->freeBytes();
+}
+
+/**
+ * gets the allocated memory reported by main allocator
+ */
+int HbSharedMemoryManager::allocatedSharedMemory()
+{
+    HbSplayTreeAllocator *splayAllocator = static_cast<HbSplayTreeAllocator*>(mainAllocator);
+    return splayAllocator->allocatedBytes();
+}
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/core/hbsharedmemorymanager_p.h
--- a/src/hbcore/core/hbsharedmemorymanager_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/core/hbsharedmemorymanager_p.h	Mon May 03 12:48:33 2010 +0300
@@ -50,9 +50,9 @@
     }
     static HbMemoryManager *instance();
     static void releaseInstance();
-#ifdef HB_PERF_MEM
-    unsigned int memoryConsumed();
-#endif
+
+    int freeSharedMemory();
+    int allocatedSharedMemory();
 
 protected:
     HbSharedMemoryManager();
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/core/hbsmartoffset_p.h
--- a/src/hbcore/core/hbsmartoffset_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/core/hbsmartoffset_p.h	Mon May 03 12:48:33 2010 +0300
@@ -26,7 +26,7 @@
 #ifndef HBSMARTOFFSET_P_H
 #define HBSMARTOFFSET_P_H
 
-#include "hbmemoryutils_p.h"
+#include "hbmemorymanager_p.h"
 #include <QDebug>
 
 
@@ -48,13 +48,12 @@
     ~HbSmartOffset()
     {
         if (mOffset != -1) {
-            GET_MEMORY_MANAGER(mType);
+            HbMemoryManager * manager = HbMemoryManager::instance(mType);
             manager->free(mOffset);
             qDebug() << "HbSmartOffset::~HbSmartOffset() offset = " << mOffset;
         }
     }
 private:
-    //Q_DISABLE_COPY(HbSmartOffset)
     int mOffset;
     HbMemoryManager::MemoryType mType;
 };
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/core/hbsplaytreeallocator_p.cpp
--- a/src/hbcore/core/hbsplaytreeallocator_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/core/hbsplaytreeallocator_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -483,3 +483,13 @@
         }
     }
 }
+
+int HbSplayTreeAllocator::freeBytes()
+{
+    return header->freeBytes;
+}
+
+int HbSplayTreeAllocator::allocatedBytes()
+{
+    return header->allocatedBytes;
+}
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/core/hbstandarddirs.cpp
--- a/src/hbcore/core/hbstandarddirs.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/core/hbstandarddirs.cpp	Mon May 03 12:48:33 2010 +0300
@@ -35,7 +35,8 @@
 #include <QResource>
 #include <sys/stat.h>
 
-
+// Standard theme root dirs
+const char *coreResourcesRootDir = ":";
 
 // Private API
 // WARNING: This API is at prototype level and shouldn't be used before
@@ -55,15 +56,17 @@
     // Return icon filename if it exists in file system,
     // otherwise return empty string.
     QString findIcon( const QString &fullFileName );
-
-    // Provide the Root Directory Path sepecific to the Platform
-    QStringList getRootPaths();
+    QStringList rootPaths() const { return rootPathList; }
+private:
+    // Root Directory Path sepecific to the Platform
+    void constructRootPathList();
     QStringList additionalRootPath();
-private:
     int fileSize(QByteArray fileName);
 private:
     // Cached contents of icon directories
     QMap<QString, QStringList> iconDirs;
+    QStringList rootPathList;
+    QStringList extList;
 };
 
 // Static instance
@@ -80,6 +83,11 @@
 
 HbStandardDirsInstance::HbStandardDirsInstance()
 {
+    constructRootPathList();
+#ifdef HB_NVG_CS_ICON
+    extList << ".nvg";
+#endif
+    extList << ".svg" << ".qpic" << ".png" << ".mng" << ".gif" << ".xpm" << ".jpg";
 }
 
 HbStandardDirsInstance::~HbStandardDirsInstance()
@@ -166,11 +174,6 @@
                 int extensionIndex = file.lastIndexOf('.');
                 int extensionLength = 0;
                 bool searchAllIconExtensions = true;
-                QStringList extList;
-#ifdef HB_NVG_CS_ICON
-                extList << ".nvg"; 
-#endif
-                extList << ".svg" << ".qpic" << ".png" << ".mng" << ".gif" << ".xpm" << ".jpg";
                 if (extensionIndex > 0) {
                         searchAllIconExtensions = false;
                 }
@@ -200,23 +203,25 @@
     return QString();
 }
 
-QStringList HbStandardDirsInstance::getRootPaths()
+void HbStandardDirsInstance::constructRootPathList()
 {
-    QStringList rootDirs;
 #if defined(Q_OS_SYMBIAN)
-    rootDirs << QLatin1String("c:/resource/hb")
-             << QLatin1String("z:/resource/hb");
+    rootPathList << QLatin1String("z:/resource/hb")
+                 << QLatin1String("c:/resource/hb")
+                 << QLatin1String("e:/resource/hb")
+                 << QLatin1String("f:/resource/hb");
 #else
-    QString envDir = qgetenv("HB_THEMES_DIR");
-    if (!envDir.isEmpty())
-        rootDirs << envDir;
+    const QString &mainThemesDir = HbStandardDirs::themesDir();
+    if (!mainThemesDir.isEmpty()) {
+        rootPathList << mainThemesDir;
+    }
 #endif
 #if defined(Q_OS_MAC)
-    rootDirs << QDir::homePath() + QLatin1String("/Library/UI Extensions for Mobile");
-#elif !defined(Q_OS_SYMBIAN)
-    rootDirs << HB_RESOURCES_DIR;
+    rootPathList << QDir::homePath() + QLatin1String("/Library/UI Extensions for Mobile");
 #endif
-    return rootDirs;
+
+    // Add core resource dir as well
+    rootPathList << coreResourcesRootDir;
 }
 
 int HbStandardDirsInstance::fileSize( QByteArray fileName ) 
@@ -238,7 +243,7 @@
     
     if(size > 0) {
         if (rootPathFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
-            QTextStream in(&rootPathFile);                
+            QTextStream in(&rootPathFile);
             rootpaths.clear();
             while (!in.atEnd()) {
                 QString line = in.readLine();
@@ -268,11 +273,17 @@
         resType == Hb::EffectResource)
     {
         QString absolutePath;
+
         QStringList rootDirs;
 
         if (QDir::isRelativePath(name)) {
-            // Given filename has a relative path, determine appDataDir
-            rootDirs = instance.getRootPaths();
+#ifdef HB_TOOL_INTERFACE
+            // Additional root directory support Currently used by tools only.
+            // This may not be needed if themes tool start using HB_THEMES_DIR to set their
+            // root dir
+            rootDirs << instance.additionalRootPath();
+#endif
+            rootDirs << instance.rootPaths();
         } else {
             // Given filename has an absolute path, use that.
             absolutePath = name;
@@ -280,23 +291,11 @@
         if (resType == Hb::IconResource ) {
             // Relative path was given, search in the standard icon folders
             if (absolutePath.isEmpty()) {
-#ifdef HB_TOOL_INTERFACE
-                // Additional root directory support Currently used by tools only.
-                const QStringList rootpaths = instance.additionalRootPath();
-#endif
-                QStringList strList;
-                strList
-#ifdef HB_TOOL_INTERFACE
-                << rootpaths
-#endif
-                <</*insert app icons here*/ ":" 
-                << rootDirs ;     
-                foreach ( const QString &prefix, strList) {
-                    absolutePath =  prefix + '/' +  name;
+                foreach ( const QString &prefix, rootDirs) {
+                    absolutePath =  prefix + '/' + name;
                     // Check file existence from instance, it caches directory contents 
                     // to speed up the lookup
                     QString ret = instance.findIcon(absolutePath);
-
                     if (!ret.isEmpty()) {
                         return ret;
                     }
@@ -307,133 +306,147 @@
             }
         }
         else if (resType == Hb::ThemeResource) {
-			QFile file;
-			bool fileExists = false;
+            QFile file;
+            bool fileExists = false;
             foreach ( const QString &prefix, rootDirs ) {
                 if (absolutePath.isEmpty()) {
                     absolutePath = prefix + '/' + name;
                 }
-				// Check for the availability of the file, as QFile::Exists takes more
-				// time this method is used
-				file.setFileName(absolutePath);        
+                // Check for the availability of the file, as QFile::Exists takes more
+                // time this method is used
+                file.setFileName(absolutePath);
                 fileExists = file.open(QIODevice::ReadOnly);
                 file.close();
                 // E.g. in hardware absolutepath is not found...
-                if(name.endsWith("theme.theme") && !fileExists) {
-                    return QString(":/themes/icons/hbdefault/theme.theme");        
+                // ToDo: mirrored.txt will be refactored
+                //if(name.endsWith("mirrored.txt") && !fileExists) {
+                //    return QString(":/themes/icons/hbdefault/mirrored.txt");       
+                //} else {
+                    return absolutePath;
+                //}
+            }
+        }
+        else if (resType == Hb::EffectResource) {
+            QFile file;
+            bool fileExists = false;
+            foreach ( const QString &prefix, rootDirs ) {
+                if (absolutePath.isEmpty()) {
+                    absolutePath = prefix + '/' + name;
                 }
-                // E.g. in hardware absolutepath is not found...
-                if(name.endsWith("mirrored.txt") && !fileExists) {
-                    return QString(":/themes/icons/hbdefault/mirrored.txt");       
-                } else {
+                // Check for the availability of the file, as QFile::Exists takes more
+                // time this method is used
+                file.setFileName(absolutePath);
+                fileExists = file.open(QIODevice::ReadOnly);
+                file.close();
+                if( fileExists ) {
                     return absolutePath;
                 }
             }
         }
-        else if (resType == Hb::EffectResource) {
-			 QFile file;
-			 bool fileExists = false;
-             foreach ( const QString &prefix, rootDirs ) {
-                 if (absolutePath.isEmpty()) {
-                     absolutePath = prefix + '/' + name;
-                 }
-				 // Check for the availability of the file, as QFile::Exists takes more
-				 // time this method is used
-				 file.setFileName(absolutePath);
-                 fileExists = file.open(QIODevice::ReadOnly);
-                 file.close();
-                 if( fileExists ) {
-                     return absolutePath;
-                 }
-             }
-        }
     }
     return QString();
 }
 
-/* @param relativePathList List of relative paths
+/* @param pathList. List of paths, relative or absolute. Modified to absolute paths.
  * @param typeOfResource Type of Resource, can be Hb::StyleSheetResource or Hb::EffectResource.
  * 
- * @ret QMap: StringList in which each item is absolute path and a path is added to list after
- *            checking the existence of the file. List Items are added in priority order.
- *
- * The QFile::exists() check can be turned off by passing false in \a checkForFileExistence.
  */
-QMap<int, QString> HbStandardDirs::findResourceList(const QMap<int, QString> &relativePathList,
-                                                    Hb::ResourceType resType,
-                                                    bool checkForFileExistence)
+void HbStandardDirs::findResourceList(QMap<int, QString> &pathList,
+                                      Hb::ResourceType resType, bool assumeAbsolutesExists)
 {
     QString absolutePath;
     QString path;
-    QMap<int,QString> listWithPref;
     if (resType == Hb::StyleSheetResource || resType == Hb::EffectResource) {
         QStringList rootDirs;
-        rootDirs = instance.getRootPaths();
+        QMutableMapIterator<int, QString> i(pathList);
+        rootDirs
 #ifdef HB_TOOL_INTERFACE
         // Additional root directory support Currently used by tools only.
-        const QStringList rootpaths = instance.additionalRootPath();
-#endif
-        QMap<int,QString>::const_iterator i;
-        QStringList strList;
-        strList
-#ifdef HB_TOOL_INTERFACE
-        << rootpaths
+        // This may not be needed if themes tool start using HB_THEMES_DIR to set their
+        // root dir
+        << instance.additionalRootPath()
 #endif
-        << rootDirs ;
-		QFile file;
-		bool fileExists = false;
-		
-        foreach ( const QString &prefix, strList ) {
-            for (i = relativePathList.constBegin(); i != relativePathList.constEnd(); ++i){
-                absolutePath =  prefix + '/' + i.value();
-				// Check for the availability of the file, as QFile::Exists takes more 
-				// time this method is used
-				file.setFileName(absolutePath);
-                fileExists = file.open(QIODevice::ReadOnly);
-                file.close();
-                if (!checkForFileExistence || fileExists) {
-                    listWithPref.insert(i.key(), absolutePath);
-                }
-                if (resType == Hb::StyleSheetResource
-                    && HbLayeredStyleLoader::Priority_Core == i.key())
-                {
-                    QString absPath = ":/";
-                    absPath += i.value();
-					file.setFileName(absPath);
-					fileExists = file.open(QIODevice::ReadOnly);
-					file.close();
+        << instance.rootPaths();
+        QFile file;
+        bool fileExists = false;
+        while (i.hasNext()) {
+            i.next();
+            if (QDir::isAbsolutePath(i.value())) {
+                fileExists = (assumeAbsolutesExists) ? true : QFile::exists(i.value());
+            } else {
+                fileExists = false;
+            foreach ( const QString &prefix, rootDirs ) {
+                    absolutePath =  prefix + '/' + i.value();
+                    // Check for the availability of the file, as QFile::Exists takes more
+                    // time this method is used
+                    file.setFileName(absolutePath);
+                    fileExists = file.open(QIODevice::ReadOnly);
+                    file.close();
                     if (fileExists) {
-                        listWithPref.insert(i.key(),absPath);
+                        i.setValue(absolutePath);
+                        break;
                     }
+             }
+            }
+            if (!fileExists) {
+                i.remove();
+            }
+        }
+    }
+}
+
+
+QStringList HbStandardDirs::findExistingFolderList(const QStringList &relativeFolderPaths, 
+                                                   const QString &currentThemeName,
+                                                   Hb::ResourceType resType)
+{
+    QString absolutePath;
+    QStringList existingPaths;
+
+    QStringList rootDirs;
+    rootDirs
+#ifdef HB_TOOL_INTERFACE
+    // Additional root directory support Currently used by tools only.
+    // This may not be needed if themes tool start using HB_THEMES_DIR to set their
+    // root dir
+    << instance.additionalRootPath()
+#endif
+    << instance.rootPaths();
+
+    foreach (const QString &path, relativeFolderPaths) {
+        if (QDir::isAbsolutePath(path)) {
+            if(QFile::exists(path)) {
+                existingPaths.append(path);
+            }
+        } else {
+            foreach( const QString &prefix, rootDirs) {
+                absolutePath =  prefix + '/' + path;
+                // Check for the availability of the file
+                if( QFile::exists(absolutePath) ) {
+                    existingPaths.append(absolutePath);
+                    // Assuming each path will be there only in one root directory
+                    // (not supporting a single theme scattered in multiple root dirs)
+                    break;
                 }
             }
         }
     }
-    return listWithPref;
+    // Appending base theme folder
+    const HbThemeInfo &themeInfo = HbThemeUtils::baseTheme();
+    if (themeInfo.name != currentThemeName && resType == Hb::EffectResource) {
+        existingPaths.append(themeInfo.rootDir + '/' + HbThemeUtils::platformHierarchy + '/' + HbThemeUtils::effectsResourceFolder + '/' + themeInfo.name + '/');
+    }
+
+    return existingPaths;
 }
 
-
-QStringList HbStandardDirs::findExistingFolderList(const QStringList &relativeFolderPaths,
-                                                   const Hb::ResourceType resType)
+const QString &HbStandardDirs::themesDir()
 {
-    QString absolutePath;
-    QStringList  existingPaths;
-    if (resType == Hb::EffectResource){
-        QStringList rootDirs;
-        rootDirs = instance.getRootPaths();
-		
-        foreach ( const QString &relpath, relativeFolderPaths) {
-            foreach( const QString &prefix, rootDirs) {
-                absolutePath =  prefix + '/' + relpath;
-				// Check for the availability of the file
-                if( QFile::exists(absolutePath) ) {
-                    existingPaths.append(absolutePath);
-                }
-            }
-        }
-        existingPaths.append(":/themes/effects/" + HbThemeUtils::defaultTheme()
-                             + "/locale/" + QLocale().name() + '/');
-        existingPaths.append(":/themes/effects/" + HbThemeUtils::defaultTheme() + '/');
-    }
-    return existingPaths;
+#ifdef Q_OS_SYMBIAN
+    static QString mainThemesDir("Z:\\resource\\hb\\");
+#else
+    static QString mainThemesDir = QDir::fromNativeSeparators(qgetenv("HB_THEMES_DIR"));
+#endif
+    return mainThemesDir;
 }
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/core/hbstandarddirs_p.h
--- a/src/hbcore/core/hbstandarddirs_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/core/hbstandarddirs_p.h	Mon May 03 12:48:33 2010 +0300
@@ -41,6 +41,8 @@
 const QString rootPathsFile = "/usr/local/hb/theme/themerootsdir.txt";
 #endif
 
+// Standard theme root dirs
+extern const char *coreResourcesRootDir;
 // WARNING: This API is at prototype level and shouldn't be used before
 // the resource fetching with theming is fully implemented
 class HbStandardDirs
@@ -50,13 +52,15 @@
         const QString &name,
         Hb::ResourceType resType );
 
-    static QMap<int,QString> findResourceList(
-        const QMap<int,QString> &relativePathList,
-        Hb::ResourceType resType,
-        bool checkForFileExistence = true);        
+    static void findResourceList(
+        QMap<int,QString> &pathList,
+        Hb::ResourceType resType, bool assumeAbsolutesExists = false);
+
     static QStringList findExistingFolderList(
-    const QStringList &relativeFolderPaths, 
-    const Hb::ResourceType resType);
+        const QStringList &relativeFolderPaths,
+        const QString &currentThemeName, Hb::ResourceType resType);
+
+    static const QString &themesDir();
 };
 
 #endif
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/core/hbstring_p.cpp
--- a/src/hbcore/core/hbstring_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/core/hbstring_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -55,7 +55,7 @@
     Constructs a new HbString with \a MemoryType (SharedMemory/HeapMemory).
 */
 HbString::HbString(HbMemoryManager::MemoryType type)
-    : mMemoryType(type), mShared(false)
+    : mMemoryType(type), mShared(false), mDataOffset(-1)
 {
     if (type == HbMemoryManager::HeapMemory) {
         // Set offset to point to default NULL instance of HbStringData to
@@ -317,6 +317,10 @@
         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->mCapacity = size;
     }
 }
 
@@ -512,17 +516,18 @@
 */
 void HbString::clear()
 {
-    HbStringData* data = 0;
-
-    data = getStringData(mMemoryType, mDataOffset, mShared);
+    // No need to clear null string
+    if (mDataOffset == shared_null_offset) {
+        return;
+    }
 
     detach(0); // This will update the new mDataOffset.
-    GET_MEMORY_MANAGER(mMemoryType)
-    RETURN_IF_READONLY(manager);
-
-    data = getStringData(mMemoryType, mDataOffset, mShared);
+    HbStringData* data = getStringData(mMemoryType, mDataOffset, mShared);
 
     if (data->mStartOffset != -1) {
+        GET_MEMORY_MANAGER(mMemoryType)
+        RETURN_IF_READONLY(manager);
+
         manager->free(data->mStartOffset);
         data->mStartOffset = -1;
         data->mLength = 0;
@@ -694,39 +699,37 @@
     HbStringData* data = 0;
     data = getStringData(mMemoryType, mDataOffset, mShared);
 
+    // If the string is empty, a copy of it can be returned directly.
+    if (!data->mLength) {
+        return *this;
+    }
+
     QChar *src = getAddress<QChar>(mMemoryType, data->mStartOffset, mShared);
     
     // check whether source memory type is writable if yes, create temporary HbString using same
     // memory manager else use Heap memory
-    HbMemoryManager::MemoryType tempMemoryType;
+    HbMemoryManager::MemoryType copyMemoryType = HbMemoryManager::HeapMemory;
     if (manager->isWritable()) {
-        tempMemoryType = mMemoryType;
-    } else {
-        tempMemoryType = HbMemoryManager::HeapMemory;
+        copyMemoryType = mMemoryType;
     }
-    HbString strTemp(tempMemoryType);
+
+    HbString copy(copyMemoryType);
+    // Detach allocates data with new capacity
+    copy.detach(data->mLength);
+    HbStringData *newData = getStringData(copy.mMemoryType, copy.mDataOffset, copy.mShared);
 
-    HbStringData* newData = 0;
-	newData = getStringData(strTemp.mMemoryType, strTemp.mDataOffset, strTemp.mShared);
-    
-    if(data->mLength > 0){
-        // get memory manager of tempMemoryType
-        GET_MEMORY_MANAGER(strTemp.mMemoryType)
-        newData->mStartOffset = manager->alloc(data->mLength*sizeof(QChar));
-        newData->mLength = data->mLength;
-        newData->mCapacity = data->mLength;
+	QChar *dest = getAddress<QChar>(copyMemoryType, newData->mStartOffset, copy.mShared);
 
-		QChar *dest = getAddress<QChar>(tempMemoryType, newData->mStartOffset, strTemp.mShared);
+    int count = data->mLength;
+    for (int i = 0; i<count; ++i) {
+        *dest = src->toLower();
+        dest++;
+        src++;
+    }
 
-        int count = 0;
-        while( count < data->mLength){
-            *dest = src->toLower();
-            dest++;
-            src++;
-            count++;
-        }
-    }
-    return strTemp;
+    // Update string length after data copy
+    newData->mLength = count;
+    return copy;
 }
 
 /*
@@ -791,57 +794,36 @@
 */
 QDataStream& operator>>(QDataStream &in, HbString &str)
 {
-    GET_MEMORY_MANAGER(str.mMemoryType)
-    char *sTemp;
-    uint len;
-    in.readBytes(sTemp, len);
-    
-    HbStringData* data = 0;
-    if(str.mShared == true) {
-        data = getStringData(HbMemoryManager::SharedMemory, str.mDataOffset);
-    }
-    else {
-        data = getStringData(str.mMemoryType,str.mDataOffset);
+    quint32 length = 0;
+    in >> length;
+        
+    // If stream had an empty string, clear target string.
+    if (!length) {
+        str.clear();
+    } else {
+        // Detach target string and allocate its buffer to the new length
+        str.detach(length);
+        GET_MEMORY_MANAGER(str.mMemoryType)
+        RETURN_OBJECT_IF_READONLY(manager, in)
+        HbStringData* data = getStringData(str.mMemoryType, str.mDataOffset);
+        char *dest = getAddress<char>(str.mMemoryType, data->mStartOffset, str.mShared);
+        in.readRawData(dest, (uint)length * sizeof(QChar));
+        data->mLength = length;
     }
 
-    if(len > 0){
-        str.clear();
-        data->mStartOffset = manager->alloc(len);
-
-        char *dest =0;
-        if(str.mShared == true) {
-            dest = HbMemoryUtils::getAddress<char>(HbMemoryManager::SharedMemory, 
-                                                    data->mStartOffset);
-        } else {
-            dest = HbMemoryUtils::getAddress<char>(str.mMemoryType, data->mStartOffset);
-        }
-        ::memcpy(dest, sTemp,len); 
-        data->mLength = len/sizeof(QChar);
-        data->mCapacity = data->mLength;
-    }  
-    delete[] sTemp;
     return in;
 }
 
 /*
     Writes the HbString to the QDataStream
 */
-QDataStream& operator<<(QDataStream &out,const HbString &str)
+QDataStream& operator<<(QDataStream &out, const HbString &str)
 {
-    HbStringData* data = 0;
-    if(str.mShared == true)
-        data = getStringData(HbMemoryManager::SharedMemory, str.mDataOffset);
-    else
-        data = getStringData(str.mMemoryType, str.mDataOffset);
-    if(data->mLength > 0){
-        char *sTemp = 0;
-        if(str.mShared == true) {
-            sTemp = HbMemoryUtils::getAddress<char>(HbMemoryManager::SharedMemory, 
-                                                    data->mStartOffset);
-        } else {
-            sTemp = HbMemoryUtils::getAddress<char>(str.mMemoryType, data->mStartOffset);
-        }
-        out.writeBytes(sTemp,(uint)data->mLength*sizeof(QChar));
+    HbStringData* data = getStringData(str.mMemoryType, str.mDataOffset);
+    out << quint32(data->mLength);
+    if (data->mLength > 0) {
+        const char *contents = getAddress<char>(str.mMemoryType, data->mStartOffset, str.mShared);
+        out.writeRawData(contents, (uint)data->mLength * sizeof(QChar));
     }
     return out;
 }
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/core/hbthemesystemeffect.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/core/hbthemesystemeffect.cpp	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,385 @@
+/****************************************************************************
+**
+** 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 "hbstandarddirs_p.h"
+#include "hbthemesystemeffect_p.h"
+
+#include <QApplication>
+#include <QDebug>
+#include <QDir>
+#include <QFile>
+#include <QStringList>
+#ifdef Q_OS_SYMBIAN
+#include <babitflags.h>
+#include <coemain.h>
+#include <w32std.h>
+#endif //Q_OS_SYMBIAN
+
+// Define this to enable debug traces
+//#define HBTHEMESYSTEMEFFECT_DEBUG
+
+// Configuration XML elements
+const QLatin1String mainElement("effects_configuration");
+const QLatin1String effectElement("system_effect");
+const QLatin1String effectIdElement("effect_id");
+const QLatin1String appIdElement("app_id");
+const QLatin1String incomingFileElement("incoming_file");
+const QLatin1String outgoingFileElement("outgoing_file");
+const QLatin1String incomingPriorityElement("incoming_priority");
+// Configuration XML values
+const QLatin1String appStartEffectId("app_start");
+const QLatin1String appEndEffectId("app_exit");
+const QLatin1String appSwitchEffectId("app_switch");
+
+// Helper class for storing effect info
+class EffectInfoEntry {
+public:
+    HbThemeSystemEffect::SystemEffectId mEffectId;
+    QLatin1String mEffectIdStr;
+};
+
+// Effect info array
+const EffectInfoEntry effectInfoArray[] = {
+    { HbThemeSystemEffect::AppStart, appStartEffectId },
+    { HbThemeSystemEffect::AppExit, appEndEffectId },
+    { HbThemeSystemEffect::AppSwitch, appSwitchEffectId }
+};
+
+const int effectInfoCount = sizeof(effectInfoArray) / sizeof(EffectInfoEntry);
+
+#ifdef Q_OS_SYMBIAN
+const TInt tfxPurpose = Qt::Window;
+#endif //Q_OS_SYMBIAN
+
+
+static HbThemeSystemEffect *systemEffect = 0;
+
+HbThemeSystemEffect::~HbThemeSystemEffect()
+{
+}
+
+void HbThemeSystemEffect::handleThemeChange(const QString& themeName)
+{
+    HbThemeSystemEffect *effect = instance();
+    if (effect) {
+        effect->setCurrentTheme(themeName);
+    }
+}
+
+HbThemeSystemEffect *HbThemeSystemEffect::instance()
+{
+    if (!systemEffect) {
+        systemEffect = new HbThemeSystemEffect(qApp);
+    }
+    return systemEffect;
+}
+
+HbThemeSystemEffect::HbThemeSystemEffect(QObject *parent)
+    : QObject(parent)
+#ifdef Q_OS_SYMBIAN
+    , mWsSession(CCoeEnv::Static()->WsSession())
+#endif //Q_OS_SYMBIAN
+{
+}
+
+void HbThemeSystemEffect::setCurrentTheme(const QString& themeName)
+{
+#ifdef HBTHEMESYSTEMEFFECT_DEBUG
+    qDebug() << "HbThemeSystemEffect::setCurrentTheme:" << themeName;
+#endif //HBTHEMESYSTEMEFFECT_DEBUG
+    if (!themeName.isEmpty()) {
+        QString confPath;
+        if (getThemeEffectFolder(confPath, themeName)) {
+            mThemeEffectFolder = QDir::toNativeSeparators(confPath);
+            confPath += "conf/system_effects_configuration.xml";
+#ifdef HBTHEMESYSTEMEFFECT_DEBUG
+            qDebug() << "HbThemeSystemEffect::setCurrentTheme trying to  parse file" << confPath;
+#endif //HBTHEMESYSTEMEFFECT_DEBUG
+            bool parsingOk = parseConfigurationFile(confPath);
+#ifdef HBTHEMESYSTEMEFFECT_DEBUG
+            QMapIterator<SystemEffectKey, SystemEffectValue> mapIt(mSystemEffects);
+            while (mapIt.hasNext()) {
+                mapIt.next();
+                qDebug() << "HbThemeSystemEffect::setCurrentTheme appUid:"
+                        << mapIt.key().mAppUid << "effect id:" << mapIt.key().mEffectId
+                        << "outgoing effect file:" << mapIt.value().mOutgoingFile
+                        << "incoming effect file:" << mapIt.value().mIncomingFile;
+            }
+#endif //HBTHEMESYSTEMEFFECT_DEBUG
+            // Register effects
+            // TODO: what to do if conf file not found (or some effect file not found)?
+            if (parsingOk) {
+                registerEffects();
+            }
+        }
+    }
+}
+
+void HbThemeSystemEffect::registerEffects()
+{
+#ifdef Q_OS_SYMBIAN
+    // Unregister all previous theme effects
+    //mWsSession.UnregisterAllEffects();
+#endif //Q_OS_SYMBIAN
+    QMapIterator<SystemEffectKey, SystemEffectValue> mapIt(mSystemEffects);
+#ifdef Q_OS_SYMBIAN
+    TPtrC resourceDir = mThemeEffectFolder.utf16();
+#endif //Q_OS_SYMBIAN
+    while (mapIt.hasNext()) {
+        mapIt.next();
+        // Register entry
+#ifdef HBTHEMESYSTEMEFFECT_DEBUG
+        if (!mapIt.key().mAppUid) {
+            qDebug() << "HbThemeSystemEffect: Registering default system effect:"
+                    << mapIt.key().mEffectId << mapIt.value().mOutgoingFile << mapIt.value().mIncomingFile;
+        } else {
+            qDebug() << "HbThemeSystemEffect: Registering application (" << mapIt.key().mAppUid
+                     << ") specific system effect:" << mapIt.key().mEffectId
+                     << mapIt.value().mOutgoingFile << mapIt.value().mIncomingFile;
+        }
+#endif //HBTHEMESYSTEMEFFECT_DEBUG
+#ifdef Q_OS_SYMBIAN
+        TInt tfxAction = tfxTransitionAction(mapIt.key().mEffectId);
+        // If no effect files defined, unregister effect
+        if (mapIt.value().mOutgoingFile.isEmpty()
+                && mapIt.value().mIncomingFile.isEmpty()) {
+//            mWsSession.UnregisterEffect(tfxAction, tfxPurpose, mapIt.key().mAppUid);
+        } else {
+            TPtrC outgoingEffect = mapIt.value().mOutgoingFile.utf16();
+            TPtrC incomingEffect = mapIt.value().mIncomingFile.utf16();
+            TBitFlags effectFlags;
+            if (mapIt.value().mIncomingHasPriority) {
+//                effectFlags.Set(TTfxFlags::ETfxIncomingTakesPriority);
+            }
+//            mWsSession.RegisterEffect(tfxAction,
+//                                      tfxPurpose,
+//                                      resourceDir,
+//                                      outgoingEffect,
+//                                      incomingEffect,
+//                                      mapIt.key().mAppUid,
+//                                      effectFlags);
+        }
+#endif //Q_OS_SYMBIAN
+    }
+}
+
+bool HbThemeSystemEffect::parseConfigurationFile(const QString& filePath)
+{
+    bool success = true;
+    mSystemEffects.clear();
+    QFile confFile(filePath);
+    success = confFile.open(QIODevice::ReadOnly);
+    if (success) {
+        QXmlStreamReader xml(&confFile);
+        success = checkStartElement(xml, mainElement);
+        if (success) {
+            parseEffects(xml);
+            if (xml.error()) {
+                qWarning() << "HbThemeSystemEffect::parseConfigurationFile: Error when parsing xml " << xml.errorString();
+                success = false;
+            }
+        }
+        confFile.close();
+    } else {
+        qWarning() << "HbThemeSystemEffect::parseConfigurationFile:" << filePath << "not found.";
+    }
+    return success;
+}
+
+void HbThemeSystemEffect::parseEffects(QXmlStreamReader &xml)
+{
+    // Go through effects section
+    while (!xml.atEnd()) {
+        if (checkStartElement(xml, effectElement)) {
+
+            SystemEffectId effectId = Invalid;
+            uint appId = 0;
+            QString incomingFile;
+            QString outgoingFile;
+            bool incomingHasPriority = false;
+            bool validEntry = true;
+            bool effectFileEntryFound = false;
+
+            // Single effect entry
+            while (validEntry && xml.readNextStartElement()) {
+                // Effect id
+                if (xml.name() == effectIdElement) {
+                    effectId = (SystemEffectId)idFromEffectIdString(xml.readElementText());
+                    validEntry = !(effectId == Invalid);
+                // App id
+                } else if (xml.name() == appIdElement) {
+                    appId = validApplicationUid(xml.readElementText());
+                // Outgoing effect file
+                } else if (xml.name() == outgoingFileElement) {
+                    effectFileEntryFound = true;
+                    outgoingFile = xml.readElementText();
+                    validEntry = validEffectFile(outgoingFile);
+                // Incoming effect file
+                } else if (xml.name() == incomingFileElement) {
+                    effectFileEntryFound = true;
+                    incomingFile = xml.readElementText();
+                    validEntry = validEffectFile(incomingFile);
+                // If incoming file has the priority
+                } else if (xml.name() == incomingPriorityElement) {
+                    incomingHasPriority = booleanFromString(xml.readElementText());
+                }
+                // Read end element
+                xml.readNext();
+            }
+            if (!effectFileEntryFound) {
+                validEntry = false;
+            }
+            // If valid entry was found, store it to system effects map
+            if (validEntry) {
+                addEntryToEffectMap(appId, effectId, incomingFile, outgoingFile, incomingHasPriority);
+            }
+        }
+    }
+}
+
+bool HbThemeSystemEffect::checkStartElement(QXmlStreamReader &xml, const QLatin1String &startElement) const
+{
+    xml.readNext();
+    while (!xml.isStartElement() && !xml.atEnd()) {
+        xml.readNext();
+    }
+    bool success = xml.isStartElement();
+    if (success && xml.name() != startElement) {
+        success = false;
+    } else if (xml.error()) {
+        qWarning()
+                << "HbThemeSystemEffect::checkStartElement: Error when parsing system effect configuration : "
+                << xml.errorString();
+    } else if (!success && !xml.name().isEmpty()) {
+        qWarning()
+                << "HbThemeSystemEffect::checkStartElement: Error when parsing system effect configuration with element: "
+                << xml.name();
+    }
+    return success;
+}
+
+int HbThemeSystemEffect::idFromEffectIdString(const QString &effectIdString) const
+{
+    for (int i=0; i<effectInfoCount; i++) {
+        if (effectInfoArray[i].mEffectIdStr == effectIdString) {
+            return effectInfoArray[i].mEffectId;
+        }
+    }
+    return Invalid;
+}
+
+bool HbThemeSystemEffect::validEffectFile(const QString &effectFile) const
+{
+    bool validFile = true;
+    // Validate file existance only if effects folder is found
+    // (no validating with unit tests nonexistent effect files)
+    if (!mThemeEffectFolder.isEmpty()) {
+        if (!QFile(mThemeEffectFolder + effectFile).exists()) {
+            validFile = false;
+        }
+    }
+    return validFile;
+}
+
+uint HbThemeSystemEffect::validApplicationUid(const QString &appUid) const
+{
+    bool ok = false;
+    int base = 10;
+    if (appUid.startsWith("0x")) {
+        base = 16;
+    }
+    uint uid = appUid.toUInt(&ok, base);
+    return uid;
+}
+
+bool HbThemeSystemEffect::booleanFromString(const QString &boolAttribute) const
+{
+    bool value = false;
+    if (boolAttribute == QLatin1String("true") || boolAttribute == QLatin1String("1")) {
+        value = true;
+    }
+    return value;
+}
+
+bool HbThemeSystemEffect::getThemeEffectFolder(QString &path, const QString &themeName) const
+{
+    bool pathFound = false;
+    QString effectDir = "themes/effects/" + themeName + "/";
+    QStringList queryList;
+    queryList.append(effectDir);
+    QStringList folderList = HbStandardDirs::findExistingFolderList(queryList, 
+                                                                    themeName, 
+                                                                    Hb::EffectResource);
+    QString pathCandidate;
+    for (int i=0; i<folderList.count(); i++) {
+        pathCandidate = folderList.at(i);
+        // Skip resource folders
+        if (!pathCandidate.startsWith(":/")) {
+            path = pathCandidate;
+            pathFound = true;
+            break;
+        }
+    }
+    return pathFound;
+}
+
+void HbThemeSystemEffect::addEntryToEffectMap(uint appUid,
+                                              SystemEffectId id,
+                                              const QString &incomingFile,
+                                              const QString &outgoingFile,
+                                              bool incomingHasPriority)
+{
+    if (id != Invalid) {
+        SystemEffectKey key(id, appUid);
+        SystemEffectValue value(incomingFile, outgoingFile, incomingHasPriority);
+        SystemEffectMap::iterator i = mSystemEffects.find(key);
+        if (i == mSystemEffects.end()) {
+            i = mSystemEffects.insert(key, value);
+        }
+    }
+}
+
+#ifdef Q_OS_SYMBIAN
+TInt HbThemeSystemEffect::tfxTransitionAction(const SystemEffectId id) const
+{
+    TInt tfxTransitionAction = 0;
+    switch (id) {
+    case (AppStart) :
+        //tfxTransitionAction = TTfxTransitionActions::ETfxActionStart;
+        break;
+    case (AppExit) :
+        //tfxTransitionAction = TTfxTransitionActions::ETfxActionShutDown;
+        break;
+    case (AppSwitch) :
+        //tfxTransitionAction = TTfxTransitionActions::ETfxActionSwitching;
+        break;
+    default:
+        break;
+    }
+    return tfxTransitionAction;
+}
+#endif //Q_OS_SYMBIAN
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/core/hbthemesystemeffect_p.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/core/hbthemesystemeffect_p.h	Mon May 03 12:48:33 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 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 HBTHEMESYSTEMEFFECT_P_H
+#define HBTHEMESYSTEMEFFECT_P_H
+
+#include <hbglobal.h>
+#include <QMap>
+#include <QObject>
+#include <QXmlStreamReader>
+
+#ifdef Q_OS_SYMBIAN
+class RWsSession;
+#endif //Q_OS_SYMBIAN
+
+class HB_CORE_PRIVATE_EXPORT HbThemeSystemEffect : public QObject
+{
+    Q_OBJECT
+
+public:
+    enum SystemEffectId {
+        Invalid = 0,
+        AppStart,
+        AppExit,
+        AppSwitch
+    };
+
+    ~HbThemeSystemEffect();
+    static void handleThemeChange(const QString &themeName);
+
+private:
+    static HbThemeSystemEffect *instance();
+    HbThemeSystemEffect(QObject *parent);
+    void setCurrentTheme(const QString &themeName);
+    void registerEffects();
+    bool parseConfigurationFile(const QString& filePath);
+    void parseEffects(QXmlStreamReader &xml);
+    bool checkStartElement(QXmlStreamReader &xml, const QLatin1String &startElement) const;
+    int idFromEffectIdString(const QString &effectIdString) const;
+    bool validEffectFile(const QString &effectFile) const;
+    uint validApplicationUid(const QString &appUid) const;
+    bool booleanFromString(const QString &boolAttribute) const;
+    bool getThemeEffectFolder(QString &path, const QString &themeName) const;
+    void addEntryToEffectMap(uint appUid,
+                             SystemEffectId id,
+                             const QString &incomingFile,
+                             const QString &outgoingFile,
+                             bool incomingHasPriority);
+
+#ifdef Q_OS_SYMBIAN
+    TInt tfxTransitionAction(const SystemEffectId id) const;
+#endif //Q_OS_SYMBIAN
+
+private:
+    class SystemEffectKey {
+    public:
+        inline SystemEffectKey(SystemEffectId effectId, uint appUid)
+            : mEffectId(effectId), mAppUid(appUid){}
+
+        inline bool operator<(const SystemEffectKey &other) const {
+            return other.mAppUid == mAppUid ? other.mEffectId > mEffectId : other.mAppUid > mAppUid;
+        }
+
+    public:
+        SystemEffectId mEffectId;
+        uint mAppUid;
+    };
+
+    class SystemEffectValue {
+    public:
+        inline SystemEffectValue(const QString &incomingFile,
+                                 const QString &outgoingFile,
+                                 bool incomingHasPriority)
+            : mIncomingFile(incomingFile),
+            mOutgoingFile(outgoingFile),
+            mIncomingHasPriority(incomingHasPriority) {}
+
+    public:
+        QString mIncomingFile;
+        QString mOutgoingFile;
+        bool mIncomingHasPriority;
+    };
+
+    typedef QMap<SystemEffectKey, SystemEffectValue> SystemEffectMap;
+    SystemEffectMap mSystemEffects;
+    QString mThemeEffectFolder;
+#ifdef Q_OS_SYMBIAN
+    RWsSession &mWsSession;
+#endif //Q_OS_SYMBIAN
+
+    friend class TestHbThemeSystemEffect;
+};
+
+#endif // HBTHEMESYSTEMEFFECT_P_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/core/hbvariant_p.cpp
--- a/src/hbcore/core/hbvariant_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/core/hbvariant_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -32,8 +32,6 @@
 #include "hbstring_p.h"
 #include "hbsmartoffset_p.h"
 
-
-
 /**
  * detach
  * used to support implicit sharing
@@ -46,32 +44,27 @@
             data->mRef.deref();
         }
         GET_MEMORY_MANAGER(mMemoryType);
-        try{
-            mDataOffset = manager->alloc( sizeof(HbVariantData) );
+        HbSmartOffset offset(manager->alloc(sizeof(HbVariantData)), mMemoryType);
 
-            HbVariantData *newData = new( (char*)manager->base() + mDataOffset ) HbVariantData();
-            newData->mData = data->mData;
-            newData->mDataType = data->mDataType;
-
-            if ( data->mDataType == String ) {
-                newData->mData.offset = manager->alloc( data->stringSize*sizeof(QChar) );
+        HbVariantData *newData = new((char*)manager->base() + offset.get()) HbVariantData();
+        newData->mData = data->mData;
+        newData->mDataType = data->mDataType;
 
-				::memcpy(HbMemoryUtils::getAddress<char>( mMemoryType, newData->mData.offset ),
-                    getAddress<char>( mMemoryType, data->mData.offset, mShared ),
-                    data->stringSize * sizeof( QChar) );
-                newData->stringSize = data->stringSize;
-            } else if( data->mDataType == Color ) {
-                newData->mData.offset = manager->alloc( sizeof(QColor) );
-                new (HbMemoryUtils::getAddress<QColor>( mMemoryType, newData->mData.offset) ) 
-                        QColor(*getAddress<QColor>( mMemoryType, data->mData.offset, mShared) );
-            }
-            mShared = false;
-    }
-        catch(std::bad_alloc &badAlloc){
-            Q_UNUSED(badAlloc)
-            qCritical("HbVariant::detach() failed!");
-            throw;
+        if ( data->mDataType == String ) {
+            HbSmartOffset dataOffset(manager->alloc( data->stringSize*sizeof(QChar)));
+            ::memcpy(HbMemoryUtils::getAddress<char>(mMemoryType, dataOffset.get()),
+                getAddress<char>(mMemoryType, data->mData.offset, mShared),
+                data->stringSize * sizeof(QChar));
+            newData->stringSize = data->stringSize;
+            newData->mData.offset = dataOffset.release();
+        } else if(data->mDataType == Color) {
+            HbSmartOffset dataOffset(manager->alloc(sizeof(QColor)));
+            new (HbMemoryUtils::getAddress<QColor>(mMemoryType, dataOffset.get()))
+                    QColor(*getAddress<QColor>(mMemoryType, data->mData.offset, mShared));
+            newData->mData.offset = dataOffset.release();
         }
+        mDataOffset = offset.release();
+        mShared = false;
     }
 }
 
@@ -118,7 +111,7 @@
     : mMemoryType( type ), mShared( false )
 {
     initializeData();
-    fillStringData(str);
+    fillStringData(str.constData(), str.length());
 }
 
 /*
@@ -129,7 +122,7 @@
 {
     initializeData();
     QString str = QString::fromAscii(val);
-    fillStringData(str);
+    fillStringData(str.constData(), str.length());
 }
 
 
@@ -314,53 +307,36 @@
 HbVariant::HbVariantData * HbVariant::initializeData()
 {
     GET_MEMORY_MANAGER(mMemoryType);
-    try{
-        mDataOffset = manager->alloc( sizeof(HbVariantData) );
-        //Q_ASSERT(mDataOffset != -1);
-        HbVariantData *data = getAddress<HbVariantData>( mMemoryType, mDataOffset, mShared );
-        return new(data) HbVariantData();
-    }
-    catch(std::bad_alloc &badAlloc){        
-              Q_UNUSED(badAlloc)
-        qCritical("HbVariant::initializeData() failed!");
-        return NULL;
-    }
+    mDataOffset = -1;
+    mDataOffset = manager->alloc(sizeof(HbVariantData));
+    HbVariantData *data = getAddress<HbVariantData>(mMemoryType, mDataOffset, mShared);
+    return new(data) HbVariantData();
 }
 
 /*
 * fillStringData 
 */
-void HbVariant::fillStringData(const QString &str)
+void HbVariant::fillStringData(const QChar *str, int size)
 {
     GET_MEMORY_MANAGER(mMemoryType);
     HbVariantData *data = getAddress<HbVariantData>(mMemoryType, mDataOffset, mShared);
-    if (data->mDataType==HbVariant::String 
-            && data->mData.offset != -1) {
-        //clean old string data when assigend with a new string value
-        HbMemoryUtils::freeMemory(mMemoryType, data->mData.offset);
-    }
+    int oldOffset = reservesMemory(data) ? data->mData.offset : -1;
 
-    data->stringSize = str.length();
-    // If the string is not null.. alocate memory for it and copy data
-    if (data->stringSize) {
-        try{
-        data->mData.offset = manager->alloc(data->stringSize*sizeof(QChar));
-
+    if (size == 0) {
+        data->mData.offset = -1;
+    } else {
+        // allocate memory and copy data.
+        int allocBytes = size * sizeof(QChar);
+        data->mData.offset = manager->alloc(allocBytes);
         memcpy(getAddress<char>(mMemoryType, data->mData.offset, mShared),
-            str.constData(),
-            data->stringSize*sizeof(QChar));
-        }
-        catch(std::bad_alloc &badAlloc){
-            Q_UNUSED(badAlloc)
-            qCritical("HbVariant::fillStringData() failed!");
-            data->mData.offset = -1;
-            throw;
-        }
-    } else {
-        data->mData.offset = -1;
+                                str, allocBytes);
     }
-
+    data->stringSize = size;
     data->mDataType = String;
+    if (oldOffset != -1) {
+        //clean old string data when assigned with a new string value
+        HbMemoryUtils::freeMemory(mMemoryType, oldOffset);
+    }
 }
 
 /*
@@ -370,22 +346,18 @@
 {
     GET_MEMORY_MANAGER(mMemoryType);
     HbVariantData *data = getAddress<HbVariantData>(mMemoryType, mDataOffset, mShared);
-    
-    int colDataSize = sizeof(col);
-    try{
+    int oldOffset = reservesMemory(data) ? data->mData.offset : -1;
 
-        if(data->mDataType!=HbVariant::Color) {
-            data->mData.offset = manager->alloc(colDataSize);
-        }
-        new(getAddress<char>(mMemoryType, data->mData.offset, mShared)) QColor(col);
-        data->mDataType = Color;
+    if(data->mDataType == HbVariant::Color && data->mData.offset != -1) {
+        oldOffset = -1; //use the preallocated memory.
+    } else {
+        data->mData.offset = manager->alloc(sizeof(QColor));
     }
-    catch(std::bad_alloc &badAlloc){
-              Q_UNUSED(badAlloc)
-        qCritical("HbVariant::fillColorData failed!");
-        throw;
+    new (getAddress<char>(mMemoryType, data->mData.offset, mShared)) QColor(col);
+    data->mDataType = Color;
+    if (oldOffset != -1) {
+        HbMemoryUtils::freeMemory(mMemoryType, oldOffset);
     }
-
 }
 
 /*
@@ -396,12 +368,7 @@
     detach(); // This will update the mDataOffset to new location if ref > 1.
 
     HbVariantData *data = getAddress<HbVariantData>(mMemoryType, mDataOffset, mShared);
-
-    if(data->mDataType==HbVariant::String || data->mDataType==HbVariant::Color) {
-        HbMemoryUtils::freeMemory(mMemoryType, data->mData.offset);
-        data->stringSize=0;
-    }
-
+    freeMemory(data);
     data->mData.i = val;
     data->mDataType = Int;
     return *this;
@@ -415,12 +382,7 @@
     detach(); // This will update the mDataOffset to new location if ref > 1.
 
     HbVariantData *data = getAddress<HbVariantData>(mMemoryType, mDataOffset, mShared);
-
-    if(data->mDataType==HbVariant::String || data->mDataType==HbVariant::Color) {
-        HbMemoryUtils::freeMemory(mMemoryType, data->mData.offset);
-        data->stringSize=0;
-    }
-
+    freeMemory(data);
     data->mData.d = val;
     data->mDataType = Double;
     return *this;
@@ -432,13 +394,7 @@
 HbVariant& HbVariant::operator=(const QString& val)
 {
     detach(); // This will update the mDataOffset to new location if ref > 1.
-    HbVariantData *data = getAddress<HbVariantData>(mMemoryType, mDataOffset, mShared);
-    if(data->mDataType == String || data->mDataType == Color) {
-        HbMemoryUtils::freeMemory(mMemoryType, data->mData.offset);
-        data->stringSize=0;
-    }
-    fillStringData(val);
-    data->mDataType = String;
+    fillStringData(val.constData(), val.length());
     return *this;
 }
 
@@ -448,34 +404,7 @@
 HbVariant& HbVariant::operator=(const HbString& val)
 {
     detach(); // This will update the mDataOffset to new location if ref > 1.
-    HbVariantData *data = getAddress<HbVariantData>(mMemoryType, mDataOffset, mShared);
-    if(data->mDataType == String || data->mDataType == Color) {
-        HbMemoryUtils::freeMemory(mMemoryType, data->mData.offset);
-        data->stringSize=0;
-    }
-
-    data->stringSize = val.length();
-    // If the string is not null.. alocate memory for it and copy data
-    if (data->stringSize) {
-        try{
-            GET_MEMORY_MANAGER(mMemoryType)
-            data->mData.offset = manager->alloc(data->stringSize*sizeof(QChar));
-            //Q_ASSERT(data->mData.offset != -1);
-            memcpy(getAddress<char>(mMemoryType,data->mData.offset,mShared),
-                   val.constData(),
-            data->stringSize*sizeof(QChar));
-    } 
-        catch(std::bad_alloc &badAlloc){
-            Q_UNUSED(badAlloc)
-            qCritical("HbVariant::operator= failed!");
-            data->mData.offset = -1;
-            throw;
-        }
-    } else {
-        data->mData.offset = -1;
-    }
-
-    data->mDataType = String;
+    fillStringData(val.constData(), val.length());
     return *this;
 }
 
@@ -485,14 +414,7 @@
 HbVariant& HbVariant::operator=(const QColor& col)
 {
     detach(); // This will update the mDataOffset to new location if ref > 1.
-    HbVariantData *data = getAddress<HbVariantData>(mMemoryType, mDataOffset, mShared);
-    if(data->mDataType==String) {
-        HbMemoryUtils::freeMemory(mMemoryType,data->mData.offset);
-        data->stringSize=0;
-    }
-
     fillColorData(col);
-    data->mDataType = Color;
     return *this;
 }
 
@@ -510,13 +432,12 @@
 */
 HbVariant& HbVariant::operator=(const HbVariant &other)
 {
-
     GET_MEMORY_MANAGER(mMemoryType)
+    if(!manager->isWritable()) {
+        Q_ASSERT(false);
+    }
 
-    if(!manager->isWritable())
-        Q_ASSERT(false);
-
-	HbVariantData *otherData = getAddress<HbVariantData>(other.mMemoryType, other.mDataOffset, other.mShared);
+    HbVariantData *otherData = getAddress<HbVariantData>(other.mMemoryType, other.mDataOffset, other.mShared);
     HbVariantData *data = getAddress<HbVariantData>(mMemoryType, mDataOffset, mShared);
 
     if(other.mMemoryType != mMemoryType || other.mShared == true) {
@@ -531,18 +452,15 @@
         mShared = true;
         mMemoryType = HbMemoryManager::HeapMemory;
     } else {
-        
         otherData->mRef.ref();
-
         if(mShared != true && !data->mRef.deref() ) {
             clear();
             HbMemoryUtils::freeMemory(mMemoryType, mDataOffset);
         }
-		mShared = other.mShared;
+        mShared = other.mShared;
         mMemoryType = other.mMemoryType;
     }
     mDataOffset = other.mDataOffset;
-
     Q_ASSERT(mMemoryType == HbMemoryManager::SharedMemory || mMemoryType == HbMemoryManager::HeapMemory);
     return *this;
 }
@@ -587,7 +505,7 @@
 
     bool ok = true;
     int tempOffset = -1;
-    QColor col; // Removing the Linux build error;
+    QColor col;
     QString str;
     if(data->mDataType == t) {
         return true;
@@ -634,23 +552,27 @@
 
     case HbVariant::String: 
         switch(data->mDataType) {
-        case HbVariant::Int : 
-            fillStringData(QString::number(data->mData.i));
+        case HbVariant::Int : {
+            QString num = QString::number(data->mData.i);
+            fillStringData(num.constData(), num.length());
             data->mDataType = HbVariant::String;
             return true;
-        case HbVariant::Double: 
-            fillStringData(QString::number(data->mData.d));
+        }
+        case HbVariant::Double: {
+            QString num = QString::number(data->mData.d);
+            fillStringData(num.constData(), num.length());
             data->mDataType = HbVariant::String;
             return true;
+        }
         case HbVariant::StringList:
             // ToDo: Handle it
             return false;
-        case HbVariant::Color: 
-            col = getColor();
-            HbMemoryUtils::freeMemory(mMemoryType,data->mData.offset);
-            fillStringData(col.name()); 
+        case HbVariant::Color: {
+            QString colName = getColor().name();
+            fillStringData(colName.constData(), colName.length());
             data->mDataType = HbVariant::String;
             return true;
+        }
         default:
             return false;
         }
@@ -659,13 +581,11 @@
         switch(data->mDataType) {
         case HbVariant::String: 
             col.setNamedColor(getString());
-            HbMemoryUtils::freeMemory(mMemoryType,data->mData.offset);
-            data->stringSize = 0;
+            if (!col.isValid()) {
+                return false;
+            }
             fillColorData(col);
-            data->mDataType = HbVariant::Color;
-            // ToDo: should it return true as type is converted to Color
-            // for invalid color also.
-            return col.isValid();
+            return true;
         default:
             return false;
         }
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/core/hbvariant_p.h
--- a/src/hbcore/core/hbvariant_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/core/hbvariant_p.h	Mon May 03 12:48:33 2010 +0300
@@ -120,7 +120,7 @@
     
 private:
     HbVariantData * initializeData();
-    void fillStringData(const QString &str);
+    void fillStringData(const QChar *str, int size);
     void fillColorData(const QColor &col);
     QString getString() const;
     QColor getColor() const;
@@ -140,6 +140,19 @@
         Q_ASSERT(data != 0);
         return data;
     }
+    static bool reservesMemory(const HbVariantData *data)
+    {
+        return data->mDataType == HbVariant::String
+               || data->mDataType == HbVariant::Color;
+    }
+    void freeMemory(HbVariantData *data)
+    {
+        if(reservesMemory(data)) {
+            HbMemoryUtils::freeMemory(mMemoryType, data->mData.offset);
+            data->mData.offset = -1;
+            data->stringSize = 0;
+        }
+    }
 
     void detach();
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/core/hbvector_p.h
--- a/src/hbcore/core/hbvector_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/core/hbvector_p.h	Mon May 03 12:48:33 2010 +0300
@@ -182,6 +182,8 @@
 * HbVector is templatized vector which can store its internal data either in shared memory or heap.
 * The class was written specially for sharing the output of CSS parser for subsequent lookup usage
 * across processes, to reduce the overall memory usage and to improve performance.
+*
+* In case of out of memory situation, the vector is restored to the state it was before the exception occurred. 
 * 
 * The class uses smart pointers (smart_ptr<T> class objects) which internally contains offsets from
 * a certain base address (which can either be shared memory or heap) instead of directly containing
@@ -256,7 +258,6 @@
            return;
        if(mShared != true && !mData->mRef.deref()) {
            destroyData();
-           deAllocateData();
        }
     
     }
@@ -359,28 +360,17 @@
     void resize(int newSize)
     {
        Q_ASSERT(newSize > -1);
-       int oldSize = this->size();
+       int oldSize = mData->mSize;
        if(newSize < oldSize) {
            // Destroy the last remaining elements
            erase(const_iterator(mData->mStart + newSize), constEnd());
        } else {
-           try{
-               reserve(newSize);
-               pointer last = mData->mStart + newSize;
-               pointer first = mData->mStart + mData->mSize;
-               while(last != first) {
-                   new(--last) T;
-                }
+           reserve(newSize);
+           Inserter it(mData->mStart + mData->mSize, mData->mStart + newSize);
+           while(it.canInsert()) {
+               it.insert(T());
            }
-            catch(std::bad_alloc &badAlloc){
-                Q_UNUSED(badAlloc)
-                //an exception happened in reserve or new probably
-                // restore the oldsize and leave vector in its earlier state
-                newSize = oldSize;
-                mData->mSize = newSize;
-                qCritical("HbVector::resize() failed!");
-                throw;
-            }
+           it.release();
        }
        mData->mSize = newSize;
     }
@@ -388,23 +378,16 @@
     // reserve() can throw owing to OOM
     void reserve(int newSize)
     {
-        if( mShared || newSize > mData->mCapacity) {
+        if( mShared || newSize > mData->mCapacity || mData->mRef != 1) {
             GET_MEMORY_MANAGER(mMemoryType);
-            try{
-                int offset = (char*)mData->mStart.get() - (char*)manager->base();
-                int newOffset = -1;
-                if(newSize > mData->mCapacity)
-                    newOffset = this->reAlloc(offset, newSize * sizeof(T), mData->mCapacity * sizeof(T));
-                else
-                    newOffset = this->reAlloc(offset, mData->mCapacity * sizeof(T), mData->mCapacity * sizeof(T));
-                mData->mStart.setOffset(newOffset);
-                mData->mCapacity = newSize;
-           }
-            catch(std::bad_alloc &badAlloc){
-                Q_UNUSED(badAlloc)
-                qCritical("HbVector::reserve() failed!");
-                throw;
-           }
+            int offset = (char*)mData->mStart.get() - (char*)manager->base();
+            int newOffset = -1;
+            if(newSize > mData->mCapacity)
+                newOffset = reAlloc(offset, newSize, mData->mSize);
+            else
+                newOffset = reAlloc(offset, mData->mCapacity, mData->mSize);
+            mData->mStart.setOffset(newOffset);
+            mData->mCapacity = newSize;
        }
     }
 
@@ -450,7 +433,7 @@
     }
 
     size_type count() const
-    { return this->mData->mSize; } 
+    { return mData->mSize; } 
 
     size_type size() const
     { return count(); } 
@@ -505,38 +488,15 @@
     HbVector<T> & operator+= (const HbVector<T>& other)
     {
         int newSize = mData->mSize + other.mData->mSize;
-        //save the oldOffset in case of failure of memory allocation via new
-        //int oldOffset = mData->mStart.mOffset;
-        int newOffset = -1;
-        try{
-            if(mShared || mData->mRef != 1 || newSize > mData->mCapacity) {
-                GET_MEMORY_MANAGER(mMemoryType);
-                int offset = (char*)mData->mStart.get() - (char*)manager->base();
-                
-                if(newSize > mData->mCapacity) {
-                    newOffset = this->reAlloc(offset, newSize * sizeof(T), mData->mCapacity * sizeof(T));
-                } else {
-                    newOffset = this->reAlloc(offset, mData->mCapacity * sizeof(T), mData->mCapacity * sizeof(T));
-                }
-                
-                mData->mStart.setOffset(newOffset);
-                mData->mCapacity = newSize;
-            }
+        reserve(newSize);
+        Inserter it(mData->mStart + mData->mSize, mData->mStart + newSize);
+        pointer otherFirst = other.mData->mStart;
 
-            pointer selfLast = mData->mStart + newSize;
-            pointer otherLast = other.mData->mStart + other.mData->mSize;
-            pointer otherFirst = other.mData->mStart;
-
-            while( otherLast != otherFirst ) {
-                new(--selfLast)T(*--otherLast);
-            }
-
-            mData->mSize = newSize;
-    }
-    catch(std::bad_alloc &badAlloc){        
-        Q_UNUSED(badAlloc)
-        qCritical("HbVector::operator+= failed!");
-    }
+        for(;it.canInsert(); ++otherFirst ) {
+            it.insert(*otherFirst);
+        }
+        mData->mSize = newSize;
+        it.release();
         return *this;
     }
 
@@ -574,7 +534,6 @@
             if(mShared != true) {
                 if(mData->mRef == 1) {
                     destroyData();
-                    deAllocateData();
                 }else {
                     mData->mRef.deref();
                 }
@@ -587,7 +546,6 @@
         } else {
             if(!mData->mRef.deref() ) {
                destroyData();
-               deAllocateData();
             }
             other.mData->mRef.ref();
             mMemoryType = other.mMemoryType;
@@ -603,7 +561,7 @@
         Q_ASSERT(mMemoryType == HbMemoryManager::SharedMemory || mMemoryType == HbMemoryManager::HeapMemory);
         clear();
         foreach (T obj, other) {
-            this->append(obj);
+            append(obj);
         }
         return *this;
     }
@@ -619,7 +577,7 @@
     void detach()
     {
         if(mData->mRef != 1 || mShared == true) {
-            copyData(this->size(), this->size());
+            copyData(size(), size());
             // Here assumption is the new copy of data is created in heap.
             // so disabling the shared flag.
             if(mShared)
@@ -633,51 +591,34 @@
             *dest++ = *begin++;
         }
         return dest;
-    }
+    }    
 
-// copy the Data , this will call in Implicit sharing whenever vector State is going to change.
+// copy the Data , this will be called in Implicit sharing whenever vector State is going to change.
+// mData is not freed, because it is assumed, that it is owned by another HbVector (mData->mRef > 1)
     void copyData(int newSize, int oldSize)
     {
         DataPointer tempData(mData);
+        DataPointer newData(0, mMemoryType);
         GET_MEMORY_MANAGER(mMemoryType)
-        DataPointer newData(0, mMemoryType);
-        int offset = -1;
-        try{
-            offset = manager->alloc(sizeof(HbVectorData));
-            //Q_ASSERT(offset != -1);
-                  
-            newData = new ((char*)manager->base() + offset) 
-                            HbVectorData(mMemoryType, tempData->mSize, newSize);
-
-            mData = newData;
-            if(mShared != true)
-                tempData->mRef.deref();
+        HbSmartOffset offset(manager->alloc(sizeof(HbVectorData)), mMemoryType);
+        qDebug() << tempData->mSize << "," << oldSize;
+        newData = new ((char*)manager->base() + offset.get())
+                        HbVectorData(mMemoryType, oldSize, newSize);
+        mData = newData;
+        offset.release();
+        if(!mShared) {
+            tempData->mRef.deref();
+        }
 
-            if(QTypeInfo<value_type>::isComplex) {
-                pointer sourceStart = tempData->mStart;
-                pointer sourceEnd = tempData->mStart + tempData->mSize;
-                pointer destStart = mData->mStart;
-                while(sourceEnd != sourceStart) {
-                    new (destStart++) value_type(*sourceStart++);
-                }
-            } else {
-                ::memcpy(mData->mStart, tempData->mStart, oldSize * sizeof(T));
+        if(QTypeInfo<value_type>::isComplex) {
+            Inserter it(mData->mStart, mData->mStart + oldSize);
+            pointer sourceStart = tempData->mStart;
+            for(;it.canInsert(); ++sourceStart) {
+                it.insert(*sourceStart);
             }
-        }
-        catch(std::bad_alloc &badAlloc){
-            Q_UNUSED(badAlloc)
-            //if first alloc is successful but HbVectorData ctor threw an exception
-            if(offset != -1){
-                manager->free(offset);
-            }
-            //if first alloc as well as HbVectorData ctor succeeeded but allocation
-            // via new fails
-            /* if(newData){
-                delete newData;
-                newData = 0;
-            } */
-            qCritical("HbVector::copyData() failed!");
-            throw;
+            it.release();
+        } else {
+            ::memcpy(mData->mStart, tempData->mStart, oldSize * sizeof(T));
         }
     }
 
@@ -696,28 +637,26 @@
             return (char*)mData->mStart.get() - (char*)manager->base();
         } else {
             // this statement can throw
-            int offset = manager->realloc( oldOffset, newSize );
+            int offset = manager->realloc(oldOffset, newSize * sizeof(T));
             return offset;
         }
    }
 
-   void deAllocateData()
-   {
-       GET_MEMORY_MANAGER(mMemoryType);
-
-       mData->deAllocateAll(mMemoryType);
-
-       int dataOffset = (char*) mData.get() - (char*)manager->base();
-       manager->free(dataOffset);
-       mData = 0;
-   }
-
    void destroyData()
    {
        mData->~HbVectorData();
+       deAllocateData();
    }
 
 private : // Data
+   void deAllocateData()
+   {
+       GET_MEMORY_MANAGER(mMemoryType);
+       mData->deAllocateAll(mMemoryType);
+       int dataOffset = (char*) mData.get() - (char*)manager->base();
+       manager->free(dataOffset);
+       mData = 0;
+   }   
     struct HbVectorData
     {
         // The ctor of HbVectorData can throw owing to manager->alloc, we're not catching the exception
@@ -766,6 +705,34 @@
         QAtomicInt mRef;
     };
 
+    struct Inserter {
+        Inserter(pointer begin, pointer end) : begin(begin), it(begin), end(end) {
+
+        }
+        void release() {
+            it = begin;
+        }
+        bool canInsert() const {
+            return (it != end);
+        }
+        void insert(const T& obj) {
+            new (it) T(obj);
+            ++it;
+        }
+
+        ~Inserter() {
+            if(QTypeInfo<value_type>::isComplex) {
+                while(it != begin) {
+                    begin.get()->~T();
+                    ++begin;
+                }
+            }
+        }
+    private:
+        pointer begin;
+        pointer it;
+        pointer end;
+    };
     typedef smart_ptr<HbVectorData> DataPointer;
     DataPointer mData;
     HbMemoryManager::MemoryType mMemoryType;
@@ -779,97 +746,72 @@
 HbVector<T>::insert(const_iterator before, int count, const_reference value)
 {
     int offset = before - mData->mStart;
-    try{
-        if(count != 0) {
-            const_value_type copy(value);
-            if(mShared || mData->mRef !=1 || mData->mSize + count > mData->mCapacity) {
-                GET_MEMORY_MANAGER(mMemoryType);
-                int offset = (char*)mData->mStart.get() - (char*)manager->base();
-                int sizeRequired = 0;
-                int newOffset = -1;
-                if((mData->mSize + count) > mData->mCapacity) {
-                     sizeRequired = (mData->mSize + count) - mData->mCapacity; 
-                     newOffset = this->reAlloc(offset,(mData->mCapacity + sizeRequired)* sizeof(T),
-                                                    mData->mCapacity * sizeof(T));
-                } else {
-                     newOffset = this->reAlloc(offset,(mData->mCapacity)* sizeof(T),
-                                                    mData->mCapacity * sizeof(T));
-                }
-
-                mData->mStart.setOffset(newOffset);
-                mData->mCapacity += sizeRequired;
+    if(count != 0) {
+        if(mShared || mData->mRef !=1 || mData->mSize + count > mData->mCapacity) {
+            GET_MEMORY_MANAGER(mMemoryType);
+            int offset = (char*)mData->mStart.get() - (char*)manager->base();
+            int newCapacity = mData->mSize + count;
+            if(newCapacity < mData->mCapacity) {
+                newCapacity = mData->mCapacity;
             }
-            if(QTypeInfo<value_type>::isStatic) {
-                pointer b = mData->mStart + mData->mSize;
-                pointer i = b + count;
-                while(i != b)
-                    new(--i) T(mMemoryType);
-                i = mData->mStart + mData->mSize;
-                pointer j = i + count;
-                b = mData->mStart + offset;
-                while( i != b )
-                    *--j = *--i;
-                i = b + count;
-                while( i != b )
-                    *--i = copy;
-            } else {
-                pointer b = mData->mStart + offset;
-                pointer i = b + count;
-                ::memmove(i, b, (mData->mSize - offset) * sizeof(T));
-                while( i!= b)   
-                    new (--i) value_type(value);
+            mData->mStart.setOffset(reAlloc(offset, newCapacity, mData->mSize));
+            mData->mCapacity = newCapacity;
+        }
+        if(QTypeInfo<value_type>::isStatic) {
+            pointer b = mData->mStart + mData->mSize;
+            pointer i = b + count;
+            while(i != b)
+                new(--i) T(mMemoryType);
+            i = mData->mStart + mData->mSize;
+            pointer j = i + count;
+            b = mData->mStart + offset;
+            while( i != b )
+                *--j = *--i;
+            i = b + count;
+            while( i != b )
+                *--i = value;
+        } else {
+            pointer b = mData->mStart + offset;
+            pointer i = b + count;
+            ::memmove(i, b, (mData->mSize - offset) * sizeof(T));
+            Inserter it(b, i);
+            while(it.canInsert()) {
+                it.insert(value);
             }
-            
-            mData->mSize += count;
-        }
+            it.release();
         }
-    catch(std::bad_alloc &badAlloc){
-        Q_UNUSED(badAlloc)
-        //@TODO:: have to see additional cases for memory clean up
-        qCritical("HbVector::insert() failed!");
-        throw;
+
+        mData->mSize += count;
     }
     return iterator(mData->mStart + offset);
 }
 
-
-
-
 template <typename T>
 void HbVector<T>::append(const value_type &value)
 {
-   try{
     if(!mShared && mData->mRef == 1 && mData->mSize < mData->mCapacity ) {
-        //There is more memory, just construct a new object at the end
-        if(QTypeInfo<value_type>::isComplex) 
+        //There is enough space, construct a new object at the end.
+        if(QTypeInfo<value_type>::isComplex) {
             new ((void*)(mData->mStart + mData->mSize)) value_type(value);
-        else
+        } else {
             mData->mStart[mData->mSize] = value;
-
-            
+        }
     } else {
-        const_value_type copy(value);
-
         GET_MEMORY_MANAGER(mMemoryType);
         int offset = (char*)mData->mStart.get() - (char*)manager->base();
-        int newOffset = this->reAlloc(offset,(2 * mData->mCapacity) * sizeof(T), mData->mCapacity * sizeof(T));
+        int newOffset = reAlloc(offset, 2 * mData->mCapacity, mData->mSize);
         mData->mStart.setOffset(newOffset);
+        mData->mCapacity *= 2;
 
-         if(QTypeInfo<value_type>::isComplex) 
-             new ((void*)(mData->mStart + mData->mSize)) value_type(copy);
-         else 
-            mData->mStart[mData->mSize] = copy;
-        
-        mData->mCapacity *= 2;
-        
+        if(QTypeInfo<value_type>::isComplex) {
+            Inserter it(mData->mStart + mData->mSize, mData->mStart + mData->mSize + 1);
+            it.insert(value_type(value));
+            it.release();
+        } else {
+            mData->mStart[mData->mSize] = value;
+        }
     }
     ++mData->mSize;
-  }
-   catch(std::bad_alloc &badAlloc){
-       Q_UNUSED(badAlloc)
-       qCritical("HbVector::append() failed!");
-       throw;
-   }
 }
 
 template <typename T>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/cssparser/hbcssformatter_p.cpp
--- a/src/hbcore/cssparser/hbcssformatter_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/cssparser/hbcssformatter_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -40,7 +40,7 @@
        qDebug() << HbCssFormatter::weightedStyleRulesToString(rules);
 */
 
-
+static QString LAST_FILENAME_WRITTEN = "";
 
 /*!
  @internal
@@ -48,7 +48,7 @@
 QString HbCssFormatter::weightedStyleRulesToString(const HbVector<HbCss::WeightedRule> &rules)
 {
 	QString str;
-#ifdef BUILD_HB_INTERNAL
+#ifdef HB_DEVELOPER
 	foreach (const HbCss::WeightedRule &rule, rules) {
 		if (str.length() > 0) {
 			str.append("\n");
@@ -69,7 +69,7 @@
 QString HbCssFormatter::weightedDeclarationsToString(const HbVector<HbCss::WeightedDeclaration> &decls)
 {
     QString str;
-#ifdef BUILD_HB_INTERNAL
+#ifdef HB_DEVELOPER
     foreach (const HbCss::WeightedDeclaration &decl, decls) {
         if (str.length() > 0) {
             str.append("\n");
@@ -93,7 +93,7 @@
 QString HbCssFormatter::styleRulesToString(const HbVector<HbCss::StyleRule> &rules)
 {
     QString str;
-#ifdef BUILD_HB_INTERNAL
+#ifdef HB_DEVELOPER
     foreach (const HbCss::StyleRule &rule, rules) {
         if (str.length() > 0) {
             str.append("\n\n");
@@ -114,7 +114,7 @@
 QString HbCssFormatter::styleRulesToHtml(const HbVector<HbCss::StyleRule> &rules)
 {
     QString str;
-#ifdef BUILD_HB_INTERNAL
+#ifdef HB_DEVELOPER
     QMap<QString, QVector<QString> > usedProperties;
     QVector<const HbCss::Declaration*> usedDecls;
     for (int i=rules.count()-1; i>=0; i--) {
@@ -145,6 +145,7 @@
         }
     }
 
+    LAST_FILENAME_WRITTEN = "";
     foreach (const HbCss::StyleRule &rule, rules) {
         if (str.length() > 0) {
             str.append("<br/><br/>");
@@ -165,7 +166,7 @@
 QString HbCssFormatter::declarationsToString(const HbVector<HbCss::Declaration> &decls)
 {
     QString str;
-#ifdef BUILD_HB_INTERNAL
+#ifdef HB_DEVELOPER
     foreach (const HbCss::Declaration &decl, decls ) {
         str.append("\n    ");
         str.append(declarationToString(decl));
@@ -182,7 +183,7 @@
 QString HbCssFormatter::styleRuleToString(const HbCss::StyleRule &rule, int specificity)
 {
     QString str;
-#ifdef BUILD_HB_INTERNAL
+#ifdef HB_DEVELOPER
     str.append(selectorsToString(rule.selectors, specificity));
     str.append("\n{");
     str.append(declarationsToString(rule.declarations));
@@ -200,7 +201,19 @@
 QString HbCssFormatter::styleRuleToHtml(const HbCss::StyleRule &rule, QVector<const HbCss::Declaration*> usedDecls, int specificity)
 {
     QString str;
-#ifdef BUILD_HB_INTERNAL
+#ifdef HB_DEVELOPER
+#ifdef HB_CSS_INSPECTOR
+    if (rule.owningStyleSheet.get()) {
+        if (rule.owningStyleSheet->fileName != LAST_FILENAME_WRITTEN) {
+            str.append("<p class=\"filename\">");
+            str.append(rule.owningStyleSheet->fileName);
+            str.append("</p>");
+            LAST_FILENAME_WRITTEN = rule.owningStyleSheet->fileName;
+        }
+    } else {
+        str.append("<p class=\"filename\">[Unknown origin]</p>");
+    }
+#endif
     str.append("<p class=\"selectors\">");
     str.append(selectorsToString(rule.selectors, specificity, true));
     str.append("</p>{");
@@ -227,7 +240,7 @@
 QString HbCssFormatter::selectorsToString(const HbVector<HbCss::Selector> &selectors, int specificity, bool html)
 {
     QString str;
-#ifdef BUILD_HB_INTERNAL
+#ifdef HB_DEVELOPER
     foreach (const HbCss::Selector &sel, selectors) {
         if (str.length() > 0) {
             str.append(',');
@@ -255,7 +268,7 @@
 QString HbCssFormatter::declarationToString(const HbCss::Declaration &decl, bool html)
 {
     QString str;
-#ifdef BUILD_HB_INTERNAL
+#ifdef HB_DEVELOPER
     if(html) str.append("<span class=\"property\">");
     str.append(decl.property);
     if(html) str.append("</span>");
@@ -300,7 +313,7 @@
 QString HbCssFormatter::selectorToString(const HbCss::Selector &sel, bool html)
 {
     QString str;
-#ifdef BUILD_HB_INTERNAL
+#ifdef HB_DEVELOPER
     foreach (const HbCss::BasicSelector &basi, sel.basicSelectors ) {
         if (basi.elementName.length() > 0) {
             str.append( basi.elementName );
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/cssparser/hbcssparser.pri
--- a/src/hbcore/cssparser/hbcssparser.pri	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/cssparser/hbcssparser.pri	Mon May 03 12:48:33 2010 +0300
@@ -29,11 +29,11 @@
 
 PUBLIC_HEADERS += $$PWD/hbstyleloader.h
 
-INTERNAL_HEADERS += $$PWD/hbcssparser_p.h
-INTERNAL_HEADERS += $$PWD/hblayeredstyleloader_p.h
-INTERNAL_HEADERS += $$PWD/hbstyleselector_p.h
-INTERNAL_HEADERS += $$PWD/hbwidgetstyleloader_p.h
-INTERNAL_HEADERS += $$PWD/hbcssformatter_p.h
+PRIVATE_HEADERS += $$PWD/hbcssparser_p.h
+PRIVATE_HEADERS += $$PWD/hblayeredstyleloader_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleselector_p.h
+PRIVATE_HEADERS += $$PWD/hbwidgetstyleloader_p.h
+PRIVATE_HEADERS += $$PWD/hbcssformatter_p.h
 
 SOURCES += $$PWD/hbcssparser_p.cpp
 SOURCES += $$PWD/hbcssscanner_p.cpp
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/cssparser/hbcssparser_p.cpp
--- a/src/hbcore/cssparser/hbcssparser_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/cssparser/hbcssparser_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -160,6 +160,7 @@
     { "indent", HbIndent },
     { "large-icon-size", HbLargeIconSize },
     { "layout", HbLayout },
+    { "layout-direction", HbLayoutDirection },
     { "left", Left },
     { "list-style", ListStyle },
     { "list-style-type", ListStyleType },
@@ -173,7 +174,7 @@
     { "max-width", MaximumWidth },
     { "min-height", MinimumHeight },
     { "min-width", MinimumWidth },
-    { "mirroring", Mirroring },
+    { "mirroring", Mirroring }, // deprecated
     { "outline", Outline },
     { "outline-bottom-left-radius", OutlineBottomLeftRadius },
     { "outline-bottom-right-radius", OutlineBottomRightRadius },
@@ -260,6 +261,7 @@
     { "keep-expand", Value_KeepExpand },
     { "large", Value_Large },
     { "left", Value_Left },
+    { "left-to-right", Value_LeftToRight },
     { "light", Value_Light },
     { "line-through", Value_LineThrough },
     { "link", Value_Link },
@@ -273,7 +275,7 @@
     { "midlight", Value_Midlight },
     { "minimum", Value_Minimum },
     { "minimum-expanding", Value_MinimumExpanding },
-    { "mirrored", Value_Mirrored },
+    { "mirrored", Value_Mirrored },  // deprecated
     { "native", Value_Native },
     { "no-wrap", Value_NoWrap },
     { "none", Value_None },
@@ -283,12 +285,14 @@
     { "on", Value_On },
     { "outset", Value_Outset },
     { "overline", Value_Overline },
+    { "parent", Value_Parent },
     { "pre", Value_Pre },
     { "preferred", Value_Preferred },
     { "primary", Value_Primary },
     { "primary-small", Value_PrimarySmall },
     { "ridge", Value_Ridge },
     { "right", Value_Right },
+    { "right-to-left", Value_RightToLeft },
     { "secondary", Value_Secondary },
     { "selected", Value_Selected },
     { "shadow", Value_Shadow },
@@ -340,6 +344,7 @@
     { "landscape", PseudoClass_Landscape },
     { "last", PseudoClass_Last },
     { "left", PseudoClass_Left },
+    { "left-to-right", PseudoClass_LeftToRight },
     { "maximized", PseudoClass_Maximized },
     { "middle", PseudoClass_Middle },
     { "minimized", PseudoClass_Minimized },
@@ -356,6 +361,7 @@
     { "previous-selected", PseudoClass_PreviousSelected },
     { "read-only", PseudoClass_ReadOnly },
     { "right", PseudoClass_Right },
+    { "right-to-left", PseudoClass_RightToLeft },
     { "selected", PseudoClass_Selected },
     { "top", PseudoClass_Top },
     { "unchecked" , PseudoClass_Unchecked },
@@ -426,10 +432,9 @@
 : declarations(decls), adjustment(0), fontExtracted(false), pal(pal), currentProfile(profile)
 {
 }
-
-ValueExtractor::ValueExtractor(const HbVector<Declaration> &decls, const HbVector<Declaration> &varDeclarations,
+ValueExtractor::ValueExtractor(const HbVector<Declaration> &decls, const QHash<QString, HbCss::Declaration> &varDeclarations,
                                const HbDeviceProfile &profile, const QPalette &pal)
-: declarations(decls), variableDeclarations(varDeclarations), adjustment(0), 
+: declarations(decls), variableDeclarationsHash(varDeclarations), adjustment(0), 
   fontExtracted(false), pal(pal), currentProfile(profile)
 {
 }
@@ -439,8 +444,19 @@
 {
     Q_UNUSED(isVariable)
     // Initialize to some profile.
-    if ( currentProfile.isNull() )
+    if ( currentProfile.isNull() ) {
         currentProfile = HbDeviceProfile::current();
+    }
+}
+
+ValueExtractor::ValueExtractor(const QHash<QString, HbCss::Declaration> &varDecls, bool isVariable, const HbDeviceProfile &profile)
+: variableDeclarationsHash(varDecls), adjustment(0), fontExtracted(false), currentProfile(profile)
+{
+    Q_UNUSED(isVariable)
+    // Initialize to some profile.
+    if ( currentProfile.isNull() ) {
+        currentProfile = HbDeviceProfile::current();
+    }
 }
 
 int ValueExtractor::lengthValue(const Value& v)
@@ -657,19 +673,25 @@
     return hit;
 }
 
-static bool parseMirroringValue(const Value v)
+static HbCss::LayoutDirection parseLayoutDirectionValue(const Value v)
 {
+    HbCss::LayoutDirection retVal(HbCss::LayoutDirection_Parent); // Parent as default
     if(v.type == Value::KnownIdentifier) {
         switch(v.variant.toInt()) {
-        case Value_Mirrored:
-            return true;
-        case Value_Disabled:
-            return false;
+        case Value_RightToLeft:
+            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;
         }
     }
-    return true; // Enabled as default
+    return retVal;
 }
 
 bool ValueExtractor::extractPosition(PositionValues &posValues)
@@ -690,7 +712,11 @@
         case QtPosition: posValues.mPosition = decl.alignmentValue(); flags|=ExtractedAlign; break;
         case TextAlignment: posValues.mTextAlignment = decl.alignmentValue(); flags|=ExtractedTextAlign; break;
         case Position: posValues.mPositionMode = decl.positionValue(); flags|=ExtractedMode; break;
-        case Mirroring: posValues.mMirroring = parseMirroringValue(decl.values.at(0)); flags|=ExtractedMirroring; break;
+        case HbLayoutDirection:
+        case Mirroring: 
+            posValues.mLayoutDirection = parseLayoutDirectionValue(decl.values.at(0)); 
+            flags|=ExtractedLayoutDirection;
+            break;
         case ZValue: posValues.mZ = asReal(decl); flags|=ExtractedZValue; break;
         case HbTextWrapMode: posValues.mTextWrapMode = decl.wrapModeValue(); flags|=ExtractedWrapMode; break;
         default: continue;
@@ -1366,15 +1392,25 @@
         }
     }
 }
+
+
 bool ValueExtractor::extractValue(const QString& variableName, HbVector<HbCss::Value>& values) const
 {
     bool variableFound = false;
-    for (int i=variableDeclarations.count()-1; i>=0;i--) {
-        if (variableDeclarations[i].property == variableName ) {
-            values = variableDeclarations[i].values;
+    if ( !variableDeclarationsHash.isEmpty() ) {
+        values = variableDeclarationsHash.value(variableName).values;
+        if ( !values.isEmpty() ) {
             variableFound = true;
-            break;
         }
+    } else {
+        const int variableCount = variableDeclarations.count();
+        for (int i=variableCount-1; i>=0; i--) {
+            if (variableDeclarations.at(i).property == variableName ) {
+                values = variableDeclarations.at(i).values;
+                variableFound = true;
+                break;
+            }
+        }    
     }
     return variableFound;
 }
@@ -1382,7 +1418,7 @@
 bool ValueExtractor::extractValue(const QString& variableName, qreal& value)
 {
     bool variableFound = false;
-    HbVector<Value> values;
+    HbVector<HbCss::Value> values;
     if (extractValue(variableName, values)) {
         value = asReal(values.first());
         variableFound = true;
@@ -1392,15 +1428,9 @@
 
 bool ValueExtractor::extractValue( const QString& variableName, HbCss::Value &val ) const
 {
-    bool variableFound = false;
     HbVector<HbCss::Value> values;
-    for ( int i=variableDeclarations.count()-1; i>=0;i-- ) {
-        if ( variableDeclarations[i].property == variableName ) {
-            values = variableDeclarations[i].values;
-            variableFound = true;
-            break;
-        }
-    }
+    bool variableFound = extractValue( variableName, values );
+
     //for variable cascading support
     if ( variableFound ) {
         val = values.first();
@@ -2314,6 +2344,9 @@
                     + (origin == StyleSheetOrigin_Inline)*0x10000*depth;
                 wRule.second.selectors.append(selector);
                 wRule.second.declarations = rule.declarations;
+#ifdef HB_CSS_INSPECTOR
+                wRule.second.owningStyleSheet = rule.owningStyleSheet;
+#endif
                 weightedRules->append(wRule);
             }
         }
@@ -2484,23 +2517,21 @@
     return decls;
 }
 
-
-
-HbVector<Declaration> StyleSelector::variableRuleSets() const
+void StyleSelector::variableRuleSets(QHash<QString, HbCss::Declaration> *variables) const 
 {
- HbVector<Declaration> decls;
-    if ( styleSheets.count() != 0) {
-        for (int i=0;i<styleSheets.count();i++) {
-            const StyleSheet *styleSheet = styleSheets.at(i);
-            //check if any variable rule exists or not
-            if (styleSheet->variableRules.count() != 0) {
-                for (int j=0;j<styleSheet->variableRules.count();j++) {
-                    decls +=styleSheet->variableRules[j].declarations;
-                }
+    HbVector<Declaration> decls;
+    const int styleSheetsCount = styleSheets.count();
+    for (int i=0; i<styleSheetsCount; i++) {
+        const StyleSheet *styleSheet = styleSheets.at(i);
+        const int variableRuleCount = styleSheet->variableRules.count();
+        for (int j=0; j<variableRuleCount; j++) {
+            decls = styleSheet->variableRules.at(j).declarations;
+            const int declsCount = decls.count();
+            for (int k=0; k<declsCount; k++) {
+                variables->insert(decls.at(k).property, decls.at(k));
             }
         }
     }
-    return decls;
 }
 
 void StyleSelector::addStyleSheet( StyleSheet* styleSheet )
@@ -2638,6 +2669,7 @@
         QFile file(css);
         if (file.open(QFile::ReadOnly)) {
             sourcePath = QFileInfo(styleSheet).absolutePath() + QLatin1String("/");
+            sourceFile = css;
             QTextStream stream(&file);
             styleSheet = stream.readAll();
         } else {
@@ -2646,6 +2678,7 @@
         }
     } else {
         sourcePath.clear();
+        sourceFile.clear();
     }
 
     hasEscapeSequences = false;
@@ -2660,6 +2693,9 @@
 bool Parser::parse(StyleSheet *styleSheet)
 {
     errorCode = Parser::UnknownError;
+#ifdef HB_CSS_INSPECTOR
+    styleSheet->fileName = sourceFile;
+#endif
     try {
         if (testTokenAndEndsWith(ATKEYWORD_SYM, QLatin1String("charset"))) {
             if (!next(STRING)) return false;
@@ -2701,6 +2737,9 @@
 #ifdef CSS_PARSER_TRACES
                 rule.print();
 #endif
+#ifdef HB_CSS_INSPECTOR
+                rule.owningStyleSheet = styleSheet;
+#endif
                 if(rule.selectors.count() > 1){
                     foreach(const HbCss::Selector &selector, rule.selectors){
                         QString stackName = selector.basicSelectors.last().elementName;
@@ -2710,6 +2749,9 @@
                         StyleRule newRule(rule.memoryType);
                         newRule.declarations = rule.declarations;
                         newRule.selectors.append(selector);
+#ifdef HB_CSS_INSPECTOR
+                        newRule.owningStyleSheet = styleSheet;
+#endif
                         addRuleToWidgetStack(styleSheet, stackName, newRule);
                     }
                 } else {
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/cssparser/hbcssparser_p.h
--- a/src/hbcore/cssparser/hbcssparser_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/cssparser/hbcssparser_p.h	Mon May 03 12:48:33 2010 +0300
@@ -35,6 +35,7 @@
 #include <QPalette>
 #include <QIcon>
 #include <QSizePolicy>
+#include <QHash>
 
 #include <hbglobal.h>
 #include <hbnamespace.h>
@@ -182,7 +183,8 @@
     HbTextLineCountMax,
     HbTextHeight,
     HbTextWrapMode,
-    Mirroring,
+    Mirroring, // deprecated
+    HbLayoutDirection,
     ZValue,
     NumProperties
 };
@@ -281,7 +283,10 @@
     Value_MinimumExpanding,
     Value_Ignored,
     
-    Value_Mirrored,
+    Value_Mirrored, // deprecated
+    Value_LeftToRight,
+    Value_RightToLeft,
+    Value_Parent,
 
     Value_NoWrap,
     Value_WordWrap,
@@ -357,6 +362,13 @@
     NumKnownPositionModes
 };
 
+enum LayoutDirection {
+    LayoutDirection_LeftToRight,
+    LayoutDirection_RightToLeft,
+    LayoutDirection_Parent,
+    NumKnownLayoutDirections
+};
+
 enum Attachment {
     Attachment_Unknown,
     Attachment_Fixed,
@@ -586,9 +598,11 @@
 const quint64 PseudoClass_Alternate        = Q_UINT64_C(0x0000100000000000);
 const quint64 PseudoClass_Landscape        = Q_UINT64_C(0x0000200000000000);
 const quint64 PseudoClass_Portrait         = Q_UINT64_C(0x0000400000000000);
+const quint64 PseudoClass_LeftToRight      = Q_UINT64_C(0x0000800000000000);
+const quint64 PseudoClass_RightToLeft      = Q_UINT64_C(0x0001000000000000);
 // The Any specifier is never generated, but can be used as a wildcard in searches.
-const quint64 PseudoClass_Any              = Q_UINT64_C(0x0000800000000000);
-const int NumPseudos = 48;
+const quint64 PseudoClass_Any              = Q_UINT64_C(0x0002000000000000);
+const int NumPseudos = 50;
 
 struct HB_CORE_PRIVATE_EXPORT Pseudo
 {
@@ -755,7 +769,7 @@
     ExtractedTextAlign = 0x0080,
     ExtractedCenterH = 0x0100,
     ExtractedCenterV = 0x0200,
-    ExtractedMirroring = 0x0400,
+    ExtractedLayoutDirection = 0x0400,
     ExtractedZValue = 0x0800,
     ExtractedWrapMode = 0x1000
 };
@@ -793,7 +807,7 @@
     HbCss::Origin mOrigin;
     HbCss::PositionMode mPositionMode;
     Qt::Alignment mTextAlignment;
-    bool mMirroring;    
+    HbCss::LayoutDirection mLayoutDirection;    
     Hb::TextWrapping mTextWrapMode;
     PositionValueFlags mFlags;
 };
@@ -815,9 +829,10 @@
 struct HB_CORE_PRIVATE_EXPORT ValueExtractor
 {
     ValueExtractor(const HbVector<Declaration> &declarations, const HbDeviceProfile &profile, const QPalette & = QPalette());
-    ValueExtractor(const HbVector<Declaration> &declarations, const HbVector<Declaration> &varDeclarations,
+    ValueExtractor(const HbVector<Declaration> &declarations, const QHash<QString, HbCss::Declaration> &varDeclarations,
                    const HbDeviceProfile &profile, const QPalette & = QPalette());
     ValueExtractor(const HbVector<Declaration> &varDeclarations, bool isVariable, const HbDeviceProfile &profile = HbDeviceProfile());
+    ValueExtractor(const QHash<QString, HbCss::Declaration> &varDecls, bool isVariable, const HbDeviceProfile &profile = HbDeviceProfile());
 
     bool extractFont(QFont *font, HbFontSpec *fontSpec, int *fontSizeAdjustment);
     bool extractValue(const QString& variableName, HbVector<HbCss::Value>& values) const;
@@ -879,6 +894,7 @@
 
     HbVector<Declaration> declarations;
     HbVector<Declaration> variableDeclarations; //for variables
+    QHash<QString, HbCss::Declaration> variableDeclarationsHash;
     QFont f;
     HbFontSpec fSpec;
     int adjustment;
@@ -888,12 +904,17 @@
     QList<ExpressionValue> expressionValues; // for parsed expression string
 };
 
+struct StyleSheet;
+
 struct HB_CORE_PRIVATE_EXPORT StyleRule
 {
     StyleRule(HbMemoryManager::MemoryType type = HbMemoryManager::HeapMemory)
         : memoryType(type),
           selectors(type),
           declarations(type)
+#ifdef HB_CSS_INSPECTOR
+          , owningStyleSheet(0, type)
+#endif
     {}
 
 #ifdef CSS_PARSER_TRACES
@@ -914,6 +935,9 @@
     HbMemoryManager::MemoryType memoryType;
     HbVector<Selector> selectors;
     HbVector<Declaration> declarations;
+#ifdef HB_CSS_INSPECTOR
+    smart_ptr<StyleSheet> owningStyleSheet;
+#endif
 };
 
 typedef QPair<int, StyleRule> WeightedRule;
@@ -1072,6 +1096,9 @@
         importRules(type),
         origin(StyleSheetOrigin_Unspecified),
         depth(0)
+#ifdef HB_CSS_INSPECTOR
+        , fileName(type)
+#endif
     { }
 
 StyleSheet(const StyleSheet &other, HbMemoryManager::MemoryType type) 
@@ -1083,12 +1110,18 @@
         importRules(type),
         origin(other.origin),
         depth(other.depth)
+#ifdef HB_CSS_INSPECTOR
+        , fileName(type)
+#endif
     {
         variableRules = other.variableRules;
         widgetRules = other.widgetRules;
         mediaRules = other.mediaRules;
         pageRules = other.pageRules;
         importRules = other.importRules;
+#ifdef HB_CSS_INSPECTOR
+        fileName = other.fileName;
+#endif
     }
 
 #ifdef CSS_PARSER_TRACES
@@ -1141,6 +1174,9 @@
 
     StyleSheetOrigin origin;
     int depth; // applicable only for inline style sheets
+#ifdef HB_CSS_INSPECTOR
+    HbString fileName;
+#endif
 };
 
 class HB_AUTOTEST_EXPORT StyleSelector
@@ -1160,7 +1196,7 @@
     QVector<WeightedDeclaration> weightedDeclarationsForNode(NodePtr node, const Qt::Orientation orientation, const char *extraPseudo = 0) const;
     HbVector<StyleRule> styleRulesForNode(NodePtr node, const Qt::Orientation orientation) const;
     HbVector<Declaration> declarationsForNode(NodePtr node, const Qt::Orientation orientation, const char *extraPseudo = 0) const;
-    HbVector<Declaration> variableRuleSets() const;
+    void variableRuleSets(QHash<QString, HbCss::Declaration> *variables) const;
 
     virtual int nodeNameEquals(NodePtr node, const HbString& nodeName) const = 0;
     virtual bool attributeMatches(NodePtr node, const AttributeSelector &attr) const = 0;
@@ -1346,7 +1382,7 @@
 	Error errorCode;
     bool hasEscapeSequences;
     QString sourcePath;
-
+    QString sourceFile;
 };
 
 } // namespace HbCss
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/cssparser/hblayeredstyleloader_p.cpp
--- a/src/hbcore/cssparser/hblayeredstyleloader_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/cssparser/hblayeredstyleloader_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -140,9 +140,7 @@
             QTime time;
             time.start();
 #endif
-#ifndef HB_TOOL_INTERFACE
             styleSheet = HbThemeClient::global()->getSharedStyleSheet(fileName,priority);
-#endif
 #ifdef LAYEREDSTYLELOADER_DEBUG
             qDebug() << "Time elapsed in getting the shared stylesheet "<< fileName << " is : %d ms" <<time.elapsed();
 #endif
@@ -514,13 +512,10 @@
 
 
 /*!
-     Provides the variable rule sets for the loaded CSS files
-
-     \return variable rules
+     Provides the variable rule sets for the loaded CSS files.
 */
-HbVector<HbCss::Declaration> HbLayeredStyleLoader::variableRuleSets() const
+void HbLayeredStyleLoader::variableRuleSets(QHash<QString, HbCss::Declaration> *variables) const
 {
-    HbVector<HbCss::Declaration> vars;
     HbLayeredStyleLoader *allStack = getStack(Concern_All);
     
     QVectorIterator<LayerPriority> iter(LayerList());
@@ -530,30 +525,24 @@
         if (it != mStyleLayers.constEnd()) {
             if (priority != HbLayeredStyleLoader::Priority_Core) {
                 if (it != mStyleLayers.constEnd()) {
-                    vars += it->styleSelector.variableRuleSets();
+                    it->styleSelector.variableRuleSets(variables);
                 }
             } else {
-                //these variables are from Core Priority
-                //insert it into map to be used during look up, this happens only once
-                //next time onwards instead of comparing each value from list, it's looked from this map only
-                if (!defaultVariablesMap.count()) {
-                    HbVector<HbCss::Declaration> sets = it->styleSelector.variableRuleSets();
-                    for(int i=0; i<sets.count();i++) {
-                        defaultVariablesMap.insert(sets.at(i).property,
-                                                   sets.at(i).values.first());
-                    }
-                } 
-               }
+                // These variables are from Core Priority
+                // insert it into hash to be used during look up, this happens only once
+                // next time onwards instead of comparing each value from list, it's looked from this hash only.
+                if (!mDefaultVariables.count()) {
+                    it->styleSelector.variableRuleSets(&mDefaultVariables);
+                }
+            }
         }
         if (allStack) {
             QMap<LayerPriority, Layer>::const_iterator allIt = allStack->mStyleLayers.constFind(priority);
             if (allIt != allStack->mStyleLayers.constEnd()) {
-                vars += allIt->styleSelector.variableRuleSets();
+                allIt->styleSelector.variableRuleSets(variables);
             }
         }
     }
-
-    return vars;
 }
 
 /*!
@@ -564,8 +553,8 @@
 bool HbLayeredStyleLoader::findInDefaultVariables(const QString& variableName, HbCss::Value &val) const
 {
     bool found = false;
-    if (defaultVariablesMap.contains(variableName)) {
-        val = defaultVariablesMap.value(variableName);
+    if (mDefaultVariables.contains(variableName)) {
+        val = mDefaultVariables.value(variableName).values.first();
         found = true;
     }
     return found;
@@ -668,9 +657,12 @@
 */
 bool HbLayeredStyleLoader::loadBinary(const QString& fileName, HbCss::StyleSheet *sheet)
 {
-
     QTime timer;
     timer.start();
+#ifdef HB_CSS_INSPECTOR
+    sheet->fileName = fileName;
+    mCurrentSheet = sheet;
+#endif
     QFile file(fileName);
     if (file.open (QFile::ReadOnly)) {
 
@@ -818,7 +810,9 @@
         //populating the declarations
         HbVector<HbCss::Declaration> declarations = loadDeclarations(stream);
         style_rule.declarations= declarations;
-
+#ifdef HB_CSS_INSPECTOR
+        style_rule.owningStyleSheet = mCurrentSheet;
+#endif
         rules.append(style_rule);
     }// style rule loop end
 }
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/cssparser/hblayeredstyleloader_p.h
--- a/src/hbcore/cssparser/hblayeredstyleloader_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/cssparser/hblayeredstyleloader_p.h	Mon May 03 12:48:33 2010 +0300
@@ -83,7 +83,7 @@
             const Qt::Orientation orientation, const char *extraPseudo = 0) const;
     HbVector<HbCss::StyleRule> styleRulesForNode(HbStyleSelector::NodePtr node,
 			const Qt::Orientation orientation) const;
-    HbVector<HbCss::Declaration> variableRuleSets() const;
+    void variableRuleSets(QHash<QString, HbCss::Declaration> *variables) const;
     
 private:
     QVector<LayerPriority> LayerList() const;
@@ -99,7 +99,10 @@
 private:
     PriorityLayerMap mStyleLayers;
     Concern mConcern;
-    mutable QMap<QString,HbCss::Value> defaultVariablesMap;
+    mutable QHash<QString, HbCss::Declaration> mDefaultVariables;
+#ifdef HB_CSS_INSPECTOR
+    HbCss::StyleSheet *mCurrentSheet;
+#endif
 };
 
 #endif // HBLAYEREDSTYLELOADER_P_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/cssparser/hbstyleloader.cpp
--- a/src/hbcore/cssparser/hbstyleloader.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/cssparser/hbstyleloader.cpp	Mon May 03 12:48:33 2010 +0300
@@ -28,7 +28,7 @@
 #include "hbwidgetstyleloader_p.h"
 
 /*!
-	@beta
+	@stable
     @hbcore
     \class HbStyleLoader
     \brief allows an application to override platform layout and stylesheet definitions
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/cssparser/hbwidgetstyleloader_p.cpp
--- a/src/hbcore/cssparser/hbwidgetstyleloader_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/cssparser/hbwidgetstyleloader_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -32,7 +32,7 @@
 #include "hbwidgetloader_p.h"
 #include "hblayeredstyleloader_p.h"
 #include "hbstyleloader.h"
-
+#include "hbcolortheme_p.h"
 #include "hbwidget.h"
 
 //#define WIDGETSTYLELOADER_DEBUG
@@ -240,6 +240,11 @@
     if (HbInstancePrivate::d_ptr()->mStyle) {
         HbInstancePrivate::d_ptr()->mStyle->d_func()->clearStyleSheetCaches();
     }
+    if ( concern == HbLayeredStyleLoader::Concern_Colors 
+         || concern == HbLayeredStyleLoader::Concern_All) {
+        HbColorTheme::instance()->flushVariableCache();
+    }
+
 #ifdef WIDGETSTYLELOADER_DEBUG
 	qDebug() << "WidgetStyleLoader now contains" << mFileSets.count() << "filters";
 #endif
@@ -303,6 +308,13 @@
                 if (HbInstancePrivate::d_ptr()->mStyle) {
                     HbInstancePrivate::d_ptr()->mStyle->d_func()->clearStyleSheetCaches();
                 }
+                if ( concern && (*concern == HbLayeredStyleLoader::Concern_Colors || 
+                                 *concern == HbLayeredStyleLoader::Concern_All)) {
+                    HbColorTheme *colorThemeInstance = HbColorTheme::instance();
+                    if (colorThemeInstance) {  // Check that the instance has not been destroyed.
+                        colorThemeInstance->flushVariableCache();
+                    }
+                }
             }
 #ifdef WIDGETSTYLELOADER_DEBUG
             else {
@@ -472,7 +484,6 @@
 			
             if ( attemptToLoad ) {
 			    static HbWidgetLoader loader;
-			    loader.setWidget(widget);
 #ifdef WIDGETSTYLELOADER_DEBUG
 			    qDebug() << "Attempting to load file " << filename;
 #endif
@@ -480,7 +491,7 @@
                     HbLayeredStyleLoader::sharingNeeded(mFileSets[c].priority)
                     ? HbMemoryManager::SharedMemory
                     : HbMemoryManager::HeapMemory;
-                if(loader.load(filename, layoutName, sectionName, type)) {
+                if(loader.load(widget, filename, layoutName, sectionName, type)) {
 				    loaded = true;
 				    break;
 			    }
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/decorators/decorators.pri
--- a/src/hbcore/decorators/decorators.pri	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/decorators/decorators.pri	Mon May 03 12:48:33 2010 +0300
@@ -27,38 +27,35 @@
 INCLUDEPATH += $$PWD
 DEPENDPATH += $$PWD
 
-INTERNAL_HEADERS += $$PWD/hbbatteryindicator_p.h
-INTERNAL_HEADERS += $$PWD/hbbatteryindicator_p_p.h
-INTERNAL_HEADERS += $$PWD/hbdecorator_p.h
-INTERNAL_HEADERS += $$PWD/hbdecorator_p_p.h
-INTERNAL_HEADERS += $$PWD/hbindicatorgroup_p.h
-INTERNAL_HEADERS += $$PWD/hbindicatorgroup_p_p.h
-INTERNAL_HEADERS += $$PWD/hbsignalindicator_p.h
-INTERNAL_HEADERS += $$PWD/hbsignalindicator_p_p.h
-INTERNAL_HEADERS += $$PWD/hbsleepmodelistener_p.h
-INTERNAL_HEADERS += $$PWD/hbsleepmodelistener_p_p.h
-INTERNAL_HEADERS += $$PWD/hbsoftkey_p.h
-INTERNAL_HEADERS += $$PWD/hbsoftkey_p_p.h
-INTERNAL_HEADERS += $$PWD/hbsoftkeygroup_p.h
-INTERNAL_HEADERS += $$PWD/hbstatusbar_p.h
-INTERNAL_HEADERS += $$PWD/hbstatusbar_p_p.h
-INTERNAL_HEADERS += $$PWD/hbtitlebar_p.h
-INTERNAL_HEADERS += $$PWD/hbtitlebar_p_p.h
-INTERNAL_HEADERS += $$PWD/hbtitlebarhandle_p.h
-INTERNAL_HEADERS += $$PWD/hbtitlepane_p.h
-INTERNAL_HEADERS += $$PWD/hbtitlepane_p_p.h
-INTERNAL_HEADERS += $$PWD/hbsysteminfo_p.h
-INTERNAL_HEADERS += $$PWD/hbnavigationbutton_p.h
-INTERNAL_HEADERS += $$PWD/hbnavigationbutton_p_p.h
-INTERNAL_HEADERS += $$PWD/hbindicatorbutton_p.h
-INTERNAL_HEADERS += $$PWD/hbindicatorbutton_p_p.h
-INTERNAL_HEADERS += $$PWD/hbindicatorleveliconitem_p.h
+PRIVATE_HEADERS += $$PWD/hbbatteryindicator_p.h
+PRIVATE_HEADERS += $$PWD/hbbatteryindicator_p_p.h
+PRIVATE_HEADERS += $$PWD/hbdecorator_p.h
+PRIVATE_HEADERS += $$PWD/hbdecorator_p_p.h
+PRIVATE_HEADERS += $$PWD/hbindicatorgroup_p.h
+PRIVATE_HEADERS += $$PWD/hbindicatorgroup_p_p.h
+PRIVATE_HEADERS += $$PWD/hbsignalindicator_p.h
+PRIVATE_HEADERS += $$PWD/hbsignalindicator_p_p.h
+PRIVATE_HEADERS += $$PWD/hbsoftkey_p.h
+PRIVATE_HEADERS += $$PWD/hbsoftkey_p_p.h
+PRIVATE_HEADERS += $$PWD/hbsoftkeygroup_p.h
+PRIVATE_HEADERS += $$PWD/hbstatusbar_p.h
+PRIVATE_HEADERS += $$PWD/hbstatusbar_p_p.h
+PRIVATE_HEADERS += $$PWD/hbtitlebar_p.h
+PRIVATE_HEADERS += $$PWD/hbtitlebar_p_p.h
+PRIVATE_HEADERS += $$PWD/hbtitlebarhandle_p.h
+PRIVATE_HEADERS += $$PWD/hbtitlepane_p.h
+PRIVATE_HEADERS += $$PWD/hbtitlepane_p_p.h
+PRIVATE_HEADERS += $$PWD/hbsysteminfo_p.h
+PRIVATE_HEADERS += $$PWD/hbnavigationbutton_p.h
+PRIVATE_HEADERS += $$PWD/hbnavigationbutton_p_p.h
+PRIVATE_HEADERS += $$PWD/hbindicatorbutton_p.h
+PRIVATE_HEADERS += $$PWD/hbindicatorbutton_p_p.h
+PRIVATE_HEADERS += $$PWD/hbindicatorleveliconitem_p.h
 
 SOURCES += $$PWD/hbbatteryindicator.cpp
 SOURCES += $$PWD/hbdecorator.cpp
 SOURCES += $$PWD/hbindicatorgroup.cpp
 SOURCES += $$PWD/hbsignalindicator.cpp
-SOURCES += $$PWD/hbsleepmodelistener.cpp
 SOURCES += $$PWD/hbsoftkey.cpp
 SOURCES += $$PWD/hbsoftkeygroup.cpp
 SOURCES += $$PWD/hbstatusbar.cpp
@@ -71,11 +68,11 @@
 SOURCES += $$PWD/hbindicatorleveliconitem.cpp
 
 symbian {
-INTERNAL_HEADERS += $$PWD/hbsysteminfo_sym_p_p.h
-INTERNAL_HEADERS += $$PWD/hbbatterymonitor_sym_p.h
-INTERNAL_HEADERS += $$PWD/hbnetworksignalmonitor_sym_p.h
-INTERNAL_HEADERS += $$PWD/hbindicatormonitor_sym_p.h
-INTERNAL_HEADERS += $$PWD/hbnetworkmodemonitor_sym_p.h
+PRIVATE_HEADERS += $$PWD/hbsysteminfo_sym_p_p.h
+PRIVATE_HEADERS += $$PWD/hbbatterymonitor_sym_p.h
+PRIVATE_HEADERS += $$PWD/hbnetworksignalmonitor_sym_p.h
+PRIVATE_HEADERS += $$PWD/hbindicatormonitor_sym_p.h
+PRIVATE_HEADERS += $$PWD/hbnetworkmodemonitor_sym_p.h
 SOURCES += $$PWD/hbsysteminfo_sym.cpp
 SOURCES += $$PWD/hbbatterymonitor_sym.cpp
 SOURCES += $$PWD/hbnetworksignalmonitor_sym.cpp
@@ -91,8 +88,8 @@
 }
 
 win32* {
-INTERNAL_HEADERS += $$PWD/hbsysteminfo_win_p_p.h
-INTERNAL_HEADERS += $$PWD/hbwmihelper_win_p.h
+PRIVATE_HEADERS += $$PWD/hbsysteminfo_win_p_p.h
+PRIVATE_HEADERS += $$PWD/hbwmihelper_win_p.h
 SOURCES += $$PWD/hbsysteminfo_win.cpp
 SOURCES += $$PWD/hbwmihelper_win.cpp
 
@@ -108,7 +105,7 @@
 }
 }
 
-linux-*|macx-* {
-INTERNAL_HEADERS += $$PWD/hbsysteminfo_linux_p_p.h
+unix:!symbian {
+PRIVATE_HEADERS += $$PWD/hbsysteminfo_linux_p_p.h
 SOURCES += $$PWD/hbsysteminfo_linux.cpp
 }
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/decorators/hbbatteryindicator.cpp
--- a/src/hbcore/decorators/hbbatteryindicator.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/decorators/hbbatteryindicator.cpp	Mon May 03 12:48:33 2010 +0300
@@ -56,12 +56,6 @@
     delete mSystemDeviceInfo;
 }
 
-void HbBatteryIndicatorPrivate::init()
-{
-    Q_Q(HbBatteryIndicator);
-    q->createPrimitives();
-}
-
 /*
     Handles signal for changing the power state.
 */
@@ -91,13 +85,7 @@
 HbBatteryIndicator::HbBatteryIndicator(QGraphicsItem *parent)
     : HbWidget(*new HbBatteryIndicatorPrivate, parent)
 {
-    Q_D(HbBatteryIndicator);
-
-    d->init();
-
-    connect(d->mSystemDeviceInfo, SIGNAL(batteryLevelChanged(int)), this, SLOT(setLevel(int)));
-    connect(d->mSystemDeviceInfo, SIGNAL(powerStateChanged(HbSystemDeviceInfo::PowerState)), this, 
-        SLOT(_q_setPowerState(HbSystemDeviceInfo::PowerState)));
+    createPrimitives();
 }
 
 /*
@@ -105,8 +93,19 @@
  */
 HbBatteryIndicator::~HbBatteryIndicator()
 {
+
 }
 
+/*
+    Delayed constructor.
+ */
+void HbBatteryIndicator::delayedConstruction()
+{
+    Q_D(HbBatteryIndicator);
+    connect(d->mSystemDeviceInfo, SIGNAL(batteryLevelChanged(int)), this, SLOT(setLevel(int)));
+    connect(d->mSystemDeviceInfo, SIGNAL(powerStateChanged(HbSystemDeviceInfo::PowerState)), this, 
+        SLOT(_q_setPowerState(HbSystemDeviceInfo::PowerState))); 
+}
 
 void HbBatteryIndicator::createPrimitives()
 {
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/decorators/hbbatteryindicator_p.h
--- a/src/hbcore/decorators/hbbatteryindicator_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/decorators/hbbatteryindicator_p.h	Mon May 03 12:48:33 2010 +0300
@@ -46,6 +46,8 @@
     explicit HbBatteryIndicator( QGraphicsItem *parent = 0 );
     virtual ~HbBatteryIndicator();
 
+    void delayedConstruction();
+
     inline int type() const { return Type; }
     int level() const;
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/decorators/hbbatteryindicator_p_p.h
--- a/src/hbcore/decorators/hbbatteryindicator_p_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/decorators/hbbatteryindicator_p_p.h	Mon May 03 12:48:33 2010 +0300
@@ -38,8 +38,6 @@
     HbBatteryIndicatorPrivate();
     virtual ~HbBatteryIndicatorPrivate();
 
-    void init();
-
     void _q_setPowerState(HbSystemDeviceInfo::PowerState powerState);
 
 private:
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/decorators/hbindicatorbutton.cpp
--- a/src/hbcore/decorators/hbindicatorbutton.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/decorators/hbindicatorbutton.cpp	Mon May 03 12:48:33 2010 +0300
@@ -47,18 +47,12 @@
 
 void HbIndicatorButtonPrivate::init()
 {
-    Q_Q(HbIndicatorButton);
     setBackgroundVisible(false);
-
-     // add default actions
-    defaultAction = new HbAction(HbIcon("qtg_mono_options_menu"), "IndicatorMenu", q);
-    notificationAction = new HbAction(HbIcon("qtg_mono_new_event"), "IndicatorMenu", q);
-    q->setAction(defaultAction);
 }
 
 void HbIndicatorButtonPrivate::showIndicatorMenu()
 {
-    HbDeviceDialog *deviceDialog = new HbDeviceDialog();
+    //HbDeviceDialog *deviceDialog = new HbDeviceDialog();
 
     QVariantMap parametersMap;
     QString noteType(noteIndicatorType);
@@ -74,9 +68,6 @@
     d->init(); 
 
     createPrimitives();
-
-    connect(this, SIGNAL(pressed()), this, SLOT(handlePress()));
-    connect(this, SIGNAL(released()), this, SLOT(handleRelease()));
 }
 
 HbIndicatorButton::~HbIndicatorButton()
@@ -84,6 +75,20 @@
 
 }
 
+void HbIndicatorButton::delayedConstruction()
+{
+    Q_D(HbIndicatorButton);
+    // add default actions
+    d->defaultAction = new HbAction(HbIcon("qtg_mono_options_menu"), "IndicatorMenu", this);
+    d->notificationAction = new HbAction(HbIcon("qtg_mono_new_event"), "IndicatorMenu", this);
+    setAction(d->defaultAction);
+
+    connect(this, SIGNAL(pressed()), this, SLOT(handlePress()));
+    connect(this, SIGNAL(released()), this, SLOT(handleRelease()));
+
+    d->deviceDialog = new HbDeviceDialog();
+}
+
 void HbIndicatorButton::showHandleIndication(bool show)
 {
     Q_D(HbIndicatorButton);
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/decorators/hbindicatorbutton_p.h
--- a/src/hbcore/decorators/hbindicatorbutton_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/decorators/hbindicatorbutton_p.h	Mon May 03 12:48:33 2010 +0300
@@ -40,6 +40,8 @@
     explicit HbIndicatorButton(QGraphicsItem *parent = 0);
     virtual ~HbIndicatorButton();
 
+    void delayedConstruction();
+
     enum { Type = HbPrivate::ItemType_IndicatorButton };
     int type() const { return Type; }
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/decorators/hbindicatorbutton_p_p.h
--- a/src/hbcore/decorators/hbindicatorbutton_p_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/decorators/hbindicatorbutton_p_p.h	Mon May 03 12:48:33 2010 +0300
@@ -45,6 +45,8 @@
     QGraphicsItem *handleIcon;
     HbAction *defaultAction;
     HbAction *notificationAction;
+
+    HbDeviceDialog *deviceDialog;
 };
 
 #endif // HBINDICATORBUTTON_P_P_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/decorators/hbindicatorgroup.cpp
--- a/src/hbcore/decorators/hbindicatorgroup.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/decorators/hbindicatorgroup.cpp	Mon May 03 12:48:33 2010 +0300
@@ -39,7 +39,7 @@
 
 HbIndicatorGroupPrivate::HbIndicatorGroupPrivate() :
     mIndicatorType(HbIndicatorGroup::NotificationType),
-    mIndicatorPrivate(0), mProgressAdded(false)
+    mIndicatorPrivate(0), mProgressAdded(false), mIndicatorAdded(false)
 {
 }
 
@@ -51,14 +51,9 @@
      mIndicators.clear();
 }
 
-void HbIndicatorGroupPrivate::init()
+void HbIndicatorGroupPrivate::delayedConstruction()
 {
     Q_Q(HbIndicatorGroup);
-    q->createPrimitives();
-
-    mIndicatorPrivate = new HbIndicatorPrivate;
-    mIndicatorPrivate->init();
-
     q->connect(mIndicatorPrivate, SIGNAL(activated(const QList<IndicatorClientInfo> &)),
         q, SLOT(activate(const QList<IndicatorClientInfo> &)));
     q->connect(mIndicatorPrivate, SIGNAL(updated(const QList<IndicatorClientInfo> &)),
@@ -68,9 +63,25 @@
     q->connect(mIndicatorPrivate, SIGNAL(deactivated(const QList<IndicatorClientInfo> &)),
         q, SLOT(deactivate(const QList<IndicatorClientInfo> &)));
 
+#ifdef HB_EFFECTS
+    HbEffect::add(
+        QStringList() << "indicator" << "indicator" << "indicator" << "indicator",
+        QStringList() << "indicator_appear" <<  "indicator_disappear" << "indicator_move_right" << "indicator_move_left",
+        QStringList() << "appear" << "disappear" <<  "move_right" << "move_left");
+#endif
+
     QTimer::singleShot(0, q, SLOT(startListen()));
 }
 
+void HbIndicatorGroupPrivate::init()
+{
+    Q_Q(HbIndicatorGroup);
+    q->createPrimitives();
+
+    mIndicatorPrivate = new HbIndicatorPrivate;
+    mIndicatorPrivate->init();
+}
+
 int HbIndicatorGroupPrivate::setIconName(HbStyleOptionIndicatorGroup &option, int index)
 {
     bool ok(mProgressAdded);
@@ -103,6 +114,7 @@
         const IndicatorClientInfo &indicator = clientInfo.at(i);
         if (canAddIndicator(indicator)) {
             mIndicators.prepend(indicator);
+            mIndicatorAdded = true;
         }
     }
     emitNotificationCount();
@@ -120,6 +132,7 @@
 
 void HbIndicatorGroupPrivate::removeIndicators(const QList<IndicatorClientInfo> &clientInfo)
 {
+    mRemovedIndicators.clear();
     for (int i = 0; i < clientInfo.size(); ++i) {
         removeIndicator(clientInfo.at(i));
     }
@@ -142,6 +155,11 @@
 {
     int index = findIndicator(indicator);
     if (index >= 0) {
+        if (mIndicators.at(index).category == HbIndicatorInterface::ProgressCategory) {
+            mRemovedIndicators.append("qtg_status_progress");
+        } else {
+            mRemovedIndicators.append(mIndicators.at(index).iconPath);
+        }
         mIndicators.removeAt(index);
     }
 }
@@ -150,6 +168,10 @@
 {
     bool canAdd(false);
 
+    if (indicator.iconPath.isEmpty()) {
+        return canAdd;
+    }
+
     if (indicator.category == HbIndicatorInterface::NotificationCategory 
         && mIndicatorType == HbIndicatorGroup::NotificationType) {
         canAdd = true;
@@ -171,6 +193,80 @@
     }
 }
 
+void HbIndicatorGroupPrivate::startAddingEffect()
+{
+#ifdef HB_EFFECTS
+    Q_Q(HbIndicatorGroup);
+    if (mIndicatorAdded) {
+        // get the original positions for the first time
+        if (mOriginalPos.count() == 0) {
+            for (int i = 0; i < mIcons.size(); ++i) {
+                mOriginalPos.append(mIcons[i]->pos());
+            }
+        }
+        // Move positions one to left
+        if (mIndicatorType == HbIndicatorGroup::NotificationType) {
+            for (int i = mIcons.size() - 1; i > 0; --i) {
+                mIcons[i]->setPos(mIcons[i - 1]->pos());
+             }
+        }
+
+        // Start the effects
+        HbEffect::start(mIcons[0], "indicator", "appear");
+        if (mIndicatorType == HbIndicatorGroup::NotificationType) {
+            HbEffect::start(mIcons[1], "indicator", "move_right");
+            HbEffect::start(mIcons[2], "indicator", "move_right");
+            HbEffect::start(mIcons[3], "indicator", "move_right", q, "moveEffectFinnished");
+        } else {
+            HbEffect::start(mIcons[1], "indicator", "move_left");
+            HbEffect::start(mIcons[2], "indicator", "move_left");
+            HbEffect::start(mIcons[3], "indicator", "move_left", q, "moveEffectFinnished");
+        }
+    }
+#endif
+}
+
+void HbIndicatorGroupPrivate::startRemovingEffect()
+{
+#ifdef HB_EFFECTS
+    Q_Q(HbIndicatorGroup);
+    for (int i = 0; i < mRemovedIndicators.size(); ++i) {   
+        int index = findIndicatorIcon(mRemovedIndicators[i]);
+        if (index >= 0) {
+            HbEffect::start(mIcons[index], "indicator", "disappear", q, "disappearEffectFinnished");
+            if (mIndicatorType == HbIndicatorGroup::NotificationType) {
+                 for (int i = mIcons.size() - 1; i > index; --i) {
+                    mIcons[i]->setPos(mIcons[i - 1]->pos());
+                 }
+                for (int i = index + 1; i < mIcons.size(); ++i) {
+                    HbEffect::start(mIcons[i], "indicator", "move_left");
+                }
+            } else {
+                for (int i = index + 1; i < mIcons.size(); ++i) {
+                    HbEffect::start(mIcons[i], "indicator", "move_right");
+                }
+            }
+        }
+    }
+#else 
+    updatePrimitives();
+#endif
+}
+
+int HbIndicatorGroupPrivate::findIndicatorIcon(const QString &iconPath) const
+{
+    int index = -1;
+
+    for (int i = 0; i < mIcons.size(); ++i) {
+        if (static_cast<HbIconItem*>(mIcons[i])->iconName() == iconPath) {
+            index = i;
+            break;
+        }
+    }
+
+    return index;
+}
+
 // ======== MEMBER FUNCTIONS ========
 
 /*
@@ -193,6 +289,15 @@
     
 }
 
+/*
+    Delayed constructor.
+ */
+void HbIndicatorGroup::delayedConstruction()
+{
+   Q_D(HbIndicatorGroup);
+   d->delayedConstruction();
+}
+
 void HbIndicatorGroup::createPrimitives()
 {
     Q_D(HbIndicatorGroup);
@@ -217,6 +322,10 @@
     style()->updatePrimitive(d->mIcons[2], HbStyle::P_IndicatorGroup_icon3, &option);
     index = d->setIconName(option, index);
     style()->updatePrimitive(d->mIcons[3], HbStyle::P_IndicatorGroup_icon4, &option);
+
+    if (d->mIndicatorAdded) {
+        d->startAddingEffect();
+    }
 }
 
 void HbIndicatorGroup::activate(const QList<IndicatorClientInfo> &clientInfo)
@@ -225,6 +334,7 @@
     d->addIndicators(clientInfo);
 
     updatePrimitives();
+    d->mIndicatorAdded = false;
 }
 
 void HbIndicatorGroup::update(const QList<IndicatorClientInfo> &clientInfo)
@@ -249,16 +359,53 @@
     Q_D(HbIndicatorGroup);
     d->removeIndicators(clientInfo);
 
-    updatePrimitives();
+    if (d->mRemovedIndicators.count() > 0) {
+        d->startRemovingEffect();
+    }
 }
 
 void HbIndicatorGroup::startListen()
 {
     Q_D(HbIndicatorGroup);
     d->mIndicatorPrivate->startListen();
+
+#ifdef HB_EFFECTS
+    HbEffect::add(
+        QStringList() << "indicator" << "indicator" << "indicator" << "indicator",
+        QStringList() << "indicator_appear" <<  "indicator_disappear" << "indicator_move_right" << "indicator_move_left",
+        QStringList() << "appear" << "disappear" <<  "move_right" << "move_left");
+#endif
 }
 
 void HbIndicatorGroup::initStyleOption(HbStyleOptionIndicatorGroup *option) const
 {
     HbWidget::initStyleOption(option);
 }
+
+void HbIndicatorGroup::moveEffectFinnished(const HbEffect::EffectStatus &status)
+{
+    Q_D(HbIndicatorGroup);
+    if (status.reason == Hb::EffectFinished || status.reason == Hb::EffectCancelled
+        || status.reason == Hb::EffectNotStarted) {
+        // Reset the positions and transformations
+        for (int i = 0; i < d->mIcons.size(); ++i) {
+            d->mIcons[i]->resetTransform();
+            d->mIcons[i]->setPos(d->mOriginalPos[i]);
+        }
+    }
+}
+
+void HbIndicatorGroup::disappearEffectFinnished(const HbEffect::EffectStatus &status)
+{
+    Q_D(HbIndicatorGroup);
+    if (status.reason == Hb::EffectFinished || status.reason == Hb::EffectCancelled
+        || status.reason == Hb::EffectNotStarted) {
+            // Reset the positions and transformations and opacity
+        for (int i = 0; i < d->mIcons.size(); ++i) {
+            d->mIcons[i]->resetTransform();
+            d->mIcons[i]->setOpacity(1.0);
+            d->mIcons[i]->setPos(d->mOriginalPos[i]);
+        }
+        updatePrimitives();
+    }
+}
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/decorators/hbindicatorgroup_p.h
--- a/src/hbcore/decorators/hbindicatorgroup_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/decorators/hbindicatorgroup_p.h	Mon May 03 12:48:33 2010 +0300
@@ -29,6 +29,9 @@
 #include "hbnamespace_p.h"
 
 #include <hbwidget.h>
+#ifdef HB_EFFECTS
+#include <hbeffect.h>
+#endif // HB_EFFECTS
 
 class HbIndicatorGroupPrivate;
 class HbStyleOptionIndicatorGroup;
@@ -51,6 +54,8 @@
     explicit HbIndicatorGroup(IndicatorType indicatorType, QGraphicsItem *parent = 0);
     virtual ~HbIndicatorGroup();
 
+    void delayedConstruction();
+
 public slots:
     virtual void createPrimitives();
     virtual void updatePrimitives();
@@ -68,6 +73,12 @@
 protected:
     virtual void initStyleOption(HbStyleOptionIndicatorGroup *option) const;
 
+private slots:
+#ifdef HB_EFFECTS
+    void moveEffectFinnished(const HbEffect::EffectStatus &status);
+    void disappearEffectFinnished(const HbEffect::EffectStatus &status);
+#endif // HB_EFFECTS
+
 private:  
     Q_DECLARE_PRIVATE_D(d_ptr, HbIndicatorGroup)
     Q_DISABLE_COPY(HbIndicatorGroup)
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/decorators/hbindicatorgroup_p_p.h
--- a/src/hbcore/decorators/hbindicatorgroup_p_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/decorators/hbindicatorgroup_p_p.h	Mon May 03 12:48:33 2010 +0300
@@ -39,6 +39,8 @@
     HbIndicatorGroupPrivate();
     virtual ~HbIndicatorGroupPrivate();
 
+    void delayedConstruction();
+
     void init();
     int setIconName(HbStyleOptionIndicatorGroup &option, int index);
 
@@ -52,12 +54,21 @@
     bool canAddIndicator(const IndicatorClientInfo &indicator) const;
 
     void emitNotificationCount();
+
+    void startAddingEffect();
+    void startRemovingEffect();
+
+    int findIndicatorIcon(const QString &iconPath) const;
+
 private:
     HbIndicatorGroup::IndicatorType mIndicatorType;
     QList<QGraphicsItem*> mIcons;   
     HbIndicatorPrivate *mIndicatorPrivate;
     QList<IndicatorClientInfo> mIndicators;
     bool mProgressAdded;
+    bool mIndicatorAdded;
+    QList<QPointF> mOriginalPos;
+    QStringList mRemovedIndicators;    
 };
 
 #endif // HBINDICATORGROUP_P_P_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/decorators/hbnavigationbutton.cpp
--- a/src/hbcore/decorators/hbnavigationbutton.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/decorators/hbnavigationbutton.cpp	Mon May 03 12:48:33 2010 +0300
@@ -55,9 +55,6 @@
     d->init(); 
 
     createPrimitives();
-
-    connect(this, SIGNAL(pressed()), this, SLOT(handlePress()));
-    connect(this, SIGNAL(released()), this, SLOT(handleRelease()));
 }
 
 HbNavigationButton::~HbNavigationButton()
@@ -65,6 +62,12 @@
 
 }
 
+void HbNavigationButton::delayedConstruction()
+{
+    connect(this, SIGNAL(pressed()), this, SLOT(handlePress()));
+    connect(this, SIGNAL(released()), this, SLOT(handleRelease()));
+}
+
 void HbNavigationButton::createPrimitives()
 {
     setBackgroundItem(HbStyle::P_NavigationButton_background); // calls updatePrimitives()
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/decorators/hbnavigationbutton_p.h
--- a/src/hbcore/decorators/hbnavigationbutton_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/decorators/hbnavigationbutton_p.h	Mon May 03 12:48:33 2010 +0300
@@ -40,6 +40,8 @@
     explicit HbNavigationButton(QGraphicsItem *parent = 0);
     virtual ~HbNavigationButton();
 
+    void delayedConstruction();
+
     enum { Type = HbPrivate::ItemType_NavigationButton };
     int type() const { return Type; }
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/decorators/hbsignalindicator.cpp
--- a/src/hbcore/decorators/hbsignalindicator.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/decorators/hbsignalindicator.cpp	Mon May 03 12:48:33 2010 +0300
@@ -57,12 +57,6 @@
     delete mSystemNetworkInfo;
 }
 
-void HbSignalIndicatorPrivate::init()
-{
-    Q_Q(HbSignalIndicator);
-    q->createPrimitives();
-}
-
 void HbSignalIndicatorPrivate::_q_setNetworkSignalStrength(HbSystemNetworkInfo::NetworkMode mode, int strength)
 {
     Q_Q(HbSignalIndicator);
@@ -88,14 +82,7 @@
 HbSignalIndicator::HbSignalIndicator(QGraphicsItem *parent)
     : HbWidget(*new HbSignalIndicatorPrivate, parent)
 {
-    Q_D(HbSignalIndicator);
-
-    d->init();
-
-    connect(d->mSystemNetworkInfo, SIGNAL(networkSignalStrengthChanged(HbSystemNetworkInfo::NetworkMode, int)), 
-        this, SLOT(_q_setNetworkSignalStrength(HbSystemNetworkInfo::NetworkMode, int)));
-    connect(d->mSystemNetworkInfo, SIGNAL(networkModeChanged(HbSystemNetworkInfo::NetworkMode)), 
-        this, SLOT(_q_setNetworkMode(HbSystemNetworkInfo::NetworkMode)));
+    createPrimitives();
 }
 
 /*
@@ -103,6 +90,17 @@
  */
 HbSignalIndicator::~HbSignalIndicator()
 {
+
+}
+
+void HbSignalIndicator::delayedConstruction()
+{
+    Q_D(HbSignalIndicator);
+    connect(d->mSystemNetworkInfo, SIGNAL(networkSignalStrengthChanged(HbSystemNetworkInfo::NetworkMode, int)), 
+        this, SLOT(_q_setNetworkSignalStrength(HbSystemNetworkInfo::NetworkMode, int)));
+    connect(d->mSystemNetworkInfo, SIGNAL(networkModeChanged(HbSystemNetworkInfo::NetworkMode)), 
+        this, SLOT(_q_setNetworkMode(HbSystemNetworkInfo::NetworkMode)));
+    updatePrimitives();
 }
 
 /*
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/decorators/hbsignalindicator_p.h
--- a/src/hbcore/decorators/hbsignalindicator_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/decorators/hbsignalindicator_p.h	Mon May 03 12:48:33 2010 +0300
@@ -44,6 +44,8 @@
     explicit HbSignalIndicator(QGraphicsItem *parent = 0);
     virtual ~HbSignalIndicator();
 
+    void delayedConstruction();
+
     inline int type() const { return Type; }
     void setLevel(int levelPercent);
     int level() const;
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/decorators/hbsignalindicator_p_p.h
--- a/src/hbcore/decorators/hbsignalindicator_p_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/decorators/hbsignalindicator_p_p.h	Mon May 03 12:48:33 2010 +0300
@@ -38,8 +38,6 @@
     HbSignalIndicatorPrivate();
     virtual ~HbSignalIndicatorPrivate();
 
-    void init();
-
     void _q_setNetworkSignalStrength(HbSystemNetworkInfo::NetworkMode mode, int strength);
     void _q_setNetworkMode(HbSystemNetworkInfo::NetworkMode mode);
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/decorators/hbsleepmodelistener.cpp
--- a/src/hbcore/decorators/hbsleepmodelistener.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,176 +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 <hbinstance.h>
-#include <hbevent.h>
-
-#include "hbsleepmodelistener_p.h"
-#include "hbsleepmodelistener_p_p.h"
-
-#if defined(Q_OS_SYMBIAN)
-
-#include <hwrmlight.h>
-#include <hwrmextendedlight.h>
-
-// app uid of sleepmode application
-const TUid KSleepModeProperty = {0x101F7A01};
-const TInt KSleepModeOn = 0x00002001;
-
-// Maximum number of possible lights targets
-const TInt KHWRMLightMaxTargets(31);
-
-// First target value in targets enumeration
-const TInt KHWRMLightFirstTarget(CHWRMExtendedLight::EPrimaryDisplay);
-
-CSleepModeListenerPrivate::~CSleepModeListenerPrivate()
-{
-    Cancel();
-    sleepModeState.Close();
-}
-
-CSleepModeListenerPrivate::CSleepModeListenerPrivate()
-                      :CActive( EPriorityNormal )
-{
-    User::LeaveIfError(sleepModeState.Attach(KSleepModeProperty, KSleepModeOn));
-    CActiveScheduler::Add(this);
-    // initial subscription
-    sleepModeState.Subscribe(iStatus);
-    SetActive();
-}
-
-void CSleepModeListenerPrivate::RunL()
-{
-    sleepModeState.Subscribe(iStatus);
-    SetActive();
-    CHWRMLight::TLightStatus status(CHWRMLight::ELightStatusUnknown);
-    RLightStatusArray currentStatus(KHWRMLightMaxTargets);
-    TInt err = InitializeStatusArray(currentStatus);
-    if (err == KErrNone) {
-        TInt arraySize = sizeof(THWRMStatusInfo) * KHWRMLightMaxTargets;
-        TPtr8 arrayPtr((TUint8*)&currentStatus[0], arraySize, arraySize);
-        err = sleepModeState.Get(arrayPtr);
-        if (err == KErrNone) {
-            TInt index = currentStatus.FindInOrder(KHWRMLightFirstTarget, FindByTarget);
-            if (index >= 0 && index < KHWRMLightMaxTargets) {
-                status = static_cast<CHWRMLight::TLightStatus>(currentStatus[index].iStatus);
-                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);
-                    }
-                }
-            }
-        }
-    }
-
-    // Clean up
-    currentStatus.Close();
-}
-
-void CSleepModeListenerPrivate::DoCancel()
-{
-    sleepModeState.Cancel();
-}
-
-TInt CSleepModeListenerPrivate::InitializeStatusArray(
-    RLightStatusArray& aArray) const
-{
-    TInt err = KErrNone;
-    TInt currentTarget(KHWRMLightFirstTarget);
-    for( TInt i = 0; i < KHWRMLightMaxTargets; ++i) {
-        THWRMStatusInfo info;
-        info.iTarget = currentTarget;
-        info.iStatus = CHWRMLight::ELightStatusUnknown;
-        err = aArray.Append(info);
-        if (err != KErrNone) {
-            break;
-        }
-
-        // shift the mask and target ready for next loop
-        currentTarget <<= 1;
-    }
-
-    return err;
-}
-
-TInt CSleepModeListenerPrivate::FindByTarget(const TInt* aTarget,
-    const THWRMStatusInfo& aItem)
-    {
-    if (*aTarget < aItem.iTarget) {
-        return -1;
-    } else if ( *aTarget > aItem.iTarget ) {
-        return 1;
-    }
-    return 0;
-    }
-
-#else
-
-HbSleepModeListenerPrivate::HbSleepModeListenerPrivate()
-{
-
-}
-
-HbSleepModeListenerPrivate::~HbSleepModeListenerPrivate()
-{
-
-}
-
-#endif
-
-/*!
-    Returns static instance
- */
-HbSleepModeListener* HbSleepModeListener::instance()
-{
-    static HbSleepModeListener theInstance;
-    return &theInstance;
-}
-
-/*!
-    Constructor
-*/
-HbSleepModeListener::HbSleepModeListener() : d(0)
-{
-#if defined(Q_OS_SYMBIAN)
-
-    d = new CSleepModeListenerPrivate();
-
-#else
-
-    d = new HbSleepModeListenerPrivate();
-
-#endif
-}
-
-/*!
-    Destructor
-*/
-HbSleepModeListener::~HbSleepModeListener()
-{
-    delete d;
-}
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/decorators/hbsleepmodelistener_p.h
--- a/src/hbcore/decorators/hbsleepmodelistener_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +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 HBSLEEPMODELISTENER_P_H
-#define HBSLEEPMODELISTENER_P_H
-
-#if defined(Q_OS_SYMBIAN)
-
-class CSleepModeListenerPrivate;
-
-#else
-
-class HbSleepModeListenerPrivate;
-
-#endif
-
-class HbSleepModeListener
-{
-public:
-    static HbSleepModeListener *instance();
-
-private:
-    HbSleepModeListener();
-    ~HbSleepModeListener();
-
-#if defined(Q_OS_SYMBIAN)
-
-    CSleepModeListenerPrivate *d;
-
-#else
-
-    HbSleepModeListenerPrivate *d;
-
-#endif
-};
-
-#endif // HBSLEEPMODELISTENER_P_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/decorators/hbsleepmodelistener_p_p.h
--- a/src/hbcore/decorators/hbsleepmodelistener_p_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +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 HBSLEEPMODELISTENER_P_P_H
-#define HBSLEEPMODELISTENER_P_P_H
-
-#include <hbapplication.h>
-
-#if defined(Q_OS_SYMBIAN)
-
-#include <e32base.h>
-#include <e32property.h>
-
-/**
-* Data structure used to handle light status information.
-*/
-struct THWRMStatusInfo
-    {
-    // Light target.
-    TInt iTarget;
-
-    // Status of the target.
-    TInt iStatus;
-    };
-
-/**
-* Defines THWRMStatusInfo array.
-*/
-typedef RArray<THWRMStatusInfo> RLightStatusArray;
-
-class CSleepModeListenerPrivate: public CActive
-{
-public:
-    CSleepModeListenerPrivate();
-    ~CSleepModeListenerPrivate();
-private:
-    void RunL();
-    void DoCancel();
-
-    TInt InitializeStatusArray(RLightStatusArray& aArray) const;
-
-    static TInt FindByTarget(const TInt* aTarget, const THWRMStatusInfo& aItem);
-private:
-    RProperty sleepModeState;
-};
-
-#else
-
-class HB_AUTOTEST_EXPORT HbSleepModeListenerPrivate
-{
-public:
-    HbSleepModeListenerPrivate();
-    ~HbSleepModeListenerPrivate();
-};
-
-#endif
-
-#endif // HBSLEEPMODELISTENER_P_P_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/decorators/hbstatusbar.cpp
--- a/src/hbcore/decorators/hbstatusbar.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/decorators/hbstatusbar.cpp	Mon May 03 12:48:33 2010 +0300
@@ -46,7 +46,7 @@
  */
 
 HbStatusBarPrivate::HbStatusBarPrivate() : 
-    mTimeText(0),
+    mTimeText(),
     mTimeTextItem(0),
     mSignalIndicator(0),
     mBatteryIndicator(0),
@@ -57,6 +57,23 @@
 {
 }
 
+void HbStatusBarPrivate::delayedConstruction()
+{
+    Q_Q(HbStatusBar);
+
+    mSignalIndicator->delayedConstruction();
+    mBatteryIndicator->delayedConstruction();
+    mNotificationIndicatorGroup->delayedConstruction();
+    mSettingsIndicatorGroup->delayedConstruction();
+
+    q->connect(mNotificationIndicatorGroup, SIGNAL(notificationCountChanged(int)), 
+        q, SIGNAL(notificationCountChanged(int)));
+    q->connect(mMainWindow, SIGNAL(currentViewChanged(HbView*)), q, SLOT(currentViewChanged(HbView*)));
+
+    mClockTimerId = q->startTimer(clockUpdateDelay);
+	updateTime();
+}
+
 void HbStatusBarPrivate::init()
 {
     Q_Q(HbStatusBar);
@@ -70,21 +87,14 @@
 
     mNotificationIndicatorGroup = new HbIndicatorGroup(HbIndicatorGroup::NotificationType, q);
     q->style()->setItemName(mNotificationIndicatorGroup, "notificationindicators");
-    q->connect(mNotificationIndicatorGroup, SIGNAL(notificationCountChanged(int)), 
-        q, SIGNAL(notificationCountChanged(int)));
 
     mSettingsIndicatorGroup = new HbIndicatorGroup(HbIndicatorGroup::SettingsType, q);
     q->style()->setItemName(mSettingsIndicatorGroup, "settingsindicators");
-
-	mClockTimerId = q->startTimer(clockUpdateDelay);
-
-    q->connect(mMainWindow, SIGNAL(currentViewChanged(HbView*)), q, SLOT(currentViewChanged(HbView*)));
-
-	updateTime();
 }
 
 void HbStatusBarPrivate::updateTime()
 {
+    Q_Q(HbStatusBar);
 	// use QLocale to find out whether there is am/pm info
     QString timeFormat(QLocale().timeFormat(QLocale::ShortFormat));
 
@@ -100,6 +110,8 @@
 
     // set time, using a proper formatting
     mTimeText = current.toString(timeFormat);
+
+    q->updatePrimitives();
 }
 
 /*
@@ -129,6 +141,15 @@
     }
 }
 
+/*
+    Delayed constructor.
+ */
+void HbStatusBar::delayedConstruction()
+{
+   Q_D(HbStatusBar);
+   d->delayedConstruction();
+}
+
 void HbStatusBar::propertiesChanged()
 {
     Q_D(HbStatusBar);
@@ -193,7 +214,6 @@
     Q_D(HbStatusBar);
     if (event->timerId() == d->mClockTimerId) {
         d->updateTime(); // get current time
-		updatePrimitives();
 	}
 }
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/decorators/hbstatusbar_p.h
--- a/src/hbcore/decorators/hbstatusbar_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/decorators/hbstatusbar_p.h	Mon May 03 12:48:33 2010 +0300
@@ -41,6 +41,8 @@
     explicit HbStatusBar(HbMainWindow *mainWindow, QGraphicsItem *parent = 0);
     virtual ~HbStatusBar();
 
+    void delayedConstruction();
+
     enum { Type = HbPrivate::ItemType_StatusBar };
     int type() const { return Type; }
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/decorators/hbstatusbar_p_p.h
--- a/src/hbcore/decorators/hbstatusbar_p_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/decorators/hbstatusbar_p_p.h	Mon May 03 12:48:33 2010 +0300
@@ -40,6 +40,7 @@
 public:
     HbStatusBarPrivate();
 
+    void delayedConstruction();
 	void init();
     void updateTime();
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/decorators/hbsysteminfo_linux.cpp
--- a/src/hbcore/decorators/hbsysteminfo_linux.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/decorators/hbsysteminfo_linux.cpp	Mon May 03 12:48:33 2010 +0300
@@ -26,6 +26,7 @@
 #include "hbsysteminfo_linux_p_p.h"
 
 #include <QTimerEvent>
+#include <QDebug>
 
 Q_GLOBAL_STATIC(HbSystemNetworkInfoPrivate, hbSystemNetworkInfoPrivate)
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/decorators/hbsysteminfo_sym.cpp
--- a/src/hbcore/decorators/hbsysteminfo_sym.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/decorators/hbsysteminfo_sym.cpp	Mon May 03 12:48:33 2010 +0300
@@ -24,6 +24,7 @@
 ****************************************************************************/
 
 #include "hbsysteminfo_sym_p_p.h"
+#include <QDebug>
 
 Q_GLOBAL_STATIC(HbSystemNetworkInfoPrivate, hbSystemNetworkInfoPrivate)
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/decorators/hbtitlebar.cpp
--- a/src/hbcore/decorators/hbtitlebar.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/decorators/hbtitlebar.cpp	Mon May 03 12:48:33 2010 +0300
@@ -34,6 +34,7 @@
 #include <hbwidgetfeedback.h>
 #include <hbinstance.h>
 #include <hbnamespace.h>
+#include <hbpangesture.h>
 
 #include "hbtitlebar_p.h"
 #include "hbtitlebar_p_p.h"
@@ -57,30 +58,40 @@
 {
 }
 
+void HbTitleBarPrivate::delayedConstruction()
+{
+    Q_Q(HbTitleBar);
+
+    mTitlePane->delayedConstruction();
+    mIndicatorButton->delayedConstruction();
+    mNavigationButton->delayedConstruction();
+
+#ifdef HB_EFFECTS
+    HbEffect::add(
+        QStringList() << "decorator" << "decorator" << "decorator",
+        QStringList() << "decorator_pressed" <<  "decorator_released" << "decorator_latched",
+        QStringList() << "pressed" << "released" <<  "latched");
+#endif
+
+    q->connect(mTitlePane, SIGNAL(launchPopup(QPointF)), mMainWindow, SLOT(_q_launchMenu(QPointF)));
+    q->connect(q, SIGNAL(notificationCountChanged(int)), mIndicatorButton, SLOT(setIcon(int)));
+    q->connect(mMainWindow, SIGNAL(currentViewChanged(HbView*)), q, SLOT(currentViewChanged(HbView*)));
+    q->connect(mDefaultNavigationAction, SIGNAL(triggered()), qApp, SLOT(quit()));  
+}
+
 void HbTitleBarPrivate::init()
 {
     Q_Q(HbTitleBar);
 
-#ifdef HB_EFFECTS
-    HbEffect::add("decorator", "decorator_pressed", "pressed");
-    HbEffect::add("decorator", "decorator_released", "released");
-    HbEffect::add("decorator", "decorator_latched", "latched");
-#endif
-
     // create title pane
     mTitlePane = new HbTitlePane(q);
     mTitlePane->setZValue(HbPrivate::TitlePaneZValue);
-    QObject::connect(mTitlePane, SIGNAL(launchPopup(QPointF)),
-                     mMainWindow, SLOT(_q_launchMenu(QPointF)));
 
     mIndicatorButton = new HbIndicatorButton(q);
-    q->connect(q, SIGNAL(notificationCountChanged(int)),
-               mIndicatorButton, SLOT(setIcon(int)));
     mNavigationButton = new HbNavigationButton(q);
     // add default quit action
     mDefaultNavigationAction = new HbAction(Hb::QuitNaviAction, q);
     mDefaultNavigationAction->setText("Quit");
-    q->connect(mDefaultNavigationAction, SIGNAL(triggered()), qApp, SLOT(quit()));
     mNavigationButton->setAction(mDefaultNavigationAction);
 
     HbStyle::setItemName(q, "titlebar");
@@ -88,39 +99,27 @@
     HbStyle::setItemName(mIndicatorButton, "status");
     HbStyle::setItemName(mNavigationButton, "back");
     
-    QObject::connect(mMainWindow, SIGNAL(currentViewChanged(HbView*)), q, SLOT(currentViewChanged(HbView*)));
     mPreviousTitleBarProperties = 0; // view not yet ready
+
+    QObject::connect(this->mTitlePane, SIGNAL(panRight()), q, SLOT(gestureRight()));
+    QObject::connect(this->mTitlePane, SIGNAL(panLeft()), q, SLOT(gestureLeft()));
 }
 
 void HbTitleBarPrivate::initSceneEventFilters(HbView *view)
 {
     Q_Q(HbTitleBar);
     if (view->viewFlags() & HbView::ViewTitleBarMinimizable) {
-        if (!mTitleBarFilter) { // Install scene event filter
-            mTitleBarFilter = new HbGestureSceneFilter(Qt::LeftButton, q);
-            mTitleBarGestureLeft = new HbGesture(HbGesture::left, 20);
-            mTitleBarFilter->addGesture(mTitleBarGestureLeft);
-            mTitleBarGestureRight = new HbGesture(HbGesture::right, 20);
-            mTitleBarFilter->addGesture(mTitleBarGestureRight);
-            QObject::connect(mTitleBarGestureRight, SIGNAL(triggered(int)),
-                q, SLOT(gestureRight(int)));
-            QObject::connect(mTitleBarGestureLeft, SIGNAL(triggered(int)),
-                q, SLOT(gestureLeft(int)));
-
+        if(!mTouchAreaItem) {
             // Install sceneEvent filter(s)
             mTouchAreaItem = q->style()->createPrimitive(HbStyle::P_TitleBar_toucharea, q);
             mTouchAreaItem->setAcceptedMouseButtons(Qt::LeftButton);
             mTouchAreaItem->installSceneEventFilter(q);
-            mTouchAreaItem->installSceneEventFilter(mTitleBarFilter);
-            //mIndicatorButton->installSceneEventFilter(mTitleBarFilter);
-            mTitlePane->installSceneEventFilter(mTitleBarFilter);
+            QGraphicsObject *touchAreaItemGraphicsObject = static_cast<QGraphicsObject*>(mTouchAreaItem);
+            touchAreaItemGraphicsObject->grabGesture(Qt::PanGesture);
         }
     } else { // Remove scene event filter
-        if (mTitleBarFilter) {
-            //mIndicatorButton->removeSceneEventFilter(mTitleBarFilter);
-            mTitlePane->removeSceneEventFilter(mTitleBarFilter);
-            delete mTitleBarFilter;
-            mTitleBarFilter = 0;
+        if (mTouchAreaItem) {
+            mTouchAreaItem->removeSceneEventFilter(q);
             delete mTouchAreaItem;
             mTouchAreaItem = 0;
         }
@@ -135,8 +134,10 @@
             mTitleBarHandle = new HbTitleBarHandle(q);
             HbStyle::setItemName(mTitleBarHandle, "handle");
 #ifdef HB_EFFECTS
-            HbEffect::add("titlebar", "titlebar_minimize", "minimize");
-            HbEffect::add("titlebar", "titlebar_maximize", "maximize");
+            HbEffect::add(
+                QStringList() << "titlebar" << "titlebar",
+                QStringList() << "titlebar_minimize" <<  "titlebar_maximize",
+                QStringList() << "minimize" << "maximize");
 #endif
         }
     } else {
@@ -182,15 +183,23 @@
 { 
     Q_D(HbTitleBar);
     // Remove scene event filter
-    if(d->mTitleBarFilter) {
-        //d->mIndicatorButton->removeSceneEventFilter(d->mTitleBarFilter);
-        d->mTitlePane->removeSceneEventFilter(d->mTitleBarFilter);
-        delete d->mTitleBarFilter;
-        d->mTitleBarFilter = 0;
+    if (d->mTouchAreaItem) {
+        d->mTouchAreaItem->removeSceneEventFilter(this);
+        delete d->mTouchAreaItem;
+        d->mTouchAreaItem = 0;
     }
 }
 
 /*
+    Delayed constructor.
+ */
+void HbTitleBar::delayedConstruction()
+{
+       Q_D(HbTitleBar);
+       d->delayedConstruction();
+}
+
+/*
     titlePane. Return titlepane decorator.
 */
 HbTitlePane *HbTitleBar::titlePane() const
@@ -260,9 +269,11 @@
     gestureRight. Handles left-to-right flick.
             if(layoutDirection() == Qt::LeftToRight) {
 */
-void HbTitleBar::gestureRight(int speed)
+
+void HbTitleBar::gestureRight()
 {
     Q_D(HbTitleBar);
+
     if (!minimizable()) {
         return;
     }
@@ -273,7 +284,7 @@
     QRectF handleRect = d->mTitleBarHandle->boundingRect();
 
     if (layoutDirection() == Qt::LeftToRight && d->mMainWindow &&
-        d->mIndicatorButton->isVisible() && (speed > 50) &&
+        d->mIndicatorButton->isVisible() &&
         p == HbTitleBar::Original) {
 #ifdef HB_EFFECTS
         //grabMouse(); // this prevents taps/gestures on top of animating titlebar
@@ -283,7 +294,7 @@
         translate(screenSize.width()-handleRect.width(), 0);
 #endif //HB_EFFECTS
     } else if (layoutDirection() == Qt::RightToLeft && d->mMainWindow &&
-        d->mIndicatorButton->isVisible() && (speed > 50) &&
+        d->mIndicatorButton->isVisible() &&
         p == HbTitleBar::Minimized) {
 #ifdef HB_EFFECTS
         //grabMouse(); // this prevents taps/gestures on top of animating titlebar
@@ -298,9 +309,11 @@
 /*
     gestureLeft. Handles right-to-left flick.
 */
-void HbTitleBar::gestureLeft(int speed)
+
+void HbTitleBar::gestureLeft()
 {
     Q_D(HbTitleBar);
+
     if (!minimizable()) {
         return;
     }
@@ -312,7 +325,7 @@
     // only way to reliable find the position of titlebar is using
     // titlebar's transformation information
     if (layoutDirection() == Qt::LeftToRight && d->mMainWindow &&
-        d->mIndicatorButton->isVisible() && (speed > 50) &&
+        d->mIndicatorButton->isVisible() &&
         p == HbTitleBar::Minimized) {
 #ifdef HB_EFFECTS
         //grabMouse(); // this prevents taps/gestures on top of animating titlebar
@@ -323,7 +336,7 @@
         translate(x()-scenePos().x(), y()-scenePos().y());
 #endif //HB_EFFECTS
     } else if (layoutDirection() == Qt::RightToLeft && d->mMainWindow &&
-        d->mIndicatorButton->isVisible() && (speed > 50) &&
+        d->mIndicatorButton->isVisible() &&
         p == HbTitleBar::Original) {
 #ifdef HB_EFFECTS
         //grabMouse(); // this prevents taps/gestures on top of animating titlebar
@@ -459,6 +472,22 @@
         filterOutEvent = true;
         break;
     }
+    case QEvent::Gesture: {
+        QGestureEvent *gestureEvent = static_cast<QGestureEvent*>(event);
+        if (HbPanGesture *pan = qobject_cast<HbPanGesture*>(gestureEvent->gesture(Qt::PanGesture))) {
+            if(pan->state() == Qt::GestureUpdated || pan->state() == Qt::GestureFinished) {
+                if(pan->sceneDelta().x() < -0) {
+                    gestureLeft();
+                }
+                if(pan->sceneDelta().x() > 0) {
+                    gestureRight();
+                }
+                gestureEvent->accept();
+            }
+        }
+        filterOutEvent = true;
+        break;
+    }
     default:
         break;
     }
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/decorators/hbtitlebar_p.h
--- a/src/hbcore/decorators/hbtitlebar_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/decorators/hbtitlebar_p.h	Mon May 03 12:48:33 2010 +0300
@@ -55,6 +55,8 @@
     explicit HbTitleBar(HbMainWindow *mainWindow, QGraphicsItem *parent = 0);
     virtual ~HbTitleBar();
 
+    void delayedConstruction();
+
     enum { Type = HbPrivate::ItemType_TitleBar };
     int type() const { return Type; }
 
@@ -75,8 +77,8 @@
     void notificationCountChanged(int count);
 
 public slots:
-    void gestureRight(int speed);
-    void gestureLeft(int speed);
+    void gestureRight();
+    void gestureLeft();
     void currentViewChanged(HbView *view);
 #ifdef HB_EFFECTS
     void effectFinished(const HbEffect::EffectStatus &status);
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/decorators/hbtitlebar_p_p.h
--- a/src/hbcore/decorators/hbtitlebar_p_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/decorators/hbtitlebar_p_p.h	Mon May 03 12:48:33 2010 +0300
@@ -40,6 +40,7 @@
 {
     Q_DECLARE_PUBLIC(HbTitleBar)
 
+    void delayedConstruction();
     void init();
     void initSceneEventFilters(HbView *view);
     void initTitleBarHandle(HbView *view);
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/decorators/hbtitlepane.cpp
--- a/src/hbcore/decorators/hbtitlepane.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/decorators/hbtitlepane.cpp	Mon May 03 12:48:33 2010 +0300
@@ -32,6 +32,11 @@
 #include <hbmainwindow.h>
 #include <hbview.h>
 #include <hbmenu.h>
+#include <hbtapgesture.h>
+#include <hbpangesture.h>
+
+#include <QGestureEvent>
+#include <QGesture>
 
 #include <QGraphicsSceneMouseEvent>
 
@@ -45,7 +50,7 @@
     setting text, font alignment and options menu.
 */
 
-HbTitlePanePrivate::HbTitlePanePrivate( ) :
+HbTitlePanePrivate::HbTitlePanePrivate() :
     mText(),
     mTextItem(0),
     mToggled(false),
@@ -55,15 +60,22 @@
 
 }
 
+void HbTitlePanePrivate::delayedConstruction()
+{
+    Q_Q(HbTitlePane);
+    q->grabGesture(Qt::TapGesture);
+    q->grabGesture(Qt::PanGesture);
+    updatePrimitives();
+}
+
 void HbTitlePanePrivate::init()
 {
     Q_Q(HbTitlePane);
 
-    q->setAcceptedMouseButtons( Qt::LeftButton );
-    q->setText( HbApplication::applicationName() );
+    q->setAcceptedMouseButtons(Qt::LeftButton);
+    q->setText(HbApplication::applicationName());
 
     createPrimitives();
-    updatePrimitives();
 }
 
 void HbTitlePanePrivate::toggle(bool on)
@@ -121,6 +133,16 @@
  */
 HbTitlePane::~HbTitlePane()
 {
+
+}
+
+/*
+    Delayed constructor.
+ */
+void HbTitlePane::delayedConstruction()
+{
+       Q_D(HbTitlePane);
+       d->delayedConstruction();
 }
 
 /*
@@ -195,84 +217,99 @@
     }
 }
 
-/*
-    \reimp
- */
-void HbTitlePane::mousePressEvent(QGraphicsSceneMouseEvent *event)
-{
-    Q_D(HbTitlePane);
-
-    d->mMode = QIcon::Active;
-    updatePrimitives();
-#ifdef HB_EFFECTS
-    if (boundingRect().contains(event->pos())) {
-        HbEffect::start(this, "decorator", "pressed");
-    }
-#endif
-    HbWidgetFeedback::triggered(this, Hb::InstantPressed);
-    d->toggle(true);    
-}
-
-/*
-    \reimp
- */
-void HbTitlePane::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
+void HbTitlePane::gestureEvent(QGestureEvent *event)
 {
     Q_D(HbTitlePane);
 
-    if (boundingRect().contains(event->pos())) {
-        if (d->mMode != QIcon::Active) {
-            d->mMode = QIcon::Active;
-            updatePrimitives();
-        }
-    } else {
-        if (d->mMode != QIcon::Normal) {
-            d->mMode = QIcon::Normal;
-            updatePrimitives();
-        }
-    }
-    if (boundingRect().contains(event->pos()) && !d->mToggled) {
-        HbWidgetFeedback::triggered(this, Hb::InstantPressed);
-        d->toggle(true);
-    } else if (!boundingRect().contains(event->pos()) && d->mToggled) {
-        HbWidgetFeedback::triggered(this, Hb::InstantReleased);
-        d->toggle(false);
-    }
-}
-
-/*
-    \reimp
- */
-void HbTitlePane::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
-{
-    Q_D(HbTitlePane);
+    if(HbTapGesture *tap = qobject_cast<HbTapGesture*>(event->gesture(Qt::TapGesture))) {
+        switch(tap->state()) {
+        case Qt::GestureStarted: {
+                d->mMode = QIcon::Active;
+                updatePrimitives();
+#ifdef HB_EFFECTS
+                HbEffect::start(this, "decorator", "pressed");
+#endif
+                HbWidgetFeedback::triggered(this, Hb::InstantPressed);
+                d->toggle(true);
+                break;
+            }
+        case Qt::GestureFinished: {
+                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);
+                break;
+            }
+        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);
+                }
 
-    if (boundingRect().contains(event->pos())) {
-        d->mMode = QIcon::Selected;
-        updatePrimitives();
-#ifdef HB_EFFECTS
-        if (boundingRect().contains(event->pos())) {
-            HbEffect::start(this, "decorator", "latched");
-        }
-#endif
-    } else {
-        d->mMode = QIcon::Normal;
-        updatePrimitives();
+                if(pan->sceneDelta().x() > 0) {
+                    emit panRight();
+                }
+                else if(pan->sceneDelta().x() < 0) {
+                    emit panLeft();
+                }
+
+                break;
+            }
+        case Qt::GestureFinished: {
+                if (boundingRect().contains(pointerPos) && !d->mToggled) {
+                    d->mMode = QIcon::Selected;
+                    updatePrimitives();
 #ifdef HB_EFFECTS
-        if (boundingRect().contains(event->pos())) {
-            HbEffect::start(this, "decorator", "released");
-        }
+                    HbEffect::start(this, "decorator", "latched");
 #endif
-    }
-    if (d->mToggled) {
-        HbWidgetFeedback::triggered(this, Hb::InstantReleased);
-    }
-    if (boundingRect().contains(event->pos())) {
-        QPointF pos(scenePos().x() + boundingRect().width() / 2 + 3,
-                    scenePos().y() + boundingRect().height());
+                    if (d->mToggled) {
+                        HbWidgetFeedback::triggered(this, Hb::InstantReleased);
+                    }
 
-        HbWidgetFeedback::triggered(this, Hb::InstantClicked);
-        emit launchPopup(pos);
+                    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;
+        }
     }
 }
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/decorators/hbtitlepane_p.h
--- a/src/hbcore/decorators/hbtitlepane_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/decorators/hbtitlepane_p.h	Mon May 03 12:48:33 2010 +0300
@@ -31,6 +31,7 @@
 
 class HbTitlePanePrivate;
 class HbStyleOptionTitlePane;
+class QGestureEvent;
 
 class HB_AUTOTEST_EXPORT HbTitlePane : public HbWidget
 {
@@ -40,6 +41,8 @@
     HbTitlePane(QGraphicsItem *parent = 0);
     virtual ~HbTitlePane();
 
+    void delayedConstruction();
+
     QString text() const;
 
     enum { Type = HbPrivate::ItemType_TitlePane };
@@ -50,6 +53,8 @@
 signals:
     void launchPopup(const QPointF &pos);
     void visibilityChanged();
+    void panLeft();
+    void panRight();
 
 public slots:
     void setText(const QString &text);
@@ -60,9 +65,7 @@
 
     void initStyleOption(HbStyleOptionTitlePane *option) const;
 	
-    void mousePressEvent(QGraphicsSceneMouseEvent *event);
-    void mouseMoveEvent(QGraphicsSceneMouseEvent *event);	
-    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
+    void gestureEvent(QGestureEvent *event);
     void polish(HbStyleParameters &params);
     bool eventFilter(QObject *object, QEvent *event);
     QVariant itemChange(GraphicsItemChange change, const QVariant &value);
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/decorators/hbtitlepane_p_p.h
--- a/src/hbcore/decorators/hbtitlepane_p_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/decorators/hbtitlepane_p_p.h	Mon May 03 12:48:33 2010 +0300
@@ -33,7 +33,8 @@
     Q_DECLARE_PUBLIC(HbTitlePane)
 
 public:
-    HbTitlePanePrivate( );
+    HbTitlePanePrivate();
+    void delayedConstruction();
 
     void createPrimitives();
     void updatePrimitives();
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/devicedialogbase/devicedialogbase.pri
--- a/src/hbcore/devicedialogbase/devicedialogbase.pri	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/devicedialogbase/devicedialogbase.pri	Mon May 03 12:48:33 2010 +0300
@@ -39,18 +39,18 @@
 PUBLIC_HEADERS += $$PWD/hbsymbianvariant.h
 PUBLIC_HEADERS += $$PWD/hbindicatorsymbian.h
 PUBLIC_HEADERS += $$PWD/hbtextresolversymbian.h
-INTERNAL_HEADERS += $$PWD/hbdevicedialogerrors_p.h
+PRIVATE_HEADERS += $$PWD/hbdevicedialogerrors_p.h
 
 SOURCES += $$PWD/hbdevicedialog.cpp
 SOURCES += $$PWD/hbindicator.cpp
 SOURCES += $$PWD/hbdevicedialogplugin.cpp
 
 symbian {
-INTERNAL_HEADERS += $$PWD/hbdevicedialogsym_p.h
-INTERNAL_HEADERS += $$PWD/hbdevicedialogclientsession_p.h
-INTERNAL_HEADERS += $$PWD/hbindicatorsym_p.h
-INTERNAL_HEADERS += $$PWD/hbsymbianvariantconverter_p.h
-INTERNAL_HEADERS += $$PWD/hbdeleteguardsymbian_p.h
+PRIVATE_HEADERS += $$PWD/hbdevicedialogsym_p.h
+PRIVATE_HEADERS += $$PWD/hbdevicedialogclientsession_p.h
+PRIVATE_HEADERS += $$PWD/hbindicatorsym_p.h
+PRIVATE_HEADERS += $$PWD/hbsymbianvariantconverter_p.h
+PRIVATE_HEADERS += $$PWD/hbdeleteguardsymbian_p.h
 
 SOURCES += $$PWD/hbsymbianvariant.cpp
 SOURCES += $$PWD/hbsymbiandevicedialog.cpp #deprecated
@@ -65,9 +65,9 @@
 SOURCES += $$PWD/hbdeleteguardsymbian.cpp
 }
 
-win32|linux-*|macx-* {
-INTERNAL_HEADERS += $$PWD/hbdevicedialogwin32_p.h
-INTERNAL_HEADERS += $$PWD/hbindicatorwin32_p.h
+!symbian {
+PRIVATE_HEADERS += $$PWD/hbdevicedialogwin32_p.h
+PRIVATE_HEADERS += $$PWD/hbindicatorwin32_p.h
 SOURCES += $$PWD/hbdevicedialogwin32_p.cpp
 SOURCES += $$PWD/hbindicatorwin32_p.cpp
 }
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/devicedialogbase/devicedialogdebug/devicedialogdebug.pri
--- a/src/hbcore/devicedialogbase/devicedialogdebug/devicedialogdebug.pri	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/devicedialogbase/devicedialogdebug/devicedialogdebug.pri	Mon May 03 12:48:33 2010 +0300
@@ -28,7 +28,7 @@
 INCLUDEPATH += $$PWD
 DEPENDPATH += $$PWD
 
-INTERNAL_HEADERS += $$PWD/hbdevicedialogtrace_p.h
-INTERNAL_HEADERS += $$PWD/hbdevicedialogmessagehandler_p.h
+PRIVATE_HEADERS += $$PWD/hbdevicedialogtrace_p.h
+PRIVATE_HEADERS += $$PWD/hbdevicedialogmessagehandler_p.h
 
 SOURCES += $$PWD/hbdevicedialogmessagehandler.cpp
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/devicedialogbase/devicedialogdebug/devicedialogtrace.pri
--- a/src/hbcore/devicedialogbase/devicedialogdebug/devicedialogtrace.pri	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/devicedialogbase/devicedialogdebug/devicedialogtrace.pri	Mon May 03 12:48:33 2010 +0300
@@ -37,7 +37,7 @@
             }
         } else:win32 {
             filePath = TRACE_OUTPUT_FILE=\\\"c:/temp/$$1\\\"
-        } else:linux-*|macx-* {
+        } else:unix {
             filePath = TRACE_OUTPUT_FILE=\\\"/usr/tmp/$$1\\\"
         } else {
             filePath = TRACE_OUTPUT_FILE=\\\"./$$1\\\"
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/devicedialogbase/devicedialogserver/devicedialogserver.pri
--- a/src/hbcore/devicedialogbase/devicedialogserver/devicedialogserver.pri	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/devicedialogbase/devicedialogserver/devicedialogserver.pri	Mon May 03 12:48:33 2010 +0300
@@ -27,14 +27,14 @@
 INCLUDEPATH += $$PWD
 DEPENDPATH += $$PWD
 
-INTERNAL_HEADERS += $$PWD/hbdevicedialogmanager_p.h
-INTERNAL_HEADERS += $$PWD/hbdevicedialogmanager_p_p.h
-INTERNAL_HEADERS += $$PWD/hbdevicedialogscontainer_p.h
-INTERNAL_HEADERS += $$PWD/hbdevicedialogpluginmanager_p.h
-INTERNAL_HEADERS += $$PWD/hbindicatorclientinfo_p.h
-INTERNAL_HEADERS += $$PWD/hbdevicedialogserver_p.h
-INTERNAL_HEADERS += $$PWD/hbpluginnamecache_p.h
-INTERNAL_HEADERS += $$PWD/hbdevicedialogserverstatus_p.h
+PRIVATE_HEADERS += $$PWD/hbdevicedialogmanager_p.h
+PRIVATE_HEADERS += $$PWD/hbdevicedialogmanager_p_p.h
+PRIVATE_HEADERS += $$PWD/hbdevicedialogscontainer_p.h
+PRIVATE_HEADERS += $$PWD/hbdevicedialogpluginmanager_p.h
+PRIVATE_HEADERS += $$PWD/hbindicatorclientinfo_p.h
+PRIVATE_HEADERS += $$PWD/hbdevicedialogserver_p.h
+PRIVATE_HEADERS += $$PWD/hbpluginnamecache_p.h
+PRIVATE_HEADERS += $$PWD/hbdevicedialogserverstatus_p.h
 
 SOURCES += $$PWD/hbdevicedialogserver.cpp
 SOURCES += $$PWD/hbdevicedialogmanager.cpp
@@ -44,9 +44,9 @@
 SOURCES += $$PWD/hbpluginnamecache.cpp
 
 symbian {
-INTERNAL_HEADERS += $$PWD/hbdevicedialogserversym_p_p.h
-INTERNAL_HEADERS += $$PWD/hbdevicedialogsession_p.h
-INTERNAL_HEADERS += $$PWD/hbdevicedialogserverdefs_p.h
+PRIVATE_HEADERS += $$PWD/hbdevicedialogserversym_p_p.h
+PRIVATE_HEADERS += $$PWD/hbdevicedialogsession_p.h
+PRIVATE_HEADERS += $$PWD/hbdevicedialogserverdefs_p.h
 
 SOURCES += $$PWD/hbdevicedialogserversym_p.cpp
 SOURCES += $$PWD/hbdevicedialogsession.cpp
@@ -54,14 +54,14 @@
 SOURCES += $$PWD/hbdevicedialogserverstatussym.cpp
 }
 
-win32|linux-*|macx-* {
-INTERNAL_HEADERS += $$PWD/hbdevicedialogserverwin_p_p.h
+!symbian {
+PRIVATE_HEADERS += $$PWD/hbdevicedialogserverwin_p_p.h
 
 SOURCES += $$PWD/hbdevicedialogserverwin_p.cpp
 SOURCES += $$PWD/hbdevicedialogserverstatuswin.cpp
 }
 
-symbian: {
+symbian {
 LIBS += -lws32
 LIBS += -lcone
 }
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogmanager_p.cpp
--- a/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogmanager_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogmanager_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -77,8 +77,22 @@
     }
     return false;
 }
+
+bool RegionUpdateFilter::eventFilter(QObject* obj, QEvent *event)
+	{
+	if (event->type() ==  QEvent::QEvent::GraphicsSceneResize) {
+		HbPopup *popup = qobject_cast<HbPopup*>(obj);
+		if (popup) {			
+			QRectF rect = popup->rect();
+			rect.moveTo(popup->pos());
+			HbDeviceDialogsContainer::Dialog & dialog = mDeviceDialogManger->mDialogs.find(popup);
+			mDeviceDialogManger->addRegionRect(dialog.id(), rect);
+		}
+	}	
+	return false;
+	}
 #endif
-
+	
 /*!
     \internal
     Constructor.
@@ -94,6 +108,7 @@
     mHousekeeperTimerId(0)
 #if defined(Q_OS_SYMBIAN)
     ,mMousePressCatcher(this)
+    ,mRegionUpdateFilter(this)
     ,mWindowRegion()
 #endif
 {
@@ -106,7 +121,8 @@
             this, SLOT(indicatorRemoved(const IndicatorClientInfo)));
     connect(mIndicatorPluginManager, SIGNAL( indicatorUpdated(const IndicatorClientInfo) ),
             this, SLOT(indicatorUpdated(const IndicatorClientInfo)));
-
+    connect(mIndicatorPluginManager, SIGNAL(indicatorUserActivated(QVariantMap)), 
+    		q, SIGNAL(indicatorUserActivated(QVariantMap)));
     // Server publishes it's status. Applications use it to delay showing of notification
     // dialogs when server is showing.
     mServerStatus.setStatus(HbDeviceDialogServerStatus::NoFlags);
@@ -306,9 +322,7 @@
     RWindowBase *win =
         static_cast<RWindowBase*>(mMainWindow->effectiveWinId()->DrawableWindow());
     if (win) {
-        RRegionBuf<1> windowRegion(QRectToTRect(mMainWindow->sceneRect()));
-        win->SetShape(windowRegion);
-        //win->SetShape(mWindowRegion);
+        win->SetShape(mWindowRegion);
     }
 }
 
@@ -377,19 +391,15 @@
                 popup->show();
                 newDialogs |= current->flags();
 #if defined(Q_OS_SYMBIAN)
-                //send polish event to get the size and position of the popup.
-                QEvent polishEvent(QEvent::Polish);
-                QCoreApplication::sendEvent(popup, &polishEvent);
-                QRectF rect = popup->rect();
-                //rect.moveTo(popup->pos());
-                addRegionRect(current->id(), rect);
                 popup->installSceneEventFilter(&mMousePressCatcher);
+                popup->installEventFilter(&mRegionUpdateFilter);               
 #endif //Q_OS_SYMBIAN
             }
         } else { // generic dialog
             current->setFlags(showing);
             current->widget()->deviceDialogWidget()->show();
             newDialogs |= current->flags();
+            setupWindowRegion();
         }
         // Find next one that is not showing
         current = &mDialogs.next(*current, noFlags, showing | closeCalled);
@@ -409,9 +419,27 @@
     if (newDialogs & lightsMask) {
         refreshDisplayLightsTime();
     }
+    
+    const HbDeviceDialogsContainer::Dialog &nonNotificationDialog =
+        mDialogs.next(start, showing, notificationGroup|showing);
+    bool dialogsShowing = showingNotification || nonNotificationDialog.isValid();
+    
+    return dialogsShowing;
+}
 
+void HbDeviceDialogManagerPrivate::setupWindowRegion()
+{
     // RWindow region control.
     // Check if any non-notification dialogs are showing.
+    // Shorthands for flags
+    const HbDeviceDialogsContainer::Dialog::Flags notificationGroup(
+        HbDeviceDialogsContainer::Dialog::NotificationGroup);
+    const HbDeviceDialogsContainer::Dialog::Flags showing(
+        HbDeviceDialogsContainer::Dialog::Showing);
+    
+    const HbDeviceDialogsContainer::Dialog start;
+    bool showingNotification = mDialogs.next(start, notificationGroup|showing,
+        notificationGroup|showing).isValid();
     const HbDeviceDialogsContainer::Dialog &nonNotificationDialog =
         mDialogs.next(start, showing, notificationGroup|showing);
     bool dialogsShowing = showingNotification || nonNotificationDialog.isValid();
@@ -431,8 +459,6 @@
         enableReceiptOfFocus(true);
     }
     moveToForeground(dialogsShowing);
-
-    return dialogsShowing;
 }
 
 /*!
@@ -647,6 +673,7 @@
         removeRegionRect(id);
     }
     showDialogs();
+    setupWindowRegion();
     updateStatus();
     TRACE_EXIT
 }
@@ -698,6 +725,7 @@
     TRect trect(QRectToTRect(rect));
     mWindowRegion.AddRect(trect);
     mRegionList.append(RegionMapping(widgetId, trect));
+    setupWindowRegion();
 }
 
 void HbDeviceDialogManagerPrivate::removeRegionRect(int widgetId)
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogmanager_p.h
--- a/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogmanager_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogmanager_p.h	Mon May 03 12:48:33 2010 +0300
@@ -63,6 +63,7 @@
      void indicatorActivated(const QList<IndicatorClientInfo> &indicatorInfoList);
      void indicatorUpdated(const QList<IndicatorClientInfo> &clientInfo);
      void indicatorRemoved(const QList<IndicatorClientInfo> &indicatorInfoList);
+     void indicatorUserActivated(const QVariantMap &data);
 
 private:
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogmanager_p_p.h
--- a/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogmanager_p_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogmanager_p_p.h	Mon May 03 12:48:33 2010 +0300
@@ -63,6 +63,18 @@
 #if defined(Q_OS_SYMBIAN)
 class HbDeviceDialogManagerPrivate;
 
+class RegionUpdateFilter : public QObject
+{
+    Q_OBJECT
+public:
+    RegionUpdateFilter(HbDeviceDialogManagerPrivate *deviceDialogManger) :
+    mDeviceDialogManger(deviceDialogManger) {}
+protected:
+    bool eventFilter(QObject* obj, QEvent *event);
+private:	
+    HbDeviceDialogManagerPrivate *mDeviceDialogManger;
+};
+
 //acts as a scene event filter to catch mouse press events.
 //when caught, resets window region to full screen.
 class MousePressCatcher : public QGraphicsItem
@@ -142,7 +154,7 @@
     bool doHousekeeping();
     void timerEvent(QTimerEvent *event);
     void markNoClient(quintptr clientTag);
-
+    void setupWindowRegion();
 private:
     // Public interface
     HbDeviceDialogManager * const q;
@@ -157,6 +169,8 @@
     int mHousekeeperTimerId;
 #if defined(Q_OS_SYMBIAN)
     MousePressCatcher mMousePressCatcher; //acts as a scene event filter to catch mouse press events.
+    friend class RegionUpdateFilter;
+    RegionUpdateFilter mRegionUpdateFilter;
 
     struct RegionMapping
     {
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogpluginmanager.cpp
--- a/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogpluginmanager.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogpluginmanager.cpp	Mon May 03 12:48:33 2010 +0300
@@ -188,7 +188,7 @@
             sender->disconnect(); // disconnect all signals
             mDeleteWidgets.append(widget);
 #if defined(Q_OS_SYMBIAN)
-            const int deleteDelay = 30000; // 30s
+            const int deleteDelay = 2000; // 2s
 #else
             const int deleteDelay = 500; // 0.5s
 #endif
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogserver.cpp
--- a/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogserver.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogserver.cpp	Mon May 03 12:48:33 2010 +0300
@@ -47,13 +47,19 @@
     \internal
     Constructor for HbDeviceDialogServer class.
 */
-HbDeviceDialogServer::HbDeviceDialogServer()
-: iManager(new HbDeviceDialogManager), d_ptr(new HbDeviceDialogServerPrivate)
+HbDeviceDialogServer::HbDeviceDialogServer() : iManager(0), d_ptr(0), mError(0)
 {
     TRACE_ENTRY
+    d_ptr = new HbDeviceDialogServerPrivate;
     Q_D( HbDeviceDialogServer );
     d->q_ptr = this;
-    d->Init();
+    mError = d->Init();
+    // Error creating a server
+    if (mError != 0) {
+        return;
+    }
+
+    iManager = new HbDeviceDialogManager;
 
     connect( iManager, SIGNAL(deviceDialogUpdate(int, QVariantMap)),
              this, SLOT(deviceDialogUpdate(int, QVariantMap)));
@@ -66,6 +72,8 @@
              this, SLOT( indicatorUpdated(QList<IndicatorClientInfo>) ) );
     connect( iManager, SIGNAL( indicatorRemoved(QList<IndicatorClientInfo>) ),
              this, SLOT( indicatorRemoved(QList<IndicatorClientInfo>) ) );
+    connect( iManager, SIGNAL( indicatorUserActivated(const QVariantMap) ),
+             this, SLOT( indicatorUserActivated(const QVariantMap) ) );
     TRACE_EXIT
 }
 
@@ -198,3 +206,7 @@
     d_func()->IndicatorsDeactivated(indicatorInfoList);
 }
 
+void HbDeviceDialogServer::indicatorUserActivated(const QVariantMap &data)
+{
+	d_func()->IndicatorUserActivated(data);
+}
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogserver_p.h
--- a/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogserver_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogserver_p.h	Mon May 03 12:48:33 2010 +0300
@@ -77,6 +77,7 @@
     HbDeviceDialogServer();
     virtual ~HbDeviceDialogServer();
 
+    int error() const {return mError;}
     void setMainWindow(HbMainWindow *mainWindow);
     int showDeviceDialog(DialogParameters &parameters);
     int updateDeviceDialog(int identifier, const QVariantMap &data);
@@ -92,10 +93,11 @@
     void indicatorActivated(const QList<IndicatorClientInfo> &indicatorInfoList);
     void indicatorUpdated(const QList<IndicatorClientInfo> &indicatorInfoList);
     void indicatorRemoved(const QList<IndicatorClientInfo> &indicatorInfoList);
-
+    void indicatorUserActivated(const QVariantMap &data);
 private:
     HbDeviceDialogManager *iManager;
     HbDeviceDialogServerPrivate *d_ptr;
+    int mError;
     Q_DECLARE_PRIVATE_D( d_ptr, HbDeviceDialogServer )
 
 };
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogserverdefs_p.h
--- a/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogserverdefs_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogserverdefs_p.h	Mon May 03 12:48:33 2010 +0300
@@ -91,6 +91,7 @@
     EHbSrvGetActivatedIndicatorsStart,
     EHbSrvGetActivatedIndicatorContinue,
     EhbSrvGetActivatedIndicatorsClose,
+    EHbSrvActivatedIndicatorData,
     EHbSrvIndicatorCommandsEnd
     };
 
@@ -105,6 +106,7 @@
     {
     EHbIndicatorAllActivated = 0,
     EHbIndicatorUpdates,
+    EHbIndicatorUserActivated
     };
 
 struct THbDeviceDialogSrvUpdateInfo {
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogserversym_p.cpp
--- a/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogserversym_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogserversym_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -62,11 +62,12 @@
     \internal
     Initialisation step. Starts a server with given name.
 */
-void HbDeviceDialogServerPrivate::Init()
+int HbDeviceDialogServerPrivate::Init()
 {
     TRACE_ENTRY
-    TRAP_IGNORE(StartL(KHbServerName));
+    int error = Start(KHbServerName);
     TRACE_EXIT
+    return error;
 }
 
 /*!
@@ -279,6 +280,15 @@
     TRACE_EXIT
 }
 
+void HbDeviceDialogServerPrivate::IndicatorUserActivated(const QVariantMap &data) const
+{    
+    TRACE_ENTRY
+    for (TInt i(0); i < iIndicatorSessionList.Count(); ++i) {
+        iIndicatorSessionList[i]->IndicatorUserActivated(data);
+    }
+    TRACE_EXIT
+}
+
 /*!
     \internal
     Check if application should exit.
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogserversym_p_p.h
--- a/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogserversym_p_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogserversym_p_p.h	Mon May 03 12:48:33 2010 +0300
@@ -61,7 +61,7 @@
     void IndicatorsActivated(const QList<IndicatorClientInfo> &indicatorInfoList);
     void IndicatorsUpdated(const QList<IndicatorClientInfo> &indicatorInfoList);
     void IndicatorsDeactivated(const QList<IndicatorClientInfo> &indicatorInfoList);
-
+    void IndicatorUserActivated(const QVariantMap &data) const;
     static TInt exitTimerCallback(TAny *aServer);
 
     CSession2* NewSessionL(const TVersion &aVersion,
@@ -72,7 +72,7 @@
 public:
 
     HbDeviceDialogServer *q_ptr;
-    void Init();
+    int Init();
 
 public:
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogserverwin_p.cpp
--- a/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogserverwin_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogserverwin_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -51,9 +51,10 @@
     \internal
     Initialisation step. Starts a server with given name.
 */
-void HbDeviceDialogServerPrivate::Init()
+int HbDeviceDialogServerPrivate::Init()
 {
-    //do nothing
+    const int error = 0;
+    return error;
 }
 
 /*!
@@ -151,3 +152,7 @@
     Q_UNUSED(indicatorInfoList)
 }
 
+void HbDeviceDialogServerPrivate::IndicatorUserActivated(const QVariantMap &data) const
+{
+    Q_UNUSED(data);
+}
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogserverwin_p_p.h
--- a/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogserverwin_p_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogserverwin_p_p.h	Mon May 03 12:48:33 2010 +0300
@@ -52,13 +52,13 @@
     void IndicatorsActivated(const QList<IndicatorClientInfo> &indicatorInfoList);
     void IndicatorsUpdated(const QList<IndicatorClientInfo> &indicatorInfoList);
     void IndicatorsDeactivated(const QList<IndicatorClientInfo> &indicatorInfoList);
-
+    void IndicatorUserActivated(const QVariantMap &data) const;
     Q_DECLARE_PUBLIC(HbDeviceDialogServer)
 
 public:
 
     HbDeviceDialogServer *q_ptr;
-    void Init();
+    int Init();
 
 public:
 };
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/devicedialogbase/devicedialogserver/hbindicatorsessionhandler.cpp
--- a/src/hbcore/devicedialogbase/devicedialogserver/hbindicatorsessionhandler.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/devicedialogbase/devicedialogserver/hbindicatorsessionhandler.cpp	Mon May 03 12:48:33 2010 +0300
@@ -124,6 +124,10 @@
         aMessage.Complete( KErrNone );
         break;
     }
+    case EHbSrvActivatedIndicatorData: {
+		WriteIndicatorDataL(aMessage);
+		break;		
+    }
     default: {
         break;
     }
@@ -167,6 +171,16 @@
     TRACE_EXIT
 }
 
+void HbIndicatorSessionHandler::IndicatorUserActivated(const QVariantMap& data)
+{
+	QString type = data.value("type").toString();
+		
+	if (indicatorTypes.contains(type) && iIndicatorChannelOpen) {
+		indicatorDataMap = data;
+		TRAP_IGNORE(WriteIndicatorDataL(iIndicatorChannel));
+	}
+}
+
 HbDeviceDialogServerPrivate& HbIndicatorSessionHandler::Server()
 {
     return iSession->Server();
@@ -181,6 +195,9 @@
     TRACE_ENTRY
     QVariant parameter;
     QString type = indicatorTypeFromMessageL(aMessage, parameter);
+    if (!indicatorTypes.contains(type)) {
+        indicatorTypes.append(type);
+    }
     HbDeviceDialogServer::IndicatorParameters indicatorParameters(type, aMessage, parameter);
     TInt result = Server().activateIndicator(indicatorParameters);
     aMessage.Complete(result);
@@ -196,6 +213,14 @@
     TRACE_ENTRY
     QVariant parameter;
     QString type = indicatorTypeFromMessageL(aMessage, parameter);
+    indicatorTypes.removeAll(type);
+    
+    if (indicatorTypes.isEmpty() && iIndicatorChannelOpen) {
+		indicatorDataMap.clear();
+		iIndicatorChannelOpen = false;
+		iIndicatorChannel.Complete(KErrCancel);
+    }    
+    
     HbDeviceDialogServer::IndicatorParameters indicatorParameters(type, aMessage, parameter);
     TInt result = Server().deactivateIndicator(indicatorParameters);
     aMessage.Complete(result);
@@ -218,6 +243,11 @@
     }
 
     WriteIndicatorInfoL();
+    
+    // check whether there is buffered indicator data also present.
+    if (iIndicatorChannelOpen && !indicatorDataMap.isEmpty()) {
+        WriteIndicatorDataL(iIndicatorChannel);
+    }
     TRACE_EXIT
 }
 
@@ -332,6 +362,31 @@
     return clientInfoCount - clientInfoStoreCount;
 }
 
+void HbIndicatorSessionHandler::WriteIndicatorDataL(const RMessage2& aMessage)
+{    
+	iIndicatorChannelOpen = EFalse;
+	QByteArray array;
+    QDataStream stream( &array, QIODevice::WriteOnly );
+
+    QVariant var(indicatorDataMap);
+    stream << var;
+      
+    // Get client data buffer size
+    TInt size = aMessage.GetDesMaxLength( KSlot0 );
+    
+	TPckgBuf<TInt> buf( EHbIndicatorUserActivated );	
+	User::LeaveIfError(aMessage.Write(KSlot1, buf));
+
+    if (size >= array.size()) {
+		// Buffer ok. Write data.
+		TPtr8 ptr( reinterpret_cast<TUint8*>(array.data()), array.size(), array.size());
+		TInt error = aMessage.Write( KSlot0, ptr );		
+		aMessage.Complete(error);
+		indicatorDataMap.clear();
+    } else {
+		aMessage.Complete(array.size());
+    }    
+}
 /*!
     \internal
     get the indicator type and parameter from the message.
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/devicedialogbase/devicedialogserver/hbindicatorsessionhandler_p.h
--- a/src/hbcore/devicedialogbase/devicedialogserver/hbindicatorsessionhandler_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/devicedialogbase/devicedialogserver/hbindicatorsessionhandler_p.h	Mon May 03 12:48:33 2010 +0300
@@ -31,7 +31,7 @@
 #include <QVariantMap>
 #include <QList>
 #include <QString>
-
+#include <QStringList>
 #include "hbindicatorclientinfo_p.h"
 
 class HbDeviceDialogServerPrivate;
@@ -74,7 +74,7 @@
     void IndicatorsActivated(const QList<IndicatorClientInfo> &activated);
     void IndicatorsUpdated(const QList<IndicatorClientInfo> &activated);
     void IndicatorsDeactivated(const QList<IndicatorClientInfo> &deactivated);
-
+    void IndicatorUserActivated(const QVariantMap& data);
 private:
 
     HbDeviceDialogServerPrivate& Server();
@@ -88,6 +88,7 @@
             IndicatorState state);
 
     void WriteIndicatorInfoL();
+    void WriteIndicatorDataL(const RMessage2 &aMessage);
     TInt DoWriteIndicatorInfoL(TInt &error);
     QString indicatorTypeFromMessageL(const RMessage2 &aMessage, QVariant &parameter) const;
     HbIndicatorSessionHandler(HbDeviceDialogSession *aSession);
@@ -98,6 +99,8 @@
     TBool iIndicatorChannelOpen;
     RMessage2 iIndicatorChannel;
     QList<IndicatorQueueItem> iIndicatorQueue;
+    QStringList indicatorTypes;
+    QVariantMap indicatorDataMap;
     };
 
 #endif  // HBINDICATORSESSIONHANDLER_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/devicedialogbase/hbdevicedialogclientsession.cpp
--- a/src/hbcore/devicedialogbase/hbdevicedialogclientsession.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/devicedialogbase/hbdevicedialogclientsession.cpp	Mon May 03 12:48:33 2010 +0300
@@ -29,7 +29,15 @@
 
 #include "hbdevicedialogclientsession_p.h"
 
-_LIT(KSemaName, "hbdevdlgcli_");
+// Check if the client is running in device dialog server
+static bool IsDeviceDialogServer()
+{
+    const TUid ServerUid = {0x20022FC5};
+    return RProcess().SecureId().operator TUid() == ServerUid;
+}
+
+// Preallocate 1 message slot for sessions
+static const int KNumAsyncMessageSlots = 1;
 
 /*!
     \internal
@@ -52,12 +60,17 @@
 TInt RHbDeviceDialogClientSession::Connect(TRequestStatus *aStatus)
 {
     TRACE_ENTRY
+    // Check server is not trying to connect to itself
+    if (IsDeviceDialogServer()) {
+      return KErrNotSupported;
+    }
+
     TInt error = KErrNone;
     if (ServerRunning()) {
         if (!Handle()) {
-            TUid serviceUid = { 0x10009822 };
-            error = CreateSession(KHbServerName, *reinterpret_cast<TVersion*>(&serviceUid), 
-                                  -1, EIpcSession_Unsharable, 0, aStatus);
+            TVersion serverVersion(KHbServerMajor, KHbServerMinor, KHbServerBuild);
+            error = CreateSession(KHbServerName, serverVersion, KNumAsyncMessageSlots,
+                EIpcSession_Unsharable, 0, aStatus);
         }
     } else {
         error = Connect();
@@ -83,25 +96,18 @@
 {
     TRACE_ENTRY
 
-    TInt error = KErrNone;
+    // Check server is not trying to connect to itself
+    if (IsDeviceDialogServer()) {
+      return KErrNotSupported;
+    }
 
-    // Create semaphore. Sserver application signals it after server object is created. Also
-    // existence of the semaphore tells server app that connection is in the progress and it
-    // should not start exiting.
-    RSemaphore serverStartedSema;
-    TBuf<sizeof(KSemaName) + 16> semaName(KSemaName); // name + thread id
-    semaName.AppendNum(RThread().Id().Id(), EHex);
-    error = serverStartedSema.CreateGlobal(semaName, 0, EOwnerProcess);
-    if (error != KErrNone) {
-        return error;
-    }
+    TInt error = KErrNone;
 
     TInt retry(3);
     if (!Handle()) {
-        TUid serviceUid = { 0x10009822 };
-
         forever {
-            error = CreateSession(KHbServerName, *reinterpret_cast<TVersion*>(&serviceUid));
+            TVersion serverVersion(KHbServerMajor, KHbServerMinor, KHbServerBuild);
+            error = CreateSession(KHbServerName, serverVersion, KNumAsyncMessageSlots);
 
             if (error != KErrNotFound && error != KErrServerTerminated) {
                 // KErrNone, KErrPermissionDenied or other serious error.
@@ -113,15 +119,13 @@
                 break;
             }
 
-            error = StartServer(serverStartedSema);
-
+            error = StartServer();
             if (error != KErrNone && error != KErrAlreadyExists) {
                 // Unrecoverable error, return an error.
                 break;
             }
         } // for-loop end
     }
-    serverStartedSema.Close();
     TRACE_EXIT
     return error;
 }
@@ -129,17 +133,12 @@
 /*!
     \internal
 */
-TInt RHbDeviceDialogClientSession::StartServer(RSemaphore &aServerStartedSema)
+TInt RHbDeviceDialogClientSession::StartServer()
 {
     TRACE_ENTRY
     TInt error(KErrNone);
 
-    TFindServer findHbServer(KHbServerName);
-    TFullName name;
-
-    error = findHbServer.Next(name);
-
-    if (error == KErrNone) {
+    if (ServerRunning()) {
         // Already running, return error.
         return KErrAlreadyExists;
     }
@@ -195,23 +194,6 @@
         error = status.Int();
     }
 
-    // QApplication calls Rendezvous() before device dialog server has created server object.
-    // Therefore we wait here for server app to create the server object.
-    if (error == KErrNone || error == KErrAlreadyExists) {
-        forever {
-            findHbServer.Find(KHbServerName);
-            error = findHbServer.Next(name);
-            if (error != KErrNotFound) {
-                break;
-            }
-            if (process.ExitType() != EExitPending) {
-                error = KErrGeneral;
-                break;
-            }
-            const TInt KTimeout = 1000000; // 1 s
-            aServerStartedSema.Wait(KTimeout);
-        }
-    }
     process.Close();
     TRACE_EXIT
     return error;
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/devicedialogbase/hbdevicedialogclientsession_p.h
--- a/src/hbcore/devicedialogbase/hbdevicedialogclientsession_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/devicedialogbase/hbdevicedialogclientsession_p.h	Mon May 03 12:48:33 2010 +0300
@@ -38,7 +38,7 @@
     TBool ServerRunning() const;
     TInt Connect();
     void Close();
-    TInt StartServer(RSemaphore &aServerStartedSema);
+    TInt StartServer();
 
     int SendSyncRequest(int aCommand, int aInt0 = 0);
     int SendSyncRequest(int aCommand, const TDesC8 &aData, TDes8 *aReceiveData = 0);
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/devicedialogbase/hbdevicedialogplugin.cpp
--- a/src/hbcore/devicedialogbase/hbdevicedialogplugin.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/devicedialogbase/hbdevicedialogplugin.cpp	Mon May 03 12:48:33 2010 +0300
@@ -259,8 +259,8 @@
     from the property set. If not set localisable strings are localised by the device
     dialog service.
 
-    \deprecated HbDeviceDialogPlugin::NoLocalisableData. Will be removed as localization
-    is always done by application.
+    \deprecated HbDeviceDialogPlugin::NoLocalisableData
+        is deprecated. Will be removed as localization is always done by application.
 */
 
 /*!
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/devicedialogbase/hbindicator.cpp
--- a/src/hbcore/devicedialogbase/hbindicator.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/devicedialogbase/hbindicator.cpp	Mon May 03 12:48:33 2010 +0300
@@ -39,6 +39,10 @@
     When deactivated, icons are removed from the status
     indicator area and in universal indicator popup.
 
+    User can interact with indicator from the indicator menu. Client is notified about
+    the user interaction via userActivated signal. Interaction notification and data 
+    sent by the indicator is a contract between HbIndicator class and indicator.
+    
     \sa HbIndicatorPluginInterface
 
     \alpha
@@ -63,6 +67,15 @@
     Mask for error type part of the error code.
 */
 
+/*!
+    \fn void userActivated(const QString &type, const QVariantMap &data)
+
+    The class should emit this signal, when client needs to be notified of the
+    user interaction.
+    @param type Type of the indicator that user interacted with.
+    @param data Data sent by indicator.
+*/
+
 #include "hbindicator.h"
 
 #include <QtGlobal>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/devicedialogbase/hbindicator.h
--- a/src/hbcore/devicedialogbase/hbindicator.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/devicedialogbase/hbindicator.h	Mon May 03 12:48:33 2010 +0300
@@ -50,7 +50,10 @@
     bool activate(const QString &indicatorType, const QVariant &parameter = QVariant());
     bool deactivate(const QString &indicatorType, const QVariant &parameter = QVariant());
 
-    int error() const; 
+    int error() const;
+	
+signals:
+    void userActivated(const QString &type, const QVariantMap &data);
 
 protected:
     HbIndicator(HbIndicatorPrivate &dd, QObject *parent = 0);
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/devicedialogbase/hbindicatorsym_p.cpp
--- a/src/hbcore/devicedialogbase/hbindicatorsym_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/devicedialogbase/hbindicatorsym_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -130,7 +130,7 @@
         error = mHbSession.Connect();
     }
 
-    if ( error != KErrNone ) {
+    if ( error != KErrNone && error != KErrAlreadyExists) {
         TRACE("initialize error: " << error);
         setError( HbDeviceDialogConnectError );
         User::LeaveIfError( error );
@@ -230,8 +230,27 @@
     iLastError = HbDeviceDialogNoError;
     TInt status = iStatus.Int();
     iRequesting = EFalse;
-
-    if (status >= 0) {
+    
+    if (status >= 0 && iMsgType == EHbIndicatorUserActivated) {
+		iMsgType = -1;
+		if (status > 0) {
+			delete iBuffer;
+			iBuffer = NULL;
+			iBuffer = HBufC8::NewL(status);
+			iDataPtr.Set(iBuffer->Des());
+			TInt error = mHbSession.SendSyncRequest(EHbSrvActivatedIndicatorData, iDataPtr, &iMsgTypePtr);							                
+		}
+		
+		QByteArray resArray((const char*)iDataPtr.Ptr(), iDataPtr.Size());
+		QDataStream stream(&resArray, QIODevice::ReadOnly);
+		QVariant var;
+		stream >> var;
+		
+		if (q_ptr && q_ptr->receivers(SIGNAL(userActivated(QString, QVariantMap))) > 0) {
+			QVariantMap map = var.toMap();
+			emit q_func()->userActivated(map.value("type").toString(), map.value("data").toMap());
+		} 			
+    } else if (status >= 0) {
         QByteArray resArray( (const char*) iDataPtr.Ptr(), iDataPtr.Size() );
         QDataStream stream( &resArray, QIODevice::ReadOnly);
 
@@ -292,7 +311,7 @@
         setError(status);
     }
 
-    if ( status != KErrServerTerminated ) {
+    if ( status != KErrServerTerminated && status != KErrCancel ) {
         Continue();
     }
     TRACE_EXIT
@@ -329,6 +348,11 @@
     TRACE_ENTRY
 
     if ( !iRequesting && iInitialized && !IsActive() ) {
+		if (!iBuffer) {
+			iBuffer = HBufC8::NewL( 256 );
+			iDataPtr.Set( iBuffer->Des() );
+		}
+		iDataPtr.Zero();
         TPckg<TInt> pckg( iMsgType );
         iMsgTypePtr.Set( pckg ); //iMsgTypePtr is ignored in server side.
     
@@ -372,15 +396,20 @@
 {
     TRACE_ENTRY
     iLastError = HbDeviceDialogNoError;
-
+    
+    TBool listening = (activate && q_ptr->receivers(SIGNAL(userActivated(QString, QVariantMap))) > 0);
+    
     if (!iInitialized) {
-        TRAPD( error, initializeL() );
+						 	
+        TRAPD( error, initializeL(listening) );
 
         if ( error != KErrNone ){
             setError( HbDeviceDialogConnectError );
             TRACE_EXIT_ARGS("error " << error)
             return false;
         }
+    } else if (listening) {
+		Start();
     }
     QByteArray array;
     QDataStream stream( &array, QIODevice::WriteOnly );
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/devicedialogbase/hbindicatorsymbian.cpp
--- a/src/hbcore/devicedialogbase/hbindicatorsymbian.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/devicedialogbase/hbindicatorsymbian.cpp	Mon May 03 12:48:33 2010 +0300
@@ -24,6 +24,21 @@
 ****************************************************************************/
 
 /*!
+    \class MHbIndicatorSymbianObserver
+    \brief MHbIndicatorSymbianObserver is an observer interface for observing CHbIndicatorSymbian.
+*/
+
+/*!
+    \fn void MHbIndicatorSymbianObserver::IndicatorUserActivated(const TDesC& aType, CHbSymbianVariantMap& aData)
+
+    This callback is called when user has interacted with an indicator on the indicator
+    menu.
+    
+    \a aType - Type of the indicator that user interacted with.
+    \a aData - Data sent by the indicator.
+*/
+
+/*!
     \class CHbIndicatorSymbian
     \brief CHbIndicatorSymbian can be used to activate and deactivate indicators. It is a client 
     interface for Symbian applications to Hb indicators.
@@ -37,6 +52,11 @@
     Depending on the indicator implementation, activated indicator may also show up with
     a notification dialog and some indicators can be interacted by the user in universal indicator menu.
 
+    User can interact with an indicator from the indicator menu. Client is notified about
+    the user interaction via MHbIndicatorSymbianObserver observer interface. Interaction 
+    notification and data sent by the indicator is a contract between HbIndicator class 
+    and indicator.
+    
     When deactivated, icons are removed from the status
     indicator area and in universal indicator menu.
 
@@ -64,6 +84,7 @@
     Mask for error type part of the error code.
 */
 
+#include <e32base.h>
 #include <QVariant>
 
 #include "hbindicatorsymbian.h"
@@ -73,10 +94,13 @@
 #include "hbdevicedialogerrors_p.h"
 #include "hbdevicedialogserverdefs_p.h"
 
-class CHbIndicatorSymbianPrivate {
+class CHbIndicatorSymbianPrivate : public CActive {
 public:
-    CHbIndicatorSymbianPrivate() : iInitialized(EFalse), iLastError(HbDeviceDialogNoError) {}
+    CHbIndicatorSymbianPrivate() : CActive(EPriorityStandard), iInitialized(EFalse), iLastError(HbDeviceDialogNoError),   iMsgTypePtr(NULL,0,0),
+    		  iBuffer(NULL),
+    		  iDataPtr(NULL,0,0) { CActiveScheduler::Add(this); }
     ~CHbIndicatorSymbianPrivate() {
+    	Cancel();
         if (iInitialized) {
             iHbSession.Close();
             iInitialized = EFalse;
@@ -89,10 +113,26 @@
     }
     bool sendActivateMessage(const TDesC& aIndicatorType,
             TBool activate, const CHbSymbianVariant* aParameter);
+
+    void Start();
+	    
+protected:	
+    // CActive
+    void RunL();
+    void DoCancel();
+    TInt RunError( TInt aError );
+
 public:
     RHbDeviceDialogClientSession iHbSession;
     TBool iInitialized;
     TInt iLastError;
+    MHbIndicatorSymbianObserver* iObserver;
+    
+    TInt iMsgType;
+    TPtr8 iMsgTypePtr;
+    HBufC8* iBuffer;
+    TPtr8 iDataPtr;
+    TBool iRequesting;
 };
 
 TBool CHbIndicatorSymbianPrivate::Initialize()
@@ -141,9 +181,90 @@
         SetError( error );
         result = false;
     }
+    
+    if (activate && result && iObserver) {
+		Start();
+    }
+       
     return result;
 }
 
+void CHbIndicatorSymbianPrivate::Start()
+	{
+	if (!IsActive() && !iRequesting) {
+		SetActive();
+		if (!iBuffer) {
+			iBuffer = HBufC8::NewL( 256 );		
+			iDataPtr.Set( iBuffer->Des() );
+		}
+		iDataPtr.Zero();
+        TPckg<TInt> pckg( iMsgType );
+        iMsgTypePtr.Set( pckg );
+        iRequesting = ETrue;
+		iHbSession.SendASyncRequest(EHbSrvGetActivatedIndicatorsStart, iDataPtr, iMsgTypePtr, iStatus);
+    }       
+       
+}
+
+void CHbIndicatorSymbianPrivate::RunL()
+{
+	TInt result = iStatus.Int();
+		
+	if (result < KErrNone) {
+		SetError(result);
+		iRequesting = EFalse;
+	} else if (iMsgType == EHbIndicatorUserActivated && result >= 0) {
+		iMsgType = -1;
+		if (result > 0) {		
+			delete iBuffer;
+			iBuffer = NULL;
+			iBuffer = HBufC8::NewL(result);
+			iDataPtr.Set(iBuffer->Des());
+			TInt error = iHbSession.SendSyncRequest(EHbSrvActivatedIndicatorData, iDataPtr, &iMsgTypePtr);							                
+		}
+	
+		QByteArray resArray((const char*)iDataPtr.Ptr(), iDataPtr.Size());
+		QDataStream stream(&resArray, QIODevice::ReadOnly);		
+	
+		QVariant var;
+		stream >> var;
+		QVariantMap varMap = var.toMap();
+	
+		if (iObserver) {
+			QString type = varMap.value("type").toString();
+			TPtrC descriptor(static_cast<const TUint16*>(type.utf16()),
+								type.length());
+			QVariantMap data = varMap.value("data").toMap();
+			
+			CHbSymbianVariantMap* symbianMap =
+				HbSymbianVariantConverter::fromQVariantMapL(data);
+			
+			iObserver->IndicatorUserActivated(descriptor, *symbianMap);
+			delete symbianMap;
+			symbianMap = 0;
+		}
+	}
+    // Make a new request if there were no errors.
+    if ( result != KErrServerTerminated && result != KErrCancel && iRequesting) {        
+		SetActive();
+		iHbSession.SendASyncRequest(EHbSrvGetActivatedIndicatorContinue, iDataPtr, iMsgTypePtr, iStatus);
+    }
+}
+
+void CHbIndicatorSymbianPrivate::DoCancel()
+{
+	if (iRequesting) {
+		iHbSession.SendSyncRequest(EhbSrvGetActivatedIndicatorsClose);
+		iRequesting = EFalse;    
+	}
+}
+
+TInt CHbIndicatorSymbianPrivate::RunError( TInt aError )
+	{
+	SetError(aError);
+	return KErrNone;
+	}
+
 EXPORT_C CHbIndicatorSymbian* CHbIndicatorSymbian::NewL()
     {
     CHbIndicatorSymbian *me = new CHbIndicatorSymbian();
@@ -189,6 +310,11 @@
     return d->iLastError;
 }
 
+EXPORT_C void CHbIndicatorSymbian::SetObserver(MHbIndicatorSymbianObserver* aObserver)
+{
+	d->iObserver = aObserver;
+}
+
 CHbIndicatorSymbian::CHbIndicatorSymbian()
 {
 }
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/devicedialogbase/hbindicatorsymbian.h
--- a/src/hbcore/devicedialogbase/hbindicatorsymbian.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/devicedialogbase/hbindicatorsymbian.h	Mon May 03 12:48:33 2010 +0300
@@ -30,8 +30,15 @@
 #include <e32base.h>
 
 class CHbIndicatorSymbianPrivate;
+class CHbSymbianVariantMap;
 class CHbSymbianVariant;
 
+class MHbIndicatorSymbianObserver
+{
+public:
+    virtual void IndicatorUserActivated(const TDesC& aType, CHbSymbianVariantMap& aData) = 0;
+};
+
 class CHbIndicatorSymbian : public CBase
 {
 public:
@@ -48,10 +55,12 @@
     TBool Deactivate(const TDesC& aIndicatorType, const CHbSymbianVariant* aParameter = 0);
 
     TInt Error() const; 
+    void SetObserver(MHbIndicatorSymbianObserver* aObserver);
 
 private:
     CHbIndicatorSymbian();
     void ConstructL();
+
 private:
     CHbIndicatorSymbianPrivate *d;
 };
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/devicedialogbase/hbindicatorwin32_p.cpp
--- a/src/hbcore/devicedialogbase/hbindicatorwin32_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/devicedialogbase/hbindicatorwin32_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -43,7 +43,7 @@
 // Indicators are implemented only for Symbian/S60 OS. All others use a stub which shows
 // indicators in the calling process.
 HbIndicatorPrivate::HbIndicatorPrivate()
-: iLastError( HbDeviceDialogNoError ), iListening(false)
+: q_ptr(0), iLastError( HbDeviceDialogNoError ), iListening(false)
 {
 }
 
@@ -64,6 +64,11 @@
         HbIndicatorPrivate::pluginManager();
     QVariantMap securityCredentials;
     pluginManager->addIndicator(indicatorType, securityCredentials, &result);
+    if (q_ptr && q_ptr->receivers(SIGNAL(userActivated(QString, QVariantMap))) > 0) {
+        connect(pluginManager, SIGNAL(indicatorUserActivated(QVariantMap)), 
+				this, SLOT(indicatorUserActivated(QVariantMap)));
+    }
+
     if (result == 0) {
         pluginManager->activateIndicator(indicatorType, parameter, securityCredentials);
     } else {
@@ -76,9 +81,15 @@
 bool HbIndicatorPrivate::deactivate(const QString &indicatorType, const QVariant &parameter)
 {
     pluginManager()->deactivateIndicator(indicatorType, parameter, QVariantMap());
+    pluginManager()->disconnect(this, SLOT(indicatorUserActivated(QVariantMap)));
     return true;
 }
 
+void HbIndicatorPrivate::indicatorUserActivated(const QVariantMap& data)
+{    
+    emit q_ptr->userActivated(data.value("type").toString(), data.value("data").toMap());
+}
+
 bool HbIndicatorPrivate::startListen()
 {
     HbIndicatorPluginManager *pluginManager =
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/devicedialogbase/hbindicatorwin32_p.h
--- a/src/hbcore/devicedialogbase/hbindicatorwin32_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/devicedialogbase/hbindicatorwin32_p.h	Mon May 03 12:48:33 2010 +0300
@@ -76,6 +76,7 @@
     void indicatorActivated(const IndicatorClientInfo &clientInfo);
     void indicatorUpdated(const IndicatorClientInfo &clientInfo);
     void indicatorRemoved(const IndicatorClientInfo &clientInfo);
+    void indicatorUserActivated(const QVariantMap& data);
 private:
     void timerEvent(QTimerEvent *event);
     
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/devicedialogbase/hbsymbiandevicedialog.cpp
--- a/src/hbcore/devicedialogbase/hbsymbiandevicedialog.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/devicedialogbase/hbsymbiandevicedialog.cpp	Mon May 03 12:48:33 2010 +0300
@@ -40,7 +40,9 @@
 
  CHbDeviceDialog displays dialogs on top of applications. It is a client interface for Symbian applications to
  Hb device dialogs.
- \deprecated this class is deprecated, use CHbDeviceDialogSymbian instead.
+
+ \deprecated CHbDeviceDialog
+     is deprecated. Replaced by a class CHbDeviceDialogSymbian.
 
  \sa HbDeviceDialog
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/devicedialogbase/hbtextresolversymbian.cpp
--- a/src/hbcore/devicedialogbase/hbtextresolversymbian.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/devicedialogbase/hbtextresolversymbian.cpp	Mon May 03 12:48:33 2010 +0300
@@ -239,7 +239,6 @@
         <translation>Text test</translation>
     </message>
     
-
     _LIT(KTextTest, "text_test");
     // returns the string "Text test"
     HBufC* tmp = HbTextResolverSymbian::LoadL(KTextTest);
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/effects/effects.pri
--- a/src/hbcore/effects/effects.pri	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/effects/effects.pri	Mon May 03 12:48:33 2010 +0300
@@ -25,29 +25,29 @@
 INCLUDEPATH += $$PWD
 DEPENDPATH += $$PWD
 PUBLIC_HEADERS += $$PWD/hbeffect.h
-INTERNAL_HEADERS += $$PWD/hbeffect_p.h
-INTERNAL_HEADERS += $$PWD/hbeffectabstract_p.h
-INTERNAL_HEADERS += $$PWD/hbeffectcontroller_p.h
-INTERNAL_HEADERS += $$PWD/hbeffectdef_p.h
-INTERNAL_HEADERS += $$PWD/hbeffectfactory_p.h
-INTERNAL_HEADERS += $$PWD/hbeffectfxmldata_p.h
-INTERNAL_HEADERS += $$PWD/hbeffectgroup_p.h
-INTERNAL_HEADERS += $$PWD/hbeffectinternal_p.h
-INTERNAL_HEADERS += $$PWD/hbeffectopacity_p.h
-INTERNAL_HEADERS += $$PWD/hbeffectrotate_p.h
-INTERNAL_HEADERS += $$PWD/hbeffectscale_p.h
-INTERNAL_HEADERS += $$PWD/hbeffectscaleanimation_p.h
-INTERNAL_HEADERS += $$PWD/hbeffecttranslate_p.h
-INTERNAL_HEADERS += $$PWD/hbeffectutils_p.h
-INTERNAL_HEADERS += $$PWD/hbeffectxmlparser_p.h
-INTERNAL_HEADERS += $$PWD/hbeffectblur_p.h
-INTERNAL_HEADERS += $$PWD/hbeffectdropshadow_p.h
-INTERNAL_HEADERS += $$PWD/hbeffectfilter_p.h
-INTERNAL_HEADERS += $$PWD/hbeffecthsl_p.h
-INTERNAL_HEADERS += $$PWD/hbeffectbc_p.h
-INTERNAL_HEADERS += $$PWD/hbeffectcolorize_p.h
-INTERNAL_HEADERS += $$PWD/hbeffectplanarreflection_p.h
-INTERNAL_HEADERS += $$PWD/hbeffectanimation_p.h
+PRIVATE_HEADERS += $$PWD/hbeffect_p.h
+PRIVATE_HEADERS += $$PWD/hbeffectabstract_p.h
+PRIVATE_HEADERS += $$PWD/hbeffectcontroller_p.h
+PRIVATE_HEADERS += $$PWD/hbeffectdef_p.h
+PRIVATE_HEADERS += $$PWD/hbeffectfactory_p.h
+PRIVATE_HEADERS += $$PWD/hbeffectfxmldata_p.h
+PRIVATE_HEADERS += $$PWD/hbeffectgroup_p.h
+PRIVATE_HEADERS += $$PWD/hbeffectinternal_p.h
+PRIVATE_HEADERS += $$PWD/hbeffectopacity_p.h
+PRIVATE_HEADERS += $$PWD/hbeffectrotate_p.h
+PRIVATE_HEADERS += $$PWD/hbeffectscale_p.h
+PRIVATE_HEADERS += $$PWD/hbeffectscaleanimation_p.h
+PRIVATE_HEADERS += $$PWD/hbeffecttranslate_p.h
+PRIVATE_HEADERS += $$PWD/hbeffectutils_p.h
+PRIVATE_HEADERS += $$PWD/hbeffectxmlparser_p.h
+PRIVATE_HEADERS += $$PWD/hbeffectblur_p.h
+PRIVATE_HEADERS += $$PWD/hbeffectdropshadow_p.h
+PRIVATE_HEADERS += $$PWD/hbeffectfilter_p.h
+PRIVATE_HEADERS += $$PWD/hbeffecthsl_p.h
+PRIVATE_HEADERS += $$PWD/hbeffectbc_p.h
+PRIVATE_HEADERS += $$PWD/hbeffectcolorize_p.h
+PRIVATE_HEADERS += $$PWD/hbeffectplanarreflection_p.h
+PRIVATE_HEADERS += $$PWD/hbeffectanimation_p.h
 
 SOURCES += $$PWD/hbeffect.cpp
 SOURCES += $$PWD/hbeffectblur.cpp
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/effects/hbeffect.cpp
--- a/src/hbcore/effects/hbeffect.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/effects/hbeffect.cpp	Mon May 03 12:48:33 2010 +0300
@@ -179,12 +179,12 @@
                      while (e != d.mEventEffectList.end()) {
                          if (e.value() == group) { // found, erase from event effect list
                              d.mEventEffectList.erase(e);
+							 delete group; // once removed from list, delete group
                              e = d.mEventEffectList.end();
                          }
                          else
                             e++;  // try next one
                      }
-                     delete group; // once removed from list, delete group
                 }
             }
         }
@@ -436,6 +436,7 @@
     Q_UNUSED(item);
     Q_UNUSED(filePath);
     Q_UNUSED(effectEvent);
+    return false;
 #else
     return HbEffectInternal::add(item, filePath, effectEvent);
 #endif //HB_EFFECT_API_OFF
@@ -619,7 +620,7 @@
     Q_UNUSED(extRect)
     return false;
 #else
-    return HbEffectInternal::start(item, item, false, itemType, effectEvent, receiver, member, userData, extRect);
+    return HbEffectInternal::start(item, item, HbEffectInternal::Normal, itemType, effectEvent, receiver, member, userData, extRect);
 #endif //HB_EFFECT_API_OFF
 }
 
@@ -823,9 +824,9 @@
   \param effectEvent  String identifying effect-event type (eg "appear"). If
   not passed, all the effects running currently on the item are canceled.
 
-  \param hideEffect   If false, the effect is left in its end state in the
-                      graphics item.  If true, the effect is hidden from the
-                      graphics item.
+  \param clearEffect   If false, the effect is left in its end state in the
+                       graphics item.  If true, the effect is hidden from the
+                       graphics item.
 
   \param sendCallback   Optional boolean parameter (true if omitted), which
                         controls if the cancel call results to our
@@ -846,19 +847,19 @@
 bool HbEffect::cancel(
     QGraphicsItem *item,
     const QString &effectEvent,
-    bool hideEffect,
+    bool clearEffect,
     bool sendCallback,
     bool itemIsValid)
 {
 #ifdef HB_EFFECT_API_OFF
     Q_UNUSED(item);
     Q_UNUSED(effectEvent);
-    Q_UNUSED(hideEffect);
+    Q_UNUSED(clearEffect);
     Q_UNUSED(sendCallback);
     Q_UNUSED(itemIsValid);
     return false;
 #else 
-    if ( privateDestroyed ) {
+    if (privateDestroyed) {
         return false;
     }
 
@@ -867,9 +868,7 @@
     if (effectEvent.isEmpty()) {
         // Stop all the effects running on item at that point of time.
         // (iterator way had some problem and caused crash so using foreach)
-
         QList<HbEffectGroup *> groupsToBeCanceled;
-
         foreach (const EffectMapKey &key, d.mEventEffectList.keys()) {
             if (key.mItem == item) {
                 HbEffectGroup* group = d.mEventEffectList.take(key);
@@ -884,11 +883,10 @@
         fixEffectGroupOrder(&groupsToBeCanceled);
 
         bool first = true;
-
-        foreach(HbEffectGroup *group, groupsToBeCanceled) {
-            // If hideEffect is false then it is important to pass a default transform
+        foreach (HbEffectGroup *group, groupsToBeCanceled) {
+            // If clearEffect is false then it is important to pass a default transform
             // first so the matrix multiplication in cancelAll ends up correct.
-            group->cancelAll(sendCallback, itemIsValid, hideEffect, first || !itemIsValid ? QTransform() : item->transform());
+            group->cancelAll(sendCallback, itemIsValid, clearEffect, first || !itemIsValid ? QTransform() : item->transform());
             if (first) {
                 first = false;
             }
@@ -896,14 +894,12 @@
             // return true if any of the effect was canceled
             ret = true;
         }
-
         return ret;
-    }
-    else {
+    } else {
         EffectMapKey key(item, effectEvent);
         HbEffectGroup* group = d.mEventEffectList.take(key);
         if (group) {
-            group->cancelAll(sendCallback, itemIsValid, hideEffect);
+            group->cancelAll(sendCallback, itemIsValid, clearEffect);
             delete group;
             return true;
         } else {
@@ -983,10 +979,7 @@
     QRectF bRect;
     // viewportitem is used as a boundingrect since viewport item gets resized when changing orientation
     if( mMainWindow ) {
-        QGraphicsWidget *viewPortItem = mMainWindow->element(HbMainWindow::ViewportItem);
-        if( viewPortItem ) {
-            bRect.setRect( 0,0,viewPortItem->geometry().width(),viewPortItem->geometry().height() );
-        }
+        bRect = mMainWindow->layoutRect();
     }
     return bRect;
 }
@@ -1221,9 +1214,7 @@
     for (int i=0; i < newDataList.count(); i++) {
         HbEffectInfo effectData = newDataList.at(i);            
         bool ret = false;
-        QStringList  splitList = effectData.xmlFileFullPath().split(QRegExp("[\\\\ /]"));
-        QString relativename = splitList.takeLast();
-        relativename.chop(5);
+        QString relativename = QFileInfo(effectData.xmlFileFullPath()).baseName();
         if (effectData.item() != 0) {
             ret = d.mController.addFXML(effectData.item(), relativename,
                                         effectData.effectEvent(), true);
@@ -1282,7 +1273,7 @@
   Like cancelAll() but no observers are invoked and items are not assumed to
   be valid anymore.
  */
-void HbEffectInternal::safeCancelAll()
+void HbEffectInternal::safeCancelAll(bool clear)
 {
     QList<HbEffectGroup *> groupsToBeCanceled;
     foreach (HbEffectGroup *group, d.mEventEffectList) {
@@ -1290,7 +1281,7 @@
     }
     foreach (HbEffectGroup *group, groupsToBeCanceled) {
         if (d.mEventEffectList.values().contains(group)) {
-            group->cancelAll(false, false);
+            group->cancelAll(false, false, clear);
         }
     }
 }
@@ -1337,6 +1328,20 @@
     }
 }
 
+inline void updateGroup(HbEffectGroup *group,
+                        QObject *receiver,
+                        const char *member,
+                        const QVariant &userData,
+                        const QRectF &extRect,
+                        HbEffectInternal::EffectFlags flags)
+
+{
+    group->setObserver(receiver, member ? QString(member) : QString());
+    group->setUserData(userData);
+    group->setExtRect(extRect);
+    group->setEffectFlags(flags);
+}
+
 /*!
   The real implementation for HbEffect::start().
 
@@ -1355,15 +1360,19 @@
   possibility) of having separate registration and target items is not exposed to the
   users of the HbEffect API in any way.
 
-  When \a hideWhenFinished is true (it is typically false when coming from the standard
-  HbEffect APIs) the effect is always hidden when it is finished or canceled (similarly to
-  when cancel() is called with hideEffect set to true).
+  When ClearEffectWhenFinished is set (it is typically not set when coming from the standard
+  HbEffect APIs) the effect is always removed when it is finished or canceled (similarly to
+  when cancel() is called with clearEffect set to true).
+
+  When ShowItemOnFirstUpdate is set, the target and registration items are set to visible
+  after the effects have been first applied. This flag is useful in certain cases to make
+  sure there is no flickering.
 
   \sa HbEffect::start()
  */
 bool HbEffectInternal::start(QGraphicsItem *registrationItem,
                              QGraphicsItem *targetItem,
-                             bool hideWhenFinished,
+                             EffectFlags flags,
                              const QString &itemType, 
                              const QString &effectEvent,
                              QObject *receiver,
@@ -1429,7 +1438,14 @@
                 QGenericReturnArgument(),
                 Q_ARG(HbEffect::EffectStatus, status));
         }
-
+        if (flags.testFlag(HbEffectInternal::ShowItemOnFirstUpdate)) {
+            if (targetItem) {
+                targetItem->setVisible(true);
+            }
+            if (registrationItem && registrationItem != targetItem) {
+                registrationItem->setVisible(true);
+            }
+        }
         return false;
     }
 
@@ -1449,15 +1465,12 @@
     if(e != d.mEventEffectList.end()) {
         HbEffectGroup *group = e.value();
         if (!group->dirty()) {
-            // if the effect group is not dirty, restart it. Cancel possible earlier effect first so that
-            // end position gets correct.
+            // if the effect group is not dirty, restart it. Cancel possible earlier
+            // effect first so that end position gets correct.
             group->cancelAll(true);
             
             // Update with given notification parameters
-            group->setObserver(receiver, member ? QString(member) : QString());
-            group->setUserData(userData);
-            group->setExtRect(extRect);
-            group->setHideWhenFinished(hideWhenFinished);
+            updateGroup(group, receiver, member, userData, extRect, flags);
 
             group->startAll();
             started = true;
@@ -1470,17 +1483,14 @@
     if (!started) {
         // Create the effect.
         HbEffectGroup *group = d.mFactory.createEffect(registrationItem, targetItem, itemType, effectEvent);
-        
-        group->setObserver(receiver, member ? QString(member) : QString());
-        group->setUserData(userData);
-        group->setExtRect(extRect);
-        group->setHideWhenFinished(hideWhenFinished);
+
+        updateGroup(group, receiver, member, userData, extRect, flags);
 
         // Store effect to support cancelation and deletion of effect
         d.mEventEffectList.insert(key, group);
         group->startAll();
         // check if definition had effects
-        if( group->effectCount() == 0 ){
+        if (group->effectCount() == 0) {
 #ifdef HBEFFECT_WARNING
             qWarning("HbEffect Warning: Starting effect with effect count zero");
 #endif //HBEFFECT_WARNING
@@ -1496,19 +1506,20 @@
  */
 bool HbEffectInternal::start(QGraphicsItem *registrationItem,
                              QGraphicsItem *targetItem,
-                             bool hideWhenFinished,
+                             EffectFlags flags,
                              const QString &effectEvent,
                              QObject *receiver,
                              const char *member,
                              const QVariant &userData,
                              const QRectF &extRect)
 {
-    return HbEffectInternal::start(registrationItem, targetItem, hideWhenFinished,
+    return HbEffectInternal::start(registrationItem, targetItem, flags,
                                    HB_EFFECT_INTERNAL_ITEM,
                                    effectEvent, receiver, member, userData, extRect);
 }
 
-/*!  By default effects are enabled. However with this function every effect can
+/*!
+  By default effects are enabled. However with this function every effect can
   be disabled, meaning that HbEffect::start() will have no effect (and will
   always return false).
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/effects/hbeffect.h
--- a/src/hbcore/effects/hbeffect.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/effects/hbeffect.h	Mon May 03 12:48:33 2010 +0300
@@ -75,7 +75,7 @@
     static bool cancel(
         QGraphicsItem *item,
         const QString &effectEvent = QString(),
-        bool hideEffect = false,
+        bool clearEffect = false,
         bool sendCallback = true,
         bool itemIsValid = true);
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/effects/hbeffectanimation.cpp
--- a/src/hbcore/effects/hbeffectanimation.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/effects/hbeffectanimation.cpp	Mon May 03 12:48:33 2010 +0300
@@ -22,6 +22,7 @@
 ** Nokia at developer.feedback@nokia.com.
 **
 ****************************************************************************/
+
 #include <hbglobal.h>
 #include "hbeffectanimation_p.h"
 #include "hbeffectgroup_p.h"
@@ -30,8 +31,8 @@
 #include <QGraphicsItem>
 #include <QtDebug>
 
-HbEffectAnimation::HbEffectAnimation() :
-    QVariantAnimation(),
+HbEffectAnimation::HbEffectAnimation(HbEffectGroup *group) :
+    mGroup(group),
     mCurve(QEasingCurve::Linear),
     mLoopStart(-1),
     mLoopEnd(-1),
@@ -45,7 +46,7 @@
 {
 }
 
-void HbEffectAnimation::addLooping(const HbEffectFxmlParamData *param, HbEffectGroup *group)
+void HbEffectAnimation::addLooping(const HbEffectFxmlParamData *param)
 {
     if (param) {
         if (param->loopDefined()) {
@@ -62,7 +63,7 @@
             if (loopEnd > loopStart) {
                 mLoopStart = loopStart;
                 mLoopEnd = loopEnd;
-                group->setLooping(true);
+                mGroup->setLooping(true);
             }
         }
     }
@@ -75,8 +76,9 @@
     }
 
     // If there is a loop defined, check whether the current time of
-    // the animation is past the loop end. If it is, do not update the effect with that value
-    // but instead change the current time back to (loopStartTime + currentTime - LoopEndTime).
+    // the animation is past the loop end. If it is, do not update the
+    // effect with that value but instead change the current time back
+    // to (loopStartTime + currentTime - LoopEndTime).
 
     if (looping()) {
         int current = currentTime();
@@ -90,8 +92,6 @@
                 newCurrentTime = mLoopEnd;
             }
 
-            //qDebug() << "Loop restarted: current time changed from" << current << "to" << newCurrentTime;
-            
             // Set the current time of the animation according to the defined loop,
             // it will create a callback to this function again.
             setCurrentTime(newCurrentTime);
@@ -99,7 +99,7 @@
         }
     }
 
-    // Create a callback to derived classes
+    // Let the derived classes handle the value change.
     handleAnimationUpdate(value);
 }
 
@@ -115,8 +115,6 @@
         if (newCurrentTime > mLoopEnd) {
             newCurrentTime = mLoopEnd;
         }
-
-        //qDebug() << "Loop restarted: current time changed from" << current << "to" << newCurrentTime;
         
         // Temporarily prevent the animation from reacting to update request,
         // because start() causes update with time=0 and the loop might start from a later point of time.
@@ -147,7 +145,3 @@
 }
 
 // End of File
-
-
-
-
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/effects/hbeffectanimation_p.h
--- a/src/hbcore/effects/hbeffectanimation_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/effects/hbeffectanimation_p.h	Mon May 03 12:48:33 2010 +0300
@@ -36,10 +36,10 @@
 {
     Q_OBJECT
 public:
-    HbEffectAnimation();
+    HbEffectAnimation(HbEffectGroup *group);
     virtual ~HbEffectAnimation();
 
-    void addLooping(const HbEffectFxmlParamData *param, HbEffectGroup *group);
+    void addLooping(const HbEffectFxmlParamData *param);
 
     virtual void handleAnimationUpdate(const QVariant &value) = 0;
     virtual void handleAnimationFinish() = 0;
@@ -49,12 +49,13 @@
 
 private:
     void updateCurrentValue(const QVariant &value);
-    inline bool looping() const {return mLoopEnd > 0;}
+    inline bool looping() const { return mLoopEnd > 0; }
 
 private slots:
     void handleFinished();
 
 public:
+    HbEffectGroup *mGroup;
     // The curve is stored here instead of setting it to QVariantAnimation so that it uses linear curve always
     // and does not mess up with applying the curve to each keyframe separately.
     QEasingCurve mCurve;
@@ -65,4 +66,3 @@
 };
 
 #endif // HB_EFFECT_ANIMATION_P_H
-
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/effects/hbeffectblur.cpp
--- a/src/hbcore/effects/hbeffectblur.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/effects/hbeffectblur.cpp	Mon May 03 12:48:33 2010 +0300
@@ -129,19 +129,6 @@
         if (mAnimationO) {
             mVgBlur->setOpacity(qVariantValue<qreal>(mAnimationO->currentValue()));
         }
-
-#if 0 // Enable for debugging parameters given to the openVG filter
-        QString opacityString;
-        if (mAnimationO) {
-            opacityString.setNum(qVariantValue<qreal>(mAnimationO->currentValue()));
-        }
-        else {
-            opacityString = "N/A";
-        }
-
-        qDebug() << "HbEffectBlur: Updating filter with radius = (" << blurRadius.x() << "," << blurRadius.y()
-                 << ") - Opacity =" << opacityString;
-#endif
     }
 }
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/effects/hbeffectcontroller.cpp
--- a/src/hbcore/effects/hbeffectcontroller.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/effects/hbeffectcontroller.cpp	Mon May 03 12:48:33 2010 +0300
@@ -190,7 +190,7 @@
     } else {
         // Try the theme, will return the same name if not found in the theme.
         bool temp;
-        return HbEffectTheme::global()->getEffectXml(fn, fromTheme ? *fromTheme : temp);
+        return HbEffectTheme::instance()->getEffectXml(fn, fromTheme ? *fromTheme : temp);
     }
 }
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/effects/hbeffectfilter.cpp
--- a/src/hbcore/effects/hbeffectfilter.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/effects/hbeffectfilter.cpp	Mon May 03 12:48:33 2010 +0300
@@ -33,8 +33,10 @@
 #include <QGraphicsItem>
 #include <QtDebug>
 
-HbEffectFilterAnimation::HbEffectFilterAnimation(HbEffectFilter *effect, int duration) :
-    HbEffectAnimation(),
+HbEffectFilterAnimation::HbEffectFilterAnimation(HbEffectFilter *effect,
+                                                 int duration,
+                                                 HbEffectGroup *group)
+    : HbEffectAnimation(group),
     mEffect(effect)
 {
     setDuration(duration);
@@ -49,7 +51,6 @@
     Q_UNUSED(value);
 
     // Effect instance updates the vgEffect for all the filter animations
-    //qDebug() << "Updating filter with current time" << currentTime();
     mEffect->updateFilterEffect();
 }
 
@@ -59,8 +60,8 @@
     mEffect->handleAnimationFinished();
 }
 
-HbEffectColorAnimation::HbEffectColorAnimation(HbEffectFilter *effect, int duration) :
-    HbEffectFilterAnimation(effect, duration)
+HbEffectColorAnimation::HbEffectColorAnimation(HbEffectFilter *effect, int duration, HbEffectGroup *group)
+    : HbEffectFilterAnimation(effect, duration, group)
 {
 }
     
@@ -213,7 +214,7 @@
     // Create animation if the duration was defined
     if (duration > 0) {
         mEffectDefined = true;
-        anim = new HbEffectFilterAnimation(this, duration);
+        anim = new HbEffectFilterAnimation(this, duration, group);
         mAnimations.append(anim);
         // Go through keyframes
         foreach(const HbKeyFrame &kf, keyFrameList) {
@@ -234,7 +235,7 @@
         anim->mCurve = curve;
 
         // Get loop parameters
-        anim->addLooping(&param, group);
+        anim->addLooping(&param);
     }
 
     // Return animation instance or NULL if not created
@@ -269,7 +270,7 @@
     // Create animation if the duration was defined
     if (duration > 0) {
         mEffectDefined = true;
-        anim = new HbEffectColorAnimation(this, duration);
+        anim = new HbEffectColorAnimation(this, duration, group);
         mAnimations.append(anim);
         // Go through keyframes
         foreach(const HbKeyFrame &kf, keyFrameList) {
@@ -291,7 +292,7 @@
         anim->mCurve = curve;
 
         // Get loop parameters
-        anim->addLooping(&param, group);
+        anim->addLooping(&param);
     }
 
     // Return animation instance or NULL if not created
@@ -318,8 +319,6 @@
             anim->setCurrentTime(anim->duration());
         }
 
-        //qDebug() << "HbEffectFilter::HandleAnimationFinished";
-
         Hb::EffectEvent reason = mAnimations.count() ? Hb::EffectFinished : Hb::EffectNotStarted;
         group()->effectFinished(reason);
     }
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/effects/hbeffectfilter_p.h
--- a/src/hbcore/effects/hbeffectfilter_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/effects/hbeffectfilter_p.h	Mon May 03 12:48:33 2010 +0300
@@ -46,7 +46,7 @@
 class HB_AUTOTEST_EXPORT HbEffectFilterAnimation : public HbEffectAnimation
 {
 public:
-    HbEffectFilterAnimation(HbEffectFilter *effect, int duration);
+    HbEffectFilterAnimation(HbEffectFilter *effect, int duration, HbEffectGroup *group);
     ~HbEffectFilterAnimation();
 
 private:
@@ -60,7 +60,7 @@
 class HB_AUTOTEST_EXPORT HbEffectColorAnimation : public HbEffectFilterAnimation
 {
 public:
-    HbEffectColorAnimation(HbEffectFilter *effect, int duration);
+    HbEffectColorAnimation(HbEffectFilter *effect, int duration, HbEffectGroup *group);
     ~HbEffectColorAnimation();
 
 private:
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/effects/hbeffectgroup.cpp
--- a/src/hbcore/effects/hbeffectgroup.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/effects/hbeffectgroup.cpp	Mon May 03 12:48:33 2010 +0300
@@ -28,7 +28,6 @@
 #include "hbeffect.h"
 #include "hbtimer_p.h"
 #include "hbeffectdef_p.h"
-#include "hbeffectinternal_p.h"
 #include "hbmainwindow.h"
 #include "hbinstance.h"
 
@@ -38,14 +37,12 @@
 #include <QGraphicsItem>
 #include <QGraphicsWidget>
 #include <QGraphicsView>
-#include <QTimer>
 
 #ifdef HB_FILTER_EFFECTS
 #include "hbvgeffect_p.h"
 #include "hbvgchainedeffect_p.h"
 #endif
 
-
 HbEffectGroup::HbEffectGroup(
     const QString &effectEventType, 
     QGraphicsItem *registrationItem, 
@@ -63,7 +60,9 @@
       mRunningState(NotRunning),
       mLooping(false),
       mView(0),
-      mHideWhenFinished(false)
+      mEffectFlags(HbEffectInternal::Normal),
+      mRegItemHidden(false),
+      mTargetItemHidden(false)
 {
 }
 
@@ -158,14 +157,15 @@
     }
     QTransform transform;
 
-    Q_FOREACH(HbEffectAbstract *effect, mEffects) {
+    foreach (HbEffectAbstract *effect, mEffects) {
         if (effect)
             effect->updateItemTransform(transform);
     }
-    if (!gv)
-        mTargetItem->setTransform(transform);	
-    else 
+    if (!gv) {
+        mTargetItem->setTransform(transform);
+    } else {
         gv->setTransform(transform);
+    }
 }
 
 bool HbEffectGroup::dirty() const
@@ -200,14 +200,14 @@
 
 void HbEffectGroup::pause()
 {
-    Q_FOREACH(HbEffectAbstract *effect, mEffects) {
+    foreach (HbEffectAbstract *effect, mEffects) {
         effect->pause();
     }
 }
 
 void HbEffectGroup::resume()
 {
-    Q_FOREACH(HbEffectAbstract *effect, mEffects) {
+    foreach (HbEffectAbstract *effect, mEffects) {
         effect->resume();
     }
 }
@@ -302,10 +302,8 @@
 
     // First resolve parameters and set the start states for all the effects.
     // This is done before starting the effect animations to avoid screen flickering.
-
     QTransform transform;
-
-    Q_FOREACH(HbEffectAbstract *effect, mEffects) {
+    foreach (HbEffectAbstract *effect, mEffects) {
         // Resolve parameters etc.
         effect->init();
         if (effect->interval() == 0) {
@@ -313,15 +311,28 @@
             effect->setStartState(transform);
         }
     }
+    mTargetItem->setTransform(transform);
 
-    mTargetItem->setTransform(transform);
+    // Make the target item visible, if needed, now that the start state is set
+    // for all the effects.
+    if (mEffectFlags.testFlag(HbEffectInternal::ShowItemOnFirstUpdate)) {
+        // In case of a view switch the registration item may be the HbView
+        // itself and the target item is just the view's content widget. Make
+        // sure both are visible.
+        mTargetItem->setVisible(true);
+        if (mRegistrationItem != mTargetItem) {
+            mRegistrationItem->setVisible(true);
+        }
+    }
+
+    mRegItemHidden = false;
+    mTargetItemHidden = false;
 
     if (mEffects.empty()) {
         // No effect exists but user wants notification when effect finishes. 
         // Let the user do whatever he wanted to do when effect finishes.
         invokeObserver(Hb::EffectNotStarted);
-    }        
-    else {
+    } else {
         // Start state has been set for all the effects,
         // next step is to start the effect animations.
         // Before that, resolve the view where the effect belongs if the effect is looping.
@@ -329,8 +340,7 @@
         if (isLooping()) {
             resolveView();
         }
-
-        Q_FOREACH(HbEffectAbstract *effect, mEffects) {
+        foreach (HbEffectAbstract *effect, mEffects) {
             // If the starttime is zero, start effect immediately
             if (effect->interval() == 0) {
                 effect->start(); // This may call group's effectFinished if the effect was empty.
@@ -342,18 +352,17 @@
     }
 }
 
-void HbEffectGroup::resolveView() {
-    if (!mView) {
-        if (mTargetItem) {
-            QGraphicsScene *scene = mTargetItem->scene();
-            if (scene) {
-                // Resolve the main window having the same scene that the item belongs to
-                QList<HbMainWindow *> windowList = hbInstance->allMainWindows();
-                Q_FOREACH(const HbMainWindow *window, windowList) {
-                    if (window->scene() == scene) {
-                        mView = window->currentView();
-                        break;
-                    }
+void HbEffectGroup::resolveView()
+{
+    if (!mView && mTargetItem) {
+        QGraphicsScene *scene = mTargetItem->scene();
+        if (scene) {
+            // Resolve the main window having the same scene that the item belongs to
+            QList<HbMainWindow *> windowList = hbInstance->allMainWindows();
+            foreach (const HbMainWindow *window, windowList) {
+                if (window->scene() == scene) {
+                    mView = window->currentView();
+                    break;
                 }
             }
         }
@@ -362,18 +371,17 @@
 
 bool HbEffectGroup::hasTranslateEffect() const
 {
-    foreach(HbEffectAbstract *effect, mEffects) {
+    foreach (HbEffectAbstract *effect, mEffects) {
         if (effect->name() == HB_EFFECT_NAME_TRANSLATE) {
             return true;
         }
     }
-
     return false;
 }
 
 bool HbEffectGroup::hasRotateEffect() const
 {
-    foreach(HbEffectAbstract *effect, mEffects) {
+    foreach (HbEffectAbstract *effect, mEffects) {
         if (effect->name() == HB_EFFECT_NAME_ROTATE) {
             return true;
         }
@@ -384,45 +392,67 @@
 
 bool HbEffectGroup::hasScaleEffect() const
 {
-    foreach(HbEffectAbstract *effect, mEffects) {
+    foreach (HbEffectAbstract *effect, mEffects) {
         if (effect->name() == HB_EFFECT_NAME_SCALE) {
             return true;
         }
     }
-
     return false;
 }
 
 bool HbEffectGroup::hasOpacityEffect() const
 {
-    foreach(HbEffectAbstract *effect, mEffects) {
+    foreach (HbEffectAbstract *effect, mEffects) {
         if (effect->name() == HB_EFFECT_NAME_OPACITY) {
             return true;
         }
     }
-
     return false;
 }
 
-void HbEffectGroup::doHideEffect(const QTransform *transform, bool opacityEffectUsed)
+void HbEffectGroup::doClearEffect(const QTransform *transform, bool opacityEffectUsed)
 {
+    // Hide registration item if needed.
+    if (mEffectFlags.testFlag(HbEffectInternal::HideRegItemBeforeClearingEffect)) {
+        // We get here also from cancelAll() when starting a new effect so there
+        // must be some guarding to do the hiding only once.
+        if (!mRegItemHidden) {
+            mRegItemHidden = true;
+            // This flag affects the registration item only.
+            mRegistrationItem->setVisible(false);
+        }
+    }
+    // Same for the target item.
+    if (mEffectFlags.testFlag(HbEffectInternal::HideTargetItemBeforeClearingEffect)) {
+        if (!mTargetItemHidden) {
+            mTargetItemHidden = true;
+            mTargetItem->setVisible(false);
+        }
+    }
+    // Reset the transformation.
     mTargetItem->setTransform(transform ? *transform : QTransform());
+    // Reset opacity.
     if (opacityEffectUsed) {
         // Hide opacity effect by setting item fully opaque regardless of what
         // its opacity value was before the effect.
         mTargetItem->setOpacity(1.0f);
     }
+    // Reset filter effects.
 #ifdef HB_FILTER_EFFECTS            
     deactivateVgEffect();
 #endif            
 }
 
-void HbEffectGroup::cancelAll(bool sendCallback, bool itemIsValid, bool hideEffect, const QTransform &initialItemTransform)
+void HbEffectGroup::cancelAll(bool sendCallback, bool itemIsValid, bool clearEffect, const QTransform &initialItemTransform)
 {
+    // No checks for running state here. The cancellation (esp. the clearing of
+    // the effect (if needed)) must be done always, regardless of the effect's
+    // state.
+
     QTransform transform;
     bool opacityEffectUsed = false;
 
-    Q_FOREACH(HbEffectAbstract *effect, mEffects) {
+    foreach (HbEffectAbstract *effect, mEffects) {
         if (effect) {
             HbTimer::instance()->unregisterEntry(effect);
             effect->cancel(transform, itemIsValid);
@@ -434,8 +464,8 @@
 
     if (itemIsValid) {
         // If effect needs to be removed, reset transform matrix and deactivate VG effect
-        if (hideEffect || mHideWhenFinished) {
-            doHideEffect(&initialItemTransform, opacityEffectUsed);
+        if (clearEffect || mEffectFlags.testFlag(HbEffectInternal::ClearEffectWhenFinished)) {
+            doClearEffect(&initialItemTransform, opacityEffectUsed);
         } else { // Otherwise set transform corresponding to the end state of the effect
             mTargetItem->setTransform(initialItemTransform * transform);
         }
@@ -446,8 +476,9 @@
     mRunningState = NotRunning;
 
     // Invoke observer with cancel signal
-    if (sendCallback)
+    if (sendCallback) {
         invokeObserver(Hb::EffectCancelled);
+    }
 }
 
 void HbEffectGroup::effectFinished(Hb::EffectEvent reason)
@@ -455,13 +486,16 @@
     // Inform the animated item when the whole effect group has finished.
     if (++mFinishedCount == mEffects.count()) {
         mFinishedCount = 0;
-        
-        // The animation framework funnily enough sends the finished signal before updating the animation with the final
-        // value, so here we set running state to NotRunning asynchronously so the effect's final value gets still updated.
+
+        // The animation framework funnily enough sends the finished signal
+        // before updating the animation with the final value, so here we set
+        // running state to NotRunning asynchronously so the effect's final
+        // value gets still updated.
         mRunningState = FinishInProgress;
-        QTimer::singleShot(0, this, SLOT(clearEffectRunning()));
+        QMetaObject::invokeMethod(this, "clearEffectRunning", Qt::QueuedConnection);
 
-        // Send callback if observer has been provided
+        // Send callback if observer has been provided. Note that with the
+        // EffectFinished reason the observer will be invoked asynchronously.
         invokeObserver(reason);
     }
 
@@ -478,11 +512,11 @@
     // has not been restarted meanwhile.
     if (mRunningState == FinishInProgress) {
         mRunningState = NotRunning;
-        // We are finished either normally or with EffectNotStarted. It is now the time to
-        // get rid of all the "effects" caused by the effects in this group if the
-        // hide-when-finished flag is set.
-        if (mHideWhenFinished) {
-            doHideEffect(0, hasOpacityEffect());
+        // We are finished either normally or with EffectNotStarted. It is now
+        // the time to get rid of all the "effects" caused by the effects in
+        // this group, if needed.
+        if (mEffectFlags.testFlag(HbEffectInternal::ClearEffectWhenFinished)) {
+            doClearEffect(0, hasOpacityEffect());
         }
     }
 }
@@ -505,9 +539,10 @@
         mObserver = 0;
 
         // Send callback if observer has been provided. Use queued connection if
-        // the effect finished normally, because otherwise deleting the effect during the callback
-        // would cause crash because this function finally returns back to animation framework code
-        // which assumes the effect objects are alive.
+        // the effect finished normally, because otherwise deleting the effect
+        // during the callback would cause crash because this function finally
+        // returns back to animation framework code which assumes the effect
+        // objects are alive.
         QMetaObject::invokeMethod(
             observer,
             mEffectFinishedSlotName.toAscii().data(),
@@ -520,9 +555,9 @@
     }
 }
 
-void HbEffectGroup::setHideWhenFinished(bool hideWhenFinished)
+void HbEffectGroup::setEffectFlags(HbEffectInternal::EffectFlags flags)
 {
-    mHideWhenFinished = hideWhenFinished;
+    mEffectFlags = flags;
 }
 
 // End of File
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/effects/hbeffectgroup_p.h
--- a/src/hbcore/effects/hbeffectgroup_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/effects/hbeffectgroup_p.h	Mon May 03 12:48:33 2010 +0300
@@ -28,6 +28,7 @@
 
 #include <hbnamespace.h>
 #include <hbglobal.h>
+#include <hbeffectinternal_p.h>
 #include <QList>
 #include <QString>
 #include <QObject>
@@ -71,7 +72,6 @@
     void fixEffectOrder();
     
     void setObserver(QObject *observer, const QString &effectFinishedSlotName);
-
     void updateItemTransform();
 
     bool dirty() const;
@@ -79,7 +79,6 @@
     int effectCount() const;
 
     bool isRunning() const;
-
     void setLooping(bool looping);
     bool isLooping() const;
     void pause();
@@ -94,7 +93,7 @@
     HbView *view() const;
     void setView(HbView *view);
 
-    void setHideWhenFinished(bool hideWhenFinished);
+    void setEffectFlags(HbEffectInternal::EffectFlags flags);
 
 #ifdef HB_FILTER_EFFECTS
     HbVgChainedEffect *vgEffect();
@@ -109,12 +108,13 @@
 
 private:
     void resolveView();
-    void doHideEffect(const QTransform *transform, bool opacityEffectUsed);
+    void doClearEffect(const QTransform *transform, bool opacityEffectUsed);
 
 public slots:
     void startAll();
-    void cancelAll(bool sendCallback, bool itemIsValid = true, bool hideEffect = false, const QTransform &initialItemTransform = QTransform());
+    void cancelAll(bool sendCallback, bool itemIsValid = true, bool clearEffect = false, const QTransform &initialItemTransform = QTransform());
     void effectFinished(Hb::EffectEvent reason = Hb::EffectFinished);
+
 private slots:
     void clearEffectRunning();
     void invokeObserver(Hb::EffectEvent reason = Hb::EffectFinished);
@@ -148,7 +148,9 @@
     bool mLooping;
 
     HbView *mView;
-    bool mHideWhenFinished;
+    HbEffectInternal::EffectFlags mEffectFlags;
+    bool mRegItemHidden;
+    bool mTargetItemHidden;
 };
 
 #endif // HB_EFFECT_GROUP_P_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/effects/hbeffectinternal_p.h
--- a/src/hbcore/effects/hbeffectinternal_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/effects/hbeffectinternal_p.h	Mon May 03 12:48:33 2010 +0300
@@ -52,34 +52,47 @@
 {
 
 public:
+    enum EffectFlag {
+        Normal = 0,
+        ClearEffectWhenFinished = 1,
+        ShowItemOnFirstUpdate = 2,
+        HideRegItemBeforeClearingEffect = 4,
+        HideTargetItemBeforeClearingEffect = 8
+    };
+    Q_DECLARE_FLAGS(EffectFlags, EffectFlag)
+
     static bool start(QGraphicsItem *registrationItem,
                       QGraphicsItem *targetItem,
-                      bool hideWhenFinished,
+                      EffectFlags flags,
                       const QString &itemType,
                       const QString &effectEvent,
                       QObject *receiver = 0,
                       const char *member = 0,
                       const QVariant &userData = QVariant(),
                       const QRectF &extRect = QRectF());
+
     static bool start(QGraphicsItem *registrationItem,
                       QGraphicsItem *targetItem,
-                      bool hideWhenFinished,
+                      EffectFlags flags,
                       const QString &effectEvent,
                       QObject *receiver = 0,
                       const char *member = 0,
                       const QVariant &userData = QVariant(),
                       const QRectF &extRect = QRectF());
+
     static bool add(const QString &itemType, const QString &filePath, const QString &effectEvent = QString());
     static bool add(const QStringList &itemType, const QStringList &filePath, const QStringList &effectEvent = QStringList());
     static bool add(QGraphicsItem *item, const QString &filePath, const QString &effectEvent = QString());
     static bool add(QGraphicsItem *item, const QStringList &filePath, const QStringList &effectEvent = QStringList());
+
     static void remove(const QString &itemType, const QString &filePath, const QString &effectEvent);
     static void remove(QGraphicsItem *item, const QString &filePath, const QString &effectEvent);
     static void remove(QGraphicsItem *item);
+
     static void reloadFxmlFiles();
 
     static void cancelAll(const QList<QGraphicsItem*> *exceptionList = 0, bool ignoreLooping = false);
-    static void safeCancelAll();
+    static void safeCancelAll(bool clear = false);
 
     static void stopEffects();
     static void resumeEffects();
@@ -91,4 +104,6 @@
     HbGVWrapperItem mGVWrapper;
 };
 
+Q_DECLARE_OPERATORS_FOR_FLAGS(HbEffectInternal::EffectFlags)
+
 #endif // HBEFFECTINTERNAL_P_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/effects/hbeffectopacity.cpp
--- a/src/hbcore/effects/hbeffectopacity.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/effects/hbeffectopacity.cpp	Mon May 03 12:48:33 2010 +0300
@@ -33,8 +33,7 @@
 HbEffectOpacityAnimation::HbEffectOpacityAnimation(
     HbEffectGroup *group,
     int duration ) :
-        HbEffectAnimation(),
-        group(group)
+        HbEffectAnimation(group)
 {
     setDuration(duration);
 }
@@ -42,16 +41,14 @@
 void HbEffectOpacityAnimation::handleAnimationUpdate(const QVariant &value)
 {
     qreal opacity = qVariantValue<qreal>(value);
-    group->targetItem()->setOpacity(opacity);
+    mGroup->targetItem()->setOpacity(opacity);
 }
 
 void HbEffectOpacityAnimation::handleAnimationFinish()
 {
-    group->effectFinished();
+    mGroup->effectFinished();
 }
 
-// -----------------------------------------------------------------------------
-
 // HbEffectOpacity
 
 HbEffectOpacity::HbEffectOpacity(
@@ -104,7 +101,7 @@
             }
         }
 
-        mAnimation->addLooping(opacityParam, group);
+        mAnimation->addLooping(opacityParam);
         mAnimation->setEndValue(QVariant(mEndOpacity));
         mAnimation->setStartValue(QVariant(mStartOpacity));
         mAnimation->mCurve = curve;
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/effects/hbeffectopacity_p.h
--- a/src/hbcore/effects/hbeffectopacity_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/effects/hbeffectopacity_p.h	Mon May 03 12:48:33 2010 +0300
@@ -46,9 +46,6 @@
 private:
     void handleAnimationUpdate(const QVariant &value);
     void handleAnimationFinish();
-
-public:
-    HbEffectGroup *group;
 };
 
 class HB_AUTOTEST_EXPORT HbEffectOpacity : public HbEffectAbstract
@@ -77,4 +74,3 @@
 };
 
 #endif // HB_EFFECT_OPACITY_P_H
-
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/effects/hbeffectrotate.cpp
--- a/src/hbcore/effects/hbeffectrotate.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/effects/hbeffectrotate.cpp	Mon May 03 12:48:33 2010 +0300
@@ -22,6 +22,7 @@
 ** Nokia at developer.feedback@nokia.com.
 **
 ****************************************************************************/
+
 #include "hbeffectrotate_p.h"
 #include "hbeffectanimation_p.h"
 #include "hbeffectutils_p.h"
@@ -45,7 +46,6 @@
     void handleAnimationFinish();
 
 public:
-    HbEffectGroup *mGroup;
     Qt::Axis mAxis;
     qreal mCenterX;
     qreal mCenterY;
@@ -57,8 +57,7 @@
     HbEffectGroup *group,
     Qt::Axis axis,
     int duration ) :
-        HbEffectAnimation(),
-        mGroup(group),
+        HbEffectAnimation(group),
         mAxis(axis),
         mCenterX(0),
         mCenterY(0),
@@ -162,11 +161,10 @@
     }
 
     // Create rotation animation
-
     HbEffectRotateAnimation *anim = new HbEffectRotateAnimation(
         group, axis, duration);
 
-    anim->addLooping(angleParam, group);
+    anim->addLooping(angleParam);
 
     foreach( const HbKeyFrame &kf, keyFrameList ) {
 	    if (HbEffectUtils::fuzzyIsNull(kf.pos)) {
@@ -188,8 +186,6 @@
     anim->setEndValue(QVariant(endAngle));
 }
 
-/* Destructor
-*/
 HbEffectRotate::~HbEffectRotate()
 {
     if (mAnimation) {
@@ -205,8 +201,6 @@
 
 void HbEffectRotate::init()
 {
-
-
     bool valueOk(false);
     qreal value = HbEffectUtils::resolveFxmlRef(originXData, &valueOk, item(), HbEffectUtils::Center);
     if (valueOk) {
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/effects/hbeffectscale.cpp
--- a/src/hbcore/effects/hbeffectscale.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/effects/hbeffectscale.cpp	Mon May 03 12:48:33 2010 +0300
@@ -36,8 +36,7 @@
     HbEffectGroup *group,
     HbEffectScale *effect,
     int duration ) :
-        HbEffectAnimation(),
-        mGroup(group),
+        HbEffectAnimation(group),
         mEffect(effect),
         mCenter(0),
         mCurrentScaling(1.0)
@@ -175,13 +174,13 @@
 
     if (durationX > 0) {
         mAnimationX = new HbEffectScaleAnimation(group, this, durationX);
-        mAnimationX->addLooping(paramX, group);
+        mAnimationX->addLooping(paramX);
         mAnimationX->mCurve = curveX;
     }
     // Create at least one animation even if both durations are zero for handling animation finish easily.
     if (durationY > 0 || !mAnimationX) {
         mAnimationY = new HbEffectScaleAnimation(group, this, durationY);
-        mAnimationY->addLooping(paramY, group);
+        mAnimationY->addLooping(paramY);
         mAnimationY->mCurve = curveY;
     }
 }
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/effects/hbeffectscaleanimation_p.h
--- a/src/hbcore/effects/hbeffectscaleanimation_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/effects/hbeffectscaleanimation_p.h	Mon May 03 12:48:33 2010 +0300
@@ -49,7 +49,6 @@
     void handleAnimationFinish();
 
 public:
-    HbEffectGroup *mGroup;
     HbEffectScale *mEffect;
 
     qreal mCenter;
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/effects/hbeffecttranslate.cpp
--- a/src/hbcore/effects/hbeffecttranslate.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/effects/hbeffecttranslate.cpp	Mon May 03 12:48:33 2010 +0300
@@ -34,8 +34,7 @@
     HbEffectGroup *group,
     HbEffectTranslate *effect,
     int duration) :
-        HbEffectAnimation(),
-        group(group),
+        HbEffectAnimation(group),
         effect(effect)
 {
     setDuration(duration);
@@ -48,9 +47,9 @@
 
 void HbEffectTranslateAnimation::handleAnimationUpdate(const QVariant &value)
 {
-    if (group->isRunning()) {
+    if (mGroup->isRunning()) {
         currentPos = qVariantValue<qreal>(value);
-        group->updateItemTransform();
+        mGroup->updateItemTransform();
     }
 }
 
@@ -118,14 +117,14 @@
 
     if (durationX > 0) {
         mAnimationX = new HbEffectTranslateAnimation(group, this, durationX);
-        mAnimationX->addLooping(paramX, group);
+        mAnimationX->addLooping(paramX);
         mAnimationX->mCurve = curveShapeX;
     }
 
     // Create at least one animation even if both durations are zero for handling animation finish easily.
     if (durationY > 0 || !mAnimationX) {
         mAnimationY = new HbEffectTranslateAnimation(group, this, durationY);
-        mAnimationY->addLooping(paramY, group);
+        mAnimationY->addLooping(paramY);
         mAnimationY->mCurve = curveShapeY;
     }
 }
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/effects/hbeffecttranslate_p.h
--- a/src/hbcore/effects/hbeffecttranslate_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/effects/hbeffecttranslate_p.h	Mon May 03 12:48:33 2010 +0300
@@ -55,11 +55,9 @@
 public:
     qreal originalPos;
     qreal currentPos;
-    HbEffectGroup *group;
     HbEffectTranslate *effect;
 };
 
-
 class HB_AUTOTEST_EXPORT HbEffectTranslate : public HbEffectAbstract
 {
 public:
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/feedback/feedback.pri
--- a/src/hbcore/feedback/feedback.pri	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/feedback/feedback.pri	Mon May 03 12:48:33 2010 +0300
@@ -43,5 +43,5 @@
                   $$PWD/hbfeedbackplugin.h \
                   $$PWD/hbfeedbackplugingroup.h
 
-INTERNAL_HEADERS += $$PWD/hbinstantinteractionevent_p.h \
+PRIVATE_HEADERS += $$PWD/hbinstantinteractionevent_p.h \
                     $$PWD/hbcontinuousinteractionevent_p.h
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/feedback/hbfeedbacknamespace.h
--- a/src/hbcore/feedback/hbfeedbacknamespace.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/feedback/hbfeedbacknamespace.h	Mon May 03 12:48:33 2010 +0300
@@ -40,7 +40,8 @@
 class HB_CORE_EXPORT HbFeedback
 {
     Q_GADGET
-    Q_ENUMS(Type InstantEffect ContinuousEffect TacticonEffect HitAreaType IntensityLevel)
+    Q_ENUMS(Type InstantEffect ContinuousEffect TacticonEffect HitAreaType IntensityLevel Modality)
+    Q_FLAGS(Types Modalities)
 
 public:
 #else
@@ -102,6 +103,7 @@
         StopFlick,
         MultitouchActivate,
         RotateStep,
+        LongPress,
         PositiveTacticon,
         NeutralTacticon,
         NegativeTacticon,
@@ -185,6 +187,19 @@
     };
 
     /*!
+      \enum Modality
+      The available modalities for feedback effects.
+      Effects can be synthesized using one or several of the available modalities.
+    */
+    enum Modality {
+        All     = 0xFFFF,
+        Audio   = 0x0001,
+        Tactile = 0x0002
+    };
+
+    Q_DECLARE_FLAGS(Modalities, Modality)
+
+    /*!
         Timeout value has to be defined for each continuous feedback
         to avoid situations where continuous feedback is never cancelled
         and accidentally continues to play infinitely.
@@ -197,6 +212,7 @@
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(HbFeedback::Types)
+Q_DECLARE_OPERATORS_FOR_FLAGS(HbFeedback::Modalities)
 
 #endif // HBFEEDBACKNAMESPACE_H
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gestures/gestures.pri
--- a/src/hbcore/gestures/gestures.pri	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gestures/gestures.pri	Mon May 03 12:48:33 2010 +0300
@@ -29,20 +29,36 @@
 PUBLIC_HEADERS += $$PWD/hbpangesture.h
 PUBLIC_HEADERS += $$PWD/hbtapgesture.h
 PUBLIC_HEADERS += $$PWD/hbswipegesture.h
-
-contains(DEFINES, HB_GESTURE_FW) {
-  INTERNAL_HEADERS += $$PWD/hbtapgesturerecognizer_p.h
-  INTERNAL_HEADERS += $$PWD/hbmousepangesturerecognizer_p.h
-  INTERNAL_HEADERS += $$PWD/hbswipegesturerecognizer_p.h
-  INTERNAL_HEADERS += $$PWD/hbtapandholdgesture_p.h
-  INTERNAL_HEADERS += $$PWD/hbtapandholdgesturerecognizer_p.h
+PUBLIC_HEADERS += $$PWD/hbpinchgesture.h
 
-  SOURCES += $$PWD/hbtapgesturerecognizer.cpp
-  SOURCES += $$PWD/hbmousepangesturerecognizer.cpp
-  SOURCES += $$PWD/hbswipegesturerecognizer.cpp
-  SOURCES += $$PWD/hbtapandholdgesture.cpp
-  SOURCES += $$PWD/hbtapandholdgesturerecognizer.cpp
-  SOURCES += $$PWD/hbtapgesture.cpp
-  SOURCES += $$PWD/hbpangesture.cpp
-  SOURCES += $$PWD/hbswipegesture.cpp
+contains(DEFINES, HB_GESTURE_FW) { 
+    PRIVATE_HEADERS += $$PWD/hbgestures_p.h
+    PRIVATE_HEADERS += $$PWD/hbpangesture_p.h
+    PRIVATE_HEADERS += $$PWD/hbpangesturelogic_p.h
+    PRIVATE_HEADERS += $$PWD/hbtapgesturelogic_p.h
+    PRIVATE_HEADERS += $$PWD/hbtapandholdgesturelogic_p.h
+    PRIVATE_HEADERS += $$PWD/hbpinchgesturelogic_p.h
+    PRIVATE_HEADERS += $$PWD/hbpointrecorder_p.h
+    PRIVATE_HEADERS += $$PWD/hbvelocitycalculator_p.h    
+    PRIVATE_HEADERS += $$PWD/hbswipegesture_p.h
+    PRIVATE_HEADERS += $$PWD/hbswipegesturelogic_p.h
+    PRIVATE_HEADERS += $$PWD/hbtapandholdgesture_p.h
+    PRIVATE_HEADERS += $$PWD/hbtapgesture_p.h
+    PRIVATE_HEADERS += $$PWD/hbpinchgesture_p.h
+    PRIVATE_HEADERS += $$PWD/hbgesturerecognizers_p.h
+
+    SOURCES += $$PWD/hbgesturerecognizers_p.cpp
+    SOURCES += $$PWD/hbpangesturelogic_p.cpp
+    SOURCES += $$PWD/hbtapgesturelogic_p.cpp
+    SOURCES += $$PWD/hbtapandholdgesturelogic_p.cpp
+    SOURCES += $$PWD/hbpinchgesturelogic_p.cpp
+    SOURCES += $$PWD/hbpointrecorder_p.cpp
+    SOURCES += $$PWD/hbvelocitycalculator_p.cpp
+    SOURCES += $$PWD/hbswipegesturelogic_p.cpp
+    SOURCES += $$PWD/hbtapandholdgesture.cpp
+    SOURCES += $$PWD/hbtapgesture.cpp
+    SOURCES += $$PWD/hbpangesture.cpp
+    SOURCES += $$PWD/hbswipegesture.cpp
+    SOURCES += $$PWD/hbpinchgesture.cpp
 }
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gestures/hbgesturerecognizers_p.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/gestures/hbgesturerecognizers_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,371 @@
+/****************************************************************************
+**
+** 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 "hbgestures_p.h"
+#include "hbgesturerecognizers_p.h"
+#include "hbpangesture.h"
+#include "hbtapgesture.h"
+#include "hbtapandholdgesture.h"
+#include "hbpinchgesture.h"
+#include "hbswipegesture.h"
+
+#include <QGesture>
+
+//#define RECOGNIZERS_DEBUG
+#ifdef RECOGNIZERS_DEBUG
+#define DEBUG qDebug
+#else
+#define DEBUG if (0) qDebug
+#endif
+
+////////////////////////////////////////////////////////////////////////////
+// Pan gesture
+////////////////////////////////////////////////////////////////////////////
+
+/*!
+    \internal
+    \brief
+    \return
+
+*/
+HbPanGestureRecognizer::HbPanGestureRecognizer()
+{
+    DEBUG() << "Creating HbPanGestureRecognizer" << this;
+}
+
+/*!
+    \internal
+    \brief
+    \return
+
+*/
+HbPanGestureRecognizer::~HbPanGestureRecognizer()
+{
+    DEBUG() << "Destroying HbPanGestureRecognizer" << this;
+}
+
+/*!
+    \internal
+    \brief
+    \return
+
+*/
+QGesture* HbPanGestureRecognizer::create(QObject *)
+{
+    return new HbPanGesture;
+}
+
+/*!
+    \internal
+    \brief
+    \return
+
+*/
+QGestureRecognizer::Result HbPanGestureRecognizer::recognize(QGesture *state, QObject *watched, QEvent *event)
+{
+    // This HbPanGestureRecognizer works only as a small stub layer
+    // for QT gesture framework's gesture recognizers. The reason for
+    // this is to enable testability within logic classes.
+    // QGesture contains gesture state, which cannot be modified by
+    // anything else, but QGestureManager itself.
+    return HbPanGestureLogic::recognize(state->state(), static_cast<HbPanGesture *>(state), watched, event);
+}
+
+/*!
+    \internal
+    \brief
+    \return
+
+*/
+void HbPanGestureRecognizer::reset(QGesture *state)
+{
+    HbPanGestureLogic::resetGesture(static_cast<HbPanGesture *>(state));
+    QGestureRecognizer::reset(state);
+}
+
+////////////////////////////////////////////////////////////////////////////
+// Tap gesture
+////////////////////////////////////////////////////////////////////////////
+
+/*!
+    \internal
+    \brief
+    \return
+
+*/
+HbTapGestureRecognizer::HbTapGestureRecognizer(int tapRadius)
+{
+    HbTapGestureLogic::mTapRadius = tapRadius;
+    DEBUG() << "Creating HbTapGestureRecognizer" << this;
+}
+
+/*!
+    \internal
+    \brief
+    \return
+
+*/
+HbTapGestureRecognizer::~HbTapGestureRecognizer()
+{
+    DEBUG() << "Destroying HbTapGestureRecognizer" << this;
+}
+
+/*!
+    \internal
+    \brief
+    \return
+
+*/
+QGesture* HbTapGestureRecognizer::create(QObject *)
+{
+    return new HbTapGesture;
+}
+
+/*!
+    \internal
+    \brief
+    \return
+
+*/
+QGestureRecognizer::Result HbTapGestureRecognizer::recognize(QGesture *state, QObject *watched, QEvent *event)
+{
+    // This HbTapGestureRecognizer works only as a small stub layer
+    // for QT gesture framework's gesture recognizers. The reason for
+    // this is to enable testability within logic classes.
+    // QGesture contains gesture state, which cannot be modified by
+    // anything else, but QGestureManager itself.
+    return HbTapGestureLogic::recognize( state->state(), static_cast<HbTapGesture *>(state), watched, event );
+}
+
+/*!
+    \internal
+    \brief
+    \return
+
+*/
+void HbTapGestureRecognizer::reset(QGesture *state)
+{
+    HbTapGestureLogic::resetGesture(static_cast<HbTapGesture *>(state));
+    QGestureRecognizer::reset(state);
+}
+
+////////////////////////////////////////////////////////////////////////////
+// Tap & hold gesture
+////////////////////////////////////////////////////////////////////////////
+
+/*!
+    \internal
+    \brief
+    \return
+
+*/
+HbTapAndHoldGestureRecognizer::HbTapAndHoldGestureRecognizer(int tapRadius)
+    :
+    QGestureRecognizer(),
+    HbTapAndHoldGestureLogic()
+{
+    HbTapAndHoldGestureLogic::mTapRadius = tapRadius;
+    DEBUG() << "Creating HbTapAndHoldGestureRecognizer" << this;
+}
+
+/*!
+    \internal
+    \brief
+    \return
+
+*/
+HbTapAndHoldGestureRecognizer::~HbTapAndHoldGestureRecognizer()
+{
+    DEBUG() << "Destroying HbTapAndHoldGestureRecognizer" << this;
+}
+
+/*!
+    \internal
+    \brief
+    \return
+
+*/
+QGesture* HbTapAndHoldGestureRecognizer::create(QObject *)
+{
+    return new HbTapAndHoldGesture;
+}
+
+/*!
+    \internal
+    \brief
+    \return
+
+*/
+QGestureRecognizer::Result HbTapAndHoldGestureRecognizer::recognize(QGesture *state, QObject *watched, QEvent *event)
+{
+    // This HbTapGestureRecognizer works only as a small stub layer
+    // for QT gesture framework's gesture recognizers. The reason for
+    // this is to enable testability within logic classes.
+    // QGesture contains gesture state, which cannot be modified by
+    // anything else, but QGestureManager itself.
+    return HbTapAndHoldGestureLogic::recognize( state->state(), static_cast<HbTapAndHoldGesture*>(state), watched, event );
+}
+
+/*!
+    \internal
+    \brief
+    \return
+
+*/
+void HbTapAndHoldGestureRecognizer::reset(QGesture *state)
+{
+    HbTapAndHoldGestureLogic::resetGesture(static_cast<HbTapAndHoldGesture*>(state));
+    QGestureRecognizer::reset(state);
+}
+
+////////////////////////////////////////////////////////////////////////////
+// Pinch gesture
+////////////////////////////////////////////////////////////////////////////
+
+/*!
+    \internal
+    \brief
+    \return
+
+*/
+HbPinchGestureRecognizer::HbPinchGestureRecognizer()
+{
+    DEBUG() << "Creating HbPinchGestureRecognizer" << this;
+}
+
+/*!
+    \internal
+    \brief
+    \return
+
+*/
+HbPinchGestureRecognizer::~HbPinchGestureRecognizer()
+{
+    DEBUG() << "Destroying HbPinchGestureRecognizer" << this;
+}
+
+/*!
+    \internal
+    \brief
+    \return
+
+*/
+QGesture* HbPinchGestureRecognizer::create(QObject *)
+{
+    return new HbPinchGesture;
+}
+
+/*!
+    \internal
+    \brief
+    \return
+
+*/
+QGestureRecognizer::Result HbPinchGestureRecognizer::recognize(QGesture *state, QObject *watched, QEvent *event)
+{
+    // This HbTapGestureRecognizer works only as a small stub layer
+    // for QT gesture framework's gesture recognizers. The reason for
+    // this is to enable testability within logic classes.
+    // QGesture contains gesture state, which cannot be modified by
+    // anything else, but QGestureManager itself.
+    return HbPinchGestureLogic::recognize(state->state(), static_cast<HbPinchGesture *>(state), watched, event);
+}
+
+/*!
+    \internal
+    \brief
+    \return
+
+*/
+void HbPinchGestureRecognizer::reset(QGesture *state)
+{
+    HbPinchGestureLogic::resetGesture(static_cast<HbPinchGesture *>(state));
+    QGestureRecognizer::reset(state);
+}
+
+////////////////////////////////////////////////////////////////////////////
+// Swipe gesture
+////////////////////////////////////////////////////////////////////////////
+
+/*!
+    \internal
+    \brief
+    \return
+
+*/
+HbSwipeGestureRecognizer::HbSwipeGestureRecognizer()
+{
+    DEBUG() << "Creating HbSwipeGestureRecognizer" << this;
+}
+
+/*!
+    \internal
+    \brief
+    \return
+
+*/
+HbSwipeGestureRecognizer::~HbSwipeGestureRecognizer()
+{
+    DEBUG() << "Destroying HbSwipeGestureRecognizer" << this;
+}
+
+/*!
+    \internal
+    \brief
+    \return
+
+*/
+QGesture* HbSwipeGestureRecognizer::create(QObject *)
+{
+    return new HbSwipeGesture;
+}
+
+/*!
+    \internal
+    \brief
+    \return
+
+*/
+QGestureRecognizer::Result HbSwipeGestureRecognizer::recognize(QGesture *state, QObject *watched, QEvent *event)
+{
+    // This HbSwipeGestureRecognizer works only as a small stub layer
+    // for QT gesture framework's gesture recognizers. The reason for
+    // this is to enable testability within logic classes.
+    // QGesture contains gesture state, which cannot be modified by
+    // anything else, but QGestureManager itself.
+    return HbSwipeGestureLogic::recognize(state->state(), static_cast<HbSwipeGesture *>(state), watched, event);
+}
+
+/*!
+    \internal
+    \brief
+    \return
+
+*/
+void HbSwipeGestureRecognizer::reset(QGesture *state)
+{
+    HbSwipeGestureLogic::resetGesture(static_cast<HbSwipeGesture *>(state));
+    QGestureRecognizer::reset(state);
+}
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gestures/hbgesturerecognizers_p.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/gestures/hbgesturerecognizers_p.h	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,92 @@
+/****************************************************************************
+**
+** 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 HBGESTURERECOGNIZERS_P_H
+#define HBGESTURERECOGNIZERS_P_H
+
+#include "hbgestures_p.h"
+#include "hbpangesturelogic_p.h"
+#include "hbtapgesturelogic_p.h"
+#include "hbtapandholdgesturelogic_p.h"
+#include "hbpinchgesturelogic_p.h"
+#include "hbswipegesturelogic_p.h"
+
+#include <QGesture>
+
+class HB_CORE_PRIVATE_EXPORT HbPanGestureRecognizer : public QGestureRecognizer, public HbPanGestureLogic
+{
+public:
+    explicit HbPanGestureRecognizer();
+    virtual ~HbPanGestureRecognizer();
+
+    QGesture* create(QObject *);
+    QGestureRecognizer::Result recognize(QGesture *state, QObject *watched, QEvent *event);
+    void reset(QGesture *state);
+};
+
+class HB_CORE_PRIVATE_EXPORT HbTapGestureRecognizer : public QGestureRecognizer, public HbTapGestureLogic
+{
+public:
+    explicit HbTapGestureRecognizer(int tapRadius = HbDefaultTapRadius);
+    virtual ~HbTapGestureRecognizer();
+
+    QGesture* create(QObject *);
+    QGestureRecognizer::Result recognize(QGesture *state, QObject *watched, QEvent *event);
+    void reset(QGesture *state);
+};
+
+class HB_CORE_PRIVATE_EXPORT HbTapAndHoldGestureRecognizer : public QGestureRecognizer, public HbTapAndHoldGestureLogic
+{
+public:
+    explicit HbTapAndHoldGestureRecognizer(int tapRadius = HbDefaultTapRadius);
+    virtual ~HbTapAndHoldGestureRecognizer();
+
+    QGesture* create(QObject *);
+    QGestureRecognizer::Result recognize(QGesture *state, QObject *watched, QEvent *event);
+    void reset(QGesture *state);
+};
+
+class HB_CORE_PRIVATE_EXPORT HbPinchGestureRecognizer : public QGestureRecognizer, public HbPinchGestureLogic
+{
+public:
+    HbPinchGestureRecognizer();
+    virtual ~HbPinchGestureRecognizer();
+
+    QGesture* create(QObject *);
+    QGestureRecognizer::Result recognize(QGesture *state, QObject *watched, QEvent *event);
+    void reset(QGesture *state);
+};
+
+class HB_CORE_PRIVATE_EXPORT HbSwipeGestureRecognizer : public QGestureRecognizer, public HbSwipeGestureLogic
+{
+public:
+    HbSwipeGestureRecognizer();
+    virtual ~HbSwipeGestureRecognizer();
+
+    QGesture* create(QObject *);
+    QGestureRecognizer::Result recognize(QGesture *state, QObject *watched, QEvent *event);
+    void reset(QGesture *state);
+};
+#endif // HBGESTURERECOGNIZERS_P_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gestures/hbgestures_p.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/gestures/hbgestures_p.h	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,61 @@
+/****************************************************************************
+**
+** 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 HBGESTURES_P_H
+#define HBGESTURES_P_H
+
+#include <QPointF>
+#include <QObject>
+#include <QGraphicsView>
+
+const int HbDefaultPanThreshold = 20;
+const int HbDefaultTapRadius = HbDefaultPanThreshold-1;
+
+const qreal HbSwipeMinOffset = 150;
+const qreal HbSwipeMinSpeed = 0.6;
+
+class HbGestureUtils
+{
+public:
+    /*!
+        \internal
+        \brief
+        \return
+
+    */
+    static QPointF mapToScene( QObject* watched, const QPointF &pos )
+    {
+        QGraphicsView* view = qobject_cast<QGraphicsView*>(watched->parent());
+
+        if ( view )
+        {
+            return view->mapToScene(view->mapFromGlobal(pos.toPoint()));
+        }
+
+        return QPointF();
+    }
+};
+
+#endif // HBGESTURES_P_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gestures/hbmousepangesturerecognizer.cpp
--- a/src/hbcore/gestures/hbmousepangesturerecognizer.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,100 +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 "hbmousepangesturerecognizer_p.h"
-
-#include <QEvent>
-#include <QGraphicsSceneMouseEvent>
-#include <QGesture>
-#include <QVariant>
-
-HbMousePanGestureRecognizer::HbMousePanGestureRecognizer()
-{
-}
-
-HbMousePanGestureRecognizer::~HbMousePanGestureRecognizer()
-{
-}
-
-QGesture* HbMousePanGestureRecognizer::create(QObject *)
-{
-    return new QPanGesture;
-}
-
-QGestureRecognizer::Result HbMousePanGestureRecognizer::recognize(QGesture *state, QObject *, QEvent *event)
-{
-    QPanGesture *g = static_cast<QPanGesture *>(state);
-    QGraphicsSceneMouseEvent *me = static_cast<QGraphicsSceneMouseEvent *>(event);
-    QPoint pos;
-
-    switch(event->type()) {
-    case QEvent::GraphicsSceneMousePress:
-        g->setOffset(QPointF(0,0));
-        g->setProperty("startPos", me->screenPos());
-        g->setProperty("pressed", QVariant::fromValue<bool>(true));
-    case QEvent::GraphicsSceneMouseMove:
-    case QEvent::GraphicsSceneMouseRelease:
-        pos = me->screenPos();
-        g->setHotSpot(pos);
-        g->setLastOffset(g->offset());
-        break;
-    default:
-        return QGestureRecognizer::Ignore;
-    }
-
-    if (event->type() == QEvent::GraphicsSceneMousePress || event->type() == QEvent::GraphicsSceneMouseDoubleClick) {
-        return QGestureRecognizer::MayBeGesture;
-    } else if (event->type() == QEvent::GraphicsSceneMouseMove) {
-        if (g->property("pressed").toBool()) {
-            QPoint offset = pos - g->property("startPos").toPoint();
-            g->setOffset(offset);
-            return QGestureRecognizer::TriggerGesture;
-        }
-        return QGestureRecognizer::CancelGesture;
-    } else if (event->type() == QEvent::GraphicsSceneMouseRelease) {
-        if(g->state() >= Qt::GestureStarted) {
-            QPoint offset = pos - g->property("startPos").toPoint();
-            g->setOffset(offset);
-            g->setProperty("pressed", QVariant::fromValue<bool>(false));
-            return QGestureRecognizer::FinishGesture;
-        } else {
-            return QGestureRecognizer::CancelGesture;
-        }
-
-    }
-    return QGestureRecognizer::Ignore;
-}
-
-void HbMousePanGestureRecognizer::reset(QGesture *state)
-{
-    QPanGesture *g = static_cast<QPanGesture *>(state);
-    g->setLastOffset(QPointF());
-    g->setOffset(QPointF(0,0));
-    g->setAcceleration(0);
-    g->setProperty("startPos", QVariant());
-    g->setProperty("pressed", QVariant::fromValue<bool>(false));
-    QGestureRecognizer::reset(state);
-}
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gestures/hbmousepangesturerecognizer_p.h
--- a/src/hbcore/gestures/hbmousepangesturerecognizer_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +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 HBMOUSEPANGESTURERECOGNIZER_H
-#define HBMOUSEPANGESTURERECOGNIZER_H
-
-#include <hbglobal.h>
-#include <QGestureRecognizer>
-
-class HB_CORE_PRIVATE_EXPORT HbMousePanGestureRecognizer : public QGestureRecognizer
-{
-public:
-    HbMousePanGestureRecognizer();
-    virtual ~HbMousePanGestureRecognizer();
-
-    virtual QGesture* create(QObject *target);
-    virtual QGestureRecognizer::Result recognize(QGesture *state, QObject *watched, QEvent *event);
-    virtual void reset(QGesture *state);
-};
-
-#endif // HBMOUSEPANGESTURERECOGNIZER_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gestures/hbpangesture.cpp
--- a/src/hbcore/gestures/hbpangesture.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gestures/hbpangesture.cpp	Mon May 03 12:48:33 2010 +0300
@@ -23,41 +23,193 @@
 **
 ****************************************************************************/
 
+#include "hbgestures_p.h"
 #include "hbpangesture.h"
+#include "hbpangesture_p.h"
+#include "hbvelocitycalculator_p.h"
+
 #include <QPointF>
 #include <QVariant>
+#include <QDebug>
 
-class HbPanGesturePrivate
-{
-public:
-    QPointF mStartPos;
-};
+/*!
+    \class HbPanGesture
+
+    \brief HbPanGesture contains data and functionality for pan gesture.
+*/
 
+/*!
+    \brief
+    \return
+
+*/
 HbPanGesture::HbPanGesture(QObject *parent) : QPanGesture(parent), d_ptr(new HbPanGesturePrivate)
 {
-
+    d_ptr->q_ptr = this;
 }
 
+/*!
+    \brief
+    \return
+
+*/
 HbPanGesture::HbPanGesture( HbPanGesturePrivate &dd, QObject *parent )
     : QPanGesture(parent), d_ptr( &dd )
 {
-
+    d_ptr->q_ptr = this;
 }
 
+/*!
+    \brief
+    \return
+
+*/
 HbPanGesture::~HbPanGesture()
 {
     delete d_ptr;
 }
 
+/*!
+    \brief
+    \return
+
+*/
 QPointF HbPanGesture::startPos() const
 {
     Q_D(const HbPanGesture);
     return d->mStartPos;
 }
 
+/*!
+    \brief
+    \return
+
+*/
 void HbPanGesture::setStartPos(const QPointF &startPos)
 {
     Q_D(HbPanGesture);
     d->mStartPos = startPos;
 }
 
+/*!
+    \brief
+    \return
+
+*/
+QPointF HbPanGesture::velocity() const
+{
+    Q_D(const HbPanGesture);
+    return HbVelocityCalculator( d->mAxisX, d->mAxisY ).velocity(QTime::currentTime());
+}
+
+/*!
+    \brief
+    \return
+
+*/
+void HbPanGesture::setVelocity(const QPointF &)
+{
+    // Q_D(HbPanGesture);
+    // d->mVelocity = velocity;
+}
+
+/*!
+    \brief
+    \return
+
+*/
+QPointF HbPanGesture::sceneLastOffset() const
+{
+    Q_D(const HbPanGesture);
+    return d->mSceneLastOffset;
+}
+
+/*!
+    \brief
+    \return
+
+*/
+void HbPanGesture::setSceneLastOffset(const QPointF &lastOffset)
+{
+    Q_D(HbPanGesture);
+    d->mSceneStartPos = lastOffset;
+}
+
+/*!
+    \brief
+    \return
+
+*/
+QPointF HbPanGesture::sceneOffset() const
+{
+    Q_D(const HbPanGesture);
+    return d->mSceneOffset;
+}
+
+/*!
+    \brief
+    \return
+
+*/
+void HbPanGesture::setSceneOffset(const QPointF &offset)
+{
+    Q_D(HbPanGesture);
+    d->mSceneOffset = offset;
+}
+
+/*!
+    \brief
+    \return
+
+*/
+QPointF HbPanGesture::sceneStartPos() const
+{
+    Q_D(const HbPanGesture);
+    return d->mSceneStartPos;
+}
+
+/*!
+    \brief
+    \return
+
+*/
+void HbPanGesture::setSceneStartPos(const QPointF &startPos)
+{
+    Q_D(HbPanGesture);
+    d->mSceneStartPos = startPos;
+}
+
+/*!
+    \brief
+    \return
+
+*/
+QPointF HbPanGesture::sceneVelocity() const
+{
+    Q_D(const HbPanGesture);
+    return HbVelocityCalculator(d->mSceneAxisX, d->mSceneAxisY).velocity( d->mLastTimeStamp );
+}
+
+/*!
+    \brief
+    \return
+
+*/
+QPointF HbPanGesture::sceneAcceleration() const
+{
+    //Q_D(const HbPanGesture);
+    //return d->mSceneAcceleration;
+    return QPointF(0,0);
+}
+
+/*!
+    \brief
+    \return
+
+*/
+QPointF HbPanGesture::sceneDelta() const
+{
+    Q_D(const HbPanGesture);
+    return d->mSceneOffset - d->mSceneLastOffset;
+}
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gestures/hbpangesture.h
--- a/src/hbcore/gestures/hbpangesture.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gestures/hbpangesture.h	Mon May 03 12:48:33 2010 +0300
@@ -25,8 +25,6 @@
 #ifndef HBPANGESTURE_H
 #define HBPANGESTURE_H
 
-#ifdef HB_GESTURE_FW
-
 #include <hbglobal.h>
 #include <QPanGesture>
 
@@ -36,6 +34,13 @@
     Q_OBJECT
 
     Q_PROPERTY(QPointF startPos READ startPos WRITE setStartPos)
+    Q_PROPERTY(QPointF velocity READ velocity WRITE setVelocity)
+    Q_PROPERTY(QPointF sceneStartPos READ sceneStartPos WRITE setSceneStartPos)
+    Q_PROPERTY(QPointF sceneLastOffset READ sceneLastOffset WRITE setSceneLastOffset)
+    Q_PROPERTY(QPointF sceneOffset READ sceneOffset WRITE setSceneOffset)
+    Q_PROPERTY(QPointF sceneVelocity READ sceneVelocity STORED false)
+    Q_PROPERTY(QPointF sceneAcceleration READ sceneAcceleration STORED false)
+    Q_PROPERTY(QPointF sceneDelta READ sceneDelta STORED false)
 
 public:
     explicit HbPanGesture(QObject *parent = 0);
@@ -44,6 +49,24 @@
     QPointF startPos() const;
     void setStartPos(const QPointF &startPos);
 
+    QPointF velocity() const;
+    void setVelocity(const QPointF &velocity);
+
+    // Scene spesific methods
+
+    QPointF sceneStartPos() const;
+    void setSceneStartPos(const QPointF &startPos);
+
+    QPointF sceneLastOffset() const;
+    void setSceneLastOffset(const QPointF &value);
+
+    QPointF sceneOffset() const;
+    void setSceneOffset(const QPointF &value);
+
+    QPointF sceneVelocity() const;
+    QPointF sceneAcceleration() const;
+    QPointF sceneDelta() const;
+
 protected:
     HbPanGesturePrivate * const d_ptr;
     HbPanGesture( HbPanGesturePrivate &dd, QObject *parent = 0 );
@@ -51,8 +74,7 @@
 private:
     Q_DECLARE_PRIVATE_D(d_ptr, HbPanGesture)
     Q_DISABLE_COPY(HbPanGesture)
+    friend class HbPanGestureLogic;
 };
 
-#endif // HB_GESTURE_FW
-
 #endif // HBPANGESTURE_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gestures/hbpangesture_p.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/gestures/hbpangesture_p.h	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,65 @@
+/****************************************************************************
+**
+** 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 HBPANGESTURE_P_H
+#define HBPANGESTURE_P_H
+
+#include "hbglobal.h"
+#include "hbgestures_p.h"
+#include "hbpointrecorder_p.h"
+
+#include <QTime>
+#include <QPoint>
+#include <QList>
+#include <QDebug>
+
+class HbPanGesture;
+
+class HB_CORE_PRIVATE_EXPORT HbPanGesturePrivate
+{
+public:
+    Q_DECLARE_PUBLIC(HbPanGesture)
+
+    QPointF mStartPos;
+
+    QPointF mSceneStartPos;
+    QPointF mSceneLastOffset;
+    QPointF mSceneOffset;
+
+    // for the recognizer
+    QPointF mDeltaSinceLastTimeStamp;
+    QPointF mSceneDeltaSinceLastTimeStamp;
+    QTime mLastTimeStamp;
+
+    HbPanGesture *q_ptr;
+
+    HbPointRecorder mAxisX;
+    HbPointRecorder mAxisY;
+    HbPointRecorder mSceneAxisX;
+    HbPointRecorder mSceneAxisY;
+};
+
+#endif // HBPANGESTURE_P_H
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gestures/hbpangesturelogic_p.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/gestures/hbpangesturelogic_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,245 @@
+/****************************************************************************
+**
+** 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 <QEvent>
+#include <QGestureRecognizer>
+#include <QGraphicsView>
+#include <QMouseEvent>
+
+#include "hbpangesture.h"
+#include "hbpangesture_p.h"
+#include "hbpangesturelogic_p.h"
+
+const int KPanStopTime = 30;
+const int KVelocitySampleTime = 30;
+const int KPanThreshold = 20;
+
+/*!
+   @hbcore
+   \internal
+   \class HbPanGestureLogic
+
+   \brief
+
+*/
+
+
+/*!
+    \internal
+    \brief
+    \return
+
+*/
+HbPanGestureLogic::HbPanGestureLogic()
+{
+    mCurrentTime = QTime();
+}
+
+HbPanGestureLogic::~HbPanGestureLogic() {}
+
+/*!
+    \internal
+    \brief
+    \return
+
+*/
+bool HbPanGestureLogic::isMouseEvent(QEvent::Type eventType)
+{
+    return eventType == QEvent::MouseButtonPress ||
+           eventType == QEvent::MouseMove ||
+           eventType == QEvent::MouseButtonDblClick ||
+           eventType == QEvent::MouseButtonRelease;
+}
+
+/*!
+    \internal
+    \brief
+    \return
+
+*/
+void HbPanGestureLogic::resetGesture(HbPanGesture *gesture)
+{
+    gesture->d_ptr->mStartPos                     = QPointF(0,0);
+    gesture->d_ptr->mDeltaSinceLastTimeStamp      = QPointF(0,0);
+    gesture->d_ptr->mSceneStartPos                = QPointF(0,0);
+    gesture->d_ptr->mSceneLastOffset              = QPointF(0,0);
+    gesture->d_ptr->mSceneOffset                  = QPointF(0,0);
+    gesture->d_ptr->mSceneDeltaSinceLastTimeStamp = QPointF(0,0);
+    gesture->d_ptr->mAxisX.clear();
+    gesture->d_ptr->mAxisY.clear();
+    gesture->d_ptr->mSceneAxisX.clear();
+    gesture->d_ptr->mSceneAxisY.clear();
+
+    gesture->setLastOffset(QPointF());
+    gesture->setOffset(QPointF(0,0));
+    gesture->setAcceleration(0);
+    gesture->setStartPos(QPointF());
+}
+
+/*!
+    \internal
+    \brief
+    \return
+
+*/
+QGestureRecognizer::Result HbPanGestureLogic::handleMousePress(
+        Qt::GestureState gestureState,
+        HbPanGesture *gesture,
+        QObject *watched,
+        QMouseEvent *me )
+{
+    // Just ignore situations that are not interesting at all.
+    if ( !( gestureState == Qt::NoGesture && me->button() == Qt::LeftButton ) )
+    {
+        return QGestureRecognizer::Ignore;
+    }
+    
+    gesture->setHotSpot( me->globalPos() );
+    gesture->setStartPos( me->globalPos() );
+    gesture->setOffset( QPointF( 0,0 ) );
+    gesture->setLastOffset( QPointF( 0,0 ) );
+    QPointF scenePos = HbGestureUtils::mapToScene(watched, me->globalPos());
+    gesture->d_ptr->mSceneStartPos       = scenePos;
+    gesture->d_ptr->mSceneOffset         = HbGestureUtils::mapToScene(watched, QPointF(0,0));
+    gesture->d_ptr->mSceneLastOffset     = HbGestureUtils::mapToScene(watched, QPointF(0,0));
+    gesture->d_ptr->mLastTimeStamp = mCurrentTime;
+        
+    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 );
+    gesture->d_ptr->mSceneAxisY.record( scenePos.y(), mCurrentTime );
+
+    return QGestureRecognizer::MayBeGesture;
+}
+
+/*!
+    \internal
+    \brief
+    \return
+
+*/
+QGestureRecognizer::Result HbPanGestureLogic::handleMouseMove(
+        Qt::GestureState gestureState,
+        HbPanGesture *gesture,
+        QObject *watched,
+        QMouseEvent *me )
+{
+    if ( !me->buttons().testFlag(Qt::LeftButton) )
+    {
+        return QGestureRecognizer::Ignore;
+    }
+
+    QPointF offset = me->globalPos() - gesture->startPos().toPoint();
+
+    if (gestureState == Qt::NoGesture && offset.manhattanLength() <= KPanThreshold )
+    {
+        return QGestureRecognizer::MayBeGesture;
+    }
+
+    // Hotspot is updated on the press and on events after the gesture started.
+    // Here we are checking the previously set gestureState.
+    if (gestureState == Qt::GestureStarted || gestureState == Qt::GestureUpdated) {
+        gesture->setHotSpot( me->globalPos() );
+    }
+
+    gesture->setLastOffset( gesture->offset().toPoint() );
+    gesture->setOffset( offset );
+    gesture->d_ptr->mSceneLastOffset = gesture->d_ptr->mSceneOffset;
+    gesture->d_ptr->mSceneOffset =
+            HbGestureUtils::mapToScene(watched, me->globalPos()) - gesture->d_ptr->mSceneStartPos;
+    gesture->d_ptr->mLastTimeStamp = mCurrentTime;
+
+    QPointF scenePos = HbGestureUtils::mapToScene(watched, me->globalPos());
+    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 );
+    gesture->d_ptr->mSceneAxisY.record( scenePos.y(), mCurrentTime );
+
+    return QGestureRecognizer::TriggerGesture;
+}
+
+/*!
+    \internal
+    \brief
+    \return
+
+*/
+QGestureRecognizer::Result HbPanGestureLogic::handleMouseRelease(
+        Qt::GestureState gestureState,
+        HbPanGesture *gesture,
+        QObject *watched,
+        QMouseEvent *me )
+{   
+    Q_UNUSED(me->globalPos());
+    Q_UNUSED(gesture);
+    Q_UNUSED(watched);
+	
+    gesture->d_ptr->mLastTimeStamp = mCurrentTime;
+		
+    if ( gestureState == Qt::GestureStarted || gestureState == Qt::GestureUpdated )
+    {
+        return QGestureRecognizer::FinishGesture;
+    }
+    else
+    {
+        return QGestureRecognizer::CancelGesture;
+    }
+}
+
+/*!
+    \internal
+    \brief
+    \return
+
+*/
+QGestureRecognizer::Result HbPanGestureLogic::recognize(
+        Qt::GestureState gestureState,
+        HbPanGesture *gesture,
+        QObject *watched,
+        QEvent *event )
+{
+    // Record the time right away.
+    mCurrentTime = QTime::currentTime();
+    
+    if ( isMouseEvent(event->type()) )
+    {
+        QMouseEvent* me = static_cast<QMouseEvent*>(event);
+        switch(event->type())
+        {
+        case QEvent::MouseButtonDblClick:
+        case QEvent::MouseButtonPress:
+            return handleMousePress(gestureState, gesture, watched, me);
+
+        case QEvent::MouseMove:
+            return handleMouseMove(gestureState, gesture, watched, me);
+
+        case QEvent::MouseButtonRelease:
+            return handleMouseRelease(gestureState, gesture, watched, me);
+
+        default: break;
+        }
+    }
+    return QGestureRecognizer::Ignore;
+}
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gestures/hbpangesturelogic_p.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/gestures/hbpangesturelogic_p.h	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,74 @@
+/****************************************************************************
+**
+** 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 HBPANGESTURELOGIC_P_H
+#define HBPANGESTURELOGIC_P_H
+
+#include "hbgestures_p.h"
+#include "hbglobal.h"
+#include "hbpangesture_p.h"
+
+#include <QTime>
+#include <QEvent>
+#include <QGestureRecognizer>
+#include <QList>
+
+class QPoint;
+class HbPanGesture;
+class QMouseEvent;
+
+class HB_CORE_PRIVATE_EXPORT HbPanGestureLogic
+{
+public:
+    HbPanGestureLogic();
+    ~HbPanGestureLogic();
+
+    bool isMouseEvent(QEvent::Type eventType);
+    void resetGesture(HbPanGesture *gesture);
+    QGestureRecognizer::Result handleMousePress(
+            Qt::GestureState gestureState,
+            HbPanGesture *gesture,
+            QObject *watched,
+            QMouseEvent *me );
+    QGestureRecognizer::Result handleMouseMove(
+            Qt::GestureState gestureState,
+            HbPanGesture *gesture,
+            QObject *watched,
+            QMouseEvent *me );
+    QGestureRecognizer::Result handleMouseRelease(
+            Qt::GestureState gestureState,
+            HbPanGesture *gesture,
+            QObject *watched,
+            QMouseEvent *me );    
+    QGestureRecognizer::Result recognize(
+            Qt::GestureState gestureState,
+            HbPanGesture *gesture,
+            QObject *watched,
+            QEvent *event );
+
+    QTime mCurrentTime;    
+};
+
+#endif // HBPANGESTURELOGIC_P_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gestures/hbpinchgesture.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/gestures/hbpinchgesture.cpp	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,124 @@
+/****************************************************************************
+**
+** 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 "hbgestures_p.h"
+#include "hbpinchgesture.h"
+#include "hbpinchgesture_p.h"
+
+HbPinchGesture::HbPinchGesture(QObject *parent)
+    : QPinchGesture(parent), d_ptr(new HbPinchGesturePrivate)
+
+{
+    d_ptr->mIsNewSequence = true;
+    setTotalScaleFactor(1);
+    setLastScaleFactor(1);
+    setScaleFactor(1);
+}
+
+HbPinchGesture::HbPinchGesture(HbPinchGesturePrivate &dd, QObject *parent)
+    : QPinchGesture(parent), d_ptr(&dd)
+{
+    d_ptr->mIsNewSequence = true;
+    setTotalScaleFactor(1);
+    setLastScaleFactor(1);
+    setScaleFactor(1);
+}
+
+HbPinchGesture::~HbPinchGesture()
+{
+    delete d_ptr;
+}
+
+qreal HbPinchGesture::sceneTotalRotationAngle() const
+{
+    Q_D(const HbPinchGesture);
+    return d->mSceneTotalRotationAngle;
+}
+
+void HbPinchGesture::setSceneTotalRotationAngle(qreal value)
+{
+    Q_D(HbPinchGesture);
+    d->mSceneTotalRotationAngle = value;
+}
+
+qreal HbPinchGesture::sceneLastRotationAngle() const
+{
+    Q_D(const HbPinchGesture);
+    return d->mSceneLastRotationAngle;
+}
+
+void HbPinchGesture::setSceneLastRotationAngle(qreal value)
+{
+    Q_D(HbPinchGesture);
+    d->mSceneLastRotationAngle = value;
+}
+
+qreal HbPinchGesture::sceneRotationAngle() const
+{
+    Q_D(const HbPinchGesture);
+    return d->mSceneRotationAngle;
+}
+
+void HbPinchGesture::setSceneRotationAngle(qreal value)
+{
+    Q_D(HbPinchGesture);
+    d->mSceneRotationAngle = value;
+}
+
+QPointF HbPinchGesture::sceneStartCenterPoint() const
+{
+    Q_D(const HbPinchGesture);
+    return d->mSceneStartCenterPoint;
+}
+
+void HbPinchGesture::setSceneStartCenterPoint(const QPointF &value)
+{
+    Q_D(HbPinchGesture);
+    d->mSceneStartCenterPoint = value;
+}
+
+QPointF HbPinchGesture::sceneLastCenterPoint() const
+{
+    Q_D(const HbPinchGesture);
+    return d->mSceneLastCenterPoint;
+}
+
+void HbPinchGesture::setSceneLastCenterPoint(const QPointF &value)
+{
+    Q_D(HbPinchGesture);
+    d->mSceneLastCenterPoint = value;
+}
+
+QPointF HbPinchGesture::sceneCenterPoint() const
+{
+    Q_D(const HbPinchGesture);
+    return d->mSceneCenterPoint;
+}
+
+void HbPinchGesture::setSceneCenterPoint(const QPointF &value)
+{
+    Q_D(HbPinchGesture);
+    d->mSceneCenterPoint = value;
+}
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gestures/hbpinchgesture.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/gestures/hbpinchgesture.h	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,76 @@
+/****************************************************************************
+**
+** 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 HBPINCHGESTURE_H
+#define HBPINCHGESTURE_H
+
+#include <hbglobal.h>
+#include <QPinchGesture>
+
+class HbPinchGesturePrivate;
+class HB_CORE_EXPORT HbPinchGesture : public QPinchGesture
+{
+    Q_OBJECT
+
+    Q_PROPERTY(qreal sceneTotalRotationAngle READ sceneTotalRotationAngle WRITE setSceneTotalRotationAngle)
+    Q_PROPERTY(qreal sceneLastRotationAngle READ sceneLastRotationAngle WRITE setSceneLastRotationAngle)
+    Q_PROPERTY(qreal sceneRotationAngle READ sceneRotationAngle WRITE setSceneRotationAngle)
+    Q_PROPERTY(QPointF sceneStartCenterPoint READ sceneStartCenterPoint WRITE setSceneStartCenterPoint)
+    Q_PROPERTY(QPointF sceneLastCenterPoint READ sceneLastCenterPoint WRITE setSceneLastCenterPoint)
+    Q_PROPERTY(QPointF sceneCenterPoint READ sceneCenterPoint WRITE setSceneCenterPoint)
+
+public:
+    explicit HbPinchGesture(QObject *parent = 0);
+    virtual ~HbPinchGesture();
+
+    qreal sceneTotalRotationAngle() const;
+    void setSceneTotalRotationAngle(qreal value);
+
+    qreal sceneLastRotationAngle() const;
+    void setSceneLastRotationAngle(qreal value);
+
+    qreal sceneRotationAngle() const;
+    void setSceneRotationAngle(qreal value);
+
+    QPointF sceneStartCenterPoint() const;
+    void setSceneStartCenterPoint(const QPointF &value);
+
+    QPointF sceneLastCenterPoint() const;
+    void setSceneLastCenterPoint(const QPointF &value);
+
+    QPointF sceneCenterPoint() const;
+    void setSceneCenterPoint(const QPointF &value);
+
+protected:
+    HbPinchGesturePrivate * const d_ptr;
+    HbPinchGesture(HbPinchGesturePrivate &dd, QObject *parent = 0);
+
+private:
+    Q_DECLARE_PRIVATE_D(d_ptr, HbPinchGesture)
+    Q_DISABLE_COPY(HbPinchGesture)
+
+    friend class HbPinchGestureLogic;
+};
+
+#endif // HBPINCHGESTURE_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gestures/hbpinchgesture_p.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/gestures/hbpinchgesture_p.h	Mon May 03 12:48:33 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 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 HBPINCHGESTURE_P_H
+#define HBPINCHGESTURE_P_H
+
+#include <hbglobal.h>
+#include <QPoint>
+
+class HB_CORE_PRIVATE_EXPORT HbPinchGesturePrivate
+{
+public:
+    bool mIsNewSequence;
+
+    qreal mSceneTotalRotationAngle;
+    qreal mSceneLastRotationAngle;
+    qreal mSceneRotationAngle;
+
+    QPointF mSceneStartCenterPoint;
+    QPointF mSceneLastCenterPoint;
+    QPointF mSceneCenterPoint;
+};
+
+#endif // HBPINCHGESTURE_P_H
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gestures/hbpinchgesturelogic_p.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/gestures/hbpinchgesturelogic_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,240 @@
+/****************************************************************************
+**
+** 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 <QEvent>
+#include <QGestureRecognizer>
+#include <QGraphicsView>
+#include <QMouseEvent>
+#include <QDebug>
+
+#include "hbpinchgesture.h"
+#include "hbpinchgesture_p.h"
+#include "hbpinchgesturelogic_p.h"
+
+/*!
+   @hbcore
+   \internal
+   \class HbPinchGestureLogic
+
+   \brief
+
+*/
+
+
+/*!
+    \internal
+    \brief
+    \return
+
+*/
+HbPinchGestureLogic::HbPinchGestureLogic()
+{
+}
+
+HbPinchGestureLogic::~HbPinchGestureLogic() {}
+
+/*!
+    \internal
+    \brief
+    \return
+
+*/
+void HbPinchGestureLogic::resetGesture(HbPinchGesture *gesture)
+{
+    HbPinchGesturePrivate *d = gesture->d_func();
+
+    gesture->setTotalChangeFlags(0);
+    gesture->setChangeFlags(0);
+
+    gesture->setStartCenterPoint(QPointF());
+    gesture->setLastCenterPoint(QPointF());
+    gesture->setCenterPoint(QPointF());
+
+    d->mSceneStartCenterPoint = QPointF();
+    d->mSceneLastCenterPoint = QPointF();
+    d->mSceneCenterPoint = QPointF();
+
+    gesture->setTotalScaleFactor(1);
+    gesture->setLastScaleFactor(1);
+    gesture->setScaleFactor(1);
+
+    gesture->setTotalRotationAngle(0);
+    gesture->setLastRotationAngle(0);
+    gesture->setRotationAngle(0);
+
+    d->mSceneTotalRotationAngle = 0;
+    d->mSceneLastRotationAngle = 0;
+    d->mSceneRotationAngle = 0;
+
+    d->mIsNewSequence = true;
+}
+
+/*!
+    \internal
+    \brief
+    \return
+
+*/
+QPointF HbPinchGestureLogic::mapToScene( QObject* watched, const QPointF &pos )
+{
+    QGraphicsView* view = qobject_cast<QGraphicsView*>(watched->parent());
+
+    if ( view )
+    {
+        return view->mapToScene(view->mapFromGlobal(pos.toPoint()));
+    }
+
+    return QPointF();
+}
+
+/*!
+    \internal
+    \brief
+    \return
+
+*/
+QGestureRecognizer::Result HbPinchGestureLogic::recognize(Qt::GestureState gestureState,
+                                                          HbPinchGesture *gesture,
+                                                          QObject *watched,
+                                                          QEvent *event)
+{
+    HbPinchGesturePrivate *d = gesture->d_func();
+
+    const QTouchEvent *ev = static_cast<const QTouchEvent *>(event);
+
+    QGestureRecognizer::Result result;
+
+    switch (event->type()) {
+    case QEvent::TouchBegin: {
+            result = QGestureRecognizer::MayBeGesture;
+            break;
+        }
+    case QEvent::TouchEnd: {
+            if (gestureState != Qt::NoGesture) {
+                result = QGestureRecognizer::FinishGesture;
+            } else {
+                result = QGestureRecognizer::CancelGesture;
+            }
+            break;
+        }
+    case QEvent::TouchUpdate: {
+            gesture->setChangeFlags(0);
+            if (ev->touchPoints().size() == 2) {
+                QTouchEvent::TouchPoint p1 = ev->touchPoints().at(0);
+                QTouchEvent::TouchPoint p2 = ev->touchPoints().at(1);
+
+                gesture->setHotSpot(p1.screenPos());
+
+                QLineF line(p1.screenPos(), p2.screenPos());
+                QLineF tmp(line);
+                tmp.setLength(line.length() / 2.);
+                QPointF centerPoint = tmp.p2();
+
+                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);
+                d->mSceneCenterPoint = mapToScene(watched, centerPoint);
+                gesture->setChangeFlags(gesture->changeFlags() |= QPinchGesture::CenterPointChanged);
+
+                const qreal scaleFactor =
+                        QLineF(p1.screenPos(), p2.screenPos()).length()
+                        / QLineF(p1.startScreenPos(),  p2.startScreenPos()).length();
+                if (d->mIsNewSequence) {
+                    gesture->setLastScaleFactor(scaleFactor);
+                } else {
+                    gesture->setLastScaleFactor(gesture->scaleFactor());
+                }
+                gesture->setScaleFactor(scaleFactor);
+                gesture->setTotalScaleFactor(gesture->totalScaleFactor() + gesture->scaleFactor() - gesture->lastScaleFactor());
+                gesture->setChangeFlags(gesture->changeFlags() |= QPinchGesture::ScaleFactorChanged);
+
+                qreal angle = QLineF(p1.screenPos(), p2.screenPos()).angle();
+                if (angle > 180) {
+                    angle -= 360;
+                }
+                qreal sceneAngle = QLineF(p1.scenePos(), p2.scenePos()).angle();
+                if (sceneAngle > 180) {
+                    sceneAngle -= 360;
+                }
+                qreal startAngle = QLineF(p1.startScreenPos(), p2.startScreenPos()).angle();
+                if (startAngle > 180) {
+                    startAngle -= 360;
+                }
+                qreal sceneStartAngle = QLineF(p1.startScenePos(), p2.startScenePos()).angle();
+                if (sceneStartAngle > 180) {
+                    sceneStartAngle -= 360;
+                }
+                const qreal rotationAngle = startAngle - angle;
+                const qreal sceneRotationAngle = sceneStartAngle - sceneAngle;
+                if (d->mIsNewSequence) {
+                    gesture->setLastRotationAngle(rotationAngle);
+                    d->mSceneLastRotationAngle = sceneRotationAngle;
+                }
+                else {
+                    gesture->setLastRotationAngle(gesture->rotationAngle());
+                    d->mSceneLastRotationAngle = d->mSceneRotationAngle;
+                }
+                gesture->setRotationAngle(rotationAngle);
+                d->mSceneRotationAngle = sceneRotationAngle;
+                gesture->setTotalRotationAngle(gesture->totalRotationAngle() + gesture->rotationAngle() - gesture->lastRotationAngle());
+                d->mSceneTotalRotationAngle = d->mSceneTotalRotationAngle + d->mSceneRotationAngle - d->mSceneLastRotationAngle;
+                gesture->setChangeFlags(gesture->changeFlags() |= QPinchGesture::RotationAngleChanged);
+                gesture->setTotalChangeFlags(gesture->totalChangeFlags() |= gesture->changeFlags());
+                d->mIsNewSequence = false;
+                result = QGestureRecognizer::TriggerGesture;
+            } else {
+                d->mIsNewSequence = true;
+                if (gestureState == Qt::NoGesture)
+                    result = QGestureRecognizer::Ignore;
+                else
+                    result = QGestureRecognizer::FinishGesture;
+            }
+            break;
+        }
+    case QEvent::MouseButtonPress:
+    case QEvent::MouseMove:
+    case QEvent::MouseButtonRelease:
+        result = QGestureRecognizer::Ignore;
+        break;
+    default:
+        result = QGestureRecognizer::Ignore;
+        break;
+    }
+    return result;
+}
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gestures/hbpinchgesturelogic_p.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/gestures/hbpinchgesturelogic_p.h	Mon May 03 12:48:33 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 HBPINCHGESTURELOGIC_P_H
+#define HBPINCHGESTURELOGIC_P_H
+
+#include "hbglobal.h"
+
+#include <QEvent>
+#include <QGestureRecognizer>
+
+class QPoint;
+class HbPinchGesture;
+
+class HB_CORE_PRIVATE_EXPORT HbPinchGestureLogic
+{
+public:
+    HbPinchGestureLogic();
+    ~HbPinchGestureLogic();
+
+    void resetGesture(HbPinchGesture *gesture);
+    QPointF mapToScene(QObject* watched, const QPointF &pos);
+    QGestureRecognizer::Result recognize(
+            Qt::GestureState gestureState,
+            HbPinchGesture *gesture,
+            QObject *watched,
+            QEvent *event );
+};
+
+#endif // HBPINCHGESTURELOGIC_P_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gestures/hbpointrecorder_p.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/gestures/hbpointrecorder_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,228 @@
+/****************************************************************************
+**
+** 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 "hbpointrecorder_p.h"
+
+#include <QDebug>
+//#define VELOCITY_DEBUG
+#ifndef VELOCITY_DEBUG
+# define DEBUG if (0) qDebug
+#else
+# define DEBUG qDebug
+#endif
+
+/*!
+   @hbcore
+   \internal
+   \class HbPointRecorder
+
+   \brief Class to store and hold list of points and timestamps.
+
+*/
+
+/*!
+    \internal
+    \brief Constructor for HbPointRecorder
+    \return
+
+*/
+HbPointRecorder::HbPointRecorder()
+{
+}
+
+/*!
+    \internal
+    \brief Destructor for HbPointRecorder
+    \return
+
+*/
+HbPointRecorder::~HbPointRecorder()
+{
+}
+
+/*!
+    \internal
+    \brief Records point to list with timestamp.
+    \param point Point to be recorded.
+    \param time Time to be recorded.
+    \return Nothing.
+
+*/
+void HbPointRecorder::record(qreal point, QTime time)
+{
+    // No point to record a point, if timestamp is less or equal with previous.
+    if ( !isEmpty() && lastTime().msecsTo(time) == 0 )
+    {
+        DEBUG() << "Ignoring point, because no difference in time stamps.";
+        return;
+    }
+
+    // In case the list contains two or more points, direction can be
+    // determined. Each new point added needs to be checked for direction
+    // change.
+    if ( mPoints.length() > 1 )
+    {
+        // Clear list, on direction change. Leave the last recorded point
+        // to the list, as it can be considered as first point for new direction.
+        if ( dirChanged( point ) )
+        {
+            qreal tempPoint = lastPoint();
+            QTime tempTime = lastTime();
+
+            clear();
+
+            mPoints.append( tempPoint );
+            mTimes.append( tempTime );
+        }
+    }
+
+    // Finally check, if the position has changed. Don't record point, when no position
+    // change.
+    if ( isEmpty() || point != lastPoint() )
+    {
+        // Add point and time to list.
+        mPoints.append( point );
+        mTimes.append( time );
+    }
+    else
+    {
+        DEBUG() << "Ignoring point, because it equals previous.";
+    }
+}
+
+/*!
+    \internal
+    \brief
+    \return True, when no recorded items.
+
+*/
+bool HbPointRecorder::isEmpty() const
+{
+    // This situation should be impossible to even happen, but in case
+    // the lists are out of sync. The result of empty list dictates the
+    // result of this test.
+    return !mTimes.length() && !mPoints.length();
+}
+
+/*!
+    \internal
+    \brief
+    \return Last recorded point.
+
+*/
+qreal HbPointRecorder::lastPoint() const
+{
+    Q_ASSERT(!isEmpty());
+    return mPoints.last();
+}
+
+/*!
+    \internal
+    \brief
+    \return Last recorded timestamp.
+
+*/
+const QTime& HbPointRecorder::lastTime() const
+{
+    Q_ASSERT(!isEmpty());
+    return mTimes.last();
+}
+
+/*!
+    \internal
+    \brief Checks if new point causes direction change.
+    \param point The point suspected cause direction change.
+    \return True, when direction changes.
+*/
+bool HbPointRecorder::dirChanged( qreal point ) const
+{
+    qreal x0 = mPoints.at(mPoints.length()-2);
+    qreal x1 = mPoints.at(mPoints.length()-1);
+    qreal dir0 = x1 - x0;
+    qreal dir1 = point - x1;
+
+    // Check for '+' and '-' -signs in directions. Opposite signs means
+    // direction change.
+    return ( dir0 < 0 && dir1 >= 0 ) || ( dir0 > 0 && dir1 <= 0 );
+}
+
+/*!
+    \internal
+    \param T type of items in the list.
+    \brief Returns given number of items from the end.
+    \return List of items.
+
+    This function gets items from the given list from the end by the
+    amount of items specified by 'number' parameter. In case, when the
+    length of the list is less than required number of items, complete
+    list is provided instead.
+*/
+template <class T>
+QList<T> HbPointRecorder::getLastItems( QList<T> list, int number ) const
+{
+    if ( list.length() <= number )
+    {
+        return list;
+    }
+    else
+    {
+        QList<T> tempList;
+        for ( int i = list.length(); --i >= list.length()-number; )
+        {
+            tempList.insert(0, list.at(i));
+        }
+        return tempList;
+    }
+}
+
+/*!
+    \internal
+    \copydoc HbPointRecorder::getLastItems
+*/
+QList<qreal> HbPointRecorder::getLastPoints( int number ) const
+{
+    return getLastItems(mPoints, number);
+}
+
+/*!
+    \internal
+    \copydoc HbPointRecorder::getLastItems
+*/
+QList<QTime> HbPointRecorder::getLastTimes( int number ) const
+{
+    return getLastItems(mTimes, number);
+}
+
+/*!
+    \internal
+    \brief
+    \return Last recorded timestamp.
+
+*/
+void HbPointRecorder::clear()
+{
+    mPoints.clear();
+    mTimes.clear();
+}
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gestures/hbpointrecorder_p.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/gestures/hbpointrecorder_p.h	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,59 @@
+/****************************************************************************
+**
+** 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 HBPOINTRECORDER_P_H
+#define HBPOINTRECORDER_P_H
+
+#include "hbglobal.h"
+
+#include <QList>
+#include <QTime>
+
+class HB_CORE_PRIVATE_EXPORT HbPointRecorder
+{
+public:
+    HbPointRecorder();
+    ~HbPointRecorder();
+
+    void record(qreal point, QTime time);
+    qreal lastPoint() const;
+    const QTime& lastTime() const;
+    bool dirChanged(qreal point) const;
+    void clear();    
+    bool isEmpty() const;
+    QList<qreal> getLastPoints( int number ) const;
+    QList<QTime> getLastTimes( int number ) const;
+
+    // TODO RECONSIDER THE WHOLE DESIGN
+    QList<qreal> mPoints;
+    QList<QTime> mTimes;
+private:
+    template <class T> QList<T> getLastItems( QList<T> list, int number ) const;
+
+
+
+};
+
+#endif // HBPOINTRECORDER_P_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gestures/hbswipegesture.cpp
--- a/src/hbcore/gestures/hbswipegesture.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gestures/hbswipegesture.cpp	Mon May 03 12:48:33 2010 +0300
@@ -23,16 +23,18 @@
 **
 ****************************************************************************/
 
+#include "hbgestures_p.h"
 #include "hbswipegesture.h"
 #include "hbswipegesture_p.h"
+#include "hbglobal_p.h"
 #include <QPointF>
 #include <QVariant>
 
 HbSwipeGesture::HbSwipeGesture(QObject *parent)
     : QSwipeGesture(parent), d_ptr(new HbSwipeGesturePrivate)
 
-{
-
+{   
+    d_ptr->mSceneSwipeAngle = 0;
 }
 
 HbSwipeGesture::HbSwipeGesture(HbSwipeGesturePrivate &dd, QObject *parent)
@@ -46,27 +48,57 @@
     delete d_ptr;
 }
 
+QSwipeGesture::SwipeDirection HbSwipeGesture::sceneHorizontalDirection() const
+{
+    if (d_ptr->mSceneSwipeAngle < 0 || d_ptr->mSceneSwipeAngle == 90 || d_ptr->mSceneSwipeAngle == 270)
+        return QSwipeGesture::NoDirection;
+    else if (d_ptr->mSceneSwipeAngle < 90 || d_ptr->mSceneSwipeAngle > 270)
+        return QSwipeGesture::Right;
+    else
+        return QSwipeGesture::Left;
+}
+
+QSwipeGesture::SwipeDirection HbSwipeGesture::sceneVerticalDirection() const
+{    
+    if (d_ptr->mSceneSwipeAngle <= 0 || d_ptr->mSceneSwipeAngle == 180)
+        return QSwipeGesture::NoDirection;
+    else if (d_ptr->mSceneSwipeAngle < 180)
+        return QSwipeGesture::Up;
+    else
+        return QSwipeGesture::Down;
+}
+
+qreal HbSwipeGesture::sceneSwipeAngle() const
+{
+    return d_ptr->mSceneSwipeAngle;
+}
+
+void HbSwipeGesture::setSceneSwipeAngle(qreal value)
+{
+    d_ptr->mSceneSwipeAngle = value;
+}
+
+
 /*!
-
+    \deprecated
     \property speed
 
     Stores the speed of the swipe gesture in pixels per milliseconds.
-
 */
 qreal HbSwipeGesture::speed() const
-{
-    Q_D(const HbSwipeGesture);
-    return d->mSpeed;
+{    
+    HB_DEPRECATED("HbSwipeGesture::speed is deprecated");
+    return 1;
 }
 
 void HbSwipeGesture::setSpeed(qreal speed)
 {
-    Q_D(HbSwipeGesture);
-    d->mSpeed = speed;
+    Q_UNUSED (speed);
+    HB_DEPRECATED("HbSwipeGesture::setSpeed is deprecated");
 }
 
 /*!
-
+    \deprecated
     \property touchPointCount
 
     Stores the number of touchpoints used in the swipe
@@ -74,12 +106,12 @@
 */
 int HbSwipeGesture::touchPointCount() const
 {
-    Q_D(const HbSwipeGesture);
-    return d->mTouchPointCount;
+    HB_DEPRECATED("HbSwipeGesture::touchPointCount is deprecated");
+    return 0;
 }
 
 void HbSwipeGesture::setTouchPointCount(int touchPointCount)
 {
-    Q_D(HbSwipeGesture);
-    d->mTouchPointCount = touchPointCount;
+    HB_DEPRECATED("HbSwipeGesture::setTouchPointCount is deprecated");
+    Q_UNUSED(touchPointCount)
 }
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gestures/hbswipegesture.h
--- a/src/hbcore/gestures/hbswipegesture.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gestures/hbswipegesture.h	Mon May 03 12:48:33 2010 +0300
@@ -25,8 +25,6 @@
 #ifndef HBSWIPEGESTURE_H
 #define HBSWIPEGESTURE_H
 
-#ifdef HB_GESTURE_FW
-
 #include <hbglobal.h>
 #include <QSwipeGesture>
 
@@ -35,26 +33,23 @@
 {
     Q_OBJECT
 
+    Q_PROPERTY(SwipeDirection sceneHorizontalDirection READ sceneHorizontalDirection STORED false)
+    Q_PROPERTY(SwipeDirection sceneVerticalDirection READ sceneVerticalDirection STORED false)
+    Q_PROPERTY(qreal sceneSwipeAngle READ sceneSwipeAngle WRITE setSceneSwipeAngle)
+
+    // Deprecated
     Q_PROPERTY(qreal speed READ speed WRITE setSpeed)
     Q_PROPERTY(int touchPointCount READ touchPointCount WRITE setTouchPointCount)
 
-
 public:
     explicit HbSwipeGesture(QObject *parent = 0);
     virtual ~HbSwipeGesture();
 
-    qreal speed() const;
-    void setSpeed(qreal speed);
-
+    SwipeDirection sceneHorizontalDirection() const;
+    SwipeDirection sceneVerticalDirection() const;
 
-    QPointF initialPoint() const;
-    void setInitialPoint(const QPointF& initialPoint);
-
-    QPoint initialMousePoint() const;
-    void setInitialMousePoint(const QPoint& initialMousePoint);
-
-    int touchPointCount() const;
-    void setTouchPointCount(int touchPointCount);
+    qreal sceneSwipeAngle() const;
+    void setSceneSwipeAngle(qreal value);    
 
 protected:
     HbSwipeGesturePrivate * const d_ptr;
@@ -64,9 +59,13 @@
     Q_DECLARE_PRIVATE_D(d_ptr, HbSwipeGesture)
     Q_DISABLE_COPY(HbSwipeGesture)
 
-    friend class HbSwipeGestureRecognizer;
+    friend class HbSwipeGestureLogic;
+
+public: // Deprecated
+    qreal speed() const;
+    void setSpeed(qreal speed);
+    int touchPointCount() const;
+    void setTouchPointCount(int touchPointCount);
 };
 
-#endif // HB_GESTURE_FW
-
 #endif // HBSWIPEGESTURE_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gestures/hbswipegesture_p.h
--- a/src/hbcore/gestures/hbswipegesture_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gestures/hbswipegesture_p.h	Mon May 03 12:48:33 2010 +0300
@@ -27,20 +27,17 @@
 #define HBSWIPEGESTURE_P_H
 
 #include <hbglobal.h>
-#include <QTime>
 #include <QPoint>
 #include <QGesture>
 
 class HB_CORE_PRIVATE_EXPORT HbSwipeGesturePrivate
 {
 public:
-    qreal mSpeed;
-    QTime mTime;
-    QPointF mInitialPoint;
-    QPoint mInitialMousePoint;
-    int mTouchPointCount;
-    QSwipeGesture::SwipeDirection mVerticalDirection;
-    QSwipeGesture::SwipeDirection mHorizontalDirection;
+    QPointF mStartPos;
+    QPointF mSceneStartPos;
+    QTime mStartTime;   
+
+    qreal mSceneSwipeAngle;       
 };
 
 #endif // HBSWIPEGESTURE_P_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gestures/hbswipegesturelogic_p.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/gestures/hbswipegesturelogic_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,179 @@
+/****************************************************************************
+**
+** 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 <QEvent>
+#include <QGestureRecognizer>
+#include <QGraphicsView>
+#include <QMouseEvent>
+
+#include "hbswipegesture.h"
+#include "hbswipegesture_p.h"
+#include "hbswipegesturelogic_p.h"
+
+/*!
+   @hbcore
+   \internal
+   \class HbSwipeGestureLogic
+
+   \brief
+
+*/
+
+
+/*!
+    \internal
+    \brief
+    \return
+
+*/
+HbSwipeGestureLogic::HbSwipeGestureLogic()
+{
+    mCurrentTime = QTime();
+}
+
+HbSwipeGestureLogic::~HbSwipeGestureLogic() {}
+
+/*!
+    \internal
+    \brief
+    \return
+
+*/
+bool HbSwipeGestureLogic::isMouseEvent(QEvent::Type eventType)
+{
+    return eventType == QEvent::MouseButtonPress ||
+           eventType == QEvent::MouseMove ||
+           eventType == QEvent::MouseButtonDblClick ||
+           eventType == QEvent::MouseButtonRelease;
+}
+
+/*!
+    \internal
+    \brief
+    \return
+
+*/
+void HbSwipeGestureLogic::resetGesture(HbSwipeGesture *gesture)
+{   
+    gesture->setSwipeAngle(0);
+    gesture->setSceneSwipeAngle(0);
+
+    gesture->d_func()->mStartPos = QPointF();
+    gesture->d_func()->mSceneStartPos = QPointF();    
+}
+
+/*!
+    \internal
+    \brief
+    \return
+
+*/
+QGestureRecognizer::Result HbSwipeGestureLogic::handleMousePress(
+        Qt::GestureState gestureState,
+        HbSwipeGesture *gesture,
+        QObject *watched,
+        QMouseEvent *me )
+{
+    // Just ignore situations that are not interesting at all.
+    if (!(gestureState == Qt::NoGesture && me->button() == Qt::LeftButton)) {
+        return QGestureRecognizer::Ignore;
+    }
+    gesture->d_func()->mStartTime = QTime::currentTime();  
+
+    gesture->d_func()->mStartPos = me->globalPos();
+    gesture->d_func()->mSceneStartPos = HbGestureUtils::mapToScene(watched, me->globalPos());
+
+    gesture->setHotSpot(me->globalPos());
+
+    return QGestureRecognizer::MayBeGesture;
+}
+
+/*!
+    \internal
+    \brief
+    \return
+
+*/
+QGestureRecognizer::Result HbSwipeGestureLogic::handleMouseRelease(
+        Qt::GestureState gestureState,
+        HbSwipeGesture *gesture,
+        QObject *watched,
+        QMouseEvent *me )
+{   
+    Q_UNUSED(gesture);
+    Q_UNUSED(watched);
+    Q_UNUSED(gestureState);
+
+    QPointF totalOffset = me->globalPos() - gesture->d_func()->mStartPos.toPoint();
+
+    QPointF velocity = totalOffset / gesture->d_func()->mStartTime.elapsed();
+
+    gesture->setSwipeAngle(QLineF(gesture->d_func()->mStartPos, me->globalPos()).angle());
+    gesture->setSceneSwipeAngle(QLineF(gesture->d_func()->mSceneStartPos, HbGestureUtils::mapToScene(watched, me->globalPos())).angle());
+
+    if (totalOffset.manhattanLength() >= HbSwipeMinOffset && velocity.manhattanLength() >= HbSwipeMinSpeed && me->button() == Qt::LeftButton) {
+        return QGestureRecognizer::FinishGesture;
+    } else {
+        return QGestureRecognizer::Ignore;
+    }
+}
+
+/*!
+    \internal
+    \brief
+    \return
+
+*/
+QGestureRecognizer::Result HbSwipeGestureLogic::recognize(
+        Qt::GestureState gestureState,
+        HbSwipeGesture *gesture,
+        QObject *watched,
+        QEvent *event )
+{
+    // Record the time right away.
+    mCurrentTime = QTime::currentTime();
+    
+    if ( isMouseEvent(event->type()) )
+    {
+        QMouseEvent* me = static_cast<QMouseEvent*>(event);
+        switch(event->type())
+        {
+        case QEvent::MouseButtonDblClick:
+        case QEvent::MouseButtonPress:
+            return handleMousePress(gestureState, gesture, watched, me);
+
+        case QEvent::MouseMove:
+            if (me->buttons().testFlag(Qt::LeftButton))
+                return QGestureRecognizer::MayBeGesture;
+            else
+                return QGestureRecognizer::Ignore;
+        case QEvent::MouseButtonRelease:
+            return handleMouseRelease(gestureState, gesture, watched, me);
+
+        default: break;
+        }
+    }
+    return QGestureRecognizer::Ignore;
+}
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gestures/hbswipegesturelogic_p.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/gestures/hbswipegesturelogic_p.h	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,64 @@
+/****************************************************************************
+**
+** 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 HBSWIPEGESTURELOGIC_P_H
+#define HBSWIPEGESTURELOGIC_P_H
+
+#include "hbgestures_p.h"
+
+#include <QEvent>
+#include <QGestureRecognizer>
+
+class HbSwipeGesture;
+class QMouseEvent;
+
+class HB_CORE_PRIVATE_EXPORT HbSwipeGestureLogic
+{
+public:
+    HbSwipeGestureLogic();
+    ~HbSwipeGestureLogic();
+
+    bool isMouseEvent(QEvent::Type eventType);
+    void resetGesture(HbSwipeGesture *gesture);
+    QGestureRecognizer::Result handleMousePress(
+            Qt::GestureState gestureState,
+            HbSwipeGesture *gesture,
+            QObject *watched,
+            QMouseEvent *me );
+    QGestureRecognizer::Result handleMouseRelease(
+            Qt::GestureState gestureState,
+            HbSwipeGesture *gesture,
+            QObject *watched,
+            QMouseEvent *me );    
+    QGestureRecognizer::Result recognize(
+            Qt::GestureState gestureState,
+            HbSwipeGesture *gesture,
+            QObject *watched,
+            QEvent *event );
+
+    QTime mCurrentTime;    
+};
+
+#endif // HBSWIPEGESTURELOGIC_P_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gestures/hbswipegesturerecognizer.cpp
--- a/src/hbcore/gestures/hbswipegesturerecognizer.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,336 +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.
-**
-****************************************************************************/
-
-/*!
-//
-//  W A R N I N G
-//  -------------
-//
-// This implementation of Gesture filter is most probably removed in later releases.
-// It exists purely as an implementation detail.
-// This implementation may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-*/
-
-#include "hbswipegesturerecognizer_p.h"
-#include "hbswipegesture.h"
-#include "hbswipegesture_p.h"
-
-#include <QEvent>
-#include <QTouchEvent>
-#include <QGraphicsSceneMouseEvent>
-#include <QPoint>
-#include <QLine>
-#include <QVariant>
-
-#include <QDebug>
-
-const int KMilliSecsToSecs = 1000;
-
-/*!
-	@proto
-    @hbcore
-	\class HbSwipeGestureRecognizer
-    \brief HbSwipeGestureRecognizer Gesture recognizer for swipes (flicks).
-	
-*/
-
-
-/*!
-	Constructs new HbSwipeGestureRecognizer.
- */
-HbSwipeGestureRecognizer::HbSwipeGestureRecognizer()
-{
-}
-
-HbSwipeGestureRecognizer::~HbSwipeGestureRecognizer()
-{
-}
-
-QGesture* HbSwipeGestureRecognizer::create(QObject *)
-{
-    return new HbSwipeGesture();
-}
-
-/*!
-	The event filter function.
-	\a obj Parameter not currently used.
-
-	\internal
- */
-QGestureRecognizer::Result HbSwipeGestureRecognizer::recognize(QGesture *state, QObject *, QEvent *event)
-{
-    HbSwipeGesture *q = qobject_cast<HbSwipeGesture *>(state);
-    if (!q) {
-        return QGestureRecognizer::Ignore;
-    }
-    if (QTouchEvent *touchEvent = dynamic_cast<QTouchEvent *>(event)) {
-        return recognizeTouchEvent(q, touchEvent);
-    }
-    else if (QGraphicsSceneMouseEvent *mouseEvent = dynamic_cast<QGraphicsSceneMouseEvent *>(event)){
-        return recognizeMouseEvent(q, mouseEvent);
-    }
-
-    return QGestureRecognizer::Ignore;
-}
-
-/*!
-
-*/
-QGestureRecognizer::Result HbSwipeGestureRecognizer::recognizeTouchEvent(HbSwipeGesture *q, QTouchEvent *touchEvent)
-{
-    QGestureRecognizer::Result result;
-
-    switch (touchEvent->type()) {
-    case QEvent::TouchBegin: {
-        q->d_func()->mSpeed = 1;
-        q->d_func()->mTouchPointCount = 1;
-        q->d_func()->mTime = QTime::currentTime();
-        result = QGestureRecognizer::MayBeGesture | QGestureRecognizer::ConsumeEventHint;
-        break;
-    }
-    case QEvent::TouchEnd: {
-        if (q->state() != Qt::NoGesture) {
-            result = QGestureRecognizer::FinishGesture;
-            q->setProperty("speed", (int)(q->d_func()->mSpeed*KMilliSecsToSecs));
-        } else {
-            result = QGestureRecognizer::CancelGesture;
-        }
-        break;
-    }
-    case QEvent::TouchUpdate: {
-        if(q->d_func()->mInitialPoint == QPointF()) {
-            q->d_func()->mInitialPoint = touchEvent->touchPoints().first().lastScreenPos();
-        }
-        
-        q->setHotSpot(touchEvent->touchPoints().first().screenPos());
-
-        int touchPointCount = touchEvent->touchPoints().size();
-
-        qreal xDistance = 0;
-        for (int i = 0; i < touchPointCount; i++) {
-            qreal distance = touchEvent->touchPoints().at(i).screenPos().x() - touchEvent->touchPoints().at(i).lastScreenPos().x();
-            if(qAbs(distance) > qAbs(xDistance)) {
-                xDistance = distance;
-            }
-        }
-
-        qreal yDistance = 0;
-        for (int i = 0; i < touchPointCount; i++) {
-            qreal distance = touchEvent->touchPoints().at(i).screenPos().y() - touchEvent->touchPoints().at(i).lastScreenPos().y();
-            if(qAbs(distance) > qAbs(yDistance)) {
-                yDistance = distance;
-            }
-        }
-
-        xDistance = qAbs(xDistance);
-        yDistance = qAbs(yDistance);
-
-        const qreal distance = xDistance >= yDistance ? xDistance : yDistance;
-        int elapsedTime = q->d_func()->mTime.msecsTo(QTime::currentTime());
-        if (!elapsedTime)
-            elapsedTime = 1;
-        q->d_func()->mSpeed = 0.9 * q->d_func()->mSpeed + distance / elapsedTime;
-        q->d_func()->mTime = QTime::currentTime();
-        q->setSwipeAngle(QLineF(q->d_func()->mInitialPoint, touchEvent->touchPoints().first().screenPos()).angle());
-
-        static const int MoveThreshold = 5;
-        if (!touchMoveEvent(touchEvent)) {
-            if (q->state() != Qt::NoGesture) {
-                result = QGestureRecognizer::TriggerGesture/* | QGestureRecognizer::ConsumeEventHint*/;
-            } else {
-                result = QGestureRecognizer::MayBeGesture/* | QGestureRecognizer::ConsumeEventHint*/;
-            }
-        }
-        else if (xDistance > MoveThreshold || yDistance > MoveThreshold) {
-            // measure the distance to check if the direction changed
-            QSwipeGesture::SwipeDirection horizontal = QSwipeGesture::NoDirection;
-            if(xDistance >= MoveThreshold)
-                horizontal = touchEvent->touchPoints().first().screenPos().x() - touchEvent->touchPoints().first().lastScreenPos().x() > 0 ? QSwipeGesture::Right : QSwipeGesture::Left;
-            QSwipeGesture::SwipeDirection vertical = QSwipeGesture::NoDirection;
-            if(yDistance >= MoveThreshold)
-                vertical = touchEvent->touchPoints().first().screenPos().y() - touchEvent->touchPoints().first().lastScreenPos().y() > 0 ? QSwipeGesture::Down : QSwipeGesture::Up;
-            if ((yDistance > MoveThreshold && q->d_func()->mVerticalDirection != QSwipeGesture::NoDirection &&  q->d_func()->mVerticalDirection != vertical) ||
-                (xDistance > MoveThreshold && q->d_func()->mHorizontalDirection != QSwipeGesture::NoDirection && q->d_func()->mHorizontalDirection != horizontal)) {
-                // the user has changed the direction!
-                result = QGestureRecognizer::CancelGesture;
-            }
-            else {
-                result = QGestureRecognizer::TriggerGesture/* | QGestureRecognizer::ConsumeEventHint*/;
-            }
-            q->d_func()->mVerticalDirection = vertical;
-            q->d_func()->mHorizontalDirection = horizontal;
-
-        } else {
-            if (q->state() != Qt::NoGesture)
-                result = QGestureRecognizer::CancelGesture;
-            else
-                result = QGestureRecognizer::MayBeGesture/* | QGestureRecognizer::ConsumeEventHint*/;
-        }
-        q->d_func()->mTouchPointCount = touchPointCount;
-        break;
-    }
-    default:
-        result = QGestureRecognizer::Ignore;
-        break;    
-    }
-    return result;
-}
-
-/*!
-
-*/
-QGestureRecognizer::Result HbSwipeGestureRecognizer::recognizeMouseEvent(HbSwipeGesture *q, QGraphicsSceneMouseEvent *mouseEvent)
-{
-    QGestureRecognizer::Result result;
-
-    switch (mouseEvent->type()) {
-    case QEvent::GraphicsSceneMousePress: {
-        q->d_func()->mSpeed = 1;
-        q->d_func()->mTime = QTime::currentTime();
-        result = QGestureRecognizer::MayBeGesture;
-        break;
-    }
-    case QEvent::GraphicsSceneMouseRelease: {
-        if (q->state() != Qt::NoGesture) {
-            result = QGestureRecognizer::FinishGesture;
-            q->setProperty("speed", (int)(q->d_func()->mSpeed*KMilliSecsToSecs));
-        } else {
-            result = QGestureRecognizer::CancelGesture;
-        }
-        break;
-    }
-    case QEvent::GraphicsSceneMouseMove: {
-        if(q->d_func()->mInitialMousePoint == QPoint()) {
-            q->d_func()->mInitialMousePoint = mouseEvent->lastScreenPos();
-        }
-        
-        q->setHotSpot(mouseEvent->screenPos());
-
-        int xDistance = qAbs(mouseEvent->lastScreenPos().x() - mouseEvent->screenPos().x());
-        int yDistance = qAbs(mouseEvent->lastScreenPos().y() - mouseEvent->screenPos().y());
-
-        const int distance = xDistance >= yDistance ? xDistance : yDistance;
-        int elapsedTime = q->d_func()->mTime.msecsTo(QTime::currentTime());
-        if (!elapsedTime)
-            elapsedTime = 1;
-        q->d_func()->mSpeed = 0.9 * q->d_func()->mSpeed + distance / elapsedTime;
-        q->d_func()->mTime = QTime::currentTime();
-        q->setSwipeAngle(QLineF(QLine(q->d_func()->mInitialMousePoint, mouseEvent->screenPos())).angle());
-
-        static const int MoveThreshold = 5;
-        if (xDistance > MoveThreshold || yDistance > MoveThreshold) {
-            // measure the distance to check if the direction changed
-            QSwipeGesture::SwipeDirection horizontal = QSwipeGesture::NoDirection;
-            if(xDistance >= MoveThreshold)
-                horizontal = mouseEvent->screenPos().x() - mouseEvent->lastScreenPos().x() > 0 ? QSwipeGesture::Right : QSwipeGesture::Left;
-            QSwipeGesture::SwipeDirection vertical = QSwipeGesture::NoDirection;
-            if(yDistance >= MoveThreshold)
-                vertical = mouseEvent->screenPos().y() - mouseEvent->lastScreenPos().y() > 0 ? QSwipeGesture::Down : QSwipeGesture::Up;
-            if ((yDistance > MoveThreshold && q->d_func()->mVerticalDirection != QSwipeGesture::NoDirection &&  q->d_func()->mVerticalDirection != vertical) ||
-                (xDistance > MoveThreshold && q->d_func()->mHorizontalDirection != QSwipeGesture::NoDirection && q->d_func()->mHorizontalDirection != horizontal)) {
-                // the user has changed the direction!
-                result = QGestureRecognizer::CancelGesture;
-            }
-            else {
-                result = QGestureRecognizer::TriggerGesture;
-            }
-            q->d_func()->mVerticalDirection = vertical;
-            q->d_func()->mHorizontalDirection = horizontal;
-
-        } else {
-            if (q->state() != Qt::NoGesture)
-                result = QGestureRecognizer::CancelGesture;
-            else
-                result = QGestureRecognizer::MayBeGesture;
-        }
-        break;
-    }
-    default:
-        result = QGestureRecognizer::Ignore;
-        break;    
-    }
-    return result;
-}
-
-/*!
-
-*/
-void HbSwipeGestureRecognizer::reset(QGesture* state)
-{
-    HbSwipeGesture *q = qobject_cast<HbSwipeGesture *>(state);
-    if(q) {
-        q->d_func()->mVerticalDirection = QSwipeGesture::NoDirection;
-        q->d_func()->mHorizontalDirection = QSwipeGesture::NoDirection;
-        q->setSwipeAngle(0);
-
-        q->d_func()->mInitialPoint = QPointF();
-        q->d_func()->mInitialMousePoint = QPoint();
-        q->d_func()->mSpeed = 0;
-        q->d_func()->mTime = QTime();
-        q->setProperty("speed", QVariant());
-        q->d_func()->mTouchPointCount= 0;
-    }
-    QGestureRecognizer::reset(state);
-}
-
-/*!
-
-*/
-bool HbSwipeGestureRecognizer::touchMoveEvent(QTouchEvent *touchEvent)
-{
-    QTouchEvent::TouchPoint touchPoint;
-    foreach (touchPoint, touchEvent->touchPoints()) {
-        if (QLineF(touchPoint.screenPos(), touchPoint.lastScreenPos()).length() > 2) {
-            return true;
-        }
-    }
-    return false;
-}
-
-/*!
-
-*/
-QPointF HbSwipeGestureRecognizer::touchPointsCenterPoint(QTouchEvent *touchEvent)
-{
-    qreal x = 0;
-    for(int i = 0; i < touchEvent->touchPoints().size(); i++) {
-        x += touchEvent->touchPoints().at(i).screenPos().x();
-    }
-    x /= touchEvent->touchPoints().size();
-
-    qreal y = 0;
-    for(int i = 0; i < touchEvent->touchPoints().size(); i++) {
-        y += touchEvent->touchPoints().at(i).screenPos().y();
-    }
-    y /= touchEvent->touchPoints().size();
-
-    return QPointF(x, y);
-}
-
-// End of File
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gestures/hbswipegesturerecognizer_p.h
--- a/src/hbcore/gestures/hbswipegesturerecognizer_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +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 HBSWIPEGESTURERECOGNIZER_H
-#define HBSWIPEGESTURERECOGNIZER_H
-
-#include <hbglobal.h>
-#include <QGesture>
-#include <QGestureRecognizer>
-#include <QPoint>
-#include <QTime>
-#include <QEvent>
-#include <QTouchEvent>
-
-class HbSwipeGesture;
-/*class QTouchEvent;
-class TouchPoint;*/
-class QGraphicsSceneMouseEvent;
-
-class HB_CORE_PRIVATE_EXPORT HbSwipeGestureRecognizer : public QGestureRecognizer
-{
-public:
-
-    HbSwipeGestureRecognizer();
-    virtual ~HbSwipeGestureRecognizer();
-
-    virtual QGesture* create(QObject *target);
-    virtual QGestureRecognizer::Result recognize(QGesture *state, QObject *watched, QEvent *event);
-    virtual void reset(QGesture *state);
-
-private:
-    QGestureRecognizer::Result recognizeTouchEvent(HbSwipeGesture *state, QTouchEvent *touchEvent);
-    QGestureRecognizer::Result recognizeMouseEvent(HbSwipeGesture *state, QGraphicsSceneMouseEvent *mouseEvent);
-    bool touchMoveEvent(QTouchEvent *touchEvent);
-    QPointF touchPointsCenterPoint(QTouchEvent *touchEvent);
-};
-
-#endif // HBSWIPEGESTURERECOGNIZER_H
-
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gestures/hbtapandholdgesture.cpp
--- a/src/hbcore/gestures/hbtapandholdgesture.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gestures/hbtapandholdgesture.cpp	Mon May 03 12:48:33 2010 +0300
@@ -23,14 +23,11 @@
 **
 ****************************************************************************/
 
+#include "hbgestures_p.h"
 #include "hbtapandholdgesture_p.h"
 #include "hbtapandholdgesture.h"
 
-#include <QGraphicsSceneEvent>
-#include <QVariant>
-#include <QDebug>
-#include <QPoint>
-#include <QLine>
+#include <QObject>
 
 /*!
     \internal
@@ -41,9 +38,17 @@
 
 HbTapAndHoldGesture::HbTapAndHoldGesture(QObject* parent)
     :
+    QTapAndHoldGesture(parent)
+{
+    priv = new HbTapAndHoldGesturePrivate(this);
+}
+
+HbTapAndHoldGesture::HbTapAndHoldGesture(HbTapAndHoldGesturePrivate* data, QObject* parent)
+    :
     QTapAndHoldGesture(parent),
-    priv(new HbTapAndHoldGesturePrivate())
+    priv(data)
 {
+    priv->q_ptr = this;
 }
 
 HbTapAndHoldGesture::~HbTapAndHoldGesture()
@@ -51,26 +56,12 @@
     delete priv; priv = NULL;
 }
 
-/*!
-    \internal
-    \brief Stores relevant values from the event.
-    \param event Event to be read.
-
-    Gesture needs to know its position all the time, and that information
-    is provided during the event.
-*/
-void HbTapAndHoldGesture::update(QEvent& event)
+QPointF HbTapAndHoldGesture::scenePosition() const
 {
-    if ( event.type() != QEvent::Timer )
-    {
-        QGraphicsSceneMouseEvent* me = static_cast<QGraphicsSceneMouseEvent*>(&event);
-        setProperty("position", me ? me->screenPos() : property("startPos"));
-    }
+    return priv->mScenePos;
 }
 
-bool HbTapAndHoldGesture::outsideThreshold()
+void HbTapAndHoldGesture::setScenePosition(const QPointF& pos)
 {
-    QPointF startPos = property("startPos").toPoint();
-    QPointF lastPos = property("position").toPoint();
-    return QLineF(startPos, lastPos).length() > DELTA_TOLERANCE;
+    priv->mScenePos = pos;
 }
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gestures/hbtapandholdgesture.h
--- a/src/hbcore/gestures/hbtapandholdgesture.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gestures/hbtapandholdgesture.h	Mon May 03 12:48:33 2010 +0300
@@ -26,8 +26,6 @@
 #ifndef HBTAPANDHOLDGESTURE_P_H
 #define HBTAPANDHOLDGESTURE_P_H
 
-#ifdef HB_GESTURE_FW
-
 #include <hbglobal.h>
 #include <QGesture>
 
@@ -37,20 +35,22 @@
 {
     Q_OBJECT
 
+    Q_PROPERTY(QPointF scenePosition READ scenePosition WRITE setScenePosition)
+
 public:
     HbTapAndHoldGesture(QObject* parent = NULL);
     virtual ~HbTapAndHoldGesture();
 
-// Data
-    bool outsideThreshold();
-    void update(QEvent& event);
+    QPointF scenePosition() const;
+    void setScenePosition(const QPointF &pos);
+
+protected:
+    HbTapAndHoldGesture(HbTapAndHoldGesturePrivate* data, QObject* parent = NULL);
 
 private:
-	HbTapAndHoldGesturePrivate* priv;
-    friend class HbTapAndHoldGestureRecognizer;
+    HbTapAndHoldGesturePrivate* priv;
+    friend class HbTapAndHoldGestureLogic;
 };
 
-#endif // HB_GESTURE_FW
-
 #endif // HBTAPANDHOLDGESTURE_P_H
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gestures/hbtapandholdgesture_p.h
--- a/src/hbcore/gestures/hbtapandholdgesture_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gestures/hbtapandholdgesture_p.h	Mon May 03 12:48:33 2010 +0300
@@ -26,7 +26,13 @@
 #ifndef HBTAPANDHOLDGESTURE_P_P_H
 #define HBTAPANDHOLDGESTURE_P_P_H
 
+#include "hbtapandholdgesture.h"
+
 #include <hbglobal.h>
+#include <QMouseEvent>
+#include <QPoint>
+#include <QLine>
+#include <QVariant>
 
 const qreal DELTA_TOLERANCE = 1.0;
 const int HOLDTAP_ACTIVATION_USECS = 150; // usecs
@@ -35,6 +41,16 @@
 class HB_CORE_PRIVATE_EXPORT HbTapAndHoldGesturePrivate
 {
 public:
+    HbTapAndHoldGesturePrivate(HbTapAndHoldGesture* owner = NULL)
+        :
+        q_ptr(owner),
+        mScenePos(QPointF(0,0)),
+        mRunningTime(0),
+        mTimerID(0) {};
+    HbTapAndHoldGesture* q_ptr;    
+
+    QPointF mScenePos;
+
     int mRunningTime;
     int mTimerID;
 };
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gestures/hbtapandholdgesturelogic_p.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/gestures/hbtapandholdgesturelogic_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,334 @@
+/****************************************************************************
+**
+** 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 "hbgestures_p.h"
+#include "hbtapandholdgesture.h"
+#include "hbtapandholdgesture_p.h"
+#include "hbtapandholdgesturelogic_p.h"
+
+#include <QEvent>
+#include <QGestureRecognizer>
+#include <QGraphicsView>
+#include <QMouseEvent>
+#include <QDebug>
+
+//#define TAPANDHOLD_DEBUG
+#ifdef TAPANDHOLD_DEBUG
+#define DEBUG qDebug
+#else
+#define DEBUG if (0) qDebug
+#endif
+
+/*!
+    @hbcore
+    \internal
+    \class HbTapAndHoldGestureLogic
+
+    \brief HbTapAndHoldGestureLogic implements a gesture for tap and hold.
+*/
+
+
+/*!
+    \internal
+    \brief
+    \return
+
+*/
+HbTapAndHoldGestureLogic::HbTapAndHoldGestureLogic()
+    :
+    mTapRadius(0)
+{
+}
+
+/*!
+    \internal
+    \brief
+    \return
+
+*/
+HbTapAndHoldGestureLogic::~HbTapAndHoldGestureLogic() {}
+
+/*!
+    \internal
+    \brief Checks if point has moved beyond finger threshold.
+
+    After user has touched the screen and intends invoke 'tap and hold' -gesture,
+    he must keep finger still until the timer expires. If finger position moves
+    beyond the given threshold for moving, timer needs to cancel. This function
+    checks, if the finger is still inside the threshold.
+*/
+bool HbTapAndHoldGestureLogic::outsideThreshold(HbTapAndHoldGesture *gesture)
+{
+    QPointF startPos = gesture->property("startPos").toPointF();
+    QPointF lastPos = gesture->property("position").toPointF();
+
+    int movementThreshold = HbTapAndHoldGestureLogic::mTapRadius;
+    if ( gesture->property("tapRadius").isValid() ) {
+        movementThreshold = gesture->property("tapRadius").toInt();
+    }
+
+    return QLineF(startPos, lastPos).length() > movementThreshold;
+};
+
+/*!
+    \internal
+    \brief Starts brand new timer.
+    \param msecs Timer runtime in microseconds
+    \return ID of the timer
+*/
+int HbTapAndHoldGestureLogic::startTimer(
+        HbTapAndHoldGesture* gesture,
+        int msecs)
+{
+    gesture->priv->mRunningTime = msecs;
+    return gesture->startTimer(msecs);
+}
+
+/*!
+    \internal
+    \brief
+    \return
+
+*/
+void HbTapAndHoldGestureLogic::resetGesture(HbTapAndHoldGesture *gesture)
+{
+    if ( gesture->priv->mTimerID ) {
+        gesture->killTimer(gesture->priv->mTimerID);
+    }
+
+    gesture->setProperty("startPos", QPointF(0,0));
+    gesture->setProperty("tapRadius", QPointF(0,0));
+    gesture->setProperty("position", QPointF(0,0));
+    gesture->setProperty("scenePosition", QPointF(0,0));
+
+    gesture->priv->mTimerID = 0;
+    gesture->priv->mRunningTime = 0;
+}
+
+/*!
+    \internal
+    \brief Handle mouse press event.
+    \return State change information.
+
+    Mouse press event only needs to record the location and start short timer
+    before triggering.
+*/
+QGestureRecognizer::Result HbTapAndHoldGestureLogic::handleMousePress(
+        Qt::GestureState gestureState,
+        HbTapAndHoldGesture *gesture,
+        QObject *watched,
+        QMouseEvent *me )
+{
+    Q_UNUSED(gestureState);
+
+    // Accept only press events from left mouse button.
+    if ( me->button() != Qt::LeftButton ) {
+        DEBUG() << gesture << QGestureRecognizer::Ignore;
+        return QGestureRecognizer::Ignore;
+    }
+
+    // Last position is automatically recorded before this event call.
+    // Press event only means, that gesture is starting, thus last position is
+    // also the starting position.
+    gesture->setHotSpot(me->globalPos());
+    gesture->setProperty("startPos", me->globalPos());
+    gesture->setProperty("position", me->globalPos());
+    gesture->setProperty("scenePosition", HbGestureUtils::mapToScene(watched, me->globalPos()));
+    gesture->priv->mTimerID = startTimer(gesture, HOLDTAP_ACTIVATION_USECS);
+    
+    DEBUG() << gesture << QGestureRecognizer::MayBeGesture;
+    return QGestureRecognizer::MayBeGesture;
+}
+
+/*!
+    \internal
+    \brief Handle mouse move event.
+    \return State change information.
+
+    Mousemove -event should cancel the gesture, when finger has moved outside
+    the threshold.
+*/
+QGestureRecognizer::Result HbTapAndHoldGestureLogic::handleMouseMove(
+        Qt::GestureState gestureState,
+        HbTapAndHoldGesture *gesture,
+        QObject *watched,
+        QMouseEvent *me )
+{
+    Q_UNUSED(gestureState);
+
+    // Before anything, check if there is even left button pressed.
+    if (me->buttons() != Qt::LeftButton || !gesture->priv->mRunningTime){
+        DEBUG() << gesture << QGestureRecognizer::Ignore;
+        return QGestureRecognizer::Ignore;
+    }
+
+    gesture->setProperty("position", me->globalPos());
+    gesture->setProperty("scenePosition", HbGestureUtils::mapToScene(watched, me->globalPos()));
+
+    // Makes sure that finger remains inside the movement threshold.
+    if (outsideThreshold(gesture)){        
+        // Finger has moved outside, so cancel this gesture
+        gesture->killTimer(gesture->priv->mTimerID);
+        return QGestureRecognizer::CancelGesture;
+    }
+
+    // Move events should be just ignored.
+    DEBUG() << gesture << QGestureRecognizer::MayBeGesture;
+    return QGestureRecognizer::MayBeGesture;
+}
+			
+/*!
+    \internal
+    \brief Handles mouse release event.
+    \return State change information.
+
+    When release happens, any timer running dictates, whether the gesture
+    should be considered as cancelled or finished. Both events needs to be
+    sent, so that UI may react correctly.
+*/
+QGestureRecognizer::Result HbTapAndHoldGestureLogic::handleMouseRelease(
+        Qt::GestureState gestureState,
+        HbTapAndHoldGesture *gesture,
+        QObject *watched,
+        QMouseEvent *me )
+{
+    Q_UNUSED(gestureState);
+    Q_UNUSED(me);
+    Q_UNUSED(watched);
+
+    // Check if the gesture is already been cancelled. This is an unknown state.
+    if (!gesture->priv->mRunningTime) {
+        DEBUG() << gesture << QGestureRecognizer::Ignore;
+        return QGestureRecognizer::Ignore;
+    }
+
+    // If release happens, before timer has expired, cancel the gesture.
+    if (gesture->priv->mTimerID) {
+        gesture->killTimer(gesture->priv->mTimerID);
+        return QGestureRecognizer::CancelGesture;
+    } else {
+        // Gesture has already been executed. Just ignore the event and don't
+        // bother UI about it.
+        gesture->priv->mTimerID = 0;
+        gesture->priv->mRunningTime = 0;
+
+        DEBUG() << gesture << QGestureRecognizer::Ignore;
+        return QGestureRecognizer::Ignore;
+    }
+}			
+		
+/*!
+    \internal
+    \brief Handle timer event.
+    \return State change information.
+
+    Timer is a heart of the tap and hold gesture and dictates its
+    behavior. There are three phases: not started - started - finished.
+    When the timer event is invoked, the state of the gesture is changed
+    and the timer event is consumed.
+
+    \see HbTapAndHoldGestureLogic::HandleGesture()
+*/
+QGestureRecognizer::Result HbTapAndHoldGestureLogic::handleTimer(
+        HbTapAndHoldGesture *gesture,
+        QTimerEvent* te)
+{
+    // React only to own timer event, please.
+    if ( gesture->priv->mTimerID == te->timerId() ) {
+        // Consume the timer event as nobody will be interested about this.
+        QGestureRecognizer::Result result = QGestureRecognizer::ConsumeEventHint;
+
+        // Handle the event and consume the timer event as it doesn't belong
+        // to anybody else.
+        switch ( gesture->priv->mRunningTime )
+        {
+        // Time to invoke the started event.
+        case HOLDTAP_ACTIVATION_USECS:
+            gesture->priv->mTimerID = startTimer(gesture, HOLDTAP_DURATION_USECS);
+            result |= QGestureRecognizer::TriggerGesture;
+            break;
+
+        // Time to invoke finish event.
+        case HOLDTAP_DURATION_USECS:
+            gesture->priv->mTimerID = 0;
+            gesture->priv->mRunningTime = 0;
+            result |= QGestureRecognizer::FinishGesture;
+            break;
+
+        default:
+            result |= QGestureRecognizer::Ignore;
+            break;
+        }
+
+        DEBUG() << gesture << result;
+        return result;
+    } else {
+        // Not our business.
+        DEBUG() << gesture << QGestureRecognizer::Ignore;
+        return QGestureRecognizer::Ignore;
+    }
+}
+
+/*!
+    \internal
+    \brief Recognizes and handles events and converts them to gesture events.
+    \param state Associated gesture
+    \param watched Object that needs attention.
+    \param event Event invoked the this function call.
+    \return State change information.
+    \relates QGestureRecognizer
+*/
+QGestureRecognizer::Result HbTapAndHoldGestureLogic::recognize(
+        Qt::GestureState gestureState,
+        HbTapAndHoldGesture *gesture,
+        QObject *watched,
+        QEvent *event )
+{
+    DEBUG() << "Entering" << gestureState << gesture << watched << event;
+
+    switch( event->type() )
+    {
+    case QEvent::MouseButtonDblClick:
+    case QEvent::MouseButtonPress:
+        return handleMousePress(
+            gestureState, gesture, watched, static_cast<QMouseEvent*>(event));
+
+    case QEvent::MouseMove:
+        return handleMouseMove(
+            gestureState, gesture, watched, static_cast<QMouseEvent*>(event));
+
+    case QEvent::MouseButtonRelease:
+        return handleMouseRelease(
+            gestureState, gesture, watched, static_cast<QMouseEvent*>(event));
+
+    case QEvent::Timer:
+        return handleTimer(gesture, static_cast<QTimerEvent*>(event));
+
+    default: break;
+    }
+
+    DEBUG() << gesture << QGestureRecognizer::Ignore;
+    return QGestureRecognizer::Ignore;
+}
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gestures/hbtapandholdgesturelogic_p.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/gestures/hbtapandholdgesturelogic_p.h	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,64 @@
+/****************************************************************************
+**
+** 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 HBTAPANDHOLDGESTURELOGIC_P_H
+#define HBTAPANDHOLDGESTURELOGIC_P_H
+
+#include "hbgestures_p.h"
+
+#include <QObject>
+#include <QGestureRecognizer>
+#include <hbglobal.h>
+
+class QEvent;
+class QMouseEvent;
+class QTimerEvent;
+class HbTapAndHoldGesture;
+
+class HB_CORE_PRIVATE_EXPORT HbTapAndHoldGestureLogic
+{
+public:
+    HbTapAndHoldGestureLogic();
+    ~HbTapAndHoldGestureLogic();
+
+    bool outsideThreshold(HbTapAndHoldGesture *gesture);
+    int startTimer(HbTapAndHoldGesture *gesture, int msecs);
+
+    void resetGesture(HbTapAndHoldGesture *gesture);
+    QGestureRecognizer::Result handleMousePress(
+        Qt::GestureState gestureState, HbTapAndHoldGesture *gesture, QObject *watched, QMouseEvent *me );
+    QGestureRecognizer::Result handleMouseMove(
+        Qt::GestureState gestureState, HbTapAndHoldGesture *gesture, QObject *watched, QMouseEvent *me );
+    QGestureRecognizer::Result handleMouseRelease(
+        Qt::GestureState gestureState, HbTapAndHoldGesture *gesture, QObject *watched, QMouseEvent *me );
+    QGestureRecognizer::Result handleTimer(
+        HbTapAndHoldGesture *gesture, QTimerEvent* te);
+    QGestureRecognizer::Result recognize(
+        Qt::GestureState gestureState, HbTapAndHoldGesture *gesture, QObject *watched, QEvent* event );
+
+    int mTapRadius;
+};
+
+#endif // HBTAPANDHOLDGESTURELOGIC_P_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gestures/hbtapandholdgesturerecognizer.cpp
--- a/src/hbcore/gestures/hbtapandholdgesturerecognizer.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,301 +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 "hbtapandholdgesture.h"
-#include "hbtapandholdgesture_p.h"
-#include "hbtapandholdgesturerecognizer_p.h"
-
-#include <QWidget>
-#include <QGesture>
-#include <QEvent>
-#include <QVariant>
-#include <QGraphicsSceneEvent>
-#include <QDebug>
-
-/*!
-    \internal
-    \class HbTapAndHoldGestureRecognizer
-
-    \brief HbTapAndHoldGestureRecognizer implements a gesture for tap and hold.
-*/
-
-/*!
-    \internal
-    \brief Default constructor.
-*/
-HbTapAndHoldGestureRecognizer::HbTapAndHoldGestureRecognizer()
-    :
-    QGestureRecognizer()
-{
-}
-
-/*!
-    \internal
-    \brief Create new gesture object.
-    \param target Associated target.
-*/
-QGesture* HbTapAndHoldGestureRecognizer::create(QObject* /*target*/)
-{
-    return new HbTapAndHoldGesture;
-}
-
-/*!
-    \internal
-    \brief Handle mouse press event.
-    \return State change information.
-
-    Mouse press event only needs to record the location and start short timer
-    before triggering.
-*/
-QGestureRecognizer::Result HbTapAndHoldGestureRecognizer::HandleGraphicsSceneMousePress(
-	HbTapAndHoldGesture& gesture )
-{
-    // Last position is automatically recorded before this event call.
-    // Press event only means, that gesture is starting, thus last position is
-    // also the starting position.
-    gesture.setProperty("startPos", gesture.property("position"));
-    gesture.priv->mTimerID = startTimer(gesture, HOLDTAP_ACTIVATION_USECS);
-    gesture.setHotSpot(gesture.property("startPos").toPointF());
-
-    return QGestureRecognizer::MayBeGesture;
-}
-
-/*!
-    \internal
-    \brief Handle mouse move event.
-    \return State change information.
-
-    Mousemove -event should cancel the gesture, when finger has moved outside
-    the threshold.
-*/
-QGestureRecognizer::Result HbTapAndHoldGestureRecognizer::HandleGraphicsSceneMouseMove(
-	HbTapAndHoldGesture& gesture )
-{
-    // In case timer is not running, just cancel gesture.priv-> This is an unknown state.
-    if ( !gesture.priv->mRunningTime ) return QGestureRecognizer::CancelGesture;
-
-    // Makes sure that finger remains inside the movement threshold.
-    if ( gesture.outsideThreshold() )
-    {
-        // Finger has moved outside, so reset and cancel this gesture.priv->
-        reset(&gesture);
-        return QGestureRecognizer::CancelGesture;
-    }
-
-    // Move events should be just ignored.
-    return QGestureRecognizer::Ignore;
-}
-
-/*!
-    \internal
-    \brief Handles mouse release event.
-    \return State change information.
-
-    When release happens, any timer running dictates, whether the gesture
-    should be considered as cancelled or finished. Both events needs to be
-    sent, so that UI may react correctly.
-*/
-QGestureRecognizer::Result HbTapAndHoldGestureRecognizer::HandleGraphicsSceneMouseRelease(
-	HbTapAndHoldGesture& gesture )
-{
-    // Check if the gesture is already been cancelled. This is an unknown state.
-    if ( !gesture.priv->mRunningTime ) return QGestureRecognizer::CancelGesture;
-
-    // If release happens, before timer has expired, cancel the gesture.priv->
-    if ( gesture.priv->mTimerID )
-    {
-        reset(&gesture);
-        return QGestureRecognizer::CancelGesture;
-    }
-    else
-    {
-        // Gesture has succesfully executed. Reward the UI with finished event.
-        gesture.priv->mTimerID = 0;
-        gesture.priv->mRunningTime = 0;
-        return QGestureRecognizer::FinishGesture;
-    }
-}
-
-/*!
-    \internal
-    \brief Handle timer event.
-    \return State change information.
-
-    Timer is a heart of the tap and hold gesture and dictates its
-    behavior. There are three phases: not started - started - finished.
-    When the timer event is invoked, the state of the gesture is changed
-    and the timer event is consumed.
-
-    \see HbTapAndHoldGestureRecognizer::HandleGesture()
-*/
-QGestureRecognizer::Result HbTapAndHoldGestureRecognizer::HandleTimer(
-	HbTapAndHoldGesture& gesture,
-	QEvent& event)
-{
-    // React only to own timer event, please.
-    if ( gesture.priv->mTimerID == GetTimerID(event) )
-    {
-        // Handle the event and consume the timer event as it doesn't belong
-        // to anybody else.
-        return HandleGesture(gesture) | QGestureRecognizer::ConsumeEventHint;
-    }
-    else
-    {
-        // Not our business.
-        return QGestureRecognizer::Ignore;
-    }
-}
-
-/*!
-    \internal
-    \brief Handle event invoked by the timer.
-    \return State change information.
-
-    Changes the hold and tap -gestures state, dictated by the expired timer.
-    Changes the state from Not started to started and from started to finished.
-
-    \see HbTapAndHoldGestureRecognizer::HandleTimer()
-*/
-QGestureRecognizer::Result HbTapAndHoldGestureRecognizer::HandleGesture(
-	HbTapAndHoldGesture& gesture)
-{
-    switch ( gesture.priv->mRunningTime )
-    {
-        // Time to invoke the started event.
-        case HOLDTAP_ACTIVATION_USECS:
-            gesture.priv->mTimerID = startTimer(gesture, HOLDTAP_DURATION_USECS);
-            return QGestureRecognizer::TriggerGesture;
-
-        // Time to invoke finish event.
-        case HOLDTAP_DURATION_USECS:
-            gesture.priv->mTimerID = 0;
-            return QGestureRecognizer::FinishGesture;
-
-        default: break;
-    }
-
-    return QGestureRecognizer::Ignore;
-}
-
-/*!
-    \internal
-    \brief Checks whether the events needs to be reacted or not
-    \param event Event to be analyzed.
-    \return True, if the event is mouse event or timer event, otherwise False.
-*/
-bool HbTapAndHoldGestureRecognizer::IsInterestingEvent(QEvent& event)
-{
-    return ( event.type() >= QEvent::GraphicsSceneMouseMove &&
-			 event.type() <= QEvent::GraphicsSceneMouseRelease ) ||
-           event.type() == QEvent::Timer;
-}
-
-/*!
-    \internal
-    \brief Retrieves the timer event from the event from the event.
-    \param event Event for investigation.
-    \return Valid timer ID
-*/
-int HbTapAndHoldGestureRecognizer::GetTimerID(QEvent& event)
-{
-	// It is already safe to presume the event is timer event, because
-	// the test is already made.
-    QTimerEvent* te = static_cast<QTimerEvent*>(&event);
-    return te->timerId();
-}
-
-/*!
-    \internal
-    \brief Recognizes and handles events and converts them to gesture events.
-    \param state Associated gesture.priv->
-    \param watched Object that needs attention.
-    \param event Event invoked the this function call.
-    \return State change information.
-    \relates QGestureRecognizer
-*/
-QGestureRecognizer::Result HbTapAndHoldGestureRecognizer::recognize(
-        QGesture *state, QObject * /*watched*/, QEvent *event)
-{
-    // Don't even try to handle cases, when any of the pointers is NULL.
-    if (!state || !event) return QGestureRecognizer::Ignore;
-    // Ignore events which are not gesture events.
-    if ( !IsInterestingEvent(*event) ) return QGestureRecognizer::Ignore;
-
-    HbTapAndHoldGesture& gesture = *static_cast<HbTapAndHoldGesture*>(state);
-    gesture.update(*event);
-
-    QGestureRecognizer::Result result(QGestureRecognizer::Ignore);
-
-    switch (event->type()) {
-    case QEvent::GraphicsSceneMousePress:   return HandleGraphicsSceneMousePress(gesture);
-    case QEvent::GraphicsSceneMouseRelease: return HandleGraphicsSceneMouseRelease(gesture);
-    case QEvent::GraphicsSceneMouseMove:    return HandleGraphicsSceneMouseMove(gesture);
-    case QEvent::Timer:                     return HandleTimer(gesture, *event);
-
-    case QEvent::TouchBegin:
-    case QEvent::TouchUpdate:
-    case QEvent::TouchEnd: return QGestureRecognizer::Ignore;
-    default: break;
-    }
-    return QGestureRecognizer::Ignore;
-}
-
-/*!
-    \internal
-    \brief Clears all values for recognizer and gesture.priv->
-    \param state Associated gesture.priv->
-    \relates QGestureRecognizer
-*/
-void HbTapAndHoldGestureRecognizer::reset(QGesture *state)
-{
-    QGestureRecognizer::reset(state);
-
-	HbTapAndHoldGesture& gesture = *static_cast<HbTapAndHoldGesture*>(state);
-    if ( gesture.priv->mTimerID )
-    {
-        gesture.killTimer(gesture.priv->mTimerID);
-    }
-
-	gesture.setProperty("startPos", QVariant());
-    gesture.setProperty("tapRadius", QVariant());
-
-    gesture.priv->mTimerID = 0;
-    gesture.priv->mRunningTime = 0;
-}
-
-/*!
-    \internal
-    \brief Starts brand new timer.
-    \param msecs Timer runtime in microseconds
-    \return ID of the timer
-*/
-int HbTapAndHoldGestureRecognizer::startTimer(
-	HbTapAndHoldGesture& gesture,
-	int msecs)
-{
-    gesture.priv->mRunningTime = msecs;
-    return gesture.startTimer(msecs);
-}
-
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gestures/hbtapandholdgesturerecognizer_p.h
--- a/src/hbcore/gestures/hbtapandholdgesturerecognizer_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +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 HBTAPANDHOLDGESTURERECOGNIZER_P_H
-#define HBTAPANDHOLDGESTURERECOGNIZER_P_H
-
-#include <hbglobal.h>
-#include <QGestureRecognizer>
-
-class QWidget;
-class HbTapAndHoldGesture;
-class QObject;
-class QTouchEvent;
-
-class HB_CORE_PRIVATE_EXPORT HbTapAndHoldGestureRecognizer : public QGestureRecognizer
-{
-public:
-    HbTapAndHoldGestureRecognizer();
-    QGesture *create(QObject *target);
-
-    // from base class QGestureRecognizer
-    QGestureRecognizer::Result recognize(QGesture *state, QObject *watched, QEvent *event);
-    void reset(QGesture *state);
-
-    // new functions
-    int GetTimerID(QEvent& event);
-
-private:
-    QGestureRecognizer::Result HandleGraphicsSceneMousePress(HbTapAndHoldGesture& gesture);
-    QGestureRecognizer::Result HandleGraphicsSceneMouseMove(HbTapAndHoldGesture& gesture);
-    QGestureRecognizer::Result HandleGraphicsSceneMouseRelease(HbTapAndHoldGesture& gesture);
-    QGestureRecognizer::Result HandleTimer(HbTapAndHoldGesture& gesture, QEvent& event);
-    QGestureRecognizer::Result HandleGesture(HbTapAndHoldGesture& gesture);
-    int startTimer(HbTapAndHoldGesture& gesture, int msecs);
-    bool IsInterestingEvent(QEvent& event);
-};
-
-#endif // HBTAPANDHOLDGESTURERECOGNIZER_P_H
-
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gestures/hbtapgesture.cpp
--- a/src/hbcore/gestures/hbtapgesture.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gestures/hbtapgesture.cpp	Mon May 03 12:48:33 2010 +0300
@@ -23,32 +23,64 @@
 **
 ****************************************************************************/
 
+#include "hbgestures_p.h"
 #include "hbtapgesture.h"
+#include "hbtapgesture_p.h"
+
 #include <QPointF>
 #include <QVariant>
+#include <QDebug>
 
-class HbTapGesturePrivate
+//#define TAPGESTURE_DEBUG
+#ifndef TAPGESTURE_DEBUG
+# define DEBUG if (0) qDebug
+#else
+# define DEBUG qDebug
+#endif
+
+
+HbTapGesturePrivate::HbTapGesturePrivate(): mTapStyleHint(HbTapGesture::Tap), mTimerId(0)
 {
-public:
-    QPointF mStartPos;
-};
+}
+
+/*!
+   @proto
+   @hbcore
+   \class HbTapGesture
+
+   \brief HbTapGesture is an extension to Qt standard QTapGesture.
+
+   HbTapGesture extends QTapGesture with additional information related
+   to the tap gesture, but most important use for HbTapGesture is
+   in widgets needing both tap and tap-and-hold. HbTapGesture
+   provides both -- use of Qt::TapAndHoldGesture
+   in conjunction with Qt::TapGesture in the same widget makes it
+   difficult to handle state updates and finishes in the widget.
+   HbTapGesture::tapStylehint() can be used to query whether
+   the tap was a normal tap, or tap-and-hold at the time of Qt::GestureUpdated
+   of Qt::GestureFinished. A gesture update will be sent at the time
+   when the tap-and-hold timer triggers. No updates are sent
+   of the finger movement during the tap.
+
+   \sa QTapGesture, HbTapGesture::TapStyleHint
+
+*/
 
 HbTapGesture::HbTapGesture(QObject *parent)
     : QTapGesture(parent), d_ptr(new HbTapGesturePrivate)
 {
-
+    DEBUG() << "Creating" << this;
 }
 
 HbTapGesture::HbTapGesture( HbTapGesturePrivate &dd, QObject *parent )
     : QTapGesture(parent), d_ptr( &dd )
 {
-
+    DEBUG() << "Creating" << this;
 }
 
-
-
 HbTapGesture::~HbTapGesture()
 {
+    DEBUG() << "Deleting" << this;
     delete d_ptr;
 }
 
@@ -70,3 +102,53 @@
     Q_D(HbTapGesture);
     d->mStartPos = startPos;
 }
+
+/*!
+
+    \property sceneStartPos
+
+    Stores the starting position of the tap gesture in scene coordinates.
+
+*/
+QPointF HbTapGesture::sceneStartPos() const
+{
+    Q_D(const HbTapGesture);
+    return d->mSceneStartPos;
+}
+
+void HbTapGesture::setSceneStartPos(const QPointF &startPos)
+{
+    Q_D(HbTapGesture);
+    d->mSceneStartPos = startPos;
+}
+
+/*!
+
+    \property startPos
+
+    Stores the starting position of the tap gesture in scene coordinates.
+
+*/
+QPointF HbTapGesture::scenePosition() const
+{
+    Q_D(const HbTapGesture);
+    return d->mScenePosition;
+}
+
+void HbTapGesture::setScenePosition(const QPointF &startPos)
+{
+    Q_D(HbTapGesture);
+    d->mScenePosition = startPos;
+}
+
+/*!
+    \property tapStyleHint
+
+    TapStyleHint is by default Tap and in case of long press, the gesture
+    update event is sent and TapStyleHint changed to TapAndHold.
+*/
+HbTapGesture::TapStyleHint HbTapGesture::tapStyleHint() const
+{
+    Q_D(const HbTapGesture);
+    return d->mTapStyleHint;
+}
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gestures/hbtapgesture.h
--- a/src/hbcore/gestures/hbtapgesture.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gestures/hbtapgesture.h	Mon May 03 12:48:33 2010 +0300
@@ -25,24 +25,37 @@
 #ifndef HBTAPGESTURE_H
 #define HBTAPGESTURE_H
 
-#ifdef HB_GESTURE_FW
-
 #include <hbglobal.h>
-#include <QTapGesture>
+#include <QGesture>
 
 class HbTapGesturePrivate;
 class HB_CORE_EXPORT HbTapGesture : public QTapGesture
 {
     Q_OBJECT
 
+    Q_ENUMS(TapStyleHint)
     Q_PROPERTY(QPointF startPos READ startPos WRITE setStartPos)
+    Q_PROPERTY(QPointF sceneStartPos READ sceneStartPos WRITE setSceneStartPos)
+    Q_PROPERTY(QPointF scenePosition READ scenePosition WRITE setScenePosition)
+    Q_PROPERTY(TapStyleHint tapStyleHint READ tapStyleHint)
 
 public:
+    enum TapStyleHint {
+        Tap,
+        TapAndHold
+    };
+
     explicit HbTapGesture(QObject *parent = 0);
     virtual ~HbTapGesture();
 
     QPointF startPos() const;
     void setStartPos(const QPointF &startPos);
+    QPointF sceneStartPos() const;
+    void setSceneStartPos(const QPointF &startPos);
+    QPointF scenePosition() const;
+    void setScenePosition(const QPointF &pos);
+
+    TapStyleHint tapStyleHint() const;
 
 protected:
     HbTapGesturePrivate * const d_ptr;
@@ -51,8 +64,7 @@
 private:
     Q_DECLARE_PRIVATE_D(d_ptr, HbTapGesture)
     Q_DISABLE_COPY(HbTapGesture)
+    friend class HbTapGestureLogic;
 };
 
-#endif // HB_GESTURE_FW
-
 #endif // HBTAPGESTURE_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gestures/hbtapgesture_p.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/gestures/hbtapgesture_p.h	Mon May 03 12:48:33 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 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 HBTAPGESTURE_P_H
+#define HBTAPGESTURE_P_H
+#include "hbtapgesture.h"
+
+const int HOLDTAP_DURATION_USECS = 500;
+
+class HB_CORE_PRIVATE_EXPORT HbTapGesturePrivate
+{
+    Q_DECLARE_PUBLIC(HbTapGesture)
+public:
+    HbTapGesturePrivate();
+
+    QPointF mStartPos;
+    QPointF mSceneStartPos;
+    QPointF mScenePosition;
+    HbTapGesture::TapStyleHint mTapStyleHint;
+    int mTimerId;
+protected:
+    HbTapGesture *q_ptr;
+};
+#endif // HBTAPGESTURE_P_H
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gestures/hbtapgesturelogic_p.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/gestures/hbtapgesturelogic_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,240 @@
+/****************************************************************************
+**
+** 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 "hbgestures_p.h"
+#include "hbtapgesturelogic_p.h"
+#include "hbtapgesture.h"
+#include "hbtapgesture_p.h"
+
+#include <QEvent>
+#include <QMouseEvent>
+#include <QGesture>
+#include <QDebug>
+
+//#define GESTURE_DEBUG
+#ifndef GESTURE_DEBUG
+# define DEBUG if (0) qDebug
+#else
+# define DEBUG qDebug
+#endif
+
+/*!
+   @hbcore
+    \internal
+    \class HbTapGestureRecognizer
+
+    \brief HbTapGestureRecognizer implements a gesture recognizer for simple taps.
+
+*/
+
+
+/*!
+    \internal
+    \brief
+    \return
+
+*/
+HbTapGestureLogic::HbTapGestureLogic()
+    :
+    mTapRadius(0)
+{
+}
+
+HbTapGestureLogic::~HbTapGestureLogic() {}
+
+/*!
+    \internal
+    \brief
+    \return
+
+*/
+void HbTapGestureLogic::resetGesture(HbTapGesture *gesture)
+{
+    gesture->setStartPos(QPointF());
+    gesture->setSceneStartPos(QPointF());
+    gesture->setProperty("tapRadius", QVariant());
+}
+
+/*!
+    \internal
+    \brief
+    \return
+
+*/
+QGestureRecognizer::Result HbTapGestureLogic::handleMousePress(
+        Qt::GestureState gestureState,
+        HbTapGesture *gesture,
+        QObject *watched,
+        QMouseEvent *me )
+{
+    DEBUG() << gesture << "PRESS";
+
+    if ( gestureState == Qt::NoGesture && me->button() == Qt::LeftButton)
+    {
+        gesture->setPosition(me->globalPos());
+        gesture->setHotSpot(me->globalPos());
+        gesture->setStartPos(me->globalPos());
+        gesture->setScenePosition(HbGestureUtils::mapToScene(watched, me->globalPos()));
+        gesture->setSceneStartPos(HbGestureUtils::mapToScene(watched, me->globalPos()));
+
+        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);
+
+        return QGestureRecognizer::TriggerGesture;
+    }
+    else
+    {
+        DEBUG() << gesture << "IGNORES" << me;
+        return QGestureRecognizer::Ignore;
+    }
+}
+
+/*!
+    \internal
+    \brief
+    \return
+
+*/
+QGestureRecognizer::Result HbTapGestureLogic::handleMouseMove(
+        Qt::GestureState gestureState,
+        HbTapGesture *gesture,
+        QObject *watched,
+        QMouseEvent *me )
+{
+    if(gestureState != Qt::NoGesture) {
+        int tapRadius(mTapRadius);
+        if(gesture->property("tapRadius").isValid()) {
+            qWarning("WARNING using widget specific properties in HbTapGestureRecognizer");
+            tapRadius = gesture->property("tapRadius").toInt();
+        }
+
+        gesture->setPosition(me->globalPos());
+        gesture->setScenePosition(HbGestureUtils::mapToScene(watched, me->globalPos()));
+        gesture->setHotSpot(me->globalPos());
+        QPointF delta = me->globalPos() - gesture->startPos();
+        if(delta.manhattanLength() > tapRadius) {
+            return QGestureRecognizer::CancelGesture;
+        }
+    }
+    return QGestureRecognizer::Ignore;
+}
+
+/*!
+    \internal
+    \brief
+    \return
+
+*/
+QGestureRecognizer::Result HbTapGestureLogic::handleMouseRelease(
+        Qt::GestureState gestureState,
+        HbTapGesture *gesture,
+        QObject *watched,
+        QMouseEvent *me )
+{
+    DEBUG() << gesture << "MOVE/RELEASE";
+    if(gestureState != Qt::NoGesture) {
+        gesture->setPosition(me->globalPos());
+        gesture->setScenePosition(HbGestureUtils::mapToScene(watched, me->globalPos()));
+        gesture->setHotSpot(me->globalPos());
+        if(me->type() == QEvent::MouseButtonRelease &&
+           me->button() == Qt::LeftButton) {
+            if (gesture->d_func()->mTimerId) gesture->killTimer(gesture->d_func()->mTimerId);
+            gesture->d_func()->mTimerId = 0;
+
+            DEBUG() << gesture << "FINISHES" << me;
+            return QGestureRecognizer::FinishGesture;
+        }
+    }
+
+    return QGestureRecognizer::Ignore;
+}
+
+/*!
+    \internal
+    \brief
+    \return
+
+*/
+QGestureRecognizer::Result HbTapGestureLogic::handleTimerEvent(
+        Qt::GestureState gestureState,
+        HbTapGesture *gesture,
+        QObject *watched)
+{
+    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;
+    }
+
+    return QGestureRecognizer::Ignore;
+}
+
+/*!
+    \internal
+    \brief
+    \return
+
+*/
+QGestureRecognizer::Result HbTapGestureLogic::recognize(
+        Qt::GestureState gestureState,
+        HbTapGesture *gesture,
+        QObject *watched,
+        QEvent *event )
+{
+    switch(event->type())
+    {
+    case QEvent::MouseButtonDblClick:
+    case QEvent::MouseButtonPress:
+        return handleMousePress(gestureState, gesture, watched, toMouseEvent(event));
+
+    case QEvent::MouseMove:
+        return handleMouseMove(gestureState, gesture, watched, toMouseEvent(event));
+
+    case QEvent::MouseButtonRelease:
+        return handleMouseRelease(gestureState, gesture, watched, toMouseEvent(event));
+
+    case QEvent::Timer:
+        return handleTimerEvent(gestureState, gesture, watched);
+
+    case QEvent::TouchBegin:
+    case QEvent::TouchUpdate:        
+        if(toTouchEvent(event)->touchPoints().count() > 1 && gestureState != Qt::NoGesture) {
+            // Cancel tap on multiple fingers
+            return QGestureRecognizer::CancelGesture;
+        }
+
+    default: break;
+    }
+
+    return QGestureRecognizer::Ignore;
+}
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gestures/hbtapgesturelogic_p.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/gestures/hbtapgesturelogic_p.h	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,81 @@
+/****************************************************************************
+**
+** 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 HBTAPGESTURELOGIC_P_H
+#define HBTAPGESTURELOGIC_P_H
+
+#include "hbgestures_p.h"
+#include "hbglobal.h"
+#include "hbtapgesture_p.h"
+
+#include <QMouseEvent>
+#include <QGestureRecognizer>
+
+class QPoint;
+class HbTapGesture;
+class QMouseEvent;
+class QTouchEvent;
+class QTimerEvent;
+
+class HB_CORE_PRIVATE_EXPORT HbTapGestureLogic
+{
+public:
+    HbTapGestureLogic();
+    ~HbTapGestureLogic();
+
+    QMouseEvent* toMouseEvent(QEvent *event) { return static_cast<QMouseEvent*>(event); }
+    QTouchEvent* toTouchEvent(QEvent *event) { return static_cast<QTouchEvent*>(event); }
+    QTimerEvent* toTimerEvent(QEvent *event) { return static_cast<QTimerEvent*>(event); }
+
+    void resetGesture(HbTapGesture *gesture);
+    QGestureRecognizer::Result handleMousePress(
+            Qt::GestureState gestureState,
+            HbTapGesture *gesture,
+            QObject *watched,
+            QMouseEvent *me );
+    QGestureRecognizer::Result handleMouseMove(
+            Qt::GestureState gestureState,
+            HbTapGesture *gesture,
+            QObject *watched,
+            QMouseEvent *me );
+    QGestureRecognizer::Result handleMouseRelease(
+            Qt::GestureState gestureState,
+            HbTapGesture *gesture,
+            QObject *watched,
+            QMouseEvent *me );
+    QGestureRecognizer::Result handleTimerEvent(
+            Qt::GestureState gestureState,
+            HbTapGesture *gesture,
+            QObject *watched);
+    QGestureRecognizer::Result recognize(
+            Qt::GestureState gestureState,
+            HbTapGesture *gesture,
+            QObject *watched,
+            QEvent *event );
+
+    int mTapRadius;
+};
+
+#endif // HBTAPGESTURELOGIC_P_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gestures/hbtapgesturerecognizer.cpp
--- a/src/hbcore/gestures/hbtapgesturerecognizer.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,150 +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 "hbtapgesturerecognizer_p.h"
-#include "hbtapgesture.h"
-
-#include <QEvent>
-#include <QGraphicsSceneMouseEvent>
-#include <QMouseEvent>
-#include <QGesture>
-#include <QDebug>
-
-/*!
-    \internal
-    \class HbTapGestureRecognizer
-
-    \brief HbTapGestureRecognizer implements a gesture recognizer for simple taps.
-
-*/
-
-/*!
-    \internal
-    \param tapRadius maximum allowed radius for jitter
-*/
-HbTapGestureRecognizer::HbTapGestureRecognizer(int tapRadius) : mTapRadius(tapRadius)
-{
-}
-
-/*!
-    \internal
-
-*/
-HbTapGestureRecognizer::~HbTapGestureRecognizer()
-{
-}
-
-/*!
-    \internal
-
-    \reimp
-*/
-QGesture *HbTapGestureRecognizer::create(QObject *)
-{
-    QGesture *gesture = new HbTapGesture;
-    return gesture;
-}
-
-/*!
-    \internal
-
-    \property tapRadius
-
-    Unsupported feature: Setting a tapRadius property for the received HbTapGesture overrides
-    the default tap radius.  Using this will invoke a warning.
-*/
-
-/*!
-    \internal
-
-    \reimp
-
-*/
-QGestureRecognizer::Result HbTapGestureRecognizer::recognize(QGesture *state, QObject *, QEvent *event)
-{
-    HbTapGesture *tap = static_cast<HbTapGesture *>(state);
-    QGraphicsSceneMouseEvent *me = static_cast<QGraphicsSceneMouseEvent*>(event);
-
-    QGestureRecognizer::Result result = QGestureRecognizer::CancelGesture;
-
-    if(event->type() == QEvent::TouchBegin || event->type() == QEvent::TouchUpdate) {
-        QTouchEvent *te = static_cast<QTouchEvent*>(event);
-        if(te->touchPoints().count() > 1) {
-            // Cancel tap on multiple fingers
-            return result;
-        }
-    }
-
-
-    int tapRadius(mTapRadius);
-    if(tap->property("tapRadius").isValid()) {
-        qWarning("WARNING using widget specific properties in HbTapGestureRecognizer");
-        tapRadius = tap->property("tapRadius").toInt();
-    }
-
-    switch(event->type()) {
-    case QEvent::GraphicsSceneMousePress:
-        tap->setPosition(me->screenPos());
-        tap->setHotSpot(me->screenPos());
-        tap->setStartPos(me->screenPos());
-        result = QGestureRecognizer::TriggerGesture;
-        break;
-    case QEvent::GraphicsSceneMouseMove:
-    case QEvent::GraphicsSceneMouseRelease: {
-            if(tap->state() != Qt::NoGesture) {
-                QPointF delta = me->screenPos() - tap->startPos();
-                tap->setPosition(me->screenPos());
-                tap->setHotSpot(me->screenPos());
-                if(delta.manhattanLength() <= tapRadius) {
-                    if(event->type() == QEvent::GraphicsSceneMouseRelease) {
-                        result = QGestureRecognizer::FinishGesture;
-                    } else {
-                        result = QGestureRecognizer::TriggerGesture;
-                    }
-                }
-            }
-        }
-        break;
-    default:
-        result = QGestureRecognizer::Ignore;
-        break;
-    }
-
-    return result;
-}
-
-/*!
-    \internal
-
-*/
-void HbTapGestureRecognizer::reset(QGesture *state)
-{
-    HbTapGesture *tap = qobject_cast<HbTapGesture *>(state);
-    if(tap) {
-        tap->setStartPos(QPointF());
-        tap->setProperty("tapRadius", QVariant());
-    }
-    QGestureRecognizer::reset(state);
-}
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gestures/hbtapgesturerecognizer_p.h
--- a/src/hbcore/gestures/hbtapgesturerecognizer_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +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 HBTAPGESTURERECOGNIZER_H
-#define HBTAPGESTURERECOGNIZER_H
-
-#include <hbglobal.h>
-#include <QGestureRecognizer>
-
-
-class HB_CORE_PRIVATE_EXPORT HbTapGestureRecognizer : public QGestureRecognizer
-{
-public:
-    static const int DefaultTapRadius = 40;
-
-    HbTapGestureRecognizer(int tapRadius = DefaultTapRadius);
-    virtual ~HbTapGestureRecognizer();
-
-    virtual QGesture *create(QObject *target);
-    virtual QGestureRecognizer::Result recognize(QGesture *state, QObject *watched,
-                             QEvent *event);
-    virtual void reset(QGesture *state);
-
-private:
-    int mTapRadius;
-};
-
-#endif // HBTAPGESTURERECOGNIZER_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gestures/hbvelocitycalculator_p.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/gestures/hbvelocitycalculator_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,154 @@
+/****************************************************************************
+**
+** 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 "hbvelocitycalculator_p.h"
+#include "hbpointrecorder_p.h"
+
+#include <QPointF>
+#include <QTime>
+
+#include <QDebug>
+//#define VELOCITY_DEBUG
+#ifndef VELOCITY_DEBUG
+# define DEBUG if (0) qDebug
+#else
+# define DEBUG qDebug
+#endif
+
+// Number of points through considered relevant to calculate speed.
+const int KHbPoints = 4;
+
+// Number to used to adjust the speed to look better for eyes. Simulates mass effect.
+const qreal KHbAdjust = 4.0;
+
+const int KHbSampleTime = 80; // ms
+const int KHbStopTime = 30; // ms
+
+/*!
+   @hbcore
+   \internal
+   \class HbVelocityCalculator
+
+   \brief Class to calculate velocity from point.
+
+*/
+
+/*!
+    \internal
+    \brief
+    \return
+
+*/
+HbVelocityCalculator::HbVelocityCalculator(
+    const HbPointRecorder& listX,
+    const HbPointRecorder& listY )
+    :
+    mListX( listX ),
+    mListY( listY )
+{
+}
+
+/*!
+    \internal
+    \brief
+    \return
+
+*/
+QPointF HbVelocityCalculator::velocity( const QTime& time ) const
+{
+    QPointF velocity(0.0, 0.0);
+
+    velocity.setX(calculate_velocity(mListX, time));
+    velocity.setY(calculate_velocity(mListY, time));
+
+    DEBUG() << "Velocity: " << velocity;
+
+    return velocity;
+}
+
+/*!
+    \internal
+    \brief
+    \return
+
+*/
+qreal HbVelocityCalculator::calculate_velocity(
+    const HbPointRecorder &list,
+    const QTime& time ) const
+{
+    Q_UNUSED(time)
+
+    // Accumulate the distance from previous point until we have sufficient sample
+    qreal delta = 0.0;
+    int timeDelta = 0;
+    if (!(list.mTimes.count() > 1 && list.mPoints.count() > 1) ||
+        (list.mTimes.last().msec()-time.msec() > KHbStopTime)) {
+        return 0.0;
+    }
+    int i = list.mTimes.count();
+    while (timeDelta < KHbSampleTime && i > 0) {
+        i--;
+        timeDelta = time.msec() - list.mTimes.at(i).msec();
+    }
+    delta = list.mPoints.last() - list.mPoints.at(i);
+
+    return delta / (qreal)(list.mTimes.at(i).msecsTo(time));
+    /*// Make decisions based on the last few points.
+    QList<int> points = list.getLastPoints( KHbPoints );
+    QList<QTime> times = list.getLastTimes( KHbPoints );
+    qreal velocity = 0.0;
+
+    // In case of empty list or in case the sizes of the list are different
+    // consider this movement being stopped.
+    if ( !points.length() || points.length() != times.length() )
+    {
+        DEBUG() << "Cancelling velocity calculation, because points.length() == " << points.length() << " and times.length() == " << times.length();
+        return velocity;
+
+    }
+    else
+    {
+        DEBUG() << "Number of points recorded: " << points.length();
+    }
+
+    // Sum the velocities between timedeltas to get the final speed.
+    qreal avg_dt = 0.0;
+    for ( int i = 0; i<points.length()-1; i++)
+    {
+        qreal t = times[i].msecsTo(times[i+1]);
+        avg_dt += t;
+        velocity += ( points[i+1] - points[i] ) / t;
+        velocity /= 2.0;
+    }
+    avg_dt /= times.length();
+
+    // Calculate time between release and last update point.
+    qreal dt = list.lastTime().msecsTo(time);
+
+    if ( !dt ) { dt = avg_dt; }
+
+    // Scale the velocity correctly and adjust it with magic.
+    return velocity * dt / KHbAdjust;*/
+}
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gestures/hbvelocitycalculator_p.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/gestures/hbvelocitycalculator_p.h	Mon May 03 12:48:33 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 HBVELOCITYCALCULATOR_P_H
+#define HBVELOCITYCALCULATOR_P_H
+
+#include "hbglobal.h"
+
+class HbPointRecorder;
+class QPointF;
+class QTime;
+
+class HB_CORE_PRIVATE_EXPORT HbVelocityCalculator
+{
+public:
+    HbVelocityCalculator( const HbPointRecorder& listX, const HbPointRecorder& listY );
+
+    QPointF velocity( const QTime& time ) const;
+
+private:
+    qreal calculate_velocity( const HbPointRecorder& listX, const QTime& time ) const;
+
+    const HbPointRecorder& mListX;
+    const HbPointRecorder& mListY;
+};
+
+#endif // HBVELOCITYCALCULATOR_P_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gui/gui.pri
--- a/src/hbcore/gui/gui.pri	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gui/gui.pri	Mon May 03 12:48:33 2010 +0300
@@ -43,46 +43,47 @@
 PUBLIC_HEADERS += $$PWD/hbview.h
 PUBLIC_HEADERS += $$PWD/hbwidget.h
 PUBLIC_HEADERS += $$PWD/hbwidgetbase.h
+PUBLIC_HEADERS += $$PWD/hbsplashscreen.h
+PUBLIC_HEADERS += $$PWD/hblongpressvisualizer.h
 
-INTERNAL_HEADERS += $$PWD/hbabstractbutton_p.h
-INTERNAL_HEADERS += $$PWD/hbactionmanager_p.h
-INTERNAL_HEADERS += $$PWD/hbactionmanagerxmlparser_p.h
-INTERNAL_HEADERS += $$PWD/hbanchorarrowdrawer_p.h
-INTERNAL_HEADERS += $$PWD/hbbackgrounditem_p.h
-INTERNAL_HEADERS += $$PWD/hbcssinspector_p.h
-INTERNAL_HEADERS += $$PWD/hbdevicefadecontrol_p.h
-INTERNAL_HEADERS += $$PWD/hbdialog_p.h
-INTERNAL_HEADERS += $$PWD/hbdockwidget_p.h
-INTERNAL_HEADERS += $$PWD/hbfocusgroup_p.h
-INTERNAL_HEADERS += $$PWD/hblongpressvisualizer_p.h
-INTERNAL_HEADERS += $$PWD/hbmenucontainer_p.h
-INTERNAL_HEADERS += $$PWD/hbmainwindow_p.h
-INTERNAL_HEADERS += $$PWD/hbmenu_p.h
-INTERNAL_HEADERS += $$PWD/hbmenuitem_p.h
-INTERNAL_HEADERS += $$PWD/hbmenuitem_p_p.h
-INTERNAL_HEADERS += $$PWD/hbpopup_p.h
-INTERNAL_HEADERS += $$PWD/hbpopupmanager_p.h
-INTERNAL_HEADERS += $$PWD/hbpopupmanager_p_p.h
-INTERNAL_HEADERS += $$PWD/hbscrollarea_p.h
-INTERNAL_HEADERS += $$PWD/hbscrollbar_p.h
-INTERNAL_HEADERS += $$PWD/hbtestabilitysignal_p.h
-INTERNAL_HEADERS += $$PWD/hbtoolbar_p.h
-INTERNAL_HEADERS += $$PWD/hbtoolbarextension_p.h
-INTERNAL_HEADERS += $$PWD/hbtoolbutton_p.h
-INTERNAL_HEADERS += $$PWD/hbtooltiplabel_p.h
-INTERNAL_HEADERS += $$PWD/hbtooltiplabel_p_p.h
-INTERNAL_HEADERS += $$PWD/hbview_p.h
-INTERNAL_HEADERS += $$PWD/hbviewactionmanager_p.h
-INTERNAL_HEADERS += $$PWD/hbwidget_p.h
-INTERNAL_HEADERS += $$PWD/hbwidgetbase_p.h
-INTERNAL_HEADERS += $$PWD/hbwidgetsequentialshow_p.h
-INTERNAL_HEADERS += $$PWD/hbnativewindow_sym_p.h
-INTERNAL_HEADERS += $$PWD/hbsplash_p.h
-INTERNAL_HEADERS += $$PWD/hbsplashscreen_p.h
-INTERNAL_HEADERS += $$PWD/hbfadeitem_p.h
-INTERNAL_HEADERS += $$PWD/hbcontentwidget_p.h
-INTERNAL_HEADERS += $$PWD/hbscreen_p.h
-INTERNAL_HEADERS += $$PWD/hbsplashdefs_p.h
+PRIVATE_HEADERS += $$PWD/hbabstractbutton_p.h
+PRIVATE_HEADERS += $$PWD/hbactionmanager_p.h
+PRIVATE_HEADERS += $$PWD/hbactionmanagerxmlparser_p.h
+PRIVATE_HEADERS += $$PWD/hbanchorarrowdrawer_p.h
+PRIVATE_HEADERS += $$PWD/hbbackgrounditem_p.h
+PRIVATE_HEADERS += $$PWD/hbcssinspector_p.h
+PRIVATE_HEADERS += $$PWD/hbdevicefadecontrol_p.h
+PRIVATE_HEADERS += $$PWD/hbdialog_p.h
+PRIVATE_HEADERS += $$PWD/hbdockwidget_p.h
+PRIVATE_HEADERS += $$PWD/hbfocusgroup_p.h
+PRIVATE_HEADERS += $$PWD/hbmenucontainer_p.h
+PRIVATE_HEADERS += $$PWD/hbmainwindow_p.h
+PRIVATE_HEADERS += $$PWD/hbmenu_p.h
+PRIVATE_HEADERS += $$PWD/hbmenuitem_p.h
+PRIVATE_HEADERS += $$PWD/hbmenuitem_p_p.h
+PRIVATE_HEADERS += $$PWD/hbpopup_p.h
+PRIVATE_HEADERS += $$PWD/hbpopupmanager_p.h
+PRIVATE_HEADERS += $$PWD/hbpopupmanager_p_p.h
+PRIVATE_HEADERS += $$PWD/hbscrollarea_p.h
+PRIVATE_HEADERS += $$PWD/hbscrollbar_p.h
+PRIVATE_HEADERS += $$PWD/hbtestabilitysignal_p.h
+PRIVATE_HEADERS += $$PWD/hbtoolbar_p.h
+PRIVATE_HEADERS += $$PWD/hbtoolbarextension_p.h
+PRIVATE_HEADERS += $$PWD/hbtoolbutton_p.h
+PRIVATE_HEADERS += $$PWD/hbtooltiplabel_p.h
+PRIVATE_HEADERS += $$PWD/hbtooltiplabel_p_p.h
+PRIVATE_HEADERS += $$PWD/hbview_p.h
+PRIVATE_HEADERS += $$PWD/hbviewactionmanager_p.h
+PRIVATE_HEADERS += $$PWD/hbwidget_p.h
+PRIVATE_HEADERS += $$PWD/hbwidgetbase_p.h
+PRIVATE_HEADERS += $$PWD/hbwidgetsequentialshow_p.h
+PRIVATE_HEADERS += $$PWD/hbnativewindow_sym_p.h
+PRIVATE_HEADERS += $$PWD/hbsplash_p.h
+PRIVATE_HEADERS += $$PWD/hbfadeitem_p.h
+PRIVATE_HEADERS += $$PWD/hbcontentwidget_p.h
+PRIVATE_HEADERS += $$PWD/hbscreen_p.h
+PRIVATE_HEADERS += $$PWD/hbsplashdefs_p.h
+PRIVATE_HEADERS += $$PWD/hblongpressvisualizer_p.h
 
 SOURCES += $$PWD/hbabstractbutton.cpp
 SOURCES += $$PWD/hbactionmanager.cpp
@@ -93,7 +94,6 @@
 SOURCES += $$PWD/hbdialog.cpp
 SOURCES += $$PWD/hbdockwidget.cpp
 SOURCES += $$PWD/hbfocusgroup_p.cpp
-SOURCES += $$PWD/hblongpressvisualizer.cpp
 SOURCES += $$PWD/hbmainwindow.cpp
 SOURCES += $$PWD/hbmainwindow_p.cpp
 SOURCES += $$PWD/hbmenu.cpp
@@ -122,12 +122,13 @@
 SOURCES += $$PWD/hbfadeitem.cpp
 SOURCES += $$PWD/hbcontentwidget.cpp
 SOURCES += $$PWD/hbscreen.cpp
+SOURCES += $$PWD/hblongpressvisualizer.cpp
 
 symbian:SOURCES += $$PWD/hbdevicefadecontrolsym.cpp
-win32|linux-*|macx-*:SOURCES += $$PWD/hbdevicefadecontrolwin.cpp
+else:SOURCES += $$PWD/hbdevicefadecontrolwin.cpp
 symbian:SOURCES += $$PWD/hbnativewindow_sym.cpp
 
 settingswindow {
-    INTERNAL_HEADERS += $$PWD/hbsettingswindow_p.h
+    PRIVATE_HEADERS += $$PWD/hbsettingswindow_p.h
     SOURCES += $$PWD/hbsettingswindow_p.cpp
 }
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gui/hbabstractbutton.cpp
--- a/src/hbcore/gui/hbabstractbutton.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gui/hbabstractbutton.cpp	Mon May 03 12:48:33 2010 +0300
@@ -36,6 +36,11 @@
 
 #include <hbwidgetfeedback.h>
 
+#ifdef HB_GESTURE_FW
+#include <hbtapgesture.h>
+#include <hbpangesture.h>
+#endif
+
 namespace {
     static const int AUTO_REPEAT_DELAY = 300;
     static const int AUTO_REPEAT_INTERVAL = 100;
@@ -290,6 +295,10 @@
 
 	q->setFocusPolicy(Qt::FocusPolicy(qApp->style()->styleHint(QStyle::SH_Button_FocusPolicy)));
 
+#ifdef HB_GESTURE_FW
+    q->grabGesture(Qt::TapGesture);
+#endif
+
     // FIXME: size policy is commented out b/c of a bug in Qt #236689, also in our bugtracker.
     //q->setSizePolicy(QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum, controlType));
 
@@ -810,6 +819,7 @@
 #ifndef QT_NO_WHEELEVENT
         case QEvent::Wheel:
 #endif
+        case QEvent::Gesture:
             return true;
         default:
             break;
@@ -838,6 +848,7 @@
     return HbWidget::event(event);
 }
 
+#ifndef HB_GESTURE_FW
 /*!
     \reimp
  */
@@ -934,6 +945,53 @@
         event->ignore();
     }
 }
+#endif
+
+#ifdef HB_GESTURE_FW
+void HbAbstractButton::gestureEvent(QGestureEvent *event)
+{
+    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:
+            setDown(true);
+            HbWidgetFeedback::triggered(this, Hb::InstantPressed);
+            updatePrimitives();
+            d->emitPressed();
+            break;
+        case Qt::GestureCanceled:
+            if(d->down) {
+                HbWidgetFeedback::triggered(this, Hb::InstantReleased);
+                setDown(false);
+                d->longPress = false;
+                d->emitReleased(); 
+            }
+            break;
+        case Qt::GestureFinished:
+            if (!d->down) {
+                return;
+            }
+            if ( hit  && !d->longPress) {
+                HbWidgetFeedback::triggered(this, Hb::InstantClicked);
+            }
+            HbWidgetFeedback::triggered(this, Hb::InstantReleased);
+            if ( hit ) {
+                d->repeatTimer.stop();
+                d->click();
+            } else {
+                setDown(false);
+            }
+            d->longPress = false;
+            break;
+        default:
+            break;
+        }
+    }
+}
+#endif
 
 /*!
     \reimp
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gui/hbabstractbutton.h
--- a/src/hbcore/gui/hbabstractbutton.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gui/hbabstractbutton.h	Mon May 03 12:48:33 2010 +0300
@@ -103,14 +103,19 @@
     bool event( QEvent *event );
     void keyPressEvent( QKeyEvent *event );
     void keyReleaseEvent( QKeyEvent *event );
+#ifndef HB_GESTURE_FW
     void mousePressEvent( QGraphicsSceneMouseEvent *event );
     void mouseReleaseEvent( QGraphicsSceneMouseEvent *event );
     void mouseMoveEvent( QGraphicsSceneMouseEvent *event );
+#endif
     void focusInEvent( QFocusEvent *event );
     void changeEvent( QEvent *event );
     void timerEvent( QTimerEvent *event );
     QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const;
     void polish(HbStyleParameters& params);
+
+    void gestureEvent(QGestureEvent *event);
+
 private:
     Q_DECLARE_PRIVATE_D( d_ptr, HbAbstractButton )
     Q_DISABLE_COPY( HbAbstractButton )
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gui/hbanchorarrowdrawer_p.cpp
--- a/src/hbcore/gui/hbanchorarrowdrawer_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gui/hbanchorarrowdrawer_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -28,7 +28,6 @@
 #include <hbanchor_p.h>
 #include <hbanchorarrowdrawer_p.h>
 #include <hbcolorscheme.h>
-#include <hbcssinspector_p.h>
 #include <hbevent.h>
 #include <hblayoututils_p.h>
 #include <hbmeshlayout_p.h>
@@ -46,7 +45,7 @@
 HbAnchorArrowDrawer::HbAnchorArrowDrawer(HbMeshLayout* mesh, QGraphicsItem *parent)
     : HbWidgetBase(parent), mLayout(mesh), mDrawOutlines(true), mDrawArrows(true), mDrawSpacers(true)
 {
-#ifdef BUILD_HB_INTERNAL
+#if defined(HB_DEVELOPER) || defined(CSS_INSPECTOR)
     updateColors();
 #endif
 }
@@ -57,7 +56,7 @@
 
 void HbAnchorArrowDrawer::changeEvent(QEvent *event)
 {
-#if defined(BUILD_HB_INTERNAL) || defined(CSS_INSPECTOR)
+#if defined(HB_DEVELOPER) || defined(CSS_INSPECTOR)
     if (event->type() == HbEvent::ThemeChanged)
         updateColors();
 #endif
@@ -66,7 +65,7 @@
 
 void HbAnchorArrowDrawer::updateColors()
 {
-#if defined(BUILD_HB_INTERNAL) || defined(CSS_INSPECTOR)
+#if defined(HB_DEVELOPER) || defined(CSS_INSPECTOR)
     mValidColor = HbColorScheme::color(VALID_COLOR);
     mInvalidColor = HbColorScheme::color(INVALID_COLOR);
     mBoxColor = HbColorScheme::color(BOX_COLOR);
@@ -75,7 +74,7 @@
 
 void HbAnchorArrowDrawer::updateFocusItem(const QGraphicsItem *item)
 {
-#if defined(BUILD_HB_INTERNAL) || defined(CSS_INSPECTOR)
+#if defined(HB_DEVELOPER) || defined(CSS_INSPECTOR)
     mLayout = 0;
     if (item && item->isWidget()) {
         const QGraphicsWidget *widget = static_cast<const QGraphicsWidget*>(item);
@@ -98,23 +97,23 @@
     Q_UNUSED(option);
     Q_UNUSED(widget);
 
-#if defined(BUILD_HB_INTERNAL) || defined(CSS_INSPECTOR)
+#if defined(HB_DEVELOPER) || defined(CSS_INSPECTOR)
     if(!mLayout || (!mDrawOutlines && !mDrawArrows)) {
         return;
     }
     painter->save();
-    
-    QList<HbAnchor> anchors = HbMeshLayoutDebug::getAnchors(mLayout);
+
+    QList<HbAnchor*> anchors = HbMeshLayoutDebug::getAnchors(mLayout);
 
     // Draw boxes round anchored child items
     if (mDrawOutlines) {
         QList<QGraphicsLayoutItem*> anchoredChildren;
-        foreach (const HbAnchor &anchor, anchors) {
-            if (!anchoredChildren.contains(anchor.mStartItem)) {
-                anchoredChildren.append(anchor.mStartItem);
+        foreach (const HbAnchor *anchor, anchors) {
+            if (!anchoredChildren.contains(anchor->mStartItem)) {
+                anchoredChildren.append(anchor->mStartItem);
             }
-            if (!anchoredChildren.contains(anchor.mEndItem)) {
-                anchoredChildren.append(anchor.mEndItem);
+            if (!anchoredChildren.contains(anchor->mEndItem)) {
+                anchoredChildren.append(anchor->mEndItem);
             }
         }
         painter->setPen(QPen(QBrush(mBoxColor), LINE_WIDTH));
@@ -135,41 +134,41 @@
                     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(HbAnchor *anchor, anchors) {
+                        if (anchor->mStartEdge == Hb::LeftEdge || anchor->mStartEdge == Hb::RightEdge ||anchor->mStartEdge == Hb::CenterHEdge) {
                             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 (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 { 
+                                } else {
                                     rectArea.setTop(other->geometry().top());
                                     rectArea.setHeight(other->geometry().height());
-                                    overridden = true;  
+                                    overridden = true;
                                 }
                             }
                         }
                     }
-                 
+
                 }
-            
+
                 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) {
+                    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 (anchor->mStartItem == layoutItem && anchor->mEndItem != mLayout) {
+                                other = anchor->mEndItem;
+                            } else if (anchor->mEndItem == layoutItem && anchor->mStartItem != mLayout) {
+                                other = anchor->mStartItem;
                             }
                             if (other) {
                                 if (overridden) {
@@ -179,14 +178,15 @@
                                 } else {
                                     rectArea.setLeft(other->geometry().left());
                                     rectArea.setWidth(other->geometry().width());
-                                    overridden = true; 
+                                    overridden = true;
                                 }
                             }
                         }
                     }
                 }
 
-                painter->fillRect(rectArea, QBrush(mInvalidColor, Qt::BDiagPattern));
+                painter->setOpacity(0.2); // so that we can see overlapping spacers
+                painter->fillRect(rectArea, QBrush(mInvalidColor, Qt::SolidPattern));
             }
         }
         painter->restore();
@@ -199,11 +199,11 @@
         for (int i=0; i<anchors.count(); i++) {
             Hb::Edge arrowType = Hb::RightEdge;
             QPointF start, start2, end, end2;
-            HbAnchor anchor(anchors.at(i));
+            HbAnchor *anchor = anchors.at(i);
 
             // Ignore some primitives
-            if (anchor.mStartItem) {
-                if (QGraphicsItem *asGraphicsItem = anchor.mStartItem->graphicsItem()) {
+            if (anchor->mStartItem) {
+                if (QGraphicsItem *asGraphicsItem = anchor->mStartItem->graphicsItem()) {
                     if (asGraphicsItem->isWidget()) {
                         const QGraphicsWidget *widget = static_cast<const QGraphicsWidget *>(asGraphicsItem);
                         QString itemText(widget->metaObject()->className());
@@ -215,32 +215,32 @@
                 }
             }
             // 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) {
+            if(anchor->mEndItem->isLayout()
+                && anchor->mStartEdge == anchor->mEndEdge
+                && anchor->mValue == 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 (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 (anchor.mEndEdge == Hb::LeftEdge) {
-                    anchor.mEndEdge = Hb::RightEdge;
-                } else if (anchor.mEndEdge == Hb::RightEdge) {
-                    anchor.mEndEdge = Hb::LeftEdge;
+                if (anchor->mEndEdge == Hb::LeftEdge) {
+                    anchor->mEndEdge = Hb::RightEdge;
+                } else if (anchor->mEndEdge == Hb::RightEdge) {
+                    anchor->mEndEdge = Hb::LeftEdge;
                 }
             }
 
-            QRectF startRect = anchor.mStartItem->geometry();
-            QRectF endRect = anchor.mEndItem->geometry();
+            QRectF startRect = anchor->mStartItem->geometry();
+            QRectF endRect = anchor->mEndItem->geometry();
 
             // Fix non-pinned spacers issue
             if (startRect.left() == 0 && startRect.width() == 0) {
@@ -255,7 +255,7 @@
             }
 
             // Work out the arrow line start point
-            switch (anchor.mStartEdge) {
+            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;
@@ -265,16 +265,16 @@
             }
             start2 = start;
 
-            switch (anchor.mStartEdge) {
+            switch (anchor->mStartEdge) {
                 case Hb::LeftEdge:
                 case Hb::RightEdge:
                 case Hb::CenterHEdge:
                 {
                     // Set arrow end point
-                    end.rx() = start.x() + anchor.mValue;
+                    end.rx() = start.x() + anchor->mValue;
 
                     // Set arrow direction
-                    arrowType = anchor.mValue < 0
+                    arrowType = anchor->mValue < 0
                         ? Hb::LeftEdge
                         : Hb::RightEdge;
 
@@ -293,11 +293,11 @@
                     end2.ry() = start.y();
 
                     // Set end staggered point
-                    if (anchor.mEndEdge == Hb::LeftEdge) {
+                    if (anchor->mEndEdge == Hb::LeftEdge) {
                         end2.rx() = endRect.left();
-                    } else if (anchor.mEndEdge == Hb::RightEdge) {
+                    } else if (anchor->mEndEdge == Hb::RightEdge) {
                         end2.rx() = endRect.right();
-                    } else { 
+                    } else {
                         end2.rx() = endRect.center().x();
                     }
                 }
@@ -308,10 +308,10 @@
                 case Hb::CenterVEdge:
                 {
                     // Set arrow end point
-                    end.ry() = start.y() + anchor.mValue;
+                    end.ry() = start.y() + anchor->mValue;
 
                     // Set arrow direction
-                    arrowType = anchor.mValue < 0
+                    arrowType = anchor->mValue < 0
                         ? Hb::TopEdge
                         : Hb::BottomEdge;
 
@@ -330,9 +330,9 @@
                     end2.rx() = start.x();
 
                     // Set end staggered point
-                    if (anchor.mEndEdge == Hb::TopEdge) {
+                    if (anchor->mEndEdge == Hb::TopEdge) {
                         end2.ry() = endRect.top();
-                    } else if (anchor.mEndEdge == Hb::BottomEdge) {
+                    } else if (anchor->mEndEdge == Hb::BottomEdge) {
                         end2.ry() = endRect.bottom();
                     } else {
                         end2.ry() = endRect.center().y();
@@ -359,14 +359,14 @@
             painter->setPen(myPen);
             painter->drawLine(start, end);
 
-            if (anchor.mStartEdge == Hb::CenterHEdge || anchor.mStartEdge == Hb::CenterVEdge) {
+            if (anchor->mStartEdge == Hb::CenterHEdge || anchor->mStartEdge == Hb::CenterVEdge) {
                 painter->setBrush(centerColor);
             }
 
-            // 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, 
+            // 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 (qAbs(anchor->mValue) > ARROW_HEAD_SIZE*3) {
                 painter->drawRect(QRectF(
                     start2.x() - ARROW_HEAD_SIZE,
                     start2.y() - ARROW_HEAD_SIZE,
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gui/hbbackgrounditem.cpp
--- a/src/hbcore/gui/hbbackgrounditem.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gui/hbbackgrounditem.cpp	Mon May 03 12:48:33 2010 +0300
@@ -54,6 +54,7 @@
 #ifdef ENABLE_FAST_PAINT_
     setAttribute(Qt::WA_NoSystemBackground); // Disable clearing of background
 #endif
+    setSizePolicy( QSizePolicy::Ignored, QSizePolicy::Ignored );
 
     mPrtImageName = defaultImageName(Qt::Vertical);
     mLscImageName = defaultImageName(Qt::Horizontal);
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gui/hbbackgrounditem_p.h
--- a/src/hbcore/gui/hbbackgrounditem_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gui/hbbackgrounditem_p.h	Mon May 03 12:48:33 2010 +0300
@@ -47,11 +47,11 @@
     QString imageName(Qt::Orientation orientation) const;
     QString defaultImageName(Qt::Orientation orientation) const;
 
+    void updateBackgroundImage();
+
 private:
     void resizeEvent(QGraphicsSceneResizeEvent *event);
 
-    void updateBackgroundImage();
-
     HbIcon mBackground;
     QRectF mBoundingRect;
     Qt::Orientation mOrientation;
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gui/hbcontentwidget.cpp
--- a/src/hbcore/gui/hbcontentwidget.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gui/hbcontentwidget.cpp	Mon May 03 12:48:33 2010 +0300
@@ -144,38 +144,41 @@
     return effectTarget;
 }
 
-void HbContentWidget::showTargetView()
-{
-    targetView->setVisible(true);
-}
-
+/*!
+  Callback for 'hide' effect.
+*/
 void HbContentWidget::hideEffectFinished(HbEffect::EffectStatus status)
 {
-    // Get rid of the old view and make sure the new one is ok in both
-    // cases.  These need to be done also when the effect is canceled
-    // otherwise we might end up with a previous view left visible in
-    // the parallel case, etc.
+    // Make sure the old view is hidden. The effect does this too due to
+    // HideRegItemBeforeClearingEffect so no matter which comes first (clearing
+    // of the effect or this notification), the item is hidden properly before
+    // resetting the transform etc. and thus there is no flicker.
     hidingView->setVisible(false);
+    // Start the "show" phase if not yet started.
     if (viewSwitchFlags & Hb::ViewSwitchSequential) {
-        // Don't show targetView yet, make the call async to reduce
-        // flickering on certain platforms (e.g. Linux). This is not a
-        // perfect solution, though.
-        QMetaObject::invokeMethod(this, "showTargetView", Qt::QueuedConnection);
+        // Do not show targetView yet, leave it to the effect in order to
+        // prevent flickering.
         if (status.reason != Hb::EffectCancelled) {
             runViewSwitchEffectShow();
+        } else {
+            targetView->setVisible(true);
+            viewSwitchEffectsFinished(status);
         }
     }
-    if (status.reason == Hb::EffectCancelled) {
-        viewSwitchRunning = false;
-    }
 }
 
+/*!
+  Callback for 'show' effect.
+*/
 void HbContentWidget::viewSwitchEffectsFinished(HbEffect::EffectStatus status)
 {
     Q_UNUSED(status);
+    // Do not bother with item visibility here, the effect should manage it
+    // properly because the ShowItemOnFirstUpdate flag was set.
     viewSwitchRunning = false;
-    if (HbMainWindowPrivate::d_ptr(mainWindow)->mDelayedConstructionHandled)
+    if (HbMainWindowPrivate::d_ptr(mainWindow)->mDelayedConstructionHandled) {
         HbMainWindowPrivate::d_ptr(mainWindow)->_q_viewReady();
+    }
 }
 
 /*!
@@ -192,8 +195,8 @@
     // messed up state in mainwindow, the stack widget, etc. due to events coming during
     // the view switch animation.
     // 2nd param (hideOld): We still want to see the old view (normally setCurrentWidget would hide it).
-    // 3rd param (showNew): The new view is not yet needed in the sequential case.
-    setCurrentWidget(targetView, false, !(flags & Hb::ViewSwitchSequential));
+    // 3rd param (showNew): The new view is not yet needed (the effect will take care of making it visible).
+    setCurrentWidget(targetView, false, false);
     
     hidingView = viewToHide;
     viewSwitchFlags = flags;
@@ -201,8 +204,11 @@
     QGraphicsWidget *effectTarget = getEffectTarget(viewToHide, flags);
     if (effectTarget) {
         QString event = getEffectEvent("hide", flags, viewToHide, targetView);
-        // The effect must not be persistent so pass 'true' as 3rd param (hideWhenFinished) to start().
-        HbEffectInternal::start(viewToHide, effectTarget, true, "HB_view", event, this, "hideEffectFinished");
+        HbEffectInternal::EffectFlags effectFlags = 
+            HbEffectInternal::ClearEffectWhenFinished // the effect must not be persistent
+            | HbEffectInternal::HideRegItemBeforeClearingEffect; // to prevent unlikely, but possible flicker
+        HbEffectInternal::start(viewToHide, effectTarget, effectFlags,
+                                "HB_view", event, this, "hideEffectFinished");
         if (!(flags & Hb::ViewSwitchSequential)) {
             runViewSwitchEffectShow();
         }
@@ -218,7 +224,11 @@
     QGraphicsWidget *effectTarget = getEffectTarget(targetView, viewSwitchFlags);
     if (effectTarget) {
         QString event = getEffectEvent("show", viewSwitchFlags, hidingView, targetView);
-        HbEffectInternal::start(targetView, effectTarget, true, "HB_view", event, this, "viewSwitchEffectsFinished");
+        HbEffectInternal::EffectFlags effectFlags =
+            HbEffectInternal::ClearEffectWhenFinished
+            | HbEffectInternal::ShowItemOnFirstUpdate; // because targetView is not yet visible
+        HbEffectInternal::start(targetView, effectTarget, effectFlags,
+                                "HB_view", event, this, "viewSwitchEffectsFinished");
     }
 }
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gui/hbcontentwidget_p.h
--- a/src/hbcore/gui/hbcontentwidget_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gui/hbcontentwidget_p.h	Mon May 03 12:48:33 2010 +0300
@@ -49,7 +49,6 @@
 private slots:
     void hideEffectFinished(HbEffect::EffectStatus status);
     void viewSwitchEffectsFinished(HbEffect::EffectStatus status);
-    void showTargetView();
 
 private:
     void mousePressEvent(QGraphicsSceneMouseEvent *event);
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gui/hbcssinspector_p.cpp
--- a/src/hbcore/gui/hbcssinspector_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gui/hbcssinspector_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -25,7 +25,7 @@
 
 #include "hbcssinspector_p.h"
 
-#ifdef CSS_INSPECTOR
+#ifdef HB_CSS_INSPECTOR
 #include <hbanchor_p.h>
 #include <hbanchorarrowdrawer_p.h>
 #include <hbcolorscheme.h>
@@ -37,6 +37,8 @@
 #include <hbnamespace_p.h>
 #include <hbwidgetloadersyntax_p.h>
 #include <hbxmlloaderabstractsyntax_p.h>
+#include <hbwidgetbase_p.h>
+#include <hbwidget_p.h>
 
 #include <QBrush>
 #include <QCheckBox>
@@ -58,7 +60,8 @@
 
 const QString CSS_HTML_HEADER = "<style type=\"text/css\"> \
                                 .overridden {color:#999; text-decoration:line-through;} \
-                                .selectors {background-color: #e0e0e0; margin:0;} \
+                                .filename {background-color: #e0e0e0; margin:0;} \
+                                .selectors {margin:0;} \
                                 .selector {color:#000;} \
                                 .pseudo {font-weight:bold;} \
                                 .attr {font-style:italic;} \
@@ -74,6 +77,7 @@
 
 const int ITEMNAME = 0xfffe; // Copied from hbstyle.cpp!!
 const qreal HOVER_BOX_PEN_WIDTH = 2.0;
+const qreal GUIDE_LINE_WIDTH = 1.0;
 const QChar BIG_NUMBER_CHAR = 0x221E;
 const QString TEXT_COLOR = "qtc_default_main_pane_normal";
 const QString LINE_COLOR = "qtc_view_visited_normal";
@@ -106,7 +110,7 @@
 }
 
 
-static QString convertHintToHintText(const QGraphicsItem *item, qreal hint)
+static QString convertMeasurementToText(const QGraphicsItem *item, qreal hint)
 {
     QString hintText;
     qreal unit = HbDeviceProfile::profile(item).unitValue();
@@ -125,23 +129,37 @@
     return hintText;
 }
 
-
 static QString cssItemHintText(const QGraphicsItem *item)
 {
     QString sizeHint;
     if (item->isWidget()) {
         const QGraphicsLayout *layout = (static_cast<const QGraphicsWidget *>(item))->layout();
         if(layout) {
-            sizeHint += "(" + convertHintToHintText( item, layout->minimumWidth() ) + "," + convertHintToHintText( item, layout->minimumHeight() ) + ")|";
-            sizeHint += "(" + convertHintToHintText( item, layout->preferredWidth() ) + "," + convertHintToHintText( item, layout->preferredHeight() ) +")|";
-            sizeHint += "(" + convertHintToHintText( item, layout->maximumWidth() ) + "," +convertHintToHintText( item, layout->maximumHeight() ) + ")";
+            sizeHint += "(" + convertMeasurementToText( item, layout->minimumWidth() ) + "," + convertMeasurementToText( item, layout->minimumHeight() ) + ")|";
+            sizeHint += "(" + convertMeasurementToText( item, layout->preferredWidth() ) + "," + convertMeasurementToText( item, layout->preferredHeight() ) +")|";
+            sizeHint += "(" + convertMeasurementToText( item, layout->maximumWidth() ) + "," +convertMeasurementToText( item, layout->maximumHeight() ) + ")";
         }
     }
     return sizeHint;
 }
 
+static QRectF cssItemHintRect(const QGraphicsItem *item)
+{
+    QRectF hintRect;
+    if (item->isWidget()) {
+            if (item->isWidget()) {
+                const QGraphicsLayout *layout = (static_cast<const QGraphicsWidget *>(item))->layout();
+                if(layout) {
+                    hintRect.setWidth(layout->preferredWidth());
+                    hintRect.setHeight(layout->preferredHeight());
+                }
+            }
+    }
+    return hintRect;
+}
 
-static QString anchorEdgeName(HbAnchorLayout::Edge edge) 
+
+static QString anchorEdgeName(Hb::Edge edge)
 {
     QString name;
     switch (edge) {
@@ -157,7 +175,7 @@
 }
 
 
-static QString meshItemsToHtmlInfo(HbMeshLayout *mesh, const QString itemName, const QString layoutName)
+QString HbCssInspectorWindow::meshItemsToHtmlInfo(HbMeshLayout *mesh, const QString itemName, const QString layoutName)
 {
     QString html;
     QString widgetML;
@@ -170,40 +188,61 @@
     xmlWriter.writeStartElement(syntax.lexemValue(HbXmlLoaderAbstractSyntax::TYPE_HBWIDGET));
     xmlWriter.writeAttribute(syntax.lexemValue(HbXmlLoaderAbstractSyntax::ATTR_VERSION), HbWidgetLoaderSyntax::version());
     xmlWriter.writeAttribute(syntax.lexemValue(HbXmlLoaderAbstractSyntax::ATTR_TYPE), itemName);
-    
+
     xmlWriter.writeStartElement(syntax.lexemValue(HbXmlLoaderAbstractSyntax::TYPE_LAYOUT));
     xmlWriter.writeAttribute(syntax.lexemValue(HbXmlLoaderAbstractSyntax::ATTR_NAME), layoutName);
-    xmlWriter.writeAttribute(syntax.lexemValue(HbXmlLoaderAbstractSyntax::ATTR_TYPE), "mesh");
+    xmlWriter.writeAttribute(syntax.lexemValue(HbXmlLoaderAbstractSyntax::ATTR_TYPE), syntax.lexemValue(HbXmlLoaderAbstractSyntax::LAYOUT_MESH));
 
     if (mesh) {
-        QList<HbAnchor> anchors = HbMeshLayoutDebug::getAnchors(mesh);
+        QList<HbAnchor*> anchors = HbMeshLayoutDebug::getAnchors(mesh);
         for (int i=0; i<anchors.count(); i++) {
-            HbAnchor anchor(anchors.at(i));
-    
+            HbAnchor* anchor = anchors.at(i);
+
+            QString startName = HbStyle::itemName(anchor->mStartItem->graphicsItem());
+            QString endName = HbStyle::itemName(anchor->mEndItem->graphicsItem());
+            QString spacingText;
+
+            QGraphicsItem *asGraphicsItem = mesh->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));
+
+                    if (startName.isEmpty()) {
+                        startName = priv->mSpacers.key(anchor->mStartItem);
+                    } 
+                    if (endName.isEmpty()) {
+                        endName = priv->mSpacers.key(anchor->mEndItem);
+                    }
+
+                    if(qAbs<qreal>(anchor->mValue) > 0.01)
+                        spacingText = convertMeasurementToText(asWidget, anchor->mValue);
+                }
+            }
+
             xmlWriter.writeStartElement(syntax.lexemValue(HbXmlLoaderAbstractSyntax::ML_MESHITEM));
 
             xmlWriter.writeAttribute(
-                syntax.lexemValue(HbXmlLoaderAbstractSyntax::ML_SRC_NAME), 
-                HbStyle::itemName(anchor.mStartItem->graphicsItem()));
+                syntax.lexemValue(HbXmlLoaderAbstractSyntax::ML_SRC_NAME), startName);
             xmlWriter.writeAttribute(
-                syntax.lexemValue(HbXmlLoaderAbstractSyntax::ML_SRC_EDGE), 
-                anchorEdgeName(anchor.mStartEdge));
+                syntax.lexemValue(HbXmlLoaderAbstractSyntax::ML_SRC_EDGE), anchorEdgeName(anchor->mStartEdge));
+            xmlWriter.writeAttribute(
+                syntax.lexemValue(HbXmlLoaderAbstractSyntax::ML_DST_NAME), endName);
             xmlWriter.writeAttribute(
-                syntax.lexemValue(HbXmlLoaderAbstractSyntax::ML_DST_NAME), 
-                HbStyle::itemName(anchor.mEndItem->graphicsItem()));
-            xmlWriter.writeAttribute(
-                syntax.lexemValue(HbXmlLoaderAbstractSyntax::ML_DST_EDGE), 
-                anchorEdgeName(anchor.mEndEdge));
-
+                syntax.lexemValue(HbXmlLoaderAbstractSyntax::ML_DST_EDGE), anchorEdgeName(anchor->mEndEdge));
+            if ( !spacingText.isEmpty() ) {
+                xmlWriter.writeAttribute(
+                syntax.lexemValue(HbXmlLoaderAbstractSyntax::ML_SPACING), spacingText);
+            }
             xmlWriter.writeEndElement(); // meshitem
         }
 
-    }   
+    }
     xmlWriter.writeEndElement(); // layout
     xmlWriter.writeEndElement(); // widgetml
 
     html = widgetML;
-    html.remove(0, html.indexOf("<")); // trim whitespace 
+    html.remove(0, html.indexOf("<")); // trim whitespace
     html.replace("<", "&lt;");
     html.replace(">", "&gt;");
     html.replace(QRegExp("\"([^\"]*)\""), "\"<span>\\1</span>\""); // Add span elements around things in quotes
@@ -224,10 +263,16 @@
 
 
 HbCssInfoDrawer::HbCssInfoDrawer(QGraphicsItem *parent)
-    : HbWidgetBase(parent), mShowItemText(true), mShowHintText(true), mShowBox(true)
+    : HbWidgetBase(parent), 
+    mShowItemText(true),
+    mShowHintText(true), 
+    mShowBox(true),
+    mShowHintBox(true),
+    mDrawGuideLines(true), 
+    mItemRect(0,0,0,0)
 {
-    updateColors();
-    setVisible(false);
+	updateColors();
+	setVisible(false);
 }
 
 
@@ -256,16 +301,28 @@
     // update text and geometry
     if (item) {
         this->setVisible(true);
-        this->setGeometry(item->sceneBoundingRect());
+        mItemRect = item->sceneBoundingRect();
         mItemText = cssItemText(item);
         mHintText = cssItemHintText(item);
+        mHintRect = cssItemHintRect(item);
+        // Make sure this is in the same place in the scene as the window
+        if (item->isWidget()) {
+            const HbWidget *obj = static_cast<const HbWidget*>(item);
+            this->setGeometry(obj->mainWindow()->rect());
+        }
     } else {
         this->setVisible(false);
-        mItemText = "";
-        mHintText = "";
     }
+    this->update();
 }
 
+void HbCssInfoDrawer::paintRect(QPainter *painter, QRectF rect)
+{
+        rect.adjust(
+            HOVER_BOX_PEN_WIDTH/2, HOVER_BOX_PEN_WIDTH/2,
+            -HOVER_BOX_PEN_WIDTH/2, -HOVER_BOX_PEN_WIDTH/2);
+        painter->drawRect(rect);
+}
 
 void HbCssInfoDrawer::paint(QPainter *painter, 
     const QStyleOptionGraphicsItem *option, QWidget *widget)
@@ -273,20 +330,27 @@
     Q_UNUSED(option);
     Q_UNUSED(widget);
 
+    const QPen prevPen = painter->pen();
+    const Qt::LayoutDirection prevDirection = painter->layoutDirection();
+    painter->setLayoutDirection(Qt::LeftToRight);
+
     if (mShowBox) {
         painter->setPen(QPen(mBoxColor, HOVER_BOX_PEN_WIDTH));
-        QRectF boxRect = this->boundingRect();
-        boxRect.adjust(HOVER_BOX_PEN_WIDTH/2, HOVER_BOX_PEN_WIDTH/2,
-                            -HOVER_BOX_PEN_WIDTH/2, -HOVER_BOX_PEN_WIDTH/2);
-        painter->drawRect(boxRect);
+        paintRect(painter, mItemRect);
+    }
+    if (mShowHintBox) {
+        painter->setPen(QPen(Qt::green, HOVER_BOX_PEN_WIDTH));
+        QRectF prefRect = mHintRect;
+        prefRect.moveCenter(mItemRect.center());
+        paintRect(painter, prefRect);
     }
 
     painter->setPen(mTextColor);
     int fontSize = painter->fontInfo().pixelSize();
-    int boxHeight = (int)(this->boundingRect().height());
+    int boxHeight = (int)(mItemRect.height());
 
     if (mShowItemText && boxHeight - fontSize > 0) {
-        QPointF pos = this->boundingRect().topLeft();
+        QPointF pos = mItemRect.topLeft();
         pos += QPointF(HOVER_BOX_PEN_WIDTH, fontSize);
         painter->drawText(pos, mItemText);
     }
@@ -294,10 +358,26 @@
     bool roomForSizeHint = (boxHeight - (2*fontSize) > 0 )
             || (!mShowItemText && (boxHeight - fontSize) > 0);
     if (mShowHintText && roomForSizeHint) {
-        QPointF pos = this->boundingRect().bottomLeft();
+        QPointF pos = mItemRect.bottomLeft();
         pos += QPointF(HOVER_BOX_PEN_WIDTH, -HOVER_BOX_PEN_WIDTH);
         painter->drawText(pos, mHintText);
     }
+
+    if (mDrawGuideLines) {
+        const QRectF &br = this->boundingRect();
+        painter->setPen(QPen(mTextColor, GUIDE_LINE_WIDTH, Qt::DashLine));
+        // Line down left hand side
+        painter->drawLine((int)mItemRect.left(), 0, (int)mItemRect.left(), (int)br.height());
+        // Line down right hand side
+        painter->drawLine((int)mItemRect.right(), 0, (int)mItemRect.right(), (int)br.height());
+        // Line across top
+        painter->drawLine(0, (int)mItemRect.top(), (int)br.width(), (int)mItemRect.top());
+        // Line across bottom
+        painter->drawLine(0, (int)mItemRect.bottom(), (int)br.width(), (int)mItemRect.bottom());
+    }
+
+    painter->setLayoutDirection(prevDirection);
+    painter->setPen(prevPen);
 }
 
 
@@ -342,6 +422,8 @@
         connect(filter, SIGNAL(newItemHovered(const QGraphicsItem*)), SLOT(updateFocusItem(const QGraphicsItem*)));
         connect(mNameCheck, SIGNAL(toggled(bool)), filter->mCssInfoDrawer, SLOT(setItemTextVisible(bool)));
         connect(mSizeHintCheck, SIGNAL(toggled(bool)), filter->mCssInfoDrawer, SLOT(setHintTextVisible(bool)));
+		connect(mHintOutlinesCheck, SIGNAL(toggled(bool)), filter->mCssInfoDrawer, SLOT(setHintBoxVisible(bool)));
+        connect(mGuideLinesCheck, SIGNAL(toggled(bool)), filter->mCssInfoDrawer, SLOT(setGuideLinesVisible(bool)));
         connect(mArrowsCheck, SIGNAL(toggled(bool)), filter->mArrowDrawer, SLOT(setDrawArrows(bool)));
         connect(mOutlinesCheck, SIGNAL(toggled(bool)), filter->mArrowDrawer, SLOT(setDrawOutlines(bool)));
         connect(mSpacersCheck, SIGNAL(toggled(bool)), filter->mArrowDrawer, SLOT(setDrawSpacers(bool)));
@@ -358,25 +440,31 @@
     QGridLayout *settingLayout = new QGridLayout(settings);
     mArrowsCheck = new QCheckBox(tr("Draw arrows"), this);
     mOutlinesCheck = new QCheckBox(tr("Draw subitem outlines"), this);
+	mHintOutlinesCheck = new QCheckBox(tr("Draw sizehint outlines"), this);
     mSpacersCheck = new QCheckBox(tr("Draw spacers"), this);
     mNameCheck = new QCheckBox(tr("Show object name"), this);
     mSizeHintCheck = new QCheckBox(tr("Show size hint"), this);
+    mGuideLinesCheck = new QCheckBox(tr("Draw guide lines"), this);
     mLiveRadio = new QRadioButton(tr("Live mode"), this);
     mClickRadio = new QRadioButton(tr("Click locking mode"), this);
     mBlockRadio = new QRadioButton(tr("Click locking mode (block events)"), this);
     settingLayout->addWidget(mArrowsCheck, 0, 0);
     settingLayout->addWidget(mOutlinesCheck, 1, 0);
-    settingLayout->addWidget(mSpacersCheck, 2, 0);
+	settingLayout->addWidget(mHintOutlinesCheck, 2, 0);
+    settingLayout->addWidget(mSpacersCheck, 3, 0);
     settingLayout->addWidget(mNameCheck, 0, 1);
     settingLayout->addWidget(mSizeHintCheck, 1, 1);
+    settingLayout->addWidget(mGuideLinesCheck, 2, 1);
     settingLayout->addWidget(mLiveRadio, 0, 2);
     settingLayout->addWidget(mClickRadio, 1, 2);
     settingLayout->addWidget(mBlockRadio, 2, 2);
     mArrowsCheck->setChecked(true);
     mOutlinesCheck->setChecked(true);
+	mHintOutlinesCheck->setChecked(true);
     mSpacersCheck->setChecked(true);
     mNameCheck->setChecked(true);
     mSizeHintCheck->setChecked(true);
+    mGuideLinesCheck->setChecked(true);
     mLiveRadio->setChecked(true);
 
     QLabel *lblWidgetML = new QLabel(tr("WidgetML"), this);
@@ -408,6 +496,14 @@
     layout->setRowStretch(2, 2);
     layout->setRowStretch(4, 3);
 
+    // Lock in left-to-right mode
+    mSizeHintLabel->setLayoutDirection(Qt::LeftToRight);
+    lblColors->setLayoutDirection(Qt::LeftToRight);
+    lblLayout->setLayoutDirection(Qt::LeftToRight);
+    mLayoutCssBox->setLayoutDirection(Qt::LeftToRight);
+    mColorsCssBox->setLayoutDirection(Qt::LeftToRight);
+    mLayoutWidgetMLBox->setLayoutDirection(Qt::LeftToRight);
+
     setLayout(layout);
 }
 
@@ -526,7 +622,9 @@
                     || itemText == "HbWidgetBase" 
                     || itemText == "HbTextItem" 
                     || itemText == "HbIconItem" 
-                    || itemText == "HbFrameItem") {
+                    || itemText == "HbFrameItem"
+                    || itemText == "HbMarqueeItem"
+                    || itemText == "HbSpacerItem") {
                 item = item->parentItem();
                 widget = static_cast<const QGraphicsWidget *>(item);
                 itemText = widget ? widget->metaObject()->className() : "";
@@ -544,6 +642,14 @@
     } else if(event->type() == QEvent::Leave && mLiveMode) {
         emit newItemHovered(0);
         mCurrentItem = 0;
+#ifdef HB_GESTURE_FW
+    } else if(mBlockingMode && event->type() == QEvent::Gesture) {
+        QGestureEvent *gesEvent = static_cast<QGestureEvent*>(event);
+        QGesture *tap = gesEvent->gesture(Qt::TapGesture);
+        if (tap) {
+            return true;
+        }
+#endif
     }
 
     return QObject::eventFilter(obj, event);
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gui/hbcssinspector_p.h
--- a/src/hbcore/gui/hbcssinspector_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gui/hbcssinspector_p.h	Mon May 03 12:48:33 2010 +0300
@@ -26,11 +26,7 @@
 #ifndef HBCSSINSPECTOR_P_H
 #define HBCSSINSPECTOR_P_H
 
-#ifdef HB_SETTINGS_WINDOW
-#define CSS_INSPECTOR
-#endif
-
-#ifdef CSS_INSPECTOR
+#ifdef HB_CSS_INSPECTOR
 #include <QWidget>
 #include <hbanchorlayout.h>
 #include <hbwidgetbase.h>
@@ -56,21 +52,28 @@
     void setItemTextVisible(bool visible) { mShowItemText = visible; };
     void setHintTextVisible(bool visible) { mShowHintText = visible; };
     void setBoxVisible(bool visible) { mShowBox = visible; };
+	void setHintBoxVisible(bool visible) { mShowHintBox = visible; };
+    void setGuideLinesVisible(bool visible) { mDrawGuideLines = visible; };
     void updateFocusItem(const QGraphicsItem* item);
 
 protected:
     void changeEvent(QEvent *event);
     void updateColors();
+    void paintRect(QPainter *painter, QRectF rect);
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
 
 private:
     bool mShowItemText;
     bool mShowHintText;
     bool mShowBox;
+	bool mShowHintBox;
+    bool mDrawGuideLines;
     QColor mTextColor;
     QColor mBoxColor;
     QString mItemText;
     QString mHintText;
+    QRectF mItemRect;
+    QRectF mHintRect;
 };
 
 
@@ -120,6 +123,7 @@
 private:
     void removeFilters();
     void addFilters();
+    static QString meshItemsToHtmlInfo(HbMeshLayout *mesh, const QString itemName, const QString layoutName);
 
 private:
     explicit HbCssInspectorWindow(QWidget *parent = 0);
@@ -130,9 +134,11 @@
     QLabel *mSizeHintLabel;
     QCheckBox *mArrowsCheck;
     QCheckBox *mOutlinesCheck;
+	QCheckBox *mHintOutlinesCheck;
     QCheckBox *mSpacersCheck;
     QCheckBox *mNameCheck;
     QCheckBox *mSizeHintCheck;
+    QCheckBox *mGuideLinesCheck;
     QRadioButton *mLiveRadio;
     QRadioButton *mClickRadio;
     QRadioButton *mBlockRadio;
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gui/hbdialog.cpp
--- a/src/hbcore/gui/hbdialog.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gui/hbdialog.cpp	Mon May 03 12:48:33 2010 +0300
@@ -31,6 +31,7 @@
 #include "hbdeviceprofile.h"
 #include "hbevent.h"
 #include "hbtoolbar_p.h"
+#include "hbglobal_p.h"
 
 #include <QPainter>
 #include <QGraphicsSceneMouseEvent>
@@ -51,7 +52,7 @@
 #endif
 
 /*!
-    @stable
+    @beta
     @hbcore
     \class HbDialog
     \brief HbDialog is a base class for different popup notes in Hb library.
@@ -242,24 +243,30 @@
 }
 
 /*!
-* It returns the primary action added to the control area
-* \sa setPrimaryAction()
+\deprecated HbDialog::primaryAction() const
+       is deprecated.
+ It returns the primary action added to the control area
+ \sa setPrimaryAction()
 */
 HbAction* HbDialog::primaryAction() const
 {
+    HB_DEPRECATED("HbAction* HbDialog::primaryAction() is deprecated. Use QGraphicsWidget action api instead");
     Q_D(const HbDialog);
     return d->primaryAction;
 }
 
 /*!
-* It adds the given action to the control area.
-* It is added to the left side of the control area if the layout direction of the application
-* is left-to-right and in the vice-versa if the layout direction of the application
-* is right-to-left.
-* \sa primaryAction()
+\deprecated HbDialog::setPrimaryAction(HbAction*)
+           is deprecated. Please use QGraphicsWidget::addAction() family of functions instead.
+ It adds the given action to the control area.
+ It is added to the left side of the control area if the layout direction of the application
+ is left-to-right and in the vice-versa if the layout direction of the application
+ is right-to-left.
+ \sa primaryAction()
 */
 void HbDialog::setPrimaryAction(HbAction *action)
 {
+    HB_DEPRECATED("HbDialog::setPrimaryAction(HbAction *action) is deprecated. Use QGraphicsWidget action api instead");
     Q_D(HbDialog);
     if (d->primaryAction && action != d->primaryAction) {
         removeAction(d->primaryAction);
@@ -273,24 +280,30 @@
 }
 
 /*!
-* It returns the secondary action added to the control area
-* \sa setSecondaryAction()
+\deprecated HbDialog::secondaryAction() const
+            is deprecated.
+ It returns the secondary action added to the control area
+ \sa setSecondaryAction()
 */
 HbAction* HbDialog::secondaryAction() const
 {
+    HB_DEPRECATED("HbAction* HbDialog::secondaryAction() is deprecated. Use QGraphicsWidget action api instead");
     Q_D(const HbDialog);
     return(d->secondaryAction);
 }
 
 /*!
-* It adds the given action to the control area.
-* It is added to the right side of the control area if the layout direction of the application
-* is left-to-right and in the vice-versa if the layout direction of the application
-* is right-to-left.
-* \sa secondaryAction()
+\deprecated HbDialog::setSecondaryAction(HbAction*)
+           is deprecated. Please use QGraphicsWidget::addAction() family of functions instead.
+ It adds the given action to the control area.
+ It is added to the right side of the control area if the layout direction of the application
+ is left-to-right and in the vice-versa if the layout direction of the application
+ is right-to-left.
+ \sa secondaryAction()
 */
 void HbDialog::setSecondaryAction(HbAction *action)
 {
+    HB_DEPRECATED("HbDialog::setSecondaryAction(HbAction *action) is deprecated. Use QGraphicsWidget action api instead");
     Q_D(HbDialog);
     if (d->secondaryAction && action != d->secondaryAction) {
         removeAction(d->secondaryAction);
@@ -300,14 +313,16 @@
 }
 
 /*!
-    \deprecated HbDialog::exec()
-        is deprecated. Please use HbDialog::open( QObject* receiver, const char* member ) instead.
-*
-* Executes the popup synchronously.
-* Note: when popup is executed syncronously it is always modal.
+\deprecated HbDialog::exec()
+           is deprecated.
+ Please use HbDialog::open( QObject* receiver, const char* member ) instead.
+
+ Executes the popup synchronously.
+ Note: when popup is executed syncronously it is always modal.
 */
 HbAction* HbDialog::exec()
 {
+    HB_DEPRECATED("HbDialog::exec is deprecated. Use HbDialog::show() or HbDialog::open() instead!");
     Q_D(HbDialog);
 
     HbAction *action = 0;
@@ -342,7 +357,7 @@
         d->receiverToDisconnectOnClose = 0;
         d->memberToDisconnectOnClose.clear();
     }
-    HbPopup::open();
+    show();
 }
 
 /*!
@@ -374,6 +389,13 @@
         HbAction* nullAction(0);
         emit finished( nullAction );
     }
+    if (d->receiverToDisconnectOnClose) {
+        if (disconnect(this, SIGNAL(finished(HbAction*)),
+                       d->receiverToDisconnectOnClose, d->memberToDisconnectOnClose)) {
+            d->receiverToDisconnectOnClose = 0;
+            d->memberToDisconnectOnClose.clear();
+        }
+    }
 
     HbPopup::closeEvent(event);
 }
@@ -457,4 +479,28 @@
     return HbPopup::event(event);
 }
 
+/*!
+    \reimp
+*/
+QSizeF HbDialog::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
+{
+    QSizeF hint = HbPopup::sizeHint(which, constraint);
+
+    if (which == Qt::PreferredSize) {
+        Q_D(const HbDialog);
+        if (d->contentWidget) {
+            QSizePolicy policy = d->contentWidget->sizePolicy();
+            if (policy.horizontalPolicy() & QSizePolicy::ExpandFlag) {
+                hint.setWidth(QWIDGETSIZE_MAX);
+            }
+
+            if (policy.verticalPolicy() & QSizePolicy::ExpandFlag) {
+                hint.setHeight(QWIDGETSIZE_MAX);
+            }
+        }
+    }
+
+    return hint;
+}
+
 #include "moc_hbdialog.cpp"
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gui/hbdialog.h
--- a/src/hbcore/gui/hbdialog.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gui/hbdialog.h	Mon May 03 12:48:33 2010 +0300
@@ -66,6 +66,7 @@
 protected:
     HbDialog( HbDialogPrivate &dd, QGraphicsItem *parent );
 
+    QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const;
     void focusInEvent( QFocusEvent *event );
     void closeEvent( QCloseEvent * event );
     void changeEvent(QEvent *event );
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gui/hblongpressvisualizer.cpp
--- a/src/hbcore/gui/hblongpressvisualizer.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gui/hblongpressvisualizer.cpp	Mon May 03 12:48:33 2010 +0300
@@ -23,109 +23,129 @@
 **
 ****************************************************************************/
 
+#include "hblongpressvisualizer.h"
+#include "hblongpressvisualizer_p.h"
+#include <hbiconitem.h>
+#include <hbmainwindow.h>
+#include <hbwidget.h>
+#include <hbinstance.h>
+#include <hbiconanimationmanager.h>
+#include <hbiconanimator.h>
+#include <hbwidgetfeedback.h>
+#include <QGraphicsScene>
+
 /*!
-//
-//  W A R N I N G
-//  -------------
-//
-// This implementation of longpress visualizer is most probably removed in later releases.
-// It exists purely as an implementation detail.
-// This implementation may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
+  \class HbLongPressVisualizer
+
+  \brief Displays the long press animation, that is, the small animated icon
+  indicating that the tap being held may potentially become a long press.
+
+  Widgets or applications should use the functions of this class to show and
+  hide the standard, themed long press animation.
 */
 
-#include "hblongpressvisualizer_p.h"
+Q_GLOBAL_STATIC(HbLongPressVisualizerPrivate, visualizer)
+
+/*!
+  Shows the animated icon at (or near) position \a pos. If \a delayMs is non-zero then
+  the animation is only shown after the specified number of milliseconds.
 
-#include <QPen>
-#include <QPainter>
+  \a pos is treated to be a scene position. In typical usage scenarios the scene
+  position will be retrieved from a gesture event and passed as it is in \a
+  pos. Do not make any assumptions about the exact position of the icon, the
+  visualizer may decide to position it a bit differently in order to make it
+  more visible to the user (e.g. to prevent being obscured by the user's
+  finger).
+
+  If \a widget is not 0 then the icon is added to the scene of the widget's
+  mainwindow.  Otherwise the first main window is used. If no main windows were
+  instantiated before calling start() then it will return immediately.
 
-/* 
-	HbLongPressVisualizer
-	HbLongPressVisualizer is part of the internal implementation. It is not supposed to be in public API.
-	
-	
-	HbLongPressVisualizer is a visualizer for the long-press gesture.
+  The widget is also used for tactile feedback, if it is 0 then no feedback
+  effect will be started. If the widget is given then the instant LongPressed
+  feedback effect will be started automatically.
+ */
+void HbLongPressVisualizer::start(const QPointF &pos, int delayMs, const HbWidget *widget)
+{
+    visualizer()->start(pos, delayMs, widget);
+}
 
-	HbGestureFilter
-*/
-
+/*!
+  Hides the animated icon if it is visible. Has no effect if the animation is
+  not currently visible.
+ */
+void HbLongPressVisualizer::stop()
+{
+    visualizer()->stop();
+}
 
-/*
-	Constructs sample long-press visualization widget with a parent.
-*/
-
-HbLongPressVisualizer::HbLongPressVisualizer( QGraphicsItem *parent ) : HbWidget(parent), active(false), spanAngle(0)
+HbLongPressVisualizerPrivate::HbLongPressVisualizerPrivate()
+    : mInited(false), mWidget(0), mIconItem(0)
 {
 }
 
-/*
-	Reimplemented from QGraphicsItem::paint().
-*/
-void HbLongPressVisualizer::paint( QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+void HbLongPressVisualizerPrivate::start(const QPointF &pos, int delayMs, const HbWidget *widget)
 {
-    Q_UNUSED(option);
-    Q_UNUSED(widget);
-    
-    if (active) {
-        QPen pen( Qt::lightGray );
-        pen.setWidth(5);
-        painter->setPen(pen);
-        painter->drawArc(rect, 90*16, -spanAngle*16);
+    // Multiple mainwindow support is in place below, however currently there is
+    // only one icon item so the icon is only shown in one mainwindow at a time.
+    stop();
+    mWidget = widget;
+    HbMainWindow *mainWindow = widget ? widget->mainWindow() : 0;
+    if (!mainWindow) {
+        QList<HbMainWindow *> mainWindows(hbInstance->allMainWindows());
+        if (!mainWindows.isEmpty()) {
+            mainWindow = mainWindows.at(0);
+        } else {
+            return;
+        }
+    }
+    if (!mInited) {
+        mInited = true;
+        mTimer.setSingleShot(true);
+        connect(&mTimer, SIGNAL(timeout()), SLOT(showIcon()));
+        HbIconAnimationManager::global()->addDefinitionFile("qtg_anim_longtap.axml");
+        mIconItem = new HbIconItem("qtg_anim_longtap");
+        mIconItem->hide();
+        mIconItem->setSize(mIconItem->defaultSize());
+    }
+    QGraphicsScene *targetScene = mainWindow->scene();
+    QGraphicsScene *oldScene = mIconItem->scene();
+    if (targetScene != oldScene) {
+        if (oldScene) {
+            oldScene->removeItem(mIconItem);
+        }
+        targetScene->addItem(mIconItem); // takes ownership
+    }
+    prepareIcon(pos);
+    if (delayMs > 0) {
+        mTimer.start(delayMs);
+    } else {
+        showIcon();
     }
 }
 
-/*
-	Start HbLongPressVisualizer.
-
-	Currently position is hardcoded.
-*/
-void HbLongPressVisualizer::start(QPointF scenePos)
+void HbLongPressVisualizerPrivate::stop()
 {
-    prepareGeometryChange();
-    rect = QRect( 0, 0, 30, 30);
-
-    if (scenePos.y() < 60 ) {
-        //Draw the animation below of the touch point
-        rect.moveCenter( QPointF(scenePos.x(), scenePos.y()+50));
+    mTimer.stop();
+    if (mIconItem) {
+        mIconItem->animator().stopAnimation();
+        mIconItem->hide();
     }
-    else {
-        //Draw the animation above of the touch point
-        rect.moveCenter( QPointF(scenePos.x(), scenePos.y()-50));
-    }
-
-    setFrame(0);
-    active = true;
 }
 
-/*
-	Stop HbLongPressVisualizer.
-*/
-void HbLongPressVisualizer::stop()
+void HbLongPressVisualizerPrivate::prepareIcon(const QPointF &pos)
 {
-    active = false;
-    update();
+    mPos = pos;
+    QSizeF iconSize = mIconItem->size();
+    mPos -= QPointF(iconSize.width() / 2, iconSize.height());
+    mIconItem->setPos(mPos);
 }
 
-
-/*
-	Set frame for HbLongPressVisualizer
-*/
-void HbLongPressVisualizer::setFrame(int frame)
+void HbLongPressVisualizerPrivate::showIcon()
 {
-    spanAngle = frame*360/100;
-    update();
+    mIconItem->animator().startAnimation();
+    mIconItem->show();
+    if (mWidget) {
+        HbWidgetFeedback::triggered(mWidget, Hb::InstantLongPressed);
+    }
 }
-
-/*
-	Reimplemented from QGraphicsItem::boundingRect().
-
-	Currently returns the default bounding rect.
-
-*/
-QRectF HbLongPressVisualizer::boundingRect() const 
-{
-    return rect;
-}
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gui/hblongpressvisualizer.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/gui/hblongpressvisualizer.h	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,40 @@
+/****************************************************************************
+**
+** 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_LONG_PRESS_VISUALIZER_H
+#define HB_LONG_PRESS_VISUALIZER_H
+
+#include <hbglobal.h>
+#include <QPointF>
+
+class HbWidget;
+
+class HB_CORE_EXPORT HbLongPressVisualizer {
+public:
+    static void start(const QPointF &pos, int delayMs = 0, const HbWidget *widget = 0);
+    static void stop();
+};
+
+#endif // HB_LONG_PRESS_VISUALIZER_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gui/hblongpressvisualizer_p.h
--- a/src/hbcore/gui/hblongpressvisualizer_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gui/hblongpressvisualizer_p.h	Mon May 03 12:48:33 2010 +0300
@@ -23,40 +23,31 @@
 **
 ****************************************************************************/
 
-#ifndef HB_LONG_PRESS_VISUALIZER_P_H
-#define HB_LONG_PRESS_VISUALIZER_P_H
-
+#include <hbglobal.h>
 #include <QPointF>
-#include <QRectF>
-#include <hbglobal.h>
-#include <hbwidget.h>
+#include <QTimer>
 
-QT_BEGIN_NAMESPACE
-class QGraphicsItem;
-class QPainter;
-class QStyleOptionGraphicsItem;
-class QWidget;
-QT_END_NAMESPACE
+class HbWidget;
+class HbIconItem;
 
-class HbLongPressVisualizer : public HbWidget
+class HbLongPressVisualizerPrivate : public QObject
 {
-
     Q_OBJECT
 
 public:
-    HbLongPressVisualizer(QGraphicsItem *parent);
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget=0);
-    QRectF boundingRect() const;
+    HbLongPressVisualizerPrivate();
+    void start(const QPointF &pos, int delayMs, const HbWidget *widget);
+    void stop();
 
-public slots:
-    void start(QPointF scenePos);
-    void stop();
-    void setFrame(int frame);
+private slots:
+    void showIcon();
 
 private:
-    bool active;
-    QRectF rect;
-    int spanAngle;
+    void prepareIcon(const QPointF &pos);
+
+    bool mInited;
+    const HbWidget *mWidget;
+    HbIconItem *mIconItem;
+    QTimer mTimer;
+    QPointF mPos;
 };
-
-#endif // HB_LONG_PRESS_VISUALIZER_P_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gui/hbmainwindow.cpp
--- a/src/hbcore/gui/hbmainwindow.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gui/hbmainwindow.cpp	Mon May 03 12:48:33 2010 +0300
@@ -56,7 +56,7 @@
 #include "hbthetestutility_p.h"
 #include "hbglobal_p.h"
 #include "hbevent.h"
-#include "hbsplashscreen_p.h"
+#include "hbsplashscreen.h"
 #include "hbcontentwidget_p.h"
 #include "hbscreen_p.h"
 #include "hbmainwindoworientation_p.h"
@@ -129,9 +129,11 @@
 /*!
     \fn void HbMainWindow::aboutToChangeOrientation(Qt::Orientation newOrientation, bool animated)
 
-    This signal is emitted when the orientation change starts. This version of aboutToChangeOrientation also includes the information
-    about the new orientation and whether the orientation change is animated or not. 
-    This can be used for example by widgets who want to participate in the orientation change animation.
+    This signal is emitted when the orientation change starts. This version of
+    aboutToChangeOrientation also includes the information about the new
+    orientation and whether the orientation change is animated or not.  This can
+    be used for example by widgets who want to participate in the orientation
+    change animation.
  */
 
 /*!
@@ -150,9 +152,28 @@
  */
 
 /*!
+    \fn void HbMainWindow::aboutToChangeView(HbView *oldView, HbView *newView)
+
+    This signal is emitted before starting a view change. Note that it is only
+    emitted when there is a real view change (i.e. when setCurrentView() is
+    used), it will not be emitted when views are added to the main window via
+    addView().
+
+    It is guaranteed that this signal is emitted before starting any view switch
+    animation.
+ */
+
+/*!
     \fn void HbMainWindow::currentViewChanged(HbView *view)
 
-    This signal is emitted when the current view changes.
+    This signal is emitted when the current view changes. Do not make assumptions about
+    the exact timing of this signal, it may be emitted at any time during the view switch
+    (this is relevant if the view switch is animated, i.e. it is not guaranteed that the
+    signal will be emitted at the end of the animation, in fact it is usually emitted
+    already when the animation starts).
+
+    \sa aboutToChangeView()
+    \sa viewReady()
  */
 
 /*!
@@ -161,11 +182,12 @@
     This signal is emitted first time when window content is drawn on screen.
     It will only be emitted again when current view is changed and drawn on screen.
 
-    If applicationlaunch or current view is switched with effect, signal is
-    emitted after the effect has completed.
+    If the view switch is animated, the signal is emitted only after the effect has
+    completed.
 
-    Application developers may connect to this signal to do lower priority construction tasks. When
-    thinking about the tasks, it's important to keep the UI responsive all the time.
+    Application developers may connect to this signal to do lower priority construction
+    tasks. Note however that when thinking about the tasks, it is important to keep the UI
+    responsive all the time.
  */
 
 /*!
@@ -234,9 +256,12 @@
         HbMainWindowOrientation::instance()->setFixedOrientation(Qt::Horizontal);
         d->mOrientation = Qt::Horizontal;
         d->mAutomaticOrientationSwitch = false;
-    } else {
+    } else if (HbMainWindowOrientation::instance()->isEnabled()) {
         d->mOrientation = HbMainWindowOrientation::instance()->sensorOrientation();
         d->mAutomaticOrientationSwitch = true;
+    } else {
+        d->mOrientation = d->mDefaultOrientation;
+        d->mAutomaticOrientationSwitch = false; 
     }
 
 #if defined(Q_WS_S60) || defined(HB_Q_WS_MAEMO)
@@ -292,6 +317,7 @@
 
     QRectF rect(0,0,pSize.width(),pSize.height());
     resize(pSize);
+	d->mLayoutRect = rect;
     d->mRootItem->setGeometry(rect);
     d->mClippingItem->setGeometry(rect);
 
@@ -300,6 +326,17 @@
     setTransformationAnchor(QGraphicsView::AnchorViewCenter);
 
     // Rest of the initialization is done later, see paintEvent().
+    
+    
+#ifdef HB_GESTURE_FW
+    // @todo remove after view auto-subscribes to gestures
+    viewport()->grabGesture(Qt::TapGesture);
+    viewport()->grabGesture(Qt::TapAndHoldGesture);
+    viewport()->grabGesture(Qt::PanGesture);
+    viewport()->grabGesture(Qt::SwipeGesture);
+    viewport()->grabGesture(Qt::PinchGesture);
+#endif
+
 }
 
 /*!
@@ -498,6 +535,7 @@
     HbView *oldView = currentView();
     // Switching to null view or to the one that is current will do nothing.
     if (view && oldView != view) {
+        emit aboutToChangeView(oldView, view);
         if (oldView && animate) {
             if (flags & Hb::ViewSwitchFullScreen) {
                 flags |= Hb::ViewSwitchSequential;
@@ -604,40 +642,7 @@
     
     return result;
 }
-/*!
-    \deprecated HbMainWindow::element(HbMainWindow::Element) const
-        is deprecated.
 
-    Returns user interface elements of mainwindow as QGraphicsWidgets. The term "element" here is used since each of these
-    elements consist of one or multiple items. The term "item" is used since each element is represented by a single 
-    QGraphicsWidget (which is also a QGraphicsItem).
-
-    The returned elements can be used for example to run effects using the HbEffect API.
-    For example an application could use the ViewPortItem to do an effect on all the other parts of the UI except the background item.
-
-    Currently supported elements are:
-    - HbMainWindow::RootItem, this is an item that contains all other items including the background element.
-    - HbMainWindow::ViewportItem, this contains all other items except the background, it can be thought as the viewport for widgets.
-      This item gets resized when the orientation changes.
-    - HbMainWindow::BackgroundItem, as the name says the enum represents the background item, nothing else.
-      Note that in this case the returned pointer may be null if the main window was constructed with Hb::WindowFlagNoBackground.
-
-    \param element Enumeration of the element. 
-
-*/
-QGraphicsWidget *HbMainWindow::element(HbMainWindow::Element element) const
-{
-    HB_DEPRECATED("HbMainWindow::element is deprecated!");
-    Q_D(const HbMainWindow);
-    if( element == HbMainWindow::RootItem )
-        return d->mRootItem;
-    else if( element == HbMainWindow::ViewportItem )
-        return d->mClippingItem;
-    else if( element == HbMainWindow::BackgroundItem )
-        return d->mBgItem;
-
-    return 0;
-}
 
 /*!
     Returns orientation of the window.
@@ -665,31 +670,11 @@
 {
     Q_D(HbMainWindow);
     d->mAutomaticOrientationSwitch = false;
+    d->mUserOrientationSwitch = true;
     d->setTransformedOrientation(orientation, animate);
 }
 
 /*!
-    \deprecated HbMainWindow::toggleOrientation()
-        is deprecated.
-
-    @proto
-    
-    Switches orientation of main window.
-        
- */
-void HbMainWindow::toggleOrientation()
-{
-    HB_DEPRECATED("HbMainWindow::toggleOrientation is deprecated!");
-    Q_D(HbMainWindow);
-    d->mAutomaticOrientationSwitch = false;
-    if (d->mOrientation == Qt::Horizontal) {
-        d->setTransformedOrientation(Qt::Vertical,false);
-    } else {
-        d->setTransformedOrientation(Qt::Horizontal,false);
-    }
-}
-
-/*!
     Unsets orientation of the window. Application will listen orientation events coming from system.
     Orientation switch animation can be skipped by using the boolean parameter.
 
@@ -700,6 +685,7 @@
     Q_D(HbMainWindow);
     if (!d->mAutomaticOrientationSwitch) {
         d->mAutomaticOrientationSwitch = true;
+        d->mUserOrientationSwitch = false;
         if(HbMainWindowOrientation::instance()->isEnabled())
             d->setTransformedOrientation(HbMainWindowOrientation::instance()->sensorOrientation(), animate);
     }
@@ -851,10 +837,7 @@
 QRectF HbMainWindow::layoutRect() const
 {
     Q_D(const HbMainWindow);
-    if (d->mClippingItem) {
-        return d->mClippingItem->geometry();
-    }
-    return QRectF();
+	return d->mLayoutRect;
 }
 /*!
     \deprecated HbMainWindow::setCurrentViewIndex(int)
@@ -941,6 +924,8 @@
         // Notify layout direction change to the icon framework
         HbLayoutDirectionNotifier::instance()->notifyLayoutDirectionChange();
 
+        broadcastEvent( HbEvent::WindowLayoutDirectionChanged );
+
         foreach (QGraphicsItem *item, items()) {
             if (item->isWidget() && !item->parentItem() ) {
                 QGraphicsWidget *widget = static_cast<QGraphicsWidget *>(item);
@@ -1073,15 +1058,36 @@
         }
     } else if (event->type() == HbMainWindowPrivate::IdleOrientationFinalEvent) {
         if (d->mAnimateOrientationSwitch) {
-            HbEffect::start(d->mStatusBar, "statusbar", "appear_orient"); 
             HbEffect::start(d->mTitleBar, "titlebar", "appear_orient");
+            HbEffect::start(d->mStatusBar, "statusbar", "appear_orient");
             if (d->mCurrentToolbar) {         
                 HbToolBarPrivate *toolBarD = HbToolBarPrivate::d_ptr(d->mCurrentToolbar);
                 toolBarD->startAppearOrientEffect();
             }
+            d->mOrientationChangeOngoing = false;
+            if (d->mAutomaticOrientationSwitch && HbMainWindowOrientation::instance()->isEnabled()) {
+                d->setTransformedOrientation(HbMainWindowOrientation::instance()->sensorOrientation(), d->mAnimateOrientationSwitch);
+            }
+            else if (d->mRequestedOrientation != d->mOrientation) {
+                d->setTransformedOrientation(d->mRequestedOrientation, d->mAnimateOrientationSwitch);
+            }
+        } else {
+            // cancel() with clearEffect cannot be used because the effects may have already been canceled.
+            if (d->mTitleBar) {
+                d->mTitleBar->resetTransform();
+                d->mTitleBar->setOpacity(1);
+            }
+            if (d->mStatusBar) {
+                d->mStatusBar->resetTransform();
+                d->mStatusBar->setOpacity(1);
+            }
+            if (d->mCurrentToolbar) {
+                d->mCurrentToolbar->resetTransform();
+                d->mCurrentToolbar->setOpacity(1);
+                d->mCurrentToolbar->show();
+            }
         }
     }
-      
 }
 
 /*!
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gui/hbmainwindow.h
--- a/src/hbcore/gui/hbmainwindow.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gui/hbmainwindow.h	Mon May 03 12:48:33 2010 +0300
@@ -42,25 +42,19 @@
 class HB_CORE_EXPORT HbMainWindow : public QGraphicsView
 {
     Q_OBJECT
+
     //Deprecated
     Q_PROPERTY(int currentViewIndex READ currentViewIndex WRITE setCurrentViewIndex)
     //Deprecated
     Q_PROPERTY(int viewCount READ viewCount)
+
     Q_PROPERTY(Qt::Orientation orientation 
                READ orientation
                WRITE setOrientation
                RESET unsetOrientation
-               NOTIFY orientationChanged )
+               NOTIFY orientationChanged)
 
 public:
-
-    //deprecated
-    enum Element {
-        RootItem,
-        ViewportItem,
-        BackgroundItem
-    };
-
     explicit HbMainWindow(QWidget *parent = 0, Hb::WindowFlags windowFlags = Hb::WindowFlagNone);
     ~HbMainWindow();
 
@@ -82,9 +76,6 @@
     HbView *currentView() const;
     void setCurrentView(HbView *view, bool animate = true, Hb::ViewSwitchFlags flags = Hb::ViewSwitchDefault);
 
-    // Deprecated
-    QGraphicsWidget *element(HbMainWindow::Element element) const;
-
     Qt::Orientation orientation() const;
     void setOrientation(Qt::Orientation orientation, bool animate = true);
     void unsetOrientation(bool animate = true);
@@ -118,13 +109,12 @@
 
     void broadcastEvent( int eventType );
 
-    // Deprecated
-    void toggleOrientation();
-
 signals:
     // deprecated
     void currentViewIndexChanged(int index);
+
     void viewReady();
+    void aboutToChangeView(HbView *oldView, HbView *newView);
     void currentViewChanged(HbView *view);
     void aboutToChangeOrientation();
     void aboutToChangeOrientation(Qt::Orientation newOrientation, bool animated);
@@ -161,7 +151,6 @@
     Q_PRIVATE_SLOT(d_func(), void _q_restoreTitlePane())
     Q_PRIVATE_SLOT(d_func(), void _q_delayedConstruction())
     Q_PRIVATE_SLOT(d_func(), void _q_viewReady())
-
 };
 
 #endif // HBMAINWINDOW_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gui/hbmainwindow_p.cpp
--- a/src/hbcore/gui/hbmainwindow_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gui/hbmainwindow_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -50,18 +50,13 @@
 #include "hbcontentwidget_p.h"
 #include "hbscreen_p.h"
 #include "hbbackgrounditem_p.h"
+#include "hbforegroundwatcher_p.h"
+
 
 #ifdef Q_OS_SYMBIAN
 #include "hbnativewindow_sym_p.h"
 #endif
 
-#ifdef HB_GESTURE_FW
-#include "hbmousepangesturerecognizer_p.h"
-#include "hbswipegesturerecognizer_p.h"
-#include "hbtapgesturerecognizer_p.h"
-#include "hbtapandholdgesturerecognizer_p.h"
-#endif
-
 const int HbMainWindowPrivate::IdleEvent = QEvent::registerEventType();
 const int HbMainWindowPrivate::IdleOrientationEvent = QEvent::registerEventType();
 const int HbMainWindowPrivate::IdleOrientationFinalEvent = QEvent::registerEventType();
@@ -85,8 +80,10 @@
     mFadeItem(0),
     mRootItem(0),    
     mAutomaticOrientationSwitch(true),
+    mUserOrientationSwitch(false),
     mOrientationChangeOngoing(false),
     mOrientation(Qt::Vertical),
+    mRequestedOrientation(Qt::Vertical),
     mCurrentToolbar(0),
     mCurrentDockWidget(0),
     mVisibleItems(Hb::AllItems),
@@ -125,8 +122,6 @@
         mVisibleItems &= ~Hb::MiddleSoftKeyItem;
         mVisibleItems &= ~Hb::PrimarySoftKeyItem;
     }
-
-    mOrientation = hbInstance->orientation();
 }
 
 HbToolBar *HbMainWindowPrivate::toolBar() const
@@ -225,14 +220,19 @@
 
 void HbMainWindowPrivate::setTransformedOrientation(Qt::Orientation orientation, bool animate)
 {
-    if ( (mOrientation == orientation) && !mForceSetOrientation && mEffectItem )
+    Q_Q(HbMainWindow);
+    mRequestedOrientation = orientation;
+
+    if (mOrientationChangeOngoing) {
         return;
-       
-    Q_Q(HbMainWindow);
+    }
+    if ( (mOrientation == orientation) && !mForceSetOrientation && mEffectItem) {
+        return;
+    }
 
+    // skip transition if graphicsview is not visible
+    mAnimateOrientationSwitch = animate;
 
-        // skip transition if graphicsview is not visible
-    mAnimateOrientationSwitch = animate;
     if (!q->isVisible())
         mAnimateOrientationSwitch = false;
 
@@ -279,7 +279,6 @@
 
 void HbMainWindowPrivate::changeSceneSize()
 {
-    
    // no need to perform the scene size change if there's no (rotation) effect for graphicsview
     if (!mGVOrientationChangeEffectEnabled)
         return;
@@ -364,18 +363,16 @@
     mForceSetOrientation = true;
     setTransformedOrientation(profile.orientation(), false);
     mForceSetOrientation = false;
-    
 }
 
-
 HbDeviceProfile HbMainWindowPrivate::profile() const
 {
     return adjustedProfile(mCurrentProfile);
 }
 
- HbDeviceProfile HbMainWindowPrivate::adjustedProfile(const HbDeviceProfile &profile) const
- {
-     HbDeviceProfile result = profile;
+HbDeviceProfile HbMainWindowPrivate::adjustedProfile(const HbDeviceProfile &profile) const
+{
+    HbDeviceProfile result = profile;
     if (!result.isNull() && result.orientation() != mOrientation) {
         if(mAlternateProfile.isNull()) {
             mAlternateProfile = HbDeviceProfile(profile.alternateProfileName());
@@ -386,15 +383,15 @@
         }
      }
      return result;
- }
+}
 
 
 void HbMainWindowPrivate::orientationEffectFinished(const HbEffect::EffectStatus& status)
 {
+    Q_UNUSED(status);
     Q_Q(HbMainWindow);
+
     QSize newSize;
-
- 
     
     HbDeviceProfile o = HbDeviceProfile::profile(q);
     newSize = o.logicalSize(); 
@@ -406,13 +403,17 @@
     
     q->setSceneRect(0,0,newSize.width(),newSize.height());
     
+    if (mBgItem)
+        mBgItem->updateBackgroundImage();
+
     // re-layouting, skip if size does not change
     if (mClippingItem->size() != newSize) {
         mClippingItem->resize(newSize);
+		mLayoutRect = QRectF(QPointF(0,0), newSize);
         
     // reset transformation
     q->resetTransform(); 
-    
+
     // if not default rotation, rotate to the defined angle no matter what the effect did
     if( mOrientation != mDefaultOrientation)
         q->rotate(mOrientationAngle);
@@ -429,33 +430,14 @@
             HbInputSettingProxy::instance()->setScreenOrientation(mOrientation);
         }
     }
-
-    if (status.reason == Hb::EffectCancelled) {
-        mOrientationChangeOngoing = false;
-        HbEffect::EffectStatus dummy;
-        rootItemFinalPhaseDone(dummy);
-    }
 }
 
-
 void HbMainWindowPrivate::rootItemFirstPhaseDone(const HbEffect::EffectStatus& status)
 {
+    Q_UNUSED(status)
     Q_Q(HbMainWindow);
 
-    if (status.reason == Hb::EffectCancelled) {
-        // if using opacity effect make sure that opacity is 1 if first phase effect
-        // is cancelled
-        if (mEffectItem) {
-            mEffectItem->setOpacity(1.0f);
-            // also reset transform since root item first phase isn't the end state
-            mEffectItem->resetTransform();
-        }
-        HbEffect::EffectStatus empty;
-        orientationEffectFinished(empty);
-        return;
-    }
-
-   if (mOrientation == mDefaultOrientation)
+    if (mOrientation == mDefaultOrientation)
         HbEffect::start(&mGVWrapperItem,"toDefault", q, "orientationEffectFinished");
     else 
         HbEffect::start(&mGVWrapperItem,"toRotated", q, "orientationEffectFinished");
@@ -464,7 +446,7 @@
 void HbMainWindowPrivate::rootItemFinalPhaseDone(const HbEffect::EffectStatus& status)
 {
     Q_UNUSED(status);
-        
+
     if (mEffectItem) {
         HbEffect::enable(mEffectItem);
         // make sure effect does not leave anything in wrong state
@@ -495,6 +477,8 @@
 void HbMainWindowPrivate::addViewEffects()
 {
     // Register the view switch animations from the theme.
+    // Use HbEffectInternal and the HB_ prefix to prevent general overriding of these effects.
+    // Instead, view switch effects can be overridden on a per-instance basis.
     bool ok = HbEffectInternal::add(
         QStringList() << "HB_view" << "HB_view" << "HB_view" << "HB_view",
         QStringList() << "view_show_normal" << "view_hide_normal" <<  "view_show_back" << "view_hide_back",
@@ -513,6 +497,7 @@
     }
 
     // Register titlebar effects.
+    // These should be overridable in general (so we use HbEffect and no HB_ prefix).
     ok = HbEffect::add(
         QStringList() << "titlebar" << "titlebar" << "titlebar" << "titlebar",
         QStringList() << "titlebar_disappear" <<  "titlebar_appear" << "titlebar_orient_disappear" << "titlebar_orient_appear",
@@ -610,30 +595,31 @@
 /*
     Launches the menu of the current view at given pos.
 */
-void HbMainWindowPrivate::_q_launchMenu(const QPointF &pos)
+void HbMainWindowPrivate::_q_launchMenu(const QPointF& pos)  // TODO - pos unused!
 {
     Q_Q(HbMainWindow);
-    QPointer<HbView> view = q->currentView();
-    if (view) {
-        HbMenu *menu = view->menu();
-
+    Q_UNUSED(pos);
+    mMenuView = q->currentView();
+    if (mMenuView) {
+        HbMenu *menu = mMenuView->menu();
         if (!menu->isEmpty()) {
             q->connect(menu, SIGNAL(aboutToClose()), q, SLOT(_q_restoreTitlePane()));
             menu->setTimeout(HbPopup::NoTimeout);
-            QPointer<HbMenu> menuAlive(menu);
-            menu->exec(pos);
-            if (menuAlive) {
-                q->disconnect(menu, SIGNAL(aboutToClose()), q, SLOT(_q_restoreTitlePane()));
-            }
-            if (view) {
-                view->setFocus();
-            }
+            menu->open( this, SLOT(menuClosed()));
         } else {
             _q_restoreTitlePane();
         }
     }
 }
 
+void HbMainWindowPrivate::menuClosed()
+{
+    if (mMenuView) {
+        mMenuView->setFocus();
+    }
+    _q_restoreTitlePane();
+}
+
 /*
   Restore the mode of the title pane after menu is closed.
  */
@@ -704,7 +690,6 @@
     if (view) {
         const Hb::SceneItems visibleItems(view->visibleItems());
         view->setTitleBarVisible(visibleItems & Hb::TitleBarItem); // also handles updating of the navigation button
-        mTitleBar->titlePane()->setVisible(visibleItems & Hb::TitlePaneItem);
         
         // ToolBar is a special case, since it depens on the current view's toolbar
         if (visibleItems & Hb::ToolBarItem) {
@@ -899,7 +884,6 @@
         if (initializeInputs) {
             initializeInputs = false;
             HbInputMethod::initializeFramework(*qApp);
-            initGestures();
         }
         HbInputSettingProxy::instance()->initializeOrientation(mOrientation);
 
@@ -915,13 +899,15 @@
         connect(q, SIGNAL(currentViewChanged(HbView*)),
                 mClippingItem, SLOT(currentViewChanged(HbView*)));
 
+        mTitleBar->delayedConstruction();
         connect(mTitleBar->titlePane(), SIGNAL(visibilityChanged()),
                 mClippingItem, SLOT(decoratorVisibilityChanged()));
         connect(mTitleBar, SIGNAL(titleBarStateChanged()),
                 mClippingItem, SLOT(decoratorVisibilityChanged()));
 
-         connect(mStatusBar, SIGNAL(notificationCountChanged(int)),
-                 mTitleBar, SIGNAL(notificationCountChanged(int)));
+        mStatusBar->delayedConstruction();
+        connect(mStatusBar, SIGNAL(notificationCountChanged(int)),
+                mTitleBar, SIGNAL(notificationCountChanged(int)));
 
         mFadeItem = new HbFadeItem;
         mFadeItem->setZValue(HbPrivate::FadingItemZValue);
@@ -940,6 +926,17 @@
         emit q->viewReady();
 }
 
+QGraphicsWidget *HbMainWindowPrivate::element(HbMainWindowPrivate::Element element) const
+{
+     if( element == HbMainWindowPrivate::RootItem )
+        return mRootItem;
+    else if( element == HbMainWindowPrivate::ViewportItem )
+        return mClippingItem;
+    else if( element == HbMainWindowPrivate::BackgroundItem )
+        return mBgItem;
+    return 0;
+}
+
 void HbMainWindowPrivate::addBackgroundItem()
 {
     Q_Q(HbMainWindow);
@@ -958,20 +955,5 @@
     }
 }
 
-void HbMainWindowPrivate::initGestures()
-{
-#ifdef HB_GESTURE_FW
-// ### TODO enable this (and remove the similar calls in HbApplication ctor) once QGestureManager problems are fixed
-/*    QGestureRecognizer::unregisterRecognizer(Qt::TapGesture);
-    QGestureRecognizer::unregisterRecognizer(Qt::TapAndHoldGesture);
-    QGestureRecognizer::unregisterRecognizer(Qt::PanGesture);
-    QGestureRecognizer::unregisterRecognizer(Qt::SwipeGesture);
-
-    QGestureRecognizer::registerRecognizer(new HbTapGestureRecognizer);
-    QGestureRecognizer::registerRecognizer(new HbTapAndHoldGestureRecognizer);
-    QGestureRecognizer::registerRecognizer(new HbMousePanGestureRecognizer);
-    QGestureRecognizer::registerRecognizer(new HbSwipeGestureRecognizer);*/
-#endif
-}
 
 // end of file
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gui/hbmainwindow_p.h
--- a/src/hbcore/gui/hbmainwindow_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gui/hbmainwindow_p.h	Mon May 03 12:48:33 2010 +0300
@@ -63,6 +63,12 @@
 
 public:
 
+    enum Element {
+        RootItem,
+        ViewportItem,
+        BackgroundItem
+    };
+
     HbMainWindowPrivate();
     virtual ~HbMainWindowPrivate();
 
@@ -90,7 +96,6 @@
     void updateRotationEffects();
     void addBackgroundItem();
     void removeBackgroundItem();
-    void initGestures();
 
     void postIdleEvent(int eventId);
 
@@ -98,6 +103,8 @@
     void unfadeScreen();
 
     void _q_viewReady();
+        
+    QGraphicsWidget *element(HbMainWindowPrivate::Element element) const;
 
     HbGraphicsScene *mScene;
     HbBackgroundItem *mBgItem;
@@ -115,10 +122,12 @@
     QList<QGraphicsItem*> mOrientationChangeEffectItems;
 
     bool mAutomaticOrientationSwitch;
+    bool mUserOrientationSwitch;
     bool mOrientationChangeOngoing;
     bool mAnimateOrientationSwitch;
     bool mGVOrientationChangeEffectEnabled;
     Qt::Orientation mOrientation;
+    Qt::Orientation mRequestedOrientation;
 
     HbToolBar *mCurrentToolbar;
     HbDockWidget *mCurrentDockWidget;
@@ -141,17 +150,20 @@
     HbGVWrapperItem mGVWrapperItem;
 
     bool mIdleEventHandled;
+	QRectF mLayoutRect;
     
     mutable HbDeviceProfile mAlternateProfile;
+	
 
 #ifdef Q_OS_SYMBIAN
     HbNativeWindow *mNativeWindow;
 #endif
+    QPointer<HbView> mMenuView;
 
     void rootItemFirstPhaseDone(const HbEffect::EffectStatus& status);
     void rootItemFinalPhaseDone(const HbEffect::EffectStatus& status);
     void orientationEffectFinished(const HbEffect::EffectStatus& status);
-        
+
     void addOrientationChangeEffects();
     void addViewEffects();
     void _q_viewChanged(int);
@@ -177,6 +189,9 @@
 signals:
     void idleEventDispatched();
 
+public slots:
+    void menuClosed();
+
 private:
     static HbMainWindowPrivate *d_ptr(HbMainWindow *mainWindow) {
         Q_ASSERT(mainWindow);
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gui/hbmenu.cpp
--- a/src/hbcore/gui/hbmenu.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gui/hbmenu.cpp	Mon May 03 12:48:33 2010 +0300
@@ -35,6 +35,7 @@
 #include "hbeffectinternal_p.h"
 bool HbMenuPrivate::menuEffectsLoaded = false;
 #endif
+#include "hbglobal_p.h"
 
 #include <QPointer>
 
@@ -69,7 +70,6 @@
     q->setTimeout(HbPopup::ContextMenuTimeout);
 
     q->setBackgroundFaded(false);
-    q->setFlag(QGraphicsItem::ItemClipsChildrenToShape);
 }
 
 void HbMenuPrivate::addPopupEffects()
@@ -108,7 +108,7 @@
         }
 #endif
         HbAction *hbAction = qobject_cast<HbAction *>(currentItem->action());
-        if (hbAction && hbAction->menu()) {
+        if (hbAction && hbAction->menu() && !actionTriggered) {
             hbAction->trigger();
             stopTimeout();
             openSubmenu(currentItem);
@@ -131,13 +131,7 @@
     if (!menuItemView && q->actions().count()){
         menuItemView = new HbMenuListView(q, q);
         HbStyle::setItemName(menuItemView, "content");
-        /* This is for qt versions 4.5,which had the clipping problem.
-           FOR http://www.qtsoftware.com/developer/task-tracker/index_html?id=257232&method=entry
-          see also HbMenu constructor */
-#if QT_VERSION < 0x040600
-        menuItemView->setFlag( QGraphicsItem::ItemClipsChildrenToShape, false );
-#endif
-   //This optimises case of options menu which otherwise updates its primitives twice.
+        //This optimises case of options menu which otherwise updates its primitives twice.
         if (menuType ==  HbMenu::OptionsMenu)
             q->setFrameType(HbPopup::Strong);
     	else
@@ -294,6 +288,47 @@
     }
 }
 
+void HbMenuPrivate::_q_handleMenuAfterOrientationChange()
+{
+    Q_Q(HbMenu);
+    if ( menuType == HbMenu::ContextMenu || menuType == HbMenu::OptionsMenu ) {
+        if(activeSubMenu){
+            HbAction* action = activeSubMenu->activeAction();
+            if(action) {
+                closeMenuRecursively(action);
+            }
+            closeSubmenu();
+        }
+        q->close();
+    }
+}
+
+/*!
+* closes the menu after Orientation change
+*/
+void HbMenuPrivate::closeMenuAfterOrientationChange()
+{
+    Q_Q(HbMenu);
+    HbMainWindow* w(q->mainWindow());
+    if ( w ){
+        QObject::disconnect( w, SIGNAL(aboutToChangeOrientation()),
+                             q, SLOT(_q_handleMenuAfterOrientationChange()));
+        QObject::connect( w, SIGNAL(aboutToChangeOrientation()),
+                 q, SLOT(_q_handleMenuAfterOrientationChange()));
+    }
+}
+
+void HbMenuPrivate::closeMenuRecursively(HbAction* menuAction)
+{
+    if(menuAction->menu() && menuAction->menu()->activeAction()) {
+        closeMenuRecursively(menuAction->menu()->activeAction());
+    }
+    if(menuAction->menu()) {
+        menuAction->menu()->close();
+    }
+}
+
+
 bool HbMenuPrivate::menuTimedOut(HbMenu* menu)
 {
     return (menu && menu->timeout() > 0 && HbMenuPrivate::d_ptr(menu)->timedOut);
@@ -314,10 +349,7 @@
         qreal upperEdge = mSubMenuItem->scenePos().y() + mSubMenuItem->size().height() * 2 / 3;
         QSizeF windowSize = QSizeF(0,0);
         if (q->mainWindow()) {
-            QGraphicsWidget *viewPortItem = q->mainWindow()->element(HbMainWindow::ViewportItem);
-            if (viewPortItem) {
-                windowSize = viewPortItem->size();
-            }
+            windowSize = q->mainWindow()->layoutRect().size();
         }
         if (windowSize.height() - mDownMargin - q->preferredHeight() < upperEdge) {
             upperEdge = windowSize.height() - mDownMargin - q->preferredHeight();
@@ -343,7 +375,7 @@
 }
 
 /*!
-    @stable
+    @beta
     @hbcore
     \class HbMenu
     \brief HbMenu is a menu widget for use in HbView.
@@ -446,12 +478,7 @@
     Q_D(HbMenu);
     d->q_ptr = this;
     d->init();
-    /* This is for qt versions 4.5,which had the clipping problem.
-           FOR http://www.qtsoftware.com/developer/task-tracker/index_html?id=257232&method=entry
-           */
-#if QT_VERSION < 0x040600
-    setFlag( QGraphicsItem::ItemClipsChildrenToShape, true );
-#endif
+    setModal(true);
 }
 
 /*!
@@ -492,9 +519,10 @@
 }
 
 /*!
-    \deprecated HbMenu::exec(HbAction*)
-        is deprecated. Please use void HbMenu::open( QObject *receiver, const char *member )
-        or HbMenu::show() instead.
+ \deprecated HbMenu::exec(HbAction*)
+         is deprecated. Please use
+  void HbMenu::open( QObject *receiver, const char *member ) or 
+  HbMenu::show() instead.
 
     Executes the menu synchronously so that given \a action
     is active.
@@ -519,6 +547,7 @@
  */
 HbAction *HbMenu::exec(HbAction *action)
 {
+    HB_DEPRECATED("HbMenu::exec is deprecated. Use HbMenu::show() or HbMenu::open() instead!");
     Q_D(HbMenu);
     if (actions().count() == 0) {
         return 0;
@@ -548,9 +577,10 @@
 }
 
 /*!
-    \deprecated HbMenu::exec(const QPointF&, HbAction*)
-        is deprecated. Please use void HbMenu::open( QObject *receiver, const char *member )
-        or HbMenu::show() and setPreferredPos() instead.
+  \deprecated HbMenu::exec(const QPointF&, HbAction*)
+     is deprecated. Please use
+  void HbMenu::open( QObject *receiver, const char *member ) or 
+  HbMenu::show() and setPreferredPos() instead.
 
     Executes the menu synchronously at \a pos so that given \a action
     is active.
@@ -693,6 +723,7 @@
     HbAction *action = new HbAction(this);
     action->setSeparator(true);
     action->setEnabled(false);
+    action->setVisible(false);
     insertAction(before, action);
     return action;
 }
@@ -766,6 +797,9 @@
 {
     Q_D(HbMenu);
 
+    if (change == QGraphicsItem::ItemSceneHasChanged) {
+        d->closeMenuAfterOrientationChange();
+    }
     if (change == QGraphicsItem::ItemVisibleChange) {
         if (value.toBool() && d->delayMenuConstruction) {
             d->delayedLayout();
@@ -782,48 +816,6 @@
 }
 
 /*!
-    \reimp
- */
-void HbMenu::keyPressEvent(QKeyEvent *event)
-{
-    //TODO: check if non-touch version works with the key bindings below
-    Q_D(HbMenu);
-    switch( event->key() ) {
-            case Qt::Key_Up:
-            case Qt::Key_Down:
-        break;
-            case Qt::Key_Right:
-        layoutDirection() == Qt::LeftToRight
-                ? d->openSubmenu()
-                    : d->closeSubmenu();
-        break;
-            case Qt::Key_Left:
-        layoutDirection() == Qt::LeftToRight
-                ? d->closeSubmenu()
-                    : d->openSubmenu();
-        break;
-            case Qt::Key_Backspace:
-        d->closeSubmenu();
-        break;
-            case Qt::Key_Escape:
-        close();
-        break;
-            default:
-        HbPopup::keyPressEvent( event );
-        break;
-    }
-}
-
-/*!
-    \reimp
- */
-void HbMenu::keyReleaseEvent(QKeyEvent *event)
-{
-    //TODO do we need this method?
-    QGraphicsWidget::keyReleaseEvent( event );
-}
-
-/*!
    \reimp
 */
 bool HbMenu::event(QEvent *event)
@@ -846,9 +838,9 @@
         }
     }
     if (event->type() == QEvent::LayoutRequest) {
-        resize(preferredSize());
         if(d->menuItemView)
             d->menuItemView->contentWidget()->adjustSize();
+    } else if (event->type() == QEvent::GraphicsSceneResize){
         if (d->mSubMenuItem)
             d->setSubMenuPosition();
     }
@@ -881,11 +873,13 @@
 
 QPainterPath HbMenu::shape() const
 {
-    QRectF sceneRect = mapRectToScene(boundingRect());
-    QRectF clipRect = sceneRect.intersected(geometry());
-    QPainterPath path;    
+    QRectF sceneRect = mapRectToScene(QRectF(-0.5, -0.5, boundingRect().width() + 0.5, boundingRect().height() + 0.5));
+    QRectF clipRect = sceneRect.intersected(QRectF(pos().x() - 0.5, pos().y() - 0.5, size().width() + 0.5, size().height() + 0.5));
+
+    QPainterPath path;
     path.addRect(mapRectFromScene(clipRect));
-    return path;
+
+    return path.intersected(HbPopup::shape());
 }
 
 /*!  @alpha
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gui/hbmenu.h
--- a/src/hbcore/gui/hbmenu.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gui/hbmenu.h	Mon May 03 12:48:33 2010 +0300
@@ -89,8 +89,6 @@
 protected:
     HbMenu(HbMenuPrivate &dd, QGraphicsItem *parent);
 
-    void keyPressEvent(QKeyEvent *event);
-    void keyReleaseEvent(QKeyEvent *event);
     bool event(QEvent *event);
     void polish(HbStyleParameters &params);
     QVariant itemChange(GraphicsItemChange change, const QVariant &value);
@@ -103,6 +101,7 @@
     Q_PRIVATE_SLOT(d_func(), void _q_onActionTriggered())
     Q_PRIVATE_SLOT(d_func(), void _q_subMenuItemTriggered(HbAction *action))
     Q_PRIVATE_SLOT(d_func(), void _q_subMenuTimedOut())
+    Q_PRIVATE_SLOT(d_func(), void _q_handleMenuAfterOrientationChange())
 };
 
 #endif // HBMENU_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gui/hbmenu_p.h
--- a/src/hbcore/gui/hbmenu_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gui/hbmenu_p.h	Mon May 03 12:48:33 2010 +0300
@@ -54,11 +54,14 @@
     void changeToOptionsMenu();
     HbMenuItem *subMenuItem();
     void setSubMenuItem(HbMenuItem *menuItem);
+    void closeMenuAfterOrientationChange();
+    void closeMenuRecursively(HbAction* menuAction);
 
     void _q_triggerAction(HbMenuItem *currentItem);
     void _q_onActionTriggered();
     void _q_subMenuItemTriggered(HbAction *action);
     void _q_subMenuTimedOut();
+    void _q_handleMenuAfterOrientationChange();
     void actionAdded(QActionEvent *actionEvent);
     void actionRemoved(QActionEvent *actionEvent);
     void actionChanged(QActionEvent *actionEvent);
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gui/hbmenucontainer_p.cpp
--- a/src/hbcore/gui/hbmenucontainer_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gui/hbmenucontainer_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -127,7 +127,7 @@
     Q_D(HbMenuContainer);
     if (!item) {
         item  = new HbMenuItem(d->menu, this);
-        item->setAction(action);        
+        item->setAction(action);
     }
     int pos = 0;           
     HbAction *castedAction = qobject_cast<HbAction *>(action);
@@ -219,7 +219,7 @@
     d->mFrictionEnabled = false;
     d->mContainer = new HbMenuContainer(menu, this);
     setContentWidget(d->mContainer);
-    d->updateGestures();
+    setScrollingStyle(HbScrollArea::Pan);
 }
 
 bool HbMenuListView::scrollByAmount(const QPointF& delta)
@@ -234,6 +234,8 @@
 void HbMenuListView::addActionItem(QAction *action)
 {
     Q_D(HbMenuListView);
+    if (action->isSeparator())
+        return;
     d->mContainer->updateVisibleActionList();
     d->mContainer->addItem(action);
     d->mCurrentIndex = -1;
@@ -283,6 +285,11 @@
 */
 void HbMenuListView::mousePressEvent(QGraphicsSceneMouseEvent *event)
 {
+#ifdef HB_GESTURE_FW
+    Q_UNUSED(event);
+    HbScrollArea::mousePressEvent(event);
+    event->accept();
+#else
     Q_D(HbMenuListView);
     d->mHitItem = itemAt(event->scenePos());
     if (d->mHitItem){
@@ -304,6 +311,7 @@
     }
     HbScrollArea::mousePressEvent(event);
     event->accept();
+#endif
 }
 
 /*!
@@ -311,6 +319,9 @@
 */
 void HbMenuListView::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
 {
+#ifdef HB_GESTURE_FW
+    HbScrollArea::mouseReleaseEvent(event);    
+#else
     Q_D(HbMenuListView);
 
     HbScrollArea::mouseReleaseEvent(event);
@@ -335,52 +346,7 @@
         d->mHitItem = 0;
     }
     event->accept();
-}
-
-/*!
-    \reimp
-*/
-void HbMenuListView::keyPressEvent(QKeyEvent *event)
-{
-    switch (event->key()) {
-    case Qt::Key_Up:
-    case Qt::Key_Down: {
-            Q_D(HbMenuListView);
-            if (event->key() ==  Qt::Key_Up){
-                if(d->mCurrentIndex>0)
-                    d->mCurrentIndex--;
-            }else if (event->key() ==  Qt::Key_Down){
-                if (d->mCurrentIndex<d->mContainer->items().count())
-                    d->mCurrentIndex++;
-            }
-            if (d->mCurrentIndex>=0 &&
-                d->mCurrentIndex<d->mContainer->items().count()){
-                d->mCurrentItem = d->mContainer->items().at(d->mCurrentIndex);
-            }
-            break;
-        }
-    default:
-        HbScrollArea::keyPressEvent(event);
-        break;
-    }
-}
-
-/*!
-    \reimp
-*/
-void HbMenuListView::keyReleaseEvent(QKeyEvent *event)
-{
-    Q_D(HbMenuListView);
-    switch (event->key()) {
-    case Qt::Key_Enter:
-    case Qt::Key_Return:
-        if (d->mCurrentItem)
-            HbMenuPrivate::d_ptr(d->mCurrentItem->menu())->_q_triggerAction(d->mCurrentItem);
-        break;
-    default:
-        HbScrollArea::keyReleaseEvent(event);
-        break;
-    }
+#endif
 }
 
 HbMenuItem *HbMenuListView::itemAt(const QPointF& position) const
@@ -484,3 +450,64 @@
 
     return HbScrollArea::itemChange(change, value);
 }
+
+void HbMenuListView::gestureEvent(QGestureEvent *event)
+{
+    Q_D(HbMenuListView);
+    HbScrollArea::gestureEvent(event);
+    //WORKAROUND for bug scene doesn't return all the items
+    if(QTapGesture *gesture = static_cast<QTapGesture *>(event->gesture(Qt::TapGesture))) {
+        // Stop scrolling on tap
+        if (gesture->state() == Qt::GestureStarted) {
+            event->accept();
+            d->mHitItem = itemAt(gesture->position());
+            if (d->mHitItem){
+                Hb::InteractionModifiers modifiers = 0;
+                if (d->mIsScrolling) {
+                    modifiers |= Hb::ModifierScrolling;
+                    d->mWasScrolling = true;
+                }
+                HbWidgetFeedback::triggered(d->mHitItem, Hb::InstantPressed, modifiers);
+                if (!d->mWasScrolling){
+                    ensureVisible(d->mHitItem->pos());
+                    if(!isFocusable(d->mHitItem->action()))
+                        d->mHitItem = 0;
+                    else
+                        d->mHitItem->pressStateChanged(true);
+                }
+                else
+                    d->mHitItem = 0;
+            }
+        } else if (gesture->state() == Qt::GestureFinished) {
+
+            HbMenuItem* hitItem = itemAt(gesture->position());
+            if (hitItem){
+                Hb::InteractionModifiers modifiers = 0;
+                if (d->mWasScrolling) {
+                    modifiers |= Hb::ModifierScrolling;
+                    d->mWasScrolling = false;
+                }
+                HbWidgetFeedback::triggered(hitItem, Hb::InstantReleased, modifiers);
+            }
+            if (d->mHitItem){
+                d->mHitItem->pressStateChanged(false);
+                if (d->mHitItem == hitItem) {
+                    d->mCurrentItem = d->mHitItem;
+                    d->mCurrentIndex = d->mContainer->items().indexOf(d->mCurrentItem);
+                    HbMenuPrivate::d_ptr(d->mCurrentItem->menu())->_q_triggerAction(d->mCurrentItem);
+                }
+                d->mHitItem = 0;
+            }
+        } else if (gesture->state() == Qt::GestureCanceled) {
+            if (d->mHitItem) {
+                d->mHitItem->pressStateChanged(false);
+                d->mHitItem = 0;
+            }
+        }
+    }
+    //WORKAROUND
+    
+    if (QPanGesture *panGesture = qobject_cast<QPanGesture*>(event->gesture(Qt::PanGesture))) {
+        event->accept(panGesture);
+    }
+}
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gui/hbmenucontainer_p.h
--- a/src/hbcore/gui/hbmenucontainer_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gui/hbmenucontainer_p.h	Mon May 03 12:48:33 2010 +0300
@@ -33,6 +33,7 @@
 #include "hbscrollarea_p.h"
 #include "hbactionmanager_p.h"
 #include <QGraphicsLinearLayout>
+#include <QGesture>
 
 class HbMenuContainer;
 class HbMenuContainerPrivate;
@@ -63,8 +64,7 @@
     void upGesture(int value);
     void downGesture(int value);
     void panGesture(const QPointF &point);
-    void keyPressEvent(QKeyEvent *event);
-    void keyReleaseEvent(QKeyEvent *event);
+    virtual void gestureEvent(QGestureEvent *event);
     QVariant itemChange(GraphicsItemChange change, const QVariant &value);
 private:
     HbMenuItem* itemAt(const QPointF& position) const;
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gui/hbmenuitem_p.cpp
--- a/src/hbcore/gui/hbmenuitem_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gui/hbmenuitem_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -26,6 +26,7 @@
 #include "hbmenuitem_p.h"
 #include "hbmenuitem_p_p.h"
 #include "hbmenu.h"
+#include "hbmenu_p.h"
 #include "hbaction.h"
 #include "hbstyle.h"
 #include "hbstyleoptionmenuitem.h"
@@ -33,7 +34,10 @@
 #include "hbtextitem.h"
 #include "hbevent.h"
 #include "hbcolorscheme.h"
-
+#include "hbwidgetfeedback.h"
+#ifdef HB_GESTURE_FW
+#include <QGesture>
+#endif
 Q_DECLARE_METATYPE (QAction*)
 
 /*
@@ -180,7 +184,8 @@
 
     d->q_ptr = this;
     d->menu = menu;
-    setAcceptedMouseButtons(Qt::NoButton);
+    grabGesture(Qt::TapGesture);
+    setAcceptedMouseButtons (Qt::NoButton);
 }
 
 /*
@@ -247,6 +252,28 @@
         d->_q_updateItem();
     }
 }
+#ifdef HB_GESTURE_FW
+void HbMenuItem::gestureEvent(QGestureEvent *event)
+{
+    //Q_D(HbMenuItem);
+    if(QTapGesture *gesture = qobject_cast<QTapGesture *>(event->gesture(Qt::TapGesture))) {
+        if (gesture->state() == Qt::GestureStarted) {           
+            // Tactile feedback                        
+            HbWidgetFeedback::triggered(this, Hb::InstantPressed);
+
+            pressStateChanged(true);
+            event->accept();
+        } else if (gesture->state() == Qt::GestureFinished) {
+            HbWidgetFeedback::triggered(this, Hb::InstantReleased);
+            pressStateChanged(false);
+            event->accept();            
+            HbMenuPrivate::d_ptr(menu())->_q_triggerAction(this);
+        } else if (gesture->state() == Qt::GestureCanceled) {
+            pressStateChanged(false);
+        }
+    }
+}
+#endif
 
 /*
     Sets the action,which is represented by the menu item.
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gui/hbmenuitem_p.h
--- a/src/hbcore/gui/hbmenuitem_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gui/hbmenuitem_p.h	Mon May 03 12:48:33 2010 +0300
@@ -67,6 +67,9 @@
 
     void initStyleOption(HbStyleOptionMenuItem *option) const;
     void changeEvent(QEvent *event);    
+#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 16d8024aca5e -r f7ac710697a9 src/hbcore/gui/hbpopup.cpp
--- a/src/hbcore/gui/hbpopup.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gui/hbpopup.cpp	Mon May 03 12:48:33 2010 +0300
@@ -32,12 +32,15 @@
 #include "hbgraphicsscene.h"
 #include "hbgraphicsscene_p.h"
 #include "hbtooltip.h"
+#include "hbglobal_p.h"
 #include <QTimer>
 #include <QGraphicsSceneMouseEvent>
 #include <QShowEvent>
 #include <QHideEvent>
 #include <QEventLoop>
 #include <QPointer>
+#include <QDebug>
+#include <QBitmap>
 #include <QApplication> // krazy:exclude=qclasses
 
 #include <hbwidgetfeedback.h>
@@ -47,7 +50,7 @@
 bool HbPopupPrivate::popupEffectsLoaded = false;
 #endif
 /*!
-    @stable
+    @beta
     @hbcore
     \class HbPopup
     \brief HbPopup is a base class for different popup notes in Hb library.
@@ -281,6 +284,8 @@
     frameType(HbPopup::Strong),
     preferredPosSet(false),
     mStartEffect(false),
+    mScreenMargin(0.0),
+    mPath(0),
     timeoutTimerInstance(0)
 {
 }
@@ -304,10 +309,22 @@
         backgroundItem = new HbPopupBackGround(q);
         backgroundItem->setVisible(false);
 
-        // Popup is invisible by default (explicit show or exec call is required)
+        // 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
+
 }
 
 /*
@@ -396,25 +413,14 @@
     return timeoutTimerInstance;
 }
 
-void HbPopupPrivate::handleKeyEvent(QKeyEvent *event)
-{
-    Q_Q(HbPopup);
-    event->accept();
-
-    // Any key event dismisses the popup if dismissPolicy includes TapInside flag
-    if (dismissPolicy & HbPopup::TapInside && !q->parentItem()) {
-        q->close();
-    }
-}
-
 //returns true if popup has been added to scene here.
 bool HbPopupPrivate::addPopupToScene()
 {
     Q_Q(HbPopup);
     bool popupAdded(false);
     if (!q->parentItem()) {
-        if (!q->scene() && !HbInstance::instance()->allMainWindows().isEmpty()) {
-            HbInstance::instance()->allMainWindows().at(0)->scene()->addItem(q);
+        if (!q->scene() && !HbInstance::instance()->allMainWindows().isEmpty()) {            
+            HbInstance::instance()->allMainWindows().at(0)->scene()->addItem(q);           
             popupAdded = true;
             if (backgroundItem) {
                 q->scene()->addItem(backgroundItem);
@@ -523,9 +529,41 @@
         // events to be able to prevent last focus item losing its
         // focus
         backgroundItem->setFlag(QGraphicsItem::ItemIsFocusable, modal);
+        backgroundItem->setFlag(QGraphicsItem::ItemIsPanel, modal);
+        if(modal) {
+            backgroundItem->setPanelModality(QGraphicsItem::PanelModal);
+        } else {
+            backgroundItem->setPanelModality(QGraphicsItem::NonModal);
+        }
     }
 }
 
+void HbPopupPrivate::calculateShape()
+{
+    Q_Q(HbPopup);
+    if (mPath)
+        delete mPath;
+    mPath = new QPainterPath();
+#if 1
+    QPixmap image(QSize(static_cast<int>(q->backgroundItem()->boundingRect().width() + 0.5), 
+	                    static_cast<int>(q->backgroundItem()->boundingRect().height() + 0.5)));
+    image.fill(Qt::transparent);
+
+    QPainter imagePainter(&image);
+
+    q->backgroundItem()->paint(&imagePainter, 0, 0);
+
+    imagePainter.end();
+
+    mPath->addRegion(image.mask());
+#else
+    QRectF rect(-0.5, -0.5, q->boundingRect().width() + 0.5, q->boundingRect().height() + 0.5);
+    mPath->addRoundedRect(rect, 12, 12);
+#endif
+
+    mPath->translate(-0.5, -0.5);
+}
+
 /*!
 * Constructs a popup with given  \a parent graphics item.\n
 * Note: popups with \a parent set as 0 are behaving as real popups.
@@ -547,7 +585,7 @@
 {
     Q_D(HbPopup);
     d->q_ptr = this;
-    d->init();
+    d->init();    
 }
 
 
@@ -559,7 +597,7 @@
 {
     Q_D(HbPopup);
     d->q_ptr = this;
-    d->init();
+    d->init();    
 }
 /*!
 * Destroys the popup.
@@ -742,40 +780,28 @@
 void HbPopup::open( QObject *receiver, const char *member )
 {
     Q_D(HbPopup);
-    connect(this, SIGNAL(aboutToClose()), receiver, member);
+    if (receiver) {
+        connect(this, SIGNAL(aboutToClose()), receiver, member);
+    }
     d->receiverToDisconnectOnClose = receiver;
     d->memberToDisconnectOnClose = member;
 
-#if needed
-    // Ungrab the mouse if it is currently grabbed
-        // todo; currently needed menus to work ok, otherwise:
-        // - quick multiple presses on menuitem causes multiple actions (menu relaunch?)
-        // - closing menu with titlepane needs multiple presses (menu relaunch?)
-        // Ungrab was removed when trying to fix problem when button pressed()-signal
-        // was connected to menu launch. Button did not get anymore mouse release event.
-        if (scene()) {
-            QGraphicsItem *item = scene()->mouseGrabberItem();
-            if (item) {
-                item->ungrabMouse();
-            }
-        }
-#endif
     show();
 }
 
 
 /*!
-    \deprecated HbPopup::exec()
-        is deprecated. Please use HbPopup::show() or
-        void HbPopup::open( QObject *receiver, const char *member ) instead.
-*
-* Executes the popup synchronously.
-* Note: when popup is executed syncronously it is always modal.
-* This function is deprecated. use \sa open() or \sa show() instead.
+\deprecated HbPopup::exec()
+       is deprecated. Please use HbPopup::show() or
+ void HbPopup::open( QObject *receiver, const char *member ) instead.
+
+ Executes the popup synchronously.
+ Note: when popup is executed syncronously it is always modal.
+ This function is deprecated. use \sa open() or \sa show() instead.
 */
 void HbPopup::exec()
 {
-    //    Q_ASSERT(false);
+    HB_DEPRECATED("HbPopup::exec is deprecated. Use HbPopup::show() or HbPopup::open() instead!");
     Q_D(HbPopup);
 
     HbMainWindow* w(mainWindow());
@@ -847,7 +873,6 @@
             }
             // Note: when visibility changes to "visible" base class implementation needs
             //       to be called otherwise showEvent() is not called.
-            
         } else {
             d->aboutToShowSignalGuard = false;
             if (!d->hidingInProgress) {
@@ -934,15 +959,6 @@
 /*!
     \reimp
  */
-void HbPopup::keyPressEvent(QKeyEvent *event)
-{
-    Q_D(HbPopup);
-    d->handleKeyEvent(event);
-}
-
-/*!
-    \reimp
- */
 //
 // Shows the popup with an animation and starts the timer to dismiss the popup,
 // unless it is a permanent popup.
@@ -967,20 +983,17 @@
     if (!parentItem()) {
         //check if popup needs to be added to scene.This can result in duplciate show event,
         // if popup is added to scene here.
-           if(d->addPopupToScene())
+        if(d->addPopupToScene()) {
               d->duplicateShowEvent = true;
-
+        }
         // Popup clears closed state
         d->closed = false;
         if (d->backgroundItem) {
             d->backgroundItem->setVisible(true);
             d->backgroundItem->setAcceptHoverEvents(isModal());
-            // Let the background be a panel if the popup is one
-            // However if the popup is not modal we don't want the background
-            // to be a panel. A panel provides contained focus handling
-            if ((flags() & QGraphicsItem::ItemIsPanel) && isModal()) {
+            if (isModal()) {
                 d->backgroundItem->setFlag(QGraphicsItem::ItemIsPanel);
-            }
+             }
         }
         if (qobject_cast<HbGraphicsScene *>(scene())) {
             qobject_cast<HbGraphicsScene *>(scene())->d_ptr->showPopup(this);
@@ -1047,9 +1060,15 @@
     \reimp
  */
 void HbPopup::resizeEvent( QGraphicsSceneResizeEvent * event )
-{
+{    
     HbWidget::resizeEvent(event);
     updatePrimitives();
+#if 1
+    Q_D(HbPopup);
+    if (d->polished) {
+        d->calculateShape();
+    }
+#endif
 }
 
 /*!
@@ -1087,25 +1106,31 @@
  */
 bool HbPopup::event(QEvent *event)
 {
-    /*Q_D(HbPopup);
-    if (event->type() == QEvent::GraphicsSceneResize) {
-        //Workaround when showing first time                   
-        #ifdef HB_EFFECTS
+/*    Q_D(HbPopup);
+    if (event->type() == QEvent::LayoutRequest) {
+        //Workaround when showing first time                           
+#ifdef HB_EFFECTS
         if(d->mStartEffect && boundingRect().isValid()) {
+            d->mStartEffect = false;
+            QCoreApplication::sendPostedEvents(this, QEvent::LayoutRequest);
             QRectF extRect(0.0,
                            -boundingRect().height(),
                            boundingRect().width(),
                            0);
-            HbEffect::start(this, d->effectType, "appear", 0, 0, QVariant(), extRect);
-            d->mStartEffect = false;
+            HbEffect::start(this, d->effectType, "appear", 0, 0, QVariant(), extRect);            
+            qDebug() << "effect start";
         }
-            #endif//HB_EFFECTS        
+#endif//HB_EFFECTS
         //workaround ends
+    }
+    qDebug() << "event: " << event;*/
+    /*Q_D(HbPopup);
+    if (event->type() == QEvent::LayoutDirectionChange) {
+        d->calculateShape();
     }*/
     return HbWidget::event(event);
 }
 
-
 /*!
   Sets preferred position\a position for popup with \a placement
   as origin.
@@ -1125,7 +1150,6 @@
 
 void HbPopup::setPreferredPos( const QPointF& preferredPos,
                                HbPopup::Placement placement )
-
 {
     Q_D(HbPopup);
     bool layoutFlag = false;
@@ -1140,8 +1164,22 @@
     d->preferredPosSet = true;
     //If position updated, informing layoutproxy with layoutrequest
     if (layoutFlag) {
-        QApplication::postEvent(this, new QEvent(QEvent::LayoutRequest));
+        QApplication::sendEvent(this, new QEvent(QEvent::LayoutRequest));
     }
 }
 
+QPainterPath HbPopup::shape() const
+{    
+#if 1
+    Q_D(const HbPopup);    
+    if (backgroundItem() && d->mPath) {
+        return *d->mPath;
+    } else {
+        return HbWidget::shape();
+    }
+#else
+    return HbWidget::shape();
+#endif
+}
+
 #include "moc_hbpopup.cpp"
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gui/hbpopup.h
--- a/src/hbcore/gui/hbpopup.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gui/hbpopup.h	Mon May 03 12:48:33 2010 +0300
@@ -114,6 +114,8 @@
     void setPreferredPos(const QPointF& position,
                           HbPopup::Placement placement = HbPopup::TopLeftCorner);
 
+    QPainterPath shape() const;
+
 public slots:
     void open( QObject *receiver = 0, const char *member = 0);
     void exec();
@@ -130,7 +132,6 @@
 
     void mousePressEvent(QGraphicsSceneMouseEvent *event );
     void mouseReleaseEvent(QGraphicsSceneMouseEvent *event );
-    void keyPressEvent(QKeyEvent *event);
 
     void showEvent(QShowEvent *event);
     void hideEvent(QHideEvent *event);
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gui/hbpopup_p.h
--- a/src/hbcore/gui/hbpopup_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gui/hbpopup_p.h	Mon May 03 12:48:33 2010 +0300
@@ -107,6 +107,7 @@
     bool mStartEffect;
     QPointer<QObject> receiverToDisconnectOnClose;
     QByteArray memberToDisconnectOnClose;
+    qreal mScreenMargin;
 
 public:
 #ifdef HB_EFFECTS
@@ -115,10 +116,10 @@
 #endif // HB_EFFECTS
     void _q_timeoutFinished();
 
-    void handleKeyEvent(QKeyEvent *event);
     bool addPopupToScene();
     void handleBackgroundMousePressEvent();
     void handleBackgroundMouseReleaseEvent(QGraphicsSceneMouseEvent *event);
+    void calculateShape();
 
     static int timeoutValue(HbPopup::DefaultTimeout timeout);
 
@@ -130,6 +131,7 @@
     QTimer *timeoutTimer();
     void doSetModal( bool modal );
     QString effectType;
+    QPainterPath *mPath;
 private:
     static bool popupEffectsLoaded;
     static HbPopupPrivate *d_ptr(HbPopup *popup) {
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gui/hbpopupmanager.cpp
--- a/src/hbcore/gui/hbpopupmanager.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gui/hbpopupmanager.cpp	Mon May 03 12:48:33 2010 +0300
@@ -40,7 +40,7 @@
 #include <QGraphicsSceneMouseEvent>
 #include <QGraphicsLayout>
 #include <QDebug>
-
+#include <QEvent>
 
 HbPopupLayoutSpacer::HbPopupLayoutSpacer( QGraphicsItem *parent )
 : HbWidgetBase( parent )
@@ -101,9 +101,10 @@
         mPreferredPos = ((HbPopupPrivate*)HbPopupPrivate::d_ptr(mPopup))->preferredPos;
         mPlacement = ((HbPopupPrivate*)HbPopupPrivate::d_ptr(mPopup))->placement;
         mPreferredPosSet = ((HbPopupPrivate*)HbPopupPrivate::d_ptr(mPopup))->preferredPosSet;
+        qreal screenMargin = ((HbPopupPrivate*)HbPopupPrivate::d_ptr(mPopup))->mScreenMargin;
         if ( mPreferredPosSet ) { // user set preferred pos, ignore css
-            const qreal pw(parentItem()->boundingRect().width());
-            const qreal ph(parentItem()->boundingRect().height());
+            const qreal pw(parentItem()->boundingRect().width() - screenMargin);
+            const qreal ph(parentItem()->boundingRect().height() - screenMargin);
             const qreal uw(usedSize.width());
             const qreal uh(usedSize.height());
             const qreal x(mPreferredPos.x());
@@ -151,8 +152,8 @@
                 //should not happen
                 break;
             }
-            if ( usedx < 0 ) usedx = 0;
-            if ( usedy < 0 ) usedy = 0;
+            if ( usedx < screenMargin ) usedx = screenMargin;
+            if ( usedy < screenMargin ) usedy = screenMargin;
 
             usedPos = QPointF(usedx, usedy);
         }
@@ -203,7 +204,7 @@
 
 HbPopupLayoutManager::HbPopupLayoutManager( HbPopup *popup, QGraphicsScene *scene ) 
 : HbWidget()
-{
+{        
 #if QT_VERSION >= 0x040600
     setFlag(QGraphicsItem::ItemHasNoContents, true);
 #endif
@@ -227,13 +228,12 @@
         } else {
             HbStyle::setItemName( childItem, "menu" );
         }
-    } else if ( metaObject->className() == QLatin1String("HbToolTipLabel") ) {
-        HbStyle::setItemName( childItem, "" );
     } else if ( metaObject->className() == QLatin1String("HbToolBarExtension" ) ) {
         HbStyle::setItemName( childItem, "toolbar-extension" );
     } else {
-        HbStyle::setItemName( childItem, "popup" );
+        HbStyle::setItemName( childItem, "popup" );        
     }
+    setZValue(popup->zValue() - 1);
     if ( metaObject->className() == QLatin1String("HbVolumeSliderPopup") ) {
         HbStyle::setItemName( childItem, "volumesliderpopup" );
         connect(scene,SIGNAL(sceneRectChanged(QRectF)),this,SLOT(orientationChanged(QRectF)));
@@ -250,7 +250,6 @@
     repolish();
 }
 
-
 /*!
     \reimp
 */
@@ -270,6 +269,7 @@
     if (event && event->type() == QEvent::LayoutDirectionChange) {
         repolish();
     }
+
 }
 
 /*
@@ -410,13 +410,13 @@
         }
 
         if ( !popup->parentItem() ) {
-            if ( popup->metaObject()->className() != QLatin1String("HbToolTipLabel") &&
-                 popup->metaObject()->className() != QLatin1String("HbInputCustomButtonList") &&
+            if ( popup->metaObject()->className() != QLatin1String("HbInputCustomButtonList") &&
                  popup->metaObject()->className() != QLatin1String("HbCharPreviewPane") &&
                  popup->metaObject()->className() != QLatin1String("HbCandidateList") &&
                  popup->metaObject()->className() != QLatin1String("HbExactWordPopup") &&
                  popup->metaObject()->className() != QLatin1String("HbInputSmileyPicker") &&
                  popup->metaObject()->className() != QLatin1String("Hb12KeyCustomKeypad") &&
+				 popup->metaObject()->className() != QLatin1String("HbInputThaiSpecialPopup") &&
                  !popup->inherits("HbInputVkbWidget")) {
                 setGeometryForPopup( popup );
             }
@@ -485,7 +485,7 @@
 
             // Move the focus to the initial focus item if there is no current focus item or
             // the ancestor of the current fucus item is popup
-            if( !scene->focusItem() || popup->isAncestorOf(scene->focusItem())) {
+            if( !scene->focusItem() || popup->hasFocus() || popup->isAncestorOf(scene->focusItem())) {
                 initialFocusedItem->setFocus();
                 initialFocusedItem = 0;
             }
@@ -553,11 +553,12 @@
     parentItem = 0;
     childItem = 0;
     if ( parentItems.contains( popup ) ) {
-        parentItem = parentItems[popup];
+        parentItem = parentItems[popup];        
     } else {
         parentItem = new HbPopupLayoutManager( popup, scene );
         parentItems.insert( popup, parentItem );
-    }
+    }    
+
     childItem = static_cast<HbPopupLayoutProxy*>(parentItem->childItems().at(0));
     childItem->setSizePolicy( popup->sizePolicy() );
 }
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gui/hbpopupmanager_p_p.h
--- a/src/hbcore/gui/hbpopupmanager_p_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gui/hbpopupmanager_p_p.h	Mon May 03 12:48:33 2010 +0300
@@ -128,6 +128,7 @@
     virtual ~HbPopupLayoutManager() {}
 public slots:
       void  orientationChanged(const QRectF& rect);
+
 protected:
     QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const;
     void changeEvent(QEvent *event);
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gui/hbscrollarea.cpp
--- a/src/hbcore/gui/hbscrollarea.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gui/hbscrollarea.cpp	Mon May 03 12:48:33 2010 +0300
@@ -27,13 +27,17 @@
 #include "hbscrollarea_p.h"
 #include "hbscrollbar.h"
 #include "hbdeviceprofile.h"
+#include "hbinstance.h"
 #include <hbwidgetfeedback.h>
 #include <hbevent.h>
+#include "hbglobal_p.h"
+
+#include <QGesture>
 
 #include <QDebug>
 
 /*!
- *  @stable
+ *  @beta
  *  @hbcore
  *  \class HbScrollArea
  *  \brief HbScrollArea provides a finger-touch enabled scrollable container class.  
@@ -125,12 +129,6 @@
 */
 
 /*!
-    \fn void HbScrollArea::gestureSceneFilterChanged(HbGestureSceneFilter* newFilter)
-
-    This signal is emitted when gesture filters are changed.
-*/
-
-/*!
     \fn void HbScrollArea::scrollingStarted()
 
     This signal is emitted whenever a scrolling action begins.
@@ -251,6 +249,10 @@
  */
 HbScrollArea::~HbScrollArea()
 {
+    Q_D( HbScrollArea );
+    if (d && d->mContents) {
+        d->mContents->setParentLayoutItem(0);
+    }
 }
 
 /*!
@@ -282,14 +284,17 @@
     d->stopAnimating();
 
     if (0 != d->mContents) {
+        d->mContents->setParentLayoutItem(0);
         delete d->mContents;
     }
     d->mContents = contents;
     updateGeometry();
 
     if (0 != contents) {
+        contents->setParentLayoutItem(this);
         contents->setParentItem(this);
         contents->installEventFilter(this);
+        d->mResetAlignment = true;
         d->adjustContent();
         setContinuationIndicators(d->mContinuationIndicators);
     } else {
@@ -314,6 +319,7 @@
 
     // Reset the ownership
     if (content) {
+        content->setParentLayoutItem(0);
         content->setParentItem(0);
         content->removeEventFilter(this);
     }
@@ -370,30 +376,29 @@
 }
 
 /*!
- * Sets the scrollingStyle property that controls how the style of scrolling interaction
- * provided by the widget
- *
- * Possible values for the clamping style include:
- *
- *		Pan - dragging motion pans the view with no follow-on scrolling animation
- *		PanOrFlick - dragging motion pans the view with no follow-on scrolling animation, quick flicking motion triggers scrolling animation
- *		PanWithFollowOn - dragging motion pans the view, velocity at end of drag motion triggers follow-on animated scrolling
- *
- * The default value is PanWithFollowOn.
- *
- * \sa HbScrollArea::scrollingStyle()
+  Sets the scrollingStyle property that controls how the style of scrolling interaction
+  provided by the widget
+ 
+  Possible values for the clamping style include:
+ 
+ 		Pan - dragging motion pans the view with no follow-on scrolling animation
+ \deprecated PanOrFlick
+                    is deprecated.
+ 		PanWithFollowOn - dragging motion pans the view, velocity at end of drag motion triggers follow-on animated scrolling
+ 
+  The default value is PanWithFollowOn.
+ 
+  \sa HbScrollArea::scrollingStyle()
  */
 void HbScrollArea::setScrollingStyle(ScrollingStyle value)
 {
     Q_D( HbScrollArea );
 
-    bool isChanged = (d->mScrollingStyle != value);
-
-    d->mScrollingStyle = value;
-
-    if (isChanged) {
-        d->updateGestures();
-        emit gestureSceneFilterChanged( d->mGestureFilter );
+    if (value == HbScrollArea::PanOrFlick) {
+        d->mScrollingStyle = HbScrollArea::PanWithFollowOn;
+        HB_DEPRECATED("HbScrollArea::PanOrFlick is deprecated");
+    } else {
+        d->mScrollingStyle = value;
     }
 }
 
@@ -428,11 +433,7 @@
     d->mScrollDirections = value;
 
     if (isChanged) {
-        d->updateGestures();
-
         emit scrollDirectionsChanged( value );
-
-        emit gestureSceneFilterChanged( d->mGestureFilter );
     }
 }
 
@@ -462,38 +463,35 @@
 }
 
 /*!
- * Returns true if the scroll area handles
- * long press gestures, false otherwise
- *
- * \sa HbScrollArea::setHandleLongPress()
+  Returns true if the scroll area handles
+  long press gestures, false otherwise
+ 
+  \deprecated HbScrollArea::longPressEnabled()
+      is deprecated.
+ 
+  \sa HbScrollArea::setHandleLongPress()
  */
 bool HbScrollArea::longPressEnabled() const
 {
-    Q_D( const HbScrollArea );
-
-    return d->mHandleLongPress;
+    HB_DEPRECATED("HbScrollArea::longPressEnabled() is deprecated");    
+    return false;
 }
 
 /*!
- * Sets the value of the handleLongPress property.  This value is set
- * to true if the widget is to respond to long press gestures, false otherwise.
- *
- * The default value is false.
- *
- * \sa HbScrollArea::handleLongPress()
+  Sets the value of the handleLongPress property.  This value is set
+  to true if the widget is to respond to long press gestures, false otherwise.
+ 
+  The default value is false.
+ 
+  \deprecated HbScrollArea::setLongPressEnabled(bool)
+        is deprecated.
+ 
+  \sa HbScrollArea::handleLongPress()
  */
 void HbScrollArea::setLongPressEnabled (bool value)
 {
-    Q_D( HbScrollArea );
-
-    bool isChanged = (d->mHandleLongPress != value);
-
-    d->mHandleLongPress = value;
-
-    if (isChanged) {
-        d->updateGestures();
-        emit gestureSceneFilterChanged( d->mGestureFilter );
-    }
+    HB_DEPRECATED("HbScrollArea::setLongPressEnabled(bool) is deprecated");
+    Q_UNUSED(value);
 }
 
 /*
@@ -503,12 +501,7 @@
 {
     Q_D( HbScrollArea );
 
-    // ??? need to support other changes ???
-    if ( change == QGraphicsItem::ItemSceneHasChanged ) {
-        d->updateGestures();
-
-        emit gestureSceneFilterChanged( d->mGestureFilter );
-    } else if (change == QGraphicsItem::ItemVisibleHasChanged && d->mContents) {
+    if (change == QGraphicsItem::ItemVisibleHasChanged && d->mContents) {
         if (value.toBool() == true)
             d->adjustContent();
         else
@@ -519,145 +512,119 @@
 }
 
 /*! @beta
- * upGesture() is a virtual slot function that is called whenever an
- * up flick gesture is detected, if the scrollDirection is set to
- * enable vertical scrolling.
- *
- * Derived classes can override this method to add custom handling of
- * the gesture.  In most cases, derived classes should call up to the
- * HbScrollArea parent method.
- *
+  upGesture() is a virtual slot function that is called whenever an
+  up flick gesture is detected, if the scrollDirection is set to
+  enable vertical scrolling.
+ 
+  Derived classes can override this method to add custom handling of
+  the gesture.  In most cases, derived classes should call up to the
+  HbScrollArea parent method.
+ 
+  \deprecated HbScrollArea::upGesture(int)
+        is deprecated.
  */
 void HbScrollArea::upGesture(int speedPixelsPerSecond)
 {
-    Q_D( HbScrollArea );
+    HB_DEPRECATED("HbScrollArea::upGesture(int) is deprecated. Use gesture FW.");
 
-    // convert the speedPixelsPerSecond to pixels per msec
-    QPointF speed;
-    speed.setX(0.0f);
-    speed.setY(-speedPixelsPerSecond * d->mSpeedFactor);
-    d->animateScroll(speed);
+    Q_UNUSED(speedPixelsPerSecond);
 }
 
 /*! @beta
- * downGesture() is a virtual slot function that is called whenever an
- * down flick gesture is detected, if the scrollDirection is set to
- * enable vertical scrolling. 
- *
- * Derived classes can override this method to add custom handling of
- * the gesture.  In most cases, derived classes should call up to the
- * HbScrollArea parent method.
+  downGesture() is a virtual slot function that is called whenever an
+  down flick gesture is detected, if the scrollDirection is set to
+  enable vertical scrolling. 
+ 
+  Derived classes can override this method to add custom handling of
+  the gesture.  In most cases, derived classes should call up to the
+  HbScrollArea parent method.
+ 
+  \deprecated HbScrollArea::downGesture(int)
+        is deprecated.
  */
 void HbScrollArea::downGesture(int speedPixelsPerSecond)
 {
-    Q_D( HbScrollArea );
-
-    // convert the speedPixelsPerSecond to pixels per msec
-    QPointF speed;
-    speed.setX(0.0f);
-    speed.setY(speedPixelsPerSecond * d->mSpeedFactor);
-    d->animateScroll(speed);
+    HB_DEPRECATED("HbScrollArea::downGesture(int) is deprecated. Use gesture FW.");
+    Q_UNUSED(speedPixelsPerSecond);
 }
 
 /*! @beta
- * leftGesture() is a virtual slot function that is called whenever an
- * left flick gesture is detected, if the scrollDirection is set to
- * enable horizontal scrolling.
- *
- * Derived classes can override this method to add custom handling of
- * the gesture.  In most cases, derived classes should call up to the
- * HbScrollArea parent method.
+  leftGesture() is a virtual slot function that is called whenever an
+  left flick gesture is detected, if the scrollDirection is set to
+  enable horizontal scrolling.
+ 
+  Derived classes can override this method to add custom handling of
+  the gesture.  In most cases, derived classes should call up to the
+  HbScrollArea parent method.
+ 
+  \deprecated HbScrollArea::leftGesture(int)
+            is deprecated.
  */
 void HbScrollArea::leftGesture(int speedPixelsPerSecond)
 {
-    Q_D( HbScrollArea );
-    
-    // convert the speedPixelsPerSecond to pixels per msec
-    QPointF speed;
-    speed.setX(-speedPixelsPerSecond * d->mSpeedFactor);
-    speed.setY(0.0f);
-    d->animateScroll(speed);
+    HB_DEPRECATED("HbScrollArea::leftGesture(int) is deprecated. Use gesture FW.");
+    Q_UNUSED(speedPixelsPerSecond);
 }
 
 /*! @beta
- * rightGesture() is a virtual slot function that is called whenever an
- * right flick gesture is detected, if the scrollDirection is set to
- * enable horizontal scrolling.
- *
- * Derived classes can override this method to add custom handling of
- * the gesture.  In most cases, derived classes should call up to the
- * HbScrollArea parent method.
+  rightGesture() is a virtual slot function that is called whenever an
+  right flick gesture is detected, if the scrollDirection is set to
+  enable horizontal scrolling.
+ 
+  Derived classes can override this method to add custom handling of
+  the gesture.  In most cases, derived classes should call up to the
+  HbScrollArea parent method.
+ 
+  \deprecated HbScrollArea::rightGesture(int)
+        is deprecated.
  */
 void HbScrollArea::rightGesture(int speedPixelsPerSecond)
 {
-    Q_D( HbScrollArea );
-    
-    // convert the speedPixelsPerSecond to pixels per msec
-    QPointF speed;
-    speed.setX(speedPixelsPerSecond * d->mSpeedFactor);
-    speed.setY(0.0f);
-    d->animateScroll(speed);
+    HB_DEPRECATED("HbScrollArea::rightGesture(int) is deprecated. Use gesture FW.");
+    Q_UNUSED(speedPixelsPerSecond);
+}
+
+
+/*!
+  panGesture() is a virtual slot function that is called whenever an
+  pan gesture is detected.
+ 
+  Derived classes can override this method to add custom handling of
+  the gesture.  In most cases, derived classes should call up to the
+  HbScrollArea parent method.
+ 
+  \deprecated HbScrollArea::panGesture(const QPointF&)
+   is deprecated.
+ */
+void HbScrollArea::panGesture(const QPointF &delta)
+{
+    HB_DEPRECATED("HbScrollArea::panGesture(const QPointF &) is deprecated. Use gesture FW.");
+    Q_UNUSED(delta);
 }
 
 /*!  @beta
- * panGesture() is a virtual slot function that is called whenever an
- * pan gesture is detected.
- *
- * Derived classes can override this method to add custom handling of
- * the gesture.  In most cases, derived classes should call up to the
- * HbScrollArea parent method.
+  longPressGesture() is a virtual slot function that is called whenever an
+  long press gesture is detected, if the handleLongPress property is set to true.
+ 
+  Derived classes can override this method to add custom handling of
+  the gesture.  By default, HbScrollArea does not respond to a long press.
+ 
+  \deprecated HbScrollArea::longPressGesture(const QPointF&)
+   is deprecated.
+ 
+  \sa setHandleLongPress(), handleLongPress()
  */
-void HbScrollArea::panGesture(const QPointF &delta)
+void HbScrollArea::longPressGesture(const QPointF &)
 {
-    Q_D( HbScrollArea );
-    if ( d->mIsAnimating ) {
-        d->stopAnimating();
-    }
-    if (scrollingStyle() == HbScrollArea::PanWithFollowOn) {
-        d->addPositionToQueue(-delta, d->mDragElapsedTime.elapsed(), true);
-    }
-    if (d->mAbleToScrollY || d->mAbleToScrollX) {
-        // initiate scroll feedback
-        HbWidgetFeedback::continuousTriggered(this, Hb::ContinuousScrolled, delta);
-        d->mScrollFeedbackOngoing = true;
-    }
-    scrollByAmount(-delta);
-}
-
-/*!  @beta
- * longPressGesture() is a virtual slot function that is called whenever an
- * long press gesture is detected, if the handleLongPress property is set to true.
- *
- * Derived classes can override this method to add custom handling of
- * the gesture.  By default, HbScrollArea does not respond to a long press.
- *
- * \sa setHandleLongPress(), handleLongPress()
- */
-void HbScrollArea::longPressGesture(const QPointF &/* point */)
-{
-    //	qDebug() << "GOT LONG PRESS GESTURE" << point;
+    HB_DEPRECATED("HbScrollArea::longPressGesture(const QPointF &) is deprecated. Use gesture FW.");
 }
 
 /*
     \reimp
- */
+*/
 void HbScrollArea::mousePressEvent(QGraphicsSceneMouseEvent *event)
 {
-    Q_D( HbScrollArea );
-    if (d->mContents) {
-        d->mousePressEvent( event );
-    }
-}
-
-/*
-    \reimp
- */
-void HbScrollArea::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
-{    
-    Q_D( HbScrollArea );
-    if (d->mContents) {
-        d->mouseReleaseEvent ( event );
-    }
+    Q_UNUSED (event);
 }
 
 /*!
@@ -694,21 +661,7 @@
 
     return d->scrollByAmount(delta);
 }
-
-#if 0
-
-bool HbScrollArea::sceneEvent(QEvent *event)
-{
-    Q_D( HbScrollArea );
-    bool eventAccepted(false);
-    eventAccepted = d->sceneEvent(event);
-    if(!eventAccepted);
-        eventAccepted = HbWidget::sceneEvent(event);
-    return eventAccepted;
-}
-
-#endif // HB_NEW_GESTURE_FW
-
+ 
 /*!
    \reimp
  */
@@ -723,13 +676,63 @@
              d->changeLayoutDirection(layoutDirection());
         } else if (event->type() == QEvent::GraphicsSceneResize) {
             if (isVisible() && d->mContents) {
-                d->orientationChanged();
+                if ( d->mIsAnimating ) {
+                    d->stopAnimating();
+                }
+                d->adjustContent();
             }
         }  else if (event->type() == HbEvent::ChildFocusOut) {
             //qDebug() << "focusout";
             if ( !d->positionOutOfBounds() ) {
                 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;
+            }
+        } else if (event->type() == QEvent::LayoutRequest) {
+            if (d->mContents) {
+                if (preferredSize() != d->mContents->preferredSize()) {
+                    updateGeometry();
+                }
+
+                QSizeF newSize = d->mContents->size();
+                QSizePolicy contentPolicy = d->mContents->sizePolicy();
+
+                if (d->mScrollDirections & Qt::Vertical) {
+                    if (contentPolicy.verticalPolicy() != QSizePolicy::Ignored) {
+                        newSize.setHeight(d->mContents->preferredHeight());
+                    }
+                } else {
+                    newSize.setHeight(size().height());
+                }
+
+                if (d->mScrollDirections & Qt::Horizontal) {
+                    if (contentPolicy.horizontalPolicy() != QSizePolicy::Ignored) {
+                        newSize.setWidth(d->mContents->preferredWidth());
+                    }
+                } else {
+                    newSize.setWidth(size().width());
+                }
+
+                d->mContents->resize(newSize);
+            }
+        } else if (event->type() == QEvent::GraphicsSceneResize) {
+            if (d->mContents) {
+                QSizeF newSize = d->mContents->size();
+
+                if (!(d->mScrollDirections & Qt::Vertical)) {
+                    newSize.setHeight(size().height());
+                }
+
+                if (!(d->mScrollDirections & Qt::Horizontal)) {
+                    newSize.setWidth(size().width());
+                }
+
+                d->mContents->resize(newSize);
+            }
         }
     }
   return value;
@@ -795,6 +798,33 @@
 
 }
 
+#ifdef HB_GESTURE_FW
+void HbScrollArea::gestureEvent(QGestureEvent *event)
+{    
+    Q_D ( HbScrollArea );
+    if(QTapGesture *gesture = static_cast<QTapGesture *>(event->gesture(Qt::TapGesture))) {        
+        // Stop scrolling on tap
+        if (gesture->state() == Qt::GestureStarted) {
+            if (d->mIsAnimating && !d->positionOutOfBounds() && !d->mMultiFlickEnabled) {
+                d->stopAnimating();
+                event->accept(gesture);
+            } else {
+                event->ignore(gesture);
+            }
+        }
+    }
+    if (QPanGesture *panGesture = qobject_cast<QPanGesture*>(event->gesture(Qt::PanGesture))) {
+        if (!d->pan(panGesture)) {
+            event->ignore(panGesture);
+        } else {
+            event->accept(panGesture);
+            setFocus(Qt::MouseFocusReason);
+        }
+    }
+}
+
+#endif
+
 /*!
     Returns the scrollbar policy for vertical scrollbar
 
@@ -921,6 +951,7 @@
 {
     Q_D(HbScrollArea);
     d->mAlignment = alignment;
+    d->mResetAlignment = true;
     if (d->mContents)
         d->adjustContent();
 }
@@ -1005,11 +1036,8 @@
         d->startTargetAnimation (newPosition, qMax (0, time));
     } else {
         scrollByAmount(newPosition - (-d->mContents->pos()));
-        if (d->positionOutOfBounds() && d->mClampingStyle == BounceBackClamping) {
-            d->startAnimating();
-        } else {
-            d->stopScrolling();
-        }
+        d->stopScrolling();
+
     }
 }
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gui/hbscrollarea.h
--- a/src/hbcore/gui/hbscrollarea.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gui/hbscrollarea.h	Mon May 03 12:48:33 2010 +0300
@@ -32,6 +32,10 @@
 class HbGestureSceneFilter;
 class HbScrollBar;
 
+#ifdef HB_GESTURE_FW
+class QPanGesture;
+#endif
+
 
 class HB_CORE_EXPORT HbScrollArea : public HbWidget
 {
@@ -116,9 +120,8 @@
     void scrollContentsTo (const QPointF &newPosition, int time = 0);
 
 protected:
-    HbScrollArea(HbScrollAreaPrivate &dd, QGraphicsItem *parent);
+    HbScrollArea(HbScrollAreaPrivate &dd, QGraphicsItem *parent);    
     virtual void mousePressEvent(QGraphicsSceneMouseEvent *event);
-    virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
     virtual QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const;
     virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value);
     virtual bool event(QEvent *event);
@@ -126,12 +129,14 @@
     virtual bool scrollByAmount(const QPointF &delta);
     virtual void polish(HbStyleParameters &params);
     virtual bool eventFilter(QObject *obj, QEvent *event);
+#ifdef HB_GESTURE_FW
+    virtual void gestureEvent(QGestureEvent *event);    
+#endif
 
 signals:
     void scrollingStarted();
     void scrollingEnded();
     void scrollDirectionsChanged(Qt::Orientations newValue);
-    void gestureSceneFilterChanged(HbGestureSceneFilter *newFilter);
     void scrollPositionChanged(const QPointF &newPosition);
 
 protected slots:
@@ -148,8 +153,8 @@
     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())
+    Q_PRIVATE_SLOT(d_func(), void _q_thumbReleased())
 };
 
 #endif // HBSCROLLAREA_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gui/hbscrollarea_p.cpp
--- a/src/hbcore/gui/hbscrollarea_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gui/hbscrollarea_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -26,37 +26,27 @@
 #include "hbscrollarea_p.h"
 #include "hbscrollarea.h"
 #include "hbstyleoption.h"
+#include "hbinstance.h"
+#include "hbpangesture.h"
 #include <hbscrollbar_p.h>
 
 #include <hbgesture.h>
-#include <hbgesturefilter.h>
 #include <hbscrollbar.h>
 #include <hbwidgetfeedback.h>
 
 #include <QGraphicsSceneMouseEvent>
 #include <qmath.h>
 #include <QVariantAnimation>
+#include <QGesture>
 
 #include <QDebug>
 
-#if 0
-
-#include <QGraphicsSceneMouseEvent>
-#include <QApplication>
-#include <math.h>
-
-#endif // HB_NEW_GESTURE_FW
-
 // These constants control parameters of the inertia and bounce back animations and
 // have been selected heuristically to produce good results.  They
 // likely do not need to be controlled programatically, so they are just defined
 // here.
 namespace
 {
-static const int FLICKMINDISTANCE = 50;
-/*  PANMINDISTANCE is also the threshold for longpress.
- Value of 50pixels roughly translates to 5mm/5mm area on 3.2inch nHD screen. */
-static const int PANMINDISTANCE = 40;
 
 // Factor that is used to convert flick to pixels per ms
 static const qreal SCROLLSPEED_FACTOR = 0.0004;
@@ -86,8 +76,7 @@
 HbScrollAreaPrivate::HbScrollAreaPrivate() :
         mScrollFeedbackOngoing(false),
         mBoundaryReached(false),
-        mContents(0), mScrollDirections(Qt::Vertical),
-        mGestureFilter(0),
+        mContents(0), mScrollDirections(Qt::Vertical),        
         mHorizontalScrollBar(0),
         mVerticalScrollBar(0),
         mVerticalScrollBarPolicy(HbScrollArea::ScrollBarAutoHide),
@@ -108,10 +97,9 @@
         mAnimationShape (0),
         mScrollBarHideTimer(0),
         mFrictionEnabled(true),
+        mResetAlignment(true),
         mClampingStyle(HbScrollArea::BounceBackClamping),
-        mScrollingStyle(HbScrollArea::PanOrFlick),
-        mHandleLongPress(false),
-        mOrientationChanged(false),
+        mScrollingStyle(HbScrollArea::PanWithFollowOn),
         mEventPositionQueueSize(10),
         mEventPositionQueueLastIndex(0),
         mEventPositionQueueIsFull(false),
@@ -135,16 +123,7 @@
 }
 
 HbScrollAreaPrivate::~HbScrollAreaPrivate()
-{
-    Q_Q( HbScrollArea );
-
-    if (mGestureFilter) {
-        q->removeSceneEventFilter(mGestureFilter);
-
-        delete mGestureFilter;
-
-        mGestureFilter = 0;
-    }
+{    
 }
 
 void HbScrollAreaPrivate::init()
@@ -178,19 +157,20 @@
 void HbScrollAreaPrivate::doLazyInit()
 {
     Q_Q( HbScrollArea );
-    updateGestures();
     QObject::connect(mVerticalScrollBar, SIGNAL(valueChanged(qreal, Qt::Orientation)), q, SLOT(_q_thumbPositionChanged(qreal, Qt::Orientation)));
     QObject::connect(mVerticalScrollBar, SIGNAL(valueChangeRequested(qreal, Qt::Orientation)), q, SLOT(_q_groovePressed(qreal, Qt::Orientation)));
+    QObject::connect(&HbScrollBarPrivate::d_ptr(mVerticalScrollBar)->core, SIGNAL(handlePressed()), q, SLOT(_q_thumbPressed()));
+    QObject::connect(&HbScrollBarPrivate::d_ptr(mVerticalScrollBar)->core, SIGNAL(handleReleased()), q, SLOT(_q_thumbReleased()));
+    QObject::connect(&HbScrollBarPrivate::d_ptr(mHorizontalScrollBar)->core, SIGNAL(handlePressed()), q, SLOT(_q_thumbPressed()));
+    QObject::connect(&HbScrollBarPrivate::d_ptr(mHorizontalScrollBar)->core, SIGNAL(handleReleased()), q, SLOT(_q_thumbReleased()));
     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)));
-#if 0
-    QApplication::setAttribute(Qt::AA_EnableGestures);
-    grabGesture(Qt::PanGesture);
-    mFlickTimer = new QTime();
-    mPanDirection = Qt::NoDirection;
-#endif // HB_NEW_GESTURE_FW
+
     QObject::connect(&(mScrollTimer), SIGNAL(timeout()), q, SLOT(_q_animateScrollTimeout()));
     QObject::connect(&(mScrollBarHideTimer), SIGNAL(timeout()), q, SLOT(_q_hideScrollBars()));
+
+    q->grabGesture(Qt::PanGesture, Qt::ReceivePartialGestures);
+    q->grabGesture(Qt::TapGesture);
 }
 
 void HbScrollAreaPrivate::replaceScrollBar(Qt::Orientation orientation, HbScrollBar *scrollBar)
@@ -219,69 +199,14 @@
 void HbScrollAreaPrivate::changeLayoutDirection(
         Qt::LayoutDirection aNewDirection)
 {
+    Q_Q(HbScrollArea);
     mLayoutDirection = aNewDirection;
-}
-
-void HbScrollAreaPrivate::updateGestures()
-{
-    Q_Q( HbScrollArea );
-
-    // Gestures are scene events, if we don't have the scene, no need to take action
-    if (q->scene() == 0) {
-        return;
-    }
-
-    if (mGestureFilter != 0) {
-        q->removeSceneEventFilter(mGestureFilter);
-
-        // ??? need to delete the filter ???
-        delete mGestureFilter;
-
-        mGestureFilter = 0;
+    Qt::Alignment currentAlignment = mAlignment;
+    if ((mAlignment & Qt::AlignLeft) | (mAlignment & Qt::AlignRight)) {
+        currentAlignment ^= Qt::AlignLeft;
+        currentAlignment ^= Qt::AlignRight;        
     }
-
-    mGestureFilter = new HbGestureSceneFilter(Qt::LeftButton, q);
-
-    HbGesture* gesture = 0;
-
-    // add flick gestures only for PanOrFlick scrolling style
-    if (mScrollingStyle == HbScrollArea::PanOrFlick) {
-        if (mScrollDirections & Qt::Vertical) {
-            gesture = new HbGesture(HbGesture::up, FLICKMINDISTANCE);
-            mGestureFilter->addGesture(gesture);
-            QObject::connect(gesture, SIGNAL(triggered(int)), q, SLOT(upGesture(int)));
-
-            gesture = new HbGesture(HbGesture::down, FLICKMINDISTANCE);
-            mGestureFilter->addGesture(gesture);
-            QObject::connect(gesture, SIGNAL(triggered(int)), q, SLOT(downGesture(int)));
-        }
-
-        if (mScrollDirections & Qt::Horizontal) {
-            gesture = new HbGesture(HbGesture::left, FLICKMINDISTANCE);
-            mGestureFilter->addGesture(gesture);
-            QObject::connect(gesture, SIGNAL(triggered(int)), q, SLOT(leftGesture(int)));
-
-            gesture = new HbGesture(HbGesture::right, FLICKMINDISTANCE);
-            mGestureFilter->addGesture(gesture);
-            QObject::connect(gesture, SIGNAL(triggered(int)), q, SLOT(rightGesture(int)));
-        }
-    }
-
-    gesture = new HbGesture(HbGesture::pan, PANMINDISTANCE);
-    mGestureFilter->addGesture(gesture);
-    QObject::connect(gesture, SIGNAL(panned(QPointF)), q, SLOT(panGesture(QPointF)));
-
-    if (mHandleLongPress) {
-        gesture = new HbGesture(HbGesture::longpress, 0);
-        mGestureFilter->addGesture(gesture);
-        QObject::connect(gesture, SIGNAL(longPress(QPointF)), q, SLOT(longPressGesture(QPointF)));
-        mGestureFilter->setLongpressAnimation(true);
-    }
-
-#if 1
-    q->installSceneEventFilter(mGestureFilter);
-#endif //HB_NEW_GESTURE_FW
-
+    q->setAlignment(currentAlignment);
 }
 
 bool HbScrollAreaPrivate::scrollByAmount(const QPointF& delta)
@@ -297,10 +222,6 @@
     qreal newXPosition;
     qreal newYPosition;
 
-#if 0
-    mAbleToScrollY = true;
-#endif //HB_NEW_GESTURE_FW
-
     bool scrollingHitBoundary(false);
     if (mAbleToScrollX) {
         newXPosition = currentPosition.x() + delta.x();
@@ -348,9 +269,10 @@
                 HbWidgetFeedback::triggered(q, Hb::InstantBoundaryReached);
             }
         }
+    } else {
+        mBoundaryReached = false;
     }
 
-    setContentPosition(-newPosition);
 
     if (!mIsScrolling) {
         mIsScrolling = true;
@@ -364,6 +286,9 @@
             displayScrollBar(Qt::Vertical);
         }
     }  
+
+    setContentPosition(-newPosition);
+
     if (mAbleToScrollX && mHorizontalScrollBar->isVisible()) {
         updateScrollBar(Qt::Horizontal);
     }
@@ -644,152 +569,56 @@
 
 }
 
-void HbScrollAreaPrivate::mousePressEvent(QGraphicsSceneMouseEvent *event)
-{
 
-    if (mIsAnimating && !positionOutOfBounds() && !mMultiFlickEnabled) {
-        stopAnimating();
-        stopScrolling();
-    }
-
-    if (mScrollingStyle == HbScrollArea::PanWithFollowOn) {
-        mDragElapsedTime.restart();
-        mEventPositionQueueLastIndex = 0;
-        mEventPositionQueueIsFull = false;
-        addPositionToQueue(event->pos(), 0, false);
-    }
-    event->accept();
-}
-
-const int VELOCITY_SAMPLE_PERIOD=250;
-void HbScrollAreaPrivate::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
+/*!
+ * Pans the scroll area
+ */
+bool HbScrollAreaPrivate::pan(QPanGesture* panGesture)
 {
     Q_Q ( HbScrollArea );
 
-    bool hasFollowOn = false;
-    int  currIndex = 0;
+    HbPanGesture *hbPanGesture = qobject_cast<HbPanGesture *>(panGesture);
 
-    // Q: Could there be following classes, which takes some responsibilities
-    // away from the HbScrollArea/HbScrollAreaPrivate. Such as:
-    // A) A circular buffer class
-    // B) A average time keeper class, where one can change the VELOCITY_SAMPLE_PERIOD and/or
-    // the method to calculate the average time.
-    // Time keeper class would use the circular buffer object.
-    // Then, HbScrollArea/HbScrollAreaPrivate would hand the position/time of the events over to
-    // the Time keeper and ask the average in the end.
-    if ( mScrollingStyle == HbScrollArea::PanWithFollowOn ) {
-        // queue the release position
-        addPositionToQueue(event->pos(), mDragElapsedTime.elapsed(), false);
+    if (hbPanGesture) {
+        if(hbPanGesture->state() == Qt::GestureUpdated) {
 
-        // there has to be at least one value in the queue since we just added one
+            if (mIsAnimating) stopAnimating();
 
-        /* UNCOMMENT TO PRINT QUEUE VALUES */
-        /*
-                currIndex = d->mEventPositionQueueFirstIndex;
-                int ii = 0;
-                do {
-                        qDebug() << "POSITION QUEUE" << ii++ << d->mEventPositionQueue[currIndex] << " TIME " << d->mEventTimeQueue[currIndex];
-                        currIndex = (currIndex + 1) % d->mEventPositionQueueSize;
-                } while (currIndex != d->mEventPositionQueueLastIndex);
-                */
+            QPointF delta(hbPanGesture->sceneDelta());
 
-        // go through the data and compute the average speed in pixels per second over the
-        // last VELOCITY_SAMPLE_PERIOD ms
-        int lastIndex = (mEventPositionQueueLastIndex + mEventPositionQueueSize - 1) % mEventPositionQueueSize;
-        qreal lastTime = mEventTimeQueue[lastIndex];
-        QPointF lastPoint = mEventPositionQueue[lastIndex];
-
-        qreal startAvgTime(lastTime);
-        QPointF startAvgPoint(lastPoint);
-
-        if (mEventPositionQueueIsFull) {
-            // go backward through the queue to average the velocity over the last N milliseconds
-            currIndex = (lastIndex + mEventPositionQueueSize - 1) % mEventPositionQueueSize;
-            while (currIndex != lastIndex) {
-                if ((lastTime - mEventTimeQueue[currIndex]) > VELOCITY_SAMPLE_PERIOD)
-                    break;
+            // Panning against the bounceback spring
+            if (mClampingStyle == HbScrollArea::BounceBackClamping) {
+                if (-mContents->pos().y() < topBoundary() && delta.y() > 0.0f) {
+                    delta.setY(delta.y() / 2);
+                } else if (-mContents->pos().y() > bottomBoundary() && delta.y() < 0.0f) {
+                    delta.setY(delta.y() / 2);
+                }
+                if (-mContents->pos().x() < leftBoundary() && delta.x() > 0.0f) {
+                    delta.setX(delta.x() / 2);
+                } else if (-mContents->pos().x() > rightBoundary() && delta.x() < 0.0f) {
+                    delta.setX(delta.x() / 2);
+                }
+            }
+            QPointF oldPos = mContents->pos();
+            q->scrollByAmount(-delta);
+            if (mContents->pos() == oldPos) {
+                return false;
+            }
 
-                startAvgTime = mEventTimeQueue[currIndex];
-                startAvgPoint = mEventPositionQueue[currIndex];
+        } else if (panGesture->state() == Qt::GestureFinished) {
+            if ((!mAbleToScrollX && !mAbleToScrollY) || mBoundaryReached)
+                return false;
 
-                currIndex = (currIndex + mEventPositionQueueSize - 1) % mEventPositionQueueSize;
-            }
-        } else {
-            currIndex = (lastIndex - 1);
-            while (currIndex >= 0) {
-                if ((lastTime - mEventTimeQueue[currIndex]) > VELOCITY_SAMPLE_PERIOD)
-                    break;
-
-                startAvgTime = mEventTimeQueue[currIndex];
-                startAvgPoint = mEventPositionQueue[currIndex];
-
-                currIndex -= 1;
+            if (mScrollingStyle == HbScrollArea::PanWithFollowOn && hbPanGesture) {
+                animateScroll(hbPanGesture->sceneVelocity());
+            } else if (mScrollingStyle == HbScrollArea::Pan && positionOutOfBounds()) {
+                animateScroll(QPointF(0,0));
+            } else {
+                stopAnimating();
             }
         }
-
-        //		qDebug() << "TIME DIFF" << (lastTime - startAvgTime) << "POS DIFF" << (lastPoint - startAvgPoint);
-
-        // ??? need to handle both directions at once
-        qreal timeDiff(lastTime - startAvgTime);
-        QPointF posDiff(lastPoint - startAvgPoint);
-
-        if (timeDiff > 0.0) {
-            QPointF speed = posDiff / timeDiff;
-
-            if (!mScrollDirections.testFlag(Qt::Horizontal)) {
-                speed.setX(0.0f);
-            }
-
-            if (!mScrollDirections.testFlag(Qt::Vertical)) {
-                speed.setY(0.0f);
-            }
-
-            QRectF contentRect = mContents->boundingRect();
-            if (contentRect.width() < q->size().width()) {
-                speed.setX(0.0);
-            }
-
-            if (contentRect.height() < q->size().height()) {
-                speed.setY(0.0);
-            }
-
-            if (!qIsNull(speed.x()) || !qIsNull(speed.y())) {
-                hasFollowOn = true;
-                animateScroll(speed);
-            }
-        }
-
-        // may need to bounce back if not animating the scrolling
-        if (!hasFollowOn &&
-            mClampingStyle == HbScrollArea::BounceBackClamping &&
-            positionOutOfBounds () ) {
-                if (!mBoundaryReached) {
-                    HbWidgetFeedback::triggered(q, Hb::InstantBoundaryReached);
-                    mBoundaryReached = true;
-                }
-            // display return animation if necessary
-            animateScroll( QPointF(0,0) );
-        } else if ( !hasFollowOn && mIsScrolling ){
-            stopAnimating();
-            stopScrolling();
-        }
-    } else if (mClampingStyle == HbScrollArea::BounceBackClamping &&
-               positionOutOfBounds() ) {
-        // display return animation if necessary
-        if (!mBoundaryReached) {
-            HbWidgetFeedback::triggered(q, Hb::InstantBoundaryReached);
-            mBoundaryReached = true;
-        }
-        animateScroll( QPointF(0,0) );
-    } else {
-        if ( mIsAnimating && !positionOutOfBounds() && !mTargetAnimationInProgress ) {
-            stopAnimating();
-        } else if (mIsScrolling && !mTargetAnimationInProgress ) {
-            stopScrolling ();
-        }
     }
-
-    event->accept();
+    return true;
 }
 
 void HbScrollAreaPrivate::adjustContent()
@@ -806,24 +635,26 @@
 
     QRectF contentsBoundingRect = mContents->boundingRect();
     QPointF alignedPosition = mContents->pos();
-    // Set the content alignment if content size is smaller than the area
-    if (!mAbleToScrollX && mAlignment & Qt::AlignHCenter) {
-        alignedPosition.setX((scrollAreaBoundingRect.width() - contentsBoundingRect.width()) / 2.0);
-    } else if (!mAbleToScrollX && mAlignment & Qt::AlignRight) {
-         alignedPosition.setX(scrollAreaBoundingRect.width() - mContents->size().width());
-    } else if ((!mAbleToScrollX && mAlignment & Qt::AlignLeft) ||
-               mContents->pos().x() + contentsBoundingRect.x() > 0.0) {
-        alignedPosition.setX(-contentsBoundingRect.x());
+    if (mResetAlignment) {
+        if (mAlignment & Qt::AlignHCenter) {
+            alignedPosition.setX((scrollAreaBoundingRect.width() - contentsBoundingRect.width()) / 2.0);
+        } else if (mAlignment & Qt::AlignRight) {
+            alignedPosition.setX(scrollAreaBoundingRect.width() - mContents->size().width());
+        } else if ((mAlignment & Qt::AlignLeft) ||
+                   mContents->pos().x() + contentsBoundingRect.x() > 0.0) {
+            alignedPosition.setX(-contentsBoundingRect.x());
+        }
+
+        if (mAlignment & Qt::AlignVCenter) {
+            alignedPosition.setY((scrollAreaBoundingRect.height() - contentsBoundingRect.height()) / 2.0);
+        } else if (mAlignment & Qt::AlignBottom) {
+            alignedPosition.setY(scrollAreaBoundingRect.height() - mContents->size().height());
+        } else if ((mAlignment & Qt::AlignTop) ||
+                   mContents->pos().y() + contentsBoundingRect.y() > 0.0) {
+            alignedPosition.setY(-contentsBoundingRect.y());
+        }
     }
-
-    if (!mAbleToScrollY && mAlignment & Qt::AlignVCenter) {
-        alignedPosition.setY((scrollAreaBoundingRect.height() - contentsBoundingRect.height()) / 2.0);
-    } else if (!mAbleToScrollY && mAlignment & Qt::AlignBottom) {
-        alignedPosition.setY(scrollAreaBoundingRect.height() - mContents->size().height());
-    } else if ((!mAbleToScrollY && mAlignment & Qt::AlignTop) ||
-               mContents->pos().y() + contentsBoundingRect.y() > 0.0) {
-        alignedPosition.setY(-contentsBoundingRect.y());
-    }
+    mResetAlignment = false;
     if (mAbleToScrollX && (-alignedPosition.x() < leftBoundary())) {
        alignedPosition.setX(-leftBoundary());
     } else if (mAbleToScrollX && (-alignedPosition.x() > rightBoundary())) {
@@ -840,56 +671,7 @@
     if (mContinuationIndicators) {
         updateIndicators(-mContents->pos());
     }
- }
-
-#if 0
-bool HbScrollAreaPrivate::sceneEvent(QEvent *event)
-{
-    Q_Q(HbScrollArea);
-      if (event->type() == QEvent::GraphicsSceneGesture) {
-        QGraphicsSceneGestureEvent *gestureEvent = static_cast<QGraphicsSceneGestureEvent*>(event);
-        if (const QGesture *gesture = gestureEvent->gesture(Qt::PanGesture)) {
-            const QPanningGesture *pannningGesture = static_cast<const QPanningGesture*>(gesture);
-
-            if (gesture->state() == Qt::GestureStarted){
-                qDebug()  << "HbScrollArea::sceneEvent: PAN EVENT -> GestureStarted";
-                panDirection = pannningGesture->direction();
-                mFlickTimer->restart();
-            }
-
-            if (gesture->state() == Qt::GestureUpdated){
-                if (panDirection != pannningGesture->direction() ){
-                    qDebug()  << "PAN EVENT -> GestureUpdated: Flick timer restart";
-                    panDirection = pannningGesture->direction();
-                    mFlickTimer->restart();
-                }
-            }
-
-            if (gesture->state() == Qt::GestureFinished){
-                if (flickTimer->elapsed() < 400 ){
-                    double trueLength = sqrt(pow(gesture->pos().x(), 2) + pow(gesture->pos().y(), 2));
-                    int speed  = trueLength *1000 / flickTimer->elapsed();
-
-                    if (pannningGesture->direction() == Qt::UpDirection ){
-                        qDebug() << "UP_FLICK -> Speed: " << speed;
-                        q->upGesture(speed);
-                    } else if (pannningGesture->direction() == Qt::DownDirection ){
-                        qDebug() << "DOWN_FLICK -> Speed: " << speed;
-                       q->downGesture(speed);
-                    }
-                    panDirection = Qt::NoDirection;
-                    event->accept();
-                    return true;
-                }
-            }
-            q->panGesture(gesture->pos() - gesture->lastPos());
-            event->accept();
-            return true;
-            }
-        }
-      return false;
 }
-#endif // HB_NEW_GESTURE_FW
 
 void HbScrollAreaPrivate::ensureVisible(QPointF position, qreal xMargin, qreal yMargin)
 {
@@ -1078,29 +860,23 @@
 {
     Q_Q(HbScrollArea);
     if (orientation == Qt::Horizontal) {
-        
-        // Layout the scrollbar
-        setScrollBarMetrics(orientation);
-        
-        // Activate the scrollbar
-        if ( (!mHorizontalScrollBar->isVisible() || mOrientationChanged )&& q->isVisible()) {
-            mHorizontalScrollBar->setVisible(true);
-            if (mOrientationChanged ) {
-                HbScrollBarPrivate::d_ptr(mHorizontalScrollBar)->startShowEffect();
-            }
-        }
-    }
-    else if (orientation == Qt::Vertical) {
-        
+
         // Layout the scrollbar
         setScrollBarMetrics(orientation);
 
         // Activate the scrollbar
-        if ( (!mVerticalScrollBar->isVisible() || mOrientationChanged )&& q->isVisible()) {
+        if ( !mHorizontalScrollBar->isVisible() && q->isVisible()) {
+            mHorizontalScrollBar->setVisible(true);
+        }
+    }
+    else if (orientation == Qt::Vertical) {
+
+        // Layout the scrollbar
+        setScrollBarMetrics(orientation);
+
+        // Activate the scrollbar
+        if ( !mVerticalScrollBar->isVisible() && q->isVisible()) {
             mVerticalScrollBar->setVisible(true);
-            if (mOrientationChanged ) {
-                HbScrollBarPrivate::d_ptr(mVerticalScrollBar)->startShowEffect();
-            }
         }
     }
 }
@@ -1210,6 +986,21 @@
     }
 }
 
+void HbScrollAreaPrivate::_q_thumbPressed()
+{
+    Q_Q(HbScrollArea);
+    mIsScrolling = true;
+    emit q->scrollingStarted();
+}
+
+void HbScrollAreaPrivate::_q_thumbReleased()
+{
+    Q_Q(HbScrollArea);
+    mIsScrolling = false;
+    emit q->scrollingEnded();
+}
+
+
 void HbScrollAreaPrivate::setContentPosition( qreal value, Qt::Orientation orientation, bool animate )
 {
     Q_Q(HbScrollArea);
@@ -1223,9 +1014,9 @@
         mScrollSpeed.setY(0.0);
     }
 
-	if (animate) {
-	    q->scrollContentsTo (-newPosition, PAGE_CHANGE_DURATION);
-	} else {
+    if (animate) {
+        q->scrollContentsTo(-newPosition, PAGE_CHANGE_DURATION);
+    } else {
     	setContentPosition(newPosition);	
     }
 }
@@ -1348,10 +1139,3 @@
         mVerticalScrollBar->setVisible(false);
     }
 }
-
-void HbScrollAreaPrivate::orientationChanged()
-{
-    mOrientationChanged = true;
-    adjustContent();
-    mOrientationChanged = false;
-}
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gui/hbscrollarea_p.h
--- a/src/hbcore/gui/hbscrollarea_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gui/hbscrollarea_p.h	Mon May 03 12:48:33 2010 +0300
@@ -43,9 +43,9 @@
 #include <QTimer>
 #include <QTime>
 
-class HbGestureSceneFilter;
 class HbScrollBar;
 class QEasingCurve;
+class QPanGesture;
 
 class HB_CORE_PRIVATE_EXPORT HbScrollAreaPrivate: public HbWidgetPrivate
 {
@@ -68,8 +68,6 @@
 
     void changeLayoutDirection(Qt::LayoutDirection aNewDirection);
 
-    void updateGestures();
-
     // returns true if it was able to scroll in either direction
     bool scrollByAmount(const QPointF& delta);
 
@@ -90,6 +88,8 @@
     void _q_hideScrollBars();
     void _q_thumbPositionChanged(qreal value, Qt::Orientation orientation);
     void _q_groovePressed(qreal value, Qt::Orientation orientation);
+    void _q_thumbPressed();
+    void _q_thumbReleased();
 
     //void bounceBackValueChanged(qreal value);
     virtual void updateScrollMetrics();
@@ -101,8 +101,8 @@
 
     bool positionOutOfBounds ();
 
-    void mousePressEvent(QGraphicsSceneMouseEvent *event);
-    void mouseReleaseEvent(QGraphicsSceneMouseEvent * event);
+    bool pan(QPanGesture *gesture);
+
     void adjustContent();
 
     virtual void ensureVisible(QPointF position, qreal xMargin, qreal yMargin);
@@ -114,7 +114,6 @@
     void updateIndicators(QPointF newPosition);
 
     void hideChildComponents();
-    void orientationChanged();
 
     virtual void setContentPosition( qreal value, Qt::Orientation orientation, bool animate );
 
@@ -143,9 +142,7 @@
     // valid during animation
     QPointF mScrollPosition;
 
-    Qt::Orientations mScrollDirections;
-
-    HbGestureSceneFilter* mGestureFilter;
+    Qt::Orientations mScrollDirections;    
 
     HbScrollBar* mHorizontalScrollBar;
     HbScrollBar* mVerticalScrollBar;
@@ -175,13 +172,10 @@
 
     bool mFrictionEnabled;
     bool mScrollbarVisible;
+    bool mResetAlignment;
 
     HbScrollArea::ClampingStyle mClampingStyle;
-    HbScrollArea::ScrollingStyle mScrollingStyle;
-
-    bool mHandleLongPress;
-
-    bool mOrientationChanged;
+    HbScrollArea::ScrollingStyle mScrollingStyle;    
 
     // TODO/Q: All circular array related members could go
     // to circular array class if so wanted.
@@ -196,17 +190,13 @@
     uint mEventPositionQueueLastIndex;
     bool mEventPositionQueueIsFull;
     Qt::LayoutDirection mLayoutDirection;
-    #if 0
-    QTime *mFlickTimer;
-    Qt::DirectionType mPanDirection;
-    #endif //HB_NEW_GESTURE_FW
 
     Qt::Alignment mAlignment;
     bool mContinuationIndicators;
     QGraphicsItem *continuationIndicatorTopItem;
     QGraphicsItem *continuationIndicatorBottomItem;
     QGraphicsItem *continuationIndicatorLeftItem;
-    QGraphicsItem *continuationIndicatorRightItem;
+    QGraphicsItem *continuationIndicatorRightItem;    
 
 private:
     // Private access for the fute application to enable setting tweaking
@@ -225,7 +215,6 @@
     qreal mSpringDampingFactor;
     qreal mFrictionPerMilliSecond;
     bool mMultiFlickEnabled;
-
 };
 
 #endif // HBSCROLLAREA_P_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gui/hbscrollbar.cpp
--- a/src/hbcore/gui/hbscrollbar.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gui/hbscrollbar.cpp	Mon May 03 12:48:33 2010 +0300
@@ -95,6 +95,9 @@
 
 void HbScrollBarPrivate::init()
 {
+    Q_Q(HbScrollBar);
+    q->grabGesture(Qt::PanGesture);
+    q->grabGesture(Qt::TapGesture);
 }
 
 void HbScrollBarPrivate::createPrimitives()
@@ -210,8 +213,6 @@
     Q_D(HbScrollBar);
     d->q_ptr = this;
     d->init();
-    grabGesture(Qt::TapGesture);
-    grabGesture(Qt::PanGesture);
 }
 
 /*!
@@ -328,12 +329,9 @@
 */
 void HbScrollBar::setValue( qreal value )
 {
-    Q_D(HbScrollBar);
-    if( value < 0.0 || value > 1.0 ) {
-        qWarning( "HbScrollBar::setValue(%f) out of range 0.0-1.0", value );
-        return;
-    }
+    Q_D(HbScrollBar);        
 
+    value = qBound(static_cast<qreal>(0.0), value, static_cast<qreal>(1.0));
     if( !qFuzzyCompare(d->mCurrentPosition,value )) {
         d->mCurrentPosition = value;
         d->updatePosition();
@@ -351,10 +349,7 @@
 void HbScrollBar::setPageSize( qreal size )
 {
     Q_D(HbScrollBar);
-    if( size < 0.0 || size > 1.0 ) {
-        qWarning( "HbScrollBar::setPageSize(%f) out of range 0.0-1.0", size );
-        return;
-    }
+    size = qBound(static_cast<qreal>(0.0), size, static_cast<qreal>(1.0));
 
     if(!qFuzzyCompare(d->mPageSize,size)) {
         d->mPageSize = size;
@@ -451,6 +446,7 @@
             HbWidgetFeedback::triggered(this, Hb::InstantPressed, Hb::ModifierSliderHandle);
             initStyleOption(&opt);
             style()->updatePrimitive(d->handleItem, HbStyle::P_ScrollBar_handle, &opt );
+            emit d->core.handlePressed();
         }
 
         break;
@@ -476,6 +472,7 @@
             HbWidgetFeedback::triggered(this, Hb::InstantPressed, Hb::ModifierSliderHandle);
             initStyleOption(&opt);
             style()->updatePrimitive(d->handleItem, HbStyle::P_ScrollBar_handle, &opt );
+            emit d->core.handlePressed();
         }
 
         break;
@@ -499,6 +496,7 @@
         d->mThumbPressed = false;
         HbWidgetFeedback::triggered(this, Hb::InstantReleased, Hb::ModifierSliderHandle);
         emit valueChanged(value(), orientation());
+        emit d->core.handleReleased();
         initStyleOption(&opt);
         style()->updatePrimitive(d->handleItem, HbStyle::P_ScrollBar_handle, &opt );
     } else if (d->mGroovePressed){
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gui/hbscrollbar.h
--- a/src/hbcore/gui/hbscrollbar.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gui/hbscrollbar.h	Mon May 03 12:48:33 2010 +0300
@@ -81,6 +81,7 @@
     void polish( HbStyleParameters& params );
     void resizeEvent(QGraphicsSceneResizeEvent *event);
     void gestureEvent(QGestureEvent* event);
+
 private:
     Q_DECLARE_PRIVATE_D( d_ptr, HbScrollBar )
     Q_DISABLE_COPY(HbScrollBar)
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gui/hbscrollbar_p.h
--- a/src/hbcore/gui/hbscrollbar_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gui/hbscrollbar_p.h	Mon May 03 12:48:33 2010 +0300
@@ -31,6 +31,18 @@
 #include <hbscrollbar.h>
 #include <hbwidget_p.h>
 
+class HbScrollBarPrivateCore : public QObject
+{
+    Q_OBJECT
+
+    signals:
+        void handlePressed();
+        void handleReleased();
+
+    friend class HbScrollBar;
+    friend class HbScrollAreaPrivate;    
+};
+
 class HbScrollBarPrivate : public HbWidgetPrivate
 {
     Q_DECLARE_PUBLIC(HbScrollBar)
@@ -67,6 +79,7 @@
     bool hasEffects;
     QPointF lastEmittedPos;
     bool emittedPos;
+    HbScrollBarPrivateCore core;
     static bool effectsLoaded;
 
     inline bool isPressed() {
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gui/hbsettingswindow_p.cpp
--- a/src/hbcore/gui/hbsettingswindow_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gui/hbsettingswindow_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -34,6 +34,7 @@
 #include "hbtextitem_p.h"
 #include "hbiconitem_p.h"
 #include "hbgraphicsscene_p.h"
+#include "hbeffectinternal_p.h"
 
 #include <QPointer>
 #include <QComboBox>
@@ -42,9 +43,11 @@
 #include <QGroupBox>
 #include <QApplication>
 #include <QSettings>
+#include <QPushButton>
+#include <hbevent.h>
 
-#ifdef CSS_INSPECTOR
-#include <QPushButton>
+#ifdef HB_CSS_INSPECTOR
+#include "hbcssinspector_p.h"
 #endif
 
 static QString windowName(HbMainWindow *window)
@@ -81,18 +84,25 @@
 
 HbSettingsWindow::HbSettingsWindow(QWidget *parent) : QWidget(parent)
 {
+    mLights = true;
+    mAnimation = true;
+
     windowComboBox = new QComboBox(this);
     windowComboBox->hide();
     resolutionComboBox = new QComboBox(this);
-    orientationComboBox = new QComboBox(this);
     directionComboBox = new QComboBox(this);
     dragToResizeComboBox = new QComboBox(this);
     mSensorComboBox = new QComboBox(this);
     mGeneralSettingsForSensorsComboBox = new QComboBox(this);
     mUnsetOrientationButton = new QPushButton(tr("&Unset orientation"), this);
 
+    mLights = true;
+    HbIcon icon("qtg_mono_light");
+    mLightsButton = new QPushButton(icon.pixmap(), "", this);
+
+    mAnimationButton = new QPushButton(tr("&Animation on"), this);
+
     resolutionComboBox->addItems(HbDeviceProfile::profileNames());
-    orientationComboBox->addItems(QStringList() << tr("Portrait") << tr("Landscape"));
     directionComboBox->addItems(QStringList() << tr("Left to right") << tr("Right to left"));
     dragToResizeComboBox->addItems(QStringList() << tr("Disabled") << tr("Enabled"));
     mSensorComboBox->addItems(QStringList() << tr("Landscape") << tr("Portrait"));
@@ -101,12 +111,13 @@
 
     connect(windowComboBox, SIGNAL(currentIndexChanged(int)), SLOT(changeWindow(int)));
     connect(resolutionComboBox, SIGNAL(currentIndexChanged(int)), SLOT(changeResolution(int)));
-    connect(orientationComboBox, SIGNAL(currentIndexChanged(int)), SLOT(changeOrientation(int)));
     connect(directionComboBox, SIGNAL(currentIndexChanged(int)), SLOT(changeDirection(int)));
     connect(dragToResizeComboBox, SIGNAL(currentIndexChanged(int)), SLOT(changeDragToResize(int)));
     connect(mSensorComboBox, SIGNAL(currentIndexChanged(int)), SLOT(changeSensorValue(int)));
     connect(mGeneralSettingsForSensorsComboBox, SIGNAL(currentIndexChanged(int)), SLOT(changeGSettingsForSensors(int)));
     connect(mUnsetOrientationButton, SIGNAL(pressed()), SLOT(unsetOrientation()));
+    connect(mLightsButton, SIGNAL(pressed()), SLOT(toggleLights()));
+    connect(mAnimationButton, SIGNAL(pressed()), SLOT(toggleAnimation()));
 
     QVBoxLayout *boxLayout = new QVBoxLayout(this);
     
@@ -114,7 +125,6 @@
     QFormLayout *layout = new QFormLayout(mainGroup);
     layout->addRow(tr("&Window"), windowComboBox);
     layout->addRow(tr("&Resolution"), resolutionComboBox);
-    layout->addRow(tr("&Orientation"), orientationComboBox);
     layout->addRow(tr("&Direction"), directionComboBox);
     layout->addRow(tr("&Drag to resize"), dragToResizeComboBox);
 
@@ -127,6 +137,9 @@
     sensorLayout->addRow(tr("&Sensors"), mSensorComboBox);
     sensorLayout->addRow(tr("&GS sensors"), mGeneralSettingsForSensorsComboBox);
     sensorLayout->addRow(mUnsetOrientationButton);
+    sensorLayout->addRow(mLightsButton);
+    sensorLayout->addRow(mAnimationButton);
+
     mainGroup->setLayout(sensorLayout);
     boxLayout->addWidget(sensorGroup);
 
@@ -156,7 +169,7 @@
     globalGroup->setLayout(globalLayout);
     boxLayout->addWidget(globalGroup);
 
-#ifdef CSS_INSPECTOR
+#ifdef HB_CSS_INSPECTOR
     QGroupBox *cssGroup = new QGroupBox(tr("CSS Debugging"), this);
     QHBoxLayout *cssLayout = new QHBoxLayout(cssGroup);
 
@@ -227,26 +240,6 @@
     }
 }
 
-void HbSettingsWindow::changeOrientation(int index)
-{
-    HbMainWindow *window = getWindow(windowComboBox->currentIndex());
-    if (!window) {
-        // global
-        HbInstancePrivate::d_ptr()->setOrientation(index == 0 ? Qt::Vertical : Qt::Horizontal, true);
-    } else {
-        // window specific
-        if (index == 2)
-            window->unsetOrientation();
-        else{
-            Qt::Orientation orientation = index == 0 ? Qt::Vertical : Qt::Horizontal;
-            if(orientation != HbInstancePrivate::d_ptr()->orientation()){
-                window->setOrientation(orientation);
-            }else{
-                window->unsetOrientation();
-            }
-        }
-    }
-}
 
 void HbSettingsWindow::changeDirection(int index)
 {
@@ -307,7 +300,6 @@
 void HbSettingsWindow::changeDragToResize(int index)
 {
     resolutionComboBox->setEnabled(index == 0);
-    orientationComboBox->setEnabled(index == 0);
     foreach (HbMainWindow *window, hbInstance->allMainWindows()) {
         HbDeviceProfile profile = HbDeviceProfile::profile(window);
         window->resize(profile.logicalSize());
@@ -362,3 +354,37 @@
         }
     }
 }
+
+void HbSettingsWindow::toggleLights()
+{
+    HbIcon icon("qtg_mono_light");
+    QList<HbMainWindow *> mainWindowList = hbInstance->allMainWindows();
+    for (int i = 0; i < mainWindowList.count(); ++i) {
+        if (mLights) {
+            icon.setIconName("qtg_mono_light_off");
+			mainWindowList[i]->broadcastEvent(HbEvent::SleepModeEnter);
+			mLights = false;
+            mainWindowList[i]->setForegroundBrush(QBrush(Qt::black, Qt::Dense1Pattern));
+        } else {
+            icon.setIconName("qtg_mono_light");
+            mainWindowList[i]->broadcastEvent(HbEvent::SleepModeExit);
+			mLights = true;
+            mainWindowList[i]->setForegroundBrush(Qt::NoBrush);
+        }
+        mLightsButton->setIcon(icon.pixmap());
+    }
+}
+
+void HbSettingsWindow::toggleAnimation()
+{
+    if (mAnimation) {
+        HbEffectInternal::setEffectsEnabled(false);
+        mAnimationButton->setText(tr("&Animation Off"));
+        mAnimation = false;
+    } else {
+        HbEffectInternal::setEffectsEnabled(true);
+        mAnimationButton->setText(tr("&Animation On"));
+        mAnimation = true;
+    }
+
+}
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gui/hbsettingswindow_p.h
--- a/src/hbcore/gui/hbsettingswindow_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gui/hbsettingswindow_p.h	Mon May 03 12:48:33 2010 +0300
@@ -27,7 +27,6 @@
 #define HBSETTINGSWINDOW_P_H
 
 #include <QWidget>
-#include "hbcssinspector_p.h"
 #include "hbmainwindoworientation_p.h"
 
 QT_FORWARD_DECLARE_CLASS(QComboBox)
@@ -47,7 +46,6 @@
 private slots:
     void changeWindow(int index);
     void changeResolution(int index);
-    void changeOrientation(int index);
     void changeDirection(int index);
     void changeTouchArea(int index);
     void changeTextBoxes(int index);
@@ -57,6 +55,8 @@
     void changeSensorValue(int index);
     void changeGSettingsForSensors(int index);
     void unsetOrientation();
+    void toggleLights();
+    void toggleAnimation();
 
 private:
     void initStartUpValues();
@@ -75,8 +75,12 @@
     QComboBox *mSensorComboBox;
     QComboBox *mGeneralSettingsForSensorsComboBox;
     QPushButton *mUnsetOrientationButton;
+    QPushButton *mLightsButton;
+    QPushButton *mAnimationButton;
+    bool mLights;
+    bool mAnimation;
 
-#ifdef CSS_INSPECTOR
+#ifdef HB_CSS_INSPECTOR
     QPushButton *cssWindowButton;
 #endif
 };
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gui/hbsplash.cpp
--- a/src/hbcore/gui/hbsplash.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gui/hbsplash.cpp	Mon May 03 12:48:33 2010 +0300
@@ -45,11 +45,11 @@
 
 const qint64 image_bytes_limit = 1024 * 1024 * 4;
 
-static QString orientationId(HbSplash::Flags flags)
+static QString orientationId(HbSplashScreen::Flags flags)
 {
-    if (flags & HbSplash::FixedVertical) {
+    if (flags & HbSplashScreen::FixedVertical) {
         return QString("prt");
-    } else if (flags & HbSplash::FixedHorizontal) {
+    } else if (flags & HbSplashScreen::FixedHorizontal) {
         return QString("lsc");
     }
 #ifdef Q_OS_SYMBIAN
@@ -67,8 +67,9 @@
     int *h;
     int *bpl;
     QImage::Format *fmt;
-    HbSplash::Flags flags;
+    HbSplashScreen::Flags flags;
     QString appId;
+    QString screenId;
     HbSplash::AllocFunc allocFunc;
     void *allocFuncParam;
 };
@@ -143,26 +144,64 @@
 {
 public:
     bool Connect();
-    bool getSplash(RFile &f, const QString &ori, const QString &appId);
+    bool getSplash(RFile &f, const QString &ori, const QString &appId, const QString &screenId);
 };
 
 bool HbSplashSrvClient::Connect()
 {
     TVersion ver(hbsplash_version_major, hbsplash_version_minor, hbsplash_version_build);
-    if (CreateSession(hbsplash_server_name, ver) != KErrNone) {
-        qWarning("[hbsplash] cannot connect to splashgen server");
-        return false;
+    int maxTries = 3;
+    while (maxTries--) {
+        TInt err = CreateSession(hbsplash_server_name, ver);
+        qDebug("[hbsplash] CreateSession result: %d", err);
+        if (err == KErrNone) {
+            return true;
+/*
+        } else if (err == KErrNotFound || err == KErrServerTerminated) {
+            qDebug("[hbsplash] Server not running");
+            TFindServer findServer(hbsplash_server_name);
+            TFullName name;
+            if (findServer.Next(name) != KErrNone) {
+                RProcess server;
+                const TUidType uid(KNullUid, KNullUid, hbsplash_server_uid3);
+                err = server.Create(hbsplash_server_exe, KNullDesC, uid);
+                if (err != KErrNone) {
+                    qWarning("[hbsplash] RProcess::Create failed (%d)", err);
+                    break;
+                }
+                TRequestStatus status;
+                server.Rendezvous(status);
+                if (status != KRequestPending) {
+                    server.Kill(0);
+                } else {
+                    server.Resume();
+                }
+                User::WaitForRequest(status);
+                server.Close();
+                if (status.Int() != KErrNone) {
+                    qWarning("[hbsplash] Rendezvous failed (%d)", status.Int());
+                    break;
+                }
+                qDebug("[hbsplash] Server started");
+            }
+*/
+        } else {
+            break;
+        }
     }
-    return true;
+    qWarning("[hbsplash] cannot connect to splashgen server");
+    return false;
 }
 
-bool HbSplashSrvClient::getSplash(RFile &f, const QString &ori, const QString &appId)
+bool HbSplashSrvClient::getSplash(RFile &f, const QString &ori,
+                                  const QString &appId, const QString &screenId)
 {
     TPtrC oriDes(static_cast<const TUint16 *>(ori.utf16()), ori.length());
     TPtrC appIdDes(static_cast<const TUint16 *>(appId.utf16()), appId.length());
+    TPtrC screenIdDes(static_cast<const TUint16 *>(screenId.utf16()), screenId.length());
     TInt fileHandle;
     TPckg<TInt> fileHandlePckg(fileHandle);
-    TIpcArgs args(&oriDes, &appIdDes, &fileHandlePckg);
+    TIpcArgs args(&oriDes, &appIdDes, &screenIdDes, &fileHandlePckg);
     TInt fsHandle = SendReceive(HbSplashSrvGetSplash, args);
     return f.AdoptFromServer(fsHandle, fileHandle) == KErrNone;
 }
@@ -184,7 +223,7 @@
     uchar *data = 0;
     File f;
     f.mFullName = "[unavailable]";
-    if (client.getSplash(f.mFile, oriStr, appIdStr)) {
+    if (client.getSplash(f.mFile, oriStr, appIdStr, params.screenId)) {
         qDebug("[hbsplash] got handle from server");
         data = readSpl(f, params);
         f.mFile.Close();
@@ -212,13 +251,20 @@
 static uchar *load_generic(const Params &params)
 {
     QString appSpecificName("splash_%1_%2.spl");
+    QString appAndScreenSpecificName("splash_%1_%2_%3.spl");
     QString genericName("splash_%1.spl");
     QDir dir("splashscreens"); // see hbsplashgenerator
     QString oriStr(orientationId(params.flags));
     uchar *data = 0;
     // Try to read the app-specific screen.
     if (!params.appId.isEmpty()) {
-        data = read_file_generic(dir.filePath(appSpecificName.arg(oriStr).arg(params.appId)), params);
+        QString name;
+        if (!params.screenId.isEmpty()) {
+            name = appAndScreenSpecificName.arg(oriStr).arg(params.appId).arg(params.screenId);
+        } else {
+            name = appSpecificName.arg(oriStr).arg(params.appId);
+        }
+        data = read_file_generic(dir.filePath(name), params);
     }
     // If failed then use the common one.
     if (!data) {
@@ -262,12 +308,13 @@
   load() is either 0 (if there was an error) or the return value of allocFunc
   (in case of success).
 
-  \sa HbSplash::Flags
+  \sa HbSplashScreen::Flags
 
   \internal
 */
 uchar *HbSplash::load(int &w, int &h, int &bpl, QImage::Format &fmt,
-                      Flags flags, const QString &appId,
+                      HbSplashScreen::Flags flags,
+                      const QString &appId, const QString &screenId,
                       AllocFunc allocFunc, void *allocFuncParam)
 {
     Params params;
@@ -277,6 +324,7 @@
     params.fmt = &fmt;
     params.flags = flags;
     params.appId = appId;
+    params.screenId = screenId;
     params.allocFunc = allocFunc;
     params.allocFuncParam = allocFuncParam;
 #ifdef Q_OS_SYMBIAN
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gui/hbsplash_p.h
--- a/src/hbcore/gui/hbsplash_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gui/hbsplash_p.h	Mon May 03 12:48:33 2010 +0300
@@ -27,31 +27,23 @@
 #define HBSPLASH_P_H
 
 #include <hbglobal.h>
+#include <hbsplashscreen.h>
 #include <QImage>
 
 class HB_AUTOTEST_EXPORT HbSplash
 {
 public:
-    enum Flag {
-        Default         = 0x00,
-        FixedVertical   = 0x01,
-        FixedHorizontal = 0x02
-    };
-
-    Q_DECLARE_FLAGS(Flags, Flag)
-
     typedef uchar *(*AllocFunc)(int w, int h, int bpl, QImage::Format fmt, void *param);
 
     static uchar *load(int &w,
                        int &h,
                        int &bpl,
                        QImage::Format &fmt,
-                       Flags flags = Default,
+                       HbSplashScreen::Flags flags = HbSplashScreen::Default,
                        const QString &appId = QString(),
+                       const QString &screenId = QString(),
                        AllocFunc allocFunc = 0,
                        void *allocFuncParam = 0);
 };
 
-Q_DECLARE_OPERATORS_FOR_FLAGS(HbSplash::Flags)
-
 #endif // HBSPLASH_P_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gui/hbsplashdefs_p.h
--- a/src/hbcore/gui/hbsplashdefs_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gui/hbsplashdefs_p.h	Mon May 03 12:48:33 2010 +0300
@@ -35,6 +35,8 @@
 const uint hbsplash_version_build = 1;
 
 _LIT(hbsplash_server_name, "hbsplashgenerator");
+_LIT(hbsplash_server_exe, "hbsplashgenerator.exe");
+const TUid hbsplash_server_uid3 = { 0x2002E68B };
 
 enum HbSplashServerFuncs {
     HbSplashSrvGetSplash = 1
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gui/hbsplashscreen.cpp
--- a/src/hbcore/gui/hbsplashscreen.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gui/hbsplashscreen.cpp	Mon May 03 12:48:33 2010 +0300
@@ -23,7 +23,8 @@
 **
 ****************************************************************************/
 
-#include "hbsplashscreen_p.h"
+#include "hbsplashscreen.h"
+#include "hbsplash_p.h"
 #include <QPainter>
 #include <QImage>
 #include <QApplication>
@@ -51,15 +52,47 @@
 /*!
   \class HbSplashScreen
 
-  \brief Shows a splash screen suitable for the current application, if available.
+  \brief Shows a splash screen suitable for the current application.
+
+  Normally start() and destroy() are invoked by HbApplication and HbMainWindow
+  so applications do not have to care about this class at all. However if
+  HbApplication is not used then it may be necessary to call start() manually,
+  very early in the application's main() function.
+*/
+
+/*!
+  \enum HbSplashScreen::Flag
+
+  Flags controlling the splash screen.
+*/
+
+/*!
+  \var HbSplashScreen::Flag HbSplashScreen::Default
 
-  \internal
+  Default value for splash screen flags. By default the orientation for the
+  splash screen is determined based on the current device orientation
+  (e.g. based on sensor data).
+*/
+
+/*!
+  \var HbSplashScreen::Flag HbSplashScreen::FixedVertical
+
+  Indicates that the application will force its orientation to vertical. As a
+  result the splash screen will also be forced to vertical orientation.
+*/
+
+/*!
+  \var HbSplashScreen::Flag HbSplashScreen::FixedHorizontal
+
+  Indicates that the application will force its orientation to horizontal. As a
+  result the splash screen will also be forced to horizontal orientation.
 */
 
 class HbSplashScreenInterface
 {
 public:
-    virtual void start(HbSplash::Flags flags) = 0;
+    virtual ~HbSplashScreenInterface() {}
+    virtual void start(HbSplashScreen::Flags flags) = 0;
     virtual void release() = 0;
 };
 
@@ -69,7 +102,7 @@
     HbSplashScreenGeneric();
     ~HbSplashScreenGeneric();
 
-    void start(HbSplash::Flags flags);
+    void start(HbSplashScreen::Flags flags);
     void release();
 
 private:
@@ -88,7 +121,7 @@
     HbSplashScreenSymbian();
     ~HbSplashScreenSymbian();
 
-    void start(HbSplash::Flags flags);
+    void start(HbSplashScreen::Flags flags);
     void release();
 
 private:
@@ -101,7 +134,21 @@
 
 static HbSplashScreenInterface *splashScreen = 0;
 
-void HbSplashScreen::start(HbSplash::Flags flags)
+struct RequestProps {
+    RequestProps() : mSplashFlags(HbSplashScreen::Default) { }
+    HbSplashScreen::Flags mSplashFlags;
+    QString mAppId;
+    QString mScreenId;
+};
+
+Q_GLOBAL_STATIC(RequestProps, requestProps)
+
+/*!
+  Creates and shows the splash screen, if a suitable one is available for the
+  current application. The splash screen is automatically destroyed by
+  HbMainWindow after the window has become fully visible.
+ */
+void HbSplashScreen::start(Flags flags)
 {
     if (!splashScreen) {
         splashScreen =
@@ -112,9 +159,14 @@
 #endif
             ;
     }
-    splashScreen->start(flags);
+    splashScreen->start(flags | requestProps()->mSplashFlags);
 }
 
+/*!
+    Hides and destroys the splash screen.  Has no effect if the splash screen
+    has not been started.  This is called automatically by HbMainWindow after
+    the window is fully constructed and visible.
+ */
 void HbSplashScreen::destroy()
 {
     if (splashScreen) {
@@ -123,11 +175,73 @@
     }
 }
 
+/*!
+    Returns true if the splash screen exists (i.e. start(), but not destroy(),
+    has been called)
+ */
 bool HbSplashScreen::exists()
 {
     return splashScreen != 0;
 }
 
+/*!
+  Sets the flags that will be combined with the flags passed to start().  If
+  start() is called directly by the application then this function is not needed
+  because the flags can be passed directly to start(). However if start() is not
+  called by the application itself then, without this function, the application
+  would have no way to pass flags to it. Hence the existence of this function.
+ */
+void HbSplashScreen::setFlags(Flags flags)
+{
+    requestProps()->mSplashFlags = flags;
+}
+
+/*!
+  Overrides the application id. If used then this must be called before
+  instantiating HbApplication or calling start().
+
+  No prefixes are allowed, e.g. on Symbian \a appid is typically a secure id,
+  however the 0x prefix must not be used here.
+
+  On Symbian the request will typically be ignored because in general it is not
+  allowed to use another application's splash screen.
+
+  If not set then appid defaults to an empty string, the interpretation of which
+  depends on the platform. For example on Symbian the current process' secure id
+  will be used (which will match splash screens for which the splashml document
+  had specified the same uid in the appid element).
+
+  \sa setScreenId()
+ */
+void HbSplashScreen::setAppId(const QString &appId)
+{
+    requestProps()->mAppId = appId;
+}
+
+/*!
+  Sets the requested screen id. If a screen id need to be specified then this
+  function must be called before instantiating HbApplication or before invoking
+  start().
+
+  Splash screens are normally identified based on the appid, however if one
+  application needs more than one screen (specific to that application) then the
+  screenid can be used to distinguish between the different screens. This string
+  will then be matched to the screenid element text from the splashml documents
+  in order to find the proper splash screen.
+
+  If not set then the screenid defaults to an empty string that matches splash
+  screens for which the screenid was not specified in the splashml document.
+
+  If set but no matching screen is found then the generic splash screen will be
+  used.
+
+  \sa setAppId()
+ */
+void HbSplashScreen::setScreenId(const QString &screenId)
+{
+    requestProps()->mScreenId = screenId;
+}
+
 HbSplashScreenGeneric::HbSplashScreenGeneric()
     : QWidget(0, Qt::SplashScreen), mImageData(0)
 {
@@ -143,13 +257,15 @@
     delete this;
 }
 
-void HbSplashScreenGeneric::start(HbSplash::Flags flags)
+void HbSplashScreenGeneric::start(HbSplashScreen::Flags flags)
 {
     try {
         if (!mImageData) {
             int w, h, bpl;
             QImage::Format fmt;
-            mImageData = HbSplash::load(w, h, bpl, fmt, flags);
+            RequestProps *props = requestProps();
+            mImageData = HbSplash::load(w, h, bpl, fmt, flags,
+                                        props->mAppId, props->mScreenId);
             if (mImageData) {
                 QImage img(mImageData, w, h, bpl, fmt);
                 mContents = QPixmap::fromImage(img);
@@ -157,7 +273,7 @@
             }
         }
         if (!mContents.isNull()) {
-#ifdef HB_SPLASH_USE_SYMBIAN_LEGACY_SURFACE
+#ifdef Q_OS_SYMBIAN
             showFullScreen();
 #else
             show();
@@ -220,14 +336,18 @@
     return 0;
 }
 
-void HbSplashScreenSymbian::start(HbSplash::Flags flags)
+void HbSplashScreenSymbian::start(HbSplashScreen::Flags flags)
 {
     try {
         if (!mContents) {
             mContents = new CFbsBitmap;
             int w, h, bpl;
             QImage::Format fmt;
-            if (HbSplash::load(w, h, bpl, fmt, flags, QString(), fbsBitmapAllocFunc, mContents)) {
+            RequestProps *props = requestProps();
+            if (HbSplash::load(w, h, bpl, fmt, flags,
+                               props->mAppId, props->mScreenId,
+                               fbsBitmapAllocFunc, mContents))
+            {
                 TRect rect(TPoint(0, 0), TSize(w, h));
                 TRAPD(err, {
                         CreateWindowL();
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gui/hbsplashscreen.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/gui/hbsplashscreen.h	Mon May 03 12:48:33 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 HBSPLASHSCREEN_H
+#define HBSPLASHSCREEN_H
+
+#include <hbglobal.h>
+
+class HB_CORE_EXPORT HbSplashScreen
+{
+public:
+    enum Flag {
+        Default         = 0x00,
+        FixedVertical   = 0x01,
+        FixedHorizontal = 0x02
+    };
+
+    Q_DECLARE_FLAGS(Flags, Flag)
+
+    static void start(Flags flags = Default);
+    static void destroy();
+    static bool exists();
+    static void setFlags(Flags flags);
+    static void setAppId(const QString &appId);
+    static void setScreenId(const QString &screenId);
+};
+
+Q_DECLARE_OPERATORS_FOR_FLAGS(HbSplashScreen::Flags)
+
+#endif // HBSPLASHSCREEN_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gui/hbsplashscreen_p.h
--- a/src/hbcore/gui/hbsplashscreen_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +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 HBSPLASHSCREEN_P_H
-#define HBSPLASHSCREEN_P_H
-
-#include <hbglobal.h>
-#include <hbsplash_p.h>
-
-class HbSplashScreen
-{
-public:
-    static void start(HbSplash::Flags flags = HbSplash::Default);
-    static void destroy();
-    static bool exists();
-
-private:
-    HbSplashScreen() { }
-};
-
-#endif // HBSPLASHSCREEN_P_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gui/hbtoolbar.cpp
--- a/src/hbcore/gui/hbtoolbar.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gui/hbtoolbar.cpp	Mon May 03 12:48:33 2010 +0300
@@ -49,11 +49,10 @@
 
 #ifdef HB_EFFECTS
 #include "hbeffectinternal_p.h"
-#define HB_TOOLBAR_ITEM_TYPE "HB_TOOLBAR"
 #endif
 
 /*!
-    @stable
+    @beta
     @hbcore
     \class HbToolBar
     \brief HbToolBar is a toolbar decorator.
@@ -91,6 +90,8 @@
     Q_D(HbToolBar);
     d->q_ptr = this;
     d->init();
+    setFlag(QGraphicsItem::ItemIsPanel);
+
 }
 
 /*!
@@ -233,7 +234,8 @@
 }
 
 /*!
-    \deprecated HbToolBar::unsetOrientation()is deprecated.
+    \deprecated HbToolBar::unsetOrientation()
+            is deprecated.
  */
 void HbToolBar::unsetOrientation()
 {
@@ -312,6 +314,11 @@
         d->updateButtonsLayoutDirection();
     }
 
+    if (event->type() == QEvent::ParentChange && parentItem()) {
+        setPos(-1000, -1000);   // Not very nice workaround to toolbar flicker problem.
+                                // We will find a better solution later.
+    }
+
     QGraphicsWidget::changeEvent(event);
 }
 
@@ -371,79 +378,19 @@
 /*!
     \reimp
  */
-void HbToolBar::gestureEvent(QGestureEvent *event)
+void HbToolBar::gestureEvent(QGestureEvent *)
 {
-    Q_D(HbToolBar);    
-    if (QPanGesture *panGesture = qobject_cast<QPanGesture*>(event->gesture(Qt::PanGesture))) {
-        QPointF scenePoint = event->mapToGraphicsScene(panGesture->hotSpot());
-        if (panGesture->state() == Qt::GestureStarted) {
-            foreach (HbToolButton *button, d->mVisibleToolButtons) {
-                if (button->isDown()) {
-                    d->mPressedDownButton = button;
-                    break;
-                }
-            }
-            if (d->moreExtensionButton && d->moreExtensionButton->isDown()) {
-                d->mPressedDownButton = d->moreExtensionButton;
-            }
-        } else if (panGesture->state() == Qt::GestureUpdated) {
-            if (mapRectToScene(boundingRect()).contains(scenePoint)) {
-                // moving inside the tool bar
-                if (!d->mPressedDownButton ||
-                    !mapRectToScene(d->mPressedDownButton->geometry()).contains(scenePoint)) {
-                    if (d->mPressedDownButton) {
-                        // lift it up and try to find some other button
-                        d->mPressedDownButton->setDown(false);
-                        d->mPreviouslyPressedDownButton = d->mPressedDownButton;
-                        d->mPressedDownButton = 0;
-                    }
+
+}
 
-                    // Find the pressed button
-                    foreach (HbToolButton *button, d->mVisibleToolButtons) {
-                        if (button->action()->isEnabled() &&
-                            mapRectToScene(button->geometry()).contains(scenePoint)) {
-                            d->mPressedDownButton = button;
-                            HbWidgetFeedback::triggered(button, Hb::InstantDraggedOver);
-                            button->setDown(true);
-                            break;
-                        }
-                    }
-                    if (d->moreExtensionButton && d->moreExtensionButton->isVisible() &&
-                        mapRectToScene(d->moreExtensionButton->geometry()).contains(scenePoint)) {
-                        d->mPressedDownButton = d->moreExtensionButton;
-                        HbWidgetFeedback::triggered(d->moreExtensionButton, Hb::InstantDraggedOver);
-                        d->moreExtensionButton->setDown(true);
-                    }
-                }
-            } else {
-                // moving outside the tool bar
-
-                // if a button is pressed down, lift it.
-                if (d->mPressedDownButton) {
-                    d->mPressedDownButton->setDown(false);
-                    d->mPressedDownButton = 0;
-                    d->mPreviouslyPressedDownButton = d->mPressedDownButton;
-                }
-            }
-        } else if (panGesture->state() == Qt::GestureFinished) {
-            if (d->mPressedDownButton && !d->mPreviouslyPressedDownButton) {
-                // Generate tap gesture to the button
-                QGesture *gesture = new QTapGesture();
-                gesture->setHotSpot(panGesture->hotSpot());
-                QList<QGesture *> list;
-                list.append(gesture);
-                QGestureEvent *event = new QGestureEvent(list);
-                QCoreApplication::sendEvent(d->mPressedDownButton, event);                
-                d->mPressedDownButton = 0;
-            } else if (d->mPressedDownButton) {
-                d->mPressedDownButton->setDown(false);
-                HbWidgetFeedback::triggered( d->mPressedDownButton, Hb::InstantClicked );
-            }
-            d->mPreviouslyPressedDownButton = 0;
-        }
-        event->accept(panGesture);
-    } else {
-        event->ignore();
+void HbToolBar::updatePrimitives()
+{
+    Q_D(HbToolBar);
+    for (int i = 0; i < d->mVisibleToolButtons.count(); i++) {
+        d->mVisibleToolButtons.at(i)->updatePrimitives();
+    }
+    if (d->moreExtensionButton) {
+        d->moreExtensionButton->updatePrimitives();
     }
 }
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gui/hbtoolbar.h
--- a/src/hbcore/gui/hbtoolbar.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gui/hbtoolbar.h	Mon May 03 12:48:33 2010 +0300
@@ -56,6 +56,7 @@
 
     Qt::Orientation orientation() const;
 
+    void updatePrimitives();
     enum { Type = Hb::ItemType_ToolBar };
     int type() const { return Type; }
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gui/hbtoolbar_p.cpp
--- a/src/hbcore/gui/hbtoolbar_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gui/hbtoolbar_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -322,11 +322,15 @@
         bool movingFromExtension = moreExtension && (button->parentItem() == moreExtension->contentWidget());
         setExtensionLayout(button, false);
         // tool buttons should eat all the space in the toolbar
-        button->setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored));
+        if (mOrientation == Qt::Horizontal)
+            button->setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Preferred));
+        else
+            button->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Ignored));
+
         if (movingFromExtension){
             QObject::disconnect(button->action(), SIGNAL(triggered(bool) ),
                                 moreExtension, SLOT(close()));
-            HbToolButtonPrivate::d_ptr(button)->setBackgroundVisible(true);
+            HbToolButtonPrivate::d_ptr(button)->setExtensionBackgroundVisible(false);
             polishButtons = true;
         }
         button->setParentItem(q);
@@ -345,6 +349,7 @@
     foreach(HbToolButton *button, mToolButtons) {
         if (button->action()->isVisible()) {
             mVisibleToolButtons.append(button);
+            button->setVisible(true);
         } else {
             button->setVisible(false);
         }
@@ -411,8 +416,8 @@
     if (moreExtension) {
         HbToolBarExtensionPrivate::d_ptr(moreExtension)->mToolButtons.clear();
         HbToolBarExtensionPrivate::d_ptr(moreExtension)->contentWidget->setLayout(0);
+        moreExtensionButton->action()->setVisible(moreButtonNeeded);
         moreExtensionButton->setVisible(moreButtonNeeded);
-        moreExtensionButton->action()->setVisible(moreButtonNeeded);
     }
     else if (moreButtonNeeded && !moreExtension)  {
         moreExtension = new HbToolBarExtension();
@@ -420,7 +425,6 @@
         moreExtensionButton->setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored));
 
         HbIcon extensionIcon("qtg_mono_more");
-        extensionIcon.setColor(HbColorScheme::color("foreground"));
         moreExtension->extensionAction()->setIcon(extensionIcon);
         initToolBarExtension(moreExtension);
         HbToolButtonPrivate::d_ptr(moreExtensionButton)->setToolBarPosition(
@@ -498,6 +502,7 @@
         mDoLayoutPending = false;
         return;
     }
+
     if (mDoLayoutPending){
         if (!mToolButtons.count()){
             foreach(QAction *action, q->actions()) {
@@ -512,7 +517,16 @@
         return;
     }
     //Saving minimumSize for the more button calculations
-    if (!minimumToolButtonSize.isValid()) {
+    bool firstButton =  mToolButtons.count() == 1 ? true : false;
+
+    // Recalculate minimum button size when adding first button.
+    // minimumToolButtonSize might have wrong value incase it has been
+    // calculated earlier using button which have been deleted.
+    if (!minimumToolButtonSize.isValid() || firstButton ) {
+        if (mVisibleToolButtons.count() > 0)
+            q->setVisible(true); // The toolbar must be set visible in order to correctly
+                                 // calculate minimum button size in all situations (also when
+                                 // the toolbar was hidden).
         calculateButtonMinimumSize();
     }
 
@@ -520,12 +534,12 @@
     calculateMaximumButtons();
     int visibleItemsCount = mVisibleToolButtons.count();
     bool moreButtonNeeded = visibleItemsCount > maxToolBarButtons;
+
     if (moreButtonNeeded ||
         (moreExtensionButton && moreExtensionButton->action()->isVisible() != moreButtonNeeded)) {
         updateExtension(moreButtonNeeded);
     }
 
-
     mLayout = new QGraphicsLinearLayout( q->orientation() );
     mLayout->setSpacing(0);
     mLayout->setContentsMargins(0,0,0,0);
@@ -603,15 +617,20 @@
     for (int i = 0; i < mToolButtons.count(); i++) {
         button = mToolButtons.at(i);
         if (button->action() == event->action()) {         
-            mToolButtons.removeAt(i);
+            mToolButtons.removeAt(i);            
             // Emit signal when the only action is removed
             if (mToolButtons.count() == 0) {
                 if (moreExtensionButton)
                     moreExtensionButton->setVisible(false);
+                mVisibleToolButtons.clear();
+                delete button;
+                q->setLayout(0);
+                mLayout = 0;
                 //reset toolbar size
                 q->resize(0, 0);
                 if (q->isVisible())
                     QMetaObject::invokeMethod(&core, "visibilityChanged", Qt::QueuedConnection);
+                return;
             }
             break;
         }
@@ -818,7 +837,7 @@
                              QVariant(), extRect)) {
             delayedHide = false;
         }
-    } else {
+    } else if (parentItem) {
         QRectF extRect(-q->boundingRect().width(),
                        parentItem->boundingRect().height() - q->boundingRect().height(),
                        q->boundingRect().width(),
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gui/hbtoolbarextension.cpp
--- a/src/hbcore/gui/hbtoolbarextension.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gui/hbtoolbarextension.cpp	Mon May 03 12:48:33 2010 +0300
@@ -83,6 +83,7 @@
         mColsPortrait(3),
         mColsLandscape(4),
         lazyInitDone(false),
+        orientationConnectDone(false),
         //
         mExtendedButton(0),
         mToolBar(0)
@@ -147,7 +148,6 @@
     int column (0);
     int row(0);
     initialiseContent();
-
     if (!mDefaultContentWidget)
         return;
 
@@ -167,7 +167,7 @@
             if ( row >= maxRow ) {
                 qWarning() << "Too many items in extension!";
             }
-            HbToolButtonPrivate::d_ptr(button)->setBackgroundVisible(false);
+            HbToolButtonPrivate::d_ptr(button)->setExtensionBackgroundVisible(true);
             mLayout->addItem( button, row, column );
             ++j;
         }
@@ -294,6 +294,7 @@
             HbToolBarExtensionPrivate::d_ptr(q)->setAlignment(Qt::AlignRight);
         }
     }
+    q->repolish();
     doLayout();
 }
 
@@ -327,6 +328,7 @@
  */
 HbToolBarExtension::~HbToolBarExtension()
 {
+    disconnect();
 }
 
 /*!
@@ -484,7 +486,13 @@
 {
     Q_D(HbToolBarExtension);
     if (change == QGraphicsItem::ItemVisibleHasChanged) {
-        if (value.toBool() == true) {
+        if (value.toBool()) {
+            HbMainWindow* w(mainWindow());
+            if(w && !d->orientationConnectDone) {
+                QObject::connect(w,SIGNAL(orientationChanged(Qt::Orientation)),
+                                 this, SLOT(_q_orientationChanged()));
+                d->orientationConnectDone = true;
+            }
             d->placeToolBarExtension();
         }
     }
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gui/hbtoolbarextension_p.h
--- a/src/hbcore/gui/hbtoolbarextension_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gui/hbtoolbarextension_p.h	Mon May 03 12:48:33 2010 +0300
@@ -66,6 +66,7 @@
     int   mColsPortrait;
     int   mColsLandscape;
     bool  lazyInitDone;
+    bool  orientationConnectDone;
 
 private:
     HbToolButton *mExtendedButton;
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gui/hbtoolbutton.cpp
--- a/src/hbcore/gui/hbtoolbutton.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gui/hbtoolbutton.cpp	Mon May 03 12:48:33 2010 +0300
@@ -35,6 +35,10 @@
 #include "hbcolorscheme.h"
 #include "hbtextitem.h"
 #include "hbiconitem.h"
+#include "hbview.h"
+#include "hbmainwindow.h"
+
+#include "hbglobal_p.h" // remove when removing HB_DEPRECATED
 
 #include <QGraphicsSceneHelpEvent>
 #include <QGraphicsSceneMouseEvent>
@@ -77,6 +81,7 @@
 
 /*!
     \enum HbToolButton::ToolButtonStyle
+    \deprecated HbToolButton::ToolButtonStyle
 
     This enum defines available tool button styles.
 
@@ -85,18 +90,21 @@
 
 /*!
     \var HbToolButton::ToolButtonIcon
+    \deprecated HbToolButton::ToolButtonIcon
 
     Only display the icon.
  */
 
 /*!
     \var HbToolButton::ToolButtonText
+    \deprecated HbToolButton::ToolButtonText
 
     Only display the text.
  */
 
 /*!
     \var HbToolButton::ToolButtonTextAndIcon
+    \deprecated HbToolButton::ToolButtonTextAndIcon
 
     Display both text and icon.
  */
@@ -123,6 +131,7 @@
     toolBarPosition(HbStyleOptionToolButton::TB_None),
     orientation(Qt::Vertical),
     mDialogToolBar(false),
+    toolbarExtensionFrame(false),
     mButtonSize(QSizeF())
 {    
 }
@@ -134,9 +143,8 @@
 void HbToolButtonPrivate::createPrimitives()
 {
     Q_Q(HbToolButton);
-    
     if (backgroundVisible) {
-        if (!frameItem) {
+        if (!frameItem){
             frameItem = q->style()->createPrimitive(HbStyle::P_ToolButton_frame, q);
         }
     } else if (frameItem) {
@@ -189,6 +197,18 @@
     }    
 }
 
+void HbToolButtonPrivate::setExtensionBackgroundVisible(bool visible)
+{
+    Q_Q(HbToolButton);
+    if (toolbarExtensionFrame != visible) {
+        toolbarExtensionFrame = visible;
+        // required to make extension orientation switch from
+        // landscape to portrait work correctly with automatic more
+        // extension.
+        q->repolish();
+    }
+}
+
 void HbToolButtonPrivate::setBackgroundVisible(bool visible)
 {
     Q_Q(HbToolButton);
@@ -244,7 +264,7 @@
         buttonStyle = HbToolButton::ToolButtonText;
     }
     // action text/icon may have changed,            
-    if (q->isVisible() && polished) {
+    if (polished) {
         q->repolish();
     }
 }
@@ -356,6 +376,9 @@
 }
 
 /*!
+ \deprecated HbToolButton::toolButtonStyle() const
+         is deprecated.
+
     @beta
     Returns the tool button style.
 
@@ -365,11 +388,16 @@
  */
 HbToolButton::ToolButtonStyle HbToolButton::toolButtonStyle() const
 {
+    HB_DEPRECATED("HbToolButton::toolButtonStyle() is deprecated.");
+
     Q_D(const HbToolButton);
     return d->buttonStyle;
 }
 
 /*!
+ \deprecated HbToolButton::setToolButtonStyle(HbToolButton::ToolButtonStyle)
+         is deprecated.
+
     @beta
     Sets the tool button style.
 
@@ -377,6 +405,8 @@
  */
 void HbToolButton::setToolButtonStyle(HbToolButton::ToolButtonStyle style)
 {    
+    HB_DEPRECATED("HbToolButton::setToolButtonStyle(HbToolButton::ToolButtonStyle style) is deprecated.");
+
     Q_D(HbToolButton);
     if (d->buttonStyle != style) {
         d->buttonStyle = style;
@@ -390,6 +420,10 @@
 }
 
 /*!
+
+    \deprecated HbToolButton::primitive(HbStyle::Primitive)
+         is deprecated.
+
     \reimp
  */
 QGraphicsItem *HbToolButton::primitive(HbStyle::Primitive primitive) const
@@ -449,9 +483,9 @@
     subclasses when they need a HbStyleOptionToolButton, but don't want to fill in all the
     information themselves.
  */
-void HbToolButton::initStyleOption(HbStyleOptionToolButton *option) const
+void HbToolButton::initStyleOption(HbStyleOptionToolButton *option)
 {
-    Q_D(const HbToolButton);
+    Q_D(HbToolButton);
     HbAbstractButton::initStyleOption(option);
 
     Q_ASSERT(option);
@@ -461,10 +495,17 @@
     option->orientation = d->orientation;
     option->isCheckable = d->checkable;
     option->useSecondaryGraphics = d->mDialogToolBar;
+    option->useTransparentGraphics = false;
+    if (mainWindow() && mainWindow()->currentView()) {
+        if (mainWindow()->currentView()->viewFlags() & HbView::ViewTitleBarTransparent) {
+            option->useTransparentGraphics = true;
+        }
+    }
 
     if (d->action) {
         option->text = d->action->text();
-        option->icon = d->action->icon();
+        option->icon = d->action->icon();        
+        option->isToolBarExtension = d->toolbarExtensionFrame;
     }
 }
 
@@ -494,26 +535,6 @@
 /*!
     \reimp
  */
-void HbToolButton::mousePressEvent(QGraphicsSceneMouseEvent *event)
-{
-    HbAbstractButton::mousePressEvent(event);
-    setProperty("state", "pressed");
-    updatePrimitives();
-}
-
-/*!
-    \reimp
- */
-void HbToolButton::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
-{
-    HbAbstractButton::mouseReleaseEvent(event);
-    setProperty("state", "normal");
-    updatePrimitives();
-}
-
-/*!
-    \reimp
- */
 void HbToolButton::nextCheckState()
 {
     Q_D(HbToolButton);
@@ -532,27 +553,28 @@
 /*!
     \reimp
  */
+bool HbToolButton::sceneEvent(QEvent *event)
+{
+    if (event->type() == QEvent::GraphicsSceneHelp) {
+        Q_D(HbToolButton);
+        // Check whether toolbutton is inside a toolbar.
+        if (d->toolBarPosition != HbStyleOptionToolButton::TB_None) {
+            d->showToolTip();
+            event->accept();
+            return true;
+        }
+    }
+    return HbAbstractButton::sceneEvent(event);
+}
+
+/*!
+    \reimp
+ */
 bool HbToolButton::event(QEvent *event)
 {
-    if (event) {
-        switch (event->type()) {
-            case QEvent::GraphicsSceneMouseRelease: {
-                mouseReleaseEvent(static_cast<QGraphicsSceneMouseEvent*>(event));
-                return true;
-            }
-            case QEvent::GraphicsSceneHelp: {
-                    Q_D(HbToolButton);                    
-                    // Check whether toolbutton is inside a toolbar.
-                    if (d->toolBarPosition != HbStyleOptionToolButton::TB_None) {
-                        d->showToolTip();
-                        event->accept();
-                        return true;
-                    }
-                }
-                break;
-
-        default: break;
-        }
+    if (event->type() == QEvent::GraphicsSceneMouseRelease) {
+        mouseReleaseEvent(static_cast<QGraphicsSceneMouseEvent*>(event));
+        return true;
     }
 
     return HbAbstractButton::event(event);
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gui/hbtoolbutton.h
--- a/src/hbcore/gui/hbtoolbutton.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gui/hbtoolbutton.h	Mon May 03 12:48:33 2010 +0300
@@ -75,13 +75,12 @@
 protected:
     HbToolButton( HbToolButtonPrivate &dd, QGraphicsItem *parent );
 
-    void initStyleOption( HbStyleOptionToolButton *option ) const;
-    void mousePressEvent( QGraphicsSceneMouseEvent *event );
-    void mouseReleaseEvent( QGraphicsSceneMouseEvent *event );
+    void initStyleOption( HbStyleOptionToolButton *option );
     void resizeEvent( QGraphicsSceneResizeEvent *event );
     void nextCheckState();
     bool event( QEvent *event );
     void polish(HbStyleParameters &params);
+    bool sceneEvent(QEvent *event);
 
 private:
     Q_DECLARE_PRIVATE_D( d_ptr, HbToolButton )
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gui/hbtoolbutton_p.h
--- a/src/hbcore/gui/hbtoolbutton_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gui/hbtoolbutton_p.h	Mon May 03 12:48:33 2010 +0300
@@ -59,6 +59,7 @@
     void setOrientation( Qt::Orientation orientation );
     void setToolBarPosition( HbStyleOptionToolButton::ToolBarPosition position );
     void setBackgroundVisible( bool visible );
+    void setExtensionBackgroundVisible( bool visible );
     void setLayoutProperty(const char *name, bool value);
     QSizeF getMinimumSize();
 
@@ -75,11 +76,11 @@
     Qt::Orientation orientation;
 
     bool mDialogToolBar;
+    bool toolbarExtensionFrame;
 
     void _q_actionTriggered();
     void _q_actionChanged();
 
-    // TODO: Remove when tooltip show/hide working
     void showToolTip();
 
     QSizeF mButtonSize;
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gui/hbtooltiplabel_p.cpp
--- a/src/hbcore/gui/hbtooltiplabel_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gui/hbtooltiplabel_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -49,7 +49,8 @@
 }
 
 HbToolTipLabelPrivate::HbToolTipLabelPrivate():
-        label(0),aboutToHide(false)
+        label(0), aboutToHide(false),
+        mHorizontalMargin(0.0), mVerticalMargin(0.0), mPolishLayoutRequest(false)
 {
 }
 
@@ -151,88 +152,49 @@
 {
     Q_Q(HbToolTipLabel);    
     QRectF itemSceneRect = item->sceneBoundingRect();    
-    QRectF toolTipBoundingRect = QRectF(qreal(0.0), qreal(0.0), q->preferredSize().width(), q->preferredSize().height()); //q->boundingRect();
+    QRectF toolTipBoundingRect = QRectF(qreal(0.0), qreal(0.0),
+                                        q->preferredSize().width(), q->preferredSize().height());
     QRectF screenRect(QPointF(qreal(0.0), qreal(0.0)), HbDeviceProfile::profile(q).logicalSize());
 
     Qt::Alignment currentAlignment = (preferredAlignment & Qt::AlignHorizontal_Mask)?
                                      QStyle::visualAlignment(q->layoutDirection(), preferredAlignment ): // krazy:exclude=qclasses
                                      preferredAlignment;
-    Qt::AlignmentFlag nextAlignmentFlag;
-    Qt::Alignment nextAlignment;
-    Qt::Alignment visitedAlignment;
+
     bool matchingFinished = false;
 
-    forever {
-
-        toolTipBoundingRect.moveCenter(itemSceneRect.center());
-
-        if (currentAlignment & Qt::AlignTop) {            
-            visitedAlignment |= Qt::AlignTop;
-            if (currentAlignment & Qt::AlignRight) {
-                visitedAlignment |= Qt::AlignRight;
-                toolTipBoundingRect.moveBottomLeft(itemSceneRect.topRight());
-
-                nextAlignment = Qt::AlignTop;
-                nextAlignmentFlag = Qt::AlignLeft;
-                nextAlignment |= nextAlignmentFlag;
-
-            } else if (currentAlignment & Qt::AlignLeft) {
-                visitedAlignment |= Qt::AlignLeft;
-                toolTipBoundingRect.moveBottomRight(itemSceneRect.topLeft());
-
-                nextAlignment = Qt::AlignTop;
-                nextAlignmentFlag = Qt::AlignRight;
-                nextAlignment |= nextAlignmentFlag;
-
-            } else {
-                toolTipBoundingRect.moveBottom(itemSceneRect.top());
-
-                // Find out next alignment
-                nextAlignment = Qt::AlignRight | (preferredAlignment & Qt::AlignAbsolute);
-                nextAlignment = QStyle::visualAlignment(q->layoutDirection(), nextAlignment ); // krazy:exclude=qclasses
-                nextAlignmentFlag = ((nextAlignment & Qt::AlignRight)?Qt::AlignRight:Qt::AlignLeft);
-            }
-
-        } else if (currentAlignment & Qt::AlignRight) {
-
-            visitedAlignment |= Qt::AlignRight;
-            toolTipBoundingRect.moveLeft(itemSceneRect.right());
-            nextAlignment = nextAlignmentFlag = Qt::AlignLeft;
-
-        } else if (currentAlignment & Qt::AlignLeft ) {
-
-            visitedAlignment |= Qt::AlignLeft;
-            toolTipBoundingRect.moveRight(itemSceneRect.left());
-            nextAlignment = nextAlignmentFlag = Qt::AlignRight;
-
-        } else {
-            currentAlignment = Qt::AlignTop;
-            continue;
+    if (currentAlignment & Qt::AlignTop) {        
+        if ((itemSceneRect.y() - mVerticalMargin - toolTipBoundingRect.height()) >= 0) {
+            q->setPreferredPos(QPointF(itemSceneRect.x() + item->boundingRect().width()/2,
+                                       itemSceneRect.y() - mVerticalMargin),
+                               HbPopup::BottomEdgeCenter);
+            matchingFinished = true;
         }
 
-        // Respect screen boundaries
-        toolTipBoundingRect.moveBottom(qMin(toolTipBoundingRect.bottom(),screenRect.bottom()));
-        toolTipBoundingRect.moveLeft(qMax(toolTipBoundingRect.left(),screenRect.left()));
-        toolTipBoundingRect.moveRight(qMin(toolTipBoundingRect.right(),screenRect.right()));
-        toolTipBoundingRect.moveTop(qMax(toolTipBoundingRect.top(),screenRect.top()));
-
-        // Check if a match is found or if matching was finished
-        if (!toolTipBoundingRect.intersects(itemSceneRect) || matchingFinished) {
-            break;
-        }
-        else { // move to the next alignment
-
-            // Check if every supported alignment was tried
-            if (visitedAlignment & nextAlignmentFlag) {
-                   currentAlignment = Qt::AlignTop;
-                   matchingFinished = true;
-            } else {
-                currentAlignment = nextAlignment;
-            }
+    }
+    if (currentAlignment & Qt::AlignRight || !matchingFinished) {        
+        if ((itemSceneRect.x() + item->boundingRect().width() +
+             mHorizontalMargin + toolTipBoundingRect.width()) <= screenRect.width()) {
+            q->setPreferredPos(QPointF(itemSceneRect.x() + item->boundingRect().width() + mHorizontalMargin,
+                                       itemSceneRect.y() +  item->boundingRect().height()/2),
+                               HbPopup::LeftEdgeCenter);
+            matchingFinished = true;
         }
     }
+    if (currentAlignment & Qt::AlignLeft || !matchingFinished) {        
+        if ((itemSceneRect.x() - mHorizontalMargin - toolTipBoundingRect.width()) >= 0) {
+            q->setPreferredPos(QPointF(itemSceneRect.x() - mHorizontalMargin,
+                                       itemSceneRect.y() +  item->boundingRect().height()/2),
+                               HbPopup::RightEdgeCenter);
+            matchingFinished = true;
+        }
+    }
+    //Using AlignTop as default
+    if (!matchingFinished) {
+        q->setPreferredPos(QPointF(itemSceneRect.x() + item->boundingRect().width()/2,
+                                   itemSceneRect.y() - mVerticalMargin),
+                           HbPopup::BottomEdgeCenter);
+    }
 
-    q->setPos(toolTipBoundingRect.topLeft());
     q->show();
 }
 
@@ -287,8 +249,6 @@
                 case QEvent::GraphicsSceneHoverEnter:
                 case QEvent::GraphicsSceneHoverLeave:
                 case QEvent::GraphicsSceneHoverMove:
-                case QEvent::KeyPress:
-                case QEvent::KeyRelease:
                 case QEvent::FocusIn:
                 case QEvent::FocusOut:
 
@@ -409,6 +369,7 @@
 /*
     reimp
 */
+#include <QDebug>
 bool HbToolTipLabel::event(QEvent *event)
 {
     Q_D(HbToolTipLabel);
@@ -416,15 +377,40 @@
         if (d->label) {
             d->label->setFont(font());
         }
-    } else if (event->type() == QEvent::LayoutRequest) {        
-        if (d->label) {
-            resize(preferredSize());
-            d->label->resize(d->label->preferredSize());
-        }
-        if (isVisible()) {
-            showText(d->mItem, d->mPreferredAlignment);
+    } else if (event->type() == QEvent::LayoutRequest) {
+        if (isVisible() && d->mPolishLayoutRequest) {
+            d->mPolishLayoutRequest = false;
+            d->showText(d->mItem, d->mPreferredAlignment);
         }
     }
     return HbPopup::event(event);
 }
 
+/*
+    reimp
+*/
+void HbToolTipLabel::polish(HbStyleParameters &params)
+{
+    Q_D(HbToolTipLabel);
+    const QString HorizontalMargin = "horizontal-margin";
+    const QString VerticalMargin = "vertical-margin";
+    const QString ScreenMargin = "screen-margin";
+
+    params.addParameter(HorizontalMargin);
+    params.addParameter(VerticalMargin);
+    params.addParameter(ScreenMargin);
+
+    HbPopup::polish(params);
+
+    if (params.value(HorizontalMargin).isValid()) {
+        d->mHorizontalMargin = params.value(HorizontalMargin).toReal();
+    }
+    if (params.value(VerticalMargin).isValid()) {
+        d->mVerticalMargin = params.value(VerticalMargin).toReal();
+    }
+    if (params.value(ScreenMargin).isValid()) {
+        d->mScreenMargin = params.value(ScreenMargin).toReal();
+    }
+    d->mPolishLayoutRequest = true;
+}
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gui/hbtooltiplabel_p.h
--- a/src/hbcore/gui/hbtooltiplabel_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gui/hbtooltiplabel_p.h	Mon May 03 12:48:33 2010 +0300
@@ -57,6 +57,7 @@
 protected:    
     void timerEvent (QTimerEvent *event);
     bool event(QEvent *event);
+    void polish(HbStyleParameters &params);
 
 private:
     Q_DECLARE_PRIVATE_D(d_ptr, HbToolTipLabel)
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gui/hbtooltiplabel_p_p.h
--- a/src/hbcore/gui/hbtooltiplabel_p_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gui/hbtooltiplabel_p_p.h	Mon May 03 12:48:33 2010 +0300
@@ -60,6 +60,9 @@
     bool aboutToHide;
     QGraphicsItem *mItem;
     Qt::Alignment mPreferredAlignment;
+    qreal mHorizontalMargin;
+    qreal mVerticalMargin;
+    bool mPolishLayoutRequest;
 
 private:
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gui/hbview.cpp
--- a/src/hbcore/gui/hbview.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gui/hbview.cpp	Mon May 03 12:48:33 2010 +0300
@@ -635,7 +635,7 @@
 }
 
 /*!
-    \deprecated HbView::titleBarFlags()
+    \deprecated HbView::titleBarFlags() const
         is deprecated. Use HbView::viewFlags() instead.
 
     Returns titlebar flags bit vector.
@@ -697,24 +697,37 @@
     HbView::HbViewFlags originalFlags(d->mViewFlags);
     d->mViewFlags = flags;
     if (mainWindow()) {
+
+        // Statusbar-animation
         bool statusBarAnimating = false;
-        HbStatusBar *statusBar = HbMainWindowPrivate::d_ptr(mainWindow())->mStatusBar;
+        HbStatusBar *statusBar = HbMainWindowPrivate::d_ptr(mainWindow())->mStatusBar;        
         if ((d->mViewFlags & HbView::ViewStatusBarHidden) && statusBar->isVisible()) {
-             HbEffect::start(statusBar, "statusbar", "disappear", this, "statusBarEffectFinished"); 
-             statusBarAnimating = true;
+#ifdef HB_EFFECTS
+            HbEffect::start(statusBar, "statusbar", "disappear", this, "statusBarEffectFinished");
+#endif // HB_EFFECTS
+            statusBarAnimating = true;
         } else if (!(d->mViewFlags & HbView::ViewStatusBarHidden) && !statusBar->isVisible()) {
-             HbEffect::start(statusBar, "statusbar", "appear", this, "statusBarEffectFinished");
-             statusBarAnimating = true;
+#ifdef HB_EFFECTS
+            HbEffect::start(statusBar, "statusbar", "appear", this, "statusBarEffectFinished");
+#endif // HB_EFFECTS
+            statusBarAnimating = true;
         }
+
+        // Titlebar-animation
         bool titleBarAnimating = false;
         HbTitleBar *titleBar = HbMainWindowPrivate::d_ptr(mainWindow())->mTitleBar;
         if ((d->mViewFlags & HbView::ViewTitleBarHidden) && titleBar->isVisible()) {
-             HbEffect::start(titleBar, "titleBar", "disappear", this, "titleBarEffectFinished");
-             titleBarAnimating = true;
+#ifdef HB_EFFECTS
+            HbEffect::start(titleBar, "titleBar", "disappear", this, "titleBarEffectFinished");
+#endif // HB_EFFECTS
+            titleBarAnimating = true;
         } else if (!(d->mViewFlags & HbView::ViewTitleBarHidden) && !titleBar->isVisible()) {
-             HbEffect::start(titleBar, "titleBar", "appear", this, "titleBarEffectFinished");
-             titleBarAnimating = true;
+#ifdef HB_EFFECTS
+            HbEffect::start(titleBar, "titleBar", "appear", this, "titleBarEffectFinished");
+#endif // HB_EFFECTS
+            titleBarAnimating = true;
         }
+
         if (!statusBarAnimating) {
             statusBar->setVisible(!(d->mViewFlags & HbView::ViewStatusBarHidden));
             statusBar->propertiesChanged();
@@ -728,7 +741,28 @@
             }
             titleBar->propertiesChanged();
         }
-       
+        if (d->toolBar) {
+            d->toolBar->updatePrimitives();
+        }
+
+        // Statusbar-visibility
+        if ( statusBar->isVisible() ){
+            d->mVisibleItems |= Hb::StatusBarItem;
+            d->mVisibleItemsSet = true;
+        } else {
+            d->mVisibleItems &= ~Hb::StatusBarItem;
+            d->mVisibleItemsSet = true;
+        }
+
+        // Titlebar-visibility
+        if (titleBar->isVisible()){
+            d->mVisibleItems |= Hb::TitleBarItem;
+            d->mVisibleItemsSet = true;
+        }else{
+            d->mVisibleItems &= ~Hb::TitleBarItem;
+            d->mVisibleItemsSet = true;
+        }
+
         // Repolish the screen if needed
         int visibilityFlags = HbView::ViewTitleBarMinimized | HbView::ViewTitleBarFloating 
             | HbView::ViewTitleBarMinimizable | HbView::ViewStatusBarHidden | HbView::ViewStatusBarFloating;
@@ -746,12 +780,8 @@
     Q_D(HbView);
     if (visible) {
         setViewFlags(d->mViewFlags &~ HbView::ViewTitleBarHidden);
-        d->mVisibleItems |= Hb::TitleBarItem;
-        d->mVisibleItemsSet = true;
     } else {
         setViewFlags(d->mViewFlags | HbView::ViewTitleBarHidden);
-        d->mVisibleItems &= ~Hb::TitleBarItem;
-        d->mVisibleItemsSet = true;
     }  
 }
 
@@ -763,12 +793,8 @@
     Q_D(HbView);
     if (visible) {
         setViewFlags(d->mViewFlags &~ HbView::ViewStatusBarHidden);
-        d->mVisibleItems |= Hb::StatusBarItem;
-        d->mVisibleItemsSet = true;
     } else {
         setViewFlags(d->mViewFlags | HbView::ViewStatusBarHidden);
-        d->mVisibleItems &= ~Hb::StatusBarItem;
-        d->mVisibleItemsSet = true;
     }
 }
 
@@ -845,6 +871,7 @@
     return menu;
 }
 
+#ifdef HB_EFFECTS
 /*
     Handles effect finished event for title bar animation    
  */
@@ -890,6 +917,7 @@
         }
     }
 }
+#endif // HB_EFFECTS
 
 /*!
   Returns the currently set navigation action or 0 if there is none.
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gui/hbwidget.cpp
--- a/src/hbcore/gui/hbwidget.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gui/hbwidget.cpp	Mon May 03 12:48:33 2010 +0300
@@ -42,10 +42,6 @@
 #include <QGraphicsLayout>
 #include <QInputContext>
 
-#ifdef HB_GESTURE_FW
-#include <QGestureEvent>
-#endif
-
 #ifdef HB_TESTABILITY
 /*!
     \internal
@@ -119,6 +115,10 @@
 }
 
 /*
+    
+    \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
@@ -232,8 +232,8 @@
 
     HbFocusGroup *group = getFocusGroup();
 
-    // Do not show focus if there is no focus group or the flag is NeverOn.
-    if (!group || (group && (group->focusParameters() == HbFocusGroup::NeverOn))) {
+    // Do not show focus if there is focus group and the flag is NeverOn.
+    if (group && (group->focusParameters() == HbFocusGroup::NeverOn)) {
         return;
     }
 
@@ -768,14 +768,6 @@
             }
             return true;
 
-#ifdef HB_GESTURE_FW
-        case QEvent::Gesture:
-            gestureEvent(static_cast<QGestureEvent *>(event));
-            if(!(static_cast<QGestureEvent *>(event))->isAccepted()) {
-                return false;
-            }
-            break;
-#endif
         default:
             if (event->type() == HbEvent::ChildFocusIn) {
                 QGraphicsWidget *parentW = parentWidget();
@@ -987,12 +979,9 @@
 }
 
 /*!
-    This is the default implementation of style primitive accessing. As a default it always returns NULL. 
-    Hb widgets can reimplement this method to offer access to style primitives (e.g. button's label or icon). 
-    This can be used for example for creating custom effects for parts of the widget.
 
-    \param primitive The primitive enumeration by which the widget returns the QGraphicsItem.
-    \return QGraphicsItem* pointer to GraphicsItem that matches the given primitive enumeration
+    \deprecated HbWidget::primitive(HbStyle::Primitive)
+        is deprecated. Use HbWidget::primitive(const QString) instead.
 */
 QGraphicsItem *HbWidget::primitive(HbStyle::Primitive primitive) const
 {
@@ -1011,6 +1000,38 @@
 }
 
 /*!
+    This is the default implementation of style primitive accessing. The method iterates through all widget's child items
+    and returns the child QGraphicsItem matching to \a itemName parameter. The \a itemName parameter matches to the 
+    item names set by the HbStyle::setItemName(). The item name should match with widget's WidgetML CSS definition.
+
+    Hb widgets can reimplement this method to do optimized lookup of primitives meaning that widget's implementation of this 
+    method will return correct primitives without going through all child items.
+
+    The returned QGraphicsItem can be used for example to perform an application-specific effect for widget's primitive.
+
+    \param itemName The string of the itemName used to search for the primitive.
+    \return QGraphicsItem* pointer to QGraphicsItem that matches the itemName. Returns 0 if not found.
+
+    \sa HbStyle::setItemName(QGraphicsItem *, const QString)
+    \sa HbStyle::itemName()
+*/
+QGraphicsItem *HbWidget::primitive(const QString &itemName) const
+{
+    if ( itemName == "" ) {
+        return 0;
+    } else {
+        QList<QGraphicsItem*> list = childItems();
+        for ( int i = 0 ; i < list.count() ; i++  ) {
+            QGraphicsItem* item = list.at(i);
+            if ( HbStyle::itemName(item) == itemName ) {
+                return item;
+            }
+        }
+    }
+    return 0;
+}
+
+/*!
     Returns primitive which HbStyle::itemName equals to \a itemName.
     
     If the \a itemName is empty, the layout is returned. 
@@ -1298,6 +1319,10 @@
 }
 
 /*
+
+    \deprecated HbWidget::setFocusHighlight(HbStyle::Primitive, HbWidget::FocusHighlight)
+    is deprecated. This method will be made private and should not be used by public API users.
+
     Sets focus primitives defined in HbStyle. If FocusHighlightNone is set both active
     and residual focus primitives are deleted.
 
@@ -1323,6 +1348,10 @@
 }
 
 /*!
+
+    \deprecated HbWidget::focusHighlight(HbWidget::FocusHighlight)
+    is deprecated. This method will be made private and should not be used by public API users.
+
     Returns identifier of the focus primitive defined in HbStyle for focus highlight.
     \param highlightType defines the highlight type.
 */
@@ -1339,7 +1368,12 @@
     return primitive;
 }
 
-/*! Default implementation of a virtual method for overriding instant feedback effects.
+/*! 
+    
+    \deprecated HbWidget::overrideFeedback(Hb::InstantInteraction) const
+        is deprecated. Effect overriding is done via properties.
+
+    Default implementation of a virtual method for overriding instant feedback effects.
     Returns HbFeedback::NoOverride by default.
     Widgets can reimplement this method to override the default feedback effects (if
     there is a strong need not to use the default ones).
@@ -1352,7 +1386,12 @@
     return HbFeedback::NoOverride;
 }
 
-/*! Default implementation of a virtual method for overriding continuous feedback effects.
+/*! 
+
+    \deprecated HbWidget::overrideContinuousFeedback(Hb::ContinuousInteraction, int*) const
+        is deprecated. Effect overriding is done via properties.
+
+    Default implementation of a virtual method for overriding continuous feedback effects.
     Returns HbFeedback::NoContinuousOverride by default.
     Widgets can reimplement this method to override the default continuous feedbacks
     and/or their intensity (if there is a strong need not to use the default ones).
@@ -1368,9 +1407,3 @@
     return HbFeedback::NoContinuousOverride;
 }
 
-#ifdef HB_GESTURE_FW
-void HbWidget::gestureEvent(QGestureEvent *event)
-{
-    event->ignore();
-}
-#endif
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gui/hbwidget.h
--- a/src/hbcore/gui/hbwidget.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gui/hbwidget.h	Mon May 03 12:48:33 2010 +0300
@@ -90,6 +90,7 @@
     HbMainWindow *mainWindow() const;
 
     virtual QGraphicsItem *primitive(HbStyle::Primitive primitive) const;
+    virtual QGraphicsItem *primitive(const QString &itemName) const;
     virtual QGraphicsLayoutItem *layoutPrimitive(const QString &itemName) const;
 
     void setFocusOrientation(Qt::Orientations previous, Qt::Orientations next);
@@ -119,8 +120,8 @@
     void setBackgroundItem(QGraphicsItem *item, int zValue = -1);
     QGraphicsItem *backgroundItem() const;
 
-    virtual HbFeedback::InstantEffect overrideFeedback(Hb::InstantInteraction interaction) const;
-    virtual HbFeedback::ContinuousEffect overrideContinuousFeedback(Hb::ContinuousInteraction interaction, int *intensity) const;
+    virtual HbFeedback::InstantEffect overrideFeedback(Hb::InstantInteraction interaction) const; // deprecated
+    virtual HbFeedback::ContinuousEffect overrideContinuousFeedback(Hb::ContinuousInteraction interaction, int *intensity) const; // deprecated
 
 public slots:
     virtual void recreatePrimitives();
@@ -141,10 +142,6 @@
 
     void setPluginBaseId(int baseId);
 
-#ifdef HB_GESTURE_FW
-    virtual void gestureEvent(QGestureEvent *event);
-#endif
-
 protected:
     HbWidget(HbWidgetPrivate &dd, QGraphicsItem *parent, Qt::WindowFlags wFlags=0);
 private:
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gui/hbwidgetbase.cpp
--- a/src/hbcore/gui/hbwidgetbase.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gui/hbwidgetbase.cpp	Mon May 03 12:48:33 2010 +0300
@@ -171,6 +171,19 @@
     return QGraphicsWidget::event(e);
 }
 
+
+bool HbWidgetBase::sceneEvent(QEvent *event)
+{
+    bool result = QGraphicsWidget::sceneEvent(event);
+    if(!result && event->type() == QEvent::Gesture &&
+       !isBlockedByModalPanel() // workaround for missing panel support in qt
+        ) {
+        gestureEvent(static_cast<QGestureEvent *>(event));
+        return true;
+    }
+    return result;
+}
+
 /*!
  * \reimp
  * Function handles attribute Hb::InsidePopup.
@@ -362,5 +375,19 @@
     option->boundingRect = boundingRect();
 }
 
+/*!
+    This event handler, for \a event, receives gesture events. Its base
+    implementation ignores all gestures delivered in the \a event.
 
+    You can reimplement this handler in a subclass of HbWidgetBase to
+    provide your own custom gesture handling.
 
+    \sa event()
+*/
+void HbWidgetBase::gestureEvent(QGestureEvent *event)
+{
+    event->ignore();
+    foreach(QGesture *g, event->gestures()) {
+        event->ignore(g);
+    }
+}
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gui/hbwidgetbase.h
--- a/src/hbcore/gui/hbwidgetbase.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gui/hbwidgetbase.h	Mon May 03 12:48:33 2010 +0300
@@ -35,6 +35,7 @@
 
 class HbStyleOption;
 class HbWidgetBasePrivate;
+class QGestureEvent;
 
 class HB_CORE_EXPORT HbWidgetBase: public QGraphicsWidget
 {
@@ -63,6 +64,9 @@
     HbWidgetBase(HbWidgetBasePrivate &dd, QGraphicsItem *parent, Qt::WindowFlags wFlags = 0);
 
     QVariant itemChange(GraphicsItemChange change, const QVariant &value);
+    bool sceneEvent(QEvent *event);
+
+    virtual void gestureEvent(QGestureEvent *event);
 
     void initStyleOption(HbStyleOption *option) const;
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gui/hbwidgetbase_p.h
--- a/src/hbcore/gui/hbwidgetbase_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gui/hbwidgetbase_p.h	Mon May 03 12:48:33 2010 +0300
@@ -28,6 +28,7 @@
 
 #include <hbnamespace.h>
 #include <hbwidgetbase.h>
+#include <hbcssinspector_p.h>
 
 #include <QGraphicsItem>
 //
@@ -107,7 +108,9 @@
     friend class HbStylePrivate;
     friend class HbDocumentLoaderActions;
     friend class HbWidgetLoaderActions;
-
+#ifdef HB_CSS_INSPECTOR
+    friend class HbCssInspectorWindow;
+#endif
 };
 
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/hbcore.pro
--- a/src/hbcore/hbcore.pro	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/hbcore.pro	Mon May 03 12:48:33 2010 +0300
@@ -33,7 +33,6 @@
 DEFINES += HB_RESOURCES_DIR=\"\\\"$${HB_RESOURCES_DIR}\\\"\"
 DEFINES += HB_BUILD_DIR=\"\\\"$${HB_BUILD_DIR}\\\"\"
 DEFINES += HB_INSTALL_DIR=\"\\\"$${HB_INSTALL_DIR}\\\"\"
-developer:DEFINES += BUILD_HB_INTERNAL
 *-maemo*:DEFINES += HB_Q_WS_MAEMO
 
 # directories
@@ -74,7 +73,7 @@
 
 CONVENIENCE_HEADERS += $${HB_BUILD_DIR}/include/hbcore/hbcore.h
 CONVENIENCE_HEADERS += $$files($${HB_BUILD_DIR}/include/hbcore/Hb*)
-HEADERS += $$PUBLIC_HEADERS $$INTERNAL_HEADERS $$CONVENIENCE_HEADERS
+HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS $$CONVENIENCE_HEADERS
 
 # installation
 !local {
@@ -84,7 +83,7 @@
     pubheaders.files = $$PUBLIC_HEADERS
     pubheaders.path = $${HB_INCLUDE_DIR}/hbcore
 
-    privheaders.files = $$INTERNAL_HEADERS
+    privheaders.files = $$PRIVATE_HEADERS
     privheaders.path = $${HB_INCLUDE_DIR}/hbcore/private
     convheaders.files = $$CONVENIENCE_HEADERS
     convheaders.path = $${HB_INCLUDE_DIR}/hbcore
@@ -98,9 +97,9 @@
 
 TRANSLATIONS += i18n/translations/directorylocalizer_en_GB.ts
 TRANSLATIONS += i18n/translations/directorylocalizer_de_DE.ts
+TRANSLATIONS += i18n/translations/languages.ts
 
 symbian {
-    defFilePath = ..
     TARGET.EPOCALLOWDLLDATA = 1
     TARGET.CAPABILITY = CAP_GENERAL_DLL
     TARGET.UID3=0x20022EDC
@@ -110,47 +109,49 @@
     # Executable section is now over 4MB in Symbian. Extend it to 8MB
     QMAKE_LFLAGS.ARMCC += --rw-base 0x800000
 
-    INCLUDEPATH += /epoc32/include/osextensions/stdapis/stlport # TODO: depends on S60 version?
-    INCLUDEPATH += /epoc32/include/hwrm # TODO: depends on S60 version?
+    INCLUDEPATH += $${EPOCROOT}epoc32/include/osextensions/stdapis/stlport # TODO: depends on S60 version?
+    INCLUDEPATH += $${EPOCROOT}epoc32/include/hwrm # TODO: depends on S60 version?
     nvg:DEFINES += HB_NVG_CS_ICON
     sgimage:DEFINES += HB_SGIMAGE_ICON
 
     nvg {
-    	include(svgext/svgext.pri)
+        include(svgext/svgext.pri)
         LIBS += -llibOpenVG
         LIBS += -llibOpenVGU
         LIBS += -lsvgengine
         LIBS += -llibegl
     }
     sgimage {
-	INCLUDEPATH += /epoc32/include/platform #For SGImage Support
-	 LIBS += -lsgresource #For SGImage Support
-}
+        INCLUDEPATH += $${EPOCROOT}epoc32/include/platform #For SGImage Support
+        LIBS += -lsgresource #For SGImage Support
+    }
 
     # For avkon code in HbApplication event handling
-    exists(/epoc32/include/domain/middleware) {
-        INCLUDEPATH += /epoc32/include/domain/middleware
+    exists($${EPOCROOT}epoc32/include/domain/middleware) {
+        INCLUDEPATH += $${EPOCROOT}epoc32/include/domain/middleware
     }
-    exists(/epoc32/include/middleware) {
-        INCLUDEPATH += /epoc32/include/middleware
+    exists($${EPOCROOT}epoc32/include/middleware) {
+        INCLUDEPATH += $${EPOCROOT}epoc32/include/middleware
     }
-    exists(/epoc32/include/platform/mw) {
-        INCLUDEPATH += /epoc32/include/platform/mw
+    exists($${EPOCROOT}epoc32/include/platform/mw) {
+        INCLUDEPATH += $${EPOCROOT}epoc32/include/platform/mw
     }
-    exists(/epoc32/include/mw) {
-        INCLUDEPATH += /epoc32/include/mw
+    exists($${EPOCROOT}epoc32/include/mw) {
+        INCLUDEPATH += $${EPOCROOT}epoc32/include/mw
     }
 
     hbExportHeaders(hbcore)
 
-    # HbDirectoryNameLocalizer .qm files export
-    exportqm.path = /epoc32/winscw/c/resource/hbi18n/translations
+    # i18n's .qm files export
+    exportqm.path = $${EPOCROOT}epoc32/winscw/c/resource/hbi18n/translations
     exportqm.sources = $$TRANSLATIONS
     for(file, exportqm.sources) {
         file2 = $$replace(file, .ts, .qm)
         file3 = $${PWD}/$$file2
         BLD_INF_RULES.prj_exports += "$$section(file3, ":", 1) $$exportqm.path/$$basename(file2)"
     }
+    # i18n's other files export
+    BLD_INF_RULES.prj_exports += "$$section(PWD, ":", 1)/i18n/translations/language_list.txt $${EPOCROOT}epoc32/winscw/c/resource/hbi18n/translations/language_list.txt"
 
     LIBS += -lapparc
     LIBS += -lavkon
@@ -164,18 +165,25 @@
     LIBS += -lgdi
     LIBS += -lws32
     LIBS += -lapgrfx
-		
+    LIBS += -lcone
+
     # central repository
-    BLD_INF_RULES.prj_exports += "$$section(PWD, ":", 1)/resources/centralrepository/2002C304.txt /epoc32/data/z/private/10202BE9/2002C304.txt"
-    BLD_INF_RULES.prj_exports += "$$section(PWD, ":", 1)/resources/centralrepository/2002C304.txt /epoc32/release/winscw/udeb/z/private/10202BE9/2002C304.txt"
-    BLD_INF_RULES.prj_exports += "$$section(PWD, ":", 1)/resources/centralrepository/2002C304.txt /epoc32/release/winscw/urel/z/private/10202BE9/2002C304.txt"
-    
-    BLD_INF_RULES.prj_exports += "$$section(PWD, ":", 1)/resources/centralrepository/2002C384.txt /epoc32/data/z/private/10202BE9/2002C384.txt"
-    BLD_INF_RULES.prj_exports += "$$section(PWD, ":", 1)/resources/centralrepository/2002C384.txt /epoc32/release/winscw/udeb/z/private/10202BE9/2002C384.txt"
-    BLD_INF_RULES.prj_exports += "$$section(PWD, ":", 1)/resources/centralrepository/2002C384.txt /epoc32/release/winscw/urel/z/private/10202BE9/2002C384.txt"
-    BLD_INF_RULES.prj_exports += "$$section(PWD, ":", 1)/resources/centralrepository/2002C3AE.txt /epoc32/data/z/private/10202BE9/2002C3AE.txt"
-    BLD_INF_RULES.prj_exports += "$$section(PWD, ":", 1)/resources/centralrepository/2002C3AE.txt /epoc32/release/winscw/udeb/z/private/10202BE9/2002C3AE.txt"
-    BLD_INF_RULES.prj_exports += "$$section(PWD, ":", 1)/resources/centralrepository/2002C3AE.txt /epoc32/release/winscw/urel/z/private/10202BE9/2002C3AE.txt"
+    BLD_INF_RULES.prj_exports += "$$section(PWD, ":", 1)/resources/centralrepository/2002C304.txt $${EPOCROOT}epoc32/data/z/private/10202BE9/2002C304.txt"
+    BLD_INF_RULES.prj_exports += "$$section(PWD, ":", 1)/resources/centralrepository/2002C304.txt $${EPOCROOT}epoc32/release/winscw/udeb/z/private/10202BE9/2002C304.txt"
+    BLD_INF_RULES.prj_exports += "$$section(PWD, ":", 1)/resources/centralrepository/2002C304.txt $${EPOCROOT}epoc32/release/winscw/urel/z/private/10202BE9/2002C304.txt"
+
+    BLD_INF_RULES.prj_exports += "$$section(PWD, ":", 1)/resources/centralrepository/2002C384.txt $${EPOCROOT}epoc32/data/z/private/10202BE9/2002C384.txt"
+    BLD_INF_RULES.prj_exports += "$$section(PWD, ":", 1)/resources/centralrepository/2002C384.txt $${EPOCROOT}epoc32/release/winscw/udeb/z/private/10202BE9/2002C384.txt"
+    BLD_INF_RULES.prj_exports += "$$section(PWD, ":", 1)/resources/centralrepository/2002C384.txt $${EPOCROOT}epoc32/release/winscw/urel/z/private/10202BE9/2002C384.txt"
+    BLD_INF_RULES.prj_exports += "$$section(PWD, ":", 1)/resources/centralrepository/2002C3AE.txt $${EPOCROOT}epoc32/data/z/private/10202BE9/2002C3AE.txt"
+    BLD_INF_RULES.prj_exports += "$$section(PWD, ":", 1)/resources/centralrepository/2002C3AE.txt $${EPOCROOT}epoc32/release/winscw/udeb/z/private/10202BE9/2002C3AE.txt"
+    BLD_INF_RULES.prj_exports += "$$section(PWD, ":", 1)/resources/centralrepository/2002C3AE.txt $${EPOCROOT}epoc32/release/winscw/urel/z/private/10202BE9/2002C3AE.txt"
+}
+
+hb_maemo_dui {
+    INCLUDEPATH += /usr/include/dui
+    INCLUDEPATH += /usr/local/include/dui
+    LIBS += -ldui
 }
 
 include($${HB_SOURCE_DIR}/src/hbcommon.pri)
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/i18n/hbextendedlocale.cpp
--- a/src/hbcore/i18n/hbextendedlocale.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/i18n/hbextendedlocale.cpp	Mon May 03 12:48:33 2010 +0300
@@ -108,6 +108,8 @@
     
     \snippet{unittest_hbextendedlocale/unittest_hbextendedlocale.cpp,11}
     
+    \snippet{unittest_hbextendedlocale/unittest_hbextendedlocale.cpp,12}
+    
     \sa QLocale
 */
 
@@ -1109,20 +1111,12 @@
     { ELangNorwegian,           "no_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_BE" },
-    { ELangAustrian,            "de_AT" },
-    { ELangNewZealand,          "en_NZ" },
-    { ELangInternationalFrench, "fr" },
     { ELangCzech,               "cs_CZ" },
     { ELangSlovak,              "sk_SK" },
     { ELangPolish,              "pl_PL" },
@@ -1132,90 +1126,57 @@
     { ELangPrcChinese,          "zh_CN" },
     { ELangJapanese,            "ja_JP" },
     { ELangThai,                "th_TH" },
-    { ELangAfrikaans,           "af" }, // SouthAfrika/Namibia
-    { ELangAlbanian,            "sq_AL" },
-    { ELangAmharic,             "am_ET" },
     { ELangArabic,              "ar_AE" },
-    { ELangArmenian,            "hy_AM" },
     { ELangTagalog,             "tl_PH" },
-    { ELangBelarussian,         "be_BY" },
-    { ELangBengali,             "bn" }, // Bangladesh/India
+    { ELangBengali,             "bn_IN" }, // Bangladesh/India
     { ELangBulgarian,           "bg_BG" },
-    { ELangBurmese,             "my_MM" },
     { ELangCatalan,             "ca_ES" },
     { ELangCroatian,            "hr_HR" },
-    { ELangCanadianEnglish,     "en_CA" },
-    { ELangInternationalEnglish, "en" },
-    { ELangSouthAfricanEnglish, "en_ZA" },
     { ELangEstonian,            "et_EE" },
     { ELangFarsi,               "fa_IR" },
     { ELangCanadianFrench,      "fr_CA" },
-    { ELangScotsGaelic,         "gd_GB" },
-    { ELangGeorgian,            "ka_GE" },
     { ELangGreek,               "el_GR" },
-    { ELangCyprusGreek,         "el_GR" },
     { 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,           "mo_MD" },
-    { ELangMongolian,           "mn_MN" },
-    { ELangNorwegianNynorsk,    "nn_NO" },
     { ELangBrazilianPortuguese, "pt_BR" },
-    { ELangPunjabi,             "pa" }, // India/Pakistan
     { ELangRomanian,            "ro_RO" },
     { ELangSerbian,             "sr_YU" },
-    { ELangSinhalese,           "si_LK" },
-    { ELangSomali,              "so_SO" },
-    { ELangInternationalSpanish, "es" },
-    { ELangLatinAmericanSpanish, "es" },
-    { ELangSwahili,             "sw" }, // Kenya/Tanzania
-    { ELangFinlandSwedish,      "sv_FI" },
+    { ELangLatinAmericanSpanish, "es_MX" },
     { ELangTamil,               "ta_IN" },
     { ELangTelugu,              "te_IN" },
-    { ELangTibetan,             "bo_CN" },
-    { ELangTigrinya,            "ti_ER" },
-    { ELangCyprusTurkish,       "tr_GR" },
-    { ELangTurkmen,             "tk_TM" },
     { ELangUkrainian,           "uk_UA" },
     { ELangUrdu,                "ur_PK" }, // India/Pakistan
     { ELangVietnamese,          "vi_VN" },
-    { ELangWelsh,               "cy_GB" },
-    { ELangZulu,                "zu_ZA" },
-    { ELangSouthSotho,          "st_LS" },
 #ifdef __E32LANG_H__
 // 5.0
     { ELangBasque,              "eu_ES" },
     { ELangGalician,            "gl_ES" },
 #endif
-    { ELangEnglish_Apac,        "en" },
+    { ELangEnglish_Apac,        "en_APAC" },
     { ELangEnglish_Taiwan,      "en_TW" },
     { ELangEnglish_HongKong,    "en_HK" },
     { ELangEnglish_Prc,         "en_CN" },
     { ELangEnglish_Japan,       "en_JP"},
     { ELangEnglish_Thailand,    "en_TH" },
-//  { ELangSantali,             "" }, // dll in 3.2, not in 5.0, defined in 5.0
-    { ELangMalay_Apac,          "ms" }
+    { ELangEnglish_India,       "en_IN" },
+    { ELangMalay_Apac,          "ms_APAC" },
+    { ELangIndonesian_Apac,     "id_APAC" }
 };
 #endif
 
 /*!
     \return ISO name corresponding to the Symbian language \a code.
     If the code does not does not correspond to any Symbian language,
-    returns a null string.
+    returns a empty string.
     
     \sa User::Language()
 */
@@ -1257,7 +1218,48 @@
     return QString();
 #else
     Q_UNUSED(code);
-    return QString("not supported");
+    return QString();
+#endif
+}
+
+/*!
+    \return RFC3066 name corresponding to the Symbian language \a code.
+    If the code does not does not correspond to any Symbian language,
+    returns a empty string.
+    
+    \sa User::Language()
+*/
+QString HbExtendedLocale::symbianLangToRfc3066( const int code )
+{
+    return symbianLangToISO(code).replace('_', '-');
+}
+
+/*!
+    Converts ISO tag to Symbian language code.
+
+    \param langAndCountry ISO tag, example "fi_FI"
+    
+    \return Symbian language code or -1 (failed case)
+ */
+int HbExtendedLocale::ISOToSymbianLang( const QString &langAndCountry )
+{
+#if defined(Q_OS_SYMBIAN)
+    
+    if ( langAndCountry.length() == 0 ){
+        return -1;
+    }        
+    
+    int count = sizeof(symbian_to_iso_list)/sizeof(symbianToISO);
+    for ( int i = 0; i < count; i++) {
+        if ( langAndCountry.compare(symbian_to_iso_list[i].iso_name) == 0 ) {
+            return symbian_to_iso_list[i].symbian_language;
+        }        
+    }
+    
+    return -1;
+#else
+    Q_UNUSED(langAndCountry);
+    return -1;
 #endif
 }
 
@@ -1810,7 +1812,7 @@
 #endif    
 }
 
-/*! \enum HbExtendedLocale::DaylightSavingZone
+/*! 
     Returns the daylight saving zone in which the home city is located.
     
     \value Home Home daylight saving zone
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/i18n/hbextendedlocale.h
--- a/src/hbcore/i18n/hbextendedlocale.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/i18n/hbextendedlocale.h	Mon May 03 12:48:33 2010 +0300
@@ -123,7 +123,8 @@
     bool setZeroDigit( const DigitType type );
 
     static QString symbianLangToISO( const int code );
-    
+    static QString symbianLangToRfc3066( const int code );
+    static int ISOToSymbianLang( const QString &langAndCountry );
     QString symbianDateTimeToQt( const QString &sys_fmt );
 
     WeekDay startOfWeek() const;
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/i18n/hblanguageutil.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/i18n/hblanguageutil.cpp	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,275 @@
+/****************************************************************************
+**
+** 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 <QFile>
+#include <QLocale>
+#include <QTimer>
+#include <QHash>
+#include <QHashIterator>
+#include <QTextStream>
+#include <QTranslator>
+#include <QTextCodec>
+#include <QCoreApplication>
+
+#if defined(Q_OS_SYMBIAN)
+#include <e32lang.h>
+#include <e32property.h>
+#include <centralrepository.h> 
+#include <hal.h>
+#include <syslangutil.h>
+#include <CommonEngineDomainCRKeys.h> //Ui language
+#endif // Q_OS_SYMBIAN
+
+#include "hblanguageutil.h"
+#include "hbfeaturemanager_p.h"
+
+#if defined(Q_OS_SYMBIAN)
+#define LANGUAGE_LIST_FILE "/resource/hbi18n/translations/language_list.txt"
+#define LANGUAGE_ID_PREFIX "language_"
+#define TRANSLATOR_PATH "/resource/hbi18n/translations/languages"
+#endif // Q_OS_SYMBIAN
+
+/*!
+    @beta
+    @hbcore
+    \class HbLanguageUtil
+    \brief HbLanguageUtil provides functions for quering supported languages and switching the system language.
+*/
+
+#if defined(Q_OS_SYMBIAN)
+/*!
+    \brief Returns identifiers and localized names of all known languages.
+      
+    \return Localized names and integer identifiers of languages supported in a device  
+*/
+QHash<int, QString> readLanguageList()
+{
+    QHash<int, QString> hashLanguages;
+    QString path = "c:";
+    path += QString(LANGUAGE_LIST_FILE);
+    QFile* file = new QFile(path);
+    if (!file->exists() ) {
+        path = "z:";
+        path += QString(LANGUAGE_LIST_FILE);
+        delete file;
+        file = new QFile(path);
+    }
+    if (!file->open(QIODevice::ReadOnly | QIODevice::Text)) {
+        delete file;
+        return hashLanguages;
+    }
+    QTextStream in(file);
+    while (!in.atEnd()) {
+        QString line = in.readLine(256);
+        if (!line.isEmpty()) {
+            int sep = line.indexOf(',');
+            QString strCode = line.left(sep);
+            QString name = line.mid(sep+1);
+
+            bool ok;
+            int code = strCode.toUInt(&ok);
+            if (!ok) {
+                continue;
+            }
+            hashLanguages.insert(code, name);
+        }
+    }
+    delete file;
+    return hashLanguages;
+}
+#endif // Q_OS_SYMBIAN
+
+#if defined(Q_OS_SYMBIAN)
+
+/*!
+    \brief Changes the system UI language.
+      
+    \param language identifier of the language  
+*/
+bool setLocale( int language )
+{
+    TExtendedLocale dummy;
+    QString no;
+    no = QString( "%1" ).arg( language, 2, 10, QLatin1Char( '0' ) );
+    QString name = QString( "elocl." ).append( no );
+    TPtrC nameptr(name.utf16());
+    
+    TInt err = dummy.LoadLocale( nameptr );
+    if( err != KErrNone )
+        return false;
+    dummy.SaveSystemSettings();
+    // cause localeprivate update on next qlocale object( glp->m_language_id = 0 )
+    QSystemLocale dummy2;
+    return true;
+}
+#endif // Q_OS_SYMBIAN
+
+
+/*!
+    \brief Returns names and identifiers of supported languages in a phone.
+ 
+    Language names are localized according the language's native presentation.
+    Language ID's returned by this functions may be used as language parameter for changeLanguage(int language) function.
+    Language IDs and names are OS specific and may vary across the platforms and releases.
+     
+    \return Localized names and integer identifiers of languages supported in a device  
+*/
+QHash<int, QString> HbLanguageUtil::supportedLanguages()
+{
+#if defined(Q_OS_SYMBIAN)   
+    QHash<int, QString> languages; 
+    
+    QTranslator translator;
+    if (!translator.load(TRANSLATOR_PATH)) {
+        return languages;
+    } 
+    QCoreApplication::installTranslator(&translator);
+    QHash<int, QString> hashLanguageNames = readLanguageList();
+ 
+    CArrayFixFlat<TInt>* systemEpocLanguageCodes = 0;
+    TInt error = SysLangUtil::GetInstalledLanguages( systemEpocLanguageCodes );
+    if ( error != KErrNone ) {
+        delete systemEpocLanguageCodes;
+        return languages;
+    }
+    
+    for (int i = 0; i < systemEpocLanguageCodes->Count(); ++i) {
+        int code = systemEpocLanguageCodes->At(i);
+        QString id = QString(LANGUAGE_ID_PREFIX);
+        id += QString::number(code);
+        QString locName = hbTrId(id.toAscii().constData());
+        if (locName.isEmpty() || locName == id) {
+            locName = hashLanguageNames.value(code);
+        }
+        languages.insert(code, locName);
+    }
+    
+    delete systemEpocLanguageCodes;
+    return languages;
+#else 
+    QHash<int, QString> dummy;
+    return dummy;
+#endif
+}
+
+/*!
+    \brief Returns names and identifiers of all known languages.
+ 
+    Language names are localized according the language's native presentation.
+    Language ID's returned by this functions may be used as language parameter for changeLanguage(int language) function.
+    Language IDs and names are OS specific and may vary across the platforms and releases.
+     
+    \return Localized names and integer identifiers of known languages 
+*/
+QHash<int, QString> HbLanguageUtil::allLanguages()
+{
+#if defined(Q_OS_SYMBIAN)  
+    QHash<int, QString> langs; 
+    
+    QTranslator translator;
+    if (!translator.load(TRANSLATOR_PATH)) {
+        return langs;
+    } 
+    QCoreApplication::installTranslator(&translator);
+    
+    QHash<int, QString> languageNameList = readLanguageList();
+    QHashIterator<int, QString> i(languageNameList);
+    while (i.hasNext()) {
+        i.next();
+        int code = i.key();
+        QString id = QString(LANGUAGE_ID_PREFIX);
+        id += QString::number(code);
+        QString locName = hbTrId(id.toAscii().constData());
+        if (locName.isEmpty()) {
+            locName = i.value();
+        }
+        langs.insert(code, locName);
+    }
+    return langs;
+#else 
+    QHash<int, QString> dummy;
+    return dummy;
+#endif
+}
+
+/*!
+    \brief Changes the device system language.  
+  
+    \param identifier of language to set active
+    \return true if language change was successful
+*/ 
+bool HbLanguageUtil::changeLanguage( int language )
+{
+#if defined(Q_OS_SYMBIAN)
+    if ( !HbFeatureManager::instance()->featureStatus(HbFeatureManager::LanguageSwitch) ) {
+        return false;
+    }
+    
+    CRepository* commonEngineRepository = 0;
+    TRAPD( err1, commonEngineRepository = CRepository::NewL( KCRUidCommonEngineKeys ) );    
+    if ( err1 != KErrNone ) { 
+        return false;
+    }
+    
+    if (!setLocale(language)) {
+    		delete commonEngineRepository;
+        return false;
+    }
+        
+    // Never set Language code 0 to HAL
+    if ( language !=0 ) {
+        if ( HAL::Set( HAL::ELanguageIndex, language ) != KErrNone ) {
+            delete commonEngineRepository;
+            return false;
+        }
+    }
+    if ( commonEngineRepository->Set( KGSDisplayTxtLang, language ) != KErrNone ) {
+        delete commonEngineRepository;
+        return false;
+    }
+    delete commonEngineRepository;
+    return true;
+
+#else
+    Q_UNUSED(language);
+    return false;
+#endif
+}
+
+/*!
+    \brief Returns ID of current language. Localized name 
+  
+    \return identifier of current system language
+*/ 
+int HbLanguageUtil::currentLanguage()
+{
+    #if defined(Q_OS_SYMBIAN)
+        TLanguage l = User::Language();
+        return l;
+    #else 
+        return 0;
+    #endif
+}
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/i18n/hblanguageutil.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/i18n/hblanguageutil.h	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,41 @@
+/****************************************************************************
+**
+** 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 HBLANGUAGEUTIL_H
+#define HBLANGUAGEUTIL_H
+
+#include <QHash>
+#include <hbglobal.h>
+
+class HB_CORE_EXPORT HbLanguageUtil
+{
+public:
+    static bool changeLanguage( int language );
+    static int currentLanguage();
+    static QHash<int, QString> supportedLanguages();
+    static QHash<int, QString> allLanguages();
+};
+
+#endif /* HBLANGUAGEUTIL_H */
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/i18n/hbparameterlengthlimiter.cpp
--- a/src/hbcore/i18n/hbparameterlengthlimiter.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/i18n/hbparameterlengthlimiter.cpp	Mon May 03 12:48:33 2010 +0300
@@ -308,10 +308,6 @@
 {
     QChar tmpChar = fillChar;
 
-    if ( a.length() == 0 ) {
-        return *this;    
-    }
-    
     QString result = "";
     int i = 0;
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/i18n/hbstringutil.cpp
--- a/src/hbcore/i18n/hbstringutil.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/i18n/hbstringutil.cpp	Mon May 03 12:48:33 2010 +0300
@@ -83,26 +83,6 @@
 */
 
 /*!
-    \deprecated HbStringUtil::collationMethods()
-        is deprecated.
-    
-    Returns the number of collation methods supported.
-    On Symbian platform uses Mem::CollationMethods,
-    elsewhere return 0.
-     
-    \return The number of collation methods available.
- */
-int HbStringUtil::collationMethods()
-{
-    qWarning("HbStringUtil::collationMethods is DEPRECATED. Do not use this function.");
-#if defined( Q_OS_SYMBIAN )
-    return Mem::CollationMethods();
-#else
-    return 0;
-#endif 
-}
-
-/*!
     Searches source string's collated data for a
     match with collated data supplied in pattern string
     
@@ -325,28 +305,6 @@
 }
 
 /*!
-    \deprecated HbStringUtil::collate( const uint chr )
-        is deprecated.
-    
-    Converts the character to its collated form.
-    Collating is the process of removing differences between characters 
-    that are considered unimportant for the purposes of ordering characters.
-    The result of the conversion depends on the locale
-    
-    \param chr The charcter to be collated.
-    \return The converted character.
- */
-uint HbStringUtil::collate( const uint chr )
-{
-    qWarning("HbStringUtil::collate is DEPRECATED. Do not use this function.");
-#if defined( Q_OS_SYMBIAN )
-    return User::Collate( chr );
-#else
-    return chr;
-#endif 
-}
-
-/*!
     Returns the starting digit range of the native digit
     \param ch native digit
     \return starting digit range
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/i18n/hbstringutil.h
--- a/src/hbcore/i18n/hbstringutil.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/i18n/hbstringutil.h	Mon May 03 12:48:33 2010 +0300
@@ -45,7 +45,6 @@
     };
     Q_DECLARE_FLAGS(Options, Option)
     
-    static int collationMethods(); // Will be deprecated 
     static int matchC( const QString &strFrom, const QString &strToMatch, 
                        int maxLevel = 0, Options flags = Default, 
                        int wildChar = '?', int wildSequenceChar = '*', int escapeChar = '\\' );
@@ -57,9 +56,7 @@
     static int matchF( const QString &strFrom, const QString &strToMatch );
     static int compareF( const QString &string1, const QString &string2 );    
     static int findF( const QString &strFrom, const QString &strToFind );
-    
-    static uint collate( const uint chr ); // Will be deprecated
-    
+        
     static QString convertDigits( const QString str );
     static QString convertDigitsTo( const QString str, const DigitType digitType ); 
     static void sort( QStringList &strList );   
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/i18n/hbtranslator.cpp
--- a/src/hbcore/i18n/hbtranslator.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/i18n/hbtranslator.cpp	Mon May 03 12:48:33 2010 +0300
@@ -45,7 +45,7 @@
 */
 
 /*!
-    Default case: searches translation file from default location with default name, which is <executablename>.qm
+    Default case: searches translation file from default location (/resource/qt/translations/) with default name, which is <executablename>.qm
 */
 HbTranslator::HbTranslator(): d(new HbTranslatorPrivate())
 {
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/i18n/hbtranslator.h
--- a/src/hbcore/i18n/hbtranslator.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/i18n/hbtranslator.h	Mon May 03 12:48:33 2010 +0300
@@ -40,6 +40,7 @@
     void loadCommon();
 private:
     HbTranslatorPrivate* const d;
+    Q_DISABLE_COPY(HbTranslator)
 };
 
 #endif // HBTRANSLATOR_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/i18n/hbtranslator_p.h
--- a/src/hbcore/i18n/hbtranslator_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/i18n/hbtranslator_p.h	Mon May 03 12:48:33 2010 +0300
@@ -37,4 +37,5 @@
     QTranslator common;
 };
 
-#endif
\ No newline at end of file
+#endif
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/i18n/i18n.pri
--- a/src/hbcore/i18n/i18n.pri	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/i18n/i18n.pri	Mon May 03 12:48:33 2010 +0300
@@ -36,13 +36,15 @@
 PUBLIC_HEADERS += $$PWD/hbparameterlengthlimiter.h
 PUBLIC_HEADERS += $$PWD/hbfindfile.h
 PUBLIC_HEADERS += $$PWD/hbtranslator.h
-INTERNAL_HEADERS += $$PWD/hbdntxmlreader_p.h
-INTERNAL_HEADERS += $$PWD/hbngnormalnumber_p.h
-INTERNAL_HEADERS += $$PWD/hbnumbergrpxmlreader_p.h
-INTERNAL_HEADERS += $$PWD/hbdirectorynamelocalizer_p.h
-INTERNAL_HEADERS += $$PWD/hbstringutil_p.h
-INTERNAL_HEADERS += $$PWD/hbparameterlengthlimiter_p.h
-INTERNAL_HEADERS += $$PWD/hbtranslator_p.h
+PUBLIC_HEADERS += $$PWD/hblanguageutil.h
+
+PRIVATE_HEADERS += $$PWD/hbdntxmlreader_p.h
+PRIVATE_HEADERS += $$PWD/hbngnormalnumber_p.h
+PRIVATE_HEADERS += $$PWD/hbnumbergrpxmlreader_p.h
+PRIVATE_HEADERS += $$PWD/hbdirectorynamelocalizer_p.h
+PRIVATE_HEADERS += $$PWD/hbstringutil_p.h
+PRIVATE_HEADERS += $$PWD/hbparameterlengthlimiter_p.h
+PRIVATE_HEADERS += $$PWD/hbtranslator_p.h
 
 SOURCES += $$PWD/hbextendedlocale.cpp
 SOURCES += $$PWD/hbstringutil.cpp
@@ -54,3 +56,8 @@
 SOURCES += $$PWD/hbparameterlengthlimiter.cpp
 SOURCES += $$PWD/hbfindfile.cpp
 SOURCES += $$PWD/hbtranslator.cpp
+SOURCES += $$PWD/hblanguageutil.cpp
+
+symbian:LIBS += -leuser -lhal -lcentralrepository -lptiengine -lSysLangUtil
+symbian:TARGET.CAPABILITY += WriteDeviceData
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/i18n/translations/language_list.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/i18n/translations/language_list.txt	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,51 @@
+1,English
+2,French
+3,German
+4,Spanish
+5,Italian
+6,Swedish
+7,Danish
+8,Norwegian
+9,Finnish
+10,English (American)
+13,Portuguese
+14,Turkish
+15,Icelandic
+16,Russian
+17,Hungarian
+18,Dutch
+25,Czech
+26,Slovak
+27,Polish
+28,Slovenian
+29,Chinese TW
+30,Chinese HK
+31,Chinese PRC
+32,Japanese
+33,Thai
+37,Arabic
+39,Pilipino
+42,Burgarian
+44,Catalan
+45,Croatian
+49,Estonian
+50,Farsi
+51,French (Canadian)
+54,Greek
+57,Hebrew
+58,Hindi
+59,Indonesian
+65,Korean
+67,Latvian
+68,Lithuanian
+70,Malay
+72,Marathi
+76,Portuguese (Brasilian)
+78,Romanian
+79,Serbian
+83,Spanish (American)
+93,Ukrainian
+94,Urdu
+96,Vietnamese
+102,Basque
+103,Galician
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/i18n/translations/languages.qm
Binary file src/hbcore/i18n/translations/languages.qm has changed
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/i18n/translations/languages.ts
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/i18n/translations/languages.ts	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="1.0" language="en">
+<context>
+	<name>hblanguageswitch</name>
+	<message id="language_1">
+		<source>English</source>
+		<translation variants="no">English</translation>
+	</message>
+	<message id="language_2">
+		<source>French</source>
+		<translation variants="no">Français</translation>
+	</message>
+	<message id="language_3">
+		<source>German</source>
+		<translation variants="no">Deutsch</translation>
+	</message>
+	<message id="language_4">
+		<source>Spanish</source>
+		<translation variants="no">Español</translation>
+	</message>
+	<message id="language_5">
+		<source>Italian</source>
+		<translation variants="no">Italiano</translation>
+	</message>
+	<message id="language_6">
+		<source>Swedish</source>
+		<translation variants="no">Svenska</translation>
+	</message>
+	<message id="language_7">
+		<source>Danish</source>
+		<translation variants="no">Dansk</translation>
+	</message>
+	<message id="language_8">
+		<source>Norwegian</source>
+		<translation variants="no">Norsk</translation>
+	</message>
+	<message id="language_9">
+		<source>Finnish</source>
+		<translation variants="no">Suomi</translation>
+	</message>
+	<message id="language_10">
+		<source>English (American)</source>
+		<translation variants="no">English</translation>
+	</message>
+	<message id="language_13">
+		<source>Portuguese</source>
+		<translation variants="no">Português</translation>
+	</message>
+	<message id="language_14">
+		<source>Turkish</source>
+		<translation variants="no">Türkçe</translation>
+	</message>
+	<message id="language_15">
+		<source>Icelandic</source>
+		<translation variants="no">�slenska</translation>
+	</message>
+	<message id="language_16">
+		<source>Russian</source>
+		<translation variants="no">Ру��кий</translation>
+	</message>
+	<message id="language_17">
+		<source>Hungarian</source>
+		<translation variants="no">Magyar</translation>
+	</message>
+	<message id="language_18">
+		<source>Dutch</source>
+		<translation variants="no">Nederlands</translation>
+	</message>
+	<message id="language_25">
+		<source>Czech</source>
+		<translation variants="no">Čeština</translation>
+	</message>
+	<message id="language_26">
+		<source>Slovak</source>
+		<translation variants="no">Sloven�ina</translation>
+	</message>
+	<message id="language_27">
+		<source>Polish</source>
+		<translation variants="no">Polski</translation>
+	</message>
+	<message id="language_28">
+		<source>Slovenian</source>
+		<translation variants="no">Slovenš�ina</translation>
+	</message>
+	<message id="language_29">
+		<source>Chinese TW</source>
+		<translation variants="no">�體中文(��)</translation>
+	</message>
+	<message id="language_30">
+		<source>Chinese HK</source>
+		<translation variants="no">�體中文(香港)</translation>
+	</message>
+	<message id="language_31">
+		<source>Chinese PRC</source>
+		<translation variants="no">简体中文</translation>
+	</message>
+	<message id="language_32">
+		<source>Japanese</source>
+		<translation variants="no">日本語</translation>
+	</message>
+	<message id="language_33">
+		<source>Thai</source>
+		<translation variants="no">ภาษาไทย</translation>
+	</message>
+	<message id="language_37">
+		<source>Arabic</source>
+		<translation variants="no">العربية</translation>
+	</message>
+	<message id="language_39">
+		<source>Pilipino</source>
+		<translation variants="no">Pilipino</translation>
+	</message>
+	<message id="language_42">
+		<source>Burgarian</source>
+		<translation variants="no">Българ�ки</translation>
+	</message>
+	<message id="language_44">
+		<source>Catalan</source>
+		<translation variants="no">Català</translation>
+	</message>
+	<message id="language_45">
+		<source>Croatian</source>
+		<translation variants="no">Hrvatski</translation>
+	</message>
+	<message id="language_49">
+		<source>Estonian</source>
+		<translation variants="no">Eesti</translation>
+	</message>
+	<message id="language_50">
+		<source>Farsi</source>
+		<translation variants="no">�ارسى</translation>
+	</message>
+	<message id="language_51">
+		<source>French (Canadian)</source>
+		<translation variants="no">Français</translation>
+	</message>
+	<message id="language_54">
+		<source>Greek</source>
+		<translation variants="no">Ελληνικά</translation>
+	</message>
+	<message id="language_57">
+		<source>Hebrew</source>
+		<translation variants="no">עברית</translation>
+	</message>
+	<message id="language_58">
+		<source>Hindi</source>
+		<translation variants="no">हिन�दी</translation>
+	</message>
+	<message id="language_59">
+		<source>Indonesian</source>
+		<translation variants="no">Indonesia</translation>
+	</message>
+	<message id="language_65">
+		<source>Korean</source>
+		<translation variants="no">한국어</translation>
+	</message>
+	<message id="language_67">
+		<source>Latvian</source>
+		<translation variants="no">Latviešu</translation>
+	</message>
+	<message id="language_68">
+		<source>Lithuanian</source>
+		<translation variants="no">Lietuvių</translation>
+	</message>
+	<message id="language_70">
+		<source>Malay</source>
+		<translation variants="no">Melayu</translation>
+	</message>
+	<message id="language_72">
+		<source>Marathi</source>
+		<translation variants="no">मराठी</translation>
+	</message>
+  <message id="language_76">
+		<source>Portuguese (Brazil)</source>
+		<translation variants="no">Português</translation>
+	</message>
+	<message id="language_78">
+		<source>Romanian</source>
+		<translation variants="no">Română</translation>
+	</message>
+	<message id="language_79">
+		<source>Serbian</source>
+		<translation variants="no">Srpski</translation>
+	</message>
+	<message id="language_83">
+		<source>Spanish (American)</source>
+		<translation variants="no">Español</translation>
+	</message>
+	<message id="language_93">
+		<source>Ukrainian</source>
+		<translation variants="no">Україн�ька</translation>
+	</message>
+	<message id="language_94">
+		<source>Urdu</source>
+		<translation variants="no">اردو</translation>
+	</message>
+	<message id="language_96">
+		<source>Vietnamese</source>
+		<translation variants="no">Tiê�ng Việt</translation>
+	</message>
+	<message id="language_102">
+		<source>Basque</source>
+		<translation variants="no">Euskara</translation>
+	</message>
+	<message id="language_103">
+		<source>Galician</source>
+		<translation variants="no">Galego</translation>
+	</message>
+</context>
+</TS>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/image/hbeglstate.cpp
--- a/src/hbcore/image/hbeglstate.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/image/hbeglstate.cpp	Mon May 03 12:48:33 2010 +0300
@@ -34,40 +34,27 @@
                           EGLContext  c,
                           EGLConfig cfg )
         : refCount(0),
-        init(0),
-        background(0)
+        init(0)
+       
 {
-    fgWatcher = HbForegroundWatcher::instance();
-    connect(fgWatcher, SIGNAL(foregroundLost()),
-            SLOT(handleForegroundLost()));
     set(d, rs, ds, c, cfg);
 }
 
 HbEglStates::HbEglStates()
         : refCount(0),
-        init(0),
-        background(0)
-{
-    fgWatcher = HbForegroundWatcher::instance();
-    connect(fgWatcher, SIGNAL(foregroundLost()),
-            SLOT(handleForegroundLost()));
-    reset();
+        init(0)
+       
+{   reset();
 }
 
 void HbEglStates::handleForegroundLost()
 {
     reset();
-    background = 1;
     init = 0;
-    HbNVGEnginePool::instance()->resetNVGEngine();
+    HbNvgEnginePool::instance()->resetNvgEngine();
     clearImages();
 }
 
-void HbEglStates::handleForegroundGained()
-{
-    background = 0;
-}
-
 void HbEglStates::clearImages()
 {
     if (!imageList.empty()) {
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/image/hbeglstate_p.h
--- a/src/hbcore/image/hbeglstate_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/image/hbeglstate_p.h	Mon May 03 12:48:33 2010 +0300
@@ -31,7 +31,6 @@
 #include <QMutex>
 #include <QSet>
 
-#include "hbforegroundwatcher_p.h"
 #include "hbnvgiconimpl_p.h"
 #include "hbnvgenginepool_p.h"
 
@@ -74,12 +73,7 @@
     {
         return init;
     }
-
-    int isBackground() const
-    {
-        return background;
-    }
-
+    
     void deref(HbEglStates *& instance)
     {
         if (instance && --(instance->refCount) == 0) {
@@ -94,6 +88,7 @@
             imageList.insert(image);
         }
     }
+    void handleForegroundLost();
 
     EGLDisplay  display;
     EGLSurface  currentReadSurface;
@@ -103,11 +98,6 @@
 
     static HbEglStates *global();
 
-public slots:
-
-    void handleForegroundLost();
-    void handleForegroundGained();
-
 private:
 
     void clearImages();
@@ -120,9 +110,6 @@
 
     int         refCount;
     int         init;
-    int         background;
-    HbForegroundWatcher * fgWatcher;
-
     typedef QSet<VGImage*>     ImageList;
     typedef ImageList::iterator ImageListIter;
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/image/hbframedrawer.cpp
--- a/src/hbcore/image/hbframedrawer.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/image/hbframedrawer.cpp	Mon May 03 12:48:33 2010 +0300
@@ -165,12 +165,15 @@
     graphicsItem(0),
     color(),
     icon(0),
-    maskChanged(false)
+    maskChanged(false),
+    clipPath(QPainterPath())
 {
     borderWidths[0]=0.0;
     borderWidths[1]=0.0;
     borderWidths[2]=0.0;
     borderWidths[3]=0.0;
+    //Register the HbFrameDrawerPrivate Instance to HbIconLoader
+    HbIconLoader::global()->storeFrameDrawerInfo(this);
 }
 
 /*!
@@ -189,7 +192,8 @@
     graphicsItem(0),
     color(),
     icon(0),
-    maskChanged(false)
+    maskChanged(false),
+    clipPath(QPainterPath())
 {
     borderWidths[0]=0.0;
     borderWidths[1]=0.0;
@@ -201,6 +205,8 @@
     if (index>0) {
         this->frameGraphicsName.resize(index);
     }
+    //Register the HbFrameDrawerPrivate Instance to HbIconLoader
+    HbIconLoader::global()->storeFrameDrawerInfo(this);
 }
 
 /*!
@@ -220,12 +226,15 @@
     graphicsItem( other.graphicsItem ),
     color(other.color),
     icon(0),
-    maskChanged(false)
+    maskChanged(false),
+    clipPath(QPainterPath())
 {
     borderWidths[0]=other.borderWidths[0];
     borderWidths[1]=other.borderWidths[1];
     borderWidths[2]=other.borderWidths[2];
     borderWidths[3]=other.borderWidths[3];
+    //Register the HbFrameDrawerPrivate Instance to HbIconLoader
+    HbIconLoader::global()->storeFrameDrawerInfo(this);
 }
 
 /*!
@@ -234,6 +243,8 @@
 HbFrameDrawerPrivate::~HbFrameDrawerPrivate()
 {
     unLoadIcon();
+    //Unregister the HbFrameDrawerPrivate Instance to HbIconLoader
+    HbIconLoader::global()->removeFrameDrawerInfo(this);
 }
 
 /*!
@@ -427,7 +438,10 @@
             icon->setMask(mask);
         } 
         //paint the stitched icon
-        icon->paint(painter, centeredRect, Qt::AlignHCenter);
+        icon->paint(painter, centeredRect, Qt::AlignHCenter, clipPath);
+        if ( icon->isCreatedOnServer() ) {
+            iconType = icon->iconImpl()->iconData().type;
+        }
 
         #ifdef HB_FRAME_DRAWER_TRACES
         qDebug() << "FRAMENAME: " << frameGraphicsName << "Drawn at: "
@@ -452,12 +466,21 @@
                     QRect maskRect(position.x(), position.y(), multiPartSizeData.targets[i].width(), multiPartSizeData.targets[i].height());
                     pieceMask = mask.copy(maskRect);
                     fallbackMaskableIconList[i]->setMask(pieceMask);
-                } 
-                if(!multiPartSizeData.targets[i].isEmpty()) {
-                    fallbackMaskableIconList[i]->paint(painter, QRect(position,multiPartSizeData.pixmapSizes[i]), Qt::AlignHCenter);
+                }
+                if (!multiPartSizeData.targets[i].isEmpty()) {
+                    fallbackMaskableIconList[i]->paint(painter,
+                            QRect(position, multiPartSizeData.pixmapSizes[i]),
+                            Qt::AlignHCenter, clipPath);
                 }
             }
         }
+        if ( fallbackMaskableIconList[0]->iconImpl()
+             && fallbackMaskableIconList[0]->iconImpl()->isCreatedOnServer() ) {
+            if ( fallbackMaskableIconList[0]->iconImpl()->iconData().type != INVALID_FORMAT ) {
+                // store the icon type
+                iconType = fallbackMaskableIconList[0]->iconImpl()->iconData().type;
+            }
+        }
     }
     maskChanged = false;
 }
@@ -907,6 +930,41 @@
     }
 }
 
+/*!
+*	Resets the MaskableIcon 
+*/
+void HbFrameDrawerPrivate::resetMaskableIcon()
+{
+#if defined(HB_SGIMAGE_ICON) || defined(HB_NVG_CS_ICON)    
+    HbIconLoader *loader = HbIconLoader::global();
+    if ( icon ) {  
+      //consolidated icon case 
+      icon->decrementRefCount();    
+      if ( icon->refCount() == 0 && icon->isCreatedOnServer() ) {
+          // remove the item from cache and delete the icon
+          loader->removeItemInCache( icon->iconImpl() );
+          icon->dispose();
+      }
+      icon = 0;              
+    } else {            
+        int count = fallbackMaskableIconList.count();
+        if ( count ) {
+            // for each item in fallbackMaskableIconList - decrement the reference count and
+            // remove the item in cache, dispose if needed.
+            foreach ( HbMaskableIconImpl* impl, fallbackMaskableIconList ) {
+                   impl->decrementRefCount();
+                   if ( impl->refCount() == 0 && impl->isCreatedOnServer() ) {
+                       loader->removeItemInCache( impl->iconImpl() );     
+                       impl->dispose();
+                   } 
+            }                                   
+            fallbackMaskableIconList.clear(); 
+        }
+    }
+    frameParts = 0;
+#endif
+}
+
 HbIconLoader::IconLoaderOptions HbFrameDrawerPrivate::iconLoaderOptions()
 {
     HbIconLoader::IconLoaderOptions options = DEFAULT_OPTIONS;
@@ -977,8 +1035,8 @@
     QVector<HbIconImpl *> fallbackIconList;
     int count = fallbackMaskableIconList.count();
     for (int i = 0; i < count ; i++) {
-        if (fallbackMaskableIconList[i]) {
-            fallbackIconList.append(fallbackMaskableIconList[i]->iconImpl());
+        if ( fallbackMaskableIconList.at(i) ) {
+            fallbackIconList.append(fallbackMaskableIconList.at(i)->iconImpl());
         }
     }
     count = fallbackIconList.count();
@@ -987,8 +1045,8 @@
         //frame-items are batched together in a single IPC, which is initiated in HbIconLoader::unLoadMultiIcon().
         loader->unLoadMultiIcon(fallbackIconList);
         for (int i=0; i < count ; i++) {
-            if (fallbackMaskableIconList[i]) {
-                fallbackMaskableIconList[i]->dispose();
+            if ( fallbackMaskableIconList.at(i) ) {
+                fallbackMaskableIconList.at(i)->dispose();
             }
         }
      }
@@ -1380,6 +1438,26 @@
 }
 
 /*! 
+* Sets the \a clipPath to be applied with the entire frame icon.
+* 
+*/
+void HbFrameDrawer::setClipPath(const QPainterPath &clipPath)
+{
+    d->clipPath = clipPath;
+}
+
+/*!
+* Returns the clippath set on the frame drawer.
+* As default, returns a empty QPainterPath.
+* \sa setClipPath()
+*/
+
+QPainterPath HbFrameDrawer::clipPath() const
+{
+    return d->clipPath;
+}
+
+/*! 
 * Sets the mask to be applied with the the entire frame icon.
 * If the mask is also a frame item, use another frame drawer to draw it.
 * Mask should be of the same size as returned by frameSize().
@@ -1485,5 +1563,11 @@
     d->graphicsItem = item;
 }
 
-
+/*!
+* Returns the iconType
+*/
+HbIconFormatType HbFrameDrawerPrivate::iconFormatType() const
+{
+    return iconType;
+}
 // End of File
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/image/hbframedrawer.h
--- a/src/hbcore/image/hbframedrawer.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/image/hbframedrawer.h	Mon May 03 12:48:33 2010 +0300
@@ -84,6 +84,9 @@
     QPixmap mask() const; 
     QBitmap maskBitmap() const; 
 
+    void setClipPath(const QPainterPath &clipPath);
+    QPainterPath clipPath() const;
+
     QSize frameSize() const;
 
     void themeChanged();
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/image/hbframedrawer_p.h
--- a/src/hbcore/image/hbframedrawer_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/image/hbframedrawer_p.h	Mon May 03 12:48:33 2010 +0300
@@ -32,6 +32,7 @@
 
 #include <QByteArray>
 #include <QBitmap>
+#include <QPainterPath>
 
 class HbMaskableIconImpl;
 
@@ -43,7 +44,7 @@
     HbFrameDrawerPrivate(const HbFrameDrawerPrivate &other);
 
     ~HbFrameDrawerPrivate();
-
+    HbIconFormatType iconFormatType() const;
     void checkFrameParts();
     QStringList fileNameSuffixList() const;
     QSize divideSpace(HbMultiPartSizeData &data);
@@ -57,6 +58,7 @@
     void paint(QPainter *painter);
 
     void reset( bool resetFrameCount = true );
+    void resetMaskableIcon();    
     bool fillWholeRect() const;
     QString multiPartIconId() const;
     HbIconLoader::IconLoaderOptions iconLoaderOptions();
@@ -72,7 +74,7 @@
     bool hasBorderWidths() const;
     // disabled
     HbFrameDrawerPrivate& operator=(const HbFrameDrawerPrivate &other);
-
+    HbIconFormatType iconType;   
 public:
     QString frameGraphicsName;
     HbFrameDrawer::FrameType type;
@@ -116,6 +118,7 @@
     QVector<HbMaskableIconImpl *> fallbackMaskableIconList;
     HbMultiPartSizeData multiPartSizeData;
     QRect prevRect;
+    QPainterPath clipPath;
 };
 
 #endif // HBFRAMEDRAWER_P_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/image/hbicon.cpp
--- a/src/hbcore/image/hbicon.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/image/hbicon.cpp	Mon May 03 12:48:33 2010 +0300
@@ -139,6 +139,13 @@
          theme this flag can be left unset because they will still be colorized properly
          if the logical icon name indicates that the icon is a mono icon. Therefore this
          flag is only relevant for icons loaded from regular files.
+
+  \b NonThemeable \b (0x10) This flag indicates that the icon is not themeable and thus
+         there is no need to handle theme and layout direction changes for this icon.
+         This is merely an optimization flag and must be set directly after creating the
+         HbIcon instance (before the first paint of the icon) to have any performance
+         benefits.
+
 */
 
 /*!
@@ -377,6 +384,9 @@
 * \note If this constructor is used, there are the following limitations in the HbIcon methods.
 * - HbIcon::defaultSize() always returns QSizeF().
 * - HbIcon::paint() ignores the parameter aspectRatioMode and converts the given QRectF to QRect.
+* - HbIcon::iconName() returns empty string by default.
+* - HbIcon::pixmap() returns null pixmap.
+* - Colorization and mirroring support are not available.
 * This method should only be used if absolute necessary, as this is not ideal for hardware accelerated environment.
 */
 HbIcon::HbIcon( const QIcon &icon )
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/image/hbicon.h
--- a/src/hbcore/image/hbicon.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/image/hbicon.h	Mon May 03 12:48:33 2010 +0300
@@ -90,7 +90,8 @@
         DoNotCache = 0x01,
         ResolutionCorrected = 0x02,
         NoAutoStartAnimation = 0x04,
-        Colorized = 0x08
+        Colorized = 0x08,
+        NonThemeable = 0x10
     };
 
     Q_DECLARE_FLAGS(Flags, Flag)
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/image/hbiconanimationmanager.cpp
--- a/src/hbcore/image/hbiconanimationmanager.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/image/hbiconanimationmanager.cpp	Mon May 03 12:48:33 2010 +0300
@@ -210,7 +210,12 @@
     // animation definitions (or at least try to reload; some defs may now be
     // missing if they were present in the previous theme but not in the new
     // one).
-    animations.clear();
+    foreach (const QString &iconName, animations.keys()) {
+        // Do not remove animations that were not created from files.
+        if (animations.value(iconName).definitionFileName) {
+            animations.remove(iconName);
+        }
+    }
     definitionFileNames.clear();
     //
     // Cannot use definitionFileNames here because it is cleared upon every
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/image/hbiconengine.cpp
--- a/src/hbcore/image/hbiconengine.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/image/hbiconengine.cpp	Mon May 03 12:48:33 2010 +0300
@@ -28,6 +28,7 @@
 #include "hbicon.h"
 #include "hbiconloader_p.h"
 #include "hbtheme.h"
+#include "hbtheme_p.h"
 #include "hblayoutdirectionnotifier_p.h"
 #include "hbiconanimation_p.h"
 #include "hbimagetraces_p.h"
@@ -63,7 +64,7 @@
     void externalize(QDataStream &stream);
     void appendLoadFail(QIcon::Mode mode, QIcon::State state);
     void removeLoadFail(QIcon::Mode mode, QIcon::State state);
-    void unLoadIcon();
+    void unLoadIcon(bool unloadedByServer = false);
 
     void addBadge(Qt::Alignment alignment,
                       const HbIcon& badge,
@@ -125,6 +126,10 @@
 
     // Icons decorating this engine
     HbBadgeIcon *badgeInfo;
+
+    bool signalConnectionsSet;
+    // Icon FormatType
+    HbIconFormatType iconType;
 };
 
 // Class HbIconEnginePrivate
@@ -145,7 +150,9 @@
     animator(0),
     color(QColor()),
     icon(0),
-    badgeInfo(0)
+    badgeInfo(0),
+    signalConnectionsSet(false),
+    iconType(INVALID_FORMAT)
 {
     if (!iconName.isEmpty()) {
         HbIconEnginePrivate::IconName newName = {QIcon::Normal, QIcon::Off, iconName};
@@ -172,7 +179,9 @@
     color(other.color),
     // HbIconImpl is instance specific, it is recreated when icon is painted
     icon(0),
-    badgeInfo(0)
+    badgeInfo(0),
+    signalConnectionsSet(false),
+    iconType(INVALID_FORMAT)
 {
     if (other.badgeInfo) {
         badgeInfo = new HbBadgeIcon();
@@ -196,7 +205,9 @@
     animator(0),
     color(QColor()),
     icon(0),
-    badgeInfo(new HbBadgeIcon())
+    badgeInfo(new HbBadgeIcon),
+    signalConnectionsSet(false),
+    iconType(INVALID_FORMAT)
 {
     // Internalize the icon from the stream
     stream >> size;
@@ -276,11 +287,11 @@
   the icon if created on server side.
  
  */
-void HbIconEnginePrivate::unLoadIcon()
+void HbIconEnginePrivate::unLoadIcon(bool unloadedByServer)
 {
     if (icon) {
         HbIconLoader *loader = HbIconLoader::global();
-        loader->unLoadIcon(icon);
+        loader->unLoadIcon(icon, unloadedByServer);
         icon->dispose();
         icon = 0;
     }
@@ -464,7 +475,9 @@
     QIconEngineV2(),
     d(new HbIconEnginePrivate(QString()))
 {
-    init();
+    // Register the HbIconEngine Instance to HbIconLoader
+    HbIconLoader *loader = HbIconLoader::global();
+    loader->storeIconEngineInfo(this);    
 }
 
 HbIconEngine::HbIconEngine(const QString &iconName) :
@@ -472,7 +485,9 @@
     QIconEngineV2(),
     d(new HbIconEnginePrivate(iconName))
 {
-    init();
+    // Register the HbIconEngine Instance to HbIconLoader
+    HbIconLoader *loader = HbIconLoader::global();    
+    loader->storeIconEngineInfo(this);
 }
 
 HbIconEngine::HbIconEngine(const HbIconEngine &other) :
@@ -480,23 +495,30 @@
     QIconEngineV2(other),
     d(new HbIconEnginePrivate(*other.d))
 {
-    init();
     HbIcon::Flags newFlags = d->flags;
     d->flags = 0;
     setFlags(newFlags);
+    // Register the HbIconEngine Instance to HbIconLoader
+    HbIconLoader *loader = HbIconLoader::global();
+    loader->storeIconEngineInfo(this);
 }
 
 HbIconEngine::HbIconEngine(QDataStream &stream) :
     d(new HbIconEnginePrivate(stream))
 {
-    init();
     HbIcon::Flags newFlags = d->flags;
     d->flags = 0;
     setFlags(newFlags);
+    // Register the HbIconEngine Instance to HbIconLoader
+    HbIconLoader *loader = HbIconLoader::global();
+    loader->storeIconEngineInfo(this);
 }
 
 HbIconEngine::~HbIconEngine()
 {
+    // Unregister the HbIconEngine Instance to HbIconLoader
+    HbIconLoader *loader = HbIconLoader::global();
+    loader->removeIconEngineInfo(this);
     delete d;
 }
 
@@ -716,7 +738,6 @@
     return QPixmap();
 }
 
-
 void HbIconEngine::setColor(const QColor &color)
 {
     // Store the color. Note that we won't pass it later to the loader
@@ -792,7 +813,7 @@
                           Qt::AspectRatioMode aspectRatioMode,
                           Qt::Alignment alignment,
                           QIcon::Mode mode,
-                          QIcon::State state) const
+                          QIcon::State state)
 {
     // If loading the pixmap has failed, do not retry forever
     if (loadFailed(mode, state)) {
@@ -835,6 +856,9 @@
         // If icon parameters changed unload the icon first, and get the new icon
         d->unLoadIcon();
         d->icon = paintHelper(s, aspectRatioMode, mode, state);
+        if ( d->icon && d->icon->isCreatedOnServer() ) {
+            d->iconType = d->icon->iconData().type;
+        }
     }
 
     // Adjust the alignment and draw the icon.
@@ -872,8 +896,13 @@
     const QSizeF &size,
     Qt::AspectRatioMode aspectRatioMode,
     QIcon::Mode mode,
-    QIcon::State state) const
+    QIcon::State state)
 {
+    // Set up signal connections if not yet done. This cannot be done during construction
+    // because it would then consume time unnecessarily in case the NonThemeable flag is
+    // set afterwards (after construction but before the first paint).
+    ensureSignalConnections();
+
     QString name = iconName(mode, state);
     QIcon::Mode modeForLoader = mode;
     HbIconImpl *icon = NULL;
@@ -953,14 +982,14 @@
     The data will be reloaded (well, at least tried to be reloaded) when the icon is
     painted the next time.
  */
-void HbIconEngine::clearStoredIconContent(bool resetIconSize)
+void HbIconEngine::clearStoredIconContent(bool resetIconSize, bool unloadedByServer)
 {
 #ifdef HB_ICON_TRACES
     qDebug("HbIconEngine %x: clearStoredIconContent", (int) this);
 #endif
 
     d->pixmap = QPixmap();
-    d->unLoadIcon();
+    d->unLoadIcon(unloadedByServer);
     d->defaultSize = QSizeF();
     if (resetIconSize) {
         d->size = QSizeF();
@@ -989,18 +1018,27 @@
     }
 }
 
-void HbIconEngine::init()
+void HbIconEngine::ensureSignalConnections()
 {
-    connect(hbInstance->theme(), SIGNAL(changed()), this, SLOT(updateTheme()));
-
-    connect(HbLayoutDirectionNotifier::instance(), SIGNAL(layoutDirectionChanged()),
-        this, SLOT(handleLayoutDirectionChanged()));
+    if (!d->signalConnectionsSet) {
+        d->signalConnectionsSet = true;
+        if (!d->flags.testFlag(HbIcon::NonThemeable)) {
+            connect(&hbInstance->theme()->d_ptr->iconTheme, SIGNAL(iconsUpdated(const QStringList &)), this, SLOT(themeChange(const QStringList &)));
+            connect(HbLayoutDirectionNotifier::instance(), SIGNAL(layoutDirectionChanged()),
+                    this, SLOT(handleLayoutDirectionChanged()));
+            // No need to worry about missed notifications because if the icon was not
+            // painted before then there is nothing to clear.
+        }
+    }
 }
 
-void HbIconEngine::updateTheme()
+void HbIconEngine::themeChange(const QStringList &updatedFiles)
 {
     // Theme has changed, clear stored icon content
-    clearStoredIconContent();
+    // Server side icon cache is already cleared when theme is changed
+    if (updatedFiles.count() == 0 || (d->icon && updatedFiles.contains(d->icon->iconFileName())) ) {
+        clearStoredIconContent(false, true);
+    }
 }
 
 void HbIconEngine::handleLayoutDirectionChanged()
@@ -1081,6 +1119,27 @@
     }
 }
 
+/*!
+ * Removes the item in the cache if the ref. count is 0 and does delete on
+ * HbIconImpl and Resets the IconImpl. 
+ */
+void HbIconEngine::resetIconImpl() const
+ {  
+#if defined(HB_SGIMAGE_ICON) || defined(HB_NVG_CS_ICON)
+    if ( (d->iconType == SGIMAGE) || (d->iconType == NVG) ) {
+        if ( d->icon ) {
+            d->icon->decrementRefCount();
+            if ( d->icon->refCount() == 0 && d->icon->isCreatedOnServer() ) {
+                HbIconLoader *loader = HbIconLoader::global();
+                loader->removeItemInCache(d->icon);
+                d->icon->dispose();
+            }
+            d->icon = 0;
+        }
+    }
+#endif
+ }
+
 void HbIconEngine::addBadge(Qt::Alignment align,
                       const HbIcon& icon,
                       int z)
@@ -1108,4 +1167,12 @@
     return d->isBadged();
 }
 
+/*!
+ * Returns the IconFormat Type
+ */
+HbIconFormatType HbIconEngine::iconFormatType() const
+{
+    return d->iconType;
+}
+
 // End of File
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/image/hbiconengine_p.h
--- a/src/hbcore/image/hbiconengine_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/image/hbiconengine_p.h	Mon May 03 12:48:33 2010 +0300
@@ -29,6 +29,7 @@
 #include <QIcon>
 #include <QIconEngine>
 #include <QDataStream>
+#include "hbthemecommon_p.h"
 #include "hbglobal.h"
 #include "hbicon.h"
 
@@ -77,18 +78,19 @@
     void setColor(const QColor &color);
     QColor color() const;
 
-    void paint( QPainter *painter,
-                const QRect &rect,
-                QIcon::Mode mode,
-                QIcon::State state );
+    void paint(QPainter *painter,
+               const QRect &rect,
+               QIcon::Mode mode,
+               QIcon::State state);
 
-    void paint( QPainter *painter,
-                const QRectF &rect,
-                Qt::AspectRatioMode aspectRatioMode = Qt::KeepAspectRatio,
-                Qt::Alignment alignment = Qt::AlignCenter,
-                QIcon::Mode mode = QIcon::Normal,
-                QIcon::State state = QIcon::Off ) const;
+    void paint(QPainter *painter,
+               const QRectF &rect,
+               Qt::AspectRatioMode aspectRatioMode = Qt::KeepAspectRatio,
+               Qt::Alignment alignment = Qt::AlignCenter,
+               QIcon::Mode mode = QIcon::Normal,
+               QIcon::State state = QIcon::Off);
 
+    void resetIconImpl() const;
     HbIconAnimator *animator() const;
     void setAnimator(HbIconAnimator *animator);
     bool isMirrored() const;
@@ -98,26 +100,26 @@
     bool removeBadge(const HbIcon& badge);
     void removeAllBadges();
     const QList<HbBadgeIconInfo> badges() const;
-
+    HbIconFormatType iconFormatType() const;    
 private:
-    void init();
+    void ensureSignalConnections();
     QPixmap getPixmapFromAnimation() const;
     
-    HbIconImpl* paintHelper( const QSizeF &size,
-        Qt::AspectRatioMode aspectRatioMode,
-        QIcon::Mode,
-        QIcon::State) const;
+    HbIconImpl* paintHelper(const QSizeF &size,
+                            Qt::AspectRatioMode aspectRatioMode,
+                            QIcon::Mode,
+                            QIcon::State);
 
     bool loadFailed(QIcon::Mode mode, QIcon::State state) const;
 
     HbIconAnimation *animation() const;
 
 public slots:
-    void clearStoredIconContent(bool resetIconSize = false);
+    void clearStoredIconContent(bool resetIconSize = false, bool unloadedByServer = false);
     void clearStoredNonAnimIconContent();
 
 private slots:
-    void updateTheme();
+    void themeChange(const QStringList &updatedFiles);
     void handleLayoutDirectionChanged();
     void handleDefaultSizeAdjustmentChanged();
     void handleAnimationUpdated();
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/image/hbiconimpl_p.h
--- a/src/hbcore/image/hbiconimpl_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/image/hbiconimpl_p.h	Mon May 03 12:48:33 2010 +0300
@@ -31,7 +31,7 @@
 
 #include "hbthemecommon_p.h"
 
-typedef void * IconMaskedData ;
+typedef void HbIconMaskedData ;
 
 class HbMaskableIconImpl;
 
@@ -69,7 +69,8 @@
     virtual void paint(QPainter* painter,
                         const QRectF &childRect,
                         Qt::Alignment alignment,
-                        HbMaskableIconImpl * maskIconData = 0) = 0;
+                        const QPainterPath &clipPath = QPainterPath(),
+						HbMaskableIconImpl * maskIconData = 0) = 0;
     virtual QSize defaultSize() const = 0;
     virtual QSize size() = 0;
     void setColor(const QColor &color)
@@ -149,7 +150,7 @@
         }
     }
 
-    virtual void destroyMaskedData(IconMaskedData data)
+    virtual void destroyMaskedData(HbIconMaskedData *data)
     {
         Q_UNUSED(data);
     }
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/image/hbiconimplcreator_p.cpp
--- a/src/hbcore/image/hbiconimplcreator_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/image/hbiconimplcreator_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -76,10 +76,10 @@
         default:
             break;
     }
-
-    if (iconImpl) {
-        iconImpl->setColor(params.color);
-    }
+    
+	if (iconImpl && params.color.isValid()){
+		iconImpl->setColor(params.color);
+	}
 
     return iconImpl;
 }
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/image/hbiconloader.cpp
--- a/src/hbcore/image/hbiconloader.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/image/hbiconloader.cpp	Mon May 03 12:48:33 2010 +0300
@@ -38,6 +38,7 @@
 #include <QImageReader>
 #include <QHash>
 
+#include "hbframedrawer_p.h"
 #include "hbicontheme_p.h"
 #include "hbstandarddirs_p.h"
 #include "hblayoutdirectionnotifier_p.h"
@@ -59,6 +60,10 @@
 #include "hbthemecommon_p.h"
 #include "hbiconimplcreator_p.h"
 
+#ifdef HB_NVG_CS_ICON
+#include "hbeglstate_p.h"
+#endif
+
 #define HB_ICONIMPL_CACHE
 /*
  * Client side caching of sgimage icon required,
@@ -167,7 +172,7 @@
 };
 
 HbIconLoaderPrivate::HbIconLoaderPrivate() :
-        storedTheme(HbIconTheme::global()->currentTheme()),
+        storedTheme(HbTheme::instance()->name()),
         mirroredListCreated(false),
         sourceResolution(144), // This is about the resolution of a Nokia N95 8GB
         resolution(144),
@@ -291,7 +296,7 @@
 
         // If there was no theme index, search the icon in theme icon dirs (slow)
         if (!themeIndexUsed) {
-        foreach( const QString &dir, HbIconTheme::global()->dirList() ) {
+        foreach (const QString &dir, HbThemePrivate::instance()->iconDirectories()) {
                 if (mirrored) {
                     // If icon is mirrored, try to find the icon in a separate "mirrored" folder used for mirrored icons
                     iconPath =  HbStandardDirs::findResource( dir + "mirrored" + '/' + iconName, Hb::IconResource );
@@ -509,6 +514,7 @@
 
 void HbIconLoaderPrivate::createMirroredList()
 {
+    /* Todo: mirrored.txt will be refactored
     // Find mirrored.txt file
     QString filename = HbStandardDirs::findResource("themes/themes/mirrored.txt", Hb::ThemeResource);
     if (filename.endsWith("mirrored.txt")) {
@@ -531,6 +537,53 @@
         qSort(mirroredList.begin(), mirroredList.end());
         }
     }
+    */
+    // button
+    mirroredList << "qtg_fr_btn_normal" << "qtg_fr_btn_pressed" << "qtg_fr_btn_latched" << "qtg_fr_btn_highlight";
+    mirroredList << "qtg_fr_btn_latched_highlight" << "qtg_fr_btn_disabled";
+
+    // form
+    mirroredList << "qtg_fr_form_value";
+
+    // grid
+    mirroredList << "qtg_fr_grid_normal" << "qtg_fr_grid_highlight" << "qtg_fr_grid_pressed";
+
+    // list
+    mirroredList << "qtg_fr_list_normal" << "qtg_fr_list_highlight" << "qtg_fr_list_pressed" << "qtg_fr_list_parent_normal";
+    mirroredList << "qtg_fr_convlist_sent_normal" << "qtg_fr_convlist_sent_highlight" << "qtg_fr_convlist_sent_pressed";
+    mirroredList << "qtg_fr_convlist_received_normal" << "qtg_fr_convlist_received_highlight" << "qtg_fr_convlist_received_pressed";
+
+    // popup
+    mirroredList << "qtg_fr_popup_list_normal" << "qtg_fr_popup_list_pressed" << "qtg_fr_popup_list_highlight" << "qtg_fr_popup_list_parent_normal";
+    mirroredList << "qtg_fr_popup_grid_normal" << "qtg_fr_popup_grid_pressed" << "qtg_fr_popup_grid_highlight" << "qtg_graf_dimming_image";
+    mirroredList << "qtg_fr_popup" << "qtg_fr_popup_secondary" << "qtg_fr_popup_preview";
+
+    // progressive slider
+    mirroredList << "qtg_fr_progslider_frame" << "qtg_fr_progslider_pressed" << "qtg_fr_progslider_loaded";
+    mirroredList << "qtg_fr_progslider_played" << "qtg_graf_progslider_handle_normal" << "qtg_graf_progslider_handle_pressed";
+
+    // slider
+    mirroredList << "qtg_fr_slider_v_frame" << "qtg_fr_slider_v_filled" << "qtg_graf_slider_v_handle_normal" << "qtg_graf_slider_v_tick_minor";
+    mirroredList << "qtg_graf_slider_v_tick_major" << "qtg_fr_slider_h_frame" << "qtg_fr_slider_h_filled" << "qtg_graf_slider_h_handle_normal";
+    mirroredList << "qtg_graf_slider_h_tick_minor" << "qtg_graf_slider_h_tick_major";
+
+    // tabs
+    mirroredList << "qtg_fr_tab_active" << "qtg_fr_tab_passive_normal" << "qtg_fr_tab_passive_pressed" << "qtg_fr_tab_mask";
+
+    // toolbar
+    mirroredList << "qtg_fr_tb_h_normal" << "qtg_fr_tb_h_pressed" << "qtg_fr_tb_h_latched" << "qtg_fr_tb_h_disabled";
+    mirroredList << "qtg_fr_tb_v_normal" << "qtg_fr_tb_v_pressed" << "qtg_fr_tb_v_latched" << "qtg_fr_tb_v_disabled";
+
+    // toolbar extension
+    mirroredList << "qtg_fr_tb_ext";
+
+    // scrollbar
+    mirroredList << "qtg_fr_scroll_v_handle" << "qtg_fr_scroll_v_frame" << "qtg_fr_scroll_h_handle" << "qtg_fr_scroll_h_frame";
+
+    // status pane
+    mirroredList << "qtg_fr_status_normal" << "qtg_fr_status_pressed" << "qtg_fr_status_latched" << "qtg_indi_status_options";
+
+    qSort(mirroredList.begin(), mirroredList.end());
 }
 
 #ifdef HB_ICONIMPL_CACHE
@@ -675,7 +728,7 @@
 
 // Theme server on desktop was found very slow (probably due to IPC with QLocalServer/QLocalSocket).
 // disabling icon sharing via theme server until theme server performance on desktop is improved
-#ifdef  Q_OS_SYMBIAN
+#ifdef Q_OS_SYMBIAN
     GET_MEMORY_MANAGER(HbMemoryManager::SharedMemory)
     // Try to take data from server if parameters don't prevent it
     if (manager && format != "MNG" && format != "GIF" &&
@@ -794,6 +847,53 @@
     d->setLayoutMirrored(primaryWindow->layoutDirection() == Qt::RightToLeft);
 }
 
+void HbIconLoader::handleForegroundLost()
+{
+#if defined(HB_SGIMAGE_ICON) || defined(HB_NVG_CS_ICON)
+    // Remove SGImage /NVG type of icons 
+    freeGpuIconData();
+    // delete the VGImage
+    HbEglStates *eglStateInstance = HbEglStates::global();
+    eglStateInstance->handleForegroundLost();
+    // notify the server to clear the SGImage and NVG type of icons from the client's session
+    HbThemeClient::global()->notifyForegroundLostToServer();
+#endif
+}
+
+/*!
+ * Removes the  IconImpl entry from the client side cache
+ */
+void HbIconLoader::removeItemInCache(HbIconImpl *iconImpl)
+{
+#ifdef HB_ICONIMPL_CACHE  
+    if ( iconImpl ) {
+        iconImplCache.remove(iconImplCache.key(iconImpl));
+    }
+#else
+    Q_UNUSED(iconImpl);
+#endif
+}
+
+/*!
+ *  Cleans up (deletes) the HbIconImpl instances at the client side
+ *  It also resets the engine's iconImpl and MaskableIcon's iconImpl
+ */
+void HbIconLoader::freeGpuIconData()
+{
+#if defined(HB_SGIMAGE_ICON) || defined(HB_NVG_CS_ICON)
+	for( int i = 0; i < iconEngineList.count(); i++ ) {	    
+        HbIconEngine *engine = iconEngineList.at(i);
+	    engine->resetIconImpl();
+	}	
+	for(int i = 0; i< frameDrawerInstanceList.count(); i++) {
+	    HbFrameDrawerPrivate * fd = frameDrawerInstanceList.at(i);
+	    if ( (fd->iconFormatType() == SGIMAGE) || (fd->iconFormatType() == NVG) ) {
+	        fd->resetMaskableIcon();            
+	    }    
+	}    
+#endif
+}
+
 /*!
   \internal
 
@@ -814,12 +914,11 @@
     bool temp;
     if (resType == Hb::EffectResource) {
         QMap<int, QString> effectHier = HbThemeUtils::constructHierarchyListWithPathInfo(
-            name, HbIconTheme::global()->currentTheme(), Hb::EffectResource);
-        QMap<int, QString> effectFiles =
-            HbStandardDirs::findResourceList(effectHier, Hb::EffectResource);
+            name, HbTheme::instance()->name(), Hb::EffectResource);
+        HbStandardDirs::findResourceList(effectHier, Hb::EffectResource);
 
         // Just take the first value from the map. (note that maps are sorted by the key)
-        foreach (const QString &file, effectFiles) {
+        foreach (const QString &file, effectHier) {
             return file;
         }
 
@@ -833,6 +932,38 @@
     }
 }
 
+/*!
+  This function is used to register the IconEngine instance to IconLoader
+ */
+void HbIconLoader::storeIconEngineInfo(HbIconEngine *iconEngine)
+{    
+    iconEngineList.append( iconEngine );
+}
+
+/*!
+  This function is used to unregister the Iconengine instance from Iconloader
+ */
+void HbIconLoader::removeIconEngineInfo(HbIconEngine *iconEngine)
+{
+   iconEngineList.removeOne(iconEngine); 
+}
+
+/*!
+  This function is used to register the FrameDrawerPrivate instance to IconLoader
+ */
+void HbIconLoader::storeFrameDrawerInfo( HbFrameDrawerPrivate *frameDrawer )
+{
+    frameDrawerInstanceList.append(frameDrawer);
+}
+
+/*!
+  This function is used to unregister the FrameDrawerPrivate instance from IconLoader
+ */
+void HbIconLoader::removeFrameDrawerInfo( HbFrameDrawerPrivate *frameDrawer )
+{
+    frameDrawerInstanceList.removeOne(frameDrawer);    
+}
+
 void HbIconLoader::resolveCleanIconName(HbIconLoadingParams &params) const
 {
     // Replace empty icon name with the "unknown" icon if needed.
@@ -1375,7 +1506,7 @@
 
 // Theme server on desktop was found very slow (probably due to IPC with QLocalServer/QLocalSocket).
 // disabling icon sharing via theme server until theme server performance on desktop is improved
-#ifdef  Q_OS_SYMBIAN
+#ifdef Q_OS_SYMBIAN
         GET_MEMORY_MANAGER(HbMemoryManager::SharedMemory)
         // Try to take data from server if parameters don't prevent it
         if (!options.testFlag(DoNotCache) 
@@ -1446,7 +1577,7 @@
     qDebug() << "HbIconLoader::loadIcon END";
 #endif
 
-    icon = new HbPixmapIconImpl(params.canvasPixmap);
+    icon = new HbPixmapIconImpl(params.canvasPixmap, params.iconFileName);
     return icon;
 }
 
@@ -1570,7 +1701,8 @@
         getMultiIconImplFromServer(iconPathList, sizeList,
                                    aspectRatioMode,
                                    mode,
-                                   (mirrored && !mirroredIconFound),
+                                   mirrored, 
+                                   mirroredIconFound,
                                    options,
                                    color,
                                    HbIconLoader::AnyType,
@@ -1598,7 +1730,7 @@
 }
 
 // Initiates an IPC call to the ThemeServer to unload ( decrement ref count ) the icon
-void HbIconLoader::unLoadIcon(HbIconImpl * icon)
+void HbIconLoader::unLoadIcon(HbIconImpl * icon, bool unloadedByServer)
 {
     if (!icon) {
         return;
@@ -1607,13 +1739,15 @@
     icon->decrementRefCount();
 
     if (icon->refCount() == 0 && icon->isCreatedOnServer()) {
-        HbThemeClient::global()->unloadIcon(icon->iconFileName(),
-                                            icon->keySize(),
-                                            icon->iconAspectRatioMode(),
-                                            icon->iconMode(),
-                                            icon->isMirrored(),
-                                            icon->color()
-                                           );
+        if (!unloadedByServer) {
+           HbThemeClient::global()->unloadIcon(icon->iconFileName(),
+                                               icon->keySize(),
+                                               icon->iconAspectRatioMode(),
+                                               icon->iconMode(),
+                                               icon->isMirrored(),
+                                               icon->color()
+                                              );
+        }
 #ifdef HB_ICONIMPL_CACHE
         int rem = iconImplCache.remove(iconImplCache.key(icon));
         if (rem > 0) {
@@ -1659,6 +1793,7 @@
                                 Qt::AspectRatioMode aspectRatioMode,
                                 QIcon::Mode mode,
                                 bool mirrored,
+                                bool mirroredIconFound,
                                 HbIconLoader::IconLoaderOptions options,
                                 const QColor &color,
                                 HbIconLoader::IconDataType type,
@@ -1712,7 +1847,7 @@
         params.aspectRatioMode = aspectRatioMode;
         params.mode = mode;
         params.mirrored = mirrored;
-        //params.mirroredIconFound = mirroredIconFound;
+        params.mirroredIconFound = mirroredIconFound;
 
 
         for (int i = 0; i < count;  i++) {
@@ -1776,7 +1911,7 @@
             int rem = iconImplCache.remove(iconImplCache.key(impl));
             if (rem > 0) {
 #ifdef HB_ICON_TRACES
-            qDebug()<<"HbIconLoader::unLoadMultiIcon :Removed from HbIconImpl Cache "<<rem<< impl->iconFileName()<< icon->keySize().height()<<"X"<<icon->keySize().width() ;
+            qDebug()<<"HbIconLoader::unLoadMultiIcon :Removed from HbIconImpl Cache "<<rem<< impl->iconFileName()<< impl->keySize().height()<<"X"<<impl->keySize().width() ;
 #endif 
             }
 #endif      
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/image/hbiconloader_p.h
--- a/src/hbcore/image/hbiconloader_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/image/hbiconloader_p.h	Mon May 03 12:48:33 2010 +0300
@@ -29,10 +29,12 @@
 #include <hbglobal.h>
 #include <hbnamespace.h>
 #include <hbthemecommon_p.h>
+#include <hbiconengine_p.h>
 #include <QStringList>
 #include <QIcon> //krazy:exclude=qclasses
 #include <QFlags>
 
+class HbFrameDrawerPrivate;
 class HbIconLoaderPrivate;
 class HbIconAnimator;
 class HbIconImpl;
@@ -102,7 +104,7 @@
         HbIconAnimator *animator = 0,
         const QColor &color = QColor());
 
-    void unLoadIcon(HbIconImpl * icon);
+    void unLoadIcon(HbIconImpl * icon, bool unloadedByServer = false);
     void unLoadMultiIcon(QVector<HbIconImpl *> &multiPieceImpls);
         
     HbIconImpl* loadMultiPieceIcon(const QStringList &listOfIcons,
@@ -136,6 +138,17 @@
     QString findSharedResource(const QString &name,
                                Hb::ResourceType resType = Hb::IconResource);
 
+    void storeIconEngineInfo( HbIconEngine *iconEngine );
+    void removeIconEngineInfo( HbIconEngine *iconEngine );
+    
+    void storeFrameDrawerInfo( HbFrameDrawerPrivate *frameDrawer );
+    void removeFrameDrawerInfo( HbFrameDrawerPrivate *frameDrawer );
+
+    void freeGpuIconData();
+    void removeItemInCache( HbIconImpl *iconImpl );
+
+    void handleForegroundLost();
+
 signals:
     void defaultSizeAdjustmentChanged();
 
@@ -154,6 +167,7 @@
                                     Qt::AspectRatioMode aspectRatioMode,
                                     QIcon::Mode mode,
                                     bool mirrored,
+                                    bool mirroredIconFound,
                                     HbIconLoader::IconLoaderOptions options,
                                     const QColor &color,
                                     HbIconLoader::IconDataType type,
@@ -165,6 +179,8 @@
     void loadAnimatedIcon(HbIconLoadingParams &params, const QString &format);
     void loadPixmapIcon(HbIconLoadingParams &params, const QString &format);
 
+    QList< HbFrameDrawerPrivate *> frameDrawerInstanceList;    
+    QList< HbIconEngine *> iconEngineList;
     friend class HbApplication;
     friend class HbIconLoaderPrivate;
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/image/hbiconsource.cpp
--- a/src/hbcore/image/hbiconsource.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/image/hbiconsource.cpp	Mon May 03 12:48:33 2010 +0300
@@ -97,7 +97,7 @@
 	    float lViewboxHeight = * (float*)(lBuf + NVG_VIEWBOX_HEIGHT_OFS);
 
 	    if (lViewboxWidth > 0 && lViewboxHeight > 0) {
-	        ret = QSize(lViewboxWidth, lViewboxHeight);
+	        ret = QSize((int)lViewboxWidth, (int)lViewboxHeight);
 	    } else {
 	        ret = QSize(0, 0);
 	    }
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/image/hbicontheme.cpp
--- a/src/hbcore/image/hbicontheme.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/image/hbicontheme.cpp	Mon May 03 12:48:33 2010 +0300
@@ -30,11 +30,10 @@
 
 #include <QtCore/QDebug>
 #include <QtCore/QDir>
-#include <QSettings>
 #include <hbstandarddirs_p.h>
 #include <hbiniparser_p.h>
 
-static HbIconTheme *globalInst = 0;
+#define THEME_INDEX_FILE "index.theme"
 
 class HbIconThemePrivate
 {
@@ -42,41 +41,37 @@
     HbIconThemePrivate();
     ~HbIconThemePrivate();
 
-    QString m_dir;
+    QString m_theme;
     QStringList m_dirList;
     QString m_description;
-
-    bool parseDesktopEntryFile(const QString &dir);
-    bool initialise(const QString &dir);
-    bool addDefaultPath();
-
+    bool loaded;
+    void loadThemeDescriptionFile(const QString &themePath, int priority);
+    void loadThemeDescriptionFiles(const QString &theme);
+    bool addBaseThemePath();
 };
 
-
-bool HbIconThemePrivate::initialise(const QString &dir)
+void HbIconThemePrivate::loadThemeDescriptionFiles(const QString &theme)
 {
-    bool success = false;
-
-    QMap<int,QString> maplist = HbThemeUtils::constructHierarchyListWithPathInfo(
-        QString(), dir, Hb::IconResource);
-        
-    // Cleanup old dirlist
-    m_dirList.clear();
-    QList<QString> list = maplist.values();
-    for (int i = list.count() - 1; i >= 0; --i) {
-        if (parseDesktopEntryFile(list.at(i))) {
-            success = true;
-        }
-    }
-
-    if (!addDefaultPath()) {
-        qDebug() << "Can't find default theme";
-    }
-    return success;
-
+    const QString indextheme(THEME_INDEX_FILE);
+    QString pathToTheme;
+    QMap<int, QString> maplist = HbThemeUtils::constructHierarchyListWithPathInfo(
+        QString(), theme, Hb::IconResource);
+    QMapIterator<int, QString> i(maplist);
+     i.toBack();
+     while (i.hasPrevious()) {
+         i.previous();
+         pathToTheme = HbStandardDirs::findResource(i.value() + indextheme, Hb::IconResource);
+         if (!pathToTheme.isEmpty()) {
+             loadThemeDescriptionFile(pathToTheme, i.key());
+         }
+     }
+    if (!addBaseThemePath()) {
+         qDebug() << "Can't find base theme";
+     }
+     loaded = true;
 }
 
-HbIconThemePrivate::HbIconThemePrivate()
+HbIconThemePrivate::HbIconThemePrivate() : loaded(false)
 {
 }
 
@@ -84,74 +79,61 @@
 {
 }
 
-bool HbIconThemePrivate::parseDesktopEntryFile(const QString &dir)
+void HbIconThemePrivate::loadThemeDescriptionFile(const QString &themePath, int priority)
 {
-    bool success = true;
     HbIniParser iniParser;
-    QString themePath;
-    QString indextheme("index.theme");
-
-    themePath = HbStandardDirs::findResource( dir + indextheme, Hb::IconResource);
-    if (themePath.isEmpty()) {
-        return false;
-    }
-
-    QFile themeFile( themePath );
+    QFile themeFile(themePath);
 
     if (!themeFile.open(QIODevice::ReadOnly) || !iniParser.read(&themeFile)) {
         qDebug() << "Can't access file : " << themePath;
-        return false;
+        return;
     }
-    m_description = iniParser.value("Icon Theme", "Comment");
-
+    if (priority == HbLayeredStyleLoader::Priority_Theme) {
+        m_description = iniParser.value("Icon Theme", "Comment");
 #ifdef Q_OS_SYMBIAN
-    m_description = m_description.left(m_description.indexOf("\n", 0));
+        m_description = m_description.left(m_description.indexOf("\n", 0));
 #endif
+    }
 
     QString directories = iniParser.value("Icon Theme", "Directories");
-
     QStringList dirList = directories.split( ',', QString::SkipEmptyParts );
-
-    themePath.chop(indextheme.length());
+    QString indexThemeDir(themePath);
+    indexThemeDir.chop(sizeof(THEME_INDEX_FILE) - 1);
 
     foreach (const QString &str, dirList) {
-        m_dirList.append(QString(themePath + str + '/'));
+        m_dirList.append(QString(indexThemeDir + str + '/'));
     }
-
-    return success;
 }
 
-bool HbIconThemePrivate::addDefaultPath()
+bool HbIconThemePrivate::addBaseThemePath()
 {
     HbIniParser iniParser;
-    QString defaultThemeName = HbThemeUtils::defaultTheme();
-    QString defaultLocaleThemePath = HbStandardDirs::findResource("themes/icons/" + defaultThemeName 
-                + "/locale/" + QLocale().name() + "/index.theme", Hb::IconResource);
+    const HbThemeInfo &baseThemeInfo = HbThemeUtils::baseTheme();
+    QString baseThemePath = baseThemeInfo.rootDir + "/themes/icons/" + baseThemeInfo.name + "/"THEME_INDEX_FILE;
 
-    QString defaultThemePath = HbStandardDirs::findResource("themes/icons/" + defaultThemeName + "/index.theme", Hb::IconResource);
-    QStringList defaultlist;
-    if (!defaultLocaleThemePath.isEmpty()) {
-        defaultlist << defaultLocaleThemePath;
-    }
-    if (!defaultThemePath.isEmpty()) {
-        defaultlist << defaultThemePath;
+    // Parse it
+    QFile baseThemeFile(baseThemePath);
+    if (!baseThemeFile.open(QIODevice::ReadOnly) || !iniParser.read(&baseThemeFile)) {
+        qDebug() << "Can't access file";
+        return false;
     }
-    foreach (QString defaultThemePath, defaultlist) {
-        // Parse it
-        QFile defaultThemeFile(defaultThemePath);
-        if (!defaultThemeFile.open(QIODevice::ReadOnly) || !iniParser.read(&defaultThemeFile)) {
-            qDebug() << "Can't access file";
-            return false;
-        }
-        //Read parameters
-        QString directories = iniParser.value("Icon Theme", "Directories");
-        QStringList dirList = directories.split(',', QString::SkipEmptyParts);
-        defaultThemePath.chop(sizeof("index.theme") - 1);
-        // Save paths
-        foreach (const QString &str, dirList) {
-            m_dirList.append(QString(defaultThemePath + str + '/'));
-        }
+
+    if (m_theme == baseThemeInfo.name) {
+        m_description = iniParser.value("Icon Theme", "Comment");
+#ifdef Q_OS_SYMBIAN
+        m_description = m_description.left(m_description.indexOf("\n", 0));
+#endif
     }
+
+    //Read parameters
+    QString directories = iniParser.value("Icon Theme", "Directories");
+    QStringList dirList = directories.split(',', QString::SkipEmptyParts);
+    baseThemePath.chop(sizeof(THEME_INDEX_FILE) - 1);
+    // Save paths
+    foreach (const QString &str, dirList) {
+        m_dirList.append(QString(baseThemePath + str + '/'));
+    }
+
     return true;
 }
 
@@ -171,15 +153,13 @@
     delete d;
 }
 
-/**
- * Returns a pointer to the Singleton object.
- */
-HbIconTheme *HbIconTheme::global()
+void HbIconTheme::setCurrentTheme(const QString &theme)
 {
-    if (!globalInst) {
-        globalInst = new HbIconTheme;    
+    if (d->m_theme != theme) {
+        d->m_theme = theme;
+        d->m_dirList.clear();
+        d->loaded = false;
     }
-    return globalInst;
 }
 
 /**
@@ -187,32 +167,7 @@
  */
 QString HbIconTheme::currentTheme() const
 {
-    return d->m_dir;
-}
-
-
-/**
- * Allows HbTheme to set the current theme.
- */
-void HbIconTheme::setCurrentTheme(const QString& dir)
-{
-    bool success = d->initialise(dir);
-
-    if (!success) {
-        qDebug() << "Theme not found. We stay with the current theme.";
-        d->initialise(d->m_dir);
-        return;
-    }
-
-    d->m_dir = dir;
-}
-
-/**
- * Name identifier / directory prefix
- */
-QString HbIconTheme::dir() const
-{
-    return d->m_dir;
+    return d->m_theme;
 }
 
 /**
@@ -220,20 +175,27 @@
  */
 QStringList HbIconTheme::dirList() const
 { 
-    if (!d->m_dirList.empty()) {
-        return d->m_dirList;
-    } else {
-        d->initialise(d->m_dir);
-        return d->m_dirList; 
+    if (!d->loaded) {
+        d->loadThemeDescriptionFiles(d->m_theme);
     }
+    return d->m_dirList;
 }
 
 QString HbIconTheme::description() const
 {
+    if (!d->loaded) {
+        d->loadThemeDescriptionFiles(d->m_theme);
+    }
     return d->m_description;
 }
 
 void HbIconTheme::clearDirList()
 {
-	d->m_dirList.clear();
+    d->m_dirList.clear();
+    d->loaded = false;
 }
+
+void HbIconTheme::emitUpdateIcons(const QStringList &fileNames)
+{
+    emit iconsUpdated(fileNames);
+}
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/image/hbicontheme_p.h
--- a/src/hbcore/image/hbicontheme_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/image/hbicontheme_p.h	Mon May 03 12:48:33 2010 +0300
@@ -26,33 +26,31 @@
 #ifndef HBICONTHEME_P_H
 #define HBICONTHEME_P_H
 
+#include <QObject>
 #include <hbglobal.h>
 #include <QStringList>
 
 class HbIconThemePrivate;
 
-class HB_AUTOTEST_EXPORT HbIconTheme
+class HB_AUTOTEST_EXPORT HbIconTheme : public QObject
 {
+Q_OBJECT
+
 public:
     explicit HbIconTheme();
     ~HbIconTheme();
-
-    static HbIconTheme *global();
-
+    void setCurrentTheme(const QString &theme);
     QString currentTheme() const;
-
-    void setCurrentTheme( const QString& dir );
-
-    QString dir() const;
-
     QStringList dirList() const;
     QString description() const;
-    
     void clearDirList();
-
+    void emitUpdateIcons(const QStringList &fileNames = QStringList());
 //    For future addition:
 //    QSizeF actualSize(HbIconLoader::Purpose purpose) const;
 
+signals:
+    void iconsUpdated(const QStringList &fileNames);
+
 private:
     Q_DISABLE_COPY(HbIconTheme)
     HbIconThemePrivate *d;
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/image/hbmaskableiconimpl_p.h
--- a/src/hbcore/image/hbmaskableiconimpl_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/image/hbmaskableiconimpl_p.h	Mon May 03 12:48:33 2010 +0300
@@ -48,9 +48,10 @@
     }
     
     void paint(QPainter* painter, const QRectF &childRect,
-                        Qt::Alignment alignment)
+                        Qt::Alignment alignment,
+                        const QPainterPath &clipPath = QPainterPath())
     {
-        icon->paint(painter, childRect, alignment, this);
+        icon->paint(painter, childRect, alignment, clipPath, this);
         maskApplied = false;
     }
     
@@ -159,12 +160,12 @@
         delete this;
     }
     
-    void setImplData(IconMaskedData data)
+    void setImplData(HbIconMaskedData *data)
     {
         this->data = data;
     }
     
-    IconMaskedData implData()
+    HbIconMaskedData * implData() const
     {
         return data;
     }
@@ -174,10 +175,10 @@
     {
     }
 
-    HbIconImpl *      icon;
-    IconMaskedData    data;
-    QBitmap           maskBitmap;
-    bool              maskApplied;
+    HbIconImpl        *icon;
+    HbIconMaskedData  *data;
+    QBitmap            maskBitmap;
+    bool               maskApplied;
 };
 
 #endif
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/image/hbnvgiconimpl_p.cpp
--- a/src/hbcore/image/hbnvgiconimpl_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/image/hbnvgiconimpl_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -39,11 +39,8 @@
 #include "hbnvgenginepool_p.h"
 #include "hbeglstate_p.h"
 #include "hbmaskableiconimpl_p.h"
-
-struct HbNvgMaskedIcon
-{
-    QPixmap currentPixmap;
-};
+#include "hbvgimageiconrenderer_p.h"
+#include "hbpixmapiconrenderer_p.h"
 
 // Constants
 static const int HB_BITS_PER_COLOR =    8;
@@ -62,12 +59,10 @@
                    mirrored),
         readyToRender(false),
         specialCaseApplied(false),
-        vgimage(0),
-        opacityPaint(VG_INVALID_HANDLE),
-        lastOpacity(1.0),
-        nvgEngine(0),
-        eglStates(HbEglStates::global())
-
+        nvgEngine(NULL),
+        eglStates(HbEglStates::global()),
+        vgImageRenderer(0),
+        pixmapIconRenderer(0)
 {
     eglStates->ref();
     retrieveNvgData();
@@ -77,14 +72,14 @@
 {
     delete nvgEngine;
     if (eglStates) {
-        if (vgimage) {
-            eglStates->removeVGImage(&vgimage);
-        }
-        if (opacityPaint) {
-            vgDestroyPaint(opacityPaint);
-        }
         eglStates->deref(eglStates);
     }
+    if (vgImageRenderer) {
+        delete vgImageRenderer;
+    }
+    if (pixmapIconRenderer) {
+        delete pixmapIconRenderer;
+    }
 }
 
 VGImage HbNvgIconImpl::createVGImageFromNVG(EGLDisplay display,
@@ -188,7 +183,7 @@
 
     vgSeti(VG_RENDERING_QUALITY, VG_RENDERING_QUALITY_BETTER);
 
-    HbNvgEngine::NvgErrorType errorType = drawNVGIcon(iconSize, *nvgEngine);
+    HbNvgEngine::HbNvgErrorType errorType = drawNVGIcon(iconSize, *nvgEngine);
 
     if (!useGivenContext) {
         vgFinish();
@@ -215,21 +210,6 @@
     int width = renderSize.width();
     int height = renderSize.height();
 
-    if (vgimage != VG_INVALID_HANDLE) {
-        QImage image(width, height, QImage::Format_ARGB32_Premultiplied);
-        vgGetImageSubData(vgimage,
-                          image.bits(),
-                          image.bytesPerLine(),
-                          VG_sARGB_8888_PRE,
-                          0,
-                          0,
-                          width,
-                          height);
-
-        currentPixmap = QPixmap::fromImage(image);
-        return currentPixmap;
-    }
-
     EGLDisplay display      = eglGetCurrentDisplay();
     EGLSurface currentReadSurface  = eglGetCurrentSurface(EGL_READ);
     EGLSurface currentWriteSurface  = eglGetCurrentSurface(EGL_DRAW);
@@ -330,7 +310,7 @@
     return currentPixmap;
 }
 
-HbNvgEngine::NvgErrorType HbNvgIconImpl::drawNVGIcon(const QSize & size, HbNvgEngine & nvgEngine)
+HbNvgEngine::HbNvgErrorType HbNvgIconImpl::drawNVGIcon(const QSize & size, HbNvgEngine & nvgEngine)
 {
 
     VGint                   mMatrixMode;
@@ -356,9 +336,9 @@
 
     NvgAspectRatioSettings settings = mapKeyAspectRatioToNvgAspectRatio(aspectRatioMode);
     nvgEngine.setPreserveAspectRatio(settings.nvgAlignStatusAndAspectRatio, settings.type);
-    nvgEngine.setMirroringMode(mirrored);
+    nvgEngine.enableMirroring(mirrored);
 
-    HbNvgEngine::NvgErrorType errorType = nvgEngine.drawNvg(nvgData, size);
+    HbNvgEngine::HbNvgErrorType errorType = nvgEngine.drawNvg(nvgData, size);
 
     vgSeti(VG_MATRIX_MODE, VG_MATRIX_PATH_USER_TO_SURFACE);
     vgLoadMatrix(mPathMatrix);
@@ -418,9 +398,29 @@
 
 }
 
+VGImage HbNvgIconImpl::getVgImage(HbIconImpl * impl, QPainter * painter)
+{
+    HbNvgIconImpl * nvgImpl = (HbNvgIconImpl*)impl;
+
+    painter->beginNativePainting();
+
+    VGImage vgimage = nvgImpl->createVGImageFromNVG(nvgImpl->eglStates->display,
+                      nvgImpl->eglStates->currentReadSurface,
+                      nvgImpl->eglStates->currentWriteSurface,
+                      nvgImpl->eglStates->eglContext,
+                      nvgImpl->contentSize.width(),
+                      nvgImpl->contentSize.height(),
+                      true,
+                      nvgImpl->nvgEngine->engine());
+
+    painter->endNativePainting();
+
+    return vgimage;
+}
 void HbNvgIconImpl::paint(QPainter* painter,
                           const QRectF& rect,
                           Qt::Alignment alignment,
+                          const QPainterPath &clipPath,
                           HbMaskableIconImpl * maskIconData)
 {
 #ifdef HB_ICON_CACHE_DEBUG
@@ -432,36 +432,44 @@
 
     QPointF topLeft = setAlignment(rect, renderSize, alignment);
     if (!nvgEngine) {
-        nvgEngine = HbNVGEnginePool::instance()->getNVGEngine();
+        nvgEngine = HbNvgEnginePool::instance()->getNvgEngine();
     }
 
     bool maskApplied = false;
-    if (maskIconData && maskIconData->maskChanged()) {
+    if (maskIconData && (maskIconData->maskChanged() ||  maskIconData->implData())) {
         maskApplied = true;
     }
 
-    if (readyToRender && !maskApplied) {
-        if (maskIconData) {
-            HbNvgMaskedIcon * mi = (HbNvgMaskedIcon *) maskIconData->implData();
-            if (mi) {
-                painter->drawPixmap(topLeft, mi->currentPixmap, mi->currentPixmap.rect());
-                return;
-            }
+    if ((painter->paintEngine()->type() != QPaintEngine::OpenVG) || maskApplied) {
+
+        painter->beginNativePainting();
+        pixmap();
+        painter->endNativePainting();
+
+        if (!pixmapIconRenderer) {
+            pixmapIconRenderer = new HbPixmapIconRenderer(currentPixmap, this);
+            pixmapIconRenderer->setColor(iconColor);
+            pixmapIconRenderer->setMode(mode);
         }
-        painter->drawPixmap(topLeft, currentPixmap, currentPixmap.rect());
+
+        pixmapIconRenderer->draw(painter, topLeft, clipPath, maskIconData);
         return;
     }
 
-    if ((iconColor.isValid()) || (mode != QIcon::Normal) ||
-            (painter->paintEngine()->type() != QPaintEngine::OpenVG) ||
-            (maskApplied)) {
-
-        applySpecialCases(painter, topLeft, maskIconData);
-        return;
+    QPainterPath intersect;
+    if (!clipPath.isEmpty()) {
+        QPainterPath piecePath;
+        piecePath.addRect(rect);
+        intersect = clipPath.intersected(piecePath);
+        QRectF intRect = intersect.boundingRect();
+        if (intersect.isEmpty()) {
+            return;
+        }
     }
 
-    if (multiPieceIcon || painter->opacity() != 1.0) {
-        if (drawRasterizedIcon(painter, topLeft, renderSize)) {
+    if ((iconColor.isValid()) || (mode != QIcon::Normal) ||
+            multiPieceIcon || painter->opacity() != 1.0) {
+        if (drawRasterizedIcon(painter, topLeft, renderSize, intersect)) {
             return;
         }
     }
@@ -469,56 +477,6 @@
     drawNVGIcon(painter, topLeft, renderSize, settings);
 }
 
-void HbNvgIconImpl::applySpecialCases(QPainter * painter,
-                                      const QPointF & topLeft,
-                                      HbMaskableIconImpl *maskIconData)
-{
-    painter->beginNativePainting();
-    pixmap();
-    painter->endNativePainting();
-
-    if (!specialCaseApplied) {
-
-        if ((iconColor.isValid()) && (mode != QIcon::Disabled)) {
-            if (!currentPixmap.isNull()) {
-                QPixmap mask = currentPixmap.alphaChannel();
-                currentPixmap.fill(iconColor);
-                currentPixmap.setAlphaChannel(mask);
-            }
-        }
-
-        // Apply the mode
-        if (mode != QIcon::Normal) {
-            QStyleOption opt(0);
-            opt.palette = QApplication::palette();
-            currentPixmap = QApplication::style()->generatedIconPixmap(mode, currentPixmap, &opt);
-        }
-        specialCaseApplied = true;
-    }
-
-    if (maskIconData) {
-        HbNvgMaskedIcon * mi = (HbNvgMaskedIcon *)maskIconData->implData();
-        if (maskIconData->maskChanged()) {
-            if (!mi) {
-                mi = new HbNvgMaskedIcon();
-            }
-
-            mi->currentPixmap = currentPixmap;
-            mi->currentPixmap.setMask(maskIconData->mask());
-            maskIconData->setImplData(mi);
-        }
-
-        if (mi) {
-            painter->drawPixmap(topLeft, mi->currentPixmap, mi->currentPixmap.rect());
-            readyToRender = true;
-            return;
-        }
-    }
-
-    painter->drawPixmap(topLeft, currentPixmap, currentPixmap.rect());
-    readyToRender = true;
-}
-
 void HbNvgIconImpl::drawNVGIcon(QPainter * painter,
                                 const QPointF & topLeft,
                                 const QSizeF & renderSize,
@@ -526,7 +484,7 @@
 {
     nvgEngine->engine()->setPreserveAspectRatio(settings.nvgAlignStatusAndAspectRatio,
         settings.type);
-    nvgEngine->engine()->setMirroringMode(mirrored);
+    nvgEngine->engine()->enableMirroring(mirrored);
 
     painter->beginNativePainting();
     vgSeti(VG_MATRIX_MODE, VG_MATRIX_PATH_USER_TO_SURFACE);
@@ -603,8 +561,10 @@
 
 bool HbNvgIconImpl::drawRasterizedIcon(QPainter * painter,
                                        const QPointF & topLeft,
-                                       const QSizeF & renderSize)
+                                       const QSizeF & renderSize,
+                                       const QPainterPath &clipPath)
 {
+    bool ret = false;
     // need to do a reset if EGL contexts changes/recreated
     if (!eglStates->initialized()) {
         eglStates->set(eglGetCurrentDisplay(),
@@ -613,102 +573,31 @@
                        eglGetCurrentContext());
     }
 
-    if (vgimage == VG_INVALID_HANDLE) {
+    if (!vgImageRenderer) {
         painter->beginNativePainting();
 
-        vgimage = createVGImageFromNVG(eglStates->display,
-                                       eglStates->currentReadSurface,
-                                       eglStates->currentWriteSurface,
-                                       eglStates->eglContext,
-                                       renderSize.width(),
-                                       renderSize.height(),
-                                       true,
-                                       nvgEngine->engine());
-        if (vgimage) {
-            eglStates->addVGImage(&vgimage);
+        VGImage vgimage = createVGImageFromNVG(eglStates->display,
+                                               eglStates->currentReadSurface,
+                                               eglStates->currentWriteSurface,
+                                               eglStates->eglContext,
+                                               renderSize.width(),
+                                               renderSize.height(),
+                                               true,
+                                               nvgEngine->engine());
+
+        if (vgimage != VG_INVALID_HANDLE) {
+            vgImageRenderer = new HbVgImageIconRenderer(vgimage, renderSize.toSize(), this);
+            vgImageRenderer->setVgImageCreator(getVgImage);
+            vgImageRenderer->setColor(iconColor);
+            vgImageRenderer->setMode(mode);
         }
         painter->endNativePainting();
-        opacityPaint = VG_INVALID_HANDLE;
     }
 
-    if (vgimage != VG_INVALID_HANDLE) {
-
-        VGint imageMode      = vgGeti(VG_IMAGE_MODE);
-        VGint matrixMode     = vgGeti(VG_MATRIX_MODE);
-        VGPaint oldFillPaint = VG_INVALID_HANDLE;
-        VGPaint oldStrkPaint = VG_INVALID_HANDLE;
-        VGint   blendMode    = 0;
-
-        qreal opacity = painter->opacity();
-
-        if (opacity != lastOpacity) {
-            lastOpacity = opacity;
-            if (opacityPaint == VG_INVALID_HANDLE) {
-                opacityPaint = vgCreatePaint();
-            }
-            if (opacity != 1.0) {
-                VGfloat opaquePaint[] = {1.0f, 1.0f, 1.0f, opacity};
-                if (opacityPaint != VG_INVALID_HANDLE) {
-                    vgSetParameteri(opacityPaint, VG_PAINT_TYPE, VG_PAINT_TYPE_COLOR);
-                    vgSetParameterfv(opacityPaint, VG_PAINT_COLOR, 4, opaquePaint);
-                }
-            }
-
-        }
-
-        if (opacity != 1.0 && opacityPaint != VG_INVALID_HANDLE) {
-            oldFillPaint = vgGetPaint(VG_FILL_PATH);
-            oldStrkPaint = vgGetPaint(VG_STROKE_PATH);
-            blendMode = vgGeti(VG_BLEND_MODE);
-            vgSeti(VG_BLEND_MODE, VG_BLEND_SRC_OVER);
-            vgSetPaint(opacityPaint, VG_FILL_PATH | VG_STROKE_PATH);
-        }
-
-        VGfloat devh = painter->device()->height() - 1;
-        QTransform viewport(1.0f, 0.0f, 0.0f,
-                            0.0f, -1.0f, 0.0f,
-                            0.5f, devh + 0.5f, 1.0f);
-        QTransform imageTransform = painter->transform() * viewport;
-        imageTransform.translate(topLeft.x(), topLeft.y());
-
-        VGfloat mat[9];
-
-        if (opacity == 1.0) {
-            vgSeti(VG_IMAGE_MODE, VG_DRAW_IMAGE_NORMAL);
-        } else {
-            vgSeti(VG_IMAGE_MODE, VG_DRAW_IMAGE_MULTIPLY);
-        }
-
-        vgSeti(VG_MATRIX_MODE, VG_MATRIX_IMAGE_USER_TO_SURFACE);
-
-        mat[0] = imageTransform.m11();
-        mat[1] = imageTransform.m12();
-        mat[2] = imageTransform.m13();
-        mat[3] = imageTransform.m21();
-        mat[4] = imageTransform.m22();
-        mat[5] = imageTransform.m23();
-        mat[6] = imageTransform.m31();
-        mat[7] = imageTransform.m32();
-        mat[8] = imageTransform.m33();
-        vgLoadMatrix(mat);
-
-        vgDrawImage(vgimage);
-        vgSeti(VG_MATRIX_MODE, matrixMode);
-        vgSeti(VG_IMAGE_MODE, imageMode);
-
-        if (oldFillPaint) {
-            vgSetPaint(oldFillPaint, VG_FILL_PATH);
-        }
-        if (oldStrkPaint) {
-            vgSetPaint(oldStrkPaint, VG_STROKE_PATH);
-        }
-
-        if (blendMode) {
-            vgSeti(VG_BLEND_MODE, blendMode);
-        }
-        return true;
+    if (vgImageRenderer) {
+        ret = vgImageRenderer->draw(painter, topLeft, clipPath);
     }
-    return false;
+    return ret;
 }
 
 QPointF HbNvgIconImpl::setAlignment(const QRectF& rect,
@@ -735,8 +624,8 @@
     return contentSize;
 }
 
-void HbNvgIconImpl::destroyMaskedData(IconMaskedData data)
+void HbNvgIconImpl::destroyMaskedData(HbIconMaskedData *data)
 {
-    delete((HbNvgMaskedIcon *)data);
+    pixmapIconRenderer->destroyMaskedData(data);
 }
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/image/hbnvgiconimpl_p.h
--- a/src/hbcore/image/hbnvgiconimpl_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/image/hbnvgiconimpl_p.h	Mon May 03 12:48:33 2010 +0300
@@ -32,11 +32,13 @@
 #include <QBitmap>
 class HbPooledNVGEngine;
 class HbEglStates;
+class HbVgImageIconRenderer;
+class HbPixmapIconRenderer;
 
 struct NvgAspectRatioSettings
 {
-    HbNvgEngine::NvgAlignStatusType nvgAlignStatusAndAspectRatio;
-    HbNvgEngine::NvgMeetOrSliceType type;
+    HbNvgEngine::HbNvgAlignType nvgAlignStatusAndAspectRatio;
+    HbNvgEngine::HbNvgMeetType type;
 };
 
 class HB_AUTOTEST_EXPORT HbNvgIconImpl : public HbIconImpl
@@ -54,13 +56,14 @@
     void paint(QPainter* painter,
                const QRectF &rect,
                Qt::Alignment alignment,
+               const QPainterPath &clipPath = QPainterPath(),
                HbMaskableIconImpl * maskIconData = 0);
 
     QSize defaultSize() const;
 
     QSize size();
 
-    void destroyMaskedData(IconMaskedData data);
+    void destroyMaskedData(HbIconMaskedData *data);
 
 private :
     void retrieveNvgData();
@@ -69,7 +72,7 @@
                          Qt::Alignment alignment);
     NvgAspectRatioSettings mapKeyAspectRatioToNvgAspectRatio(Qt::AspectRatioMode aspectRatio);
 
-    HbNvgEngine::NvgErrorType drawNVGIcon(const QSize & size, HbNvgEngine &engine);
+    HbNvgEngine::HbNvgErrorType drawNVGIcon(const QSize & size, HbNvgEngine &engine);
     int createContextAndSurface(EGLDisplay display,
                                 int width,
                                 int height,
@@ -86,19 +89,17 @@
                                  bool useGivenContext = true,
                                  HbNvgEngine * nvgEngine = 0);
 
-    void applySpecialCases(QPainter * painter,
-                           const QPointF & topLeft,
-                           HbMaskableIconImpl * maskIconData = 0);
-
     bool drawRasterizedIcon(QPainter * painter,
                             const QPointF & topLeft,
-                            const QSizeF & renderSize);
+                            const QSizeF & renderSize,
+                            const QPainterPath &clipPath);
 
     void drawNVGIcon(QPainter * painter,
                      const QPointF & topLeft,
                      const QSizeF & renderSize,
                      NvgAspectRatioSettings settings);
 
+    static VGImage getVgImage(HbIconImpl * impl, QPainter * painter);
 
 private:
     QByteArray          nvgData;
@@ -106,11 +107,10 @@
     bool                readyToRender;
     bool                specialCaseApplied;
     QSize               contentSize;
-    VGImage             vgimage;
-    VGPaint             opacityPaint;
-    qreal               lastOpacity;
-    HbPooledNVGEngine   *nvgEngine;
-    HbEglStates         *eglStates;
+    HbPooledNVGEngine  *nvgEngine;
+    HbEglStates        *eglStates;
+    HbVgImageIconRenderer *vgImageRenderer;
+    HbPixmapIconRenderer * pixmapIconRenderer;
 };
 
 #endif // end of HBNVGICONIMPL_P_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/image/hbpixmapiconimpl_p.cpp
--- a/src/hbcore/image/hbpixmapiconimpl_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/image/hbpixmapiconimpl_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -33,6 +33,7 @@
 
 #include "hbmemoryutils_p.h"
 #include "hbmaskableiconimpl_p.h"
+#include "hbpixmapiconrenderer_p.h"
 
 struct HbPixmapMaskedIcon
 {
@@ -49,21 +50,30 @@
                    keySize,
                    aspectRatioMode,
                    mode,
-                   mirrored)
+                   mirrored),
+        pixmapIconRenderer(0)
 {
     retrievePixmapData();
+    pixmapIconRenderer = new HbPixmapIconRenderer(pixmapData, this);
 }
 
-HbPixmapIconImpl::HbPixmapIconImpl(const QPixmap& pixmap):pixmapData(pixmap)
+HbPixmapIconImpl::HbPixmapIconImpl(const QPixmap& pixmap, const QString& name):
+        pixmapData(pixmap),
+        pixmapIconRenderer(0)
 {
+    pixmapIconRenderer = new HbPixmapIconRenderer(pixmapData, this);
     aspectRatioMode = Qt::KeepAspectRatio;
     mode = QIcon::Normal;
     mirrored = false;
     createdOnServer = false;
+    fileName = name;
 }
 
 HbPixmapIconImpl::~HbPixmapIconImpl()
 {
+    if (pixmapIconRenderer) {
+        delete pixmapIconRenderer;
+    }
 }
 
 QPixmap HbPixmapIconImpl::pixmap()
@@ -97,6 +107,7 @@
 void HbPixmapIconImpl::paint(QPainter* painter,
                              const QRectF &rect,
                              Qt::Alignment alignment,
+                             const QPainterPath &clipPath,
                              HbMaskableIconImpl * maskIconData)
 {
 #ifdef HB_ICON_CACHE_DEBUG
@@ -106,37 +117,18 @@
     QSizeF pixmapSize = pixmapData.size();
 
     if (alignment & Qt::AlignRight) {
-        topLeft.setX( rect.right() - pixmapSize.width() );
+        topLeft.setX(rect.right() - pixmapSize.width());
     } else if (alignment & Qt::AlignHCenter) {
-        topLeft.setX( topLeft.x() + (rect.width() - pixmapSize.width()) / 2 );
+        topLeft.setX(topLeft.x() + (rect.width() - pixmapSize.width()) / 2);
     }
 
     if (alignment & Qt::AlignBottom) {
-        topLeft.setY( rect.bottom() - pixmapSize.height() );
+        topLeft.setY(rect.bottom() - pixmapSize.height());
     } else if (alignment & Qt::AlignVCenter) {
-        topLeft.setY( topLeft.y() + (rect.height() - pixmapSize.height()) / 2 );
+        topLeft.setY(topLeft.y() + (rect.height() - pixmapSize.height()) / 2);
     }
 
-    if (maskIconData) {
-    
-        HbPixmapMaskedIcon * maskedImage = (HbPixmapMaskedIcon *) maskIconData->implData();
-        if (maskIconData->maskChanged()) {        
-            if (!maskedImage) {
-                maskedImage = new HbPixmapMaskedIcon();
-            }
-            
-            maskedImage->currentPixmap = pixmapData;
-            maskedImage->currentPixmap.setMask(maskIconData->mask());
-            maskIconData->setImplData(maskedImage);
-        }
-
-        if (maskedImage) {
-            painter->drawPixmap(topLeft, maskedImage->currentPixmap, maskedImage->currentPixmap.rect());
-            return;
-        }
-    }
-    
-    painter->drawPixmap(topLeft, pixmapData, pixmapData.rect());
+    pixmapIconRenderer->draw(painter, topLeft, clipPath, maskIconData);
 }
 
 QSize HbPixmapIconImpl::size()
@@ -145,8 +137,8 @@
 
 }
 
-void HbPixmapIconImpl::destroyMaskedData(IconMaskedData data)
+void HbPixmapIconImpl::destroyMaskedData(HbIconMaskedData *data)
 {
-    delete ((HbPixmapMaskedIcon *) data);
+    delete((HbPixmapMaskedIcon *) data);
 }
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/image/hbpixmapiconimpl_p.h
--- a/src/hbcore/image/hbpixmapiconimpl_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/image/hbpixmapiconimpl_p.h	Mon May 03 12:48:33 2010 +0300
@@ -29,6 +29,8 @@
 #include "hbiconimpl_p.h"
 #include <QBitmap>
 
+class HbPixmapIconRenderer;
+
 class HB_AUTOTEST_EXPORT HbPixmapIconImpl : public HbIconImpl
 {
 public :
@@ -37,22 +39,25 @@
                      Qt::AspectRatioMode aspectRatioMode,
                      QIcon::Mode mode,
                      bool mirrored);
-    HbPixmapIconImpl(const QPixmap& pixmap);
+    HbPixmapIconImpl(const QPixmap& pixmap, const QString& name = QString());
     ~HbPixmapIconImpl();
 
     QPixmap pixmap();
     void paint(QPainter* painter,
                const QRectF &rect,
-               Qt::Alignment alignment, HbMaskableIconImpl * maskIconData = 0);
+               Qt::Alignment alignment,
+               const QPainterPath &clipPath = QPainterPath(),
+               HbMaskableIconImpl * maskIconData = 0);
     QSize defaultSize() const;
     QSize size();
-    void destroyMaskedData(IconMaskedData data);
+    void destroyMaskedData(HbIconMaskedData *data);
 
 private :
     void retrievePixmapData();
 
 private:
     QPixmap pixmapData;
+    HbPixmapIconRenderer *pixmapIconRenderer;
 };
 
 #endif
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/image/hbpixmapiconrenderer.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/image/hbpixmapiconrenderer.cpp	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,151 @@
+/****************************************************************************
+**
+** 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 "hbpixmapiconrenderer_p.h"
+#include "hbmaskableiconimpl_p.h"
+
+#include <QStyleOption>
+#include <QApplication>
+
+struct HbPixmapIconMaskedData
+{
+    QPixmap    currentPixmap;
+};
+
+HbPixmapIconRenderer::HbPixmapIconRenderer(const QPixmap &pixmap, HbIconImpl *impl)
+        : iconMode(QIcon::Normal),
+        iconPropertiesApplied(false),
+        pixmapData(pixmap),
+        iconImpl(impl)
+{
+}
+
+HbPixmapIconRenderer::~HbPixmapIconRenderer()
+{
+}
+
+void HbPixmapIconRenderer::draw(QPainter* painter,
+                                const QPointF &topLeft,
+                                const QPainterPath &clipPath,
+                                HbMaskableIconImpl * maskIconData)
+{
+    if (!iconPropertiesApplied) {
+        applyIconProperties();
+    }
+
+    QPixmap pixmapToDraw = pixmapData;
+
+    if (maskIconData) {
+        pixmapToDraw = getMaskedPixmap(maskIconData);
+        if (pixmapToDraw.isNull()) {
+            pixmapToDraw = pixmapData;
+        }
+    }
+
+    doDraw(painter, topLeft, pixmapToDraw, clipPath);
+}
+
+void HbPixmapIconRenderer::doDraw(QPainter * painter,
+                                  const QPointF & topLeft,
+                                  const QPixmap & finalPixmap,
+                                  const QPainterPath & clipPath)
+{
+    if (!clipPath.isEmpty()) {
+        QPainterPath oldPath;
+        bool clipped = painter->hasClipping();
+    
+        if (!clipped) {
+            painter->setClipping(true);
+        }
+        
+        QRectF cliprect = clipPath.boundingRect();
+        QPainterPath intersect(clipPath);
+        if (clipped) {
+            oldPath = painter->clipPath();
+            QRectF oldrect = oldPath.boundingRect();
+            intersect =  oldPath.intersected(clipPath);
+            QRectF interrect = intersect.boundingRect();
+        }
+    
+        painter->setClipPath(intersect, Qt::ReplaceClip);     
+        painter->drawPixmap(topLeft, finalPixmap);
+    
+        if (!clipped) {
+            painter->setClipPath(oldPath, Qt::NoClip);
+        } else {
+            painter->setClipPath(oldPath);
+        }
+        painter->setClipping(clipped);
+    }  else {
+        painter->drawPixmap(topLeft, finalPixmap);
+    }
+}
+
+void HbPixmapIconRenderer::applyIconProperties()
+{
+    if ((iconColor.isValid()) && (iconMode != QIcon::Disabled)) {
+        if (!pixmapData.isNull()) {
+            QPixmap mask = pixmapData.alphaChannel();
+            pixmapData.fill(iconColor);
+            pixmapData.setAlphaChannel(mask);
+        }
+    }
+
+    // Apply the mode
+    if (iconMode != QIcon::Normal) {
+        QStyleOption opt(0);
+        opt.palette = QApplication::palette();
+        pixmapData = QApplication::style()->generatedIconPixmap(iconMode, pixmapData, &opt);
+    }
+    iconPropertiesApplied = true;
+}
+
+QPixmap HbPixmapIconRenderer::getMaskedPixmap(HbMaskableIconImpl * maskIconData)
+{
+    QPixmap maskedPixmap;
+
+    HbPixmapIconMaskedData * mi = (HbPixmapIconMaskedData *)maskIconData->implData();
+    if (maskIconData->maskChanged()) {
+        if (!mi) {
+            mi = new HbPixmapIconMaskedData();
+        }
+
+        mi->currentPixmap = pixmapData;
+        mi->currentPixmap.setMask(maskIconData->mask());
+        maskIconData->setImplData(mi);
+    }
+
+    if (mi) {
+        maskedPixmap = mi->currentPixmap;
+    }
+
+    return maskedPixmap;
+}
+
+void HbPixmapIconRenderer::destroyMaskedData(HbIconMaskedData *data)
+{
+    delete((HbPixmapIconMaskedData*)data);
+}
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/image/hbpixmapiconrenderer_p.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/image/hbpixmapiconrenderer_p.h	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,90 @@
+/****************************************************************************
+**
+** 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 HBPIXMAPICONRENDERER_P_H_
+#define HBPIXMAPICONRENDERER_P_H_
+
+#include <hbglobal.h>
+#include <QIcon>
+
+#include "hbiconimpl_p.h"
+
+class HbMaskableIconImpl;
+
+class HB_CORE_PRIVATE_EXPORT HbPixmapIconRenderer
+{
+public:
+    
+    HbPixmapIconRenderer(const QPixmap & pixmap, HbIconImpl *impl);
+    
+    ~HbPixmapIconRenderer();
+    
+    void setColor(const QColor & color)
+    {
+        this->iconColor = color;
+    }
+    
+    void setMode(QIcon::Mode mode)
+    {
+        this->iconMode = mode;
+    }
+    
+    QColor color()
+    {
+        return iconColor;
+    }
+    
+    QIcon::Mode mode() 
+    {
+        return iconMode;
+    }
+
+    void draw(QPainter* painter,
+              const QPointF &topLeft,
+              const QPainterPath &clipPath,
+              HbMaskableIconImpl * maskIconData);
+
+    void destroyMaskedData(HbIconMaskedData *data);
+
+private:
+
+    void applyIconProperties();
+
+    QPixmap getMaskedPixmap(HbMaskableIconImpl * maskIconData);
+
+    void doDraw(QPainter * painter,
+                const QPointF & topLeft,
+                const QPixmap & finalPixmap,
+                const QPainterPath & clipPath);
+
+    QColor                  iconColor;
+    QIcon::Mode             iconMode;
+    bool                    iconPropertiesApplied;
+    QPixmap                 pixmapData;
+    HbIconImpl *            iconImpl;
+};
+
+#endif
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/image/hbsgimageiconimpl_p.cpp
--- a/src/hbcore/image/hbsgimageiconimpl_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/image/hbsgimageiconimpl_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -34,17 +34,14 @@
 #include <QApplication>
 
 #include "hbmaskableiconimpl_p.h"
+#include "hbvgimageiconrenderer_p.h"
 #include "hbeglstate_p.h"
+#include "hbpixmapiconrenderer_p.h"
 
-struct HbSgImageMaskedIcon
-{
-    QPixmap    currentPixmap;
-};
-
-typedef EGLImageKHR( *pfnEglCreateImageKHR)(EGLDisplay, EGLContext,
+typedef EGLImageKHR(*pfnEglCreateImageKHR)(EGLDisplay, EGLContext,
         EGLenum, EGLClientBuffer, EGLint*);
-typedef EGLBoolean( *pfnEglDestroyImageKHR)(EGLDisplay, EGLImageKHR);
-typedef VGImage( *pfnVgCreateEGLImageTargetKHR)(VGeglImageKHR);
+typedef EGLBoolean(*pfnEglDestroyImageKHR)(EGLDisplay, EGLImageKHR);
+typedef VGImage(*pfnVgCreateEGLImageTargetKHR)(VGeglImageKHR);
 
 HbSgimageIconImpl::HbSgimageIconImpl(const HbSharedIconInfo &iconData,
                                      const QString& name,
@@ -58,28 +55,19 @@
                    aspectRatioMode,
                    mode,
                    mirrored),
-        vgImage(VG_INVALID_HANDLE),
-        readyToRender(false),
-        specialCaseApplied(false),
-        opacityPaint(VG_INVALID_HANDLE),
-        lastOpacity(1.0)
-
+        vgImageRenderer(0),
+        pixmapIconRenderer(0)
 {
-    eglStates = HbEglStates::global();
-    eglStates->ref();
     retrieveSgImageData();
 }
 
 HbSgimageIconImpl::~HbSgimageIconImpl()
 {
-    if (vgImage) {
-        eglStates->removeVGImage(&vgImage);
+    if (vgImageRenderer) {
+        delete vgImageRenderer;
     }
-
-    eglStates->deref(eglStates);
-
-    if (opacityPaint) {
-        vgDestroyPaint(opacityPaint);
+    if (pixmapIconRenderer) {
+        delete pixmapIconRenderer;
     }
 }
 
@@ -127,133 +115,72 @@
     contentSize = QSize(sharedIconData.sgImageData.width, sharedIconData.sgImageData.height);
 }
 
-void HbSgimageIconImpl::paint(QPainter *painter,
-                              const QRectF &rect,
+VGImage HbSgimageIconImpl::getVgImage(HbIconImpl * impl, QPainter *)
+{
+    return ((HbSgimageIconImpl *)impl)->getVgImageFromSgImage();
+}
+
+void HbSgimageIconImpl::paint(QPainter* painter,
+                              const QRectF& rect,
                               Qt::Alignment alignment,
-                              HbMaskableIconImpl *maskIconData)
+                              const QPainterPath &clipPath,
+                              HbMaskableIconImpl * maskIconData)
 {
 #ifdef HB_ICON_CACHE_DEBUG
-    qDebug() << "HbSgimageIconImpl::paint()-->"<<this->fileName;
+    qDebug() << "HbSgimageIconImpl::paint()-->" << this->fileName;
 #endif
 
     QSizeF renderSize(contentSize);
+
     QPointF topLeft = setAlignment(rect, renderSize, alignment);
+
     bool maskApplied = false;
-    if (maskIconData && maskIconData->maskChanged()) {
+    if (maskIconData && (maskIconData->maskChanged() ||  maskIconData->implData())) {
         maskApplied = true;
     }
 
-    if (readyToRender && !maskApplied) {
-        if (maskIconData) {
-            HbSgImageMaskedIcon * mi = (HbSgImageMaskedIcon *) maskIconData->implData();
-            if (mi) {
-                painter->drawPixmap(topLeft, mi->currentPixmap, mi->currentPixmap.rect());
-                return;
-            }
+    if ((painter->paintEngine()->type() != QPaintEngine::OpenVG) ||
+         maskApplied || pixmapIconRenderer) {
+        // going to pixmap, vgimage may not be required any more
+        if (vgImageRenderer) {
+            delete vgImageRenderer;
+            vgImageRenderer = 0;
         }
-        painter->drawPixmap(topLeft, currentPixmap, currentPixmap.rect());
-        return;
-    }
-    if ((iconColor.isValid()) || (mode != QIcon::Normal) ||
-            (painter->paintEngine()->type() != QPaintEngine::OpenVG) ||
-            (maskApplied)) {
-        applySpecialCases(painter, topLeft, maskIconData);
+        
+        if (!pixmapIconRenderer) {
+            painter->beginNativePainting();
+            pixmap();
+            painter->endNativePainting();
+            
+            pixmapIconRenderer = new HbPixmapIconRenderer(currentPixmap, this);
+            pixmapIconRenderer->setColor(iconColor);
+            pixmapIconRenderer->setMode(mode);
+        }
+
+        pixmapIconRenderer->draw(painter, topLeft, clipPath, maskIconData);
         return;
     }
-    if (vgImage == VG_INVALID_HANDLE) {
+
+    if (!vgImageRenderer) {
+        VGImage vgImage = VG_INVALID_HANDLE;
         vgImage = getVgImageFromSgImage();
-        if (vgImage == VG_INVALID_HANDLE) {
-            return;
-        }
-        eglStates->addVGImage(&vgImage);
-        opacityPaint = VG_INVALID_HANDLE;
-    }
-
-    VGint imageMode      = vgGeti(VG_IMAGE_MODE);
-    VGint matrixMode     = vgGeti(VG_MATRIX_MODE);
-    VGPaint oldFillPaint = VG_INVALID_HANDLE;
-    VGPaint oldStrkPaint = VG_INVALID_HANDLE;
-    VGint   blendMode    = 0;
-
-    updatePainterTransformation(painter, topLeft);
-
-    qreal opacity = painter->opacity();
-
-    if (opacity != lastOpacity) {
-        lastOpacity = opacity;
-        if (opacity != 1.0) {
-            if (opacityPaint == VG_INVALID_HANDLE) {
-                opacityPaint = vgCreatePaint();
-            }
-            VGfloat opaquePaint[] = {1.0f, 1.0f, 1.0f, opacity};
-            if (opacityPaint != VG_INVALID_HANDLE) {
-                vgSetParameteri(opacityPaint, VG_PAINT_TYPE, VG_PAINT_TYPE_COLOR);
-                vgSetParameterfv(opacityPaint, VG_PAINT_COLOR, 4, opaquePaint);
-            }
+        if (vgImage != VG_INVALID_HANDLE) {
+            vgImageRenderer = new HbVgImageIconRenderer(vgImage, renderSize.toSize(), this);
+            vgImageRenderer->setVgImageCreator(getVgImage);
+            vgImageRenderer->setColor(iconColor);
+            vgImageRenderer->setMode(mode);
         }
     }
 
-    if (opacity != 1.0 && opacityPaint != VG_INVALID_HANDLE) {
-        oldFillPaint = vgGetPaint(VG_FILL_PATH);
-        oldStrkPaint = vgGetPaint(VG_STROKE_PATH);
-        blendMode = vgGeti(VG_BLEND_MODE);
-        vgSeti(VG_BLEND_MODE, VG_BLEND_SRC_OVER);
-        vgSetPaint(opacityPaint, VG_FILL_PATH | VG_STROKE_PATH);
-    }
-
-    if (opacity == 1.0) {
-        vgSeti(VG_IMAGE_MODE, VG_DRAW_IMAGE_NORMAL);
-    } else {
-        vgSeti(VG_IMAGE_MODE, VG_DRAW_IMAGE_MULTIPLY);
-    }
-
-#ifdef HB_ICON_TRACES
-    qDebug() <<  "HbSgimageIconImpl::paint() " + this->fileName;
-#endif
-    vgDrawImage(vgImage);
-    eglWaitClient();
-
-    vgSeti(VG_MATRIX_MODE, matrixMode);
-    vgSeti(VG_IMAGE_MODE, imageMode);
-
-    if (oldFillPaint) {
-        vgSetPaint(oldFillPaint, VG_FILL_PATH);
-    }
-
-    if (oldStrkPaint) {
-        vgSetPaint(oldStrkPaint, VG_STROKE_PATH);
-    }
-
-    if (blendMode) {
-        vgSeti(VG_BLEND_MODE, blendMode);
+    if (vgImageRenderer) {
+        vgImageRenderer->draw(painter, topLeft, clipPath);
+        eglWaitClient();
+        return;
     }
 }
 
-void HbSgimageIconImpl::updatePainterTransformation(QPainter *painter, const QPointF &pos)
-{
-    VGfloat devh = painter->device()->height() - 1;
-    QTransform viewport(1.0f, 0.0f, 0.0f,
-                        0.0f, -1.0f, 0.0f,
-                        0.5f, devh + 0.5f, 1.0f);
-    QTransform imageTransform = painter->transform() * viewport;
-    imageTransform.translate(pos.x(), pos.y());
-
-    VGfloat mat[9];
-    vgSeti(VG_MATRIX_MODE, VG_MATRIX_IMAGE_USER_TO_SURFACE);
-    mat[0] = imageTransform.m11();
-    mat[1] = imageTransform.m12();
-    mat[2] = imageTransform.m13();
-    mat[3] = imageTransform.m21();
-    mat[4] = imageTransform.m22();
-    mat[5] = imageTransform.m23();
-    mat[6] = imageTransform.m31();
-    mat[7] = imageTransform.m32();
-    mat[8] = imageTransform.m33();
-    vgLoadMatrix(mat);
-}
-
-QPointF HbSgimageIconImpl::setAlignment(const QRectF &rect,
-                                        QSizeF &renderSize,
+QPointF HbSgimageIconImpl::setAlignment(const QRectF& rect,
+                                        QSizeF& renderSize,
                                         Qt::Alignment alignment)
 {
     QPointF topLeft = rect.topLeft();
@@ -288,15 +215,17 @@
 #endif
     }
 
+    
+    
     EGLDisplay display = eglGetDisplay(EGL_DEFAULT_DISPLAY);
 
     // Retrieve the extensions
     pfnEglCreateImageKHR eglCreateImageKHR = (pfnEglCreateImageKHR)
-        eglGetProcAddress("eglCreateImageKHR");
+            eglGetProcAddress("eglCreateImageKHR");
     pfnEglDestroyImageKHR eglDestroyImageKHR = (pfnEglDestroyImageKHR)
-        eglGetProcAddress("eglDestroyImageKHR");
+            eglGetProcAddress("eglDestroyImageKHR");
     pfnVgCreateEGLImageTargetKHR vgCreateEGLImageTargetKHR = (pfnVgCreateEGLImageTargetKHR)
-        eglGetProcAddress("vgCreateEGLImageTargetKHR");
+            eglGetProcAddress("vgCreateEGLImageTargetKHR");
 
     // Create an EGLImage based on the RSgImage via extensions, specifying the
     // EGL_IMAGE_PRESERVED_KHR attribute as EGL_TRUE to ensure its contents
@@ -316,6 +245,7 @@
 
     VGImage vgImage = vgCreateEGLImageTargetKHR((VGeglImageKHR)eglImage);
     eglDestroyImageKHR(display, eglImage);
+    sgImage.Close();
     return vgImage;
 }
 
@@ -324,53 +254,9 @@
     return  contentSize;
 }
 
-void HbSgimageIconImpl::applySpecialCases(QPainter *painter,
-        const QPointF &topLeft,
-        HbMaskableIconImpl *maskIconData)
+
+void HbSgimageIconImpl::destroyMaskedData(HbIconMaskedData *data)
 {
-    painter->beginNativePainting();
-    pixmap();
-    painter->endNativePainting();
-
-    if (!specialCaseApplied) {
-        if ((iconColor.isValid()) && (mode != QIcon::Disabled)) {
-            if (!currentPixmap.isNull()) {
-                QPixmap mask = currentPixmap.alphaChannel();
-                currentPixmap.fill(iconColor);
-                currentPixmap.setAlphaChannel(mask);
-            }
-        }
-        // Apply the mode
-        if (mode != QIcon::Normal) {
-            QStyleOption opt(0);
-            opt.palette = QApplication::palette();
-            currentPixmap = QApplication::style()->generatedIconPixmap(mode, currentPixmap, &opt);
-        }
-        specialCaseApplied = true;
-    }
-
-    if (maskIconData) {
-        HbSgImageMaskedIcon * mi = (HbSgImageMaskedIcon *)maskIconData->implData();
-        if (maskIconData->maskChanged()) {
-            if (!mi) {
-                mi = new HbSgImageMaskedIcon();
-            }
-            mi->currentPixmap = currentPixmap;
-            mi->currentPixmap.setMask(maskIconData->mask());
-            maskIconData->setImplData(mi);
-        }
-        if (mi) {
-            painter->drawPixmap(topLeft, mi->currentPixmap, mi->currentPixmap.rect());
-            readyToRender = true;
-            return;
-        }
-    }
-    painter->drawPixmap(topLeft, currentPixmap, currentPixmap.rect());
-    readyToRender = true;
+    pixmapIconRenderer->destroyMaskedData(data);
 }
 
-void HbSgimageIconImpl::destroyMaskedData(IconMaskedData data)
-{
-    delete((HbSgImageMaskedIcon *)data);
-}
-
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/image/hbsgimageiconimpl_p.h
--- a/src/hbcore/image/hbsgimageiconimpl_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/image/hbsgimageiconimpl_p.h	Mon May 03 12:48:33 2010 +0300
@@ -33,6 +33,8 @@
 #include <QBitmap>
 
 class HbEglStates;
+class HbVgImageIconRenderer;
+class HbPixmapIconRenderer;
 
 class HB_AUTOTEST_EXPORT HbSgimageIconImpl : public HbIconImpl
 {
@@ -49,11 +51,12 @@
     void paint(QPainter* painter,
                const QRectF &rect,
                Qt::Alignment alignment,
+               const QPainterPath &clipPath = QPainterPath(),
                HbMaskableIconImpl * maskIconData = 0);
 
     QSize defaultSize() const;
     QSize size();
-    void destroyMaskedData(IconMaskedData data);
+    void destroyMaskedData(HbIconMaskedData *data);
 
 private :
     void retrieveSgImageData();
@@ -62,20 +65,15 @@
                          QSizeF& renderSize,
                          Qt::Alignment alignment);
     void updatePainterTransformation(QPainter * painter, const QPointF & pos);
-    void applySpecialCases(QPainter * painter,
-                           const QPointF & topLeft,
-                           HbMaskableIconImpl * maskIconData);
+    static VGImage getVgImage(HbIconImpl * impl, QPainter * painter);
+
 
 private:
     TSgDrawableId sgImageId;
-    VGImage vgImage;
     QPixmap currentPixmap;
-    bool readyToRender;
-    bool specialCaseApplied;
     QSize contentSize;
-    VGPaint opacityPaint;
-    qreal   lastOpacity;
-    HbEglStates *eglStates;
+    HbVgImageIconRenderer * vgImageRenderer;
+    HbPixmapIconRenderer * pixmapIconRenderer;
 };
 
 #endif // HBSGIMAGEICONIMPL_P_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/image/hbvgimageiconrenderer.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/image/hbvgimageiconrenderer.cpp	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,340 @@
+/****************************************************************************
+**
+** 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 "hbvgimageiconrenderer_p.h"
+#include "hbeglstate_p.h"
+#include "hbiconimpl_p.h"
+
+#include <QtCore/qvarlengtharray.h>
+
+HbVgImageIconRenderer::HbVgImageIconRenderer(VGImage img, const QSize & size, HbIconImpl * impl)
+        : vgImage(img),
+        iconMode(QIcon::Normal),
+        specialCaseApplied(false),
+        rendersize(size),
+        addedToStates(false),
+        opacityPaint(VG_INVALID_HANDLE),
+        lastOpacity(1.0),
+        iconImpl(impl)
+{
+    eglStates = HbEglStates::global();
+    eglStates->ref();
+}
+
+HbVgImageIconRenderer::~HbVgImageIconRenderer()
+{
+    if (vgImage) {
+        eglStates->removeVGImage(&vgImage);
+    }
+    eglStates->deref(eglStates);
+}
+
+void HbVgImageIconRenderer::applyIconProperties()
+{
+    if (!specialCaseApplied) {
+        if (iconMode == QIcon::Disabled) {
+            VGImage modifiedVgImage = vgCreateImage((VGImageFormat)  VG_sARGB_8888_PRE,
+                                                    rendersize.width(), rendersize.height(), VG_IMAGE_QUALITY_NONANTIALIASED);
+
+            VGImageFormat imageFormat =
+                (VGImageFormat)vgGetParameteri(vgImage, VG_IMAGE_FORMAT);
+
+            VGfloat matrix[20] = {0.1700, 0.1700, 0.1700, 0,
+                                  0.5721, 0.5721, 0.5721, 0,
+                                  0.0577, 0.0577, 0.0577, 0,
+                                  0, 0, 0, 1,
+                                  0, 0, 0, 0
+                                 };
+
+            vgColorMatrix(modifiedVgImage, vgImage, matrix);
+            vgDestroyImage(vgImage);
+            vgImage = modifiedVgImage;
+        }
+
+        if (iconColor.isValid() && iconMode != QIcon::Disabled) {
+            VGImage resultImage = vgCreateImage((VGImageFormat)  VG_sARGB_8888_PRE,
+                                                rendersize.width(), rendersize.height(), VG_IMAGE_QUALITY_NONANTIALIASED);
+
+            VGfloat matrix[20] = {0, 0, 0, 0,
+                                  0, 0, 0, 0,
+                                  0, 0, 0, 0,
+                                  0, 0, 0, 1,
+                                  (VGfloat)iconColor.red() / 255.0, (VGfloat)iconColor.green() / 255.0, (VGfloat)iconColor.blue() / 255.0, 0
+                                 };
+            vgColorMatrix(resultImage, vgImage, matrix);
+            vgDestroyImage(vgImage);
+            vgImage = resultImage;
+        }
+        specialCaseApplied = true;
+    }
+}
+
+bool HbVgImageIconRenderer::draw(QPainter * painter, const QPointF & topLeft, const QPainterPath & clipPath)
+{
+    if ((iconColor.isValid()) || (iconMode != QIcon::Normal)) {
+        applyIconProperties();
+    }
+
+    if (vgImage == VG_INVALID_HANDLE) {
+        vgImage = vgImageCreator(iconImpl , painter);
+        addedToStates = false;
+    }
+
+    if (!addedToStates && vgImage != VG_INVALID_HANDLE) {
+        eglStates->addVGImage(&vgImage);
+        addedToStates = true;
+    }
+
+    if (vgImage != VG_INVALID_HANDLE) {
+
+        if (!clipPath.isEmpty()) {
+            painter->beginNativePainting();
+        }
+
+        VGint imageMode      = vgGeti(VG_IMAGE_MODE);
+        VGint matrixMode     = vgGeti(VG_MATRIX_MODE);
+        VGPaint oldFillPaint = VG_INVALID_HANDLE;
+        VGPaint oldStrkPaint = VG_INVALID_HANDLE;
+        VGint   blendMode    = 0;
+
+        updatePainterTransformation(painter, topLeft);
+
+        qreal opacity = painter->opacity();
+
+        if (opacity != lastOpacity || iconMode == QIcon::Selected) {
+            lastOpacity = opacity;
+            if (opacityPaint == VG_INVALID_HANDLE) {
+                opacityPaint = vgCreatePaint();
+            }
+            if (opacity != 1.0) {
+                VGfloat opaquePaint[] = {1.0f, 1.0f, 1.0f, opacity};
+
+                if (iconMode == QIcon::Selected) {
+                    opaquePaint[0] = 0.54901f;
+                    opaquePaint[1] = 0.54901f;
+                    opaquePaint[2] = 0.72156f;
+                    opaquePaint[3] = 0.81f * opaquePaint[3];
+                }
+
+                if (opacityPaint != VG_INVALID_HANDLE) {
+                    vgSetParameteri(opacityPaint, VG_PAINT_TYPE, VG_PAINT_TYPE_COLOR);
+                    vgSetParameterfv(opacityPaint, VG_PAINT_COLOR, 4, opaquePaint);
+                }
+            }
+        }
+
+        if ((iconMode == QIcon::Selected || opacity != 1.0) && opacityPaint != VG_INVALID_HANDLE) {
+            oldFillPaint = vgGetPaint(VG_FILL_PATH);
+            oldStrkPaint = vgGetPaint(VG_STROKE_PATH);
+            blendMode = vgGeti(VG_BLEND_MODE);
+            vgSeti(VG_BLEND_MODE, VG_BLEND_SRC_OVER);
+            vgSetPaint(opacityPaint, VG_FILL_PATH | VG_STROKE_PATH);
+        }
+
+        if (opacity == 1.0) {
+            vgSeti(VG_IMAGE_MODE, VG_DRAW_IMAGE_NORMAL);
+        } else {
+            vgSeti(VG_IMAGE_MODE, VG_DRAW_IMAGE_MULTIPLY);
+        }
+
+        VGint prevMask = 0;
+        VGPath vgpath = VG_INVALID_HANDLE;
+
+        if (!clipPath.isEmpty()) {
+
+            QPaintDevice *pdev = painter->paintEngine()->paintDevice();
+            int width = pdev->width();
+            int height = pdev->height();
+
+            vgMask(VG_INVALID_HANDLE, VG_CLEAR_MASK, 0, 0, width, height);
+
+            vgpath = painterPathToVGPath(clipPath);
+            vgRenderToMask(vgpath, VG_FILL_PATH, VG_UNION_MASK);
+
+            prevMask = vgGeti(VG_MASKING);
+            vgSeti(VG_MASKING, VG_TRUE);
+        }
+
+        vgDrawImage(vgImage);
+
+        if (!clipPath.isEmpty()) {
+            vgSeti(VG_MASKING, VG_FALSE);
+        }
+
+        vgSeti(VG_MATRIX_MODE, matrixMode);
+        vgSeti(VG_IMAGE_MODE, imageMode);
+
+        if (oldFillPaint) {
+            vgSetPaint(oldFillPaint, VG_FILL_PATH);
+        }
+        if (oldStrkPaint) {
+            vgSetPaint(oldStrkPaint, VG_STROKE_PATH);
+        }
+
+        if (blendMode) {
+            vgSeti(VG_BLEND_MODE, blendMode);
+        }
+
+        if (prevMask) {
+            vgSeti(VG_MASKING, prevMask);
+        }
+
+        if (!clipPath.isEmpty()) {
+            vgDestroyPath(vgpath);
+            vgpath = VG_INVALID_HANDLE;
+            painter->endNativePainting();
+        }
+        return true;
+    }
+
+    return false;
+}
+
+
+void HbVgImageIconRenderer::updatePainterTransformation(QPainter * painter, const QPointF & pos)
+{
+    VGfloat devh = painter->device()->height() - 1;
+    QTransform viewport(1.0f, 0.0f, 0.0f,
+                        0.0f, -1.0f, 0.0f,
+                        0.5f, devh + 0.5f, 1.0f);
+    QTransform imageTransform = painter->transform() * viewport;
+    imageTransform.translate(pos.x(), pos.y());
+
+    VGfloat mat[9];
+    vgSeti(VG_MATRIX_MODE, VG_MATRIX_IMAGE_USER_TO_SURFACE);
+    mat[0] = imageTransform.m11();
+    mat[1] = imageTransform.m12();
+    mat[2] = imageTransform.m13();
+    mat[3] = imageTransform.m21();
+    mat[4] = imageTransform.m22();
+    mat[5] = imageTransform.m23();
+    mat[6] = imageTransform.m31();
+    mat[7] = imageTransform.m32();
+    mat[8] = imageTransform.m33();
+    vgLoadMatrix(mat);
+}
+
+VGPath HbVgImageIconRenderer::painterPathToVGPath(const QPainterPath& path)
+{
+    int count = path.elementCount();
+
+    // Creating vgpath is needed else clipling is failing,
+    // vgpaintengine also doing the same way,
+    // optimising by storing the path as member was tried but not giving expected output
+    VGPath vgpath = vgCreatePath(VG_PATH_FORMAT_STANDARD,
+                                 VG_PATH_DATATYPE_F,
+                                 1.0f,        // scale
+                                 0.0f,        // bias
+                                 0,   // segmentCapacityHint
+                                 0,   // coordCapacityHint
+                                 VG_PATH_CAPABILITY_APPEND_TO);
+
+    if (count == 0) {
+        return vgpath;
+    }
+
+    const QPainterPath::Element *elements = &(path.elementAt(0));
+
+    // Sizes chosen so that drawRoundedRect() paths fit in these arrays.
+    QVarLengthArray<VGfloat, 48> coords;
+    QVarLengthArray<VGubyte, 20> segments;
+
+    int curvePos = 0;
+    QPointF temp;
+
+    // Keep track of the start and end of each sub-path.  QPainterPath
+    // does not have an "implicit close" flag like QVectorPath does.
+    // We therefore have to detect closed paths by looking for a LineTo
+    // element that connects back to the initial MoveTo element.
+    qreal startx = 0.0;
+    qreal starty = 0.0;
+    qreal endx = 0.0;
+    qreal endy = 0.0;
+    bool haveStart = false;
+    bool haveEnd = false;
+
+    // Convert the members of the element array.
+    for (int i = 0; i < count; ++i) {
+        switch (elements[i].type) {
+
+        case QPainterPath::MoveToElement: {
+            if (haveStart && haveEnd && startx == endx && starty == endy) {
+                // Implicitly close the previous sub-path.
+                segments.append(VG_CLOSE_PATH);
+            }
+            startx = elements[i].x;
+            starty = elements[i].y;
+            coords.append(startx);
+            coords.append(starty);
+            haveStart = true;
+            haveEnd = false;
+            segments.append(VG_MOVE_TO_ABS);
+        }
+        break;
+
+        case QPainterPath::LineToElement: {
+            endx = elements[i].x;
+            endy = elements[i].y;
+            coords.append(endx);
+            coords.append(endy);
+            haveEnd = true;
+            segments.append(VG_LINE_TO_ABS);
+        }
+        break;
+
+        case QPainterPath::CurveToElement: {
+            coords.append(elements[i].x);
+            coords.append(elements[i].y);
+            haveEnd = false;
+            curvePos = 2;
+        }
+        break;
+
+        case QPainterPath::CurveToDataElement: {
+            coords.append(elements[i].x);
+            coords.append(elements[i].y);
+            haveEnd = false;
+            curvePos += 2;
+            if (curvePos == 6) {
+                curvePos = 0;
+                segments.append(VG_CUBIC_TO_ABS);
+            }
+        }
+        break;
+
+        }
+    }
+
+    if ( haveStart && haveEnd && (startx == endx) && (starty == endy) ) {
+        // Implicitly close the last sub-path.
+        segments.append(VG_CLOSE_PATH);
+    }
+
+    vgAppendPathData(vgpath, segments.count(),
+                     segments.constData(), coords.constData());
+
+    return vgpath;
+}
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/image/hbvgimageiconrenderer_p.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/image/hbvgimageiconrenderer_p.h	Mon May 03 12:48:33 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 HBVGIMAGEICONRENDERER_P_H_
+#define HBVGIMAGEICONRENDERER_P_H_
+
+#include <hbglobal.h>
+#include <VG/openvg.h>
+#include <QIcon>
+#include <QColor>
+#include <QPaintEngine>
+#include <QPaintDevice>
+
+class HbEglStates;
+class HbIconImpl;
+
+class HB_CORE_PRIVATE_EXPORT HbVgImageIconRenderer
+{
+public:
+
+    typedef VGImage(*VgImageCreator)(HbIconImpl * impl, QPainter * painter);
+
+    HbVgImageIconRenderer(VGImage img, const QSize & size, HbIconImpl *impl);
+
+    ~HbVgImageIconRenderer();
+    
+    void setColor(const QColor & color)
+    {
+        this->iconColor = color;
+    }
+    
+    void setMode(QIcon::Mode mode)
+    {
+        this->iconMode = mode;
+    }
+    
+    QColor color()
+    {
+        return iconColor;
+    }
+    
+    QIcon::Mode mode() 
+    {
+        return iconMode;
+    }
+    
+    void setVgImageCreator(VgImageCreator vgCreator)
+    {
+        vgImageCreator =  vgCreator;
+    }
+    
+    bool draw(QPainter * painter, const QPointF & topLeft, const QPainterPath & clipPath);
+
+private:
+    void applyIconProperties();
+    VGPath painterPathToVGPath(const QPainterPath& path);
+    void updatePainterTransformation(QPainter * painter, const QPointF & pos);
+
+    VGImage vgImage;
+    QColor iconColor;
+    QIcon::Mode iconMode;
+    bool specialCaseApplied;
+    QSize   rendersize;
+    HbEglStates * eglStates;
+    bool    addedToStates;
+    VGPaint opacityPaint;
+    qreal   lastOpacity;
+    HbIconImpl * iconImpl;
+    VgImageCreator vgImageCreator;
+};
+
+#endif
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/image/image.pri
--- a/src/hbcore/image/image.pri	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/image/image.pri	Mon May 03 12:48:33 2010 +0300
@@ -34,26 +34,27 @@
 PUBLIC_HEADERS += $$PWD/hbiconanimationdefinition.h
 PUBLIC_HEADERS += $$PWD/hbiconanimator.h
 
-INTERNAL_HEADERS += $$PWD/hbframedrawer_p.h
-INTERNAL_HEADERS += $$PWD/hbframebackground_p.h
-INTERNAL_HEADERS += $$PWD/hbicon_p.h
-INTERNAL_HEADERS += $$PWD/hbiconanimation_p.h 
-INTERNAL_HEADERS += $$PWD/hbiconanimator_p.h
-INTERNAL_HEADERS += $$PWD/hbiconanimationdatatypes_p.h
-INTERNAL_HEADERS += $$PWD/hbiconanimationmanager_p.h
-INTERNAL_HEADERS += $$PWD/hbiconanimationparser_p.h
-INTERNAL_HEADERS += $$PWD/hbiconengine_p.h
-INTERNAL_HEADERS += $$PWD/hbiconloader_p.h
-INTERNAL_HEADERS += $$PWD/hbicontheme_p.h
-INTERNAL_HEADERS += $$PWD/hblayoutdirectionnotifier_p.h
-INTERNAL_HEADERS += $$PWD/hbiconimpl_p.h
-INTERNAL_HEADERS += $$PWD/hbpixmapiconimpl_p.h
-INTERNAL_HEADERS += $$PWD/hbbadgeicon_p.h
-INTERNAL_HEADERS += $$PWD/hbbadgeiconinfo_p.h
-INTERNAL_HEADERS += $$PWD/hbiconsource_p.h
-INTERNAL_HEADERS += $$PWD/hbframedrawerpool_p.h
-INTERNAL_HEADERS += $$PWD/hbmaskableiconimpl_p.h
-INTERNAL_HEADERS += $$PWD/hbiconimplcreator_p.h
+PRIVATE_HEADERS += $$PWD/hbframedrawer_p.h
+PRIVATE_HEADERS += $$PWD/hbframebackground_p.h
+PRIVATE_HEADERS += $$PWD/hbicon_p.h
+PRIVATE_HEADERS += $$PWD/hbiconanimation_p.h 
+PRIVATE_HEADERS += $$PWD/hbiconanimator_p.h
+PRIVATE_HEADERS += $$PWD/hbiconanimationdatatypes_p.h
+PRIVATE_HEADERS += $$PWD/hbiconanimationmanager_p.h
+PRIVATE_HEADERS += $$PWD/hbiconanimationparser_p.h
+PRIVATE_HEADERS += $$PWD/hbiconengine_p.h
+PRIVATE_HEADERS += $$PWD/hbiconloader_p.h
+PRIVATE_HEADERS += $$PWD/hbicontheme_p.h
+PRIVATE_HEADERS += $$PWD/hblayoutdirectionnotifier_p.h
+PRIVATE_HEADERS += $$PWD/hbiconimpl_p.h
+PRIVATE_HEADERS += $$PWD/hbpixmapiconimpl_p.h
+PRIVATE_HEADERS += $$PWD/hbbadgeicon_p.h
+PRIVATE_HEADERS += $$PWD/hbbadgeiconinfo_p.h
+PRIVATE_HEADERS += $$PWD/hbiconsource_p.h
+PRIVATE_HEADERS += $$PWD/hbframedrawerpool_p.h
+PRIVATE_HEADERS += $$PWD/hbmaskableiconimpl_p.h
+PRIVATE_HEADERS += $$PWD/hbiconimplcreator_p.h
+PRIVATE_HEADERS += $$PWD/hbpixmapiconrenderer_p.h
 
 SOURCES += $$PWD/hbframedrawer.cpp
 SOURCES += $$PWD/hbframebackground.cpp
@@ -73,16 +74,20 @@
 SOURCES += $$PWD/hbiconsource.cpp
 SOURCES += $$PWD/hbframedrawerpool.cpp
 SOURCES += $$PWD/hbiconimplcreator_p.cpp
+SOURCES += $$PWD/hbpixmapiconrenderer.cpp
 
 symbian {
     nvg {
+        PRIVATE_HEADERS += $$PWD/hbnvgiconimpl_p.h   
+        PRIVATE_HEADERS += $$PWD/hbeglstate_p.h   
+        PRIVATE_HEADERS += $$PWD/hbvgimageiconrenderer_p.h
+	
         SOURCES += $$PWD/hbnvgiconimpl_p.cpp    
         SOURCES += $$PWD/hbeglstate.cpp
-        INTERNAL_HEADERS += $$PWD/hbnvgiconimpl_p.h   
-    	INTERNAL_HEADERS += $$PWD/hbeglstate_p.h   
+	SOURCES += $$PWD/hbvgimageiconrenderer.cpp
     }
     sgimage {    
         SOURCES += $$PWD/hbsgimageiconimpl_p.cpp
-        INTERNAL_HEADERS += $$PWD/hbsgimageiconimpl_p.h
+        PRIVATE_HEADERS += $$PWD/hbsgimageiconimpl_p.h
     }
 }
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/indicatorplugins/hbindicatorinterface.cpp
--- a/src/hbcore/indicatorplugins/hbindicatorinterface.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/indicatorplugins/hbindicatorinterface.cpp	Mon May 03 12:48:33 2010 +0300
@@ -59,11 +59,12 @@
 */
 
 /*!
-    \deprecated HbIndicatorInterface::GroupPriority
-        is deprecated. Please use HbIndicatorInterface::Category instead.
     \enum HbIndicatorInterface::GroupPriority
     Defines indicator group priority. This determines where the indicator is shown: in indicator area or only
     in indicator menu etc.
+
+    \deprecated HbIndicatorInterface::GroupPriority
+        is deprecated. Please use HbIndicatorInterface::Category instead.
 */
 /*!
     \var HbIndicatorInterface::GroupPriority HbIndicatorInterface::GroupPriorityHigh
@@ -148,6 +149,7 @@
 /*!
     \var HbIndicatorInterface::DataRole HbIndicatorInterface::TextRole
     Indicator text shown in universal indicator popup.
+
     \deprecated HbIndicatorInterface::TextRole
         is deprecated. Please use HbIndicatorInterface::PrimaryTextRole instead.
 */
@@ -270,8 +272,9 @@
 }
 
 /*!
-    \deprecated HbIndicatorInterface::groupPriority()
+    \deprecated HbIndicatorInterface::groupPriority() const
         is deprecated. Please use HbIndicatorInterface::category() instead.
+
     returns the priority group the indicator belongs to.
    */
 HbIndicatorInterface::GroupPriority HbIndicatorInterface::groupPriority() const
@@ -340,8 +343,11 @@
     \a indicatorGroup indicator group priority the object belongs to,
     \a interactionTypes interaction type flags for the object
 
-    \deprecated HbIndicatorInterface::HbIndicatorInterface(const QString&, GroupPriority, InteractionTypes)
+    \deprecated HbIndicatorInterface::HbIndicatorInterface(const QString&, HbIndicatorInterface::GroupPriority, HbIndicatorInterface::InteractionTypes)
         is deprecated, use the other constructor.
+
+    \deprecated HbIndicatorInterface::HbIndicatorInterface__sub_object(const QString&, HbIndicatorInterface::GroupPriority, QFlags<HbIndicatorInterface::InteractionType>)
+
 */
 HbIndicatorInterface::HbIndicatorInterface(const QString &indicatorType,
     GroupPriority indicatorGroup, InteractionTypes interactionTypes) :
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/indicatorplugins/hbindicatorinterface.h
--- a/src/hbcore/indicatorplugins/hbindicatorinterface.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/indicatorplugins/hbindicatorinterface.h	Mon May 03 12:48:33 2010 +0300
@@ -28,7 +28,7 @@
 
 #include <QFlags>
 #include <QObject>
-
+#include <QVariantMap>
 #include <hbglobal.h>
 
 class HbIndicatorInterfacePrivate;
@@ -82,7 +82,8 @@
 signals:
     void dataChanged();
     void deactivate();
-
+    void userActivated(const QVariantMap& data);
+    
 protected:
     HbIndicatorInterface(const QString &indicatorType,
         GroupPriority indicatorGroup, InteractionTypes interactionTypes); //deprecated.
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/indicatorplugins/hbindicatorplugininterface.cpp
--- a/src/hbcore/indicatorplugins/hbindicatorplugininterface.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/indicatorplugins/hbindicatorplugininterface.cpp	Mon May 03 12:48:33 2010 +0300
@@ -101,17 +101,9 @@
 
     Note! Not implemented yet. Plugin implementors should always return true from this function.
 
-    \deprecated
-    Replaced by
-    virtual bool HbIndicatorPluginInterface::accessAllowed(
-        const QString &indicatorType, const QVariantMap &securityInfo) const
-*/
-/*
-    \deprecated virtual bool HbIndicatorPluginInterface::accessAllowed(
-        const QString &indicatorType, const HbSecurityInfo *securityInfo) const
-    is deprecated. Replaced by
-    virtual bool HbIndicatorPluginInterface::accessAllowed(
-        const QString &indicatorType, const QVariantMap &securityInfo) const
+    \deprecated HbIndicatorPluginInterface::accessAllowed(const QString &, const HbSecurityInfo *) const
+        is deprecated. Replaced by IndicatorPluginInterface::accessAllowed(const QString &indicatorType, const QVariantMap &securityInfo) const
+
 */
 
 /*!
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/indicatorplugins/hbindicatorpluginmanager.cpp
--- a/src/hbcore/indicatorplugins/hbindicatorpluginmanager.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/indicatorplugins/hbindicatorpluginmanager.cpp	Mon May 03 12:48:33 2010 +0300
@@ -25,7 +25,7 @@
 
 #include <QDir>
 #include <QApplication>
-
+#include <QVariantMap>
 #include <hbindicatorpluginmanager_p.h>
 #include <hbindicatorplugininterface.h>
 #include <hbindicatorinterface.h>
@@ -134,6 +134,20 @@
     return indicator;
 }
 
+void HbIndicatorPluginManager::userActivateIndicator(const QVariantMap& data)
+{    
+    const HbIndicatorInterface* indicator =
+           qobject_cast<const HbIndicatorInterface*>(sender());
+    if (!indicator) {
+        return;
+    }
+
+    QVariantMap package;
+    package.insert("type", indicator->indicatorType());    
+    package.insert("data", data);
+    emit indicatorUserActivated(package);
+}
+
 /*
    Activates the indicator.
    Assumes indicator-instance is already created (addIndicator called).
@@ -165,6 +179,7 @@
                 indicator->category()));
 
             connect(indicator, SIGNAL(dataChanged()), SLOT(indicatorDataChanged()));
+            connect(indicator, SIGNAL(userActivated(QVariantMap)), SLOT(userActivateIndicator(QVariantMap)));
         }
         success = true;
     }
@@ -470,16 +485,10 @@
 QString HbIndicatorPluginManager::statusAreaIconPath(
         const HbIndicatorInterface *indicator) const
 {
-    //Use MonoDecorationNameRole-role first, if empty,
-    //try with DecorationRole.
+    //Use MonoDecorationNameRole-role
     QString path(indicator->indicatorData(
         HbIndicatorInterface::MonoDecorationNameRole).toString());
 
-    if (path.isEmpty()) {
-        path = indicator->indicatorData(
-            HbIndicatorInterface::DecorationNameRole).toString();
-    }
-
     return path;
 }
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/indicatorplugins/hbindicatorpluginmanager_p.h
--- a/src/hbcore/indicatorplugins/hbindicatorpluginmanager_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/indicatorplugins/hbindicatorpluginmanager_p.h	Mon May 03 12:48:33 2010 +0300
@@ -88,7 +88,8 @@
     void indicatorUpdated(const IndicatorClientInfo &clientInfo);
     void indicatorRemoved(HbIndicatorInterface *indicatorRemoved);
     void indicatorRemoved(const IndicatorClientInfo &clientInfo);
-
+    void indicatorUserActivated(const QVariantMap& data);
+    
 public slots:
     bool activateIndicator(const QString &indicatorType, const QVariant &parameter,
         const QVariantMap &securityCredentials);
@@ -96,6 +97,7 @@
         const QVariantMap &securityCredentials);
     void deactivateIndicator();
     void indicatorDataChanged();
+    void userActivateIndicator(const QVariantMap& data);
 private:
     bool checkAccess(int index, const QString &indicatorType,
         const QVariantMap &securityCredentials);    
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/indicatorplugins/indicatorplugins.pri
--- a/src/hbcore/indicatorplugins/indicatorplugins.pri	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/indicatorplugins/indicatorplugins.pri	Mon May 03 12:48:33 2010 +0300
@@ -30,7 +30,7 @@
 PUBLIC_HEADERS += $$PWD/hbindicatorinterface.h
 PUBLIC_HEADERS += $$PWD/hbindicatorplugininterface.h
 
-INTERNAL_HEADERS += $$PWD/hbindicatorpluginmanager_p.h
+PRIVATE_HEADERS += $$PWD/hbindicatorpluginmanager_p.h
 
 SOURCES += $$PWD/hbindicatorinterface.cpp
 SOURCES += $$PWD/hbindicatorplugininterface.cpp
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/inputfw/hbinputbasepaths_p.h
--- a/src/hbcore/inputfw/hbinputbasepaths_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +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_INPUT_BASE_PATHS_H
-#define HB_INPUT_BASE_PATHS_H
-
-#ifdef Q_OS_SYMBIAN
-
-#define HBI_BASE_PATH QString("\\resource\\plugins")
-#define HBI_BASE_WRITABLE_PATH QString("c:\\data\\hbinputs")
-
-#else
-
-#ifndef Q_OS_UNIX
-
-#define HBI_BASE_WRITABLE_PATH QString("c:\\Hb\\lib")
-
-#endif
-
-#endif
-
-
-#endif // HB_INPUT_BASE_PATHS_H
-
-// End of file
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/inputfw/hbinputcontextproxy.cpp
--- a/src/hbcore/inputfw/hbinputcontextproxy.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/inputfw/hbinputcontextproxy.cpp	Mon May 03 12:48:33 2010 +0300
@@ -34,17 +34,16 @@
 @alpha
 @hbcore
 \class HbInputContextProxy
-\brief A proxy class forwarding class from QInputContext to HbInputMethod
+\brief A proxy class forwarding calls from QInputContext to HbInputMethod
 
 This class is needed because Qt's input context system assumes the ownership
 of the installed context and deletes the old one when a new context is installed.
-HbInput framework wants to cache active input context entities to its local
-memory structures and keep the ownership of those objects. That's why a proxy object
-is installed between QInputContext and HbInputMehod classes. When Qt's
-input context system deletes old context, it will delete the proxy instead of
+HbInput framework wants to cache active input methods and keep the ownership of those
+objects. The proxy sits between QInputContext and HbInputMethod and is the one that
+is deleted when Qt level input context is switched.
 real implementation.
 
-We also handle certain common events (such as Qt's input panel events) on this level.
+Also a set of common events (such as Qt's input panel events) are handled on this level.
 This class is not needed outside of framework code.
 
 \sa QInputContext
@@ -113,9 +112,9 @@
 #if QT_VERSION >= 0x040600
         if (event->type() == QEvent::CloseSoftwareInputPanel) {
             setInputFrameworkFocus(0);
-            return true;
-        } else if (event->type() == QEvent::RequestSoftwareInputPanel) {
-            if(QWidget * focusedWidget =  qApp->focusWidget()) {
+            return true;            
+        } else if (event->type() == QEvent::RequestSoftwareInputPanel) {           
+            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
                 if(QGraphicsView * graphicsView = qobject_cast<QGraphicsView*>(focusedWidget)) {
@@ -148,14 +147,19 @@
                     mTarget->reset();
                 }
                 return false;
-            }
-        } 
+			}
+		} 
 #endif
+		if(event->type() == QEvent::KeyPress || event->type() == QEvent::KeyRelease) {
+			const QKeyEvent *keyEvent = static_cast<const QKeyEvent *>(event);
+			if (Qt::Key_unknown == keyEvent->key()) {
+				return false;
+			}
+		}
+		return mTarget->filterEvent(event);
+	}
 
-        return mTarget->filterEvent(event);
-    }
-
-    return false;
+	return false;
 }
 
 /*!
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/inputfw/hbinputcustombutton_p.h
--- a/src/hbcore/inputfw/hbinputcustombutton_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +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_INPUT_CUSTOM_BUTTON_P_H
-#define HB_INPUT_CUSTOM_BUTTON_P_H
-
-#include <QString>
-
-/// @cond
-
-class HbInputCustomButtonPrivate
-{
-public:
-    HbInputCustomButtonPrivate()
-        : mType(0),
-          mId(0),
-          mFlags(0)
-    {}
-
-public:
-    int mType;
-    int mId;
-    int mFlags;
-    QString mTitle;
-    QString mText;
-    QString mIconFile;
-    QString mTooltip;
-};
-
-/// @endcond
-
-#endif // HB_INPUT_CUSTOM_BUTTON_P_H
-
-// End of file
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/inputfw/hbinputdef.h
--- a/src/hbcore/inputfw/hbinputdef.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/inputfw/hbinputdef.h	Mon May 03 12:48:33 2010 +0300
@@ -65,17 +65,19 @@
 */
 enum HbKeyboardTypeFlag
 {
-    HbKeyboardNone          = 0x00000000,
+    HbKeyboardNone          				= 0x00000000,
 
-    HbKeyboard12Key         = 0x00000001,                                          /**< Conventional phone keypad */
+    HbKeyboard12Key         				= 0x00000001,                                          /**< Conventional phone keypad */
 
-    HbKeyboardQwerty        = 0x00000001 | HbQwertyKeyboardMask,                   /**< Qwerty keyboard */
+    HbKeyboardQwerty        				= 0x00000001 | HbQwertyKeyboardMask,                   /**< Qwerty keyboard */
  
-    HbKeyboardVirtual12Key  = 0x00000001 | HbTouchInputMask,                       /**< Touchscreen version of conventional phone keypad */
-    HbKeyboardVirtualQwerty = 0x00000002 | HbTouchInputMask| HbQwertyKeyboardMask, /**< Touchscreen version of qwerty keyboard */
-    HbKeyboardSctPortrait   = 0x00000003 | HbTouchInputMask,                       /**< Special character selection keypad for portrait view */
-    HbKeyboardSctLandscape  = 0x00000004 | HbTouchInputMask| HbQwertyKeyboardMask, /**< Special character selection keypad for landscape view */
-    HbKeyboardHwr           = 0x00000005 | HbTouchInputMask| HbHwrKeyboardMask     /**< Hand writing recognition keypad */
+    HbKeyboardVirtual12Key  				= 0x00000001 | HbTouchInputMask,                       /**< Touchscreen version of conventional phone keypad */
+    HbKeyboardVirtualQwerty 				= 0x00000002 | HbTouchInputMask| HbQwertyKeyboardMask, /**< Touchscreen version of qwerty keyboard */
+    HbKeyboardSctPortrait   				= 0x00000003 | HbTouchInputMask,                       /**< Special character selection keypad for portrait view */
+    HbKeyboardSctLandscape  				= 0x00000004 | HbTouchInputMask| HbQwertyKeyboardMask, /**< Special character selection keypad for landscape view */
+    HbKeyboardHwr           				= 0x00000005 | HbTouchInputMask| HbHwrKeyboardMask,     /**< Hand writing recognition keypad */
+	HbKeyboardThaiStarSctPortrait   		= 0x00000006 | HbTouchInputMask, 					   /**< Special character selection keypad for star key in Thai portrait view */
+	HbKeyboardThaiHashSctPortrait   		= 0x00000007 | HbTouchInputMask 					   /**< Special character selection keypad for hash key in Thai portrait view */
 };
 
 Q_DECLARE_FLAGS(HbKeyboardType, HbKeyboardTypeFlag)
@@ -145,6 +147,19 @@
 Q_DECLARE_FLAGS(HbModifiers, HbModifier)
 
 /*!
+\enum HbKeyboardSettingFlags
+
+Enumerates keyboard setting flags.
+*/
+enum HbKeyboardSettingFlag
+{
+    HbKeyboardSettingNone         = 0x00000000,
+    HbKeyboardSetting12key        = 0x00000001,
+    HbKeyboardSettingQwerty       = 0x00000010
+};
+Q_DECLARE_FLAGS(HbKeyboardSettingFlags, HbKeyboardSettingFlag)
+
+/*!
 \enum HbTextCase
 
 Enumerates supported text case states. HbTextCaseAutomatic is a state
@@ -183,8 +198,8 @@
 enum HbEditorConstraint
 {
     HbEditorConstraintNone                 = 0,
-    HbEditorConstraintsNoSecondaryChannel  = 0x01,   /**< Editor doesn't allow input from secondary channel. */
-    HbEditorConstraintOnlySecondaryChannel = 0x02,   /**< Editor allows input only from secondary channel. */
+    HbEditorConstraintsNoSecondaryChannel  = 0x01,   /**< DEPRECATED */
+    HbEditorConstraintOnlySecondaryChannel = 0x02,   /**< DEPRECATED */
     HbEditorConstraintAutoCompletingField  = 0x04,   /**< This is auto-completing editor. It remeber what has been typed previously to same editor class. */
     HbEditorConstraintIgnoreFocus          = 0x08,   /**< Editor rejects input framework focus. */
     HbEditorConstraintFixedInputMode       = 0x10,   /**< Editor doesn't allow initial input mode to be changed. */
@@ -242,6 +257,26 @@
      HbInputEditorClassLastItem          // Keep this last, but never use.
 };
 
+/*!
+Enumerates primary candidate modes.
+*/
+enum HbPrimaryCandidateMode{
+    HbPrimaryCandidateModeBestPrediction,        /**< Display best prediction as the primary candidate */
+    HbPrimaryCandidateModeExactTyping            /**< Display exact typing as the primary candidate */
+};
+
+/*!
+Enumerates typing correction levels.
+*/
+enum HbTypingCorrectionLevel{
+    HbTypingCorrectionLevelLow,
+    HbTypingCorrectionLevelMedium,
+    HbTypingCorrectionLevelHigh
+};
+
+const int HbInputMinKeypressTimeout = 400;
+const int HbInputMaxKeypressTimeout = 3000;
+
 #define CUSTOM_INPUT_MASK 0xffff0000
 #define CUSTOM_INPUT_ID_MASK 0x0000ffff
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/inputfw/hbinputeditorinterface.cpp
--- a/src/hbcore/inputfw/hbinputeditorinterface.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/inputfw/hbinputeditorinterface.cpp	Mon May 03 12:48:33 2010 +0300
@@ -42,8 +42,8 @@
 \brief An interface for accessing editor specific input attributes.
 
 This class is an interface for accessing and manipulating editor attributes, such as input mode, text case,
-constraints, etc. It also contains some useful convenience and utility methods. This interface is meant to be used
-by both client application and input method sides.
+constraints, input filter and so on. It also contains some useful convenience and utility methods.
+This interface is meant to be used from both client application and input method code.
 
 Following example shows how to create editor interface, attach editor to it and use some attributes.
 
@@ -59,9 +59,9 @@
 /*!
 Constructs the object and attaches given editor.
 */
-HbEditorInterface::HbEditorInterface(QObject* aEditor)
+HbEditorInterface::HbEditorInterface(QObject* editor)
 {
-    mPrivate = HbEditorInterfacePrivateCache::instance()->attachEditor(aEditor, this);
+    mPrivate = HbEditorInterfacePrivateCache::instance()->attachEditor(editor, this);
     connect(mPrivate, SIGNAL(destroyed(QObject*)), this, SLOT(backendDestroyed(QObject*)));
 }
 
@@ -96,24 +96,48 @@
 \sa textCase
 \sa HbTextCase
 */
-void HbEditorInterface::setTextCase(HbTextCase aTextCase)
+void HbEditorInterface::setTextCase(HbTextCase textCase)
 {
     if (mPrivate) {
         mPrivate->lock();
-        mPrivate->mTextCase = aTextCase;
+        mPrivate->mTextCase = textCase;
         mPrivate->unlock();
         HbEditorInterfacePrivateCache::instance()->notifyValueChanged(mPrivate->mHostEditor);
     }
 }
 
 /*!
+\deprecated HbEditorInterface::inputMode() const
+  is deprecated. Use mode() instead.
 Returns active editor input mode. Returned value is HbInputMethodType.
 
 \sa setInputMode
 */
 int HbEditorInterface::inputMode() const
 {
-    int ret = HbInputModeNone;
+    return mode();
+}
+
+/*!
+\deprecated HbEditorInterface::setInputMode(int)
+  is deprecated. Use setMode() instead.
+Sets active editor input mode.
+
+\sa inputMode
+*/
+void HbEditorInterface::setInputMode(int inputMode)
+{
+    setMode(static_cast<HbInputModeType>(inputMode));
+}
+
+/*!
+Returns active editor input mode.
+
+\sa setInputMode
+*/
+HbInputModeType HbEditorInterface::mode() const
+{
+    HbInputModeType ret = HbInputModeNone;
     if (mPrivate) {
         mPrivate->lock();
         ret = mPrivate->mInputMode;
@@ -128,17 +152,19 @@
 
 \sa inputMode
 */
-void HbEditorInterface::setInputMode(int aInputMode)
+void HbEditorInterface::setMode(HbInputModeType inputMode)
 {
     if (mPrivate) {
         mPrivate->lock();
-        mPrivate->mInputMode = aInputMode;
+        mPrivate->mInputMode = inputMode;
         mPrivate->unlock();
         HbEditorInterfacePrivateCache::instance()->notifyValueChanged(mPrivate->mHostEditor);
     }
 }
 
 /*!
+\deprecated HbEditorInterface::constraints() const
+  is deprecated. Use inputConstraints() instead.
 Returns editor constraints. Returned value is a bit vector consisting of
 HbEditorConstraint bits.
 
@@ -146,7 +172,29 @@
 */
 int HbEditorInterface::constraints() const
 {
-    int ret = 0;
+    return inputConstraints();
+}
+
+/*!
+\deprecated HbEditorInterface::setConstraints(int)
+  is deprecated. Use setInputConstraints() instead.
+Sets editor constraints.
+
+\sa constraints
+*/
+void HbEditorInterface::setConstraints(int constraints)
+{
+    setInputConstraints(static_cast<HbEditorConstraints>(constraints));
+}
+
+/*!
+Returns editor constraints. The returned value is a combination of HbEditorConstraint flags.
+
+\sa setEditorConstraints
+*/
+HbEditorConstraints HbEditorInterface::inputConstraints() const
+{
+    HbEditorConstraints ret = 0;
     if (mPrivate) {
         mPrivate->lock();
         ret = mPrivate->mConstraints;
@@ -159,21 +207,24 @@
 /*!
 Sets editor constraints.
 
-\sa constraints
+\sa editorConstraints
 */
-void HbEditorInterface::setConstraints(int aConstraints)
+void HbEditorInterface::setInputConstraints(HbEditorConstraints constraints)
 {
     if (mPrivate) {
         mPrivate->lock();
-        mPrivate->mConstraints = aConstraints;
+        mPrivate->mConstraints = constraints;
         mPrivate->unlock();
         HbEditorInterfacePrivateCache::instance()->notifyValueChanged(mPrivate->mHostEditor);
     }
 }
 
 /*!
-Returns custom filter id. If this value is set, then corresponding filter
-in HbEditorCharacterFilter is used as part of edit operations for this editor.
+Returns active input filter. The input framework will always run any text it produces
+through the active filter before it is commited into editor buffer.
+
+In some cases, the input framework also automatically sets the filter to match
+input method hints. The default filter can still be overridden.
 
 \sa setFilter
 */
@@ -190,21 +241,23 @@
 }
 
 /*!
-Sets custom filter id.
+Sets active input filter. The ownership is not transferred.
 
 \sa filter
 */
-void HbEditorInterface::setFilter(HbInputFilter *aFilter)
+void HbEditorInterface::setFilter(HbInputFilter *filter)
 {
     if (mPrivate) {
         mPrivate->lock();
-        mPrivate->mFilter = aFilter;
+        mPrivate->mFilter = filter;
         mPrivate->unlock();
         HbEditorInterfacePrivateCache::instance()->notifyValueChanged(mPrivate->mHostEditor);
     }
 }
 
 /*!
+\deprecated HbEditorInterface::localDigitType() const
+  is deprecated. Use digitType() instead.
 Returns local digit type setting. If this value is set, it will override device wide
 digit type setting. Returned value is HbInputDigitType.
 
@@ -212,7 +265,30 @@
 */
 int HbEditorInterface::localDigitType() const
 {
-    int ret = HbDigitTypeNone;
+    return digitType();
+}
+
+/*!
+\deprecated HbEditorInterface::setLocalDigitType(int)
+  is deprecated. Use setDigitType() instead.
+Sets local digit type.
+
+\sa localDigitType
+*/
+void HbEditorInterface::setLocalDigitType(int digitType)
+{
+    setDigitType(static_cast<HbInputDigitType>(digitType));
+}
+
+/*!
+Returns local digit type setting. If this value is set, it will override device wide
+digit type setting.
+
+\sa setDigitType
+*/
+HbInputDigitType HbEditorInterface::digitType() const
+{
+    HbInputDigitType ret = HbDigitTypeNone;
 
     if (mPrivate) {
         mPrivate->lock();
@@ -226,13 +302,13 @@
 /*!
 Sets local digit type.
 
-\sa localDigitType
+\sa digitType
 */
-void HbEditorInterface::setLocalDigitType(int aDigitType)
+void HbEditorInterface::setDigitType(HbInputDigitType digitType)
 {
     if (mPrivate) {
         mPrivate->lock();
-        mPrivate->mLocalDigitType = aDigitType;
+        mPrivate->mLocalDigitType = digitType;
         mPrivate->unlock();
         HbEditorInterfacePrivateCache::instance()->notifyValueChanged(mPrivate->mHostEditor);
     }
@@ -250,6 +326,11 @@
 Hb input methods currently use only the first action in the list.
 Different input methods may display 0 or more than one button.
 
+Note that the custom button action is only a request to show it. Whether or not the
+virtual keyboard widget actually shows it depends on the situation and
+the active input method. That's why a function asigned to custom button should never
+be the only way to use a feature but only a shortcut.
+
 \sa insertAction
 \sa removeAction
 \sa actions
@@ -280,7 +361,7 @@
         int index = mPrivate->mActions.indexOf(action);
         if (index >= 0)
             mPrivate->mActions.removeAt(index);
-    
+
         int pos = mPrivate->mActions.indexOf(before);
         if (pos < 0) {
             pos = mPrivate->mActions.size();
@@ -353,18 +434,18 @@
 
 /*!
 Sets extra user dictionary id value. After setting this value those prediction
-implementations that support extra user dictionaries attach given user additional dictionary
-in case it is available.
+engines that support extra dictionaries attach given dictionary to be
+part of prediction vocabulary.
 
 \sa extraDictionaryId
 \sa HbUserDictionary
 \sa HbExtraUserDictionary
 */
-void HbEditorInterface::setExtraDictionaryId(int aId)
+void HbEditorInterface::setExtraDictionaryId(int id)
 {
     if (mPrivate) {
         mPrivate->lock();
-        mPrivate->mExtraDictionaryId = aId;
+        mPrivate->mExtraDictionaryId = id;
         mPrivate->unlock();
         HbEditorInterfacePrivateCache::instance()->notifyValueChanged(mPrivate->mHostEditor);
     }
@@ -389,11 +470,11 @@
 /*!
 Sets editor class.
 */
-void HbEditorInterface::setEditorClass(HbInputEditorClass aClass)
+void HbEditorInterface::setEditorClass(HbInputEditorClass editorClass)
 {
     if (mPrivate) {
         mPrivate->lock();
-        mPrivate->mClass = aClass;
+        mPrivate->mClass = editorClass;
         mPrivate->unlock();
         HbEditorInterfacePrivateCache::instance()->notifyValueChanged(mPrivate->mHostEditor);
     }
@@ -489,17 +570,17 @@
 /*!
 Returns true if this instance is attached to same editor as given instance.
 */
-bool HbEditorInterface::operator==(const HbEditorInterface& aInterface) const
+bool HbEditorInterface::operator==(const HbEditorInterface& interface) const
 {
-    return (mPrivate == aInterface.mPrivate);
+    return (mPrivate == interface.mPrivate);
 }
 
 /*!
 Returns true if this instance is not attached to same editor as given instance.
 */
-bool HbEditorInterface::operator!=(const HbEditorInterface& aInterface) const
+bool HbEditorInterface::operator!=(const HbEditorInterface& interface) const
 {
-    return (mPrivate != aInterface.mPrivate);
+    return (mPrivate != interface.mPrivate);
 }
 
 /*!
@@ -546,20 +627,19 @@
 }
 
 /*!
-A convenience method for setting up the editor as number only editor. Sets input mode
-to HbInputModeNumeric, activates phone number filter and sets fixed input mode
-constraint. In Qt 4.6 sets Qt::ImhDigitsOnly and Qt::ImhDialableCharactersOnly hints.
+\deprecated void HbEditorInterface::setUpAsPhoneNumberEditor()
+        is deprecated. Instead use setInputMethodHints() of QGraphicsItem(HbAbstractEdit) to setup editor.
 */
 void HbEditorInterface::setUpAsPhoneNumberEditor()
 {
     setInputMode(HbInputModeNumeric);
-    mPrivate->setInputMethodHints(Qt::ImhDialableCharactersOnly);
+    mPrivate->setInputMethodHints(Qt::ImhDialableCharactersOnly | Qt::ImhNoPredictiveText);
     setConstraints(HbEditorConstraintFixedInputMode);
     setFilter(HbPhoneNumberFilter::instance());
 }
 
 /*!
-A convinience method for setting up the editor as completing email field. 
+A convinience method for setting up the editor as completing email field.
 */
 void HbEditorInterface::setUpAsCompletingEmailField()
 {
@@ -589,7 +669,7 @@
 /*!
 A convinience method for setting up the editor as latin alphabet editor. In this mode, the input framework
 will use global input language if it is naturally capable of producing latin aplhabets. Otherwise
-it will switch locally to english language (is is assumed that english is alwasy available).
+it will switch locally to english language (is is assumed that english is always available).
 It is also recommended that prediction is disabled in latin only editors. That's because predictive mode in
 latin alphabet editor is controversial (which prediction database should be used if global language doesn't
 apply and we locally to switch to english? If we used english database, that would lead to situation
@@ -600,7 +680,7 @@
 {
     setInputMode(HbInputModeNone);
     setConstraints(HbEditorConstraintLatinAlphabetOnly);
-    mPrivate->setInputMethodHints(Qt::ImhNoPredictiveText); 
+    mPrivate->setInputMethodHints(Qt::ImhNoPredictiveText);
 }
 
 /*!
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/inputfw/hbinputeditorinterface.h
--- a/src/hbcore/inputfw/hbinputeditorinterface.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/inputfw/hbinputeditorinterface.h	Mon May 03 12:48:33 2010 +0300
@@ -44,34 +44,40 @@
     Q_OBJECT
 
 public:
-    HbEditorInterface(QObject* aEditor);
+    HbEditorInterface(QObject* editor);
     ~HbEditorInterface();
 
     HbTextCase textCase() const;
-    void setTextCase(HbTextCase aTextCase);
+    void setTextCase(HbTextCase textCase);
     int inputMode() const;
-    void setInputMode(int aInputMode);
+    void setInputMode(int inputMode);
+     HbInputModeType mode() const;
+     void setMode(HbInputModeType inputMode);
     int constraints() const;
-    void setConstraints(int aConstraints);
+    void setConstraints(int constraints);
+    HbEditorConstraints inputConstraints() const;
+    void setInputConstraints(HbEditorConstraints constraints);
     HbInputFilter *filter() const;
-    void setFilter(HbInputFilter *aFilter);
+    void setFilter(HbInputFilter *filter);
     int localDigitType() const;
-    void setLocalDigitType(int aDigitType);
+    void setLocalDigitType(int digitType);
+    HbInputDigitType digitType() const;
+    void setDigitType(HbInputDigitType digitType);
     void addAction(HbAction *action);
     void insertAction(HbAction *before, HbAction *action);
     void removeAction(HbAction *action);
     QList<HbAction*> actions() const;
     int extraDictionaryId() const;
-    void setExtraDictionaryId(int aId);
+    void setExtraDictionaryId(int id);
     HbInputEditorClass editorClass() const;
-    void setEditorClass(HbInputEditorClass aClass);
+    void setEditorClass(HbInputEditorClass editorClass);
     HbSmileyTheme smileyTheme() const;
     void setSmileyTheme(const HbSmileyTheme &theme);
     void lastFocusedState(HbInputState &result) const;
     void setLastFocusedState(const HbInputState &state);
 
-    bool operator==(const HbEditorInterface& aInterface) const;
-    bool operator!=(const HbEditorInterface& aInterface) const;
+    bool operator==(const HbEditorInterface& interface) const;
+    bool operator!=(const HbEditorInterface& interface) const;
     QObject* editor() const;
     HbVkbHost *vkbHost() const;
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/inputfw/hbinputeditorinterface_p.cpp
--- a/src/hbcore/inputfw/hbinputeditorinterface_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/inputfw/hbinputeditorinterface_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -114,35 +114,35 @@
     }
 }
 
-HbEditorInterfacePrivate* HbEditorInterfacePrivateCache::attachEditor(QObject* aEditor, HbEditorInterface* aInterface)
+HbEditorInterfacePrivate* HbEditorInterfacePrivateCache::attachEditor(QObject* editor, HbEditorInterface* interface)
 {
-    if (aEditor) {
+    if (editor) {
         for (int i = 0; i < mObjectCache.count(); i++) {
-            if (mObjectCache[i]->mHostEditor == aEditor) {
-                if (!mObjectCache[i]->hasInterface(aInterface)) {
-                    mObjectCache[i]->mAttachedInterfaces.append(aInterface);
-                    connect(aInterface, SIGNAL(destroyed(QObject*)), this, SLOT(interfaceDestroyed(QObject*)));
-                    connect(mObjectCache[i], SIGNAL(cursorPositionChanged(int, int)), aInterface, SIGNAL(cursorPositionChanged(int, int)));
+            if (mObjectCache[i]->mHostEditor == editor) {
+                if (!mObjectCache[i]->hasInterface(interface)) {
+                    mObjectCache[i]->mAttachedInterfaces.append(interface);
+                    connect(interface, SIGNAL(destroyed(QObject*)), this, SLOT(interfaceDestroyed(QObject*)));
+                    connect(mObjectCache[i], SIGNAL(cursorPositionChanged(int, int)), interface, SIGNAL(cursorPositionChanged(int, int)));
                 }
                 return mObjectCache[i];
             }
         }
 
         HbEditorInterfacePrivate* newItem = new HbEditorInterfacePrivate();
-        newItem->mHostEditor = aEditor;
-        newItem->mAttachedInterfaces.append(aInterface);
+        newItem->mHostEditor = editor;
+        newItem->mAttachedInterfaces.append(interface);
         mObjectCache.append(newItem);
 
-        connect(aEditor, SIGNAL(destroyed(QObject*)), this, SLOT(destroyed(QObject*)));
-        connect(aInterface, SIGNAL(destroyed(QObject*)), this, SLOT(interfaceDestroyed(QObject*)));
-        connect(newItem, SIGNAL(cursorPositionChanged(int, int)), aInterface, SIGNAL(cursorPositionChanged(int, int)));
+        connect(editor, SIGNAL(destroyed(QObject*)), this, SLOT(destroyed(QObject*)));
+        connect(interface, SIGNAL(destroyed(QObject*)), this, SLOT(interfaceDestroyed(QObject*)));
+        connect(newItem, SIGNAL(cursorPositionChanged(int, int)), interface, SIGNAL(cursorPositionChanged(int, int)));
 
         // Check whether the connected object is a QLineEdit or QTextEdit, plain or wrapped in QGraphicsProxyWidget
         // and if yes, connect its cursorPositionChanged() signal to this item's cursorPositionChanged() signal
-        if (aEditor->inherits("HbAbstractEdit")) {
-            connect(aEditor, SIGNAL(cursorPositionChanged(int, int)), newItem, SIGNAL(cursorPositionChanged(int, int)));
+        if (editor->inherits("HbAbstractEdit")) {
+            connect(editor, SIGNAL(cursorPositionChanged(int, int)), newItem, SIGNAL(cursorPositionChanged(int, int)));
         } else {
-            QGraphicsProxyWidget* proxywidget = qobject_cast<QGraphicsProxyWidget*>(aEditor);
+            QGraphicsProxyWidget* proxywidget = qobject_cast<QGraphicsProxyWidget*>(editor);
             if (proxywidget) {
                 QWidget* editorwidget = proxywidget->widget();
                 QLineEdit* lineedit = qobject_cast<QLineEdit*>(editorwidget);
@@ -155,11 +155,11 @@
                     }
                 }
             } else {
-                QLineEdit* lineedit = qobject_cast<QLineEdit*>(aEditor);
+                QLineEdit* lineedit = qobject_cast<QLineEdit*>(editor);
                 if (lineedit) {
                 connect(lineedit, SIGNAL(cursorPositionChanged(int, int)), newItem, SIGNAL(cursorPositionChanged(int, int)));
                 } else {
-                    QTextEdit* textedit = qobject_cast<QTextEdit*>(aEditor);
+                    QTextEdit* textedit = qobject_cast<QTextEdit*>(editor);
                     if (textedit) {
                     connect(textedit, SIGNAL(cursorPositionChanged()), newItem, SLOT(cursorPositionChanged()));
                     }
@@ -173,10 +173,10 @@
     return 0;
 }
 
-void HbEditorInterfacePrivateCache::destroyed(QObject* aObject)
+void HbEditorInterfacePrivateCache::destroyed(QObject* object)
 {
     for (int i = 0; i < mObjectCache.count(); i++) {
-        if (mObjectCache[i]->mHostEditor == aObject) {
+        if (mObjectCache[i]->mHostEditor == object) {
             delete mObjectCache[i];
             mObjectCache.remove(i);
             break;
@@ -184,11 +184,11 @@
     }
 }
 
-void HbEditorInterfacePrivateCache::interfaceDestroyed(QObject* aObject)
+void HbEditorInterfacePrivateCache::interfaceDestroyed(QObject* object)
 {
     for (int i = 0; i < mObjectCache.count(); i++) {
         for (int j = 0; j < mObjectCache[i]->mAttachedInterfaces.count(); j++) {
-            if (mObjectCache[i]->mAttachedInterfaces[j] == aObject) {
+            if (mObjectCache[i]->mAttachedInterfaces[j] == object) {
                 mObjectCache[i]->mAttachedInterfaces.removeAt(j);
                 return;
             }
@@ -196,10 +196,10 @@
     }
 }
 
-void HbEditorInterfacePrivateCache::notifyValueChanged(QObject* aEditor)
+void HbEditorInterfacePrivateCache::notifyValueChanged(QObject* editor)
 {
     for (int i = 0; i < mObjectCache.count(); i++) {
-       if (mObjectCache[i]->mHostEditor == aEditor) {
+       if (mObjectCache[i]->mHostEditor == editor) {
             for (int j = 0; j < mObjectCache[i]->mAttachedInterfaces.count(); j++) {
                 mObjectCache[i]->mAttachedInterfaces[j]->backendModified();
             }
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/inputfw/hbinputeditorinterface_p.h
--- a/src/hbcore/inputfw/hbinputeditorinterface_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/inputfw/hbinputeditorinterface_p.h	Mon May 03 12:48:33 2010 +0300
@@ -52,7 +52,7 @@
         : mInputMode(0),
         mTextCase(HbTextCaseNone),
         mConstraints(0),
-        mLocalDigitType(0),
+        mLocalDigitType(HbDigitTypeNone),
         mExtraDictionaryId(0),
         mClass(0),
         mHostEditor(0)
@@ -67,11 +67,11 @@
     Qt::InputMethodHints inputMethodHints() const;
 
 public:
-    int mInputMode;
+    HbInputModeType mInputMode;
     HbTextCase mTextCase;
-    int mConstraints;
+    HbEditorConstraints mConstraints;
     QPointer<HbInputFilter> mFilter;
-    int mLocalDigitType;
+    HbInputDigitType mLocalDigitType;
     int mExtraDictionaryId;
     int mClass;
     HbSmileyTheme mSmileyTheme;
@@ -103,13 +103,13 @@
     ~HbEditorInterfacePrivateCache();
 
 public:
-    HbEditorInterfacePrivate* attachEditor(QObject* aEditor, HbEditorInterface* aInterface);
+    HbEditorInterfacePrivate* attachEditor(QObject* editor, HbEditorInterface* interface);
     bool isConnected(QObject* object);
-    void notifyValueChanged(QObject *aEditor);
+    void notifyValueChanged(QObject *editor);
 
 public slots:
-    void destroyed(QObject* aObject);
-    void interfaceDestroyed(QObject* aObject);
+    void destroyed(QObject* object);
+    void interfaceDestroyed(QObject* object);
 
 private:
     QVector<HbEditorInterfacePrivate*> mObjectCache;
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/inputfw/hbinputextradictionarycollection.h
--- a/src/hbcore/inputfw/hbinputextradictionarycollection.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/inputfw/hbinputextradictionarycollection.h	Mon May 03 12:48:33 2010 +0300
@@ -34,7 +34,7 @@
 const int HbMaxDictionariesInCollection = 16;
 
 class HB_CORE_EXPORT HbExtraDictionaryCollection
-{      
+{
 public:
     HbExtraDictionaryCollection();
     HbExtraDictionaryCollection(QList<int> dictionaries);
@@ -49,11 +49,10 @@
     QList<int> dictionaries() const;
 
     void disableDictionary(int id);
-    void enableDictionary(int id); 
+    void enableDictionary(int id);
 
     bool isDisabled(int id) const;
 
-public:
     int numberOfWords() const;
     int totalNumberOfWords() const;
 
@@ -61,7 +60,7 @@
     QStringList findMatches(const QString& searchString, Qt::CaseSensitivity caseSensitivity = Qt::CaseSensitive);
 
     bool hasWord(const QString& word) const;
-    void incrementUseCount(const QString& word); 
+    void incrementUseCount(const QString& word);
 
 protected:
     HbExtraDictionaryCollectionPrivate* const d_ptr;
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/inputfw/hbinputextradictionaryfactory.cpp
--- a/src/hbcore/inputfw/hbinputextradictionaryfactory.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/inputfw/hbinputextradictionaryfactory.cpp	Mon May 03 12:48:33 2010 +0300
@@ -34,7 +34,7 @@
 \class HbExtraDictionaryFactory
 \brief A factory class for creating and accessing instances of HbExtraDictionary database.
 
-This is a singleton factory class for instances of HbExtraDictionary class by id number. 
+This is a singleton factory class for creating instances of HbExtraDictionary class by id number.
 It knows where the databases are stored in the system, loads and maintains them in the memory.
 
 \sa HbExtraUserDictionary
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/inputfw/hbinputextradictionaryfactory.h
--- a/src/hbcore/inputfw/hbinputextradictionaryfactory.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/inputfw/hbinputextradictionaryfactory.h	Mon May 03 12:48:33 2010 +0300
@@ -46,7 +46,7 @@
 
 public:
     static HbExtraDictionaryFactory *instance();
-        
+
     HbExtraUserDictionary *existingDictionary(int dictionaryId);
     HbExtraUserDictionary *createDictionary(int dictionaryId, const QStringList& initialContent = QStringList());
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/inputfw/hbinputextrauserdictionary.cpp
--- a/src/hbcore/inputfw/hbinputextrauserdictionary.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/inputfw/hbinputextrauserdictionary.cpp	Mon May 03 12:48:33 2010 +0300
@@ -42,18 +42,21 @@
 \brief A generic implementation of HbUserDictionary class.
 
 This class provides generic all-purpose implementation of HbUserDictionary class.
-It uses shared memory and words are stored in plain text format. Entries are sorted and 
-a binary search algorithm is used for finding matches. There is a random access
-operator for read operations. It also knows how to save it self to disk and load again.
+It uses shared memory and words are stored in plain text format. Entries are sorted and
+a binary search algorithm is provided for finding matches. There is a random access
+operator for read operations. It also knows how to save its contents to disk and load it again.
 There is a separate factory class for creating and accessing HbExtraUserDictionary
 instances.
 
 The dictionary data is organized so that there is a directory area and data area. Directory area
-contains an array of HbExtraUDDirectoryEntry items. They specify where each word begins in the 
+contains an array of HbExtraUDDirectoryEntry items. They specify where each word begins in the
 data area and how long it is. Data area contains characters in a single long string. There are
 methods for accessing directory and data area in case direct access is needed.
 Typically this is not needed and default search and access operators are enough.
 
+Example uses cases for extra dictonaries are additional prediction engine databases and
+acting as a backend for auto-completing fields.
+
 \sa HbUserDictionary
 \sa HbExtraDictionaryFactory
 */
@@ -165,6 +168,7 @@
     // Update word count.
     dataHeader()->numWords--;
     dataHeader()->dataSize -= length;
+    dataHeader()->modified = true;
 
     // Then update remaining dictionary entries.
     const int rounds = dataHeader()->numWords;
@@ -178,9 +182,9 @@
     HbExtraUDDirectoryEntry *dir = directory();
     QChar *data = dataArea();
 
-    const int origNumWords = dataHeader()->numWords;  
+    const int origNumWords = dataHeader()->numWords;
     if (origNumWords > 0) {
-        if (index < origNumWords) { 
+        if (index < origNumWords) {
             // First move the trailing part of the data area to make space for the new word.
             memmove((char*)&data[dir[index].start + newWord.size()] + sizeof(HbExtraUDDirectoryEntry),
                     (char*)(&data[dir[index].start]),
@@ -200,7 +204,8 @@
 
     // Update word count.
     dataHeader()->numWords++;
-    dataHeader()->dataSize += newWord.size(); 
+    dataHeader()->dataSize += newWord.size();
+    dataHeader()->modified = true;
 
     data = dataArea();  // data area starting point has changed, refresh.
 
@@ -246,12 +251,12 @@
 }
 
 int HbExtraUserDictionaryPrivate::findIndexForNewWord(int start, int end, const QString& newWord) const
-{    
+{
     if (start >= end) {
         if (dataHeader()->numWords == 0) {
             return 0;
         }
-    
+
         if (compareWords(start, newWord) > 0) {
             return start + 1;
         } else {
@@ -277,31 +282,31 @@
 
     const int start = dir[index].start;
     const int rounds = (dir[index].length > otherWord.size() ? otherWord.size() : dir[index].length);
-	if (caseSensitivity == Qt::CaseSensitive) {
-		for (int i = 0; i < rounds; i++) {
-			if (data[start + i] == otherWord[i]) {
-				continue;
-			}
+        if (caseSensitivity == Qt::CaseSensitive) {
+                for (int i = 0; i < rounds; i++) {
+                        if (data[start + i] == otherWord[i]) {
+                                continue;
+                        }
 
-			if (otherWord[i] > data[start + i]) {
-				return 1;
-			}
+                        if (otherWord[i] > data[start + i]) {
+                                return 1;
+                        }
 
-			return -1;
-		}
-	} else {
-		for (int i = 0; i < rounds; i++) {
-			if (data[start + i].toCaseFolded() == otherWord[i].toCaseFolded()) {
-				continue;
-			}
+                        return -1;
+                }
+        } else {
+                for (int i = 0; i < rounds; i++) {
+                        if (data[start + i].toCaseFolded() == otherWord[i].toCaseFolded()) {
+                                continue;
+                        }
 
-			if (otherWord[i].toCaseFolded() > data[start + i].toCaseFolded()) {
-				return 1;
-			}
+                        if (otherWord[i].toCaseFolded() > data[start + i].toCaseFolded()) {
+                                return 1;
+                        }
 
-			return -1;
-		}
-	}
+                        return -1;
+                }
+        }
 
     if (dir[index].length == otherWord.size()) {
         return 0;  // Match!
@@ -337,7 +342,7 @@
 if not found, initializes it.
 */
 HbExtraUserDictionary::HbExtraUserDictionary(int dbId) : d_ptr(new HbExtraUserDictionaryPrivate)
-{ 
+{
     setId(dbId);
     attach();
 }
@@ -378,10 +383,10 @@
 \sa addWords
 \sa removeWord
 */
-bool HbExtraUserDictionary::addWord(const QString& newWord, HbPredictionCallback* aCallback)
+bool HbExtraUserDictionary::addWord(const QString& newWord, HbPredictionCallback* callback)
 {
-    Q_UNUSED(aCallback);
-    Q_D(HbExtraUserDictionary);    
+    Q_UNUSED(callback);
+    Q_D(HbExtraUserDictionary);
 
     d->lock();
 
@@ -392,15 +397,15 @@
     }
 
     if (newWord.size() < KExtraUserDictionaryMaxWordLength &&
-        d->hasEnoughSpaceForNewWord(newWord) && 
+        d->hasEnoughSpaceForNewWord(newWord) &&
         d->dataHeader()->numWords < KExtraUserDictionaryMaxWords) {
        int newIndex = d->findIndexForNewWord(0, d->dataHeader()->numWords - 1, newWord);
-       d->addEntry(newIndex, newWord);  
+       d->addEntry(newIndex, newWord);
 
        d->unlock();
        return true;
        }
- 
+
     d->unlock();
     return false;
 }
@@ -435,7 +440,7 @@
 
     d->lock();
 
-	int index = d->findWord(0, d->dataHeader()->numWords - 1, toBeRemoved, Qt::CaseInsensitive);
+    int index = d->findWord(0, d->dataHeader()->numWords - 1, toBeRemoved, Qt::CaseInsensitive);
     if (index >= 0) {
        d->removeEntry(index);
        d->unlock();
@@ -710,7 +715,7 @@
 
 /*!
 Returs the maximum size of raw data area. This size will decrease every time new words are
-added to the dictionary, because directory size will increase. This method is provided for sake 
+added to the dictionary, because directory size will increase. This method is provided for sake
 of efficiency for those who need direct access and know what they are doing.
 
 \sa rawDataArea
@@ -722,7 +727,7 @@
 }
 
 /*!
-Returns direct access to internal directory in the data area. The array contains as many items as there are 
+Returns direct access to internal directory in the data area. The array contains as many items as there are
 words in the dictionary. This method is provided for sake of efficiency for those who need direct access
 and know what they are doing.
 
@@ -761,10 +766,11 @@
 
     if (d->dataHeader()->numWords) {
         HbExtraUDDirectoryEntry *dir = d->directory();
-      
+
         int first = d->findFirstMatch(0, d->dataHeader()->numWords - 1, word);
         if (first >= 0 && dir[first].frequency < HbExtraDictMaxFrequency) {
             dir[first].frequency++;
+            d->dataHeader()->modified = true;
             }
         }
 }
@@ -772,48 +778,49 @@
 /*!
 Returns true if given word exits in the dictionary.
 */
-bool HbExtraUserDictionary::hasWord(const QString& word, Qt::CaseSensitivity caseSensitivity) const 
+bool HbExtraUserDictionary::hasWord(const QString& word, Qt::CaseSensitivity caseSensitivity) const
 {
     Q_D(const HbExtraUserDictionary);
 
     if (d->dataHeader()->numWords) {
         QChar *data = d->dataArea();
         HbExtraUDDirectoryEntry *dir = d->directory();
-		int first = d->findFirstMatch(0, d->dataHeader()->numWords - 1, word,-1, caseSensitivity);
-		if (first >= 0) {
-			if (caseSensitivity == Qt::CaseSensitive) {
-				if (QString(&data[dir[first].start], dir[first].length) == word) {
-					return true;
-				}
-				const int rounds = d->dataHeader()->numWords;
-				for (int i = first + 1; i <= rounds; i++) {
-					QString candidate(&data[dir[i].start], dir[i].length);
-					if (candidate.startsWith(word, Qt::CaseInsensitive)) {  
-						if (candidate == word) { 
-							return true;
-						}                    
-					} else {
-						break;
-					}
-				}
-			} else {
-				if (QString(&data[dir[first].start], dir[first].length).toCaseFolded() == word.toCaseFolded()) {
-					return true;
-				}
-				const int rounds = d->dataHeader()->numWords;
-				for (int i = first + 1; i <= rounds; i++) {
-					QString candidate(&data[dir[i].start], dir[i].length);
-					if (candidate.startsWith(word, Qt::CaseInsensitive)) {  
-						if (candidate.toCaseFolded() == word.toCaseFolded()) {
-							return true;
-						}                    
-					} else {
-						break;
-					}
-				}
-			}
-		}
-	}
+            int first = d->findFirstMatch(0, d->dataHeader()->numWords - 1, word,-1, caseSensitivity);
+            if (first >= 0) {
+                if (caseSensitivity == Qt::CaseSensitive) {
+                    if (QString(&data[dir[first].start], dir[first].length) == word) {
+                        return true;
+                    }
+
+                    const int rounds = d->dataHeader()->numWords;
+                    for (int i = first + 1; i <= rounds; i++) {
+                         QString candidate(&data[dir[i].start], dir[i].length);
+                         if (candidate.startsWith(word, Qt::CaseInsensitive)) {
+                             if (candidate == word) {
+                                 return true;
+                             }
+                         } else {
+                             break;
+                         }
+                    }
+            } else {
+                if (QString(&data[dir[first].start], dir[first].length).toCaseFolded() == word.toCaseFolded()) {
+                    return true;
+                }
+                const int rounds = d->dataHeader()->numWords;
+                for (int i = first + 1; i <= rounds; i++) {
+                    QString candidate(&data[dir[i].start], dir[i].length);
+                    if (candidate.startsWith(word, Qt::CaseInsensitive)) {
+                        if (candidate.toCaseFolded() == word.toCaseFolded()) {
+                            return true;
+                        }
+                    } else {
+                        break;
+                    }
+                }
+           }
+        }
+    }
 
     return false;
 }
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/inputfw/hbinputextrauserdictionary.h
--- a/src/hbcore/inputfw/hbinputextrauserdictionary.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/inputfw/hbinputextrauserdictionary.h	Mon May 03 12:48:33 2010 +0300
@@ -63,7 +63,7 @@
 
 public: // from HbUserDictionary
     int id() const;
-    bool addWord(const QString& newWord, HbPredictionCallback* aCallback = 0);
+    bool addWord(const QString& newWord, HbPredictionCallback* callback = 0);
     bool addWords(const QStringList& wordList);
     bool removeWord(const QString& toBeRemoved);
     int numberOfWords() const;
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/inputfw/hbinputfilter.cpp
--- a/src/hbcore/inputfw/hbinputfilter.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/inputfw/hbinputfilter.cpp	Mon May 03 12:48:33 2010 +0300
@@ -22,10 +22,6 @@
 ** Nokia at developer.feedback@nokia.com.
 **
 ****************************************************************************/
-#include <QMutex>
-#include <QMutexLocker>
-#include <QVector>
-
 #include "hbinputfilter.h"
 
 /*!
@@ -34,29 +30,31 @@
 \class HbInputFilter
 \brief Abstract base class for all editor filters.
 
-Input filter knows how to answer one question: "Is given character legal?". It does not do postion based
+An input filter knows how to answer one question: "Is given character legal?". It does not do postion based
 validation in same way as QValidator but is much simpler position independent filter.
-Input filter can be asigned to an editor by using editor interface. Input method implementations should always
-honor installed filter and never commit characters that do not pass active filter.
+
+Input filter can be asigned to an editor through editor interface. Input method implementations should always
+honor installed filter and never commit characters that do not pass active filter (all the methods in
+HbInputFocusObject API do that automatically).
 
 \sa HbEditorInterface
 */
 
 /*!
-\fn virtual bool filter(QChar aChar) = 0
+\fn virtual bool filter(QChar character) = 0
 
 Returns true if given character is valid.
 */
 
 /*!
-Performs filtering operation for string aIn. Filtered string aOut is a copy of aIn without
+Performs filtering operation for string "in". Filtered string "out" is a copy of "in" without
 invalid characters.
 */
-void HbInputFilter::filterString(const QString& aIn, QString& aOut)
+void HbInputFilter::filterString(const QString& in, QString& out)
 {
-    for (int i = 0; i < aIn.length(); i++) {
-        if (filter(aIn[i])) {
-            aOut.append(aIn[i]);
+    for (int i = 0; i < in.length(); i++) {
+        if (filter(in[i])) {
+            out.append(in[i]);
         }
     }
 }
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/inputfw/hbinputfilter.h
--- a/src/hbcore/inputfw/hbinputfilter.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/inputfw/hbinputfilter.h	Mon May 03 12:48:33 2010 +0300
@@ -38,11 +38,8 @@
 public:
     virtual ~HbInputFilter() {};
 
-    /*!
-    Returns true if given character passes the filter.
-    */
-    virtual bool filter(QChar aChar) = 0;
-    virtual void filterString(const QString &aIn, QString &aOut);
+    virtual bool filter(QChar character) = 0;
+    virtual void filterString(const QString &in, QString &out);
 };
 
 #endif // HB_INPUT_FILTER_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/inputfw/hbinputfocusobject.cpp
--- a/src/hbcore/inputfw/hbinputfocusobject.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/inputfw/hbinputfocusobject.cpp	Mon May 03 12:48:33 2010 +0300
@@ -45,20 +45,19 @@
 \brief A helper class for accessing editor widget in abstract way.
 
 This class is input method side API for accessing editor widgets. It was added because
-in some cases Qt's QInputMethodEvent/inputMethodQuery system is not enough for our purposes
-and direct access via type casting between QWidget and QGraphiscWidget based editors is needed.
+in some cases Qt's QInputMethodEvent/inputMethodQuery system is not enough and direct
+access via type casting between QWidget and QGraphiscWidget based editors is needed.
+Focus object hides those cases behind a convinience API.
 
 This class is purely a convenience or helper type of class in nature. Everything
 it does, can be done directly in input method code as well. It just wraps
-most commonly used operations behind one API to avoid duplicate code in input method implementations.
+most commonly used operations behind one API to avoid duplicate code.
 
 Application developers should never need to use this class, it is for input method developers only.
 
 \sa HbEditorInterface
 */
 
-
-
 /// @cond
 
 /*
@@ -235,20 +234,40 @@
 }
 
 /*!
+\deprecated HbInputFocusObject::cursorLeft(int)
+  is deprecated. Use HbInputFocusObject::cursorLeft(Qt::KeyboardModifiers modifiers) instead.
 Sends left arrow key press to focused editor.
 */
 void HbInputFocusObject::cursorLeft(int modifiers)
 {
-    QKeyEvent keyEvent(QEvent::KeyPress, Qt::Key_Left, (Qt::KeyboardModifiers)modifiers);
+    cursorLeft(static_cast<Qt::KeyboardModifiers>(modifiers));
+}
+
+/*!
+\deprecated HbInputFocusObject::cursorRight(int)
+  is deprecated. Use HbInputFocusObject::cursorRight(Qt::KeyboardModifiers modifiers) instead.
+Sends right arrow key press to focused editor.
+*/
+void HbInputFocusObject::cursorRight(int modifiers)
+{
+    cursorRight(static_cast<Qt::KeyboardModifiers>(modifiers));
+}
+
+/*!
+Sends left arrow key press to focused editor.
+*/
+void HbInputFocusObject::cursorLeft(Qt::KeyboardModifiers modifiers)
+{
+    QKeyEvent keyEvent(QEvent::KeyPress, Qt::Key_Left, modifiers);
     sendEvent(keyEvent);
 }
 
 /*!
 Sends right arrow key press to focused editor.
 */
-void HbInputFocusObject::cursorRight(int modifiers)
+void HbInputFocusObject::cursorRight(Qt::KeyboardModifiers modifiers)
 {
-    QKeyEvent keyEvent(QEvent::KeyPress, Qt::Key_Right, (Qt::KeyboardModifiers)modifiers);
+    QKeyEvent keyEvent(QEvent::KeyPress, Qt::Key_Right, modifiers);
     sendEvent(keyEvent);
 }
 
@@ -280,30 +299,30 @@
 Runs the given character through active input filter and commits it if it was accepted.
 Returns true if the character was accepted.
 */
-bool HbInputFocusObject::filterAndCommitCharacter(QChar aChar)
+bool HbInputFocusObject::filterAndCommitCharacter(QChar character)
 {
     // Two pass filtering because this may be a case constrained editor
     // with a filter.
     Qt::InputMethodHints hints = inputMethodHints();
     if (hints & Qt::ImhLowercaseOnly) {
-        if (!HbInputLowerCaseFilter::instance()->filter(aChar)) {
+        if (!HbInputLowerCaseFilter::instance()->filter(character)) {
             return false;
         }
     } else if (hints & Qt::ImhUppercaseOnly) {
-        if (!HbInputUpperCaseFilter::instance()->filter(aChar)) {
+        if (!HbInputUpperCaseFilter::instance()->filter(character)) {
             return false;
         }
     }
 
     HbInputFilter *filter = editorInterface().filter();
     if (filter) {
-        if (!filter->filter(aChar)) {
+        if (!filter->filter(character)) {
             return false;
         }
     }
 
     QString cString;
-    cString.append(aChar);
+    cString.append(character);
     sendCommitString(cString);
 
     return true;
@@ -340,7 +359,7 @@
 In case of QGraphicsWidget, the returned rectangle is in scene coordinates.
 */
 QRectF HbInputFocusObject::microFocus() const
-{  
+{
     return inputMethodQuery(Qt::ImMicroFocus).toRectF();
 }
 
@@ -530,7 +549,7 @@
 Commits given smiley.
 */
 void HbInputFocusObject::commitSmiley(QString smiley)
-{    
+{
      Q_D(HbInputFocusObject);
 
      if (d->mFocusedObject) {
@@ -591,8 +610,9 @@
 */
 bool HbInputFocusObject::isEditor(QObject *object)
 {
-    if (object && object->inherits("HbAbstractEdit")) {
-         return true;
+    QGraphicsObject *graphicsObject = qobject_cast<QGraphicsObject*>(object);
+    if (graphicsObject) {
+        return ((graphicsObject->flags() & QGraphicsItem::ItemAcceptsInputMethod) != 0);
     }
 
     if (qobject_cast<QLineEdit*>(object)) {
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/inputfw/hbinputfocusobject.h
--- a/src/hbcore/inputfw/hbinputfocusobject.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/inputfw/hbinputfocusobject.h	Mon May 03 12:48:33 2010 +0300
@@ -41,35 +41,37 @@
 class QGraphicsProxyWidget;
 class QGraphicsWidget;
 
-class HB_CORE_EXPORT HbInputFocusObject : public QObject 
+class HB_CORE_EXPORT HbInputFocusObject : public QObject
 {
     Q_OBJECT
 
 public:
     explicit HbInputFocusObject(QObject *focusedObject);
-    ~HbInputFocusObject();   
+    ~HbInputFocusObject();
 
     void sendPreEditString(const QString& string);
     void sendCommitString(const QString& string);
-    void sendEvent(QEvent& aEvent);
-    void postEvent(QEvent& aEvent);
+    void sendEvent(QEvent& event);
+    void postEvent(QEvent& event);
     QVariant inputMethodQuery(Qt::InputMethodQuery query) const;
     int editorCursorPosition();
     QFont editorFont();
     QString editorTextSelection();
     QString editorSurroundingText();
     HbEditorInterface& editorInterface() const;
-    void cursorLeft(int aModifiers = 0);
-    void cursorRight(int aModifiers = 0);      
+    void cursorLeft(int modifiers);
+    void cursorRight(int modifiers);
+    void cursorLeft(Qt::KeyboardModifiers modifiers = Qt::NoModifier);
+    void cursorRight(Qt::KeyboardModifiers modifiers = Qt::NoModifier);
     void releaseFocus();
-    bool filterAndCommitCharacter(QChar aChar);
+    bool filterAndCommitCharacter(QChar character);
     QRectF editorGeometry() const;
     QRectF microFocus() const;
     QString preEditString() const;
     qreal findVkbZValue() const;
     Qt::InputMethodHints inputMethodHints() const;
     void setInputMethodHints(Qt::InputMethodHints hints);
- 
+
     QPointF scenePos() const;
     void filterStringWithEditorFilter(const QString& source, QString& result);
     bool characterAllowedInEditor(QChar character) const;
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/inputfw/hbinputlanguage.cpp
--- a/src/hbcore/inputfw/hbinputlanguage.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/inputfw/hbinputlanguage.cpp	Mon May 03 12:48:33 2010 +0300
@@ -172,15 +172,13 @@
 /*!
 \fn bool defined() 
 
-Returns true if this structure is initialised to contain a valid language / variant .
+Returns true if this structure is initialised to contain a valid language/variant pair.
 */
 
 /*!
-Returns localized language name for given language. Language variant parameter
-identifies sub-language in those cases where QLocale::Language does not provide
-enough information (for example in case of Chinese). See setting proxy's
-input language variant for more information. Chinese requires languageVariant
-parameter, otherwise null string will be returned. Valid variants are
+Returns localized language name for given language.
+Chinese requires valid value in language's variant field,
+otherwise null string will be returned. Valid variants are
 QLocale::China, QLocale::Taiwan and QLocale::HongKong.
 
 \sa HbInputSettingProxy
@@ -216,7 +214,7 @@
 }
 
 /*!
-Returns true if the language is case sensitive else returns false.
+Returns true if the language is case sensitive.
 */
 bool HbInputLanguage::isCaseSensitiveLanguage() const
 {
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/inputfw/hbinputlanguagedatabase.h
--- a/src/hbcore/inputfw/hbinputlanguagedatabase.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/inputfw/hbinputlanguagedatabase.h	Mon May 03 12:48:33 2010 +0300
@@ -36,6 +36,7 @@
     virtual ~HbLanguageDatabase()
     {
     }
+
     virtual int HostId() const=0;
     virtual int LanguageCode() const=0;
     virtual char* LanguageData(void* aNativeParams=0) const=0;
@@ -54,6 +55,36 @@
     virtual HbLanguageDatabase* LanguageDatabase(int aLanguage) = 0;
 };
 
+/*!
+\deprecated HbLanguageDatabase::HostId() const
+    is deprecated. Use upcoming lower case version instead.
+*/
+
+/*!
+\deprecated HbLanguageDatabase::LanguageCode() const
+    is deprecated. Use upcoming lower case version instead.
+*/
+
+/*!
+\deprecated HbLanguageDatabase::LanguageData(void*) const
+    is deprecated. Use upcoming lower case version instead.
+*/
+
+/*!
+\deprecated HbLanguageDatabase::NativeId() const
+    is deprecated. Use upcoming lower case version instead.
+*/
+
+/*!
+\deprecated HbLanguageDatabaseInterface::ListLanguages(QVector<int>&)
+    is deprecated. Use upcoming lower case version instead.
+*/
+
+/*!
+\deprecated HbLanguageDatabaseInterface::LanguageDatabase(int)
+    is deprecated. Use upcoming lower case version instead.
+*/
+
 #endif // HB_LANGUAGE_DATABASE_H
 
 // End of file
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/inputfw/hbinputmethod.cpp
--- a/src/hbcore/inputfw/hbinputmethod.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/inputfw/hbinputmethod.cpp	Mon May 03 12:48:33 2010 +0300
@@ -35,6 +35,7 @@
 #include "hbinputfilter.h"
 #include "hbinputmethodnull_p.h"
 #include "hbinputpredictionfactory.h"
+#include "hbinputextradictionaryfactory.h"
 #include "hbinputstandardfilters.h"
 #include "hbinpututils.h"
 #include "hbinputvkbhost.h"
@@ -46,18 +47,20 @@
 \brief A base class for input method implementations.
 
 HbInputMethod is the base class for input method implementations. It inherits from QInputContext,
-connects to the input framework behind the scenes and provides focusing and other framework level 
-services.   
+connects to the input framework behind the scenes and resolves correct input state handler when
+an editor widget is focused.
 
-An internal framework class called HbInputModeCache scans through the system and looks for available HbInputMethod instances. It then forms a list of available input methods based on language
-and keyboard type. Input method plugin reports (on plugin level, as meta-data) which languages, keyboards and input modes that input method instance supports. Input mode cache then activates suitable
-input method depending on the situation. It can also switch active input method on the fly
-when the focus switches between editors and the previously active input method is unable to 
+An internal framework class called HbInputModeCache scans through the system and looks for
+available HbInputMethod instances. It then forms a list of input methods based on language
+and keyboard type. Input method plugin reports (as plugin meta-data) which languages,
+keyboards and input modes that plugin instance implements. Input mode cache then activates matching
+HbInputMethod depending on the editor properties. It switches the active input method on the fly
+when the focus switches between editors if the previous input method is unable to
 support newly focused editor.
 
 Custom input methods are a special class of input methods. Once a custom input method is
-activated from UI, input mode cache stops resolving suitable input methods upon focus operations
-and the custom input is ative in all editors until it is deactivated.
+activated from UI, input mode cache stops resolving input methods upon focus operations
+and the custom input is active in all editors until it is deactivated.
 
 Following is the basic input framework program flow:
 
@@ -68,9 +71,9 @@
    opens the virtual keyboard by using HbVkbHost API) and waits for user actions.
 4. Text is written. The input method delivers results to the editor buffer by using HbInputFocusObject API.
    It can access editor attributes via HbEditorInterface API.
-5. The active editor loses focus. At this point the input method receives a call to virtual function   
+5. The active editor loses focus. At this point the input method receives a call to virtual function
    HbInputMethod::focusLost and is expected to conclude any ongoing input operations and shut down active
-   UI elements (such as the virtual keyboard).   
+   UI elements (such as the virtual keyboard).
 6. The input method waits for next focusReceived() call.
 
 \sa QInputContext
@@ -84,7 +87,7 @@
 */
 HbInputMethod::HbInputMethod() : d_ptr(new HbInputMethodPrivate(this))
 {
-    HbInputSettingProxy::instance()->connectObservingObject(this);  
+    HbInputSettingProxy::instance()->connectObservingObject(this);
 }
 
 /*!
@@ -98,8 +101,7 @@
 }
 
 /*!
-Initializes the HbInputs framework. Each Qt application needs to call this
-method once in order to connect to the HbInputs framework.
+Initializes the input framework.
 */
 bool HbInputMethod::initializeFramework(QApplication& app)
 {
@@ -107,6 +109,7 @@
     connect(&app, SIGNAL(aboutToQuit()), HbInputModeCache::instance(), SLOT(shutdown()));
     connect(&app, SIGNAL(aboutToQuit()), HbInputSettingProxy::instance(), SLOT(shutdown()));
     connect(&app, SIGNAL(aboutToQuit()), HbPredictionFactory::instance(), SLOT(shutDown()));
+    connect(&app, SIGNAL(aboutToQuit()), HbExtraDictionaryFactory::instance(), SLOT(shutdown()));
 
     HbInputMethod *master = HbInputMethodNull::Instance();
 
@@ -124,10 +127,9 @@
 }
 
 /*!
-Returns active instance of HbInputMethod. There is always active HbInputMethod instance after
+Returns the active instance of HbInputMethod. There is always active HbInputMethod instance after
 InitializeFramework method has been called, even when there is no focused editor (in some cases it may
-be so called null input method). Normally this method is needed only for special cases, such as developing
-and debugging framework level code, but it is made public for convenience.
+be so called null input method).
 */
 HbInputMethod* HbInputMethod::activeInputMethod()
 {
@@ -161,7 +163,7 @@
 }
 
 /*!
-Activates given input method. input context is
+Activates given input method. Input context is
 switched to custom method. Returns false if input method was not found
 or the framework was not able to activate it.
 */
@@ -187,7 +189,6 @@
     return false;
 }
 
-
 /*!
 This slot is called when the input language changes. The framework connects it
 to the input setting proxy. When the signal is received, the input method implementation
@@ -197,7 +198,7 @@
 \sa HbInputSettingProxy
 */
 void HbInputMethod::globalInputLanguageChanged(const HbInputLanguage &newLanguage)
-{ 
+{
     Q_D(HbInputMethod);
 
     inputLanguageChanged(newLanguage);
@@ -208,12 +209,12 @@
         // in the active method
         return;
     }
-   
+
     // Just behave as if this was the first focus operation
     // to this editor.
-    if (d->mFocusObject) { 
+    if (d->mFocusObject) {
         HbInputState state;
-        editorRootState(state);  
+        editorRootState(state);
         activateState(state);
     }
 }
@@ -226,14 +227,14 @@
 \sa secondaryInputLanguageChanged
 \sa HbInputSettingProxy
 */
-void HbInputMethod::globalSecondaryInputLanguageChanged(const HbInputLanguage &aNewLanguage)
+void HbInputMethod::globalSecondaryInputLanguageChanged(const HbInputLanguage &newLanguage)
 {
-    secondaryInputLanguageChanged(aNewLanguage);
+    secondaryInputLanguageChanged(newLanguage);
 }
 
 /*!
-This slot is connected to the setting proxy hw keyboard attribute. It will
-do refreshState() when the signal is received.
+\deprecated HbInputMethod::activeHwKeyboardChanged(HbKeyboardType)
+    is deprecated.
 */
 void HbInputMethod::activeHwKeyboardChanged(HbKeyboardType newKeyboard)
 {
@@ -247,8 +248,8 @@
 }
 
 /*!
-This slot is connected to the setting proxy touch keyboard attribute. It will
-do refreshState() when the signal is received.
+\deprecated HbInputMethod::activeTouchKeyboardChanged(HbKeyboardType)
+    is deprecated.
 */
 void HbInputMethod::activeTouchKeyboardChanged(HbKeyboardType newKeyboard)
 {
@@ -258,7 +259,6 @@
     d->refreshState();
 }
 
-
 /*!
 This slot is connected to the setting proxy activeKeyboard attribute. It will
 activate proper state when the signal is received.
@@ -270,7 +270,7 @@
     }
     Q_D(HbInputMethod);
     d->mInputState.setKeyboard(newKeyboard);
-    HbInputMethod* stateHandler = d->findStateHandler(d->mInputState); 
+    HbInputMethod* stateHandler = d->findStateHandler(d->mInputState);
     if (stateHandler) {
         d->inputStateToEditor(d->mInputState);
         if (stateHandler != this) {
@@ -284,20 +284,22 @@
 }
 
 /*!
-This slot is called when the predictive input state changes. The framework connects it
-to the input setting proxy. When the signal is received, the input method implementation
-is notified by calling predictiveInputStatusChanged.
-
-\sa predictiveInputStatusChanged
-\sa HbInputSettingProxy
+\deprecated HbInputMethod::predictiveInputStateChanged(int newStatus)
+    is deprecated.
 */
 void HbInputMethod::predictiveInputStateChanged(int newStatus)
 {
-    // Do here whatever needs to be done on HbInputMethod level, then
-    // call virtual predictiveInputStatusChanged() in case plugin needs to do something.
-    // ...
+    Q_UNUSED(newStatus);
+}
 
-    predictiveInputStatusChanged(newStatus);
+/*!
+\deprecated HbInputMethod::predictiveInputStateChanged(HbKeyboardSettingFlags, bool)
+    is deprecated.
+*/
+void HbInputMethod::predictiveInputStateChanged(HbKeyboardSettingFlags keyboardType, bool newState)
+{
+    Q_UNUSED(keyboardType);
+    Q_UNUSED(newState);
 }
 
 /*!
@@ -352,7 +354,7 @@
 
     if (!widget) {
         // Losing focus.
-        if (d->mFocusObject) { 
+        if (d->mFocusObject) {
             focusLost(false);
             delete d->mFocusObject;
             d->mFocusObject = 0;
@@ -384,7 +386,7 @@
         }
         return;
     }
-   
+
     if (d->mFocusObject) {
         if (d->mFocusObject->object() == widget) {
             // Focus remains in same widget, do nothing.
@@ -437,10 +439,8 @@
 }
 
 /*!
-Checks if the destroyed object is currently focused and clears the focus
-if needed.
-
-\sa widgetDestroyed
+\deprecated HbInputMethod::focusObjectDestroyed(const HbInputFocusObject*)
+    is deprecated.
 */
 void HbInputMethod::focusObjectDestroyed(const HbInputFocusObject* focusObject)
 {
@@ -454,11 +454,9 @@
 /*!
 Graphics item based editors (or any other object that implements
 HbInputFocusObject) send their focus events notifications through this method.
-Since Qt's QInputContext mechanism works only with QWidget based editors,
-this alternate focus channel is needed for objects belonging to a graphics scene
-(in case of a graphics scene, the topmost QWidget that has focus is
-graphics view, not the the object inside the view). The ownership of
-incoming focus object is transferred to the input framework.
+
+Typically this method is called by HbInputContextProxy when it receives
+requestSoftwareInputPanel event.
 
 \sa setFocusWidget
 \sa HbInputFocusObject
@@ -492,7 +490,7 @@
         }
         return;
     }
-   
+
     bool refreshHost = false;
 
     // Delete previous focus object.
@@ -528,25 +526,17 @@
 }
 
 /*!
-The secondary channel uses this slot for inserting text active editor.
+\deprecated HbInputMethod::receiveText(const QString&)
+    is deprecated.
 */
 void HbInputMethod::receiveText(const QString& string)
 {
-    Q_D(HbInputMethod);
-
-    if (isActiveMethod() && d->mFocusObject &&
-        (d->editorConstraints() & HbEditorConstraintsNoSecondaryChannel) == 0) {
-        QList<QInputMethodEvent::Attribute> list;
-        QInputMethodEvent event(QString(), list);
-        event.setCommitString(string);
-        d->mFocusObject->sendEvent(event);
-    }
+    Q_UNUSED(string);
 }
 
 /*!
-This slot is called when the candidate list popup is closed. The base
-class implementation is empty so any input method interested in
-candidate list close event should implement it.
+\deprecated HbInputMethod::candidatePopupClosed(int closingKey)
+    is deprecated.
 */
 void HbInputMethod::candidatePopupClosed(int closingKey)
 {
@@ -581,9 +571,8 @@
 }
 
 /*!
-The framework calls this method when the predictive input status changes.
-The base class implementation is empty so any input method interested in
-prediction status events should implement it.
+\deprecated HbInputMethod::predictiveInputStatusChanged(int newStatus)
+    is deprecated.
 */
 void HbInputMethod::predictiveInputStatusChanged(int newStatus)
 {
@@ -618,7 +607,7 @@
     Q_UNUSED(newState);
     // Empty default implementation.
     if (this != HbInputMethodNull::Instance()) {
-        qDebug("WARNING: inputStateActivated() default implementation called: Is that ok?");
+        qWarning("WARNING: inputStateActivated() default implementation called: Is that ok?");
     }
 }
 
@@ -635,7 +624,7 @@
 }
 
 /*!
-Returns the first input state that should be activated when an editor is 
+Returns the first input state that should be activated when an editor is
 focused for the first time. The state is constructed from edirtor attributes and
 input settings.
 */
@@ -681,13 +670,13 @@
 
     d->mInputState = state;
 
-    if (stateHandler != this) {     
+    if (stateHandler != this) {
         stateHandler->d_ptr->mStateChangeInProgress = true;
         // Context switch needed.
-        d->inputStateToEditor(d->mInputState);        
+        d->inputStateToEditor(d->mInputState);
         d->contextSwitch(stateHandler);
         stateHandler->d_ptr->mStateChangeInProgress = false;
-    } else {         
+    } else {
         // Same method handles new state, just report the state change.
         d->inputStateToEditor(d->mInputState);
         inputStateActivated(d->mInputState);
@@ -736,9 +725,8 @@
 }
 
 /*!
-Clears focus state from input method side. After calling this method,
-HbInputMethod instance thinks that it is not focused to any widget.
-The widget itself still remain focused to this input context.
+\deprecated HbInputMethod::releaseFocus()
+    is deprecated.
 */
 void HbInputMethod::releaseFocus()
 {
@@ -843,12 +831,12 @@
         active->focusLost(false);
         active->releaseFocus();
         delete active->d_ptr->mFocusObject;
-        active->d_ptr->mFocusObject = 0;  
+        active->d_ptr->mFocusObject = 0;
     }
 }
 
 /*!
-Wrapper
+Wrapper.
 */
 bool HbInputMethod::automaticTextCaseNeeded() const
 {
@@ -857,7 +845,7 @@
 }
 
 /*!
-Wrapper
+Deep copies the input state back to editor interface.
 */
 void HbInputMethod::inputStateToEditor(const HbInputState& source)
 {
@@ -892,8 +880,8 @@
 }
 
 /*!
-This function returns true if there is a context switch happening due to a orientation
-switch.
+\deprecated HbInputMethod::orientationContextSwitchInProgress()
+    is deprecated.
 */
 bool HbInputMethod::orientationContextSwitchInProgress()
 {
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/inputfw/hbinputmethod.h
--- a/src/hbcore/inputfw/hbinputmethod.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/inputfw/hbinputmethod.h	Mon May 03 12:48:33 2010 +0300
@@ -37,7 +37,6 @@
 
 class QAction;
 class HbInputMethodPrivate;
-class HbInputStateMachine;
 
 class HB_CORE_EXPORT HbInputMethod : public QInputContext
 {
@@ -68,37 +67,38 @@
     void setFocusWidget(QWidget* widget);
 
     void focusObjectDestroyed(const HbInputFocusObject* focusObject);
-    HbInputState inputState() const; 
+    HbInputState inputState() const;
 
-    bool activateState(const HbInputState& state); 
+    bool activateState(const HbInputState& state);
     void updateState();
-    void editorRootState(HbInputState &result) const;  
+    void editorRootState(HbInputState &result) const;
     bool automaticTextCaseNeeded() const;
     bool activateInputMethod(const HbInputMethodDescriptor &inputMethod);
-      
+
 protected:
     virtual void inputStateActivated(const HbInputState& newState);
     virtual void inputLanguageChanged(const HbInputLanguage &newLanguage);
-    virtual void secondaryInputLanguageChanged(const HbInputLanguage &aNewLanguage);
+    virtual void secondaryInputLanguageChanged(const HbInputLanguage &newLanguage);
     virtual void predictiveInputStatusChanged(int newStatus);
     bool stateChangeInProgress() const;
     bool orientationContextSwitchInProgress();
-       
-    void releaseFocus();    
+
+    void releaseFocus();
     HbInputLanguage activeLanguage() const;
 
-    bool modeAllowedInEditor(HbInputModeType mode) const;  
+    bool modeAllowedInEditor(HbInputModeType mode) const;
     void inputStateToEditor(const HbInputState& source);
-  
+
     void constructLatinState(HbInputState &result) const;
 
 public slots:
-    void globalInputLanguageChanged(const HbInputLanguage &aNewLanguage);
-    void globalSecondaryInputLanguageChanged(const HbInputLanguage &aNewLanguage);
+    void globalInputLanguageChanged(const HbInputLanguage &newLanguage);
+    void globalSecondaryInputLanguageChanged(const HbInputLanguage &newLanguage);
     void activeHwKeyboardChanged(HbKeyboardType newKeyboard);
     void activeTouchKeyboardChanged(HbKeyboardType newKeyboard);
     void activeKeyboardChanged(HbKeyboardType newKeyboard);
     void predictiveInputStateChanged(int newState);
+    virtual void predictiveInputStateChanged(HbKeyboardSettingFlags keyboardType, bool newState);
     void receiveText(const QString& string);
     virtual void candidatePopupClosed(int closingKey = 0);
     void orientationChanged(Qt::Orientation orientation);
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/inputfw/hbinputmethod_p.cpp
--- a/src/hbcore/inputfw/hbinputmethod_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/inputfw/hbinputmethod_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -99,6 +99,12 @@
 
         // this editor has not been focused before, return the root state.
         editorRootState(result);
+
+        // See if the editor prefers numeric mode when focused for the first time.
+        Qt::InputMethodHints hints = mFocusObject->inputMethodHints();
+        if (hints & Qt::ImhPreferNumbers) {
+            result.setInputMode(HbInputModeNumeric);
+        }
     } else {
         result = HbInputState();
     }
@@ -209,7 +215,7 @@
     HbInputState inState;
 
     foreach (HbInputModeProperties mode, modes) {
-        if (modeAllowedInEditor(mode.iMode)) {
+        if (modeAllowedInEditor(mode.inputMode())) {
             stateFromMode(mode, inState);
             master = HbInputModeCache::instance()->findStateHandler(inState);
             if (master) {
@@ -228,10 +234,10 @@
 void HbInputMethodPrivate::stateFromMode(const HbInputModeProperties& mode, HbInputState& state)
 {
     state.setKeyboard(activeKeyboard());
-    state.setInputMode(mode.iMode);
-    state.setLanguage(mode.iLanguage);
+    state.setInputMode(mode.inputMode());
+    state.setLanguage(mode.language());
 
-    if (state.language().isCaseSensitiveLanguage() && HbInputUtils::isCaseSensitiveMode(mode.iMode)) {
+    if (state.language().isCaseSensitiveLanguage() && HbInputUtils::isCaseSensitiveMode(mode.inputMode())) {
         if (automaticTextCaseNeeded()) {
             state.setTextCase(HbTextCaseAutomatic);
         } else {
@@ -370,37 +376,29 @@
     Q_Q(HbInputMethod);
 
     if (mFocusObject) {
-        if (mFocusObject->editorInterface().filter() == 0) {
-            // If input method hints suggest certain input method filter but none is set,
-            // provide suitable one with compliments.
-            Qt::InputMethodHints hints = mFocusObject->inputMethodHints();
-            if (hints & Qt::ImhDialableCharactersOnly) {
-                mFocusObject->editorInterface().setFilter(HbPhoneNumberFilter::instance());
-            } else if (hints & Qt::ImhFormattedNumbersOnly) {
-                mFocusObject->editorInterface().setFilter(HbFormattedNumbersFilter::instance());
-            } else if (hints & Qt::ImhDigitsOnly) {
-                mFocusObject->editorInterface().setFilter(HbDigitsOnlyFilter::instance());
-            } else if (hints & Qt::ImhUrlCharactersOnly) {
-                mFocusObject->editorInterface().setFilter(HbUrlFilter::instance());
-            } else if (hints & Qt::ImhEmailCharactersOnly) {
-                mFocusObject->editorInterface().setFilter(HbEmailAddressFilter::instance());
-            } 
+        Qt::InputMethodHints hints = mFocusObject->inputMethodHints();
+        if (hints & Qt::ImhDialableCharactersOnly) {
+            setUpFocusedObjectAsPhoneNumberEditor();
+        } else if (hints & Qt::ImhFormattedNumbersOnly) {
+            setUpFocusedObjectAsFormattedNumberEditor();
+        } else if (hints & Qt::ImhDigitsOnly) {
+            setUpFocusedObjectAsDigitsOnlyEditor();
+        } else if (hints & Qt::ImhUrlCharactersOnly) {
+            setUpFocusedObjectAsUrlEditor();
+        } else if (hints & Qt::ImhEmailCharactersOnly) {
+            setUpFocusedObjectAsEmailEditor();
+        } 
+
+        if (mFocusObject->editorInterface().editorClass() != HbInputEditorClassUnknown &&
+            mFocusObject->editorInterface().extraDictionaryId() == 0) {
+            // Editor class is set, but no dictionary id. Set it automatically here.
+            mFocusObject->editorInterface().setExtraDictionaryId(mFocusObject->editorInterface().editorClass());
         }
     }
 
-    // Create input state.
-    if (mTrustLocalState) {
-        // This focus operation is a direct result from UI operation that modified
-        // input state (and probably caused context switch) while focus was away.
-        // Therefore it was not possible to store new state to editor interface,
-        // but instead input method was requested to trust the local state instead
-        // of reading it from the editor. We assume that whatever part of code set this flag
-        // knows what it is doing.
-        mTrustLocalState = false;
-    } else {
-        inputStateFromEditor(mInputState);
-    }
-   
+    // Create input state.  
+    inputStateFromEditor(mInputState);
+
     // Find state handler
     HbInputMethod* stateHandler = 0;
     HbInputMethodDescriptor activeMethod = HbInputSettingProxy::instance()->activeCustomInputMethod();
@@ -666,8 +664,8 @@
         } else {
             // Editor doesn't have mode asigned. Propose default mode.                  
             Qt::InputMethodHints hints = mFocusObject->inputMethodHints();
-            if (mFocusObject->editorInterface().isNumericEditor() || (hints & Qt::ImhPreferNumbers)) {
-                // It is either fixed numeric or prefers numeric.
+            if (mFocusObject->editorInterface().isNumericEditor()) {
+                // It is fixed numeric editor.
                 ret = HbInputModeNumeric;
             } else {
                 ret = defaultInputMode(language);        
@@ -708,6 +706,83 @@
     return HbInputModeDefault;
 }
 
+/*!
+A convenience method for setting up the editor as digits only editor.
+*/
+void HbInputMethodPrivate::setUpFocusedObjectAsDigitsOnlyEditor()
+{
+    if(mFocusObject) {
+        mFocusObject->editorInterface().setInputMode(HbInputModeNumeric);
+        mFocusObject->editorInterface().setConstraints(HbEditorConstraintFixedInputMode);
+        if(!mFocusObject->editorInterface().filter()) {
+            mFocusObject->editorInterface().setFilter(HbDigitsOnlyFilter::instance());
+        }
+        mFocusObject->setInputMethodHints(Qt::ImhDigitsOnly | Qt::ImhNoPredictiveText);
+    }
+}
+
+/*!
+A convenience method for setting up the editor as formatted only editor
+*/
+void HbInputMethodPrivate::setUpFocusedObjectAsFormattedNumberEditor()
+{
+    if(mFocusObject) {
+        mFocusObject->editorInterface().setInputMode(HbInputModeNumeric);
+        mFocusObject->editorInterface().setConstraints(HbEditorConstraintFixedInputMode);
+        if(!mFocusObject->editorInterface().filter()) {
+            mFocusObject->editorInterface().setFilter(HbFormattedNumbersFilter::instance());
+        }
+        mFocusObject->setInputMethodHints(Qt::ImhFormattedNumbersOnly | Qt::ImhNoPredictiveText);
+    }
+}
+
+/*!
+A convenience method for setting up the editor as phone number editor
+*/
+void HbInputMethodPrivate::setUpFocusedObjectAsPhoneNumberEditor()
+{
+    if(mFocusObject) {
+        mFocusObject->editorInterface().setInputMode(HbInputModeNumeric);
+        mFocusObject->editorInterface().setConstraints(HbEditorConstraintFixedInputMode);
+        if(!mFocusObject->editorInterface().filter()) {
+            mFocusObject->editorInterface().setFilter(HbPhoneNumberFilter::instance());
+        }
+        mFocusObject->setInputMethodHints(Qt::ImhDialableCharactersOnly | Qt::ImhNoPredictiveText);
+    }
+}
+
+/*!
+A convenience method for setting up the editor as email editor
+*/
+void HbInputMethodPrivate::setUpFocusedObjectAsEmailEditor()
+{
+    if(mFocusObject) {
+        mFocusObject->editorInterface().setInputMode(HbInputModeNone);
+        mFocusObject->editorInterface().setConstraints(HbEditorConstraintLatinAlphabetOnly);
+        if(!mFocusObject->editorInterface().filter()) {
+            mFocusObject->editorInterface().setFilter(HbEmailAddressFilter::instance());
+        }
+        mFocusObject->setInputMethodHints(Qt::ImhEmailCharactersOnly | Qt::ImhNoPredictiveText 
+            | Qt::ImhPreferLowercase);
+    }
+}
+/*!
+A convenience method for setting up the editor as url editor
+*/
+void HbInputMethodPrivate::setUpFocusedObjectAsUrlEditor()
+{
+    if(mFocusObject) {
+        mFocusObject->editorInterface().setInputMode(HbInputModeNone);
+        mFocusObject->editorInterface().setConstraints(HbEditorConstraintLatinAlphabetOnly);
+        if(!mFocusObject->editorInterface().filter()) {
+            mFocusObject->editorInterface().setFilter(HbUrlFilter::instance());
+        }
+        mFocusObject->setInputMethodHints(Qt::ImhUrlCharactersOnly | Qt::ImhNoPredictiveText 
+            | Qt::ImhPreferLowercase);
+    }
+}
+
+
 /// @endcond
 
 // End of file
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/inputfw/hbinputmethod_p.h
--- a/src/hbcore/inputfw/hbinputmethod_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/inputfw/hbinputmethod_p.h	Mon May 03 12:48:33 2010 +0300
@@ -46,8 +46,7 @@
         mFocusObject(0),
         mInputState(HbInputModeNone, HbTextCaseNone, HbKeyboardNone),        
         mFocusLocked(false),
-        mStateChangeInProgress(false),
-        mTrustLocalState(false),
+        mStateChangeInProgress(false),       
         mIsOrientationContextSwitchInProgress(false)
     {}
     ~HbInputMethodPrivate();
@@ -80,6 +79,11 @@
     HbTextCase initialTextCase(HbInputModeType inputMode) const; 
     HbInputModeType initialInputMode(const HbInputLanguage &language) const;
     HbInputModeType defaultInputMode(const HbInputLanguage &inputLanguage) const;  
+    void setUpFocusedObjectAsDigitsOnlyEditor();
+    void setUpFocusedObjectAsFormattedNumberEditor();
+    void setUpFocusedObjectAsPhoneNumberEditor();
+    void setUpFocusedObjectAsEmailEditor();
+    void setUpFocusedObjectAsUrlEditor();
 
 public:
     HbInputMethod *q_ptr;
@@ -87,10 +91,7 @@
     HbInputFocusObject* mFocusObject;
     HbInputState mInputState;   
     bool mFocusLocked;
-    bool mStateChangeInProgress;
-    bool mTrustLocalState;
-    bool mIsModifyEvent;
-    bool mHandleEvent;
+    bool mStateChangeInProgress;  
     bool mIsOrientationContextSwitchInProgress;
     QList<HbInputModeProperties> mInputModes;
 };
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/inputfw/hbinputmethoddescriptor.h
--- a/src/hbcore/inputfw/hbinputmethoddescriptor.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/inputfw/hbinputmethoddescriptor.h	Mon May 03 12:48:33 2010 +0300
@@ -48,7 +48,7 @@
 private:
     QString mPluginNameAndPath;
     QString mKey;
-    QString mDisplayName;   
+    QString mDisplayName;
 };
 
 #endif // HB_INPUT_METHOD_DESCRIPTOR_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/inputfw/hbinputmethodnull.cpp
--- a/src/hbcore/inputfw/hbinputmethodnull.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/inputfw/hbinputmethodnull.cpp	Mon May 03 12:48:33 2010 +0300
@@ -26,83 +26,63 @@
 #include "hbinputmethodnull_p.h"
 #include "hbinputeditorinterface.h"
 
-//
-// HbInputMethodNull
-//
-
-// ---------------------------------------------------------------------------
-// HbInputMethodNull::Instance
-//
-// ---------------------------------------------------------------------------
-//
+/*!
+\internal
+*/
 HbInputMethodNull* HbInputMethodNull::Instance()
 {
     static HbInputMethodNull myInstance;
     return &myInstance;
 }
 
-// ---------------------------------------------------------------------------
-// HbInputMethodNull::HbInputMethodNull
-//
-// ---------------------------------------------------------------------------
-//
+/*!
+\internal
+*/
 HbInputMethodNull::HbInputMethodNull()
 {
 }
 
-// ---------------------------------------------------------------------------
-// HbInputMethodNull::~HbInputMethodNull
-//
-// ---------------------------------------------------------------------------
-//
+/*!
+\internal
+*/
 HbInputMethodNull::~HbInputMethodNull()
 {
 }
 
-// ---------------------------------------------------------------------------
-// HbInputMethodNull::identifierName
-//
-// ---------------------------------------------------------------------------
-//
+/*!
+\internal
+*/
 QString HbInputMethodNull::identifierName()
 {
     return QString();
 }
 
-// ---------------------------------------------------------------------------
-// HbInputMethodNull::isComposing
-//
-// ---------------------------------------------------------------------------
-//
+/*!
+\internal
+*/
 bool HbInputMethodNull::isComposing() const
 {
     return false;
 }
 
-// ---------------------------------------------------------------------------
-// HbInputMethodNull::language
-//
-// ---------------------------------------------------------------------------
-//
+/*!
+\internal
+*/
 QString HbInputMethodNull::language()
 {
     return QString();
 }
 
-// ---------------------------------------------------------------------------
-// HbInputMethodNull::reset
-//
-// ---------------------------------------------------------------------------
-//
+/*!
+\internal
+*/
 void HbInputMethodNull::reset()
 {
 }
 
-// ---------------------------------------------------------------------------
-// HbInputMethodNull::filterEvent
-//
-// ---------------------------------------------------------------------------
-//
+/*!
+\internal
+*/
 bool HbInputMethodNull::filterEvent(const QEvent* event)
 {
     if (!event || event->type() != QEvent::KeyPress) {
@@ -117,12 +97,9 @@
     return false;
 }
 
-
-// ---------------------------------------------------------------------------
-// HbInputMethodNull::mouseHandler
-//
-// ---------------------------------------------------------------------------
-//
+/*!
+\internal
+*/
 void HbInputMethodNull::mouseHandler(int x, QMouseEvent* event)
 {
     Q_UNUSED(x);
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/inputfw/hbinputmodecache.cpp
--- a/src/hbcore/inputfw/hbinputmodecache.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/inputfw/hbinputmodecache.cpp	Mon May 03 12:48:33 2010 +0300
@@ -248,6 +248,7 @@
 /// @endcond
 
 /*!
+\internal
 Returns the singleton instance.
 */
 HbInputModeCache* HbInputModeCache::instance()
@@ -257,6 +258,7 @@
 }
 
 /*!
+\internal
 Construct the object.
 */
 HbInputModeCache::HbInputModeCache() : d_ptr(new HbInputModeCachePrivate())
@@ -271,6 +273,7 @@
 }
 
 /*!
+\internal
 Destruct the object.
 */
 HbInputModeCache::~HbInputModeCache()
@@ -279,6 +282,7 @@
 }
 
 /*!
+\internal
 This slot is called whenever a change in input method plugin file system is detected and
 the list needs to be refreshed.
 */
@@ -294,6 +298,7 @@
 }
 
 /*!
+\internal
 Shuts down the object safely. This is needed mainly for singleton object. There has been a lot
 of problems related to randown singleton desctruction order and additional shutdown step is
 needed to guarantee that it will be done safely. The slot is connected to
@@ -314,6 +319,7 @@
 }
 
 /*!
+\internal
 Loads given input method and caches it.
 */
 HbInputMethod* HbInputModeCache::loadInputMethod(const HbInputMethodDescriptor &inputMethod)
@@ -335,6 +341,7 @@
 }
 
 /*!
+\internal
 Lists custom input methods.
 */
 QList<HbInputMethodDescriptor> HbInputModeCache::listCustomInputMethods()
@@ -357,8 +364,9 @@
 }
 
 /*!
- Find correct handler for given input state.
- */
+\internal
+Find correct handler for given input state.
+*/
 HbInputMethod* HbInputModeCache::findStateHandler(const HbInputState& state)
 {
     Q_D(HbInputModeCache);
@@ -409,10 +417,11 @@
 }
 
 /*!
- Returns the active input method.
+\internal
+Returns the active input method.
 
- \sa HbInputMethod
- */
+\sa HbInputMethod
+*/
 HbInputMethod* HbInputModeCache::activeMethod() const
 {
     Q_D(const HbInputModeCache);
@@ -427,6 +436,7 @@
 }
 
 /*!
+\internal
 Lists available input languages.
 */
 QList<HbInputLanguage> HbInputModeCache::listInputLanguages() const
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/inputfw/hbinputmodeproperties.h
--- a/src/hbcore/inputfw/hbinputmodeproperties.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/inputfw/hbinputmodeproperties.h	Mon May 03 12:48:33 2010 +0300
@@ -35,9 +35,11 @@
 \class HbInputModeProperties
 \brief Binds together all the properties that define an input mode.
 
-Input mode properties structure is needed when the freworks resolves which input method should
-serve the active input state. This class is mostly used inside the input framework. The only exception is
-HbInputMethod::listInputModes method, which is something each HbInputMethod instance must implement. 
+This class is needed when the framework resolves input state handler. An input method
+plugin reports a set of implemented input modes as an array of HbInputModeProperties
+coverted to strings.
+
+This class is not needed in application code.
 
 \sa HbInputState
 \sa HbInputMethod
@@ -49,31 +51,31 @@
     {
     }
 
-    HbInputModeProperties(HbInputModeType aMode, const HbInputLanguage &aLanguage, HbKeyboardType aKeyboard)
-        : iMode(aMode), iLanguage(aLanguage), iKeyboard(aKeyboard)
+    HbInputModeProperties(HbInputModeType mode, const HbInputLanguage &language, HbKeyboardType keyboard)
+        : iMode(mode), iLanguage(language), iKeyboard(keyboard)
     {
     }
 
-    HbInputModeProperties& operator=(const HbInputModeProperties& aMode) {
-        iMode = aMode.iMode;
-        iLanguage = aMode.iLanguage;
-        iKeyboard = aMode.iKeyboard;
+    HbInputModeProperties& operator=(const HbInputModeProperties& other) {
+        iMode = other.iMode;
+        iLanguage = other.iLanguage;
+        iKeyboard = other.iKeyboard;
         return *this;
     }
 
-    bool operator==(const HbInputModeProperties& aMode) const {
-        if (iMode == aMode.iMode
-            && iLanguage == aMode.iLanguage
-            && iKeyboard == aMode.iKeyboard) {
+    bool operator==(const HbInputModeProperties& other) const {
+        if (iMode == other.iMode
+            && iLanguage == other.iLanguage
+            && iKeyboard == other.iKeyboard) {
                 return true;
         }
         return false;
     }
 
-    bool operator!=(const HbInputModeProperties& aMode) const {
-        if (iMode != aMode.iMode
-            || iLanguage != aMode.iLanguage
-            || iKeyboard != aMode.iKeyboard) {
+    bool operator!=(const HbInputModeProperties& other) const {
+        if (iMode != other.iMode
+            || iLanguage != other.iLanguage
+            || iKeyboard != other.iKeyboard) {
                 return true;
         }
         return false;
@@ -123,6 +125,21 @@
     HbKeyboardType iKeyboard;
 };
 
+/*!
+\deprecated HbInputModeProperties::iMode
+    is deprecated. It will become private.
+*/
+
+/*!
+\deprecated HbInputModeProperties::iLanguage
+    is deprecated. It will become private.
+*/
+
+/*!
+\deprecated HbInputModeProperties::iKeyboard
+    is deprecated. It will become private.
+*/
+
 #endif // HB_INPUT_MODE_PROPERTIES_H
 
 // End of file
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/inputfw/hbinputpredictioncallback.h
--- a/src/hbcore/inputfw/hbinputpredictioncallback.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/inputfw/hbinputpredictioncallback.h	Mon May 03 12:48:33 2010 +0300
@@ -32,7 +32,7 @@
 @proto
 @hbcore
 \class HbPredictionCallback
-\brief A callback method for prediction engine API.  
+\brief A callback method for prediction engine API.
 
 This callback class can be delivered as a parameter for various prediction engine API methods.
 When it is given, the prediction engine can use it for querying editor buffer contents and
@@ -43,13 +43,13 @@
 class HbPredictionCallback
 {
 public:
-    virtual ~HbPredictionCallback() {}    
+    virtual ~HbPredictionCallback() {}
 
     virtual QString surroundingText() = 0;
     virtual int cursorPosition() = 0;
     virtual QList<HbKeyPressProbability> probableKeypresses()
     {
-    return QList<HbKeyPressProbability>();
+        return QList<HbKeyPressProbability>();
     }
 };
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/inputfw/hbinputpredictionengine.cpp
--- a/src/hbcore/inputfw/hbinputpredictionengine.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/inputfw/hbinputpredictionengine.cpp	Mon May 03 12:48:33 2010 +0300
@@ -50,8 +50,20 @@
 */
 
 /*!
+\deprecated HbPredictionBase::updateCandidates(int&, bool&)
+    is deprecated. Use bool updateCandidates(int&) instead.
 \fn virtual void HbPredictionBase::updateCandidates(int& bestGuessLocation, bool& noMoreCandidates)
+*/
 
+/*!
+\fn bool HbPredictionBase::updateCandidates(int& bestGuessLocation)
+Updates the candidate list to match active input sequence. Typically appendKeyPress and deleteKeyPress
+do that automatically but in same cases it may be required to update the situation explicitly.
+Paramter bestGuessLocation specifies the best match index in the candidate list. Typically it is
+the first location but with some engines it may vary.
+Returns true if active input sequence produces valid candidates. Otherwise returns false and
+doesn not update the existing candidate list (in other words HbPredictionEngine::candidates() will
+still return same set of candidates as it did before calling this method unsuccesfully).
 */
 
 /*!
@@ -63,7 +75,7 @@
 
 /*!
 \fn virtual void HbPredictionBase::deleteKeyPress(HbPredictionCallback* callback = 0)
-Handles delete key press.
+Deletes one key press from the active input sequence.
 */
 
 /*!
@@ -107,20 +119,10 @@
 Returns true if the engine supports given combination of language and keyboard type.
 */
 
-// ---------------------------------------------------------------------------
-// HbPredictionBase::HbPredictionBase
-//
-// ---------------------------------------------------------------------------
-//
 HbPredictionBase::HbPredictionBase()
 {
 }
 
-// ---------------------------------------------------------------------------
-// HbPredictionBase::~HbPredictionBase
-//
-// ---------------------------------------------------------------------------
-//
 HbPredictionBase::~HbPredictionBase()
 {
 }
@@ -208,10 +210,17 @@
 */
 
 /*!
+\deprecated HbPredictionEngine::candidateList()
+    is deprecated. use QStringList candidates() instead.
 \fn virtual QStringList HbPredictionEngine::candidateList()
 Returns the list of prediction candidates for current input sequence.
 */
 
+/*!
+\fn virtual QStringList HbPredictionEngine::candidates()
+Returns the list of prediction candidates for current input sequence.
+*/
+
 /*
 \fn virtual int HbPredictionEngine::inputLength()
 Returns the number of key presses since previous clear or commit operation.
@@ -349,4 +358,14 @@
 page handling.
 */
 
+/*!
+\deprecated HbPredictionEngineChinese::pressKey(const int keycode, const Qt::KeyboardModifiers modifiers, const int textCase)
+    is deprecated. use base class AppendkeyPress instead.
+*/
+
+/*!
+\deprecated HbPredictionEngineChinese::HbPredictionEngineChinese::getCandidates(int, int)
+    is deprecated. Use base class candidates() instead.
+*/
+
 // End of file
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/inputfw/hbinputpredictionengine.h
--- a/src/hbcore/inputfw/hbinputpredictionengine.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/inputfw/hbinputpredictionengine.h	Mon May 03 12:48:33 2010 +0300
@@ -58,14 +58,14 @@
     HbPredInterfaceLatinBased = 0x00000001,
     HbPredInterfaceChinese    = 0x00000002,
     HbPredInterfaceJapanese   = 0x00000004,
-    HbPredInterfaceHidden     = 0x00000008     /**< The engine is exluded from factory queries and must be instantiated directly */
+    HbPredInterfaceHidden     = 0x00000008     /**< The engine is excluded from factory queries and must be instantiated directly */
 };
 
 Q_DECLARE_FLAGS(HbPredictionInterfaceType, HbPredictionInterfaceTypeFlag)
 
 
 class HB_CORE_EXPORT HbPredictionBase
-{        
+{
 public:
     virtual ~HbPredictionBase();
 
@@ -76,6 +76,7 @@
     virtual QList<HbInputLanguage> languages() const = 0;
     virtual void setWord(const QString& word, HbPredictionCallback* callback = 0) = 0;
     virtual void updateCandidates(int& bestGuessLocation, bool& noMoreCandidates) = 0;
+    virtual bool updateCandidates(int& bestGuessLocation) = 0;
     virtual void appendKeyPress(const int keycode, const Qt::KeyboardModifiers modifiers, const HbTextCase textCase = HbTextCaseNone, HbPredictionCallback* callback = 0) = 0;
     virtual void deleteKeyPress(HbPredictionCallback* callback = 0) = 0;
     virtual void commit(const QString &word = QString()) = 0;
@@ -100,7 +101,7 @@
 {
 public:
     /*!
-    Specifies error correction levels. 
+    Specifies error correction levels.
     */
     enum HbErrorCorrectionLevel {
         HbErrorCorrectionLevelNone = 0,
@@ -112,8 +113,9 @@
 public:
     virtual void setCandidateList(QStringList* candidateList) = 0;
     virtual QStringList candidateList() = 0;
+    virtual QStringList candidates() = 0;
     virtual int inputLength() = 0;
-    virtual void appendCharacter(const QChar aChar, const HbTextCase textCase = HbTextCaseNone, HbPredictionCallback* callback = 0) = 0;
+    virtual void appendCharacter(const QChar character, const HbTextCase textCase = HbTextCaseNone, HbPredictionCallback* callback = 0) = 0;
 
     virtual QStringList nextWordCandidateList(HbPredictionCallback* callback = 0);
     virtual bool setErrorCorrectionLevel(HbErrorCorrectionLevel level);
@@ -140,7 +142,7 @@
 
     virtual QStringList getCandidates(int startIndex, int count) = 0;
     virtual bool selectCandidate(int index) = 0;
-    virtual bool selectCandidate(const QString& candidate) = 0; 
+    virtual bool selectCandidate(const QString& candidate) = 0;
     virtual bool candidateExist(int index) = 0;
 
     virtual bool pressKey(const int keycode, const Qt::KeyboardModifiers modifiers, const int textCase = 0) = 0;
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/inputfw/hbinputsettingproxy.cpp
--- a/src/hbcore/inputfw/hbinputsettingproxy.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/inputfw/hbinputsettingproxy.cpp	Mon May 03 12:48:33 2010 +0300
@@ -33,10 +33,22 @@
 
 #include "hbinputsettingproxy.h"
 #include "hbinputsettingproxy_p.h"
-#include "hbinputmodecache_p.h" 
-#include "hbinputbasepaths_p.h"
+#include "hbinputmodecache_p.h"
 #include "hbinputfilter.h"
 
+#ifdef Q_OS_SYMBIAN
+
+#define HBI_BASE_PATH QString("\\resource\\plugins")
+#define HBI_BASE_WRITABLE_PATH QString("c:\\data\\hbinputs")
+
+#else
+
+#ifndef Q_OS_UNIX
+#define HBI_BASE_WRITABLE_PATH QString("c:\\Hb\\lib")
+#endif
+
+#endif
+
 /*!
 @alpha
 @hbcore
@@ -160,11 +172,15 @@
             prData->iHwKeyboard = HbKeyboardQwerty;
             prData->iActiveCustomMethodName[0] = 0;
             prData->iActiveCustomMethodKey[0] = 0;
-            prData->iPredictiveInputState = 0;
+            prData->iPredictiveInputState = HbKeyboardSettingNone;
             prData->iDigitType = HbDigitTypeLatin;
             prData->iQwertyTextCasing = true;
             prData->iQwertyCharacterPreview = true;
             prData->iRegionalCorrectionStatus = true;
+            prData->iKeypressTimeout = 1000;
+            prData->iAutocompletion = (HbKeyboardSettingFlags)(HbKeyboardSetting12key | HbKeyboardSettingQwerty);
+            prData->iTypingCorrectionLevel = HbTypingCorrectionLevelHigh;
+            prData->iPrimaryCandidateMode = HbPrimaryCandidateModeBestPrediction;
         }
     }
     unlock();
@@ -338,10 +354,10 @@
 */
 void HbInputSettingProxy::togglePrediction()
 {
-    if (predictiveInputStatus()) {
-        setPredictiveInputStatus(0);
+    if (activeKeyboard() & HbQwertyKeyboardMask) {
+        setPredictiveInputStatus(HbKeyboardSettingQwerty, !predictiveInputStatus(HbKeyboardSettingQwerty));
     } else {
-        setPredictiveInputStatus(1);
+        setPredictiveInputStatus(HbKeyboardSetting12key, !predictiveInputStatus(HbKeyboardSetting12key));
     }
 }
 
@@ -355,6 +371,11 @@
 \sa predictiveInputStateChanged
 \sa orientationAboutToChange
 \sa orientationChanged
+\sa characterPreviewStateForQwertyChanged
+\sa keypressTimeoutChanged
+\sa autocompletionStateChanged
+\sa typingCorrectionLevelChanged
+\sa primaryCandidateModeChanged
 */
 void HbInputSettingProxy::connectObservingObject(QObject* aObserver)
 {
@@ -364,9 +385,16 @@
         connect(this, SIGNAL(activeKeyboardChanged(HbKeyboardType)), aObserver, SLOT(activeKeyboardChanged(HbKeyboardType)));
         connect(this, SIGNAL(activeHwKeyboardChanged(HbKeyboardType)), aObserver, SLOT(activeHwKeyboardChanged(HbKeyboardType)));
         connect(this, SIGNAL(activeTouchKeyboardChanged(HbKeyboardType)), aObserver, SLOT(activeTouchKeyboardChanged(HbKeyboardType)));
-        connect(this, SIGNAL(predictiveInputStateChanged(int)), aObserver, SLOT(predictiveInputStateChanged(int)));
+        connect(this, SIGNAL(predictiveInputStateChanged(HbKeyboardSettingFlags, bool)), aObserver, SLOT(predictiveInputStateChanged(HbKeyboardSettingFlags, bool)));
         connect(this, SIGNAL(orientationAboutToChange()), aObserver, SLOT(orientationAboutToChange()));
         connect(this, SIGNAL(orientationChanged(Qt::Orientation)), aObserver, SLOT(orientationChanged(Qt::Orientation)));
+/* Setting listeners not implemented yet
+        connect(this, SIGNAL(characterPreviewStateForQwertyChanged(bool)), aObserver, SLOT(characterPreviewStateForQwertyChanged(bool)));
+        connect(this, SIGNAL(keypressTimeoutChanged(int)), aObserver, SLOT(keypressTimeoutChanged(int)));
+        connect(this, SIGNAL(autocompletionStateChanged(HbKeyboardSettingFlags, bool)), aObserver, SLOT(autocompletionStateChanged(HbKeyboardSettingFlags, bool)));
+        connect(this, SIGNAL(typingCorrectionLevelChanged(HbTypingCorrectionLevel)), aObserver, SLOT(typingCorrectionLevelChanged(HbTypingCorrectionLevel)));
+        connect(this, SIGNAL(primaryCandidateModeChanged(HbPrimaryCandidateMode)), aObserver, SLOT(primaryCandidateModeChanged(HbPrimaryCandidateMode)));
+*/
     }
 }
 
@@ -380,12 +408,19 @@
     if (aObserver) {
         disconnect(this, SIGNAL(globalInputLanguageChanged(const HbInputLanguage &)), aObserver, SLOT(globalInputLanguageChanged(const HbInputLanguage &)));
         disconnect(this, SIGNAL(globalSecondaryInputLanguageChanged(const HbInputLanguage &)), aObserver, SLOT(globalSecondaryInputLanguageChanged(const HbInputLanguage &)));
-        disconnect(this, SIGNAL(predictiveInputStateChanged(int)), aObserver, SLOT(predictiveInputStateChanged(int)));
+        disconnect(this, SIGNAL(predictiveInputStateChanged(HbKeyboardSettingFlags, bool)), aObserver, SLOT(predictiveInputStateChanged(HbKeyboardSettingFlags, bool)));
         disconnect(this, SIGNAL(activeKeyboardChanged(HbKeyboardType)), aObserver, SLOT(activeKeyboardChanged(HbKeyboardType)));
         disconnect(this, SIGNAL(activeHwKeyboardChanged(HbKeyboardType)), aObserver, SLOT(activeHwKeyboardChanged(HbKeyboardType)));
         disconnect(this, SIGNAL(activeTouchKeyboardChanged(HbKeyboardType)), aObserver, SLOT(activeTouchKeyboardChanged(HbKeyboardType)));
         disconnect(this, SIGNAL(orientationAboutToChange()), aObserver, SLOT(orientationAboutToChange()));
         disconnect(this, SIGNAL(orientationChanged(Qt::Orientation)), aObserver, SLOT(orientationChanged(Qt::Orientation)));
+/* Setting listeners not implemented yet
+        disconnect(this, SIGNAL(characterPreviewStateForQwertyChanged(bool)), aObserver, SLOT(characterPreviewStateForQwertyChanged(bool)));
+        disconnect(this, SIGNAL(keypressTimeoutChanged(int)), aObserver, SLOT(keypressTimeoutChanged(int)));
+        disconnect(this, SIGNAL(autocompletionStateChanged(HbKeyboardSettingFlags, bool)), aObserver, SLOT(autocompletionStateChanged(HbKeyboardSettingFlags, bool)));
+        disconnect(this, SIGNAL(typingCorrectionLevelChanged(HbTypingCorrectionLevel)), aObserver, SLOT(typingCorrectionLevelChanged(HbTypingCorrectionLevel)));
+        disconnect(this, SIGNAL(primaryCandidateModeChanged(HbPrimaryCandidateMode)), aObserver, SLOT(primaryCandidateModeChanged(HbPrimaryCandidateMode)));
+*/
     }
 }
 
@@ -500,7 +535,7 @@
 }
 
 /*!
-Sets system wide input language. Will emit signal globalInputLanguageChanged.
+Sets system wide input language. Will emit signal globalInputLanguageChanged if language is changed.
 
 \sa globalInputLanguage
 */
@@ -509,15 +544,21 @@
     Q_D(HbInputSettingProxy);
     HbSettingProxyInternalData* prData = d->proxyData();
     if (prData) {
+        bool notify = false;
         d->lock();
-        prData->iGlobalPrimaryInputLanguage = language;
+        if (prData->iGlobalPrimaryInputLanguage != language) {
+            prData->iGlobalPrimaryInputLanguage = language;
+            notify = true;
+        }
         d->unlock();
-        emit globalInputLanguageChanged(language);
+        if (notify) {
+            emit globalInputLanguageChanged(language);
+        }
     }
 }
 
 /*!
-Sets system wide secondary input language. Will emit signal globalSecondaryInputLanguageChanged.
+Sets system wide secondary input language. Will emit signal globalSecondaryInputLanguageChanged if language is changed.
 
 \sa globalSecondaryInputLanguage
 */
@@ -526,15 +567,21 @@
     Q_D(HbInputSettingProxy);
     HbSettingProxyInternalData* prData = d->proxyData();
     if (prData) {
+        bool notify = false;
         d->lock();
-        prData->iGlobalSecondaryInputLanguage = language;
+        if (prData->iGlobalSecondaryInputLanguage != language) {
+            prData->iGlobalSecondaryInputLanguage = language;
+            notify = true;
+        }
         d->unlock();
-        emit globalSecondaryInputLanguageChanged(language);
+        if (notify) {
+            emit globalSecondaryInputLanguageChanged(language);
+        }
     }
 }
 
 /*!
-Sets active hardware keyboard type. Will emit signal activeHwKeyboardChanged.
+Sets active hardware keyboard type. Will emit signal activeHwKeyboardChanged if keyboard is changed.
 
 \sa activeHwKeyboard
 \sa activeTouchKeyboard
@@ -546,15 +593,21 @@
     Q_D(HbInputSettingProxy);
     HbSettingProxyInternalData* prData = d->proxyData();
     if (prData) {
+        bool notify = false;
         d->lock();
-        prData->iHwKeyboard = keyboard;
+        if (prData->iHwKeyboard != keyboard) {
+            prData->iHwKeyboard = keyboard;
+            notify = true;
+        }
         d->unlock();
-        emit activeHwKeyboardChanged(keyboard);
+        if (notify) {
+            emit activeHwKeyboardChanged(keyboard);
+        }
     }
 }
 
 /*!
-Sets active touch keyboard type. Will emit signal activeTouchKeyboardChanged.
+Sets active touch keyboard type. Will emit signal activeTouchKeyboardChanged keyboard is changed.
 
 \sa activeTouchKeyboard
 \sa activeHwKeyboard
@@ -566,15 +619,21 @@
     Q_D(HbInputSettingProxy);
     HbSettingProxyInternalData* prData = d->proxyData();
     if (prData) {
+        bool notify = false;
         d->lock();
-        prData->iTouchKeyboard = keyboard;
+        if (prData->iTouchKeyboard != keyboard) {
+            prData->iTouchKeyboard = keyboard;
+            notify = true;
+        }
         d->unlock();
-        emit activeTouchKeyboardChanged(keyboard);
+        if (notify) {
+            emit activeTouchKeyboardChanged(keyboard);
+        }
     }
 }
 
 /*!
-Sets active keyboard type. Will emit signal activeKeyboardChanged.
+Sets active keyboard type. Will emit signal activeKeyboardChanged if keyboard is changed.
 
 \sa activeKeyboard
 \sa activeHwKeyboard
@@ -586,51 +645,121 @@
     Q_D(HbInputSettingProxy);
     HbSettingProxyInternalData* prData = d->proxyData();
     if (prData) {
+        bool notify = false;
         d->lock();
-        prData->iActiveKeyboard = keyboard;
+        if (prData->iActiveKeyboard != keyboard) {
+            prData->iActiveKeyboard = keyboard;
+            notify = true;
+        }
         d->unlock();
-        emit activeKeyboardChanged(keyboard);
+        if (notify) {
+            emit activeKeyboardChanged(keyboard);
+        }
     }
 }
 
 /*!
-Returns the status of predictive input feature. An editor instance
-may still forbid predictive input feature, even if the device wide status allows it.
-
-\sa setPredictiveInputStatus.
+\deprecated HbInputSettingProxy::predictiveInputStatus()
+    is deprecated. Use predictiveInputStatusForITUT or predictiveInputStatusForQwerty instead.
 */
 int HbInputSettingProxy::predictiveInputStatus() const
 {
+    return predictiveInputStatusForActiveKeyboard();
+}
+
+/*!
+\deprecated HbInputSettingProxy::setPredictiveInputStatus(int newStatus)
+    is deprecated. Use setPredictiveInputStatusForITUT or setPredictiveInputStatusForQwerty instead.
+*/
+void HbInputSettingProxy::setPredictiveInputStatus(int newStatus)
+{
+    setPredictiveInputStatusForActiveKeyboard(newStatus);
+}
+
+/*!
+Returns the status of predictive input feature. Returns true if any one of given
+keyboard types has the prediction enabled. An editor instance may still forbid
+predictive input feature, even if the device wide status allows it.
+
+\sa setPredictiveInputStatus.
+*/
+bool HbInputSettingProxy::predictiveInputStatus(HbKeyboardSettingFlags keyboardType) const
+{
     Q_D(const HbInputSettingProxy);
-    int res = 0;
+    bool res = false;
 
     HbSettingProxyInternalData* prData = d->proxyData();
     if (prData) {
-        res = prData->iPredictiveInputState;
+        res = prData->iPredictiveInputState & keyboardType;
     }
 
     return res;
 }
 
 /*!
-Sets the status of predictive text input feature.
+Sets the status of predictive text input feature. Will emit signal predictiveInputStateChanged if status is changed.
 
 \sa predictiveInputStatus
 */
-void HbInputSettingProxy::setPredictiveInputStatus(int newStatus)
+void HbInputSettingProxy::setPredictiveInputStatus(HbKeyboardSettingFlags keyboardType, bool newStatus)
 {
     Q_D(HbInputSettingProxy);
+    HbSettingProxyInternalData* prData = d->proxyData();
+    if (prData) {
+        bool notify = false;
+        d->lock();
+        
+        HbKeyboardSettingFlags newValue = prData->iPredictiveInputState;
+        if (newStatus) {
+            newValue |= keyboardType;
+        } else {
+            newValue &= ~keyboardType;
+        }
+        if (prData->iPredictiveInputState != newValue) {
+            prData->iPredictiveInputState = newValue;
+            notify = true;
+        }
+        d->unlock();
+        if (notify) {
+            emit predictiveInputStateChanged(keyboardType, newStatus);
+        }
+    }
+}
 
-    if (newStatus != 0) {
-        newStatus = 1;
-    }
+/*!
+Returns the status of predictive input feature for active keyboard. An editor instance
+may still forbid predictive input feature, even if the device wide status allows it.
+
+\sa setPredictiveInputStatusForActiveKeyboard.
+*/
+bool HbInputSettingProxy::predictiveInputStatusForActiveKeyboard() const
+{
+    Q_D(const HbInputSettingProxy);
+    bool res = false;
 
     HbSettingProxyInternalData* prData = d->proxyData();
     if (prData) {
-        d->lock();
-        prData->iPredictiveInputState = newStatus;
-        d->unlock();
-        emit predictiveInputStateChanged(newStatus);
+        if (activeKeyboard() & HbQwertyKeyboardMask) {
+            res = prData->iPredictiveInputState & HbKeyboardSettingQwerty;
+        } else {
+            res = prData->iPredictiveInputState & HbKeyboardSetting12key;
+        }
+    }
+
+    return res;
+}
+
+/*!
+Sets the status of predictive text input feature for active keyboard.
+
+\sa predictiveInputStatusForActiveKeyboard
+*/
+void HbInputSettingProxy::setPredictiveInputStatusForActiveKeyboard(bool newStatus)
+{
+    if (activeKeyboard() & HbQwertyKeyboardMask) {
+        setPredictiveInputStatus(HbKeyboardSettingQwerty, newStatus);
+    } else {
+        setPredictiveInputStatus(HbKeyboardSetting12key, newStatus);
     }
 }
 
@@ -769,12 +898,14 @@
 void HbInputSettingProxy::setGlobalDigitType(HbInputDigitType digitType)
 {
     Q_D(HbInputSettingProxy);
-    d->lock();
     HbSettingProxyInternalData* prData = d->proxyData();
     if (prData) {
-        prData->iDigitType = digitType;
+        d->lock();
+        if (prData->iDigitType != digitType) {
+            prData->iDigitType = digitType;
+        }
+        d->unlock();
     }
-    d->unlock();
 }
 
 /*!
@@ -796,36 +927,51 @@
 }
 
 /*!
-Sets automatic text casing for qwerty keyboards.
+Sets automatic text casing for qwerty keyboards. Will emit signal automaticTextCasingStateForQwertyChanged if status is changed.
 
 \sa automaticTextCasingForQwerty
 */
 void HbInputSettingProxy::setAutomaticTextCasingForQwerty(bool status)
 {
     Q_D(HbInputSettingProxy);
-    d->lock();
     HbSettingProxyInternalData* prData = d->proxyData();
     if (prData) {
-        prData->iQwertyTextCasing = status;
+        bool notify = false;
+        d->lock();
+        if (prData->iQwertyTextCasing != status) {
+            prData->iQwertyTextCasing = status;
+            notify = true;
+        }
+        d->unlock();
+        if (notify) {
+            emit automaticTextCasingStateForQwertyChanged(status);
+        }
     }
-    d->unlock();
+    
 }
 
 /*!
-Enables/Disables character preview in Qwerty keypad.
+Enables/Disables character preview in Qwerty keypad. Will emit signal characterPreviewStateForQwertyChanged if status is changed.
 
 \sa characterPreviewForQwerty
 */
 void HbInputSettingProxy::setCharacterPreviewForQwerty(bool previewEnabled)
 {
     Q_D(HbInputSettingProxy);
-
-    d->lock();
     HbSettingProxyInternalData* prData = d->proxyData();
     if (prData) {
-        prData->iQwertyCharacterPreview = previewEnabled;
+        bool notify = false;
+        d->lock();
+        if (prData->iQwertyCharacterPreview != previewEnabled) {
+            prData->iQwertyCharacterPreview = previewEnabled;
+            notify = true;
+        }
+        d->unlock();
+        if (notify) {
+            emit characterPreviewStateForQwertyChanged(previewEnabled);
+        }
     }
-    d->unlock();
+    
 }
 
 /*!
@@ -1007,7 +1153,7 @@
 }
 
 /*!
-Sets the status of regional input correction feature. 
+Sets the status of regional input correction feature. Will emit signal regionalCorretionStatusChanged if status is changed.
 
 \sa regionalCorrectionEnabled.
 */
@@ -1016,11 +1162,181 @@
     Q_D(HbInputSettingProxy);
     HbSettingProxyInternalData* prData = d->proxyData();
     if (prData) {
+        bool notify = false;
         d->lock();
-        prData->iRegionalCorrectionStatus = newStatus;
+        if (prData->iRegionalCorrectionStatus != newStatus) {
+            prData->iRegionalCorrectionStatus = newStatus;
+            notify = true;
+        }
+        d->unlock();
+        if (notify) {
+            emit regionalCorretionStatusChanged(newStatus);
+        }
+    }
+}
+
+/*!
+Sets the keypress timeout value. Will emit signal keypressTimeoutChanged if timeout is changed.
+
+\sa keypressTimeout.
+*/
+void HbInputSettingProxy::setKeypressTimeout(int timeout)
+{
+    Q_D(HbInputSettingProxy);
+    HbSettingProxyInternalData* prData = d->proxyData();
+    if (prData) {
+        bool notify = false;
+        d->lock();
+        if (prData->iKeypressTimeout != timeout) {
+            prData->iKeypressTimeout = timeout;
+            notify = true;
+        }
         d->unlock();
-        emit regionalCorretionStatusChanged(newStatus);
+        if (notify) {
+            emit keypressTimeoutChanged(timeout);
+        }
+    }
+}
+
+/*!
+Returns the keypress timeout value. 
+
+\sa setKeypressTimeout.
+*/
+int HbInputSettingProxy::keypressTimeout() const
+{
+    Q_D(const HbInputSettingProxy);
+    int res = 0;
+    HbSettingProxyInternalData* prData = d->proxyData();
+    if (prData) {
+        res = prData->iKeypressTimeout;
+    }
+    return res;
+}
+
+/*!
+Sets the autocompletion status. Will emit signal autocompletionStateChanged if status is changed.
+
+\sa isAutocompletionEnabled.
+*/
+void HbInputSettingProxy::setAutocompletionStatus(HbKeyboardSettingFlags keyboardType, bool state)
+{
+    Q_D(HbInputSettingProxy);
+    HbSettingProxyInternalData* prData = d->proxyData();
+    if (prData) {
+        bool notify = false;
+        d->lock();
+        HbKeyboardSettingFlags newValue = prData->iAutocompletion;
+        if (state) {
+            newValue |= keyboardType;
+        } else {
+            newValue &= ~keyboardType;
+        }
+        if (prData->iAutocompletion != newValue) {
+            prData->iAutocompletion = newValue;
+            notify = true;
+        }
+        d->unlock();
+        if (notify) {
+            emit autocompletionStateChanged(keyboardType, state);
+        }
     }
 }
 
+/*!
+Returns the autocompletion status for ITUT. Returns true if any of given
+keyboards have autocompletion enabled.
+
+\sa setAutocompletionStatus.
+*/
+bool HbInputSettingProxy::isAutocompletionEnabled(HbKeyboardSettingFlags keyboardType) const
+{
+    Q_D(const HbInputSettingProxy);
+    bool res = false;
+    HbSettingProxyInternalData* prData = d->proxyData();
+    if (prData) {
+        res = prData->iAutocompletion & keyboardType;
+    }
+    return res;
+}
+
+/*!
+Sets the typing correction level. Will emit signal typingCorrectionLevelChanged if level is changed.
+
+\sa typingCorrectionLevel.
+*/
+void HbInputSettingProxy::setTypingCorrectionLevel(HbTypingCorrectionLevel level)
+{
+    Q_D(HbInputSettingProxy);
+    HbSettingProxyInternalData* prData = d->proxyData();
+    if (prData) {
+        bool notify = false;
+        d->lock();
+        if (prData->iTypingCorrectionLevel != level) {
+            prData->iTypingCorrectionLevel = level;
+            notify = true;
+        }
+        d->unlock();
+        if (notify) {
+            emit typingCorrectionLevelChanged(level);
+        }
+        enableRegionalCorrection(level == HbTypingCorrectionLevelHigh);
+    }
+}
+
+/*!
+Returns the typing correction level
+
+\sa setTypingCorrectionLevel.
+*/
+HbTypingCorrectionLevel HbInputSettingProxy::typingCorrectionLevel() const
+{
+    Q_D(const HbInputSettingProxy);
+    HbTypingCorrectionLevel res = HbTypingCorrectionLevelHigh;
+    HbSettingProxyInternalData* prData = d->proxyData();
+    if (prData) {
+        res = prData->iTypingCorrectionLevel;
+    }
+    return res;
+}
+
+/*!
+Sets the primary candidate mode. Will emit signal primaryCandidateModeChanged if mode is changed.
+
+\sa primaryCandidateMode.
+*/
+void HbInputSettingProxy::setPrimaryCandidateMode(HbPrimaryCandidateMode mode)
+{
+    Q_D(HbInputSettingProxy);
+    HbSettingProxyInternalData* prData = d->proxyData();
+    if (prData) {
+        bool notify = false;
+        d->lock();
+        if (prData->iPrimaryCandidateMode != mode) {
+            prData->iPrimaryCandidateMode = mode;
+            notify = true;
+        }
+        d->unlock();
+        if (notify) {
+            emit primaryCandidateModeChanged(mode);
+        }
+    }
+}
+
+/*!
+Returns the primary candidate mode
+
+\sa setPrimaryCandidateMode.
+*/
+HbPrimaryCandidateMode HbInputSettingProxy::primaryCandidateMode() const
+{
+    Q_D(const HbInputSettingProxy);
+    HbPrimaryCandidateMode res = HbPrimaryCandidateModeExactTyping;
+    HbSettingProxyInternalData* prData = d->proxyData();
+    if (prData) {
+        res = prData->iPrimaryCandidateMode;
+    }
+    return res;
+}
+
 // End of file
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/inputfw/hbinputsettingproxy.h
--- a/src/hbcore/inputfw/hbinputsettingproxy.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/inputfw/hbinputsettingproxy.h	Mon May 03 12:48:33 2010 +0300
@@ -69,6 +69,10 @@
     void setActiveTouchKeyboard(HbKeyboardType keyboard);
     int predictiveInputStatus() const;
     void setPredictiveInputStatus(int newStatus);
+    bool predictiveInputStatus(HbKeyboardSettingFlags keyboardType) const;
+    void setPredictiveInputStatus(HbKeyboardSettingFlags keyboardType, bool newStatus);
+    bool predictiveInputStatusForActiveKeyboard() const;
+    void setPredictiveInputStatusForActiveKeyboard(bool newStatus);
     HbInputDigitType globalDigitType() const;
     void setGlobalDigitType(HbInputDigitType digitType);
     bool automaticTextCasingForQwerty();
@@ -84,6 +88,14 @@
     void initializeOrientation(Qt::Orientation screenOrientation);
     bool regionalCorrectionEnabled();
     void enableRegionalCorrection(bool status);
+    void setKeypressTimeout(int timeout);
+    int keypressTimeout() const;
+    void setAutocompletionStatus(HbKeyboardSettingFlags keyboardType, bool newStatus);
+    bool isAutocompletionEnabled(HbKeyboardSettingFlags keyboardType) const;
+    void setTypingCorrectionLevel(HbTypingCorrectionLevel level);
+    HbTypingCorrectionLevel typingCorrectionLevel() const;
+    void setPrimaryCandidateMode(HbPrimaryCandidateMode mode);
+    HbPrimaryCandidateMode primaryCandidateMode() const;
 
 signals:
     void globalInputLanguageChanged(const HbInputLanguage &newLanguage);
@@ -91,10 +103,16 @@
     void activeKeyboardChanged(HbKeyboardType newKeyboard);
     void activeHwKeyboardChanged(HbKeyboardType newKeyboard);
     void activeTouchKeyboardChanged(HbKeyboardType newKeyboard);
-    void predictiveInputStateChanged(int newState);
+    void predictiveInputStateChanged(HbKeyboardSettingFlags keyboardType, bool newState);
+    void automaticTextCasingStateForQwertyChanged(bool newState);
+    void characterPreviewStateForQwertyChanged(bool newState);
     void orientationAboutToChange();
     void orientationChanged(Qt::Orientation orientation);
     void regionalCorretionStatusChanged(bool newStatus);
+    void keypressTimeoutChanged(int newTimeout);
+    void autocompletionStateChanged(HbKeyboardSettingFlags keyboardType, bool newState);
+    void typingCorrectionLevelChanged(HbTypingCorrectionLevel newLevel);
+    void primaryCandidateModeChanged(HbPrimaryCandidateMode newMode);
 
 public slots:
     void togglePrediction();
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/inputfw/hbinputsettingproxy_p.h
--- a/src/hbcore/inputfw/hbinputsettingproxy_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/inputfw/hbinputsettingproxy_p.h	Mon May 03 12:48:33 2010 +0300
@@ -49,7 +49,7 @@
     HbKeyboardType iActiveKeyboard;
     HbKeyboardType iHwKeyboard;
     HbKeyboardType iTouchKeyboard;
-    int iPredictiveInputState;
+    HbKeyboardSettingFlags iPredictiveInputState;
     HbInputDigitType iDigitType;
     bool iQwertyTextCasing;
     bool iQwertyCharacterPreview;
@@ -59,6 +59,10 @@
     bool iOrientationChangeCompleted;
     bool iFlipStatus;
     bool iRegionalCorrectionStatus;
+    int iKeypressTimeout;
+    HbKeyboardSettingFlags iAutocompletion;
+    HbTypingCorrectionLevel iTypingCorrectionLevel;
+    HbPrimaryCandidateMode iPrimaryCandidateMode;
 };
 
 class HB_CORE_PRIVATE_EXPORT HbInputSettingProxyPrivate
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/inputfw/hbinputstandardfilters.cpp
--- a/src/hbcore/inputfw/hbinputstandardfilters.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/inputfw/hbinputstandardfilters.cpp	Mon May 03 12:48:33 2010 +0300
@@ -24,6 +24,7 @@
 ****************************************************************************/
 #include "hbinputstandardfilters.h"
 
+#include "hbinputsettingproxy.h"
 /*!
 @alpha
 @hbcore
@@ -36,6 +37,30 @@
 
 \sa HbEditorInterface
 */
+
+/* Returns true if the character is a valid number in the current input language
+*/
+ 
+static bool isValidNumber(QChar aChar)
+{
+    bool ret = false;
+
+    QLocale::Language language = HbInputSettingProxy::instance()->globalInputLanguage().language();
+	QLocale::Language systemLanguage = QLocale::system().language();
+
+	if (language != systemLanguage) {
+        if (aChar >= '0' && aChar <= '9') {
+            ret = true;
+        }	
+	} else if (language == QLocale::Arabic) {
+        if (aChar >= 0x0660 && aChar <= 0x0669) {
+            ret = true;
+        }
+    } else if (aChar >= '0' && aChar <= '9') {
+        ret = true;
+    }         
+    return ret;	
+}
 HbPhoneNumberFilter* HbPhoneNumberFilter::instance()
 {
     static HbPhoneNumberFilter myInstance;
@@ -53,17 +78,15 @@
 /*!
 Returns true if given character is valid.
 */
-bool HbPhoneNumberFilter::filter(QChar aChar)
+bool HbPhoneNumberFilter::filter(QChar character)
 {
-    if (aChar >= '0' && aChar <= '9') {
+    if (character == '+' || character == '*'
+        || character == '#' || character == 'p'
+        || character == 'w') {
         return true;
-    }
-    if (aChar == '+' || aChar == '*'
-        || aChar == '#' || aChar == 'p'
-        || aChar == 'w') {
+    }  else if (isValidNumber(character)) {
         return true;
-    }
-
+    }	
     return false;
 }
 
@@ -97,15 +120,13 @@
 /*!
 Returns true if given character is valid.
 */
-bool HbFormattedNumbersFilter::filter(QChar aChar)
+bool HbFormattedNumbersFilter::filter(QChar character)
 {
-    if (aChar >= '0' && aChar <= '9') {
+    if (character == '.' || character == ',' || character == '-') {
+        return true;
+    } else if (isValidNumber(character)) {
         return true;
     }
-    if (aChar == '.' || aChar == ',' || aChar == '-') {
-        return true;
-    }
-
     return false;
 }
 
@@ -138,12 +159,11 @@
 /*!
 Returns true if given character is valid.
 */
-bool HbDigitsOnlyFilter::filter(QChar aChar)
+bool HbDigitsOnlyFilter::filter(QChar character)
 {
-    if (aChar >= '0' && aChar <= '9') {
+    if (isValidNumber(character)) {
         return true;
     }
-
     return false;
 }
 
@@ -176,9 +196,9 @@
 /*!
 Returns true if given character is valid.
 */
-bool HbUrlFilter::filter(QChar aChar)
+bool HbUrlFilter::filter(QChar character)
 {
-    if (aChar > 0x20 && aChar < 0x7f) {
+    if (character > 0x20 && character < 0x7f) {
         return true;
     }
 
@@ -215,17 +235,17 @@
 /*!
 Returns true if given character is valid.
 */
-bool HbEmailAddressFilter::filter(QChar aChar)
+bool HbEmailAddressFilter::filter(QChar character)
 {
-    if ((aChar >= 'a' && aChar <= 'z') ||
-        (aChar >= 'A' && aChar <= 'Z') ||
-        (aChar >= '0' && aChar <= '9')) {
+    if ((character >= 'a' && character <= 'z') ||
+        (character >= 'A' && character <= 'Z') ||
+        (character >= '0' && character <= '9')) {
     return true;
     }
 
     const QString others(".@,;?'-_&/~*+="); 
     for (int i = 0; i < others.size(); i++) {
-        if (others[i] == aChar) {
+        if (others[i] == character) {
             return true;
         }
     }
@@ -257,10 +277,10 @@
 /*!
 Returns true if the given character is in lower case or the case cannot be determined.
 */
-bool HbInputLowerCaseFilter::filter(QChar aChar)
+bool HbInputLowerCaseFilter::filter(QChar character)
 {
-    QChar lowerCase = aChar.toLower();
-    if (lowerCase != aChar) {
+    QChar lowerCase = character.toLower();
+    if (lowerCase != character) {
         return false;
     }
 
@@ -291,10 +311,10 @@
 /*!
 Returns true if the given character is in upper case or the case cannot be determined.
 */
-bool HbInputUpperCaseFilter::filter(QChar aChar)
+bool HbInputUpperCaseFilter::filter(QChar character)
 {
-    QChar upperCase = aChar.toUpper();
-    if (upperCase != aChar) {
+    QChar upperCase = character.toUpper();
+    if (upperCase != character) {
         return false;
     }
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/inputfw/hbinputstandardfilters.h
--- a/src/hbcore/inputfw/hbinputstandardfilters.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/inputfw/hbinputstandardfilters.h	Mon May 03 12:48:33 2010 +0300
@@ -36,7 +36,7 @@
 public:
     static HbPhoneNumberFilter* instance();
     virtual ~HbPhoneNumberFilter();
-    bool filter(QChar aChar);
+    bool filter(QChar character);
 
 private:
     HbPhoneNumberFilter();
@@ -53,7 +53,7 @@
 public:
     static HbFormattedNumbersFilter* instance();
     virtual ~HbFormattedNumbersFilter();
-    bool filter(QChar aChar);
+    bool filter(QChar character);
 
 private:
    HbFormattedNumbersFilter();
@@ -70,7 +70,7 @@
 public:
     static HbDigitsOnlyFilter* instance();
     virtual ~HbDigitsOnlyFilter();
-    bool filter(QChar aChar);
+    bool filter(QChar character);
 
 private:
    HbDigitsOnlyFilter();
@@ -87,7 +87,7 @@
 public: 
     static HbUrlFilter* instance();
     virtual ~HbUrlFilter();
-    bool filter(QChar aChar);
+    bool filter(QChar character);
 
 private:
      HbUrlFilter();
@@ -105,7 +105,7 @@
 public: 
     static HbEmailAddressFilter* instance();
     virtual ~HbEmailAddressFilter();
-    bool filter(QChar aChar);
+    bool filter(QChar character);
 
 private:
     HbEmailAddressFilter();
@@ -122,7 +122,7 @@
 public:
     static HbInputLowerCaseFilter* instance();
     virtual ~HbInputLowerCaseFilter() {}
-    bool filter(QChar aChar);
+    bool filter(QChar character);
 
 private:
     HbInputLowerCaseFilter() {}
@@ -139,7 +139,7 @@
 public:
     static HbInputUpperCaseFilter* instance();
     virtual ~HbInputUpperCaseFilter() {}
-    bool filter(QChar aChar);
+    bool filter(QChar character);
 
 private:
     HbInputUpperCaseFilter() {}
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/inputfw/hbinputstate.h
--- a/src/hbcore/inputfw/hbinputstate.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/inputfw/hbinputstate.h	Mon May 03 12:48:33 2010 +0300
@@ -48,31 +48,31 @@
 {
 public:
     HbInputState()
-        : iModeType(HbInputModeNone),
-          iTextCase(HbTextCaseNone),
-          iKeyboardType(HbKeyboardNone),
-          iLanguage(HbInputLanguage())
+        : mModeType(HbInputModeNone),
+          mTextCase(HbTextCaseNone),
+          mKeyboardType(HbKeyboardNone),
+          mLanguage(HbInputLanguage())
     {}
 
-    HbInputState(HbInputModeType aModeType, HbTextCase aTextCase, HbKeyboardType aKeyboardType, const HbInputLanguage &aLanguage = HbInputLanguage())
-        : iModeType(aModeType),
-          iTextCase(aTextCase),
-          iKeyboardType(aKeyboardType),
-          iLanguage(aLanguage)
+    HbInputState(HbInputModeType modeType, HbTextCase textCase, HbKeyboardType keyboardType, const HbInputLanguage &language = HbInputLanguage())
+        : mModeType(modeType),
+          mTextCase(textCase),
+          mKeyboardType(keyboardType),
+          mLanguage(language)
     {}
 
-    void operator=(const HbInputState& aState) {
-        iModeType = aState.iModeType;
-        iTextCase = aState.iTextCase; 
-        iKeyboardType = aState.iKeyboardType;
-        iLanguage = aState.iLanguage;
+    void operator=(const HbInputState& other) {
+        mModeType = other.mModeType;
+        mTextCase = other.mTextCase;
+        mKeyboardType = other.mKeyboardType;
+        mLanguage = other.mLanguage;
     }
 
-    bool operator==(const HbInputState& aState) {
-        if (iModeType == aState.iModeType
-            && iTextCase == aState.iTextCase
-            && iKeyboardType == aState.iKeyboardType
-            && iLanguage == aState.iLanguage) {
+    bool operator==(const HbInputState& other) {
+        if (mModeType == other.mModeType
+            && mTextCase == other.mTextCase
+            && mKeyboardType == other.mKeyboardType
+            && mLanguage == other.mLanguage) {
                 return true;
         }
         return false;
@@ -83,23 +83,23 @@
     states being compared has undefined language value, it will match to any language.
     If both language values are defined, then they are compared directly.
     */
-    bool isMatch(const HbInputState& aState) {
-        if (iModeType == aState.iModeType
-            && iTextCase == aState.iTextCase
-            && iKeyboardType == aState.iKeyboardType
-            && (iLanguage == aState.iLanguage ||
-                iLanguage.undefined() ||           // Undefined matches to anything.
-        aState.iLanguage.undefined())) {
+    bool isMatch(const HbInputState& other) {
+        if (mModeType == other.mModeType
+            && mTextCase == other.mTextCase
+            && mKeyboardType == other.mKeyboardType
+            && (mLanguage == other.mLanguage ||
+                mLanguage.undefined() ||           // Undefined matches to anything.
+        other.mLanguage.undefined())) {
                 return true;
         }
-    return false;
+        return false;
     }
 
-    bool operator!=(const HbInputState& aState) {
-        if (iModeType != aState.iModeType
-            || iTextCase != aState.iTextCase
-            || iKeyboardType != aState.iKeyboardType
-            || iLanguage != aState.iLanguage) {
+    bool operator!=(const HbInputState& other) {
+        if (mModeType != other.mModeType
+            || mTextCase != other.mTextCase
+            || mKeyboardType != other.mKeyboardType
+            || mLanguage != other.mLanguage) {
                 return true;
         }
         return false;
@@ -108,48 +108,48 @@
     /*!
     Returns input mode.
     */
-    HbInputModeType inputMode() const { return iModeType; }
+    HbInputModeType inputMode() const { return mModeType; }
 
     /*!
     Sets input mode.
     */
-    void setInputMode(HbInputModeType newMode) { iModeType = newMode; }
+    void setInputMode(HbInputModeType newMode) { mModeType = newMode; }
 
     /*!
     Returns text case.
     */
-    HbTextCase textCase() const { return iTextCase; }
+    HbTextCase textCase() const { return mTextCase; }
 
     /*!
     Sets text case.
     */
-    void setTextCase(HbTextCase newCase) { iTextCase = newCase; }
+    void setTextCase(HbTextCase newCase) { mTextCase = newCase; }
 
     /*!
     Returns keyboard type.
     */
-    HbKeyboardType keyboard() const { return iKeyboardType; }
+    HbKeyboardType keyboard() const { return mKeyboardType; }
 
     /*!
     Sets keyboard type.
     */
-    void setKeyboard(HbKeyboardType newKeyboard) { iKeyboardType = newKeyboard; } 
+    void setKeyboard(HbKeyboardType newKeyboard) { mKeyboardType = newKeyboard; }
 
     /*!
     Returns language.
     */
-    HbInputLanguage language() const { return HbInputLanguage(iLanguage); }
+    HbInputLanguage language() const { return HbInputLanguage(mLanguage); }
 
     /*!
     Sets language. 
     */
-    void setLanguage(const HbInputLanguage &newLanguage) { iLanguage = newLanguage; }
+    void setLanguage(const HbInputLanguage &newLanguage) { mLanguage = newLanguage; }
 
 private:
-    HbInputModeType iModeType;
-    HbTextCase iTextCase;
-    HbKeyboardType iKeyboardType;
-    HbInputLanguage iLanguage;
+    HbInputModeType mModeType;
+    HbTextCase mTextCase;
+    HbKeyboardType mKeyboardType;
+    HbInputLanguage mLanguage;
 };
 
 #endif // HB_INPUT_STATE_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/inputfw/hbinputuserdictionary.h
--- a/src/hbcore/inputfw/hbinputuserdictionary.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/inputfw/hbinputuserdictionary.h	Mon May 03 12:48:33 2010 +0300
@@ -42,12 +42,12 @@
 class HB_CORE_EXPORT HbUserDictionary
 {
 public:
-    virtual ~HbUserDictionary() {} 
+    virtual ~HbUserDictionary() {}
 
     virtual int id() const = 0;
-    virtual bool addWord(const QString& aWord, HbPredictionCallback* aCallback = 0) = 0;
-    virtual bool addWords(const QStringList& aWordList) = 0;
-    virtual bool removeWord(const QString& aWord) = 0;
+    virtual bool addWord(const QString& word, HbPredictionCallback* callback = 0) = 0;
+    virtual bool addWords(const QStringList& wordList) = 0;
+    virtual bool removeWord(const QString& word) = 0;
     virtual int numberOfWords() const = 0;
     virtual QStringList listWords() = 0;
     virtual void clear() = 0;
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/inputfw/hbinpututils.cpp
--- a/src/hbcore/inputfw/hbinpututils.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/inputfw/hbinpututils.cpp	Mon May 03 12:48:33 2010 +0300
@@ -42,6 +42,9 @@
 #include "hbinputlanguage.h"
 #include "hbinpututils.h"
 
+#define HB_DIGIT_ARABIC_INDIC_START_VALUE 0x0660
+
+
 /// @cond
 
 static bool usesLatinDigits(QLocale::Language language, HbInputDigitType digitType)
@@ -105,8 +108,9 @@
             }
         } else if (digitType == HbDigitTypeArabicIndic) {
             for (int i = 0; i < chars.length(); i++) {
-                if (chars.at(i) >= 0x0660 && chars.at(i) <= 0x0669) {
-                    return chars.at(i);
+                if (chars.at(i) >= '0' && chars.at(i) <= '9') {
+                    return HB_DIGIT_ARABIC_INDIC_START_VALUE +
+						(chars.at(i).toAscii() - '0');
                 }
             }
         } else if (digitType == HbDigitTypeEasternArabic) {
@@ -189,9 +193,8 @@
 }
 
 /*!
-Returns true if the given plugin is located to permanent (ROM) memory.
-This is only relevant for devices where plugins can be pre-installed as part
-of ROM-based firmware. In Windows and Unix environments this always returns false.
+\deprecated HbInputUtils::isInputPluginInPermanentMemory(const QString&)
+    is deprecated.
 */
 bool HbInputUtils::isInputPluginInPermanentMemory(const QString& pluginFileName)
 {
@@ -250,5 +253,23 @@
     return proxy;
 }
 
+/*!
+returns the input digit type for the given input language
+*/
+
+HbInputDigitType HbInputUtils::inputDigitType(HbInputLanguage language)
+{
+    HbInputDigitType digitType = HbDigitTypeNone;
+
+    switch (language.language()) {
+        case QLocale::Arabic:
+            digitType = HbDigitTypeArabicIndic;
+            break;
+        default:
+            digitType = HbDigitTypeLatin;
+			break;		
+    }
+    return digitType;
+}
 // End of file
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/inputfw/hbinpututils.h
--- a/src/hbcore/inputfw/hbinpututils.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/inputfw/hbinpututils.h	Mon May 03 12:48:33 2010 +0300
@@ -62,6 +62,7 @@
 
     static QWidget* createWrapperWidget(QGraphicsWidget* graphicsWidget);
     static QGraphicsWidget* createGraphicsProxyWidget(QWidget* widget);
+    static HbInputDigitType inputDigitType(HbInputLanguage language);	
 };
 
 /*!
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/inputfw/hbinputvirtualkeyboard.cpp
--- a/src/hbcore/inputfw/hbinputvirtualkeyboard.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/inputfw/hbinputvirtualkeyboard.cpp	Mon May 03 12:48:33 2010 +0300
@@ -91,7 +91,7 @@
 
 /*!
 \fn QSizeF HbVirtualKeyboard::minimizedKeyboardSize()
-This function is used by HbVkbHost to show the keypad in minimized state.
+The vkb host queries the size of minimized keyboard through this method.
 */
 
 /*!
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/inputfw/hbinputvkbhost.cpp
--- a/src/hbcore/inputfw/hbinputvkbhost.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/inputfw/hbinputvkbhost.cpp	Mon May 03 12:48:33 2010 +0300
@@ -38,8 +38,8 @@
 Its purpose is to isolate virtual keyboard's interaction in application space from
 the widget and the input method.
 
-In other words, an input method is responsible for creating the virtual keyboard widget
-but it is the virtual keyboard host who places it on the screen. The host decides
+While the input method is responsible for creating virtual keyboard widget,
+it is the virtual keyboard host who places it on the screen. The host decides
 where the keyboard is shown and what is the maximum area it is allowed to cover.
 
 Virtual keyboard host also knows how to keep the editor cursor visible at all times
@@ -123,6 +123,12 @@
 */
 
 /*!
+\fn bool stateTransitionOngoing() const = 0
+Returns true if the vkb host has state transition ongoing, ie. it is running open or close
+animation or updating the split-view status.
+*/
+
+/*!
 Attaches given host to given object. Deletes previously attached host.
 */
 void HbVkbHost::attachHost(HbVkbHost* host, QObject* object)
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/inputfw/hbinputvkbhost.h
--- a/src/hbcore/inputfw/hbinputvkbhost.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/inputfw/hbinputvkbhost.h	Mon May 03 12:48:33 2010 +0300
@@ -86,13 +86,17 @@
     virtual void ensureCursorVisibility() = 0;
 
 signals:
+    void aboutToOpen();
+    void aboutToClose();
     void keypadOpened();
     void keypadClosed();
 
 protected:
     virtual void refresh() = 0;
+    virtual bool stateTransitionOngoing() const = 0;
 
     friend class HbInputMethod;
+    friend class HbVkbHostBridge;
 };
 
 #endif // HB_INPUT_VKB_HOST_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/inputfw/hbinputvkbhostbridge.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/inputfw/hbinputvkbhostbridge.cpp	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,283 @@
+/****************************************************************************
+**
+** 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 <QVariant>
+#include <QPointer>
+
+#include "hbinputvkbhostbridge.h"
+
+/*!
+\proto
+\class HbVkbHostBridge
+\brief Provides one connection point to receive signals from all the virtual keyboard hosts.
+
+The virtual keyboard host provides signals when the keyboard changes state. Usually there are many active virtual
+keyboard hosts in the system so if an application is interested to know when any of them changes state
+(ie. keyboard opens or closes), it is difficult to know which one to connect to.
+
+This singleton class acts as a gateway and delivers signals when any of the virtual keyboard hosts
+in the system changes state. It also forwards HbVkbHost API function calls to active host.
+
+Note that there is active host only when editor widget is focused.
+
+The bridge virtual keyboard host also has has an important internal role in synchronising state transitions between several
+active virtual keyboard hosts.  
+
+\sa HbVkbHost
+*/
+
+/// @cond
+
+class HbVkbHostBridgePrivate
+{
+public:
+    QPointer<HbVkbHost> mActiveHost;
+};
+
+/// @endcond
+
+HbVkbHostBridge *HbVkbHostBridge::instance()
+{
+    static HbVkbHostBridge theInstance;
+    return &theInstance;
+}
+
+HbVkbHostBridge::HbVkbHostBridge() : d_ptr(new HbVkbHostBridgePrivate())
+{
+}
+
+HbVkbHostBridge::~HbVkbHostBridge()
+{
+    delete d_ptr;
+}
+
+/*!
+\reimp
+*/
+void HbVkbHostBridge::openKeypad(HbVirtualKeyboard *vkb, HbInputMethod* owner, bool animationAllowed)
+{
+    Q_D(HbVkbHostBridge);
+    if (d->mActiveHost) {
+        d->mActiveHost->openKeypad(vkb, owner, animationAllowed);
+    }
+}
+
+/*!
+\reimp
+*/
+void HbVkbHostBridge::openMinimizedKeypad(HbVirtualKeyboard *vkb, HbInputMethod* owner)
+{
+    Q_D(HbVkbHostBridge);
+    if (d->mActiveHost) {
+        d->mActiveHost->openMinimizedKeypad(vkb, owner);
+    }
+}
+
+/*!
+\reimp
+*/
+void HbVkbHostBridge::closeKeypad(bool animationAllowed)
+{
+    Q_D(HbVkbHostBridge);
+
+    if (d->mActiveHost) {
+        d->mActiveHost->closeKeypad(animationAllowed);
+    }
+}
+
+/*!
+\reimp
+*/
+void HbVkbHostBridge::minimizeKeypad(bool animationAllowed)
+{
+    Q_D(HbVkbHostBridge);
+    if (d->mActiveHost) {
+        d->mActiveHost->minimizeKeypad(animationAllowed);
+    }
+}
+
+/*!
+\reimp
+*/
+HbVkbHost::HbVkbStatus HbVkbHostBridge::keypadStatus() const
+{
+    Q_D(const HbVkbHostBridge);
+    if (d->mActiveHost) {
+        return d->mActiveHost->keypadStatus();
+    }
+
+    return HbVkbHost::HbVkbStatusClosed;
+}
+
+/*!
+\reimp
+*/
+int HbVkbHostBridge::priority() const
+{
+    return 0;
+}
+
+/*!
+\reimp
+*/ 
+QSizeF HbVkbHostBridge::keyboardArea() const
+{
+    Q_D(const HbVkbHostBridge);
+    if (d->mActiveHost) {
+        return d->mActiveHost->keyboardArea();
+    }
+
+    return QSizeF();
+}
+
+/*!
+\reimp
+*/
+void HbVkbHostBridge::preferredSizeChanged(const QSizeF& newSize)
+{
+    Q_D(HbVkbHostBridge);
+    if (d->mActiveHost) {
+        d->mActiveHost->preferredSizeChanged(newSize);
+    }
+}
+
+/*!
+\reimp
+*/
+HbVirtualKeyboard* HbVkbHostBridge::activeKeypad() const
+{
+    Q_D(const HbVkbHostBridge);
+    if (d->mActiveHost) {
+        return d->mActiveHost->activeKeypad();
+    }
+
+    return 0;
+}
+
+/*!
+\reimp
+*/
+QRectF HbVkbHostBridge::applicationArea() const
+{
+    Q_D(const HbVkbHostBridge);
+    if (d->mActiveHost) {
+        return d->mActiveHost->applicationArea();
+    }
+
+    return QRectF();
+}
+
+/*!
+\reimp
+*/
+HbVkbHost::HbVkbStatus HbVkbHostBridge::keypadStatusBeforeOrientationChange() const
+{
+    Q_D(const HbVkbHostBridge);
+    if (d->mActiveHost) {
+        return d->mActiveHost->keypadStatusBeforeOrientationChange();
+    }
+
+    return HbVkbHost::HbVkbStatusClosed;
+}
+
+/*!
+\reimp
+*/
+void HbVkbHostBridge::ensureCursorVisibility()
+{
+    Q_D(HbVkbHostBridge);
+    if (d->mActiveHost) {
+        d->mActiveHost->ensureCursorVisibility();
+    }
+}
+
+/*!
+Connects vkb host to the bridge. Returns false if there is an existing host and
+it has ongoing state transition.
+
+Only vkb host implementors need this method.
+*/
+bool HbVkbHostBridge::connectHost(HbVkbHost *host)
+{
+    Q_D(HbVkbHostBridge);
+
+    if (d->mActiveHost && d->mActiveHost->stateTransitionOngoing()) {     
+        return false;
+    }
+
+    if (d->mActiveHost != host) {
+        if (d->mActiveHost) {
+            disconnect(d->mActiveHost, SIGNAL(aboutToOpen()), this, SIGNAL(aboutToOpen()));
+            disconnect(d->mActiveHost, SIGNAL(aboutToClose()), this, SIGNAL(aboutToClose()));
+            disconnect(d->mActiveHost, SIGNAL(keypadOpened()), this, SIGNAL(keypadOpened()));
+            disconnect(d->mActiveHost, SIGNAL(keypadClosed()), this, SIGNAL(keypadClosed()));
+            disconnect(d->mActiveHost, SIGNAL(keypadOpened()), this, SIGNAL(stateTransitionCompleted()));
+            disconnect(d->mActiveHost, SIGNAL(keypadClosed()), this, SIGNAL(stateTransitionCompleted()));
+        }  
+
+        d->mActiveHost = host;
+        if (d->mActiveHost) {
+            connect(d->mActiveHost, SIGNAL(aboutToOpen()), this, SIGNAL(aboutToOpen()));
+            connect(d->mActiveHost, SIGNAL(aboutToClose()), this, SIGNAL(aboutToClose()));
+            connect(d->mActiveHost, SIGNAL(keypadOpened()), this, SIGNAL(keypadOpened()));
+            connect(d->mActiveHost, SIGNAL(keypadClosed()), this, SIGNAL(keypadClosed()));
+            connect(d->mActiveHost, SIGNAL(keypadOpened()), this, SIGNAL(stateTransitionCompleted()));
+            connect(d->mActiveHost, SIGNAL(keypadClosed()), this, SIGNAL(stateTransitionCompleted()));
+        }
+    }
+
+    return true;
+}
+
+/*!
+Returns currently active vkb host. Note that there is active vkb host only when an editor is focused.
+*/
+HbVkbHost *HbVkbHostBridge::activeHost() const
+{
+    Q_D(const HbVkbHostBridge);
+    return d->mActiveHost;
+}
+
+/*!
+\reimp
+*/
+void HbVkbHostBridge::refresh()
+{
+}
+
+/*!
+\reimp
+*/
+bool HbVkbHostBridge::stateTransitionOngoing() const
+{
+    Q_D(const HbVkbHostBridge);
+    if (d->mActiveHost) {
+        return d->mActiveHost->stateTransitionOngoing();
+    }
+
+    return false;
+}
+
+// End of file
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/inputfw/hbinputvkbhostbridge.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/inputfw/hbinputvkbhostbridge.h	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,80 @@
+/****************************************************************************
+**
+** 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_INPUT_VKB_HOST_BRIDGE_H
+#define HB_INPUT_VKB_HOST_BRIDGE_H
+
+#include <hbinputvkbhost.h>
+
+class HbVkbHostBridgePrivate;
+
+class HB_CORE_EXPORT HbVkbHostBridge : public HbVkbHost
+{
+    Q_OBJECT
+
+public:
+    static HbVkbHostBridge *instance();
+
+    ~HbVkbHostBridge();
+    void openKeypad(HbVirtualKeyboard *vkb, HbInputMethod* owner, bool animationAllowed);
+    void openMinimizedKeypad(HbVirtualKeyboard *vkb, HbInputMethod* owner);
+    void closeKeypad(bool animationAllowed);
+    void minimizeKeypad(bool animationAllowed);
+    HbVkbStatus keypadStatus() const;
+    int priority() const; 
+    QSizeF keyboardArea() const;
+    void preferredSizeChanged(const QSizeF& newSize);
+    HbVirtualKeyboard* activeKeypad() const;
+    QRectF applicationArea() const;
+    HbVkbStatus keypadStatusBeforeOrientationChange() const;
+
+    HbVkbHost *activeHost() const;
+    bool connectHost(HbVkbHost *host);
+
+public slots:
+    void ensureCursorVisibility();
+
+signals:
+    void stateTransitionCompleted();
+
+protected:
+    void refresh();
+    bool stateTransitionOngoing() const;
+
+private:
+    HbVkbHostBridge();
+
+private:
+    HbVkbHostBridgePrivate *const d_ptr;
+
+private:
+    Q_DECLARE_PRIVATE_D(d_ptr, HbVkbHostBridge)
+    Q_DISABLE_COPY(HbVkbHostBridge)
+};
+
+#endif // HB_INPUT_VKB_HOST_BRIDGE_H
+
+// End of file
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/inputfw/inputfw.pri
--- a/src/hbcore/inputfw/inputfw.pri	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/inputfw/inputfw.pri	Mon May 03 12:48:33 2010 +0300
@@ -52,18 +52,16 @@
 PUBLIC_HEADERS += $$PWD/hbinputlanguage.h
 PUBLIC_HEADERS += $$PWD/hbinputstandardfilters.h
 PUBLIC_HEADERS += $$PWD/hbinputmethoddescriptor.h
+PUBLIC_HEADERS += $$PWD/hbinputvkbhostbridge.h
 
 # private framework headers
-INTERNAL_HEADERS += $$PWD/hbinputmodecache_p.h
-INTERNAL_HEADERS += $$PWD/hbinputcontextproxy_p.h
-INTERNAL_HEADERS += $$PWD/hbinputmethodnull_p.h
-INTERNAL_HEADERS += $$PWD/hbinputeditorinterface_p.h
-INTERNAL_HEADERS += $$PWD/hbinputbasepaths_p.h
-INTERNAL_HEADERS += $$PWD/hbinputextrauserdictionary_p.h
-INTERNAL_HEADERS += $$PWD/hbinputmethod_p.h
-INTERNAL_HEADERS += $$PWD/hbinputcustombutton_p.h
-INTERNAL_HEADERS += $$PWD/hbinputsettingproxy_p.h
-
+PRIVATE_HEADERS += $$PWD/hbinputmodecache_p.h
+PRIVATE_HEADERS += $$PWD/hbinputcontextproxy_p.h
+PRIVATE_HEADERS += $$PWD/hbinputmethodnull_p.h
+PRIVATE_HEADERS += $$PWD/hbinputeditorinterface_p.h
+PRIVATE_HEADERS += $$PWD/hbinputextrauserdictionary_p.h
+PRIVATE_HEADERS += $$PWD/hbinputmethod_p.h
+PRIVATE_HEADERS += $$PWD/hbinputsettingproxy_p.h
 
 # framework sources
 SOURCES += $$PWD/hbinputmethod.cpp
@@ -89,4 +87,5 @@
 SOURCES += $$PWD/hbinputlanguage.cpp
 SOURCES += $$PWD/hbinputmethod_p.cpp
 SOURCES += $$PWD/hbinputmethoddescriptor.cpp
+SOURCES += $$PWD/hbinputvkbhostbridge.cpp
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/layouts/hbanchor_p.h
--- a/src/hbcore/layouts/hbanchor_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/layouts/hbanchor_p.h	Mon May 03 12:48:33 2010 +0300
@@ -34,17 +34,17 @@
     HbAnchor();
     HbAnchor(
         QGraphicsLayoutItem *startItem,
-        HbAnchorLayout::Edge startEdge,
+        Hb::Edge startEdge,
         QGraphicsLayoutItem *endItem,
-        HbAnchorLayout::Edge endEdge,
+        Hb::Edge endEdge,
         qreal value );
     HbAnchor(const HbAnchor &anchor);
     HbAnchor &operator=(const HbAnchor &anchor);
 
     QGraphicsLayoutItem *mStartItem;
-    HbAnchorLayout::Edge mStartEdge;
+    Hb::Edge mStartEdge;
     QGraphicsLayoutItem *mEndItem;
-    HbAnchorLayout::Edge mEndEdge;
+    Hb::Edge mEndEdge;
     qreal mValue;
 };
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/layouts/hbanchorlayout.cpp
--- a/src/hbcore/layouts/hbanchorlayout.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/layouts/hbanchorlayout.cpp	Mon May 03 12:48:33 2010 +0300
@@ -28,7 +28,6 @@
 #include "hbanchorlayoutdebug_p.h"
 #include "hbanchorlayoutengine_p.h"
 
-#include <QDebug>
 #include <QLayout>
 
 #include "hblayoututils_p.h"
@@ -37,19 +36,21 @@
 //Similar define exists also in the engine side.
 //#define HBANCHORLAYOUT_DEBUG
 
+#include <QDebug>
+
 /*!
-    @beta
+    @stable
     @hbcore
     \class HbAnchorLayout
     \brief HbAnchorLayout manages geometries of its child items with anchors that
     that connect the layout items with each other.
-    
+
     The anchors have a start edge, an end edge and a value. The start and
     end edges are defined by (layout item, edge) pairs. See setAnchor() for
     more details.
-    
-    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.
+
     Example code:
     \snippet{anchorlayoutsample.cpp,1}
 
@@ -59,7 +60,7 @@
 */
 
 /*!
-    \enum HbAnchorLayout::Edge
+    \enum Hb::Edge
 
     This enum defines the edges of a layout item.
 */
@@ -93,73 +94,6 @@
     Vertical
 };
 
-class HbAnchorLayoutPrivate
-{
-public:
-    Q_DECLARE_PUBLIC( HbAnchorLayout )
-
-    HbAnchorLayoutPrivate();
-    ~HbAnchorLayoutPrivate();
-
-    void addItemIfNeeded( QGraphicsLayoutItem *item );
-    EdgeType edgeType( HbAnchorLayout::Edge edge );
-    HbAnchor* getAnchor( QGraphicsLayoutItem *startItem,
-                         HbAnchorLayout::Edge startEdge,
-                         QGraphicsLayoutItem *endItem,
-                         HbAnchorLayout::Edge endEdge );
-
-    void setItemGeometries();
-
-    void createEquations( EdgeType type );
-    void calculateSizeHint( EdgeType type );
-    void createEquationsCommon( EdgeType type );
-    void setVariables( Variable *v, QGraphicsLayoutItem *item, EdgeType type );
-
-    int getEdgeIndex( QGraphicsLayoutItem *item, HbAnchorLayout::Edge edge );
-    
-    QSizeF sizeHint( Qt::SizeHint which );
-    
-public:
-    HbAnchorLayout * q_ptr;
-    QList<QGraphicsLayoutItem*> mItems;
-    QList<HbAnchor*> mAnchors;
-    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 mSizeHintDirty;    // set true in ::invalidate() and cleared after re-creation of equations in ::sizeHint
-    bool mInvalidateCalled; // set true in ::invalidate() and cleared after geometry is set in ::setGeometry
-
-    Expression mSx, mSy;
-    
-    QSizeF mMinSH, mPrefSH, mMaxSH;
-    
-
-    QList<Equation> mEquationsHorizontal;
-    QList<Equation> mEquationsVertical;
-    VariableSet mVariablesHorizontal;
-    VariableSet mVariablesVertical;
-    DataGrid mDataHorizontal;
-    DataGrid mDataVertical;
-    Solution mSolutionHorizontal;
-    Solution mSolutionVertical;
-
-    QRectF mUsedRect;
-};
-
-/*!
-    \internal
-*/
-HbAnchor::HbAnchor( QGraphicsLayoutItem *startItem,
-                   HbAnchorLayout::Edge startEdge,
-                   QGraphicsLayoutItem *endItem,
-                   HbAnchorLayout::Edge endEdge,
-                   qreal value )
-    : mStartItem(startItem),
-    mStartEdge(startEdge),
-    mEndItem(endItem),
-    mEndEdge(endEdge),
-    mValue(value)
-{
-}
 
 /*!
     \internal
@@ -174,14 +108,28 @@
 }
 
 HbAnchor::HbAnchor(const HbAnchor &anchor)
-: mStartItem(anchor.mStartItem), 
-  mStartEdge(anchor.mStartEdge), 
-  mEndItem(anchor.mEndItem), 
-  mEndEdge(anchor.mEndEdge), 
+: mStartItem(anchor.mStartItem),
+  mStartEdge(anchor.mStartEdge),
+  mEndItem(anchor.mEndItem),
+  mEndEdge(anchor.mEndEdge),
   mValue(anchor.mValue)
 {
 }
 
+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)
 {
     if (this != &anchor) {
@@ -194,11 +142,74 @@
     return *this;
 }
 
+
+class HbAnchorLayoutPrivate
+{
+public:
+    Q_DECLARE_PUBLIC( HbAnchorLayout )
+
+    HbAnchorLayoutPrivate();
+    ~HbAnchorLayoutPrivate();
+
+    void addItemIfNeeded( QGraphicsLayoutItem *item );
+    EdgeType edgeType( const Hb::Edge edge ) const;
+    HbAnchor* getAnchor( QGraphicsLayoutItem *startItem,
+                         Hb::Edge startEdge,
+                         QGraphicsLayoutItem *endItem,
+                         Hb::Edge endEdge );
+
+    void setItemGeometries();
+
+    void createEquations( EdgeType type );
+    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:
+    HbAnchorLayout * q_ptr;
+    QList<QGraphicsLayoutItem*> mItems;
+    QList<HbAnchor*> mAnchors;
+    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 mWrongAnchors;    // need to recreate anchors, these ones are unsolvable with any layout geometry
+    bool mInvalidateCalled; // set true in ::invalidate() and cleared after geometry is set in ::setGeometry
+
+
+    QRectF mUsedRect;
+
+    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
 */
-HbAnchorLayoutPrivate::HbAnchorLayoutPrivate() : mEquationsDirty( true ), mValid( true ), mSizeHintDirty( true ), mInvalidateCalled(false), 
-                                            mMinSH( 0, 0 ), mPrefSH( 100, 100 ), mMaxSH( 1000, 1000 )
+HbAnchorLayoutPrivate::HbAnchorLayoutPrivate() : mEquationsDirty( false ), mValid( true ), mWrongAnchors( false ), mInvalidateCalled(false),
+                                                    mLayoutVarH( 0 ), mLayoutVarV( 0 )
 {
 }
 
@@ -206,8 +217,17 @@
     \internal
 */
 HbAnchorLayoutPrivate::~HbAnchorLayoutPrivate()
-{   
+{
     qDeleteAll( mAnchors );
+
+
+    qDeleteAll( mEdgesVertical );
+    qDeleteAll( mEdgesHorizontal );
+    qDeleteAll( mVerticesVertical );
+    qDeleteAll( mVerticesHorizontal );
+
+    qDeleteAll( mEquationsHorizontal );
+    qDeleteAll( mEquationsVertical );
 }
 
 /*!
@@ -226,7 +246,7 @@
 /*!
     \internal
 */
-EdgeType HbAnchorLayoutPrivate::edgeType( HbAnchorLayout::Edge edge )
+EdgeType HbAnchorLayoutPrivate::edgeType( const Hb::Edge edge ) const
 {
     EdgeType type( Horizontal );
     if ( edge == Hb::TopEdge || edge == Hb::BottomEdge || edge == Hb::CenterVEdge) {
@@ -240,9 +260,9 @@
 */
 HbAnchor* HbAnchorLayoutPrivate::getAnchor(
     QGraphicsLayoutItem *startItem,
-    HbAnchorLayout::Edge startEdge,
+    Hb::Edge startEdge,
     QGraphicsLayoutItem *endItem,
-    HbAnchorLayout::Edge endEdge )
+    Hb::Edge endEdge )
 {
     for ( int i = mAnchors.count()-1 ; i >= 0; i-- ) {
         HbAnchor* anchor = mAnchors.at(i);
@@ -256,6 +276,120 @@
     return 0;
 }
 
+void HbAnchorLayoutPrivate::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( mItems.at(itemIndexEnd) ) );
+        } else {
+            mGeometryDefinedV[itemIndexEnd] = true;
+            itemSize = mSolutionVertical.value( mVariablesVertical.findVariable( mItems.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( mItems.at(itemIndexStart) ) );
+        } else {
+            mGeometryDefinedV[itemIndexStart] = true;
+            itemSize = mSolutionVertical.value( mVariablesVertical.findVariable( mItems.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
 */
@@ -264,303 +398,375 @@
     Q_Q(HbAnchorLayout);
     const QRectF newRect = q->geometry();
 
+    if( mWrongAnchors || ( mItems.isEmpty() ) ) {
+        return;
+    }
+
+
     if ( (newRect != mUsedRect) || mInvalidateCalled ) {
 
-        mValid = true;
+        mUsedRect = newRect;
+
         if ( mEquationsDirty ) {
             createEquations( Horizontal );
             createEquations( Vertical );
             mEquationsDirty = false;
         }
 
-        Variable *layoutWidth = mVariablesHorizontal.findVariable( q );
-        if ( layoutWidth ) {
-            layoutWidth->mFlags |= Variable::FlagFixed;
-            layoutWidth->mPref = newRect.width();
+
+        mValid = true;
+
+        {
+
+            QList<Expression*> *el = &mEquationsHorizontal;
+            VariableSet *vs = &mVariablesHorizontal;
+            Solution *solution = &mSolutionHorizontal;
+            solution->clear();
+
+
+            solution->insert( mLayoutVarH, newRect.width() );
+#ifdef HBANCHORLAYOUT_DEBUG
+            qDebug() << "LayoutH Id = " << mLayoutVarH->mId;
+#endif // HBANCHORLAYOUT_DEBUG
+            mValid = AnchorLayoutEngine::instance()->solveEquation( el, vs, solution );
+            if( !mValid ) {
+                return;
+            }
+
+#ifdef HBANCHORLAYOUT_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 //HBANCHORLAYOUT_DEBUG
         }
 
-        Variable *layoutHeight = mVariablesVertical.findVariable( q );
-        if ( layoutHeight ) {
-            layoutHeight->mFlags |= Variable::FlagFixed;
-            layoutHeight->mPref = newRect.height();
-        }
+        {
+            QList<Expression*> *el = &mEquationsVertical;
+            VariableSet *vs = &mVariablesVertical;
+            Solution *solution = &mSolutionVertical;
+            solution->clear();
+
+
+
+            solution->insert( mLayoutVarV, newRect.height() );
+#ifdef HBANCHORLAYOUT_DEBUG
+            qDebug() << "LayoutV Id = " << mLayoutVarV->mId;
+#endif //HBANCHORLAYOUT_DEBUG
 
-        for ( int i = 0; i < mVariablesHorizontal.mVarList.count(); i++ ) {
-            Variable *var = mVariablesHorizontal.mVarList.at(i);
-            QGraphicsLayoutItem *item = static_cast<QGraphicsLayoutItem*>(var->mRef);
-            if ( item && item != q ) {
-                setVariables( var, item, Horizontal );
+            mValid = AnchorLayoutEngine::instance()->solveEquation( el, vs, solution );
+            if( !mValid ) {
+                return;
             }
+#ifdef HBANCHORLAYOUT_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 //HBANCHORLAYOUT_DEBUG
         }
 
-        for ( int i = 0; i < mVariablesVertical.mVarList.count(); i++ ) {
-            Variable *var = mVariablesVertical.mVarList.at(i);
-            QGraphicsLayoutItem *item = static_cast<QGraphicsLayoutItem*>(var->mRef);
-            if ( item && item != q ) {
-                setVariables( var, item, Vertical );
+        {
+            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 = mItems.size();
+
+            mItemsGeometry[ layoutIndex ].x1 = 0;
+            mItemsGeometry[ layoutIndex ].x2 = newRect.width();
+            mItemsGeometry[ layoutIndex ].y1 = 0;
+            mItemsGeometry[ layoutIndex ].y2 = newRect.height();
+
+
+            for( int i = 0; i < mAnchorsVisited.size(); i++ ) {
+
+                HbAnchor *anchor = mAnchors.at(i);
+
+
+                if( ( anchor->mStartItem != q ) && ( anchor->mEndItem != q ) ) {
+                    continue;
+                }
+
+                int startIndex = mItems.indexOf( anchor->mStartItem ); // returns -1 if not found => this is layout
+                int endIndex = mItems.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 );
+                        }
+                    }
+                }
+            }
+
+
 
-        mValid = EquationSolver::solveEquation(
-            mEquationsHorizontal,
-            mVariablesHorizontal,
-            &mSolutionHorizontal );
-        if ( !mValid ) {
-            return;
-        }
+            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 = mItems.indexOf( anchor->mStartItem );
+                    endIndex = mItems.indexOf( anchor->mEndItem );
+#ifdef HBANCHORLAYOUT_DEBUG
+                    qDebug() << "startIndex:" << startIndex << "  endIndex" << endIndex;
+#endif //HBANCHORLAYOUT_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;
+                    }
+                }
+            }
+
+
+            Qt::LayoutDirection layoutDir = HbLayoutUtils::visualDirection(q);
+            for( int i = 0; i < layoutIndex; 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() + mItems.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() + mItems.at(i)->preferredHeight() );
+                }
+
+                HbLayoutUtils::visualRect(layoutDir, geom, newRect);
 
 #ifdef HBANCHORLAYOUT_DEBUG
-        printf("\n\n\nHorisontal solution:\n");
-        Solution::iterator i = mSolutionHorizontal.begin();
-        while( i != mSolutionHorizontal.end() ) {
-            printf( "id = %d  value = %lf\n", i.key().mId, i.value() );
-            i++;
-        }
-        for( int i = 0; i < 2*(mItems.count()+1); i++ ) {
-            printf( "distance 0 : %d = %lf\n", i, mDataHorizontal.value( i, 0, &mSolutionHorizontal, mValid ) );
-        }
+                qDebug( "Item %d: (%lf, %lf) : (%lf %lf)", i, calcGeom.x1, calcGeom.y1, calcGeom.x2, calcGeom.y2 );
 #endif // HBANCHORLAYOUT_DEBUG
 
-        mValid = EquationSolver::solveEquation(
-            mEquationsVertical,
-            mVariablesVertical,
-            &mSolutionVertical );
-        if ( !mValid ) {
-            return;
+                mItems.at(i)->setGeometry( geom );
+            }
         }
-
-#ifdef HBANCHORLAYOUT_DEBUG
-        printf("\n\n\nVertical solution:\n");
-
-        i = mSolutionVertical.begin();
-        while( i != mSolutionVertical.end() ) {
-            printf( "id = %d  value = %lf\n", i.key().mId, i.value() );
-            i++;
-        }
-        for( int i = 0; i < 2*(mItems.count()+1); i++ ) {
-            printf( "distance 0 : %d = %lf\n", i, mDataVertical.value( i, 0, &mSolutionVertical, mValid ) );
-        }
-#endif // HBANCHORLAYOUT_DEBUG
-
     }
-
-    mUsedRect = newRect;
-
-    Qt::LayoutDirection layoutDir = HbLayoutUtils::visualDirection(q);
-    for ( int i=0; i<mItems.count(); i++ ) {
-
-        qreal l, t, r, b;
-        l = mUsedRect.left() + mDataHorizontal.value( 2*i+1, 0, &mSolutionHorizontal, mValid );
-        if ( !mValid ) {
-        	return;
-    	}
-        r = mUsedRect.left() + mDataHorizontal.value( 2*i+2, 0, &mSolutionHorizontal, mValid );
-        if ( !mValid ) {
-        	return;
-    	}
-        t = mUsedRect.top() + mDataVertical.value( 2*i+1, 0, &mSolutionVertical, mValid );
-        if ( !mValid ) {
-        	return;
-    	}
-        b = mUsedRect.top() + mDataVertical.value( 2*i+2, 0, &mSolutionVertical, mValid );
-        if ( !mValid ) {
-        	return;
-    	}
-
-#ifdef HBANCHORLAYOUT_DEBUG
-        printf( "%d: l=%lf   r=%lf   t=%lf   b=%lf\n", i, l, r, t, b );
-#endif // HBANCHORLAYOUT_DEBUG
-
-        QRectF itemRect(QPointF(l, t), QPointF(r, b));
-        HbLayoutUtils::visualRect(layoutDir, itemRect, mUsedRect);
-        mItems.at(i)->setGeometry(itemRect);
-
-        // left edge -> 2*i+1
-        // right edge -> 2*i+2
-
-    }
-
 }
 
-void HbAnchorLayoutPrivate::setVariables( Variable *v, QGraphicsLayoutItem *item, EdgeType type )
+void HbAnchorLayoutPrivate::setSizeProp( SizeProperty *v, QGraphicsLayoutItem *item, EdgeType type )
 {
     if( type == Vertical ) {
         const QSizePolicy::Policy verticalPolicy = item->sizePolicy().verticalPolicy();
 
         if ( verticalPolicy & QSizePolicy::ShrinkFlag ) {
-            v->mMin = item->minimumHeight();
+            v->min = item->minimumHeight();
         } else {
-            v->mMin = item->preferredHeight();
+            v->min = item->preferredHeight();
         }
 
         if ( verticalPolicy & (QSizePolicy::GrowFlag | QSizePolicy::ExpandFlag) ) {
-            v->mMax = item->maximumHeight();
+            v->max = item->maximumHeight();
         } else {
-            v->mMax = item->preferredHeight();
+            v->max = item->preferredHeight();
         }
 
-        v->mPref = qBound( v->mMin, item->preferredHeight(), v->mMax );
-        v->mFlags |= (v->mMin == v->mMax) ? Variable::FlagFixed : 0;
-        v->mFlags |= (verticalPolicy&QSizePolicy::ExpandFlag) ? Variable::FlagExpanding : 0;
+        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;
 
-    } else {    
+        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->mMin = item->minimumWidth();
+            v->min = item->minimumWidth();
         } else {
-            v->mMin = item->preferredWidth();
+            v->min = item->preferredWidth();
         }
-    
+
         if ( horizontalPolicy & (QSizePolicy::GrowFlag | QSizePolicy::ExpandFlag) ) {
-            v->mMax = item->maximumWidth();
+            v->max = item->maximumWidth();
         } else {
-            v->mMax = item->preferredWidth();
+            v->max = item->preferredWidth();
         }
-    
-        v->mPref = qBound( v->mMin, item->preferredWidth(), v->mMax );
-        v->mFlags |= (v->mMin == v->mMax) ? Variable::FlagFixed : 0;
-        v->mFlags |= (horizontalPolicy&QSizePolicy::ExpandFlag) ? Variable::FlagExpanding : 0;
-    }    
+
+        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;
+        }
+    }
 }
 
-void HbAnchorLayoutPrivate::createEquationsCommon( EdgeType type )
+
+GraphVertex *HbAnchorLayoutPrivate::createCenterEdge( EdgeType type, QGraphicsLayoutItem *item,  Hb::Edge edge )
 {
-    Q_Q(HbAnchorLayout);
-    VariableSet *vs = &mVariablesHorizontal;
-    DataGrid *dg = &mDataHorizontal;
-    if ( type == Vertical ) {
-        vs = &mVariablesVertical;
-        dg = &mDataVertical;
-    }
-    vs->clear();
-    dg->clear();
+    GraphVertex *middle;
+    GraphVertex *start = 0;
+    GraphVertex *end = 0;
+
+    QList<GraphEdge*> *edges = &mEdgesHorizontal;
+    QList<GraphVertex*> *vertices = &mVerticesHorizontal;
 
-    SimpleExpression se = {0,0};
+    if( type == Vertical ) {
+        if( edge != Hb::CenterVEdge ) {
+#ifdef HBANCHORLAYOUT_DEBUG
+            qDebug() << "something wrong " << __LINE__;
+#endif //HBANCHORLAYOUT_DEBUG
+            return 0;
+        }
 
-    // pseudo variable
-    Variable *v1 = vs->createVariable(0);
-    v1->mPref = 1;
-    v1->mFlags |= Variable::FlagFixed;
+        edges = &mEdgesVertical;
+        vertices = &mVerticesVertical;
 
-    vs->createVariable(q);
+        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 HBANCHORLAYOUT_DEBUG
+            qDebug() << "something wrong " << __LINE__;
+#endif //HBANCHORLAYOUT_DEBUG
+            return 0;
+        }
 
-    se.mCoef = 1;
-    for (int i=0; i<mItems.count(); i++) {
-        QGraphicsLayoutItem *item = mItems.at(i);
-        se.mVar = vs->createVariable(item);
-        
-        // left edge -> 2*i+1
-        // right edge -> 2*i+2
-        dg->setExpression( se, 2*i+2, 2*i+1 );
+        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 no anchors in this dimension...
-        bool has_any_anchor = false;
-        for (int i=0; i<mAnchors.count(); i++) {
-            HbAnchor* anchor = mAnchors.at(i);
-            if( edgeType( anchor->mStartEdge ) == type &&
-                ( anchor->mStartItem == item || anchor->mEndItem == item  ) ) {
-                has_any_anchor = true;
+    if( !( start && end ) ) {
+#ifdef HBANCHORLAYOUT_DEBUG
+        qDebug() << "something wrong " << __LINE__;
+#endif //HBANCHORLAYOUT_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( !has_any_anchor ) {
-            // ...anchor the item with a "fake anchor"
-            // to the top or the left edge of the layout.
-            se.mVar = v1;
-            se.mCoef = 0;
-            int startIndex = 0;
-            HbAnchorLayout::Edge fakeEdge = ( type == Horizontal )
-                ? Hb::LeftEdge
-                : Hb::TopEdge;
-            int endIndex = getEdgeIndex( item, fakeEdge );
-            dg->setExpression( se, endIndex, startIndex );
-            se.mCoef = 1;
-        }
     }
 
-    se.mVar = v1;
-    for (int i=0; i<mAnchors.count(); i++) {
-        HbAnchor* anchor = mAnchors.at(i);
-        if ( edgeType( anchor->mStartEdge ) == type ) {
-            Expression ex;
-            int startIndex = getEdgeIndex( anchor->mStartItem, anchor->mStartEdge );
-            int endIndex = getEdgeIndex( anchor->mEndItem, anchor->mEndEdge );
-            
-            if( ( anchor->mStartEdge == Hb::CenterHEdge ) || ( anchor->mStartEdge == Hb::CenterVEdge ) ) {
-                SimpleExpression startSE;
-                startSE.mVar = vs->findVariable( anchor->mStartItem );
-                startSE.mCoef = 0.5;
-                ex.plusSimpleExpression( startSE );
-            }
-
-            if( ( anchor->mEndEdge == Hb::CenterHEdge ) || ( anchor->mEndEdge == Hb::CenterVEdge ) ) {
-                SimpleExpression endSE;
-                endSE.mVar = vs->findVariable( anchor->mEndItem );
-                endSE.mCoef = -0.5;
-                ex.plusSimpleExpression( endSE );
-            }
-            
-            se.mCoef = anchor->mValue;
-            ex.plusSimpleExpression( se );
-            dg->setExpression( ex, endIndex, startIndex );
-        }
+    if( !oldEdge ) {
+#ifdef HBANCHORLAYOUT_DEBUG
+        qDebug() << "something wrong " << __LINE__;
+#endif //HBANCHORLAYOUT_DEBUG
+        return 0;
     }
 
-    se.mCoef = 0;
-    se.mVar = v1;
-    for( int i = 0; i <= 2*mItems.count()+1; i++ ) {
-        dg->setExpression( se, i, i );
-    }
-}
+    middle = new GraphVertex();
+    middle->itemRef = ( void* )item;
+    middle->itemSide =  edge;
+    middle->special = false;
+
+    GraphEdge *newEdge1 = new GraphEdge();
+    GraphEdge *newEdge2 = new GraphEdge();
 
-void HbAnchorLayoutPrivate::calculateSizeHint( EdgeType type )
-{
-    Q_Q(HbAnchorLayout);
-    VariableSet *vs = &mVariablesHorizontal;
-    DataGrid *dg = &mDataHorizontal;
-    if ( type == Vertical ) {
-        vs = &mVariablesVertical;
-        dg = &mDataVertical;
-    }
-    
-    createEquationsCommon( type );
+    newEdge1->startVertex = start;
+    newEdge1->endVertex = middle;
+    newEdge1->ref = ( void* )item;
 
-    Variable *vLayout = vs->findVariable( q );
+    newEdge1->expr->plusExpression( oldEdge->expr );
+    newEdge1->expr->multiply( 0.5 );
 
-    vLayout->mFlags = 0;
-    vLayout->mMin = 0;
-    vLayout->mPref = 100;
-    vLayout->mMax = 1000; 
 
-    for ( int i = 0; i < vs->mVarList.count(); i++ ) {
-        Variable *var = vs->mVarList.at(i);
-        QGraphicsLayoutItem *item = static_cast<QGraphicsLayoutItem*>(var->mRef);
-        if ( item && item != q ) {
-            setVariables( var, item, type );
-        }            
-    }
-    
-    if ( type == Horizontal ) {        
-        dg->calculate();
-         
-        if( dg->mGrid.value( 2 * mItems.count() + 1 ).contains( 0 ) ) {
-            mSx = dg->mGrid.value( 2 * mItems.count() + 1 ).value( 0 );
-        } else {
-            mSx.clear();
-        }
-                
-    } else {
-        dg->calculate();
-        
-        if( dg->mGrid.value( 2 * mItems.count() + 1 ).contains( 0 ) ) {
-            mSy = dg->mGrid.value( 2 * mItems.count() + 1 ).value( 0 );
-        } else {
-            mSy.clear();
-        }
-    }
-    
+    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;
 }
 
 /*!
@@ -569,50 +775,233 @@
 void HbAnchorLayoutPrivate::createEquations( EdgeType type )
 {
     Q_Q(HbAnchorLayout);
-    VariableSet *vs = &mVariablesHorizontal;
-    DataGrid *dg = &mDataHorizontal;
-    if ( type == Vertical ) {
-        vs = &mVariablesVertical;
-        dg = &mDataVertical;
-    }
-    vs->clear();
-    dg->clear();
-    
-    createEquationsCommon( type );
-    
-    SimpleExpression se;
-    se.mVar = vs->findVariable( q );
-    se.mCoef = 1;
-    dg->setExpression( se, 2*mItems.count()+1, 0 );
+
+    {
+
+        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 < mItems.count(); i++ ) {
+            QGraphicsLayoutItem *item = mItems.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;
+
 
-    if ( type == Horizontal ) {
-        mEquationsHorizontal = dg->calculate();
-        mSolutionHorizontal.clear();
-    } else {
-        mEquationsVertical = dg->calculate();
-        mSolutionVertical.clear();
+        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 HBANCHORLAYOUT_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 // HBANCHORLAYOUT_DEBUG
+
+        if( ! AnchorLayoutEngine::instance()->processItems( edges, vertices, vs, el ) ) {
+            mWrongAnchors = true;
+            AnchorLayoutEngine::instance()->cleanUp( layoutStart, layoutMiddle, layoutEnd, edges, vertices, el );
+//#ifdef HBANCHORLAYOUT_DEBUG
+            qDebug() << "FAIL line:" << __LINE__;
+//#endif //HBANCHORLAYOUT_DEBUG
+            return;
+        }
+
+#ifdef HBANCHORLAYOUT_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 //HBANCHORLAYOUT_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( mItems.size() * sizeof( bool ) );
+        mGeometryDefinedV.resize( mItems.size() * sizeof( bool ) );
+        mItemsGeometry.resize( ( mItems.size() + 1 ) * sizeof( ItemGeometry ) );
+
+        if( type == Vertical ) {
+            mLayoutVarV = layoutVar;
+        } else {
+            mLayoutVarH = layoutVar;
+        }
     }
 }
 
-/*!
-    \internal
-*/
-int HbAnchorLayoutPrivate::getEdgeIndex( QGraphicsLayoutItem *item, HbAnchorLayout::Edge edge )
-{
-    Q_Q(HbAnchorLayout);
-    int edgeIndex(0);
-    if ( item == q ) {
-        if ( edge == Hb::RightEdge || edge == Hb::BottomEdge ) {
-            edgeIndex = 2 * mItems.count()+1;
-        } // else -> 0
-    } else {
-        edgeIndex = 2 * q->indexOf( item )+1;
-        if ( edge == Hb::RightEdge || edge == Hb::BottomEdge ) {
-            edgeIndex += 1;
-        }
-    }
-    return edgeIndex;
-}
 
 /*!
     \internal
@@ -641,7 +1030,7 @@
         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 
+            // from the layout more efficiently than the implementation of
             // ~QGraphicsLayoutItem.
             removeAt(i);
             if (item) {
@@ -652,7 +1041,7 @@
             }
         }
     }
-    
+
     delete d_ptr;
 }
 
@@ -661,10 +1050,10 @@
     (\a startItem, \a startEdge) and (\a endItem, \a endEdge).
 
     The edges can be either horizontal (e.g. left) or vertical (e.g. top)
-    and you can connect only the same type of edges with each other. 
+    and you can connect only the same type of edges with each other.
     That is, it is not allowed to connect e.g. top edge of an item to the
     left edge of another one. Also there are horizontal and vertical center edges.
-    
+
     The distance between the two edges is defined by \a value.
     If \a value is positive the end edge is to the right or below the start edge.
     If \a value is negative the end edge is to the left or above the start edge.
@@ -673,15 +1062,15 @@
     or between two child layout items, or even between two edges of the same
     child layout item (when you are essentially defining the height or width
     of the item).
-    
+
     There could be only one anchor between two edges, that mean that every next
     call of setAnchor for the same edges will just update existing anchor between them.
     So even though anchors are directional, if you first set anchor between A and B, and
-    after that from B to A, then second anchor will just override the first one.    
-    
-    
+    after that from B to A, then second anchor will just override the first one.
+
+
     \a startItem and  \a endItem will automatically be added to the layout.
-    
+
     \param startItem source item.
     \param startEdge source edge.
     \param endItem target item.
@@ -690,9 +1079,9 @@
     \return true if anchor was successfully added, false otherwise
 */
 bool HbAnchorLayout::setAnchor( QGraphicsLayoutItem *startItem,
-                             HbAnchorLayout::Edge startEdge,
+                             Hb::Edge startEdge,
                              QGraphicsLayoutItem *endItem,
-                             HbAnchorLayout::Edge endEdge,
+                             Hb::Edge endEdge,
                              qreal value )
 {
     Q_D( HbAnchorLayout );
@@ -716,7 +1105,7 @@
 
     HbAnchor* anchor = d->getAnchor(startItem, startEdge, endItem, endEdge);
     HbAnchor* anchor2 = d->getAnchor(endItem, endEdge, startItem, startEdge);
-    
+
     if ( anchor ) {
         anchor->mValue = value;
     } else if ( anchor2 ) {
@@ -726,7 +1115,6 @@
         d->mAnchors.append(anchor);
     }
 
-    d->mEquationsDirty = true;
     invalidate();
     return true;
 }
@@ -738,7 +1126,7 @@
 
     Notice: The item will be removed from the layout if this is the last
     anchor connecting the item.
-    
+
     \param item1 first item.
     \param edge1 first edge.
     \param item2 second item.
@@ -746,9 +1134,9 @@
     \return true if anchor was successfully removed, false otherwise
 */
 bool HbAnchorLayout::removeAnchor( QGraphicsLayoutItem *item1,
-                                   HbAnchorLayout::Edge edge1,
+                                   Hb::Edge edge1,
                                    QGraphicsLayoutItem *item2,
-                                   HbAnchorLayout::Edge edge2 )
+                                   Hb::Edge edge2 )
 {
     Q_D( HbAnchorLayout );
     HbAnchor *anchor = d->getAnchor( item1, edge1, item2, edge2 );
@@ -779,7 +1167,7 @@
             item2->setParentLayoutItem( 0 );
             d->mItems.removeAt(indexOf(item2));
         }
-        d->mEquationsDirty = true;
+        delete anchor;
         invalidate();
         return true;
     } else {
@@ -800,6 +1188,7 @@
 void HbAnchorLayout::setGeometry(const QRectF &rect)
 {
     Q_D( HbAnchorLayout );
+
     QGraphicsLayout::setGeometry(rect);
     d->setItemGeometries();
     d->mInvalidateCalled = false;
@@ -810,7 +1199,7 @@
     Removes the item at index, \a index, without destroying it.
 
     Removes all the anchors connected to the removed item.
-    
+
     \param index index of item to be removed.
 */
 void HbAnchorLayout::removeAt(int index)
@@ -832,7 +1221,6 @@
         d->mItems.removeAt(index);
     }
 
-    d->mEquationsDirty = true;
     invalidate();
 }
 
@@ -895,7 +1283,7 @@
 bool HbAnchorLayout::isValid() const
 {
     Q_D( const HbAnchorLayout );
-    return d->mValid;
+    return ( d->mValid && ( ! d->mWrongAnchors ) );
 }
 
 /*!
@@ -904,8 +1292,9 @@
 void HbAnchorLayout::invalidate()
 {
     Q_D( HbAnchorLayout );
-    d->mSizeHintDirty = true;
+    d->mWrongAnchors = false;
     d->mInvalidateCalled = true;
+    d->mEquationsDirty = true;
     QGraphicsLayout::invalidate();
 }
 
@@ -926,83 +1315,57 @@
 QSizeF HbAnchorLayout::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
 {
     Q_D( const HbAnchorLayout );
-    Q_UNUSED( constraint );    
-    
+    Q_UNUSED( constraint );
+
     return const_cast<HbAnchorLayoutPrivate*>(d)->sizeHint( which );
 }
 
 QSizeF HbAnchorLayoutPrivate::sizeHint( Qt::SizeHint which )
 {
-    if( mSizeHintDirty ) {
-        calculateSizeHint( Horizontal );
-        calculateSizeHint( Vertical );
-        mEquationsDirty = true;        
-        mSizeHintDirty = false;
-        
-        
-        
-        if( mSx.mExpression.size() > 0 ) {
+    if ( mEquationsDirty ) {
+        mEquationsDirty = false;
+        createEquations( Horizontal );
+        createEquations( Vertical );
+    }
 
-            mMinSH.setWidth( mSx.minValue() );
-            mPrefSH.setWidth( mSx.prefValue() );
-            mMaxSH.setWidth( mSx.maxValue() );
+
+    if( mLayoutVarH && mLayoutVarV ) {
+
+        QSizeF res;
 
-            if( mMinSH.width() < 0 ) {
-                mMinSH.setWidth( 0 );
-            }
-
-            if( mPrefSH.width() < 0 ) {
-                mPrefSH.setWidth( 0 );
+        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( mMaxSH.width() < 0 ) {
-                mMaxSH.setWidth( 0 );
-            }
-
-        } else {
-            mMinSH.setWidth( 0 );
-            mPrefSH.setWidth( 100 );
-            mMaxSH.setWidth( 1000 );
         }
-        
-        if( mSy.mExpression.size() > 0 ) {
-            mMinSH.setHeight( mSy.minValue() );
-            mPrefSH.setHeight( mSy.prefValue() );            
-            mMaxSH.setHeight( mSy.maxValue() );
 
-            if( mMinSH.height() < 0 ) {
-                mMinSH.setHeight( 0 );
-            }
-
-            if( mPrefSH.height() < 0 ) {
-                mPrefSH.setHeight( 0 );
-            }
-
-            if( mMaxSH.height() < 0 ) {
-                mMaxSH.setHeight( 0 );
-            }
+        if( mLayoutVarV->sizeProp.flags & SizeProperty::FlagFixed ) {
+            res.setHeight( mLayoutVarV->sizeProp.pref );
         } else {
-            mMinSH.setHeight( 0 );
-            mPrefSH.setHeight( 100 );
-            mMaxSH.setHeight( 1000 );
+            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 );
+            }
         }
-        
-        mSx.clear();
-        mSy.clear();
-        
+
+        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 );
+        }
     }
-    
-    
-    QSizeF res;
-    
-    if (which == Qt::MinimumSize) {
-        res = mMinSH;
-    } else if (which == Qt::PreferredSize ) {
-        res = mPrefSH;
-    } else {
-        res = mMaxSH;
-    }
-    
-    return res;
 }
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/layouts/hbanchorlayout.h
--- a/src/hbcore/layouts/hbanchorlayout.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/layouts/hbanchorlayout.h	Mon May 03 12:48:33 2010 +0300
@@ -38,22 +38,22 @@
 {
 public:
     typedef Hb::Edge Edge;
-    
+
     explicit HbAnchorLayout(QGraphicsLayoutItem *parent = 0);
     virtual ~HbAnchorLayout();
 
     bool setAnchor(
         QGraphicsLayoutItem *startItem,
-        Edge startEdge,
+        Hb::Edge  startEdge,
         QGraphicsLayoutItem *endItem,
-        Edge endEdge,
+        Hb::Edge  endEdge,
         qreal value);
 
     bool removeAnchor(
         QGraphicsLayoutItem *startItem,
-        Edge startEdge,
+        Hb::Edge  startEdge,
         QGraphicsLayoutItem *endItem,
-        Edge endEdge);
+        Hb::Edge  endEdge);
 
     void removeAt(int index);
     void removeItem(QGraphicsLayoutItem* item);
@@ -80,5 +80,5 @@
     friend class HbAnchorLayoutDebug;
 };
 
-#endif
+#endif // HBANCHORLAYOUT_H
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/layouts/hbanchorlayoutengine_p.cpp
--- a/src/hbcore/layouts/hbanchorlayoutengine_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/layouts/hbanchorlayoutengine_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -35,292 +35,851 @@
 #endif
 
 #define EPSILON 0.01f
+#define MAX_SIZE 0xffffff
 
 static inline bool myFuzzyCompare(double p1, double p2)
 {
-    return (qAbs(p1 - p2) <= 0.000000000001);
+    return (qAbs(p1 - p2) <= 0.0001);
 }
 
 static inline bool myFuzzyCompare(float p1, float p2)
 {
-    return (qAbs(p1 - p2) <= 0.00001f);
-}
-
-/*!
-    \internal
-*/
-DataGrid::DataGrid() : mResult(), mSize( 0 )
-{
-}
-
-/*!
-    \internal
-*/
-DataGrid::~DataGrid()
-{
-    clear();
-}
-
-/*!
-    \internal
-*/
-void DataGrid::clear()
-{
-    mGrid.clear();
-    mResult.clear();
-    mSize = 0;
-}
-
-/*!
-    \internal
-*/
-void DataGrid::setExpression( const SimpleExpression ex, int i, int j )
-{
-    Expression e;
-    e.plusSimpleExpression( ex );
-    setExpression( e, i, j );
-}
-
-/*!
-    \internal
-*/
-void DataGrid::setExpression( const Expression ex, int i, int j )
-{
-    Expression ex2 = ex;
-    if ( mGrid[i].contains( j ) ) {
-        Equation eq( mGrid.value(i).value(j), ex );
-        if ( ( ! mResult.contains( eq ) ) && ( !eq.isTrivial() ) ) {
-            mResult.append( eq );
-#ifdef HBANCHORLAYOUT_DEBUG
-            qDebug( "Create extra equation on cell %d %d: %s", i, j, eq.print().toLatin1().data() );
-#endif
-            return;
-        }
-    }
-
-    mGrid[i][j] = ex2;
-    ex2.minus();
-    mGrid[j][i] = ex2;
-
-
-    if (mSize  < i + 1) {
-        mSize = i + 1;
-    }
-    if (mSize  < j + 1) {
-        mSize = j + 1;
-    }
-}
-
-/*!
-    \internal
-*/
-qreal DataGrid::value( int i, int j, Solution *solution, bool &ok )  const
-{
-    ok = true;
-    if( mGrid.value(i).contains( j ) ) {
-        return mGrid.value(i).value(j).value( solution );
-    }
-    ok = false;
-    return 0;
-}
-
-/*!
-    \internal
-*/
-QList<Equation> DataGrid::calculate()
-{
-
-#ifdef HBANCHORLAYOUT_DEBUG
-    qDebug( "\nbefore:" );
-
-    for( int j = 0; j < mSize; j++ ) {
-        QString line;
-        line.sprintf( "%d  ", j );
-        for( int i = 0; i < mSize; i++ ) {
-            if( mGrid.value(i).contains( j ) ) {
-                line.append( "X   " );
-            } else {
-                line.append( "_   " );
-            }
-        }
-        line.append( '\n' );
-        qDebug() << line;
-    }
-#endif // HBANCHORLAYOUT_DEBUG
-
-
-    for( int i = 1; i < mSize; i++ ) {
-        calculateLine( i );
-    }
-
-    for( int i = mSize - 1; i > 0; i-- ) {
-        if( ! mGrid.value( i ).contains( 0 ) ) {
-            calculateLine( i );
-        }
-    }
-
-    for( int i = 1; i < mSize; i++ ) {
-        if( ! mGrid.value( i ).contains( 0 ) ) {
-            calculateLine( i );
-        }
-    }
-
-#ifdef HBANCHORLAYOUT_DEBUG
-    qDebug( "\nafter:" );
-
-    for( int j = 0; j < mSize; j++ ) {
-        QString line;
-        line.sprintf( "%d  ", j );
-        for( int i = 0; i < mSize; i++ ) {
-            if( mGrid.value(i).contains( j ) ) {
-                line.append( "X   " );
-            } else {
-                line.append( "_   " );
-            }
-        }
-        line.append( '\n' );
-        qDebug() << line;
-    }
-
-    qDebug( "number of equations: %d", mResult.size() );
-    for( int i = 0; i < mResult.size(); i++ ) {
-        qDebug( "equation %d: %s", i, mResult.at(i).print().toLatin1().data() );
-    }
-#endif // HBANCHORLAYOUT_DEBUG
-
-    return mResult;
-}
-
-/*!
-    \internal
-*/
-void DataGrid::calculateLine( int x )
-{
-    QHash< int, Expression > vertical = mGrid.value( x );
-    bool flag = false;
-
-    QList<int>::const_iterator i;
-    QList<int> keys = vertical.keys();
-
-    for ( i = keys.constBegin(); i != keys.constEnd(); ++i ) {
-        if ( ( *i <= x ) && ( *i != 0 ) ) {
-            if ( checkLine( x, *i ) ) {
-                flag = true;
-            }
-        }
-    }
-
-    if ( flag ) {
-        return;
-    }
-
-    for ( i = keys.constBegin(); i != keys.constEnd(); ++i ) {
-        if ( *i > x ) {
-            checkLine( x, *i );
-        }
-    }
-}
-
-/*!
-    \internal
-*/
-bool DataGrid::checkLine( int x, int y )
-{
-    for ( int i = 0; i < mSize; i++ ) {
-        if ( ( mGrid.value(i).contains( y ) ) && ( mGrid.value(i).contains( 0 ) ) && ( i != x ) ) {
-            calculateRect( x, 0, i, y );
-            return true;
-        }
-    }
-    return false;
-}
-
-/*!
-    \internal
-*/
-void DataGrid::calculateRect( int ax, int ay, int cx, int cy )
-{
-    Expression exp;
-
-    /*
-    A ---  B
-    --------
-    D ---  C
-
-    A = B + D - C
-    */
-
-    exp.minusExpression( mGrid.value(cx).value(cy) );
-    exp.plusExpression( mGrid.value(cx).value(ay) );
-    exp.plusExpression( mGrid.value(ax).value(cy) );
-
-    if ( mGrid.value(ax).contains( ay ) ) {
-        Equation eq( mGrid.value(ax).value(ay), exp );
-        if ( ( ! mResult.contains( eq ) ) && ( !eq.isTrivial() ) ) {
-            mResult.append( eq );
-        }
-    } else {
-        mGrid[ax][ay] = exp;
-    }
-
-}
-
-/*!
-    \internal
-*/
-Equation::Equation( const Expression &exp1, const Expression &exp2 ) : mFormula()
-{
-    mFormula.plusExpression( exp1 );
-    mFormula.minusExpression( exp2 );
-}
-
-/*!
-    \internal
-*/
-Equation::~Equation()
-{
-}
-
-/*!
-    \internal
-*/
-bool Equation::isTrivial() const
-{
-    if ( mFormula.mExpression.count() == 0 ) {
-        return true;
-    }
-    return false;
-}
-
-/*!
-    \internal
-*/
-bool Equation::operator== ( const Equation &first ) const
-{
-    return EquationSolver::compareEquations( first, *this );
-}
-
-QString Equation::print() const
-{
-    return QString( mFormula.print() ) + QString( " = 0" );
+    return (qAbs(p1 - p2) <= EPSILON);
 }
 
 
 static inline qreal minSlope(const Variable &var, qreal coef )
 {
-    return var.mPref + ( var.mMin - var.mPref )* coef;
+    return var.sizeProp.pref + ( var.sizeProp.min - var.sizeProp.pref ) * coef;
 }
 
 static inline qreal maxSlope(const Variable &var, qreal coef )
 {
-    return var.mPref + ( var.mMax - var.mPref )* coef;
+    return var.sizeProp.pref + ( var.sizeProp.max - var.sizeProp.pref ) * coef;
+}
+
+static inline bool differentSignOrZero( qreal val1, qreal val2 )
+{
+    return ( ( val1 < EPSILON ) && ( val2 > -EPSILON ) ) || ( ( val1 > -EPSILON ) && ( val2 < EPSILON ) );
+}
+
+
+AnchorLayoutEngine::AnchorLayoutEngine()
+{
+}
+
+AnchorLayoutEngine::~AnchorLayoutEngine()
+{
+}
+
+AnchorLayoutEngine *AnchorLayoutEngine::instance()
+{
+    static AnchorLayoutEngine theAnchorLayoutSimplyfier;
+    return &theAnchorLayoutSimplyfier;
+}
+
+bool AnchorLayoutEngine::processItems( QList<GraphEdge*> *edges, QList<GraphVertex*> *vertices, VariableSet *vs, QList<Expression*> *el )
+{
+    bool result = true;
+
+    int oldEdgesNumber;
+    int oldVerticesNumber;
+
+    bool inLoop = true;
+
+    enum {
+        COMMON_ACTIONS,
+        SPLIT_1,
+        SPLIT_2,
+        ERROR,
+        DONE
+    } state;
+
+    state = COMMON_ACTIONS;
+    while( inLoop ) {
+        switch( state ) {
+            case COMMON_ACTIONS:
+                if( !findBranches( edges, vertices ) ) {
+                    state = ERROR;
+                    break;
+                }
+
+                oldEdgesNumber = edges->size();
+                oldVerticesNumber = vertices->size();
+
+                if( ! findSerialChains( edges, vertices, el ) ) {
+                    state = ERROR;
+                    break;
+                }
+
+                if( ! findParallelChains( edges, vertices, vs, el ) ) {
+                    state = ERROR;
+                    break;
+                }
+
+                if( ready( vertices ) ) {
+                    state = DONE;
+                    break;
+                }
+
+                if( ( oldEdgesNumber == edges->size() ) && ( oldVerticesNumber == vertices->size() ) ) {
+                    state = SPLIT_1;
+                    break;
+                }
+
+                break;
+            case SPLIT_1:
+                if( splitVertices( edges, vertices, 1 ) ) {
+                    state = COMMON_ACTIONS;
+                    break;
+                }
+                state = SPLIT_2;
+                break;
+            case SPLIT_2:
+                if( splitVertices( edges, vertices, 2 ) ) {
+                    state = COMMON_ACTIONS;
+                    break;
+                }
+                state = ERROR;
+                break;
+            case ERROR:
+                result = false;
+                // cleanup;
+            case DONE:
+                inLoop = false;
+                break;
+            default:
+                state = ERROR;
+                break;
+        }
+    }
+
+    return result;
+}
+
+GraphVertex *AnchorLayoutEngine::nextVertex( GraphVertex *currentVertex, GraphEdge *currentEdge, int *sign )
+{
+    if( currentEdge->startVertex == currentVertex ) {
+        *sign = 1;
+        return currentEdge->endVertex;
+    }
+    *sign = -1;
+    return currentEdge->startVertex;
+}
+
+GraphEdge *AnchorLayoutEngine::nextEdge( GraphVertex *currentVertex, GraphEdge *currentEdge )
+{
+    if( currentVertex->edges.at(0) == currentEdge ) {
+        return currentVertex->edges.at(1);
+    }
+    return currentVertex->edges.at(0);
+}
+
+bool AnchorLayoutEngine::findSerialChains( QList<GraphEdge*> *edges, QList<GraphVertex*> *vertices, QList<Expression*> *el )
+{
+    bool result = true;
+
+    GraphEdge *newEdge;
+
+    GraphEdge *currentEdge;
+    GraphVertex *currentVertex;
+    GraphVertex *initialVertex;
+
+    GraphVertex *oldEndVertex, *oldStartVertex;
+    GraphEdge *oldEndEdge, *oldStartEdge;
+
+    GraphVertex *vertexToDelete;
+    GraphEdge *edgeToDelete;
+
+    GraphEdge *rightEdge, *leftEdge;
+
+    int sign;
+
+
+    Expression *expr;
+
+    for( int i = 0; i < vertices->size(); i++ ) {
+
+        initialVertex =  vertices->at(i);
+
+        if( ( initialVertex->edges.size() == 2 ) && ( ! initialVertex->special ) ) {
+
+            expr = new Expression();
+
+            rightEdge = initialVertex->edges.at(1);
+            leftEdge = initialVertex->edges.at(0);
+
+            // left side
+            currentEdge = rightEdge;
+            currentVertex = initialVertex;
+
+
+            edgeToDelete = 0;
+            vertexToDelete = 0;
+
+            do {
+
+                vertices->removeOne( currentVertex );
+                currentEdge = nextEdge( currentVertex, currentEdge );
+                currentVertex = nextVertex( currentVertex, currentEdge, &sign );
+
+                if( sign > 0 ) {
+                    expr->minusExpression( currentEdge->expr );
+                } else {
+                    expr->plusExpression( currentEdge->expr );
+                }
+
+                edges->removeOne( currentEdge );
+
+                delete vertexToDelete;
+
+                if( edgeToDelete != leftEdge ) {
+                    delete edgeToDelete;
+                }
+
+                vertexToDelete = currentVertex;
+                edgeToDelete = currentEdge;
+
+
+#ifdef HBANCHORLAYOUT_DEBUG
+                qDebug() << "Adding one more left edge";
+#endif //HBANCHORLAYOUT_DEBUG
+
+            } while( ( currentVertex != initialVertex ) && ( currentVertex->edges.size() == 2 ) && ( ! currentVertex->special ) );
+
+            if( currentVertex == initialVertex ) {
+                el->append( expr );
+                edges->removeOne( currentVertex->edges.at(0) );
+                vertices->removeOne( currentVertex );
+
+                qDeleteAll( initialVertex->edges );
+                delete currentVertex;
+                i--;
+                continue;
+            }
+
+
+            oldStartVertex = currentVertex;
+            oldStartEdge = currentEdge;
+
+
+            // right side
+            currentEdge = leftEdge;
+            currentVertex = initialVertex;
+
+            edgeToDelete = 0;
+            vertexToDelete = 0;
+
+            do {
+                vertices->removeOne( currentVertex );
+                currentEdge = nextEdge( currentVertex, currentEdge );
+                currentVertex = nextVertex( currentVertex, currentEdge, &sign );
+
+                edges->removeOne( currentEdge );
+
+
+                if( sign < 0 ) {
+                    expr->minusExpression( currentEdge->expr );
+                } else {
+                    expr->plusExpression( currentEdge->expr );
+                }
+
+                delete vertexToDelete;
+
+                if( edgeToDelete != rightEdge ) {
+                    delete edgeToDelete;
+                }
+
+                vertexToDelete = currentVertex;
+                edgeToDelete = currentEdge;
+
+
+#ifdef HBANCHORLAYOUT_DEBUG
+                qDebug() << "Adding one more right edge";
+#endif //HBANCHORLAYOUT_DEBUG
+
+            } while( ( currentVertex->edges.size() == 2 ) && ( ! currentVertex->special ) );
+
+
+            oldEndVertex = currentVertex;
+            oldEndEdge = currentEdge;
+
+            if( oldStartVertex == oldEndVertex ) {
+                el->append( expr );
+
+                currentVertex->edges.removeOne( currentEdge );
+                currentVertex->edges.removeOne( oldStartEdge );
+
+                edges->removeOne( currentEdge );
+                edges->removeOne( oldStartEdge );
+
+                if( ( rightEdge != currentEdge ) && ( leftEdge != currentEdge ) ) {
+                    delete currentEdge;
+                }
+                if( ( rightEdge != oldStartEdge ) && ( leftEdge != oldStartEdge ) ) {
+                    delete oldStartEdge;
+                }
+
+                delete rightEdge;
+                delete leftEdge;
+
+                if( currentVertex->edges.size() == 0 ) {
+                    vertices->removeOne( currentVertex );
+                    if( !currentVertex->special ) {
+                        delete currentVertex;
+                    }
+                    i--;
+                }
+
+                continue;
+            }
+
+            newEdge = new GraphEdge( false );
+
+            newEdge->startVertex = oldStartVertex;
+            newEdge->endVertex = oldEndVertex;
+
+            oldStartVertex->edges.removeOne( oldStartEdge );
+            oldEndVertex->edges.removeOne( oldEndEdge );
+
+            oldStartVertex->edges.append( newEdge );
+            oldEndVertex->edges.append( newEdge );
+
+            newEdge->expr = expr;
+            edges->append( newEdge );
+            i--;
+
+            if( ( rightEdge != oldStartEdge ) && ( leftEdge != oldStartEdge ) ) {
+                delete oldStartEdge;
+            }
+            if( ( rightEdge != oldEndEdge ) && ( leftEdge != oldEndEdge ) ) {
+                delete oldEndEdge;
+            }
+
+            delete rightEdge;
+            delete leftEdge;
+            delete initialVertex;
+
+
+#ifdef HBANCHORLAYOUT_DEBUG
+            qDebug()<< "### Serial New Edge: start= " << newEdge->startVertex->itemSide << ", " << (int)(newEdge->startVertex->itemRef) << ", " << newEdge->startVertex->special;
+            qDebug()<< "### Serial New Edge: end= " << newEdge->endVertex->itemSide << ", " << (int)(newEdge->endVertex->itemRef) << ", " << newEdge->endVertex->special;
+            qDebug() << "### Serial New Edge size prop: min" << expr->minValue() << " pref:" << expr->prefValue() <<
+                    " max:" << expr->maxValue() << " flags" << expr->flags();
+#endif //HBANCHORLAYOUT_DEBUG
+        }
+    }
+    return result;
 }
 
 
-/*!
-    \internal
-*/
-bool EquationSolver::solveEquation( QList<Equation> el, VariableSet &varset, Solution *solution )
+bool AnchorLayoutEngine::findParallelChains( QList<GraphEdge*> *edges, QList<GraphVertex*> *vertices, VariableSet *vs, QList<Expression*> *el )
+{
+    Q_UNUSED( vertices );
+    bool result = true;
+    GraphEdge *newEdge = 0;
+
+    GraphVertex *oldStart = 0;
+    GraphVertex *oldEnd = 0;
+
+    GraphEdge *current;
+    GraphEdge *compared;
+
+
+    bool found = false;
+    int sign;
+    int numberOfParallelEdges;
+    QList<qreal> expandingPrefValues;
+
+    Expression *expr;
+
+    SizeProperty *newEdgeSizeProp(0);
+
+    SimpleExpression se;
+
+    uint comparedEdgeFlags;
+
+    for( int i = 0; ( i < edges->size() ) && result; i++ ) {
+        current = edges->at(i);
+        numberOfParallelEdges = 1;
+        expandingPrefValues.clear();
+        for( int j = i + 1; j <  edges->size(); j++ ) {
+            compared = edges->at(j);
+            found = false;
+
+            if( ( current->startVertex == compared->startVertex ) && ( current->endVertex == compared->endVertex ) ) {
+                found = true;
+                sign = 1;
+            } else if( ( current->startVertex == compared->endVertex ) && ( current->endVertex == compared->startVertex ) ) {
+                found = true;
+                sign = -1;
+            }
+
+            if( found ) {
+                numberOfParallelEdges++;
+
+                j--;
+                if( numberOfParallelEdges == 2 ) {
+                    newEdge = new GraphEdge();
+
+                    oldStart = current->startVertex;
+                    oldEnd = current->endVertex;
+
+                    se.mVar = vs->createVariable( 0 );
+                    se.mCoef = 1;
+
+                    newEdgeSizeProp = &( se.mVar->sizeProp );
+                    newEdgeSizeProp->min = current->expr->minValue();
+                    newEdgeSizeProp->max = current->expr->maxValue();
+                    newEdgeSizeProp->flags = current->expr->flags();
+
+                    if( newEdgeSizeProp->flags & SizeProperty::FlagExpanding ) {
+                        expandingPrefValues.append( current->expr->prefValue() );
+                        newEdgeSizeProp->pref = 0;
+                    } else {
+                        newEdgeSizeProp->pref = current->expr->prefValue();
+                    }
+
+
+
+                    oldStart->edges.removeOne( current );
+                    oldEnd->edges.removeOne( current );
+
+                    oldStart->edges.append( newEdge );
+                    oldEnd->edges.append( newEdge );
+
+                    newEdge->startVertex = oldStart;
+                    newEdge->endVertex = oldEnd;
+
+                    edges->removeOne( current );
+
+                    el->append( current->expr->toEquation( se ) );
+                }
+
+                oldStart->edges.removeOne( compared );
+                oldEnd->edges.removeOne( compared );
+
+                edges->removeOne( compared );
+
+                comparedEdgeFlags = compared->expr->flags();
+
+                if( ~newEdgeSizeProp->flags & SizeProperty::FlagFixed ) {
+                    if( comparedEdgeFlags & SizeProperty::FlagFixed ) {
+                        newEdgeSizeProp->pref = sign * compared->expr->prefValue();
+                        newEdgeSizeProp->flags |= SizeProperty::FlagFixed;
+                    } else {
+                        if( sign * compared->expr->minValue() < sign * compared->expr->maxValue()  ) {
+                            newEdgeSizeProp->min = qMax( newEdgeSizeProp->min, sign * compared->expr->minValue() );
+                            newEdgeSizeProp->max = qMin( newEdgeSizeProp->max, sign * compared->expr->maxValue() );
+                        } else {
+                            newEdgeSizeProp->min = qMax( newEdgeSizeProp->min, sign * compared->expr->maxValue() );
+                            newEdgeSizeProp->max = qMin( newEdgeSizeProp->max, sign * compared->expr->minValue() );
+                        }
+                        if( comparedEdgeFlags & SizeProperty::FlagExpanding ) {
+                            expandingPrefValues.append( sign * compared->expr->prefValue() );
+                        } else {
+                            newEdgeSizeProp->pref += sign * compared->expr->prefValue();
+                        }
+                    }
+
+                    if( ~comparedEdgeFlags & SizeProperty::FlagExpanding ) {
+                        newEdgeSizeProp->flags &= ~SizeProperty::FlagExpanding;
+                    }
+
+                    expr = new Expression();
+                    if( sign < 0 ) {
+                        expr->minusSimpleExpression( se );
+                    } else {
+                        expr->plusSimpleExpression( se );
+                    }
+                    expr->minusExpression( compared->expr );
+
+                    el->append( expr );
+
+                    delete compared;
+                } else {
+                    if( comparedEdgeFlags & SizeProperty::FlagFixed ) {
+                        if( ! myFuzzyCompare( newEdgeSizeProp->pref, sign * compared->expr->prefValue() ) ) {
+#ifdef HBANCHORLAYOUT_DEBUG
+                            qDebug()<< "!!!  two different parallel fixed items";
+#endif //HBANCHORLAYOUT_DEBUG
+                            // ERROR!!!
+                            delete compared;
+                            delete current;
+                            delete newEdge;
+                            result = false;
+                            break;
+                        }
+                    } else {
+                        expr = new Expression();
+                        if( sign < 0 ) {
+                            expr->minusSimpleExpression( se );
+                        } else {
+                            expr->plusSimpleExpression( se );
+                        }
+                        expr->minusExpression( compared->expr );
+
+                        el->append( expr );
+                        delete compared;
+                    }
+                }
+
+            }
+        }
+
+        if( ( numberOfParallelEdges > 1 ) && result ) {
+            delete current;
+            i--; // ???
+            newEdge->expr->plusSimpleExpression( se );
+            edges->append( newEdge );
+            if( newEdgeSizeProp->min - newEdgeSizeProp->max > EPSILON ) {
+#ifdef HBANCHORLAYOUT_DEBUG
+                qDebug() << "!!! min is bigger than max. min:" << newEdgeSizeProp->min << " max:" << newEdgeSizeProp->max;
+#endif //HBANCHORLAYOUT_DEBUG
+                // ERROR!!!
+                result = false;
+                break;
+            } else {
+                if( ~newEdgeSizeProp->flags & SizeProperty::FlagFixed ) {
+                    int expectedPref = 0;
+                    if( expandingPrefValues.size() < numberOfParallelEdges ) {
+                        expectedPref = static_cast<int>(newEdgeSizeProp->pref / ( numberOfParallelEdges - expandingPrefValues.size() ));
+                    }
+
+                    qSort( expandingPrefValues );
+                    if( ( !expandingPrefValues.isEmpty() ) && ( qAbs( expandingPrefValues.last() ) < qAbs( expandingPrefValues.first() ) ) ) {
+                        qSort( expandingPrefValues.begin(), expandingPrefValues.end(), qGreater<qreal>() );
+                    }
+
+                    while( expandingPrefValues.size() > 0 ) {
+                        if( qAbs( expandingPrefValues.last() ) > qAbs( expectedPref ) ) {
+                            newEdgeSizeProp->pref += expandingPrefValues.last();
+                            expandingPrefValues.removeLast();
+                            expectedPref = static_cast<int>(newEdgeSizeProp->pref / ( numberOfParallelEdges - expandingPrefValues.size() ));
+                        } else {
+                            break;
+                        }
+                    }
+                    newEdgeSizeProp->pref = expectedPref;
+
+                    if( newEdgeSizeProp->pref < newEdgeSizeProp->min ) {
+                        newEdgeSizeProp->pref = newEdgeSizeProp->min;
+                    }
+                    if( newEdgeSizeProp->pref > newEdgeSizeProp->max ) {
+                        newEdgeSizeProp->pref = newEdgeSizeProp->max;
+                    }
+                }
+            }
+#ifdef HBANCHORLAYOUT_DEBUG
+            qDebug()<< "### Parallel New Edge: start= " << newEdge->startVertex->itemSide << ", " << (int)(newEdge->startVertex->itemRef) << ", " << newEdge->startVertex->special;
+            qDebug()<< "### Parallel New Edge: end= " << newEdge->endVertex->itemSide << ", " << (int)(newEdge->endVertex->itemRef) << ", " << newEdge->endVertex->special;
+            qDebug() << "### Parallel New Edge size prop: min" << newEdgeSizeProp->min << " pref:" << newEdgeSizeProp->pref <<
+                    " max:" << newEdgeSizeProp->max << " flags" << newEdgeSizeProp->flags;
+#endif //HBANCHORLAYOUT_DEBUG
+        }
+    }
+
+    return result;
+}
+
+
+bool AnchorLayoutEngine::findBranches( QList<GraphEdge*> *edges, QList<GraphVertex*> *vertices )
+{
+    bool result = true;
+
+    GraphEdge *currentEdge;
+    GraphVertex *currentVertex;
+    GraphVertex *initialVertex;
+
+    GraphVertex *vertexToDelete;
+    GraphEdge *edgeToDelete;
+
+
+    int sign;
+
+    for( int i = 0; i < vertices->size(); i++ ) {
+
+        initialVertex =  vertices->at(i);
+
+        if( ( initialVertex->edges.size() == 1 ) && ( ! initialVertex->special ) ) {
+
+            currentEdge = initialVertex->edges.at(0);
+            currentVertex = nextVertex( initialVertex, currentEdge, &sign );
+
+            vertices->removeOne( initialVertex );
+            edges->removeOne( currentEdge );
+
+            while( ( currentVertex->edges.size() == 2 ) && ( ! currentVertex->special ) ) {
+                vertexToDelete = currentVertex;
+                edgeToDelete = currentEdge;
+
+                vertices->removeOne( currentVertex );
+                currentEdge = nextEdge( currentVertex, currentEdge );
+                currentVertex = nextVertex( currentVertex, currentEdge, &sign );
+
+                edges->removeOne( currentEdge );
+
+                delete vertexToDelete;
+                delete edgeToDelete;
+            }
+
+            currentVertex->edges.removeOne( currentEdge );
+
+            if( currentVertex->edges.size() == 0 ) {
+                vertices->removeOne( currentVertex );
+                if( !currentVertex->special ) {
+                    delete currentVertex;
+                }
+            }
+            delete currentEdge;
+            i = 0;
+#ifdef HBANCHORLAYOUT_DEBUG
+            qDebug()<< "### Branch New Edge";
+#endif //HBANCHORLAYOUT_DEBUG
+        }
+    }
+
+    return result;
+}
+
+void AnchorLayoutEngine::attachToLayout( GraphVertex *start, GraphVertex *middle, GraphVertex *end, Variable *layoutVar,
+                                         QList<Expression*> *el )
+{
+    GraphEdge *current;
+    SimpleExpression se;
+    se.mVar = layoutVar;
+    bool found;
+
+    int count = 0;
+
+    if( start ) {
+        for( int i = 0; i < start->edges.size(); i++ ) {
+            current = start->edges.at(i);
+            found = false;
+            if( ( current->startVertex == start ) && ( current->endVertex == middle ) ) {
+                se.mCoef = 0.5;
+                found = true;
+            } else if( ( current->startVertex == middle ) && ( current->endVertex == start ) ) {
+                se.mCoef = -0.5;
+                found = true;
+            } else if( ( current->startVertex == start ) && ( current->endVertex == end ) ) {
+                se.mCoef = 1;
+                found = true;
+            } else if( ( current->startVertex == end ) && ( current->endVertex == start ) ) {
+                se.mCoef = -1;
+                found = true;
+            }
+
+            if( found ) {
+                if( count == 0 ) {
+                    layoutVar->sizeProp.min = 0;
+                    layoutVar->sizeProp.max = MAX_SIZE;
+                    layoutVar->sizeProp.pref = 0;
+                    layoutVar->sizeProp.flags = 0;
+                }
+                count++;
+
+                el->append( current->expr->toEquation( se ) );
+
+                if( current->expr->isFixed() ) {
+                    if( ~layoutVar->sizeProp.flags & SizeProperty::FlagFixed ) {
+                        layoutVar->sizeProp.flags |= SizeProperty::FlagFixed;
+                        layoutVar->sizeProp.pref = current->expr->prefValue() / se.mCoef;
+                    }
+                    // else some compare and indicate error
+                } else if( ~layoutVar->sizeProp.flags & SizeProperty::FlagFixed ) {
+                    if( current->expr->minValue() / se.mCoef < current->expr->maxValue() / se.mCoef ) {
+                        layoutVar->sizeProp.min = qMax( layoutVar->sizeProp.min, current->expr->minValue() / se.mCoef );
+                        layoutVar->sizeProp.max = qMin( layoutVar->sizeProp.max, current->expr->maxValue() / se.mCoef );
+                    } else {
+                        layoutVar->sizeProp.min = qMax( layoutVar->sizeProp.min, current->expr->maxValue() / se.mCoef );
+                        layoutVar->sizeProp.max = qMin( layoutVar->sizeProp.max, current->expr->minValue() / se.mCoef );
+                    }
+                    layoutVar->sizeProp.pref += qAbs( current->expr->prefValue() / se.mCoef );
+                }
+                // check for exotic situations
+            }
+        }
+    }
+
+    if( middle ) {
+        for( int i = 0; i < middle->edges.size(); i++ ) {
+            current = middle->edges.at(i);
+            found = false;
+            if( ( current->startVertex == middle ) && ( current->endVertex == end ) ) {
+                se.mCoef = 0.5;
+                found = true;
+            } else if( ( current->startVertex == end ) && ( current->endVertex == middle ) ) {
+                se.mCoef = -0.5;
+                found = true;
+            }
+
+            if( found ) {
+                if( count == 0 ) {
+                    layoutVar->sizeProp.min = 0;
+                    layoutVar->sizeProp.max = MAX_SIZE;
+                    layoutVar->sizeProp.pref = 0;
+                    layoutVar->sizeProp.flags = 0;
+                }
+                count++;
+
+                el->append( current->expr->toEquation( se ) );
+
+                if( current->expr->isFixed() ) {
+                    if( ~layoutVar->sizeProp.flags & SizeProperty::FlagFixed ) {
+                        layoutVar->sizeProp.flags |= SizeProperty::FlagFixed;
+                        layoutVar->sizeProp.pref = current->expr->prefValue() / se.mCoef;
+                    }
+                    // else some compare and indicate error
+                } else if( ~layoutVar->sizeProp.flags & SizeProperty::FlagFixed ) {
+                    if( current->expr->minValue() / se.mCoef < current->expr->maxValue() / se.mCoef ) {
+                        layoutVar->sizeProp.min = qMax( layoutVar->sizeProp.min, current->expr->minValue() / se.mCoef );
+                        layoutVar->sizeProp.max = qMin( layoutVar->sizeProp.max, current->expr->maxValue() / se.mCoef );
+                    } else {
+                        layoutVar->sizeProp.min = qMax( layoutVar->sizeProp.min, current->expr->maxValue() / se.mCoef );
+                        layoutVar->sizeProp.max = qMin( layoutVar->sizeProp.max, current->expr->minValue() / se.mCoef );
+                    }
+                    layoutVar->sizeProp.pref += qAbs( current->expr->prefValue() / se.mCoef );
+                }
+                // check for exotic situations
+
+            }
+        }
+    }
+
+    if( ( count > 0 ) && ( ~layoutVar->sizeProp.flags & SizeProperty::FlagFixed ) ){
+        layoutVar->sizeProp.pref /= count;
+        if( layoutVar->sizeProp.pref > layoutVar->sizeProp.max ) {
+            layoutVar->sizeProp.pref = layoutVar->sizeProp.max;
+        }
+        if( layoutVar->sizeProp.pref < layoutVar->sizeProp.min ) {
+            layoutVar->sizeProp.pref = layoutVar->sizeProp.min;
+        }
+    }
+}
+
+void AnchorLayoutEngine::cleanUp( GraphVertex *start, GraphVertex *middle, GraphVertex *end, QList<GraphEdge*> *edges, QList<GraphVertex*> *vertices, QList<Expression*> *el )
+{
+    if( start ) {
+        vertices->removeOne( start );
+        delete start;
+    }
+    if( middle ) {
+        vertices->removeOne( middle );
+        delete middle;
+    }
+    if( end ) {
+        vertices->removeOne( end );
+        delete end;
+    }
+    qDeleteAll( *edges );
+    qDeleteAll( *vertices );
+    edges->clear();
+    vertices->clear();
+    for( int i = 0; i < el->size(); i++ ) {
+        if( el->at(i)->isTrivial() ) {
+            el->removeAt(i);
+            i--;
+        }
+    }
+}
+
+
+bool AnchorLayoutEngine::splitVertices( QList<GraphEdge*> *edges, QList<GraphVertex*> *vertices, int level )
+{
+    bool result = false;
+    GraphEdge *newEdge, *current, *edgeToModify;
+    GraphVertex *referenceVertex, *newVertex;
+
+    bool found = false;
+
+    for( int i = 0; i < edges->size(); i++ ) {
+        current = edges->at(i);
+
+        if( level == 1 ) {
+            if( ! current->expr->isFixed() ) {
+                continue;
+            }
+        }
+
+
+        found = false;
+
+        if( ( !current->startVertex->special ) && ( current->startVertex->edges.size() > 2 ) ) {
+            referenceVertex = current->startVertex;
+            found = true;
+        } else if( ( !current->endVertex->special ) && ( current->endVertex->edges.size() > 2 ) ) {
+            referenceVertex = current->endVertex;
+            found = true;
+        }
+
+
+        if( found ) {
+            result = true;
+#ifdef HBANCHORLAYOUT_DEBUG
+                qDebug() << "@@@@ Splitting vertices";
+#endif //HBANCHORLAYOUT_DEBUG
+
+            while( referenceVertex->edges.size() > 2 ) {
+                edgeToModify = referenceVertex->edges.at( 0 );
+                if( edgeToModify == current ) {
+                    edgeToModify = referenceVertex->edges.at( 1 );
+                }
+                newVertex = new GraphVertex();
+                newEdge = new GraphEdge();
+
+                referenceVertex->edges.removeOne( edgeToModify );
+
+
+                // looks like other parameters are useless
+                newVertex->special = false;
+                newVertex->edges.append( edgeToModify );
+
+                if( ( edgeToModify->startVertex == referenceVertex ) ){
+                    edgeToModify->startVertex = newVertex;
+                } else {
+                    edgeToModify->endVertex = newVertex;
+                }
+
+                vertices->append( newVertex );
+
+
+
+                // looks like other parameters are useless
+                if( referenceVertex == current->startVertex ) {
+                    newEdge->startVertex = newVertex;
+                    newEdge->endVertex = current->endVertex;
+                    current->endVertex->edges.append( newEdge );
+                } else {
+                    newEdge->startVertex = current->startVertex;
+                    newEdge->endVertex = newVertex;
+                    current->startVertex->edges.append( newEdge );
+                }
+                newEdge->expr->plusExpression( current->expr );
+
+                newVertex->edges.append( newEdge );
+                edges->prepend( newEdge );
+                i++;
+            }
+        }
+
+    }
+
+    return result;
+}
+
+bool AnchorLayoutEngine::ready( QList<GraphVertex*> *vertices )
+{
+    for( int i = 0; i < vertices->size(); i++ ) {
+        if( ! vertices->at(i)->special ) {
+            return false;
+        }
+    }
+    return true;
+}
+
+
+bool AnchorLayoutEngine::solveEquation( QList<Expression*> *elOriginal, VariableSet *vs, Solution *solution )
 {
     enum State {
         CheckEquationsNum,
@@ -338,22 +897,34 @@
     qreal max;
     qreal pref;
     int currentEquationNum = 0;
+    QList<Expression*> el = *elOriginal;
 
     state = CheckEquationsNum;
     bool inloop = true;
     bool result = false;
 
-    solution->clear();
-
-    for ( int i = 0; i < varset.mVarList.size(); i++ ) {
-        if ( varset.mVarList.at(i)->mFlags&Variable::FlagFixed ) {
-            solution->insert( *(varset.mVarList.at(i)), varset.mVarList.at(i)->mPref );
+    for ( int i = 0; i < vs->mVarList.size(); i++ ) {
+        if ( vs->mVarList.at(i)->sizeProp.flags & SizeProperty::FlagFixed ) {
+            solution->insert( vs->mVarList.at(i), vs->mVarList.at(i)->sizeProp.pref );
 #ifdef HBANCHORLAYOUT_DEBUG
-            qDebug( "Solved fixed variable: Id=%d value=%lf", varset.mVarList.at(i)->mId, varset.mVarList.at(i)->mPref );
+            qDebug( "Solved fixed variable: Id=%d value=%lf", vs->mVarList.at(i)->mId, vs->mVarList.at(i)->sizeProp.pref );
 #endif // HBANCHORLAYOUT_DEBUG
         }
     }
 
+#ifdef HBANCHORLAYOUT_DEBUG
+    qDebug( "Equation list size = %d", el.size() );
+    for( int i = 0; i < el.size(); i++ ) {
+        qDebug() << "Equation " << i << ": " << el.at(i)->print() << " = 0";
+    }
+
+    QHashIterator<Variable*, qreal>  i(*solution);
+    while (i.hasNext()) {
+        i.next();
+        qDebug() << ( ( Variable* )( i.key() ) )->mId << ": " << i.value();
+    }
+#endif //HBANCHORLAYOUT_DEBUG
+
 
 
     while ( inloop ) {
@@ -365,9 +936,7 @@
 #endif // HBANCHORLAYOUT_DEBUG
                 if ( el.size() == 0 ) {
                     state = FillRest;
-//                } else if ( el.size() == 1 ) {
-//                    state = SolveOne;
-                } else {
+               } else {
                     state = CheckEquation;
                 }
                 break;
@@ -377,9 +946,9 @@
 #ifdef HBANCHORLAYOUT_DEBUG
                 qDebug( "state = FillRest" );
 #endif // HBANCHORLAYOUT_DEBUG
-                for ( int i = 0; i < varset.mVarList.size(); i++ ) {
-                    if ( !solution->contains( *(varset.mVarList.at(i)) ) ) {
-                        solution->insert( *(varset.mVarList[i]), varset.mVarList.at(i)->mPref );
+                for ( int i = 0; i < vs->mVarList.size(); i++ ) {
+                    if ( !solution->contains( vs->mVarList.at(i) ) ) {
+                        solution->insert( vs->mVarList.at(i), vs->mVarList.at(i)->sizeProp.pref );
                     }
                 }
 
@@ -389,19 +958,55 @@
             }
             case SolveOne:
             {
-                currentEquationNum = el.size() - 1;
 #ifdef HBANCHORLAYOUT_DEBUG
                 qDebug( "state = SolveOne" );
 #endif // HBANCHORLAYOUT_DEBUG
-                Equation currentEquation = el.at(currentEquationNum);
+                Expression *currentEquation = el.at(currentEquationNum);
+
+                pref = currentEquation->prefValue( solution );
+
+                // special block for expanding cases
+                if( currentEquation->isExpanding() ) {
+                    qreal maxExp = currentEquation->maxExpandedValue( solution );
+
+#ifdef HBANCHORLAYOUT_DEBUG
+                    qDebug( "pref=%lf  maxExp=%lf", pref, maxExp );
+#endif // HBANCHORLAYOUT_DEBUG
+
+                    if( differentSignOrZero( pref, maxExp ) ) {
+                        for ( int i = 0; i < currentEquation->mExpression.size(); i++ ) {
+                            SimpleExpression se = currentEquation->mExpression.at(i);
 
-                min = currentEquation.mFormula.minValue( solution );
-                max = currentEquation.mFormula.maxValue( solution );
-                pref = currentEquation.mFormula.prefValue( solution );
-                const qreal prefExpanded = currentEquation.mFormula.prefExpandedValue( solution );
+                            if ( ( se.mVar->sizeProp.flags & SizeProperty::FlagFixed ) ||
+                                 ( se.mVar->sizeProp.flags & SizeProperty::FlagExpanding ) ||
+                                    solution->contains( ( se.mVar ) ) ) {
+                                continue;
+                            }
+                            solution->insert( se.mVar, se.mVar->sizeProp.pref );
+                        }
+                    } else if( ( ( pref < EPSILON ) && ( maxExp > pref ) ) || ( ( pref > -EPSILON ) && ( maxExp < pref ) ) ) {
+                        for ( int i = 0; i < currentEquation->mExpression.size(); i++ ) {
+                            SimpleExpression se = currentEquation->mExpression.at(i);
+
+                            if ( ( se.mVar->sizeProp.flags & SizeProperty::FlagFixed ) ||
+                                    solution->contains( ( se.mVar ) ) ) {
+                                continue;
+                            }
+
+                            if( ( se.mVar->sizeProp.flags & SizeProperty::FlagExpanding ) ) {
+                                solution->insert( se.mVar, se.mVar->sizeProp.max );
+                            }
+                        }
+                        pref = currentEquation->prefValue( solution );
+                    }
+                }
+
+                min = currentEquation->minValue( solution );
+                max = currentEquation->maxValue( solution );
 
                 qreal coef = 0;
-                
+
+
                 if ( ( ( min > 0 ) && !myFuzzyCompare(min, 0) ) ||
                      ( ( max < 0 ) && !myFuzzyCompare(max, 0) ) ) {
                     result = false;
@@ -410,84 +1015,55 @@
                 }
 
                 bool min_is_pref = false;
-                bool min_is_prefExp = false;
-                
+
                 if( pref < 0 ) {
                     min_is_pref = true;
-                } else if ( prefExpanded < 0 ) {
-                    min_is_prefExp = true;
                 }
-                
+
                 if( myFuzzyCompare( pref, 0 ) ) {
                     coef = 0;
                 } else if( min_is_pref ) {
-                    if( myFuzzyCompare( max, 0 ) ) {
-                        coef = 1;
-                    } else {
-                        coef = ( pref / ( pref - max ) );
-                    }
+                    coef = myFuzzyCompare( max, 0 ) ? 1 : ( pref / ( pref - max ) );
                 } else {
-                    if( myFuzzyCompare( min, 0 ) ) {
-                        coef = 1;
-                    } else {
-                        if ( min_is_prefExp ) {
-                            coef = ( pref / ( pref - prefExpanded ) );
-                        } else {
-                            coef = ( prefExpanded / ( prefExpanded - min ) );
-                        }
-                    }
+                    coef = myFuzzyCompare( min, 0 ) ? 1 : ( pref / ( pref - min ) );
                 }
 
 
-                for ( int i = 0; i < currentEquation.mFormula.mExpression.size(); i++ ) {
-                    SimpleExpression se = currentEquation.mFormula.mExpression[i];
+                for ( int i = 0; i < currentEquation->mExpression.size(); i++ ) {
+                    SimpleExpression se = currentEquation->mExpression.at(i);
                     qreal value;
 
-                    if ( (se.mVar->mFlags&Variable::FlagFixed) || solution->contains( *( se.mVar ) ) ) {
+                    if ( ( se.mVar->sizeProp.flags & SizeProperty::FlagFixed ) || solution->contains( ( se.mVar ) ) ) {
                         continue;
                     }
 
                     if( min_is_pref ) {
 
                         if ( se.mCoef > 0 ) {
-                            value = maxSlope( *se.mVar, coef );
+                            value = se.mVar->sizeProp.pref
+                                + ( se.mVar->sizeProp.max - se.mVar->sizeProp.pref )
+                                * coef;
                         } else {
-                            value = minSlope( *se.mVar, coef );
+                            value = se.mVar->sizeProp.pref
+                                + ( se.mVar->sizeProp.min - se.mVar->sizeProp.pref )
+                                * coef;
                         }
                     } else {
-                        if ( min_is_prefExp ) {
-                            if ( se.mVar->mFlags&Variable::FlagExpanding ){
-                                if ( se.mCoef > 0 ) {
-                                    value = minSlope( *se.mVar, coef );
-                                  } else {
-                                    value = maxSlope( *se.mVar, coef );
-                                } 
-                            }else {
-                                value = se.mVar->mPref;
-                            }
-
+                        if ( se.mCoef > 0 ) {
+                            value = se.mVar->sizeProp.pref
+                                + ( se.mVar->sizeProp.min - se.mVar->sizeProp.pref )
+                                * coef;
                         } else {
-                            if ( se.mVar->mFlags&Variable::FlagExpanding ){
-                                if ( se.mCoef > 0 ) {
-                                    value = se.mVar->mMin;
-                                } else {
-                                    value = se.mVar->mMax;
-                                }
-                            } else {
-                                if ( se.mCoef > 0 ) {
-                                    value = minSlope( *se.mVar, coef );
-                                 } else {
-                                    value = maxSlope( *se.mVar, coef );
-                                }
-                            }
+                            value = se.mVar->sizeProp.pref
+                                + ( se.mVar->sizeProp.max - se.mVar->sizeProp.pref )
+                                * coef;
                         }
                     }
 
-                    solution->insert( *( se.mVar ), value );
+                    solution->insert( ( se.mVar ), value );
                 }
                 result = true;
                 state = ExcludeEquation;
-
                 break;
             }
             case Result:
@@ -505,10 +1081,12 @@
 #endif // HBANCHORLAYOUT_DEBUG
 
                 bool real_break = false;
+                int minUndefinedVariables = 0xffff;
+                currentEquationNum = el.size() - 1;
 
-                for ( int i = 0; i < el.size(); i++ ) {
+                for ( int i = el.size() -1; i >= 0; i-- ) {
                     int num;
-                    num = numOfUnknownVars( &( el.at(i) ), solution );
+                    num = numOfUnknownVars( ( el.at(i) ), solution );
                     if ( num == 0 ) {
                         currentEquationNum = i;
                         state = Validate;
@@ -521,6 +1099,11 @@
                         real_break = true;
                         break;
                     }
+
+                    if( num < minUndefinedVariables ) {
+                        minUndefinedVariables = num;
+                        currentEquationNum = i;
+                    }
                 }
 
                 if ( real_break ) {
@@ -536,7 +1119,8 @@
                 qDebug( "state = Validate" );
 #endif // HBANCHORLAYOUT_DEBUG
 
-                if ( !myFuzzyCompare( el.at(currentEquationNum).mFormula.value( solution ), 0 ) ) {
+                if ( !myFuzzyCompare( el.at(currentEquationNum)->value( solution ), 0 ) ) {
+                    qDebug( "val = %lf", el.at(currentEquationNum)->value( solution ) );
                     result = false;
                     state = Result;
                 } else {
@@ -551,13 +1135,13 @@
                 qDebug( "state = FinalizeVariable" );
 #endif // HBANCHORLAYOUT_DEBUG
 
-                Expression exp = el.at(currentEquationNum).mFormula;
+                Expression exp = *( el.at(currentEquationNum) );
                 SimpleExpression se;
                 se.mCoef = 0;
                 se.mVar = 0;
 
                 for ( int i = 0; i < exp.mExpression.size(); i++ ) {
-                    if ( !solution->contains( *( exp.mExpression.at(i).mVar ) ) ) {
+                    if ( !solution->contains( ( exp.mExpression.at(i).mVar ) ) ) {
                         se = exp.mExpression.at(i);
                         exp.mExpression.removeAt( i );
                         break;
@@ -566,16 +1150,16 @@
 
                 qreal value = - exp.value( solution ) / se.mCoef;
 
-                if ( ( value - se.mVar->mMin < -EPSILON ) || ( value - se.mVar->mMax > EPSILON ) ) {
+                if ( ( value - se.mVar->sizeProp.min < -EPSILON ) || ( value - se.mVar->sizeProp.max > EPSILON  ) ) {
 #ifdef HBANCHORLAYOUT_DEBUG
-                    qDebug( "cannot solve: min=%lf, max=%lf, value=%lf", se.mVar->mMin, se.mVar->mMax, value );
+                    qDebug( "cannot solve: min=%lf, max=%lf, value=%lf", se.mVar->sizeProp.min, se.mVar->sizeProp.max, value );
 #endif
                     result = false;
                     state = Result;
                     break;
                 }
 
-                solution->insert( *( se.mVar ), value );
+                solution->insert( ( se.mVar ), value );
 
                 state = ExcludeEquation;
                 break;
@@ -606,83 +1190,95 @@
     return result;
 }
 
-/*!
-    \internal
-*/
-int EquationSolver::numOfUnknownVars( const Equation *eq, const Solution *solution ) {
-
+int AnchorLayoutEngine::numOfUnknownVars( const Expression *eq, const Solution *solution )
+{
     int result = 0;
 
-
-    for ( int i = 0; i < eq->mFormula.mExpression.size(); i++ ) {
-        if ( solution->contains( *(eq->mFormula.mExpression.at(i).mVar) ) ) {
+    for ( int i = 0; i < eq->mExpression.size(); i++ ) {
+        if ( solution->contains( (eq->mExpression.at(i).mVar) ) ) {
             continue;
         }
         result++;
     }
 
     return result;
+
+}
+
+Expression *Expression::toEquation( const SimpleExpression simp_exp )
+{
+    Expression *expr = new Expression();
+    expr->plusExpression( this );
+    expr->minusSimpleExpression( simp_exp );
+    return expr;
 }
 
-/*!
-    \internal
-*/
-bool EquationSolver::compareEquations( const Equation &equation1, const Equation &equation2 )
+Expression *Expression::toEquation( const Expression *exp )
+{
+    Expression *expr = new Expression();
+    expr->plusExpression( this );
+    expr->minusExpression( exp );
+    return expr;
+}
+
+Expression *Expression::toEquation()
 {
-    QList<SimpleExpression> exp1 = equation1.mFormula.mExpression;
-    QList<SimpleExpression> exp2 = equation2.mFormula.mExpression;
-    if ( exp1.count() != exp2.count() ) {
-        return false;
-    }
+    Expression *expr = new Expression();
+    expr->plusExpression( this );
+    return expr;
+}
 
-    if ( exp1.count() == 0 ) {
+
+bool Expression::isTrivial() const
+{
+    if ( mExpression.count() == 0 ) {
         return true;
     }
-
-    qreal global_coef = 1.0 * exp2.at(0).mCoef / exp1.at(0).mCoef;
-
-    for ( int i = 0; i < exp1.count(); i++ ) {
-        if ( ( !myFuzzyCompare( global_coef * exp1.at(i).mCoef, exp2.at(i).mCoef ) )
-            || ( exp1.at(i).mVar != exp2.at(i).mVar ) ) {
-            return false;
-        }
-    }
-    return true;
+    return false;
 }
 
-/*!
-    \internal
-*/
-bool EquationSolver::compareExpressions( const Expression &expression1, const Expression &expression2 )
+bool Expression::isFixed() const
 {
-    QList<SimpleExpression> exp1 = expression1.mExpression;
-    QList<SimpleExpression> exp2 = expression2.mExpression;
-    if ( exp1.count() != exp2.count() ) {
-        return false;
+    bool result = true;
+
+    for ( int i = 0; i < mExpression.size(); i++ ) {
+        result &= ( mExpression.at(i).mVar->sizeProp.flags & SizeProperty::FlagFixed );
+    }
+
+    return result;
+
+}
+
+bool Expression::isExpanding() const
+{
+    bool result = false;
+
+    for ( int i = 0; i < mExpression.size(); i++ ) {
+        result |= (bool)( mExpression.at(i).mVar->sizeProp.flags & SizeProperty::FlagExpanding );
     }
 
-    for ( int i = 0; i < exp1.count(); i++ ) {
-        if ( ( !myFuzzyCompare( exp1.at(i).mCoef, exp2.at(i).mCoef ) )
-            || ( exp1.at(i).mVar != exp2.at(i).mVar ) ) {
-            return false;
-        }
-    }
-
-    return true;
+    return result;
 }
 
-/*!
-    \internal
-*/
-Expression::Expression() : mExpression()
+uint Expression::flags() const
 {
-}
+    bool isFixed = true;
+    bool isExpanding = false;
+    uint result = 0;
+
+    for ( int i = 0; i < mExpression.size(); i++ ) {
+        isFixed = isFixed && ( mExpression.at(i).mVar->sizeProp.flags & SizeProperty::FlagFixed );
+        isExpanding = ( isExpanding ) || ( mExpression.at(i).mVar->sizeProp.flags & SizeProperty::FlagExpanding );
+    }
 
-/*!
-    \internal
-*/
-Expression::~Expression()
-{
+    if( isFixed ) {
+        result |= SizeProperty::FlagFixed;
+    }
+    if( isExpanding ) {
+        result |= SizeProperty::FlagExpanding;
+    }
+
+    return result;
 }
 
 /*!
@@ -729,10 +1325,10 @@
 /*!
     \internal
 */
-void Expression::plusExpression( const Expression exp )
+void Expression::plusExpression( const Expression *exp )
 {
-    for ( int i = 0; i < exp.mExpression.size(); i++ ) {
-        plusSimpleExpression( exp.mExpression.at(i) );
+    for ( int i = 0; i < exp->mExpression.size(); i++ ) {
+        plusSimpleExpression( exp->mExpression.at(i) );
     }
 }
 
@@ -749,20 +1345,24 @@
 /*!
     \internal
 */
-void Expression::minusExpression( const Expression exp )
+void Expression::minusExpression( const Expression *exp )
 {
-    for ( int i = 0; i < exp.mExpression.size(); i++ ) {
-        minusSimpleExpression( exp.mExpression.at(i) );
+    for ( int i = 0; i < exp->mExpression.size(); i++ ) {
+        minusSimpleExpression( exp->mExpression.at(i) );
     }
 }
 
 /*!
     \internal
 */
-void Expression::minus()
+void Expression::multiply( qreal multiplier )
 {
+    if( multiplier == 0 ) {
+        clear();
+    }
+
     for ( int i = 0; i < mExpression.size(); i++ ) {
-        mExpression[i].mCoef = -mExpression.at(i).mCoef;
+        mExpression[i].mCoef *= multiplier;
     }
 }
 
@@ -774,7 +1374,7 @@
     qreal result = 0;
 
     for ( int i = 0; i < mExpression.size(); i++ ) {
-        result += solution->value( *(mExpression.at(i).mVar) ) * mExpression.at(i).mCoef;
+        result += solution->value( (mExpression.at(i).mVar) ) * mExpression.at(i).mCoef;
     }
 
     return result;
@@ -788,15 +1388,11 @@
     qreal result = 0;
 
     for ( int i = 0; i < mExpression.size(); i++ ) {
-        const SimpleExpression &currentExpression = mExpression.at(i);
-        if ( currentExpression.mVar->mFlags&Variable::FlagFixed ) {
-            result += currentExpression.mVar->mPref * currentExpression.mCoef;
+        const SimpleExpression currentExpression = mExpression.at(i);
+        if ( currentExpression.mVar->sizeProp.flags & SizeProperty::FlagFixed ) {
+            result += currentExpression.mVar->sizeProp.pref * currentExpression.mCoef;
         } else {
-            if ( currentExpression.mCoef > 0 ) {
-                result += currentExpression.mVar->mMin * currentExpression.mCoef;
-            } else {
-                result += currentExpression.mVar->mMax * currentExpression.mCoef;
-            }
+            result += qMin( currentExpression.mVar->sizeProp.max * currentExpression.mCoef, currentExpression.mVar->sizeProp.min * currentExpression.mCoef );
         }
     }
 
@@ -811,8 +1407,8 @@
     qreal result = 0;
 
     for ( int i = 0; i < mExpression.size(); i++ ) {
-         const SimpleExpression &currentExpression = mExpression.at(i);
-         result += currentExpression.mVar->mPref * currentExpression.mCoef;
+         const SimpleExpression currentExpression = mExpression.at(i);
+         result += currentExpression.mVar->sizeProp.pref * currentExpression.mCoef;
     }
 
     return result;
@@ -826,15 +1422,11 @@
     qreal result = 0;
 
     for ( int i = 0; i < mExpression.size(); i++ ) {
-        const SimpleExpression &currentExpression = mExpression.at(i);
-        if ( currentExpression.mVar->mFlags&Variable::FlagFixed ) {
-            result += currentExpression.mVar->mPref * currentExpression.mCoef;
+        const SimpleExpression currentExpression = mExpression.at(i);
+        if ( currentExpression.mVar->sizeProp.flags & SizeProperty::FlagFixed ) {
+            result += currentExpression.mVar->sizeProp.pref * currentExpression.mCoef;
         } else {
-            if ( currentExpression.mCoef < 0 ) {
-                result += currentExpression.mVar->mMin * currentExpression.mCoef;
-            } else {
-                result += currentExpression.mVar->mMax * currentExpression.mCoef;
-            }
+            result += qMax( currentExpression.mVar->sizeProp.max * currentExpression.mCoef, currentExpression.mVar->sizeProp.min * currentExpression.mCoef );
         }
     }
 
@@ -849,17 +1441,13 @@
     qreal result = 0;
 
     for ( int i = 0; i < mExpression.size(); i++ ) {
-        const SimpleExpression &currentExpression = mExpression.at(i);
-        if ( currentExpression.mVar->mFlags&Variable::FlagFixed ) {
-            result += currentExpression.mVar->mPref * currentExpression.mCoef;
-        } else if ( solution->contains( *( currentExpression.mVar ) ) ) {
-            result += solution->value( *( currentExpression.mVar ) ) * currentExpression.mCoef;
+        const SimpleExpression currentExpression = mExpression.at(i);
+        if ( currentExpression.mVar->sizeProp.flags & SizeProperty::FlagFixed ) {
+            result += currentExpression.mVar->sizeProp.pref * currentExpression.mCoef;
+        } else if ( solution->contains( ( currentExpression.mVar ) ) ) {
+            result += solution->value( ( currentExpression.mVar ) ) * currentExpression.mCoef;
         } else {
-            if ( currentExpression.mCoef > 0 ) {
-                result += currentExpression.mVar->mMin * currentExpression.mCoef;
-            } else {
-                result += currentExpression.mVar->mMax * currentExpression.mCoef;
-            }
+            result += qMin( currentExpression.mVar->sizeProp.max * currentExpression.mCoef, currentExpression.mVar->sizeProp.min * currentExpression.mCoef );
         }
     }
 
@@ -874,44 +1462,11 @@
     qreal result = 0;
 
     for ( int i = 0; i < mExpression.size(); i++ ) {
-        const SimpleExpression &currentExpression = mExpression.at(i);
-        if ( solution->contains( *( currentExpression.mVar ) ) ) {
-            result += solution->value( *( currentExpression.mVar ) ) * currentExpression.mCoef;
+        const SimpleExpression currentExpression = mExpression.at(i);
+        if ( solution->contains( ( currentExpression.mVar ) ) ) {
+            result += solution->value( ( currentExpression.mVar ) ) * currentExpression.mCoef;
         } else {
-            result += currentExpression.mVar->mPref * currentExpression.mCoef;
-        }
-    }
-
-    return result;
-}
-
-/*!
-    \internal
-*/
-qreal Expression::prefExpandedValue( Solution *solution ) const
-{
-    qreal result = 0;
-
-    for ( int i = 0; i < mExpression.size(); i++ ) {
-        const SimpleExpression &currentExpression = mExpression.at(i);
-        if ( currentExpression.mVar->mFlags&Variable::FlagExpanding ) {
-            // use the min value
-            if ( currentExpression.mVar->mFlags&Variable::FlagFixed ) {
-                result += currentExpression.mVar->mPref * currentExpression.mCoef;
-            } else if ( solution->contains( *( currentExpression.mVar ) ) ) {
-                result += solution->value( *( currentExpression.mVar ) ) * currentExpression.mCoef;
-            } else {
-                if ( currentExpression.mCoef > 0 ) {
-                    result += currentExpression.mVar->mMin * currentExpression.mCoef;
-                } else {
-                    result += currentExpression.mVar->mMax * currentExpression.mCoef;
-                }
-            }
-        }
-        else if ( solution->contains( *( currentExpression.mVar ) ) ) {
-            result += solution->value( *( currentExpression.mVar ) ) * currentExpression.mCoef;
-        } else {
-            result += currentExpression.mVar->mPref * currentExpression.mCoef;
+            result += currentExpression.mVar->sizeProp.pref * currentExpression.mCoef;
         }
     }
 
@@ -926,23 +1481,47 @@
     qreal result = 0;
 
     for ( int i = 0; i < mExpression.size(); i++ ) {
-        const SimpleExpression &currentExpression = mExpression.at(i);
-        if ( currentExpression.mVar->mFlags&Variable::FlagFixed ) {
-            result += currentExpression.mVar->mPref * currentExpression.mCoef;
-        } else if ( solution->contains( *( currentExpression.mVar ) ) ) {
-            result += solution->value( *( currentExpression.mVar ) ) * currentExpression.mCoef;
+        const SimpleExpression currentExpression = mExpression.at(i);
+        if ( currentExpression.mVar->sizeProp.flags & SizeProperty::FlagFixed ) {
+            result += currentExpression.mVar->sizeProp.pref * currentExpression.mCoef;
+        } else if ( solution->contains( ( currentExpression.mVar ) ) ) {
+            result += solution->value( ( currentExpression.mVar ) ) * currentExpression.mCoef;
         } else {
-            if ( currentExpression.mCoef < 0 ) {
-                result += currentExpression.mVar->mMin * currentExpression.mCoef;
-            } else {
-                result += currentExpression.mVar->mMax * currentExpression.mCoef;
-            }
+            result += qMax( currentExpression.mVar->sizeProp.max * currentExpression.mCoef, currentExpression.mVar->sizeProp.min * currentExpression.mCoef );
         }
     }
 
     return result;
 }
 
+
+qreal Expression::maxExpandedValue( Solution *solution ) const
+{
+    qreal result = 0;
+
+    for ( int i = 0; i < mExpression.size(); i++ ) {
+        const SimpleExpression &currentExpression = mExpression.at(i);
+        if ( currentExpression.mVar->sizeProp.flags & SizeProperty::FlagExpanding ) {
+            if ( currentExpression.mVar->sizeProp.flags & SizeProperty::FlagFixed ) {
+                result += currentExpression.mVar->sizeProp.pref * currentExpression.mCoef;
+            } else if ( solution->contains( currentExpression.mVar ) ) {
+                result += solution->value( currentExpression.mVar ) * currentExpression.mCoef;
+            } else {
+                result += currentExpression.mVar->sizeProp.max * currentExpression.mCoef;
+            }
+        }
+        else if ( solution->contains( currentExpression.mVar ) ) {
+            result += solution->value( currentExpression.mVar ) * currentExpression.mCoef;
+        } else {
+            result += currentExpression.mVar->sizeProp.pref * currentExpression.mCoef;
+        }
+    }
+
+    return result;
+}
+
+
+
 QString Expression::print() const
 {
     QString res;
@@ -950,17 +1529,25 @@
         if( i > 0 ) {
             res += " + ";
         }
-        res += '(' + QString::number( mExpression.at(i).mCoef ) + ')' + "var[" + QString::number( mExpression.at(i).mVar->mId ) + ']';
+        if( mExpression.at(i).mVar->sizeProp.flags & SizeProperty::FlagFixed ) {
+            res += '(' + QString::number( mExpression.at(i).mCoef ) + ')' + "var[" + QString::number( mExpression.at(i).mVar->mId ) + ']' + "(" +
+                    QString::number( mExpression.at(i).mVar->sizeProp.pref ) + "|f)";
+        } else {
+            res += '(' + QString::number( mExpression.at(i).mCoef ) + ')' + "var[" + QString::number( mExpression.at(i).mVar->mId ) + ']' + "(" +
+                    QString::number( mExpression.at(i).mVar->sizeProp.min ) + "," +
+                    QString::number( mExpression.at(i).mVar->sizeProp.pref ) + "," +
+                    QString::number( mExpression.at(i).mVar->sizeProp.max ) + ")";
+        }
     }
     return res;
 }
 
+
 /*!
     \internal
 */
-VariableSet::VariableSet() : mVarList()
+VariableSet::VariableSet() : mVarList(), mCurr_id(0)
 {
-    mCurr_id = 0;
 }
 
 /*!
@@ -978,7 +1565,7 @@
 {
     Variable *var = new Variable();
     var->mId = mCurr_id;
-    var->mFlags &= ~Variable::FlagFixed;
+    var->sizeProp.flags = 0;
     var->mRef = ref;
 
     mVarList.append( var );
@@ -996,7 +1583,7 @@
     if( var ) {
         return mVarList.removeOne( var );
     }
-    return false; 
+    return false;
 }
 
 /*!
@@ -1007,7 +1594,7 @@
     if( ! ref ) {
         return 0;
     }
-    
+
     QList<Variable*>::const_iterator i;
     for ( i = mVarList.constBegin(); i != mVarList.constEnd(); ++i ) {
         if ( (*i)->mRef == ref ) return *i;
@@ -1026,9 +1613,18 @@
     mCurr_id = 0;
 }
 
-/*!
-    \internal
-*/
-uint qHash ( Variable key ) {
-    return key.mId;
+
+GraphEdge::GraphEdge( bool initExpr )
+{
+    if( initExpr ) {
+        expr = new Expression();
+    } else {
+        expr = 0;
+    }
 }
+
+GraphEdge::~GraphEdge()
+{
+    delete expr;
+}
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/layouts/hbanchorlayoutengine_p.h
--- a/src/hbcore/layouts/hbanchorlayoutengine_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/layouts/hbanchorlayoutengine_p.h	Mon May 03 12:48:33 2010 +0300
@@ -26,35 +26,53 @@
 #ifndef HBANCHORLAYOUTENGINE_P_H
 #define HBANCHORLAYOUTENGINE_P_H
 
-#include <QHash>
+#include <hbglobal.h>
+#include <hbnamespace.h>
 #include <QList>
 
+
+struct GraphEdge;
+struct GraphVertex;
+struct SizeProperty;
+struct SerialBlockData;
+struct ParallelBlockData;
+
+class Variable;
+class Expression;
+
+struct SimpleExpression
+{
+    Variable *mVar;
+    qreal mCoef;
+};
+
+
+struct SizeProperty {
+    qreal min, pref, max;
+    enum
+    {
+        FlagFixed = 1,
+        FlagExpanding = 2
+    };
+    uint flags;
+};
+
+
+
+
 class Variable
 {
 public:
-    Variable() : mId(-1), mMin(0), mMax(0), mPref(0), mFlags(0), mRef(0) {}
-    ~Variable() {}
 
-    bool operator== ( const Variable &var ) const { return ( var.mId == mId ); }
+    inline bool operator== ( const Variable &var ) const { return ( var.mId == mId ); }
 
-public:
     int mId;
-    qreal mMin;
-    qreal mMax;
-    qreal mPref;
-    enum 
-    {
-        FlagFixed = 1,
-        FlagExpanding = 2
-    };
-    uint mFlags;
+
+    SizeProperty sizeProp;
+
     void *mRef; // reference to QGraphicsLayoutItem
 };
 
-typedef QHash<Variable, qreal> Solution;
-
-uint qHash ( Variable key );
-
 class VariableSet
 {
 public:
@@ -72,23 +90,30 @@
     int mCurr_id;
 };
 
-struct SimpleExpression
-{
-    Variable *mVar;
-    qreal mCoef;
-};
+
+typedef QHash<Variable*, qreal> Solution;
+
 
 class Expression
 {
 public:
-    Expression();
-    ~Expression();
     void clear();
     void plusSimpleExpression( const SimpleExpression simp_exp );
-    void plusExpression( const Expression exp );
+    void plusExpression( const Expression *exp );
     void minusSimpleExpression( const SimpleExpression simp_exp );
-    void minusExpression( const Expression exp );
-    void minus();
+    void minusExpression( const Expression *exp );
+    void multiply( qreal multiplier );
+
+    Expression *toEquation( const SimpleExpression simp_exp );
+    Expression *toEquation( const Expression *exp );
+    Expression *toEquation();
+
+    bool isFixed() const;
+    bool isExpanding() const;
+
+    bool isTrivial() const;
+
+    uint flags() const;
 
     qreal value( Solution *solution ) const;
 
@@ -97,65 +122,56 @@
     qreal maxValue() const;
     qreal minValue( Solution *solution ) const;
     qreal prefValue( Solution *solution ) const;
-    qreal prefExpandedValue( Solution *solution ) const;
     qreal maxValue( Solution *solution ) const;
+    qreal maxExpandedValue( Solution *solution ) const;
+
+
+
 
     QString print() const;
-    
+
 public:
     QList<SimpleExpression> mExpression;
 };
 
 
-class Equation
-{
-public:
-    Equation( const Expression &exp1, const Expression &exp2 );
-    ~Equation();
 
-    bool isTrivial() const;
-    bool operator== ( const Equation &first ) const;
-    Expression mFormula;
-    QString print() const;
-};
+class AnchorLayoutEngine {
+private:
+    AnchorLayoutEngine();
+    ~AnchorLayoutEngine();
+public:
+    static AnchorLayoutEngine *instance();
+    bool processItems( QList<GraphEdge*> *edges, QList<GraphVertex*> *vertices, VariableSet *vs, QList<Expression*> *el );
+    void attachToLayout( GraphVertex *start, GraphVertex *middle, GraphVertex *end, Variable *layoutVar, QList<Expression*> *el );
+    void cleanUp( GraphVertex *start, GraphVertex *middle, GraphVertex *end, QList<GraphEdge*> *edges, QList<GraphVertex*> *vertices, QList<Expression*> *el );
+    bool solveEquation( QList<Expression*> *el, VariableSet *vs, Solution *solution );
+private:
+    GraphVertex *nextVertex( GraphVertex *currentVertex, GraphEdge *currentEdge, int *sign );
+    GraphEdge *nextEdge( GraphVertex *currentVertex, GraphEdge *currentEdge );
+    bool findSerialChains( QList<GraphEdge*> *edges, QList<GraphVertex*> *vertices, QList<Expression*> *el );
+    bool findParallelChains( QList<GraphEdge*> *edges, QList<GraphVertex*> *vertices, VariableSet *vs, QList<Expression*> *el );
+    bool findBranches( QList<GraphEdge*> *edges, QList<GraphVertex*> *vertices );
+    bool splitVertices( QList<GraphEdge*> *edges, QList<GraphVertex*> *vertices, int level );
+    bool ready( QList<GraphVertex*> *vertices );
 
-class EquationSolver
-{
-public:
-    static bool solveEquation( QList<Equation> el, VariableSet &varset, Solution *solution );
-    static bool compareExpressions( const Expression &expression1, const Expression &expression2 );
-    static bool compareEquations( const Equation &equation1, const Equation &equation2 );
-
-private:
-    static int numOfUnknownVars( const Equation *eq, const Solution *solution );
+    int numOfUnknownVars( const Expression *eq, const Solution *solution );
 };
 
-class DataGrid
-{
-public:
-    DataGrid();
-    ~DataGrid();
-
-    void setExpression( const Expression ex, int i, int j );
-    void setExpression( const SimpleExpression ex, int i, int j );
-
-    qreal value( int i, int j, Solution *solution, bool &ok ) const;
-
-    void clear();
-
-    QList<Equation> calculate();
-
-private:
-    void calculateLine( int x );
-    bool checkLine( int x, int y );
-    void calculateRect( int ax, int ay, int cx, int cy );
-
-public:
-
-    QList<Equation> mResult;
-    int mSize;
-
-    QHash< int, QHash< int, Expression > > mGrid;
+struct GraphEdge {
+    GraphEdge( bool initExpr = true );
+    ~GraphEdge();
+    void *ref;
+    GraphVertex *startVertex, *endVertex;
+    Expression *expr;
 };
 
+struct GraphVertex {
+    QList<GraphEdge*> edges;
+    bool special;
+    Hb::Edge itemSide;
+    void *itemRef;
+};
+
+
 #endif // HBANCHORLAYOUTENGINE_P_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/layouts/hbmeshlayout_p.cpp
--- a/src/hbcore/layouts/hbmeshlayout_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/layouts/hbmeshlayout_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -42,19 +42,19 @@
 /*!
     \class HbMeshLayout
     \brief HbMeshLayout manages geometries of its child items with anchors
-    that connect the layout items with each other. This is different from 
+    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. 
+    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 
+    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. 
+    First, we need to find the child item (=node), which is always present i.e. cannot be missing.
 
     \image html hbmeshlayout1.png
 
@@ -76,12 +76,12 @@
 
     \endcode
 
-    As mentioned, the green node needs be present always. In practice, this means that the 
+    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 
+    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.
 
@@ -91,7 +91,7 @@
     the anchor definitions starting from the missing nodes.
 
     \proto
-    \internal 
+    \internal
 */
 
 /*!
@@ -110,7 +110,7 @@
 };
 
 /*
-    Single anchor. If mHasSpacing equals to false, then anchor is sort of defined, 
+    Single anchor. If mHasSpacing equals to false, then anchor is sort of defined,
     but not really connected.
     \internal
 */
@@ -137,7 +137,7 @@
     Returns true if \a first is less than \a second. Needed for QMap use.
     \internal
 */
-inline bool operator<(const HbMeshKey &first, const HbMeshKey &second) 
+inline bool operator<(const HbMeshKey &first, const HbMeshKey &second)
 {
     if( first.mId == second.mId ) {
         return int(first.mEdge) < int(second.mEdge);
@@ -183,38 +183,38 @@
     static EdgeType edgeType( HbMeshLayout::Edge edge );
     void setItemGeometries();
     void updateAnchorsAndItems();
-    void setVariables( Variable *v, QGraphicsLayoutItem *item, EdgeType type );
 
     void createEquations( EdgeType type );
-    void calculateSizeHint( EdgeType type );
-    void createEquationsCommon( EdgeType type );
-    
-    int getEdgeIndex(QGraphicsLayoutItem *item, HbAnchorLayout::Edge edge);
+
+    int getEdgeIndex(QGraphicsLayoutItem *item, Hb::Edge edge);
 
     bool hasAnchorSpacing(const HbMeshAnchor &anchor, qreal *spacing = 0) const;
     bool findEndItem(
         HbMeshEndItemResult &result,
-        const HbMeshAnchor &anchor, 
+        const HbMeshAnchor &anchor,
         const HbMeshItemMapInverse &inverse,
         QStringList &ids) const;
-    QList<HbAnchor> resolveAnchors();
+    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 mSizeHintDirty;    // set true in ::invalidate() and cleared after re-creation of equations in ::sizeHint
     bool mInvalidateCalled; // set true in ::invalidate() and cleared after geometry is set in ::setGeometry
-    
-    QList<HbAnchor> mAnchors;
-    Expression mSx, mSy;
-    QSizeF mMinSH, mPrefSH, mMaxSH;
+    bool mWrongAnchors;
+
+    QList<HbAnchor*> mAnchors;
 
     // mesh layout data
     QList<QGraphicsLayoutItem*> mItems; // for addItem
@@ -223,33 +223,53 @@
     QList<HbMeshAnchor> mMeshAnchors;
     QMap<HbMeshKey, qreal> mMeshSpacings;
 
-    // variables needed to solve item geometries using resolved anchors
-    QList<Equation> mEquationsHorizontal;
-    QList<Equation> mEquationsVertical;
+    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;
-    DataGrid mDataHorizontal;
-    DataGrid mDataVertical;
+
+    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;
 
-    QRectF mUsedRect;
 };
-
 /*!
     \internal
 */
-QList<HbAnchor> HbMeshLayoutDebug::getAnchors( HbMeshLayout* layout )
+QList<HbAnchor*> HbMeshLayoutDebug::getAnchors( HbMeshLayout* layout )
 {
-    return layout->d_ptr->resolveAnchors();
+    QList<HbAnchor*> anchors;
+    layout->d_ptr->resolveAnchors( &anchors );
+    return anchors;
 }
 
 /*
     \class HbMeshLayoutPrivate
     \internal
 */
-HbMeshLayoutPrivate::HbMeshLayoutPrivate() : mEquationsDirty(false), mValid(true), mSizeHintDirty( true ), mInvalidateCalled( false ),
-                                            mMinSH( 0, 0 ), mPrefSH( 100, 100 ), mMaxSH( 1000, 1000 ) 
+HbMeshLayoutPrivate::HbMeshLayoutPrivate() : mEquationsDirty(false), mValid(true), mInvalidateCalled( false ), mWrongAnchors( false ),
+                                                mUsedRect( 0, 0, 0, 0 ), mLayoutVarH( 0 ), mLayoutVarV( 0 )
+
 {
 }
 
@@ -258,6 +278,16 @@
 */
 HbMeshLayoutPrivate::~HbMeshLayoutPrivate()
 {
+
+    qDeleteAll( mEdgesVertical );
+    qDeleteAll( mEdgesHorizontal );
+    qDeleteAll( mVerticesVertical );
+    qDeleteAll( mVerticesHorizontal );
+
+    qDeleteAll( mEquationsHorizontal );
+    qDeleteAll( mEquationsVertical );
+
+    qDeleteAll( mAnchors );
 }
 
 /*
@@ -284,7 +314,7 @@
     case Hb::LeftEdge:
         result = "LEFT";
         break;
-    
+
     case Hb::RightEdge:
         result = "RIGHT";
         break;
@@ -309,7 +339,7 @@
         result = "<UNDEFINED>";
         break;
     }
-    
+
     return result;
 }
 
@@ -321,90 +351,328 @@
 void HbMeshLayoutPrivate::updateAnchorsAndItems()
 {
     Q_Q(HbMeshLayout);
-    mAnchors = resolveAnchors();
-        
+    resolveAnchors( &mAnchors );
+
 #ifdef HBMESHLAYOUT_DEBUG
     QGraphicsWidget* w = HbLayoutUtils::parentWidget( q );
     if ( w ) {
         qDebug() << "MeshLayout: Mesh anchors for" << w->metaObject()->className();
     }
-    const QString parentId = 
+    const QString parentId =
         mMeshMap.contains(q) ? mMeshMap.value(q) : QString();
     qDebug() << "-- count: " << mAnchors.size() << ", parent: " << parentId;
-    foreach (const HbAnchor &item, mAnchors) {
+    foreach (const HbAnchor *item, mAnchors) {
         const QString itemTemplate("-- (%1, %2) - (%3, %4) = %5");
-        qDebug() << 
+        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();
+            .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(); 
+    for (QList<HbAnchor*>::const_iterator it = mAnchors.constBegin();
+         it != mAnchors.constEnd();
          ++it) {
-    
-        const HbAnchor& item = *it;
+
+        const HbAnchor* item = *it;
 
-        if (item.mStartItem != q && !mActualItems.contains(item.mStartItem)) {
-            mActualItems.append(item.mStartItem);
+        if (item->mStartItem != q && !mActualItems.contains(item->mStartItem)) {
+            mActualItems.append(item->mStartItem);
         }
-        if (item.mEndItem != q && !mActualItems.contains(item.mEndItem)) {
-            mActualItems.append(item.mEndItem);
+        if (item->mEndItem != q && !mActualItems.contains(item->mEndItem)) {
+            mActualItems.append(item->mEndItem);
         }
-    }    
-    
+    }
+
 }
 
-/*
-    \internal
-*/
-void HbMeshLayoutPrivate::setVariables( Variable *v, QGraphicsLayoutItem *item, EdgeType type )
+
+void HbMeshLayoutPrivate::setSizeProp( SizeProperty *v, QGraphicsLayoutItem *item, EdgeType type )
 {
     if( type == Vertical ) {
         const QSizePolicy::Policy verticalPolicy = item->sizePolicy().verticalPolicy();
 
         if ( verticalPolicy & QSizePolicy::ShrinkFlag ) {
-            v->mMin = item->minimumHeight();
+            v->min = item->minimumHeight();
         } else {
-            v->mMin = item->preferredHeight();
+            v->min = item->preferredHeight();
         }
 
         if ( verticalPolicy & (QSizePolicy::GrowFlag | QSizePolicy::ExpandFlag) ) {
-            v->mMax = item->maximumHeight();
+            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->mMax = item->preferredHeight();
+            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;
         }
 
-        v->mPref = qBound( v->mMin, item->preferredHeight(), v->mMax );
-        v->mFlags |= (v->mMin == v->mMax) ? Variable::FlagFixed : 0;
-        v->mFlags |= (verticalPolicy&QSizePolicy::ExpandFlag) ? Variable::FlagExpanding : 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;
+                }
+            }
+        }
+    }
 
-    } else {    
-        const QSizePolicy::Policy horizontalPolicy = item->sizePolicy().horizontalPolicy();
-    
-        if ( horizontalPolicy & QSizePolicy::ShrinkFlag ) {
-            v->mMin = item->minimumWidth();
-        } else {
-            v->mMin = item->preferredWidth();
+    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 ( horizontalPolicy & (QSizePolicy::GrowFlag | QSizePolicy::ExpandFlag) ) {
-            v->mMax = item->maximumWidth();
+    }
+
+    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 {
-            v->mMax = item->preferredWidth();
+            mGeometryDefinedV[itemIndexEnd] = true;
+            itemSize = mSolutionVertical.value( mVariablesVertical.findVariable( mActualItems.at(itemIndexEnd) ) );
         }
-    
-        v->mPref = qBound( v->mMin, item->preferredWidth(), v->mMax );
-        v->mFlags |= (v->mMin == v->mMax) ? Variable::FlagFixed : 0;
-        v->mFlags |= (horizontalPolicy&QSizePolicy::ExpandFlag) ? Variable::FlagExpanding : 0;
-    }    
+
+        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;
+    }
+
 }
 
 
@@ -415,325 +683,454 @@
 {
     Q_Q(HbMeshLayout);
     const QRectF newRect = q->geometry();
-#ifdef HBMESHLAYOUT_DEBUG
-    QGraphicsWidget* w = HbLayoutUtils::parentWidget( q );
-    if ( w ) {
-        qDebug() << "MeshLayout: Setting geometries for" << w->metaObject()->className() << ", rect " << newRect;
-    }    
-#endif
+
+    if( mWrongAnchors || ( mActualItems.isEmpty() ) ) {
+        return;
+    }
+
 
-    if ( (newRect != mUsedRect) || mInvalidateCalled ) {
+    if( (newRect != mUsedRect) || mInvalidateCalled ) {
 
-        mValid = true;
+        mInvalidateCalled = false;
+        mUsedRect = newRect;
+
         if ( mEquationsDirty ) {
-            // Resolve anchors from mesh layout data.
             updateAnchorsAndItems();
-
-            // Remainder of this method is similar to \c HbAnchorLayout.
             createEquations( Horizontal );
             createEquations( Vertical );
-
             mEquationsDirty = false;
         }
 
-        Variable *layoutWidth = mVariablesHorizontal.findVariable( q );
-        if ( layoutWidth ) {
-            layoutWidth->mFlags |= Variable::FlagFixed;
-            layoutWidth->mPref = newRect.width();
-        }
+
+        mValid = true;
+
+        {
+
+            QList<Expression*> *el = &mEquationsHorizontal;
+            VariableSet *vs = &mVariablesHorizontal;
+            Solution *solution = &mSolutionHorizontal;
+            solution->clear();
+
 
-        Variable *layoutHeight = mVariablesVertical.findVariable( q );
-        if ( layoutHeight ) {
-            layoutHeight->mFlags |= Variable::FlagFixed;
-            layoutHeight->mPref = newRect.height();
+            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
         }
 
-        for ( int i = 0; i < mVariablesHorizontal.mVarList.count(); i++ ) {
-            Variable *var = mVariablesHorizontal.mVarList.at(i);
-            QGraphicsLayoutItem *item = static_cast<QGraphicsLayoutItem*>(var->mRef);
-            if ( item && item != q ) {
-                setVariables( var, item, Horizontal );
-            }
-        }
+        {
+            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
 
-        for ( int i = 0; i < mVariablesVertical.mVarList.count(); i++ ) {
-            Variable *var = mVariablesVertical.mVarList.at(i);
-            QGraphicsLayoutItem *item = static_cast<QGraphicsLayoutItem*>(var->mRef);
-            if ( item && item != q ) {
-                setVariables( var, item, Vertical );
+            mValid = AnchorLayoutEngine::instance()->solveEquation( el, vs, solution );
+            if( !mValid ) {
+                return;
             }
-        }
+#ifdef HBMESHLAYOUT_DEBUG
+            qDebug() << "solution->size() = " << solution->size();
+
 
-        mValid = EquationSolver::solveEquation(
-            mEquationsHorizontal,
-            mVariablesHorizontal,
-            &mSolutionHorizontal );
-        if ( !mValid ) {
-#ifdef HBMESHLAYOUT_DEBUG
-            qDebug() << "MeshLayout: Horizontal anchors couldn't be solved";
-#endif
-            return;
+            if( solution->size() > 0 ) {
+                QHashIterator<Variable*, qreal>  i(*solution);
+                while (i.hasNext()) {
+                    i.next();
+                    qDebug() << ( ( Variable* )( i.key() ) )->mId << ": " << i.value();
+                }
+            }
+#endif //HBMESHLAYOUT_DEBUG
         }
 
-        mValid = EquationSolver::solveEquation(
-            mEquationsVertical,
-            mVariablesVertical,
-            &mSolutionVertical );
-        if ( !mValid ) {
+        {
+            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() << "MeshLayout: Vertical anchors couldn't be solved";
-#endif
-            return;
-        }
-    }
+                    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 );
+                    }
 
-    mUsedRect = newRect;
-   
-    Qt::LayoutDirection layoutDir = HbLayoutUtils::visualDirection(q);
-    for ( int i=0; i<mActualItems.count(); i++ ) {
+                    if( startDefined && ( !endDefined ) ) {
+                        defineNextGeometry( startIndex, endIndex, i, startIndex );
+                        somethingHappens = true;
+                    } else if( ( !startDefined ) && endDefined ) {
+                        defineNextGeometry( startIndex, endIndex, i, endIndex );
+                        somethingHappens = true;
+                    }
+                }
+            }
 
-        qreal l, t, r, b;
-        l = mUsedRect.left() + mDataHorizontal.value( 2*i+1, 0, &mSolutionHorizontal, mValid );
-        if ( !mValid ) {
 #ifdef HBMESHLAYOUT_DEBUG
-            qDebug() << "MeshLayout: Invalid left coordinate";
+            QGraphicsWidget* w = HbLayoutUtils::parentWidget( q );
+            if ( w ) {
+                qDebug() << "Items of " << w->metaObject()->className();
+            }
 #endif
-        	return;
-    	}
-        r = mUsedRect.left() + mDataHorizontal.value( 2*i+2, 0, &mSolutionHorizontal, mValid );
-        if ( !mValid ) {
-#ifdef HBMESHLAYOUT_DEBUG
-            qDebug() << "MeshLayout: Invalid right coordinate";
-#endif
-        	return;
-    	}
-        t = mUsedRect.top() + mDataVertical.value( 2*i+1, 0, &mSolutionVertical, mValid );
-        if ( !mValid ) {
+
+
+            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() << "MeshLayout: Invalid top coordinate";
-#endif
-        	return;
-    	}
-        b = mUsedRect.top() + mDataVertical.value( 2*i+2, 0, &mSolutionVertical, mValid );
-        if ( !mValid ) {
-#ifdef HBMESHLAYOUT_DEBUG
-            qDebug() << "Invalid bottom coordinate";
-#endif
-        	return;
-    	}
-        QRectF geom(QPointF(l, t), QPointF(r, b));
-        HbLayoutUtils::visualRect(layoutDir, geom, mUsedRect);
-        QGraphicsLayoutItem *lItem = mActualItems.at(i);
-        lItem->setGeometry(geom);
-
-        // left edge -> 2*i+1
-        // right edge -> 2*i+2
-
+                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
-*/
-int HbMeshLayoutPrivate::getEdgeIndex( QGraphicsLayoutItem *item, HbAnchorLayout::Edge edge )
-{
-    Q_Q(HbMeshLayout);
-    int edgeIndex(0);
-    if ( item == q ) {
-        if ( edge == Hb::RightEdge || edge == Hb::BottomEdge ) {
-            edgeIndex = 2 * mActualItems.count()+1;
-        } // else -> 0
-    } else {
-        edgeIndex = 2 * actualItemsIndexOf( item )+1;
-        if ( edge == Hb::RightEdge || edge == Hb::BottomEdge ) {
-            edgeIndex += 1;
-        }
-    }
-    return edgeIndex;
-}
-
-/*
+/*!
     \internal
 */
 void HbMeshLayoutPrivate::createEquations( EdgeType type )
 {
-    
     Q_Q(HbMeshLayout);
-    VariableSet *vs = &mVariablesHorizontal;
-    DataGrid *dg = &mDataHorizontal;
-    if ( type == Vertical ) {
-        vs = &mVariablesVertical;
-        dg = &mDataVertical;
-    }
-    vs->clear();
-    dg->clear();
-    
-    createEquationsCommon( type );
-    
-    SimpleExpression se;
-    se.mVar = vs->findVariable( q );
-    se.mCoef = 1;
-    dg->setExpression( se, 2*mActualItems.count()+1, 0 );
+
+    {
+
+        VariableSet *vs =  &mVariablesHorizontal;
+        QList<Expression*> *el = &mEquationsHorizontal;
+
+        QList<GraphEdge*> *edges = &mEdgesHorizontal;
+        QList<GraphVertex*> *vertices = &mVerticesHorizontal;
+
+        Variable *layoutVar;
 
-    if ( type == Horizontal ) {
-        mEquationsHorizontal = dg->calculate();
-        mSolutionHorizontal.clear();
-    } else {
-        mEquationsVertical = dg->calculate();
-        mSolutionVertical.clear();
-    }
-}
+        if( type == Vertical ) {
+            edges = &mEdgesVertical;
+            vertices = &mVerticesVertical;
+            vs =  &mVariablesVertical;
+            el = &mEquationsVertical;
+        }
+
+        qDeleteAll( *el );
+
+        vs->clear();
+        el->clear();
 
 
-/*
-    \internal
-*/
-void HbMeshLayoutPrivate::calculateSizeHint( EdgeType type )
-{
-    Q_Q(HbMeshLayout);
-    VariableSet *vs = &mVariablesHorizontal;
-    DataGrid *dg = &mDataHorizontal;
-    if ( type == Vertical ) {
-        vs = &mVariablesVertical;
-        dg = &mDataVertical;
-    }
-    
-    createEquationsCommon( type );
+        GraphVertex *layoutStart = new GraphVertex();
+        GraphVertex *layoutMiddle = new GraphVertex();
+        GraphVertex *layoutEnd = new GraphVertex();
+
+        GraphVertex *itemStart;
+        GraphVertex *itemEnd;
 
-    Variable *vLayout = vs->findVariable( q );
+        GraphEdge *newEdge;
+
+        SimpleExpression se;
 
-    vLayout->mFlags = 0;
-    vLayout->mMin = 0;
-    vLayout->mPref = 100;
-    vLayout->mMax = 1000; 
+        vertices->append( layoutStart );
+        vertices->append( layoutMiddle );
+        vertices->append( layoutEnd );
 
-    for ( int i = 0; i < vs->mVarList.count(); i++ ) {
-        Variable *var = vs->mVarList.at(i);
-        QGraphicsLayoutItem *item = static_cast<QGraphicsLayoutItem*>(var->mRef);
-        if ( item && item != q ) {
-            setVariables( var, item, type );
-        } 
-    }
-    
-    if ( type == Horizontal ) {        
-        dg->calculate();
-         
-        if( dg->mGrid.value( 2 * mActualItems.count() + 1 ).contains( 0 ) ) {
-            mSx = dg->mGrid.value( 2 * mActualItems.count() + 1 ).value( 0 );
+        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 {
-            mSx.clear();
+            layoutStart->itemSide =  Hb::LeftEdge;
+            layoutMiddle->itemSide =  Hb::CenterHEdge;
+            layoutEnd->itemSide =  Hb::RightEdge;
         }
-                
-    } else {
-        dg->calculate();
-        
-        if( dg->mGrid.value( 2 * mActualItems.count() + 1 ).contains( 0 ) ) {
-            mSy = dg->mGrid.value( 2 * mActualItems.count() + 1 ).value( 0 );
-        } else {
-            mSy.clear();
-        }
-    }
-    
-}
 
 
-/*
-    \internal
-*/
-void HbMeshLayoutPrivate::createEquationsCommon( EdgeType type )
-{
-    Q_Q(HbMeshLayout);
-    VariableSet *vs = &mVariablesHorizontal;
-    DataGrid *dg = &mDataHorizontal;
-    if ( type == Vertical ) {
-        vs = &mVariablesVertical;
-        dg = &mDataVertical;
-    }
-    vs->clear();
-    dg->clear();
+        for ( int i = 0; i < mActualItems.count(); i++ ) {
+            QGraphicsLayoutItem *item = mActualItems.at( i );
+            itemStart = new GraphVertex();
+            itemEnd = new GraphVertex();
+            newEdge = new GraphEdge();
 
-    SimpleExpression se = {0,0};
+            se.mVar = vs->createVariable(item);
+            se.mCoef = 1;
+
+            newEdge->expr->plusSimpleExpression( se );
+
+            edges->append( newEdge );
+            vertices->append( itemStart );
+            vertices->append( itemEnd );
 
-    // pseudo variable
-    Variable *v1 = vs->createVariable(0);
-    v1->mPref = 1;
-    v1->mFlags |= Variable::FlagFixed;
+            newEdge->startVertex = itemStart;
+            newEdge->endVertex = itemEnd;
+            newEdge->ref = ( void* )item;
 
-    vs->createVariable(q);
+            setSizeProp( &(se.mVar->sizeProp), item, type );
+
+            itemStart->itemRef = ( void* )item;
+            itemEnd->itemRef = ( void* )item;
 
-    se.mCoef = 1;
-    for (int i=0; i<mActualItems.count(); i++) {
-        QGraphicsLayoutItem *item = mActualItems.at(i);
-        se.mVar = vs->createVariable(item);
-        // left edge -> 2*i+1
-        // right edge -> 2*i+2
-        dg->setExpression( se, 2*i+2, 2*i+1 );
+            itemStart->edges.append( newEdge );
+            itemEnd->edges.append( newEdge );
+
+            itemStart->special = false;
+            itemEnd->special = false;
 
-        // if no anchors in this dimension...
-        bool has_any_anchor = false;
-        for (int i=0; i<mAnchors.count(); i++) {
-            const HbAnchor& anchor = mAnchors.at(i);
-            if( edgeType( anchor.mStartEdge ) == type &&
-                ( anchor.mStartItem == item || anchor.mEndItem == item  ) ) {
-                has_any_anchor = true;
-                break;
+            if( type == Vertical ) {
+                itemStart->itemSide =  Hb::TopEdge;
+                itemEnd->itemSide =  Hb::BottomEdge;
+            } else {
+                itemStart->itemSide =  Hb::LeftEdge;
+                itemEnd->itemSide =  Hb::RightEdge;
             }
         }
 
-        if( !has_any_anchor ) {
-            // ...anchor the item with a "fake anchor"
-            // to the top or the left edge of the layout.
-            se.mVar = v1;
-            se.mCoef = 0;
-            int startIndex = 0;
-            HbAnchorLayout::Edge fakeEdge = ( type == Horizontal )
-                ? Hb::LeftEdge
-                : Hb::TopEdge;
-            int endIndex = getEdgeIndex( item, fakeEdge );
-            dg->setExpression( se, endIndex, startIndex );
-            se.mCoef = 1;
-        }
-    }
+
+        // pseudo variable
+        Variable *v1 = vs->createVariable(0);
+        v1->sizeProp.pref = 1;
+        v1->sizeProp.flags = SizeProperty::FlagFixed;
 
 
-    se.mVar = v1;
-    for (int i=0; i<mAnchors.count(); i++) {
-        const HbAnchor& anchor = mAnchors[i];
-        if ( edgeType( anchor.mStartEdge ) == type ) {
-            Expression ex;
-            int startIndex = getEdgeIndex( anchor.mStartItem, anchor.mStartEdge );
-            int endIndex = getEdgeIndex( anchor.mEndItem, anchor.mEndEdge );
-            
-            if( ( anchor.mStartEdge == Hb::CenterHEdge ) || ( anchor.mStartEdge == Hb::CenterVEdge ) ) {
-                SimpleExpression startSE;
-                startSE.mVar = vs->findVariable( anchor.mStartItem );
-                startSE.mCoef = 0.5;
-                ex.plusSimpleExpression( startSE );
+        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();
             }
+        }
 
-            if( ( anchor.mEndEdge == Hb::CenterHEdge ) || ( anchor.mEndEdge == Hb::CenterVEdge ) ) {
-                SimpleExpression endSE;
-                endSE.mVar = vs->findVariable( anchor.mEndItem );
-                endSE.mCoef = -0.5;
-                ex.plusSimpleExpression( endSE );
+
+        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();
             }
-            
-            se.mCoef = anchor.mValue;
-            ex.plusSimpleExpression( se );
-            dg->setExpression( ex, endIndex, startIndex );
+        }
+
+
+        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;
         }
     }
-
-    se.mCoef = 0;
-    se.mVar = v1;
-    for( int i = 0; i <= 2*mActualItems.count()+1; i++ ) {
-        dg->setExpression( se, i, i );
-    }
-
 }
 
-
-
 /*
     Creates inverse mapping, i.e. from id -> layout item.
 */
@@ -755,7 +1152,7 @@
     if it's not NULL.
 */
 bool HbMeshLayoutPrivate::hasAnchorSpacing(
-    const HbMeshAnchor &anchor, 
+    const HbMeshAnchor &anchor,
     qreal *spacing) const
 {
     if (spacing) {
@@ -764,9 +1161,9 @@
         key.mId = anchor.mStartId;
         key.mEdge = anchor.mStartEdge;
 
-        QMap<HbMeshKey, qreal>::const_iterator spacingIt = 
+        QMap<HbMeshKey, qreal>::const_iterator spacingIt =
             mMeshSpacings.constFind(key);
-            
+
         bool hasSpacing = true;
         if (spacingIt != mMeshSpacings.constEnd()) {
             *spacing = spacingIt.value();
@@ -792,28 +1189,28 @@
 /*
     Finds new end item for problematic anchor.
 
-    Follows the anchor that have the same start edge 
+    Follows the anchor that have the same start edge
     as the problematic anchor.
 
-    Invariant: 
+    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 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 && 
+        if (currentItem.mStartId == problem.mEndId &&
             currentItem.mStartEdge == problem.mStartEdge &&
             !ids.contains(currentItem.mStartId)) {
 
@@ -834,7 +1231,7 @@
                     ids.takeLast();
                 }
                 if (found) {
-                    // We have found an end item. There can be multiple end items, 
+                    // We have found an end item. There can be multiple end items,
                     // but (for now) the first one is selected.
                     return true;
                 }
@@ -853,23 +1250,27 @@
     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, 
+    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 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 
+    So direction of anchors affect this resolution process, but not in the
     anchor layout calculations.
 
     \sa findEndItem
 */
-QList<HbAnchor> HbMeshLayoutPrivate::resolveAnchors()
+void HbMeshLayoutPrivate::resolveAnchors( QList<HbAnchor*> *anchors )
 {
-    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) {
@@ -878,18 +1279,36 @@
 
         QGraphicsLayoutItem *startItem = map.value(anchor.mStartId);
 
-        if (startItem) {            
-            HbAnchor item(startItem, anchor.mStartEdge, 0 /*end item*/, anchor.mEndEdge, 0);
+        if (startItem) {
+            qreal value;
+
+            if (hasAnchorSpacing(anchor, &value)) {
+                // anchor really exists
+
+                if( count > anchors->size() - 1 ) {
+                    isAnchorNew = true;
+                }
 
-            if (hasAnchorSpacing(anchor, &item.mValue)) {
-                // anchor really exists
+                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;
-                    anchors.append(item);
+                    item->mEndItem = endItem;
+                    if( isAnchorNew ) {
+                        anchors->append(item);
+                    }
+                    count++;
                 } else {
                     // try to "fix" anchor
 
@@ -902,12 +1321,15 @@
                     ids.append(anchor.mStartId);
 
                     if (findEndItem(result, anchor, map, ids)) {
-                        item.mEndEdge = result.mEdge;
-                        item.mEndItem = result.mItem;
-                        item.mValue = result.mSpacing;
-                        anchors.append(item);
+                        item->mEndEdge = result.mEdge;
+                        item->mEndItem = result.mItem;
+                        item->mValue = result.mSpacing;
+                        if( isAnchorNew ) {
+                            anchors->append(item);
+                        }
+                        count++;
                     }
-                }            
+                }
             }
 
         } else {
@@ -915,26 +1337,29 @@
         }
     }
 
-    return anchors;
+    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) != 
+    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() || 
+    if (anchor.mStartId.isNull() ||
         anchor.mEndId.isNull()) {
         qWarning() << "HbMeshLayout::setAnchor : Both ids must be valid";
         return false;
     }
 
-    if ((anchor.mStartId == anchor.mEndId) && 
+    if ((anchor.mStartId == anchor.mEndId) &&
         (anchor.mStartEdge == anchor.mEndEdge)) {
         qWarning() << "HbMeshLayout::setAnchor : You cannot set anchor between the same edge";
         return false;
@@ -945,7 +1370,7 @@
     const int count = mMeshAnchors.size();
     for (int i = 0; i < count; ++i) {
         HbMeshAnchor& item = mMeshAnchors[i];
-        if (item.mStartId == anchor.mStartId && 
+        if (item.mStartId == anchor.mStartId &&
             item.mStartEdge == anchor.mStartEdge) {
 #ifdef HBMESHLAYOUT_DEBUG
                 if (item.mEndId != anchor.mEndId ||
@@ -999,7 +1424,7 @@
         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 
+            // from the layout more efficiently than the implementation of
             // ~QGraphicsLayoutItem.
             removeAt(i);
             if (item) {
@@ -1010,7 +1435,7 @@
             }
         }
     }
-    
+
     delete d_ptr;
 }
 
@@ -1018,10 +1443,10 @@
     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 
+
+    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.
@@ -1042,7 +1467,6 @@
     anchor.mSpacing = spacing;
 
     if (d->setAnchor(anchor)) {
-        d->mEquationsDirty = true;
         invalidate();
         return true;
     }
@@ -1062,7 +1486,6 @@
     anchor.mSpacing = 0;
 
     if (d->setAnchor(anchor)) {
-        d->mEquationsDirty = true;
         invalidate();
         return true;
     }
@@ -1070,12 +1493,12 @@
 }
 
 /*!
-    Removes anchor starting from (\a startId, \a startEdge). As you cannot have more 
+    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).
@@ -1096,7 +1519,6 @@
     }
 
     if (modified) {
-        d->mEquationsDirty = true;
         invalidate();
         return true;
     }
@@ -1106,7 +1528,7 @@
 /*!
     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.
 */
@@ -1124,7 +1546,6 @@
     }
 
     if (modified) {
-        d->mEquationsDirty = true;
         invalidate();
         return true;
     }
@@ -1140,8 +1561,6 @@
     Q_D( HbMeshLayout );
     if (d->mMeshAnchors.size()) {
         d->mMeshAnchors.clear();
-
-        d->mEquationsDirty = true;
         invalidate();
     }
 }
@@ -1160,9 +1579,8 @@
     key.mId = startId;
     key.mEdge = startEdge;
 
-    d->mMeshSpacings.insert(key, spacing); // will replace spacing if key already exists    
+    d->mMeshSpacings.insert(key, spacing); // will replace spacing if key already exists
 
-    d->mEquationsDirty = true;
     invalidate();
 }
 
@@ -1179,7 +1597,6 @@
     key.mEdge = startEdge;
 
     if(d->mMeshSpacings.remove(key)) {
-        d->mEquationsDirty = true;
         invalidate();
     }
 }
@@ -1192,13 +1609,12 @@
     Q_D( HbMeshLayout );
     if (d->mMeshSpacings.size()) {
         d->mMeshSpacings.clear();
-        d->mEquationsDirty = true;
         invalidate();
     }
 }
 
 /*!
-    Sets identifier for \a item. You can reset this mapping by 
+    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.
@@ -1228,7 +1644,6 @@
     }
 
     if (modified) {
-        d->mEquationsDirty = true;
         invalidate();
     }
 }
@@ -1307,7 +1722,7 @@
 bool HbMeshLayout::isValid() const
 {
     Q_D( const HbMeshLayout );
-    return d->mValid;
+    return ( d->mValid && ( ! d->mWrongAnchors ) );
 }
 
 
@@ -1343,7 +1758,7 @@
     Q_D( const HbMeshLayout );
     return d->mMeshMap.key( id );
 }
-    
+
 qreal HbMeshLayout::spacing( const QString& startId, Edge startEdge ) const
 {
     Q_D( const HbMeshLayout );
@@ -1351,7 +1766,7 @@
     key.mId = startId;
     key.mEdge = startEdge;
 
-    return d->mMeshSpacings.value( key );     
+    return d->mMeshSpacings.value( key );
 }
 
 
@@ -1373,7 +1788,6 @@
         d->mItems.removeAt(index);
     }
 
-    d->mEquationsDirty = true;
     invalidate();
 }
 
@@ -1385,7 +1799,6 @@
     Q_D( HbMeshLayout );
     QGraphicsLayout::setGeometry(rect);
     d->setItemGeometries();
-    d->mInvalidateCalled = false;
 }
 
 /*!
@@ -1413,7 +1826,8 @@
 {
     Q_D( HbMeshLayout );
     d->mInvalidateCalled = true;
-    d->mSizeHintDirty = true;
+    d->mWrongAnchors = false;
+    d->mEquationsDirty = true;
     QGraphicsLayout::invalidate();
 }
 
@@ -1430,99 +1844,57 @@
 QSizeF HbMeshLayout::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
 {
     Q_D( const HbMeshLayout );
-    Q_UNUSED( constraint );    
-    
+    Q_UNUSED( constraint );
+
     return const_cast<HbMeshLayoutPrivate*>(d)->sizeHint( which );
 }
 
 QSizeF HbMeshLayoutPrivate::sizeHint(Qt::SizeHint which)
 {
-    if( mSizeHintDirty ) {
+    if ( mEquationsDirty ) {
         updateAnchorsAndItems();
-        calculateSizeHint( Horizontal );
-        calculateSizeHint( Vertical );
-        mEquationsDirty = true;        
-        mSizeHintDirty = false;
-        
-        if( mSx.mExpression.size() > 0 ) {
-
-            mMinSH.setWidth( mSx.minValue() );
-            mPrefSH.setWidth( mSx.prefValue() );
-            mMaxSH.setWidth( mSx.maxValue() );
+        createEquations( Horizontal );
+        createEquations( Vertical );
+        mEquationsDirty = false;
+    }
 
-            if( mMinSH.width() < 0 ) {
-                mMinSH.setWidth( 0 );
-            }
+    if( mLayoutVarH && mLayoutVarV ) {
 
-            if( mPrefSH.width() < 0 ) {
-                mPrefSH.setWidth( 0 );
-            }
+        QSizeF res;
 
-            if( mMaxSH.width() < 0 ) {
-                mMaxSH.setWidth( 0 );
-            }
-
+        if( mLayoutVarH->sizeProp.flags & SizeProperty::FlagFixed ) {
+            res.setWidth( mLayoutVarH->sizeProp.pref );
         } else {
-            mMinSH.setWidth( 0 );
-            mPrefSH.setWidth( 100 );
-            mMaxSH.setWidth( 1000 );
-        }
-        
-        if( mSy.mExpression.size() > 0 ) {
-            mMinSH.setHeight( mSy.minValue() );
-            mPrefSH.setHeight( mSy.prefValue() );            
-            mMaxSH.setHeight( mSy.maxValue() );
-
-            if( mMinSH.height() < 0 ) {
-                mMinSH.setHeight( 0 );
+            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( mPrefSH.height() < 0 ) {
-                mPrefSH.setHeight( 0 );
-            }
-
-            if( mMaxSH.height() < 0 ) {
-                mMaxSH.setHeight( 0 );
-            }
-        } else {
-            mMinSH.setHeight( 0 );
-            mPrefSH.setHeight( 100 );
-            mMaxSH.setHeight( 1000 );
         }
 
-            
-        mSx.clear();
-        mSy.clear();
+        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 );
+        }
     }
-        
-    QSizeF res;
-#ifdef HBMESHLAYOUT_DEBUG
-    QString shText;
-#endif
-    if (which == Qt::MinimumSize) {
-#ifdef HBMESHLAYOUT_DEBUG
-        shText = "(minimum)";
-#endif
-        res = mMinSH;
-    } else if (which == Qt::PreferredSize ) {
-#ifdef HBMESHLAYOUT_DEBUG
-        shText = "(preferred)";
-#endif
-        res = mPrefSH;
-    } else {
-#ifdef HBMESHLAYOUT_DEBUG
-        shText = "(maximum)";
-#endif
-        res = mMaxSH;
-    }
-    
-#ifdef HBMESHLAYOUT_DEBUG
-    Q_Q(HbMeshLayout);
-    QGraphicsWidget* w = HbLayoutUtils::parentWidget( q );
-    if ( w ) {
-        qDebug() << "MeshLayout: Size hint" << shText.toAscii().data() << "for" << w->metaObject()->className() << res;
-    }    
-#endif    
-    return res;
 }
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/layouts/hbmeshlayout_p.h
--- a/src/hbcore/layouts/hbmeshlayout_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/layouts/hbmeshlayout_p.h	Mon May 03 12:48:33 2010 +0300
@@ -37,7 +37,7 @@
 class HB_AUTOTEST_EXPORT HbMeshLayout : public QGraphicsLayout
 {
     friend class HbMeshLayoutDebug;
-    
+
 public:
     typedef Hb::Edge Edge;
 
@@ -57,18 +57,18 @@
 
     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;
@@ -84,7 +84,7 @@
 
 private:
     Q_DISABLE_COPY(HbMeshLayout)
-    Q_DECLARE_PRIVATE_D(d_ptr, HbMeshLayout)    
+    Q_DECLARE_PRIVATE_D(d_ptr, HbMeshLayout)
 };
 
 #endif // HBMESHLAYOUT_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/layouts/hbmeshlayoutdebug_p.h
--- a/src/hbcore/layouts/hbmeshlayoutdebug_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/layouts/hbmeshlayoutdebug_p.h	Mon May 03 12:48:33 2010 +0300
@@ -34,7 +34,7 @@
 class HB_AUTOTEST_EXPORT HbMeshLayoutDebug
 {
 public:
-    static QList<HbAnchor> getAnchors( HbMeshLayout* layout );
+    static QList<HbAnchor*> getAnchors( HbMeshLayout* layout );
 };
 
 #endif
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/layouts/layouts.pri
--- a/src/hbcore/layouts/layouts.pri	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/layouts/layouts.pri	Mon May 03 12:48:33 2010 +0300
@@ -29,14 +29,14 @@
 DEPENDPATH += $$PWD
 
 PUBLIC_HEADERS += $$PWD/hbanchorlayout.h
-PUBLIC_HEADERS += $$PWD/hbstackedlayout.h
+PUBLIC_HEADERS += $$PWD/hbstackedlayout.h 
 
-INTERNAL_HEADERS += $$PWD/hbanchor_p.h
-INTERNAL_HEADERS += $$PWD/hbanchorlayoutdebug_p.h
-INTERNAL_HEADERS += $$PWD/hbanchorlayoutengine_p.h
-INTERNAL_HEADERS += $$PWD/hblayoututils_p.h
-INTERNAL_HEADERS += $$PWD/hbmeshlayout_p.h
-INTERNAL_HEADERS += $$PWD/hbspaceritem_p.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/hbanchorlayout.cpp
 SOURCES += $$PWD/hbanchorlayoutengine_p.cpp
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/ovgeffects/ovgeffects.pri
--- a/src/hbcore/ovgeffects/ovgeffects.pri	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/ovgeffects/ovgeffects.pri	Mon May 03 12:48:33 2010 +0300
@@ -36,35 +36,34 @@
         LIBS += $$QMAKE_LIBS_OPENVG
     } else {
         symbian: LIBS += -llibopenvg -llibopenvgu
-        win32-g++: LIBS += -lopenvg
-        win32-msvc*: LIBS += -llibopenvg
-        linux-*: LIBS += -lopenvg
+        else:win32-msvc*: LIBS += -llibopenvg
+        else: LIBS += -lopenvg
     }
 }
 
-INTERNAL_HEADERS += $$PWD/hbvgbceffect_p.h
-INTERNAL_HEADERS += $$PWD/hbvgbceffect_p_p.h
-INTERNAL_HEADERS += $$PWD/hbvgblureffect_p.h
-INTERNAL_HEADERS += $$PWD/hbvgblureffect_p_p.h
-INTERNAL_HEADERS += $$PWD/hbvgchainedeffect_p.h
-INTERNAL_HEADERS += $$PWD/hbvgchainedeffect_p_p.h
-INTERNAL_HEADERS += $$PWD/hbvgcolorizeeffect_p.h
-INTERNAL_HEADERS += $$PWD/hbvgcolorizeeffect_p_p.h
-INTERNAL_HEADERS += $$PWD/hbvgeffect_p.h
-INTERNAL_HEADERS += $$PWD/hbvgeffect_p_p.h
-INTERNAL_HEADERS += $$PWD/hbvggloweffect_p.h
-INTERNAL_HEADERS += $$PWD/hbvghsleffect_p.h
-INTERNAL_HEADERS += $$PWD/hbvghsleffect_p_p.h
-INTERNAL_HEADERS += $$PWD/hbvgoutlineeffect_p.h
-INTERNAL_HEADERS += $$PWD/hbvgoutlineeffect_p_p.h
-INTERNAL_HEADERS += $$PWD/hbvgshadoweffect_p.h
-INTERNAL_HEADERS += $$PWD/hbvgframeeffect_p.h
-INTERNAL_HEADERS += $$PWD/hbvgframeeffect_p_p.h
-INTERNAL_HEADERS += $$PWD/hbvgreflectioneffect_p.h
-INTERNAL_HEADERS += $$PWD/hbvgreflectioneffect_p_p.h
-INTERNAL_HEADERS += $$PWD/hbvgmaskeffect_p.h
-INTERNAL_HEADERS += $$PWD/hbvgmaskeffect_p_p.h
-INTERNAL_HEADERS += $$PWD/hbvgeffecttraces_p.h
+PRIVATE_HEADERS += $$PWD/hbvgbceffect_p.h
+PRIVATE_HEADERS += $$PWD/hbvgbceffect_p_p.h
+PRIVATE_HEADERS += $$PWD/hbvgblureffect_p.h
+PRIVATE_HEADERS += $$PWD/hbvgblureffect_p_p.h
+PRIVATE_HEADERS += $$PWD/hbvgchainedeffect_p.h
+PRIVATE_HEADERS += $$PWD/hbvgchainedeffect_p_p.h
+PRIVATE_HEADERS += $$PWD/hbvgcolorizeeffect_p.h
+PRIVATE_HEADERS += $$PWD/hbvgcolorizeeffect_p_p.h
+PRIVATE_HEADERS += $$PWD/hbvgeffect_p.h
+PRIVATE_HEADERS += $$PWD/hbvgeffect_p_p.h
+PRIVATE_HEADERS += $$PWD/hbvggloweffect_p.h
+PRIVATE_HEADERS += $$PWD/hbvghsleffect_p.h
+PRIVATE_HEADERS += $$PWD/hbvghsleffect_p_p.h
+PRIVATE_HEADERS += $$PWD/hbvgoutlineeffect_p.h
+PRIVATE_HEADERS += $$PWD/hbvgoutlineeffect_p_p.h
+PRIVATE_HEADERS += $$PWD/hbvgshadoweffect_p.h
+PRIVATE_HEADERS += $$PWD/hbvgframeeffect_p.h
+PRIVATE_HEADERS += $$PWD/hbvgframeeffect_p_p.h
+PRIVATE_HEADERS += $$PWD/hbvgreflectioneffect_p.h
+PRIVATE_HEADERS += $$PWD/hbvgreflectioneffect_p_p.h
+PRIVATE_HEADERS += $$PWD/hbvgmaskeffect_p.h
+PRIVATE_HEADERS += $$PWD/hbvgmaskeffect_p_p.h
+PRIVATE_HEADERS += $$PWD/hbvgeffecttraces_p.h
 
 SOURCES += $$PWD/hbvgbceffect.cpp
 SOURCES += $$PWD/hbvgblureffect.cpp
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/primitives/hbframeitem.cpp
--- a/src/hbcore/primitives/hbframeitem.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/primitives/hbframeitem.cpp	Mon May 03 12:48:33 2010 +0300
@@ -101,6 +101,8 @@
 
 void HbFrameItemPrivate::init()
 {
+    item->setSizePolicy( QSizePolicy::Ignored, QSizePolicy::Ignored );
+
     if ( QGraphicsWidget *parent = item->parentWidget() ) {
         frameDrawer->setLayoutDirection(parent->layoutDirection());
     }
@@ -226,4 +228,17 @@
     }
 }
 
+
+QSizeF HbFrameItem::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
+{
+    if (which == Qt::MinimumSize) {
+        return QSizeF( 0, 0 );
+    } else if (which == Qt::PreferredSize ) {
+        return QSizeF( 0, 0 );
+    } else {
+        return HbWidgetBase::sizeHint( which, constraint );
+    }
+}
+
+
 // End of File
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/primitives/hbframeitem.h
--- a/src/hbcore/primitives/hbframeitem.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/primitives/hbframeitem.h	Mon May 03 12:48:33 2010 +0300
@@ -63,6 +63,7 @@
 
 protected:
     void changeEvent(QEvent *event);
+    QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const;
 
 private:
     Q_DISABLE_COPY(HbFrameItem)
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/primitives/hbiconitem.cpp
--- a/src/hbcore/primitives/hbiconitem.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/primitives/hbiconitem.cpp	Mon May 03 12:48:33 2010 +0300
@@ -48,7 +48,7 @@
   (the HbIconItem is not added to a layout in this case):
   \code
   //Create new icon, set position and size for it
-  HbIconItem *icon = new HbIconItem("qgn_menu_phob", this);
+  HbIconItem *icon = new HbIconItem("qtg_large_phonebook", this);
   icon->setPos(10,150);
   icon->setSize(QSizeF(200,20));
   \endcode
@@ -57,7 +57,7 @@
   (the HbIconItem is not added to a layout in this case):
   \code
   //Create new icon, set position and size for it
-  HbIconItem *icon = new HbIconItem("qgn_menu_phob", this);
+  HbIconItem *icon = new HbIconItem("qtg_large_phonebook", this);
   icon->setPos(10,150);
   icon->setSize(icon->defaultSize());
   \endcode
@@ -65,7 +65,7 @@
   Example of how to add HbIconItem to a layout.
   \code
   HbButton *button = new HbButton("Button 1");
-  HbIconItem *icon = new HbIconItem("qgn_menu_phob");
+  HbIconItem *icon = new HbIconItem("qtg_large_phonebook");
   QGraphicsGridLayout *layout = new QGraphicsGridLayout();
 
   //No need of setting the position and size. In this case
@@ -359,7 +359,8 @@
     Q_D(HbIconItem);
     if (d->mIcon.flags() != flags) {
         d->mIcon.setFlags(flags);
-        d->mAnimator.setIcon(d->mIcon);
+        if (d->mIconRect.isValid())
+            d->mAnimator.setIcon(d->mIcon);
         update();
     }
 }
@@ -377,7 +378,8 @@
     Q_D(HbIconItem);
     if (d->mIcon.mirroringMode() != mode) {
         d->mIcon.setMirroringMode(mode);
-        d->mAnimator.setIcon(d->mIcon);
+        if (d->mIconRect.isValid())
+            d->mAnimator.setIcon(d->mIcon);
         update();
     }
 }
@@ -429,7 +431,8 @@
     Q_D( HbIconItem );
     if (d->mIcon.color() != color) {
         d->mIcon.setColor(color);
-        d->mAnimator.setIcon(d->mIcon);
+        if (d->mIconRect.isValid())
+            d->mAnimator.setIcon(d->mIcon);
         update();
     }
 }
@@ -446,6 +449,8 @@
 
 /*!
  Returns the default size of the icon.
+ 
+ For raster images this is the original size of the image.
 
  \sa HbIcon::defaultSize()
  */
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/primitives/hbmarqueeitem.cpp
--- a/src/hbcore/primitives/hbmarqueeitem.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/primitives/hbmarqueeitem.cpp	Mon May 03 12:48:33 2010 +0300
@@ -96,9 +96,10 @@
     Q_UNUSED(option);
     Q_UNUSED(widget);
 
+    painter->save();
+
     painter->setPen(pen());
 
-    Qt::LayoutDirection direction = painter->layoutDirection();
     painter->setLayoutDirection ( mTextDirection );
     painter->setFont(parent->font());
     painter->drawText(boundingRect(), Qt::TextDontClip, mText);
@@ -108,7 +109,8 @@
     painter->drawRect(boundingRect());
     painter->setOpacity(0.3);
 #endif
-    painter->setLayoutDirection ( direction );
+
+    painter->restore();
 }
 
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/primitives/hbprogresstrackitem.cpp
--- a/src/hbcore/primitives/hbprogresstrackitem.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/primitives/hbprogresstrackitem.cpp	Mon May 03 12:48:33 2010 +0300
@@ -113,14 +113,9 @@
         }
     }
 
-	QPixmap mask(size);
-    mask.fill(Qt::white);
-    QPainter p;
-    p.begin(&mask);
-    p.setBrush(QBrush(Qt::black));
-	p.drawRect(maskRect);
-	p.end();
-	frameDrawer().setMask(mask);                   
+	QPainterPath path;
+	path.addRect(maskRect);
+	frameDrawer().setClipPath(path);         
     HbFrameItem::paint(painter,option,widget);
 }
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/primitives/hbrepeaticonitem_p.cpp
--- a/src/hbcore/primitives/hbrepeaticonitem_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/primitives/hbrepeaticonitem_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -130,7 +130,7 @@
     Q_UNUSED(option);
     Q_UNUSED(widget);
 
-    if(boundingRect().isValid()) {
+  //  if(boundingRect().isValid()) { // There is no geomtry set at any point ? 
 		if(!mConnected) {
 			connect(&mTimer,SIGNAL(timeout()),this,SLOT(updateAnimation()));
 		}
@@ -163,7 +163,7 @@
             newblit.setMask(mMask);
         }
         painter->drawPixmap(QPointF(0,0),newblit);
-    }
+  //  }
 }
 
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/primitives/hbrichtextitem.cpp
--- a/src/hbcore/primitives/hbrichtextitem.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/primitives/hbrichtextitem.cpp	Mon May 03 12:48:33 2010 +0300
@@ -36,6 +36,7 @@
 #include <QTextLayout>
 #include <QPainter>
 #include <QAbstractTextDocumentLayout>
+#include <QApplication>
 
 const int KMinimumLetersToShow = 4;
 
@@ -110,12 +111,11 @@
 {
     Qt::Alignment oldAlign = mTextOption.alignment();
     Qt::Alignment alignment = QStyle::visualAlignment(newDirection, mAlignment);
-    if(alignment!=oldAlign) {
-        mTextOption.setAlignment(alignment);
-        mRtf->setDefaultTextOption(mTextOption);
-        return true;
-    }
-    return false;
+    mTextOption.setAlignment(alignment);
+    mTextOption.setTextDirection(newDirection);
+    mRtf->setDefaultTextOption(mTextOption);
+
+    return alignment!=oldAlign;
 }
 
 void HbRichTextItemPrivate::setSize(const QSizeF &newSize)
@@ -276,6 +276,10 @@
 
     Q_D(HbRichTextItem);
 
+    // Save painter's state
+    QRegion oldClipRegion = painter->clipRegion();
+    QTransform oldTransform = painter->transform();
+
     if(!d->mDontPrint) {
         if(!d->mDontClip) {
             painter->setClipRect(contentsRect(), Qt::IntersectClip);
@@ -285,6 +289,10 @@
         context.palette.setColor(QPalette::Text, textDefaultColor());
         d->mRtf->documentLayout()->draw(painter, context);
     }
+
+    // Restore painter's state
+    painter->setClipRegion(oldClipRegion);
+    painter->setTransform(oldTransform);
 }
 
 /*!
@@ -342,9 +350,8 @@
     switch(event->type()) {
     case QEvent::LayoutDirectionChange: {
             prepareGeometryChange();
-            if(d->setLayoutDirection(layoutDirection())) {
-                update();
-            }
+            d->setLayoutDirection(layoutDirection());
+            update();
         }
         break;
 
@@ -480,9 +487,24 @@
 void HbRichTextItem::setTextDefaultColor(const QColor &color)
 {
     Q_D(HbRichTextItem);
+
+    d->setApiProtectionFlag(HbWidgetBasePrivate::AC_TextColor, color.isValid());
     if (d->mColor != color) {
         d->mColor = color;
-        update();
+
+        if (!color.isValid()) {
+            QGraphicsWidget* ccsHandler = parentWidget();
+            // check if there is a widget which handles CSS
+            if (ccsHandler!=NULL) {
+                // this is needed to enforce color fetch from CSS
+                HbEvent themeEvent(HbEvent::ThemeChanged);
+                QApplication::sendEvent(ccsHandler, &themeEvent);
+            }
+        }
+
+        if (!d->mText.isEmpty()) {
+            update();
+        }
     }
 }
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/primitives/hbrichtextitem.h
--- a/src/hbcore/primitives/hbrichtextitem.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/primitives/hbrichtextitem.h	Mon May 03 12:48:33 2010 +0300
@@ -65,11 +65,11 @@
     void setGeometry( const QRectF & rect );
     QRectF boundingRect () const;
 
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
+
 protected:
     HbRichTextItem(HbRichTextItemPrivate &dd, QGraphicsItem *parent );
 
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
-
     QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const;
     void resizeEvent ( QGraphicsSceneResizeEvent * event );
     void changeEvent( QEvent *event) ;
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/primitives/hbslidertrackitem.cpp
--- a/src/hbcore/primitives/hbslidertrackitem.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/primitives/hbslidertrackitem.cpp	Mon May 03 12:48:33 2010 +0300
@@ -106,66 +106,54 @@
     }
 }
 
-void HbSliderTrackItem::paint ( QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget )
+void HbSliderTrackItem::paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget)
 {
-
-    if ( setMask ) {
-        QSize size = boundingRect().size().toSize();
-     
-        QPixmap mask(size);
-        mask.fill(Qt::white);
-        QPainter p;
-        p.begin(&mask);
-
-        p.setBrush(QBrush(Qt::black));
-        if(maximum != minimum) {
-            if(maskWidth == 0) {
-                if(mOrientation == Qt::Horizontal){
+    QSize size = boundingRect().size().toSize();
+    if (setMask) {
+        QRectF maskRect;
+        if (maximum != minimum) {
+            if (maskWidth == 0) {
+                if (mOrientation == Qt::Horizontal) {
                     qreal left = (qreal)boundingRect().topLeft().x();
-                    if(inverted) {
-                        left = (qreal)boundingRect().width()* ((maximum - value)/(qreal) (maximum - minimum));
+                    if (inverted) {
+                        left = (qreal)boundingRect().width() * ((maximum - value) / (qreal)(maximum - minimum));
                     }
-                    if ( layoutDirection() == Qt::RightToLeft ) {
-
-                        p.drawRect(QRectF(
-                            left,
-                            (qreal)boundingRect().topLeft().y(),
-                            (qreal)boundingRect().width()* ((value -  minimum)/(qreal) (maximum - minimum)),
-                            (qreal)boundingRect().height()));
-
+                    if (layoutDirection() == Qt::RightToLeft) {
+                        maskRect = QRectF(
+                                       left,
+                                       (qreal)boundingRect().topLeft().y(),
+                                       (qreal)boundingRect().width() * ((value -  minimum) / (qreal)(maximum - minimum)),
+                                       (qreal)boundingRect().height());
+                    } else {
+                        maskRect = QRectF(
+                                       left,
+                                       (qreal)boundingRect().topLeft().y(),
+                                       (qreal)trackSpan * ((value -  minimum) / (qreal)(maximum - minimum)),
+                                       (qreal)boundingRect().height());
                     }
-                    else {
-                        p.drawRect(QRectF(
-                            left,
-                            (qreal)boundingRect().topLeft().y(),
-                            (qreal)trackSpan* ((value -  minimum)/(qreal) (maximum - minimum)),
-                            (qreal)boundingRect().height()));
-                    }
-
-                }
-                else{
-                    qreal start = boundingRect().bottom() -(qreal)trackSpan*((value -  minimum)/(qreal) (maximum - minimum));
+                } else {
+                    qreal start = boundingRect().bottom() - (qreal)trackSpan * ((value -  minimum) / (qreal)(maximum - minimum));
                     qreal end = boundingRect().bottom();
 
-                    if(inverted) {
+                    if (inverted) {
                         start = boundingRect().top();
-                        end = start+(qreal)trackSpan*((value -  minimum)/(qreal) (maximum - minimum));
+                        end = start + (qreal)trackSpan * ((value -  minimum) / (qreal)(maximum - minimum));
                     }
-                    p.drawRect(QRectF(
-                        (qreal)boundingRect().topLeft().x(),
-                        start,
-                        (qreal)boundingRect().width(),
-                        end ));
+                    maskRect = QRectF(
+                                   (qreal)boundingRect().topLeft().x(),
+                                   start,
+                                   (qreal)boundingRect().width(),
+                                   end);
                 }
             }
         }
-        p.end();        
-                  
-        frameDrawer().setMask(mask); 
-        setMask = false; 
+        QPainterPath rectPath;
+        rectPath.addRect(maskRect);
+        frameDrawer().setClipPath(rectPath);
+        setMask = false;
     }
-    HbFrameItem::paint(painter,option,widget);
 
+    HbFrameItem::paint(painter, option, widget);
 }
 
  /*!
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/primitives/hbtextitem.cpp
--- a/src/hbcore/primitives/hbtextitem.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/primitives/hbtextitem.cpp	Mon May 03 12:48:33 2010 +0300
@@ -34,28 +34,32 @@
 #include <QGraphicsSceneResizeEvent>
 #include <QPainter>
 #include <QTextOption>
-
+#include <QApplication>
 
 #ifdef HB_TEXT_MEASUREMENT_UTILITY
 #include "hbtextmeasurementutility_p.h"
 #include "hbfeaturemanager_p.h"
 #endif
 
+#define EPSILON 0.01
 
 bool HbTextItemPrivate::outlinesEnabled = false;
 
 static const QString KDefaultColorThemeName = "qtc_view_normal";
 const int MinimumWidth = 5; // minimum width if there is some text.
 const int KLayoutCacheLimit = 64;
+const qreal KFadeTolerance = 1.0;
 
 HbTextItemPrivate::HbTextItemPrivate () :
     mAlignment(Qt::AlignLeft | Qt::AlignVCenter),
-    mElideMode(Qt::ElideRight),
+    mElideMode(Qt::ElideNone),
     mDontPrint(false),
     mDontClip(false),
-    mTextDirection(Qt::LeftToRight),
     mInvalidateShownText(true),
     mOffsetPos(0,0),
+    mPaintFaded(false),
+    mFadeLengthX(30),
+    mFadeLengthY(15),
     mPrefHeight(0),
     mMinLines(0),
     mMaxLines(0),
@@ -98,18 +102,34 @@
         QTextLine line = mTextLayout.createLine();
         if (!line.isValid())
             break;
+        if( ( mMaxLines > 0 ) && ( mTextLayout.lineCount() > mMaxLines ) ) {
+            textTruncated = true;
+            break;
+        }
 
         line.setLineWidth(lineWidth);
         height += leading;
         line.setPosition(QPointF(0, height));
         height += line.height();
-        if( ( mMaxLines > 0 ) && ( mTextLayout.lineCount() >= mMaxLines ) ) {
-            textTruncated = true;
-            break;
-        }
     }
     mTextLayout.endLayout();
 
+    if( textTruncated ) {
+        mTextLayout.setText(text);
+        mTextLayout.setFont( q_func()->font() );
+
+        qreal height = 0;
+        mTextLayout.beginLayout();
+        while ( mTextLayout.lineCount() < mMaxLines ) {
+            QTextLine line = mTextLayout.createLine();
+            line.setLineWidth(lineWidth);
+            height += leading;
+            line.setPosition(QPointF(0, height));
+            height += line.height();
+        }
+        mTextLayout.endLayout();
+    }
+
     return textTruncated;
 }
 
@@ -117,18 +137,16 @@
 {
     Q_Q(HbTextItem);
 
-    updateTextOption();
-
     QFont usedFont = q->font();
     QFontMetricsF fontMetrics(usedFont);
 
-    const qreal lineWidth = newSize.width();
+    const qreal lineWidth = qRound( newSize.width() + 0.5 ); // round up to integer
 
     updateTextOption();
 
     QString tempText(mText);
     if(tempText.indexOf('\n')>=0) {
-        // to prevent creation of deep copy if replace has no efect
+        // to prevent creation of deep copy if replace has no effect
         tempText.replace('\n', QChar::LineSeparator);
     }
 
@@ -138,8 +156,9 @@
     tempText = fontMetrics.elidedText(tempText, Qt::ElideNone, lineWidth);
     bool textTruncated = doLayout(tempText, lineWidth, fontMetrics.leading());
     if(mElideMode!=Qt::ElideNone && !tempText.isEmpty()) {
-        if(mTextLayout.boundingRect().height()>newSize.height()
-          || mTextLayout.boundingRect().width()>newSize.width() || textTruncated) {
+        if( ( mTextLayout.boundingRect().height() - newSize.height() > EPSILON ) ||
+            ( mTextLayout.boundingRect().width() - lineWidth > EPSILON ) ||
+              textTruncated) {
             // TODO: Multiple length translations with multiline text
             doLayout(elideLayoutedText(newSize, fontMetrics),
                      lineWidth,
@@ -147,6 +166,7 @@
         }
     }
     calculateVerticalOffset();
+    calculateFadeRects();
     q->update();
 }
 
@@ -206,7 +226,7 @@
 
     QTextOption textOpt = mTextLayout.textOption();
     textOpt.setAlignment(QStyle::visualAlignment(q->layoutDirection(), q->alignment()));
-    textOpt.setTextDirection (mTextDirection);
+    textOpt.setTextDirection(q->layoutDirection());
     mTextLayout.setTextOption(textOpt);
 }
 
@@ -233,12 +253,11 @@
 
 int HbTextItemPrivate::textFlagsFromTextOption() const
 {
-    QTextOption textOtion = mTextLayout.textOption();
+    QTextOption textOption = mTextLayout.textOption();
     int flags = (int)mAlignment;
 
-    switch(textOtion.wrapMode()) {
+    switch(textOption.wrapMode()) {
     case QTextOption::NoWrap:
-        flags |= Qt::TextSingleLine;
         break;
     case QTextOption::WordWrap:
         flags |= Qt::TextWordWrap;
@@ -273,7 +292,7 @@
         if ( mMinLines > 0 && (mMinLines == mMaxLines) ) {
             // if the number of lines if fixed: optimize
             const qreal newPrefHeight = ( metrics.height() + metrics.leading() ) * mMinLines - metrics.leading();
-            if( qAbs( mPrefHeight - newPrefHeight ) > 0.01 /* epsilon */ ) {
+            if( qAbs( mPrefHeight - newPrefHeight ) > EPSILON ) {
                 mPrefHeight = newPrefHeight;
                 return true;
             }
@@ -284,7 +303,7 @@
         // do the heavy calculation
         QRectF desiredRect = metrics.boundingRect( QRectF( 0, 0 , currSize.width(), QWIDGETSIZE_MAX ), textFlagsFromTextOption(), mText );
 
-        if( qAbs( desiredRect.height() - mPrefHeight ) > 0.01 /* epsilon */ ) {
+        if( qAbs( desiredRect.height() - mPrefHeight ) > EPSILON ) {
             mPrefHeight = desiredRect.height();
             return true;
         }
@@ -293,6 +312,365 @@
     return false;
 }
 
+bool HbTextItemPrivate::fadeNeeded(const QRectF& contentRect) const
+{
+    return (mFadeLengthX!=0 || mFadeLengthY!=0)
+            && !contentRect.contains(
+                    layoutBoundingRect().adjusted(KFadeTolerance,
+                                                  KFadeTolerance,
+                                                  -KFadeTolerance,
+                                                  -KFadeTolerance));
+}
+
+void HbTextItemPrivate::setupGradient(QLinearGradient *gradient, QColor color)
+{
+    gradient->setColorAt(1.0, color);
+    color.setAlpha(color.alpha()>>2); // 1/4 of initial opacity
+    gradient->setColorAt(0.5, color); // middle color to improve feeling of fade effect
+    color.setAlpha(0); // fully transparent
+    gradient->setColorAt(0.0, color);
+}
+
+void HbTextItemPrivate::calculateFadeRects()
+{
+    Q_Q(const HbTextItem);
+
+    const QRectF contentRect = q->contentsRect();
+    mFadeToRect = contentRect;
+    mFadeFromRect = contentRect;
+
+    if(mFadeLengthX>0) {
+        mFadeFromRect.moveLeft(mFadeLengthX);
+        mFadeFromRect.setRight(contentRect.right()-mFadeLengthX);
+
+        if(mFadeFromRect.width()<0) {
+            mFadeFromRect.moveLeft(mFadeFromRect.center().x());
+            mFadeFromRect.setWidth(0.0);
+        }
+    } else {
+        mFadeToRect.moveLeft(mFadeLengthX);
+        mFadeToRect.setRight(contentRect.right()-mFadeLengthX);
+    }
+
+    if(mFadeLengthY>0) { // TODO: alternative direction
+        mFadeFromRect.moveTop(mFadeLengthY);
+        mFadeFromRect.setBottom(contentRect.bottom()-mFadeLengthY);
+
+        if(mFadeFromRect.height()<0) {
+            mFadeFromRect.moveTop(mFadeFromRect.center().y());
+            mFadeFromRect.setHeight(0.0);
+        }
+    } else {
+        mFadeToRect.moveTop(mFadeLengthY);
+        mFadeToRect.setBottom(contentRect.bottom()-mFadeLengthY);
+    }
+
+    qreal dx,dy;
+    dx = mFadeFromRect.left() - mFadeToRect.left();
+    dy = mFadeFromRect.top()  - mFadeToRect.top();
+    if(dx!=0 || dy!=0) {
+        // corner gradient vectors
+        qreal scale = dx*dy/(dx*dx+dy*dy);
+        mCornerFadeX = dy*scale;
+        mCornerFadeY = dx*scale;
+    } else {
+        mCornerFadeX = 1;
+        mCornerFadeY = 0;
+    }
+
+    mPaintFaded = fadeNeeded(contentRect);
+}
+
+/*
+    This work-around is needed since there is a problem with pen transformations
+    in hardware Open VG renderer. This problem occurs only on s60 hardware.
+    On platforms: Linux, Windows and S60 emulator there is no such problem.
+    Below flag detects platform which have this problem to activate work-around.
+ */
+#if defined(Q_WS_S60) && defined(Q_BIG_ENDIAN)
+#   warning Work-around is active in fade effect of HbTextItem (see comment)
+#   define HB_FADE_EFFECT_WORKAROUND_ON_PHONE
+#endif
+inline void HbTextItemPrivate::setPainterPen(QPainter *painter,
+                         const QPen& pen,
+                         const QPointF& lineBegin)
+{
+#ifdef HB_FADE_EFFECT_WORKAROUND_ON_PHONE
+    const QGradient *gradient = pen.brush().gradient();
+    if (!gradient || gradient->type()!=QGradient::LinearGradient) {
+        painter->setPen(pen);
+        return;
+    }
+    const QLinearGradient* linGrad = static_cast<const QLinearGradient*>(gradient);
+    QLinearGradient newGrad(*linGrad);
+    newGrad.setStart(newGrad.start()-lineBegin);
+    newGrad.setFinalStop(newGrad.finalStop()-lineBegin);
+
+    QBrush newBrush(newGrad);
+    QPen newPen;
+    newPen.setBrush(newBrush);
+    painter->setPen(newPen);
+#else
+    Q_UNUSED(painter)
+    Q_UNUSED(pen)
+    Q_UNUSED(lineBegin)
+#endif // HB_FADE_EFFECT_WORKAROUND_ON_PHONE
+}
+
+/*
+    This method paint each line in tree pieces.
+    In each piece uses different pen.
+    When fade effect is not needed on some end centerPen is used.
+ */
+int HbTextItemPrivate::paintFaded(QPainter *painter,
+                                  int firstItemToPaint,
+                                  const QPen& leftPen,
+                                  const QPen& centerPen,
+                                  const QPen& rightPen,
+                                  const QRectF& area ) const
+{
+    Q_Q(const HbTextItem);
+
+    const int n = mTextLayout.lineCount();
+    const qreal leftBorder = q->contentsRect().left()-KFadeTolerance;
+    const qreal rightBorder = q->contentsRect().right()+KFadeTolerance;
+
+    QRectF leftRect(area);
+    leftRect.setRight(mFadeFromRect.left());
+    QRectF centerRect(area);
+    centerRect.moveLeft(leftRect.right());
+    centerRect.setRight(mFadeFromRect.right());
+    QRectF rightRect(area);
+    rightRect.setLeft(centerRect.right());
+
+    qreal maxY = area.bottom();
+
+    for(int i=firstItemToPaint; i<n; ++i) {
+        QTextLine line = mTextLayout.lineAt(i);
+        QRectF lineRect = line.naturalTextRect();
+        lineRect.translate(mOffsetPos);
+
+#ifdef HB_FADE_EFFECT_WORKAROUND_ON_PHONE
+        const QPointF gradientOffset(
+                QPointF(lineRect.left(),
+                        lineRect.top()+line.ascent())
+                );
+#endif // HB_FADE_EFFECT_WORKAROUND_ON_PHONE
+
+        QRectF currentCenter(centerRect);
+
+        if(lineRect.top()>maxY) {
+            // stop painting line by line
+            return i; // current line won't be painted at all
+        }
+
+        if(lineRect.left()<leftBorder) {
+#ifdef HB_FADE_EFFECT_WORKAROUND_ON_PHONE
+            setPainterPen(painter, leftPen, gradientOffset);
+#else
+            painter->setPen(leftPen);
+#endif
+            painter->setClipRect(leftRect);
+            line.draw(painter, mOffsetPos);
+        } else {
+            // no fade on this end so extend currentCenter
+            currentCenter.setLeft(leftRect.left());
+        }
+
+        if(lineRect.right()>rightBorder) {
+#ifdef HB_FADE_EFFECT_WORKAROUND_ON_PHONE
+            setPainterPen(painter, rightPen, gradientOffset);
+#else
+            painter->setPen(rightPen);
+#endif
+            painter->setClipRect(rightRect);
+            line.draw(painter, mOffsetPos);
+        } else {
+            // no fade on this end so extend currentCenter
+            currentCenter.setRight(rightRect.right());
+        }
+
+        if(currentCenter.width()>0) {
+#ifdef HB_FADE_EFFECT_WORKAROUND_ON_PHONE
+            setPainterPen(painter, centerPen, gradientOffset);
+#else
+            painter->setPen(centerPen);
+#endif
+            painter->setClipRect(currentCenter);
+            line.draw(painter, mOffsetPos);
+        }
+
+        if(lineRect.bottom()>maxY) {
+            // stop painting line by line
+            return i; // current line has been painted partially
+        }
+    } // for loop
+
+    return n;
+} // paintFaded()
+
+void HbTextItemPrivate::paintWithFadeEffect(QPainter *painter) const
+{
+    Q_Q(const HbTextItem);
+
+    QLinearGradient gradient;
+    setupGradient(&gradient, q->textColor());
+
+    const QRectF contentRect = q->contentsRect();
+    int i=0;
+
+    const int n = mTextLayout.lineCount();
+
+// #define SEE_FADE_RECTANGLES
+#ifdef SEE_FADE_RECTANGLES
+    painter->setClipRect(mFadeToRect);
+    painter->setBrush(QBrush(QColor(215, 0, 0, 30)));
+    painter->drawRect(mFadeToRect);
+    painter->setBrush(QBrush(QColor(0, 0, 200, 30)));
+    painter->drawRect(mFadeFromRect.adjusted(0,0,-1,-1));
+#endif // SEE_FADE_RECTANGLES
+
+    QRectF centerRect(mFadeToRect);
+    if(mTextLayout.lineAt(0).y()+mOffsetPos.y()<contentRect.top()) {
+        centerRect.setTop(mFadeFromRect.top());
+
+        // top left gradient (//):
+        QPointF from(mFadeFromRect.topLeft());
+        gradient.setStart(from.x()-mCornerFadeX, from.y()-mCornerFadeY);
+        gradient.setFinalStop(from);
+        QBrush leftBrush(gradient);
+        QPen leftPen;
+        leftPen.setBrush(leftBrush);
+
+        // top center gradient (==):
+        gradient.setStart(mFadeFromRect.left(),mFadeToRect.top());
+        QBrush centerBrush(gradient);
+        QPen centerPen;
+        centerPen.setBrush(centerBrush);
+
+        // top right gradient (\\):
+        from = mFadeFromRect.topRight();
+        gradient.setStart(from.x()+mCornerFadeX, from.y()-mCornerFadeY);
+        gradient.setFinalStop(from);
+        QBrush rightBrush(gradient);
+        QPen rightPen;
+        rightPen.setBrush(rightBrush);
+
+        QRectF clipTo(mFadeToRect);
+        clipTo.setBottom(mFadeFromRect.top());
+        i = paintFaded(painter, 0, leftPen, centerPen, rightPen, clipTo);
+    }
+
+    if(mTextLayout.lineAt(n-1).naturalTextRect().bottom()+mOffsetPos.y()>contentRect.bottom()) {
+        // bottom fade is needed here
+        centerRect.setBottom(mFadeFromRect.bottom());
+    }
+
+    // paint center part
+    {
+        // left gradient | ||
+        gradient.setStart(mFadeToRect.left(), mFadeFromRect.top());
+        gradient.setFinalStop(mFadeFromRect.topLeft());
+        QBrush leftBrush(gradient);
+        QPen leftPen;
+        leftPen.setBrush(leftBrush);
+
+        // center with no gradient:
+        QPen centerPen(q->textColor());
+
+        // top right gradient || |
+        gradient.setStart(mFadeToRect.right(), mFadeFromRect.top());
+        gradient.setFinalStop(mFadeFromRect.topRight());
+        QBrush rightBrush(gradient);
+        QPen rightPen;
+        rightPen.setBrush(rightBrush);
+        i = paintFaded(painter, i, leftPen, centerPen, rightPen, centerRect);
+    }
+
+    // need to draw bottom as faded? is some lines remained?
+    if(i<n) {
+        // bottom left gradient (\\):
+        QPointF from(mFadeFromRect.bottomLeft());
+        gradient.setStart(from.x()-mCornerFadeX, from.y()+mCornerFadeY);
+        gradient.setFinalStop(from);
+        QBrush leftBrush(gradient);
+        QPen leftPen;
+        leftPen.setBrush(leftBrush);
+
+        // bottom center gradient (==):
+        gradient.setStart(mFadeFromRect.left(),mFadeToRect.bottom());
+        QBrush centerBrush(gradient);
+        QPen centerPen;
+        centerPen.setBrush(centerBrush);
+
+        // bottom right gradient (//):
+        from = mFadeFromRect.bottomRight();
+        gradient.setStart(from.x()+mCornerFadeX, from.y()+mCornerFadeY);
+        gradient.setFinalStop(from);
+        QBrush rightBrush(gradient);
+        QPen rightPen;
+        rightPen.setBrush(rightBrush);
+
+        QRectF clipTo(mFadeToRect);
+        clipTo.setTop(mFadeFromRect.bottom());
+        i = paintFaded(painter, 0, leftPen, centerPen, rightPen, clipTo);
+    }
+}
+
+void HbTextItemPrivate::setFadeLengths(qreal xLength, qreal yLength)
+{
+    static const qreal KMinDiff = 0.5;
+    Q_Q( HbTextItem );
+
+    if(qAbs(mFadeLengthX - xLength)>KMinDiff
+       || qAbs(mFadeLengthY - yLength)>KMinDiff) {
+        if(mFadeLengthX<0 || xLength<0
+           || mFadeLengthY<0 || yLength<0) {
+            // in this cases boundingRect will be changed
+            q->prepareGeometryChange();
+        }
+        mFadeLengthX = (qAbs(xLength)<=KMinDiff)? 0.0: xLength;
+        mFadeLengthY = (qAbs(yLength)<=KMinDiff)? 0.0: yLength;
+
+        calculateFadeRects();
+
+        q->update();
+    }
+}
+
+QRectF HbTextItemPrivate::layoutBoundingRect () const
+{
+    QRectF result;
+    for (int i=0, n=mTextLayout.lineCount(); i<n; ++i) {
+        result = result.unite(
+                mTextLayout.lineAt(i).naturalTextRect());
+    }
+
+    result.translate(mOffsetPos);
+
+    return result;
+}
+
+QRectF HbTextItemPrivate::boundingRect (const QRectF& contentsRect) const
+{
+    QRectF result(layoutBoundingRect());
+    if(!mDontClip) {
+        // clip
+        QRectF clippedTo = contentsRect;
+
+        qreal dx = qMin(mFadeLengthX, (qreal)0.0);
+        qreal dy = qMin(mFadeLengthY, (qreal)0.0);
+        clippedTo.adjust(dx, dy, -dx, -dy);
+
+        result = result.intersected(clippedTo);
+    }
+
+    if (HbTextItemPrivate::outlinesEnabled) {
+        result = result.united(contentsRect);
+    }
+
+    return result;
+}
 
 /*!
     @alpha
@@ -357,7 +735,7 @@
 }
 
 /*!
-    Returns the text color used for paiting text.
+    Returns the text color used for painting text.
     If no color was set it returns color based on theme.
 
     \sa HbTextItem::setTextColor()
@@ -377,7 +755,7 @@
 
 
 /*!
-    Returns the text alignment. It suports vertical and horizontal alignment.
+    Returns the text alignment. It supports vertical and horizontal alignment.
 
     \sa HbTextItem::setAlignment()
  */
@@ -424,18 +802,15 @@
 
     if (d->mText != txt) {
         d->mInvalidateShownText = true;
-        bool rightToLeft = HbTextUtils::ImplicitDirectionalityIsRightToLeft(
-            txt.utf16(), txt.length(), 0 );
-        d->mTextDirection = rightToLeft ? Qt::RightToLeft : Qt::LeftToRight;
         prepareGeometryChange();
         d->mText = txt;
         d->mTextLayout.setCacheEnabled(KLayoutCacheLimit >= d->mText.length());
-        bool onlyHorizonalSizeHintChanged = false;
+        bool onlyHorizontalSizeHintChanged = false;
         if ( d->mMinLines > 0 && (d->mMinLines == d->mMaxLines) ) {
-            onlyHorizonalSizeHintChanged = true;
+            onlyHorizontalSizeHintChanged = true;
         }
-        if ( (sizePolicy().horizontalPolicy()&QSizePolicy::IgnoreFlag) && onlyHorizonalSizeHintChanged ) {
-            // suppress updageGeometry() and use the same geometry
+        if ( (sizePolicy().horizontalPolicy()&QSizePolicy::IgnoreFlag) && onlyHorizontalSizeHintChanged ) {
+            // suppress updateGeometry() and use the same geometry
             d->setSize( size() );
         } else {
             updateGeometry();
@@ -453,16 +828,30 @@
 void HbTextItem::setTextColor (const QColor &color)
 {
     Q_D(HbTextItem);
-	d->setApiProtectionFlag(HbWidgetBasePrivate::AC_TextColor, true);
+
+    d->setApiProtectionFlag(HbWidgetBasePrivate::AC_TextColor, color.isValid());
     if (d->mColor != color) {
         d->mColor = color;
-        update();
+
+        if (!color.isValid()) {
+            QGraphicsWidget* cssHandler = parentWidget();
+            // check if there is a widget which handles CSS
+            if (cssHandler!=NULL) {
+                // this is needed to enforce color fetch from CSS
+                HbEvent themeEvent(HbEvent::ThemeChanged);
+                QApplication::sendEvent(cssHandler, &themeEvent);
+            }
+        }
+
+        if (!d->mText.isEmpty()) {
+            update();
+        }
     }
 }
 
 /*!
     Sets the text alignment into \a alignment.
-    It suports vertical and horizontal alignment.
+    It supports vertical and horizontal alignment.
 
     \sa HbTextItem::alignment()
  */
@@ -509,30 +898,34 @@
     Q_UNUSED(option);
     Q_UNUSED(widget);
 
-     HbWidgetBase::paint(painter, option, widget);
+    // Save painter's state
+    QPen oldPen = painter->pen();
+
 
-    /* Reverted "text layouting optimization"
-    if ( d->mInvalidateShownText ) {
-        d->setSize( size() );
+    if (HbTextItemPrivate::outlinesEnabled){
+        painter->setBrush(QBrush(QColor(255, 0, 0, 50)));
+        QRectF rect(contentsRect());
+        // to see border - bounding rect was clipping bottom and right border
+        rect.adjust(0, 0, -1.0, -1.0);
+        painter->drawRect(rect);
     }
-    */
 
     if(!d->mDontPrint) {
         painter->setPen(textColor());
 
-        d->mTextLayout.draw(painter,
-                            d->mOffsetPos,
-                            QVector<QTextLayout::FormatRange>(),
-                            d->mDontClip?QRectF():contentsRect());
+        Q_ASSERT(d->mPaintFaded == d->fadeNeeded(contentsRect()));
+        if(!d->mDontClip && d->mPaintFaded ) {
+            d->paintWithFadeEffect(painter);
+        } else {
+            d->mTextLayout.draw(painter,
+                                d->mOffsetPos,
+                                QVector<QTextLayout::FormatRange>(),
+                                d->mDontClip?QRectF():contentsRect());
+        }
     }
 
-    if (HbTextItemPrivate::outlinesEnabled){
-        painter->setBrush(QBrush(QColor(255, 0, 0, 50)));
-        QRectF rect(contentsRect());
-        // to see border - bounding rect was cliping bottom and right border
-        rect.adjust(0, 0, -1.0, -1.0);
-        painter->drawRect(rect);
-    }
+    // Restore painter's state
+    painter->setPen(oldPen);
 }
 
 /*!
@@ -542,14 +935,14 @@
  */
 void HbTextItem::setGeometry(const QRectF & rect)
 {
-    /* Reverted "text layouting optimization" */
     Q_D(HbTextItem);
 
     HbWidgetBase::setGeometry(rect);
 
-    // needed when tere was no size change and some things
+    // needed when there was no size change and some things
     // need to relayout text
     if(d->mInvalidateShownText) {
+        prepareGeometryChange();
         d->setSize(rect.size());
     }
 }
@@ -563,20 +956,8 @@
 {
     Q_D(const HbTextItem);
 
-    QRectF result(d->mTextLayout.boundingRect());
-    result.translate(d->mOffsetPos);
-
-    if(!d->mDontClip) {
-        // clip
-        result = result.intersected(contentsRect());
-    }
-
-    if (HbTextItemPrivate::outlinesEnabled) {
-        result = result.united(contentsRect());
-    }
-
-    return result;
-}
+    return d->boundingRect(contentsRect());
+} // boundingRect()
 
 /*!
     \reimp
@@ -630,7 +1011,7 @@
     case Qt::PreferredSize: 
         {
             if ( !(effectiveOrientations&Qt::Horizontal) && d->mMinLines > 0 && (d->mMinLines == d->mMaxLines) ) {
-                //optimize single line if the horizonal sizeHint is ignored
+                //optimize single line if the horizontal sizeHint is ignored
                 size.setHeight( ( metrics.height() + metrics.leading() ) * d->mMinLines - metrics.leading() );
                 break;
             }
@@ -683,13 +1064,15 @@
     switch(event->type()) {
     case QEvent::LayoutDirectionChange: {
             Q_D(HbTextItem);
-            d->updateTextOption();
+            d->mInvalidateShownText = true;
+            updateGeometry();
         }
         break;
 
     case QEvent::FontChange: {
             Q_D(HbTextItem);
             d->mInvalidateShownText = true;
+            prepareGeometryChange();
             updateGeometry();
         }
         break;
@@ -716,12 +1099,10 @@
     Q_D(HbTextItem);
 
     HbWidgetBase::resizeEvent(event);
-    /* Reverted "text layouting optimization"
-    d->mInvalidateShownText = true;
-    */
+
     d->setSize(event->newSize());
 
-    if( ( qAbs(event->oldSize().width() - event->newSize().width()) > 0.01 ) &&
+    if( ( qAbs(event->oldSize().width() - event->newSize().width()) > EPSILON ) &&
         ( ( event->oldSize().width() < preferredWidth() ) || ( event->newSize().width() < preferredWidth() ) ) ){
         if( d->adjustSizeHint() ) {
             updateGeometry();
@@ -731,7 +1112,7 @@
 
 /*!
     @proto
-    Sets style of text wrapping. \a mode type will be changed to Hb::TextWraping
+    Sets style of text wrapping. \a mode type will be changed to Hb::TextWrapping
     after appropriate merge.
 
     \sa HbTextItem::textWrapping
@@ -757,8 +1138,7 @@
 
 /*!
     @proto
-    returns style of text wrapping. Return value type will be changed to
-    Hb::WrappMode after appropriate merge.
+    returns style of text wrapping.
 
     \sa HbTextItem::setTextWrapping
     \sa QTextOption::wrapMode
@@ -796,23 +1176,23 @@
 }
 
 /*!
-    enables (default) od disables text cliping when item geometry is to small.
+    enables (default) or disables text clipping when item geometry is too small.
 
     \sa HbTextItem::isTextClip()
  */
-void HbTextItem::setTextClip(bool cliping)
+void HbTextItem::setTextClip(bool clipping)
 {
     Q_D(HbTextItem);
-    if( d->mDontClip == cliping ) {
+    if( d->mDontClip == clipping ) {
         prepareGeometryChange();
-        d->mDontClip = !cliping;
-        setFlag(QGraphicsItem::ItemClipsToShape, cliping);
+        d->mDontClip = !clipping;
+        setFlag(QGraphicsItem::ItemClipsToShape, clipping);
         update();
     }
 }
 
 /*!
-    Returns true if text is cliped when item geometry is to small.
+    Returns true if text is clipped when item geometry is too small.
 
     \sa HbTextItem::setTextClip(bool)
  */
@@ -907,4 +1287,70 @@
     return d->mMaxLines;
 }
 
+/*!
+    @proto
+
+    returns distance which text fades out when reaching border of item.
+
+    \sa HbTextItem::setFadeLengths(qreal, qreal)
+*/
+QPointF HbTextItem::fadeLengths() const
+{
+    Q_D( const HbTextItem );
+    return QPointF(d->mFadeLengthX, d->mFadeLengthY);
+}
+
+/*!
+    @proto
+
+    Method provided for convenience.
+    Equivalent of setFadeLengths(length, length).
+
+    \sa HbTextItem::setFadeLengths(qreal, qreal)
+*/
+void HbTextItem::setFadeLength(qreal length)
+{
+    Q_D( HbTextItem );
+    d->setFadeLengths(length, length);
+}
+
+/*!
+    @proto
+
+    Sets distance on which text will be fade out when reaching border of item.
+
+    Effect is performed only when text should be clipped at specified border.
+
+    Positive value means that fade will end at border of contentsRect()
+    and will start at a \a length distance inside of this rectangle.
+
+    Zero value disables the feature.
+
+    Behavior for negative values is undefined.
+
+    Note that text clip (setTextClip) must be set to true to use this effect.
+
+    xLength and yLength values refer to fade effect to horizontal and vertical
+    direction respectively.
+ */
+void HbTextItem::setFadeLengths(qreal xLength, qreal yLength)
+{
+    Q_D( HbTextItem );
+    d->setFadeLengths(xLength, yLength);
+}
+
+/*!
+    @proto
+
+    Method provided for connivance.
+    Equivalent of setFadeLengths(lengths.x(), lengths.y()).
+
+    \sa HbTextItem::setFadeLengths(qreal, qreal)
+ */
+void HbTextItem::setFadeLengths(const QPointF& lengths)
+{
+    Q_D( HbTextItem );
+    d->setFadeLengths(lengths.x(), lengths.y());
+}
+
 // end of file
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/primitives/hbtextitem.h
--- a/src/hbcore/primitives/hbtextitem.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/primitives/hbtextitem.h	Mon May 03 12:48:33 2010 +0300
@@ -76,8 +76,12 @@
 
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
 
+    QPointF fadeLengths() const;
+    void setFadeLength(qreal length);
+    void setFadeLengths(qreal xLength, qreal yLength);
+    void setFadeLengths(const QPointF& lengths);
+
 protected:
-    
     QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const;
     void resizeEvent ( QGraphicsSceneResizeEvent * event );
     void changeEvent(QEvent *event);
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/primitives/hbtextitem_p.h
--- a/src/hbcore/primitives/hbtextitem_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/primitives/hbtextitem_p.h	Mon May 03 12:48:33 2010 +0300
@@ -42,6 +42,7 @@
 #include "hbwidgetbase_p.h"
 
 class QFontMetricsF;
+class QLinearGradient;
 
 class HbTextItemPrivate : public HbWidgetBasePrivate
 {
@@ -66,6 +67,28 @@
     QString elideLayoutedText(const QSizeF& size, const QFontMetricsF& metrics) const;
     bool adjustSizeHint();
 
+    bool fadeNeeded(const QRectF& contentRect) const;
+    static inline void setupGradient(QLinearGradient *gradient, QColor color);
+
+    void calculateFadeRects();
+
+    static inline void setPainterPen(QPainter *painter,
+                             const QPen& pen,
+                             const QPointF& lineBegin);
+
+    int paintFaded(QPainter *painter,
+                    int firstItemToPaint,
+                    const QPen& leftPen,
+                    const QPen& centerPen,
+                    const QPen& rightPen,
+                    const QRectF& area ) const;
+
+    void paintWithFadeEffect(QPainter *painter) const;
+
+    void setFadeLengths(qreal xLength, qreal yLength);
+
+    QRectF layoutBoundingRect() const;
+    QRectF boundingRect(const QRectF& contentsRect) const;
 
     QString mText;
     Qt::Alignment mAlignment;
@@ -73,7 +96,6 @@
     bool mDontPrint;  // needed to fake text flags
     bool mDontClip;   // needed to fake text flags
 
-    Qt::LayoutDirection mTextDirection;
     bool mInvalidateShownText;
     QRectF mOldContentsRect;
     QColor mColor;
@@ -82,6 +104,14 @@
 
     QPointF mOffsetPos;
 
+    bool mPaintFaded;
+    qreal mFadeLengthX; // distance on which fade efect is performed when text doesn't fit content rectangle
+    qreal mFadeLengthY; // distance on which fade efect is performed when text doesn't fit content rectangle
+    qreal mCornerFadeX;
+    qreal mCornerFadeY;
+    QRectF mFadeToRect;
+    QRectF mFadeFromRect;
+
     qreal mPrefHeight;
     int mMinLines;
     int mMaxLines;
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/primitives/hbtoucharea.cpp
--- a/src/hbcore/primitives/hbtoucharea.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/primitives/hbtoucharea.cpp	Mon May 03 12:48:33 2010 +0300
@@ -80,6 +80,7 @@
     Q_D(HbTouchArea);
     d->q_ptr = this;
     setFlag(QGraphicsItem::ItemHasNoContents, !HbTouchAreaPrivate::outlinesEnabled);
+    setSizePolicy( QSizePolicy::Ignored, QSizePolicy::Ignored );
 }
 
 /*!
@@ -177,5 +178,12 @@
     }
 }
 
+/*!
+  Touch areas accept gestures by default
+  */
+void HbTouchArea::gestureEvent(QGestureEvent *event)
+{
+    Q_UNUSED(event);
+}
 
 // end of file
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/primitives/hbtoucharea.h
--- a/src/hbcore/primitives/hbtoucharea.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/primitives/hbtoucharea.h	Mon May 03 12:48:33 2010 +0300
@@ -48,6 +48,7 @@
 protected:
     HbTouchArea (HbTouchAreaPrivate &dd, QGraphicsItem *parent);
     QSizeF sizeHint (Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const;
+    void gestureEvent(QGestureEvent *event);
 
 private:
     Q_DECLARE_PRIVATE_D(d_ptr, HbTouchArea)
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/primitives/primitives.pri
--- a/src/hbcore/primitives/primitives.pri	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/primitives/primitives.pri	Mon May 03 12:48:33 2010 +0300
@@ -35,15 +35,15 @@
 PUBLIC_HEADERS += $$PWD/hbrichtextitem.h
 PUBLIC_HEADERS += $$PWD/hbmarqueeitem.h
 
-INTERNAL_HEADERS += $$PWD/hbrepeatitem_p.h
-INTERNAL_HEADERS += $$PWD/hbiconitem_p.h
-INTERNAL_HEADERS += $$PWD/hbprogresstrackitem_p.h
-INTERNAL_HEADERS += $$PWD/hbrepeaticonitem_p.h
-INTERNAL_HEADERS += $$PWD/hbtextitem_p.h
-INTERNAL_HEADERS += $$PWD/hbrichtextitem_p.h
-INTERNAL_HEADERS += $$PWD/hbtoucharea_p.h
-INTERNAL_HEADERS += $$PWD/hbslidertrackitem_p.h
-INTERNAL_HEADERS += $$PWD/hbmarqueeitem_p.h
+PRIVATE_HEADERS += $$PWD/hbrepeatitem_p.h
+PRIVATE_HEADERS += $$PWD/hbiconitem_p.h
+PRIVATE_HEADERS += $$PWD/hbprogresstrackitem_p.h
+PRIVATE_HEADERS += $$PWD/hbrepeaticonitem_p.h
+PRIVATE_HEADERS += $$PWD/hbtextitem_p.h
+PRIVATE_HEADERS += $$PWD/hbrichtextitem_p.h
+PRIVATE_HEADERS += $$PWD/hbtoucharea_p.h
+PRIVATE_HEADERS += $$PWD/hbslidertrackitem_p.h
+PRIVATE_HEADERS += $$PWD/hbmarqueeitem_p.h
 
 SOURCES += $$PWD/hbframeitem.cpp
 SOURCES += $$PWD/hbiconitem.cpp
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/displaydefinition.xml
--- a/src/hbcore/resources/displaydefinition.xml	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/displaydefinition.xml	Mon May 03 12:48:33 2010 +0300
@@ -1,105 +1,85 @@
 <?xml version="1.0" encoding="utf-8"?>
 <displayDefinition>
 
-    <display name="NHD landscape"
-    styleName="NHD"
+    <display
+    resolutionName="NHD"
     resolutionWidth="640"
     resolutionHeight="360"
     ppiValue="229"
-    orientation="landscape"
     orientationAngle="270"
-    alternateProfileName="NHD portrait"
     unitValue="6.7" />
     
-    <display name="NHD portrait" 
+    <display
     defaultMode="true"
-    styleName="NHD"   
+    resolutionName="NHD"   
     resolutionWidth="360" 
     resolutionHeight="640"
     ppiValue="229"
-    orientation="portrait"
     orientationAngle="270"
-    alternateProfileName="NHD landscape"
     unitValue="6.7" />
 
-    <display name="VGA landscape"
-    styleName="VGA"
+    <display
+    resolutionName="VGA"
     resolutionWidth="640"
     resolutionHeight="480"
     ppiValue="250"
-    orientation="landscape"
     orientationAngle="90"
-    alternateProfileName="VGA portrait"
     unitValue="6.2" />
     
-    <display name="VGA portrait" 
-    styleName="VGA"   
+    <display
+    resolutionName="VGA"   
     resolutionWidth="480" 
     resolutionHeight="640"
     ppiValue="250"
-    orientation="portrait"
     orientationAngle="90"
-    alternateProfileName="VGA landscape"
     unitValue="6.2" />
 
-    <display name="HVGA landscape"
-    styleName="HVGA"
+    <display
+    resolutionName="HVGA"
     resolutionWidth="480"
     resolutionHeight="320"
     ppiValue="180"
-    orientation="landscape"
     orientationAngle="90"
-    alternateProfileName="HVGA portrait"
     unitValue="5.3" />
     
-    <display name="HVGA portrait" 
-    styleName="HVGA"   
+    <display
+    resolutionName="HVGA"   
     resolutionWidth="320" 
     resolutionHeight="480"
     ppiValue="180"
-    orientation="portrait"
     orientationAngle="90"
-    alternateProfileName="HVGA landscape"
     unitValue="5.3" />
     
-    <display name="NHD 4_0 landscape"
-    styleName="NHD 4_0"
+    <display
+    resolutionName="NHD"
     resolutionWidth="640"
     resolutionHeight="360"
     ppiValue="183.6"
-    orientation="landscape"
     orientationAngle="90"
-    alternateProfileName="NHD 4_0 portrait"
     unitValue="5.42" />
     
-    <display name="NHD 4_0 portrait" 
-    styleName="NHD 4_0"   
+    <display
+    resolutionName="NHD"
     resolutionWidth="360" 
     resolutionHeight="640"
     ppiValue="183.6"
-    orientation="portrait"
     orientationAngle="90"
-    alternateProfileName="NHD 4_0 landscape"
     unitValue="5.42" />
     
-    <display name="WVGA landscape"
-    styleName="WVGA"
+    <display
+    resolutionName="WVGA"
     resolutionWidth="864"
     resolutionHeight="480"
     ppiValue="247.1"
-    orientation="landscape"
     orientationAngle="90"
-    alternateProfileName="WVGA portrait"
     unitValue="7.27" />
     
-    <display name="WVGA portrait" 
-    styleName="WVGA"   
+    <display
+    resolutionName="WVGA"
     resolutionWidth="480" 
     resolutionHeight="864"
     ppiValue="247.1"
-    orientation="portrait"
     orientationAngle="90"
-    alternateProfileName="WVGA landscape"
     unitValue="7.27" />
     
 </displayDefinition>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/displaydefinition_hw.xml
--- a/src/hbcore/resources/displaydefinition_hw.xml	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/displaydefinition_hw.xml	Mon May 03 12:48:33 2010 +0300
@@ -1,25 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <displayDefinition>
 
-  <display name="NHD portrait" 
+  <display
     defaultMode="true"
-    styleName="NHD"   
+    resolutionName="NHD"   
     resolutionWidth="360" 
     resolutionHeight="640"
     ppiValue="229"
-    orientation="portrait"
     orientationAngle="0"
-    alternateProfileName="NHD landscape"
     unitValue="6.7" />
     
-    <display name="NHD landscape"
-    styleName="NHD"
+    <display
+    resolutionName="NHD"
     resolutionWidth="640"
     resolutionHeight="360"
     ppiValue="229"
-    orientation="landscape"
     orientationAngle="90"
-    alternateProfileName="NHD portrait"
     unitValue="6.7" />
     
 </displayDefinition>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/displaydefinition_nhdlandscape.xml
--- a/src/hbcore/resources/displaydefinition_nhdlandscape.xml	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/displaydefinition_nhdlandscape.xml	Mon May 03 12:48:33 2010 +0300
@@ -1,25 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <displayDefinition>
 
-    <display name="NHD landscape"
+    <display
     defaultMode="true"
-    styleName="NHD"
+    resolutionName="NHD"
     resolutionWidth="640"
     resolutionHeight="360"
     ppiValue="229"
     orientation="landscape"
     orientationAngle="0"
-    alternateProfileName="NHD portrait"
     unitValue="6.7" />
     
-    <display name="NHD portrait" 
-    styleName="NHD"   
+    <display
+    resolutionName="NHD"   
     resolutionWidth="360" 
     resolutionHeight="640"
     ppiValue="229"
-    orientation="portrait"
     orientationAngle="270"
-    alternateProfileName="NHD landscape"
     unitValue="6.7" />
 
 </displayDefinition>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/displaydefinition_nhdportrait.xml
--- a/src/hbcore/resources/displaydefinition_nhdportrait.xml	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/displaydefinition_nhdportrait.xml	Mon May 03 12:48:33 2010 +0300
@@ -1,26 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <displayDefinition>
 
-
-    <display name="NHD portrait" 
+    <display
     defaultMode="true"
-    styleName="NHD"   
+    resolutionName="NHD"   
     resolutionWidth="360" 
     resolutionHeight="640"
     ppiValue="229"
-    orientation="portrait"
     orientationAngle="0"
-    alternateProfileName="NHD landscape"
     unitValue="6.7" />
     
-    <display name="NHD landscape"
-    styleName="NHD"
+    <display
+    resolutionName="NHD"
     resolutionWidth="640"
     resolutionHeight="360"
     ppiValue="229"
-    orientation="landscape"
     orientationAngle="90"
-    alternateProfileName="NHD portrait"
     unitValue="6.7" />
     
 </displayDefinition>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/keymaps/130.txt
Binary file src/hbcore/resources/keymaps/130.txt has changed
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/resources.pri
--- a/src/hbcore/resources/resources.pri	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/resources.pri	Mon May 03 12:48:33 2010 +0300
@@ -28,9 +28,9 @@
 
 symbian {
     RESOURCES += $$PWD/hbvariant_s60.qrc
-    BLD_INF_RULES.prj_exports += "resources/displaydefinition_hw.xml /epoc32/data/z/resource/displaydefinition.xml"
-    BLD_INF_RULES.prj_exports += "resources/displaydefinition.xml /epoc32/release/winscw/udeb/z/resource/displaydefinition.xml"
-    BLD_INF_RULES.prj_exports += "resources/displaydefinition.xml /epoc32/release/winscw/urel/z/resource/displaydefinition.xml"
+    BLD_INF_RULES.prj_exports += "resources/displaydefinition_hw.xml $${EPOCROOT}epoc32/data/z/resource/displaydefinition.xml"
+    BLD_INF_RULES.prj_exports += "resources/displaydefinition.xml $${EPOCROOT}epoc32/release/winscw/udeb/z/resource/displaydefinition.xml"
+    BLD_INF_RULES.prj_exports += "resources/displaydefinition.xml $${EPOCROOT}epoc32/release/winscw/urel/z/resource/displaydefinition.xml"
 } else {
     RESOURCES += $$PWD/hbvariant_default.qrc
 }
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/smileys/smileys_theme.sml
--- a/src/hbcore/resources/smileys/smileys_theme.sml	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/smileys/smileys_theme.sml	Mon May 03 12:48:33 2010 +0300
@@ -2,26 +2,26 @@
 # Smilies definition file
 #
 
-qtg_small_smiley_smile.svg                                :-) :)
-qtg_small_smiley_bigsmile.svg                             :-D :D
-qtg_small_smiley_wink.svg                                 ;-) ;)
-qtg_small_smiley_wink_grin.svg                            ;-D ;D
-qtg_small_smiley_unhappy.svg                              :-( :(
-qtg_small_smiley_tongue.svg                               :-P :P :-p :p
-qtg_small_smiley_cry.svg                                  :’( ;-( ;(
-qtg_small_smiley_neutral.svg                              :-| :|
-qtg_small_smiley_wondering.svg                            :-/ :/ :-\ :\
-qtg_small_smiley_surprised.svg                            :-O :O :-o :o
-qtg_small_smiley_kissing.svg                              :-* :*
-qtg_small_smiley_irritated.svg                            :-X :X :-x :x
-qtg_small_smiley_sarcastic.svg                            :-> :>
-qtg_small_smiley_verycool.svg                             B-) B)
-qtg_small_smiley_eyebrows.svg                             %-) %)
-qtg_small_smiley_angry.svg                                :-@ :@
-qtg_small_smiley_sarcastic_mad.svg                        ;-> ;>
-qtg_small_smiley_evil.svg                                 >-) >)
-qtg_small_smiley_nerd.svg                                 8–) 8)
-qtg_small_smiley_heart.svg                                <3
+qtg_small_smiley_smile                                :-) :)
+qtg_small_smiley_bigsmile                             :-D :D
+qtg_small_smiley_wink                                 ;-) ;)
+qtg_small_smiley_wink_grin                            ;-D ;D
+qtg_small_smiley_unhappy                              :-( :(
+qtg_small_smiley_tongue                               :-P :P :-p :p
+qtg_small_smiley_cry                                  :’( ;-( ;(
+qtg_small_smiley_neutral                              :-| :|
+qtg_small_smiley_wondering                            :-/ :-\
+qtg_small_smiley_surprised                            :-O :O :-o :o
+qtg_small_smiley_kissing                              :-* :*
+qtg_small_smiley_irritated                            :-X :X :-x :x
+qtg_small_smiley_sarcastic                            :-> :>
+qtg_small_smiley_verycool                             B-) B)
+qtg_small_smiley_eyebrows                             %-) %)
+qtg_small_smiley_angry                                :-@ :@
+qtg_small_smiley_sarcastic_mad                        ;-> ;>
+qtg_small_smiley_evil                                 >-) >)
+qtg_small_smiley_nerd                                 8–) 8)
+qtg_small_smiley_heart                                <3
 
 
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/effects/hbdefault/chatincoming_appear.fxml
--- a/src/hbcore/resources/themes/effects/hbdefault/chatincoming_appear.fxml	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-<layers>
-	<visual>
-		<param name="translation_x" type="anim">
-			<duration>0.5</duration>
-			<keyframe at="0.0">-1.0</keyframe>
-			<keyframe at="1.0">0.0</keyframe>
-			<style>outquad</style>
-			<end ref="screen.width">1.0</end>
-		</param>
-	</visual>
-</layers>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/effects/hbdefault/chatoutgoing_appear.fxml
--- a/src/hbcore/resources/themes/effects/hbdefault/chatoutgoing_appear.fxml	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-<layers>
-	<visual>
-		<param name="translation_x" type="anim">
-			<duration>0.5</duration>
-			<keyframe at="0.0">0.0</keyframe>
-			<keyframe at="1.0">1.0</keyframe>
-			<style>outquad</style>
-			<start ref="screen.width">1.0</start>
-		</param>
-	</visual>
-</layers>
\ No newline at end of file
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/effects/hbdefault/decorator_latched.fxml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/effects/hbdefault/decorator_latched.fxml	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,4 @@
+<layers>
+    <visual />
+</layers>
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/effects/hbdefault/decorator_pressed.fxml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/effects/hbdefault/decorator_pressed.fxml	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,3 @@
+<layers>
+    <visual />
+</layers>
\ No newline at end of file
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/effects/hbdefault/decorator_released.fxml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/effects/hbdefault/decorator_released.fxml	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,3 @@
+<layers>
+    <visual />
+</layers>
\ No newline at end of file
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/effects/hbdefault/dimming_appear.fxml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/effects/hbdefault/dimming_appear.fxml	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,15 @@
+<layers>
+	<visual>
+	<filter name="Hsl" type="hsl">
+		<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>
+		<param name="hue">0.0</param>
+		<param name="saturation">1.0</param>
+		<param name="lightness">-0.5</param>
+	</filter>
+	</visual>
+</layers>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/effects/hbdefault/dimming_disappear.fxml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/effects/hbdefault/dimming_disappear.fxml	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,15 @@
+<layers>
+	<visual>
+	<filter name="Hsl" type="hsl">
+		<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="hue">0.0</param>
+		<param name="saturation">1.0</param>
+		<param name="lightness">-0.5</param>
+	</filter>
+	</visual>
+</layers>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/effects/hbdefault/griditem_press.fxml
--- a/src/hbcore/resources/themes/effects/hbdefault/griditem_press.fxml	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-<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>
-
-  </visual>
-</layers>
-
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/effects/hbdefault/griditem_release.fxml
--- a/src/hbcore/resources/themes/effects/hbdefault/griditem_release.fxml	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-<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>
-
-  </visual>
-</layers>
\ No newline at end of file
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/effects/hbdefault/gridviewitem_appear.fxml
--- a/src/hbcore/resources/themes/effects/hbdefault/gridviewitem_appear.fxml	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/effects/hbdefault/gridviewitem_appear.fxml	Mon May 03 12:48:33 2010 +0300
@@ -1,13 +1,26 @@
 <layers>
-<visual>
+  <visual>
+    <param name="scale_x" type="anim">
+      <duration>0.3</duration>   
+       <style>outquad</style>   
+      <keyframe at="0.0">0.8</keyframe>
+      <keyframe at="1.0">1.0</keyframe>
+    </param>
+    <param name="scale_y" type="anim">
+      <duration>0.3</duration>
+      <style>outquad</style>  
+      <keyframe at="0.0">0.8</keyframe>
+      <keyframe at="1.0">1.0</keyframe>
+    </param> 
+    
+    	<param name="opacity" type="anim">
+	        <duration>0.3</duration>
+	        <keyframe at="0.0">0.0</keyframe>
+	        <keyframe at="1.0">1.0</keyframe>
+	    </param>
 
-<param name="opacity" type="anim">
-<duration>0.2</duration>
-<style>linear</style>
-<keyframe at="0.0">0.0</keyframe>
-<keyframe at="1.0">1.0</keyframe>
-</param>
-
-</visual>
+    <param name="scale_origin_x" ref="visual.width">0.5</param>
+    <param name="scale_origin_y" ref="visual.height">0.5</param>
+  </visual>
 </layers>
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/effects/hbdefault/gridviewitem_disappear.fxml
--- a/src/hbcore/resources/themes/effects/hbdefault/gridviewitem_disappear.fxml	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/effects/hbdefault/gridviewitem_disappear.fxml	Mon May 03 12:48:33 2010 +0300
@@ -1,13 +1,25 @@
 <layers>
-<visual>
+  <visual>
+    <param name="scale_x" type="anim">
+      <duration>0.3</duration>   
+       <style>inoutquad</style>   
+      <keyframe at="0.0">1.0</keyframe>
+      <keyframe at="1.0">0.8</keyframe>
+    </param>
+    <param name="scale_y" 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="opacity" type="anim">
+	        <duration>0.3</duration>
+	        <keyframe at="0.0">1.0</keyframe>
+	        <keyframe at="1.0">0.0</keyframe>
+	    </param>
 
-<param name="opacity" type="anim">
-<duration>0.2</duration>
-<style>linear</style>
-<keyframe at="0.0">1.0</keyframe>
-<keyframe at="1.0">0.0</keyframe>
-</param>
-
-</visual>
-</layers>
-
+    <param name="scale_origin_x" ref="visual.width">0.5</param>
+    <param name="scale_origin_y" ref="visual.height">0.5</param>
+  </visual>
+</layers>
\ No newline at end of file
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/effects/hbdefault/gridviewitem_press.fxml
--- a/src/hbcore/resources/themes/effects/hbdefault/gridviewitem_press.fxml	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/effects/hbdefault/gridviewitem_press.fxml	Mon May 03 12:48:33 2010 +0300
@@ -1,13 +1,20 @@
 <layers>
-<visual>
+  <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="opacity" type="anim">
-<duration>0.3</duration>
-<style>linear</style>
-<keyframe at="0.0">0.0</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>
 
-</visual>
+  </visual>
 </layers>
-
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/effects/hbdefault/gridviewitem_release.fxml
--- a/src/hbcore/resources/themes/effects/hbdefault/gridviewitem_release.fxml	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/effects/hbdefault/gridviewitem_release.fxml	Mon May 03 12:48:33 2010 +0300
@@ -1,13 +1,21 @@
 <layers>
-<visual>
+  <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="opacity" type="anim">
-<duration>0.3</duration>
-<style>linear</style>
-<keyframe at="0.0">1.0</keyframe>
-<keyframe at="1.0">0.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>
 
-</visual>
+  </visual>
 </layers>
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/effects/hbdefault/indicator_move_left.fxml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/effects/hbdefault/indicator_move_left.fxml	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,12 @@
+<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.0</start>
+	        <end ref="visual.right">1.0</end>
+	    </param>
+	</visual>
+</layers>
\ No newline at end of file
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/effects/hbdefault/indicator_move_right.fxml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/effects/hbdefault/indicator_move_right.fxml	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,12 @@
+<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.0</start>
+	        <end ref="visual.right">1.0</end>
+	    </param>
+	</visual>
+</layers>
\ No newline at end of file
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/effects/hbdefault/listitem_appear.fxml
--- a/src/hbcore/resources/themes/effects/hbdefault/listitem_appear.fxml	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-<layers>
-  <visual>
-    <param name="scale_x" type="anim">
-      <duration>0.3</duration>   
-       <style>outquad</style>   
-      <keyframe at="0.0">0.8</keyframe>
-      <keyframe at="1.0">1.0</keyframe>
-    </param>
-    <param name="scale_y" type="anim">
-      <duration>0.3</duration>
-      <style>outquad</style>  
-      <keyframe at="0.0">0.8</keyframe>
-      <keyframe at="1.0">1.0</keyframe>
-    </param> 
-    
-    	<param name="opacity" type="anim">
-	        <duration>0.3</duration>
-	        <keyframe at="0.0">0.0</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>
-  </visual>
-</layers>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/effects/hbdefault/listitem_press.fxml
--- a/src/hbcore/resources/themes/effects/hbdefault/listitem_press.fxml	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-<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>
-
-  </visual>
-</layers>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/effects/hbdefault/listitem_release.fxml
--- a/src/hbcore/resources/themes/effects/hbdefault/listitem_release.fxml	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-<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>
-
-  </visual>
-</layers>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/effects/hbdefault/listitem_remove.fxml
--- a/src/hbcore/resources/themes/effects/hbdefault/listitem_remove.fxml	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-<layers>
-  <visual>
-    <param name="scale_x" type="anim">
-      <duration>0.3</duration>   
-       <style>inoutquad</style>   
-      <keyframe at="0.0">1.0</keyframe>
-      <keyframe at="1.0">0.7</keyframe>
-    </param>
-    <param name="scale_y" type="anim">
-      <duration>0.3</duration>
-      <style>inoutquad</style>   
-      <keyframe at="0.0">1.0</keyframe>
-      <keyframe at="1.0">0.7</keyframe>
-    </param> 
-    
-    	<param name="opacity" type="anim">
-	        <duration>0.3</duration>
-	        <keyframe at="0.0">1.0</keyframe>
-	        <keyframe at="1.0">0.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>
-  </visual>
-</layers>>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/effects/hbdefault/listviewitem_press.fxml
--- a/src/hbcore/resources/themes/effects/hbdefault/listviewitem_press.fxml	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/effects/hbdefault/listviewitem_press.fxml	Mon May 03 12:48:33 2010 +0300
@@ -1,13 +1,21 @@
 <layers>
-<visual>
+  <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="opacity" type="anim">
-<duration>0.3</duration>
-<style>linear</style>
-<keyframe at="0.0">0.0</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>
 
-</visual>
+  </visual>
 </layers>
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/effects/hbdefault/listviewitem_release.fxml
--- a/src/hbcore/resources/themes/effects/hbdefault/listviewitem_release.fxml	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/effects/hbdefault/listviewitem_release.fxml	Mon May 03 12:48:33 2010 +0300
@@ -1,13 +1,21 @@
 <layers>
-<visual>
+  <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="opacity" type="anim">
-<duration>0.3</duration>
-<style>linear</style>
-<keyframe at="0.0">1.0</keyframe>
-<keyframe at="1.0">0.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>
 
-</visual>
+  </visual>
 </layers>
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/effects/hbdefault/progressbar_appear.fxml
--- a/src/hbcore/resources/themes/effects/hbdefault/progressbar_appear.fxml	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/effects/hbdefault/progressbar_appear.fxml	Mon May 03 12:48:33 2010 +0300
@@ -1,8 +1,8 @@
 <layers>
 	<visual>
 	    <param name="opacity" type="anim">
-	        <duration>0.2</duration>
-	        <keyframe at="0.0">0.5</keyframe>
+	        <duration>0.3</duration>
+	        <keyframe at="0.0">0.0</keyframe>
 	        <keyframe at="1.0">1.0</keyframe>
 	    	</param>
 	</visual>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/effects/hbdefault/progressbar_progress_complete.fxml
--- a/src/hbcore/resources/themes/effects/hbdefault/progressbar_progress_complete.fxml	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/effects/hbdefault/progressbar_progress_complete.fxml	Mon May 03 12:48:33 2010 +0300
@@ -1,14 +1,5 @@
 <layers>
-	<visual>
-	    <param name="scale_y" type="anim">
-                <duration>0.2</duration>
-                <keyframe at="1.0">1.0</keyframe>
-                <keyframe at="1.0">1.0</keyframe>
-                <keyframe at="1.0">1.0</keyframe>
-	    </param>
-
-	    <param name="scale_origin_y" ref="visual.height">0.0</param>
-      
-	</visual>
+    <visual />
 </layers>
 
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/effects/hbdefault/progressslider_handleoutofbound.fxml
--- a/src/hbcore/resources/themes/effects/hbdefault/progressslider_handleoutofbound.fxml	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/effects/hbdefault/progressslider_handleoutofbound.fxml	Mon May 03 12:48:33 2010 +0300
@@ -1,10 +1,11 @@
 <layers>
-	<visual>
-	    <param name="scale_x" type="anim">
-                <duration>0.2</duration>           
-          <keyframe at="0.0">1.0</keyframe>
-	        <keyframe at="1.0">1.0</keyframe>
-	    </param>
-           
-	</visual>
+  <visual>
+    <param name="opacity" type="anim">
+      <duration>0.2</duration>
+      <style>linear</style>
+      <keyframe at="0.0">1.0</keyframe>
+      <keyframe at="0.5">0.5</keyframe>
+      <keyframe at="1.0">1.0</keyframe>
+    </param>   
+  </visual>
 </layers>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/effects/hbdefault/progressslider_handlepress.fxml
--- a/src/hbcore/resources/themes/effects/hbdefault/progressslider_handlepress.fxml	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/effects/hbdefault/progressslider_handlepress.fxml	Mon May 03 12:48:33 2010 +0300
@@ -1,8 +1,20 @@
 <layers>
-  <layergroup>
-    <visual src="Item">
+  <visual>
+    <param name="scale_x" type="anim">
+      <duration>0.2</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>
 
-     
-    </visual>
-  </layergroup>
+    <param name="scale_origin_x" ref="visual.width">0.5</param>
+    <param name="scale_origin_y" ref="visual.height">0.5</param>
+
+  </visual>
 </layers>
\ No newline at end of file
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/effects/hbdefault/progressslider_handlerelease.fxml
--- a/src/hbcore/resources/themes/effects/hbdefault/progressslider_handlerelease.fxml	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/effects/hbdefault/progressslider_handlerelease.fxml	Mon May 03 12:48:33 2010 +0300
@@ -1,7 +1,20 @@
 <layers>
-  <layergroup>
-    <visual src="Item">
+  <visual>
+    <param name="scale_x" type="anim">
+      <duration>0.2</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>
 
-    </visual>
-  </layergroup>
+    <param name="scale_origin_x" ref="visual.width">0.5</param>
+    <param name="scale_origin_y" ref="visual.height">0.5</param>
+
+  </visual>
 </layers>
\ No newline at end of file
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/effects/hbdefault/pushbutton_pressed.fxml
--- a/src/hbcore/resources/themes/effects/hbdefault/pushbutton_pressed.fxml	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/effects/hbdefault/pushbutton_pressed.fxml	Mon May 03 12:48:33 2010 +0300
@@ -1,14 +1,3 @@
 <layers>
-    <visual src="Item"> 
-    <filter name="glow" type="glow">
-    	<param name="blur_x">3.0</param>
-    	<param name="blur_y">3.0</param>
-    	<param name="opacity" type="anim">
-        <duration>0.3</duration>
-        <style>outquad</style>
-        <keyframe at="0.0">0.0</keyframe>
-        <keyframe at="1.0">1.0</keyframe>
-      </param>
-      </filter>
-    </visual>
+    <visual />
 </layers>
\ No newline at end of file
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/effects/hbdefault/pushbutton_released.fxml
--- a/src/hbcore/resources/themes/effects/hbdefault/pushbutton_released.fxml	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/effects/hbdefault/pushbutton_released.fxml	Mon May 03 12:48:33 2010 +0300
@@ -1,12 +1,3 @@
 <layers>
-    <visual src="Item"> 
-      <param name="opacity" type="anim">
-        <duration>0.3</duration>
-        <style>outquad</style>
-        <keyframe at="0.0">1.0</keyframe>
-        <keyframe at="0.5">0.5</keyframe>
-        <keyframe at="1.0">1.0</keyframe>
-      </param>
-
-    </visual>
+    <visual />
 </layers>
\ No newline at end of file
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/effects/hbdefault/rootitem_orientation_firstPhase.fxml
--- a/src/hbcore/resources/themes/effects/hbdefault/rootitem_orientation_firstPhase.fxml	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/effects/hbdefault/rootitem_orientation_firstPhase.fxml	Mon May 03 12:48:33 2010 +0300
@@ -2,7 +2,7 @@
   <layergroup>
     <visual>
         <param name="opacity" type="anim">
-        <duration>0.3</duration>
+        <duration>0.4</duration>
         <style>linear</style>
             <keyframe at="0.0">1</keyframe>
             <keyframe at="1.0">0.0</keyframe>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/effects/hbdefault/screensaver_activate.fxml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/effects/hbdefault/screensaver_activate.fxml	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,10 @@
+<layers>
+	<visual>
+		<param name="opacity" type="anim">
+			<duration>0.4</duration>
+			<keyframe at="0.0">0.0</keyframe>
+			<keyframe at="1.0">1.0</keyframe>
+			<style>linear</style>
+		</param>
+	</visual>
+</layers>
\ No newline at end of file
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/effects/hbdefault/screensaver_deactivate.fxml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/effects/hbdefault/screensaver_deactivate.fxml	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,10 @@
+<layers>
+	<visual>
+		<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>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/effects/hbdefault/statusbar_appear.fxml
--- a/src/hbcore/resources/themes/effects/hbdefault/statusbar_appear.fxml	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/effects/hbdefault/statusbar_appear.fxml	Mon May 03 12:48:33 2010 +0300
@@ -1,12 +1,12 @@
 <layers>
 	<visual>
 	    <param name="translation_y" type="anim">
-	        <duration>0.4</duration>
+	        <duration>0.3</duration>
 	        <style>outquad</style>
 	        <keyframe at="0.0">0.0</keyframe>
 	        <keyframe at="1.0">1.0</keyframe>
-	        <start ref="screen.top">1.0</start>
-	        <end ref="visual.top">1</end>
+	        <start ref="visual.bottom">-1.0</start>
+	        <end ref="visual.top">1.0</end>
 	    </param>
 	</visual>
 </layers>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/effects/hbdefault/statusbar_disappear.fxml
--- a/src/hbcore/resources/themes/effects/hbdefault/statusbar_disappear.fxml	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/effects/hbdefault/statusbar_disappear.fxml	Mon May 03 12:48:33 2010 +0300
@@ -1,12 +1,12 @@
 <layers>
 	<visual>
-  <param name="translation_y" type="anim">
-    <duration>0.3</duration>
-    <style>inoutquad</style>
-          <keyframe at="0">0</keyframe>
-          <keyframe at="0">0</keyframe>     
-    <start ref="visual.top">1</start>
-    <end ref="screen.top">1</end>
-  </param>
+	    <param name="translation_y" type="anim">
+	        <duration>0.3</duration>
+	        <style>inquad</style>
+	        <keyframe at="0.0">0.0</keyframe>
+	        <keyframe at="1.0">-1.0</keyframe>
+	        <start ref="visual.top">1.0</start>
+	        <end ref="visual.bottom">1.0</end>
+	    </param>
 	</visual>
 </layers>
\ No newline at end of file
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/effects/hbdefault/statusbar_orient_appear.fxml
--- a/src/hbcore/resources/themes/effects/hbdefault/statusbar_orient_appear.fxml	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/effects/hbdefault/statusbar_orient_appear.fxml	Mon May 03 12:48:33 2010 +0300
@@ -1,7 +1,7 @@
 <layers>
 	<visual>
 	    <param name="translation_y" type="anim">
-	        <duration>0.2</duration>
+	        <duration>0.3</duration>
 	        <style>outquad</style>
 	        <keyframe at="0.0">0.0</keyframe>
 	        <keyframe at="1.0">1.0</keyframe>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/effects/hbdefault/statusbar_orient_disappear.fxml
--- a/src/hbcore/resources/themes/effects/hbdefault/statusbar_orient_disappear.fxml	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/effects/hbdefault/statusbar_orient_disappear.fxml	Mon May 03 12:48:33 2010 +0300
@@ -1,8 +1,8 @@
 <layers>
 	<visual>
 	    <param name="translation_y" type="anim">
-	        <duration>0.2</duration>
-	        <style>inquad</style>
+	        <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>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/effects/hbdefault/taskswapper_appear.fxml
--- a/src/hbcore/resources/themes/effects/hbdefault/taskswapper_appear.fxml	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-<layers>
-<visual>
-	<param name="scale_x" type="anim">
-			<duration>0.4</duration>
-			<style>outquad</style>
-			<keyframe at="0.0">0</keyframe>
-			<keyframe at="1.0">1</keyframe>
-			<start ref="visual.width">0.5</start>
-			<end ref="visual.width">1.0</end>
-		</param>
-		<param name="scale_y" type="anim">
-			<duration>0.4</duration>
-			<style>outquad</style>
-			<keyframe at="0.0">0</keyframe>
-			<keyframe at="1.0">1</keyframe>
-			<start ref="visual.height">0.5</start>
-			<end ref="visual.height">1.0</end>
-		</param>
-		<param name="opacity" type="anim">
-			<style>linear</style>
-			<duration>0.4</duration>
-			<keyframe at="0.0">0.0</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>
-	</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 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/effects/hbdefault/taskswapper_disappear.fxml
--- a/src/hbcore/resources/themes/effects/hbdefault/taskswapper_disappear.fxml	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-<layers>
-<visual>
-
-	<param name="scale_x" type="anim">
-			<duration>0.4</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>
-		</param>
-		<param name="scale_y" type="anim">
-			<duration>0.4</duration>
-			<style>inoutquad</style>
-			<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>
-		</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.4</duration>
-			<keyframe at="0.0">1.0</keyframe>
-			<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 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/effects/hbdefault/titlebar_appear.fxml
--- a/src/hbcore/resources/themes/effects/hbdefault/titlebar_appear.fxml	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/effects/hbdefault/titlebar_appear.fxml	Mon May 03 12:48:33 2010 +0300
@@ -5,8 +5,8 @@
 	        <style>outquad</style>
 	        <keyframe at="0.0">0.0</keyframe>
 	        <keyframe at="1.0">1.0</keyframe>
-	        <start ref="screen.top">1.0</start>
-	        <end ref="visual.top">1</end>
+	        <start ref="visual.bottom">-1.0</start>
+	        <end ref="visual.top">1.0</end>
 	    </param>
 	</visual>
 </layers>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/effects/hbdefault/titlebar_disappear.fxml
--- a/src/hbcore/resources/themes/effects/hbdefault/titlebar_disappear.fxml	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/effects/hbdefault/titlebar_disappear.fxml	Mon May 03 12:48:33 2010 +0300
@@ -1,12 +1,12 @@
 <layers>
 	<visual>
-  <param name="translation_y" type="anim">
-    <duration>0.3</duration>
-    <style>inoutquad</style>
-          <keyframe at="0">0</keyframe>
-          <keyframe at="0">0</keyframe>     
-    <start ref="visual.top">1</start>
-    <end ref="screen.top">1</end>
-  </param>
+	    <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.3</keyframe>
+	        <start ref="visual.top">1.0</start>
+	        <end ref="visual.bottom">1.0</end>
+	    </param>
 	</visual>
 </layers>
\ No newline at end of file
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/effects/hbdefault/titlebar_orient_appear.fxml
--- a/src/hbcore/resources/themes/effects/hbdefault/titlebar_orient_appear.fxml	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/effects/hbdefault/titlebar_orient_appear.fxml	Mon May 03 12:48:33 2010 +0300
@@ -1,7 +1,7 @@
 <layers>
 	<visual>
 	    <param name="translation_y" type="anim">
-	        <duration>0.2</duration>
+	        <duration>0.3</duration>
 	        <style>outquad</style>
 	        <keyframe at="0.0">0.0</keyframe>
 	        <keyframe at="1.0">1.0</keyframe>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/effects/hbdefault/titlebar_orient_disappear.fxml
--- a/src/hbcore/resources/themes/effects/hbdefault/titlebar_orient_disappear.fxml	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/effects/hbdefault/titlebar_orient_disappear.fxml	Mon May 03 12:48:33 2010 +0300
@@ -1,10 +1,10 @@
 <layers>
 	<visual>
 	    <param name="translation_y" type="anim">
-	        <duration>0.2</duration>
-	        <style>inquad</style>
+	        <duration>0.3</duration>
+	     	<style>inoutquad</style>
 	        <keyframe at="0.0">0.0</keyframe>
-	        <keyframe at="1.0">-1.0</keyframe>
+	        <keyframe at="1.0">-1.3</keyframe>
 	        <start ref="visual.top">1.0</start>
 	        <end ref="visual.bottom">1.0</end>
 	    </param>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/effects/hbdefault/toolbar_orient_disappear.fxml
--- a/src/hbcore/resources/themes/effects/hbdefault/toolbar_orient_disappear.fxml	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/effects/hbdefault/toolbar_orient_disappear.fxml	Mon May 03 12:48:33 2010 +0300
@@ -1,12 +1,12 @@
 <layers>
-    <visual>
-        <param name="translation_y" type="anim">
-            <duration>0.3</duration>
-            <keyframe at="0.0">0.0</keyframe>
-            <keyframe at="1.0">1.0</keyframe>
-            <style>inquad</style>
-            <start ref="visual.top">1</start>
-            <end ref="visual.bottom">1</end>
-        </param>
-    </visual>
+	<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="visual.bottom">1.0</end>
+	    </param>
+	</visual>
 </layers>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/effects/hbdefault/toolbar_orient_disappear_left.fxml
--- a/src/hbcore/resources/themes/effects/hbdefault/toolbar_orient_disappear_left.fxml	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/effects/hbdefault/toolbar_orient_disappear_left.fxml	Mon May 03 12:48:33 2010 +0300
@@ -4,7 +4,7 @@
             <duration>0.3</duration>
             <keyframe at="0.0">0.0</keyframe>
             <keyframe at="1.0">1.0</keyframe>
-            <style>outquad</style>
+			<style>inoutquad</style>
             <start ref="visual.left">1</start>
             <end ref="extrect.left">1.1</end>
         </param>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/effects/hbdefault/toolbar_orient_disappear_right.fxml
--- a/src/hbcore/resources/themes/effects/hbdefault/toolbar_orient_disappear_right.fxml	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/effects/hbdefault/toolbar_orient_disappear_right.fxml	Mon May 03 12:48:33 2010 +0300
@@ -4,7 +4,7 @@
             <duration>0.3</duration>
             <keyframe at="0.0">0.0</keyframe>
             <keyframe at="1.0">1.0</keyframe>
-            <style>outquad</style>
+			<style>inoutquad</style>
             <start ref="visual.left">1</start>
             <end ref="extrect.left">1</end>
         </param>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/effects/hbdefault/treeviewitem_collapse.fxml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/effects/hbdefault/treeviewitem_collapse.fxml	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,11 @@
+<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 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/effects/hbdefault/treeviewitem_expand.fxml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/effects/hbdefault/treeviewitem_expand.fxml	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,10 @@
+<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 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/effects/hbdefault/viewitem_appear.fxml
--- a/src/hbcore/resources/themes/effects/hbdefault/viewitem_appear.fxml	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/effects/hbdefault/viewitem_appear.fxml	Mon May 03 12:48:33 2010 +0300
@@ -1,19 +1,25 @@
 <layers>
-	<visual>
-    
-    <param name="opacity" type="anim">
-      <duration>0.3</duration>
-      <style>linear</style>
-      <keyframe at="0.0">0.0</keyframe>
+  <visual>
+    <param name="scale_x" type="anim">
+      <duration>0.3</duration>   
+       <style>outquad</style>   
+      <keyframe at="0.0">0.8</keyframe>
       <keyframe at="1.0">1.0</keyframe>
     </param>
-
     <param name="scale_y" type="anim">
       <duration>0.3</duration>
-      <style>linear</style>
-      <keyframe at="0.0">0.0</keyframe>
+      <style>outquad</style>  
+      <keyframe at="0.0">0.8</keyframe>
       <keyframe at="1.0">1.0</keyframe>
-    </param>
+    </param> 
+    
+    	<param name="opacity" type="anim">
+	        <duration>0.3</duration>
+	        <keyframe at="0.0">0.0</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>
   </visual>
 </layers>
\ No newline at end of file
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/effects/hbdefault/viewitem_disappear.fxml
--- a/src/hbcore/resources/themes/effects/hbdefault/viewitem_disappear.fxml	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/effects/hbdefault/viewitem_disappear.fxml	Mon May 03 12:48:33 2010 +0300
@@ -1,19 +1,25 @@
 <layers>
-	<visual>
-    
-    <param name="opacity" type="anim">
-      <duration>0.3</duration>
-      <style>linear</style>
+  <visual>
+    <param name="scale_x" type="anim">
+      <duration>0.3</duration>   
+       <style>inoutquad</style>   
       <keyframe at="0.0">1.0</keyframe>
-      <keyframe at="1.0">0.0</keyframe>
+      <keyframe at="1.0">0.8</keyframe>
     </param>
-
     <param name="scale_y" type="anim">
       <duration>0.3</duration>
-      <style>linear</style>
+      <style>outquad</style>  
       <keyframe at="0.0">1.0</keyframe>
-      <keyframe at="1.0">0.0</keyframe>
-    </param>
+      <keyframe at="1.0">0.8</keyframe>
+    </param> 
+    
+    	<param name="opacity" type="anim">
+	        <duration>0.3</duration>
+	        <keyframe at="0.0">1.0</keyframe>
+	        <keyframe at="1.0">0.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>
   </visual>
 </layers>
\ No newline at end of file
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/mirrored.txt
--- a/src/hbcore/resources/themes/icons/hbdefault/mirrored.txt	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/mirrored.txt	Mon May 03 12:48:33 2010 +0300
@@ -155,16 +155,7 @@
 qtg_fr_status_latched
 qtg_indi_status_options
 
-#Battery/signal
 
-qtg_graf_battery_bg
-qtg_graf_battery_full
-qtg_graf_battery_medium
-qtg_graf_battery_low
-qtg_graf_signal_bg
-qtg_graf_signal_full
-qtg_graf_signal_medium
-qtg_graf_signal_low
 
 
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/hb_vol_slider_decrement.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/hb_vol_slider_decrement.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +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" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<polygon points="33.999,26 10,26 10,17.998 33.999,17.998 "/>
-<rect fill="#FFFFFF" height="4" width="20" x="12" y="20"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/hb_vol_slider_decrement_pressed.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/hb_vol_slider_decrement_pressed.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +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" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<polygon points="33.999,26 10,26 10,17.998 33.999,17.998 "/>
-<rect fill="#00FF00" height="4" width="20" x="12" y="20"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/hb_vol_slider_increment.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/hb_vol_slider_increment.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +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" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<polygon points="26.001,33.999 18,33.999 18,26.001 10,26.001 10,18 18,18 18,9.999 26.001,9.999 26.001,18 33.999,18   33.999,26.001 26.001,26.001 "/>
-<polygon fill="#FFFFFF" points="31.999,20 23.999,20 23.999,12 20,12 20,20 12,20 12,23.999 20,23.999 20,31.999 23.999,31.999   23.999,23.999 31.999,23.999 "/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/hb_vol_slider_increment_pressed.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/hb_vol_slider_increment_pressed.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +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" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<polygon points="26.001,33.999 18,33.999 18,26.001 10,26.001 10,18 18,18 18,9.999 26.001,9.999 26.001,18 33.999,18   33.999,26.001 26.001,26.001 "/>
-<polygon fill="#00FF00" points="31.999,20 23.999,20 23.999,12 20,12 20,20 12,20 12,23.999 20,23.999 20,31.999 23.999,31.999   23.999,23.999 31.999,23.999 "/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/hb_vol_slider_muted.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/hb_vol_slider_muted.svg	Mon Apr 19 14:02:13 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" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<path d="M25.824,21.015V8.411h-9.979l-1.025,1.6L8.354,3.545L3.651,8.242l6.797,6.795H4.931v15.818h6.671l4.24,6.625h9.982v-7.067  l7.902,7.905l4.697-4.703L25.824,21.015z M19.179,30.336L15.26,24.21h-3.682v-2.524h3.682l0.715-1.121l3.204,3.203V30.336z"/>
-<rect fill="#FFFFFF" height="2.648" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 21.1169 50.6082)" width="38.533" x="1.773" y="19.607"/>
-<polygon fill="#FFFFFF" points="21.179,32.835 18.403,32.835 14.166,26.209 9.578,26.209 9.578,19.685 14.166,19.685 14.463,19.219   12.279,17.037 6.931,17.037 6.931,28.855 12.695,28.855 16.937,35.48 23.824,35.48 23.824,28.579 21.179,25.936 "/>
-<polygon fill="#FFFFFF" points="18.403,13.06 21.179,13.06 21.179,16.202 23.824,18.847 23.824,10.412 16.937,10.412 16.332,11.355   18.259,13.284 "/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/hb_vol_slider_unmuted.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/hb_vol_slider_unmuted.svg	Mon Apr 19 14:02:13 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" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<path d="M34.951,38.12l-5.054-4.302l1.282-1.521c0.877-1.04,8.324-10.39,0.111-18.605l-1.414-1.413l4.697-4.701l1.413,1.415  c12.695,12.699,0.386,27.46,0.259,27.606L34.951,38.12L34.951,38.12z"/>
-<path d="M30.761,14.545l-1.414-1.412l-3.521,3.521V8.411h-9.981l-4.24,6.624H4.93v15.82h6.674l4.24,6.625h9.981v-8.201l3.855,3.287  l1.298-1.521C33.574,28.005,36.864,20.643,30.761,14.545z M19.18,30.335l-3.921-6.128h-3.682v-2.522h3.682l3.921-6.128V30.335z   M25.918,26.742l-0.094,0.109v-7.844l0.237,0.236C29.324,22.505,26.277,26.318,25.918,26.742z"/>
-<path d="M27.476,17.83c4.622,4.622,0.158,9.979-0.031,10.203l2.014,1.714c2.181-2.554,4.957-8.725-0.11-13.788  L27.476,17.83z" fill="#FFFFFF"/>
-<path d="M34.576,10.406l-1.873,1.871c9.664,9.663,0.404,20.838,0.006,21.309l2.017,1.717  C34.838,35.17,45.974,21.811,34.576,10.406z" fill="#FFFFFF"/>
-<path d="M16.937,10.411l-4.242,6.625H6.931v11.819h5.764l4.242,6.625h6.887V10.411H16.937z M21.179,32.834h-2.776  l-4.237-6.626H9.578v-6.524h4.588l4.237-6.625h2.776V32.834z" fill="#FFFFFF"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/hb_zoom_slider_decrement.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/hb_zoom_slider_decrement.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +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" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<path d="M24.998,3C16.177,3,9.002,10.18,9.002,19c0,2.654,0.658,5.153,1.808,7.36l-8.638,8.638l6.83,6.83l8.636-8.64  c2.206,1.148,4.706,1.81,7.36,1.81C33.82,34.998,41,27.821,41,19C41,10.18,33.82,3,24.998,3z M24.998,8.998  c4.094,0,7.614,2.473,9.162,6.002h-18.32C17.388,11.471,20.908,8.998,24.998,8.998z M24.998,29c-4.09,0-7.611-2.476-9.159-6.002  H34.16C32.613,26.524,29.092,29,24.998,29z"/>
-<rect fill="#FFFFFF" height="4" width="16" x="17" y="17"/>
-<path d="M25,5c-7.722,0-14,6.279-14,14c0,2.839,0.854,5.479,2.312,7.688L5,35l4,4l8.312-8.313  C19.521,32.145,22.16,33,25,33c7.721,0,14-6.278,14-14C39,11.279,32.721,5,25,5z M25,31c-6.618,0-12-5.386-12-12  c0-6.617,5.383-12,12-12c6.615,0,12,5.383,12,12C37,25.614,31.616,31,25,31z" fill="#FFFFFF"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/hb_zoom_slider_decrement_pressed.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/hb_zoom_slider_decrement_pressed.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +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" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<path d="M24.998,3C16.177,3,9.002,10.18,9.002,19c0,2.654,0.658,5.153,1.808,7.36l-8.638,8.638l6.83,6.83l8.636-8.64  c2.206,1.148,4.706,1.81,7.36,1.81C33.82,34.998,41,27.821,41,19C41,10.18,33.82,3,24.998,3z M24.998,8.998  c4.094,0,7.614,2.473,9.162,6.002h-18.32C17.388,11.471,20.908,8.998,24.998,8.998z M24.998,29c-4.09,0-7.611-2.476-9.159-6.002  H34.16C32.613,26.524,29.092,29,24.998,29z"/>
-<rect fill="#00FF00" height="4" width="16" x="17" y="17"/>
-<path d="M25,5c-7.722,0-14,6.279-14,14c0,2.839,0.854,5.479,2.312,7.688L5,35l4,4l8.312-8.313  C19.521,32.145,22.16,33,25,33c7.721,0,14-6.278,14-14C39,11.279,32.721,5,25,5z M25,31c-6.618,0-12-5.386-12-12  c0-6.617,5.383-12,12-12c6.615,0,12,5.383,12,12C37,25.614,31.616,31,25,31z" fill="#FFFFFF"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/hb_zoom_slider_increment.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/hb_zoom_slider_increment.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +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" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<path d="M24.999,3C16.177,3,9.002,10.18,9.002,19.001c0,2.654,0.658,5.153,1.807,7.359l-8.637,8.64l6.83,6.83l8.637-8.64  c2.205,1.149,4.705,1.81,7.36,1.81c8.82,0,16-7.177,16-15.999C40.999,10.18,33.82,3,24.999,3z M34.159,15.001h-5.16V9.84  C31.3,10.849,33.152,12.698,34.159,15.001z M15.841,22.999H21v5.16C18.699,27.15,16.85,25.301,15.841,22.999z M21,9.84v5.161h-5.16  C16.85,12.699,18.699,10.849,21,9.84z M28.999,28.16v-5.16h5.16C33.15,25.301,31.3,27.15,28.999,28.16z"/>
-<path d="M24.999,5c-7.72,0-14,6.28-14,14c0,2.839,0.854,5.479,2.312,7.688L5,34.999l4,4l8.312-8.313  c2.209,1.459,4.85,2.313,7.688,2.313c7.722,0,14-6.278,14-14C38.999,11.28,32.72,5,24.999,5z M24.999,30.999  c-6.617,0-12-5.383-12-12c0-6.616,5.383-12,12-12c6.617,0,12,5.384,12,12C36.999,25.617,31.616,30.999,24.999,30.999z" fill="#FFFFFF"/>
-<polygon fill="#FFFFFF" points="32.999,17 26.999,17 26.999,11 22.999,11 22.999,17 17,17 17,21 22.999,21 22.999,26.999   26.999,26.999 26.999,21 32.999,21 "/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/hb_zoom_slider_increment_pressed.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/hb_zoom_slider_increment_pressed.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +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" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<path d="M24.999,3C16.177,3,9.002,10.18,9.002,19.001c0,2.654,0.658,5.153,1.807,7.359l-8.637,8.64l6.83,6.83l8.637-8.64  c2.205,1.149,4.705,1.81,7.36,1.81c8.82,0,16-7.177,16-15.999C40.999,10.18,33.82,3,24.999,3z M34.159,15.001h-5.16V9.84  C31.3,10.849,33.152,12.698,34.159,15.001z M15.841,22.999H21v5.16C18.699,27.15,16.85,25.301,15.841,22.999z M21,9.84v5.161h-5.16  C16.85,12.699,18.699,10.849,21,9.84z M28.999,28.16v-5.16h5.16C33.15,25.301,31.3,27.15,28.999,28.16z"/>
-<path d="M24.999,5c-7.72,0-14,6.28-14,14c0,2.839,0.854,5.479,2.312,7.688L5,34.999l4,4l8.312-8.313  c2.209,1.459,4.85,2.313,7.688,2.313c7.722,0,14-6.278,14-14C38.999,11.28,32.72,5,24.999,5z M24.999,30.999  c-6.617,0-12-5.383-12-12c0-6.616,5.383-12,12-12c6.617,0,12,5.384,12,12C36.999,25.617,31.616,30.999,24.999,30.999z" fill="#FFFFFF"/>
-<polygon fill="#00FF00" points="32.999,17 26.999,17 26.999,11 22.999,11 22.999,17 17,17 17,21 22.999,21 22.999,26.999   26.999,26.999 26.999,21 32.999,21 "/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/note_error.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/note_error.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +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" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="60" height="80" viewBox="0 0 60 80">
-<rect fill="none" width="60" height="80"/>
-<linearGradient id="XMLID_6_" gradientUnits="userSpaceOnUse" x1="28.9209" y1="-1484.5107" x2="40.7249" y2="-1507.7615" gradientTransform="matrix(1 0 0 -1 0.188 -1446.8857)">
-<stop offset="0" style="stop-color:#A2C2DD"/>
-<stop offset="0.1" style="stop-color:#A2C2DD"/>
-<stop offset="0.7135" style="stop-color:#6C83BB"/>
-<stop offset="0.9888" style="stop-color:#003D6D"/>
-</linearGradient>
-<path fill="url(#XMLID_6_)" d="M16.176,14.783L4.304,25.613L5.4,45.105l11.638,13.826l18.399,4.547L52.775,50.3l0.854-18.561 L40.182,16.516l-18.915-3.38L16.176,14.783z"/>
-<g>
-<linearGradient id="XMLID_7_" gradientUnits="userSpaceOnUse" x1="51.0596" y1="22.3335" x2="51.0596" y2="60.833">
-<stop offset="0" style="stop-color:#E6EEF4"/>
-<stop offset="0.4438" style="stop-color:#C03A3A"/>
-<stop offset="0.9382" style="stop-color:#302D02"/>
-<stop offset="1" style="stop-color:#302D02"/>
-</linearGradient>
-<polygon fill="url(#XMLID_7_)" points="49.166,34.424 53.273,31.867 52.434,50.122 48.846,53.186 "/>
-<linearGradient id="XMLID_8_" gradientUnits="userSpaceOnUse" x1="33.416" y1="7.5293" x2="50.249" y2="34.5293">
-<stop offset="0" style="stop-color:#E3DFE4"/>
-<stop offset="1" style="stop-color:#C03A3A"/>
-</linearGradient>
-<polygon fill="url(#XMLID_8_)" points="35.658,18.622 40,16.839 53.254,31.852 49.109,34.432 "/>
-<linearGradient id="XMLID_9_" gradientUnits="userSpaceOnUse" x1="20.2061" y1="11.1016" x2="39.873" y2="23.1016">
-<stop offset="0" style="stop-color:#E3DFE4"/>
-<stop offset="1" style="stop-color:#C03A3A"/>
-</linearGradient>
-<polygon fill="url(#XMLID_9_)" points="16.355,15.092 21.292,13.496 40,16.839 35.646,18.638 "/>
-<polygon fill="#E0CFD4" points="35.646,18.725 49.243,34.445 48.959,53.05 35.359,63.1 17.232,58.62 5.742,44.97 4.663,25.76 16.603,15.213 "/>
-<linearGradient id="XMLID_10_" gradientUnits="userSpaceOnUse" x1="-2.7905" y1="1.5742" x2="36.0425" y2="50.9072">
-<stop offset="0" style="stop-color:#E3DFE4"/>
-<stop offset="1" style="stop-color:#C03A3A"/>
-</linearGradient>
-<path fill="url(#XMLID_10_)" d="M17.365,17.124l-11.07,9.601l0.941,17.477L17.97,56.723l16.672,4.021l12.373-8.72l0.271-16.723 l-12.54-14.523L17.365,17.124z"/>
-</g>
-<g>
-<path fill="#FFFFFF" d="M37.215,34.541l0.322,15.732l2.512,0.554c0,0-0.102-6.134-0.107-6.606c2.313,0.581,6.144,1.973,6.229-3.128 C46.262,35.68,40.074,35.254,37.215,34.541z M39.918,41.632l-0.064-3.943c1.49,0.393,3.799,0.626,3.723,2.768 C43.479,42.9,42.21,42.08,39.918,41.632z"/>
-<path fill="#FFFFFF" d="M31.299,46.41c-2.522-0.938-2.393-4.896-2.35-7.549c0.046-2.837,0.729-3.495,2.078-3.417 c2.392,0.612,2.447,3.624,2.478,5.603C33.6,47.139,31.578,46.514,31.299,46.41z M26.636,40.401c0.22,2.588,0.22,7.172,4.615,8.679 c1.165,0.4,5.547,0.701,4.112-11.37c-0.322-2.708-2.35-4.507-4.293-4.937C29.382,32.402,25.992,32.871,26.636,40.401z"/>
-<path fill="#FFFFFF" d="M17.995,32.544l2.852,0.622l0.215,12.959l2.568,0.607l-0.215-13.006l2.852,0.628l-0.037-2.335l-8.275-1.787 L17.995,32.544z"/>
-<path fill="#FFFFFF" d="M9.185,32.171c0.282,2.324,1.344,3.079,2.684,4.087c0,0,3.497,2.272,3.411,4.682 c-0.021,0.578-0.497,1.354-1.768,1.086c-2.171-0.449-2.009-2.667-2.009-2.667l-2.731-0.613c0,0,0.236,4.975,4.697,5.865 c1.194,0.238,4.103,0.154,4.287-3.312c0.2-3.771-4.328-6.884-4.328-6.884c-0.92-0.702-1.859-1.083-1.707-1.942 c0.445-2.501,3.226-0.193,2.937,0.682l2.643,0.572c0,0,0.383-3.685-4.156-4.872C10.238,28.098,8.981,30.487,9.185,32.171z"/>
-</g>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/note_info.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/note_info.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +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" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="60" height="80" viewBox="0 0 60 80">
-<rect fill="none" width="60" height="80"/>
-<linearGradient id="XMLID_111_" gradientUnits="userSpaceOnUse" x1="29.7021" y1="-1488.3389" x2="41.5779" y2="-1511.731" gradientTransform="matrix(1 0 0 -1 0.188 -1446.8857)">
-<stop offset="0" style="stop-color:#A2C2DD"/>
-<stop offset="0.1" style="stop-color:#A2C2DD"/>
-<stop offset="0.7135" style="stop-color:#6C83BB"/>
-<stop offset="0.9888" style="stop-color:#003D6D"/>
-</linearGradient>
-<path fill="url(#XMLID_111_)" d="M18.917,24.506c0,3.711,1.761,7.093,4.673,9.217c-0.697,0.423-5.008,3.041-5.008,3.041l0.472,6.679 c0,0,2.263,1.052,2.587,1.201c0.025,0.387,0.521,7.998,0.547,8.395c-0.325,0.193-3.047,1.814-3.047,1.814l0.57,7.551L35.598,67.8 l6.99-6.586l0.084-6.815c0,0-2.498-0.67-2.938-0.787C39.74,53.091,39.9,35.508,39.9,35.508s-3.782-0.877-4.963-1.135 c3.48-1.97,5.742-5.701,5.742-9.863c0-6.242-4.882-11.32-10.881-11.32S18.917,18.264,18.917,24.506z"/>
-<g>
-<linearGradient id="XMLID_112_" gradientUnits="userSpaceOnUse" x1="22.0054" y1="-1475.1733" x2="43.8581" y2="-1500.0464" gradientTransform="matrix(1 0 0 -1 0.188 -1446.8857)">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.05" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#A2C2DD"/>
-</linearGradient>
-<polygon fill="url(#XMLID_112_)" points="18.946,36.953 32.229,40.859 39.604,35.744 25.864,32.752 "/>
-<linearGradient id="XMLID_113_" gradientUnits="userSpaceOnUse" x1="35.8018" y1="50.2832" x2="35.8018" y2="22.7804" gradientTransform="matrix(1 0 0 -1 0.0376 78.9346)">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.35" style="stop-color:#A2C2DD"/>
-<stop offset="0.7" style="stop-color:#6C83BB"/>
-<stop offset="1" style="stop-color:#003D6D"/>
-</linearGradient>
-<polygon fill="url(#XMLID_113_)" points="32.475,59.457 39.38,53.879 39.546,35.744 32.134,40.859 "/>
-<linearGradient id="XMLID_114_" gradientUnits="userSpaceOnUse" x1="32.5225" y1="-2262.6187" x2="49.2845" y2="-2277.6162" gradientTransform="matrix(1 0 0 -1 0.2632 -2209.7959)">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.05" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#A2C2DD"/>
-</linearGradient>
-<polygon fill="url(#XMLID_114_)" points="32.458,59.211 35.719,60.193 42.311,54.666 39.38,53.879 "/>
-<linearGradient id="XMLID_115_" gradientUnits="userSpaceOnUse" x1="17.854" y1="-2260.3921" x2="27.3872" y2="-2271.8667" gradientTransform="matrix(1 0 0 -1 0.2632 -2209.7959)">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.05" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#A2C2DD"/>
-</linearGradient>
-<polygon fill="url(#XMLID_115_)" points="19.506,55.044 22.796,56.124 22.591,53.206 "/>
-<linearGradient id="XMLID_116_" gradientUnits="userSpaceOnUse" x1="38.8848" y1="29.8823" x2="38.8848" y2="12.0626" gradientTransform="matrix(1 0 0 -1 0.0376 78.9346)">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.35" style="stop-color:#A2C2DD"/>
-<stop offset="0.7" style="stop-color:#6C83BB"/>
-<stop offset="1" style="stop-color:#003D6D"/>
-</linearGradient>
-<polygon fill="url(#XMLID_116_)" points="35.536,67.4 42.232,61.063 42.311,54.666 35.582,60.24 "/>
-<linearGradient id="XMLID_117_" gradientUnits="userSpaceOnUse" x1="35.3174" y1="-6.2339" x2="18.7901" y2="53.8081" gradientTransform="matrix(1 0 0 -1 0.0376 78.9346)">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.05" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#A2C2DD"/>
-</linearGradient>
-<polygon fill="url(#XMLID_117_)" points="18.946,36.953 32.134,40.859 32.458,59.258 35.604,60.186 35.51,67.402 20.042,62.146 19.499,55.046 22.738,56.109 21.976,44.416 19.388,43.213 "/>
-</g>
-<radialGradient id="XMLID_118_" cx="24.4282" cy="-2991.7402" r="19.158" gradientTransform="matrix(1 0 0 -1 0.3384 -2972.7061)" gradientUnits="userSpaceOnUse">
-<stop offset="0" style="stop-color:#DCE8E4"/>
-<stop offset="1" style="stop-color:#43910A"/>
-</radialGradient>
-<ellipse fill="url(#XMLID_118_)" cx="29.797" cy="24.506" rx="10.531" ry="10.969"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/note_warning.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/note_warning.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +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" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="60" height="80" viewBox="0 0 60 80">
-<linearGradient id="XMLID_68_" gradientUnits="userSpaceOnUse" x1="26.0703" y1="-2273.4072" x2="31.9835" y2="-2285.0527" gradientTransform="matrix(1 0 0 -1 0.2632 -2209.7959)">
-<stop offset="0" style="stop-color:#A2C2DD"/>
-<stop offset="0.1" style="stop-color:#A2C2DD"/>
-<stop offset="0.7135" style="stop-color:#6C83BB"/>
-<stop offset="0.9888" style="stop-color:#003D6D"/>
-</linearGradient>
-<circle fill="url(#XMLID_68_)" cx="29.29" cy="69.434" r="6.529"/>
-<g>
-<rect fill="none" width="60" height="80"/>
-</g>
-<linearGradient id="XMLID_69_" gradientUnits="userSpaceOnUse" x1="30.415" y1="1559.0273" x2="40.6636" y2="1579.2108" gradientTransform="matrix(1 0 0 1 0.1504 -1525.8203)">
-<stop offset="0" style="stop-color:#A2C2DD"/>
-<stop offset="0.1" style="stop-color:#A2C2DD"/>
-<stop offset="0.7135" style="stop-color:#6C83BB"/>
-<stop offset="0.9888" style="stop-color:#003D6D"/>
-</linearGradient>
-<path fill="url(#XMLID_69_)" d="M19.666,13.492c-0.396,0.462-0.428,0.882-0.385,1.153l4.14,39.044 c0.198,1.199,0.643,2.05,1.402,2.69c1.008,1.083,2.547,1.694,4.421,1.739c1.117,0,2.189-0.212,3.107-0.613 c1.604-0.646,2.549-1.824,2.775-3.511l3.584-39.309c0.061-0.329,0.016-0.752-0.396-1.216c-1.232-1.409-5.063-2.393-9.311-2.393 C24.722,11.083,20.878,12.073,19.666,13.492z"/>
-<g>
-<g>
-<linearGradient id="XMLID_70_" gradientUnits="userSpaceOnUse" x1="14.7363" y1="776.8535" x2="33.5391" y2="801.0286" gradientTransform="matrix(1 0 0 1 0.0752 -762.9102)">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.05" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#A2C2DD"/>
-</linearGradient>
-<path fill="url(#XMLID_70_)" d="M37.949,14.62l-3.178,39.271c-0.277,2.805-3.086,3.885-5.521,3.885 c-2.58-0.063-4.746-1.237-5.355-3.849l-4.029-38.819C23.36,17.514,33.879,18.064,37.949,14.62z"/>
-<linearGradient id="XMLID_71_" gradientUnits="userSpaceOnUse" x1="37.4512" y1="796.1699" x2="-11.1774" y2="805.2171" gradientTransform="matrix(1 0 0 1 0.0752 -762.9102)">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.35" style="stop-color:#A2C2DD"/>
-<stop offset="0.7" style="stop-color:#6C83BB"/>
-<stop offset="1" style="stop-color:#003D6D"/>
-</linearGradient>
-<path fill="url(#XMLID_71_)" d="M25.46,17.253l1.585,40.042c-1.518-0.785-2.883-1.27-3.276-3.645L19.64,14.501 C20.06,14.847,24.262,16.785,25.46,17.253z"/>
-<linearGradient id="XMLID_72_" gradientUnits="userSpaceOnUse" x1="25.5776" y1="799.0352" x2="53.4279" y2="798.3287" gradientTransform="matrix(1 0 0 1 0.0752 -762.9102)">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.35" style="stop-color:#A2C2DD"/>
-<stop offset="0.7" style="stop-color:#6C83BB"/>
-<stop offset="1" style="stop-color:#003D6D"/>
-</linearGradient>
-<path fill="url(#XMLID_72_)" d="M32.047,57.261c1.309-0.479,2.479-1.429,2.738-3.308l3.597-39.45c0,0-3.825,1.754-4.456,2.15 L32.047,57.261z"/>
-<linearGradient id="XMLID_73_" gradientUnits="userSpaceOnUse" x1="19.8716" y1="772.9834" x2="42.9158" y2="784.152" gradientTransform="matrix(1 0 0 1 0.0752 -762.9102)">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.05" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#A2C2DD"/>
-</linearGradient>
-<path fill="url(#XMLID_73_)" d="M38.389,14.591c-0.209,1.578-4.394,2.859-9.345,2.859c-4.952,0-9.167-1.281-9.417-2.859 c-0.248-1.579,3.976-3.158,9.385-3.158C34.42,11.433,38.596,13.012,38.389,14.591z"/>
-</g>
-</g>
-<g>
-<g>
-<radialGradient id="XMLID_74_" cx="26.4556" cy="-2274.9688" r="6.3101" gradientTransform="matrix(1 0 0 -1 0.2632 -2209.7959)" gradientUnits="userSpaceOnUse">
-<stop offset="0" style="stop-color:#E3DFE4"/>
-<stop offset="1" style="stop-color:#C03A3A"/>
-</radialGradient>
-<circle fill="url(#XMLID_74_)" cx="29.271" cy="69.457" r="6.171"/>
-</g>
-</g>
-<rect fill="none" width="60" height="80"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_fr_cale_side_b.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_fr_cale_side_b.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +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 width="326" height="12" viewBox="0 0 326 12">
-<rect fill-opacity="0.02" width="326" height="11.999"/>
-<rect fill-opacity="0.06" width="326" height="10.999"/>
-<rect fill-opacity="0.11" width="326" height="9.999"/>
-<rect fill-opacity="0.19" width="326" height="8.999"/>
-<rect fill-opacity="0.7" fill="#084296" width="326" height="8.999"/>
-<linearGradient id="_2" gradientUnits="userSpaceOnUse" x1="163" y1="-247.08" x2="163" y2="255.6">
-<stop stop-color="#FFFFFF" offset="0"/>
-<stop stop-color="#B3DDFF" offset="1"/>
-</linearGradient>
-<rect fill="url(#_2)" width="326" height="7.999"/>
-<rect fill="#FFFFFF" width="326" height="4.5"/>
-</svg>
\ No newline at end of file
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_graf_nslider_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_graf_nslider_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="32px" height="13px" viewBox="0 0 32 13" style="enable-background:new 0 0 32 13;" xml:space="preserve">
-<rect y="0" width="32" height="13"/>
-<rect y="2" style="fill:#D0D0D0;fill-opacity:0.75;" width="32" height="9"/>
-<polygon style="fill:#FFFFFF;" points="0,9.5 0,9.5 0,11 0,11 32,11 32,9.5 "/>
-<polygon style="fill:#FFFFFF;" points="0,2 0,3.5 0,3.5 32,3.5 32,2 "/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_graf_nslider_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_graf_nslider_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="32px" height="13px" viewBox="0 0 32 13" style="enable-background:new 0 0 32 13;" xml:space="preserve">
-<path d="M5.792,13H32V0H5.789C2.598,0.003,0,2.479,0,5.526v1.947C0,10.522,2.598,13,5.792,13z"/>
-<path style="fill:#D0D0D0;fill-opacity:0.75;" d="M5.789,2C3.699,2.003,1.998,3.606,1.998,5.526v1.947
-	C1.998,9.401,3.699,11,5.789,11H32V1.998L5.789,2L5.789,2z"/>
-<path style="fill:#FFFFFF;" d="M5.789,9.499c-1.25,0-2.291-0.941-2.291-2.022V5.522c0-1.08,1.041-2.021,2.291-2.021H32V2H5.789
-	C3.699,2.004,1.998,3.606,1.998,5.526v1.95c0,1.927,1.701,3.525,3.791,3.525H32V9.499H5.789z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_graf_nslider_marker.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_graf_nslider_marker.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +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" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g>
-<path d="M0,5.973V26c0,3.292,2.533,5.973,5.643,5.973h6.716C15.468,31.973,18,29.292,18,26V5.973C18,2.682,15.468,0,12.355,0H5.646   C2.533,0,0,2.682,0,5.973z M12.354,5.006c0.304,0,0.646,0.414,0.646,0.967V26c0,0.557-0.336,0.973-0.64,0.973H5.646   c-0.304,0-0.644-0.416-0.644-0.973V5.973c0-0.553,0.34-0.967,0.644-0.967H12.354z"/>
-<path d="M2.002,5.973V26c0,2.191,1.633,3.973,3.645,3.973h6.712   C14.368,29.973,16,28.191,16,26V5.973c0-2.188-1.632-3.969-3.645-3.969H5.648C3.635,2.004,2.002,3.789,2.002,5.973z M12.354,3.502   c1.186,0,2.146,1.111,2.146,2.471V26c0,1.363-0.96,2.473-2.14,2.473H5.648c-1.187,0-2.146-1.106-2.146-2.473V5.973   c0-1.363,0.959-2.471,2.146-2.471H12.354z" fill="#FF0000" fill-opacity="0.96" stroke-opacity="0.96"/>
-<linearGradient gradientTransform="matrix(0 -1 -1 0 3692.4004 -6820.4238)" gradientUnits="userSpaceOnUse" id="XMLID_16_" x1="-6836.4106" x2="-6836.4106" y1="3688.8984" y2="3677.9023">
-<stop offset="0" style="stop-color:#FDFEFE"/>
-<stop offset="0.0165" style="stop-color:#FDFEFE"/>
-<stop offset="1" style="stop-color:#A6B8C6"/>
-</linearGradient>
-<path d="M14.498,5.973V26c0,1.363-0.96,2.473-2.139,2.473H5.648   c-1.187,0-2.146-1.106-2.146-2.473V5.973c0-1.363,0.959-2.471,2.146-2.471h6.706C13.538,3.502,14.498,4.613,14.498,5.973   L14.498,5.973z" fill="url(#XMLID_16_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<linearGradient gradientTransform="matrix(0 -1 -1 0 3692.4004 -6820.4238)" gradientUnits="userSpaceOnUse" id="XMLID_17_" x1="-6836.4136" x2="-6836.4136" y1="3679.4023" y2="3687.3984">
-<stop offset="0" style="stop-color:#555555"/>
-<stop offset="0.4484" style="stop-color:#E6EEEE"/>
-<stop offset="1" style="stop-color:#00FF00"/>
-</linearGradient>
-<path d="M12.998,5.973V26c0,0.557-0.336,0.973-0.639,0.973   H5.646c-0.304,0-0.644-0.416-0.644-0.973V5.973c0-0.553,0.34-0.967,0.644-0.967h6.708C12.656,5.006,12.998,5.42,12.998,5.973   L12.998,5.973z" fill="url(#XMLID_17_)" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0 -1 -1 0 3692.4004 -6820.4238)" gradientUnits="userSpaceOnUse" id="XMLID_18_" x1="-6836.4136" x2="-6836.4136" y1="3676.9736" y2="3687.075">
-<stop offset="0" style="stop-color:#ACB4A7"/>
-<stop offset="0.0225" style="stop-color:#ACB4A7"/>
-<stop offset="0.1164" style="stop-color:#B4C0B7"/>
-<stop offset="0.264" style="stop-color:#C6D8D8"/>
-<stop offset="0.5021" style="stop-color:#E6EEEE"/>
-<stop offset="0.7247" style="stop-color:#00FF00"/>
-<stop offset="1" style="stop-color:#00FF00"/>
-</linearGradient>
-<path d="M5.002,5.973V26c0,0.557,0.34,0.973,0.641,0.973H9   V5.006H5.643C5.342,5.006,5.002,5.42,5.002,5.973z" fill="url(#XMLID_18_)" fill-opacity="0.4" stroke-opacity="0.4"/>
-</g>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_graf_nslider_marker_selected.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_graf_nslider_marker_selected.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="16px" height="9px" viewBox="0 0 16 9" style="enable-background:new 0 0 16 9;" xml:space="preserve">
-<g>
-	<g>
-		<path d="M1,0C0.45,0,0,0.45,0,1v7c0,0.551,0.45,1,1,1h14c0.55,0,1-0.449,1-1V1c0-0.55-0.45-1-1-1H1z"/>
-	</g>
-	<rect x="1" y="1" style="fill:#D0D0D0;fill-opacity:0.75;" width="14" height="7"/>
-</g>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_graf_nslider_pressed_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_graf_nslider_pressed_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="32px" height="13px" viewBox="0 0 32 13" style="enable-background:new 0 0 32 13;" xml:space="preserve">
-<rect y="0" width="32" height="13"/>
-<rect y="2" style="fill:#D0D0D0;fill-opacity:1.00;" width="32" height="9"/>
-<polygon style="fill:#00FFFF;" points="0,9.5 0,9.5 0,11 0,11 32,11 32,9.5 "/>
-<polygon style="fill:#00FFFF;" points="0,2 0,3.5 0,3.5 32,3.5 32,2 "/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_graf_nslider_pressed_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_graf_nslider_pressed_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="32px" height="13px" viewBox="0 0 32 13" style="enable-background:new 0 0 32 13;" xml:space="preserve">
-<path d="M5.792,13H32V0H5.789C2.598,0.003,0,2.479,0,5.526v1.947C0,10.522,2.598,13,5.792,13z"/>
-<path style="fill:#D0D0D0;fill-opacity:0.75;" d="M5.789,2C3.699,2.003,1.998,3.606,1.998,5.526v1.947
-	C1.998,9.401,3.699,11,5.789,11H32V1.998L5.789,2L5.789,2z"/>
-<path style="fill:#00FFFF;" d="M5.789,9.499c-1.25,0-2.291-0.941-2.291-2.022V5.522c0-1.08,1.041-2.021,2.291-2.021H32V2H5.789
-	C3.699,2.004,1.998,3.606,1.998,5.526v1.95c0,1.927,1.701,3.525,3.791,3.525H32V9.499H5.789z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_graf_nslider_pressed_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_graf_nslider_pressed_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="32px" height="13px" viewBox="0 0 32 13" style="enable-background:new 0 0 32 13;" xml:space="preserve">
-<path d="M26.208,12.998c3.194,0,5.792-2.477,5.792-5.525V5.521C32,2.478,29.404,0,26.208,0H0v13h26.208V12.998z"/>
-<path style="fill:#D0D0D0;fill-opacity:0.75;" d="M26.208,10.998C28.3,10.998,30,9.4,30,7.472V5.521
-	c0-1.924-1.734-3.523-3.792-3.523H0v9H26.208L26.208,10.998z"/>
-<path style="fill:#00FFFF;" d="M26.208,3.498c1.25,0,2.292,0.943,2.292,2.025v1.949c0,1.084-1.042,2.025-2.292,2.025H0v1.5h26.208
-	c2.092,0,3.792-1.6,3.792-3.525V5.519c0-1.922-1.7-3.523-3.792-3.523H0v1.501H26.208L26.208,3.498z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_graf_nslider_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_graf_nslider_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="32px" height="13px" viewBox="0 0 32 13" style="enable-background:new 0 0 32 13;" xml:space="preserve">
-<path d="M26.208,12.998c3.194,0,5.792-2.477,5.792-5.525V5.521C32,2.478,29.404,0,26.208,0H0v13h26.208V12.998z"/>
-<path style="fill:#D0D0D0;fill-opacity:0.75;" d="M26.208,10.998C28.3,10.998,30,9.4,30,7.472V5.521
-	c0-1.924-1.734-3.523-3.792-3.523H0v9H26.208L26.208,10.998z"/>
-<path style="fill:#FFFFFF;" d="M26.208,3.498c1.25,0,2.292,0.943,2.292,2.025v1.949c0,1.084-1.042,2.025-2.292,2.025H0v1.5h26.208
-	c2.092,0,3.792-1.6,3.792-3.525V5.519c0-1.922-1.7-3.523-3.792-3.523H0v1.501H26.208L26.208,3.498z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_graf_nslider_tick_major.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_graf_nslider_tick_major.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="6px" height="8px" viewBox="0 0 6 8" style="enable-background:new 0 0 6 8;" xml:space="preserve">
-<polygon style="fill:#FFFFFF;" points="0,8 0,5.999 0,2 0,0 2.001,0 3.999,0 6,0 6,2 6,5.999 6,8 3.999,8 2.001,8 "/>
-<rect x="2.001" y="2" width="1.999" height="3.999"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_graf_nslider_tick_minor.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_graf_nslider_tick_minor.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="6px" height="6px" viewBox="0 0 6 6" style="enable-background:new 0 0 6 6;" xml:space="preserve">
-<polygon style="fill:#FFFFFF;" points="0,6 0,0 6,0 6,6 "/>
-<rect x="2.001" y="2.001" width="1.999" height="2"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_graf_nslider_vertical_b.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_graf_nslider_vertical_b.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="13px" height="32px" viewBox="0 0 13 32" style="enable-background:new 0 0 13 32;" xml:space="preserve">
-<path style="fill:#FFFFFF;" d="M0,26.208C0,29.4,2.477,32,5.524,32h1.955C10.523,32,13,29.4,13,26.208V0H0V26.208L0,26.208z"/>
-<path style="fill:#FFFFFF;fill-opacity:0.7;" d="M2,26.206c0,2.095,1.598,3.793,3.523,3.793h1.954c1.922,0,3.522-1.733,3.522-3.793
-	V0h-9L2,26.206L2,26.206z"/>
-<path d="M9.499,26.206c0,1.25-0.94,2.293-2.022,2.293H5.524c-1.083,0-2.024-1.043-2.024-2.293V0H2v26.208
-	C2,28.303,3.598,30,5.523,30h1.954c1.922,0,3.522-1.697,3.522-3.793V0h-1.5V26.206z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_graf_nslider_vertical_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_graf_nslider_vertical_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="13px" height="32px" viewBox="0 0 13 32" style="enable-background:new 0 0 13 32;" xml:space="preserve">
-<rect style="fill:#FFFFFF;" width="13" height="32"/>
-<rect x="2" style="fill:#FFFFFF;fill-opacity:0.7;" width="9" height="32"/>
-<polygon points="3.5,0 3.5,0 2,0 2,0 2,31.999 3.5,31.999 "/>
-<polygon points="10.999,0 9.499,0 9.499,0 9.499,31.999 10.999,31.999 "/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_graf_nslider_vertical_marker.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_graf_nslider_vertical_marker.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="32px" height="18px" viewBox="0 0 32 18" style="enable-background:new 0 0 32 18;" xml:space="preserve">
-<path d="M26.02,0H5.978C2.683,0,0,2.532,0,5.646v6.711C0,15.465,2.683,18,5.978,18H26.02c3.294,0,5.98-2.532,5.98-5.646V5.646
-	C31.999,2.532,29.313,0,26.02,0z M26.989,12.351c0,0.303-0.414,0.646-0.974,0.646H5.977c-0.558,0-0.973-0.336-0.973-0.641V5.646
-	c0-0.304,0.415-0.644,0.973-0.644h20.041c0.559,0,0.973,0.34,0.973,0.644L26.989,12.351L26.989,12.351z"/>
-<path style="fill:#FFFFFF;fill-opacity:0.96;" d="M26.018,2.002H5.978c-2.192,0-3.976,1.635-3.976,3.645v6.71
-	c0,2.01,1.784,3.642,3.976,3.642h20.04c2.189,0,3.978-1.634,3.978-3.646V5.646C29.994,3.637,28.209,2.002,26.018,2.002z
-	 M28.492,12.351c0,1.188-1.11,2.146-2.477,2.146H5.977c-1.365,0-2.474-0.959-2.474-2.141V5.646c0-1.184,1.108-2.145,2.474-2.145
-	h20.041c1.362,0,2.476,0.961,2.476,2.145L28.492,12.351L28.492,12.351z"/>
-<path style="fill:#DEDEDE;fill-opacity:0.6;" d="M26.018,14.496H5.977c-1.365,0-2.474-0.959-2.474-2.14V5.646
-	c0-1.184,1.108-2.145,2.474-2.145h20.041c1.362,0,2.476,0.961,2.476,2.145v6.705C28.492,13.537,27.382,14.496,26.018,14.496
-	L26.018,14.496z"/>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="-431.2861" y1="-2188.6387" x2="-431.2861" y2="-2180.644" gradientTransform="matrix(1 0 0 -1 447.2832 -2175.6426)">
-	<stop  offset="0" style="stop-color:#F5F5F5"/>
-	<stop  offset="0.4484" style="stop-color:#FAFAFA"/>
-	<stop  offset="1" style="stop-color:#FFFFFF"/>
-</linearGradient>
-<path style="fill:url(#SVGID_1_);fill-opacity:0.4;" d="M26.018,12.996H5.977c-0.558,0-0.973-0.336-0.973-0.64V5.646
-	c0-0.304,0.415-0.644,0.973-0.644h20.041c0.559,0,0.973,0.34,0.973,0.644v6.707C26.989,12.653,26.575,12.996,26.018,12.996
-	L26.018,12.996z"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="-431.2861" y1="-2191.0698" x2="-431.2861" y2="-2180.9685" gradientTransform="matrix(1 0 0 -1 447.2832 -2175.6426)">
-	<stop  offset="0" style="stop-color:#EBEBEB"/>
-	<stop  offset="0.0225" style="stop-color:#EBEBEB"/>
-	<stop  offset="0.1164" style="stop-color:#EEEEEE"/>
-	<stop  offset="0.264" style="stop-color:#F3F3F3"/>
-	<stop  offset="0.5021" style="stop-color:#FAFAFA"/>
-	<stop  offset="0.7247" style="stop-color:#FFFFFF"/>
-	<stop  offset="1" style="stop-color:#FFFFFF"/>
-</linearGradient>
-<path style="fill:url(#SVGID_2_);fill-opacity:0.4;" d="M26.018,5.001H5.977c-0.558,0-0.973,0.34-0.973,0.644V9H26.99V5.645
-	C26.989,5.341,26.575,5.001,26.018,5.001z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_graf_nslider_vertical_marker_selected.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_graf_nslider_vertical_marker_selected.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +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" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g>
-<g>
-<g>
-<g>
-<path d="M26.025,0H6C2.708,0,0.027,2.532,0.027,5.645v6.714C0.027,15.467,2.708,18,6,18h20.025C29.316,18,32,15.467,32,12.355      v-6.71C32,2.532,29.316,0,26.025,0z M26.995,12.354c0,0.303-0.415,0.645-0.972,0.645H5.999c-0.557,0-0.972-0.336-0.972-0.639      V5.645c0-0.304,0.415-0.644,0.972-0.644h20.024c0.557,0,0.972,0.34,0.972,0.644V12.354z"/>
-</g>
-<path d="M26.023,2.001H6c-2.191,0-3.973,1.635-3.973,3.645v6.713     c0,2.008,1.781,3.64,3.973,3.64h20.023c2.188,0,3.974-1.632,3.974-3.644V5.646C29.997,3.636,28.213,2.001,26.023,2.001z      M28.496,12.354c0,1.185-1.107,2.145-2.473,2.145H5.999c-1.364,0-2.472-0.96-2.472-2.139V5.646c0-1.184,1.107-2.145,2.472-2.145     h20.024c1.363,0,2.473,0.961,2.473,2.145V12.354z" fill="#E6E6E6" fill-opacity="0.96" stroke-opacity="0.96"/>
-</g>
-<linearGradient gradientTransform="matrix(1 0 0 -1 0.1377 15.834)" gradientUnits="userSpaceOnUse" id="XMLID_4_" x1="15.874" x2="15.874" y1="12.333" y2="1.3364">
-<stop offset="0" style="stop-color:#8C8C8C"/>
-<stop offset="0.0165" style="stop-color:#8C8C8C"/>
-<stop offset="1" style="stop-color:#303A42"/>
-</linearGradient>
-<path d="M26.023,14.498H5.999c-1.364,0-2.472-0.96-2.472-2.139    V5.646c0-1.184,1.107-2.145,2.472-2.145h20.024c1.363,0,2.473,0.961,2.473,2.145v6.708C28.496,13.538,27.389,14.498,26.023,14.498    L26.023,14.498z" fill="url(#XMLID_4_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 0.1377 15.834)" gradientUnits="userSpaceOnUse" id="XMLID_5_" x1="15.8735" x2="15.8735" y1="10.333" y2="3.333">
-<stop offset="0" style="stop-color:#868787"/>
-<stop offset="0.0165" style="stop-color:#868787"/>
-<stop offset="1" style="stop-color:#104466"/>
-</linearGradient>
-<path d="M26.023,12.998H5.999c-0.557,0-0.972-0.336-0.972-0.639    V5.645c0-0.304,0.415-0.644,0.972-0.644h20.024c0.557,0,0.972,0.34,0.972,0.644v6.708C26.995,12.656,26.58,12.998,26.023,12.998    L26.023,12.998z" fill="url(#XMLID_5_)" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 0.1377 15.834)" gradientUnits="userSpaceOnUse" id="XMLID_6_" x1="15.873" x2="15.873" y1="7.334" y2="10.3344">
-<stop offset="0" style="stop-color:#ACB4A7"/>
-<stop offset="0.0225" style="stop-color:#ACB4A7"/>
-<stop offset="0.1164" style="stop-color:#B4C0B7"/>
-<stop offset="0.264" style="stop-color:#C6D8D8"/>
-<stop offset="0.5021" style="stop-color:#E6EEEE"/>
-<stop offset="0.7247" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#FFFFFF"/>
-</linearGradient>
-<path d="M26.023,5.001H5.999c-0.557,0-0.972,0.34-0.972,0.644V9    h21.968V5.645C26.995,5.341,26.58,5.001,26.023,5.001z" fill="url(#XMLID_6_)" fill-opacity="0.2" stroke-opacity="0.2"/>
-</g>
-</g>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_graf_nslider_vertical_pressed_b.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_graf_nslider_vertical_pressed_b.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="13px" height="32px" viewBox="0 0 13 32" style="enable-background:new 0 0 13 32;" xml:space="preserve">
-<path style="fill:#00FFFF;" d="M0,26.208C0,29.4,2.477,32,5.524,32h1.955C10.523,32,13,29.4,13,26.208V0H0V26.208L0,26.208z"/>
-<path style="fill:#00FFFF;fill-opacity:0.7;" d="M2,26.206c0,2.095,1.598,3.793,3.523,3.793h1.954c1.922,0,3.522-1.733,3.522-3.793
-	V0h-9L2,26.206L2,26.206z"/>
-<path d="M9.499,26.206c0,1.25-0.94,2.293-2.022,2.293H5.524c-1.083,0-2.024-1.043-2.024-2.293V0H2v26.208
-	C2,28.303,3.598,30,5.523,30h1.954c1.922,0,3.522-1.697,3.522-3.793V0h-1.5V26.206z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_graf_nslider_vertical_pressed_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_graf_nslider_vertical_pressed_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="13px" height="32px" viewBox="0 0 13 32" style="enable-background:new 0 0 13 32;" xml:space="preserve">
-<rect style="fill:#00FFFF;" width="13" height="32"/>
-<rect x="2" style="fill:#00FFFF;fill-opacity:0.7;" width="9" height="32"/>
-<polygon points="3.5,0 3.5,0 2,0 2,0 2,31.999 3.5,31.999 "/>
-<polygon points="10.999,0 9.499,0 9.499,0 9.499,31.999 10.999,31.999 "/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_graf_nslider_vertical_pressed_t.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_graf_nslider_vertical_pressed_t.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="13px" height="32px" viewBox="0 0 13 32" style="enable-background:new 0 0 13 32;" xml:space="preserve">
-<path style="fill:#00FFFF;" d="M0,5.791V32h13V5.787C12.993,2.597,10.518,0,7.473,0H5.525C2.477,0,0,2.597,0,5.791z"/>
-<path style="fill:#00FFFF;fill-opacity:0.7;" d="M10.999,5.789c-0.004-2.09-1.604-3.791-3.526-3.791H5.524
-	c-1.926,0-3.523,1.701-3.523,3.791V32H11L10.999,5.789L10.999,5.789z"/>
-<path d="M3.5,5.789c0-1.25,0.941-2.291,2.023-2.291h1.954c1.08,0,2.021,1.041,2.021,2.291V32h1.5V5.789
-	c-0.004-2.09-1.604-3.791-3.523-3.791H5.524c-1.926,0-3.523,1.701-3.523,3.791V32H3.5V5.789z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_graf_nslider_vertical_t.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_graf_nslider_vertical_t.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="13px" height="32px" viewBox="0 0 13 32" style="enable-background:new 0 0 13 32;" xml:space="preserve">
-<path style="fill:#FFFFFF;" d="M0,5.791V32h13V5.787C12.993,2.597,10.518,0,7.473,0H5.525C2.477,0,0,2.597,0,5.791z"/>
-<path style="fill:#FFFFFF;fill-opacity:0.7;" d="M10.999,5.789c-0.004-2.09-1.604-3.791-3.526-3.791H5.524
-	c-1.926,0-3.523,1.701-3.523,3.791V32H11L10.999,5.789L10.999,5.789z"/>
-<path d="M3.5,5.789c0-1.25,0.941-2.291,2.023-2.291h1.954c1.08,0,2.021,1.041,2.021,2.291V32h1.5V5.789
-	c-0.004-2.09-1.604-3.791-3.523-3.791H5.524c-1.926,0-3.523,1.701-3.523,3.791V32H3.5V5.789z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_graf_nslider_vertical_tick_major.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_graf_nslider_vertical_tick_major.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="8px" height="6px" viewBox="0 0 8 6" style="enable-background:new 0 0 8 6;" xml:space="preserve">
-<polygon style="fill:#FFFFFF;" points="8,6 0,6 0,0 8,0 "/>
-<rect x="2" y="2" width="4" height="2"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_graf_nslider_vertical_tick_minor.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_graf_nslider_vertical_tick_minor.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="6px" height="6px" viewBox="0 0 6 6" style="enable-background:new 0 0 6 6;" xml:space="preserve">
-<polygon style="fill:#FFFFFF;" points="6,6 0,6 0,0 6,0.001 "/>
-<rect x="2" y="2" width="2" height="2"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_indi_input_arrow_down.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_indi_input_arrow_down.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="24" height="24" viewBox="0 0 24 24">
-<rect fill="none" height="24" width="24"/>
-<polygon points="22,6.898 12,17.102 2,6.898 "/>
-</svg>
\ No newline at end of file
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_indi_input_arrow_up.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_indi_input_arrow_up.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="24" height="24" viewBox="0 0 24 24">
-<rect fill="none" height="24" width="24"/>
-<polygon points="2,17.102 12,6.898 22,17.102 "/>
-</svg>
\ No newline at end of file
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_indi_input_list_collapse.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_indi_input_list_collapse.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="62" height="62" viewBox="0 0 62 62">
-<rect fill="none" height="62" width="62"/>
-<polygon fill="#496DA2" points="47.151,18.142 43.859,14.85 31,27.709 18.141,14.85 14.849,18.142 27.708,31 14.85,43.858 18.142,47.15 31,34.293 43.858,47.15 47.15,43.858 34.292,31 "/>
-</svg>
\ No newline at end of file
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_indi_input_list_expand.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_indi_input_list_expand.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="62" height="62" viewBox="0 0 62 62">
-<rect fill="none" height="62" width="62"/>
-<polygon fill="#496DA2" points="30.566,38.335 17.867,23.664 44.133,23.664 "/>
-</svg>
\ No newline at end of file
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_indi_nslider_level_decrease.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_indi_nslider_level_decrease.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +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" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<polygon points="33.999,26 10,26 10,17.998 33.999,17.998 "/>
-<rect fill="#FFFFFF" height="4" width="20" x="12" y="20"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_indi_nslider_level_decrease_pressed.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_indi_nslider_level_decrease_pressed.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +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" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<polygon points="33.999,26 10,26 10,17.998 33.999,17.998 "/>
-<rect fill="#000000" height="4" width="20" x="12" y="20"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_indi_nslider_level_increase.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_indi_nslider_level_increase.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +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" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<polygon points="26.001,33.999 18,33.999 18,26.001 10,26.001 10,18 18,18 18,9.999 26.001,9.999 26.001,18 33.999,18   33.999,26.001 26.001,26.001 "/>
-<polygon fill="#FFFFFF" points="31.999,20 23.999,20 23.999,12 20,12 20,20 12,20 12,23.999 20,23.999 20,31.999 23.999,31.999   23.999,23.999 31.999,23.999 "/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_indi_nslider_level_increase_pressed.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_indi_nslider_level_increase_pressed.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +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" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<polygon points="26.001,33.999 18,33.999 18,26.001 10,26.001 10,18 18,18 18,9.999 26.001,9.999 26.001,18 33.999,18   33.999,26.001 26.001,26.001 "/>
-<polygon fill="#000000" points="31.999,20 23.999,20 23.999,12 20,12 20,20 12,20 12,23.999 20,23.999 20,31.999 23.999,31.999   23.999,23.999 31.999,23.999 "/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_indi_nslider_muted.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_indi_nslider_muted.svg	Mon Apr 19 14:02:13 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" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<path d="M25.824,21.015V8.411h-9.979l-1.025,1.6L8.354,3.545L3.651,8.242l6.797,6.795H4.931v15.818h6.671l4.24,6.625h9.982v-7.067  l7.902,7.905l4.697-4.703L25.824,21.015z M19.179,30.336L15.26,24.21h-3.682v-2.524h3.682l0.715-1.121l3.204,3.203V30.336z"/>
-<rect fill="#FFFFFF" height="2.648" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 21.1169 50.6082)" width="38.533" x="1.773" y="19.607"/>
-<polygon fill="#FFFFFF" points="21.179,32.835 18.403,32.835 14.166,26.209 9.578,26.209 9.578,19.685 14.166,19.685 14.463,19.219   12.279,17.037 6.931,17.037 6.931,28.855 12.695,28.855 16.937,35.48 23.824,35.48 23.824,28.579 21.179,25.936 "/>
-<polygon fill="#FFFFFF" points="18.403,13.06 21.179,13.06 21.179,16.202 23.824,18.847 23.824,10.412 16.937,10.412 16.332,11.355   18.259,13.284 "/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_indi_nslider_unmuted.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_indi_nslider_unmuted.svg	Mon Apr 19 14:02:13 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" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<path d="M34.951,38.12l-5.054-4.302l1.282-1.521c0.877-1.04,8.324-10.39,0.111-18.605l-1.414-1.413l4.697-4.701l1.413,1.415  c12.695,12.699,0.386,27.46,0.259,27.606L34.951,38.12L34.951,38.12z"/>
-<path d="M30.761,14.545l-1.414-1.412l-3.521,3.521V8.411h-9.981l-4.24,6.624H4.93v15.82h6.674l4.24,6.625h9.981v-8.201l3.855,3.287  l1.298-1.521C33.574,28.005,36.864,20.643,30.761,14.545z M19.18,30.335l-3.921-6.128h-3.682v-2.522h3.682l3.921-6.128V30.335z   M25.918,26.742l-0.094,0.109v-7.844l0.237,0.236C29.324,22.505,26.277,26.318,25.918,26.742z"/>
-<path d="M27.476,17.83c4.622,4.622,0.158,9.979-0.031,10.203l2.014,1.714c2.181-2.554,4.957-8.725-0.11-13.788  L27.476,17.83z" fill="#FFFFFF"/>
-<path d="M34.576,10.406l-1.873,1.871c9.664,9.663,0.404,20.838,0.006,21.309l2.017,1.717  C34.838,35.17,45.974,21.811,34.576,10.406z" fill="#FFFFFF"/>
-<path d="M16.937,10.411l-4.242,6.625H6.931v11.819h5.764l4.242,6.625h6.887V10.411H16.937z M21.179,32.834h-2.776  l-4.237-6.626H9.578v-6.524h4.588l4.237-6.625h2.776V32.834z" fill="#FFFFFF"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_indi_nslider_zoom_in.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_indi_nslider_zoom_in.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +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" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<path d="M24.999,3C16.177,3,9.002,10.18,9.002,19.001c0,2.654,0.658,5.153,1.807,7.359l-8.637,8.64l6.83,6.83l8.637-8.64  c2.205,1.149,4.705,1.81,7.36,1.81c8.82,0,16-7.177,16-15.999C40.999,10.18,33.82,3,24.999,3z M34.159,15.001h-5.16V9.84  C31.3,10.849,33.152,12.698,34.159,15.001z M15.841,22.999H21v5.16C18.699,27.15,16.85,25.301,15.841,22.999z M21,9.84v5.161h-5.16  C16.85,12.699,18.699,10.849,21,9.84z M28.999,28.16v-5.16h5.16C33.15,25.301,31.3,27.15,28.999,28.16z"/>
-<path d="M24.999,5c-7.72,0-14,6.28-14,14c0,2.839,0.854,5.479,2.312,7.688L5,34.999l4,4l8.312-8.313  c2.209,1.459,4.85,2.313,7.688,2.313c7.722,0,14-6.278,14-14C38.999,11.28,32.72,5,24.999,5z M24.999,30.999  c-6.617,0-12-5.383-12-12c0-6.616,5.383-12,12-12c6.617,0,12,5.384,12,12C36.999,25.617,31.616,30.999,24.999,30.999z" fill="#FFFFFF"/>
-<polygon fill="#FFFFFF" points="32.999,17 26.999,17 26.999,11 22.999,11 22.999,17 17,17 17,21 22.999,21 22.999,26.999   26.999,26.999 26.999,21 32.999,21 "/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_indi_nslider_zoom_in_pressed.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_indi_nslider_zoom_in_pressed.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +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" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<path d="M24.999,3C16.177,3,9.002,10.18,9.002,19.001c0,2.654,0.658,5.153,1.807,7.359l-8.637,8.64l6.83,6.83l8.637-8.64  c2.205,1.149,4.705,1.81,7.36,1.81c8.82,0,16-7.177,16-15.999C40.999,10.18,33.82,3,24.999,3z M34.159,15.001h-5.16V9.84  C31.3,10.849,33.152,12.698,34.159,15.001z M15.841,22.999H21v5.16C18.699,27.15,16.85,25.301,15.841,22.999z M21,9.84v5.161h-5.16  C16.85,12.699,18.699,10.849,21,9.84z M28.999,28.16v-5.16h5.16C33.15,25.301,31.3,27.15,28.999,28.16z"/>
-<path d="M24.999,5c-7.72,0-14,6.28-14,14c0,2.839,0.854,5.479,2.312,7.688L5,34.999l4,4l8.312-8.313  c2.209,1.459,4.85,2.313,7.688,2.313c7.722,0,14-6.278,14-14C38.999,11.28,32.72,5,24.999,5z M24.999,30.999  c-6.617,0-12-5.383-12-12c0-6.616,5.383-12,12-12c6.617,0,12,5.384,12,12C36.999,25.617,31.616,30.999,24.999,30.999z" fill="#FFFFFF"/>
-<polygon fill="#000000" points="32.999,17 26.999,17 26.999,11 22.999,11 22.999,17 17,17 17,21 22.999,21 22.999,26.999   26.999,26.999 26.999,21 32.999,21 "/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_indi_nslider_zoom_out.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_indi_nslider_zoom_out.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +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" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<path d="M24.998,3C16.177,3,9.002,10.18,9.002,19c0,2.654,0.658,5.153,1.808,7.36l-8.638,8.638l6.83,6.83l8.636-8.64  c2.206,1.148,4.706,1.81,7.36,1.81C33.82,34.998,41,27.821,41,19C41,10.18,33.82,3,24.998,3z M24.998,8.998  c4.094,0,7.614,2.473,9.162,6.002h-18.32C17.388,11.471,20.908,8.998,24.998,8.998z M24.998,29c-4.09,0-7.611-2.476-9.159-6.002  H34.16C32.613,26.524,29.092,29,24.998,29z"/>
-<rect fill="#FFFFFF" height="4" width="16" x="17" y="17"/>
-<path d="M25,5c-7.722,0-14,6.279-14,14c0,2.839,0.854,5.479,2.312,7.688L5,35l4,4l8.312-8.313  C19.521,32.145,22.16,33,25,33c7.721,0,14-6.278,14-14C39,11.279,32.721,5,25,5z M25,31c-6.618,0-12-5.386-12-12  c0-6.617,5.383-12,12-12c6.615,0,12,5.383,12,12C37,25.614,31.616,31,25,31z" fill="#FFFFFF"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_indi_nslider_zoom_out_pressed.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_indi_nslider_zoom_out_pressed.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +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" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<path d="M24.998,3C16.177,3,9.002,10.18,9.002,19c0,2.654,0.658,5.153,1.808,7.36l-8.638,8.638l6.83,6.83l8.636-8.64  c2.206,1.148,4.706,1.81,7.36,1.81C33.82,34.998,41,27.821,41,19C41,10.18,33.82,3,24.998,3z M24.998,8.998  c4.094,0,7.614,2.473,9.162,6.002h-18.32C17.388,11.471,20.908,8.998,24.998,8.998z M24.998,29c-4.09,0-7.611-2.476-9.159-6.002  H34.16C32.613,26.524,29.092,29,24.998,29z"/>
-<rect fill="#000000" height="4" width="16" x="17" y="17"/>
-<path d="M25,5c-7.722,0-14,6.279-14,14c0,2.839,0.854,5.479,2.312,7.688L5,35l4,4l8.312-8.313  C19.521,32.145,22.16,33,25,33c7.721,0,14-6.278,14-14C39,11.279,32.721,5,25,5z M25,31c-6.618,0-12-5.386-12-12  c0-6.617,5.383-12,12-12c6.615,0,12,5.383,12,12C37,25.614,31.616,31,25,31z" fill="#FFFFFF"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_menu_note.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_menu_note.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,88 +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 width="100%" height="100%" viewBox="0 0 88 88">
-<linearGradient id="_20" gradientUnits="userSpaceOnUse" x1="46.99" y1="48.62" x2="57.59" y2="67.17">
-<stop stop-color="#A2C2DD" offset="0.1"/>
-<stop stop-color="#6C83BB" offset="0.71"/>
-<stop stop-color="#003D6D" offset="0.99"/>
-</linearGradient>
-<path fill="url(#_20)" d="M37.755,14.563c-0.625-0.15-3.215-0.771-3.215-0.771l-6.344,9.318 C14.325,41.71,3.561,47.928,2.801,48.401l6.468,2.128l-1.694,2.4l1.111,3.48l41.153,18.198l14.238-26.409l16.804-2.157l2.899-4.356 l-1.079-7.683l-3.737-4.507l-5.312,0.944l0.463-0.857l0.251-6.262c0,0-4.423-1.069-4.374-1.063 c-0.755-3.548-4.226-3.896-6.26-1.475c-0.013-0.005-2.825-0.708-2.818-0.712c-0.742-3.492-4.2-3.939-6.269-1.469 c-0.004-0.012-2.582-0.668-2.595-0.661c-0.749-3.501-4.18-3.806-6.163-1.437c-0.027,0.008-2.09-0.508-2.088-0.523 C43.063,12.593,39.706,12.258,37.755,14.563z"/>
-<polygon fill="#FFFFFF" points="35.11,15.12 8.336,53.049 48.798,69.047 72.646,28.459 73.573,25.04 "/>
-<linearGradient id="_21" gradientUnits="userSpaceOnUse" x1="30.63" y1="59.56" x2="27.89" y2="65.83">
-<stop stop-color="#FFFFFF" offset="0"/>
-<stop stop-color="#496DA2" offset="0.71"/>
-<stop stop-color="#235487" offset="0.99"/>
-</linearGradient>
-<polygon fill="url(#_21)" points="8.45,52.959 48.528,68.704 49.52,73.706 9.246,55.897 "/>
-<linearGradient id="_22" gradientUnits="userSpaceOnUse" x1="56.86" y1="45.11" x2="69.16" y2="54.68">
-<stop stop-color="#DEE9F3" offset="0"/>
-<stop stop-color="#235487" offset="1"/>
-</linearGradient>
-<polygon fill="url(#_22)" points="48.528,68.704 73.633,23.86 73.411,29.393 49.52,73.706 "/>
-<linearGradient id="_23" gradientUnits="userSpaceOnUse" x1="4.44" y1="38.62" x2="45.79" y2="38.62">
-<stop stop-color="#CADCEC" offset="0"/>
-<stop stop-color="#87A8CB" offset="1"/>
-</linearGradient>
-<path fill="url(#_23)" d="M34.894,14.715C18.737,39.471,4.443,48.209,4.443,48.209 c7.75,2.391,41.35,14.314,41.35,14.314L34.894,14.715z"/>
-<linearGradient id="_24" gradientUnits="userSpaceOnUse" x1="15.64" y1="58.6" x2="44.93" y2="34.82">
-<stop stop-color="#FFFFFF" offset="0.15"/>
-<stop stop-color="#A2C2DD" offset="1"/>
-</linearGradient>
-<path fill="url(#_24)" d="M10.557,50.247c11.41,4.494,35.236,12.277,35.236,12.277 c15.358-11.682,27.74-38.658,27.74-38.658l-38.697-9.279L10.557,50.247z"/>
-<linearGradient id="_25" gradientUnits="userSpaceOnUse" x1="68.03" y1="52.73" x2="41.63" y2="18.62">
-<stop stop-color="#FFFFFF" offset="0"/>
-<stop stop-color="#496DA2" offset="0.71"/>
-<stop stop-color="#235487" offset="0.99"/>
-</linearGradient>
-<polygon fill="url(#_25)" points="33.619,23.77 33.263,24.6 64.586,33.327 64.445,31.303 "/>
-<polygon fill="url(#_25)" points="30.349,28.944 29.959,29.764 60.965,39.577 60.895,37.549 "/>
-<polygon fill="url(#_25)" points="26.981,34.229 26.567,35.036 57.195,45.958 57.195,43.926 "/>
-<polyline fill="url(#_25)" points="37.03,44.815 23.809,40.569 23.396,41.375 34.393,45.297 37.03,44.815 "/>
-<path fill="#3F5AA6" d="M37.265,17.37c-1.227,0.744-1.05,2.494,0.11,3.184c1.821,1.088,4.019-0.83,2.968-2.572 c0.449-1.01,1.511-1.695,1.794-1.643l1.055,0.223C42.339,13.018,37.265,17.37,37.265,17.37z"/>
-<linearGradient id="_29" gradientUnits="userSpaceOnUse" x1="39.83" y1="18.64" x2="40.83" y2="14.3">
-<stop stop-color="#87A8CB" offset="0"/>
-<stop stop-color="#CADCEC" offset="0.5"/>
-<stop stop-color="#87A8CB" offset="1"/>
-</linearGradient>
-<path fill="url(#_29)" d="M38.914,19.569c-0.589,0.107-1.317-0.102-1.613-0.867c-0.736-5.027,5.301-6.996,5.913-2.141 C42.121,14.176,39.059,15.401,38.914,19.569z"/>
-<path fill="#3F5AA6" d="M45.395,19.34c-1.25,0.758-1.071,2.543,0.112,3.248c1.859,1.107,4.099-0.848,3.027-2.625 c0.458-1.031,1.542-1.729,1.83-1.676l1.076,0.227C50.57,14.901,45.395,19.34,45.395,19.34z"/>
-<path fill="url(#_29)" d="M47.076,21.584c-0.601,0.107-1.342-0.105-1.645-0.887c-0.75-5.129,5.407-7.137,6.031-2.184 C50.348,16.081,47.225,17.331,47.076,21.584z"/>
-<path fill="#3F5AA6" d="M54.135,21.483c-1.274,0.775-1.092,2.594,0.114,3.314c1.897,1.129,4.181-0.863,3.088-2.678 c0.468-1.051,1.574-1.762,1.867-1.709l1.099,0.232C59.414,16.956,54.135,21.483,54.135,21.483z"/>
-<path fill="url(#_29)" d="M55.85,23.772c-0.611,0.111-1.367-0.107-1.676-0.902c-0.767-5.232,5.515-7.281,6.151-2.227 C59.188,18.161,56.002,19.436,55.85,23.772z"/>
-<path fill="#3F5AA6" d="M63.214,23.67c-1.275,0.775-1.093,2.596,0.114,3.314c1.897,1.131,4.181-0.863,3.088-2.678 c0.467-1.051,1.573-1.762,1.867-1.709l1.098,0.23C68.493,19.143,63.214,23.67,63.214,23.67z"/>
-<path fill="url(#_29)" d="M64.929,25.959c-0.612,0.111-1.368-0.105-1.677-0.902c-0.766-5.23,5.515-7.279,6.151-2.229 C68.267,20.348,65.081,21.624,64.929,25.959z"/>
-<linearGradient id="_33" gradientUnits="userSpaceOnUse" x1="39.98" y1="48.02" x2="38.35" y2="40.21">
-<stop stop-color="#81C7C8" offset="0"/>
-<stop stop-color="#BFDAE1" offset="0.01"/>
-<stop stop-color="#FFFFFF" offset="1"/>
-</linearGradient>
-<polygon fill="url(#_33)" points="44.766,36.286 32.146,45.174 47.337,49.641 "/>
-<linearGradient id="_34" gradientUnits="userSpaceOnUse" x1="76.2" y1="30.96" x2="76.09" y2="43.23">
-<stop stop-color="#D6E6EC" offset="0"/>
-<stop stop-color="#298595" offset="1"/>
-</linearGradient>
-<polygon fill="url(#_34)" points="78.675,30.256 82.024,34.297 83.039,41.52 80.464,45.389 69.202,39.09 "/>
-<linearGradient id="_35" gradientUnits="userSpaceOnUse" x1="32.44" y1="33.5" x2="65.81" y2="41.63">
-<stop stop-color="#D6E6EC" offset="0"/>
-<stop stop-color="#298595" offset="1"/>
-</linearGradient>
-<polygon fill="url(#_35)" points="76.59,34.737 77.632,41.426 45.104,46.104 44.105,39.893 "/>
-<linearGradient id="_36" gradientUnits="userSpaceOnUse" x1="30.73" y1="46.42" x2="88.73" y2="44.8">
-<stop stop-color="#E6EEF4" offset="0"/>
-<stop stop-color="#2F8E9A" offset="0.44"/>
-<stop stop-color="#003D6D" offset="0.94"/>
-</linearGradient>
-<polygon fill="url(#_36)" points="77.632,41.426 80.464,45.389 47.337,49.641 45.104,46.104 "/>
-<linearGradient id="_37" gradientUnits="userSpaceOnUse" x1="45.63" y1="37.46" x2="101.75" y2="28.96">
-<stop stop-color="#D6E6EC" offset="0"/>
-<stop stop-color="#298595" offset="1"/>
-</linearGradient>
-<polygon fill="url(#_37)" points="76.59,34.737 78.675,30.256 44.766,36.286 44.105,39.893 "/>
-<linearGradient id="_38" gradientUnits="userSpaceOnUse" x1="35.44" y1="45.89" x2="34.76" y2="40.93">
-<stop stop-color="#235487" offset="0"/>
-<stop stop-color="#496DA2" offset="0.5"/>
-<stop stop-color="#235487" offset="1"/>
-</linearGradient>
-<path fill="url(#_38)" d="M38.261,40.885l-6.462,4.201l7.347,2.1C38.319,46.098,37.854,42.79,38.261,40.885z"/>
-<rect fill="none" height="88" width="88"/>
-</svg>
\ No newline at end of file
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_menu_phob.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_menu_phob.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +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 width="100%" height="100%" viewBox="0 0 88 88">
-<linearGradient id="_11" gradientUnits="userSpaceOnUse" x1="50.39" y1="48.74" x2="61.61" y2="68.36">
-<stop stop-color="#A2C2DD" offset="0.1"/>
-<stop stop-color="#6C83BB" offset="0.71"/>
-<stop stop-color="#003D6D" offset="0.99"/>
-</linearGradient>
-<path fill="url(#_11)" d="M34.199,14.979c-3.443-0.718-6.798,2.583-5.091,6.385c-0.004-0.009-1.399,1.762-1.418,1.779 c-3.373-0.733-7.108,2.492-5.245,6.582c-0.008,0.025-1.403,1.734-1.395,1.749c-3.365-0.708-7.271,2.495-5.37,6.733 c-0.014,0.002-1.659,2.064-1.648,2.07c-3.763-0.801-7.449,2.782-5.563,6.977c-1.225,1.537-2.691,3.377-2.691,3.377l1.865,6.74 l43.636,20.074l26.594-46.56l-0.124-6.614c0,0-2.915-0.781-4.031-1.079c0.786-1.216,5.179-8.005,5.179-8.005 C67.252,16.083,56.627,16,37.846,13.091L36.1,12.596C36.1,12.596,34.188,14.979,34.199,14.979z"/>
-<polygon fill="#FFFFFF" points="36.469,14.039 77.113,24.766 50.307,69.046 7.529,51.712 "/>
-<linearGradient id="_12" gradientUnits="userSpaceOnUse" x1="59.46" y1="47.07" x2="71.46" y2="56.4">
-<stop stop-color="#DEE9F3" offset="0"/>
-<stop stop-color="#235487" offset="1"/>
-</linearGradient>
-<polygon fill="url(#_12)" points="77.11,24.68 50.307,68.525 51.012,76.609 77.223,30.718 "/>
-<linearGradient id="_13" gradientUnits="userSpaceOnUse" x1="31.25" y1="57.96" x2="26.59" y2="68.62">
-<stop stop-color="#FFFFFF" offset="0"/>
-<stop stop-color="#496DA2" offset="0.71"/>
-<stop stop-color="#235487" offset="0.99"/>
-</linearGradient>
-<polygon fill="url(#_13)" points="50.307,68.525 6.482,50.748 8.187,56.91 51.012,76.609 "/>
-<linearGradient id="_14" gradientUnits="userSpaceOnUse" x1="76.94" y1="31.97" x2="52.95" y2="35.3">
-<stop stop-color="#CADCEC" offset="0"/>
-<stop stop-color="#87A8CB" offset="1"/>
-</linearGradient>
-<path fill="url(#_14)" d="M36.378,13.498c24.735,4.342,41.233,2.484,41.233,2.484L49.186,59.923L36.378,13.498z"/>
-<linearGradient id="_15" gradientUnits="userSpaceOnUse" x1="73.85" y1="37.23" x2="35.93" y2="36.53">
-<stop stop-color="#FFFFFF" offset="0.15"/>
-<stop stop-color="#A2C2DD" offset="1"/>
-</linearGradient>
-<path fill="url(#_15)" d="M72.768,23.608l-23.58,36.319c-23.076,0.301-38.464-8.516-42.789-9.037l29.939-37.557 L72.768,23.608z"/>
-<linearGradient id="_16" gradientUnits="userSpaceOnUse" x1="58.82" y1="29.92" x2="24.83" y2="45.91">
-<stop stop-color="#E6EEF4" offset="0"/>
-<stop stop-color="#4A9900" offset="0.44"/>
-<stop stop-color="#0E4E58" offset="0.94"/>
-</linearGradient>
-<path fill="url(#_16)" d="M45.084,34.615c0,0,1.762-0.957,1.908,0.615c0.147,1.57,1.468,3.25,3.453,2.432 c0,0,8.095-3.654,6.076-6.276c-4.984-5.887-10.621-1.919-16.515,1.713c-7.056,4.346-12.051,7.557-9.143,14.24 c1.619,2.596,5.948-1.133,8.319-2.676c1.612-1.422,0.691-3.342-0.652-4.172c-1.345-0.826,0.294-1.984,0.294-1.984L45.084,34.615z "/>
-<path fill="#3F5AA6" d="M30.537,26.138c0,0-8.821-3.032-7.378,3.595l1.676-2.035c0.245-0.25,1.759-0.018,2.612,0.693 c-0.806,2.173,1.367,3.796,3.721,1.986C32.79,29.131,33.064,26.169,30.537,26.138z"/>
-<linearGradient id="_17" gradientUnits="userSpaceOnUse" x1="31.36" y1="26.85" x2="26.41" y2="26.76">
-<stop stop-color="#FFFFFF" offset="0.05"/>
-<stop stop-color="#A2C2DD" offset="1"/>
-</linearGradient>
-<path fill="url(#_17)" d="M29.455,29.955c0.991-0.278,1.679-0.673,1.714-1.934c-1.872-7.957-10.948-3.719-8.015,1.744 C22.884,26.623,27.535,23.434,29.455,29.955z"/>
-<path fill="#3F5AA6" d="M36.99,17.913c0,0-8.557-2.941-7.157,3.488l1.626-1.977c0.239-0.242,1.707-0.013,2.534,0.673 c-0.779,2.107,1.327,3.683,3.61,1.928C39.176,20.815,39.441,17.943,36.99,17.913z"/>
-<linearGradient id="_18" gradientUnits="userSpaceOnUse" x1="37.79" y1="18.6" x2="32.99" y2="18.51">
-<stop stop-color="#FFFFFF" offset="0.05"/>
-<stop stop-color="#A2C2DD" offset="1"/>
-</linearGradient>
-<path fill="url(#_18)" d="M35.94,21.614c0.962-0.269,1.63-0.652,1.665-1.873c-1.816-7.72-10.622-3.607-7.777,1.69 C29.567,18.386,34.078,15.292,35.94,21.614z"/>
-<path fill="#3F5AA6" d="M24.014,34.554c0,0-9.087-3.124-7.6,3.703l1.727-2.098c0.253-0.258,1.813-0.016,2.69,0.713 c-0.829,2.24,1.406,3.912,3.832,2.051C26.334,37.636,26.615,34.585,24.014,34.554z"/>
-<linearGradient id="_19" gradientUnits="userSpaceOnUse" x1="24.87" y1="35.29" x2="19.76" y2="35.19">
-<stop stop-color="#FFFFFF" offset="0.05"/>
-<stop stop-color="#A2C2DD" offset="1"/>
-</linearGradient>
-<path fill="url(#_19)" d="M22.898,38.486c1.021-0.283,1.73-0.693,1.767-1.99c-1.929-8.194-11.279-3.832-8.257,1.801 C16.131,35.052,20.92,31.77,22.898,38.486z"/>
-<path fill="#3F5AA6" d="M17.105,43.455c0,0-9.447-3.248-7.901,3.852l1.795-2.184c0.263-0.268,1.884-0.012,2.798,0.746 c-0.862,2.328,1.465,4.066,3.986,2.125C19.521,46.66,19.813,43.49,17.105,43.455z"/>
-<linearGradient id="_20" gradientUnits="userSpaceOnUse" x1="17.99" y1="44.22" x2="12.69" y2="44.12">
-<stop stop-color="#FFFFFF" offset="0.05"/>
-<stop stop-color="#A2C2DD" offset="1"/>
-</linearGradient>
-<path fill="url(#_20)" d="M15.946,47.539c1.063-0.291,1.8-0.717,1.839-2.066c-2.007-8.521-11.727-3.979-8.587,1.873 C8.91,43.976,13.891,40.564,15.946,47.539z"/>
-<rect fill="none" height="88" width="88"/>
-</svg>
\ No newline at end of file
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_menu_pinb.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_menu_pinb.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +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 width="100%" height="100%" viewBox="-0.737 0.34 88 88">
-<linearGradient id="_11" gradientUnits="userSpaceOnUse" x1="45.24" y1="39.77" x2="57.54" y2="64">
-<stop stop-color="#A2C2DD" offset="0.1"/>
-<stop stop-color="#6C83BB" offset="0.71"/>
-<stop stop-color="#003D6D" offset="0.99"/>
-</linearGradient>
-<path fill="url(#_11)" d="M25.759,19.008L13.896,33.48l18.916,42.891L74.663,51.83l-2.439-19.991l-9.559-11.085L39.526,14.33 L25.759,19.008z"/>
-<linearGradient id="_12" gradientUnits="userSpaceOnUse" x1="62.01" y1="3.36" x2="38.26" y2="43.86">
-<stop stop-color="#FFFFFF" offset="0.05"/>
-<stop stop-color="#A2C2DD" offset="1"/>
-</linearGradient>
-<polygon fill="url(#_12)" points="43.2,43.472 26.114,19.515 39.532,15.255 62.259,21.563 71.558,32.134 "/>
-<linearGradient id="_13" gradientUnits="userSpaceOnUse" x1="53.25" y1="13.55" x2="43.58" y2="41.89">
-<stop stop-color="#FFFFFF" offset="0.05"/>
-<stop stop-color="#A2C2DD" offset="1"/>
-</linearGradient>
-<polygon fill="url(#_13)" points="61.728,35.175 58.13,36.353 35.438,29.89 32.831,26.932 39.552,15.063 62.278,21.372 "/>
-<linearGradient id="_14" gradientUnits="userSpaceOnUse" x1="48.68" y1="82.52" x2="41.34" y2="51.19">
-<stop stop-color="#DEE6F1" offset="0"/>
-<stop stop-color="#7579D0" offset="1"/>
-</linearGradient>
-<polygon fill="url(#_14)" points="26.245,46.959 33.14,75.369 56.452,55.471 "/>
-<linearGradient id="_15" gradientUnits="userSpaceOnUse" x1="46.79" y1="96.25" x2="62.79" y2="18.25">
-<stop stop-color="#E6EEF4" offset="0"/>
-<stop stop-color="#575AC6" offset="0.44"/>
-<stop stop-color="#003D6D" offset="0.94"/>
-</linearGradient>
-<polygon fill="url(#_15)" points="56.452,55.471 33.14,75.369 73.915,51.459 "/>
-<linearGradient id="_16" gradientUnits="userSpaceOnUse" x1="56.11" y1="87.43" x2="-0.55" y2="29.43">
-<stop stop-color="#DEE6F1" offset="0"/>
-<stop stop-color="#7579D0" offset="1"/>
-</linearGradient>
-<polygon fill="url(#_16)" points="26.245,46.959 14.72,33.603 33.14,75.369 "/>
-<linearGradient id="_17" gradientUnits="userSpaceOnUse" x1="52.05" y1="79.15" x2="25.05" y2="-23.18">
-<stop stop-color="#FFFFFF" offset="0"/>
-<stop stop-color="#A2C2DD" offset="0.35"/>
-<stop stop-color="#6C83BB" offset="0.7"/>
-<stop stop-color="#003D6D" offset="1"/>
-</linearGradient>
-<polygon fill="url(#_17)" points="35.173,29.949 26.245,46.959 56.452,55.471 58.112,36.542 "/>
-<linearGradient id="_18" gradientUnits="userSpaceOnUse" x1="68.45" y1="83.08" x2="60.45" y2="10.59">
-<stop stop-color="#FFFFFF" offset="0"/>
-<stop stop-color="#A2C2DD" offset="0.35"/>
-<stop stop-color="#6C83BB" offset="0.7"/>
-<stop stop-color="#003D6D" offset="1"/>
-</linearGradient>
-<polygon fill="url(#_18)" points="58.112,36.542 56.452,55.471 73.915,51.459 71.454,32.195 "/>
-<polygon fill="#A2C2DD" points="26.181,19.604 14.72,33.603 26.245,46.959 35.173,29.949 "/>
-<linearGradient id="_19" gradientUnits="userSpaceOnUse" x1="3.81" y1="45.81" x2="32.64" y2="35.97">
-<stop stop-color="#FFFFFF" offset="0.05"/>
-<stop stop-color="#A2C2DD" offset="1"/>
-</linearGradient>
-<polygon fill="url(#_19)" points="32.743,27.153 35.161,29.941 26.233,46.945 14.714,33.591 "/>
-<linearGradient id="_20" gradientUnits="userSpaceOnUse" x1="74.04" y1="66.17" x2="44.41" y2="24.05">
-<stop stop-color="#FFFFFF" offset="0"/>
-<stop stop-color="#A2C2DD" offset="0.35"/>
-<stop stop-color="#6C83BB" offset="0.7"/>
-<stop stop-color="#003D6D" offset="1"/>
-</linearGradient>
-<polygon fill="url(#_20)" points="73.827,51.566 56.501,55.545 58.155,36.623 61.751,35.449 "/>
-<rect fill="none" height="88" width="88" x="-0.737" y="0.34"/>
-</svg>
\ No newline at end of file
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_prop_battery_icon.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_prop_battery_icon.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +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 width="12" height="15" viewBox="0 0 12 15">
-<path d="M8.026,2.995L8.032,2L4.984,2L4.979,2.984H3.929l-0.016,7.038L9.093,10l0.003-7L8.026,2.995z M5.971,3.984l0.008-0.983L7.026,3L7.021,3.989l1.071,0.007L8.065,9.03l-3.15-0.006l0.012-5.04H5.971z"/>
-</svg>
\ No newline at end of file
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_prop_checkbox_inactive.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qgn_prop_checkbox_inactive.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<rect display="none" fill="none" width="16" height="16"/>
-<rect x="3" y="3" opacity="0.5" fill="#FFFFFF" width="11" height="11"/>
-<rect x="4" y="4" opacity="0.5" fill="#A2C2DD" width="10" height="10"/>
-<path opacity="0.5" fill="#496DA2" d="M14,14H3V3h11V14z M15,2H2v13h13V2z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qsn_cp_scroll_bg_middle.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qsn_cp_scroll_bg_middle.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +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="12" version="1.1" viewBox="0 0 12 12" width="12" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g>
-<g>
-<rect fill="url(#XMLID_4_)" height="12" width="0.75" x="2"/>
-<rect fill="url(#XMLID_4_)" height="12" width="0.746" x="9.254"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="XMLID_6_" x1="2.75" x2="9.2539" y1="6" y2="6">
-<stop offset="0" style="stop-color:#B8C4C4"/>
-<stop offset="0.1143" style="stop-color:#C1CCCC"/>
-<stop offset="0.7025" style="stop-color:#EEF1F1"/>
-<stop offset="1" style="stop-color:#FFFFFF"/>
-</linearGradient>
-<rect fill="url(#XMLID_6_)" fill-opacity="0.6" height="12" stroke-opacity="0.6" width="6.504" x="2.75"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="XMLID_4_" x1="12.3125" x2="-2.75" y1="5.9995" y2="5.9995">
-<stop offset="0" style="stop-color:#DEE9F3"/>
-<stop offset="1" style="stop-color:#556180"/>
-</linearGradient>
-</defs>
-</g>
-<rect fill="none" height="12" width="12"/>
-</g>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qsn_cp_scroll_bg_top.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qsn_cp_scroll_bg_top.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +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="12" version="1.1" viewBox="0 0 12 12" width="12" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g>
-<g>
-<linearGradient gradientUnits="userSpaceOnUse" id="XMLID_3_" x1="12.3125" x2="-2.75" y1="7.5" y2="7.5">
-<stop offset="0" style="stop-color:#DEE9F3"/>
-<stop offset="1" style="stop-color:#556180"/>
-</linearGradient>
-<path d="M8.779,3H3.219C2.547,3,2,3.538,2,4.2V12h0.75V4.578c0-0.456,0.379-0.828,0.848-0.828h4.807    c0.47,0,0.85,0.372,0.85,0.828V12H10V4.2C10,3.538,9.452,3,8.779,3z" fill="url(#XMLID_3_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="XMLID_4_" x1="2.75" x2="9.2539" y1="7.875" y2="7.875">
-<stop offset="0" style="stop-color:#B8C4C4"/>
-<stop offset="0.1143" style="stop-color:#C1CCCC"/>
-<stop offset="0.7025" style="stop-color:#EEF1F1"/>
-<stop offset="1" style="stop-color:#FFFFFF"/>
-</linearGradient>
-<path d="M8.404,3.75H3.598c-0.469,0-0.848,0.372-0.848,0.828V12h6.504V4.578    C9.254,4.122,8.874,3.75,8.404,3.75z" fill="url(#XMLID_4_)" fill-opacity="0.6" stroke-opacity="0.6"/>
-</g>
-<rect fill="none" height="12" width="12"/>
-</g>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qsn_cp_scroll_handle_middle.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qsn_cp_scroll_handle_middle.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +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="12" version="1.1" viewBox="0 0 12 12" width="12" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g>
-<rect fill="none" height="12" width="12"/>
-<g>
-<linearGradient gradientUnits="userSpaceOnUse" id="XMLID_4_" x1="2" x2="10" y1="5.9995" y2="5.9995">
-<stop offset="0" style="stop-color:#788FB8"/>
-<stop offset="1" style="stop-color:#235487"/>
-</linearGradient>
-<rect fill="url(#XMLID_4_)" fill-opacity="0.7" height="12" stroke-opacity="0.7" width="8" x="2"/>
-<rect fill="#A2C2DD" height="12" width="7" x="2.5"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="XMLID_5_" x1="-9.0625" x2="22.5625" y1="5.9995" y2="5.9995">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.1142" style="stop-color:#E0EAF3"/>
-<stop offset="0.35" style="stop-color:#A2C2DD"/>
-<stop offset="0.4825" style="stop-color:#8CA9CF"/>
-<stop offset="0.7" style="stop-color:#6C83BB"/>
-<stop offset="0.7458" style="stop-color:#637DB5"/>
-<stop offset="0.8189" style="stop-color:#4C6EA4"/>
-<stop offset="0.9097" style="stop-color:#265689"/>
-<stop offset="0.9888" style="stop-color:#003D6D"/>
-<stop offset="1" style="stop-color:#003D6D"/>
-</linearGradient>
-<rect fill="url(#XMLID_5_)" fill-opacity="0.6" height="12" stroke-opacity="0.6" width="6.5" x="2.75"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="XMLID_6_" x1="2.9951" x2="9.8349" y1="5.9995" y2="5.9995">
-<stop offset="0" style="stop-color:#E1EBF4"/>
-<stop offset="0.4944" style="stop-color:#CEE1EF"/>
-<stop offset="1" style="stop-color:#C5CEEF"/>
-</linearGradient>
-<rect fill="url(#XMLID_6_)" height="12" width="5.5" x="3.25"/>
-<rect fill="#FFFFFF" fill-opacity="0.5" height="12" stroke-opacity="0.5" width="3.25" x="2.75"/>
-</g>
-</g>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qsn_cp_scroll_handle_top.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qsn_cp_scroll_handle_top.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +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="12" version="1.1" viewBox="0 0 12 12" width="12" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g>
-<rect fill="none" height="12" width="12"/>
-<g>
-<linearGradient gradientUnits="userSpaceOnUse" id="XMLID_4_" x1="2" x2="10" y1="7.5005" y2="7.5005">
-<stop offset="0" style="stop-color:#788FB8"/>
-<stop offset="1" style="stop-color:#235487"/>
-</linearGradient>
-<path d="M8.779,3H3.219C2.547,3,2,3.538,2,4.2V12h8V4.2C10,3.538,9.451,3,8.779,3z" fill="url(#XMLID_4_)" fill-opacity="0.7" stroke-opacity="0.7"/>
-<path d="M8.654,3.5H3.344C2.877,3.5,2.5,3.872,2.5,4.329V12h7V4.329C9.5,3.872,9.121,3.5,8.654,3.5z" fill="#A2C2DD"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="XMLID_5_" x1="-9.0625" x2="22.5625" y1="7.8755" y2="7.8755">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.1142" style="stop-color:#E0EAF3"/>
-<stop offset="0.35" style="stop-color:#A2C2DD"/>
-<stop offset="0.4825" style="stop-color:#8CA9CF"/>
-<stop offset="0.7" style="stop-color:#6C83BB"/>
-<stop offset="0.7458" style="stop-color:#637DB5"/>
-<stop offset="0.8189" style="stop-color:#4C6EA4"/>
-<stop offset="0.9097" style="stop-color:#265689"/>
-<stop offset="0.9888" style="stop-color:#003D6D"/>
-<stop offset="1" style="stop-color:#003D6D"/>
-</linearGradient>
-<path d="M8.654,3.75H3.344c-0.328,0-0.594,0.26-0.594,0.579V12h6.5V4.329    C9.25,4.01,8.982,3.75,8.654,3.75z" fill="url(#XMLID_5_)" fill-opacity="0.6" stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="XMLID_6_" x1="2.9951" x2="9.8349" y1="8.0005" y2="8.0005">
-<stop offset="0" style="stop-color:#E1EBF4"/>
-<stop offset="0.4944" style="stop-color:#CEE1EF"/>
-<stop offset="1" style="stop-color:#C5CEEF"/>
-</linearGradient>
-<path d="M8.154,4H3.842C3.516,4,3.25,4.26,3.25,4.578V12h5.5V4.578C8.75,4.26,8.482,4,8.154,4z" fill="url(#XMLID_6_)"/>
-<path d="M3.344,3.75c-0.328,0-0.594,0.26-0.594,0.579V12H6V3.75H3.344z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
-</g>
-</g>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qsn_cp_scroll_horizontal_bg_middle.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qsn_cp_scroll_horizontal_bg_middle.svg	Mon Apr 19 14:02:13 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="12" version="1.1" viewBox="0 0 12 12" width="12" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g>
-<g>
-<linearGradient gradientTransform="matrix(0 1 1 0 318.2246 -318.2256)" gradientUnits="userSpaceOnUse" id="XMLID_4_" x1="330.5391" x2="315.4766" y1="-312.2241" y2="-312.2241">
-<stop offset="0" style="stop-color:#DEE9F3"/>
-<stop offset="1" style="stop-color:#556180"/>
-</linearGradient>
-<rect fill="url(#XMLID_4_)" height="0.75" width="12" y="2"/>
-<linearGradient gradientTransform="matrix(0 1 1 0 318.2246 -318.2256)" gradientUnits="userSpaceOnUse" id="XMLID_5_" x1="330.5381" x2="315.4756" y1="-312.2241" y2="-312.2241">
-<stop offset="0" style="stop-color:#DEE9F3"/>
-<stop offset="1" style="stop-color:#556180"/>
-</linearGradient>
-<rect fill="url(#XMLID_5_)" height="0.746" width="12" y="9.254"/>
-<linearGradient gradientTransform="matrix(0 1 1 0 318.2246 -318.2256)" gradientUnits="userSpaceOnUse" id="XMLID_6_" x1="320.9756" x2="327.4795" y1="-312.2246" y2="-312.2246">
-<stop offset="0" style="stop-color:#B8C4C4"/>
-<stop offset="0.1143" style="stop-color:#C1CCCC"/>
-<stop offset="0.7025" style="stop-color:#EEF1F1"/>
-<stop offset="1" style="stop-color:#FFFFFF"/>
-</linearGradient>
-<rect fill="url(#XMLID_6_)" fill-opacity="0.6" height="6.504" stroke-opacity="0.6" width="12" y="2.75"/>
-</g>
-<rect fill="none" height="12" width="12"/>
-</g>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qsn_cp_scroll_horizontal_bg_top.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qsn_cp_scroll_horizontal_bg_top.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +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="12" version="1.1" viewBox="0 0 12 12" width="12" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g>
-<g>
-<linearGradient gradientTransform="matrix(0 1 1 0 318.2246 -318.2256)" gradientUnits="userSpaceOnUse" id="XMLID_3_" x1="330.5381" x2="315.4765" y1="-310.7241" y2="-310.7241">
-<stop offset="0" style="stop-color:#DEE9F3"/>
-<stop offset="1" style="stop-color:#556180"/>
-</linearGradient>
-<path d="M3,8.779V3.219C3,2.547,3.537,2,4.199,2H12v0.75H4.578c-0.457,0-0.828,0.379-0.828,0.848v4.807    c0,0.47,0.371,0.85,0.828,0.85H12V10H4.199C3.537,10,3,9.452,3,8.779z" fill="url(#XMLID_3_)"/>
-<linearGradient gradientTransform="matrix(0 1 1 0 318.2246 -318.2256)" gradientUnits="userSpaceOnUse" id="XMLID_4_" x1="320.9756" x2="327.4795" y1="-310.3496" y2="-310.3496">
-<stop offset="0" style="stop-color:#B8C4C4"/>
-<stop offset="0.1143" style="stop-color:#C1CCCC"/>
-<stop offset="0.7025" style="stop-color:#EEF1F1"/>
-<stop offset="1" style="stop-color:#FFFFFF"/>
-</linearGradient>
-<path d="M3.75,8.404V3.598c0-0.469,0.371-0.848,0.828-0.848H12v6.504H4.578    C4.121,9.254,3.75,8.874,3.75,8.404z" fill="url(#XMLID_4_)" fill-opacity="0.6" stroke-opacity="0.6"/>
-</g>
-<rect fill="none" height="12" width="12"/>
-</g>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qsn_cp_scroll_horizontal_handle_middle.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qsn_cp_scroll_horizontal_handle_middle.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +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="12" version="1.1" viewBox="0 0 12 12" width="12" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g>
-<rect fill="none" height="12" width="12"/>
-<g>
-<linearGradient gradientTransform="matrix(0 1 1 0 317.9258 -317.9268)" gradientUnits="userSpaceOnUse" id="XMLID_4_" x1="319.9268" x2="327.9268" y1="-311.9258" y2="-311.9258">
-<stop offset="0" style="stop-color:#788FB8"/>
-<stop offset="1" style="stop-color:#235487"/>
-</linearGradient>
-<rect fill="url(#XMLID_4_)" fill-opacity="0.7" height="8" stroke-opacity="0.7" width="12" y="2"/>
-<rect fill="#A2C2DD" height="7" width="12" y="2.5"/>
-<linearGradient gradientTransform="matrix(0 1 1 0 317.9258 -317.9268)" gradientUnits="userSpaceOnUse" id="XMLID_5_" x1="308.8643" x2="340.4892" y1="-311.9258" y2="-311.9258">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.1142" style="stop-color:#E0EAF3"/>
-<stop offset="0.35" style="stop-color:#A2C2DD"/>
-<stop offset="0.4825" style="stop-color:#8CA9CF"/>
-<stop offset="0.7" style="stop-color:#6C83BB"/>
-<stop offset="0.7458" style="stop-color:#637DB5"/>
-<stop offset="0.8189" style="stop-color:#4C6EA4"/>
-<stop offset="0.9097" style="stop-color:#265689"/>
-<stop offset="0.9888" style="stop-color:#003D6D"/>
-<stop offset="1" style="stop-color:#003D6D"/>
-</linearGradient>
-<rect fill="url(#XMLID_5_)" fill-opacity="0.6" height="6.5" stroke-opacity="0.6" width="12" y="2.75"/>
-<linearGradient gradientTransform="matrix(0 1 1 0 317.9258 -317.9268)" gradientUnits="userSpaceOnUse" id="XMLID_6_" x1="320.9219" x2="327.7617" y1="-311.9258" y2="-311.9258">
-<stop offset="0" style="stop-color:#E1EBF4"/>
-<stop offset="0.4944" style="stop-color:#CEE1EF"/>
-<stop offset="1" style="stop-color:#C5CEEF"/>
-</linearGradient>
-<rect fill="url(#XMLID_6_)" height="5.5" width="12" y="3.25"/>
-<rect fill="#FFFFFF" fill-opacity="0.5" height="3.25" stroke-opacity="0.5" width="12" y="2.75"/>
-</g>
-</g>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qsn_cp_scroll_horizontal_handle_top.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qsn_cp_scroll_horizontal_handle_top.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +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="12" version="1.1" viewBox="0 0 12 12" width="12" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g>
-<rect fill="none" height="12" width="12"/>
-<g>
-<linearGradient gradientTransform="matrix(0 1 1 0 317.9258 -317.9268)" gradientUnits="userSpaceOnUse" id="XMLID_4_" x1="319.9268" x2="327.9268" y1="-310.4258" y2="-310.4258">
-<stop offset="0" style="stop-color:#788FB8"/>
-<stop offset="1" style="stop-color:#235487"/>
-</linearGradient>
-<path d="M3,8.779V3.219C3,2.547,3.538,2,4.199,2H12v8H4.199C3.538,10,3,9.451,3,8.779z" fill="url(#XMLID_4_)" fill-opacity="0.7" stroke-opacity="0.7"/>
-<path d="M3.5,8.654V3.344C3.5,2.877,3.872,2.5,4.328,2.5H12v7H4.328C3.872,9.5,3.5,9.121,3.5,8.654z" fill="#A2C2DD"/>
-<linearGradient gradientTransform="matrix(0 1 1 0 317.9258 -317.9268)" gradientUnits="userSpaceOnUse" id="XMLID_5_" x1="308.8643" x2="340.4892" y1="-310.0508" y2="-310.0508">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.1142" style="stop-color:#E0EAF3"/>
-<stop offset="0.35" style="stop-color:#A2C2DD"/>
-<stop offset="0.4825" style="stop-color:#8CA9CF"/>
-<stop offset="0.7" style="stop-color:#6C83BB"/>
-<stop offset="0.7458" style="stop-color:#637DB5"/>
-<stop offset="0.8189" style="stop-color:#4C6EA4"/>
-<stop offset="0.9097" style="stop-color:#265689"/>
-<stop offset="0.9888" style="stop-color:#003D6D"/>
-<stop offset="1" style="stop-color:#003D6D"/>
-</linearGradient>
-<path d="M3.75,8.654V3.344c0-0.328,0.26-0.594,0.578-0.594H12v6.5H4.328    C4.01,9.25,3.75,8.982,3.75,8.654z" fill="url(#XMLID_5_)" fill-opacity="0.6" stroke-opacity="0.6"/>
-<linearGradient gradientTransform="matrix(0 1 1 0 317.9258 -317.9268)" gradientUnits="userSpaceOnUse" id="XMLID_6_" x1="320.9219" x2="327.7617" y1="-309.9258" y2="-309.9258">
-<stop offset="0" style="stop-color:#E1EBF4"/>
-<stop offset="0.4944" style="stop-color:#CEE1EF"/>
-<stop offset="1" style="stop-color:#C5CEEF"/>
-</linearGradient>
-<path d="M4,8.154V3.842C4,3.516,4.26,3.25,4.578,3.25H12v5.5H4.578C4.26,8.75,4,8.482,4,8.154z" fill="url(#XMLID_6_)"/>
-<path d="M3.75,3.344c0-0.328,0.26-0.594,0.578-0.594H12V6H3.75V3.344z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
-</g>
-</g>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qt_prog_bar_loaded.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qt_prog_bar_loaded.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="100px" height="38px" viewBox="0 0 100 38" enable-background="new 0 0 100 38" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="49.9995" y1="3" x2="49.9995" y2="35.0005">
-	<stop  offset="0" style="stop-color:#B2B2B2"/>
-	<stop  offset="1" style="stop-color:#666666"/>
-</linearGradient>
-<rect y="3" fill="url(#SVGID_1_)" width="100" height="32"/>
-<rect fill="none" width="100" height="38"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qt_prog_bar_mask_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qt_prog_bar_mask_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="374px" height="38px" viewBox="0 0 374 38" enable-background="new 0 0 374 38" xml:space="preserve">
-<defs>
-</defs>
-<rect y="3" width="374" height="32"/>
-<rect fill="none" width="374" height="38"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qt_prog_bar_mask_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qt_prog_bar_mask_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="25px" height="38px" viewBox="0 0 25 38" enable-background="new 0 0 25 38" xml:space="preserve">
-<defs>
-</defs>
-<path d="M19.008,3C10.168,3,3,10.165,3,19s7.168,16,16.008,16H25V3H19.008z"/>
-<rect fill="none" width="25" height="38"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qt_prog_bar_mask_m.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qt_prog_bar_mask_m.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="374px" height="38px" viewBox="0 0 374 38" enable-background="new 0 0 374 38" xml:space="preserve">
-<defs>
-</defs>
-<rect y="3" width="374" height="32"/>
-<rect fill="none" width="374" height="38"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qt_prog_bar_mask_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qt_prog_bar_mask_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="25px" height="38px" viewBox="0 0 25 38" enable-background="new 0 0 25 38" xml:space="preserve">
-<defs>
-</defs>
-<path d="M5.992,3H0v32h5.992C14.834,35,22,27.835,22,19S14.834,3,5.992,3z"/>
-<rect fill="none" width="25" height="38"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qt_prog_bar_mask_rating.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qt_prog_bar_mask_rating.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="140px" height="23px" viewBox="-0.292 -0.109 140 23" enable-background="new -0.292 -0.109 140 23"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect width="140" height="23"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qt_prog_bar_pause.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qt_prog_bar_pause.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="21px" height="21px" viewBox="0 0 21 21" enable-background="new 0 0 21 21" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="10.4995" y1="2" x2="10.4995" y2="19.0005">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="1" style="stop-color:#D9D9D9"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" d="M2.5,19h6V2h-6V19z M12.5,2v17h6V2H12.5z"/>
-<rect fill="none" width="21" height="21"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qt_prog_bar_play.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qt_prog_bar_play.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="21px" height="21px" viewBox="0 0 21 21" enable-background="new 0 0 21 21" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="none" width="21" height="21"/>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="10.9995" y1="1.877" x2="10.9995" y2="18.8413">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="1" style="stop-color:#D9D9D9"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" d="M5,2v17l12-8.5L5,2z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qt_prog_bar_played.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qt_prog_bar_played.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="100px" height="38px" viewBox="0 0 100 38" enable-background="new 0 0 100 38" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="49.9995" y1="3" x2="49.9995" y2="35.0005">
-	<stop  offset="0" style="stop-color:#8CE0FF"/>
-	<stop  offset="1" style="stop-color:#29ABE2"/>
-</linearGradient>
-<rect y="3" fill="url(#SVGID_1_)" width="100" height="32"/>
-<rect fill="none" width="100" height="38"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qt_prog_bar_track_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qt_prog_bar_track_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="374px" height="38px" viewBox="0 0 374 38" enable-background="new 0 0 374 38" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="186.9995" y1="0" x2="186.9995" y2="38.0005">
-	<stop  offset="0" style="stop-color:#FAFAFA"/>
-	<stop  offset="1" style="stop-color:#E5E5E5"/>
-</linearGradient>
-<rect fill="url(#SVGID_1_)" width="374" height="38"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="186.9995" y1="2" x2="186.9995" y2="36.0005">
-	<stop  offset="0" style="stop-color:#E5E5E5"/>
-	<stop  offset="1" style="stop-color:#B2B2B2"/>
-</linearGradient>
-<rect y="2" fill="url(#SVGID_2_)" width="374" height="34"/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="187.0005" y1="36" x2="187.0005" y2="2.0005">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="1" style="stop-color:#B2B2B2"/>
-</linearGradient>
-<rect y="2" fill="url(#SVGID_3_)" width="374" height="0.999"/>
-<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="187.0005" y1="36" x2="187.0005" y2="2.0005">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="1" style="stop-color:#B2B2B2"/>
-</linearGradient>
-<rect y="35.002" fill="url(#SVGID_4_)" width="374" height="0.998"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qt_prog_bar_track_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qt_prog_bar_track_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="25px" height="38px" viewBox="0 0 25 38" enable-background="new 0 0 25 38" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="12.4995" y1="0" x2="12.4995" y2="38.0005">
-	<stop  offset="0" style="stop-color:#FAFAFA"/>
-	<stop  offset="1" style="stop-color:#E5E5E5"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" d="M19,0C8.507,0,0,8.507,0,19s8.507,19,19,19h6V0H19z"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="13.5" y1="2" x2="13.5" y2="36.0005">
-	<stop  offset="0" style="stop-color:#E5E5E5"/>
-	<stop  offset="1" style="stop-color:#B2B2B2"/>
-</linearGradient>
-<path fill="url(#SVGID_2_)" d="M18.94,2C9.585,2,2,9.612,2,19s7.585,17,16.94,17H25V2H18.94z"/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="13.5" y1="36" x2="13.5" y2="2.0005">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="1" style="stop-color:#B2B2B2"/>
-</linearGradient>
-<path fill="url(#SVGID_3_)" d="M18.94,35.002c-8.791,0-15.944-7.18-15.944-16.003c0-8.821,7.153-16,15.944-16H25V2h-6.06
-	C9.585,2,2,9.612,2,19s7.585,17,16.94,17H25v-0.998H18.94z"/>
-<rect fill="none" width="25" height="38"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qt_prog_bar_track_m.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qt_prog_bar_track_m.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="374px" height="38px" viewBox="0 0 374 38" enable-background="new 0 0 374 38" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="186.9995" y1="0" x2="186.9995" y2="38.0005">
-	<stop  offset="0" style="stop-color:#FAFAFA"/>
-	<stop  offset="1" style="stop-color:#E5E5E5"/>
-</linearGradient>
-<rect fill="url(#SVGID_1_)" width="374" height="38"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="186.9995" y1="2" x2="186.9995" y2="36.0005">
-	<stop  offset="0" style="stop-color:#E5E5E5"/>
-	<stop  offset="1" style="stop-color:#B2B2B2"/>
-</linearGradient>
-<rect y="2" fill="url(#SVGID_2_)" width="374" height="34"/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="187.0005" y1="36" x2="187.0005" y2="2.0005">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="1" style="stop-color:#B2B2B2"/>
-</linearGradient>
-<rect y="2" fill="url(#SVGID_3_)" width="374" height="0.999"/>
-<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="187.0005" y1="36" x2="187.0005" y2="2.0005">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="1" style="stop-color:#B2B2B2"/>
-</linearGradient>
-<rect y="35.002" fill="url(#SVGID_4_)" width="374" height="0.998"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qt_prog_bar_track_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qt_prog_bar_track_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="25px" height="38px" viewBox="0 0 25 38" enable-background="new 0 0 25 38" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="12.4995" y1="0" x2="12.4995" y2="38.0005">
-	<stop  offset="0" style="stop-color:#FAFAFA"/>
-	<stop  offset="1" style="stop-color:#E5E5E5"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" d="M6,0H0v38h6c10.493,0,19-8.507,19-19S16.493,0,6,0z"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="11.4995" y1="2" x2="11.4995" y2="36.0005">
-	<stop  offset="0" style="stop-color:#E5E5E5"/>
-	<stop  offset="1" style="stop-color:#B2B2B2"/>
-</linearGradient>
-<path fill="url(#SVGID_2_)" d="M6.06,2H0v34h6.06C15.415,36,23,28.388,23,19S15.415,2,6.06,2z"/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="11.5005" y1="36" x2="11.5005" y2="2.0005">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="1" style="stop-color:#B2B2B2"/>
-</linearGradient>
-<path fill="url(#SVGID_3_)" d="M6.06,2H0v0.999h6.059c8.792,0,15.947,7.179,15.947,16c0,8.823-7.155,16.003-15.947,16.003H0V36h6.06
-	C15.415,36,23,28.388,23,19S15.415,2,6.06,2z"/>
-<rect fill="none" width="25" height="38"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qt_tab_background.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qt_tab_background.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/">
-<defs>
-</defs>
-<rect opacity="0.15" width="68" height="68"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qt_tb_lsc_b.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qt_tb_lsc_b.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="60px" height="21px" viewBox="0 0 60 21" enable-background="new 0 0 60 21" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="110.668" y1="-458.833" x2="110.668" y2="-398.833" gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 458.5001 121.1676)">
-	<stop  offset="0" style="stop-color:#00B9FF"/>
-	<stop  offset="0.2458" style="stop-color:#00A0EE"/>
-	<stop  offset="0.563" style="stop-color:#0087DC"/>
-	<stop  offset="0.7527" style="stop-color:#007DD5"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" d="M60,21H9.999C4.478,21,0,16.523,0,11V0.001h60V21z"/>
-<rect x="59.001" y="0.001" fill="#005EC2" width="0.999" height="20.999"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="110.668" y1="184.001" x2="110.668" y2="195.013" gradientTransform="matrix(-4.371139e-008 -1 -0.9167 4.006877e-008 178.6664 121.1683)">
-	<stop  offset="0" style="stop-color:#00B9FF"/>
-	<stop  offset="1" style="stop-color:#FFFFFF"/>
-</linearGradient>
-<path opacity="0.5" fill="url(#SVGID_2_)" d="M1,11c0,4.963,4.038,9,8.999,9v1C4.478,21,0,16.523,0,11V0h1V11z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qt_tb_lsc_bottom_b.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qt_tb_lsc_bottom_b.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="60px" height="21px" viewBox="0 0 60 21" enable-background="new 0 0 60 21" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="110.668" y1="-458.833" x2="110.668" y2="-398.833" gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 458.5001 121.1676)">
-	<stop  offset="0" style="stop-color:#00B9FF"/>
-	<stop  offset="0.2458" style="stop-color:#00A0EE"/>
-	<stop  offset="0.563" style="stop-color:#0087DC"/>
-	<stop  offset="0.7527" style="stop-color:#007DD5"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" d="M60,21H9.999C4.478,21,0,16.523,0,11V0.001h60V21z"/>
-<rect x="59.001" y="0.001" fill="#005EC2" width="0.999" height="20.999"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="110.668" y1="184.001" x2="110.668" y2="195.013" gradientTransform="matrix(-4.371139e-008 -1 -0.9167 4.006877e-008 178.6664 121.1683)">
-	<stop  offset="0" style="stop-color:#00B9FF"/>
-	<stop  offset="1" style="stop-color:#FFFFFF"/>
-</linearGradient>
-<path opacity="0.5" fill="url(#SVGID_2_)" d="M1,11c0,4.963,4.038,9,8.999,9v1C4.478,21,0,16.523,0,11V0h1V11z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qt_tb_lsc_bottom_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qt_tb_lsc_bottom_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="60px" height="80px" viewBox="0 0 60 80" enable-background="new 0 0 60 80" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="110.168" y1="-429.833" x2="110.168" y2="-369.833" gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 429.5001 150.1676)">
-	<stop  offset="0" style="stop-color:#00B9FF"/>
-	<stop  offset="0.2458" style="stop-color:#00A0EE"/>
-	<stop  offset="0.563" style="stop-color:#0087DC"/>
-	<stop  offset="0.7527" style="stop-color:#007DD5"/>
-</linearGradient>
-<rect fill="url(#SVGID_1_)" width="60" height="80"/>
-<rect x="59.001" fill="#005EC2" width="0.999" height="80"/>
-<rect opacity="0.5" fill="#FFFFFF" width="1" height="80"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qt_tb_lsc_bottom_pressed_b.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qt_tb_lsc_bottom_pressed_b.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="60px" height="21px" viewBox="0 0 60 21" enable-background="new 0 0 60 21" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="110.668" y1="-458.833" x2="110.668" y2="-398.833" gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 458.5001 121.1676)">
-	<stop  offset="0" style="stop-color:#8CE0FF"/>
-	<stop  offset="0.1167" style="stop-color:#78D6F9"/>
-	<stop  offset="0.4027" style="stop-color:#4DBFED"/>
-	<stop  offset="0.6262" style="stop-color:#33B0E5"/>
-	<stop  offset="0.7582" style="stop-color:#29ABE2"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" d="M60,21H9.999C4.478,21,0,16.523,0,11V0.001h60V21z"/>
-<rect x="59.001" y="0.001" fill="#498FFF" width="0.999" height="20.999"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="110.668" y1="184.001" x2="110.668" y2="195.013" gradientTransform="matrix(-4.371139e-008 -1 -0.9167 4.006877e-008 178.6664 121.1683)">
-	<stop  offset="0" style="stop-color:#8CE0FF"/>
-	<stop  offset="1" style="stop-color:#FFFFFF"/>
-</linearGradient>
-<path opacity="0.5" fill="url(#SVGID_2_)" d="M1,11c0,4.963,4.038,9,8.999,9v1C4.478,21,0,16.523,0,11V0h1V11z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qt_tb_lsc_bottom_pressed_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qt_tb_lsc_bottom_pressed_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="60px" height="80px" viewBox="0 0 60 80" enable-background="new 0 0 60 80" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="110.168" y1="-429.833" x2="110.168" y2="-369.833" gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 429.5001 150.1676)">
-	<stop  offset="0" style="stop-color:#8CE0FF"/>
-	<stop  offset="0.1167" style="stop-color:#78D6F9"/>
-	<stop  offset="0.4027" style="stop-color:#4DBFED"/>
-	<stop  offset="0.6262" style="stop-color:#33B0E5"/>
-	<stop  offset="0.7582" style="stop-color:#29ABE2"/>
-</linearGradient>
-<rect fill="url(#SVGID_1_)" width="60" height="80"/>
-<rect x="59.001" fill="#498FFF" width="0.999" height="80"/>
-<rect opacity="0.5" fill="#FFFFFF" width="1" height="80"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qt_tb_lsc_bottom_pressed_t.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qt_tb_lsc_bottom_pressed_t.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="60px" height="21px" viewBox="0 0 60 21" enable-background="new 0 0 60 21" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="110.168" y1="-458.833" x2="110.168" y2="-398.833" gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 458.5001 121.1676)">
-	<stop  offset="0" style="stop-color:#8CE0FF"/>
-	<stop  offset="0.1167" style="stop-color:#78D6F9"/>
-	<stop  offset="0.4027" style="stop-color:#4DBFED"/>
-	<stop  offset="0.6262" style="stop-color:#33B0E5"/>
-	<stop  offset="0.7582" style="stop-color:#29ABE2"/>
-</linearGradient>
-<rect y="1" fill="url(#SVGID_1_)" width="60" height="20"/>
-<rect x="59.001" y="1" fill="#498FFF" width="0.999" height="20"/>
-<rect y="1" opacity="0.5" fill="#FFFFFF" width="1" height="20"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="119.668" y1="-457.583" x2="119.668" y2="-399.582" gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 458.5001 121.1676)">
-	<stop  offset="0.011" style="stop-color:#007DD5"/>
-	<stop  offset="1" style="stop-color:#005EC2"/>
-</linearGradient>
-<rect x="1" y="1" opacity="0.35" fill="url(#SVGID_2_)" width="58.001" height="1"/>
-<rect fill="none" width="60" height="21"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qt_tb_lsc_bottom_t.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qt_tb_lsc_bottom_t.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="60px" height="21px" viewBox="0 0 60 21" enable-background="new 0 0 60 21" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="110.168" y1="-458.833" x2="110.168" y2="-398.833" gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 458.5001 121.1676)">
-	<stop  offset="0" style="stop-color:#00B9FF"/>
-	<stop  offset="0.2458" style="stop-color:#00A0EE"/>
-	<stop  offset="0.563" style="stop-color:#0087DC"/>
-	<stop  offset="0.7527" style="stop-color:#007DD5"/>
-</linearGradient>
-<rect y="1" fill="url(#SVGID_1_)" width="60" height="20"/>
-<rect x="59.001" y="1" fill="#005EC2" width="0.999" height="20"/>
-<rect y="1" opacity="0.5" fill="#FFFFFF" width="1" height="20"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="119.668" y1="-457.583" x2="119.668" y2="-399.582" gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 458.5001 121.1676)">
-	<stop  offset="0.011" style="stop-color:#007DD5"/>
-	<stop  offset="1" style="stop-color:#005EC2"/>
-</linearGradient>
-<rect x="1" y="1" opacity="0.5" fill="url(#SVGID_2_)" width="58.001" height="1"/>
-<rect fill="none" width="60" height="21"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qt_tb_lsc_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qt_tb_lsc_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="60px" height="80px" viewBox="0 0 60 80" enable-background="new 0 0 60 80" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="110.168" y1="-429.833" x2="110.168" y2="-369.833" gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 429.5001 150.1676)">
-	<stop  offset="0" style="stop-color:#00B9FF"/>
-	<stop  offset="0.2458" style="stop-color:#00A0EE"/>
-	<stop  offset="0.563" style="stop-color:#0087DC"/>
-	<stop  offset="0.7527" style="stop-color:#007DD5"/>
-</linearGradient>
-<rect fill="url(#SVGID_1_)" width="60" height="80"/>
-<rect x="59.001" fill="#005EC2" width="0.999" height="80"/>
-<rect opacity="0.5" fill="#FFFFFF" width="1" height="80"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qt_tb_lsc_cb_b.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qt_tb_lsc_cb_b.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="60px" height="21px" viewBox="0 0 60 21" enable-background="new 0 0 60 21" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="111.167" y1="-458.833" x2="111.167" y2="-398.833" gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 458.5001 121.1676)">
-	<stop  offset="0" style="stop-color:#00B9FF"/>
-	<stop  offset="0.2458" style="stop-color:#00A0EE"/>
-	<stop  offset="0.563" style="stop-color:#0087DC"/>
-	<stop  offset="0.7527" style="stop-color:#007DD5"/>
-</linearGradient>
-<rect y="0.001" fill="url(#SVGID_1_)" width="60" height="20"/>
-<rect x="59.001" y="0.001" fill="#005EC2" width="0.999" height="19"/>
-<rect opacity="0.5" fill="#FFFFFF" width="1" height="20"/>
-<rect x="1" y="19.001" opacity="0.35" fill="#FFFFFF" width="59.001" height="1"/>
-<rect fill="none" width="60" height="21"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qt_tb_lsc_cb_pressed_b.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qt_tb_lsc_cb_pressed_b.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="60px" height="21px" viewBox="0 0 60 21" enable-background="new 0 0 60 21" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="111.167" y1="-458.833" x2="111.167" y2="-398.833" gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 458.5001 121.1676)">
-	<stop  offset="0" style="stop-color:#8CE0FF"/>
-	<stop  offset="0.1167" style="stop-color:#78D6F9"/>
-	<stop  offset="0.4027" style="stop-color:#4DBFED"/>
-	<stop  offset="0.6262" style="stop-color:#33B0E5"/>
-	<stop  offset="0.7582" style="stop-color:#29ABE2"/>
-</linearGradient>
-<rect y="0.001" fill="url(#SVGID_1_)" width="60" height="20"/>
-<rect x="59.001" y="0.001" fill="#498FFF" width="0.999" height="19"/>
-<rect opacity="0.5" fill="#FFFFFF" width="1" height="20"/>
-<rect x="1" y="19.001" opacity="0.35" fill="#FFFFFF" width="59.001" height="1"/>
-<rect fill="none" width="60" height="21"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qt_tb_lsc_ct_pressed_t.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qt_tb_lsc_ct_pressed_t.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="60px" height="21px" viewBox="0 0 60 21" enable-background="new 0 0 60 21" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="110.168" y1="-458.833" x2="110.168" y2="-398.833" gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 458.5001 121.1676)">
-	<stop  offset="0" style="stop-color:#8CE0FF"/>
-	<stop  offset="0.1167" style="stop-color:#78D6F9"/>
-	<stop  offset="0.4027" style="stop-color:#4DBFED"/>
-	<stop  offset="0.6262" style="stop-color:#33B0E5"/>
-	<stop  offset="0.7582" style="stop-color:#29ABE2"/>
-</linearGradient>
-<rect y="1" fill="url(#SVGID_1_)" width="60" height="20"/>
-<rect x="59.001" y="1" fill="#498FFF" width="0.999" height="20"/>
-<rect y="1" opacity="0.5" fill="#FFFFFF" width="1" height="20"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="119.668" y1="-457.583" x2="119.668" y2="-399.582" gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 458.5001 121.1676)">
-	<stop  offset="0.011" style="stop-color:#007DD5"/>
-	<stop  offset="1" style="stop-color:#005EC2"/>
-</linearGradient>
-<rect x="1" y="1" opacity="0.35" fill="url(#SVGID_2_)" width="58.001" height="1"/>
-<rect fill="none" width="60" height="21"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qt_tb_lsc_ct_t.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qt_tb_lsc_ct_t.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="60px" height="21px" viewBox="0 0 60 21" enable-background="new 0 0 60 21" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="110.168" y1="-458.833" x2="110.168" y2="-398.833" gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 458.5001 121.1676)">
-	<stop  offset="0" style="stop-color:#00B9FF"/>
-	<stop  offset="0.2458" style="stop-color:#00A0EE"/>
-	<stop  offset="0.563" style="stop-color:#0087DC"/>
-	<stop  offset="0.7527" style="stop-color:#007DD5"/>
-</linearGradient>
-<rect y="1" fill="url(#SVGID_1_)" width="60" height="20"/>
-<rect x="59.001" y="1" fill="#005EC2" width="0.999" height="20"/>
-<rect y="1" opacity="0.5" fill="#FFFFFF" width="1" height="20"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="119.668" y1="-457.583" x2="119.668" y2="-399.582" gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 458.5001 121.1676)">
-	<stop  offset="0.011" style="stop-color:#007DD5"/>
-	<stop  offset="1" style="stop-color:#005EC2"/>
-</linearGradient>
-<rect x="1" y="1" opacity="0.5" fill="url(#SVGID_2_)" width="58.001" height="1"/>
-<rect fill="none" width="60" height="21"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qt_tb_lsc_mid_b.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qt_tb_lsc_mid_b.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="60px" height="21px" viewBox="0 0 60 21" enable-background="new 0 0 60 21" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="111.167" y1="-458.833" x2="111.167" y2="-398.833" gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 458.5001 121.1676)">
-	<stop  offset="0" style="stop-color:#00B9FF"/>
-	<stop  offset="0.2458" style="stop-color:#00A0EE"/>
-	<stop  offset="0.563" style="stop-color:#0087DC"/>
-	<stop  offset="0.7527" style="stop-color:#007DD5"/>
-</linearGradient>
-<rect y="0.001" fill="url(#SVGID_1_)" width="60" height="20"/>
-<rect x="59.001" y="0.001" fill="#005EC2" width="0.999" height="19"/>
-<rect opacity="0.5" fill="#FFFFFF" width="1" height="20"/>
-<rect x="1" y="19.001" opacity="0.35" fill="#FFFFFF" width="59.001" height="1"/>
-<rect fill="none" width="60" height="21"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qt_tb_lsc_mid_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qt_tb_lsc_mid_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="60px" height="80px" viewBox="0 0 60 80" enable-background="new 0 0 60 80" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="110.168" y1="-429.833" x2="110.168" y2="-369.833" gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 429.5001 150.1676)">
-	<stop  offset="0" style="stop-color:#00B9FF"/>
-	<stop  offset="0.2458" style="stop-color:#00A0EE"/>
-	<stop  offset="0.563" style="stop-color:#0087DC"/>
-	<stop  offset="0.7527" style="stop-color:#007DD5"/>
-</linearGradient>
-<rect fill="url(#SVGID_1_)" width="60" height="80"/>
-<rect x="59.001" fill="#005EC2" width="0.999" height="80"/>
-<rect opacity="0.5" fill="#FFFFFF" width="1" height="80"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qt_tb_lsc_mid_pressed_b.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qt_tb_lsc_mid_pressed_b.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="60px" height="21px" viewBox="0 0 60 21" enable-background="new 0 0 60 21" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="111.167" y1="-458.833" x2="111.167" y2="-398.833" gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 458.5001 121.1676)">
-	<stop  offset="0" style="stop-color:#8CE0FF"/>
-	<stop  offset="0.1167" style="stop-color:#78D6F9"/>
-	<stop  offset="0.4027" style="stop-color:#4DBFED"/>
-	<stop  offset="0.6262" style="stop-color:#33B0E5"/>
-	<stop  offset="0.7582" style="stop-color:#29ABE2"/>
-</linearGradient>
-<rect y="0.001" fill="url(#SVGID_1_)" width="60" height="20"/>
-<rect x="59.001" y="0.001" fill="#498FFF" width="0.999" height="19"/>
-<rect opacity="0.5" fill="#FFFFFF" width="1" height="20"/>
-<rect x="1" y="19.001" opacity="0.35" fill="#FFFFFF" width="59.001" height="1"/>
-<rect fill="none" width="60" height="21"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qt_tb_lsc_mid_pressed_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qt_tb_lsc_mid_pressed_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="60px" height="80px" viewBox="0 0 60 80" enable-background="new 0 0 60 80" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="110.168" y1="-429.833" x2="110.168" y2="-369.833" gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 429.5001 150.1676)">
-	<stop  offset="0" style="stop-color:#8CE0FF"/>
-	<stop  offset="0.1167" style="stop-color:#78D6F9"/>
-	<stop  offset="0.4027" style="stop-color:#4DBFED"/>
-	<stop  offset="0.6262" style="stop-color:#33B0E5"/>
-	<stop  offset="0.7582" style="stop-color:#29ABE2"/>
-</linearGradient>
-<rect fill="url(#SVGID_1_)" width="60" height="80"/>
-<rect x="59.001" fill="#498FFF" width="0.999" height="80"/>
-<rect opacity="0.5" fill="#FFFFFF" width="1" height="80"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qt_tb_lsc_mid_pressed_t.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qt_tb_lsc_mid_pressed_t.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="60px" height="21px" viewBox="0 0 60 21" enable-background="new 0 0 60 21" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="110.168" y1="-458.833" x2="110.168" y2="-398.833" gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 458.5001 121.1676)">
-	<stop  offset="0" style="stop-color:#8CE0FF"/>
-	<stop  offset="0.1167" style="stop-color:#78D6F9"/>
-	<stop  offset="0.4027" style="stop-color:#4DBFED"/>
-	<stop  offset="0.6262" style="stop-color:#33B0E5"/>
-	<stop  offset="0.7582" style="stop-color:#29ABE2"/>
-</linearGradient>
-<rect y="1" fill="url(#SVGID_1_)" width="60" height="20"/>
-<rect x="59.001" y="1" fill="#498FFF" width="0.999" height="20"/>
-<rect y="1" opacity="0.5" fill="#FFFFFF" width="1" height="20"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="119.668" y1="-457.583" x2="119.668" y2="-399.582" gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 458.5001 121.1676)">
-	<stop  offset="0.011" style="stop-color:#007DD5"/>
-	<stop  offset="1" style="stop-color:#005EC2"/>
-</linearGradient>
-<rect x="1" y="1" opacity="0.35" fill="url(#SVGID_2_)" width="58.001" height="1"/>
-<rect fill="none" width="60" height="21"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qt_tb_lsc_mid_t.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qt_tb_lsc_mid_t.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="60px" height="21px" viewBox="0 0 60 21" enable-background="new 0 0 60 21" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="110.168" y1="-458.833" x2="110.168" y2="-398.833" gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 458.5001 121.1676)">
-	<stop  offset="0" style="stop-color:#00B9FF"/>
-	<stop  offset="0.2458" style="stop-color:#00A0EE"/>
-	<stop  offset="0.563" style="stop-color:#0087DC"/>
-	<stop  offset="0.7527" style="stop-color:#007DD5"/>
-</linearGradient>
-<rect y="1" fill="url(#SVGID_1_)" width="60" height="20"/>
-<rect x="59.001" y="1" fill="#005EC2" width="0.999" height="20"/>
-<rect y="1" opacity="0.5" fill="#FFFFFF" width="1" height="20"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="119.668" y1="-457.583" x2="119.668" y2="-399.582" gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 458.5001 121.1676)">
-	<stop  offset="0.011" style="stop-color:#007DD5"/>
-	<stop  offset="1" style="stop-color:#005EC2"/>
-</linearGradient>
-<rect x="1" y="1" opacity="0.5" fill="url(#SVGID_2_)" width="58.001" height="1"/>
-<rect fill="none" width="60" height="21"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qt_tb_lsc_pressed_b.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qt_tb_lsc_pressed_b.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="60px" height="21px" viewBox="0 0 60 21" enable-background="new 0 0 60 21" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="110.668" y1="-458.833" x2="110.668" y2="-398.833" gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 458.5001 121.1676)">
-	<stop  offset="0" style="stop-color:#8CE0FF"/>
-	<stop  offset="0.1167" style="stop-color:#78D6F9"/>
-	<stop  offset="0.4027" style="stop-color:#4DBFED"/>
-	<stop  offset="0.6262" style="stop-color:#33B0E5"/>
-	<stop  offset="0.7582" style="stop-color:#29ABE2"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" d="M60,21H9.999C4.478,21,0,16.523,0,11V0.001h60V21z"/>
-<rect x="59.001" y="0.001" fill="#498FFF" width="0.999" height="20.999"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="110.668" y1="184.001" x2="110.668" y2="195.013" gradientTransform="matrix(-4.371139e-008 -1 -0.9167 4.006877e-008 178.6664 121.1683)">
-	<stop  offset="0" style="stop-color:#8CE0FF"/>
-	<stop  offset="1" style="stop-color:#FFFFFF"/>
-</linearGradient>
-<path opacity="0.5" fill="url(#SVGID_2_)" d="M1,11c0,4.963,4.038,9,8.999,9v1C4.478,21,0,16.523,0,11V0h1V11z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qt_tb_lsc_pressed_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qt_tb_lsc_pressed_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="60px" height="80px" viewBox="0 0 60 80" enable-background="new 0 0 60 80" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="110.168" y1="-429.833" x2="110.168" y2="-369.833" gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 429.5001 150.1676)">
-	<stop  offset="0" style="stop-color:#8CE0FF"/>
-	<stop  offset="0.1167" style="stop-color:#78D6F9"/>
-	<stop  offset="0.4027" style="stop-color:#4DBFED"/>
-	<stop  offset="0.6262" style="stop-color:#33B0E5"/>
-	<stop  offset="0.7582" style="stop-color:#29ABE2"/>
-</linearGradient>
-<rect fill="url(#SVGID_1_)" width="60" height="80"/>
-<rect x="59.001" fill="#498FFF" width="0.999" height="80"/>
-<rect opacity="0.5" fill="#FFFFFF" width="1" height="80"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qt_tb_lsc_pressed_t.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qt_tb_lsc_pressed_t.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="60px" height="21px" viewBox="0 0 60 21" enable-background="new 0 0 60 21" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="110.668" y1="-458.833" x2="110.668" y2="-398.833" gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 458.5001 121.1676)">
-	<stop  offset="0" style="stop-color:#8CE0FF"/>
-	<stop  offset="0.1167" style="stop-color:#78D6F9"/>
-	<stop  offset="0.4027" style="stop-color:#4DBFED"/>
-	<stop  offset="0.6262" style="stop-color:#33B0E5"/>
-	<stop  offset="0.7582" style="stop-color:#29ABE2"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" d="M60,0H9.999C4.478,0,0,4.477,0,10v11h60V0z"/>
-<rect x="59.001" fill="#498FFF" width="0.999" height="21"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="79.3457" y1="184.001" x2="79.3457" y2="195.013" gradientTransform="matrix(4.298141e-008 0.9833 -0.9167 4.006877e-008 178.6672 -67.5211)">
-	<stop  offset="0" style="stop-color:#8CE0FF"/>
-	<stop  offset="1" style="stop-color:#FFFFFF"/>
-</linearGradient>
-<path opacity="0.5" fill="url(#SVGID_2_)" d="M1,10c0-4.961,4.038-9,8.999-9V0C4.478,0,0,4.477,0,10v11h1V10z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qt_tb_lsc_t.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qt_tb_lsc_t.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="60px" height="21px" viewBox="0 0 60 21" enable-background="new 0 0 60 21" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="110.668" y1="-458.833" x2="110.668" y2="-398.833" gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 458.5001 121.1676)">
-	<stop  offset="0" style="stop-color:#00B9FF"/>
-	<stop  offset="0.2458" style="stop-color:#00A0EE"/>
-	<stop  offset="0.563" style="stop-color:#0087DC"/>
-	<stop  offset="0.7527" style="stop-color:#007DD5"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" d="M60,0H9.999C4.478,0,0,4.477,0,10v11h60V0z"/>
-<rect x="59.001" fill="#005EC2" width="0.999" height="21"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="79.3457" y1="184.001" x2="79.3457" y2="195.013" gradientTransform="matrix(4.298141e-008 0.9833 -0.9167 4.006877e-008 178.6672 -67.5211)">
-	<stop  offset="0" style="stop-color:#00B9FF"/>
-	<stop  offset="1" style="stop-color:#FFFFFF"/>
-</linearGradient>
-<path opacity="0.5" fill="url(#SVGID_2_)" d="M1,10c0-4.961,4.038-9,8.999-9V0C4.478,0,0,4.477,0,10v11h1V10z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qt_tb_lsc_top_b.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qt_tb_lsc_top_b.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="60px" height="21px" viewBox="0 0 60 21" enable-background="new 0 0 60 21" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="111.167" y1="-458.833" x2="111.167" y2="-398.833" gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 458.5001 121.1676)">
-	<stop  offset="0" style="stop-color:#00B9FF"/>
-	<stop  offset="0.2458" style="stop-color:#00A0EE"/>
-	<stop  offset="0.563" style="stop-color:#0087DC"/>
-	<stop  offset="0.7527" style="stop-color:#007DD5"/>
-</linearGradient>
-<rect y="0.001" fill="url(#SVGID_1_)" width="60" height="20"/>
-<rect x="59.001" y="0.001" fill="#005EC2" width="0.999" height="19"/>
-<rect opacity="0.5" fill="#FFFFFF" width="1" height="20"/>
-<rect x="1" y="19.001" opacity="0.35" fill="#FFFFFF" width="59.001" height="1"/>
-<rect fill="none" width="60" height="21"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qt_tb_lsc_top_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qt_tb_lsc_top_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="60px" height="80px" viewBox="0 0 60 80" enable-background="new 0 0 60 80" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="110.168" y1="-429.833" x2="110.168" y2="-369.833" gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 429.5001 150.1676)">
-	<stop  offset="0" style="stop-color:#00B9FF"/>
-	<stop  offset="0.2458" style="stop-color:#00A0EE"/>
-	<stop  offset="0.563" style="stop-color:#0087DC"/>
-	<stop  offset="0.7527" style="stop-color:#007DD5"/>
-</linearGradient>
-<rect fill="url(#SVGID_1_)" width="60" height="80"/>
-<rect x="59.001" fill="#005EC2" width="0.999" height="80"/>
-<rect opacity="0.5" fill="#FFFFFF" width="1" height="80"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qt_tb_lsc_top_pressed_b.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qt_tb_lsc_top_pressed_b.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="60px" height="21px" viewBox="0 0 60 21" enable-background="new 0 0 60 21" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="111.167" y1="-458.833" x2="111.167" y2="-398.833" gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 458.5001 121.1676)">
-	<stop  offset="0" style="stop-color:#8CE0FF"/>
-	<stop  offset="0.1167" style="stop-color:#78D6F9"/>
-	<stop  offset="0.4027" style="stop-color:#4DBFED"/>
-	<stop  offset="0.6262" style="stop-color:#33B0E5"/>
-	<stop  offset="0.7582" style="stop-color:#29ABE2"/>
-</linearGradient>
-<rect y="0.001" fill="url(#SVGID_1_)" width="60" height="20"/>
-<rect x="59.001" y="0.001" fill="#498FFF" width="0.999" height="19"/>
-<rect opacity="0.5" fill="#FFFFFF" width="1" height="20"/>
-<rect x="1" y="19.001" opacity="0.35" fill="#FFFFFF" width="59.001" height="1"/>
-<rect fill="none" width="60" height="21"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qt_tb_lsc_top_pressed_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qt_tb_lsc_top_pressed_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="60px" height="80px" viewBox="0 0 60 80" enable-background="new 0 0 60 80" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="110.168" y1="-429.833" x2="110.168" y2="-369.833" gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 429.5001 150.1676)">
-	<stop  offset="0" style="stop-color:#8CE0FF"/>
-	<stop  offset="0.1167" style="stop-color:#78D6F9"/>
-	<stop  offset="0.4027" style="stop-color:#4DBFED"/>
-	<stop  offset="0.6262" style="stop-color:#33B0E5"/>
-	<stop  offset="0.7582" style="stop-color:#29ABE2"/>
-</linearGradient>
-<rect fill="url(#SVGID_1_)" width="60" height="80"/>
-<rect x="59.001" fill="#498FFF" width="0.999" height="80"/>
-<rect opacity="0.5" fill="#FFFFFF" width="1" height="80"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qt_tb_lsc_top_pressed_t.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qt_tb_lsc_top_pressed_t.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="60px" height="21px" viewBox="0 0 60 21" enable-background="new 0 0 60 21" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="110.668" y1="-458.833" x2="110.668" y2="-398.833" gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 458.5001 121.1676)">
-	<stop  offset="0" style="stop-color:#8CE0FF"/>
-	<stop  offset="0.1167" style="stop-color:#78D6F9"/>
-	<stop  offset="0.4027" style="stop-color:#4DBFED"/>
-	<stop  offset="0.6262" style="stop-color:#33B0E5"/>
-	<stop  offset="0.7582" style="stop-color:#29ABE2"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" d="M60,0H9.999C4.478,0,0,4.477,0,10v11h60V0z"/>
-<rect x="59.001" fill="#498FFF" width="0.999" height="21"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="79.3457" y1="184.001" x2="79.3457" y2="195.013" gradientTransform="matrix(4.298141e-008 0.9833 -0.9167 4.006877e-008 178.6672 -67.5211)">
-	<stop  offset="0" style="stop-color:#8CE0FF"/>
-	<stop  offset="1" style="stop-color:#FFFFFF"/>
-</linearGradient>
-<path opacity="0.5" fill="url(#SVGID_2_)" d="M1,10c0-4.961,4.038-9,8.999-9V0C4.478,0,0,4.477,0,10v11h1V10z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qt_tb_lsc_top_t.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qt_tb_lsc_top_t.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="60px" height="21px" viewBox="0 0 60 21" enable-background="new 0 0 60 21" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="110.668" y1="-458.833" x2="110.668" y2="-398.833" gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 458.5001 121.1676)">
-	<stop  offset="0" style="stop-color:#00B9FF"/>
-	<stop  offset="0.2458" style="stop-color:#00A0EE"/>
-	<stop  offset="0.563" style="stop-color:#0087DC"/>
-	<stop  offset="0.7527" style="stop-color:#007DD5"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" d="M60,0H9.999C4.478,0,0,4.477,0,10v11h60V0z"/>
-<rect x="59.001" fill="#005EC2" width="0.999" height="21"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="79.3457" y1="184.001" x2="79.3457" y2="195.013" gradientTransform="matrix(4.298141e-008 0.9833 -0.9167 4.006877e-008 178.6672 -67.5211)">
-	<stop  offset="0" style="stop-color:#00B9FF"/>
-	<stop  offset="1" style="stop-color:#FFFFFF"/>
-</linearGradient>
-<path opacity="0.5" fill="url(#SVGID_2_)" d="M1,10c0-4.961,4.038-9,8.999-9V0C4.478,0,0,4.477,0,10v11h1V10z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading.axml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading.axml	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,14 @@
+<animations>
+<icon name="qtg_anim_loading" frame_duration="50" playmode="loop">
+<frame>qtg_anim_loading_1</frame>
+<frame>qtg_anim_loading_2</frame>
+<frame>qtg_anim_loading_3</frame>
+<frame>qtg_anim_loading_4</frame>
+<frame>qtg_anim_loading_5</frame>
+<frame>qtg_anim_loading_6</frame>
+<frame>qtg_anim_loading_7</frame>
+<frame>qtg_anim_loading_8</frame>
+<frame>qtg_anim_loading_9</frame>
+<frame>qtg_anim_loading_10</frame>
+</icon>
+</animations>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_1.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_1.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_1.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,14 +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="60px" version="1.1" viewBox="45 45 60 60" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g>
-<rect fill="none" height="52" width="52" x="49" y="49"/>
-<path d="M74.999,50.733c-0.031,0-0.065,0.001-0.096,0.001v5.71c0.03,0,0.064,0,0.096,0   c10.233,0,18.558,8.325,18.558,18.556c0,10.234-8.324,18.557-18.558,18.557c-10.105,0-18.351-8.117-18.555-18.176h-5.711   c0.204,13.207,11.011,23.887,24.266,23.887c13.38,0,24.269-10.885,24.269-24.268C99.268,61.62,88.379,50.733,74.999,50.733z" fill="url(#SVGID_1_)"/>
+<svg baseProfile="tiny" height="52px" version="1.1" viewBox="0 0 52 52" width="52px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="52" width="52"/>
+<path d="M25.999,1.732c-0.031,0-0.065,0.002-0.097,0.002v5.709c0.031,0,0.064,0,0.097,0  c10.233,0,18.558,8.326,18.558,18.557c0,10.234-8.324,18.557-18.558,18.557c-10.104,0-18.351-8.117-18.556-18.176H1.732  c0.205,13.207,11.012,23.887,24.267,23.887c13.38,0,24.269-10.885,24.269-24.268C50.268,12.62,39.379,1.732,25.999,1.732z" fill="url(#SVGID_1_)"/>
 <defs>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -342.4805 -316.0195)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="419.2471" x2="413.2628" y1="-400.5405" y2="-368.3206">
-<stop offset="0" style="stop-color:#3B87C0"/>
-<stop offset="1" style="stop-color:#0069B2;stop-opacity:0"/>
+<linearGradient gradientTransform="matrix(1 0 0 1 -603.5 -638.5)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="631.2676" x2="625.2834" y1="674.0195" y2="641.8002">
+<stop offset="0" style="stop-color:#0067B1"/>
+<stop offset="1" style="stop-color:#0069B1;stop-opacity:0.25"/>
 </linearGradient>
 </defs>
-</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_10.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_10.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_10.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,14 +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="60px" version="1.1" viewBox="45 45 60 60" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g>
-<rect fill="none" height="52" width="52" x="49" y="49"/>
-<path d="M60.735,55.369c-0.025,0.018-0.052,0.039-0.077,0.057l3.356,4.619   c0.024-0.018,0.052-0.038,0.078-0.056c8.279-6.015,19.907-4.173,25.921,4.104c6.016,8.28,4.173,19.906-4.106,25.921   c-8.176,5.939-19.617,4.22-25.695-3.799l-4.621,3.356c7.929,10.565,22.948,12.854,33.672,5.063   c10.825-7.864,13.236-23.071,5.37-33.898C86.768,49.911,71.56,47.504,60.735,55.369z" fill="url(#SVGID_1_)"/>
+<svg baseProfile="tiny" height="52px" version="1.1" viewBox="0 0 52 52" width="52px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="52" width="52"/>
+<path d="M11.734,6.369c-0.025,0.018-0.051,0.039-0.076,0.057l3.355,4.619  c0.023-0.018,0.053-0.038,0.078-0.057c8.279-6.014,19.906-4.172,25.922,4.105c6.016,8.279,4.172,19.905-4.107,25.92  c-8.176,5.939-19.617,4.221-25.695-3.799L6.59,40.57c7.93,10.566,22.949,12.854,33.674,5.063  c10.824-7.864,13.234-23.071,5.369-33.897C37.768,0.911,22.561-1.496,11.734,6.369z" fill="url(#SVGID_1_)"/>
 <defs>
-<linearGradient gradientTransform="matrix(0.809 -0.5878 -0.5878 -0.809 -492.5839 4.0465)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="419.2471" x2="413.2627" y1="-400.5405" y2="-368.3203">
-<stop offset="0" style="stop-color:#3B87C0"/>
-<stop offset="1" style="stop-color:#0069B2;stop-opacity:0"/>
+<linearGradient gradientTransform="matrix(0.809 -0.5878 0.5878 0.809 -809.3743 -387.0681)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="434.7861" x2="428.8017" y1="834.7246" y2="802.5044">
+<stop offset="0" style="stop-color:#0067B1"/>
+<stop offset="1" style="stop-color:#0069B1;stop-opacity:0.25"/>
 </linearGradient>
 </defs>
-</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_2.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_2.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_2.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,14 +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="60px" version="1.1" viewBox="45 45 60 60" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g>
-<rect fill="none" height="52" width="52" x="49" y="49"/>
-<path d="M89.263,55.367c-0.025-0.019-0.054-0.038-0.078-0.056l-3.356,4.62   c0.025,0.018,0.053,0.038,0.078,0.056c8.279,6.015,10.12,17.643,4.106,25.92c-6.016,8.279-17.642,10.12-25.921,4.104   c-8.176-5.939-10.075-17.353-4.328-25.611l-4.62-3.356c-7.598,10.805-5.133,25.797,5.591,33.588   c10.825,7.865,26.032,5.459,33.899-5.368C102.498,78.439,100.088,63.231,89.263,55.367z" fill="url(#SVGID_1_)"/>
+<svg baseProfile="tiny" height="52px" version="1.1" viewBox="0 1 52 52" width="52px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="52" width="52"/>
+<path d="M40.264,6.367c-0.025-0.02-0.055-0.038-0.078-0.057l-3.355,4.621  c0.023,0.018,0.053,0.037,0.078,0.055c8.277,6.017,10.119,17.644,4.105,25.921c-6.016,8.278-17.643,10.12-25.922,4.104  C6.916,35.072,5.018,23.658,10.764,15.4l-4.619-3.356c-7.598,10.806-5.133,25.797,5.59,33.588c10.826,7.865,26.033,5.459,33.9-5.368  C53.498,29.439,51.088,14.23,40.264,6.367z" fill="url(#SVGID_1_)"/>
 <defs>
-<linearGradient gradientTransform="matrix(0.809 0.5878 0.5878 -0.809 -32.9132 -486.7301)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="419.2471" x2="413.2627" y1="-400.54" y2="-368.3198">
-<stop offset="0" style="stop-color:#3B87C0"/>
-<stop offset="1" style="stop-color:#0069B2;stop-opacity:0"/>
+<linearGradient gradientTransform="matrix(0.809 0.5878 -0.5878 0.809 -288.5716 -720.7115)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="695.1816" x2="689.1973" y1="428.7139" y2="396.4937">
+<stop offset="0" style="stop-color:#0067B1"/>
+<stop offset="1" style="stop-color:#0069B1;stop-opacity:0.25"/>
 </linearGradient>
 </defs>
-</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_3.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_3.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_3.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,14 +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="60px" version="1.1" viewBox="45 45 60 60" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g>
-<rect fill="none" height="52" width="52" x="49" y="49"/>
-<path d="M98.079,67.5c-0.01-0.03-0.021-0.062-0.03-0.091l-5.431,1.765c0.01,0.029,0.021,0.062,0.029,0.091   c3.163,9.733-2.183,20.222-11.912,23.384c-9.734,3.162-20.221-2.183-23.384-11.916c-3.123-9.61,2.049-19.96,11.553-23.263   l-1.765-5.432c-12.498,4.275-19.315,17.854-15.22,30.46c4.135,12.725,17.852,19.717,30.58,15.582   C95.225,93.945,102.214,80.225,98.079,67.5z" fill="url(#SVGID_1_)"/>
+<svg baseProfile="tiny" height="52px" version="1.1" viewBox="0 0 52 52" width="52px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="52" width="52"/>
+<path d="M49.078,18.5c-0.01-0.029-0.02-0.063-0.029-0.091l-5.432,1.765c0.01,0.029,0.021,0.063,0.029,0.092  c3.164,9.732-2.184,20.221-11.912,23.383C22,46.811,11.514,41.466,8.352,31.732C5.229,22.123,10.4,11.773,19.904,8.471l-1.766-5.433  C5.641,7.313-1.176,20.893,2.918,33.498c4.137,12.725,17.854,19.717,30.58,15.582S53.213,31.225,49.078,18.5z" fill="url(#SVGID_1_)"/>
 <defs>
-<linearGradient gradientTransform="matrix(0.309 0.9511 0.9511 -0.309 317.874 -442.879)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="419.2471" x2="413.2627" y1="-400.54" y2="-368.3195">
-<stop offset="0" style="stop-color:#3B87C0"/>
-<stop offset="1" style="stop-color:#0069B2;stop-opacity:0"/>
+<linearGradient gradientTransform="matrix(0.309 0.9511 -0.9511 0.309 13.5896 -602.8)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="603.6143" x2="597.6299" y1="192.0293" y2="159.8088">
+<stop offset="0" style="stop-color:#3B86BF"/>
+<stop offset="1" style="stop-color:#0069B1;stop-opacity:0.25"/>
 </linearGradient>
 </defs>
-</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_4.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_4.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_4.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,14 +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="60px" version="1.1" viewBox="45 45 60 60" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g>
-<rect fill="none" height="52" width="52" x="49" y="49"/>
-<path d="M98.08,82.498c0.01-0.03,0.02-0.063,0.029-0.092l-5.431-1.765c-0.01,0.029-0.021,0.062-0.029,0.091   c-3.163,9.733-13.653,15.077-23.383,11.916c-9.734-3.162-15.077-13.651-11.914-23.384c3.123-9.611,13.391-14.944,23.021-12.03   l1.765-5.431c-12.624-3.887-26.121,3.09-30.216,15.696c-4.135,12.725,2.852,26.445,15.581,30.581   C80.227,102.215,93.945,95.223,98.08,82.498z" fill="url(#SVGID_1_)"/>
+<svg baseProfile="tiny" height="52px" version="1.1" viewBox="0 0 52 52" width="52px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="52" width="52"/>
+<path d="M49.08,33.498c0.01-0.03,0.02-0.063,0.029-0.092l-5.432-1.766c-0.01,0.029-0.021,0.063-0.029,0.092  c-3.162,9.732-13.652,15.076-23.383,11.916C10.531,40.486,5.189,29.997,8.352,20.264C11.475,10.652,21.742,5.32,31.373,8.234  l1.766-5.432C20.514-1.084,7.018,5.893,2.922,18.499c-4.135,12.726,2.852,26.444,15.58,30.581  C31.227,53.215,44.945,46.223,49.08,33.498z" fill="url(#SVGID_1_)"/>
 <defs>
-<linearGradient gradientTransform="matrix(-0.309 0.9511 0.9511 0.309 575.8906 -201.2149)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="419.2471" x2="413.2627" y1="-400.54" y2="-368.3195">
-<stop offset="0" style="stop-color:#3B87C0"/>
-<stop offset="1" style="stop-color:#0069B2;stop-opacity:0"/>
+<linearGradient gradientTransform="matrix(-0.309 0.9511 -0.9511 -0.309 189.1018 -329.3094)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="390.0723" x2="384.0879" y1="54.8574" y2="22.6369">
+<stop offset="0" style="stop-color:#0067B1"/>
+<stop offset="1" style="stop-color:#0069B1;stop-opacity:0.25"/>
 </linearGradient>
 </defs>
-</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_5.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_5.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_5.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,14 +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="60px" version="1.1" viewBox="45 45 60 60" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g>
-<rect fill="none" height="52" width="52" x="49" y="49"/>
-<path d="M89.266,94.632c0.025-0.019,0.053-0.039,0.077-0.057l-3.356-4.62   c-0.024,0.019-0.052,0.038-0.077,0.057c-8.279,6.016-19.908,4.173-25.921-4.104c-6.016-8.28-4.173-19.906,4.106-25.921   c8.176-5.94,19.618-4.219,25.695,3.799l4.62-3.357c-7.928-10.565-22.948-12.853-33.671-5.062   c-10.825,7.865-13.236,23.071-5.37,33.898C63.232,100.09,78.44,102.497,89.266,94.632z" fill="url(#SVGID_1_)"/>
+<svg baseProfile="tiny" height="52px" version="1.1" viewBox="0 0 52 52" width="52px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="52" width="52"/>
+<path d="M40.265,45.632c0.025-0.019,0.053-0.039,0.078-0.057l-3.357-4.62  c-0.023,0.02-0.051,0.038-0.076,0.057c-8.279,6.016-19.908,4.174-25.921-4.104c-6.016-8.28-4.172-19.905,4.107-25.922  c8.176-5.939,19.617-4.219,25.695,3.8l4.619-3.356C37.482,0.863,22.463-1.424,11.738,6.367C0.914,14.232-1.496,29.438,6.369,40.266  C14.232,51.09,29.439,53.497,40.265,45.632z" fill="url(#SVGID_1_)"/>
 <defs>
-<linearGradient gradientTransform="matrix(-0.809 0.5878 0.5878 0.809 642.5839 145.9526)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="419.2471" x2="413.2627" y1="-400.5396" y2="-368.319">
-<stop offset="0" style="stop-color:#3B87C0"/>
-<stop offset="1" style="stop-color:#0069B2;stop-opacity:0"/>
+<linearGradient gradientTransform="matrix(-0.809 0.5878 -0.5878 -0.809 170.3323 -4.893)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="136.6899" x2="130.7054" y1="69.3574" y2="37.1362">
+<stop offset="0" style="stop-color:#0067B1"/>
+<stop offset="1" style="stop-color:#0069B1;stop-opacity:0.25"/>
 </linearGradient>
 </defs>
-</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_6.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_6.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_6.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,14 +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="60px" version="1.1" viewBox="45 45 60 60" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g>
-<rect fill="none" height="52" width="52" x="49" y="49"/>
-<path d="M75.002,99.268c0.031,0,0.065-0.001,0.096-0.001v-5.71c-0.03,0-0.064,0-0.096,0   c-10.234,0-18.558-8.325-18.558-18.556c0-10.235,8.324-18.557,18.558-18.557c10.105,0,18.351,8.117,18.555,18.176h5.711   c-0.204-13.208-11.011-23.887-24.266-23.887c-13.38,0-24.269,10.885-24.269,24.268C50.733,88.381,61.622,99.268,75.002,99.268z" fill="url(#SVGID_1_)"/>
+<svg baseProfile="tiny" height="52px" version="1.1" viewBox="0 0 52 52" width="52px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="52" width="52"/>
+<path d="M26.002,50.267c0.031,0,0.064,0,0.096,0v-5.711c-0.029,0-0.063,0-0.096,0  c-10.234,0-18.559-8.324-18.559-18.555c0-10.235,8.324-18.558,18.559-18.558c10.106,0,18.352,8.117,18.555,18.177h5.711  C50.065,12.412,39.258,1.732,26.002,1.732c-13.379,0-24.27,10.886-24.27,24.269C1.732,39.38,12.623,50.267,26.002,50.267z" fill="url(#SVGID_1_)"/>
 <defs>
-<linearGradient gradientTransform="matrix(-1 0 0 1 492.4805 466.0195)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="419.2471" x2="413.2627" y1="-400.5396" y2="-368.319">
-<stop offset="0" style="stop-color:#3B87C0"/>
-<stop offset="1" style="stop-color:#0069B2;stop-opacity:0"/>
+<linearGradient gradientTransform="matrix(-1 0 0 -1 -35.5381 246.5381)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-59.7715" x2="-65.756" y1="230.0591" y2="197.8378">
+<stop offset="0" style="stop-color:#0067B1"/>
+<stop offset="1" style="stop-color:#0069B1;stop-opacity:0.25"/>
 </linearGradient>
 </defs>
-</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_7.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_7.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_7.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,14 +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="60px" version="1.1" viewBox="45 45 60 60" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g>
-<rect fill="none" height="52" width="52" x="49" y="49"/>
-<path d="M60.738,94.634c0.025,0.019,0.053,0.038,0.078,0.056l3.356-4.619   c-0.024-0.019-0.052-0.038-0.078-0.057c-8.279-6.016-10.12-17.644-4.107-25.92c6.016-8.28,17.643-10.12,25.922-4.105   c8.175,5.94,10.074,17.353,4.327,25.611l4.62,3.357c7.598-10.806,5.133-25.797-5.591-33.588   c-10.825-7.865-26.032-5.459-33.898,5.368C47.502,71.562,49.913,86.77,60.738,94.634z" fill="url(#SVGID_1_)"/>
+<svg baseProfile="tiny" height="52px" version="1.1" viewBox="0 0 52 52" width="52px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="52" width="52"/>
+<path d="M11.738,45.633c0.025,0.02,0.053,0.039,0.078,0.057l3.355-4.619  c-0.023-0.018-0.051-0.037-0.078-0.057c-8.279-6.016-10.119-17.644-4.107-25.92C17.004,6.814,28.63,4.975,36.91,10.988  c8.174,5.941,10.072,17.354,4.326,25.612l4.619,3.357c7.6-10.807,5.133-25.797-5.59-33.588C29.439-1.496,14.232,0.91,6.367,11.736  S0.914,37.77,11.738,45.633z" fill="url(#SVGID_1_)"/>
 <defs>
-<linearGradient gradientTransform="matrix(-0.809 -0.5878 -0.5878 0.809 182.9132 636.7306)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="419.2471" x2="413.2627" y1="-400.5396" y2="-368.3193">
-<stop offset="0" style="stop-color:#3B87C0"/>
-<stop offset="1" style="stop-color:#0069B2;stop-opacity:0"/>
+<linearGradient gradientTransform="matrix(-0.809 -0.5878 0.5878 -0.809 -349.8818 328.9452)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-124.2505" x2="-130.235" y1="475.5562" y2="443.3352">
+<stop offset="0" style="stop-color:#0067B1"/>
+<stop offset="1" style="stop-color:#0069B1;stop-opacity:0.25"/>
 </linearGradient>
 </defs>
-</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_8.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_8.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_8.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,14 +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="60px" version="1.1" viewBox="45 45 60 60" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g>
-<rect fill="none" height="52" width="52" x="49" y="49"/>
-<path d="M51.921,82.501c0.009,0.029,0.021,0.062,0.03,0.091l5.431-1.765c-0.009-0.028-0.02-0.062-0.03-0.091   c-3.163-9.733,2.183-20.223,11.913-23.384c9.734-3.163,20.221,2.183,23.384,11.916c3.122,9.611-2.05,19.961-11.554,23.264   l1.765,5.431c12.498-4.275,19.316-17.853,15.22-30.459C93.945,54.777,80.229,47.785,67.5,51.921   C54.775,56.056,47.787,69.775,51.921,82.501z" fill="url(#SVGID_1_)"/>
+<svg baseProfile="tiny" height="52px" version="1.1" viewBox="0 0 52 52" width="52px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="52" width="52"/>
+<path d="M2.922,33.501c0.008,0.028,0.02,0.062,0.029,0.091l5.432-1.765c-0.01-0.028-0.021-0.062-0.031-0.091  c-3.162-9.733,2.184-20.223,11.914-23.385C30,5.189,40.487,10.535,43.649,20.268c3.123,9.611-2.049,19.961-11.553,23.265  l1.764,5.431c12.498-4.275,19.316-17.854,15.221-30.459C44.946,5.777,31.229-1.215,18.5,2.921  C5.775,7.057-1.213,20.775,2.922,33.501z" fill="url(#SVGID_1_)"/>
 <defs>
-<linearGradient gradientTransform="matrix(-0.309 -0.9511 -0.9511 0.309 -167.8735 592.8785)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="419.2471" x2="413.2627" y1="-400.5396" y2="-368.3193">
-<stop offset="0" style="stop-color:#3B87C0"/>
-<stop offset="1" style="stop-color:#0069B2;stop-opacity:0"/>
+<linearGradient gradientTransform="matrix(-0.309 -0.9511 0.9511 -0.309 -652.6261 210.8405)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-32.1201" x2="-38.1047" y1="712.0537" y2="679.8328">
+<stop offset="0" style="stop-color:#0067B1"/>
+<stop offset="1" style="stop-color:#0069B1;stop-opacity:0.25"/>
 </linearGradient>
 </defs>
-</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_9.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_9.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_9.svg	Mon May 03 12:48:33 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="60px" version="1.1" viewBox="45 45 60 60" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g>
-<rect fill="none" height="52" width="52" x="49" y="49"/>
-<path d="M51.92,67.503c-0.009,0.03-0.019,0.063-0.028,0.091l5.43,1.764c0.01-0.028,0.02-0.061,0.03-0.091   c3.163-9.733,13.652-15.077,23.382-11.916c9.734,3.163,15.077,13.651,11.914,23.384c-3.122,9.61-13.39,14.944-23.02,12.029   l-1.765,5.432c12.625,3.888,26.121-3.09,30.216-15.696c4.135-12.726-2.853-26.445-15.58-30.581   C69.773,47.786,56.055,54.777,51.92,67.503z" fill="url(#SVGID_1_)"/>
+<svg baseProfile="tiny" height="52px" version="1.1" viewBox="0.001 0 52 52" width="52px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="52" width="52.002"/>
+<path d="M2.92,18.503c-0.01,0.03-0.02,0.063-0.027,0.091l5.432,1.764c0.01-0.027,0.02-0.061,0.029-0.09  c3.164-9.733,13.65-15.078,23.383-11.916c9.73,3.162,15.076,13.651,11.912,23.383C40.525,41.346,30.26,46.68,20.627,43.764  l-1.764,5.432C31.49,53.084,44.984,46.105,49.08,33.5C53.215,20.773,46.229,7.055,33.5,2.919C20.773-1.214,7.057,5.777,2.92,18.503z  " fill="url(#SVGID_1_)"/>
 <defs>
-<linearGradient gradientTransform="matrix(0.309 -0.9511 -0.9511 -0.309 -425.8908 351.2161)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="419.2471" x2="413.2628" y1="-400.541" y2="-368.3211">
-<stop offset="0" style="stop-color:#3B87C0"/>
-<stop offset="1" style="stop-color:#0069B2;stop-opacity:0"/>
+<linearGradient gradientTransform="matrix(0.309 -0.9511 0.9511 0.309 -828.1402 -62.6477)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="181.373" x2="175.3885" y1="849.2324" y2="817.0112">
+<stop offset="0" style="stop-color:#0067B1"/>
+<stop offset="0.9939" style="stop-color:#0069B1;stop-opacity:0.25"/>
+<stop offset="1" style="stop-color:#0069B1;stop-opacity:0.25"/>
 </linearGradient>
 </defs>
-</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap.axml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap.axml	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,13 @@
+<animations>
+<icon name="qtg_anim_longtap" frame_duration="50" playmode="loop">
+<frame>qtg_anim_longtap_1</frame>
+<frame>qtg_anim_longtap_2</frame>
+<frame>qtg_anim_longtap_3</frame>
+<frame>qtg_anim_longtap_4</frame>
+<frame>qtg_anim_longtap_5</frame>
+<frame>qtg_anim_longtap_6</frame>
+<frame>qtg_anim_longtap_7</frame>
+<frame>qtg_anim_longtap_8</frame>
+<frame>qtg_anim_longtap_9</frame>
+</icon>
+</animations>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_1.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_1.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_1.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,33 +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="75px" version="1.1" viewBox="-1.5 -1.6 75 75" width="75px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="0" x2="19.814" y1="23.1826" y2="23.1826">
-<stop offset="0" style="stop-color:#3B87C0"/>
-<stop offset="1" style="stop-color:#0069B2"/>
-</linearGradient>
-<path d="M13.8,35.3c0.2-5.6,2.4-10.7,6-14.5L10,11.1C4,17.4,0.2,25.9,0,35.3H13.8z" fill="url(#SVGID_1_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="11.0552" x2="35.3105" y1="9.9063" y2="9.9063">
-<stop offset="0" style="stop-color:#3B87C0"/>
-<stop offset="1" style="stop-color:#0069B2"/>
-</linearGradient>
-<path d="M20.8,19.8c3.8-3.6,8.9-5.8,14.5-6V0c-9.4,0.2-17.9,4-24.3,10L20.8,19.8z" fill="url(#SVGID_2_)"/>
-<path d="M36.7,0v13.8c5.6,0.2,10.7,2.4,14.5,6L61,10C54.7,4,46.1,0.2,36.7,0z" fill="#5AB85B"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="0" x2="19.814" y1="48.8647" y2="48.8647">
-<stop offset="0" style="stop-color:#3B87C0"/>
-<stop offset="1" style="stop-color:#0069B2"/>
-</linearGradient>
-<path d="M19.8,51.2c-3.6-3.8-5.8-8.9-6-14.5H0C0.2,46.1,4,54.7,10,61L19.8,51.2z" fill="url(#SVGID_3_)"/>
-<path d="M52.2,20.8c3.6,3.8,5.8,8.9,6,14.5H72c-0.2-9.4-4-17.9-10-24.3L52.2,20.8z" fill="#5AB85B"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="11.0552" x2="35.3105" y1="62.1421" y2="62.1421">
-<stop offset="0" style="stop-color:#3B87C0"/>
-<stop offset="1" style="stop-color:#0069B2"/>
-</linearGradient>
-<path d="M35.3,58.2c-5.6-0.2-10.7-2.4-14.5-6L11.1,62c6.3,6.1,14.8,9.9,24.3,10V58.2z" fill="url(#SVGID_4_)"/>
-<path d="M51.2,52.2c-3.8,3.6-8.9,5.8-14.5,6V72c9.4-0.2,17.9-4,24.3-10L51.2,52.2z" fill="#424242"/>
-<linearGradient gradientTransform="matrix(1 0 0 1 -1269.75 -3487.3887)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="1306.4873" x2="1311.042" y1="3494.2671" y2="3494.2671">
-<stop offset="0" style="stop-color:#3B87C0"/>
-<stop offset="1" style="stop-color:#0069B2"/>
-</linearGradient>
-<polygon fill="url(#SVGID_5_)" points="41.3,6.9 36.7,13.8 36.7,0 41.3,6.9 "/>
-<path d="M58.3,36.7L58.3,36.7c-0.2,5.6-2.5,10.7-6.1,14.5L62,61c6.1-6.3,9.9-14.8,10-24.3H58.3z" fill="#424242"/>
+<svg baseProfile="tiny" height="72px" version="1.1" viewBox="0 0 72 72" width="72px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M13.801,35.3c0.199-5.6,2.4-10.7,6-14.5L10,11.1C4,17.4,0.201,25.9,0,35.3H13.801z" fill="#0067B1"/>
+<path d="M20.801,19.8c3.8-3.6,8.9-5.8,14.5-6V0C25.9,0.2,17.4,4,11,10L20.801,19.8z" fill="#0067B1"/>
+<path d="M36.701,0v13.8c5.6,0.2,10.699,2.4,14.5,6L61,10C54.701,4,46.1,0.2,36.701,0z" fill="#82C341"/>
+<path d="M19.801,51.2c-3.6-3.8-5.801-8.9-6-14.5H0C0.201,46.1,4,54.7,10,61L19.801,51.2z" fill="#0067B1"/>
+<path d="M52.201,20.8c3.6,3.8,5.799,8.9,6,14.5H72C71.801,25.9,68,17.4,62,11L52.201,20.8z" fill="#82C341"/>
+<path d="M35.301,58.2c-5.6-0.2-10.7-2.4-14.5-6l-9.7,9.8c6.3,6.1,14.8,9.9,24.3,10V58.2H35.301z" fill="#0067B1"/>
+<path d="M51.201,52.2c-3.801,3.6-8.9,5.8-14.5,6V72C46.1,71.8,54.6,68,61,62L51.201,52.2z" fill="#424242"/>
+<polygon fill="#0067B1" points="41.301,6.9 36.701,13.8 36.701,0 "/>
+<path d="M58.301,36.7L58.301,36.7c-0.201,5.6-2.5,10.7-6.1,14.5L62,61c6.1-6.3,9.9-14.8,10-24.3H58.301z" fill="#424242"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_2.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_2.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_2.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,33 +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="75px" version="1.1" viewBox="-1.5 -1.6 75 75" width="75px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="0" x2="19.814" y1="23.1826" y2="23.1826">
-<stop offset="0" style="stop-color:#3B87C0"/>
-<stop offset="1" style="stop-color:#0069B2"/>
-</linearGradient>
-<path d="M13.8,35.3c0.2-5.6,2.4-10.7,6-14.5L10,11.1C4,17.4,0.2,25.9,0,35.3H13.8z" fill="url(#SVGID_1_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="11.0552" x2="35.3105" y1="9.9063" y2="9.9063">
-<stop offset="0" style="stop-color:#3B87C0"/>
-<stop offset="1" style="stop-color:#0069B2"/>
-</linearGradient>
-<path d="M20.8,19.8c3.8-3.6,8.9-5.8,14.5-6V0c-9.4,0.2-17.9,4-24.3,10L20.8,19.8z" fill="url(#SVGID_2_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="36.7383" x2="60.9922" y1="9.9063" y2="9.9063">
-<stop offset="0" style="stop-color:#3B87C0"/>
-<stop offset="1" style="stop-color:#0069B2"/>
-</linearGradient>
-<path d="M36.7,0v13.8c5.6,0.2,10.7,2.4,14.5,6L61,10C54.7,4,46.1,0.2,36.7,0z" fill="url(#SVGID_3_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="0" x2="19.814" y1="48.8647" y2="48.8647">
-<stop offset="0" style="stop-color:#3B87C0"/>
-<stop offset="1" style="stop-color:#0069B2"/>
-</linearGradient>
-<path d="M19.8,51.2c-3.6-3.8-5.8-8.9-6-14.5H0C0.2,46.1,4,54.7,10,61L19.8,51.2z" fill="url(#SVGID_4_)"/>
-<path d="M52.2,20.8c3.6,3.8,5.8,8.9,6,14.5H72c-0.2-9.4-4-17.9-10-24.3L52.2,20.8z" fill="#5AB85B"/>
-<path d="M35.3,58.2c-5.6-0.2-10.7-2.4-14.5-6L11.1,62c6.3,6.1,14.8,9.9,24.3,10V58.2z" fill="#424242"/>
-<path d="M51.2,52.2c-3.8,3.6-8.9,5.8-14.5,6V72c9.4-0.2,17.9-4,24.3-10L51.2,52.2z" fill="#424242"/>
-<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 1584.3986 -3389.3784)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="1327.9453" x2="1332.5" y1="3487.8726" y2="3487.8726">
-<stop offset="0" style="stop-color:#3B87C0"/>
-<stop offset="1" style="stop-color:#0069B2"/>
-</linearGradient>
-<polygon fill="url(#SVGID_5_)" points="60.3,19.1 52.2,20.8 62,11.1 60.3,19.1 "/>
-<path d="M58.3,36.7L58.3,36.7c-0.2,5.6-2.5,10.7-6.1,14.5L62,61c6.1-6.3,9.9-14.8,10-24.3H58.3z" fill="#5AB85B"/>
+<svg baseProfile="tiny" height="72px" version="1.1" viewBox="0 0 72 72" width="72px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M13.8,35.3c0.2-5.6,2.4-10.7,6-14.5L10,11.1C4,17.4,0.2,25.9,0,35.3H13.8z" fill="#0067B1"/>
+<path d="M20.8,19.8c3.801-3.6,8.9-5.8,14.5-6V0c-9.4,0.2-17.9,4-24.3,10L20.8,19.8z" fill="#0067B1"/>
+<path d="M36.7,0v13.8c5.599,0.2,10.701,2.4,14.5,6L61,10C54.699,4,46.1,0.2,36.7,0z" fill="#0067B1"/>
+<path d="M19.8,51.2c-3.6-3.8-5.8-8.9-6-14.5H0C0.2,46.1,4,54.7,10,61L19.8,51.2z" fill="#0067B1"/>
+<path d="M52.199,20.8c3.6,3.8,5.801,8.9,6,14.5H72C71.799,25.9,68,17.4,62,11L52.199,20.8z" fill="#82C341"/>
+<path d="M35.3,58.2c-5.6-0.2-10.699-2.4-14.5-6L11.101,62c6.299,6.1,14.799,9.9,24.299,10V58.2H35.3z" fill="#424242"/>
+<path d="M51.199,52.2c-3.799,3.6-8.9,5.8-14.5,6V72c9.4-0.2,17.9-4,24.3-10L51.199,52.2z" fill="#424242"/>
+<polygon fill="#0067B1" points="60.299,19.1 52.199,20.8 62,11.1 "/>
+<path d="M58.299,36.7L58.299,36.7c-0.199,5.6-2.5,10.7-6.1,14.5L62,61c6.1-6.3,9.9-14.8,10-24.3H58.299z" fill="#82C341"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_3.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_3.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_3.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,33 +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="75px" version="1.1" viewBox="-1.5 -1.6 75 75" width="75px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="0" x2="19.814" y1="23.1826" y2="23.1826">
-<stop offset="0" style="stop-color:#3B87C0"/>
-<stop offset="1" style="stop-color:#0069B2"/>
-</linearGradient>
-<path d="M13.8,35.3c0.2-5.6,2.4-10.7,6-14.5L10,11.1C4,17.4,0.2,25.9,0,35.3H13.8z" fill="url(#SVGID_1_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="11.0552" x2="35.3105" y1="9.9063" y2="9.9063">
-<stop offset="0" style="stop-color:#3B87C0"/>
-<stop offset="1" style="stop-color:#0069B2"/>
-</linearGradient>
-<path d="M20.8,19.8c3.8-3.6,8.9-5.8,14.5-6V0c-9.4,0.2-17.9,4-24.3,10L20.8,19.8z" fill="url(#SVGID_2_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="36.7383" x2="60.9922" y1="9.9063" y2="9.9063">
-<stop offset="0" style="stop-color:#3B87C0"/>
-<stop offset="1" style="stop-color:#0069B2"/>
-</linearGradient>
-<path d="M36.7,0v13.8c5.6,0.2,10.7,2.4,14.5,6L61,10C54.7,4,46.1,0.2,36.7,0z" fill="url(#SVGID_3_)"/>
-<path d="M19.8,51.2c-3.6-3.8-5.8-8.9-6-14.5H0C0.2,46.1,4,54.7,10,61L19.8,51.2z" fill="#424242"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="52.2354" x2="72.0469" y1="23.1826" y2="23.1826">
-<stop offset="0" style="stop-color:#3B87C0"/>
-<stop offset="1" style="stop-color:#0069B2"/>
-</linearGradient>
-<path d="M52.2,20.8c3.6,3.8,5.8,8.9,6,14.5H72c-0.2-9.4-4-17.9-10-24.3L52.2,20.8z" fill="url(#SVGID_4_)"/>
-<path d="M35.3,58.2c-5.6-0.2-10.7-2.4-14.5-6L11.1,62c6.3,6.1,14.8,9.9,24.3,10V58.2z" fill="#424242"/>
-<path d="M51.2,52.2c-3.8,3.6-8.9,5.8-14.5,6V72c9.4-0.2,17.9-4,24.3-10L51.2,52.2z" fill="#5AB85B"/>
-<path d="M58.3,36.7L58.3,36.7c-0.2,5.6-2.5,10.7-6.1,14.5L62,61c6.1-6.3,9.9-14.8,10-24.3H58.3z" fill="#5AB85B"/>
-<linearGradient gradientTransform="matrix(0 1 -1 0 3546.5811 -1312.6934)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="1349.4316" x2="1353.9863" y1="3481.4136" y2="3481.4136">
-<stop offset="0" style="stop-color:#3B87C0"/>
-<stop offset="1" style="stop-color:#0069B2"/>
-</linearGradient>
-<polygon fill="url(#SVGID_5_)" points="65.2,41.3 58.3,36.7 72,36.7 65.2,41.3 "/>
+<svg baseProfile="tiny" height="72px" version="1.1" viewBox="0 0 72 72" width="72px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M13.799,35.3c0.201-5.6,2.4-10.7,6-14.5L10,11.1C4,17.4,0.199,25.9,0,35.3H13.799z" fill="#0067B1"/>
+<path d="M20.799,19.8c3.801-3.6,8.9-5.8,14.5-6V0C25.899,0.2,17.399,4,11,10L20.799,19.8z" fill="#0067B1"/>
+<path d="M36.699,0v13.8c5.6,0.2,10.701,2.4,14.5,6L61,10C54.699,4,46.1,0.2,36.699,0z" fill="#0067B1"/>
+<path d="M19.799,51.2c-3.6-3.8-5.799-8.9-6-14.5H0C0.199,46.1,4,54.7,10,61L19.799,51.2z" fill="#424242"/>
+<path d="M52.199,20.8c3.6,3.8,5.801,8.9,6,14.5H72C71.799,25.9,68,17.4,62,11L52.199,20.8z" fill="#0067B1"/>
+<path d="M35.299,58.2c-5.6-0.2-10.699-2.4-14.5-6L11.1,62c6.3,6.1,14.8,9.9,24.3,10V58.2H35.299z" fill="#424242"/>
+<path d="M51.199,52.2c-3.799,3.6-8.9,5.8-14.5,6V72C46.1,71.8,54.6,68,61,62L51.199,52.2z" fill="#82C341"/>
+<path d="M58.299,36.7L58.299,36.7c-0.199,5.6-2.5,10.7-6.1,14.5L62,61c6.1-6.3,9.9-14.8,10-24.3H58.299z" fill="#82C341"/>
+<polygon fill="#0067B1" points="65.199,41.3 58.299,36.7 72,36.7 "/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_4.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_4.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_4.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,33 +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="75px" version="1.1" viewBox="-1.5 -1.6 75 75" width="75px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<path d="M13.8,35.3c0.2-5.6,2.4-10.7,6-14.5L10,11.1C4,17.4,0.2,25.9,0,35.3H13.8z" fill="#424242"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="11.0552" x2="35.3105" y1="9.9063" y2="9.9063">
-<stop offset="0" style="stop-color:#3B87C0"/>
-<stop offset="1" style="stop-color:#0069B2"/>
-</linearGradient>
-<path d="M20.8,19.8c3.8-3.6,8.9-5.8,14.5-6V0c-9.4,0.2-17.9,4-24.3,10L20.8,19.8z" fill="url(#SVGID_1_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="36.7383" x2="60.9922" y1="9.9063" y2="9.9063">
-<stop offset="0" style="stop-color:#3B87C0"/>
-<stop offset="1" style="stop-color:#0069B2"/>
-</linearGradient>
-<path d="M36.7,0v13.8c5.6,0.2,10.7,2.4,14.5,6L61,10C54.7,4,46.1,0.2,36.7,0z" fill="url(#SVGID_2_)"/>
-<path d="M19.8,51.2c-3.6-3.8-5.8-8.9-6-14.5H0C0.2,46.1,4,54.7,10,61L19.8,51.2z" fill="#424242"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="52.2354" x2="72.0469" y1="23.1826" y2="23.1826">
-<stop offset="0" style="stop-color:#3B87C0"/>
-<stop offset="1" style="stop-color:#0069B2"/>
-</linearGradient>
-<path d="M52.2,20.8c3.6,3.8,5.8,8.9,6,14.5H72c-0.2-9.4-4-17.9-10-24.3L52.2,20.8z" fill="url(#SVGID_3_)"/>
-<path d="M35.3,58.2c-5.6-0.2-10.7-2.4-14.5-6L11.1,62c6.3,6.1,14.8,9.9,24.3,10V58.2z" fill="#5AB85B"/>
-<path d="M51.2,52.2c-3.8,3.6-8.9,5.8-14.5,6V72c9.4-0.2,17.9-4,24.3-10L51.2,52.2z" fill="#5AB85B"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="52.2354" x2="72.0469" y1="48.8647" y2="48.8647">
-<stop offset="0" style="stop-color:#3B87C0"/>
-<stop offset="1" style="stop-color:#0069B2"/>
-</linearGradient>
-<path d="M58.3,36.7L58.3,36.7c-0.2,5.6-2.5,10.7-6.1,14.5L62,61c6.1-6.3,9.9-14.8,10-24.3H58.3z" fill="url(#SVGID_4_)"/>
-<linearGradient gradientTransform="matrix(-0.7071 0.7071 -0.7071 -0.7071 3493.6553 1560.1959)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="1367.8477" x2="1372.4023" y1="3493.5483" y2="3493.5483">
-<stop offset="0" style="stop-color:#3B87C0"/>
-<stop offset="1" style="stop-color:#0069B2"/>
-</linearGradient>
-<polygon fill="url(#SVGID_5_)" points="52.9,60.3 51.3,52.2 61,62 52.9,60.3 "/>
+<svg baseProfile="tiny" height="72px" version="1.1" viewBox="0 0 72 72" width="72px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M13.799,35.3c0.201-5.6,2.4-10.7,6-14.5L10,11.1C4,17.4,0.199,25.9,0,35.3H13.799z" fill="#424242"/>
+<path d="M20.799,19.8c3.801-3.6,8.9-5.8,14.5-6V0C25.899,0.2,17.399,4,11,10L20.799,19.8z" fill="#0067B1"/>
+<path d="M36.699,0v13.8c5.6,0.2,10.701,2.4,14.5,6L61,10C54.699,4,46.1,0.2,36.699,0z" fill="#0067B1"/>
+<path d="M19.799,51.2c-3.6-3.8-5.799-8.9-6-14.5H0C0.199,46.1,4,54.7,10,61L19.799,51.2z" fill="#424242"/>
+<path d="M52.199,20.8c3.6,3.8,5.801,8.9,6,14.5H72C71.799,25.9,68,17.4,62,11L52.199,20.8z" fill="#0067B1"/>
+<path d="M35.299,58.2c-5.6-0.2-10.699-2.4-14.5-6L11.1,62c6.3,6.1,14.8,9.9,24.3,10V58.2H35.299z" fill="#82C341"/>
+<path d="M51.199,52.2c-3.799,3.6-8.9,5.8-14.5,6V72C46.1,71.8,54.6,68,61,62L51.199,52.2z" fill="#82C341"/>
+<path d="M58.299,36.7L58.299,36.7c-0.199,5.6-2.5,10.7-6.1,14.5L62,61c6.1-6.3,9.9-14.8,10-24.3H58.299z" fill="#0067B1"/>
+<polygon fill="#0067B1" points="52.9,60.3 51.299,52.2 61,62 "/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_5.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_5.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_5.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,33 +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="75px" version="1.1" viewBox="-1.5 -1.6 75 75" width="75px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<svg baseProfile="tiny" height="72px" version="1.1" viewBox="0 0 72 72" width="72px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
 <path d="M13.8,35.3c0.2-5.6,2.4-10.7,6-14.5L10,11.1C4,17.4,0.2,25.9,0,35.3H13.8z" fill="#424242"/>
-<path d="M20.8,19.8c3.8-3.6,8.9-5.8,14.5-6V0c-9.4,0.2-17.9,4-24.3,10L20.8,19.8z" fill="#424242"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="36.7383" x2="60.9922" y1="9.9063" y2="9.9063">
-<stop offset="0" style="stop-color:#3B87C0"/>
-<stop offset="1" style="stop-color:#0069B2"/>
-</linearGradient>
-<path d="M36.7,0v13.8c5.6,0.2,10.7,2.4,14.5,6L61,10C54.7,4,46.1,0.2,36.7,0z" fill="url(#SVGID_1_)"/>
-<path d="M19.8,51.2c-3.6-3.8-5.8-8.9-6-14.5H0C0.2,46.1,4,54.7,10,61L19.8,51.2z" fill="#5AB85B"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="52.2354" x2="72.0469" y1="23.1826" y2="23.1826">
-<stop offset="0" style="stop-color:#3B87C0"/>
-<stop offset="1" style="stop-color:#0069B2"/>
-</linearGradient>
-<path d="M52.2,20.8c3.6,3.8,5.8,8.9,6,14.5H72c-0.2-9.4-4-17.9-10-24.3L52.2,20.8z" fill="url(#SVGID_2_)"/>
-<path d="M35.3,58.2c-5.6-0.2-10.7-2.4-14.5-6L11.1,62c6.3,6.1,14.8,9.9,24.3,10V58.2z" fill="#5AB85B"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="36.7383" x2="60.9922" y1="62.1421" y2="62.1421">
-<stop offset="0" style="stop-color:#3B87C0"/>
-<stop offset="1" style="stop-color:#0069B2"/>
-</linearGradient>
-<path d="M51.2,52.2c-3.8,3.6-8.9,5.8-14.5,6V72c9.4-0.2,17.9-4,24.3-10L51.2,52.2z" fill="url(#SVGID_3_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="52.2354" x2="72.0469" y1="48.8647" y2="48.8647">
-<stop offset="0" style="stop-color:#3B87C0"/>
-<stop offset="1" style="stop-color:#0069B2"/>
-</linearGradient>
-<path d="M58.3,36.7L58.3,36.7c-0.2,5.6-2.5,10.7-6.1,14.5L62,61c6.1-6.3,9.9-14.8,10-24.3H58.3z" fill="url(#SVGID_4_)"/>
-<linearGradient gradientTransform="matrix(-1 0 0 -1 1424.6426 3552.2568)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="1389.332" x2="1393.8867" y1="3487.0864" y2="3487.0864">
-<stop offset="0" style="stop-color:#3B87C0"/>
-<stop offset="1" style="stop-color:#0069B2"/>
-</linearGradient>
-<polygon fill="url(#SVGID_5_)" points="30.8,65.2 35.3,58.3 35.3,72 30.8,65.2 "/>
+<path d="M20.8,19.8c3.801-3.6,8.9-5.8,14.5-6V0c-9.4,0.2-17.9,4-24.3,10L20.8,19.8z" fill="#424242"/>
+<path d="M36.701,0v13.8c5.6,0.2,10.699,2.4,14.5,6L61,10C54.701,4,46.099,0.2,36.701,0z" fill="#0067B1"/>
+<path d="M19.8,51.2c-3.6-3.8-5.8-8.9-6-14.5H0C0.2,46.1,4,54.7,10,61L19.8,51.2z" fill="#82C341"/>
+<path d="M52.201,20.8c3.6,3.8,5.799,8.9,6,14.5H72C71.8,25.9,68,17.4,62,11L52.201,20.8z" fill="#0067B1"/>
+<path d="M35.3,58.2c-5.6-0.2-10.699-2.4-14.5-6L11.101,62c6.299,6.1,14.799,9.9,24.299,10V58.2H35.3z" fill="#82C341"/>
+<path d="M51.201,52.2c-3.801,3.6-8.9,5.8-14.5,6V72C46.099,71.8,54.599,68,61,62L51.201,52.2z" fill="#0067B1"/>
+<path d="M58.3,36.7L58.3,36.7c-0.201,5.6-2.5,10.7-6.1,14.5L62,61c6.1-6.3,9.9-14.8,10-24.3H58.3z" fill="#0067B1"/>
+<polygon fill="#0067B1" points="30.8,65.2 35.3,58.3 35.3,72 "/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_6.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_6.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_6.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,37 +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="75px" version="1.1" viewBox="-1.5 -1.6 75 75" width="75px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<path d="M13.8,35.3c0.2-5.6,2.4-10.7,6-14.5L10,11.1C4,17.4,0.2,25.9,0,35.3H13.8z" fill="#424242"/>
-<path d="M20.8,19.8c3.8-3.6,8.9-5.8,14.5-6V0c-9.4,0.2-17.9,4-24.3,10L20.8,19.8z" fill="#424242"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="36.7383" x2="60.9922" y1="9.9063" y2="9.9063">
-<stop offset="0" style="stop-color:#3B87C0"/>
-<stop offset="1" style="stop-color:#0069B2"/>
-</linearGradient>
-<path d="M36.7,0v13.8c5.6,0.2,10.7,2.4,14.5,6L61,10C54.7,4,46.1,0.2,36.7,0z" fill="url(#SVGID_1_)"/>
-<path d="M19.8,51.2c-3.6-3.8-5.8-8.9-6-14.5H0C0.2,46.1,4,54.7,10,61L19.8,51.2z" fill="#5AB85B"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="52.2354" x2="72.0469" y1="23.1826" y2="23.1826">
-<stop offset="0" style="stop-color:#3B87C0"/>
-<stop offset="1" style="stop-color:#0069B2"/>
-</linearGradient>
-<path d="M52.2,20.8c3.6,3.8,5.8,8.9,6,14.5H72c-0.2-9.4-4-17.9-10-24.3L52.2,20.8z" fill="url(#SVGID_2_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="11.0552" x2="35.3105" y1="62.1421" y2="62.1421">
-<stop offset="0" style="stop-color:#3B87C0"/>
-<stop offset="1" style="stop-color:#0069B2"/>
-</linearGradient>
-<path d="M35.3,58.2c-5.6-0.2-10.7-2.4-14.5-6L11.1,62c6.3,6.1,14.8,9.9,24.3,10V58.2z" fill="url(#SVGID_3_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="36.7383" x2="60.9922" y1="62.1421" y2="62.1421">
-<stop offset="0" style="stop-color:#3B87C0"/>
-<stop offset="1" style="stop-color:#0069B2"/>
-</linearGradient>
-<path d="M51.2,52.2c-3.8,3.6-8.9,5.8-14.5,6V72c9.4-0.2,17.9-4,24.3-10L51.2,52.2z" fill="url(#SVGID_4_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="52.2354" x2="72.0469" y1="48.8647" y2="48.8647">
-<stop offset="0" style="stop-color:#3B87C0"/>
-<stop offset="1" style="stop-color:#0069B2"/>
-</linearGradient>
-<path d="M58.3,36.7L58.3,36.7c-0.2,5.6-2.5,10.7-6.1,14.5L62,61c6.1-6.3,9.9-14.8,10-24.3H58.3z" fill="url(#SVGID_5_)"/>
-<linearGradient gradientTransform="matrix(-0.7071 -0.7071 0.7071 -0.7071 -1461.6281 3526.3462)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="1409.8438" x2="1414.3984" y1="3497.7866" y2="3497.7866">
-<stop offset="0" style="stop-color:#3B87C0"/>
-<stop offset="1" style="stop-color:#0069B2"/>
-</linearGradient>
-<polygon fill="url(#SVGID_6_)" points="11.5,52.9 19.6,51.3 9.9,61 11.5,52.9 "/>
+<svg baseProfile="tiny" height="72px" version="1.1" viewBox="0 0 72 72" width="72px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M13.801,35.3c0.199-5.6,2.4-10.7,6-14.5L10,11.1C4,17.4,0.201,25.9,0,35.3H13.801z" fill="#424242"/>
+<path d="M20.801,19.8c3.8-3.6,8.9-5.8,14.5-6V0C25.9,0.2,17.4,4,11,10L20.801,19.8z" fill="#424242"/>
+<path d="M36.701,0v13.8c5.6,0.2,10.699,2.4,14.5,6L61,10C54.701,4,46.1,0.2,36.701,0z" fill="#0067B1"/>
+<path d="M19.801,51.201c-3.6-3.801-5.801-8.9-6-14.5H0c0.201,9.398,4,18,10,24.299L19.801,51.201z" fill="#82C341"/>
+<path d="M52.201,20.8c3.6,3.8,5.799,8.9,6,14.5H72C71.801,25.9,68,17.4,62,11L52.201,20.8z" fill="#0067B1"/>
+<path d="M35.301,58.201c-5.6-0.201-10.7-2.4-14.5-6L11.101,62c6.3,6.1,14.8,9.9,24.3,10V58.201H35.301z" fill="#0067B1"/>
+<path d="M51.201,52.201c-3.801,3.6-8.9,5.799-14.5,6V72C46.1,71.8,54.6,68,61,62L51.201,52.201z" fill="#0067B1"/>
+<path d="M58.301,36.701L58.301,36.701c-0.201,5.6-2.5,10.699-6.1,14.5L62,61c6.1-6.299,9.9-14.799,10-24.299H58.301z  " fill="#0067B1"/>
+<polygon fill="#0067B1" points="11.5,52.9 19.601,51.3 9.9,61 "/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_7.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_7.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_7.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,41 +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="75px" version="1.1" viewBox="-1.5 -1.6 75 75" width="75px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<svg baseProfile="tiny" height="72px" version="1.1" viewBox="0 0 72 72" width="72px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
 <path d="M13.8,35.3c0.2-5.6,2.4-10.7,6-14.5L10,11.1C4,17.4,0.2,25.9,0,35.3H13.8z" fill="#424242"/>
-<path d="M20.8,19.8c3.8-3.6,8.9-5.8,14.5-6V0c-9.4,0.2-17.9,4-24.3,10L20.8,19.8z" fill="#424242"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="36.7383" x2="60.9922" y1="9.9063" y2="9.9063">
-<stop offset="0" style="stop-color:#3B87C0"/>
-<stop offset="1" style="stop-color:#0069B2"/>
-</linearGradient>
-<path d="M36.7,0v13.8c5.6,0.2,10.7,2.4,14.5,6L61,10C54.7,4,46.1,0.2,36.7,0z" fill="url(#SVGID_1_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="0" x2="19.814" y1="48.8647" y2="48.8647">
-<stop offset="0" style="stop-color:#3B87C0"/>
-<stop offset="1" style="stop-color:#0069B2"/>
-</linearGradient>
-<path d="M19.8,51.2c-3.6-3.8-5.8-8.9-6-14.5H0C0.2,46.1,4,54.7,10,61L19.8,51.2z" fill="url(#SVGID_2_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="52.2354" x2="72.0469" y1="23.1826" y2="23.1826">
-<stop offset="0" style="stop-color:#3B87C0"/>
-<stop offset="1" style="stop-color:#0069B2"/>
-</linearGradient>
-<path d="M52.2,20.8c3.6,3.8,5.8,8.9,6,14.5H72c-0.2-9.4-4-17.9-10-24.3L52.2,20.8z" fill="url(#SVGID_3_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="11.0552" x2="35.3105" y1="62.1421" y2="62.1421">
-<stop offset="0" style="stop-color:#3B87C0"/>
-<stop offset="1" style="stop-color:#0069B2"/>
-</linearGradient>
-<path d="M35.3,58.2c-5.6-0.2-10.7-2.4-14.5-6L11.1,62c6.3,6.1,14.8,9.9,24.3,10V58.2z" fill="url(#SVGID_4_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="36.7383" x2="60.9922" y1="62.1421" y2="62.1421">
-<stop offset="0" style="stop-color:#3B87C0"/>
-<stop offset="1" style="stop-color:#0069B2"/>
-</linearGradient>
-<path d="M51.2,52.2c-3.8,3.6-8.9,5.8-14.5,6V72c9.4-0.2,17.9-4,24.3-10L51.2,52.2z" fill="url(#SVGID_5_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="52.2354" x2="72.0469" y1="48.8647" y2="48.8647">
-<stop offset="0" style="stop-color:#3B87C0"/>
-<stop offset="1" style="stop-color:#0069B2"/>
-</linearGradient>
-<path d="M58.3,36.7L58.3,36.7c-0.2,5.6-2.5,10.7-6.1,14.5L62,61c6.1-6.3,9.9-14.8,10-24.3H58.3z" fill="url(#SVGID_6_)"/>
-<linearGradient gradientTransform="matrix(0 -1 1 0 -3505.6865 1466.1221)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="1430.8135" x2="1435.3682" y1="3512.5659" y2="3512.5659">
-<stop offset="0" style="stop-color:#3B87C0"/>
-<stop offset="1" style="stop-color:#0069B2"/>
-</linearGradient>
-<polygon fill="url(#SVGID_7_)" points="6.9,30.8 13.8,35.3 0,35.3 6.9,30.8 "/>
+<path d="M20.8,19.8c3.8-3.6,8.9-5.8,14.5-6V0C25.9,0.2,17.4,4,11,10L20.8,19.8z" fill="#424242"/>
+<path d="M36.7,0v13.8c5.6,0.2,10.7,2.4,14.5,6L61,10C54.7,4,46.1,0.2,36.7,0z" fill="#0067B1"/>
+<path d="M19.8,51.201c-3.6-3.801-5.8-8.9-6-14.5H0c0.2,9.398,4,18,10,24.299L19.8,51.201z" fill="#0067B1"/>
+<path d="M52.2,20.8c3.6,3.8,5.8,8.9,6,14.5H72C71.8,25.9,68,17.4,62,11L52.2,20.8z" fill="#0067B1"/>
+<path d="M35.3,58.201c-5.6-0.201-10.7-2.4-14.5-6L11.1,62C17.4,68.099,25.9,71.9,35.4,72V58.201H35.3z" fill="#0067B1"/>
+<path d="M51.2,52.201c-3.8,3.6-8.9,5.799-14.5,6V72C46.1,71.8,54.6,68,61,62L51.2,52.201z" fill="#0067B1"/>
+<path d="M58.3,36.701L58.3,36.701c-0.2,5.6-2.5,10.699-6.1,14.5L62,61c6.1-6.299,9.9-14.799,10-24.299H58.3z" fill="#0067B1"/>
+<polygon fill="#0067B1" points="6.9,30.8 13.8,35.3 0,35.3 "/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_8.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_8.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_8.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,45 +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="75px" version="1.1" viewBox="-1.5 -1.6 75 75" width="75px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="0" x2="19.814" y1="23.1826" y2="23.1826">
-<stop offset="0" style="stop-color:#3B87C0"/>
-<stop offset="1" style="stop-color:#0069B2"/>
-</linearGradient>
-<path d="M13.8,35.3c0.2-5.6,2.4-10.7,6-14.5L10,11.1C4,17.4,0.2,25.9,0,35.3H13.8z" fill="url(#SVGID_1_)"/>
-<path d="M20.8,19.8c3.8-3.6,8.9-5.8,14.5-6V0c-9.4,0.2-17.9,4-24.3,10L20.8,19.8z" fill="#424242"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="36.7383" x2="60.9922" y1="9.9063" y2="9.9063">
-<stop offset="0" style="stop-color:#3B87C0"/>
-<stop offset="1" style="stop-color:#0069B2"/>
-</linearGradient>
-<path d="M36.7,0v13.8c5.6,0.2,10.7,2.4,14.5,6L61,10C54.7,4,46.1,0.2,36.7,0z" fill="url(#SVGID_2_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="0" x2="19.814" y1="48.8647" y2="48.8647">
-<stop offset="0" style="stop-color:#3B87C0"/>
-<stop offset="1" style="stop-color:#0069B2"/>
-</linearGradient>
-<path d="M19.8,51.2c-3.6-3.8-5.8-8.9-6-14.5H0C0.2,46.1,4,54.7,10,61L19.8,51.2z" fill="url(#SVGID_3_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="52.2354" x2="72.0469" y1="23.1826" y2="23.1826">
-<stop offset="0" style="stop-color:#3B87C0"/>
-<stop offset="1" style="stop-color:#0069B2"/>
-</linearGradient>
-<path d="M52.2,20.8c3.6,3.8,5.8,8.9,6,14.5H72c-0.2-9.4-4-17.9-10-24.3L52.2,20.8z" fill="url(#SVGID_4_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="11.0552" x2="35.3105" y1="62.1421" y2="62.1421">
-<stop offset="0" style="stop-color:#3B87C0"/>
-<stop offset="1" style="stop-color:#0069B2"/>
-</linearGradient>
-<path d="M35.3,58.2c-5.6-0.2-10.7-2.4-14.5-6L11.1,62c6.3,6.1,14.8,9.9,24.3,10V58.2z" fill="url(#SVGID_5_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="36.7383" x2="60.9922" y1="62.1421" y2="62.1421">
-<stop offset="0" style="stop-color:#3B87C0"/>
-<stop offset="1" style="stop-color:#0069B2"/>
-</linearGradient>
-<path d="M51.2,52.2c-3.8,3.6-8.9,5.8-14.5,6V72c9.4-0.2,17.9-4,24.3-10L51.2,52.2z" fill="url(#SVGID_6_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="52.2354" x2="72.0469" y1="48.8647" y2="48.8647">
-<stop offset="0" style="stop-color:#3B87C0"/>
-<stop offset="1" style="stop-color:#0069B2"/>
-</linearGradient>
-<path d="M58.3,36.7L58.3,36.7c-0.2,5.6-2.5,10.7-6.1,14.5L62,61c6.1-6.3,9.9-14.8,10-24.3H58.3z" fill="url(#SVGID_7_)"/>
-<linearGradient gradientTransform="matrix(0.7071 -0.7071 0.7071 0.7071 -3490.3384 -1437.3785)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="1452.3613" x2="1456.915" y1="3506.2817" y2="3506.2817">
-<stop offset="0" style="stop-color:#3B87C0"/>
-<stop offset="1" style="stop-color:#0069B2"/>
-</linearGradient>
-<polygon fill="url(#SVGID_8_)" points="19.1,11.7 20.8,19.8 11.1,10.1 19.1,11.7 "/>
+<svg baseProfile="tiny" height="72px" version="1.1" viewBox="0 0 72 72" width="72px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M13.799,35.3c0.201-5.6,2.4-10.7,6-14.5L10,11.1C4,17.4,0.199,25.9,0,35.3H13.799z" fill="#0067B1"/>
+<path d="M20.799,19.8c3.801-3.6,8.9-5.8,14.5-6V0C25.9,0.2,17.4,4,11,10L20.799,19.8z" fill="#424242"/>
+<path d="M36.699,0v13.8c5.6,0.2,10.702,2.4,14.5,6L61,10C54.699,4,46.1,0.2,36.699,0z" fill="#0067B1"/>
+<path d="M19.799,51.2c-3.6-3.799-5.799-8.9-6-14.5H0C0.199,46.1,4,54.7,10,61L19.799,51.2z" fill="#0067B1"/>
+<path d="M52.199,20.8c3.6,3.8,5.801,8.9,6,14.5H72C71.799,25.9,68,17.4,62,11L52.199,20.8z" fill="#0067B1"/>
+<path d="M35.299,58.2c-5.6-0.199-10.699-2.4-14.5-6L11.1,62C17.4,68.1,25.9,71.901,35.4,72V58.2H35.299z" fill="#0067B1"/>
+<path d="M51.199,52.2c-3.799,3.6-8.9,5.801-14.5,6V72C46.1,71.799,54.6,68,61,62L51.199,52.2z" fill="#0067B1"/>
+<path d="M58.299,36.7L58.299,36.7c-0.199,5.6-2.5,10.701-6.1,14.5L62,61C68.1,54.7,71.9,46.2,72,36.7H58.299z" fill="#0067B1"/>
+<polygon fill="#0067B1" points="19.1,11.7 20.799,19.8 11.1,10.1 "/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_9.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_9.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_9.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,44 +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="75px" version="1.1" viewBox="-1.5 -1.6 75 75" width="75px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="0" x2="19.814" y1="23.1826" y2="23.1826">
-<stop offset="0" style="stop-color:#3B87C0"/>
-<stop offset="1" style="stop-color:#0069B2"/>
-</linearGradient>
-<path d="M13.8,35.3c0.2-5.6,2.4-10.7,6-14.5L10,11.1C4,17.4,0.2,25.9,0,35.3H13.8z" fill="url(#SVGID_1_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="11.0552" x2="35.3105" y1="9.9063" y2="9.9063">
-<stop offset="0" style="stop-color:#3B87C0"/>
-<stop offset="1" style="stop-color:#0069B2"/>
-</linearGradient>
-<path d="M20.8,19.8c3.8-3.6,8.9-5.8,14.5-6V0c-9.4,0.2-17.9,4-24.3,10L20.8,19.8z" fill="url(#SVGID_2_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="36.7383" x2="60.9922" y1="9.9063" y2="9.9063">
-<stop offset="0" style="stop-color:#3B87C0"/>
-<stop offset="1" style="stop-color:#0069B2"/>
-</linearGradient>
-<path d="M36.7,0v13.8c5.6,0.2,10.7,2.4,14.5,6L61,10C54.7,4,46.1,0.2,36.7,0z" fill="url(#SVGID_3_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="0" x2="19.814" y1="48.8647" y2="48.8647">
-<stop offset="0" style="stop-color:#3B87C0"/>
-<stop offset="1" style="stop-color:#0069B2"/>
-</linearGradient>
-<path d="M19.8,51.2c-3.6-3.8-5.8-8.9-6-14.5H0C0.2,46.1,4,54.7,10,61L19.8,51.2z" fill="url(#SVGID_4_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="52.2354" x2="72.0469" y1="23.1826" y2="23.1826">
-<stop offset="0" style="stop-color:#3B87C0"/>
-<stop offset="1" style="stop-color:#0069B2"/>
-</linearGradient>
-<path d="M52.2,20.8c3.6,3.8,5.8,8.9,6,14.5H72c-0.2-9.4-4-17.9-10-24.3L52.2,20.8z" fill="url(#SVGID_5_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="11.0552" x2="35.3105" y1="62.1421" y2="62.1421">
-<stop offset="0" style="stop-color:#3B87C0"/>
-<stop offset="1" style="stop-color:#0069B2"/>
-</linearGradient>
-<path d="M35.3,58.2c-5.6-0.2-10.7-2.4-14.5-6L11.1,62c6.3,6.1,14.8,9.9,24.3,10V58.2z" fill="url(#SVGID_6_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="36.7383" x2="60.9922" y1="62.1421" y2="62.1421">
-<stop offset="0" style="stop-color:#3B87C0"/>
-<stop offset="1" style="stop-color:#0069B2"/>
-</linearGradient>
-<path d="M51.2,52.2c-3.8,3.6-8.9,5.8-14.5,6V72c9.4-0.2,17.9-4,24.3-10L51.2,52.2z" fill="url(#SVGID_7_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="52.2354" x2="72.0469" y1="48.8647" y2="48.8647">
-<stop offset="0" style="stop-color:#3B87C0"/>
-<stop offset="1" style="stop-color:#0069B2"/>
-</linearGradient>
-<path d="M58.3,36.7L58.3,36.7c-0.2,5.6-2.5,10.7-6.1,14.5L62,61c6.1-6.3,9.9-14.8,10-24.3H58.3z" fill="url(#SVGID_8_)"/>
+<svg baseProfile="tiny" height="72px" version="1.1" viewBox="0 0 72 72" width="72px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M13.799,35.3c0.201-5.6,2.4-10.7,6-14.5L10,11.1C4,17.4,0.199,25.9,0,35.3H13.799z" fill="#0067B1"/>
+<path d="M20.799,19.8c3.801-3.6,8.9-5.8,14.5-6V0C25.9,0.2,17.4,4,11,10L20.799,19.8z" fill="#0067B1"/>
+<path d="M36.7,0v13.8c5.599,0.2,10.701,2.4,14.5,6L61,10C54.699,4,46.1,0.2,36.7,0z" fill="#0067B1"/>
+<path d="M19.799,51.2c-3.6-3.8-5.799-8.9-6-14.5H0C0.199,46.1,4,54.7,10,61L19.799,51.2z" fill="#0067B1"/>
+<path d="M52.199,20.8c3.6,3.8,5.801,8.9,6,14.5H72C71.799,25.9,68,17.4,62,11L52.199,20.8z" fill="#0067B1"/>
+<path d="M35.299,58.2c-5.6-0.2-10.699-2.4-14.5-6L11.1,62C17.4,68.1,25.9,71.9,35.4,72V58.2H35.299z" fill="#0067B1"/>
+<path d="M51.199,52.2c-3.799,3.6-8.9,5.8-14.5,6V72c9.4-0.2,17.9-4,24.3-10L51.199,52.2z" fill="#0067B1"/>
+<path d="M58.299,36.7L58.299,36.7c-0.199,5.6-2.5,10.7-6.1,14.5L62,61c6.1-6.3,9.9-14.8,10-24.3H58.299z" fill="#0067B1"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_1.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_1.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_1.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,18 +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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="60" height="60" viewBox="0 0 60 60">
+<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">
 <rect fill="none" height="60" width="60"/>
 <g transform="translate(-29.999,-66.081)">
-<linearGradient id="SVGID_1" gradientUnits="userSpaceOnUse" x1="60.22" y1="6.5" x2="59.88" y2="108.33">
-<stop stop-color="#E2E2E2" offset="0"/>
-<stop stop-color="#C0C0C0" offset="0.32"/>
-<stop stop-color="#6D6D6D" offset="1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="60.22" x2="59.88" y1="6.5" y2="108.33">
+<stop offset="0" stop-color="#E2E2E2"/>
+<stop offset="0.32" stop-color="#C0C0C0"/>
+<stop offset="1" stop-color="#6D6D6D"/>
 </linearGradient>
 <path d="M86,74.853c0,0-18.422,10.203-25.92,10.23C52.583,85.11,34,74.853,34,74.853v-4.77 c0,0,18.678,10.313,26.16,10.23C67.644,80.23,86,70.083,86,70.083V74.853z" fill="url(#SVGID_1)"/>
-<linearGradient id="SVGID_2" gradientUnits="userSpaceOnUse" x1="34" y1="76.07" x2="86" y2="76.07">
-<stop stop-color="#E2E2E2" offset="0"/>
-<stop stop-color="#C0C0C0" offset="0.32"/>
-<stop stop-color="#6D6D6D" offset="1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="34" x2="86" y1="76.07" y2="76.07">
+<stop offset="0" stop-color="#E2E2E2"/>
+<stop offset="0.32" stop-color="#C0C0C0"/>
+<stop offset="1" stop-color="#6D6D6D"/>
 </linearGradient>
 </g>
 <g fill-opacity="0.25" stroke-opacity="0.25" transform="translate(-29.999,-53.748)">
@@ -26,4 +26,4 @@
 <path d="M86,74.852c0,0-18.422,10.203-25.92,10.23C52.583,85.11,34,74.852,34,74.852v-4.77 c0,0,18.678,10.313,26.16,10.23C67.644,80.229,86,70.083,86,70.083V74.852z" fill="url(#SVGID_1)"/>
 <path d="M86,70.834c0,0-18.422,11.204-25.92,11.229C52.583,82.092,34,70.834,34,70.834v-0.75 c0,0,18.678,10.313,26.16,10.229C67.644,80.231,86,70.084,86,70.084V70.834z" fill="url(#SVGID_2)"/>
 </g>
-</svg>
\ No newline at end of file
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_10.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_10.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_10.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,18 +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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="60" height="60" viewBox="0 0 60 60">
+<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">
 <rect fill="none" height="60" width="60"/>
 <g fill-opacity="0.25" stroke-opacity="0.25" transform="translate(-29.999,-66.081)">
-<linearGradient id="SVGID_1" gradientUnits="userSpaceOnUse" x1="60.22" y1="6.5" x2="59.88" y2="108.33">
-<stop stop-color="#E2E2E2" offset="0"/>
-<stop stop-color="#C0C0C0" offset="0.32"/>
-<stop stop-color="#6D6D6D" offset="1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="60.22" x2="59.88" y1="6.5" y2="108.33">
+<stop offset="0" stop-color="#E2E2E2"/>
+<stop offset="0.32" stop-color="#C0C0C0"/>
+<stop offset="1" stop-color="#6D6D6D"/>
 </linearGradient>
 <path d="M86,74.853c0,0-18.422,10.203-25.92,10.23C52.583,85.11,34,74.853,34,74.853v-4.77 c0,0,18.678,10.313,26.16,10.23C67.644,80.23,86,70.083,86,70.083V74.853z" fill="url(#SVGID_1)"/>
-<linearGradient id="SVGID_2" gradientUnits="userSpaceOnUse" x1="34" y1="76.07" x2="86" y2="76.07">
-<stop stop-color="#E2E2E2" offset="0"/>
-<stop stop-color="#C0C0C0" offset="0.32"/>
-<stop stop-color="#6D6D6D" offset="1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="34" x2="86" y1="76.07" y2="76.07">
+<stop offset="0" stop-color="#E2E2E2"/>
+<stop offset="0.32" stop-color="#C0C0C0"/>
+<stop offset="1" stop-color="#6D6D6D"/>
 </linearGradient>
 </g>
 <g fill-opacity="0.25" stroke-opacity="0.25" transform="translate(-29.999,-53.748)">
@@ -26,4 +26,4 @@
 <path d="M86,74.852c0,0-18.422,10.203-25.92,10.23C52.583,85.11,34,74.852,34,74.852v-4.77 c0,0,18.678,10.313,26.16,10.23C67.644,80.229,86,70.083,86,70.083V74.852z" fill="url(#SVGID_1)"/>
 <path d="M86,70.834c0,0-18.422,11.204-25.92,11.229C52.583,82.092,34,70.834,34,70.834v-0.75 c0,0,18.678,10.313,26.16,10.229C67.644,80.231,86,70.084,86,70.084V70.834z" fill="url(#SVGID_2)"/>
 </g>
-</svg>
\ No newline at end of file
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_11.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_11.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_11.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,18 +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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="60" height="60" viewBox="0 0 60 60">
+<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">
 <rect fill="none" height="60" width="60"/>
 <g fill-opacity="0.25" stroke-opacity="0.25" transform="translate(-29.999,-66.081)">
-<linearGradient id="SVGID_1" gradientUnits="userSpaceOnUse" x1="60.22" y1="6.5" x2="59.88" y2="108.33">
-<stop stop-color="#E2E2E2" offset="0"/>
-<stop stop-color="#C0C0C0" offset="0.32"/>
-<stop stop-color="#6D6D6D" offset="1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="60.22" x2="59.88" y1="6.5" y2="108.33">
+<stop offset="0" stop-color="#E2E2E2"/>
+<stop offset="0.32" stop-color="#C0C0C0"/>
+<stop offset="1" stop-color="#6D6D6D"/>
 </linearGradient>
 <path d="M86,74.853c0,0-18.422,10.203-25.92,10.23C52.583,85.11,34,74.853,34,74.853v-4.77 c0,0,18.678,10.313,26.16,10.23C67.644,80.23,86,70.083,86,70.083V74.853z" fill="url(#SVGID_1)"/>
-<linearGradient id="SVGID_2" gradientUnits="userSpaceOnUse" x1="34" y1="76.07" x2="86" y2="76.07">
-<stop stop-color="#E2E2E2" offset="0"/>
-<stop stop-color="#C0C0C0" offset="0.32"/>
-<stop stop-color="#6D6D6D" offset="1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="34" x2="86" y1="76.07" y2="76.07">
+<stop offset="0" stop-color="#E2E2E2"/>
+<stop offset="0.32" stop-color="#C0C0C0"/>
+<stop offset="1" stop-color="#6D6D6D"/>
 </linearGradient>
 </g>
 <g fill-opacity="0.25" stroke-opacity="0.25" transform="translate(-29.999,-53.748)">
@@ -26,4 +26,4 @@
 <path d="M86,74.852c0,0-18.422,10.203-25.92,10.23C52.583,85.11,34,74.852,34,74.852v-4.77 c0,0,18.678,10.313,26.16,10.23C67.644,80.229,86,70.083,86,70.083V74.852z" fill="url(#SVGID_1)"/>
 <path d="M86,70.834c0,0-18.422,11.204-25.92,11.229C52.583,82.092,34,70.834,34,70.834v-0.75 c0,0,18.678,10.313,26.16,10.229C67.644,80.231,86,70.084,86,70.084V70.834z" fill="url(#SVGID_2)"/>
 </g>
-</svg>
\ No newline at end of file
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_12.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_12.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_12.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,18 +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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="60" height="60" viewBox="0 0 60 60">
+<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">
 <rect fill="none" height="60" width="60"/>
 <g fill-opacity="0.25" stroke-opacity="0.25" transform="translate(-29.999,-66.081)">
-<linearGradient id="SVGID_1" gradientUnits="userSpaceOnUse" x1="60.22" y1="6.5" x2="59.88" y2="108.33">
-<stop stop-color="#E2E2E2" offset="0"/>
-<stop stop-color="#C0C0C0" offset="0.32"/>
-<stop stop-color="#6D6D6D" offset="1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="60.22" x2="59.88" y1="6.5" y2="108.33">
+<stop offset="0" stop-color="#E2E2E2"/>
+<stop offset="0.32" stop-color="#C0C0C0"/>
+<stop offset="1" stop-color="#6D6D6D"/>
 </linearGradient>
 <path d="M86,74.853c0,0-18.422,10.203-25.92,10.23C52.583,85.11,34,74.853,34,74.853v-4.77 c0,0,18.678,10.313,26.16,10.23C67.644,80.23,86,70.083,86,70.083V74.853z" fill="url(#SVGID_1)"/>
-<linearGradient id="SVGID_2" gradientUnits="userSpaceOnUse" x1="34" y1="76.07" x2="86" y2="76.07">
-<stop stop-color="#E2E2E2" offset="0"/>
-<stop stop-color="#C0C0C0" offset="0.32"/>
-<stop stop-color="#6D6D6D" offset="1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="34" x2="86" y1="76.07" y2="76.07">
+<stop offset="0" stop-color="#E2E2E2"/>
+<stop offset="0.32" stop-color="#C0C0C0"/>
+<stop offset="1" stop-color="#6D6D6D"/>
 </linearGradient>
 </g>
 <g fill-opacity="0.25" stroke-opacity="0.25" transform="translate(-29.999,-53.748)">
@@ -26,4 +26,4 @@
 <path d="M86,74.852c0,0-18.422,10.203-25.92,10.23C52.583,85.11,34,74.852,34,74.852v-4.77 c0,0,18.678,10.313,26.16,10.23C67.644,80.229,86,70.083,86,70.083V74.852z" fill="url(#SVGID_1)"/>
 <path d="M86,70.834c0,0-18.422,11.204-25.92,11.229C52.583,82.092,34,70.834,34,70.834v-0.75 c0,0,18.678,10.313,26.16,10.229C67.644,80.231,86,70.084,86,70.084V70.834z" fill="url(#SVGID_2)"/>
 </g>
-</svg>
\ No newline at end of file
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_13.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_13.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_13.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,18 +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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="60" height="60" viewBox="0 0 60 60">
+<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">
 <rect fill="none" height="60" width="60"/>
 <g fill-opacity="0.25" stroke-opacity="0.25" transform="translate(-29.999,-66.081)">
-<linearGradient id="SVGID_1" gradientUnits="userSpaceOnUse" x1="60.22" y1="6.5" x2="59.88" y2="108.33">
-<stop stop-color="#E2E2E2" offset="0"/>
-<stop stop-color="#C0C0C0" offset="0.32"/>
-<stop stop-color="#6D6D6D" offset="1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="60.22" x2="59.88" y1="6.5" y2="108.33">
+<stop offset="0" stop-color="#E2E2E2"/>
+<stop offset="0.32" stop-color="#C0C0C0"/>
+<stop offset="1" stop-color="#6D6D6D"/>
 </linearGradient>
 <path d="M86,74.853c0,0-18.422,10.203-25.92,10.23C52.583,85.11,34,74.853,34,74.853v-4.77 c0,0,18.678,10.313,26.16,10.23C67.644,80.23,86,70.083,86,70.083V74.853z" fill="url(#SVGID_1)"/>
-<linearGradient id="SVGID_2" gradientUnits="userSpaceOnUse" x1="34" y1="76.07" x2="86" y2="76.07">
-<stop stop-color="#E2E2E2" offset="0"/>
-<stop stop-color="#C0C0C0" offset="0.32"/>
-<stop stop-color="#6D6D6D" offset="1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="34" x2="86" y1="76.07" y2="76.07">
+<stop offset="0" stop-color="#E2E2E2"/>
+<stop offset="0.32" stop-color="#C0C0C0"/>
+<stop offset="1" stop-color="#6D6D6D"/>
 </linearGradient>
 </g>
 <g fill-opacity="0.25" stroke-opacity="0.25" transform="translate(-29.999,-53.748)">
@@ -26,4 +26,4 @@
 <path d="M86,74.852c0,0-18.422,10.203-25.92,10.23C52.583,85.11,34,74.852,34,74.852v-4.77 c0,0,18.678,10.313,26.16,10.23C67.644,80.229,86,70.083,86,70.083V74.852z" fill="url(#SVGID_1)"/>
 <path d="M86,70.834c0,0-18.422,11.204-25.92,11.229C52.583,82.092,34,70.834,34,70.834v-0.75 c0,0,18.678,10.313,26.16,10.229C67.644,80.231,86,70.084,86,70.084V70.834z" fill="url(#SVGID_2)"/>
 </g>
-</svg>
\ No newline at end of file
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_14.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_14.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_14.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,18 +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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="60" height="60" viewBox="0 0 60 60">
+<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">
 <rect fill="none" height="60" width="60"/>
 <g fill-opacity="0.25" stroke-opacity="0.25" transform="translate(-29.999,-66.081)">
-<linearGradient id="SVGID_1" gradientUnits="userSpaceOnUse" x1="60.22" y1="6.5" x2="59.88" y2="108.33">
-<stop stop-color="#E2E2E2" offset="0"/>
-<stop stop-color="#C0C0C0" offset="0.32"/>
-<stop stop-color="#6D6D6D" offset="1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="60.22" x2="59.88" y1="6.5" y2="108.33">
+<stop offset="0" stop-color="#E2E2E2"/>
+<stop offset="0.32" stop-color="#C0C0C0"/>
+<stop offset="1" stop-color="#6D6D6D"/>
 </linearGradient>
 <path d="M86,74.853c0,0-18.422,10.203-25.92,10.23C52.583,85.11,34,74.853,34,74.853v-4.77 c0,0,18.678,10.313,26.16,10.23C67.644,80.23,86,70.083,86,70.083V74.853z" fill="url(#SVGID_1)"/>
-<linearGradient id="SVGID_2" gradientUnits="userSpaceOnUse" x1="34" y1="76.07" x2="86" y2="76.07">
-<stop stop-color="#E2E2E2" offset="0"/>
-<stop stop-color="#C0C0C0" offset="0.32"/>
-<stop stop-color="#6D6D6D" offset="1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="34" x2="86" y1="76.07" y2="76.07">
+<stop offset="0" stop-color="#E2E2E2"/>
+<stop offset="0.32" stop-color="#C0C0C0"/>
+<stop offset="1" stop-color="#6D6D6D"/>
 </linearGradient>
 </g>
 <g fill-opacity="0.25" stroke-opacity="0.25" transform="translate(-29.999,-53.748)">
@@ -26,4 +26,4 @@
 <path d="M86,74.852c0,0-18.422,10.203-25.92,10.23C52.583,85.11,34,74.852,34,74.852v-4.77 c0,0,18.678,10.313,26.16,10.23C67.644,80.229,86,70.083,86,70.083V74.852z" fill="url(#SVGID_1)"/>
 <path d="M86,70.834c0,0-18.422,11.204-25.92,11.229C52.583,82.092,34,70.834,34,70.834v-0.75 c0,0,18.678,10.313,26.16,10.229C67.644,80.231,86,70.084,86,70.084V70.834z" fill="url(#SVGID_2)"/>
 </g>
-</svg>
\ No newline at end of file
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_15.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_15.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_15.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,18 +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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="60" height="60" viewBox="0 0 60 60">
+<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">
 <rect fill="none" height="60" width="60"/>
 <g fill-opacity="0.25" stroke-opacity="0.25" transform="translate(-29.999,-66.081)">
-<linearGradient id="SVGID_1" gradientUnits="userSpaceOnUse" x1="60.22" y1="6.5" x2="59.88" y2="108.33">
-<stop stop-color="#E2E2E2" offset="0"/>
-<stop stop-color="#C0C0C0" offset="0.32"/>
-<stop stop-color="#6D6D6D" offset="1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="60.22" x2="59.88" y1="6.5" y2="108.33">
+<stop offset="0" stop-color="#E2E2E2"/>
+<stop offset="0.32" stop-color="#C0C0C0"/>
+<stop offset="1" stop-color="#6D6D6D"/>
 </linearGradient>
 <path d="M86,74.853c0,0-18.422,10.203-25.92,10.23C52.583,85.11,34,74.853,34,74.853v-4.77 c0,0,18.678,10.313,26.16,10.23C67.644,80.23,86,70.083,86,70.083V74.853z" fill="url(#SVGID_1)"/>
-<linearGradient id="SVGID_2" gradientUnits="userSpaceOnUse" x1="34" y1="76.07" x2="86" y2="76.07">
-<stop stop-color="#E2E2E2" offset="0"/>
-<stop stop-color="#C0C0C0" offset="0.32"/>
-<stop stop-color="#6D6D6D" offset="1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="34" x2="86" y1="76.07" y2="76.07">
+<stop offset="0" stop-color="#E2E2E2"/>
+<stop offset="0.32" stop-color="#C0C0C0"/>
+<stop offset="1" stop-color="#6D6D6D"/>
 </linearGradient>
 </g>
 <g fill-opacity="0.25" stroke-opacity="0.25" transform="translate(-29.999,-53.748)">
@@ -26,4 +26,4 @@
 <path d="M86,74.852c0,0-18.422,10.203-25.92,10.23C52.583,85.11,34,74.852,34,74.852v-4.77 c0,0,18.678,10.313,26.16,10.23C67.644,80.229,86,70.083,86,70.083V74.852z" fill="url(#SVGID_1)"/>
 <path d="M86,70.834c0,0-18.422,11.204-25.92,11.229C52.583,82.092,34,70.834,34,70.834v-0.75 c0,0,18.678,10.313,26.16,10.229C67.644,80.231,86,70.084,86,70.084V70.834z" fill="url(#SVGID_2)"/>
 </g>
-</svg>
\ No newline at end of file
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_16.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_16.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_16.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,18 +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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="60" height="60" viewBox="0 0 60 60">
+<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">
 <rect fill="none" height="60" width="60"/>
 <g fill-opacity="0.25" stroke-opacity="0.25" transform="translate(-29.999,-66.081)">
-<linearGradient id="SVGID_1" gradientUnits="userSpaceOnUse" x1="60.22" y1="6.5" x2="59.88" y2="108.33">
-<stop stop-color="#E2E2E2" offset="0"/>
-<stop stop-color="#C0C0C0" offset="0.32"/>
-<stop stop-color="#6D6D6D" offset="1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="60.22" x2="59.88" y1="6.5" y2="108.33">
+<stop offset="0" stop-color="#E2E2E2"/>
+<stop offset="0.32" stop-color="#C0C0C0"/>
+<stop offset="1" stop-color="#6D6D6D"/>
 </linearGradient>
 <path d="M86,74.853c0,0-18.422,10.203-25.92,10.23C52.583,85.11,34,74.853,34,74.853v-4.77 c0,0,18.678,10.313,26.16,10.23C67.644,80.23,86,70.083,86,70.083V74.853z" fill="url(#SVGID_1)"/>
-<linearGradient id="SVGID_2" gradientUnits="userSpaceOnUse" x1="34" y1="76.07" x2="86" y2="76.07">
-<stop stop-color="#E2E2E2" offset="0"/>
-<stop stop-color="#C0C0C0" offset="0.32"/>
-<stop stop-color="#6D6D6D" offset="1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="34" x2="86" y1="76.07" y2="76.07">
+<stop offset="0" stop-color="#E2E2E2"/>
+<stop offset="0.32" stop-color="#C0C0C0"/>
+<stop offset="1" stop-color="#6D6D6D"/>
 </linearGradient>
 </g>
 <g fill-opacity="0.25" stroke-opacity="0.25" transform="translate(-29.999,-53.748)">
@@ -26,4 +26,4 @@
 <path d="M86,74.852c0,0-18.422,10.203-25.92,10.23C52.583,85.11,34,74.852,34,74.852v-4.77 c0,0,18.678,10.313,26.16,10.23C67.644,80.229,86,70.083,86,70.083V74.852z" fill="url(#SVGID_1)"/>
 <path d="M86,70.834c0,0-18.422,11.204-25.92,11.229C52.583,82.092,34,70.834,34,70.834v-0.75 c0,0,18.678,10.313,26.16,10.229C67.644,80.231,86,70.084,86,70.084V70.834z" fill="url(#SVGID_2)"/>
 </g>
-</svg>
\ No newline at end of file
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_2.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_2.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_2.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,18 +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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="60" height="60" viewBox="0 0 60 60">
+<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">
 <rect fill="none" height="60" width="60"/>
 <g fill-opacity="0.75" stroke-opacity="0.75" transform="translate(-29.999,-66.081)">
-<linearGradient id="SVGID_1" gradientUnits="userSpaceOnUse" x1="60.22" y1="6.5" x2="59.88" y2="108.33">
-<stop stop-color="#E2E2E2" offset="0"/>
-<stop stop-color="#C0C0C0" offset="0.32"/>
-<stop stop-color="#6D6D6D" offset="1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="60.22" x2="59.88" y1="6.5" y2="108.33">
+<stop offset="0" stop-color="#E2E2E2"/>
+<stop offset="0.32" stop-color="#C0C0C0"/>
+<stop offset="1" stop-color="#6D6D6D"/>
 </linearGradient>
 <path d="M86,74.853c0,0-18.422,10.203-25.92,10.23C52.583,85.11,34,74.853,34,74.853v-4.77 c0,0,18.678,10.313,26.16,10.23C67.644,80.23,86,70.083,86,70.083V74.853z" fill="url(#SVGID_1)"/>
-<linearGradient id="SVGID_2" gradientUnits="userSpaceOnUse" x1="34" y1="76.07" x2="86" y2="76.07">
-<stop stop-color="#E2E2E2" offset="0"/>
-<stop stop-color="#C0C0C0" offset="0.32"/>
-<stop stop-color="#6D6D6D" offset="1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="34" x2="86" y1="76.07" y2="76.07">
+<stop offset="0" stop-color="#E2E2E2"/>
+<stop offset="0.32" stop-color="#C0C0C0"/>
+<stop offset="1" stop-color="#6D6D6D"/>
 </linearGradient>
 </g>
 <g fill-opacity="0.25" stroke-opacity="0.25" transform="translate(-29.999,-53.748)">
@@ -26,4 +26,4 @@
 <path d="M86,74.852c0,0-18.422,10.203-25.92,10.23C52.583,85.11,34,74.852,34,74.852v-4.77 c0,0,18.678,10.313,26.16,10.23C67.644,80.229,86,70.083,86,70.083V74.852z" fill="url(#SVGID_1)"/>
 <path d="M86,70.834c0,0-18.422,11.204-25.92,11.229C52.583,82.092,34,70.834,34,70.834v-0.75 c0,0,18.678,10.313,26.16,10.229C67.644,80.231,86,70.084,86,70.084V70.834z" fill="url(#SVGID_2)"/>
 </g>
-</svg>
\ No newline at end of file
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_3.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_3.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_3.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,18 +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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="60" height="60" viewBox="0 0 60 60">
+<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">
 <rect fill="none" height="60" width="60"/>
 <g fill-opacity="0.5" stroke-opacity="0.5" transform="translate(-29.999,-65.999)">
-<linearGradient id="SVGID_1" gradientUnits="userSpaceOnUse" x1="60.22" y1="6.5" x2="59.88" y2="108.33">
-<stop stop-color="#E2E2E2" offset="0"/>
-<stop stop-color="#C0C0C0" offset="0.32"/>
-<stop stop-color="#6D6D6D" offset="1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="60.22" x2="59.88" y1="6.5" y2="108.33">
+<stop offset="0" stop-color="#E2E2E2"/>
+<stop offset="0.32" stop-color="#C0C0C0"/>
+<stop offset="1" stop-color="#6D6D6D"/>
 </linearGradient>
 <path d="M86,74.853c0,0-18.422,10.203-25.92,10.23C52.583,85.11,34,74.853,34,74.853v-4.77 c0,0,18.678,10.313,26.16,10.23C67.644,80.23,86,70.083,86,70.083V74.853z" fill="url(#SVGID_1)"/>
-<linearGradient id="SVGID_2" gradientUnits="userSpaceOnUse" x1="34" y1="76.07" x2="86" y2="76.07">
-<stop stop-color="#E2E2E2" offset="0"/>
-<stop stop-color="#C0C0C0" offset="0.32"/>
-<stop stop-color="#6D6D6D" offset="1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="34" x2="86" y1="76.07" y2="76.07">
+<stop offset="0" stop-color="#E2E2E2"/>
+<stop offset="0.32" stop-color="#C0C0C0"/>
+<stop offset="1" stop-color="#6D6D6D"/>
 </linearGradient>
 </g>
 <g fill-opacity="0.5" stroke-opacity="0.5" transform="translate(-29.999,-53.666)">
@@ -23,4 +23,4 @@
 <path d="M86,74.853c0,0-18.422,10.203-25.92,10.23C52.583,85.11,34,74.853,34,74.853v-4.77 c0,0,18.678,10.313,26.16,10.23C67.644,80.229,86,70.083,86,70.083V74.853z" fill="url(#SVGID_1)"/>
 <path d="M86,70.834c0,0-18.422,11.204-25.92,11.229C52.583,82.092,34,70.834,34,70.834v-0.75 c0,0,18.678,10.313,26.16,10.229C67.644,80.231,86,70.084,86,70.084V70.834z" fill="url(#SVGID_2)"/>
 </g>
-</svg>
\ No newline at end of file
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_4.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_4.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_4.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,18 +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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="60" height="60" viewBox="0 0 60 60">
+<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">
 <rect fill="none" height="60" width="60"/>
 <g fill-opacity="0.25" stroke-opacity="0.25" transform="translate(-29.999,-66.081)">
-<linearGradient id="SVGID_1" gradientUnits="userSpaceOnUse" x1="60.22" y1="6.5" x2="59.88" y2="108.33">
-<stop stop-color="#E2E2E2" offset="0"/>
-<stop stop-color="#C0C0C0" offset="0.32"/>
-<stop stop-color="#6D6D6D" offset="1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="60.22" x2="59.88" y1="6.5" y2="108.33">
+<stop offset="0" stop-color="#E2E2E2"/>
+<stop offset="0.32" stop-color="#C0C0C0"/>
+<stop offset="1" stop-color="#6D6D6D"/>
 </linearGradient>
 <path d="M86,74.853c0,0-18.422,10.203-25.92,10.23C52.583,85.11,34,74.853,34,74.853v-4.77 c0,0,18.678,10.313,26.16,10.23C67.644,80.23,86,70.083,86,70.083V74.853z" fill="url(#SVGID_1)"/>
-<linearGradient id="SVGID_2" gradientUnits="userSpaceOnUse" x1="34" y1="76.07" x2="86" y2="76.07">
-<stop stop-color="#E2E2E2" offset="0"/>
-<stop stop-color="#C0C0C0" offset="0.32"/>
-<stop stop-color="#6D6D6D" offset="1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="34" x2="86" y1="76.07" y2="76.07">
+<stop offset="0" stop-color="#E2E2E2"/>
+<stop offset="0.32" stop-color="#C0C0C0"/>
+<stop offset="1" stop-color="#6D6D6D"/>
 </linearGradient>
 </g>
 <g fill-opacity="0.75" stroke-opacity="0.75" transform="translate(-29.999,-53.748)">
@@ -26,4 +26,4 @@
 <path d="M86,74.852c0,0-18.422,10.203-25.92,10.23C52.583,85.11,34,74.852,34,74.852v-4.77 c0,0,18.678,10.313,26.16,10.23C67.644,80.229,86,70.083,86,70.083V74.852z" fill="url(#SVGID_1)"/>
 <path d="M86,70.834c0,0-18.422,11.204-25.92,11.229C52.583,82.092,34,70.834,34,70.834v-0.75 c0,0,18.678,10.313,26.16,10.229C67.644,80.231,86,70.084,86,70.084V70.834z" fill="url(#SVGID_2)"/>
 </g>
-</svg>
\ No newline at end of file
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_5.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_5.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_5.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,18 +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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="60" height="60" viewBox="0 0 60 60">
+<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">
 <rect fill="none" height="60" width="60"/>
 <g fill-opacity="0.25" stroke-opacity="0.25" transform="translate(-29.999,-66.081)">
-<linearGradient id="SVGID_1" gradientUnits="userSpaceOnUse" x1="60.22" y1="6.5" x2="59.88" y2="108.33">
-<stop stop-color="#E2E2E2" offset="0"/>
-<stop stop-color="#C0C0C0" offset="0.32"/>
-<stop stop-color="#6D6D6D" offset="1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="60.22" x2="59.88" y1="6.5" y2="108.33">
+<stop offset="0" stop-color="#E2E2E2"/>
+<stop offset="0.32" stop-color="#C0C0C0"/>
+<stop offset="1" stop-color="#6D6D6D"/>
 </linearGradient>
 <path d="M86,74.853c0,0-18.422,10.203-25.92,10.23C52.583,85.11,34,74.853,34,74.853v-4.77 c0,0,18.678,10.313,26.16,10.23C67.644,80.23,86,70.083,86,70.083V74.853z" fill="url(#SVGID_1)"/>
-<linearGradient id="SVGID_2" gradientUnits="userSpaceOnUse" x1="34" y1="76.07" x2="86" y2="76.07">
-<stop stop-color="#E2E2E2" offset="0"/>
-<stop stop-color="#C0C0C0" offset="0.32"/>
-<stop stop-color="#6D6D6D" offset="1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="34" x2="86" y1="76.07" y2="76.07">
+<stop offset="0" stop-color="#E2E2E2"/>
+<stop offset="0.32" stop-color="#C0C0C0"/>
+<stop offset="1" stop-color="#6D6D6D"/>
 </linearGradient>
 </g>
 <g transform="translate(-29.999,-53.748)">
@@ -26,4 +26,4 @@
 <path d="M86,74.852c0,0-18.422,10.203-25.92,10.23C52.583,85.11,34,74.852,34,74.852v-4.77 c0,0,18.678,10.313,26.16,10.23C67.644,80.229,86,70.083,86,70.083V74.852z" fill="url(#SVGID_1)"/>
 <path d="M86,70.834c0,0-18.422,11.204-25.92,11.229C52.583,82.092,34,70.834,34,70.834v-0.75 c0,0,18.678,10.313,26.16,10.229C67.644,80.231,86,70.084,86,70.084V70.834z" fill="url(#SVGID_2)"/>
 </g>
-</svg>
\ No newline at end of file
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_6.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_6.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_6.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,18 +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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="60" height="60" viewBox="0 0 60 60">
+<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">
 <rect fill="none" height="60" width="60"/>
 <g fill-opacity="0.25" stroke-opacity="0.25" transform="translate(-29.999,-66.081)">
-<linearGradient id="SVGID_1" gradientUnits="userSpaceOnUse" x1="60.22" y1="6.5" x2="59.88" y2="108.33">
-<stop stop-color="#E2E2E2" offset="0"/>
-<stop stop-color="#C0C0C0" offset="0.32"/>
-<stop stop-color="#6D6D6D" offset="1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="60.22" x2="59.88" y1="6.5" y2="108.33">
+<stop offset="0" stop-color="#E2E2E2"/>
+<stop offset="0.32" stop-color="#C0C0C0"/>
+<stop offset="1" stop-color="#6D6D6D"/>
 </linearGradient>
 <path d="M86,74.853c0,0-18.422,10.203-25.92,10.23C52.583,85.11,34,74.853,34,74.853v-4.77 c0,0,18.678,10.313,26.16,10.23C67.644,80.23,86,70.083,86,70.083V74.853z" fill="url(#SVGID_1)"/>
-<linearGradient id="SVGID_2" gradientUnits="userSpaceOnUse" x1="34" y1="76.07" x2="86" y2="76.07">
-<stop stop-color="#E2E2E2" offset="0"/>
-<stop stop-color="#C0C0C0" offset="0.32"/>
-<stop stop-color="#6D6D6D" offset="1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="34" x2="86" y1="76.07" y2="76.07">
+<stop offset="0" stop-color="#E2E2E2"/>
+<stop offset="0.32" stop-color="#C0C0C0"/>
+<stop offset="1" stop-color="#6D6D6D"/>
 </linearGradient>
 </g>
 <g fill-opacity="0.75" stroke-opacity="0.75" transform="translate(-29.999,-53.748)">
@@ -26,4 +26,4 @@
 <path d="M86,74.852c0,0-18.422,10.203-25.92,10.23C52.583,85.11,34,74.852,34,74.852v-4.77 c0,0,18.678,10.313,26.16,10.23C67.644,80.229,86,70.083,86,70.083V74.852z" fill="url(#SVGID_1)"/>
 <path d="M86,70.834c0,0-18.422,11.204-25.92,11.229C52.583,82.092,34,70.834,34,70.834v-0.75 c0,0,18.678,10.313,26.16,10.229C67.644,80.231,86,70.084,86,70.084V70.834z" fill="url(#SVGID_2)"/>
 </g>
-</svg>
\ No newline at end of file
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_7.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_7.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_7.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,18 +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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="60" height="60" viewBox="0 0 60 60">
+<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">
 <rect fill="none" height="60" width="60"/>
 <g fill-opacity="0.25" stroke-opacity="0.25" transform="translate(-29.999,-65.999)">
-<linearGradient id="SVGID_1" gradientUnits="userSpaceOnUse" x1="60.22" y1="6.5" x2="59.88" y2="108.33">
-<stop stop-color="#E2E2E2" offset="0"/>
-<stop stop-color="#C0C0C0" offset="0.32"/>
-<stop stop-color="#6D6D6D" offset="1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="60.22" x2="59.88" y1="6.5" y2="108.33">
+<stop offset="0" stop-color="#E2E2E2"/>
+<stop offset="0.32" stop-color="#C0C0C0"/>
+<stop offset="1" stop-color="#6D6D6D"/>
 </linearGradient>
 <path d="M86,74.853c0,0-18.422,10.203-25.92,10.23C52.583,85.11,34,74.853,34,74.853v-4.77 c0,0,18.678,10.313,26.16,10.23C67.644,80.23,86,70.083,86,70.083V74.853z" fill="url(#SVGID_1)"/>
-<linearGradient id="SVGID_2" gradientUnits="userSpaceOnUse" x1="34" y1="76.07" x2="86" y2="76.07">
-<stop stop-color="#E2E2E2" offset="0"/>
-<stop stop-color="#C0C0C0" offset="0.32"/>
-<stop stop-color="#6D6D6D" offset="1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="34" x2="86" y1="76.07" y2="76.07">
+<stop offset="0" stop-color="#E2E2E2"/>
+<stop offset="0.32" stop-color="#C0C0C0"/>
+<stop offset="1" stop-color="#6D6D6D"/>
 </linearGradient>
 </g>
 <g fill-opacity="0.5" stroke-opacity="0.5" transform="translate(-29.999,-53.666)">
@@ -23,4 +23,4 @@
 <path d="M86,74.853c0,0-18.422,10.203-25.92,10.23C52.583,85.11,34,74.853,34,74.853v-4.77 c0,0,18.678,10.313,26.16,10.23C67.644,80.229,86,70.083,86,70.083V74.853z" fill="url(#SVGID_1)"/>
 <path d="M86,70.834c0,0-18.422,11.204-25.92,11.229C52.583,82.092,34,70.834,34,70.834v-0.75 c0,0,18.678,10.313,26.16,10.229C67.644,80.231,86,70.084,86,70.084V70.834z" fill="url(#SVGID_2)"/>
 </g>
-</svg>
\ No newline at end of file
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_8.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_8.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_8.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,18 +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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="60" height="60" viewBox="0 0 60 60">
+<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">
 <rect fill="none" height="60" width="60"/>
 <g fill-opacity="0.25" stroke-opacity="0.25" transform="translate(-29.999,-66.081)">
-<linearGradient id="SVGID_1" gradientUnits="userSpaceOnUse" x1="60.22" y1="6.5" x2="59.88" y2="108.33">
-<stop stop-color="#E2E2E2" offset="0"/>
-<stop stop-color="#C0C0C0" offset="0.32"/>
-<stop stop-color="#6D6D6D" offset="1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="60.22" x2="59.88" y1="6.5" y2="108.33">
+<stop offset="0" stop-color="#E2E2E2"/>
+<stop offset="0.32" stop-color="#C0C0C0"/>
+<stop offset="1" stop-color="#6D6D6D"/>
 </linearGradient>
 <path d="M86,74.853c0,0-18.422,10.203-25.92,10.23C52.583,85.11,34,74.853,34,74.853v-4.77 c0,0,18.678,10.313,26.16,10.23C67.644,80.23,86,70.083,86,70.083V74.853z" fill="url(#SVGID_1)"/>
-<linearGradient id="SVGID_2" gradientUnits="userSpaceOnUse" x1="34" y1="76.07" x2="86" y2="76.07">
-<stop stop-color="#E2E2E2" offset="0"/>
-<stop stop-color="#C0C0C0" offset="0.32"/>
-<stop stop-color="#6D6D6D" offset="1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="34" x2="86" y1="76.07" y2="76.07">
+<stop offset="0" stop-color="#E2E2E2"/>
+<stop offset="0.32" stop-color="#C0C0C0"/>
+<stop offset="1" stop-color="#6D6D6D"/>
 </linearGradient>
 </g>
 <g fill-opacity="0.25" stroke-opacity="0.25" transform="translate(-29.999,-53.748)">
@@ -26,4 +26,4 @@
 <path d="M86,74.852c0,0-18.422,10.203-25.92,10.23C52.583,85.11,34,74.852,34,74.852v-4.77 c0,0,18.678,10.313,26.16,10.23C67.644,80.229,86,70.083,86,70.083V74.852z" fill="url(#SVGID_1)"/>
 <path d="M86,70.834c0,0-18.422,11.204-25.92,11.229C52.583,82.092,34,70.834,34,70.834v-0.75 c0,0,18.678,10.313,26.16,10.229C67.644,80.231,86,70.084,86,70.084V70.834z" fill="url(#SVGID_2)"/>
 </g>
-</svg>
\ No newline at end of file
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_9.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_9.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_9.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,18 +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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="60" height="60" viewBox="0 0 60 60">
+<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">
 <rect fill="none" height="60" width="60"/>
 <g fill-opacity="0.25" stroke-opacity="0.25" transform="translate(-29.999,-66.081)">
-<linearGradient id="SVGID_1" gradientUnits="userSpaceOnUse" x1="60.22" y1="6.5" x2="59.88" y2="108.33">
-<stop stop-color="#E2E2E2" offset="0"/>
-<stop stop-color="#C0C0C0" offset="0.32"/>
-<stop stop-color="#6D6D6D" offset="1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="60.22" x2="59.88" y1="6.5" y2="108.33">
+<stop offset="0" stop-color="#E2E2E2"/>
+<stop offset="0.32" stop-color="#C0C0C0"/>
+<stop offset="1" stop-color="#6D6D6D"/>
 </linearGradient>
 <path d="M86,74.853c0,0-18.422,10.203-25.92,10.23C52.583,85.11,34,74.853,34,74.853v-4.77 c0,0,18.678,10.313,26.16,10.23C67.644,80.23,86,70.083,86,70.083V74.853z" fill="url(#SVGID_1)"/>
-<linearGradient id="SVGID_2" gradientUnits="userSpaceOnUse" x1="34" y1="76.07" x2="86" y2="76.07">
-<stop stop-color="#E2E2E2" offset="0"/>
-<stop stop-color="#C0C0C0" offset="0.32"/>
-<stop stop-color="#6D6D6D" offset="1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="34" x2="86" y1="76.07" y2="76.07">
+<stop offset="0" stop-color="#E2E2E2"/>
+<stop offset="0.32" stop-color="#C0C0C0"/>
+<stop offset="1" stop-color="#6D6D6D"/>
 </linearGradient>
 </g>
 <g fill-opacity="0.25" stroke-opacity="0.25" transform="translate(-29.999,-53.748)">
@@ -26,4 +26,4 @@
 <path d="M86,74.852c0,0-18.422,10.203-25.92,10.23C52.583,85.11,34,74.852,34,74.852v-4.77 c0,0,18.678,10.313,26.16,10.23C67.644,80.229,86,70.083,86,70.083V74.852z" fill="url(#SVGID_1)"/>
 <path d="M86,70.834c0,0-18.422,11.204-25.92,11.229C52.583,82.092,34,70.834,34,70.834v-0.75 c0,0,18.678,10.313,26.16,10.229C67.644,80.231,86,70.084,86,70.084V70.834z" fill="url(#SVGID_2)"/>
 </g>
-</svg>
\ No newline at end of file
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading.axml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading.axml	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,14 @@
+<animations>
+<icon name="qtg_anim_small_loading" frame_duration="50" playmode="loop">
+<frame>qtg_anim_small_loading_1</frame>
+<frame>qtg_anim_small_loading_2</frame>
+<frame>qtg_anim_small_loading_3</frame>
+<frame>qtg_anim_small_loading_4</frame>
+<frame>qtg_anim_small_loading_5</frame>
+<frame>qtg_anim_small_loading_6</frame>
+<frame>qtg_anim_small_loading_7</frame>
+<frame>qtg_anim_small_loading_8</frame>
+<frame>qtg_anim_small_loading_9</frame>
+<frame>qtg_anim_small_loading_10</frame>
+</icon>
+</animations>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_1.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_1.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg 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="M15,3C8.373,3,3,8.373,3,15c0,6.628,5.373,12,12,12s12-5.372,12-12   C27,8.373,21.627,3,15,3z M15,22.291c-4.027,0-7.291-3.264-7.291-7.291c0-4.027,3.264-7.291,7.291-7.291   c4.025,0,7.291,3.264,7.291,7.291C22.291,19.027,19.025,22.291,15,22.291z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<g>
+<g>
+<radialGradient cx="871.7041" cy="1210.9775" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="21.5152">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M14.451,3.502c-2.768,0.129-5.277,1.234-7.194,2.979l1.41,1.41     c1.557-1.387,3.566-2.268,5.784-2.395V3.502z" fill="url(#SVGID_1_)"/>
+<radialGradient cx="871.7041" cy="1210.9805" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="21.5177">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M6.481,7.257c-1.746,1.919-2.853,4.43-2.981,7.195h1.996c0.127-2.217,1.008-4.228,2.396-5.785     L6.481,7.257z" fill="url(#SVGID_2_)"/>
+<radialGradient cx="871.7012" cy="1210.9805" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="21.5157">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M3.502,15.549c0.13,2.768,1.235,5.276,2.979,7.194l1.409-1.41     c-1.387-1.558-2.268-3.565-2.395-5.784H3.502z" fill="url(#SVGID_3_)"/>
+<radialGradient cx="871.708" cy="1210.9775" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="21.5164">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M22.743,6.481c-1.92-1.746-4.431-2.852-7.194-2.981v1.997c2.219,0.126,4.229,1.007,5.784,2.395     L22.743,6.481z" fill="url(#SVGID_4_)"/>
+<radialGradient cx="871.7061" cy="1210.9814" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_5_" r="21.5174">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M23.52,22.743c1.746-1.919,2.853-4.431,2.98-7.194h-1.996c-0.127,2.219-1.008,4.229-2.396,5.784     L23.52,22.743z" fill="url(#SVGID_5_)"/>
+<radialGradient cx="871.708" cy="1210.9805" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="21.5174">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M26.498,14.452c-0.13-2.768-1.234-5.277-2.979-7.195l-1.41,1.41     c1.389,1.557,2.269,3.568,2.396,5.785H26.498z" fill="url(#SVGID_6_)"/>
+<radialGradient cx="871.7051" cy="1210.9873" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="21.5142">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M15.549,26.498c2.768-0.13,5.277-1.234,7.194-2.979l-1.41-1.41     c-1.558,1.387-3.565,2.268-5.784,2.395V26.498z" fill="url(#SVGID_7_)"/>
+<radialGradient cx="871.7061" cy="1210.9746" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="21.5223">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M7.257,23.52c1.92,1.744,4.431,2.852,7.194,2.98v-1.996c-2.218-0.127-4.228-1.008-5.784-2.396     L7.257,23.52z" fill="url(#SVGID_8_)"/>
+</g>
+<radialGradient cx="871.707" cy="1210.9805" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="21.5199">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M14.451,7.326V5.497c-2.218,0.126-4.228,1.007-5.784,2.395L9.96,9.186    C11.182,8.125,12.738,7.447,14.451,7.326z" fill="url(#SVGID_9_)"/>
+<radialGradient cx="871.7129" cy="1210.9795" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="21.523">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M9.186,9.96L7.891,8.667c-1.388,1.557-2.268,3.568-2.395,5.785h1.83    C7.447,12.738,8.125,11.182,9.186,9.96z" fill="url(#SVGID_10_)"/>
+<radialGradient cx="871.7158" cy="1210.9805" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_11_" r="21.5246">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M7.326,15.549h-1.83c0.127,2.219,1.008,4.229,2.395,5.784l1.295-1.294    C8.125,18.818,7.447,17.262,7.326,15.549z" fill="url(#SVGID_11_)"/>
+<radialGradient cx="871.7041" cy="1210.9805" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_12_" r="21.5199">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M20.04,9.186l1.293-1.294c-1.558-1.388-3.565-2.269-5.784-2.395v1.83    C17.262,7.447,18.818,8.125,20.04,9.186z" fill="url(#SVGID_12_)"/>
+<radialGradient cx="871.708" cy="1210.9795" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_13_" r="21.5191">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M20.814,20.04l1.293,1.293c1.389-1.558,2.27-3.565,2.396-5.784h-1.83    C22.553,17.262,21.874,18.818,20.814,20.04z" fill="url(#SVGID_13_)"/>
+<radialGradient cx="871.7061" cy="1210.9795" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_14_" r="21.5185">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M22.674,14.452h1.83c-0.127-2.217-1.007-4.228-2.395-5.785L20.814,9.96    C21.875,11.182,22.553,12.738,22.674,14.452z" fill="url(#SVGID_14_)"/>
+<radialGradient cx="871.7051" cy="1210.9746" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_15_" r="21.523">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M15.549,22.674v1.83c2.219-0.127,4.229-1.007,5.784-2.395l-1.294-1.295    C18.816,21.875,17.262,22.553,15.549,22.674z" fill="url(#SVGID_15_)"/>
+<radialGradient cx="871.7041" cy="1210.9785" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_16_" r="21.5192">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M9.96,20.814l-1.294,1.293c1.557,1.389,3.567,2.27,5.784,2.396v-1.83    C12.738,22.553,11.182,21.874,9.96,20.814z" fill="url(#SVGID_16_)"/>
+<path d="M14.451,7.326V5.497c-2.218,0.126-4.228,1.007-5.784,2.395    L9.96,9.186C11.182,8.125,12.738,7.447,14.451,7.326z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M9.186,9.96L7.891,8.667    c-1.388,1.557-2.268,3.568-2.395,5.785h1.83C7.447,12.738,8.125,11.182,9.186,9.96z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M7.326,15.549h-1.83c0.127,2.219,1.008,4.229,2.395,5.784    l1.295-1.294C8.125,18.818,7.447,17.262,7.326,15.549z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M20.04,9.186l1.293-1.294    c-1.558-1.388-3.565-2.269-5.784-2.395v1.83C17.262,7.447,18.818,8.125,20.04,9.186z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M20.814,20.04l1.293,1.293    c1.389-1.558,2.27-3.565,2.396-5.784h-1.83C22.553,17.262,21.874,18.818,20.814,20.04z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M22.674,14.452h1.83c-0.127-2.217-1.007-4.228-2.395-5.785    L20.814,9.96C21.875,11.182,22.553,12.738,22.674,14.452z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M15.549,22.674v1.83c2.219-0.127,4.229-1.007,5.784-2.395    l-1.294-1.295C18.816,21.875,17.262,22.553,15.549,22.674z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M9.96,20.814l-1.294,1.293    c1.557,1.389,3.567,2.27,5.784,2.396v-1.83C12.738,22.553,11.182,21.874,9.96,20.814z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+</g>
+</g>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_10.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_10.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg 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="M15,3C8.373,3,3,8.373,3,15c0,6.628,5.373,12,12,12s12-5.372,12-12   C27,8.373,21.627,3,15,3z M15,22.291c-4.027,0-7.291-3.264-7.291-7.291c0-4.027,3.264-7.291,7.291-7.291   c4.025,0,7.291,3.264,7.291,7.291C22.291,19.027,19.025,22.291,15,22.291z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<g>
+<g>
+<g>
+<g>
+<radialGradient cx="848.0537" cy="1218.0283" gradientTransform="matrix(0.4558 0 0 0.4558 -369.8906 -549.3661)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="21.1919">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M14.451,3.502c-2.768,0.13-5.277,1.235-7.195,2.979l1.411,1.41       c1.557-1.387,3.566-2.268,5.784-2.395V3.502z" fill="url(#SVGID_1_)"/>
+<radialGradient cx="848.0508" cy="1218.0293" gradientTransform="matrix(0.4558 0 0 0.4558 -369.8906 -549.3661)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="21.1889">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M6.481,7.257C4.735,9.176,3.63,11.687,3.5,14.452h1.996c0.127-2.217,1.008-4.228,2.396-5.785       L6.481,7.257z" fill="url(#SVGID_2_)"/>
+<radialGradient cx="848.0479" cy="1218.0313" gradientTransform="matrix(0.4558 0 0 0.4558 -369.8906 -549.3661)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="21.1867">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M3.502,15.549c0.13,2.768,1.235,5.276,2.979,7.194l1.409-1.41       c-1.387-1.558-2.268-3.567-2.395-5.784H3.502z" fill="url(#SVGID_3_)"/>
+<radialGradient cx="848.0537" cy="1218.0283" gradientTransform="matrix(0.4558 0 0 0.4558 -369.8906 -549.3661)" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="21.188">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M22.743,6.481c-1.92-1.746-4.431-2.852-7.194-2.981v1.997c2.219,0.126,4.229,1.007,5.784,2.395       L22.743,6.481z" fill="url(#SVGID_4_)"/>
+<radialGradient cx="848.0518" cy="1218.0332" gradientTransform="matrix(0.4558 0 0 0.4558 -369.8906 -549.3661)" gradientUnits="userSpaceOnUse" id="SVGID_5_" r="21.1871">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M23.52,22.743c1.746-1.919,2.852-4.431,2.98-7.194h-1.996c-0.127,2.217-1.008,4.229-2.396,5.784       L23.52,22.743z" fill="url(#SVGID_5_)"/>
+<radialGradient cx="848.0557" cy="1218.0293" gradientTransform="matrix(0.4558 0 0 0.4558 -369.8906 -549.3661)" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="21.1857">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M26.498,14.452c-0.13-2.768-1.234-5.277-2.979-7.195l-1.41,1.41       c1.389,1.557,2.269,3.568,2.396,5.785H26.498z" fill="url(#SVGID_6_)"/>
+<radialGradient cx="848.0527" cy="1218.0361" gradientTransform="matrix(0.4558 0 0 0.4558 -369.8906 -549.3661)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="21.1864">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M15.549,26.498c2.768-0.13,5.277-1.234,7.195-2.979l-1.411-1.41       c-1.556,1.387-3.565,2.268-5.784,2.395V26.498z" fill="url(#SVGID_7_)"/>
+<radialGradient cx="848.0527" cy="1218.0117" gradientTransform="matrix(0.4558 0 0 0.4558 -369.8906 -549.3661)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="21.1977">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M7.257,23.518c1.92,1.746,4.431,2.854,7.194,2.982v-1.996c-2.218-0.127-4.228-1.008-5.784-2.396       L7.257,23.518z" fill="url(#SVGID_8_)"/>
+</g>
+<radialGradient cx="848.0527" cy="1218.0293" gradientTransform="matrix(0.4558 0 0 0.4558 -369.8906 -549.3661)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="21.1899">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M14.451,7.326v-1.83c-2.218,0.126-4.228,1.007-5.784,2.395L9.96,9.186      C11.182,8.125,12.738,7.447,14.451,7.326z" fill="url(#SVGID_9_)"/>
+<radialGradient cx="848.0566" cy="1218.0283" gradientTransform="matrix(0.4558 0 0 0.4558 -369.8906 -549.3661)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="21.1934">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M9.186,9.96L7.891,8.667c-1.388,1.557-2.268,3.568-2.395,5.785h1.83      C7.447,12.739,8.125,11.182,9.186,9.96z" fill="url(#SVGID_10_)"/>
+<radialGradient cx="848.0576" cy="1218.0313" gradientTransform="matrix(0.4558 0 0 0.4558 -369.8906 -549.3661)" gradientUnits="userSpaceOnUse" id="SVGID_11_" r="21.1906">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M7.326,15.549h-1.83c0.127,2.217,1.008,4.229,2.395,5.784l1.295-1.294      C8.125,18.818,7.447,17.262,7.326,15.549z" fill="url(#SVGID_11_)"/>
+<radialGradient cx="848.0527" cy="1218.0293" gradientTransform="matrix(0.4558 0 0 0.4558 -369.8906 -549.3661)" gradientUnits="userSpaceOnUse" id="SVGID_12_" r="21.1864">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M20.04,9.186l1.293-1.294c-1.556-1.388-3.565-2.269-5.784-2.395v1.83      C17.262,7.447,18.818,8.125,20.04,9.186z" fill="url(#SVGID_12_)"/>
+<radialGradient cx="848.0537" cy="1218.0303" gradientTransform="matrix(0.4558 0 0 0.4558 -369.8906 -549.3661)" gradientUnits="userSpaceOnUse" id="SVGID_13_" r="21.1887">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M20.814,20.04l1.293,1.293c1.389-1.556,2.27-3.565,2.396-5.784h-1.83      C22.553,17.262,21.874,18.818,20.814,20.04z" fill="url(#SVGID_13_)"/>
+<radialGradient cx="848.0518" cy="1218.0283" gradientTransform="matrix(0.4558 0 0 0.4558 -369.8906 -549.3661)" gradientUnits="userSpaceOnUse" id="SVGID_14_" r="21.1912">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M22.674,14.452h1.83c-0.127-2.217-1.007-4.228-2.395-5.785L20.814,9.96      C21.875,11.182,22.553,12.739,22.674,14.452z" fill="url(#SVGID_14_)"/>
+<radialGradient cx="848.0527" cy="1218.0215" gradientTransform="matrix(0.4558 0 0 0.4558 -369.8906 -549.3661)" gradientUnits="userSpaceOnUse" id="SVGID_15_" r="21.1931">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M15.549,22.674v1.83c2.219-0.127,4.229-1.008,5.784-2.395l-1.294-1.295      C18.816,21.875,17.262,22.553,15.549,22.674z" fill="url(#SVGID_15_)"/>
+<radialGradient cx="848.0547" cy="1218.0264" gradientTransform="matrix(0.4558 0 0 0.4558 -369.8906 -549.3661)" gradientUnits="userSpaceOnUse" id="SVGID_16_" r="21.1912">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M9.96,20.814l-1.294,1.293c1.557,1.389,3.567,2.27,5.785,2.396v-1.83      C12.738,22.553,11.182,21.875,9.96,20.814z" fill="url(#SVGID_16_)"/>
+</g>
+<path d="M14.451,7.326v-1.83c-2.218,0.126-4.228,1.007-5.784,2.395     L9.96,9.186C11.182,8.125,12.738,7.447,14.451,7.326z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M9.186,9.96L7.891,8.667     c-1.388,1.557-2.268,3.568-2.395,5.785h1.83C7.447,12.739,8.125,11.182,9.186,9.96z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M7.326,15.549h-1.83c0.127,2.217,1.008,4.229,2.395,5.784     l1.295-1.294C8.125,18.818,7.447,17.262,7.326,15.549z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M20.04,9.186l1.293-1.294     c-1.556-1.388-3.565-2.269-5.784-2.395v1.83C17.262,7.447,18.818,8.125,20.04,9.186z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M20.814,20.04l1.293,1.293     c1.389-1.556,2.27-3.565,2.396-5.784h-1.83C22.553,17.262,21.874,18.818,20.814,20.04z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M22.674,14.452h1.83c-0.127-2.217-1.007-4.228-2.395-5.785     L20.814,9.96C21.875,11.182,22.553,12.739,22.674,14.452z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M15.549,22.674v1.83c2.219-0.127,4.229-1.008,5.784-2.395     l-1.294-1.295C18.816,21.875,17.262,22.553,15.549,22.674z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M9.96,20.814l-1.294,1.293     c1.557,1.389,3.567,2.27,5.785,2.396v-1.83C12.738,22.553,11.182,21.875,9.96,20.814z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+</g>
+</g>
+</g>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_2.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_2.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg 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="M15,3C8.373,3,3,8.373,3,15c0,6.628,5.373,12,12,12s12-5.372,12-12   C27,8.373,21.627,3,15,3z M15,22.291c-4.027,0-7.291-3.264-7.291-7.291c0-4.027,3.264-7.291,7.291-7.291   c4.025,0,7.291,3.264,7.291,7.291C22.291,19.027,19.025,22.291,15,22.291z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<g>
+<g>
+<radialGradient cx="871.4541" cy="1226.9746" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="21.3337">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M14.451,3.502c-2.768,0.129-5.277,1.234-7.194,2.979l1.41,1.41     c1.557-1.387,3.566-2.268,5.784-2.395V3.502z" fill="url(#SVGID_1_)"/>
+<radialGradient cx="871.4541" cy="1226.9805" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="21.3354">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M6.481,7.257c-1.746,1.919-2.853,4.43-2.981,7.195h1.996c0.127-2.217,1.008-4.228,2.396-5.785     L6.481,7.257z" fill="url(#SVGID_2_)"/>
+<radialGradient cx="871.4512" cy="1226.9795" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="21.3344">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M3.502,15.549c0.13,2.768,1.235,5.276,2.979,7.194l1.409-1.41     c-1.387-1.558-2.268-3.565-2.395-5.784H3.502z" fill="url(#SVGID_3_)"/>
+<radialGradient cx="871.458" cy="1226.9746" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="21.3333">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M22.743,6.481c-1.92-1.746-4.431-2.852-7.194-2.981v1.997c2.219,0.126,4.229,1.007,5.784,2.395     L22.743,6.481z" fill="url(#SVGID_4_)"/>
+<radialGradient cx="871.4561" cy="1226.9795" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_5_" r="21.3377">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M23.52,22.743c1.746-1.919,2.853-4.431,2.98-7.194h-1.996c-0.127,2.219-1.008,4.229-2.396,5.784     L23.52,22.743z" fill="url(#SVGID_5_)"/>
+<radialGradient cx="871.458" cy="1226.9805" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="21.3367">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M26.498,14.452c-0.13-2.768-1.234-5.277-2.979-7.195l-1.41,1.41     c1.389,1.557,2.269,3.568,2.396,5.785H26.498z" fill="url(#SVGID_6_)"/>
+<radialGradient cx="871.4551" cy="1226.9844" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="21.3317">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M15.549,26.498c2.768-0.13,5.277-1.234,7.194-2.979l-1.41-1.41     c-1.558,1.387-3.565,2.268-5.784,2.395V26.498z" fill="url(#SVGID_7_)"/>
+<radialGradient cx="871.4561" cy="1226.9775" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="21.339">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M7.257,23.52c1.92,1.744,4.431,2.852,7.194,2.98v-1.996c-2.218-0.127-4.228-1.008-5.784-2.396     L7.257,23.52z" fill="url(#SVGID_8_)"/>
+</g>
+<radialGradient cx="871.457" cy="1226.9805" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="21.3377">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M14.451,7.326V5.497c-2.218,0.126-4.228,1.007-5.784,2.395L9.96,9.186    C11.182,8.125,12.738,7.447,14.451,7.326z" fill="url(#SVGID_9_)"/>
+<radialGradient cx="871.4629" cy="1226.9785" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="21.3395">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M9.186,9.96L7.891,8.667c-1.388,1.557-2.268,3.568-2.395,5.785h1.83    C7.447,12.738,8.125,11.182,9.186,9.96z" fill="url(#SVGID_10_)"/>
+<radialGradient cx="871.4658" cy="1226.9795" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_11_" r="21.3431">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M7.326,15.549h-1.83c0.127,2.219,1.008,4.229,2.395,5.784l1.295-1.294    C8.125,18.818,7.447,17.262,7.326,15.549z" fill="url(#SVGID_11_)"/>
+<radialGradient cx="871.4541" cy="1226.9805" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_12_" r="21.3375">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M20.04,9.186l1.293-1.294c-1.558-1.388-3.565-2.269-5.784-2.395v1.83    C17.262,7.447,18.818,8.125,20.04,9.186z" fill="url(#SVGID_12_)"/>
+<radialGradient cx="871.458" cy="1226.9785" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_13_" r="21.3345">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M20.814,20.04l1.293,1.293c1.389-1.558,2.27-3.565,2.396-5.784h-1.83    C22.553,17.262,21.874,18.818,20.814,20.04z" fill="url(#SVGID_13_)"/>
+<radialGradient cx="871.4561" cy="1226.9785" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_14_" r="21.3356">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M22.674,14.452h1.83c-0.127-2.217-1.007-4.228-2.395-5.785L20.814,9.96    C21.875,11.182,22.553,12.738,22.674,14.452z" fill="url(#SVGID_14_)"/>
+<radialGradient cx="871.4551" cy="1226.9775" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_15_" r="21.339">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M15.549,22.674v1.83c2.219-0.127,4.229-1.007,5.784-2.395l-1.294-1.295    C18.816,21.875,17.262,22.553,15.549,22.674z" fill="url(#SVGID_15_)"/>
+<radialGradient cx="871.4541" cy="1226.9795" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_16_" r="21.335">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M9.96,20.814l-1.294,1.293c1.557,1.389,3.567,2.27,5.784,2.396v-1.83    C12.738,22.553,11.182,21.874,9.96,20.814z" fill="url(#SVGID_16_)"/>
+<path d="M14.451,7.326V5.497c-2.218,0.126-4.228,1.007-5.784,2.395    L9.96,9.186C11.182,8.125,12.738,7.447,14.451,7.326z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M9.186,9.96L7.891,8.667    c-1.388,1.557-2.268,3.568-2.395,5.785h1.83C7.447,12.738,8.125,11.182,9.186,9.96z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M7.326,15.549h-1.83c0.127,2.219,1.008,4.229,2.395,5.784    l1.295-1.294C8.125,18.818,7.447,17.262,7.326,15.549z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M20.04,9.186l1.293-1.294    c-1.558-1.388-3.565-2.269-5.784-2.395v1.83C17.262,7.447,18.818,8.125,20.04,9.186z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M20.814,20.04l1.293,1.293    c1.389-1.558,2.27-3.565,2.396-5.784h-1.83C22.553,17.262,21.874,18.818,20.814,20.04z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M22.674,14.452h1.83c-0.127-2.217-1.007-4.228-2.395-5.785    L20.814,9.96C21.875,11.182,22.553,12.738,22.674,14.452z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M15.549,22.674v1.83c2.219-0.127,4.229-1.007,5.784-2.395    l-1.294-1.295C18.816,21.875,17.262,22.553,15.549,22.674z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M9.96,20.814l-1.294,1.293    c1.557,1.389,3.567,2.27,5.784,2.396v-1.83C12.738,22.553,11.182,21.874,9.96,20.814z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+</g>
+</g>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_3.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_3.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg 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="M15,3C8.373,3,3,8.373,3,15c0,6.628,5.373,12,12,12s12-5.372,12-12   C27,8.373,21.627,3,15,3z M15,22.291c-4.027,0-7.291-3.264-7.291-7.291c0-4.027,3.264-7.291,7.291-7.291   c4.025,0,7.291,3.264,7.291,7.291C22.291,19.027,19.025,22.291,15,22.291z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<g>
+<g>
+<radialGradient cx="860.0811" cy="1238.2236" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="20.7276">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M14.451,3.502c-2.768,0.129-5.277,1.234-7.194,2.979l1.41,1.41     c1.557-1.387,3.566-2.268,5.784-2.395V3.502z" fill="url(#SVGID_1_)"/>
+<radialGradient cx="860.0791" cy="1238.2295" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="20.7292">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M6.481,7.257c-1.746,1.919-2.853,4.43-2.981,7.195h1.996c0.127-2.217,1.008-4.228,2.396-5.785     L6.481,7.257z" fill="url(#SVGID_2_)"/>
+<radialGradient cx="860.0781" cy="1238.2285" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="20.73">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M3.502,15.549c0.13,2.768,1.235,5.276,2.979,7.194l1.409-1.41     c-1.387-1.558-2.268-3.565-2.395-5.784H3.502z" fill="url(#SVGID_3_)"/>
+<radialGradient cx="860.083" cy="1238.2227" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="20.7272">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M22.743,6.481c-1.92-1.746-4.431-2.852-7.194-2.981v1.997c2.219,0.126,4.229,1.007,5.784,2.395     L22.743,6.481z" fill="url(#SVGID_4_)"/>
+<radialGradient cx="860.0811" cy="1238.2275" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_5_" r="20.7323">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M23.52,22.743c1.746-1.919,2.853-4.431,2.98-7.194h-1.996c-0.127,2.219-1.008,4.229-2.396,5.784     L23.52,22.743z" fill="url(#SVGID_5_)"/>
+<radialGradient cx="860.085" cy="1238.2295" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="20.7296">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M26.498,14.452c-0.13-2.768-1.234-5.277-2.979-7.195l-1.41,1.41     c1.389,1.557,2.269,3.568,2.396,5.785H26.498z" fill="url(#SVGID_6_)"/>
+<radialGradient cx="860.082" cy="1238.2314" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="20.7269">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M15.549,26.498c2.768-0.13,5.277-1.234,7.194-2.979l-1.41-1.41     c-1.558,1.387-3.565,2.268-5.784,2.395V26.498z" fill="url(#SVGID_7_)"/>
+<radialGradient cx="860.082" cy="1238.2305" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="20.7343">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M7.257,23.52c1.92,1.744,4.431,2.852,7.194,2.98v-1.996c-2.218-0.127-4.228-1.008-5.784-2.396     L7.257,23.52z" fill="url(#SVGID_8_)"/>
+</g>
+<radialGradient cx="860.082" cy="1238.2305" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="20.7311">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M14.451,7.326V5.497c-2.218,0.126-4.228,1.007-5.784,2.395L9.96,9.186    C11.182,8.125,12.738,7.447,14.451,7.326z" fill="url(#SVGID_9_)"/>
+<radialGradient cx="860.0859" cy="1238.2285" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="20.7309">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M9.186,9.96L7.891,8.667c-1.388,1.557-2.268,3.568-2.395,5.785h1.83    C7.447,12.738,8.125,11.182,9.186,9.96z" fill="url(#SVGID_10_)"/>
+<radialGradient cx="860.0879" cy="1238.2285" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_11_" r="20.7332">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M7.326,15.549h-1.83c0.127,2.219,1.008,4.229,2.395,5.784l1.295-1.294    C8.125,18.818,7.447,17.262,7.326,15.549z" fill="url(#SVGID_11_)"/>
+<radialGradient cx="860.082" cy="1238.2305" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_12_" r="20.7307">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M20.04,9.186l1.293-1.294c-1.558-1.388-3.565-2.269-5.784-2.395v1.83    C17.262,7.447,18.818,8.125,20.04,9.186z" fill="url(#SVGID_12_)"/>
+<radialGradient cx="860.083" cy="1238.2275" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_13_" r="20.7279">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M20.814,20.04l1.293,1.293c1.389-1.558,2.27-3.565,2.396-5.784h-1.83    C22.553,17.262,21.874,18.818,20.814,20.04z" fill="url(#SVGID_13_)"/>
+<radialGradient cx="860.0811" cy="1238.2285" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_14_" r="20.7294">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M22.674,14.452h1.83c-0.127-2.217-1.007-4.228-2.395-5.785L20.814,9.96    C21.875,11.182,22.553,12.738,22.674,14.452z" fill="url(#SVGID_14_)"/>
+<radialGradient cx="860.082" cy="1238.2295" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_15_" r="20.7296">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M15.549,22.674v1.83c2.219-0.127,4.229-1.007,5.784-2.395l-1.294-1.295    C18.816,21.875,17.262,22.553,15.549,22.674z" fill="url(#SVGID_15_)"/>
+<radialGradient cx="860.0801" cy="1238.2305" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_16_" r="20.7291">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M9.96,20.814l-1.294,1.293c1.557,1.389,3.567,2.27,5.784,2.396v-1.83    C12.738,22.553,11.182,21.874,9.96,20.814z" fill="url(#SVGID_16_)"/>
+<path d="M14.451,7.326V5.497c-2.218,0.126-4.228,1.007-5.784,2.395    L9.96,9.186C11.182,8.125,12.738,7.447,14.451,7.326z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M9.186,9.96L7.891,8.667    c-1.388,1.557-2.268,3.568-2.395,5.785h1.83C7.447,12.738,8.125,11.182,9.186,9.96z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M7.326,15.549h-1.83c0.127,2.219,1.008,4.229,2.395,5.784    l1.295-1.294C8.125,18.818,7.447,17.262,7.326,15.549z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M20.04,9.186l1.293-1.294    c-1.558-1.388-3.565-2.269-5.784-2.395v1.83C17.262,7.447,18.818,8.125,20.04,9.186z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M20.814,20.04l1.293,1.293    c1.389-1.558,2.27-3.565,2.396-5.784h-1.83C22.553,17.262,21.874,18.818,20.814,20.04z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M22.674,14.452h1.83c-0.127-2.217-1.007-4.228-2.395-5.785    L20.814,9.96C21.875,11.182,22.553,12.738,22.674,14.452z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M15.549,22.674v1.83c2.219-0.127,4.229-1.007,5.784-2.395    l-1.294-1.295C18.816,21.875,17.262,22.553,15.549,22.674z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M9.96,20.814l-1.294,1.293    c1.557,1.389,3.567,2.27,5.784,2.396v-1.83C12.738,22.553,11.182,21.874,9.96,20.814z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+</g>
+</g>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_4.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_4.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg 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="M15,3C8.373,3,3,8.373,3,15c0,6.628,5.373,12,12,12s12-5.372,12-12   C27,8.373,21.627,3,15,3z M15,22.291c-4.027,0-7.291-3.264-7.291-7.291c0-4.027,3.264-7.291,7.291-7.291   c4.025,0,7.291,3.264,7.291,7.291C22.291,19.027,19.025,22.291,15,22.291z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<g>
+<g>
+<radialGradient cx="843.333" cy="1238.7236" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="21.728">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M14.451,3.502c-2.768,0.129-5.277,1.234-7.194,2.979l1.41,1.41     c1.557-1.387,3.566-2.268,5.784-2.395V3.502z" fill="url(#SVGID_1_)"/>
+<radialGradient cx="843.3301" cy="1238.7295" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="21.7309">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M6.481,7.257c-1.746,1.919-2.853,4.43-2.981,7.195h1.996c0.127-2.217,1.008-4.228,2.396-5.785     L6.481,7.257z" fill="url(#SVGID_2_)"/>
+<radialGradient cx="843.3301" cy="1238.7285" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="21.7273">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M3.502,15.549c0.13,2.768,1.235,5.276,2.979,7.194l1.409-1.41     c-1.387-1.558-2.268-3.565-2.395-5.784H3.502z" fill="url(#SVGID_3_)"/>
+<radialGradient cx="843.334" cy="1238.7227" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="21.7281">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M22.743,6.481c-1.92-1.746-4.431-2.852-7.194-2.981v1.997c2.219,0.126,4.229,1.007,5.784,2.395     L22.743,6.481z" fill="url(#SVGID_4_)"/>
+<radialGradient cx="843.3281" cy="1238.7275" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_5_" r="21.7337">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M23.52,22.743c1.746-1.919,2.853-4.431,2.98-7.194h-1.996c-0.127,2.219-1.008,4.229-2.396,5.784     L23.52,22.743z" fill="url(#SVGID_5_)"/>
+<radialGradient cx="843.3389" cy="1238.7295" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="21.7289">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M26.498,14.452c-0.13-2.768-1.234-5.277-2.979-7.195l-1.41,1.41     c1.389,1.557,2.269,3.568,2.396,5.785H26.498z" fill="url(#SVGID_6_)"/>
+<radialGradient cx="843.335" cy="1238.7314" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="21.7276">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M15.549,26.498c2.768-0.13,5.277-1.234,7.194-2.979l-1.41-1.41     c-1.558,1.387-3.565,2.268-5.784,2.395V26.498z" fill="url(#SVGID_7_)"/>
+<radialGradient cx="843.332" cy="1238.7305" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="21.7323">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M7.257,23.52c1.92,1.744,4.431,2.852,7.194,2.98v-1.996c-2.218-0.127-4.228-1.008-5.784-2.396     L7.257,23.52z" fill="url(#SVGID_8_)"/>
+</g>
+<radialGradient cx="843.3311" cy="1238.7305" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="21.7317">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M14.451,7.326V5.497c-2.218,0.126-4.228,1.007-5.784,2.395L9.96,9.186    C11.182,8.125,12.738,7.447,14.451,7.326z" fill="url(#SVGID_9_)"/>
+<radialGradient cx="843.333" cy="1238.7285" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="21.7304">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M9.186,9.96L7.891,8.667c-1.388,1.557-2.268,3.568-2.395,5.785h1.83    C7.447,12.738,8.125,11.182,9.186,9.96z" fill="url(#SVGID_10_)"/>
+<radialGradient cx="843.332" cy="1238.7285" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_11_" r="21.7272">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M7.326,15.549h-1.83c0.127,2.219,1.008,4.229,2.395,5.784l1.295-1.294    C8.125,18.818,7.447,17.262,7.326,15.549z" fill="url(#SVGID_11_)"/>
+<radialGradient cx="843.3359" cy="1238.7305" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_12_" r="21.7298">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M20.04,9.186l1.293-1.294c-1.558-1.388-3.565-2.269-5.784-2.395v1.83    C17.262,7.447,18.818,8.125,20.04,9.186z" fill="url(#SVGID_12_)"/>
+<radialGradient cx="843.333" cy="1238.7275" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_13_" r="21.7299">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M20.814,20.04l1.293,1.293c1.389-1.558,2.27-3.565,2.396-5.784h-1.83    C22.553,17.262,21.874,18.818,20.814,20.04z" fill="url(#SVGID_13_)"/>
+<radialGradient cx="843.3311" cy="1238.7285" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_14_" r="21.7301">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M22.674,14.452h1.83c-0.127-2.217-1.007-4.228-2.395-5.785L20.814,9.96    C21.875,11.182,22.553,12.738,22.674,14.452z" fill="url(#SVGID_14_)"/>
+<radialGradient cx="843.3359" cy="1238.7295" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_15_" r="21.7276">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M15.549,22.674v1.83c2.219-0.127,4.229-1.007,5.784-2.395l-1.294-1.295    C18.816,21.875,17.262,22.553,15.549,22.674z" fill="url(#SVGID_15_)"/>
+<radialGradient cx="843.3301" cy="1238.7305" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_16_" r="21.7341">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M9.96,20.814l-1.294,1.293c1.557,1.389,3.567,2.27,5.784,2.396v-1.83    C12.738,22.553,11.182,21.874,9.96,20.814z" fill="url(#SVGID_16_)"/>
+<path d="M14.451,7.326V5.497c-2.218,0.126-4.228,1.007-5.784,2.395    L9.96,9.186C11.182,8.125,12.738,7.447,14.451,7.326z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M9.186,9.96L7.891,8.667    c-1.388,1.557-2.268,3.568-2.395,5.785h1.83C7.447,12.738,8.125,11.182,9.186,9.96z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M7.326,15.549h-1.83c0.127,2.219,1.008,4.229,2.395,5.784    l1.295-1.294C8.125,18.818,7.447,17.262,7.326,15.549z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M20.04,9.186l1.293-1.294    c-1.558-1.388-3.565-2.269-5.784-2.395v1.83C17.262,7.447,18.818,8.125,20.04,9.186z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M20.814,20.04l1.293,1.293    c1.389-1.558,2.27-3.565,2.396-5.784h-1.83C22.553,17.262,21.874,18.818,20.814,20.04z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M22.674,14.452h1.83c-0.127-2.217-1.007-4.228-2.395-5.785    L20.814,9.96C21.875,11.182,22.553,12.738,22.674,14.452z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M15.549,22.674v1.83c2.219-0.127,4.229-1.007,5.784-2.395    l-1.294-1.295C18.816,21.875,17.262,22.553,15.549,22.674z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M9.96,20.814l-1.294,1.293    c1.557,1.389,3.567,2.27,5.784,2.396v-1.83C12.738,22.553,11.182,21.874,9.96,20.814z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+</g>
+</g>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_5.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_5.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg 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="M15,3C8.373,3,3,8.373,3,15c0,6.628,5.373,12,12,12s12-5.372,12-12   C27,8.373,21.627,3,15,3z M15,22.291c-4.027,0-7.291-3.264-7.291-7.291c0-4.027,3.264-7.291,7.291-7.291   c4.025,0,7.291,3.264,7.291,7.291C22.291,19.027,19.025,22.291,15,22.291z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<g>
+<g>
+<radialGradient cx="831.584" cy="1226.8496" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="21.5629">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M14.451,3.502c-2.768,0.129-5.277,1.234-7.194,2.979l1.41,1.41     c1.557-1.387,3.566-2.268,5.784-2.395V3.502z" fill="url(#SVGID_1_)"/>
+<radialGradient cx="831.5811" cy="1226.8555" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="21.5658">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M6.481,7.257c-1.746,1.919-2.853,4.43-2.981,7.195h1.996c0.127-2.217,1.008-4.228,2.396-5.785     L6.481,7.257z" fill="url(#SVGID_2_)"/>
+<radialGradient cx="831.582" cy="1226.8545" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="21.5625">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M3.502,15.549c0.13,2.768,1.235,5.276,2.979,7.194l1.409-1.41     c-1.387-1.558-2.268-3.565-2.395-5.784H3.502z" fill="url(#SVGID_3_)"/>
+<radialGradient cx="831.585" cy="1226.8496" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="21.5632">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M22.743,6.481c-1.92-1.746-4.431-2.852-7.194-2.981v1.997c2.219,0.126,4.229,1.007,5.784,2.395     L22.743,6.481z" fill="url(#SVGID_4_)"/>
+<radialGradient cx="831.5781" cy="1226.8545" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_5_" r="21.5673">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M23.52,22.743c1.746-1.919,2.853-4.431,2.98-7.194h-1.996c-0.127,2.219-1.008,4.229-2.396,5.784     L23.52,22.743z" fill="url(#SVGID_5_)"/>
+<radialGradient cx="831.5908" cy="1226.8555" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="21.5623">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M26.498,14.452c-0.13-2.768-1.234-5.277-2.979-7.195l-1.41,1.41     c1.389,1.557,2.269,3.568,2.396,5.785H26.498z" fill="url(#SVGID_6_)"/>
+<radialGradient cx="831.5869" cy="1226.8594" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="21.5615">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M15.549,26.498c2.768-0.13,5.277-1.234,7.194-2.979l-1.41-1.41     c-1.558,1.387-3.565,2.268-5.784,2.395V26.498z" fill="url(#SVGID_7_)"/>
+<radialGradient cx="831.582" cy="1226.8525" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="21.567">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M7.257,23.52c1.92,1.744,4.431,2.852,7.194,2.98v-1.996c-2.218-0.127-4.228-1.008-5.784-2.396     L7.257,23.52z" fill="url(#SVGID_8_)"/>
+</g>
+<radialGradient cx="831.5811" cy="1226.8555" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="21.5666">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M14.451,7.326V5.497c-2.218,0.126-4.228,1.007-5.784,2.395L9.96,9.186    C11.182,8.125,12.738,7.447,14.451,7.326z" fill="url(#SVGID_9_)"/>
+<radialGradient cx="831.5811" cy="1226.8535" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="21.5655">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M9.186,9.96L7.891,8.667c-1.388,1.557-2.268,3.568-2.395,5.785h1.83    C7.447,12.738,8.125,11.182,9.186,9.96z" fill="url(#SVGID_10_)"/>
+<radialGradient cx="831.5791" cy="1226.8545" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_11_" r="21.5701">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M7.326,15.549h-1.83c0.127,2.219,1.008,4.229,2.395,5.784l1.295-1.294    C8.125,18.818,7.447,17.262,7.326,15.549z" fill="url(#SVGID_11_)"/>
+<radialGradient cx="831.5889" cy="1226.8555" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_12_" r="21.5624">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M20.04,9.186l1.293-1.294c-1.558-1.388-3.565-2.269-5.784-2.395v1.83    C17.262,7.447,18.818,8.125,20.04,9.186z" fill="url(#SVGID_12_)"/>
+<radialGradient cx="831.583" cy="1226.8535" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_13_" r="21.5651">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M20.814,20.04l1.293,1.293c1.389-1.558,2.27-3.565,2.396-5.784h-1.83    C22.553,17.262,21.874,18.818,20.814,20.04z" fill="url(#SVGID_13_)"/>
+<radialGradient cx="831.5811" cy="1226.8535" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_14_" r="21.5651">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M22.674,14.452h1.83c-0.127-2.217-1.007-4.228-2.395-5.785L20.814,9.96    C21.875,11.182,22.553,12.738,22.674,14.452z" fill="url(#SVGID_14_)"/>
+<radialGradient cx="831.5879" cy="1226.8525" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_15_" r="21.5625">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M15.549,22.674v1.83c2.219-0.127,4.229-1.007,5.784-2.395l-1.294-1.295    C18.816,21.875,17.262,22.553,15.549,22.674z" fill="url(#SVGID_15_)"/>
+<radialGradient cx="831.5811" cy="1226.8545" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_16_" r="21.5653">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M9.96,20.814l-1.294,1.293c1.557,1.389,3.567,2.27,5.784,2.396v-1.83    C12.738,22.553,11.182,21.874,9.96,20.814z" fill="url(#SVGID_16_)"/>
+<path d="M14.451,7.326V5.497c-2.218,0.126-4.228,1.007-5.784,2.395    L9.96,9.186C11.182,8.125,12.738,7.447,14.451,7.326z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M9.186,9.96L7.891,8.667    c-1.388,1.557-2.268,3.568-2.395,5.785h1.83C7.447,12.738,8.125,11.182,9.186,9.96z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M7.326,15.549h-1.83c0.127,2.219,1.008,4.229,2.395,5.784    l1.295-1.294C8.125,18.818,7.447,17.262,7.326,15.549z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M20.04,9.186l1.293-1.294    c-1.558-1.388-3.565-2.269-5.784-2.395v1.83C17.262,7.447,18.818,8.125,20.04,9.186z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M20.814,20.04l1.293,1.293    c1.389-1.558,2.27-3.565,2.396-5.784h-1.83C22.553,17.262,21.874,18.818,20.814,20.04z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M22.674,14.452h1.83c-0.127-2.217-1.007-4.228-2.395-5.785    L20.814,9.96C21.875,11.182,22.553,12.738,22.674,14.452z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M15.549,22.674v1.83c2.219-0.127,4.229-1.007,5.784-2.395    l-1.294-1.295C18.816,21.875,17.262,22.553,15.549,22.674z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M9.96,20.814l-1.294,1.293    c1.557,1.389,3.567,2.27,5.784,2.396v-1.83C12.738,22.553,11.182,21.874,9.96,20.814z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+</g>
+</g>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_6.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_6.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg 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="M15,3C8.373,3,3,8.373,3,15c0,6.628,5.373,12,12,12s12-5.372,12-12   C27,8.373,21.627,3,15,3z M15,22.291c-4.027,0-7.291-3.264-7.291-7.291c0-4.027,3.264-7.291,7.291-7.291   c4.025,0,7.291,3.264,7.291,7.291C22.291,19.027,19.025,22.291,15,22.291z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<g>
+<g>
+<radialGradient cx="831.584" cy="1210.9775" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="22.3275">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M14.451,3.502c-2.768,0.129-5.277,1.234-7.194,2.979l1.41,1.41     c1.557-1.387,3.566-2.268,5.784-2.395V3.502z" fill="url(#SVGID_1_)"/>
+<radialGradient cx="831.5811" cy="1210.9805" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="22.3311">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M6.481,7.257c-1.746,1.919-2.853,4.43-2.981,7.195h1.996c0.127-2.217,1.008-4.228,2.396-5.785     L6.481,7.257z" fill="url(#SVGID_2_)"/>
+<radialGradient cx="831.582" cy="1210.9805" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="22.327">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M3.502,15.549c0.13,2.768,1.235,5.276,2.979,7.194l1.409-1.41     c-1.387-1.558-2.268-3.565-2.395-5.784H3.502z" fill="url(#SVGID_3_)"/>
+<radialGradient cx="831.585" cy="1210.9775" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="22.328">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M22.743,6.481c-1.92-1.746-4.431-2.852-7.194-2.981v1.997c2.219,0.126,4.229,1.007,5.784,2.395     L22.743,6.481z" fill="url(#SVGID_4_)"/>
+<radialGradient cx="831.5781" cy="1210.9814" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_5_" r="22.3306">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M23.52,22.743c1.746-1.919,2.853-4.431,2.98-7.194h-1.996c-0.127,2.219-1.008,4.229-2.396,5.784     L23.52,22.743z" fill="url(#SVGID_5_)"/>
+<radialGradient cx="831.5908" cy="1210.9805" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="22.3257">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M26.498,14.452c-0.13-2.768-1.234-5.277-2.979-7.195l-1.41,1.41     c1.389,1.557,2.269,3.568,2.396,5.785H26.498z" fill="url(#SVGID_6_)"/>
+<radialGradient cx="831.5869" cy="1210.9873" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="22.3253">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M15.549,26.498c2.768-0.13,5.277-1.234,7.194-2.979l-1.41-1.41     c-1.558,1.387-3.565,2.268-5.784,2.395V26.498z" fill="url(#SVGID_7_)"/>
+<radialGradient cx="831.582" cy="1210.9746" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="22.3326">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M7.257,23.52c1.92,1.744,4.431,2.852,7.194,2.98v-1.996c-2.218-0.127-4.228-1.008-5.784-2.396     L7.257,23.52z" fill="url(#SVGID_8_)"/>
+</g>
+<radialGradient cx="831.5811" cy="1210.9805" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="22.3311">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M14.451,7.326V5.497c-2.218,0.126-4.228,1.007-5.784,2.395L9.96,9.186    C11.182,8.125,12.738,7.447,14.451,7.326z" fill="url(#SVGID_9_)"/>
+<radialGradient cx="831.5811" cy="1210.9795" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="22.3317">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M9.186,9.96L7.891,8.667c-1.388,1.557-2.268,3.568-2.395,5.785h1.83    C7.447,12.738,8.125,11.182,9.186,9.96z" fill="url(#SVGID_10_)"/>
+<radialGradient cx="831.5791" cy="1210.9805" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_11_" r="22.3337">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M7.326,15.549h-1.83c0.127,2.219,1.008,4.229,2.395,5.784l1.295-1.294    C8.125,18.818,7.447,17.262,7.326,15.549z" fill="url(#SVGID_11_)"/>
+<radialGradient cx="831.5889" cy="1210.9805" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_12_" r="22.3252">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M20.04,9.186l1.293-1.294c-1.558-1.388-3.565-2.269-5.784-2.395v1.83    C17.262,7.447,18.818,8.125,20.04,9.186z" fill="url(#SVGID_12_)"/>
+<radialGradient cx="831.583" cy="1210.9795" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_13_" r="22.3298">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M20.814,20.04l1.293,1.293c1.389-1.558,2.27-3.565,2.396-5.784h-1.83    C22.553,17.262,21.874,18.818,20.814,20.04z" fill="url(#SVGID_13_)"/>
+<radialGradient cx="831.5811" cy="1210.9795" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_14_" r="22.3299">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M22.674,14.452h1.83c-0.127-2.217-1.007-4.228-2.395-5.785L20.814,9.96    C21.875,11.182,22.553,12.738,22.674,14.452z" fill="url(#SVGID_14_)"/>
+<radialGradient cx="831.5879" cy="1210.9746" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_15_" r="22.3284">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M15.549,22.674v1.83c2.219-0.127,4.229-1.007,5.784-2.395l-1.294-1.295    C18.816,21.875,17.262,22.553,15.549,22.674z" fill="url(#SVGID_15_)"/>
+<radialGradient cx="831.5811" cy="1210.9785" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_16_" r="22.3303">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M9.96,20.814l-1.294,1.293c1.557,1.389,3.567,2.27,5.784,2.396v-1.83    C12.738,22.553,11.182,21.874,9.96,20.814z" fill="url(#SVGID_16_)"/>
+<path d="M14.451,7.326V5.497c-2.218,0.126-4.228,1.007-5.784,2.395    L9.96,9.186C11.182,8.125,12.738,7.447,14.451,7.326z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M9.186,9.96L7.891,8.667    c-1.388,1.557-2.268,3.568-2.395,5.785h1.83C7.447,12.738,8.125,11.182,9.186,9.96z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M7.326,15.549h-1.83c0.127,2.219,1.008,4.229,2.395,5.784    l1.295-1.294C8.125,18.818,7.447,17.262,7.326,15.549z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M20.04,9.186l1.293-1.294    c-1.558-1.388-3.565-2.269-5.784-2.395v1.83C17.262,7.447,18.818,8.125,20.04,9.186z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M20.814,20.04l1.293,1.293    c1.389-1.558,2.27-3.565,2.396-5.784h-1.83C22.553,17.262,21.874,18.818,20.814,20.04z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M22.674,14.452h1.83c-0.127-2.217-1.007-4.228-2.395-5.785    L20.814,9.96C21.875,11.182,22.553,12.738,22.674,14.452z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M15.549,22.674v1.83c2.219-0.127,4.229-1.007,5.784-2.395    l-1.294-1.295C18.816,21.875,17.262,22.553,15.549,22.674z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M9.96,20.814l-1.294,1.293    c1.557,1.389,3.567,2.27,5.784,2.396v-1.83C12.738,22.553,11.182,21.874,9.96,20.814z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+</g>
+</g>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_7.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_7.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg 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="M15,3C8.373,3,3,8.373,3,15c0,6.628,5.373,12,12,12s12-5.372,12-12   C27,8.373,21.627,3,15,3z M15,22.291c-4.027,0-7.291-3.264-7.291-7.291c0-4.027,3.264-7.291,7.291-7.291   c4.025,0,7.291,3.264,7.291,7.291C22.291,19.027,19.025,22.291,15,22.291z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<g>
+<g>
+<radialGradient cx="843.333" cy="1199.1045" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="21.6326">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M14.451,3.502c-2.768,0.129-5.277,1.234-7.194,2.979l1.41,1.41     c1.557-1.387,3.566-2.268,5.784-2.395V3.502z" fill="url(#SVGID_1_)"/>
+<radialGradient cx="843.3301" cy="1199.1064" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="21.6293">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M6.481,7.257c-1.746,1.919-2.853,4.43-2.981,7.195h1.996c0.127-2.217,1.008-4.228,2.396-5.785     L6.481,7.257z" fill="url(#SVGID_2_)"/>
+<radialGradient cx="843.3301" cy="1199.1064" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="21.6341">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M3.502,15.549c0.13,2.768,1.235,5.276,2.979,7.194l1.409-1.41     c-1.387-1.558-2.268-3.565-2.395-5.784H3.502z" fill="url(#SVGID_3_)"/>
+<radialGradient cx="843.334" cy="1199.1055" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="21.6332">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M22.743,6.481c-1.92-1.746-4.431-2.852-7.194-2.981v1.997c2.219,0.126,4.229,1.007,5.784,2.395     L22.743,6.481z" fill="url(#SVGID_4_)"/>
+<radialGradient cx="843.3281" cy="1199.1084" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_5_" r="21.6344">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M23.52,22.743c1.746-1.919,2.853-4.431,2.98-7.194h-1.996c-0.127,2.219-1.008,4.229-2.396,5.784     L23.52,22.743z" fill="url(#SVGID_5_)"/>
+<radialGradient cx="843.3389" cy="1199.1064" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="21.6303">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M26.498,14.452c-0.13-2.768-1.234-5.277-2.979-7.195l-1.41,1.41     c1.389,1.557,2.269,3.568,2.396,5.785H26.498z" fill="url(#SVGID_6_)"/>
+<radialGradient cx="843.335" cy="1199.1143" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="21.6302">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M15.549,26.498c2.768-0.13,5.277-1.234,7.194-2.979l-1.41-1.41     c-1.558,1.387-3.565,2.268-5.784,2.395V26.498z" fill="url(#SVGID_7_)"/>
+<radialGradient cx="843.332" cy="1199.0977" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="21.6385">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M7.257,23.52c1.92,1.744,4.431,2.852,7.194,2.98v-1.996c-2.218-0.127-4.228-1.008-5.784-2.396     L7.257,23.52z" fill="url(#SVGID_8_)"/>
+</g>
+<radialGradient cx="843.3311" cy="1199.1055" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="21.6362">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M14.451,7.326V5.497c-2.218,0.126-4.228,1.007-5.784,2.395L9.96,9.186    C11.182,8.125,12.738,7.447,14.451,7.326z" fill="url(#SVGID_9_)"/>
+<radialGradient cx="843.333" cy="1199.1055" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="21.6349">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M9.186,9.96L7.891,8.667c-1.388,1.557-2.268,3.568-2.395,5.785h1.83    C7.447,12.738,8.125,11.182,9.186,9.96z" fill="url(#SVGID_10_)"/>
+<radialGradient cx="843.332" cy="1199.1064" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_11_" r="21.634">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M7.326,15.549h-1.83c0.127,2.219,1.008,4.229,2.395,5.784l1.295-1.294    C8.125,18.818,7.447,17.262,7.326,15.549z" fill="url(#SVGID_11_)"/>
+<radialGradient cx="843.3359" cy="1199.1055" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_12_" r="21.6303">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M20.04,9.186l1.293-1.294c-1.558-1.388-3.565-2.269-5.784-2.395v1.83    C17.262,7.447,18.818,8.125,20.04,9.186z" fill="url(#SVGID_12_)"/>
+<radialGradient cx="843.333" cy="1199.1055" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_13_" r="21.6346">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M20.814,20.04l1.293,1.293c1.389-1.558,2.27-3.565,2.396-5.784h-1.83    C22.553,17.262,21.874,18.818,20.814,20.04z" fill="url(#SVGID_13_)"/>
+<radialGradient cx="843.3311" cy="1199.1055" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_14_" r="21.6355">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M22.674,14.452h1.83c-0.127-2.217-1.007-4.228-2.395-5.785L20.814,9.96    C21.875,11.182,22.553,12.738,22.674,14.452z" fill="url(#SVGID_14_)"/>
+<radialGradient cx="843.3359" cy="1199.0967" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_15_" r="21.6363">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M15.549,22.674v1.83c2.219-0.127,4.229-1.007,5.784-2.395l-1.294-1.295    C18.816,21.875,17.262,22.553,15.549,22.674z" fill="url(#SVGID_15_)"/>
+<radialGradient cx="843.3301" cy="1199.1035" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_16_" r="21.6363">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M9.96,20.814l-1.294,1.293c1.557,1.389,3.567,2.27,5.784,2.396v-1.83    C12.738,22.553,11.182,21.874,9.96,20.814z" fill="url(#SVGID_16_)"/>
+<path d="M14.451,7.326V5.497c-2.218,0.126-4.228,1.007-5.784,2.395    L9.96,9.186C11.182,8.125,12.738,7.447,14.451,7.326z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M9.186,9.96L7.891,8.667    c-1.388,1.557-2.268,3.568-2.395,5.785h1.83C7.447,12.738,8.125,11.182,9.186,9.96z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M7.326,15.549h-1.83c0.127,2.219,1.008,4.229,2.395,5.784    l1.295-1.294C8.125,18.818,7.447,17.262,7.326,15.549z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M20.04,9.186l1.293-1.294    c-1.558-1.388-3.565-2.269-5.784-2.395v1.83C17.262,7.447,18.818,8.125,20.04,9.186z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M20.814,20.04l1.293,1.293    c1.389-1.558,2.27-3.565,2.396-5.784h-1.83C22.553,17.262,21.874,18.818,20.814,20.04z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M22.674,14.452h1.83c-0.127-2.217-1.007-4.228-2.395-5.785    L20.814,9.96C21.875,11.182,22.553,12.738,22.674,14.452z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M15.549,22.674v1.83c2.219-0.127,4.229-1.007,5.784-2.395    l-1.294-1.295C18.816,21.875,17.262,22.553,15.549,22.674z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M9.96,20.814l-1.294,1.293    c1.557,1.389,3.567,2.27,5.784,2.396v-1.83C12.738,22.553,11.182,21.874,9.96,20.814z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+</g>
+</g>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_8.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_8.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg 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="M15,3C8.373,3,3,8.373,3,15c0,6.628,5.373,12,12,12s12-5.372,12-12   C27,8.373,21.627,3,15,3z M15,22.291c-4.027,0-7.291-3.264-7.291-7.291c0-4.027,3.264-7.291,7.291-7.291   c4.025,0,7.291,3.264,7.291,7.291C22.291,19.027,19.025,22.291,15,22.291z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<g>
+<g>
+<radialGradient cx="850.207" cy="1197.4795" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="21.923">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M14.451,3.502c-2.768,0.129-5.277,1.234-7.194,2.979l1.41,1.41     c1.557-1.387,3.566-2.268,5.784-2.395V3.502z" fill="url(#SVGID_1_)"/>
+<radialGradient cx="850.2051" cy="1197.4814" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="21.9257">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M6.481,7.257c-1.746,1.919-2.853,4.43-2.981,7.195h1.996c0.127-2.217,1.008-4.228,2.396-5.785     L6.481,7.257z" fill="url(#SVGID_2_)"/>
+<radialGradient cx="850.2041" cy="1197.4814" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="21.9251">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M3.502,15.549c0.13,2.768,1.235,5.276,2.979,7.194l1.409-1.41     c-1.387-1.558-2.268-3.565-2.395-5.784H3.502z" fill="url(#SVGID_3_)"/>
+<radialGradient cx="850.209" cy="1197.4805" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="21.9244">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M22.743,6.481c-1.92-1.746-4.431-2.852-7.194-2.981v1.997c2.219,0.126,4.229,1.007,5.784,2.395     L22.743,6.481z" fill="url(#SVGID_4_)"/>
+<radialGradient cx="850.2051" cy="1197.4834" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_5_" r="21.9251">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M23.52,22.743c1.746-1.919,2.853-4.431,2.98-7.194h-1.996c-0.127,2.219-1.008,4.229-2.396,5.784     L23.52,22.743z" fill="url(#SVGID_5_)"/>
+<radialGradient cx="850.2119" cy="1197.4814" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="21.9222">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M26.498,14.452c-0.13-2.768-1.234-5.277-2.979-7.195l-1.41,1.41     c1.389,1.557,2.269,3.568,2.396,5.785H26.498z" fill="url(#SVGID_6_)"/>
+<radialGradient cx="850.209" cy="1197.4902" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="21.9215">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M15.549,26.498c2.768-0.13,5.277-1.234,7.194-2.979l-1.41-1.41     c-1.558,1.387-3.565,2.268-5.784,2.395V26.498z" fill="url(#SVGID_7_)"/>
+<radialGradient cx="850.207" cy="1197.4717" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="21.9306">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M7.257,23.52c1.92,1.744,4.431,2.852,7.194,2.98v-1.996c-2.218-0.127-4.228-1.008-5.784-2.396     L7.257,23.52z" fill="url(#SVGID_8_)"/>
+</g>
+<radialGradient cx="850.2061" cy="1197.4805" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="21.9271">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M14.451,7.326V5.497c-2.218,0.126-4.228,1.007-5.784,2.395L9.96,9.186    C11.182,8.125,12.738,7.447,14.451,7.326z" fill="url(#SVGID_9_)"/>
+<radialGradient cx="850.209" cy="1197.4805" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="21.9286">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M9.186,9.96L7.891,8.667c-1.388,1.557-2.268,3.568-2.395,5.785h1.83    C7.447,12.738,8.125,11.182,9.186,9.96z" fill="url(#SVGID_10_)"/>
+<radialGradient cx="850.209" cy="1197.4814" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_11_" r="21.926">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M7.326,15.549h-1.83c0.127,2.219,1.008,4.229,2.395,5.784l1.295-1.294    C8.125,18.818,7.447,17.262,7.326,15.549z" fill="url(#SVGID_11_)"/>
+<radialGradient cx="850.209" cy="1197.4805" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_12_" r="21.9224">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M20.04,9.186l1.293-1.294c-1.558-1.388-3.565-2.269-5.784-2.395v1.83    C17.262,7.447,18.818,8.125,20.04,9.186z" fill="url(#SVGID_12_)"/>
+<radialGradient cx="850.208" cy="1197.4805" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_13_" r="21.9261">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M20.814,20.04l1.293,1.293c1.389-1.558,2.27-3.565,2.396-5.784h-1.83    C22.553,17.262,21.874,18.818,20.814,20.04z" fill="url(#SVGID_13_)"/>
+<radialGradient cx="850.2061" cy="1197.4805" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_14_" r="21.9275">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M22.674,14.452h1.83c-0.127-2.217-1.007-4.228-2.395-5.785L20.814,9.96    C21.875,11.182,22.553,12.738,22.674,14.452z" fill="url(#SVGID_14_)"/>
+<radialGradient cx="850.209" cy="1197.4717" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_15_" r="21.9292">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M15.549,22.674v1.83c2.219-0.127,4.229-1.007,5.784-2.395l-1.294-1.295    C18.816,21.875,17.262,22.553,15.549,22.674z" fill="url(#SVGID_15_)"/>
+<radialGradient cx="850.2051" cy="1197.4785" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_16_" r="21.9279">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M9.96,20.814l-1.294,1.293c1.557,1.389,3.567,2.27,5.784,2.396v-1.83    C12.738,22.553,11.182,21.874,9.96,20.814z" fill="url(#SVGID_16_)"/>
+<path d="M14.451,7.326V5.497c-2.218,0.126-4.228,1.007-5.784,2.395    L9.96,9.186C11.182,8.125,12.738,7.447,14.451,7.326z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M9.186,9.96L7.891,8.667    c-1.388,1.557-2.268,3.568-2.395,5.785h1.83C7.447,12.738,8.125,11.182,9.186,9.96z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M7.326,15.549h-1.83c0.127,2.219,1.008,4.229,2.395,5.784    l1.295-1.294C8.125,18.818,7.447,17.262,7.326,15.549z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M20.04,9.186l1.293-1.294    c-1.558-1.388-3.565-2.269-5.784-2.395v1.83C17.262,7.447,18.818,8.125,20.04,9.186z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M20.814,20.04l1.293,1.293    c1.389-1.558,2.27-3.565,2.396-5.784h-1.83C22.553,17.262,21.874,18.818,20.814,20.04z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M22.674,14.452h1.83c-0.127-2.217-1.007-4.228-2.395-5.785    L20.814,9.96C21.875,11.182,22.553,12.738,22.674,14.452z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M15.549,22.674v1.83c2.219-0.127,4.229-1.007,5.784-2.395    l-1.294-1.295C18.816,21.875,17.262,22.553,15.549,22.674z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M9.96,20.814l-1.294,1.293    c1.557,1.389,3.567,2.27,5.784,2.396v-1.83C12.738,22.553,11.182,21.874,9.96,20.814z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+</g>
+</g>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_9.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_9.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg 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="M15,3C8.373,3,3,8.373,3,15c0,6.628,5.373,12,12,12s12-5.372,12-12   C27,8.373,21.627,3,15,3z M15,22.291c-4.027,0-7.291-3.264-7.291-7.291c0-4.027,3.264-7.291,7.291-7.291   c4.025,0,7.291,3.264,7.291,7.291C22.291,19.027,19.025,22.291,15,22.291z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<g>
+<g>
+<radialGradient cx="852.957" cy="1197.2295" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="22.4035">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M14.451,3.502c-2.768,0.129-5.277,1.234-7.194,2.979l1.41,1.41     c1.557-1.387,3.566-2.268,5.784-2.395V3.502z" fill="url(#SVGID_1_)"/>
+<radialGradient cx="852.9551" cy="1197.2314" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="22.4091">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M6.481,7.257c-1.746,1.919-2.853,4.43-2.981,7.195h1.996c0.127-2.217,1.008-4.228,2.396-5.785     L6.481,7.257z" fill="url(#SVGID_2_)"/>
+<radialGradient cx="852.9531" cy="1197.2314" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="22.4079">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M3.502,15.549c0.13,2.768,1.235,5.276,2.979,7.194l1.409-1.41     c-1.387-1.558-2.268-3.565-2.395-5.784H3.502z" fill="url(#SVGID_3_)"/>
+<radialGradient cx="852.959" cy="1197.2305" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="22.4075">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M22.743,6.481c-1.92-1.746-4.431-2.852-7.194-2.981v1.997c2.219,0.126,4.229,1.007,5.784,2.395     L22.743,6.481z" fill="url(#SVGID_4_)"/>
+<radialGradient cx="852.9541" cy="1197.2334" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_5_" r="22.4088">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M23.52,22.743c1.746-1.919,2.853-4.431,2.98-7.194h-1.996c-0.127,2.219-1.008,4.229-2.396,5.784     L23.52,22.743z" fill="url(#SVGID_5_)"/>
+<radialGradient cx="852.9619" cy="1197.2314" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="22.4052">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M26.498,14.452c-0.13-2.768-1.234-5.277-2.979-7.195l-1.41,1.41     c1.389,1.557,2.269,3.568,2.396,5.785H26.498z" fill="url(#SVGID_6_)"/>
+<radialGradient cx="852.959" cy="1197.2402" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="22.4047">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M15.549,26.498c2.768-0.13,5.277-1.234,7.194-2.979l-1.41-1.41     c-1.558,1.387-3.565,2.268-5.784,2.395V26.498z" fill="url(#SVGID_7_)"/>
+<radialGradient cx="852.957" cy="1197.2217" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="22.4143">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M7.257,23.52c1.92,1.744,4.431,2.852,7.194,2.98v-1.996c-2.218-0.127-4.228-1.008-5.784-2.396     L7.257,23.52z" fill="url(#SVGID_8_)"/>
+</g>
+<radialGradient cx="852.9561" cy="1197.2305" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="22.4077">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M14.451,7.326V5.497c-2.218,0.126-4.228,1.007-5.784,2.395L9.96,9.186    C11.182,8.125,12.738,7.447,14.451,7.326z" fill="url(#SVGID_9_)"/>
+<radialGradient cx="852.96" cy="1197.2305" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="22.4133">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M9.186,9.96L7.891,8.667c-1.388,1.557-2.268,3.568-2.395,5.785h1.83    C7.447,12.738,8.125,11.182,9.186,9.96z" fill="url(#SVGID_10_)"/>
+<radialGradient cx="852.96" cy="1197.2314" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_11_" r="22.4101">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M7.326,15.549h-1.83c0.127,2.219,1.008,4.229,2.395,5.784l1.295-1.294    C8.125,18.818,7.447,17.262,7.326,15.549z" fill="url(#SVGID_11_)"/>
+<radialGradient cx="852.959" cy="1197.2305" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_12_" r="22.4052">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M20.04,9.186l1.293-1.294c-1.558-1.388-3.565-2.269-5.784-2.395v1.83    C17.262,7.447,18.818,8.125,20.04,9.186z" fill="url(#SVGID_12_)"/>
+<radialGradient cx="852.958" cy="1197.2305" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_13_" r="22.4094">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M20.814,20.04l1.293,1.293c1.389-1.558,2.27-3.565,2.396-5.784h-1.83    C22.553,17.262,21.874,18.818,20.814,20.04z" fill="url(#SVGID_13_)"/>
+<radialGradient cx="852.9561" cy="1197.2305" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_14_" r="22.4108">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M22.674,14.452h1.83c-0.127-2.217-1.007-4.228-2.395-5.785L20.814,9.96    C21.875,11.182,22.553,12.738,22.674,14.452z" fill="url(#SVGID_14_)"/>
+<radialGradient cx="852.959" cy="1197.2217" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_15_" r="22.413">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M15.549,22.674v1.83c2.219-0.127,4.229-1.007,5.784-2.395l-1.294-1.295    C18.816,21.875,17.262,22.553,15.549,22.674z" fill="url(#SVGID_15_)"/>
+<radialGradient cx="852.9551" cy="1197.2285" gradientTransform="matrix(0.4558 0 0 0.4558 -375.0893 -540.5683)" gradientUnits="userSpaceOnUse" id="SVGID_16_" r="22.4114">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M9.96,20.814l-1.294,1.293c1.557,1.389,3.567,2.27,5.784,2.396v-1.83    C12.738,22.553,11.182,21.874,9.96,20.814z" fill="url(#SVGID_16_)"/>
+<path d="M14.451,7.326V5.497c-2.218,0.126-4.228,1.007-5.784,2.395    L9.96,9.186C11.182,8.125,12.738,7.447,14.451,7.326z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M9.186,9.96L7.891,8.667    c-1.388,1.557-2.268,3.568-2.395,5.785h1.83C7.447,12.738,8.125,11.182,9.186,9.96z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M7.326,15.549h-1.83c0.127,2.219,1.008,4.229,2.395,5.784    l1.295-1.294C8.125,18.818,7.447,17.262,7.326,15.549z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M20.04,9.186l1.293-1.294    c-1.558-1.388-3.565-2.269-5.784-2.395v1.83C17.262,7.447,18.818,8.125,20.04,9.186z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M20.814,20.04l1.293,1.293    c1.389-1.558,2.27-3.565,2.396-5.784h-1.83C22.553,17.262,21.874,18.818,20.814,20.04z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M22.674,14.452h1.83c-0.127-2.217-1.007-4.228-2.395-5.785    L20.814,9.96C21.875,11.182,22.553,12.738,22.674,14.452z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M15.549,22.674v1.83c2.219-0.127,4.229-1.007,5.784-2.395    l-1.294-1.295C18.816,21.875,17.262,22.553,15.549,22.674z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M9.96,20.814l-1.294,1.293    c1.557,1.389,3.567,2.27,5.784,2.396v-1.83C12.738,22.553,11.182,21.874,9.96,20.814z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+</g>
+</g>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_character_preview_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_character_preview_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_character_preview_c.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,14 +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="70px" version="1.1" viewBox="0 0 10 70" 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="70" width="10" x="0"/>
-<rect fill="#14141E" fill-opacity="0.1" height="70" stroke-opacity="0.1" width="10"/>
-<rect fill="#14141E" fill-opacity="0.2" height="67" stroke-opacity="0.2" width="10" y="2"/>
-<rect fill="url(#SVGID_1_)" height="67" width="10" y="1"/>
+<rect fill="none" height="70" width="10"/>
+<rect fill-opacity="0.2" height="70" stroke-opacity="0.2" width="10"/>
+<rect fill-opacity="0.2" height="9" stroke-opacity="0.2" width="10" y="60"/>
+<rect fill="url(#SVGID_1_)" height="65" width="10" y="2"/>
+<rect fill-opacity="0.2" height="3" stroke-opacity="0.2" width="10" y="64"/>
+<rect fill-opacity="0.2" height="4" stroke-opacity="0.2" width="10" y="2"/>
+<rect fill-opacity="0.2" height="2" stroke-opacity="0.2" width="10" y="3"/>
+<rect fill="#FFFFFF" height="3" width="10" y="1"/>
+<rect fill="#FFFFFF" height="3" width="10" y="65"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5.0005" x2="5.0005" y1="67.875" y2="0.9837">
-<stop offset="0" style="stop-color:#F0F0F0"/>
-<stop offset="1" style="stop-color:#C8C8D2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5.0005" x2="5.0005" y1="67" y2="2.0005">
+<stop offset="0" style="stop-color:#66B8CC"/>
+<stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_character_preview_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_character_preview_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_character_preview_l.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,13 +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="70px" version="1.1" viewBox="0 0 10 70" 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="70" width="10"/>
-<path d="M7,0C3.141,0,0,3.141,0,7v56c0,3.859,3.141,7,7,7h3V0H7z" fill="#14141E" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M7,2C3.7,2,1,4.7,1,8v55c0,3.3,2.7,6,6,6h3V2H7z" fill="#14141E" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M7,1C3.7,1,1,3.7,1,7v55c0,3.3,2.7,6,6,6h3V1H7z" fill="url(#SVGID_1_)"/>
+<path d="M9,0C4.037,0,0,4.037,0,9v51c0,4.963,4.037,10,9,10h1V0H9z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M1,60v1c0,4.4,3.6,8,8,8h1v-9H1z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M9,2C5.141,2,2,5.141,2,9v51c0,3.859,3.141,7,7,7h1V2H9z" fill="url(#SVGID_1_)"/>
+<path d="M9,64c-2.205,0-4-1.794-4-4V9c0-2,1.795-3,4-3h1V2H9C5.141,2,2,5.141,2,9v51c0,3.859,3.141,7,7,7h1v-3H9z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M9,3C5.691,3,3,5.691,3,9v1h1c0-2.757,2.243-5,5-5h1V3H9z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M9,65c-2.757,0-5-2.243-5-5V9c0-2.757,2.243-5,5-5h1V1H9C4.6,1,1,4.6,1,9v51c0,4.4,3.6,8,8,8h1v-3H9z" fill="#FFFFFF"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5.5" x2="5.5" y1="67.875" y2="0.9837">
-<stop offset="0" style="stop-color:#F0F0F0"/>
-<stop offset="1" style="stop-color:#C8C8D2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="6" x2="6" y1="67" y2="2.0005">
+<stop offset="0" style="stop-color:#66B8CC"/>
+<stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_character_preview_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_character_preview_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_character_preview_r.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,13 +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="70px" version="1.1" viewBox="0 0 10 70" 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="70" width="10"/>
-<path d="M3,0H0v70h3c3.859,0,7-3.141,7-7V7C10,3.141,6.859,0,3,0z" fill="#14141E" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M3,2H0v67h3c3.3,0,6-2.7,6-6V8C9,4.7,6.3,2,3,2z" fill="#14141E" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M3,1H0v67h3c3.3,0,6-2.7,6-6V7C9,3.7,6.3,1,3,1z" fill="url(#SVGID_1_)"/>
+<path d="M1,0H0v70h1c4.963,0,9-5.037,9-10V9C10,4.037,5.963,0,1,0z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M0,60v9h1c4.4,0,8-3.6,8-8v-1H0z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M1,2H0v65h1c3.859,0,7-3.141,7-7V9C8,5.141,4.859,2,1,2z" fill="url(#SVGID_1_)"/>
+<path d="M1,2H0v4h1c2.205,0,4,1,4,3v51c0,2.206-1.795,4-4,4H0v3h1c3.859,0,7-3.141,7-7V9C8,5.141,4.859,2,1,2z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M1,3H0v2h1c2.757,0,5,2.243,5,5h1V9C7,5.691,4.309,3,1,3z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M1,1H0v3h1c2.757,0,5,2.243,5,5v51c0,2.757-2.243,5-5,5H0v3h1c4.4,0,8-3.6,8-8V9C9,4.6,5.4,1,1,1z" fill="#FFFFFF"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4.5" x2="4.5" y1="67.875" y2="0.9837">
-<stop offset="0" style="stop-color:#F0F0F0"/>
-<stop offset="1" style="stop-color:#C8C8D2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4" x2="4" y1="67" y2="2.0005">
+<stop offset="0" style="stop-color:#66B8CC"/>
+<stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_disabled_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_disabled_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_disabled_c.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,13 +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="38px" version="1.1" viewBox="0 0 38 38" width="38px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
 <rect fill="none" height="38" width="38"/>
-<rect fill="url(#SVGID_1_)" height="38" width="38"/>
+<rect fill="#AAAAAA" fill-opacity="0.8" height="38" stroke-opacity="0.8" width="38"/>
 <rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="38" y="37"/>
 <rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="38"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="19" x2="19" y1="38" y2="4.882813e-004">
-<stop offset="0" style="stop-color:#D2D2D2"/>
-<stop offset="1" style="stop-color:#AAAAAA"/>
-</linearGradient>
-</defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_disabled_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_disabled_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_disabled_l.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,12 +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="38px" version="1.1" viewBox="0 0 38 38" width="38px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
 <rect fill="none" height="38" width="38"/>
-<path d="M4,0C1.8,0,0,1.8,0,4v30c0,2.2,1.8,4,4,4h34V0H4z" fill="url(#SVGID_1_)"/>
+<path d="M4,0C1.8,0,0,1.8,0,4v30c0,2.2,1.8,4,4,4h34V0H4z" fill="#AAAAAA" fill-opacity="0.8" stroke-opacity="0.8"/>
 <path d="M4,37c-1.654,0-3-1.346-3-3V4c0-1.654,1.346-3,3-3h34V0H4C1.8,0,0,1.8,0,4v30c0,2.2,1.8,4,4,4h34v-1H4z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="19" x2="19" y1="38" y2="4.882813e-004">
-<stop offset="0" style="stop-color:#D2D2D2"/>
-<stop offset="1" style="stop-color:#AAAAAA"/>
-</linearGradient>
-</defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_disabled_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_disabled_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_disabled_r.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,13 +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="38px" version="1.1" viewBox="0 0 38 38" width="38px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
 <rect fill="none" height="38" width="38"/>
-<rect fill="url(#SVGID_1_)" height="38" width="38"/>
+<rect fill="#AAAAAA" fill-opacity="0.8" height="38" stroke-opacity="0.8" width="38"/>
 <rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="38" y="37"/>
 <rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="38"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="19" x2="19" y1="38" y2="4.882813e-004">
-<stop offset="0" style="stop-color:#D2D2D2"/>
-<stop offset="1" style="stop-color:#AAAAAA"/>
-</linearGradient>
-</defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_highlight_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_highlight_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_highlight_c.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,14 +2,21 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="38px" version="1.1" viewBox="0 0 38 38" width="38px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
 <rect fill="none" height="38" width="38"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="19" x2="19" y1="4.882813e-004" y2="38.5297">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="19" x2="19" y1="2" y2="36.0005">
+<stop offset="0" style="stop-color:#DCDCDC"/>
+<stop offset="0.15" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#FFFFFF"/>
+</linearGradient>
+<rect fill="url(#SVGID_1_)" height="34" width="38" y="2"/>
+<rect fill="#3C3C3C" fill-opacity="0.1" height="2" stroke-opacity="0.1" width="38" y="2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="19" x2="19" y1="0.167" y2="37.936">
 <stop offset="0" style="stop-color:#66B8CC"/>
 <stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
-<rect fill="url(#SVGID_1_)" height="2" width="38" y="36"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="19" x2="19" y1="0" y2="38.5292">
+<rect fill="url(#SVGID_2_)" height="3" width="38"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="19" x2="19" y1="0.1675" y2="37.9365">
 <stop offset="0" style="stop-color:#66B8CC"/>
 <stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
-<rect fill="url(#SVGID_2_)" height="2" width="38"/>
+<rect fill="url(#SVGID_3_)" height="3" width="38" y="35"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_highlight_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_highlight_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_highlight_l.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,11 +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="38px" version="1.1" viewBox="0 0 38 38" width="38px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
 <rect fill="none" height="38" width="38"/>
-<path d="M4,36c-1.103,0-2-0.897-2-2V4c0-1.103,0.897-2,2-2h34V0H4C1.8,0,0,1.8,0,4v30c0,2.2,1.8,4,4,4h34v-2  H4z" fill="url(#SVGID_1_)"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="19" x2="19" y1="0" y2="38.5298">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="20" x2="20" y1="2" y2="36.0005">
+<stop offset="0" style="stop-color:#DCDCDC"/>
+<stop offset="0.15" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#FFFFFF"/>
+</linearGradient>
+<path d="M4,2C2.897,2,2,2.897,2,4v30c0,1.103,0.897,2,2,2h34V2H4z" fill="url(#SVGID_1_)"/>
+<path d="M4,2C2.897,2,2,2.897,2,4h36V2H4z" fill="#3C3C3C" fill-opacity="0.1" stroke-opacity="0.1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="19" x2="19" y1="0.167" y2="37.9365">
 <stop offset="0" style="stop-color:#66B8CC"/>
 <stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
-</defs>
+<path d="M4,35c-0.542,0-1-0.458-1-1V4c0-0.542,0.458-1,1-1h34V0H4C1.8,0,0,1.8,0,4v30c0,2.2,1.8,4,4,4h34v-3  H4z" fill="url(#SVGID_2_)"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_highlight_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_highlight_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_highlight_r.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,14 +2,21 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="38px" version="1.1" viewBox="0 0 38 38" width="38px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
 <rect fill="none" height="38" width="38"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="19" x2="19" y1="0" y2="38.5292">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="19" x2="19" y1="2" y2="36.0005">
+<stop offset="0" style="stop-color:#DCDCDC"/>
+<stop offset="0.15" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#FFFFFF"/>
+</linearGradient>
+<rect fill="url(#SVGID_1_)" height="34" width="38" y="2"/>
+<rect fill="#3C3C3C" fill-opacity="0.1" height="2" stroke-opacity="0.1" width="38" y="2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="19" x2="19" y1="0.1675" y2="37.9365">
 <stop offset="0" style="stop-color:#66B8CC"/>
 <stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
-<rect fill="url(#SVGID_1_)" height="2" width="38"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="19" x2="19" y1="4.882813e-004" y2="38.5297">
+<rect fill="url(#SVGID_2_)" height="3" width="38" y="35"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="19" x2="19" y1="0.167" y2="37.936">
 <stop offset="0" style="stop-color:#66B8CC"/>
 <stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
-<rect fill="url(#SVGID_2_)" height="2" width="38" y="36"/>
+<rect fill="url(#SVGID_3_)" height="3" width="38"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_latched_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_latched_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_latched_c.svg	Mon May 03 12:48:33 2010 +0300
@@ -3,12 +3,12 @@
 <svg baseProfile="tiny" height="38px" version="1.1" viewBox="0 0 38 38" width="38px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
 <rect fill="none" height="38" width="38"/>
 <rect fill="url(#SVGID_1_)" height="38" width="38"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="38" y="37"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="38"/>
+<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="38" y="37"/>
+<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="38"/>
 <defs>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="19" x2="19" y1="0" y2="38.0005">
-<stop offset="0" style="stop-color:#C8C8D2"/>
-<stop offset="1" style="stop-color:#8C8C96"/>
+<stop offset="0" style="stop-color:#CDCDD2"/>
+<stop offset="1" style="stop-color:#919196"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_latched_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_latched_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_latched_l.svg	Mon May 03 12:48:33 2010 +0300
@@ -3,11 +3,11 @@
 <svg baseProfile="tiny" height="38px" version="1.1" viewBox="0 0 38 38" width="38px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
 <rect fill="none" height="38" width="38"/>
 <path d="M4,0C1.8,0,0,1.8,0,4v30c0,2.2,1.8,4,4,4h34V0H4z" fill="url(#SVGID_1_)"/>
-<path d="M4,37c-1.654,0-3-1.346-3-3V4c0-1.654,1.346-3,3-3h34V0H4C1.8,0,0,1.8,0,4v30c0,2.2,1.8,4,4,4  h34v-1H4z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M4,37c-1.654,0-3-1.346-3-3V4c0-1.654,1.346-3,3-3h34V0H4C1.8,0,0,1.8,0,4v30c0,2.2,1.8,4,4,4h34v-1H4z" fill-opacity="0.2" stroke-opacity="0.2"/>
 <defs>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="19" x2="19" y1="0" y2="38.0005">
-<stop offset="0" style="stop-color:#C8C8D2"/>
-<stop offset="1" style="stop-color:#8C8C96"/>
+<stop offset="0" style="stop-color:#CDCDD2"/>
+<stop offset="1" style="stop-color:#919196"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_latched_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_latched_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_latched_r.svg	Mon May 03 12:48:33 2010 +0300
@@ -3,12 +3,12 @@
 <svg baseProfile="tiny" height="38px" version="1.1" viewBox="0 0 38 38" width="38px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
 <rect fill="none" height="38" width="38"/>
 <rect fill="url(#SVGID_1_)" height="38" width="38"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="38" y="37"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="38"/>
+<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="38" y="37"/>
+<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="38"/>
 <defs>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="19" x2="19" y1="0" y2="38.0005">
-<stop offset="0" style="stop-color:#C8C8D2"/>
-<stop offset="1" style="stop-color:#8C8C96"/>
+<stop offset="0" style="stop-color:#CDCDD2"/>
+<stop offset="1" style="stop-color:#919196"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_editor_b.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_editor_b.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="230px" height="10px" viewBox="0 0 230 10" enable-background="new 0 0 230 10" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="#FFFFFF" width="230" height="10"/>
-<rect y="9" fill="#808080" width="230" height="1"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_editor_bl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_editor_bl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#FFFFFF" d="M10,0v10H3c-1.657,0-3-1.343-3-3V0H10z"/>
-<path fill="#808080" d="M1,0v7.001C1,8.104,1.898,9,3.001,9H10v1H3c-1.657,0-3-1.343-3-3V0H1z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_editor_br.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_editor_br.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#FFFFFF" d="M0,0v10h7c1.656,0,3-1.343,3-3V0H0z"/>
-<path fill="#808080" d="M9,0v7.001C9,8.104,8.102,9,6.998,9H0v1h7c1.656,0,3-1.343,3-3V0H9z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_editor_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_editor_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="230px" height="23px" viewBox="0 0 230 23" enable-background="new 0 0 230 23" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="115.0005" y1="32.6748" x2="115.0005" y2="-9.8609">
-	<stop  offset="0.7582" style="stop-color:#FFFFFF"/>
-	<stop  offset="0.8253" style="stop-color:#F6F6F6"/>
-	<stop  offset="0.9343" style="stop-color:#DEDEDE"/>
-	<stop  offset="1" style="stop-color:#CCCCCC"/>
-</linearGradient>
-<rect fill="url(#SVGID_1_)" width="230" height="23"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_editor_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_editor_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="23px" viewBox="0 0 10 23" enable-background="new 0 0 10 23" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="5.0005" y1="32.6748" x2="5.0005" y2="-9.8609">
-	<stop  offset="0.7582" style="stop-color:#FFFFFF"/>
-	<stop  offset="0.8253" style="stop-color:#F6F6F6"/>
-	<stop  offset="0.9343" style="stop-color:#DEDEDE"/>
-	<stop  offset="1" style="stop-color:#CCCCCC"/>
-</linearGradient>
-<rect fill="url(#SVGID_1_)" width="10" height="23"/>
-<rect fill="#808080" width="1" height="23"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_editor_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_editor_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="23px" viewBox="0 0 10 23" enable-background="new 0 0 10 23" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="5.0005" y1="32.6748" x2="5.0005" y2="-9.8609">
-	<stop  offset="0.7582" style="stop-color:#FFFFFF"/>
-	<stop  offset="0.8253" style="stop-color:#F6F6F6"/>
-	<stop  offset="0.9343" style="stop-color:#DEDEDE"/>
-	<stop  offset="1" style="stop-color:#CCCCCC"/>
-</linearGradient>
-<rect fill="url(#SVGID_1_)" width="10" height="23"/>
-<rect x="9" fill="#808080" width="1" height="23"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_editor_t.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_editor_t.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="230px" height="10px" viewBox="0 0 230 10" enable-background="new 0 0 230 10" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="115.0005" y1="42.6738" x2="115.0005" y2="0.1393">
-	<stop  offset="0.7582" style="stop-color:#FFFFFF"/>
-	<stop  offset="0.8253" style="stop-color:#F6F6F6"/>
-	<stop  offset="0.9343" style="stop-color:#DEDEDE"/>
-	<stop  offset="1" style="stop-color:#CCCCCC"/>
-</linearGradient>
-<rect fill="url(#SVGID_1_)" width="230" height="10"/>
-<rect fill="#808080" width="230" height="1"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_editor_tl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_editor_tl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="5.0005" y1="42.6738" x2="5.0005" y2="0.1393">
-	<stop  offset="0.7582" style="stop-color:#FFFFFF"/>
-	<stop  offset="0.8253" style="stop-color:#F6F6F6"/>
-	<stop  offset="0.9343" style="stop-color:#DEDEDE"/>
-	<stop  offset="1" style="stop-color:#CCCCCC"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" d="M10,10V0H3C1.343,0,0,1.343,0,3v7H10z"/>
-<path fill="#808080" d="M1,10V2.999C1,1.896,1.898,1,3.001,1H10V0H3C1.343,0,0,1.343,0,3v7H1z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_editor_tr.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_editor_tr.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="5.0005" y1="42.6738" x2="5.0005" y2="0.1393">
-	<stop  offset="0.7582" style="stop-color:#FFFFFF"/>
-	<stop  offset="0.8253" style="stop-color:#F6F6F6"/>
-	<stop  offset="0.9343" style="stop-color:#DEDEDE"/>
-	<stop  offset="1" style="stop-color:#CCCCCC"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" d="M0,10V0h7c1.656,0,3,1.343,3,3v7H0z"/>
-<path fill="#808080" d="M9,10V2.999C9,1.896,8.102,1,6.998,1H0V0h7c1.656,0,3,1.343,3,3v7H9z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_b.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_b.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +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="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"/>
+<rect fill="url(#SVGID_1_)" height="10" width="80"/>
+<rect fill="#DCDCDC" height="1" width="80" y="9"/>
+<rect fill="#FFFFFF" height="1" width="80" y="8"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="39.9995" x2="39.9995" y1="-89.8325" y2="9.6436">
+<stop offset="0" style="stop-color:#FAFAFA"/>
+<stop offset="0.9" style="stop-color:#FAFAFA"/>
+<stop offset="1" style="stop-color:#EBEBF0"/>
+</linearGradient>
+</defs>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_bl.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_bl.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +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="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"/>
+<rect fill="url(#SVGID_1_)" height="10" width="10"/>
+<rect fill="#DCDCDC" height="1" width="10" y="9"/>
+<rect fill="#FFFFFF" height="1" width="10" y="8"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="-89.8325" y2="9.6436">
+<stop offset="0" style="stop-color:#FAFAFA"/>
+<stop offset="0.9" style="stop-color:#FAFAFA"/>
+<stop offset="1" style="stop-color:#EBEBF0"/>
+</linearGradient>
+</defs>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_br.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_br.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +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="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"/>
+<rect fill="url(#SVGID_1_)" height="10" width="10"/>
+<rect fill="#DCDCDC" height="1" width="10" y="9"/>
+<rect fill="#FFFFFF" height="1" width="10" y="8"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="-89.8325" y2="9.6436">
+<stop offset="0" style="stop-color:#FAFAFA"/>
+<stop offset="0.9" style="stop-color:#FAFAFA"/>
+<stop offset="1" style="stop-color:#EBEBF0"/>
+</linearGradient>
+</defs>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_c.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_c.svg	Mon May 03 12:48:33 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="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"/>
+<rect fill="url(#SVGID_1_)" height="80" width="80"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="39.9995" x2="39.9995" y1="-9.833" y2="89.6436">
+<stop offset="0" style="stop-color:#FAFAFA"/>
+<stop offset="0.9" style="stop-color:#FAFAFA"/>
+<stop offset="1" style="stop-color:#EBEBF0"/>
+</linearGradient>
+</defs>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_l.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_l.svg	Mon May 03 12:48:33 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="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="none" height="80" width="10"/>
+<rect fill="url(#SVGID_1_)" height="80" width="10"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="-9.833" y2="89.6436">
+<stop offset="0" style="stop-color:#FAFAFA"/>
+<stop offset="0.9" style="stop-color:#FAFAFA"/>
+<stop offset="1" style="stop-color:#EBEBF0"/>
+</linearGradient>
+</defs>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_r.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_r.svg	Mon May 03 12:48:33 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="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="none" height="80" width="10"/>
+<rect fill="url(#SVGID_1_)" height="80" width="10"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="-9.833" y2="89.6436">
+<stop offset="0" style="stop-color:#FAFAFA"/>
+<stop offset="0.9" style="stop-color:#FAFAFA"/>
+<stop offset="1" style="stop-color:#EBEBF0"/>
+</linearGradient>
+</defs>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_t.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_t.svg	Mon May 03 12:48:33 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 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"/>
+<rect fill="url(#SVGID_1_)" height="10" width="80"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="39.9995" x2="39.9995" y1="0.167" y2="99.6431">
+<stop offset="0" style="stop-color:#FAFAFA"/>
+<stop offset="0.9" style="stop-color:#FAFAFA"/>
+<stop offset="1" style="stop-color:#EBEBF0"/>
+</linearGradient>
+</defs>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_tl.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_tl.svg	Mon May 03 12:48:33 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 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"/>
+<rect fill="url(#SVGID_1_)" height="10" width="10"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="0.167" y2="99.6431">
+<stop offset="0" style="stop-color:#FAFAFA"/>
+<stop offset="0.9" style="stop-color:#FAFAFA"/>
+<stop offset="1" style="stop-color:#EBEBF0"/>
+</linearGradient>
+</defs>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_tr.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_tr.svg	Mon May 03 12:48:33 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 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"/>
+<rect fill="url(#SVGID_1_)" height="10" width="10"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="0.167" y2="99.6431">
+<stop offset="0" style="stop-color:#FAFAFA"/>
+<stop offset="0.9" style="stop-color:#FAFAFA"/>
+<stop offset="1" style="stop-color:#EBEBF0"/>
+</linearGradient>
+</defs>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_value_b.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_value_b.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +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="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="url(#SVGID_1_)" height="10" width="300"/>
-<rect fill="#BEBEC8" height="1" width="300" y="9"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="149.9995" x2="149.9995" y1="-29.7495" y2="9.7513">
-<stop offset="0" style="stop-color:#F0F0F0"/>
-<stop offset="1" style="stop-color:#C8C8D2"/>
-</linearGradient>
-</defs>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_value_bl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_value_bl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +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="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="url(#SVGID_1_)"/>
-<path d="M4,9C2.346,9,1,7.654,1,6V0H0v6c0,2.2,1.8,4,4,4h6V9H4z" fill="#BEBEC8"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="-29.7495" y2="9.7513">
-<stop offset="0" style="stop-color:#F0F0F0"/>
-<stop offset="1" style="stop-color:#C8C8D2"/>
-</linearGradient>
-</defs>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_value_br.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_value_br.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +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="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="url(#SVGID_1_)"/>
-<path d="M9,0v6c0,1.654-1.346,3-3,3H0v1h6c2.2,0,4-1.8,4-4V0H9z" fill="#BEBEC8"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="-29.7495" y2="9.7513">
-<stop offset="0" style="stop-color:#F0F0F0"/>
-<stop offset="1" style="stop-color:#C8C8D2"/>
-</linearGradient>
-</defs>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_value_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_value_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +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="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="url(#SVGID_1_)" height="20" width="300"/>
-<rect fill="none" height="20" width="300"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="149.9995" x2="149.9995" y1="-9.75" y2="29.7518">
-<stop offset="0" style="stop-color:#F0F0F0"/>
-<stop offset="1" style="stop-color:#C8C8D2"/>
-</linearGradient>
-</defs>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_value_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_value_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +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="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="url(#SVGID_1_)" height="20" width="10"/>
-<rect fill="#BEBEC8" height="20" width="1"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="-9.75" y2="29.7518">
-<stop offset="0" style="stop-color:#F0F0F0"/>
-<stop offset="1" style="stop-color:#C8C8D2"/>
-</linearGradient>
-</defs>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_value_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_value_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +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="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="url(#SVGID_1_)" height="20" width="10"/>
-<rect fill="#BEBEC8" height="20" width="1" x="9"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="-9.75" y2="29.7518">
-<stop offset="0" style="stop-color:#F0F0F0"/>
-<stop offset="1" style="stop-color:#C8C8D2"/>
-</linearGradient>
-</defs>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_value_t.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_value_t.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +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="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="url(#SVGID_1_)" height="10" width="300"/>
-<rect fill="#BEBEC8" height="1" width="300"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="149.9995" x2="149.9995" y1="0.25" y2="39.7508">
-<stop offset="0" style="stop-color:#F0F0F0"/>
-<stop offset="1" style="stop-color:#C8C8D2"/>
-</linearGradient>
-</defs>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_value_tl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_value_tl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +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="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="url(#SVGID_1_)"/>
-<path d="M4,0C1.8,0,0,1.8,0,4v6h1V4c0-1.654,1.346-3,3-3h6V0H4z" fill="#BEBEC8"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="0.25" y2="39.7508">
-<stop offset="0" style="stop-color:#F0F0F0"/>
-<stop offset="1" style="stop-color:#C8C8D2"/>
-</linearGradient>
-</defs>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_value_tr.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_value_tr.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +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="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="url(#SVGID_1_)"/>
-<path d="M6,0H0v1h6c1.654,0,3,1.346,3,3v6h1V4C10,1.8,8.2,0,6,0z" fill="#BEBEC8"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="0.25" y2="39.7508">
-<stop offset="0" style="stop-color:#F0F0F0"/>
-<stop offset="1" style="stop-color:#C8C8D2"/>
-</linearGradient>
-</defs>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_b.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_b.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_b.svg	Mon May 03 12:48:33 2010 +0300
@@ -5,5 +5,5 @@
 <g fill-opacity="0.2" stroke-opacity="0.2">
 <rect height="10" width="80"/>
 </g>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="80" y="9"/>
+<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="80" y="9"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_bl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_bl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_bl.svg	Mon May 03 12:48:33 2010 +0300
@@ -5,5 +5,5 @@
 <g fill-opacity="0.2" stroke-opacity="0.2">
 <path d="M0,0v4c0,3.3,2.7,6,6,6h4V0H0z"/>
 </g>
-<path d="M6,9C3.243,9,1,6.757,1,4V0H0v4c0,3.3,2.7,6,6,6h4V9H6z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M6,9C3.243,9,1,6.757,1,4V0H0v4c0,3.3,2.7,6,6,6h4V9H6z" fill-opacity="0.2" stroke-opacity="0.2"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_br.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_br.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_br.svg	Mon May 03 12:48:33 2010 +0300
@@ -3,7 +3,7 @@
 <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.2" stroke-opacity="0.2">
-<path d="M0,0v10h4c3.3,0,6-2.7,6-6V0H0z"/>
+<path d="M0,0v10h4c3.301,0,6-2.7,6-6V0H0z"/>
 </g>
-<path d="M9,0v4c0,2.757-2.243,5-5,5H0v1h4c3.3,0,6-2.7,6-6V0H9z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M9,0v4c0,2.757-2.242,5-5,5H0v1h4c3.301,0,6-2.7,6-6V0H9z" fill-opacity="0.2" stroke-opacity="0.2"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_c.svg	Mon May 03 12:48:33 2010 +0300
@@ -5,5 +5,4 @@
 <g fill-opacity="0.2" stroke-opacity="0.2">
 <rect height="80" width="80"/>
 </g>
-<rect fill="none" height="80" width="80"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_b.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_b.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_b.svg	Mon May 03 12:48:33 2010 +0300
@@ -5,11 +5,11 @@
 <g>
 <rect fill="url(#SVGID_1_)" height="10" width="80"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="39.9995" x2="39.9995" y1="-90.3325" y2="9.8478">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="39.9995" x2="39.9995" y1="-90.3325" y2="9.8475">
 <stop offset="0" style="stop-color:#66B8CC"/>
 <stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
 </defs>
 </g>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="80" y="9"/>
+<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="80" y="9"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_bl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_bl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_bl.svg	Mon May 03 12:48:33 2010 +0300
@@ -5,11 +5,11 @@
 <g>
 <path d="M0,0v4c0,3.3,2.7,6,6,6h4V0H0z" fill="url(#SVGID_1_)"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="-90.3325" y2="9.8478">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="-90.3325" y2="9.8475">
 <stop offset="0" style="stop-color:#66B8CC"/>
 <stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
 </defs>
 </g>
-<path d="M6,9C3.243,9,1,6.757,1,4V0H0v4c0,3.3,2.7,6,6,6h4V9H6z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M6,9C3.243,9,1,6.757,1,4V0H0v4c0,3.3,2.7,6,6,6h4V9H6z" fill-opacity="0.2" stroke-opacity="0.2"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_br.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_br.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_br.svg	Mon May 03 12:48:33 2010 +0300
@@ -5,11 +5,11 @@
 <g>
 <path d="M0,0v10h4c3.3,0,6-2.7,6-6V0H0z" fill="url(#SVGID_1_)"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="-90.3325" y2="9.8478">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="-90.3325" y2="9.8475">
 <stop offset="0" style="stop-color:#66B8CC"/>
 <stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
 </defs>
 </g>
-<path d="M9,0v4c0,2.757-2.243,5-5,5H0v1h4c3.3,0,6-2.7,6-6V0H9z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M9,0v4c0,2.757-2.243,5-5,5H0v1h4c3.3,0,6-2.7,6-6V0H9z" fill-opacity="0.2" stroke-opacity="0.2"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_c.svg	Mon May 03 12:48:33 2010 +0300
@@ -5,7 +5,7 @@
 <g>
 <rect fill="url(#SVGID_1_)" height="80" width="80"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="39.9995" x2="39.9995" y1="-10.333" y2="89.8479">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="39.9995" x2="39.9995" y1="-10.333" y2="89.8476">
 <stop offset="0" style="stop-color:#66B8CC"/>
 <stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_l.svg	Mon May 03 12:48:33 2010 +0300
@@ -5,11 +5,11 @@
 <g>
 <rect fill="url(#SVGID_1_)" height="80" width="10"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="-10.333" y2="89.8479">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="-10.333" y2="89.8476">
 <stop offset="0" style="stop-color:#66B8CC"/>
 <stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
 </defs>
 </g>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="80" stroke-opacity="0.4" width="1"/>
+<rect fill-opacity="0.2" height="80" stroke-opacity="0.2" width="1"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_r.svg	Mon May 03 12:48:33 2010 +0300
@@ -5,11 +5,11 @@
 <g>
 <rect fill="url(#SVGID_1_)" height="80" width="10"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="-10.333" y2="89.8479">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="-10.333" y2="89.8476">
 <stop offset="0" style="stop-color:#66B8CC"/>
 <stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
 </defs>
 </g>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="80" stroke-opacity="0.4" width="1" x="9"/>
+<rect fill-opacity="0.2" height="80" stroke-opacity="0.2" width="1" x="9"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_t.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_t.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_t.svg	Mon May 03 12:48:33 2010 +0300
@@ -5,11 +5,11 @@
 <g>
 <rect fill="url(#SVGID_1_)" height="10" width="80"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="39.9995" x2="39.9995" y1="-0.333" y2="99.8473">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="39.9995" x2="39.9995" y1="-0.333" y2="99.847">
 <stop offset="0" style="stop-color:#66B8CC"/>
 <stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
 </defs>
 </g>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="80"/>
+<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="80"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_tl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_tl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_tl.svg	Mon May 03 12:48:33 2010 +0300
@@ -5,11 +5,11 @@
 <g>
 <path d="M6,0C2.7,0,0,2.7,0,6v4h10V0H6z" fill="url(#SVGID_1_)"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="-0.333" y2="99.8473">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="-0.333" y2="99.847">
 <stop offset="0" style="stop-color:#66B8CC"/>
 <stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
 </defs>
 </g>
-<path d="M6,0C2.7,0,0,2.7,0,6v4h1V6c0-2.757,2.243-5,5-5h4V0H6z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M6,0C2.7,0,0,2.7,0,6v4h1V6c0-2.757,2.243-5,5-5h4V0H6z" fill-opacity="0.2" stroke-opacity="0.2"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_tr.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_tr.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_tr.svg	Mon May 03 12:48:33 2010 +0300
@@ -5,11 +5,11 @@
 <g>
 <path d="M10,6c0-3.3-2.7-6-6-6H0v10h10V6z" fill="url(#SVGID_1_)"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="-0.333" y2="99.8473">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="-0.333" y2="99.847">
 <stop offset="0" style="stop-color:#66B8CC"/>
 <stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
 </defs>
 </g>
-<path d="M4,0H0v1h4c2.757,0,5,2.243,5,5v4h1V6C10,2.7,7.3,0,4,0z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M4,0H0v1h4c2.757,0,5,2.243,5,5v4h1V6C10,2.7,7.3,0,4,0z" fill-opacity="0.2" stroke-opacity="0.2"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_l.svg	Mon May 03 12:48:33 2010 +0300
@@ -5,5 +5,5 @@
 <g fill-opacity="0.2" stroke-opacity="0.2">
 <rect height="80" width="10"/>
 </g>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="80" stroke-opacity="0.4" width="1"/>
+<rect fill-opacity="0.2" height="80" stroke-opacity="0.2" width="1"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_b.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_b.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_b.svg	Mon May 03 12:48:33 2010 +0300
@@ -5,11 +5,11 @@
 <g>
 <rect fill="url(#SVGID_1_)" height="10" width="80"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="39.9995" x2="39.9995" y1="-89.7495" y2="9.7517">
-<stop offset="0" style="stop-color:#999999"/>
-<stop offset="1" style="stop-color:#737373"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="39.9995" x2="39.9995" y1="-89.7495" y2="9.7518">
+<stop offset="0" style="stop-color:#AAAAAA"/>
+<stop offset="1" style="stop-color:#8C8C8C"/>
 </linearGradient>
 </defs>
 </g>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="80" y="9"/>
+<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="80" y="9"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_bl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_bl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_bl.svg	Mon May 03 12:48:33 2010 +0300
@@ -5,11 +5,11 @@
 <g>
 <path d="M0,0v4c0,3.3,2.7,6,6,6h4V0H0z" fill="url(#SVGID_1_)"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="-89.7495" y2="9.7517">
-<stop offset="0" style="stop-color:#999999"/>
-<stop offset="1" style="stop-color:#737373"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="-89.7495" y2="9.7518">
+<stop offset="0" style="stop-color:#AAAAAA"/>
+<stop offset="1" style="stop-color:#8C8C8C"/>
 </linearGradient>
 </defs>
 </g>
-<path d="M6,9C3.243,9,1,6.757,1,4V0H0v4c0,3.3,2.7,6,6,6h4V9H6z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M6,9C3.243,9,1,6.757,1,4V0H0v4c0,3.3,2.7,6,6,6h4V9H6z" fill-opacity="0.2" stroke-opacity="0.2"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_br.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_br.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_br.svg	Mon May 03 12:48:33 2010 +0300
@@ -5,11 +5,11 @@
 <g>
 <path d="M0,0v10h4c3.3,0,6-2.7,6-6V0H0z" fill="url(#SVGID_1_)"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="-89.7495" y2="9.7517">
-<stop offset="0" style="stop-color:#999999"/>
-<stop offset="1" style="stop-color:#737373"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="-89.7495" y2="9.7518">
+<stop offset="0" style="stop-color:#AAAAAA"/>
+<stop offset="1" style="stop-color:#8C8C8C"/>
 </linearGradient>
 </defs>
 </g>
-<path d="M9,0v4c0,2.757-2.243,5-5,5H0v1h4c3.3,0,6-2.7,6-6V0H9z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M9,0v4c0,2.757-2.243,5-5,5H0v1h4c3.3,0,6-2.7,6-6V0H9z" fill-opacity="0.2" stroke-opacity="0.2"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_c.svg	Mon May 03 12:48:33 2010 +0300
@@ -5,9 +5,9 @@
 <g>
 <rect fill="url(#SVGID_1_)" height="80" width="80"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="39.9995" x2="39.9995" y1="-9.75" y2="89.7519">
-<stop offset="0" style="stop-color:#999999"/>
-<stop offset="1" style="stop-color:#737373"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="39.9995" x2="39.9995" y1="-9.75" y2="89.7522">
+<stop offset="0" style="stop-color:#AAAAAA"/>
+<stop offset="1" style="stop-color:#8C8C8C"/>
 </linearGradient>
 </defs>
 </g>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_l.svg	Mon May 03 12:48:33 2010 +0300
@@ -5,11 +5,11 @@
 <g>
 <rect fill="url(#SVGID_1_)" height="80" width="10"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="-9.75" y2="89.7519">
-<stop offset="0" style="stop-color:#999999"/>
-<stop offset="1" style="stop-color:#737373"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="-9.75" y2="89.7522">
+<stop offset="0" style="stop-color:#AAAAAA"/>
+<stop offset="1" style="stop-color:#8C8C8C"/>
 </linearGradient>
 </defs>
 </g>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="80" stroke-opacity="0.4" width="1"/>
+<rect fill-opacity="0.2" height="80" stroke-opacity="0.2" width="1"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_r.svg	Mon May 03 12:48:33 2010 +0300
@@ -5,11 +5,11 @@
 <g>
 <rect fill="url(#SVGID_1_)" height="80" width="10"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="-9.75" y2="89.7519">
-<stop offset="0" style="stop-color:#999999"/>
-<stop offset="1" style="stop-color:#737373"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="-9.75" y2="89.7522">
+<stop offset="0" style="stop-color:#AAAAAA"/>
+<stop offset="1" style="stop-color:#8C8C8C"/>
 </linearGradient>
 </defs>
 </g>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="80" stroke-opacity="0.4" width="1" x="9"/>
+<rect fill-opacity="0.2" height="80" stroke-opacity="0.2" width="1" x="9"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_t.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_t.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_t.svg	Mon May 03 12:48:33 2010 +0300
@@ -6,10 +6,10 @@
 <rect fill="url(#SVGID_1_)" height="10" width="80"/>
 <defs>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="39.9995" x2="39.9995" y1="0.25" y2="99.7513">
-<stop offset="0" style="stop-color:#999999"/>
-<stop offset="1" style="stop-color:#737373"/>
+<stop offset="0" style="stop-color:#AAAAAA"/>
+<stop offset="1" style="stop-color:#8C8C8C"/>
 </linearGradient>
 </defs>
 </g>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="80"/>
+<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="80"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_tl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_tl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_tl.svg	Mon May 03 12:48:33 2010 +0300
@@ -6,10 +6,10 @@
 <path d="M6,0C2.7,0,0,2.7,0,6v4h10V0H6z" fill="url(#SVGID_1_)"/>
 <defs>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="0.25" y2="99.7513">
-<stop offset="0" style="stop-color:#999999"/>
-<stop offset="1" style="stop-color:#737373"/>
+<stop offset="0" style="stop-color:#AAAAAA"/>
+<stop offset="1" style="stop-color:#8C8C8C"/>
 </linearGradient>
 </defs>
 </g>
-<path d="M6,0C2.7,0,0,2.7,0,6v4h1V6c0-2.757,2.243-5,5-5h4V0H6z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M6,0C2.7,0,0,2.7,0,6v4h1V6c0-2.757,2.243-5,5-5h4V0H6z" fill-opacity="0.2" stroke-opacity="0.2"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_tr.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_tr.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_tr.svg	Mon May 03 12:48:33 2010 +0300
@@ -6,10 +6,10 @@
 <path d="M10,6c0-3.3-2.7-6-6-6H0v10h10V6z" fill="url(#SVGID_1_)"/>
 <defs>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="0.25" y2="99.7513">
-<stop offset="0" style="stop-color:#999999"/>
-<stop offset="1" style="stop-color:#737373"/>
+<stop offset="0" style="stop-color:#AAAAAA"/>
+<stop offset="1" style="stop-color:#8C8C8C"/>
 </linearGradient>
 </defs>
 </g>
-<path d="M4,0H0v1h4c2.757,0,5,2.243,5,5v4h1V6C10,2.7,7.3,0,4,0z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M4,0H0v1h4c2.757,0,5,2.243,5,5v4h1V6C10,2.7,7.3,0,4,0z" fill-opacity="0.2" stroke-opacity="0.2"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_b.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_b.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_b.svg	Mon May 03 12:48:33 2010 +0300
@@ -11,5 +11,5 @@
 </linearGradient>
 </defs>
 </g>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="80" y="9"/>
+<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="80" y="9"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_bl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_bl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_bl.svg	Mon May 03 12:48:33 2010 +0300
@@ -11,5 +11,5 @@
 </linearGradient>
 </defs>
 </g>
-<path d="M6,9C3.243,9,1,6.757,1,4V0H0v4c0,3.3,2.7,6,6,6h4V9H6z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M6,9C3.243,9,1,6.757,1,4V0H0v4c0,3.3,2.7,6,6,6h4V9H6z" fill-opacity="0.2" stroke-opacity="0.2"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_br.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_br.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_br.svg	Mon May 03 12:48:33 2010 +0300
@@ -11,5 +11,5 @@
 </linearGradient>
 </defs>
 </g>
-<path d="M9,0v4c0,2.757-2.244,5-5,5H0v1h4c3.299,0,6-2.7,6-6V0H9z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M9,0v4c0,2.757-2.244,5-5,5H0v1h4c3.299,0,6-2.7,6-6V0H9z" fill-opacity="0.2" stroke-opacity="0.2"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_c.svg	Mon May 03 12:48:33 2010 +0300
@@ -5,7 +5,7 @@
 <g>
 <rect fill="url(#SVGID_1_)" height="80" width="80"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="40.0005" x2="40.0005" y1="90" y2="-9.5044">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="40.0005" x2="40.0005" y1="90" y2="-9.5042">
 <stop offset="0" style="stop-color:#65B8CC"/>
 <stop offset="1" style="stop-color:#306D8C"/>
 </linearGradient>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_l.svg	Mon May 03 12:48:33 2010 +0300
@@ -5,11 +5,11 @@
 <g>
 <rect fill="url(#SVGID_1_)" height="80" width="10"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="90" y2="-9.5044">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="90" y2="-9.5042">
 <stop offset="0" style="stop-color:#65B8CC"/>
 <stop offset="1" style="stop-color:#306D8C"/>
 </linearGradient>
 </defs>
 </g>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="80" stroke-opacity="0.4" width="1"/>
+<rect fill-opacity="0.2" height="80" stroke-opacity="0.2" width="1"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_r.svg	Mon May 03 12:48:33 2010 +0300
@@ -5,11 +5,11 @@
 <g>
 <rect fill="url(#SVGID_1_)" height="80" width="10"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="90" y2="-9.5044">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="90" y2="-9.5042">
 <stop offset="0" style="stop-color:#65B8CC"/>
 <stop offset="1" style="stop-color:#306D8C"/>
 </linearGradient>
 </defs>
 </g>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="80" stroke-opacity="0.4" width="1" x="9"/>
+<rect fill-opacity="0.2" height="80" stroke-opacity="0.2" width="1" x="9"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_t.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_t.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_t.svg	Mon May 03 12:48:33 2010 +0300
@@ -11,5 +11,5 @@
 </linearGradient>
 </defs>
 </g>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="80"/>
+<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="80"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_tl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_tl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_tl.svg	Mon May 03 12:48:33 2010 +0300
@@ -11,5 +11,5 @@
 </linearGradient>
 </defs>
 </g>
-<path d="M6,0C2.7,0,0,2.7,0,6v4h1V6c0-2.757,2.243-5,5-5h4V0H6z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M6,0C2.7,0,0,2.7,0,6v4h1V6c0-2.757,2.243-5,5-5h4V0H6z" fill-opacity="0.2" stroke-opacity="0.2"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_tr.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_tr.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_tr.svg	Mon May 03 12:48:33 2010 +0300
@@ -11,5 +11,5 @@
 </linearGradient>
 </defs>
 </g>
-<path d="M4,0H0v1h4c2.756,0,5,2.243,5,5v4h1V6C10,2.7,7.299,0,4,0z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M4,0H0v1h4c2.756,0,5,2.243,5,5v4h1V6C10,2.7,7.299,0,4,0z" fill-opacity="0.2" stroke-opacity="0.2"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_r.svg	Mon May 03 12:48:33 2010 +0300
@@ -5,5 +5,5 @@
 <g fill-opacity="0.2" stroke-opacity="0.2">
 <rect height="80" width="10"/>
 </g>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="80" stroke-opacity="0.4" width="1" x="9"/>
+<rect fill-opacity="0.2" height="80" stroke-opacity="0.2" width="1" x="9"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_t.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_t.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_t.svg	Mon May 03 12:48:33 2010 +0300
@@ -5,5 +5,5 @@
 <g fill-opacity="0.2" stroke-opacity="0.2">
 <rect height="10" width="80"/>
 </g>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="80"/>
+<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="80"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_tl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_tl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_tl.svg	Mon May 03 12:48:33 2010 +0300
@@ -5,5 +5,5 @@
 <g fill-opacity="0.2" stroke-opacity="0.2">
 <path d="M6,0C2.7,0,0,2.7,0,6v4h10V0H6z"/>
 </g>
-<path d="M6,0C2.7,0,0,2.7,0,6v4h1V6c0-2.757,2.243-5,5-5h4V0H6z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M6,0C2.7,0,0,2.7,0,6v4h1V6c0-2.757,2.243-5,5-5h4V0H6z" fill-opacity="0.2" stroke-opacity="0.2"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_tr.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_tr.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_tr.svg	Mon May 03 12:48:33 2010 +0300
@@ -3,7 +3,7 @@
 <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.2" stroke-opacity="0.2">
-<path d="M10,6c0-3.3-2.7-6-6-6H0v10h10V6z"/>
+<path d="M10,6c0-3.3-2.699-6-6-6H0v10h10V6z"/>
 </g>
-<path d="M4,0H0v1h4c2.757,0,5,2.243,5,5v4h1V6C10,2.7,7.3,0,4,0z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M4,0H0v1h4c2.758,0,5,2.243,5,5v4h1V6C10,2.7,7.301,0,4,0z" fill-opacity="0.2" stroke-opacity="0.2"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_bg_b.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_bg_b.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +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="15px" version="1.1" viewBox="0 0 15 15" width="15px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<rect fill="none" height="15" width="15"/>
-<rect fill="url(#SVGID_1_)" height="15" width="15"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="7.4995" x2="7.4995" y1="-29.6665" y2="14.7804">
-<stop offset="0" style="stop-color:#D2D2D2"/>
-<stop offset="1" style="stop-color:#AAAAAA"/>
-</linearGradient>
-</defs>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_bg_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_bg_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +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="15px" version="1.1" viewBox="0 0 15 15" width="15px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<rect fill="none" height="15" width="15"/>
-<rect fill="url(#SVGID_1_)" height="15" width="15"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="7.4995" x2="7.4995" y1="-14.6675" y2="29.7809">
-<stop offset="0" style="stop-color:#D2D2D2"/>
-<stop offset="1" style="stop-color:#AAAAAA"/>
-</linearGradient>
-</defs>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_bg_t.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_bg_t.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +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="15px" version="1.1" viewBox="0 0 15 15" width="15px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<rect fill="none" height="15" width="15"/>
-<rect fill="url(#SVGID_1_)" height="15" width="15"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="7.4995" x2="7.4995" y1="0.333" y2="44.7799">
-<stop offset="0" style="stop-color:#D2D2D2"/>
-<stop offset="1" style="stop-color:#AAAAAA"/>
-</linearGradient>
-</defs>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_b.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_b.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_b.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,15 +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="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"/>
-<rect fill="#14141E" fill-opacity="0.4" height="10" stroke-opacity="0.4" width="10"/>
-<rect fill="#14141E" fill-opacity="0.2" height="9" stroke-opacity="0.2" width="10"/>
-<rect fill="url(#SVGID_1_)" height="8" width="10"/>
-<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="10" y="7"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5.0005" x2="5.0005" y1="8" y2="-38.7526">
-<stop offset="0" style="stop-color:#B4B4B4"/>
-<stop offset="1" style="stop-color:#8C8C8C"/>
-</linearGradient>
-</defs>
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" 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="50"/>
+<rect fill="#AAAAAF" fill-opacity="0.8" height="7" stroke-opacity="0.8" width="50"/>
+<rect fill-opacity="0.2" height="3" stroke-opacity="0.2" width="50" y="6"/>
+<rect fill="none" height="10" width="50"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_bl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_bl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_bl.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,15 +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="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,0v4c0,3.3,2.7,6,6,6h4V0H0z" fill="#14141E" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M1,0v4c0,2.757,2.243,5,5,5h4V0H1z" fill="#14141E" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M1,0v3c0,2.757,2.243,5,5,5h4V0H1z" fill="url(#SVGID_1_)"/>
-<path d="M6,7C3.794,7,2,5.205,2,3V0H1v3c0,2.757,2.243,5,5,5h4V7H6z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M2,0v2c0,2.757,2.243,5,5,5h3V0H2z" fill="#AAAAAF" fill-opacity="0.8" stroke-opacity="0.8"/>
+<path d="M7,6C4.794,6,3,4.205,3,2V0H1v3c0,3.3,2.7,6,6,6h3V6H7z" fill-opacity="0.2" stroke-opacity="0.2"/>
 <rect fill="none" height="10" width="10"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5.5" x2="5.5" y1="8" y2="-38.7526">
-<stop offset="0" style="stop-color:#B4B4B4"/>
-<stop offset="1" style="stop-color:#8C8C8C"/>
-</linearGradient>
-</defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_br.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_br.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_br.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,15 +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="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,0v10h4c3.3,0,6-2.7,6-6V0H0z" fill="#14141E" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M0,0v9h4c2.757,0,5-2.243,5-5V0H0z" fill="#14141E" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M0,0v8h4c2.757,0,5-2.243,5-5V0H0z" fill="url(#SVGID_1_)"/>
-<path d="M8,0v3c0,2.205-1.794,4-4,4H0v1h4c2.757,0,5-2.243,5-5V0H8z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M0,0v7h3c2.757,0,5-2.243,5-5V0H0z" fill="#AAAAAF" fill-opacity="0.8" stroke-opacity="0.8"/>
+<path d="M7,0v2c0,2.205-1.794,4-4,4H0v3h3c3.3,0,6-2.7,6-6V0H7z" fill-opacity="0.2" stroke-opacity="0.2"/>
 <rect fill="none" height="10" width="10"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4.5" x2="4.5" y1="8" y2="-38.7526">
-<stop offset="0" style="stop-color:#B4B4B4"/>
-<stop offset="1" style="stop-color:#8C8C8C"/>
-</linearGradient>
-</defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_c.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,12 +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"/>
-<rect fill="url(#SVGID_1_)" height="10" width="10"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5.0005" x2="5.0005" y1="12.667" y2="-2.9164">
-<stop offset="0" style="stop-color:#B4B4B4"/>
-<stop offset="1" style="stop-color:#8C8C8C"/>
-</linearGradient>
-</defs>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 50 30" width="50px" 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="50"/>
+<rect fill="#AAAAAF" fill-opacity="0.8" height="30" stroke-opacity="0.8" width="50"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_l.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,14 +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="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"/>
-<rect fill="#14141E" fill-opacity="0.4" height="10" stroke-opacity="0.4" width="10"/>
-<rect fill="url(#SVGID_1_)" height="10" width="9" x="1"/>
-<rect fill-opacity="0.2" height="10" stroke-opacity="0.2" width="1" x="1"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5.5" x2="5.5" y1="12.667" y2="-2.9164">
-<stop offset="0" style="stop-color:#B4B4B4"/>
-<stop offset="1" style="stop-color:#8C8C8C"/>
-</linearGradient>
-</defs>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" 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="30" width="10"/>
+<rect fill="#AAAAAF" fill-opacity="0.8" height="30" stroke-opacity="0.8" width="8" x="2"/>
+<rect fill-opacity="0.2" height="30" stroke-opacity="0.2" width="2" x="1"/>
+<rect fill="none" height="30" width="10"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_r.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,14 +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="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"/>
-<rect fill="#14141E" fill-opacity="0.4" height="10" stroke-opacity="0.4" width="10"/>
-<rect fill="url(#SVGID_1_)" height="10" width="9"/>
-<rect fill-opacity="0.2" height="10" stroke-opacity="0.2" width="1" x="8"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4.5" x2="4.5" y1="12.667" y2="-2.9164">
-<stop offset="0" style="stop-color:#B4B4B4"/>
-<stop offset="1" style="stop-color:#8C8C8C"/>
-</linearGradient>
-</defs>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" 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="30" width="10"/>
+<rect fill="#AAAAAF" fill-opacity="0.8" height="30" stroke-opacity="0.8" width="8"/>
+<rect fill-opacity="0.2" height="30" stroke-opacity="0.2" width="2" x="7"/>
+<rect fill="none" height="30" width="10"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_t.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_t.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_t.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,14 +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="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"/>
-<rect fill="#14141E" fill-opacity="0.4" height="10" stroke-opacity="0.4" width="10"/>
-<rect fill="url(#SVGID_1_)" height="9" width="10" y="1"/>
-<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="10" y="1"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5.0005" x2="5.0005" y1="48" y2="1.2473">
-<stop offset="0" style="stop-color:#B4B4B4"/>
-<stop offset="1" style="stop-color:#8C8C8C"/>
-</linearGradient>
-</defs>
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" 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="50"/>
+<rect fill="#AAAAAF" fill-opacity="0.8" height="8" stroke-opacity="0.8" width="50" y="2"/>
+<rect fill-opacity="0.2" height="2" stroke-opacity="0.2" width="50" y="1"/>
+<rect fill="none" height="10" width="50"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_tl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_tl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_tl.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,14 +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="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="M6,0C2.7,0,0,2.7,0,6v4h10V0H6z" fill="#14141E" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M6,1C3.243,1,1,3.243,1,6v4h9V1H6z" fill="url(#SVGID_1_)"/>
-<path d="M6,1C3.243,1,1,3.243,1,6v4h1V6c0-2.205,1.794-4,4-4h4V1H6z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M7,2C4.243,2,2,4.243,2,7v3h8V2H7z" fill="#AAAAAF" fill-opacity="0.8" stroke-opacity="0.8"/>
+<path d="M7,1C3.7,1,1,3.7,1,7v3h2V7c0-2.205,1.794-4,4-4h3V1H7z" fill-opacity="0.2" stroke-opacity="0.2"/>
 <rect fill="none" height="10" width="10"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5.5" x2="5.5" y1="48" y2="1.2473">
-<stop offset="0" style="stop-color:#B4B4B4"/>
-<stop offset="1" style="stop-color:#8C8C8C"/>
-</linearGradient>
-</defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_tr.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_tr.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_tr.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,14 +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="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,6c0-3.3-2.7-6-6-6H0v10h10V6z" fill="#14141E" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M9,6c0-2.757-2.243-5-5-5H0v9h9V6z" fill="url(#SVGID_1_)"/>
-<path d="M4,1H0v1h4c2.206,0,4,1.795,4,4v4h1V6C9,3.243,6.757,1,4,1z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M8,7c0-2.757-2.243-5-5-5H0v8h8V7z" fill="#AAAAAF" fill-opacity="0.8" stroke-opacity="0.8"/>
+<path d="M3,1H0v2h3c2.206,0,4,1.795,4,4v3h2V7C9,3.7,6.3,1,3,1z" fill-opacity="0.2" stroke-opacity="0.2"/>
 <rect fill="none" height="10" width="10"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4.5" x2="4.5" y1="48" y2="1.2473">
-<stop offset="0" style="stop-color:#B4B4B4"/>
-<stop offset="1" style="stop-color:#8C8C8C"/>
-</linearGradient>
-</defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_b.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_b.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_b.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,18 +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"/>
-<rect fill="#14141E" fill-opacity="0.4" height="10" stroke-opacity="0.4" width="10"/>
-<rect fill="#14141E" fill-opacity="0.2" height="9" stroke-opacity="0.2" width="10"/>
-<rect fill="url(#SVGID_1_)" height="8" width="10"/>
-<rect fill="#FFFFFF" fill-opacity="0.2" height="1" stroke-opacity="0.2" width="10" y="6"/>
-<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="10" y="7"/>
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" 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="50"/>
+<rect fill="#14141E" fill-opacity="0.4" height="2" stroke-opacity="0.4" width="50" y="7"/>
+<rect fill-opacity="0.2" height="6" stroke-opacity="0.2" width="50" y="2"/>
+<rect fill="url(#SVGID_1_)" height="7" width="50"/>
+<rect fill="#FFFFFF" fill-opacity="0.2" height="1" stroke-opacity="0.2" width="50" y="6"/>
+<rect fill="none" height="10" width="50"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4.9995" x2="4.9995" y1="-38.9995" y2="8.0195">
-<stop offset="0" style="stop-color:#646464"/>
-<stop offset="0.9" style="stop-color:#3C3C3C"/>
-<stop offset="0.9" style="stop-color:#373737"/>
-<stop offset="1" style="stop-color:#323232"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="24.9995" x2="24.9995" y1="-37.9995" y2="7.0082">
+<stop offset="0" style="stop-color:#8C8C91"/>
+<stop offset="1" style="stop-color:#5A5A5F"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_bl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_bl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_bl.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,18 +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"/>
-<path d="M0,0v4c0,3.3,2.7,6,6,6h4V0H0z" fill="#14141E" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M1,0v4c0,2.757,2.243,5,5,5h4V0H1z" fill="#14141E" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M1,0v3c0,2.757,2.243,5,5,5h4V0H1z" fill="url(#SVGID_1_)"/>
-<path d="M6,6C4.346,6,3,4.654,3,3V0H2v3c0,2.205,1.795,4,4,4h4V6H6z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M6,7C3.794,7,2,5.205,2,3V0H1v3c0,2.757,2.243,5,5,5h4V7H6z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M7,7C4.794,7,3,5.206,3,3V0H1v3c0,3.3,2.7,6,6,6h3V7H7z" fill="#14141E" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M2,2v1c0,2.757,2.243,5,5,5h3V2H2z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M2,0v2c0,2.757,2.243,5,5,5h3V0H2z" 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"/>
 <rect fill="none" height="10" width="10"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5.5" x2="5.5" y1="-38.9995" y2="8.0195">
-<stop offset="0" style="stop-color:#646464"/>
-<stop offset="0.9" style="stop-color:#3C3C3C"/>
-<stop offset="0.9" style="stop-color:#373737"/>
-<stop offset="1" style="stop-color:#323232"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="6" x2="6" y1="-37.9995" y2="7.0082">
+<stop offset="0" style="stop-color:#8C8C91"/>
+<stop offset="1" style="stop-color:#5A5A5F"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_br.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_br.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_br.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,18 +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"/>
-<path d="M0,0v10h4c3.3,0,6-2.7,6-6V0H0z" fill="#14141E" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M0,0v9h4c2.757,0,5-2.243,5-5V0H0z" fill="#14141E" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M0,0v8h4c2.757,0,5-2.243,5-5V0H0z" fill="url(#SVGID_1_)"/>
-<path d="M7,0v3c0,1.654-1.346,3-3,3H0v1h4c2.205,0,4-1.795,4-4V0H7z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M8,0v3c0,2.205-1.794,4-4,4H0v1h4c2.757,0,5-2.243,5-5V0H8z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M7,0v3c0,2.206-1.795,4-4,4H0v2h3c3.3,0,6-2.7,6-6V0H7z" fill="#14141E" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M0,2v6h3c2.757,0,5-2.243,5-5V2H0z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M0,0v7h3c2.757,0,5-2.243,5-5V0H0z" 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"/>
 <rect fill="none" height="10" width="10"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4.5" x2="4.5" y1="-38.9995" y2="8.0195">
-<stop offset="0" style="stop-color:#646464"/>
-<stop offset="0.9" style="stop-color:#3C3C3C"/>
-<stop offset="0.9" style="stop-color:#373737"/>
-<stop offset="1" style="stop-color:#323232"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4" x2="4" y1="-37.9995" y2="7.0082">
+<stop offset="0" style="stop-color:#8C8C91"/>
+<stop offset="1" style="stop-color:#5A5A5F"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_c.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,14 +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="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"/>
-<rect fill="url(#SVGID_1_)" height="10" width="10"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 50 30" width="50px" 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="50"/>
+<rect fill="url(#SVGID_1_)" height="30" width="50"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4.9995" x2="4.9995" y1="-3" y2="12.6738">
-<stop offset="0" style="stop-color:#646464"/>
-<stop offset="0.9" style="stop-color:#3C3C3C"/>
-<stop offset="0.9" style="stop-color:#373737"/>
-<stop offset="1" style="stop-color:#323232"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="24.9995" x2="24.9995" y1="-8" y2="37.0085">
+<stop offset="0" style="stop-color:#8C8C91"/>
+<stop offset="1" style="stop-color:#5A5A5F"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_l.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,17 +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="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"/>
-<rect fill="#14141E" fill-opacity="0.4" height="10" stroke-opacity="0.4" width="10"/>
-<rect fill="url(#SVGID_1_)" height="10" width="9" x="1"/>
-<rect fill="#FFFFFF" fill-opacity="0.2" height="10" stroke-opacity="0.2" width="1" x="2"/>
-<rect fill-opacity="0.2" height="10" stroke-opacity="0.2" width="1" x="1"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" 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="30" width="10"/>
+<rect fill="#14141E" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="2" x="1"/>
+<rect fill="url(#SVGID_1_)" height="30" width="8" x="2"/>
+<rect fill="#FFFFFF" fill-opacity="0.2" height="30" stroke-opacity="0.2" width="1" x="2"/>
+<rect fill="none" height="30" width="10"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5.5" x2="5.5" y1="-3" y2="12.6738">
-<stop offset="0" style="stop-color:#646464"/>
-<stop offset="0.9" style="stop-color:#3C3C3C"/>
-<stop offset="0.9" style="stop-color:#373737"/>
-<stop offset="1" style="stop-color:#323232"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="6" x2="6" y1="-8" y2="37.0085">
+<stop offset="0" style="stop-color:#8C8C91"/>
+<stop offset="1" style="stop-color:#5A5A5F"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_r.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,17 +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="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"/>
-<rect fill="#14141E" fill-opacity="0.4" height="10" stroke-opacity="0.4" width="10"/>
-<rect fill="url(#SVGID_1_)" height="10" width="9"/>
-<rect fill="#FFFFFF" fill-opacity="0.2" height="10" stroke-opacity="0.2" width="1" x="7"/>
-<rect fill-opacity="0.2" height="10" stroke-opacity="0.2" width="1" x="8"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" 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="30" width="10"/>
+<rect fill="#14141E" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="2" x="7"/>
+<rect fill="url(#SVGID_1_)" height="30" width="8"/>
+<rect fill="#FFFFFF" fill-opacity="0.2" height="30" stroke-opacity="0.2" width="1" x="7"/>
+<rect fill="none" height="30" width="10"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4.5" x2="4.5" y1="-3" y2="12.6738">
-<stop offset="0" style="stop-color:#646464"/>
-<stop offset="0.9" style="stop-color:#3C3C3C"/>
-<stop offset="0.9" style="stop-color:#373737"/>
-<stop offset="1" style="stop-color:#323232"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4" x2="4" y1="-8" y2="37.0085">
+<stop offset="0" style="stop-color:#8C8C91"/>
+<stop offset="1" style="stop-color:#5A5A5F"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_t.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_t.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_t.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,17 +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="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"/>
-<rect fill="#14141E" fill-opacity="0.4" height="10" stroke-opacity="0.4" width="10"/>
-<rect fill="url(#SVGID_1_)" height="9" width="10" y="1"/>
-<rect fill="#FFFFFF" fill-opacity="0.2" height="1" stroke-opacity="0.2" width="10" y="2"/>
-<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="10" y="1"/>
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" 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="50"/>
+<rect fill="#14141E" fill-opacity="0.4" height="2" stroke-opacity="0.4" width="50" y="1"/>
+<rect fill="url(#SVGID_1_)" height="8" width="50" y="2"/>
+<rect fill="#FFFFFF" fill-opacity="0.2" height="1" stroke-opacity="0.2" width="50" y="2"/>
+<rect fill="none" height="10" width="50"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4.9995" x2="4.9995" y1="1" y2="48.0191">
-<stop offset="0" style="stop-color:#646464"/>
-<stop offset="0.9" style="stop-color:#3C3C3C"/>
-<stop offset="0.9" style="stop-color:#373737"/>
-<stop offset="1" style="stop-color:#323232"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="24.9995" x2="24.9995" y1="2" y2="47.0077">
+<stop offset="0" style="stop-color:#8C8C91"/>
+<stop offset="1" style="stop-color:#5A5A5F"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_tl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_tl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_tl.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,17 +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="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="M6,0C2.7,0,0,2.7,0,6v4h10V0H6z" fill="#14141E" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M6,1C3.243,1,1,3.243,1,6v4h9V1H6z" fill="url(#SVGID_1_)"/>
-<path d="M6,2C3.795,2,2,3.795,2,6v4h1V6c0-1.654,1.346-3,3-3h4V2H6z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M6,1C3.243,1,1,3.243,1,6v4h1V6c0-2.205,1.794-4,4-4h4V1H6z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M7,1C3.7,1,1,3.7,1,7v3h2V7c0-2.206,1.794-4,4-4h3V1H7z" fill="#14141E" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M7,2C4.243,2,2,4.243,2,7v3h8V2H7z" fill="url(#SVGID_1_)"/>
+<path d="M7,2C4.243,2,2,4.243,2,7v3h1V7c0-2.205,1.794-4,4-4h3V2H7z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
 <rect fill="none" height="10" width="10"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5.5" x2="5.5" y1="1" y2="48.0191">
-<stop offset="0" style="stop-color:#646464"/>
-<stop offset="0.9" style="stop-color:#3C3C3C"/>
-<stop offset="0.9" style="stop-color:#373737"/>
-<stop offset="1" style="stop-color:#323232"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="6" x2="6" y1="2" y2="47.0077">
+<stop offset="0" style="stop-color:#8C8C91"/>
+<stop offset="1" style="stop-color:#5A5A5F"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_tr.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_tr.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_tr.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,17 +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="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,6c0-3.3-2.7-6-6-6H0v10h10V6z" fill="#14141E" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M9,6c0-2.757-2.243-5-5-5H0v9h9V6z" fill="url(#SVGID_1_)"/>
-<path d="M4,2H0v1h4c1.654,0,3,1.346,3,3v4h1V6C8,3.795,6.205,2,4,2z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M4,1H0v1h4c2.206,0,4,1.795,4,4v4h1V6C9,3.243,6.757,1,4,1z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M3,1H0v2h3c2.205,0,4,1.794,4,4v3h2V7C9,3.7,6.3,1,3,1z" fill="#14141E" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M8,7c0-2.757-2.243-5-5-5H0v8h8V7z" fill="url(#SVGID_1_)"/>
+<path d="M3,2H0v1h3c2.206,0,4,1.795,4,4v3h1V7C8,4.243,5.757,2,3,2z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
 <rect fill="none" height="10" width="10"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4.5" x2="4.5" y1="1" y2="48.0191">
-<stop offset="0" style="stop-color:#646464"/>
-<stop offset="0.9" style="stop-color:#3C3C3C"/>
-<stop offset="0.9" style="stop-color:#373737"/>
-<stop offset="1" style="stop-color:#323232"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4" x2="4" y1="2" y2="47.0077">
+<stop offset="0" style="stop-color:#8C8C91"/>
+<stop offset="1" style="stop-color:#5A5A5F"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_b.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_b.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_b.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,15 +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"/>
-<rect fill="#14141E" fill-opacity="0.4" height="10" stroke-opacity="0.4" width="10"/>
-<rect fill="#14141E" fill-opacity="0.2" height="9" stroke-opacity="0.2" width="10"/>
-<rect fill="url(#SVGID_1_)" height="8" width="10"/>
-<rect fill="#FFFFFF" fill-opacity="0.2" height="1" stroke-opacity="0.2" width="10" y="7"/>
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" 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="50"/>
+<rect fill="#14141E" fill-opacity="0.4" height="2" stroke-opacity="0.4" width="50" y="7"/>
+<rect fill-opacity="0.2" height="6" stroke-opacity="0.2" width="50" y="2"/>
+<rect fill="url(#SVGID_1_)" height="7" width="50"/>
+<rect fill="#FFFFFF" fill-opacity="0.2" height="1" stroke-opacity="0.2" width="50" y="6"/>
+<rect fill="none" height="10" width="50"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4.9995" x2="4.9995" y1="-38.833" y2="8.2492">
-<stop offset="0" style="stop-color:#8C8C8C"/>
-<stop offset="1" style="stop-color:#646464"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="24.9995" x2="24.9995" y1="-37.9995" y2="6.9338">
+<stop offset="0" style="stop-color:#BEBEC3"/>
+<stop offset="1" style="stop-color:#8C8C91"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_bl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_bl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_bl.svg	Mon May 03 12:48:33 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="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,0v4c0,3.3,2.7,6,6,6h4V0H0z" fill="#14141E" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M1,0v4c0,2.757,2.243,5,5,5h4V0H1z" fill="#14141E" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M1,0v3c0,2.757,2.243,5,5,5h4V0H1z" fill="url(#SVGID_1_)"/>
-<path d="M6,7C3.794,7,2,5.205,2,3V0H1v3c0,2.757,2.243,5,5,5h4V7H6z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M7,7C4.794,7,3,5.206,3,3V0H1v3c0,3.3,2.7,6,6,6h3V7H7z" fill="#14141E" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M2,2v1c0,2.757,2.243,5,5,5h3V2H2z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M2,0v2c0,2.757,2.243,5,5,5h3V0H2z" 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"/>
 <rect fill="none" height="10" width="10"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5.5" x2="5.5" y1="-38.833" y2="8.2492">
-<stop offset="0" style="stop-color:#8C8C8C"/>
-<stop offset="1" style="stop-color:#646464"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="6" x2="6" y1="-37.9995" y2="6.9338">
+<stop offset="0" style="stop-color:#BEBEC3"/>
+<stop offset="1" style="stop-color:#8C8C91"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_br.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_br.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_br.svg	Mon May 03 12:48:33 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="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,0v10h4c3.3,0,6-2.7,6-6V0H0z" fill="#14141E" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M0,0v9h4c2.757,0,5-2.243,5-5V0H0z" fill="#14141E" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M0,0v8h4c2.757,0,5-2.243,5-5V0H0z" fill="url(#SVGID_1_)"/>
-<path d="M8,0v3c0,2.205-1.794,4-4,4H0v1h4c2.757,0,5-2.243,5-5V0H8z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M7,0v3c0,2.206-1.795,4-4,4H0v2h3c3.3,0,6-2.7,6-6V0H7z" fill="#14141E" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M0,2v6h3c2.757,0,5-2.243,5-5V2H0z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M0,0v7h3c2.757,0,5-2.243,5-5V0H0z" 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"/>
 <rect fill="none" height="10" width="10"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4.5" x2="4.5" y1="-38.833" y2="8.2492">
-<stop offset="0" style="stop-color:#8C8C8C"/>
-<stop offset="1" style="stop-color:#646464"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4" x2="4" y1="-37.9995" y2="6.9338">
+<stop offset="0" style="stop-color:#BEBEC3"/>
+<stop offset="1" style="stop-color:#8C8C91"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_c.svg	Mon May 03 12:48:33 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="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"/>
-<rect fill="url(#SVGID_1_)" height="10" width="10"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 50 30" width="50px" 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="50"/>
+<rect fill="url(#SVGID_1_)" height="30" width="50"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4.9995" x2="4.9995" y1="-2.9448" y2="12.75">
-<stop offset="0" style="stop-color:#8C8C8C"/>
-<stop offset="1" style="stop-color:#646464"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="24.9995" x2="24.9995" y1="-8" y2="36.9341">
+<stop offset="0" style="stop-color:#BEBEC3"/>
+<stop offset="1" style="stop-color:#8C8C91"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_l.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,15 +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="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"/>
-<rect fill="#14141E" fill-opacity="0.4" height="10" stroke-opacity="0.4" width="10"/>
-<rect fill="#14141E" fill-opacity="0.2" height="10" stroke-opacity="0.2" width="9" x="1"/>
-<rect fill="url(#SVGID_1_)" height="10" width="9" x="1"/>
-<rect fill="#FFFFFF" fill-opacity="0.2" height="10" stroke-opacity="0.2" width="1" x="1"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" 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="30" width="10"/>
+<rect fill="#14141E" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="2" x="1"/>
+<rect fill="url(#SVGID_1_)" height="30" width="8" x="2"/>
+<rect fill="#FFFFFF" fill-opacity="0.2" height="30" stroke-opacity="0.2" width="1" x="2"/>
+<rect fill="none" height="30" width="10"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5.5" x2="5.5" y1="-2.9448" y2="12.75">
-<stop offset="0" style="stop-color:#8C8C8C"/>
-<stop offset="1" style="stop-color:#646464"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="6" x2="6" y1="-8" y2="36.9341">
+<stop offset="0" style="stop-color:#BEBEC3"/>
+<stop offset="1" style="stop-color:#8C8C91"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_r.svg	Mon May 03 12:48:33 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="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"/>
-<rect fill="#14141E" fill-opacity="0.4" height="10" stroke-opacity="0.4" width="10"/>
-<rect fill="url(#SVGID_1_)" height="10" width="9"/>
-<rect fill="#FFFFFF" fill-opacity="0.2" height="10" stroke-opacity="0.2" width="1" x="8"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" 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="30" width="10"/>
+<rect fill="#14141E" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="2" x="7"/>
+<rect fill="url(#SVGID_1_)" height="30" width="8"/>
+<rect fill="#FFFFFF" fill-opacity="0.2" height="30" stroke-opacity="0.2" width="1" x="7"/>
+<rect fill="none" height="30" width="10"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4.5" x2="4.5" y1="-2.9448" y2="12.75">
-<stop offset="0" style="stop-color:#8C8C8C"/>
-<stop offset="1" style="stop-color:#646464"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4" x2="4" y1="-8" y2="36.9341">
+<stop offset="0" style="stop-color:#BEBEC3"/>
+<stop offset="1" style="stop-color:#8C8C91"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_t.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_t.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_t.svg	Mon May 03 12:48:33 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="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"/>
-<rect fill="#14141E" fill-opacity="0.4" height="10" stroke-opacity="0.4" width="10"/>
-<rect fill="url(#SVGID_1_)" height="9" width="10" y="1"/>
-<rect fill="#FFFFFF" fill-opacity="0.2" height="1" stroke-opacity="0.2" width="10" y="1"/>
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" 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="50"/>
+<rect fill="#14141E" fill-opacity="0.4" height="2" stroke-opacity="0.4" width="50" y="1"/>
+<rect fill="url(#SVGID_1_)" height="8" width="50" y="2"/>
+<rect fill="#FFFFFF" fill-opacity="0.2" height="1" stroke-opacity="0.2" width="50" y="2"/>
+<rect fill="none" height="10" width="50"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4.9995" x2="4.9995" y1="1.1665" y2="48.2487">
-<stop offset="0" style="stop-color:#8C8C8C"/>
-<stop offset="1" style="stop-color:#646464"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="24.9995" x2="24.9995" y1="2" y2="46.9333">
+<stop offset="0" style="stop-color:#BEBEC3"/>
+<stop offset="1" style="stop-color:#8C8C91"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_tl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_tl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_tl.svg	Mon May 03 12:48:33 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="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="M6,0C2.7,0,0,2.7,0,6v4h10V0H6z" fill="#14141E" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M6,1C3.243,1,1,3.243,1,6v4h9V1H6z" fill="url(#SVGID_1_)"/>
-<path d="M6,1C3.243,1,1,3.243,1,6v4h1V6c0-2.205,1.794-4,4-4h4V1H6z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M7,1C3.7,1,1,3.7,1,7v3h2V7c0-2.206,1.794-4,4-4h3V1H7z" fill="#14141E" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M7,2C4.243,2,2,4.243,2,7v3h8V2H7z" fill="url(#SVGID_1_)"/>
+<path d="M7,2C4.243,2,2,4.243,2,7v3h1V7c0-2.205,1.794-4,4-4h3V2H7z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
 <rect fill="none" height="10" width="10"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5.5" x2="5.5" y1="1.1665" y2="48.2487">
-<stop offset="0" style="stop-color:#8C8C8C"/>
-<stop offset="1" style="stop-color:#646464"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="6" x2="6" y1="2" y2="46.9333">
+<stop offset="0" style="stop-color:#BEBEC3"/>
+<stop offset="1" style="stop-color:#8C8C91"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_tr.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_tr.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_tr.svg	Mon May 03 12:48:33 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="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,6c0-3.3-2.7-6-6-6H0v10h10V6z" fill="#14141E" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M9,6c0-2.757-2.243-5-5-5H0v9h9V6z" fill="url(#SVGID_1_)"/>
-<path d="M4,1H0v1h4c2.206,0,4,1.795,4,4v4h1V6C9,3.243,6.757,1,4,1z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M3,1H0v2h3c2.205,0,4,1.794,4,4v3h2V7C9,3.7,6.3,1,3,1z" fill="#14141E" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M8,7c0-2.757-2.243-5-5-5H0v8h8V7z" fill="url(#SVGID_1_)"/>
+<path d="M3,2H0v1h3c2.206,0,4,1.795,4,4v3h1V7C8,4.243,5.757,2,3,2z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
 <rect fill="none" height="10" width="10"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4.5" x2="4.5" y1="1.1665" y2="48.2487">
-<stop offset="0" style="stop-color:#8C8C8C"/>
-<stop offset="1" style="stop-color:#646464"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4" x2="4" y1="2" y2="46.9333">
+<stop offset="0" style="stop-color:#BEBEC3"/>
+<stop offset="1" style="stop-color:#8C8C91"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_b.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_b.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_b.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,16 +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"/>
-<rect fill="#14141E" fill-opacity="0.2" height="10" stroke-opacity="0.2" width="10"/>
-<rect fill="#14141E" fill-opacity="0.2" height="9" stroke-opacity="0.2" width="10"/>
-<rect fill="url(#SVGID_1_)" height="8" width="10"/>
-<rect fill="#FFFFFF" fill-opacity="0.2" height="1" stroke-opacity="0.2" width="10" y="6"/>
-<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="10" y="7"/>
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" 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="50"/>
+<rect fill="#14141E" fill-opacity="0.4" height="2" stroke-opacity="0.4" width="50" y="7"/>
+<rect fill-opacity="0.2" height="6" stroke-opacity="0.2" width="50" y="2"/>
+<rect fill="url(#SVGID_1_)" height="7" width="50"/>
+<rect fill="#FFFFFF" fill-opacity="0.2" height="1" stroke-opacity="0.2" width="50" y="6"/>
+<rect fill="none" height="10" width="50"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5.0005" x2="5.0005" y1="8" y2="-38.7526">
-<stop offset="0" style="stop-color:#5A5A5A"/>
-<stop offset="1" style="stop-color:#323232"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="25.0005" x2="25.0005" y1="6.875" y2="-37.8794">
+<stop offset="0" style="stop-color:#AAAAAF"/>
+<stop offset="1" style="stop-color:#78787D"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_bl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_bl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_bl.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,16 +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"/>
-<path d="M0,0v4c0,3.3,2.7,6,6,6h4V0H0z" fill="#14141E" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M1,0v4c0,2.757,2.243,5,5,5h4V0H1z" fill="#14141E" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M1,0v3c0,2.757,2.243,5,5,5h4V0H1z" fill="url(#SVGID_1_)"/>
-<path d="M6,6C4.346,6,3,4.654,3,3V0H2v3c0,2.205,1.795,4,4,4h4V6H6z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M6,7C3.794,7,2,5.205,2,3V0H1v3c0,2.757,2.243,5,5,5h4V7H6z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M1,0v3c0,3.3,2.7,6,6,6h3V7H7C4.794,7,3,5.206,3,3V0H1z" fill="#14141E" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M2,2v1c0,2.757,2.243,5,5,5h3V2H2z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M2,2c0,2.757,2.243,5,5,5h3V0H2V2z" fill="url(#SVGID_1_)"/>
+<path d="M2,0v2c0,2.757,2.243,5,5,5h3V6H7C4.794,6,3,4.205,3,2V0H2z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
 <rect fill="none" height="10" width="10"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5.5" x2="5.5" y1="8" y2="-38.7526">
-<stop offset="0" style="stop-color:#5A5A5A"/>
-<stop offset="1" style="stop-color:#323232"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="6" x2="6" y1="6.875" y2="-37.8794">
+<stop offset="0" style="stop-color:#AAAAAF"/>
+<stop offset="1" style="stop-color:#78787D"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_br.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_br.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_br.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,16 +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"/>
-<path d="M0,0v10h4c3.3,0,6-2.7,6-6V0H0z" fill="#14141E" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M0,0v9h4c2.757,0,5-2.243,5-5V0H0z" fill="#14141E" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M0,0v8h4c2.757,0,5-2.243,5-5V0H0z" fill="url(#SVGID_1_)"/>
-<path d="M7,0v3c0,1.654-1.346,3-3,3H0v1h4c2.205,0,4-1.795,4-4V0H7z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M8,0v3c0,2.205-1.794,4-4,4H0v1h4c2.757,0,5-2.243,5-5V0H8z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M7,3c0,2.206-1.795,4-4,4H0v2h3c3.3,0,6-2.7,6-6V0H7V3z" fill="#14141E" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M0,2v6h3c2.757,0,5-2.243,5-5V2H0z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M0,7h3c2.757,0,5-2.243,5-5V0H0V7z" fill="url(#SVGID_1_)"/>
+<path d="M7,2c0,2.205-1.794,4-4,4H0v1h3c2.757,0,5-2.243,5-5V0H7V2z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
 <rect fill="none" height="10" width="10"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4.5" x2="4.5" y1="8" y2="-38.7526">
-<stop offset="0" style="stop-color:#5A5A5A"/>
-<stop offset="1" style="stop-color:#323232"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4" x2="4" y1="6.875" y2="-37.8794">
+<stop offset="0" style="stop-color:#AAAAAF"/>
+<stop offset="1" style="stop-color:#78787D"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_c.svg	Mon May 03 12:48:33 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="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"/>
-<rect fill="url(#SVGID_1_)" height="10" width="10"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 50 30" width="50px" 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="50"/>
+<rect fill="url(#SVGID_1_)" height="30" width="50"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5.0005" x2="5.0005" y1="12.667" y2="-2.9164">
-<stop offset="0" style="stop-color:#5A5A5A"/>
-<stop offset="1" style="stop-color:#323232"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="25.0005" x2="25.0005" y1="36.875" y2="-7.8786">
+<stop offset="0" style="stop-color:#AAAAAF"/>
+<stop offset="1" style="stop-color:#78787D"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_l.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,15 +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="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"/>
-<rect fill="#14141E" fill-opacity="0.2" height="10" stroke-opacity="0.2" width="10"/>
-<rect fill="url(#SVGID_1_)" height="10" width="9" x="1"/>
-<rect fill="#FFFFFF" fill-opacity="0.2" height="10" stroke-opacity="0.2" width="1" x="2"/>
-<rect fill-opacity="0.2" height="10" stroke-opacity="0.2" width="1" x="1"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" 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="30" width="10"/>
+<rect fill="#14141E" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="2" x="1"/>
+<rect fill="url(#SVGID_1_)" height="30" width="8" x="2"/>
+<rect fill="#FFFFFF" fill-opacity="0.2" height="30" stroke-opacity="0.2" width="1" x="2"/>
+<rect fill="none" height="30" width="10"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5.5" x2="5.5" y1="12.667" y2="-2.9164">
-<stop offset="0" style="stop-color:#5A5A5A"/>
-<stop offset="1" style="stop-color:#323232"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="6" x2="6" y1="36.875" y2="-7.8786">
+<stop offset="0" style="stop-color:#AAAAAF"/>
+<stop offset="1" style="stop-color:#78787D"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_r.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,15 +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="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"/>
-<rect fill="#14141E" fill-opacity="0.2" height="10" stroke-opacity="0.2" width="10"/>
-<rect fill="url(#SVGID_1_)" height="10" width="9"/>
-<rect fill="#FFFFFF" fill-opacity="0.2" height="10" stroke-opacity="0.2" width="1" x="7"/>
-<rect fill-opacity="0.2" height="10" stroke-opacity="0.2" width="1" x="8"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" 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="30" width="10"/>
+<rect fill="#14141E" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="2" x="7"/>
+<rect fill="url(#SVGID_1_)" height="30" width="8"/>
+<rect fill="#FFFFFF" fill-opacity="0.2" height="30" stroke-opacity="0.2" width="1" x="7"/>
+<rect fill="none" height="30" width="10"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4.5" x2="4.5" y1="12.667" y2="-2.9164">
-<stop offset="0" style="stop-color:#5A5A5A"/>
-<stop offset="1" style="stop-color:#323232"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4" x2="4" y1="36.875" y2="-7.8786">
+<stop offset="0" style="stop-color:#AAAAAF"/>
+<stop offset="1" style="stop-color:#78787D"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_t.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_t.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_t.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,15 +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="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"/>
-<rect fill="#14141E" fill-opacity="0.2" height="10" stroke-opacity="0.2" width="10"/>
-<rect fill="url(#SVGID_1_)" height="9" width="10" y="1"/>
-<rect fill="#FFFFFF" fill-opacity="0.2" height="1" stroke-opacity="0.2" width="10" y="2"/>
-<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="10" y="1"/>
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" 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="50"/>
+<rect fill="#14141E" fill-opacity="0.4" height="2" stroke-opacity="0.4" width="50" y="1"/>
+<rect fill="url(#SVGID_1_)" height="8" width="50" y="2"/>
+<rect fill="#FFFFFF" fill-opacity="0.2" height="1" stroke-opacity="0.2" width="50" y="2"/>
+<rect fill="none" height="10" width="50"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5.0005" x2="5.0005" y1="48" y2="1.2473">
-<stop offset="0" style="stop-color:#5A5A5A"/>
-<stop offset="1" style="stop-color:#323232"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="25.0005" x2="25.0005" y1="46.876" y2="2.1216">
+<stop offset="0" style="stop-color:#AAAAAF"/>
+<stop offset="1" style="stop-color:#78787D"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_tl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_tl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_tl.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,15 +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="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="M6,0C2.7,0,0,2.7,0,6v4h10V0H6z" fill="#14141E" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M6,1C3.243,1,1,3.243,1,6v4h9V1H6z" fill="url(#SVGID_1_)"/>
-<path d="M6,2C3.795,2,2,3.795,2,6v4h1V6c0-1.654,1.346-3,3-3h4V2H6z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M6,1C3.243,1,1,3.243,1,6v4h1V6c0-2.205,1.794-4,4-4h4V1H6z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M3,7c0-2.206,1.794-4,4-4h3V1H7C3.7,1,1,3.7,1,7v3h2V7z" fill="#14141E" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M10,2H7C4.243,2,2,4.243,2,7v3h8V2z" fill="url(#SVGID_1_)"/>
+<path d="M3,7c0-2.205,1.794-4,4-4h3V2H7C4.243,2,2,4.243,2,7v3h1V7z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
 <rect fill="none" height="10" width="10"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5.5" x2="5.5" y1="48" y2="1.2473">
-<stop offset="0" style="stop-color:#5A5A5A"/>
-<stop offset="1" style="stop-color:#323232"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="6" x2="6" y1="46.876" y2="2.1216">
+<stop offset="0" style="stop-color:#AAAAAF"/>
+<stop offset="1" style="stop-color:#78787D"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_tr.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_tr.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_tr.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,15 +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="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,6c0-3.3-2.7-6-6-6H0v10h10V6z" fill="#14141E" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M9,6c0-2.757-2.243-5-5-5H0v9h9V6z" fill="url(#SVGID_1_)"/>
-<path d="M4,2H0v1h4c1.654,0,3,1.346,3,3v4h1V6C8,3.795,6.205,2,4,2z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M4,1H0v1h4c2.206,0,4,1.795,4,4v4h1V6C9,3.243,6.757,1,4,1z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M9,7c0-3.3-2.7-6-6-6H0v2h3c2.205,0,4,1.794,4,4v3h2V7z" fill="#14141E" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M8,7c0-2.757-2.243-5-5-5H0v8h8V7z" fill="url(#SVGID_1_)"/>
+<path d="M8,7c0-2.757-2.243-5-5-5H0v1h3c2.206,0,4,1.795,4,4v3h1V7z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
 <rect fill="none" height="10" width="10"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4.5" x2="4.5" y1="48" y2="1.2473">
-<stop offset="0" style="stop-color:#5A5A5A"/>
-<stop offset="1" style="stop-color:#323232"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4" x2="4" y1="46.876" y2="2.1216">
+<stop offset="0" style="stop-color:#AAAAAF"/>
+<stop offset="1" style="stop-color:#78787D"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_b.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_b.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_b.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,15 +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="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"/>
-<rect fill="#14141E" fill-opacity="0.4" height="10" stroke-opacity="0.4" width="10"/>
-<rect fill="#14141E" fill-opacity="0.2" height="9" stroke-opacity="0.2" width="10"/>
-<rect fill="url(#SVGID_1_)" height="8" width="10"/>
-<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="10" y="7"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5.0005" x2="5.0005" y1="8" y2="-38.7526">
-<stop offset="0" style="stop-color:#D2D2D2"/>
-<stop offset="1" style="stop-color:#AAAAAA"/>
-</linearGradient>
-</defs>
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" 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="50"/>
+<rect fill="#AAAAAF" fill-opacity="0.8" height="7" stroke-opacity="0.8" width="50"/>
+<rect fill-opacity="0.2" height="3" stroke-opacity="0.2" width="50" y="6"/>
+<rect fill="none" height="10" width="50"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_bl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_bl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_bl.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,15 +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="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,0v4c0,3.3,2.7,6,6,6h4V0H0z" fill="#14141E" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M1,0v4c0,2.757,2.243,5,5,5h4V0H1z" fill="#14141E" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M1,0v3c0,2.757,2.243,5,5,5h4V0H1z" fill="url(#SVGID_1_)"/>
-<path d="M6,7C3.794,7,2,5.205,2,3V0H1v3c0,2.757,2.243,5,5,5h4V7H6z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M2,0v2c0,2.757,2.243,5,5,5h3V0H2z" fill="#AAAAAF" fill-opacity="0.8" stroke-opacity="0.8"/>
+<path d="M7,6C4.794,6,3,4.205,3,2V0H1v3c0,3.3,2.7,6,6,6h3V6H7z" fill-opacity="0.2" stroke-opacity="0.2"/>
 <rect fill="none" height="10" width="10"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5.5" x2="5.5" y1="8" y2="-38.7526">
-<stop offset="0" style="stop-color:#D2D2D2"/>
-<stop offset="1" style="stop-color:#AAAAAA"/>
-</linearGradient>
-</defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_br.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_br.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_br.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,15 +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="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,0v10h4c3.3,0,6-2.7,6-6V0H0z" fill="#14141E" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M0,0v9h4c2.757,0,5-2.243,5-5V0H0z" fill="#14141E" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M0,0v8h4c2.757,0,5-2.243,5-5V0H0z" fill="url(#SVGID_1_)"/>
-<path d="M8,0v3c0,2.205-1.794,4-4,4H0v1h4c2.757,0,5-2.243,5-5V0H8z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M0,0v7h3c2.757,0,5-2.243,5-5V0H0z" fill="#AAAAAF" fill-opacity="0.8" stroke-opacity="0.8"/>
+<path d="M7,0v2c0,2.205-1.794,4-4,4H0v3h3c3.3,0,6-2.7,6-6V0H7z" fill-opacity="0.2" stroke-opacity="0.2"/>
 <rect fill="none" height="10" width="10"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4.5" x2="4.5" y1="8" y2="-38.7526">
-<stop offset="0" style="stop-color:#D2D2D2"/>
-<stop offset="1" style="stop-color:#AAAAAA"/>
-</linearGradient>
-</defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_c.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,12 +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"/>
-<rect fill="url(#SVGID_1_)" height="10" width="10"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5.0005" x2="5.0005" y1="12.667" y2="-2.9164">
-<stop offset="0" style="stop-color:#D2D2D2"/>
-<stop offset="1" style="stop-color:#AAAAAA"/>
-</linearGradient>
-</defs>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 50 30" width="50px" 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="50"/>
+<rect fill="#AAAAAF" fill-opacity="0.8" height="30" stroke-opacity="0.8" width="50"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_l.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,14 +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="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"/>
-<rect fill="#14141E" fill-opacity="0.4" height="10" stroke-opacity="0.4" width="10"/>
-<rect fill="url(#SVGID_1_)" height="10" width="9" x="1"/>
-<rect fill-opacity="0.2" height="10" stroke-opacity="0.2" width="1" x="1"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5.5" x2="5.5" y1="12.667" y2="-2.9164">
-<stop offset="0" style="stop-color:#D2D2D2"/>
-<stop offset="1" style="stop-color:#AAAAAA"/>
-</linearGradient>
-</defs>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" 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="30" width="10"/>
+<rect fill="#AAAAAF" fill-opacity="0.8" height="30" stroke-opacity="0.8" width="8" x="2"/>
+<rect fill-opacity="0.2" height="30" stroke-opacity="0.2" width="2" x="1"/>
+<rect fill="none" height="30" width="10"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_r.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,14 +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="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"/>
-<rect fill="#14141E" fill-opacity="0.4" height="10" stroke-opacity="0.4" width="10"/>
-<rect fill="url(#SVGID_1_)" height="10" width="9"/>
-<rect fill-opacity="0.2" height="10" stroke-opacity="0.2" width="1" x="8"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4.5" x2="4.5" y1="12.667" y2="-2.9164">
-<stop offset="0" style="stop-color:#D2D2D2"/>
-<stop offset="1" style="stop-color:#AAAAAA"/>
-</linearGradient>
-</defs>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" 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="30" width="10"/>
+<rect fill="#AAAAAF" fill-opacity="0.8" height="30" stroke-opacity="0.8" width="8"/>
+<rect fill-opacity="0.2" height="30" stroke-opacity="0.2" width="2" x="7"/>
+<rect fill="none" height="30" width="10"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_t.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_t.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_t.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,14 +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="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"/>
-<rect fill="#14141E" fill-opacity="0.4" height="10" stroke-opacity="0.4" width="10"/>
-<rect fill="url(#SVGID_1_)" height="9" width="10" y="1"/>
-<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="10" y="1"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5.0005" x2="5.0005" y1="48" y2="1.2473">
-<stop offset="0" style="stop-color:#D2D2D2"/>
-<stop offset="1" style="stop-color:#AAAAAA"/>
-</linearGradient>
-</defs>
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" 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="50"/>
+<rect fill="#AAAAAF" fill-opacity="0.8" height="8" stroke-opacity="0.8" width="50" y="2"/>
+<rect fill-opacity="0.2" height="2" stroke-opacity="0.2" width="50" y="1"/>
+<rect fill="none" height="10" width="50"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_tl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_tl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_tl.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,14 +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="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="M6,0C2.7,0,0,2.7,0,6v4h10V0H6z" fill="#14141E" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M6,1C3.243,1,1,3.243,1,6v4h9V1H6z" fill="url(#SVGID_1_)"/>
-<path d="M6,1C3.243,1,1,3.243,1,6v4h1V6c0-2.205,1.794-4,4-4h4V1H6z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M7,2C4.243,2,2,4.243,2,7v3h8V2H7z" fill="#AAAAAF" fill-opacity="0.8" stroke-opacity="0.8"/>
+<path d="M7,1C3.7,1,1,3.7,1,7v3h2V7c0-2.205,1.794-4,4-4h3V1H7z" fill-opacity="0.2" stroke-opacity="0.2"/>
 <rect fill="none" height="10" width="10"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5.5" x2="5.5" y1="48" y2="1.2473">
-<stop offset="0" style="stop-color:#D2D2D2"/>
-<stop offset="1" style="stop-color:#AAAAAA"/>
-</linearGradient>
-</defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_tr.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_tr.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_tr.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,14 +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="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,6c0-3.3-2.7-6-6-6H0v10h10V6z" fill="#14141E" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M9,6c0-2.757-2.243-5-5-5H0v9h9V6z" fill="url(#SVGID_1_)"/>
-<path d="M4,1H0v1h4c2.206,0,4,1.795,4,4v4h1V6C9,3.243,6.757,1,4,1z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M8,7c0-2.757-2.243-5-5-5H0v8h8V7z" fill="#AAAAAF" fill-opacity="0.8" stroke-opacity="0.8"/>
+<path d="M3,1H0v2h3c2.206,0,4,1.795,4,4v3h2V7C9,3.7,6.3,1,3,1z" fill-opacity="0.2" stroke-opacity="0.2"/>
 <rect fill="none" height="10" width="10"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4.5" x2="4.5" y1="48" y2="1.2473">
-<stop offset="0" style="stop-color:#D2D2D2"/>
-<stop offset="1" style="stop-color:#AAAAAA"/>
-</linearGradient>
-</defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_b.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_b.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_b.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,18 +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"/>
-<rect fill="#14141E" fill-opacity="0.2" height="10" stroke-opacity="0.2" width="10"/>
-<rect fill="#14141E" fill-opacity="0.2" height="9" stroke-opacity="0.2" width="10"/>
-<rect fill="url(#SVGID_1_)" height="8" width="10"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="10" y="6"/>
-<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="10" y="7"/>
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" 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="50"/>
+<rect fill="#14141E" fill-opacity="0.4" height="2" stroke-opacity="0.4" width="50" y="7"/>
+<rect fill-opacity="0.2" height="6" stroke-opacity="0.2" width="50" y="2"/>
+<rect fill="url(#SVGID_1_)" height="7" width="50"/>
+<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="50" y="6"/>
+<rect fill="none" height="10" width="50"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4.9995" x2="4.9995" y1="-38.9995" y2="8.0195">
-<stop offset="0" style="stop-color:#C8C8C8"/>
-<stop offset="0.9" style="stop-color:#969696"/>
-<stop offset="0.9" style="stop-color:#8C8C8C"/>
-<stop offset="1" style="stop-color:#828282"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="24.9995" x2="24.9995" y1="-37.9995" y2="6.9832">
+<stop offset="0" style="stop-color:#CDCDD2"/>
+<stop offset="1" style="stop-color:#9B9BA0"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_bl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_bl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_bl.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,18 +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"/>
-<path d="M0,0v4c0,3.3,2.7,6,6,6h4V0H0z" fill="#14141E" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M1,0v4c0,2.757,2.243,5,5,5h4V0H1z" fill="#14141E" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M1,0v3c0,2.757,2.243,5,5,5h4V0H1z" fill="url(#SVGID_1_)"/>
-<path d="M6,6C4.346,6,3,4.654,3,3V0H2v3c0,2.205,1.795,4,4,4h4V6H6z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M6,7C3.794,7,2,5.205,2,3V0H1v3c0,2.757,2.243,5,5,5h4V7H6z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M7,7C4.794,7,3,5.206,3,3V0H1v3c0,3.3,2.7,6,6,6h3V7H7z" fill="#14141E" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M2,2v1c0,2.757,2.243,5,5,5h3V2H2z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M2,0v2c0,2.757,2.243,5,5,5h3V0H2z" 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.4" stroke-opacity="0.4"/>
 <rect fill="none" height="10" width="10"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5.5" x2="5.5" y1="-38.9995" y2="8.0195">
-<stop offset="0" style="stop-color:#C8C8C8"/>
-<stop offset="0.9" style="stop-color:#969696"/>
-<stop offset="0.9" style="stop-color:#8C8C8C"/>
-<stop offset="1" style="stop-color:#828282"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="6" x2="6" y1="-37.9995" y2="6.9832">
+<stop offset="0" style="stop-color:#CDCDD2"/>
+<stop offset="1" style="stop-color:#9B9BA0"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_br.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_br.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_br.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,18 +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"/>
-<path d="M0,0v10h4c3.3,0,6-2.7,6-6V0H0z" fill="#14141E" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M0,0v9h4c2.757,0,5-2.243,5-5V0H0z" fill="#14141E" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M0,0v8h4c2.757,0,5-2.243,5-5V0H0z" fill="url(#SVGID_1_)"/>
-<path d="M7,0v3c0,1.654-1.346,3-3,3H0v1h4c2.205,0,4-1.795,4-4V0H7z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M8,0v3c0,2.205-1.794,4-4,4H0v1h4c2.757,0,5-2.243,5-5V0H8z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M7,0v3c0,2.206-1.795,4-4,4H0v2h3c3.3,0,6-2.7,6-6V0H7z" fill="#14141E" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M0,2v1v5h3c2.757,0,5-2.243,5-5V2H0z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M0,0v7h3c2.757,0,5-2.243,5-5V0H0z" 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.4" stroke-opacity="0.4"/>
 <rect fill="none" height="10" width="10"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4.5" x2="4.5" y1="-38.9995" y2="8.0195">
-<stop offset="0" style="stop-color:#C8C8C8"/>
-<stop offset="0.9" style="stop-color:#969696"/>
-<stop offset="0.9" style="stop-color:#8C8C8C"/>
-<stop offset="1" style="stop-color:#828282"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4" x2="4" y1="-37.9995" y2="6.9832">
+<stop offset="0" style="stop-color:#CDCDD2"/>
+<stop offset="1" style="stop-color:#9B9BA0"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_c.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,14 +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="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"/>
-<rect fill="url(#SVGID_1_)" height="10" width="10"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 50 30" width="50px" 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="50"/>
+<rect fill="url(#SVGID_1_)" height="30" width="50"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4.9995" x2="4.9995" y1="-3" y2="12.6738">
-<stop offset="0" style="stop-color:#C8C8C8"/>
-<stop offset="0.9" style="stop-color:#969696"/>
-<stop offset="0.9" style="stop-color:#8C8C8C"/>
-<stop offset="1" style="stop-color:#828282"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="24.9995" x2="24.9995" y1="-8" y2="36.9833">
+<stop offset="0" style="stop-color:#CDCDD2"/>
+<stop offset="1" style="stop-color:#9B9BA0"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_l.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,17 +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="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"/>
-<rect fill="#14141E" fill-opacity="0.2" height="10" stroke-opacity="0.2" width="10"/>
-<rect fill="url(#SVGID_1_)" height="10" width="9" x="1"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="10" stroke-opacity="0.4" width="1" x="2"/>
-<rect fill-opacity="0.2" height="10" stroke-opacity="0.2" width="1" x="1"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" 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="30" width="10"/>
+<rect fill="#14141E" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="2" x="1"/>
+<rect fill="url(#SVGID_1_)" height="30" width="8" x="2"/>
+<rect fill="#FFFFFF" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="1" x="2"/>
+<rect fill="none" height="30" width="10"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5.5" x2="5.5" y1="-3" y2="12.6738">
-<stop offset="0" style="stop-color:#C8C8C8"/>
-<stop offset="0.9" style="stop-color:#969696"/>
-<stop offset="0.9" style="stop-color:#8C8C8C"/>
-<stop offset="1" style="stop-color:#828282"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="6" x2="6" y1="-8" y2="36.9833">
+<stop offset="0" style="stop-color:#CDCDD2"/>
+<stop offset="1" style="stop-color:#9B9BA0"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_r.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,17 +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="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"/>
-<rect fill="#14141E" fill-opacity="0.2" height="10" stroke-opacity="0.2" width="10"/>
-<rect fill="url(#SVGID_1_)" height="10" width="9"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="10" stroke-opacity="0.4" width="1" x="7"/>
-<rect fill-opacity="0.2" height="10" stroke-opacity="0.2" width="1" x="8"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" 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="30" width="10"/>
+<rect fill="#14141E" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="2" x="7"/>
+<rect fill="url(#SVGID_1_)" height="30" width="8"/>
+<rect fill="#FFFFFF" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="1" x="7"/>
+<rect fill="none" height="30" width="10"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4.5" x2="4.5" y1="-3" y2="12.6738">
-<stop offset="0" style="stop-color:#C8C8C8"/>
-<stop offset="0.9" style="stop-color:#969696"/>
-<stop offset="0.9" style="stop-color:#8C8C8C"/>
-<stop offset="1" style="stop-color:#828282"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4" x2="4" y1="-8" y2="36.9833">
+<stop offset="0" style="stop-color:#CDCDD2"/>
+<stop offset="1" style="stop-color:#9B9BA0"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_t.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_t.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_t.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,17 +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="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"/>
-<rect fill="#14141E" fill-opacity="0.2" height="10" stroke-opacity="0.2" width="10"/>
-<rect fill="url(#SVGID_1_)" height="9" width="10" y="1"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="10" y="2"/>
-<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="10" y="1"/>
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" 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="50"/>
+<rect fill="#14141E" fill-opacity="0.4" height="2" stroke-opacity="0.4" width="50" y="1"/>
+<rect fill="url(#SVGID_1_)" height="8" width="50" y="2"/>
+<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="50" y="2"/>
+<rect fill="none" height="10" width="50"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4.9995" x2="4.9995" y1="1" y2="48.0191">
-<stop offset="0" style="stop-color:#C8C8C8"/>
-<stop offset="0.9" style="stop-color:#969696"/>
-<stop offset="0.9" style="stop-color:#8C8C8C"/>
-<stop offset="1" style="stop-color:#828282"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="24.9995" x2="24.9995" y1="2" y2="46.9827">
+<stop offset="0" style="stop-color:#CDCDD2"/>
+<stop offset="1" style="stop-color:#9B9BA0"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_tl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_tl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_tl.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,17 +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="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="M6,0C2.7,0,0,2.7,0,6v4h10V0H6z" fill="#14141E" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M6,1C3.243,1,1,3.243,1,6v4h9V1H6z" fill="url(#SVGID_1_)"/>
-<path d="M6,2C3.795,2,2,3.795,2,6v4h1V6c0-1.654,1.346-3,3-3h4V2H6z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M6,1C3.243,1,1,3.243,1,6v4h1V6c0-2.205,1.794-4,4-4h4V1H6z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M7,1C3.7,1,1,3.7,1,7v3h2V7c0-2.206,1.794-4,4-4h3V1H7z" fill="#14141E" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M7,2C4.243,2,2,4.243,2,7v3h8V2H7z" fill="url(#SVGID_1_)"/>
+<path d="M7,2C4.243,2,2,4.243,2,7v3h1V7c0-2.205,1.794-4,4-4h3V2H7z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
 <rect fill="none" height="10" width="10"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5.5" x2="5.5" y1="1" y2="48.0191">
-<stop offset="0" style="stop-color:#C8C8C8"/>
-<stop offset="0.9" style="stop-color:#969696"/>
-<stop offset="0.9" style="stop-color:#8C8C8C"/>
-<stop offset="1" style="stop-color:#828282"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="6" x2="6" y1="2" y2="46.9827">
+<stop offset="0" style="stop-color:#CDCDD2"/>
+<stop offset="1" style="stop-color:#9B9BA0"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_tr.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_tr.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_tr.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,17 +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="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,6c0-3.3-2.7-6-6-6H0v10h10V6z" fill="#14141E" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M9,6c0-2.757-2.243-5-5-5H0v9h9V6z" fill="url(#SVGID_1_)"/>
-<path d="M4,2H0v1h4c1.654,0,3,1.346,3,3v4h1V6C8,3.795,6.205,2,4,2z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M4,1H0v1h4c2.206,0,4,1.795,4,4v4h1V6C9,3.243,6.757,1,4,1z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M3,1H0v2h3c2.205,0,4,1.794,4,4v3h2V7C9,3.7,6.3,1,3,1z" fill="#14141E" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M8,7c0-2.757-2.243-5-5-5H0v8h8V7z" fill="url(#SVGID_1_)"/>
+<path d="M3,2H0v1h3c2.206,0,4,1.795,4,4v3h1V7C8,4.243,5.757,2,3,2z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
 <rect fill="none" height="10" width="10"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4.5" x2="4.5" y1="1" y2="48.0191">
-<stop offset="0" style="stop-color:#C8C8C8"/>
-<stop offset="0.9" style="stop-color:#969696"/>
-<stop offset="0.9" style="stop-color:#8C8C8C"/>
-<stop offset="1" style="stop-color:#828282"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4" x2="4" y1="2" y2="46.9827">
+<stop offset="0" style="stop-color:#CDCDD2"/>
+<stop offset="1" style="stop-color:#9B9BA0"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_b.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_b.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_b.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,15 +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"/>
-<rect fill="#14141E" fill-opacity="0.4" height="10" stroke-opacity="0.4" width="10"/>
-<rect fill="#14141E" fill-opacity="0.2" height="9" stroke-opacity="0.2" width="10"/>
-<rect fill="url(#SVGID_1_)" height="8" width="10"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="10" y="7"/>
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" 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="50"/>
+<rect fill="#141414" fill-opacity="0.4" height="2" stroke-opacity="0.4" width="50" y="7"/>
+<rect fill-opacity="0.2" height="6" stroke-opacity="0.2" width="50" y="2"/>
+<rect fill="url(#SVGID_1_)" height="7" width="50"/>
+<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="50" y="6"/>
+<rect fill="none" height="10" width="50"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4.9995" x2="4.9995" y1="-38.833" y2="8.2492">
-<stop offset="0" style="stop-color:#FAFAFA"/>
-<stop offset="1" style="stop-color:#E6E6E6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="24.9995" x2="24.9995" y1="-37.9995" y2="7.0883">
+<stop offset="0" style="stop-color:#FAFAFF"/>
+<stop offset="1" style="stop-color:#DCDCE1"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_bl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_bl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_bl.svg	Mon May 03 12:48:33 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="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,0v4c0,3.3,2.7,6,6,6h4V0H0z" fill="#14141E" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M1,0v4c0,2.757,2.243,5,5,5h4V0H1z" fill="#14141E" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M1,0v3c0,2.757,2.243,5,5,5h4V0H1z" fill="url(#SVGID_1_)"/>
-<path d="M6,7C3.794,7,2,5.205,2,3V0H1v3c0,2.757,2.243,5,5,5h4V7H6z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M7,7C4.794,7,3,5.206,3,3V0H1v3c0,3.3,2.7,6,6,6h3V7H7z" fill="#141414" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M2,2v1c0,2.757,2.243,5,5,5h3V2H2z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M2,0v2c0,2.757,2.243,5,5,5h3V0H2z" 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.4" stroke-opacity="0.4"/>
 <rect fill="none" height="10" width="10"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5.5" x2="5.5" y1="-38.833" y2="8.2492">
-<stop offset="0" style="stop-color:#FAFAFA"/>
-<stop offset="1" style="stop-color:#E6E6E6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="6" x2="6" y1="-37.9995" y2="7.0883">
+<stop offset="0" style="stop-color:#FAFAFF"/>
+<stop offset="1" style="stop-color:#DCDCE1"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_br.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_br.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_br.svg	Mon May 03 12:48:33 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="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,0v10h4c3.3,0,6-2.7,6-6V0H0z" fill="#14141E" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M0,0v9h4c2.757,0,5-2.243,5-5V0H0z" fill="#14141E" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M0,0v8h4c2.757,0,5-2.243,5-5V0H0z" fill="url(#SVGID_1_)"/>
-<path d="M8,0v3c0,2.205-1.794,4-4,4H0v1h4c2.757,0,5-2.243,5-5V0H8z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M7,0v3c0,2.206-1.795,4-4,4H0v2h3c3.3,0,6-2.7,6-6V0H7z" fill="#141414" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M0,2v6h3c2.757,0,5-2.243,5-5V2H0z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M0,0v7h3c2.757,0,5-2.243,5-5V0H0z" 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.4" stroke-opacity="0.4"/>
 <rect fill="none" height="10" width="10"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4.5" x2="4.5" y1="-38.833" y2="8.2492">
-<stop offset="0" style="stop-color:#FAFAFA"/>
-<stop offset="1" style="stop-color:#E6E6E6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4" x2="4" y1="-37.9995" y2="7.0883">
+<stop offset="0" style="stop-color:#FAFAFF"/>
+<stop offset="1" style="stop-color:#DCDCE1"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_c.svg	Mon May 03 12:48:33 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="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"/>
-<rect fill="url(#SVGID_1_)" height="10" width="10"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 50 30" width="50px" 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="50"/>
+<rect fill="url(#SVGID_1_)" height="30" width="50"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4.9995" x2="4.9995" y1="-2.9448" y2="12.75">
-<stop offset="0" style="stop-color:#FAFAFA"/>
-<stop offset="1" style="stop-color:#E6E6E6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="24.9995" x2="24.9995" y1="-8" y2="37.0886">
+<stop offset="0" style="stop-color:#FAFAFF"/>
+<stop offset="1" style="stop-color:#DCDCE1"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_l.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,15 +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="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"/>
-<rect fill="#14141E" fill-opacity="0.4" height="10" stroke-opacity="0.4" width="10"/>
-<rect fill="#14141E" fill-opacity="0.2" height="10" stroke-opacity="0.2" width="9" x="1"/>
-<rect fill="url(#SVGID_1_)" height="10" width="9" x="1"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="10" stroke-opacity="0.4" width="1" x="1"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" 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="30" width="10"/>
+<rect fill="#141414" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="2" x="1"/>
+<rect fill="url(#SVGID_1_)" height="30" width="8" x="2"/>
+<rect fill="#FFFFFF" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="1" x="2"/>
+<rect fill="none" height="30" width="10"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5.5" x2="5.5" y1="-2.9448" y2="12.75">
-<stop offset="0" style="stop-color:#FAFAFA"/>
-<stop offset="1" style="stop-color:#E6E6E6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="6" x2="6" y1="-8" y2="37.0886">
+<stop offset="0" style="stop-color:#FAFAFF"/>
+<stop offset="1" style="stop-color:#DCDCE1"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_r.svg	Mon May 03 12:48:33 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="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"/>
-<rect fill="#14141E" fill-opacity="0.4" height="10" stroke-opacity="0.4" width="10"/>
-<rect fill="url(#SVGID_1_)" height="10" width="9"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="10" stroke-opacity="0.4" width="1" x="8"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" 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="30" width="10"/>
+<rect fill="#141414" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="2" x="7"/>
+<rect fill="url(#SVGID_1_)" height="30" width="8"/>
+<rect fill="#FFFFFF" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="1" x="7"/>
+<rect fill="none" height="30" width="10"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4.5" x2="4.5" y1="-2.9448" y2="12.75">
-<stop offset="0" style="stop-color:#FAFAFA"/>
-<stop offset="1" style="stop-color:#E6E6E6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4" x2="4" y1="-8" y2="37.0886">
+<stop offset="0" style="stop-color:#FAFAFF"/>
+<stop offset="1" style="stop-color:#DCDCE1"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_t.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_t.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_t.svg	Mon May 03 12:48:33 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="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"/>
-<rect fill="#14141E" fill-opacity="0.4" height="10" stroke-opacity="0.4" width="10"/>
-<rect fill="url(#SVGID_1_)" height="9" width="10" y="1"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="10" y="1"/>
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" 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="50"/>
+<rect fill="#141414" fill-opacity="0.4" height="2" stroke-opacity="0.4" width="50" y="1"/>
+<rect fill="url(#SVGID_1_)" height="8" width="50" y="2"/>
+<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="50" y="2"/>
+<rect fill="none" height="10" width="50"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4.9995" x2="4.9995" y1="1.1665" y2="48.2487">
-<stop offset="0" style="stop-color:#FAFAFA"/>
-<stop offset="1" style="stop-color:#E6E6E6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="24.9995" x2="24.9995" y1="2" y2="47.0878">
+<stop offset="0" style="stop-color:#FAFAFF"/>
+<stop offset="1" style="stop-color:#DCDCE1"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_tl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_tl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_tl.svg	Mon May 03 12:48:33 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="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="M6,0C2.7,0,0,2.7,0,6v4h10V0H6z" fill="#14141E" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M6,1C3.243,1,1,3.243,1,6v4h9V1H6z" fill="url(#SVGID_1_)"/>
-<path d="M6,1C3.243,1,1,3.243,1,6v4h1V6c0-2.205,1.794-4,4-4h4V1H6z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M7,1C3.7,1,1,3.7,1,7v3h2V7c0-2.206,1.794-4,4-4h3V1H7z" fill="#141414" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M7,2C4.243,2,2,4.243,2,7v3h8V2H7z" fill="url(#SVGID_1_)"/>
+<path d="M7,2C4.243,2,2,4.243,2,7v3h1V7c0-2.205,1.794-4,4-4h3V2H7z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
 <rect fill="none" height="10" width="10"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5.5" x2="5.5" y1="1.1665" y2="48.2487">
-<stop offset="0" style="stop-color:#FAFAFA"/>
-<stop offset="1" style="stop-color:#E6E6E6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="6" x2="6" y1="2" y2="47.0878">
+<stop offset="0" style="stop-color:#FAFAFF"/>
+<stop offset="1" style="stop-color:#DCDCE1"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_tr.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_tr.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_tr.svg	Mon May 03 12:48:33 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="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,6c0-3.3-2.7-6-6-6H0v10h10V6z" fill="#14141E" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M9,6c0-2.757-2.243-5-5-5H0v9h9V6z" fill="url(#SVGID_1_)"/>
-<path d="M4,1H0v1h4c2.206,0,4,1.795,4,4v4h1V6C9,3.243,6.757,1,4,1z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M3,1H0v2h3c2.205,0,4,1.794,4,4v3h2V7C9,3.7,6.3,1,3,1z" fill="#141414" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M8,7c0-2.757-2.243-5-5-5H0v8h8V7z" fill="url(#SVGID_1_)"/>
+<path d="M3,2H0v1h3c2.206,0,4,1.795,4,4v3h1V7C8,4.243,5.757,2,3,2z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
 <rect fill="none" height="10" width="10"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4.5" x2="4.5" y1="1.1665" y2="48.2487">
-<stop offset="0" style="stop-color:#FAFAFA"/>
-<stop offset="1" style="stop-color:#E6E6E6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4" x2="4" y1="2" y2="47.0878">
+<stop offset="0" style="stop-color:#FAFAFF"/>
+<stop offset="1" style="stop-color:#DCDCE1"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_b.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_b.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_b.svg	Mon May 03 12:48:33 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="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"/>
-<rect fill="#14141E" fill-opacity="0.2" height="10" stroke-opacity="0.2" width="10"/>
-<rect fill="#14141E" fill-opacity="0.2" height="9" stroke-opacity="0.2" width="10"/>
-<rect fill="url(#SVGID_1_)" height="8" width="10"/>
-<rect fill="#FFFFFF" fill-opacity="0.2" height="1" stroke-opacity="0.2" width="10" y="6"/>
-<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="10" y="7"/>
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" 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="50"/>
+<rect fill="#141414" fill-opacity="0.4" height="2" stroke-opacity="0.4" width="50" y="7"/>
+<rect fill-opacity="0.2" height="6" stroke-opacity="0.2" width="50" y="2"/>
+<rect fill="url(#SVGID_1_)" height="7" width="50"/>
+<rect fill="#FFFFFF" fill-opacity="0.2" height="1" stroke-opacity="0.2" width="50" y="6"/>
+<rect fill="none" height="10" width="50"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5.0005" x2="5.0005" y1="8" y2="-38.7526">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="25.0005" x2="25.0005" y1="7" y2="-37.5142">
 <stop offset="0" style="stop-color:#65B8CC"/>
 <stop offset="1" style="stop-color:#306D8C"/>
 </linearGradient>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_bl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_bl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_bl.svg	Mon May 03 12:48:33 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="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,0v4c0,3.3,2.7,6,6,6h4V0H0z" fill="#14141E" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M1,0v4c0,2.757,2.243,5,5,5h4V0H1z" fill="#14141E" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M1,0v3c0,2.757,2.243,5,5,5h4V0H1z" fill="url(#SVGID_1_)"/>
-<path d="M6,6C4.346,6,3,4.654,3,3V0H2v3c0,2.205,1.795,4,4,4h4V6H6z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M6,7C3.794,7,2,5.205,2,3V0H1v3c0,2.757,2.243,5,5,5h4V7H6z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M7,7C4.794,7,3,5.206,3,3V0H1v3c0,3.3,2.7,6,6,6h3V7H7z" fill="#141414" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M2,2v1c0,2.757,2.243,5,5,5h3V2H2z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M2,0v2c0,2.757,2.243,5,5,5h3V0H2z" 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"/>
 <rect fill="none" height="10" width="10"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5.5" x2="5.5" y1="8" y2="-38.7526">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="6" x2="6" y1="7" y2="-37.5142">
 <stop offset="0" style="stop-color:#65B8CC"/>
 <stop offset="1" style="stop-color:#306D8C"/>
 </linearGradient>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_br.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_br.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_br.svg	Mon May 03 12:48:33 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,0v10h4c3.3,0,6-2.7,6-6V0H0z" fill="#14141E" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M0,0v9h4c2.757,0,5-2.243,5-5V0H0z" fill="#14141E" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M0,0v8h4c2.757,0,5-2.243,5-5V0H0z" fill="url(#SVGID_1_)"/>
-<path d="M7,0v3c0,1.654-1.346,3-3,3H0v1h4c2.205,0,4-1.795,4-4V0H7z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M8,0v3c0,2.205-1.794,4-4,4H0v1h4c2.757,0,5-2.243,5-5V0H8z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<rect fill="none" height="10" width="10"/>
+<path d="M7,0v3c0,2.206-1.795,4-4,4H0v2h3c3.3,0,6-2.7,6-6V0H7z" fill="#141414" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M0,2v6h3c2.757,0,5-2.243,5-5V2H0z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M0,0v7h3c2.757,0,5-2.243,5-5V0H0z" 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"/>
 <rect fill="none" height="10" width="10"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4.5" x2="4.5" y1="8" y2="-38.7526">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4" x2="4" y1="7" y2="-37.5142">
 <stop offset="0" style="stop-color:#65B8CC"/>
 <stop offset="1" style="stop-color:#306D8C"/>
 </linearGradient>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_c.svg	Mon May 03 12:48:33 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="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"/>
-<rect fill="url(#SVGID_1_)" height="10" width="10"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 50 30" width="50px" 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="50"/>
+<rect fill="url(#SVGID_1_)" height="30" width="50"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5.0005" x2="5.0005" y1="12.667" y2="-2.9164">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="25.0005" x2="25.0005" y1="37" y2="-7.5136">
 <stop offset="0" style="stop-color:#65B8CC"/>
 <stop offset="1" style="stop-color:#306D8C"/>
 </linearGradient>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_l.svg	Mon May 03 12:48:33 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="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"/>
-<rect fill="#14141E" fill-opacity="0.2" height="10" stroke-opacity="0.2" width="10"/>
-<rect fill="url(#SVGID_1_)" height="10" width="9" x="1"/>
-<rect fill="#FFFFFF" fill-opacity="0.2" height="10" stroke-opacity="0.2" width="1" x="2"/>
-<rect fill-opacity="0.2" height="10" stroke-opacity="0.2" width="1" x="1"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" 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="30" width="10"/>
+<rect fill="#141414" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="2" x="1"/>
+<rect fill="url(#SVGID_1_)" height="30" width="8" x="2"/>
+<rect fill="#FFFFFF" fill-opacity="0.2" height="30" stroke-opacity="0.2" width="1" x="2"/>
+<rect fill="none" height="30" width="10"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5.5" x2="5.5" y1="12.667" y2="-2.9164">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="6" x2="6" y1="37" y2="-7.5136">
 <stop offset="0" style="stop-color:#65B8CC"/>
 <stop offset="1" style="stop-color:#306D8C"/>
 </linearGradient>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_r.svg	Mon May 03 12:48:33 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="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"/>
-<rect fill="#14141E" fill-opacity="0.2" height="10" stroke-opacity="0.2" width="10"/>
-<rect fill="url(#SVGID_1_)" height="10" width="9"/>
-<rect fill="#FFFFFF" fill-opacity="0.2" height="10" stroke-opacity="0.2" width="1" x="7"/>
-<rect fill-opacity="0.2" height="10" stroke-opacity="0.2" width="1" x="8"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 10 30" 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="30" width="10"/>
+<rect fill="#141414" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="2" x="7"/>
+<rect fill="url(#SVGID_1_)" height="30" width="8"/>
+<rect fill="#FFFFFF" fill-opacity="0.2" height="30" stroke-opacity="0.2" width="1" x="7"/>
+<rect fill="none" height="30" width="10"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4.5" x2="4.5" y1="12.667" y2="-2.9164">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4" x2="4" y1="37" y2="-7.5136">
 <stop offset="0" style="stop-color:#65B8CC"/>
 <stop offset="1" style="stop-color:#306D8C"/>
 </linearGradient>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_t.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_t.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_t.svg	Mon May 03 12:48:33 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="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"/>
-<rect fill="#14141E" fill-opacity="0.2" height="10" stroke-opacity="0.2" width="10"/>
-<rect fill="url(#SVGID_1_)" height="9" width="10" y="1"/>
-<rect fill="#FFFFFF" fill-opacity="0.2" height="1" stroke-opacity="0.2" width="10" y="2"/>
-<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="10" y="1"/>
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 50 10" width="50px" 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="50"/>
+<rect fill="#141414" fill-opacity="0.4" height="2" stroke-opacity="0.4" width="50" y="1"/>
+<rect fill="url(#SVGID_1_)" height="8" width="50" y="2"/>
+<rect fill="#FFFFFF" fill-opacity="0.2" height="1" stroke-opacity="0.2" width="50" y="2"/>
+<rect fill="none" height="10" width="50"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5.0005" x2="5.0005" y1="48" y2="1.2473">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="25.0005" x2="25.0005" y1="47" y2="2.4858">
 <stop offset="0" style="stop-color:#65B8CC"/>
 <stop offset="1" style="stop-color:#306D8C"/>
 </linearGradient>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_tl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_tl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_tl.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,13 +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 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="M6,0C2.7,0,0,2.7,0,6v4h10V0H6z" fill="#14141E" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M6,1C3.243,1,1,3.243,1,6v4h9V1H6z" fill="url(#SVGID_1_)"/>
-<path d="M6,2C3.795,2,2,3.795,2,6v4h1V6c0-1.654,1.346-3,3-3h4V2H6z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M6,1C3.243,1,1,3.243,1,6v4h1V6c0-2.205,1.794-4,4-4h4V1H6z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M7,1C3.7,1,1,3.7,1,7v3h2V7c0-2.206,1.794-4,4-4h3V1H7z" fill="#141414" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M7,2C4.243,2,2,4.243,2,7v3h8V2H7z" fill="url(#SVGID_1_)"/>
+<path d="M7,2C4.243,2,2,4.243,2,7v3h1V7c0-2.205,1.794-4,4-4h3V2H7z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
 <rect fill="none" height="10" width="10"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5.5" x2="5.5" y1="48" y2="1.2473">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="6" x2="6" y1="47" y2="2.4858">
 <stop offset="0" style="stop-color:#65B8CC"/>
 <stop offset="1" style="stop-color:#306D8C"/>
 </linearGradient>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_tr.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_tr.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_tr.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,13 +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 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,6c0-3.3-2.7-6-6-6H0v10h10V6z" fill="#14141E" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M9,6c0-2.757-2.243-5-5-5H0v9h9V6z" fill="url(#SVGID_1_)"/>
-<path d="M4,2H0v1h4c1.654,0,3,1.346,3,3v4h1V6C8,3.795,6.205,2,4,2z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M4,1H0v1h4c2.206,0,4,1.795,4,4v4h1V6C9,3.243,6.757,1,4,1z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M3,1H0v2h3c2.205,0,4,1.794,4,4v3h2V7C9,3.7,6.3,1,3,1z" fill="#141414" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M8,7c0-2.757-2.243-5-5-5H0v8h8V7z" fill="url(#SVGID_1_)"/>
+<path d="M3,2H0v1h3c2.206,0,4,1.795,4,4v3h1V7C8,4.243,5.757,2,3,2z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
 <rect fill="none" height="10" width="10"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4.5" x2="4.5" y1="48" y2="1.2473">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4" x2="4" y1="47" y2="2.4858">
 <stop offset="0" style="stop-color:#65B8CC"/>
 <stop offset="1" style="stop-color:#306D8C"/>
 </linearGradient>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_h_bg_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_h_bg_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_h_bg_c.svg	Mon May 03 12:48:33 2010 +0300
@@ -4,9 +4,9 @@
 <rect fill="none" height="15" width="15"/>
 <rect fill="url(#SVGID_1_)" height="15" width="15"/>
 <defs>
-<linearGradient gradientTransform="matrix(4.489659e-011 -1 -1 -4.489659e-011 -86.0195 72.4805)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="64.9805" x2="64.9805" y1="-71.353" y2="-115.8014">
-<stop offset="0" style="stop-color:#D2D2D2"/>
-<stop offset="1" style="stop-color:#AAAAAA"/>
+<linearGradient gradientTransform="matrix(0 -1 1 0 -4319 1250)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="1242.499" x2="1242.499" y1="4304.333" y2="4348.7798">
+<stop offset="0" style="stop-color:#D2D2D7"/>
+<stop offset="1" style="stop-color:#AAAAAF"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_h_bg_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_h_bg_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_h_bg_l.svg	Mon May 03 12:48:33 2010 +0300
@@ -4,9 +4,9 @@
 <rect fill="none" height="15" width="15"/>
 <rect fill="url(#SVGID_1_)" height="15" width="15"/>
 <defs>
-<linearGradient gradientTransform="matrix(4.489659e-011 -1 -1 -4.489659e-011 -86.0195 72.4805)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="64.9805" x2="64.9805" y1="-86.354" y2="-130.8009">
-<stop offset="0" style="stop-color:#D2D2D2"/>
-<stop offset="1" style="stop-color:#AAAAAA"/>
+<linearGradient gradientTransform="matrix(0 -1 1 0 -4304 1265)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="1257.499" x2="1257.499" y1="4304.333" y2="4348.7798">
+<stop offset="0" style="stop-color:#D2D2D7"/>
+<stop offset="1" style="stop-color:#AAAAAF"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_h_bg_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_h_bg_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_h_bg_r.svg	Mon May 03 12:48:33 2010 +0300
@@ -4,9 +4,9 @@
 <rect fill="none" height="15" width="15"/>
 <rect fill="url(#SVGID_1_)" height="15" width="15"/>
 <defs>
-<linearGradient gradientTransform="matrix(4.489659e-011 -1 -1 -4.489659e-011 -86.0195 72.4805)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="64.9805" x2="64.9805" y1="-56.355" y2="-100.8019">
-<stop offset="0" style="stop-color:#D2D2D2"/>
-<stop offset="1" style="stop-color:#AAAAAA"/>
+<linearGradient gradientTransform="matrix(0 -1 1 0 -4334 1235)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="1227.499" x2="1227.499" y1="4304.333" y2="4348.7798">
+<stop offset="0" style="stop-color:#D2D2D7"/>
+<stop offset="1" style="stop-color:#AAAAAF"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_last_used_b.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_last_used_b.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +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="3px" version="1.1" viewBox="0 0 24 3" width="24px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<rect fill="none" height="3" width="24"/>
-<rect fill="url(#SVGID_1_)" height="3" width="24"/>
-<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="24" y="2"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="11.9995" x2="11.9995" y1="-26.9995" y2="3.0776">
-<stop offset="0" style="stop-color:#00BAFF"/>
-<stop offset="1" style="stop-color:#0075BD"/>
-</linearGradient>
-</defs>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_last_used_bl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_last_used_bl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +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="3px" version="1.1" viewBox="0 0 3 3" width="3px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<rect fill="none" height="3" width="3"/>
-<path d="M0,0c0,1.65,1.35,3,3,3V0H0z" fill="url(#SVGID_1_)"/>
-<path d="M1,0H0c0,1.65,1.35,3,3,3V2C1.896,2,1,1.103,1,0z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="1.5" x2="1.5" y1="-26.9995" y2="3.0776">
-<stop offset="0" style="stop-color:#00BAFF"/>
-<stop offset="1" style="stop-color:#0075BD"/>
-</linearGradient>
-</defs>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_last_used_br.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_last_used_br.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +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="3px" version="1.1" viewBox="0 0 3 3" width="3px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<rect fill="none" height="3" width="3"/>
-<path d="M0,0v3c1.65,0,3-1.35,3-3H0z" fill="url(#SVGID_1_)"/>
-<path d="M2,0c0,1.103-0.896,2-2,2v1c1.65,0,3-1.35,3-3H2z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="1.5" x2="1.5" y1="-26.9995" y2="3.0776">
-<stop offset="0" style="stop-color:#00BAFF"/>
-<stop offset="1" style="stop-color:#0075BD"/>
-</linearGradient>
-</defs>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_last_used_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_last_used_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +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="24px" version="1.1" viewBox="0 0 24 24" width="24px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<rect fill="none" height="24" width="24"/>
-<rect fill="url(#SVGID_1_)" height="24" width="24"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="11.9995" x2="11.9995" y1="-3" y2="27.0777">
-<stop offset="0" style="stop-color:#00BAFF"/>
-<stop offset="1" style="stop-color:#0075BD"/>
-</linearGradient>
-</defs>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_last_used_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_last_used_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +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="24px" version="1.1" viewBox="0 0 3 24" width="3px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<rect fill="none" height="24" width="3"/>
-<rect fill="url(#SVGID_1_)" height="24" width="3"/>
-<rect fill-opacity="0.2" height="24" stroke-opacity="0.2" width="1"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="1.5" x2="1.5" y1="-3" y2="27.0777">
-<stop offset="0" style="stop-color:#00BAFF"/>
-<stop offset="1" style="stop-color:#0075BD"/>
-</linearGradient>
-</defs>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_last_used_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_last_used_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +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="24px" version="1.1" viewBox="0 0 3 24" width="3px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<rect fill="none" height="24" width="3"/>
-<rect fill="url(#SVGID_1_)" height="24" width="3"/>
-<rect fill-opacity="0.2" height="24" stroke-opacity="0.2" width="1" x="2"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="1.5" x2="1.5" y1="-3" y2="27.0777">
-<stop offset="0" style="stop-color:#00BAFF"/>
-<stop offset="1" style="stop-color:#0075BD"/>
-</linearGradient>
-</defs>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_last_used_t.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_last_used_t.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +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="3px" version="1.1" viewBox="0 0 24 3" width="24px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<rect fill="none" height="3" width="24"/>
-<rect fill="url(#SVGID_1_)" height="3" width="24"/>
-<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="24"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="11.9995" x2="11.9995" y1="0" y2="30.0771">
-<stop offset="0" style="stop-color:#00BAFF"/>
-<stop offset="1" style="stop-color:#0075BD"/>
-</linearGradient>
-</defs>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_last_used_tl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_last_used_tl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +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="3px" version="1.1" viewBox="0 0 3 3" width="3px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<rect fill="none" height="3" width="3"/>
-<path d="M0,3h3V0C1.35,0,0,1.35,0,3z" fill="url(#SVGID_1_)"/>
-<path d="M0,3h1c0-1.103,0.896-2,2-2V0C1.35,0,0,1.35,0,3z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="1.5" x2="1.5" y1="0" y2="30.0771">
-<stop offset="0" style="stop-color:#00BAFF"/>
-<stop offset="1" style="stop-color:#0075BD"/>
-</linearGradient>
-</defs>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_last_used_tr.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_last_used_tr.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +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="3px" version="1.1" viewBox="0 0 3 3" width="3px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<rect fill="none" height="3" width="3"/>
-<path d="M3,3c0-1.65-1.35-3-3-3v3H3z" fill="url(#SVGID_1_)"/>
-<path d="M0,0v1c1.104,0,2,0.897,2,2h1C3,1.35,1.65,0,0,0z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="1.5" x2="1.5" y1="0" y2="30.0771">
-<stop offset="0" style="stop-color:#00BAFF"/>
-<stop offset="1" style="stop-color:#0075BD"/>
-</linearGradient>
-</defs>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_v_bg_b.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_v_bg_b.svg	Mon May 03 12:48:33 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="15px" version="1.1" viewBox="0 0 15 15" width="15px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="15" width="15"/>
+<rect fill="url(#SVGID_1_)" height="15" width="15"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="7.4995" x2="7.4995" y1="-29.6665" y2="14.7804">
+<stop offset="0" style="stop-color:#D2D2D7"/>
+<stop offset="1" style="stop-color:#AAAAAF"/>
+</linearGradient>
+</defs>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_v_bg_c.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_v_bg_c.svg	Mon May 03 12:48:33 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="15px" version="1.1" viewBox="0 0 15 15" width="15px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="15" width="15"/>
+<rect fill="url(#SVGID_1_)" height="15" width="15"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="7.4995" x2="7.4995" y1="-14.6675" y2="29.7809">
+<stop offset="0" style="stop-color:#D2D2D7"/>
+<stop offset="1" style="stop-color:#AAAAAF"/>
+</linearGradient>
+</defs>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_v_bg_t.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_v_bg_t.svg	Mon May 03 12:48:33 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="15px" version="1.1" viewBox="0 0 15 15" width="15px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="15" width="15"/>
+<rect fill="url(#SVGID_1_)" height="15" width="15"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="7.4995" x2="7.4995" y1="0.333" y2="44.78">
+<stop offset="0" style="stop-color:#D2D2D7"/>
+<stop offset="1" style="stop-color:#AAAAAF"/>
+</linearGradient>
+</defs>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_b.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_b.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_b.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,14 +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 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"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="149.9995" x2="149.9995" y1="-27.9995" y2="-20.1443">
-<stop offset="0" style="stop-color:#DCDCDC"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="149.9995" x2="149.9995" y1="-27.9995" y2="7.6726">
+<stop offset="0" style="stop-color:#E6E6EB"/>
+<stop offset="0.15" style="stop-color:#FFFFFF"/>
 <stop offset="1" style="stop-color:#FFFFFF"/>
 </linearGradient>
-<rect fill="url(#SVGID_1_)" height="10" width="300"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="149.9995" x2="149.9995" y1="-29.9995" y2="10.4479">
+<rect fill="url(#SVGID_1_)" height="8" width="300"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="149.9995" x2="149.9995" y1="-29.9995" y2="9.8756">
 <stop offset="0" style="stop-color:#66B8CC"/>
 <stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
-<rect fill="url(#SVGID_2_)" height="2" width="300" y="8"/>
+<rect fill="url(#SVGID_2_)" height="3" width="300" y="7"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_bl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_bl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_bl.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,14 +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"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="-27.9995" y2="-20.1443">
-<stop offset="0" style="stop-color:#DCDCDC"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="6" x2="6" y1="-27.9995" y2="7.6726">
+<stop offset="0" style="stop-color:#E6E6EB"/>
+<stop offset="0.15" style="stop-color:#FFFFFF"/>
 <stop offset="1" style="stop-color:#FFFFFF"/>
 </linearGradient>
-<path d="M0,0v5c0,2.2,2.8,5,5,5h5V0H0z" fill="url(#SVGID_1_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="5" x2="5" y1="-29.9995" y2="10.448">
+<path d="M2,6c0,1.103,0.897,2,2,2h6V0H2V6z" fill="url(#SVGID_1_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="5" x2="5" y1="-29.9995" y2="9.8757">
 <stop offset="0" style="stop-color:#66B8CC"/>
 <stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
-<path d="M4,8C2.897,8,2,7.103,2,6V0H0v6c0,2.2,1.8,4,4,4h6V8H4z" fill="url(#SVGID_2_)"/>
+<path d="M0,0v6c0,2.2,1.8,4,4,4h6V7H4C3.458,7,3,6.541,3,6V0H0z" fill="url(#SVGID_2_)"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_br.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_br.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_br.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,14 +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"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="-27.9995" y2="-20.1443">
-<stop offset="0" style="stop-color:#DCDCDC"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4" x2="4" y1="-27.9995" y2="7.6726">
+<stop offset="0" style="stop-color:#E6E6EB"/>
+<stop offset="0.15" style="stop-color:#FFFFFF"/>
 <stop offset="1" style="stop-color:#FFFFFF"/>
 </linearGradient>
-<path d="M0,0v10h5c2.2,0,5-2.8,5-5V0H0z" fill="url(#SVGID_1_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="5" x2="5" y1="-29.9995" y2="10.448">
+<path d="M0,8h6c1.104,0,2-0.897,2-2V0H0V8z" fill="url(#SVGID_1_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="5" x2="5" y1="-29.9995" y2="9.8757">
 <stop offset="0" style="stop-color:#66B8CC"/>
 <stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
-<path d="M8,0v6c0,1.103-0.896,2-2,2H0v2h6c2.2,0,4-1.8,4-4V0H8z" fill="url(#SVGID_2_)"/>
+<path d="M7,6c0,0.541-0.458,1-1,1H0v3h6c2.2,0,4-1.8,4-4V0H7V6z" fill="url(#SVGID_2_)"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_c.svg	Mon May 03 12:48:33 2010 +0300
@@ -4,8 +4,9 @@
 <rect fill="none" height="20" width="300"/>
 <rect fill="url(#SVGID_1_)" height="20" width="300"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="149.9995" x2="149.9995" y1="-8" y2="-0.1446">
-<stop offset="0" style="stop-color:#DCDCDC"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="149.9995" x2="149.9995" y1="-8" y2="27.6731">
+<stop offset="0" style="stop-color:#E6E6EB"/>
+<stop offset="0.15" style="stop-color:#FFFFFF"/>
 <stop offset="1" style="stop-color:#FFFFFF"/>
 </linearGradient>
 </defs>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_l.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,14 +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="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"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="-8" y2="-0.1446">
-<stop offset="0" style="stop-color:#DCDCDC"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="6" x2="6" y1="-8" y2="27.6731">
+<stop offset="0" style="stop-color:#E6E6EB"/>
+<stop offset="0.15" style="stop-color:#FFFFFF"/>
 <stop offset="1" style="stop-color:#FFFFFF"/>
 </linearGradient>
-<rect fill="url(#SVGID_1_)" height="20" width="10"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="1" x2="1" y1="-10.0005" y2="30.4479">
+<rect fill="url(#SVGID_1_)" height="20" width="8" x="2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="1.5" x2="1.5" y1="-10.0005" y2="29.8757">
 <stop offset="0" style="stop-color:#66B8CC"/>
 <stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
-<rect fill="url(#SVGID_2_)" height="20" width="2"/>
+<rect fill="url(#SVGID_2_)" height="20" width="3"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_r.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,14 +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="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"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="-8" y2="-0.1446">
-<stop offset="0" style="stop-color:#DCDCDC"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4" x2="4" y1="-8" y2="27.6731">
+<stop offset="0" style="stop-color:#E6E6EB"/>
+<stop offset="0.15" style="stop-color:#FFFFFF"/>
 <stop offset="1" style="stop-color:#FFFFFF"/>
 </linearGradient>
-<rect fill="url(#SVGID_1_)" height="20" width="10"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="9" x2="9" y1="-10.0005" y2="30.4479">
+<rect fill="url(#SVGID_1_)" height="20" width="8"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="8.5" x2="8.5" y1="-10.0005" y2="29.8757">
 <stop offset="0" style="stop-color:#66B8CC"/>
 <stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
-<rect fill="url(#SVGID_2_)" height="20" width="2" x="8"/>
+<rect fill="url(#SVGID_2_)" height="20" width="3" x="7"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_t.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_t.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_t.svg	Mon May 03 12:48:33 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 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"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="149.9995" x2="149.9995" y1="2" y2="9.8552">
-<stop offset="0" style="stop-color:#DCDCDC"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="149.9995" x2="149.9995" y1="2" y2="37.6721">
+<stop offset="0" style="stop-color:#E6E6EB"/>
+<stop offset="0.15" style="stop-color:#FFFFFF"/>
 <stop offset="1" style="stop-color:#FFFFFF"/>
 </linearGradient>
-<rect fill="url(#SVGID_1_)" height="10" width="300"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="149.9995" x2="149.9995" y1="0" y2="40.4474">
+<rect fill="url(#SVGID_1_)" height="8" width="300" y="2"/>
+<rect fill="#3C3C3C" fill-opacity="0.1" height="2" stroke-opacity="0.1" width="300" y="2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="149.9995" x2="149.9995" y1="0" y2="39.8751">
 <stop offset="0" style="stop-color:#66B8CC"/>
 <stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
-<rect fill="url(#SVGID_2_)" height="2" width="300"/>
+<rect fill="url(#SVGID_2_)" height="3" width="300"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_tl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_tl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_tl.svg	Mon May 03 12:48:33 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"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="2" y2="9.8552">
-<stop offset="0" style="stop-color:#DCDCDC"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="6" x2="6" y1="2" y2="37.6721">
+<stop offset="0" style="stop-color:#E6E6EB"/>
+<stop offset="0.15" style="stop-color:#FFFFFF"/>
 <stop offset="1" style="stop-color:#FFFFFF"/>
 </linearGradient>
-<path d="M5,0C2.8,0,0,2.8,0,5v5h10V0H5z" fill="url(#SVGID_1_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="5" x2="5" y1="0" y2="40.4475">
+<path d="M10,2H4C2.897,2,2,2.897,2,4v6h8V2z" fill="url(#SVGID_1_)"/>
+<path d="M4,2C2.897,2,2,2.897,2,4h8V2H4z" fill="#3C3C3C" fill-opacity="0.1" stroke-opacity="0.1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="5" x2="5" y1="0" y2="39.8752">
 <stop offset="0" style="stop-color:#66B8CC"/>
 <stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
-<path d="M4,0C1.8,0,0,1.8,0,4v6h2V4c0-1.104,0.897-2,2-2h6V0H4z" fill="url(#SVGID_2_)"/>
+<path d="M3,4c0-0.542,0.458-1,1-1h6V0H4C1.8,0,0,1.8,0,4v6h3V4z" fill="url(#SVGID_2_)"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_tr.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_tr.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_tr.svg	Mon May 03 12:48:33 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"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="2" y2="9.8552">
-<stop offset="0" style="stop-color:#DCDCDC"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4" x2="4" y1="2" y2="37.6721">
+<stop offset="0" style="stop-color:#E6E6EB"/>
+<stop offset="0.15" style="stop-color:#FFFFFF"/>
 <stop offset="1" style="stop-color:#FFFFFF"/>
 </linearGradient>
-<path d="M10,5c0-2.2-2.8-5-5-5H0v10h10V5z" fill="url(#SVGID_1_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="5" x2="5" y1="0" y2="40.4475">
+<path d="M8,4c0-1.103-0.896-2-2-2H0v8h8V4z" fill="url(#SVGID_1_)"/>
+<path d="M8,4c0-1.103-0.896-2-2-2H0v2H8z" fill="#3C3C3C" fill-opacity="0.1" stroke-opacity="0.1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="5" x2="5" y1="0" y2="39.8752">
 <stop offset="0" style="stop-color:#66B8CC"/>
 <stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
-<path d="M6,0H0v2h6c1.104,0,2,0.896,2,2v6h2V4C10,1.8,8.2,0,6,0z" fill="url(#SVGID_2_)"/>
+<path d="M10,4c0-2.2-1.8-4-4-4H0v3h6c0.542,0,1,0.458,1,1v6h3V4z" fill="url(#SVGID_2_)"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_b.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_b.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_b.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,11 +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 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="url(#SVGID_1_)" height="10" width="300"/>
-<rect fill="#BEBEC8" height="1" width="300" y="9"/>
+<rect fill="url(#SVGID_1_)" height="9.5" width="300"/>
+<rect fill="#B4B4B9" height="1" width="300" y="9"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="149.9995" x2="149.9995" y1="-29.9995" y2="-20.2103">
-<stop offset="0" style="stop-color:#DCDCDC"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="149.9995" x2="149.9995" y1="-29.4995" y2="9.5663">
+<stop offset="0" style="stop-color:#E6E6EB"/>
+<stop offset="0.15" style="stop-color:#FFFFFF"/>
 <stop offset="1" style="stop-color:#FFFFFF"/>
 </linearGradient>
 </defs>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_bl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_bl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_bl.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,11 +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 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="url(#SVGID_1_)"/>
-<path d="M4,9C2.346,9,1,7.654,1,6V0H0v6c0,2.2,1.8,4,4,4h6V9H4z" fill="#BEBEC8"/>
+<path d="M0.5,6c0,1.93,1.57,3.5,3.5,3.5h6V0H0.5V6z" fill="url(#SVGID_1_)"/>
+<path d="M0,0v6c0,2.2,1.8,4,4,4h6V9H4C2.346,9,1,7.654,1,6V0H0z" fill="#B4B4B9"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="-29.9995" y2="-20.2103">
-<stop offset="0" style="stop-color:#DCDCDC"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5.25" x2="5.25" y1="-29.4995" y2="9.5663">
+<stop offset="0" style="stop-color:#E6E6EB"/>
+<stop offset="0.15" style="stop-color:#FFFFFF"/>
 <stop offset="1" style="stop-color:#FFFFFF"/>
 </linearGradient>
 </defs>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_br.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_br.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_br.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,11 +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 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="url(#SVGID_1_)"/>
-<path d="M9,0v6c0,1.654-1.346,3-3,3H0v1h6c2.2,0,4-1.8,4-4V0H9z" fill="#BEBEC8"/>
+<path d="M0,9.5h6c1.93,0,3.5-1.57,3.5-3.5V0H0V9.5z" fill="url(#SVGID_1_)"/>
+<path d="M9,6c0,1.654-1.346,3-3,3H0v1h6c2.2,0,4-1.8,4-4V0H9V6z" fill="#B4B4B9"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="-29.9995" y2="-20.2103">
-<stop offset="0" style="stop-color:#DCDCDC"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4.75" x2="4.75" y1="-29.4995" y2="9.5663">
+<stop offset="0" style="stop-color:#E6E6EB"/>
+<stop offset="0.15" style="stop-color:#FFFFFF"/>
 <stop offset="1" style="stop-color:#FFFFFF"/>
 </linearGradient>
 </defs>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_c.svg	Mon May 03 12:48:33 2010 +0300
@@ -4,8 +4,9 @@
 <rect fill="none" height="20" width="300"/>
 <rect fill="url(#SVGID_1_)" height="20" width="300"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="149.9995" x2="149.9995" y1="-10.0005" y2="-0.2111">
-<stop offset="0" style="stop-color:#DCDCDC"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="149.9995" x2="149.9995" y1="-9.5" y2="29.5668">
+<stop offset="0" style="stop-color:#E6E6EB"/>
+<stop offset="0.15" style="stop-color:#FFFFFF"/>
 <stop offset="1" style="stop-color:#FFFFFF"/>
 </linearGradient>
 </defs>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_l.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,11 +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="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="url(#SVGID_1_)" height="20" width="10"/>
-<rect fill="#BEBEC8" height="20" width="1"/>
+<rect fill="url(#SVGID_1_)" height="20" width="9.5" x="0.5"/>
+<rect fill="#B4B4B9" height="20" width="1"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="-10.0005" y2="-0.2111">
-<stop offset="0" style="stop-color:#DCDCDC"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5.25" x2="5.25" y1="-9.5" y2="29.5668">
+<stop offset="0" style="stop-color:#E6E6EB"/>
+<stop offset="0.15" style="stop-color:#FFFFFF"/>
 <stop offset="1" style="stop-color:#FFFFFF"/>
 </linearGradient>
 </defs>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_r.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,11 +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="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="url(#SVGID_1_)" height="20" width="10"/>
-<rect fill="#BEBEC8" height="20" width="1" x="9"/>
+<rect fill="url(#SVGID_1_)" height="20" width="9.5"/>
+<rect fill="#B4B4B9" height="20" width="1" x="9"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="-10.0005" y2="-0.2111">
-<stop offset="0" style="stop-color:#DCDCDC"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4.75" x2="4.75" y1="-9.5" y2="29.5668">
+<stop offset="0" style="stop-color:#E6E6EB"/>
+<stop offset="0.15" style="stop-color:#FFFFFF"/>
 <stop offset="1" style="stop-color:#FFFFFF"/>
 </linearGradient>
 </defs>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_t.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_t.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_t.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,11 +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 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="url(#SVGID_1_)" height="10" width="300"/>
-<rect fill="#BEBEC8" height="1" width="300"/>
+<rect fill="url(#SVGID_1_)" height="9.5" width="300" y="0.5"/>
+<rect fill="#B4B4B9" height="1" width="300"/>
+<rect fill="#646464" fill-opacity="0.1" height="1" stroke-opacity="0.1" width="300" y="1"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="149.9995" x2="149.9995" y1="0" y2="9.7892">
-<stop offset="0" style="stop-color:#DCDCDC"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="149.9995" x2="149.9995" y1="0.5" y2="39.5658">
+<stop offset="0" style="stop-color:#E6E6EB"/>
+<stop offset="0.15" style="stop-color:#FFFFFF"/>
 <stop offset="1" style="stop-color:#FFFFFF"/>
 </linearGradient>
 </defs>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_tl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_tl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_tl.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,11 +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="M4,0C1.8,0,0,1.8,0,4v6h10V0H4z" fill="url(#SVGID_1_)"/>
-<path d="M4,0C1.8,0,0,1.8,0,4v6h1V4c0-1.654,1.346-3,3-3h6V0H4z" fill="#BEBEC8"/>
+<path d="M10,0.5H4C2.07,0.5,0.5,2.07,0.5,4v6H10V0.5z" fill="url(#SVGID_1_)"/>
+<path d="M1,4c0-1.654,1.346-3,3-3h6V0H4C1.8,0,0,1.8,0,4v6h1V4z" fill="#B4B4B9"/>
+<path d="M4,1C2.346,1,1,2.346,1,4c0-1.654,1.346-2,3-2h6V1H4z" fill="#646464" fill-opacity="0.1" stroke-opacity="0.1"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="0" y2="9.7892">
-<stop offset="0" style="stop-color:#DCDCDC"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5.25" x2="5.25" y1="0.5" y2="39.5658">
+<stop offset="0" style="stop-color:#E6E6EB"/>
+<stop offset="0.15" style="stop-color:#FFFFFF"/>
 <stop offset="1" style="stop-color:#FFFFFF"/>
 </linearGradient>
 </defs>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_tr.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_tr.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_tr.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,11 +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="M10,4c0-2.2-1.8-4-4-4H0v10h10V4z" fill="url(#SVGID_1_)"/>
-<path d="M6,0H0v1h6c1.654,0,3,1.346,3,3v6h1V4C10,1.8,8.2,0,6,0z" fill="#BEBEC8"/>
+<path d="M9.5,4c0-1.93-1.57-3.5-3.5-3.5H0V10h9.5V4z" fill="url(#SVGID_1_)"/>
+<path d="M10,4c0-2.2-1.8-4-4-4H0v1h6c1.654,0,3,1.346,3,3v6h1V4z" fill="#B4B4B9"/>
+<path d="M6,1H0v1h6c1.654,0,3,0.346,3,2C9,2.346,7.654,1,6,1z" fill="#646464" fill-opacity="0.1" stroke-opacity="0.1"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="0" y2="9.7892">
-<stop offset="0" style="stop-color:#DCDCDC"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4.75" x2="4.75" y1="0.5" y2="39.5658">
+<stop offset="0" style="stop-color:#E6E6EB"/>
+<stop offset="0.15" style="stop-color:#FFFFFF"/>
 <stop offset="1" style="stop-color:#FFFFFF"/>
 </linearGradient>
 </defs>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_normal_b.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_normal_b.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="300px" height="10px" viewBox="0 0 300 10" enable-background="new 0 0 300 10" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="#D9D9D9" width="300" height="10"/>
-<rect y="9" fill="#B2B2B2" width="300" height="1"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_normal_bl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_normal_bl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="#D9D9D9" width="10" height="10"/>
-<rect y="9" fill="#B2B2B2" width="10" height="1"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_normal_br.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_normal_br.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="#D9D9D9" width="10" height="10"/>
-<rect y="9" fill="#B2B2B2" width="10" height="1"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_normal_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_normal_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="300px" height="30px" viewBox="0 0 300 30" enable-background="new 0 0 300 30" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="#D9D9D9" width="300" height="30"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_normal_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_normal_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="30px" viewBox="0 0 10 30" enable-background="new 0 0 10 30" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="#D9D9D9" width="10" height="30"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_normal_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_normal_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="30px" viewBox="0 0 10 30" enable-background="new 0 0 10 30" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="#D9D9D9" width="10" height="30"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_normal_t.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_normal_t.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="300px" height="10px" viewBox="0 0 300 10" enable-background="new 0 0 300 10" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="#D9D9D9" width="300" height="10"/>
-<rect fill="#FFFFFF" width="300" height="1"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_normal_tl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_normal_tl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="#D9D9D9" width="10" height="10"/>
-<rect fill="#FFFFFF" width="10" height="1"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_normal_tr.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_normal_tr.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="#D9D9D9" width="10" height="10"/>
-<rect fill="#FFFFFF" width="10" height="1"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_heading_highlight_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_heading_highlight_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="26px" height="52px" viewBox="0 0 26 52" enable-background="new 0 0 26 52" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="12.9995" y1="1" x2="12.9995" y2="52.0005">
-	<stop  offset="0" style="stop-color:#26C100"/>
-	<stop  offset="1" style="stop-color:#009E1E"/>
-</linearGradient>
-<rect fill="url(#SVGID_1_)" width="26" height="52"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="12.9995" y1="0.6685" x2="12.9995" y2="50.3345">
-	<stop  offset="0" style="stop-color:#2BE600"/>
-	<stop  offset="1" style="stop-color:#26C100"/>
-</linearGradient>
-<rect y="51" fill="url(#SVGID_2_)" width="26" height="1"/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="12.9995" y1="0.668" x2="12.9995" y2="50.334">
-	<stop  offset="0" style="stop-color:#2BE600"/>
-	<stop  offset="1" style="stop-color:#26C100"/>
-</linearGradient>
-<rect fill="url(#SVGID_3_)" width="26" height="1"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_heading_highlight_cl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_heading_highlight_cl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="26px" height="52px" viewBox="0 0 26 52" enable-background="new 0 0 26 52" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="12.9995" y1="1" x2="12.9995" y2="52.0005">
-	<stop  offset="0" style="stop-color:#26C100"/>
-	<stop  offset="1" style="stop-color:#009E1E"/>
-</linearGradient>
-<rect fill="url(#SVGID_1_)" width="26" height="52"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="13.0015" y1="0.6685" x2="13.0015" y2="50.3345">
-	<stop  offset="0" style="stop-color:#2BE600"/>
-	<stop  offset="1" style="stop-color:#26C100"/>
-</linearGradient>
-<rect x="0.003" y="51" fill="url(#SVGID_2_)" width="25.997" height="1"/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="12.9995" y1="0.668" x2="12.9995" y2="50.334">
-	<stop  offset="0" style="stop-color:#2BE600"/>
-	<stop  offset="1" style="stop-color:#26C100"/>
-</linearGradient>
-<rect fill="url(#SVGID_3_)" width="26" height="1"/>
-<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="0.5015" y1="0.668" x2="0.5015" y2="50.3345">
-	<stop  offset="0" style="stop-color:#2BE600"/>
-	<stop  offset="1" style="stop-color:#26C100"/>
-</linearGradient>
-<rect y="1" fill="url(#SVGID_4_)" width="1.003" height="50"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_heading_highlight_cr.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_heading_highlight_cr.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="26px" height="52px" viewBox="0 0 26 52" enable-background="new 0 0 26 52" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="12.9995" y1="1" x2="12.9995" y2="52.0005" gradientTransform="matrix(-1 0 0 1 26 0)">
-	<stop  offset="0" style="stop-color:#26C100"/>
-	<stop  offset="1" style="stop-color:#009E1E"/>
-</linearGradient>
-<rect fill="url(#SVGID_1_)" width="26" height="52"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="13.0015" y1="0.6685" x2="13.0015" y2="50.3345" gradientTransform="matrix(-1 0 0 1 26 0)">
-	<stop  offset="0" style="stop-color:#2BE600"/>
-	<stop  offset="1" style="stop-color:#26C100"/>
-</linearGradient>
-<rect y="51" fill="url(#SVGID_2_)" width="25.997" height="1"/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="12.9995" y1="0.668" x2="12.9995" y2="50.334" gradientTransform="matrix(-1 0 0 1 26 0)">
-	<stop  offset="0" style="stop-color:#2BE600"/>
-	<stop  offset="1" style="stop-color:#26C100"/>
-</linearGradient>
-<rect fill="url(#SVGID_3_)" width="26" height="1"/>
-<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="0.5015" y1="0.668" x2="0.5015" y2="50.3345" gradientTransform="matrix(-1 0 0 1 26 0)">
-	<stop  offset="0" style="stop-color:#2BE600"/>
-	<stop  offset="1" style="stop-color:#26C100"/>
-</linearGradient>
-<rect x="24.997" y="1" fill="url(#SVGID_4_)" width="1.003" height="50"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_heading_highlight_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_heading_highlight_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="26px" height="52px" viewBox="0 0 26 52" enable-background="new 0 0 26 52" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="12.9995" y1="1" x2="12.9995" y2="52.0005">
-	<stop  offset="0" style="stop-color:#26C100"/>
-	<stop  offset="1" style="stop-color:#009E1E"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" d="M0,52V9.999C0,4.478,4.478,0,10,0h16v52H0z"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="12.9995" y1="0.668" x2="12.9995" y2="50.3345">
-	<stop  offset="0" style="stop-color:#2BE600"/>
-	<stop  offset="1" style="stop-color:#26C100"/>
-</linearGradient>
-<path fill="url(#SVGID_2_)" d="M1,51.001V9.998c0-4.961,4.038-9,9-9h16V0H10C4.477,0,0,4.478,0,9.999V52h26v-0.999H1z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_heading_highlight_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_heading_highlight_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="26px" height="52px" viewBox="0 0 26 52" enable-background="new 0 0 26 52" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="12.9995" y1="1" x2="12.9995" y2="52.0005" gradientTransform="matrix(-1 0 0 1 26 0)">
-	<stop  offset="0" style="stop-color:#26C100"/>
-	<stop  offset="1" style="stop-color:#009E1E"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" d="M26,52V9.999C26,4.478,21.522,0,16,0H0v52H26z"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="12.9995" y1="0.668" x2="12.9995" y2="50.3345" gradientTransform="matrix(-1 0 0 1 26 0)">
-	<stop  offset="0" style="stop-color:#2BE600"/>
-	<stop  offset="1" style="stop-color:#26C100"/>
-</linearGradient>
-<path fill="url(#SVGID_2_)" d="M25,51.001V9.998c0-4.961-4.038-9-9-9H0V0h16c5.523,0,10,4.478,10,9.999V52H0v-0.999H25z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_heading_normal_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_heading_normal_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="26px" height="52px" viewBox="0 0 26 52" enable-background="new 0 0 26 52" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="12.9995" y1="2176" x2="12.9995" y2="2228" gradientTransform="matrix(1 0 0 -1 0 2228)">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="1" style="stop-color:#F2F2F2"/>
-</linearGradient>
-<rect fill-rule="evenodd" clip-rule="evenodd" fill="url(#SVGID_1_)" width="26" height="52"/>
-<rect y="51" fill-rule="evenodd" clip-rule="evenodd" fill="#D9D9D9" width="26" height="1"/>
-<rect fill-rule="evenodd" clip-rule="evenodd" fill="#D9D9D9" width="26" height="1"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_heading_normal_cl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_heading_normal_cl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="26px" height="52px" viewBox="0 0 26 52" enable-background="new 0 0 26 52" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="12.9995" y1="2176" x2="12.9995" y2="2228" gradientTransform="matrix(1 0 0 -1 0 2228)">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="1" style="stop-color:#F2F2F2"/>
-</linearGradient>
-<rect fill-rule="evenodd" clip-rule="evenodd" fill="url(#SVGID_1_)" width="26" height="52"/>
-<rect y="51" fill-rule="evenodd" clip-rule="evenodd" fill="#D9D9D9" width="26" height="1"/>
-<rect fill-rule="evenodd" clip-rule="evenodd" fill="#D9D9D9" width="26" height="1"/>
-<rect y="1" fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" width="1" height="50"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_heading_normal_cr.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_heading_normal_cr.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="26px" height="52px" viewBox="0 0 26 52" enable-background="new 0 0 26 52" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="12.9995" y1="2176" x2="12.9995" y2="2228" gradientTransform="matrix(1 0 0 -1 0 2228)">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="1" style="stop-color:#F2F2F2"/>
-</linearGradient>
-<rect fill-rule="evenodd" clip-rule="evenodd" fill="url(#SVGID_1_)" width="26" height="52"/>
-<rect y="51" fill-rule="evenodd" clip-rule="evenodd" fill="#D9D9D9" width="26" height="1"/>
-<rect fill-rule="evenodd" clip-rule="evenodd" fill="#D9D9D9" width="26" height="1"/>
-<rect x="25" y="1" opacity="0.1" fill-rule="evenodd" clip-rule="evenodd" width="1" height="50"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_heading_normal_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_heading_normal_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="26px" height="52px" viewBox="0 0 26 52" enable-background="new 0 0 26 52" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="12.9995" y1="2176" x2="12.9995" y2="2228" gradientTransform="matrix(1 0 0 -1 0 2228)">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="1" style="stop-color:#F2F2F2"/>
-</linearGradient>
-<path fill-rule="evenodd" clip-rule="evenodd" fill="url(#SVGID_1_)" d="M26,0H10C4.477,0,0,4.478,0,10v42h26V0z"/>
-<rect y="51" fill-rule="evenodd" clip-rule="evenodd" fill="#D9D9D9" width="26" height="1"/>
-<path fill="#D9D9D9" d="M1,51.001V9.998c0-4.961,4.038-9,9-9h16V0H10C4.477,0,0,4.478,0,9.999V51L1,51.001z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_heading_normal_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_heading_normal_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="26px" height="52px" viewBox="0 0 26 52" enable-background="new 0 0 26 52" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="13.0005" y1="2176" x2="13.0005" y2="2228" gradientTransform="matrix(-1 0 0 -1 26 2228)">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="1" style="stop-color:#F2F2F2"/>
-</linearGradient>
-<path fill-rule="evenodd" clip-rule="evenodd" fill="url(#SVGID_1_)" d="M0,0h16c5.523,0,10,4.478,10,10v42H0V0z"/>
-<rect y="51" fill-rule="evenodd" clip-rule="evenodd" fill="#D9D9D9" width="26" height="1"/>
-<path fill="#D9D9D9" d="M25,51.001V9.998c0-4.961-4.038-9-9-9H0V0h16c5.523,0,10,4.478,10,9.999V51L25,51.001z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_heading_pressed_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_heading_pressed_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="26px" height="52px" viewBox="0 0 26 52" enable-background="new 0 0 26 52" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="12.9995" y1="0.0742" x2="12.9995" y2="51.7182">
-	<stop  offset="0" style="stop-color:#8CE0FF"/>
-	<stop  offset="1" style="stop-color:#29ABE2"/>
-</linearGradient>
-<rect fill="url(#SVGID_1_)" width="26" height="52"/>
-<rect y="51" fill="#8CE0FF" width="26" height="1"/>
-<rect fill="#FFFFFF" width="26" height="1"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_heading_pressed_cl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_heading_pressed_cl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="26px" height="52px" viewBox="0 0 26 52" enable-background="new 0 0 26 52" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="12.9995" y1="0.0742" x2="12.9995" y2="51.7182">
-	<stop  offset="0" style="stop-color:#8CE0FF"/>
-	<stop  offset="1" style="stop-color:#29ABE2"/>
-</linearGradient>
-<rect fill="url(#SVGID_1_)" width="26" height="52"/>
-<rect x="0.003" y="51" fill="#8CE0FF" width="25.997" height="1"/>
-<rect fill="#FFFFFF" width="26" height="1"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="0.5015" y1="0.668" x2="0.5015" y2="50.6685">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="1" style="stop-color:#8CE0FF"/>
-</linearGradient>
-<rect y="1" fill="url(#SVGID_2_)" width="1.003" height="50"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_heading_pressed_cr.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_heading_pressed_cr.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="26px" height="52px" viewBox="0 0 26 52" enable-background="new 0 0 26 52" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="12.9995" y1="0.0742" x2="12.9995" y2="51.7182" gradientTransform="matrix(-1 0 0 1 26 0)">
-	<stop  offset="0" style="stop-color:#8CE0FF"/>
-	<stop  offset="1" style="stop-color:#29ABE2"/>
-</linearGradient>
-<rect fill="url(#SVGID_1_)" width="26" height="52"/>
-<rect y="51" fill="#8CE0FF" width="25.997" height="1"/>
-<rect fill="#FFFFFF" width="26" height="1"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="0.5015" y1="0.668" x2="0.5015" y2="50.6685" gradientTransform="matrix(-1 0 0 1 26 0)">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="1" style="stop-color:#8CE0FF"/>
-</linearGradient>
-<rect x="24.997" y="1" fill="url(#SVGID_2_)" width="1.003" height="50"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_heading_pressed_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_heading_pressed_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="26px" height="52px" viewBox="0 0 26 52" enable-background="new 0 0 26 52" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="12.9995" y1="0.0742" x2="12.9995" y2="51.7182">
-	<stop  offset="0" style="stop-color:#8CE0FF"/>
-	<stop  offset="1" style="stop-color:#29ABE2"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" d="M0,52V9.999C0,4.478,4.478,0,10,0h16v52H0z"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="12.9995" y1="0.668" x2="12.9995" y2="50.6684">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="1" style="stop-color:#8CE0FF"/>
-</linearGradient>
-<path fill="url(#SVGID_2_)" d="M1,51.001V9.998c0-4.961,4.038-9,9-9h16V0H10C4.477,0,0,4.478,0,9.999V52h26v-0.999H1z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_heading_pressed_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_heading_pressed_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="26px" height="52px" viewBox="0 0 26 52" enable-background="new 0 0 26 52" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="12.9995" y1="0.0742" x2="12.9995" y2="51.7182" gradientTransform="matrix(-1 0 0 1 26 0)">
-	<stop  offset="0" style="stop-color:#8CE0FF"/>
-	<stop  offset="1" style="stop-color:#29ABE2"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" d="M26,52V9.999C26,4.478,21.522,0,16,0H0v52H26z"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="12.9995" y1="0.668" x2="12.9995" y2="50.6684" gradientTransform="matrix(-1 0 0 1 26 0)">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="1" style="stop-color:#8CE0FF"/>
-</linearGradient>
-<path fill="url(#SVGID_2_)" d="M25,51.001V9.998c0-4.961-4.038-9-9-9H0V0h16c5.523,0,10,4.478,10,9.999V52H0v-0.999H25z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_pressed_b.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_pressed_b.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +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="10px" version="1.1" viewBox="0 0 30 10" 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="10" width="30"/>
-<rect fill="#FFFFFF" fill-opacity="0.3" height="10" stroke-opacity="0.3" width="30"/>
-<rect fill="#D9D9D9" height="1" width="30" y="9"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_pressed_bl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_pressed_bl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +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="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"/>
-<rect fill="#FFFFFF" fill-opacity="0.3" height="10" stroke-opacity="0.3" width="10"/>
-<rect fill="#D9D9D9" height="1" width="10" y="9"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_pressed_br.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_pressed_br.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +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="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"/>
-<rect fill="#FFFFFF" fill-opacity="0.3" height="10" stroke-opacity="0.3" width="10"/>
-<polygon fill="#D9D9D9" points="9,0 9,9 0,9 0,10 10,10 10,0 "/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_pressed_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_pressed_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +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">
-<rect fill="none" height="30" width="30"/>
-<rect fill="#FFFFFF" fill-opacity="0.3" height="30" stroke-opacity="0.3" width="30"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_pressed_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_pressed_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +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 10 30" 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="30" width="10"/>
-<rect fill="#FFFFFF" fill-opacity="0.3" height="30" stroke-opacity="0.3" width="10"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_pressed_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_pressed_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +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 10 30" 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="30" width="10" y="0"/>
-<rect fill="#FFFFFF" fill-opacity="0.3" height="30" stroke-opacity="0.3" width="10"/>
-<rect fill="#D9D9D9" height="30" width="1" x="9"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_pressed_t.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_pressed_t.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +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="10px" version="1.1" viewBox="0 0 30 10" 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="10" width="30"/>
-<rect fill="#FFFFFF" fill-opacity="0.3" height="10" stroke-opacity="0.3" width="30"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_pressed_tl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_pressed_tl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +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="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"/>
-<rect fill="#FFFFFF" fill-opacity="0.3" height="10" stroke-opacity="0.3" width="10"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_pressed_tr.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_pressed_tr.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +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="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"/>
-<rect fill="#FFFFFF" fill-opacity="0.3" height="10" stroke-opacity="0.3" width="10"/>
-<rect fill="#D9D9D9" height="10" width="1" x="9"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_b.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_b.svg	Mon May 03 12:48:33 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="none" fill-opacity="0.2" height="10" stroke-opacity="0.2" width="300"/>
+<rect fill="#DCDCDC" fill-opacity="0.2" height="1" stroke-opacity="0.2" width="300" y="9"/>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_bl.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_bl.svg	Mon May 03 12:48:33 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"/>
+<rect fill="none" fill-opacity="0.2" height="10" stroke-opacity="0.2" width="10"/>
+<rect fill="#DCDCDC" fill-opacity="0.2" height="1" stroke-opacity="0.2" width="10" y="9"/>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_br.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_br.svg	Mon May 03 12:48:33 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"/>
+<rect fill="none" fill-opacity="0.2" height="10" stroke-opacity="0.2" width="10"/>
+<rect fill="#DCDCDC" fill-opacity="0.2" height="1" stroke-opacity="0.2" width="10" y="9"/>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_c.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_c.svg	Mon May 03 12:48:33 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="30px" version="1.1" viewBox="0 0 300 30" 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="30" width="300"/>
+<rect fill="none" fill-opacity="0.2" height="30" stroke-opacity="0.2" width="300"/>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_l.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_l.svg	Mon May 03 12:48:33 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="30px" version="1.1" viewBox="0 0 10 30" 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="30" width="10"/>
+<rect fill="none" fill-opacity="0.2" height="30" stroke-opacity="0.2" width="10"/>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_r.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_r.svg	Mon May 03 12:48:33 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="30px" version="1.1" viewBox="0 0 10 30" 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="30" width="10"/>
+<rect fill="none" fill-opacity="0.2" height="30" stroke-opacity="0.2" width="10"/>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_t.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_t.svg	Mon May 03 12:48:33 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 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="none" fill-opacity="0.2" height="10" stroke-opacity="0.2" width="300"/>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_tl.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_tl.svg	Mon May 03 12:48:33 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"/>
+<rect fill="none" fill-opacity="0.2" height="10" stroke-opacity="0.2" width="10"/>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_tr.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_tr.svg	Mon May 03 12:48:33 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"/>
+<rect fill="none" fill-opacity="0.2" height="10" stroke-opacity="0.2" width="10"/>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_down_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_down_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="20px" height="20px" viewBox="0 -0.5 20 20" enable-background="new 0 -0.5 20 20" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="9.9995" y1="5" x2="9.9995" y2="15.0251">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="0.1167" style="stop-color:#F9F9F9"/>
-	<stop  offset="0.4027" style="stop-color:#EDEDED"/>
-	<stop  offset="0.6262" style="stop-color:#E5E5E5"/>
-	<stop  offset="0.7582" style="stop-color:#E2E2E2"/>
-</linearGradient>
-<rect y="5" fill="url(#SVGID_1_)" width="20" height="10"/>
-<rect fill="none" width="20" height="20"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_down_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_down_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="20px" height="20px" viewBox="0 -0.5 20 20" enable-background="new 0 -0.5 20 20" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="10.4995" y1="5" x2="10.4995" y2="15.0251">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="0.1167" style="stop-color:#F9F9F9"/>
-	<stop  offset="0.4027" style="stop-color:#EDEDED"/>
-	<stop  offset="0.6262" style="stop-color:#E5E5E5"/>
-	<stop  offset="0.7582" style="stop-color:#E2E2E2"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" d="M20,15H3c-1.103,0-2-0.896-2-2V7.002C1,5.899,1.897,5,3,5h17V15L20,15z"/>
-<rect fill="none" width="20" height="20"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_down_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_down_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="20px" height="20px" viewBox="0 -0.5 20 20" enable-background="new 0 -0.5 20 20" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="-109.502" y1="5" x2="-109.502" y2="15.0251" gradientTransform="matrix(-1 0 0 1 -100.002 0)">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="0.1167" style="stop-color:#F9F9F9"/>
-	<stop  offset="0.4027" style="stop-color:#EDEDED"/>
-	<stop  offset="0.6262" style="stop-color:#E5E5E5"/>
-	<stop  offset="0.7582" style="stop-color:#E2E2E2"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" d="M0,15h17c1.104,0,2-0.896,2-2V7.002C19,5.899,18.103,5,17,5H0V15L0,15z"/>
-<rect fill="none" width="20" height="20"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_filled_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_filled_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="20px" height="20px" viewBox="0 -0.5 20 20" enable-background="new 0 -0.5 20 20" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="9.9995" y1="5" x2="9.9995" y2="15.0251">
-	<stop  offset="0" style="stop-color:#8CE0FF"/>
-	<stop  offset="0.1167" style="stop-color:#78D6F9"/>
-	<stop  offset="0.4027" style="stop-color:#4DBFED"/>
-	<stop  offset="0.6262" style="stop-color:#33B0E5"/>
-	<stop  offset="0.7582" style="stop-color:#29ABE2"/>
-</linearGradient>
-<rect y="5" fill="url(#SVGID_1_)" width="20" height="10"/>
-<rect fill="none" width="20" height="20"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_filled_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_filled_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="20px" height="20px" viewBox="0 -0.5 20 20" enable-background="new 0 -0.5 20 20" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="10.4995" y1="5" x2="10.4995" y2="15.0251">
-	<stop  offset="0" style="stop-color:#8CE0FF"/>
-	<stop  offset="0.1167" style="stop-color:#78D6F9"/>
-	<stop  offset="0.4027" style="stop-color:#4DBFED"/>
-	<stop  offset="0.6262" style="stop-color:#33B0E5"/>
-	<stop  offset="0.7582" style="stop-color:#29ABE2"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" d="M20,15H3c-1.103,0-2-0.896-2-2V7.002C1,5.899,1.897,5,3,5h17V15L20,15z"/>
-<rect fill="none" width="20" height="20"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_filled_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_filled_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="20px" height="20px" viewBox="0 -0.5 20 20" enable-background="new 0 -0.5 20 20" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="-109.502" y1="5" x2="-109.502" y2="15.0251" gradientTransform="matrix(-1 0 0 1 -100.002 0)">
-	<stop  offset="0" style="stop-color:#8CE0FF"/>
-	<stop  offset="0.1167" style="stop-color:#78D6F9"/>
-	<stop  offset="0.4027" style="stop-color:#4DBFED"/>
-	<stop  offset="0.6262" style="stop-color:#33B0E5"/>
-	<stop  offset="0.7582" style="stop-color:#29ABE2"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" d="M0,15h17c1.104,0,2-0.896,2-2V7.002C19,5.899,18.103,5,17,5H0V15L0,15z"/>
-<rect fill="none" width="20" height="20"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_frame_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_frame_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="20px" height="20px" viewBox="0 -0.5 20 20" enable-background="new 0 -0.5 20 20" xml:space="preserve">
-<defs>
-</defs>
-<rect y="4" fill="#E6E6E6" width="20" height="12"/>
-<rect y="4" fill="#B2B2B2" width="20" height="1"/>
-<rect y="15" fill="#B2B2B2" width="20" height="1"/>
-<rect fill="none" width="20" height="20"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_frame_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_frame_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="20px" height="20px" viewBox="0 -0.5 20 20" enable-background="new 0 -0.5 20 20" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="none" width="20" height="20"/>
-<path fill="#E6E6E6" d="M20,4H3C1.343,4,0,5.343,0,7v6c0,1.657,1.343,3,3,3h17V4z"/>
-<path fill="#B2B2B2" d="M20,15H3.001C1.897,15,1,14.103,1,12.999V6.998c0-1.102,0.897-1.999,2.001-1.999H20V4H3C1.343,4,0,5.343,0,7
-	v6c0,1.657,1.343,3,3,3h17V15z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_frame_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_frame_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="20px" height="20px" viewBox="0 -0.5 20 20" enable-background="new 0 -0.5 20 20" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#E6E6E6" d="M0,4h17c1.656,0,3,1.343,3,3v6c0,1.657-1.344,3-3,3H0V4z"/>
-<path fill="#B2B2B2" d="M0,15h17c1.104,0,2-0.897,2-2.001V6.998c0-1.102-0.896-1.999-2-1.999H0V4h17c1.656,0,3,1.343,3,3v6
-	c0,1.657-1.344,3-3,3H0V15z"/>
-<rect fill="none" width="20" height="20"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_mask_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_mask_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="20px" height="20px" viewBox="-0.001 -0.5 20 20" enable-background="new -0.001 -0.5 20 20"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect width="19.999" height="20"/>
-<rect y="5" fill="#FFFFFF" width="19.999" height="10"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_mask_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_mask_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="20px" height="20px" viewBox="0 -0.5 20 20" enable-background="new 0 -0.5 20 20" xml:space="preserve">
-<defs>
-</defs>
-<rect width="20" height="20"/>
-<path fill="#FFFFFF" d="M20,15H3c-1.103,0-2-0.896-2-2V7.002C1,5.899,1.897,5,3,5H20V15L20,15z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_mask_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_mask_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="20px" height="20px" viewBox="0 -0.5 20 20" enable-background="new 0 -0.5 20 20" xml:space="preserve">
-<defs>
-</defs>
-<rect width="20" height="20"/>
-<path fill="#FFFFFF" d="M0,15h17c1.104,0,2-0.896,2-2V7.002C19,5.899,18.103,5,17,5H0V15L0,15z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_v_down_b.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_v_down_b.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,206 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   x="0px"
-   y="0px"
-   width="20px"
-   height="20px"
-   viewBox="0 0 20 20"
-   enable-background="new 0 0 20 20"
-   xml:space="preserve"
-   id="svg12985"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="qtg_fr_progress_v_frame_second_b.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata
-   id="metadata13006"><rdf:RDF><cc:Work
-       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><sodipodi:namedview
-   inkscape:window-height="1031"
-   inkscape:window-width="1348"
-   inkscape:pageshadow="2"
-   inkscape:pageopacity="0.0"
-   guidetolerance="10.0"
-   gridtolerance="10.0"
-   objecttolerance="10.0"
-   borderopacity="1.0"
-   bordercolor="#666666"
-   pagecolor="#ffffff"
-   id="base"
-   showgrid="false"
-   inkscape:zoom="23.1"
-   inkscape:cx="10"
-   inkscape:cy="10"
-   inkscape:window-x="48"
-   inkscape:window-y="-4"
-   inkscape:current-layer="svg12985" />
-<defs
-   id="defs12987"><inkscape:perspective
-   sodipodi:type="inkscape:persp3d"
-   inkscape:vp_x="0 : 10 : 1"
-   inkscape:vp_y="0 : 1000 : 0"
-   inkscape:vp_z="20 : 10 : 1"
-   inkscape:persp3d-origin="10 : 6.6666667 : 1"
-   id="perspective13008" />
-</defs>
-<linearGradient
-   id="SVGID_1_"
-   gradientUnits="userSpaceOnUse"
-   x1="-1902.52"
-   y1="-741.0005"
-   x2="-1902.52"
-   y2="-752.9297"
-   gradientTransform="matrix(1.192488e-008 -1 -1 -1.192488e-008 -737.0194 -1894.5195)">
-	<stop
-   offset="0"
-   style="stop-color:#CCCCCC"
-   id="stop12990" />
-	<stop
-   offset="1"
-   style="stop-color:#808080"
-   id="stop12992" />
-</linearGradient>
-<path
-   fill="url(#SVGID_1_)"
-   d="M16.001,10V0.002H4V10c0,3.309,2.691,6,6.002,6C13.309,16,16.001,13.309,16.001,10L16.001,10z"
-   id="path12994" />
-<linearGradient
-   id="SVGID_2_"
-   gradientUnits="userSpaceOnUse"
-   x1="300.5"
-   y1="2839.917"
-   x2="300.5"
-   y2="2851.917"
-   gradientTransform="matrix(1.192488e-008 -1 1 1.192488e-008 -2835.9998 308.0001)">
-	<stop
-   offset="0"
-   style="stop-color:#666666"
-   id="stop12997" />
-	<stop
-   offset="1"
-   style="stop-color:#A6A6A6"
-   id="stop12999" />
-</linearGradient>
-<path
-   fill="url(#SVGID_2_)"
-   d="M15.002,10.001V0H5.001v10.001c0,2.757,2.243,4.999,5.001,4.999S15.002,12.758,15.002,10.001  L15.002,10.001z"
-   id="path13001" />
-<rect
-   fill="none"
-   width="20"
-   height="20"
-   id="rect13003" />
-<path
-   style="fill:#00ffff"
-   d="M 9.5844156,14.955995 C 8.8892416,14.906716 8.1572333,14.687313 7.5732714,14.353199 L 7.2683983,14.178764 L 7.2794771,7.1023688 L 7.2905584,0.025974026 L 9.0651913,0.025974026 L 10.839827,0.025974026 L 10.839827,7.4687463 L 10.839827,14.911519 L 10.612554,14.934665 C 10.156719,14.981087 9.9878225,14.984591 9.5844156,14.955995 z"
-   id="path13010" /><path
-   style="fill:#00ffff"
-   d="M 11.359307,15.321614 C 11.359307,14.868535 11.35242,14.824548 11.285506,14.850226 C 11.244918,14.865802 11.128035,14.890014 11.025766,14.904031 L 10.839827,14.929517 L 10.839827,7.4777459 L 10.839827,0.025974026 L 12.528139,0.025974026 L 14.21645,0.025974026 L 14.217411,6.3138528 C 14.218325,12.280242 14.222199,12.596761 14.293169,12.504516 C 14.364727,12.41151 14.367636,12.444328 14.360407,13.262091 L 14.352853,14.116883 L 13.984853,14.446024 C 13.291775,15.065929 12.511113,15.498674 11.651515,15.739469 L 11.359307,15.821323 L 11.359307,15.321614 z"
-   id="path13012" /><path
-   style="fill:#00ffff"
-   d="M 11.359307,15.302542 L 11.359307,14.821532 L 11.19697,14.852658 C 10.986026,14.893101 10.845745,14.906188 10.262165,14.939865 C 9.3890173,14.990255 8.5407329,14.808235 7.7121212,14.392696 L 7.2900433,14.181028 L 7.2900433,7.1035026 L 7.2900433,0.025974026 L 10.753247,0.025974026 L 14.21645,0.025974026 L 14.21645,6.2129095 C 14.21645,9.6157242 14.228234,12.430547 14.242632,12.468072 C 14.257026,12.505597 14.286251,12.525521 14.307567,12.512348 C 14.329844,12.498578 14.34632,12.829967 14.34632,13.29193 L 14.34632,14.095463 L 14.183983,14.240885 C 13.573221,14.788004 13.063874,15.137281 12.494987,15.39909 C 12.169727,15.548775 11.501286,15.78355 11.400364,15.78355 C 11.376944,15.78355 11.359307,15.576899 11.359307,15.302542 L 11.359307,15.302542 z"
-   id="path13014" /><path
-   style="fill:#00ffff"
-   d="M 14.380766,13.245951 L 14.367965,12.471861 L 14.503541,12.190476 C 14.674736,11.835162 14.83997,11.313398 14.927623,10.851325 C 14.987139,10.53757 14.995671,9.8365571 14.995671,5.259287 L 14.995671,0.025974026 L 15.495403,0.025974026 L 15.995134,0.025974026 L 15.980017,5.3831169 L 15.9649,10.74026 L 15.867078,11.17316 C 15.735688,11.754646 15.588074,12.173487 15.340719,12.666667 C 15.131857,13.083097 14.689519,13.741999 14.498091,13.921839 L 14.393563,14.020038 L 14.380766,13.245951 z"
-   id="path13016" /><path
-   style="fill:#00ffff"
-   d="M 14.24526,8.1747013 C 14.229442,5.8000437 14.216489,2.9974017 14.216476,1.9466074 C 14.21645,0.16226364 14.221455,0.034968398 14.292208,0.019363203 C 14.333874,0.010173593 14.512359,0.0096238095 14.688835,0.018141991 L 15.00971,0.033628571 L 14.979398,5.2932896 C 14.954818,9.5596974 14.93739,10.619689 14.887108,10.906346 C 14.794433,11.43469 14.472165,12.327811 14.33232,12.443873 C 14.283545,12.484354 14.26932,11.786853 14.24526,8.1747004 L 14.24526,8.1747013 z"
-   id="path13018" /><path
-   style="fill:#00ffff"
-   d="M 11.359307,15.302313 L 11.359307,14.821076 L 11.24026,14.848692 C 11.174784,14.863882 10.819264,14.897929 10.450216,14.924354 C 9.885013,14.964822 9.7073117,14.961707 9.3231385,14.904592 C 8.7717234,14.822612 8.1751771,14.633758 7.6796537,14.384294 L 7.3116883,14.199048 L 7.3007364,7.1125095 L 7.2897844,0.025974026 L 10.753113,0.025974026 L 14.21645,0.025974026 L 14.225554,0.70779221 L 14.234662,1.3896104 L 14.258022,0.71861472 L 14.281385,0.047619048 L 15.132303,0.036520346 L 15.983225,0.025421645 L 15.961134,5.4044844 L 15.939035,10.78355 L 15.811545,11.298124 C 15.74142,11.581139 15.616498,11.98049 15.533935,12.185569 C 15.299004,12.769135 14.785052,13.609803 14.499662,13.877311 L 14.385779,13.984059 L 14.399723,13.18467 L 14.413667,12.385281 L 14.572913,12.038961 C 14.660494,11.848485 14.785758,11.507576 14.851268,11.281385 L 14.970381,10.87013 L 14.976429,6.974026 L 14.982472,3.0779221 L 14.951835,6.7142857 C 14.934987,8.7142857 14.906476,10.496753 14.888476,10.675325 C 14.836887,11.187094 14.45626,12.363636 14.342281,12.363636 C 14.320671,12.363636 14.300242,12.047462 14.296831,11.660173 C 14.29342,11.273268 14.277805,9.1158009 14.26213,6.8658009 L 14.233632,2.7748918 L 14.225039,7.5878177 C 14.217494,11.815976 14.224338,12.408632 14.281385,12.465677 C 14.334346,12.51864 14.34632,12.675852 14.34632,13.31829 L 14.34632,14.105968 L 14.158316,14.271455 C 13.55932,14.798714 13.05674,15.14079 12.506078,15.396036 C 12.191623,15.541794 11.50181,15.78355 11.400364,15.78355 C 11.376944,15.78355 11.359307,15.576814 11.359307,15.302313 z"
-   id="path13020" /><path
-   style="fill:#00ffff"
-   d="M 7.008658,13.978275 C 6.6580121,13.725966 6.1148675,13.148817 5.8558056,12.753247 C 5.3800498,12.026797 5.1186602,11.263723 5.0402186,10.372294 C 5.0138732,10.072898 4.9962641,7.9116407 4.9960411,4.9502165 L 4.995671,0.025974026 L 6.1323861,0.025974026 L 7.2691013,0.025974026 L 7.2564264,6.9632035 C 7.2494571,10.77868 7.2395593,13.95299 7.2344316,14.017227 L 7.2251082,14.13402 L 7.008658,13.978275 z"
-   id="path13022" /><path
-   style="fill:#00ffff"
-   d="M 6.8571429,13.824786 C 6.0639134,13.14602 5.5310182,12.331697 5.2493931,11.367965 C 5.0510437,10.689204 5.045326,10.538732 5.0129636,5.1450216 L 4.9822485,0.025974026 L 6.1145009,0.025974026 L 7.2467532,0.025974026 L 7.2405944,5.4047619 C 7.2372074,8.3630952 7.222597,11.530338 7.2081273,12.44308 L 7.1818182,14.10261 L 6.8571429,13.824786 z"
-   id="path13024" /><path
-   style="fill:#00ffff"
-   d="M 6.0877697,14.517316 C 4.8519416,13.431691 4.1735446,12.05773 4.041155,10.372294 C 4.0196476,10.098485 4.0015892,7.6585498 4.0010251,4.9502165 L 4,0.025974026 L 4.4692442,0.025974026 L 4.9384857,0.025974026 L 4.9669896,1.1623377 C 4.9826671,1.7873377 4.9955338,4.1321883 4.9955823,6.3731173 C 4.9956797,10.792485 4.9947883,10.773469 5.2378797,11.548526 C 5.4422727,12.200199 5.9647346,13.080631 6.3750312,13.464809 L 6.5108225,13.591957 L 6.5108225,14.211561 C 6.5108225,14.552346 6.4960225,14.831169 6.4779342,14.831169 C 6.4598446,14.831169 6.284271,14.689935 6.0877693,14.517316 L 6.0877697,14.517316 z"
-   id="path13026" /><path
-   style="fill:#00ffff"
-   d="M 6.1395147,14.531941 C 5.2996052,13.837706 4.6064208,12.766058 4.3065948,11.698283 C 4.0524372,10.793148 4.0515433,10.772921 4.0178939,5.1666667 L 3.9870398,0.025974026 L 4.4480641,0.025974026 C 4.7016294,0.025974026 4.9126424,0.030844156 4.9169831,0.036796537 C 4.9213234,0.042748918 4.9366558,1.3041126 4.951055,2.8398268 L 4.9772338,5.6320346 L 4.9864524,2.8290043 L 4.995671,0.025974026 L 6.1212121,0.025974026 L 7.2467532,0.025974026 L 7.2467532,5.0405087 C 7.2467532,7.798503 7.2338481,10.96316 7.2180749,12.073081 L 7.1893961,14.091119 L 7.0773818,14.011097 C 7.0157745,13.967084 6.8338394,13.810409 6.6730823,13.662929 C 5.8699026,12.926087 5.3499983,11.98192 5.117432,10.837809 C 5.0916775,10.711109 5.0577485,9.7188701 5.0408225,8.5974026 L 5.0104411,6.5844156 L 5.0168459,8.7056277 L 5.0232502,10.82684 L 5.1377957,11.252694 C 5.3385649,11.999116 5.8280095,12.900941 6.3132528,13.418532 L 6.5108225,13.629273 L 6.506542,13.981303 C 6.5041866,14.174919 6.4895762,14.434998 6.4740736,14.559254 L 6.4458874,14.785176 L 6.1395147,14.531941 z"
-   id="path13028" /><path
-   style="fill:#00ffff"
-   d="M 6.1637991,14.559433 C 5.3688905,13.902982 4.6538693,12.841807 4.3475922,11.863968 C 4.0901268,11.041968 4.0804411,10.928482 4.0429636,8.2943723 C 4.0238255,6.9491342 4.0063273,4.5384199 4.0040823,2.9372294 L 4,0.025974026 L 4.4545455,0.025974026 C 4.7045455,0.025974026 4.9126307,0.030844156 4.9169571,0.036796537 C 4.9212835,0.042748918 4.9366485,1.021645 4.9511022,2.2121212 L 4.9773814,4.3766234 L 4.9865264,2.2012987 L 4.995671,0.025974026 L 6.1212121,0.025974026 L 7.2467532,0.025974026 L 7.2467532,5.4950861 C 7.2467532,8.5030965 7.233871,11.66777 7.2181264,12.527694 L 7.1894991,14.09119 L 7.0600463,13.999014 C 6.5240459,13.617346 5.9099922,12.875052 5.5850671,12.215994 C 5.145674,11.324754 5.0763355,10.954916 5.0405606,9.3116883 L 5.0122853,8.012987 L 5.0050957,9.1168831 C 4.9943017,10.773874 5.0669437,11.254997 5.4556723,12.101163 C 5.6413628,12.505364 6.1012091,13.197034 6.3339481,13.422206 L 6.5108225,13.593328 L 6.5076147,14.006621 C 6.5058489,14.233932 6.4912385,14.503719 6.4751463,14.606149 L 6.4458874,14.792387 L 6.1637991,14.559433 z"
-   id="path13030" /><path
-   style="fill:#00ffff"
-   d="M 6.1578307,14.557684 C 5.2853684,13.817523 4.6036299,12.76156 4.2839697,11.655213 C 4.0520593,10.852567 4.0455004,10.69436 4.0144355,5.1532074 L 3.9856896,0.025974026 L 4.4473905,0.025974026 C 4.701326,0.025974026 4.9127061,0.030844156 4.9171247,0.036796537 C 4.9215424,0.042748918 4.936913,0.79761905 4.9512792,1.7142857 L 4.9774,3.3809524 L 4.9865342,1.7034632 L 4.995671,0.025974026 L 6.1212121,0.025974026 L 7.2467532,0.025974026 L 7.2467532,5.8197957 C 7.2467532,9.0063996 7.2338996,12.171003 7.2181896,12.852249 C 7.1925104,13.965746 7.1826719,14.087153 7.120787,14.053998 C 6.9670307,13.971623 6.2899723,13.2983 6.0632615,13.002309 C 5.5856892,12.378794 5.2189671,11.512671 5.1054983,10.74026 C 5.0644455,10.460796 5.0469489,10.403179 5.0436126,10.536457 C 5.0369922,10.800962 5.1544359,11.331987 5.3088965,11.735931 C 5.5382844,12.335826 6.0331212,13.136423 6.3774883,13.464809 C 6.5095654,13.590758 6.5107991,13.596064 6.5083277,14.02758 C 6.506955,14.267174 6.4922948,14.539403 6.4757476,14.632537 L 6.4456628,14.801872 L 6.1578307,14.557684 z M 5.0278797,9.1060606 C 5.0198567,8.909632 5.0132939,9.0703463 5.0132939,9.4632035 C 5.0132935,9.8560606 5.0198567,10.016775 5.0278784,9.8203463 C 5.0358983,9.6239177 5.0358996,9.3024892 5.0278784,9.1060606 L 5.0278797,9.1060606 z"
-   id="path13032" /><path
-   style="fill:#00ffff"
-   d="M 6.1814732,14.582161 C 5.1577455,13.729982 4.404584,12.441984 4.1500766,11.108225 C 4.0586442,10.629077 4.0082831,7.9776532 4.0035061,3.3917749 L 4,0.025974026 L 4.4545455,0.025974026 C 4.7045455,0.025974026 4.9126658,0.030844156 4.9170351,0.036796537 C 4.9214035,0.042748918 4.9368351,0.63203463 4.951326,1.3463203 L 4.9776723,2.6450216 L 4.9866714,1.3354978 L 4.995671,0.025974026 L 6.1212121,0.025974026 L 7.2467532,0.025974026 L 7.2467532,6.0146351 C 7.2467532,9.3083987 7.2339234,12.473015 7.2182429,13.047116 C 7.1914372,14.028489 7.1851381,14.088477 7.1129342,14.049835 C 6.9473619,13.961223 6.2785173,13.28641 6.0319892,12.959242 C 5.577197,12.355689 5.1887948,11.429212 5.1015502,10.73982 C 5.0835026,10.597204 5.0604965,10.504618 5.0504273,10.534072 C 5.0209264,10.620363 5.115387,11.149647 5.2147004,11.454545 C 5.4274476,12.107688 5.8897442,12.924132 6.3090957,13.387313 L 6.5108225,13.610125 L 6.5057017,14.079953 C 6.5028835,14.33836 6.4882732,14.606592 6.4732333,14.676025 L 6.4458874,14.802268 L 6.1814732,14.582161 z"
-   id="path13034" /><path
-   style="fill:#00ffff"
-   d=""
-   id="path13036" /><path
-   style="fill:#00ffff"
-   d="M 8.1265234,15.676709 C 7.6457965,15.514521 7.2052333,15.305258 6.7827182,15.038415 L 6.5108225,14.866699 L 6.5108225,14.238673 L 6.5108225,13.610651 L 6.6731602,13.745768 C 7.2037567,14.187397 7.8354039,14.558298 8.3831169,14.749847 L 8.6753247,14.85204 L 8.6753247,15.339441 C 8.6753247,15.700897 8.661342,15.826648 8.6212121,15.826096 C 8.5914502,15.825687 8.3688398,15.758463 8.1265225,15.676709 L 8.1265234,15.676709 z"
-   id="path13038" /><path
-   style="fill:#00ffff"
-   d="M 11.359307,15.30231 C 11.359307,14.823808 11.358753,14.82123 11.261905,14.849081 C 11.208333,14.864487 10.861714,14.899132 10.491641,14.92607 C 9.9211688,14.967597 9.7466061,14.964618 9.3444545,14.906499 C 8.7753879,14.824256 8.1794398,14.637853 7.6796537,14.385777 L 7.3116883,14.200187 L 7.3007364,7.1130805 L 7.2897844,0.025974026 L 10.753113,0.025974026 L 14.21645,0.025974026 L 14.224835,0.46969697 L 14.233216,0.91341991 L 14.257303,0.48051948 L 14.281385,0.047619048 L 15.136558,0.035880952 L 15.991732,0.024142857 L 15.965156,5.403845 L 15.938589,10.78355 L 15.810208,11.30303 C 15.739602,11.588745 15.606732,12.005059 15.514944,12.228173 C 15.308165,12.730811 14.869714,13.464574 14.598056,13.762629 L 14.393541,13.987013 L 14.391576,13.226079 L 14.38961,12.465148 L 14.56013,12.071999 C 14.653913,11.855768 14.784264,11.496889 14.849801,11.27449 L 14.968957,10.87013 L 14.976424,7.8181818 L 14.983892,4.7662338 L 14.950481,7.6516429 C 14.930017,9.4183195 14.897961,10.660367 14.867797,10.855105 C 14.840701,11.030035 14.740455,11.406926 14.64503,11.692641 C 14.476983,12.195806 14.374255,12.406002 14.321965,12.35371 C 14.308078,12.339823 14.281424,10.549037 14.26274,8.3741866 L 14.228766,4.4199134 L 14.233429,8.4422913 C 14.237113,11.618387 14.249481,12.468462 14.292208,12.482696 C 14.332931,12.496263 14.34632,12.701494 14.34632,13.312213 L 14.34632,14.123705 L 13.93081,14.466615 C 13.460909,14.854405 13.070563,15.118352 12.65471,15.329489 C 12.364814,15.476675 11.530381,15.78355 11.420052,15.78355 C 11.371563,15.78355 11.359307,15.686467 11.359307,15.30231 L 11.359307,15.30231 z"
-   id="path13040" /><path
-   style="fill:#00ffff"
-   d="M 9.7142857,15.969348 C 9.4681602,15.957806 8.884316,15.881091 8.7510823,15.842786 C 8.6845667,15.823662 8.6753247,15.760057 8.6753247,15.321394 L 8.6753247,14.821784 L 8.7943723,14.851858 C 9.4341385,15.013478 10.160649,15.0442 10.857844,14.939117 C 11.093939,14.903532 11.293602,14.880905 11.301532,14.888836 C 11.309468,14.896768 11.328532,15.108853 11.343909,15.360138 C 11.376065,15.885702 11.418004,15.83574 10.883117,15.909089 C 10.50074,15.961523 10.046667,15.984933 9.7142857,15.969347 L 9.7142857,15.969348 z"
-   id="path13042" /><path
-   style="fill:#00ffff"
-   d="M 10.655844,14.932368 C 10.685606,14.92036 10.734307,14.92036 10.764069,14.932369 C 10.793831,14.944378 10.769481,14.954204 10.709957,14.954204 C 10.650433,14.954204 10.626082,14.944378 10.655844,14.932369 L 10.655844,14.932368 z"
-   id="path13044" /><path
-   style="fill:#00ffff"
-   d="M 9.4329004,15.927635 C 9.3614719,15.918776 9.1715368,15.890714 9.0108225,15.865274 L 8.7186147,15.819016 L 8.7186147,15.625569 C 8.7186147,15.507626 8.7017177,15.442563 8.6753247,15.458874 C 8.6515152,15.47359 8.6320346,15.552661 8.6320346,15.63459 C 8.6320346,15.817061 8.6187113,15.817742 8.1531424,15.659039 C 7.6531801,15.488612 7.3353749,15.342813 6.8896104,15.079366 C 6.5517061,14.879664 6.5101861,14.841339 6.5049273,14.724287 C 6.5003429,14.622265 6.494858,14.614743 6.4802714,14.690476 C 6.4699537,14.744048 6.4433247,14.787879 6.421097,14.787879 C 6.3403221,14.787879 5.3524697,13.762619 5.1489225,13.467532 C 4.664461,12.765198 4.3026883,11.910354 4.1504576,11.108225 C 4.0555939,10.608378 4.0073861,8.1453082 4.003239,3.5865801 L 4,0.025974026 L 4.4545455,0.025974026 C 4.7045455,0.025974026 4.9130377,0.030844156 4.917861,0.036796537 C 4.9226853,0.042748918 4.9380143,0.495671 4.9519268,1.04329 L 4.9772229,2.038961 L 4.9864472,1.0324675 L 4.995671,0.025974026 L 6.1212121,0.025974026 L 7.2467532,0.025974026 L 7.2467532,6.2094879 C 7.2467532,9.6104221 7.233958,12.775057 7.218319,13.24201 C 7.1919268,14.030091 7.1844874,14.088129 7.1146706,14.050764 C 6.9693147,13.972972 6.3364238,13.34832 6.114039,13.063159 C 5.8388762,12.710321 5.7936143,12.661127 5.8561892,12.782899 C 5.9272805,12.921247 6.388616,13.4937 6.5745095,13.674237 C 6.7301823,13.825425 7.4524537,14.340561 7.3441558,14.223162 C 7.3013264,14.176732 7.2900433,12.690504 7.2900433,7.0952381 L 7.2900433,0.025974026 L 10.751351,0.025974026 L 14.212658,0.025974026 L 14.227593,0.33982684 L 14.242532,0.65367965 L 14.251139,0.33982684 L 14.25974,0.025974026 L 15.129801,0.025974026 L 15.999866,0.025974026 L 15.970048,5.4047619 L 15.940225,10.78355 L 15.831264,11.238095 C 15.771342,11.488095 15.666476,11.845929 15.598234,12.033281 C 15.379472,12.633863 14.833706,13.556097 14.51813,13.858438 L 14.385771,13.985245 L 14.398532,13.185265 C 14.405541,12.745274 14.428506,12.34632 14.449563,12.298701 C 14.487823,12.212159 14.48781,12.212159 14.420619,12.298633 C 14.383649,12.346216 14.341684,12.373429 14.327364,12.359109 C 14.313043,12.344789 14.284108,10.942222 14.263061,9.2422935 L 14.224792,6.1515152 L 14.234195,9.3089987 C 14.241312,11.6992 14.256078,12.470641 14.294961,12.483601 C 14.332152,12.496 14.34632,12.725264 14.34632,13.314741 L 14.34632,14.12876 L 13.924242,14.473854 C 13.45774,14.855267 13.032727,15.141038 12.633511,15.341718 C 12.315407,15.501624 11.499299,15.790224 11.405342,15.776033 C 11.368117,15.770411 11.298701,15.787352 11.251082,15.813682 C 11.076597,15.910158 9.8911342,15.984455 9.4329004,15.927634 L 9.4329004,15.927635 z M 11.328784,14.870831 C 11.309857,14.852415 11.19697,14.85693 11.077922,14.880867 C 10.958874,14.904803 10.520563,14.926953 10.103896,14.93009 C 9.1114649,14.937563 8.6511268,14.839694 7.7662338,14.433097 C 7.3362199,14.235512 7.3496541,14.276366 7.7878788,14.498921 C 8.1442511,14.679908 8.4978359,14.821709 8.6645675,14.850509 C 8.7300069,14.861811 8.9565563,14.901046 9.1680082,14.937695 C 9.6177143,15.015638 10.313104,15.023555 10.856446,14.956919 C 11.311589,14.901099 11.310502,14.900287 11.324065,15.307359 L 11.333442,15.588745 L 11.348316,15.24653 C 11.356498,15.058313 11.347706,14.889248 11.328784,14.870832 L 11.328784,14.870831 z M 5.7748918,12.580087 C 5.7494069,12.532468 5.7188152,12.493506 5.7069104,12.493506 C 5.6950056,12.493506 5.7061169,12.532468 5.7316017,12.580087 C 5.7570866,12.627706 5.7876784,12.666667 5.7995831,12.666667 C 5.8114879,12.666667 5.8003766,12.627706 5.7748918,12.580087 z M 5.5641303,12.201299 C 5.4025939,11.880727 5.2260926,11.378553 5.1495108,11.021645 C 5.1163035,10.866883 5.0875853,10.791652 5.0856926,10.854465 C 5.0779134,11.112565 5.5630896,12.450216 5.6644818,12.450216 C 5.678274,12.450216 5.6331152,12.338203 5.564129,12.201299 L 5.5641303,12.201299 z M 14.7649,11.509614 C 14.967385,10.90849 14.992641,10.519634 14.986377,8.0995671 L 14.981671,6.2813853 L 14.947242,8.4229134 C 14.928307,9.6007541 14.892048,10.698277 14.866667,10.861852 C 14.84129,11.025429 14.751472,11.366935 14.667074,11.620757 C 14.582675,11.874579 14.50429,12.111472 14.492887,12.147186 C 14.481485,12.1829 14.50268,12.15898 14.539987,12.094029 C 14.577294,12.029079 14.678506,11.766092 14.7649,11.509614 L 14.7649,11.509614 z M 5.0676316,10.577922 C 5.0556221,10.54816 5.0457961,10.572511 5.0457961,10.632035 C 5.0457957,10.691558 5.0556221,10.715909 5.0676312,10.686147 C 5.0796398,10.656385 5.0796403,10.607684 5.0676312,10.577922 L 5.0676316,10.577922 z"
-   id="path13046" /><path
-   style="fill:#00ffff"
-   d="M 9.4329004,15.927635 C 9.3614719,15.918776 9.1715368,15.890714 9.0108225,15.865274 L 8.7186147,15.819016 L 8.7186147,15.647214 C 8.7186147,15.543701 8.7014069,15.486045 8.6753247,15.502165 C 8.6515152,15.51688 8.6320346,15.586211 8.6320346,15.656235 C 8.6320346,15.813511 8.6039104,15.814415 8.1765104,15.670865 C 7.710919,15.51449 7.3330827,15.340724 6.8896104,15.079027 C 6.5786385,14.895521 6.5099234,14.835885 6.5058009,14.745932 C 6.5024394,14.672556 6.4942394,14.661388 6.4809814,14.712121 C 6.4700931,14.753788 6.441413,14.787879 6.4172485,14.787879 C 6.393084,14.787879 6.1361199,14.549242 5.8462173,14.257576 C 5.0182597,13.424581 4.5921139,12.711522 4.2762896,11.63066 C 4.048742,10.851909 4.0428351,10.706403 4.0138658,5.1651359 L 3.9869818,0.022912987 L 4.4588602,0.035265368 L 4.9307359,0.047619048 L 4.9539714,0.78354978 L 4.97721,1.5194805 L 4.986439,0.77272727 L 4.995671,0.025974026 L 6.1212121,0.025974026 L 7.2467532,0.025974026 L 7.2416407,6.487013 C 7.2388264,10.040584 7.224216,13.208731 7.2091719,13.527339 L 7.1818182,14.106626 L 6.965368,13.933696 C 6.7433805,13.756343 6.2953658,13.299307 6.0416147,12.991342 L 5.8989385,12.818182 L 6.0061095,12.984731 C 6.2579909,13.376172 6.7592498,13.864441 7.2034632,14.151057 L 7.3116883,14.220886 L 7.3006095,7.1234299 L 7.2895307,0.025974026 L 10.750619,0.025974026 L 14.211706,0.025974026 L 14.227922,0.23160173 L 14.244134,0.43722944 L 14.251939,0.23160173 L 14.25974,0.025974026 L 15.125541,0.025974026 L 15.991342,0.025974026 L 15.986026,2.5909091 C 15.983104,4.0016234 15.967485,6.4707792 15.95132,8.0779221 L 15.921926,11 L 15.760104,11.539759 C 15.671104,11.836626 15.510723,12.264355 15.403706,12.490268 C 15.184619,12.952756 14.726939,13.661254 14.520784,13.857037 L 14.384147,13.986802 L 14.397701,13.159025 C 14.408203,12.517513 14.399281,12.335858 14.358035,12.351732 C 14.317221,12.367439 14.301866,12.16179 14.292173,11.469658 L 14.279532,10.5671 L 14.269636,11.5 C 14.263364,12.091399 14.275948,12.449107 14.304013,12.477174 C 14.331922,12.505081 14.343922,12.823162 14.336481,13.337679 L 14.324675,14.153911 L 13.95671,14.453588 C 13.065368,15.179516 12.327268,15.561908 11.356346,15.800773 C 10.836965,15.928549 9.9252381,15.988684 9.4329004,15.927634 L 9.4329004,15.927635 z M 11.343411,14.887422 C 11.33213,14.87614 11.025532,14.890589 10.662087,14.91953 C 9.522381,15.010284 8.7332281,14.883259 7.8203463,14.462114 C 7.4464476,14.289619 7.4024013,14.301244 7.7554113,14.479249 C 8.1536952,14.680083 8.5302779,14.829312 8.7065961,14.856174 C 8.7965407,14.869877 8.9480519,14.899046 9.04329,14.920993 C 9.3615931,14.994342 10.282104,15.0173 10.770762,14.964074 C 11.308706,14.905481 11.309229,14.905727 11.323541,15.220779 C 11.33132,15.39209 11.33429,15.384972 11.348156,15.161758 C 11.356827,15.022155 11.354693,14.898703 11.343411,14.887421 L 11.343411,14.887422 z M 5.7748918,12.580087 C 5.7494069,12.532468 5.7188152,12.493506 5.7069104,12.493506 C 5.6950056,12.493506 5.7061169,12.532468 5.7316017,12.580087 C 5.7570866,12.627706 5.7876784,12.666667 5.7995831,12.666667 C 5.8114879,12.666667 5.8003766,12.627706 5.7748918,12.580087 z M 5.5497143,12.16978 C 5.4979139,12.063161 5.4481069,11.983351 5.4390316,11.992426 C 5.4194476,12.012009 5.594368,12.363636 5.6236939,12.363636 C 5.6348056,12.363636 5.6015143,12.276401 5.5497143,12.169781 L 5.5497143,12.16978 z M 14.648026,11.822511 C 14.648026,11.798701 14.629143,11.808442 14.606061,11.844156 C 14.582978,11.87987 14.564095,11.928571 14.564095,11.952381 C 14.564095,11.97619 14.582978,11.96645 14.606061,11.930736 C 14.629143,11.895022 14.648026,11.84632 14.648026,11.822511 z M 5.3905658,11.814935 C 5.3395338,11.727177 5.3272104,11.755266 5.3689844,11.864127 C 5.3838303,11.902815 5.4050965,11.925351 5.4162424,11.914205 C 5.4273879,11.90306 5.4158338,11.858387 5.3905658,11.814935 L 5.3905658,11.814935 z M 14.823247,11.322004 C 14.938242,10.920114 14.992628,9.9385368 14.986199,8.3809524 L 14.981641,7.2770563 L 14.949883,8.7705628 C 14.910234,10.635239 14.892095,10.877931 14.75774,11.34157 C 14.698126,11.547283 14.649944,11.72991 14.650667,11.747407 C 14.653922,11.826113 14.739026,11.61634 14.823247,11.322004 L 14.823247,11.322004 z M 5.2590866,11.450009 C 5.2362736,11.39298 5.2163745,11.369078 5.2148654,11.396892 C 5.2111983,11.464452 5.2616286,11.592629 5.2833342,11.570923 C 5.2928091,11.561448 5.281897,11.507036 5.2590853,11.450008 L 5.2590866,11.450009 z M 5.1850649,11.156926 C 5.1698532,11.080868 5.1483835,11.027662 5.1373545,11.038691 C 5.126326,11.049719 5.1307498,11.119971 5.1471861,11.194805 C 5.1636225,11.269639 5.1850918,11.322845 5.1948965,11.31304 C 5.2047009,11.303237 5.2002766,11.232984 5.1850649,11.156926 z M 5.1118229,10.883658 C 5.0980039,10.849124 5.0877459,10.859382 5.0856688,10.909813 C 5.0837879,10.955446 5.0940208,10.981016 5.1084056,10.966631 C 5.1227896,10.952245 5.1243281,10.914908 5.1118229,10.883658 z M 14.248779,8.4350649 C 14.241238,8.155303 14.235069,8.3841991 14.235069,8.9437229 C 14.235069,9.5032468 14.241238,9.7321429 14.248779,9.452381 C 14.25632,9.172619 14.25632,8.7148268 14.248779,8.4350649 z"
-   id="path13048" /><path
-   style="fill:#00ffff"
-   d="M 9.2813853,15.914596 C 8.7286823,15.843185 8.7186147,15.838824 8.7186147,15.670808 C 8.7186147,15.580425 8.7010472,15.529557 8.6753247,15.545455 C 8.6515152,15.56017 8.6320346,15.619761 8.6320346,15.67788 C 8.6320346,15.811013 8.5926896,15.810371 8.1715918,15.670372 C 7.4340134,15.425153 6.5113169,14.924456 6.5101597,14.7688 C 6.5096437,14.69939 6.5009026,14.693231 6.4706762,14.740984 C 6.4204476,14.820337 6.1310017,14.582417 5.6413048,14.059253 C 4.888397,13.254889 4.3420446,12.177936 4.1460896,11.111927 C 4.0495978,10.587008 4.0062545,8.375232 4.0028294,3.8015658 L 4,0.023045022 L 4.465368,0.035331602 L 4.9307359,0.047619048 L 4.9543654,0.61038961 L 4.9779944,1.1731602 L 4.9868329,0.5995671 L 4.995671,0.025974026 L 6.1212121,0.025974026 L 7.2467532,0.025974026 L 7.2466078,6.3787879 C 7.2464619,12.855846 7.2294186,14.115613 7.142639,14.06369 C 7.116568,14.048091 7.121974,14.068288 7.1546511,14.108573 C 7.1873286,14.148858 7.2311597,14.181818 7.2520537,14.181818 C 7.2736913,14.181818 7.2900433,11.135265 7.2900433,7.1038961 L 7.2900433,0.025974026 L 10.750502,0.025974026 L 14.210965,0.025974026 L 14.228424,0.16666667 L 14.245883,0.30735931 L 14.252814,0.16666667 L 14.25974,0.025974026 L 15.132247,0.025974026 L 16.004753,0.025974026 L 15.973307,5.4402732 L 15.941866,10.854572 L 15.835667,11.263154 C 15.619126,12.096304 15.363879,12.673145 14.916697,13.339969 C 14.773844,13.552987 14.59681,13.784489 14.523286,13.854419 L 14.38961,13.981568 L 14.38961,13.1726 C 14.38961,12.677377 14.373281,12.363636 14.347511,12.363636 C 14.322965,12.363636 14.29945,12.11537 14.291126,11.768398 C 14.282857,11.423831 14.282268,11.437504 14.289727,11.800866 C 14.296814,12.146104 14.313563,12.81123 14.326948,13.278924 L 14.351281,14.129278 L 13.973905,14.44029 C 13.091719,15.167343 12.446632,15.506241 11.412567,15.785902 C 10.852749,15.937304 9.901658,15.994736 9.2813853,15.914596 z M 11.342069,14.935272 C 11.327039,14.896103 11.260476,14.876768 11.155039,14.880945 C 11.00774,14.886781 11.004338,14.889341 11.121069,14.906496 C 11.272342,14.928727 11.31187,14.977712 11.322281,15.155844 C 11.329814,15.284665 11.330017,15.284543 11.347641,15.1409 C 11.357411,15.061254 11.354905,14.968721 11.342069,14.935273 L 11.342069,14.935272 z M 10.709957,14.960719 C 10.883632,14.94005 10.734494,14.935837 10.320346,14.949713 C 9.9512987,14.962078 9.6412338,14.979424 9.6313117,14.988261 C 9.5997229,15.0164 10.417563,14.995519 10.709957,14.96072 L 10.709957,14.960719 z M 9.4978355,14.938274 C 9.4621212,14.931276 9.2867965,14.901982 9.1082251,14.873175 C 8.7375394,14.813377 8.1036498,14.611779 7.7943251,14.455312 C 7.6788225,14.396888 7.59581,14.367674 7.6098511,14.390393 C 7.6238922,14.413114 7.8191359,14.51229 8.0437251,14.610787 C 8.4695991,14.79756 9.0926113,14.955875 9.3896104,14.952793 C 9.4848485,14.951804 9.5335498,14.945271 9.4978355,14.938273 L 9.4978355,14.938274 z M 7.0735931,14.035603 C 7.0735931,14.026614 7.0395022,13.992523 6.9978355,13.959846 C 6.9291749,13.905999 6.9276437,13.90753 6.9814909,13.97619 C 7.0380437,14.048301 7.0735931,14.071233 7.0735931,14.035603 z M 6.5097866,13.5 C 6.2861593,13.267857 6.074684,13.048701 6.0398411,13.012987 C 6.005,12.977273 6.0423823,13.035714 6.1229165,13.142857 C 6.2821939,13.354761 6.8381108,13.922078 6.8864792,13.922078 C 6.9029264,13.922078 6.7334147,13.732143 6.509787,13.5 L 6.5097866,13.5 z M 14.648026,11.822511 C 14.648026,11.798701 14.629143,11.808442 14.606061,11.844156 C 14.582978,11.87987 14.564095,11.928571 14.564095,11.952381 C 14.564095,11.97619 14.582978,11.96645 14.606061,11.930736 C 14.629143,11.895022 14.648026,11.84632 14.648026,11.822511 z M 5.3905658,11.814935 C 5.3395338,11.727177 5.3272104,11.755266 5.3689844,11.864127 C 5.3838303,11.902815 5.4050965,11.925351 5.4162424,11.914205 C 5.4273879,11.90306 5.4158338,11.858387 5.3905658,11.814935 L 5.3905658,11.814935 z M 14.886766,10.935733 L 14.906091,10.69697 L 14.86839,10.899097 C 14.847654,11.010267 14.799628,11.208071 14.761667,11.33866 C 14.667892,11.661229 14.680061,11.702636 14.783199,11.411924 C 14.829528,11.281339 14.87613,11.067054 14.886762,10.935733 L 14.886766,10.935733 z M 14.941143,9.8852814 C 14.932688,9.7364719 14.925775,9.8582251 14.925775,10.155844 C 14.925775,10.453463 14.932688,10.575216 14.941143,10.426407 C 14.949597,10.277597 14.949597,10.034091 14.941143,9.8852814 z M 14.984481,8.371826 C 14.976,8.2220835 14.968991,8.3333333 14.968909,8.6190476 C 14.968823,8.9047619 14.975758,9.0272784 14.98432,8.8913069 C 14.992883,8.7553355 14.992952,8.5215688 14.984476,8.3718264 L 14.984481,8.371826 z"
-   id="path13050" /><path
-   style="fill:#00ffff"
-   d="M 9.2475584,15.912582 C 8.7221147,15.835991 8.7186147,15.834534 8.7186147,15.692453 C 8.7186147,15.6165 8.7005268,15.573169 8.6753247,15.588745 C 8.6515152,15.60346 8.6320346,15.653311 8.6320346,15.699525 C 8.6320346,15.809907 8.5624848,15.80594 8.166345,15.672961 C 7.5255853,15.457865 6.5108225,14.924169 6.5108225,14.802269 C 6.5108225,14.770716 6.4826082,14.758133 6.4445749,14.772728 C 6.3438615,14.811375 5.3689004,13.80579 5.0700104,13.354986 C 4.629832,12.691081 4.2845935,11.854974 4.1457658,11.116626 C 4.050816,10.611641 4.0056199,8.343168 4.0026398,3.9329004 L 4,0.025974026 L 4.4746766,0.025974026 L 4.9493528,0.025974026 L 4.9633831,0.46969697 L 4.9774108,0.91341991 L 4.986542,0.46969697 L 4.995671,0.025974026 L 6.1212121,0.025974026 L 7.2467532,0.025974026 L 7.2426498,6.5519481 C 7.2403952,10.141234 7.2257848,13.316584 7.2101835,13.608283 C 7.1916351,13.955116 7.1967983,14.133631 7.2251082,14.124157 C 7.2536714,14.114597 7.2721242,11.714098 7.2793506,7.0678216 L 7.2903022,0.025974026 L 10.750368,0.025974026 L 14.210424,0.025974026 L 14.22919,0.12337662 L 14.247944,0.22077922 L 14.253844,0.12337662 L 14.25974,0.025974026 L 15.125541,0.025974026 L 15.991342,0.025974026 L 15.986281,3.1969697 C 15.983489,4.9410173 15.967805,7.4199134 15.95142,8.7056277 L 15.921628,11.04329 L 15.758749,11.562771 C 15.669165,11.848485 15.511403,12.261092 15.408169,12.479675 C 15.180732,12.961224 14.753853,13.629526 14.543623,13.833168 L 14.38961,13.982352 L 14.38961,13.197194 C 14.38961,12.765357 14.375,12.402982 14.357143,12.391916 C 14.339286,12.380851 14.324675,12.77336 14.324675,13.264158 L 14.324675,14.156522 L 13.935065,14.474644 C 13.075182,15.176757 12.437069,15.508797 11.417818,15.784494 C 10.83984,15.940833 9.8444069,15.999582 9.2475584,15.912582 z M 11.342446,14.936245 C 11.328887,14.900919 11.267173,14.876984 11.198329,14.880354 C 11.093658,14.885479 11.090879,14.888731 11.177056,14.905237 C 11.246758,14.918586 11.284996,14.96503 11.305861,15.061679 C 11.331641,15.18111 11.337541,15.185948 11.350844,15.098583 C 11.359268,15.043281 11.355485,14.970228 11.342446,14.936245 L 11.342446,14.936245 z M 10.244589,14.97263 C 10.143398,14.963518 9.9778139,14.963518 9.8766234,14.972632 C 9.7754329,14.981747 9.8582251,14.989203 10.060606,14.989203 C 10.262987,14.989204 10.345779,14.981746 10.244589,14.972632 L 10.244589,14.97263 z M 9.4229004,14.932643 C 9.3935931,14.920785 9.3351515,14.920064 9.2930303,14.931039 C 9.2509134,14.942015 9.2748918,14.951717 9.3463203,14.9526 C 9.4177489,14.953482 9.4522121,14.944502 9.4229004,14.932643 z M 10.699134,14.931198 C 10.657468,14.92031 10.589286,14.92031 10.547619,14.931198 C 10.505952,14.942087 10.540043,14.950996 10.623377,14.950996 C 10.70671,14.950995 10.740801,14.942087 10.699134,14.931198 z M 8.9445532,14.849498 C 8.7950078,14.816743 8.5330333,14.741388 8.362387,14.682043 C 8.1917411,14.622698 8.045429,14.580834 8.0372511,14.589012 C 7.988713,14.637549 8.9101996,14.914611 9.1082251,14.911019 C 9.1677489,14.909939 9.0940961,14.882255 8.9445519,14.849499 L 8.9445532,14.849498 z M 7.9790775,14.55529 C 7.9348801,14.515743 7.6796537,14.398224 7.6796537,14.417419 C 7.6796537,14.444329 7.9040948,14.567366 7.9574316,14.569695 C 7.9792558,14.570648 7.988997,14.564166 7.9790766,14.555289 L 7.9790775,14.55529 z M 6.487119,13.478355 C 6.2749874,13.258117 6.0934987,13.068182 6.0838104,13.056277 C 6.0741203,13.044372 6.0864814,13.073593 6.1112762,13.121212 C 6.1652554,13.224882 6.794884,13.878788 6.8407247,13.878788 C 6.8583723,13.878788 6.6992494,13.698593 6.4871186,13.478355 L 6.487119,13.478355 z M 14.858602,11.08658 C 14.858303,11.038961 14.830957,11.097403 14.797831,11.21645 C 14.764706,11.335498 14.739268,11.452381 14.741303,11.47619 C 14.747571,11.549451 14.859182,11.178738 14.858602,11.08658 z M 14.894476,10.837662 C 14.882463,10.8079 14.872636,10.832251 14.872636,10.891775 C 14.872632,10.951299 14.882463,10.975649 14.894472,10.945887 C 14.906476,10.916126 14.906481,10.867424 14.894472,10.837662 L 14.894476,10.837662 z M 14.940407,10.058442 C 14.930805,9.9810606 14.922948,10.044372 14.922948,10.199134 C 14.922948,10.353896 14.930805,10.417208 14.940407,10.339827 C 14.950009,10.262446 14.950009,10.135823 14.940407,10.058442 z"
-   id="path13052" /><path
-   style="fill:#00ffff"
-   d="M 9.2164502,15.910741 C 8.7132706,15.827546 8.7186147,15.829629 8.7186147,15.716653 C 8.7186147,15.658207 8.6991342,15.61039 8.6753247,15.61039 C 8.6515152,15.61039 8.6320346,15.649351 8.6320346,15.69697 C 8.6320346,15.810188 8.564816,15.806723 8.166345,15.672961 C 7.5255853,15.457865 6.5108225,14.924169 6.5108225,14.802269 C 6.5108225,14.770716 6.4826082,14.758133 6.4445749,14.772728 C 6.3436823,14.811444 5.3682372,13.805258 5.0743394,13.359307 C 4.6042701,12.646043 4.2856177,11.874737 4.147258,11.11529 C 4.0459165,10.559036 4.005203,8.5582918 4.0024221,3.9978355 L 4,0.025974026 L 4.4742935,0.025974026 L 4.9485866,0.025974026 L 4.9635286,0.33982684 L 4.9784675,0.65367965 L 4.987068,0.33982684 L 4.995671,0.025974026 L 6.1210667,0.025974026 L 7.2464628,0.025974026 L 7.2575758,6.2922078 L 7.2686913,12.558442 L 7.2793688,6.2922078 L 7.2900433,0.025974026 L 10.750078,0.025974026 C 14.008935,0.025974026 14.211251,0.030378355 14.2299,0.1017316 C 14.248753,0.17388182 14.249935,0.17388182 14.254719,0.1017316 C 14.259325,0.032274026 14.33174,0.025974026 15.125541,0.025974026 L 15.991342,0.025974026 L 15.986338,3.3917749 C 15.983584,5.2429654 15.968061,7.7316017 15.951848,8.9220779 L 15.922364,11.08658 L 15.72471,11.670996 C 15.616,11.992424 15.448481,12.411255 15.35245,12.601732 C 15.152502,12.998323 14.717303,13.666138 14.534948,13.856183 L 14.411255,13.985092 L 14.390494,13.228478 L 14.369732,12.471861 L 14.347203,13.314442 L 14.324675,14.157024 L 13.935065,14.474895 C 13.087935,15.166049 12.433472,15.512442 11.503394,15.761926 C 10.833195,15.941699 9.8074199,16.008448 9.2164502,15.910739 L 9.2164502,15.910741 z M 11.31429,14.937315 C 11.285602,14.902744 11.23042,14.876719 11.191671,14.879481 C 11.132195,14.883718 11.133017,14.887587 11.196939,14.904294 C 11.238589,14.915179 11.286398,14.976232 11.303177,15.039965 C 11.326359,15.128001 11.337628,15.137141 11.350074,15.078007 C 11.359087,15.035196 11.342983,14.971885 11.31429,14.937314 L 11.31429,14.937315 z M 10.114719,14.975658 C 10.084957,14.96365 10.036255,14.96365 10.006494,14.975659 C 9.9767316,14.987668 10.001082,14.997494 10.060606,14.997494 C 10.12013,14.997494 10.144481,14.987668 10.114719,14.975659 L 10.114719,14.975658 z M 9.3995325,14.934884 C 9.3851472,14.9205 9.3478095,14.918962 9.3165584,14.931467 C 9.282026,14.945286 9.2922814,14.955544 9.3427143,14.957621 C 9.3883463,14.959502 9.4139177,14.949269 9.3995325,14.934884 L 9.3995325,14.934884 z M 8.6320346,14.771978 C 8.4534632,14.718164 8.258658,14.658346 8.1991342,14.639049 C 8.1396104,14.619752 8.1038286,14.617679 8.119619,14.634443 C 8.1623056,14.679763 8.7699584,14.870645 8.8701299,14.870203 C 8.9177489,14.869993 8.8106061,14.825791 8.6320346,14.771977 L 8.6320346,14.771978 z M 7.2354286,13.523096 C 7.2266563,13.397298 7.2193866,13.489177 7.219274,13.727273 C 7.2191615,13.965368 7.2263385,14.068294 7.2352238,13.955997 C 7.2441104,13.8437 7.2442013,13.648894 7.2354286,13.523096 L 7.2354286,13.523096 z M 6.7705628,13.780226 C 6.7705628,13.773633 6.6302043,13.6324 6.458655,13.466371 C 6.1939113,13.210146 6.1791273,13.200504 6.3608866,13.402597 C 6.6036424,13.672512 6.7705628,13.826373 6.7705628,13.780224 L 6.7705628,13.780226 z M 14.808792,11.273268 C 14.794974,11.238735 14.784714,11.248992 14.782636,11.299423 C 14.780758,11.345057 14.790991,11.370626 14.805377,11.356241 C 14.819762,11.341855 14.821299,11.304518 14.808792,11.273268 z M 14.852082,11.100108 C 14.838264,11.065574 14.828004,11.075832 14.825926,11.126263 C 14.824048,11.171897 14.834281,11.197466 14.848667,11.183081 C 14.863052,11.168695 14.864589,11.131358 14.852082,11.100108 z"
-   id="path13054" /><path
-   style="fill:#00ffff"
-   d="M 9.3030303,15.92699 C 8.8814623,15.872631 8.7186147,15.819743 8.7186147,15.73719 C 8.7186147,15.691261 8.6991342,15.65368 8.6753247,15.65368 C 8.6515152,15.65368 8.6320346,15.6829 8.6320346,15.718615 C 8.6320346,15.818991 8.4923935,15.79748 8.0349061,15.626627 C 7.4155519,15.395326 6.5639944,14.945619 6.5180377,14.825572 C 6.5101,14.80484 6.4731238,14.787879 6.4358658,14.787879 C 6.3197403,14.787879 5.3346225,13.754252 5.0743394,13.359307 C 4.5967398,12.634617 4.2879247,11.889809 4.1498805,11.129681 C 4.0446173,10.550052 4.005603,8.67791 4.0026143,4.0627706 L 4,0.025974026 L 4.4738177,0.025974026 L 4.9476381,0.025974026 L 4.9638506,0.23160173 L 4.9800662,0.43722944 L 4.9878684,0.23160173 L 4.995671,0.025974026 L 6.1210221,0.025974026 L 7.2463701,0.025974026 L 7.2575784,4.7554113 L 7.268784,9.4848485 L 7.2794139,4.7554113 L 7.2900433,0.025974026 L 10.749641,0.025974026 C 13.47681,0.025974026 14.213857,0.037430303 14.231069,0.08008658 C 14.248541,0.12337662 14.253589,0.12337662 14.256325,0.08008658 C 14.258935,0.038714286 14.463584,0.025974026 15.125541,0.025974026 L 15.991342,0.025974026 L 15.986602,3.5 C 15.983991,5.4107143 15.968528,7.8993506 15.952234,9.030303 L 15.922615,11.08658 L 15.741165,11.629537 C 15.524974,12.27646 15.255078,12.845302 14.94642,13.304555 C 14.69161,13.683693 14.469874,13.963425 14.423234,13.964587 C 14.406013,13.965016 14.38597,13.67803 14.378697,13.32684 L 14.365468,12.688312 L 14.355892,13.409137 L 14.34632,14.129962 L 14.097403,14.342584 C 12.994013,15.285081 11.944199,15.772392 10.713281,15.913451 C 10.35639,15.954349 9.5734892,15.961866 9.3030303,15.926991 L 9.3030303,15.92699 z M 8.7501814,14.805013 C 8.7357957,14.790629 8.6984576,14.789092 8.6672078,14.801597 C 8.632674,14.815416 8.6429316,14.825674 8.6933623,14.827751 C 8.7389961,14.829632 8.7645654,14.819399 8.7501805,14.805014 L 8.7501814,14.805013 z M 8.4588745,14.722944 C 8.2612251,14.646829 8.1834606,14.647953 8.3506494,14.724507 C 8.4220779,14.757213 8.5097403,14.78337 8.5454545,14.782633 C 8.5811688,14.781894 8.5422078,14.755035 8.4588745,14.722944 z M 6.7272727,13.736468 C 6.7272727,13.72962 6.625,13.627348 6.5,13.509195 L 6.2727273,13.294372 L 6.4875498,13.521645 C 6.6871675,13.732831 6.7272727,13.768771 6.7272727,13.736468 L 6.7272727,13.736468 z"
-   id="path13056" /><path
-   style="fill:#00ffff"
-   d="M 9.1515152,15.911716 C 8.7490745,15.842626 8.7186147,15.830504 8.7186147,15.739435 C 8.7186147,15.692269 8.6991342,15.65368 8.6753247,15.65368 C 8.6515152,15.65368 8.6320346,15.6829 8.6320346,15.718615 C 8.6320346,15.755152 8.5933446,15.78355 8.5435641,15.78355 C 8.2866861,15.78355 6.8182693,15.117065 6.5717186,14.888569 C 6.5119636,14.83319 6.4417087,14.787879 6.4155978,14.787879 C 6.3158117,14.787879 5.3099714,13.71691 5.0704139,13.355592 C 4.7526009,12.876244 4.42461,12.185548 4.2807281,11.692641 C 4.0446823,10.883996 4.038755,10.739521 4.0130316,5.1666667 L 3.9893017,0.025974026 L 4.4681,0.025974026 L 4.9468957,0.025974026 L 4.9643554,0.16666667 L 4.9818152,0.30735931 L 4.9887433,0.16666667 L 4.995671,0.025974026 L 6.1209268,0.025974026 L 7.2461853,0.025974026 L 7.257581,3.1536797 L 7.2689771,6.2813853 L 7.2795087,3.1536797 L 7.2900433,0.025974026 L 10.749641,0.025974026 C 13.47681,0.025974026 14.213857,0.037430303 14.231069,0.08008658 C 14.248541,0.12337662 14.253589,0.12337662 14.256325,0.08008658 C 14.258935,0.038714286 14.463584,0.025974026 15.125541,0.025974026 L 15.991342,0.025974026 L 15.986576,3.6515152 C 15.983952,5.6455628 15.967983,8.1439394 15.951082,9.2034632 L 15.920355,11.12987 L 15.717394,11.705146 C 15.515641,12.276972 15.26468,12.821965 15.047182,13.160582 C 14.844693,13.475832 14.469567,13.965368 14.430485,13.965368 C 14.409563,13.965368 14.386234,13.746212 14.378636,13.478355 L 14.364827,12.991342 L 14.354662,13.575758 L 14.344494,14.160173 L 13.932273,14.484848 C 12.966437,15.245562 12.189571,15.630996 11.186147,15.847306 C 10.79955,15.930645 9.5011905,15.971748 9.1515152,15.911716 L 9.1515152,15.911716 z M 6.6839827,13.692081 C 6.6839827,13.684632 6.620671,13.62132 6.54329,13.551389 L 6.4025974,13.424242 L 6.5297433,13.564935 C 6.6482628,13.696081 6.6839827,13.725526 6.6839827,13.692082 L 6.6839827,13.692081 z"
-   id="path13058" /><path
-   style="fill:#00ffff"
-   d="M 9.1515152,15.911716 C 8.7679909,15.845874 8.7186147,15.828692 8.7186147,15.76108 C 8.7186147,15.725819 8.6991342,15.69697 8.6753247,15.69697 C 8.6515152,15.69697 8.6320346,15.71645 8.6320346,15.74026 C 8.6320346,15.815929 8.4744403,15.787629 8.0596113,15.637468 C 7.5358641,15.44788 7.0102753,15.183756 6.5661229,14.886949 C 6.1598173,14.615434 5.4617667,13.914328 5.1226433,13.437154 C 4.6772351,12.810426 4.2590459,11.807503 4.1275056,11.050555 C 4.0454775,10.578521 4.0048437,8.3301688 4.0023926,4.1277056 L 4,0.025974026 L 4.4731784,0.025974026 C 4.9294658,0.025974026 4.947029,0.029451515 4.9651199,0.12337662 L 4.9838814,0.22077922 L 4.9897762,0.12337662 L 4.995671,0.025974026 L 6.1207628,0.025974026 L 7.2458524,0.025974026 L 7.2575861,1.9415584 L 7.2693229,3.8571429 L 7.2796831,1.9413961 L 7.2900433,0.025648918 L 11.640693,0.026393939 L 15.991342,0.027139394 L 15.986281,3.7603242 C 15.983494,5.8135736 15.968026,8.3116883 15.951905,9.3116883 L 15.922602,11.12987 L 15.760528,11.606061 C 15.534468,12.270253 15.094385,13.13799 14.756078,13.58658 C 14.598957,13.794913 14.453022,13.965368 14.431762,13.965368 C 14.410502,13.965368 14.38655,13.804654 14.378528,13.608225 C 14.364312,13.260148 14.363719,13.262642 14.35513,13.706501 L 14.34632,14.161919 L 13.918935,14.495761 C 13.683874,14.679372 13.386797,14.900251 13.258762,14.986602 C 12.710385,15.356449 11.847221,15.714541 11.170623,15.852886 C 10.794463,15.9298 9.4799437,15.968101 9.1515152,15.911716 L 9.1515152,15.911716 z"
-   id="path13060" /><path
-   style="fill:#00ffff"
-   d="M 9.1515152,15.911716 C 8.7679909,15.845874 8.7186147,15.828692 8.7186147,15.76108 C 8.7186147,15.725819 8.6991342,15.69697 8.6753247,15.69697 C 8.6515152,15.69697 8.6320346,15.71645 8.6320346,15.74026 C 8.6320346,15.815929 8.4744403,15.787629 8.0596113,15.637468 C 7.5358641,15.44788 7.0102753,15.183756 6.5661229,14.886949 C 6.1598173,14.615434 5.4617667,13.914328 5.1226433,13.437154 C 4.6772351,12.810426 4.2590459,11.807503 4.1275056,11.050555 C 4.0454775,10.578521 4.0048437,8.3301688 4.0023926,4.1277056 L 4,0.025974026 L 4.4731784,0.025974026 C 4.9294658,0.025974026 4.947029,0.029451515 4.9651199,0.12337662 L 4.9838814,0.22077922 L 4.9897762,0.12337662 L 4.995671,0.025974026 L 6.1207628,0.025974026 L 7.2458524,0.025974026 L 7.2575861,1.9415584 L 7.2693229,3.8571429 L 7.2796831,1.9413961 L 7.2900433,0.025648918 L 11.640693,0.026393939 L 15.991342,0.027139394 L 15.986281,3.7603242 C 15.983494,5.8135736 15.968026,8.3116883 15.951905,9.3116883 L 15.922602,11.12987 L 15.760528,11.606061 C 15.534468,12.270253 15.094385,13.13799 14.756078,13.58658 C 14.598957,13.794913 14.453022,13.965368 14.431762,13.965368 C 14.410502,13.965368 14.38655,13.804654 14.378528,13.608225 C 14.364312,13.260148 14.363719,13.262642 14.35513,13.706501 L 14.34632,14.161919 L 13.918935,14.495761 C 13.683874,14.679372 13.386797,14.900251 13.258762,14.986602 C 12.710385,15.356449 11.847221,15.714541 11.170623,15.852886 C 10.794463,15.9298 9.4799437,15.968101 9.1515152,15.911716 L 9.1515152,15.911716 z"
-   id="path13062" /><path
-   style="fill:#00ffff"
-   d="M 9.1515152,15.911716 C 8.7679909,15.845874 8.7186147,15.828692 8.7186147,15.76108 C 8.7186147,15.725819 8.6991342,15.69697 8.6753247,15.69697 C 8.6515152,15.69697 8.6320346,15.71645 8.6320346,15.74026 C 8.6320346,15.815929 8.4744403,15.787629 8.0596113,15.637468 C 7.5358641,15.44788 7.0102753,15.183756 6.5661229,14.886949 C 6.1598173,14.615434 5.4617667,13.914328 5.1226433,13.437154 C 4.6772351,12.810426 4.2590459,11.807503 4.1275056,11.050555 C 4.0454775,10.578521 4.0048437,8.3301688 4.0023926,4.1277056 L 4,0.025974026 L 4.4731784,0.025974026 C 4.9294658,0.025974026 4.947029,0.029451515 4.9651199,0.12337662 L 4.9838814,0.22077922 L 4.9897762,0.12337662 L 4.995671,0.025974026 L 6.1207628,0.025974026 L 7.2458524,0.025974026 L 7.2575861,1.9415584 L 7.2693229,3.8571429 L 7.2796831,1.9413961 L 7.2900433,0.025648918 L 11.640693,0.026393939 L 15.991342,0.027139394 L 15.986281,3.7603242 C 15.983494,5.8135736 15.968026,8.3116883 15.951905,9.3116883 L 15.922602,11.12987 L 15.760528,11.606061 C 15.534468,12.270253 15.094385,13.13799 14.756078,13.58658 C 14.598957,13.794913 14.453022,13.965368 14.431762,13.965368 C 14.410502,13.965368 14.38655,13.804654 14.378528,13.608225 C 14.364312,13.260148 14.363719,13.262642 14.35513,13.706501 L 14.34632,14.161919 L 13.918935,14.495761 C 13.683874,14.679372 13.386797,14.900251 13.258762,14.986602 C 12.710385,15.356449 11.847221,15.714541 11.170623,15.852886 C 10.794463,15.9298 9.4799437,15.968101 9.1515152,15.911716 L 9.1515152,15.911716 z"
-   id="path13064" /><path
-   style="fill:#ff8080"
-   d="M 9.1515152,15.911716 C 8.7679909,15.845874 8.7186147,15.828692 8.7186147,15.76108 C 8.7186147,15.725819 8.6991342,15.69697 8.6753247,15.69697 C 8.6515152,15.69697 8.6320346,15.71645 8.6320346,15.74026 C 8.6320346,15.815929 8.4744403,15.787629 8.0596113,15.637468 C 7.5358641,15.44788 7.0102753,15.183756 6.5661229,14.886949 C 6.1598173,14.615434 5.4617667,13.914328 5.1226433,13.437154 C 4.6772351,12.810426 4.2590459,11.807503 4.1275056,11.050555 C 4.0454775,10.578521 4.0048437,8.3301688 4.0023926,4.1277056 L 4,0.025974026 L 4.4731784,0.025974026 C 4.9294658,0.025974026 4.947029,0.029451515 4.9651199,0.12337662 L 4.9838814,0.22077922 L 4.9897762,0.12337662 L 4.995671,0.025974026 L 6.1207628,0.025974026 L 7.2458524,0.025974026 L 7.2575861,1.9415584 L 7.2693229,3.8571429 L 7.2796831,1.9413961 L 7.2900433,0.025648918 L 11.640693,0.026393939 L 15.991342,0.027139394 L 15.986281,3.7603242 C 15.983494,5.8135736 15.968026,8.3116883 15.951905,9.3116883 L 15.922602,11.12987 L 15.760528,11.606061 C 15.534468,12.270253 15.094385,13.13799 14.756078,13.58658 C 14.598957,13.794913 14.453022,13.965368 14.431762,13.965368 C 14.410502,13.965368 14.38655,13.804654 14.378528,13.608225 C 14.364312,13.260148 14.363719,13.262642 14.35513,13.706501 L 14.34632,14.161919 L 13.918935,14.495761 C 13.683874,14.679372 13.386797,14.900251 13.258762,14.986602 C 12.710385,15.356449 11.847221,15.714541 11.170623,15.852886 C 10.794463,15.9298 9.4799437,15.968101 9.1515152,15.911716 L 9.1515152,15.911716 z"
-   id="path13066" /><path
-   style="fill:#ff8080"
-   d="M 8.978355,15.865366 C 8.8712121,15.840623 8.7640693,15.797481 8.7402597,15.769497 C 8.7164502,15.741513 8.6093074,15.717555 8.5021645,15.716261 C 8.1119831,15.711545 6.9225918,15.146972 6.3549844,14.697051 C 5.9733671,14.394557 5.346668,13.724488 5.1040736,13.359574 C 4.7219563,12.784787 4.4017485,12.050417 4.2159606,11.322758 C 4.0870961,10.818047 4.0535641,9.6428792 4.019919,4.452381 L 3.9912251,0.025974026 L 4.1795965,0.026281818 C 4.6132848,0.026990476 4.9480074,0.080047619 4.9669996,0.15109437 C 4.9790771,0.19627662 4.9873931,0.18653117 4.9906494,0.12337662 L 4.995671,0.025974026 L 6.1207364,0.025974026 L 7.2458048,0.025974026 L 7.2575892,1.8333333 L 7.2693732,3.6406926 L 7.2797095,1.8333333 L 7.2900433,0.025974026 L 11.63897,0.025974026 L 15.987896,0.025974026 L 15.967853,3.1753247 C 15.956827,4.9074675 15.938957,7.4092381 15.928143,8.7348147 L 15.908489,11.144955 L 15.714922,11.6624 C 15.406723,12.486304 14.944835,13.338834 14.549398,13.813671 L 14.441398,13.943361 L 14.412749,13.72709 C 14.364511,13.362873 14.35655,13.367012 14.351342,13.759007 L 14.34632,14.137062 L 13.91026,14.473291 C 13.141476,15.066074 12.718762,15.310919 11.98471,15.588619 C 11.358931,15.825356 11.056823,15.873632 10.082251,15.892632 C 9.5392857,15.903218 9.0947052,15.892236 8.978355,15.865367 L 8.978355,15.865366 z"
-   id="path13088" /><path
-   style="fill:#ff8080"
-   d="M 8.978355,15.864293 C 8.8712121,15.838959 8.7594758,15.798532 8.7300519,15.774455 C 8.7006273,15.750378 8.5934853,15.726537 8.4919567,15.721474 C 8.0825165,15.701059 6.9143286,15.141184 6.3549844,14.697295 C 5.9729831,14.394142 5.3464615,13.724178 5.1042368,13.35982 C 4.7128628,12.771109 4.3906134,12.022548 4.1959338,11.2499 C 4.0890597,10.825736 4.0509082,9.3709359 4.0186268,4.4887567 L 3.9890268,0.012145887 L 4.4573857,0.040802165 C 4.7564848,0.059102597 4.9381424,0.088979654 4.9600459,0.12347403 C 4.9844701,0.16193723 4.9945359,0.15567792 4.9950082,0.1017316 C 4.9956225,0.031541991 5.0783524,0.025974026 6.1206208,0.025974026 L 7.2455697,0.025974026 L 7.257597,1.4437229 L 7.2696242,2.8614719 L 7.2798338,1.4437229 L 7.2900433,0.025974026 L 11.640693,0.025974026 L 15.991342,0.025974026 L 15.989035,0.9025974 C 15.987762,1.3847403 15.970554,3.8831169 15.950792,6.4545455 L 15.914861,11.12987 L 15.718113,11.65486 C 15.411035,12.474216 14.99432,13.255449 14.592264,13.765532 C 14.474887,13.914445 14.456082,13.924341 14.427719,13.852112 C 14.410108,13.807259 14.390753,13.702381 14.384714,13.619048 C 14.37868,13.535714 14.362697,13.623377 14.349203,13.813853 L 14.324675,14.160173 L 13.82684,14.539553 C 12.977792,15.186575 12.270182,15.546241 11.407554,15.769236 C 11.044303,15.863138 10.875662,15.878963 10.082251,15.893592 C 9.5287706,15.903797 9.096958,15.892337 8.978355,15.864293 z"
-   id="path13090" /><path
-   style="fill:#ff8080"
-   d="M 8.978355,15.864771 C 8.8712121,15.839702 8.7650433,15.80143 8.7424242,15.779725 C 8.7198056,15.75802 8.6404251,15.74026 8.5660238,15.74026 C 8.2590892,15.74026 7.2309589,15.297948 6.6406926,14.911963 C 6.2464013,14.654129 5.3632524,13.758813 5.0877857,13.337662 C 4.7040758,12.751023 4.4059887,12.068361 4.2186983,11.347334 C 4.0860952,10.836843 4.0523745,9.6909221 4.0175078,4.510432 L 3.9872329,0.012205628 L 4.4551745,0.038705628 C 4.7665342,0.056337229 4.9350346,0.083990909 4.9587312,0.12134675 C 4.9852147,0.16309394 4.9945152,0.15806537 4.9950082,0.1017316 C 4.9956225,0.031542424 5.0783433,0.025974026 6.1204286,0.025974026 L 7.2451866,0.025974026 L 7.2576126,1.0541126 L 7.2700416,2.0822511 L 7.2800424,1.0541126 L 7.2900433,0.025974026 L 11.640693,0.025974026 L 15.991342,0.025974026 L 15.988991,1.3354978 C 15.987701,2.0557359 15.970139,4.5541126 15.94997,6.8874459 L 15.913294,11.12987 L 15.776074,11.519481 C 15.508139,12.280257 14.992913,13.257261 14.590329,13.767977 L 14.45587,13.938552 L 14.404416,13.767976 L 14.352974,13.597403 L 14.34858,13.878788 L 14.34419,14.160173 L 13.819528,14.549784 C 13.147797,15.0486 12.702584,15.308955 12.153429,15.524094 C 11.392584,15.822166 11.109074,15.872613 10.082251,15.892632 C 9.5315758,15.903368 9.0963567,15.892384 8.978355,15.864772 L 8.978355,15.864771 z"
-   id="path13092" /><path
-   style="fill:#ffaaaa"
-   d="M 8.9814597,15.869416 C 8.8760238,15.847032 8.769855,15.808816 8.7455286,15.78449 C 8.7212026,15.760162 8.6385654,15.74026 8.5618909,15.74026 C 8.2457017,15.74026 7.2525745,15.30922 6.6152359,14.895368 C 6.2281519,14.644016 5.358442,13.749596 5.064361,13.300426 C 4.6878359,12.725332 4.3914576,12.04489 4.2208255,11.363786 C 4.0844061,10.819246 4.0513844,9.7171935 4.016771,4.5536965 L 3.9863264,0.012154113 L 4.4547225,0.038679221 C 4.7664299,0.056331602 4.9350307,0.083985281 4.9587312,0.12134675 C 4.9852147,0.16309394 4.9945152,0.15806537 4.9950082,0.1017316 C 4.9956225,0.031542857 5.0783307,0.025974026 6.1201654,0.025974026 L 7.2446606,0.025974026 L 7.2576498,0.75108225 L 7.270639,1.4761905 L 7.2803411,0.75108225 L 7.2900433,0.025974026 L 11.640693,0.025974026 L 15.991342,0.025974026 L 15.98874,1.6385281 C 15.987316,2.5254329 15.969494,5.0335498 15.949143,7.2121212 L 15.912134,11.17316 L 15.719926,11.670996 C 15.514948,12.201925 15.256385,12.741829 15.00468,13.164502 C 14.811844,13.488312 14.474485,13.934802 14.444961,13.905277 C 14.432805,13.893126 14.407636,13.818881 14.389022,13.740292 C 14.360861,13.621401 14.354394,13.644659 14.350498,13.878788 L 14.345814,14.160173 L 13.795788,14.568662 C 13.123801,15.06773 12.727498,15.298169 12.153429,15.523649 C 11.393749,15.822036 11.109727,15.872617 10.082251,15.89251 C 9.5822511,15.902191 9.0868948,15.891798 8.9814593,15.869415 L 8.9814597,15.869416 z"
-   id="path13094" /><path
-   style="fill:#ffaaaa"
-   d="M 8.7835498,15.808249 C 8.6883117,15.77482 8.4545455,15.70556 8.2640693,15.654339 C 7.886568,15.552824 7.3126268,15.295629 6.8148424,15.004907 C 6.4459026,14.789435 5.5998152,13.99058 5.2321749,13.510593 C 4.7554584,12.888199 4.2774325,11.76798 4.1739879,11.030813 C 4.1020152,10.517917 4.0494065,8.1410082 4.0172273,3.9481381 L 3.9870268,0.013159307 L 4.4137234,0.044481385 C 4.6484065,0.061707792 4.8737801,0.093656277 4.9145532,0.11547749 C 4.9650498,0.14250173 4.9943874,0.13800866 5.0065662,0.10138571 C 5.020029,0.060898268 5.2985234,0.044281818 6.1342026,0.034106061 L 7.2439576,0.020593074 L 7.2576922,0.53194113 L 7.2714264,1.04329 L 7.2807346,0.53463203 L 7.2900433,0.025974026 L 11.640693,0.025974026 L 15.991342,0.025974026 L 15.99084,0.85930736 C 15.988784,4.2671156 15.898485,11.188641 15.854589,11.30303 C 15.444312,12.372247 14.984372,13.251574 14.542944,13.810693 C 14.471905,13.900674 14.469632,13.900048 14.397312,13.770563 C 14.356957,13.698309 14.348662,13.72338 14.34719,13.922078 L 14.345429,14.160173 L 13.80545,14.549784 C 12.905247,15.199302 12.372268,15.476778 11.554113,15.721865 C 11.183338,15.832933 11.11113,15.839312 10.060606,15.853803 C 9.1930009,15.865771 8.9196446,15.85602 8.7835498,15.808249 z"
-   id="path13096" /><path
-   style="fill:#ffd5d5"
-   d="M 8.7402597,15.800328 C 7.9759944,15.572728 7.7730139,15.499124 7.3811364,15.307487 C 7.1406035,15.189861 6.8329909,15.022735 6.6975532,14.936097 C 6.3718545,14.72775 5.528316,13.900538 5.2056779,13.473096 C 4.7481082,12.86689 4.2894848,11.797766 4.1779065,11.07719 C 4.098345,10.563374 4.0478991,8.3790857 4.0161061,4.0712043 L 3.9860571,-0.00044805195 L 4.3718177,0.035810823 C 4.583984,0.055752814 4.8160173,0.070458442 4.8874459,0.068490043 C 4.9588745,0.066522078 5.5180281,0.055218615 6.1300095,0.043372294 L 7.2427026,0.021832468 L 7.2578957,0.31611169 L 7.2730857,0.61038961 L 7.2815645,0.31818182 L 7.2900433,0.025974026 L 11.640693,0.025974026 L 15.991342,0.025974026 L 15.991052,1.4437229 C 15.990892,2.2234848 15.970684,4.7394225 15.946143,7.0346957 L 15.901528,11.207921 L 15.705545,11.688376 C 15.428035,12.3687 15.07132,13.058988 14.769368,13.5 C 14.626723,13.708333 14.499684,13.878788 14.487056,13.878788 C 14.474424,13.878788 14.438212,13.844697 14.40658,13.80303 C 14.356329,13.736832 14.3489,13.755007 14.347697,13.947056 L 14.34632,14.166839 L 13.924242,14.47052 C 13.6921,14.637546 13.385281,14.852575 13.242424,14.948363 C 12.620771,15.365192 11.661238,15.74842 11.0461,15.825552 C 10.494446,15.894724 9.0024264,15.878402 8.7402597,15.800328 L 8.7402597,15.800328 z"
-   id="path13098" /></svg>
\ No newline at end of file
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_v_down_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_v_down_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   x="0px"
-   y="0px"
-   width="20px"
-   height="20px"
-   viewBox="0 0 20 20"
-   enable-background="new 0 0 20 20"
-   xml:space="preserve"
-   id="svg12767"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="qtg_fr_progress_v_frame_second_c.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata
-   id="metadata12788"><rdf:RDF><cc:Work
-       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><sodipodi:namedview
-   inkscape:window-height="1031"
-   inkscape:window-width="1348"
-   inkscape:pageshadow="2"
-   inkscape:pageopacity="0.0"
-   guidetolerance="10.0"
-   gridtolerance="10.0"
-   objecttolerance="10.0"
-   borderopacity="1.0"
-   bordercolor="#666666"
-   pagecolor="#ffffff"
-   id="base"
-   showgrid="false"
-   inkscape:zoom="23.1"
-   inkscape:cx="10"
-   inkscape:cy="10"
-   inkscape:window-x="44"
-   inkscape:window-y="0"
-   inkscape:current-layer="svg12767" />
-<defs
-   id="defs12769"><inkscape:perspective
-   sodipodi:type="inkscape:persp3d"
-   inkscape:vp_x="0 : 10 : 1"
-   inkscape:vp_y="0 : 1000 : 0"
-   inkscape:vp_z="20 : 10 : 1"
-   inkscape:persp3d-origin="10 : 6.6666667 : 1"
-   id="perspective12790" />
-</defs>
-<linearGradient
-   id="SVGID_1_"
-   gradientUnits="userSpaceOnUse"
-   x1="-1904.519"
-   y1="-741.0005"
-   x2="-1904.519"
-   y2="-752.9297"
-   gradientTransform="matrix(1.192488e-008 -1 -1 -1.192488e-008 -737.0194 -1894.5195)">
-	<stop
-   offset="0"
-   style="stop-color:#CCCCCC"
-   id="stop12772" />
-	<stop
-   offset="1"
-   style="stop-color:#808080"
-   id="stop12774" />
-</linearGradient>
-<rect
-   x="4"
-   fill="url(#SVGID_1_)"
-   width="12"
-   height="20"
-   id="rect12776" />
-<linearGradient
-   id="SVGID_2_"
-   gradientUnits="userSpaceOnUse"
-   x1="298"
-   y1="2839.917"
-   x2="298"
-   y2="2851.917"
-   gradientTransform="matrix(1.192488e-008 -1 1 1.192488e-008 -2835.9998 308.0001)">
-	<stop
-   offset="0"
-   style="stop-color:#666666"
-   id="stop12779" />
-	<stop
-   offset="1"
-   style="stop-color:#A6A6A6"
-   id="stop12781" />
-</linearGradient>
-<rect
-   x="5"
-   fill="url(#SVGID_2_)"
-   width="10"
-   height="20"
-   id="rect12783" />
-<rect
-   fill="none"
-   width="20"
-   height="20"
-   id="rect12785" />
-<path
-   style="fill:#00ffff"
-   d="M 10.277056,10.004329 L 10.277056,0.025974026 L 12.073593,0.025974026 L 13.87013,0.025974026 L 13.87013,10.004329 L 13.87013,19.982684 L 12.073593,19.982684 L 10.277056,19.982684 L 10.277056,10.004329 z"
-   id="path12792" /><path
-   style="fill:#00ffff"
-   d="M 5.7748918,10.004329 L 5.7748918,0.025974026 L 7.5714286,0.025974026 L 9.3679654,0.025974026 L 9.3679654,10.004329 L 9.3679654,19.982684 L 7.5714286,19.982684 L 5.7748918,19.982684 L 5.7748918,10.004329 z"
-   id="path12794" /><path
-   style="fill:#00ffff"
-   d="M 9.3679654,10.004329 L 9.3679654,0.025974026 L 9.8225108,0.025974026 L 10.277056,0.025974026 L 10.277056,10.004329 L 10.277056,19.982684 L 9.8225108,19.982684 L 9.3679654,19.982684 L 9.3679654,10.004329 z"
-   id="path12796" /><path
-   style="fill:#00ffff"
-   d="M 5.7748918,10.004329 L 5.7748918,0.025974026 L 9.8225108,0.025974026 L 13.87013,0.025974026 L 13.87013,10.004329 L 13.87013,19.982684 L 9.8225108,19.982684 L 5.7748918,19.982684 L 5.7748918,10.004329 z"
-   id="path12798" /><path
-   style="fill:#00ffff"
-   d="M 4.995671,10.004329 L 4.995671,0.025974026 L 5.3852814,0.025974026 L 5.7748918,0.025974026 L 5.7748918,10.004329 L 5.7748918,19.982684 L 5.3852814,19.982684 L 4.995671,19.982684 L 4.995671,10.004329 z"
-   id="path12800" /><path
-   style="fill:#00ffff"
-   d="M 4.995671,10.004329 L 4.995671,0.025974026 L 9.4329004,0.025974026 L 13.87013,0.025974026 L 13.87013,10.004329 L 13.87013,19.982684 L 9.4329004,19.982684 L 4.995671,19.982684 L 4.995671,10.004329 z"
-   id="path12802" /><path
-   style="fill:#00ffff"
-   d="M 4,10.004329 L 4,0.025974026 L 4.4978355,0.025974026 L 4.995671,0.025974026 L 4.995671,10.004329 L 4.995671,19.982684 L 4.4978355,19.982684 L 4,19.982684 L 4,10.004329 z"
-   id="path12804" /><path
-   style="fill:#00ffff"
-   d="M 13.87013,10.004532 L 13.87013,0.026380952 L 9.4437229,0.014724675 L 5.017316,0.0030701299 L 10.006494,-0.0053627706 L 14.995671,-0.013796537 L 14.995671,9.9844437 L 14.995671,19.982684 L 14.4329,19.982684 L 13.87013,19.982684 L 13.87013,10.004532 z"
-   id="path12806" /><path
-   style="fill:#00ffff"
-   d="M 14.995671,10.004329 L 14.995671,0.025974026 L 15.493506,0.025974026 L 15.991342,0.025974026 L 15.991342,10.004329 L 15.991342,19.982684 L 15.493506,19.982684 L 14.995671,19.982684 L 14.995671,10.004329 z"
-   id="path12808" /><path
-   style="fill:#ffd5d5"
-   d="M 4,10.004329 L 4,0.025974026 L 9.995671,0.025974026 L 15.991342,0.025974026 L 15.991342,10.004329 L 15.991342,19.982684 L 9.995671,19.982684 L 4,19.982684 L 4,10.004329 z"
-   id="path12810" /></svg>
\ No newline at end of file
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_v_down_t.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_v_down_t.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,251 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   x="0px"
-   y="0px"
-   width="20px"
-   height="20px"
-   viewBox="0 0 20 20"
-   enable-background="new 0 0 20 20"
-   xml:space="preserve"
-   id="svg5343"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="qtg_fr_progress_v_frame_second_t.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata
-   id="metadata5364"><rdf:RDF><cc:Work
-       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><sodipodi:namedview
-   inkscape:window-height="1031"
-   inkscape:window-width="1348"
-   inkscape:pageshadow="2"
-   inkscape:pageopacity="0.0"
-   guidetolerance="10.0"
-   gridtolerance="10.0"
-   objecttolerance="10.0"
-   borderopacity="1.0"
-   bordercolor="#666666"
-   pagecolor="#ffffff"
-   id="base"
-   showgrid="false"
-   inkscape:zoom="23.1"
-   inkscape:cx="10"
-   inkscape:cy="10"
-   inkscape:window-x="48"
-   inkscape:window-y="-4"
-   inkscape:current-layer="svg5343" />
-<defs
-   id="defs5345"><inkscape:perspective
-   sodipodi:type="inkscape:persp3d"
-   inkscape:vp_x="0 : 10 : 1"
-   inkscape:vp_y="0 : 1000 : 0"
-   inkscape:vp_z="20 : 10 : 1"
-   inkscape:persp3d-origin="10 : 6.6666667 : 1"
-   id="perspective5366" />
-</defs>
-<linearGradient
-   id="SVGID_1_"
-   gradientUnits="userSpaceOnUse"
-   x1="-3038.481"
-   y1="-740.999"
-   x2="-3038.481"
-   y2="-752.9282"
-   gradientTransform="matrix(-1.192488e-008 1 -1 -1.192488e-008 -737.0197 3050.4805)">
-	<stop
-   offset="0"
-   style="stop-color:#CCCCCC"
-   id="stop5348" />
-	<stop
-   offset="1"
-   style="stop-color:#808080"
-   id="stop5350" />
-</linearGradient>
-<path
-   fill="url(#SVGID_1_)"
-   d="M16.001,10v9.998H4V10c0-3.309,2.691-6,6.002-6C13.309,4,16.001,6.691,16.001,10L16.001,10z"
-   id="path5352" />
-<linearGradient
-   id="SVGID_2_"
-   gradientUnits="userSpaceOnUse"
-   x1="295.5"
-   y1="2839.917"
-   x2="295.5"
-   y2="2851.917"
-   gradientTransform="matrix(1.192488e-008 -1 1 1.192488e-008 -2835.9998 308.0001)">
-	<stop
-   offset="0"
-   style="stop-color:#666666"
-   id="stop5355" />
-	<stop
-   offset="1"
-   style="stop-color:#A6A6A6"
-   id="stop5357" />
-</linearGradient>
-<path
-   fill="url(#SVGID_2_)"
-   d="M15.002,9.999V20H5.001V9.999C5.001,7.242,7.244,5,10.002,5S15.002,7.242,15.002,9.999L15.002,9.999z  "
-   id="path5359" />
-<rect
-   fill="none"
-   width="20"
-   height="20"
-   id="rect5361" />
-<path
-   style="fill:#00ffff"
-   d="M 11.402597,12.603766 L 11.402597,5.2248481 L 11.24026,5.1785805 C 11.150974,5.1531325 10.99513,5.1203481 10.893939,5.1057264 L 10.709957,5.0791407 L 10.709957,4.5717879 L 10.709957,4.0644351 L 11.02381,4.1190736 C 11.878238,4.2678216 12.613074,4.5600918 13.322481,5.033339 L 13.705563,5.2888957 L 13.699338,5.9457208 L 13.693113,6.6025463 L 13.89216,6.8469221 C 14.405675,7.4773831 14.786403,8.3177983 14.929035,9.1357238 C 14.986545,9.4655152 14.995671,10.23426 14.995671,14.750259 L 14.995671,19.982684 L 13.199134,19.982684 L 11.402597,19.982684 L 11.402597,12.603766 z"
-   id="path5368" /><path
-   style="fill:#00ffff"
-   d="M 8.5887446,12.604287 C 8.5887446,8.546168 8.6040303,5.216442 8.6227126,5.2048957 C 8.6413944,5.1933481 8.8215896,5.1486835 9.0231455,5.1056385 C 9.4532424,5.0137844 10.522225,4.9953173 10.731602,5.0761225 C 10.80303,5.1036883 10.983225,5.1501762 11.132035,5.1794268 L 11.402597,5.2326113 L 11.402597,12.607648 L 11.402597,19.982684 L 9.995671,19.982684 L 8.5887446,19.982684 L 8.5887446,12.604287 z"
-   id="path5370" /><path
-   style="fill:#00ffff"
-   d="M 6.1539571,13.398489 L 6.1428571,6.8142909 L 6.5324675,6.4384861 C 7.07789,5.9123905 7.59239,5.5833918 8.2664823,5.3296641 C 8.425587,5.2697766 8.5631835,5.2207792 8.5722537,5.2207792 C 8.5813229,5.2207792 8.5887446,8.5422078 8.5887446,12.601732 L 8.5887446,19.982684 L 7.3769009,19.982684 L 6.1650545,19.982684 L 6.1539571,13.398489 z"
-   id="path5372" /><path
-   style="fill:#00ffff"
-   d="M 5.0088926,14.712121 C 5.0217117,10.885715 5.0406208,9.3703887 5.077903,9.1818182 C 5.218729,8.4695359 5.4846792,7.8095714 5.8542017,7.2554113 C 6.0596792,6.9472658 6.101058,6.9050398 6.1087381,6.995671 C 6.1137823,7.0551948 6.1239147,10.001623 6.1312554,13.54329 L 6.1446009,19.982684 L 5.5679165,19.982684 L 4.9912346,19.982684 L 5.0088926,14.712121 z"
-   id="path5374" /><path
-   style="fill:#00ffff"
-   d="M 5.3858918,7.1102558 L 5.3852814,6.2075273 L 5.5841792,5.9847147 C 6.2042121,5.2901442 7.0492645,4.7191892 7.9728498,4.3708238 C 8.3904403,4.2133139 8.3722944,4.1957801 8.3722944,4.7568035 L 8.3722944,5.2452091 L 8.0053831,5.4039641 C 6.9886784,5.843874 6.131668,6.6458329 5.5626727,7.6897632 L 5.3864996,8.012987 L 5.3858918,7.1102558 z"
-   id="path5376" /><path
-   style="fill:#00ffff"
-   d="M 6.1627424,13.391775 L 6.1609827,6.8008658 L 6.02939,6.952381 C 5.9570152,7.0357143 5.7824823,7.2976584 5.6415398,7.5344792 L 5.3852814,7.9650623 L 5.3852814,7.0970156 L 5.3852814,6.2289719 L 5.6473628,5.9429545 C 5.9911242,5.5678013 6.458471,5.1952515 6.9630576,4.8941381 C 7.3987788,4.6341195 8.1045996,4.3116883 8.2380719,4.3116883 C 8.3433186,4.3116883 8.3709749,4.4248329 8.3717035,4.8584074 L 8.3722944,5.2103212 L 7.8830407,5.4500628 C 7.6139502,5.5819199 7.2389502,5.8059641 7.0497069,5.9479381 C 6.7200052,6.195287 6.1086,6.7792208 6.1793165,6.7792208 C 6.1979931,6.7792208 6.3630152,6.6369944 6.5460312,6.4631619 C 7.1519913,5.8876104 7.8034814,5.4850922 8.4480519,5.2880156 L 8.5454545,5.2582351 L 8.5508736,8.1724078 C 8.5538701,9.7842303 8.5717823,10.999521 8.5909541,10.891775 C 8.610019,10.784632 8.627061,9.4657424 8.628826,7.9609091 L 8.6320346,5.2248481 L 8.7943723,5.1798567 C 9.1268026,5.0877212 9.7073593,5.0373333 10.211671,5.0568455 L 10.731602,5.0769636 L 10.71816,4.5861009 C 10.702558,4.0164355 10.654186,4.0536835 11.240074,4.184187 C 12.008052,4.3552506 12.65758,4.6304866 13.341771,5.0747736 L 13.700857,5.3079511 L 13.694662,5.9617857 L 13.688455,6.6156203 L 13.911307,6.9143675 C 14.347519,7.4991424 14.641229,8.0913706 14.827792,8.7623351 C 14.915316,9.0770965 14.922165,9.2308844 14.953541,11.584416 C 14.971788,12.953463 14.988736,15.403139 14.991199,17.028139 L 14.995671,19.982684 L 10.580087,19.982684 L 6.1645022,19.982684 L 6.1627424,13.391775 z M 11.383117,5.2242827 C 11.356429,5.1811 10.968022,5.0878113 10.848519,5.095881 C 10.808026,5.0986147 10.911255,5.135987 11.077922,5.1789286 C 11.244589,5.2218697 11.386974,5.2585939 11.394329,5.2605368 C 11.401688,5.2624797 11.396641,5.2461654 11.383117,5.2242827 z"
-   id="path5378" /><path
-   style="fill:#00ffff"
-   d="M 4.012939,14.668831 C 4.0321048,8.8910658 4.0208,9.1625273 4.2792991,8.2727273 C 4.423145,7.7775896 4.833129,6.9377013 5.1323117,6.5252619 L 5.3636364,6.2063675 L 5.3758117,7.1096771 C 5.3866675,7.91501 5.3788156,8.0388121 5.3034203,8.2510823 C 4.9855338,9.1460688 4.9957961,8.9291316 4.9957303,14.755411 L 4.995671,19.982684 L 4.4954918,19.982684 L 3.99531,19.982684 L 4.012939,14.668831 z"
-   id="path5380" /><path
-   style="fill:#00ffff"
-   d="M 8.3722944,4.7925104 C 8.3722944,4.528058 8.3710749,4.2970779 8.3695844,4.2792208 C 8.3598459,4.162532 9.8071732,3.9843766 10.36768,4.0332706 L 10.709957,4.0631273 L 10.7099,4.5445519 L 10.709835,5.025974 L 9.9847879,5.027319 C 9.3893983,5.0284216 9.1939377,5.0452857 8.8917749,5.1216203 C 8.6893939,5.1727481 8.4897186,5.2277983 8.4480519,5.2439554 C 8.3786857,5.2708528 8.3722944,5.2327671 8.3722944,4.7925104 z"
-   id="path5382" /><path
-   style="fill:#00ffff"
-   d="M 6.1538169,13.391775 L 6.1428571,6.8008658 L 5.991342,7.007442 C 5.9080087,7.121061 5.7375541,7.383884 5.6125541,7.5914948 L 5.3852814,7.9689675 L 5.3852814,7.0852 L 5.3852814,6.201432 L 5.8073593,5.7850771 C 6.2971823,5.3018957 6.8492446,4.9191866 7.537003,4.5860255 C 8.1025571,4.312061 8.3099074,4.2595931 8.3414918,4.3824528 C 8.359242,4.4514987 8.3629788,4.4495706 8.3672727,4.369158 C 8.3708139,4.3028584 8.4138043,4.2622584 8.512987,4.231545 C 8.8408935,4.1300039 9.3491169,4.0781879 10.038961,4.0759649 C 10.663645,4.0739506 10.843602,4.0891693 11.229437,4.1766346 C 12.015983,4.3549381 12.652502,4.6245983 13.33142,5.0671403 L 13.69697,5.3054173 L 13.69697,5.9592571 L 13.69697,6.613097 L 13.951931,6.9667229 C 14.381208,7.5621238 14.643961,8.1018879 14.829251,8.768955 C 14.913342,9.0716853 14.922294,9.2546169 14.953342,11.30303 C 14.971745,12.517316 14.988797,14.966991 14.991234,16.746753 L 14.995671,19.982684 L 10.580225,19.982684 L 6.1647797,19.982684 L 6.1538169,13.391775 z M 8.6277199,7.5059961 L 8.6320346,5.2241165 L 8.7943723,5.1808264 C 9.1592636,5.0835208 9.625961,5.0400307 10.152805,5.0542385 C 10.45926,5.0625035 10.709983,5.0546537 10.709974,5.0367965 C 10.709948,4.9873147 9.577645,4.9981026 9.2247424,5.0509468 C 9.053516,5.0765879 8.8173515,5.1252879 8.6999351,5.1591719 C 8.4129359,5.2419957 8.4165922,5.2432576 8.4083074,5.0584416 L 8.4010312,4.8961039 L 8.3842056,5.0558152 C 8.3677329,5.2121879 8.3572519,5.2205303 7.8828247,5.4549 C 7.343442,5.7213576 6.7845078,6.1234268 6.4242424,6.5041307 C 6.182268,6.7598316 6.2711636,6.7000996 6.6623264,6.3441502 C 6.9393312,6.0920805 7.2894074,5.8369329 7.5993784,5.6611909 C 7.8413935,5.5239771 8.436145,5.2640693 8.5081186,5.2640693 C 8.5286545,5.2640693 8.5473965,6.3306277 8.5497697,7.6341991 C 8.5521433,8.9377706 8.5696818,9.9556277 8.5887446,9.8961039 C 8.6078074,9.8365801 8.6253463,8.761032 8.6277195,7.5059974 L 8.6277199,7.5059961 z M 11.383987,5.2256857 C 11.370939,5.2045762 11.286996,5.1743169 11.197446,5.1584437 C 11.1079,5.1425697 10.995671,5.1184615 10.948052,5.104868 C 10.900433,5.0912749 10.875494,5.0949701 10.892628,5.1130797 C 10.909762,5.1311887 11.026645,5.1709134 11.152368,5.2013558 C 11.278091,5.2317983 11.386974,5.2583628 11.394329,5.2603874 C 11.401688,5.2624113 11.39703,5.246797 11.383987,5.2256866 L 11.383987,5.2256857 z"
-   id="path5384" /><path
-   style="fill:#00ffff"
-   d="M 6.1538169,13.391775 L 6.1428571,6.8008658 L 5.9143874,7.1361814 C 5.7887312,7.3206039 5.6183264,7.5835909 5.5357121,7.7205961 L 5.3855035,7.969697 L 5.3853922,7.0792628 L 5.3852814,6.1888286 L 5.7640693,5.8213203 C 6.3699113,5.233519 6.8278857,4.91701 7.6057052,4.5485537 C 8.0838619,4.3220468 8.2771727,4.2717835 8.3327229,4.3595134 C 8.3638706,4.408703 8.3710918,4.4067113 8.3716316,4.3487874 C 8.3719965,4.309668 8.4063853,4.2643113 8.4480519,4.2479944 C 8.6351732,4.1747165 9.2671688,4.0913238 9.824013,4.0664329 C 11.03303,4.0123905 12.062983,4.2949935 13.236411,5.0027437 L 13.69697,5.2805277 L 13.69697,5.9453987 L 13.69697,6.6102723 L 13.983169,7.0085996 C 14.301048,7.4510251 14.537255,7.8951827 14.709264,8.3739351 C 14.955173,9.0583697 14.95239,8.9937515 14.982303,14.712121 L 15.009874,19.982684 L 10.587333,19.982684 L 6.1647797,19.982684 L 6.1538169,13.391775 z M 8.6295403,7.0514506 L 8.6320346,5.2241165 L 8.8160173,5.176826 C 9.0595883,5.114219 9.0994632,5.0983203 9.021645,5.0948407 C 8.9859307,5.0932433 8.8495671,5.1206952 8.7186147,5.1558442 C 8.4131961,5.2378221 8.4166377,5.2381835 8.4096892,5.1233766 L 8.4037948,5.025974 L 8.3851355,5.1226052 C 8.3711545,5.1950009 8.257813,5.273632 7.9331861,5.4361463 C 7.3896468,5.7082506 6.9331234,6.0223961 6.5614706,6.3800554 C 6.3126238,6.6195307 6.3043165,6.6319126 6.501345,6.4696558 C 7.0338922,6.0310935 7.3271667,5.8135134 7.5736,5.6741506 C 7.8298883,5.529213 8.4341165,5.2640693 8.5081186,5.2640693 C 8.5286545,5.2640693 8.5476948,6.155303 8.5504329,7.2445887 C 8.5533727,8.4139831 8.5700801,9.15419 8.5912281,9.0519481 C 8.6109273,8.95671 8.6281675,8.0564866 8.6295398,7.0514519 L 8.6295403,7.0514506 z M 11.251082,5.1774892 C 11.203463,5.1570264 11.125541,5.1408571 11.077922,5.1415571 C 11.00832,5.1425797 11.012567,5.1496264 11.099567,5.1774892 C 11.247584,5.2248922 11.361394,5.2248922 11.251082,5.1774892 z M 9.3576494,5.0611658 C 9.3162597,5.0503303 9.2383377,5.0499372 9.1844874,5.0602918 C 9.1306385,5.0706472 9.1645022,5.0795117 9.2597403,5.0799922 C 9.3549784,5.0804736 9.3990346,5.0720004 9.3576494,5.0611654 L 9.3576494,5.0611658 z M 10.396104,5.015516 C 10.23539,5.0071879 9.9724026,5.0071879 9.8116883,5.0155173 C 9.650974,5.0238481 9.7824675,5.0306615 10.103896,5.0306615 C 10.425325,5.0306615 10.556818,5.0238468 10.396104,5.0155173 L 10.396104,5.015516 z"
-   id="path5386" /><path
-   style="fill:#00ffff"
-   d="M 6.1645022,13.424242 C 6.1645022,9.581884 6.1484177,6.8658009 6.1256632,6.8658009 C 6.0924615,6.8658009 5.8340221,7.2473411 5.480558,7.8181818 L 5.3867398,7.969697 L 5.3860108,7.0792628 L 5.3852814,6.1888286 L 5.7640693,5.8213203 C 6.3732931,5.2302385 6.8270255,4.9174177 7.6199442,4.5418087 C 7.8556403,4.4301567 8.1103745,4.3399035 8.1964429,4.3375502 C 8.2812571,4.3352307 8.375013,4.310361 8.4047909,4.282284 C 8.474297,4.2167485 8.8056039,4.1496455 9.3246753,4.0959727 C 10.901208,3.9329576 12.056299,4.2374061 13.599567,5.2227091 C 13.693576,5.2827294 13.69697,5.3078186 13.69697,5.9426922 L 13.69697,6.6004883 L 13.956489,6.9604186 C 14.259199,7.3802528 14.549563,7.925 14.709926,8.3739351 C 14.95826,9.0691481 14.954745,8.9876303 14.983139,14.712121 L 15.009286,19.982684 L 10.586892,19.982684 L 6.1645022,19.982684 L 6.1645022,13.424242 z M 8.6320346,6.7962234 L 8.6536797,5.1752935 L 8.534632,5.2014753 C 8.439545,5.2223887 8.4145736,5.2117186 8.4105628,5.1484615 C 8.4058667,5.0743784 8.4042463,5.0742394 8.3854961,5.1463056 C 8.3738182,5.1911952 8.1997667,5.3060429 7.9684398,5.4215017 C 7.4738156,5.6683758 6.9518922,6.0167459 6.6406926,6.3077355 C 6.3596,6.5705732 6.4544277,6.510839 6.8779364,6.1582887 C 7.0450706,6.0191563 7.3109004,5.8284346 7.4686675,5.7344606 C 7.7410281,5.5722299 8.420332,5.2640693 8.5055922,5.2640693 C 8.529168,5.2640693 8.5454545,5.9214779 8.5454545,6.873016 C 8.5454545,7.7579355 8.5600649,8.4673805 8.5779221,8.4495584 C 8.5957792,8.4317368 8.6201299,7.6877351 8.6320346,6.7962234 z M 8.8367615,5.1513338 C 8.8223758,5.1369498 8.7850377,5.1354121 8.7537879,5.1479173 C 8.7192541,5.1617364 8.7295117,5.1719944 8.7799424,5.1740714 C 8.8255762,5.1759524 8.8511455,5.1657195 8.8367606,5.1513346 L 8.8367615,5.1513338 z M 9.3354978,5.0622385 C 9.3057359,5.0502299 9.2570346,5.0502299 9.2272727,5.062239 C 9.1975108,5.0742485 9.2218615,5.084074 9.2813853,5.084074 C 9.3409091,5.0840745 9.3652597,5.0742481 9.3354978,5.062239 L 9.3354978,5.0622385 z M 10.245411,5.0192234 C 10.216104,5.0073654 10.157662,5.0066437 10.115541,5.0176195 C 10.073424,5.0285952 10.097403,5.0382974 10.168831,5.0391797 C 10.24026,5.0400619 10.274723,5.0310818 10.245411,5.0192234 z"
-   id="path5388" /><path
-   style="fill:#00ffff"
-   d="M 6.1645022,14.275361 C 6.1645022,11.136331 6.1516935,8.1855857 6.1360385,7.7181476 L 6.1075758,6.8682606 L 5.93041,7.1226584 C 5.8329706,7.2625771 5.6708459,7.5104004 5.5701338,7.6733766 L 5.3870199,7.969697 L 5.3861506,7.0792628 L 5.3852814,6.1888286 L 5.7640693,5.8213203 C 6.1816905,5.4161355 6.523429,5.1468641 6.9299948,4.9026351 C 7.318681,4.6691468 7.9862225,4.3606506 8.2049147,4.3134472 C 8.3088779,4.2910061 8.494332,4.2440589 8.6170346,4.2091182 C 8.9788117,4.1060991 9.8168745,4.0379307 10.383766,4.0654126 C 11.390628,4.1142225 12.344312,4.4351545 13.339827,5.0601827 L 13.69697,5.2844117 L 13.69697,5.9424498 L 13.69697,6.6004883 L 13.958416,6.9604186 C 14.284645,7.4095403 14.653485,8.1512701 14.804723,8.6623377 C 14.916472,9.0399476 14.921082,9.0999494 14.954463,10.61039 C 14.973407,11.467532 14.990429,13.926948 14.99229,16.075758 L 14.995671,19.982684 L 10.580087,19.982684 L 6.1645022,19.982684 L 6.1645022,14.275361 z M 8.6320346,6.6043087 L 8.6536797,5.1811593 L 8.551632,5.2068281 C 8.4879307,5.2228515 8.4353087,5.2099606 8.4116009,5.172526 C 8.3846593,5.1299823 8.3734277,5.1281541 8.3729571,5.166232 C 8.3725922,5.1957537 8.1969697,5.3079636 7.982684,5.4155844 C 7.7683983,5.5232052 7.5930736,5.6195394 7.5930736,5.629661 C 7.5930736,5.6397814 7.7537879,5.5728827 7.9502165,5.4809952 C 8.146645,5.3891082 8.3609307,5.3005974 8.4264069,5.2843052 L 8.5454545,5.254684 L 8.5454545,6.673519 C 8.5454545,7.4538766 8.5600649,8.0777511 8.5779221,8.0599052 C 8.5957792,8.0420597 8.6201299,7.3870407 8.6320346,6.6043087 z M 7.1168831,5.9548182 C 7.1764069,5.904242 7.1341169,5.9251346 7.0229052,6.001245 C 6.9116939,6.0773563 6.7655896,6.1993329 6.6982299,6.2723052 C 6.5822087,6.3979957 6.703961,6.3056623 7.1168831,5.9548173 L 7.1168831,5.9548182 z M 7.5497835,5.6722784 C 7.5497835,5.6603736 7.5108225,5.6714848 7.4632035,5.6969697 C 7.4155844,5.7224545 7.3766234,5.7530463 7.3766234,5.7649511 C 7.3766234,5.7768558 7.4155844,5.7657446 7.4632035,5.7402597 C 7.5108225,5.7147749 7.5497835,5.6841831 7.5497835,5.6722784 z"
-   id="path5390" /><path
-   style="fill:#00ffff"
-   d="M 4.0271593,15.318182 C 4.0387632,12.752706 4.0651312,10.254329 4.0857528,9.7662338 C 4.1213446,8.9238048 4.1312134,8.852639 4.2802931,8.3632957 C 4.4502212,7.805516 4.7983762,7.0671251 5.119042,6.5844156 L 5.3203463,6.2813853 L 5.3320697,7.1591684 C 5.3436952,8.0297338 5.3427152,8.0404143 5.2128918,8.4582883 C 5.1380792,8.6990909 5.0639771,9.0649368 5.0399485,9.3121074 C 5.0155078,9.5635056 5.0010372,11.421221 5.0053861,13.748918 L 5.0128667,17.753247 L 5.0412069,13.489177 L 5.0695498,9.2251082 L 5.1804411,8.8354978 C 5.3236056,8.3324931 5.4369996,8.0457541 5.6512277,7.6450216 C 5.8526216,7.2682948 5.8160481,7.2862654 5.5631225,7.6883117 L 5.386103,7.969697 L 5.3856935,7.075997 L 5.3852814,6.1822996 L 5.833771,5.7540996 C 6.080442,5.51859 6.4531247,5.2122065 6.6619558,5.0732472 C 7.1134926,4.7727905 7.9517329,4.3610104 8.1847662,4.3251801 C 8.2760022,4.3111524 8.3703104,4.2844039 8.3943403,4.2657398 C 8.4183693,4.2470758 8.6131753,4.1976848 8.8272407,4.1559814 C 9.3891775,4.0465052 10.689342,4.044371 11.164502,4.152142 C 11.939797,4.3279874 12.503805,4.5575922 13.231602,4.9936519 L 13.69697,5.2724766 L 13.69697,5.936484 L 13.69697,6.6004883 L 13.956489,6.9604186 C 14.437385,7.6273818 14.809195,8.4718203 14.908632,9.122884 C 14.941515,9.3381745 14.965494,11.151434 14.982541,14.712121 L 15.007779,19.982684 L 10.586139,19.982684 L 6.1645022,19.982684 L 6.1586974,14.798701 C 6.1555035,11.947511 6.1408931,9.0010823 6.126229,8.2510823 L 6.0995671,6.8874459 L 5.99841,7.038961 C 5.9335117,7.1361658 5.9271195,7.1569468 5.9805766,7.0969355 C 6.0630061,7.0043978 6.0642078,7.0253043 6.0925065,9.0449874 C 6.1082394,10.167862 6.1211346,13.088203 6.1211623,15.534632 L 6.1212121,19.982684 L 5.0636342,19.982684 L 4.0060558,19.982684 L 4.0271593,15.318182 z M 8.6269749,6.231326 C 8.632019,5.1887771 8.6317576,5.1856671 8.5410234,5.2093948 C 8.4877022,5.2233394 8.4341944,5.2082147 8.411816,5.1728745 C 8.3849303,5.1304177 8.3734238,5.1284351 8.3729571,5.1661835 C 8.3725922,5.1956801 8.2164502,5.2981697 8.025974,5.3939394 C 7.8354978,5.4897091 7.6796537,5.5763212 7.6796537,5.5864108 C 7.6796537,5.5965 7.8212039,5.5393558 7.9942095,5.4594221 C 8.1672152,5.3794896 8.3620203,5.3007225 8.42711,5.2843857 L 8.5454545,5.254684 L 8.552055,6.5472554 C 8.5561797,7.3547515 8.5705264,7.734229 8.5902857,7.5584416 C 8.6076827,7.4036797 8.6241918,6.8064775 8.6269749,6.2313255 L 8.6269749,6.231326 z M 6.7922078,6.2164502 C 6.8353026,6.1688312 6.8608216,6.1298701 6.8489169,6.1298701 C 6.8370113,6.1298701 6.7920126,6.1688312 6.7489177,6.2164502 C 6.7058229,6.2640693 6.6803039,6.3030303 6.6922087,6.3030303 C 6.7041143,6.3030303 6.749113,6.2640693 6.7922078,6.2164502 z M 6.9925351,6.0541126 C 7.0463823,5.9854519 7.0448511,5.9839208 6.9761905,6.037768 C 6.9345238,6.0704455 6.9004329,6.1045364 6.9004329,6.1135255 C 6.9004329,6.149155 6.9359823,6.1262229 6.9925351,6.0541126 z"
-   id="path5392" /><path
-   style="fill:#00ffff"
-   d="M 6.0963091,7.8614719 C 6.09631,7.3495671 6.1025723,7.1401515 6.1102255,7.3961039 C 6.1178788,7.6520563 6.1178792,8.0708874 6.1102255,8.3268398 C 6.1025719,8.5827922 6.09631,8.3733766 6.09631,7.8614719 L 6.0963091,7.8614719 z"
-   id="path5394" /><path
-   style="fill:#00ffff"
-   d=""
-   id="path5396" /><path
-   style="fill:#00ffff"
-   d="M 4.0031312,18.75974 C 4.0133965,14.749571 4.0840026,9.1977087 4.1278909,8.9496515 C 4.2496766,8.261319 4.6609541,7.2777416 5.1119242,6.596316 L 5.3203463,6.2813853 L 5.3320221,7.1715554 C 5.3436654,8.0592013 5.3433199,8.0629481 5.2102623,8.4919026 C 5.020958,9.1021926 4.9967385,9.6461584 5.0051229,13.099567 L 5.0122165,16.021645 L 5.0417883,12.601732 C 5.0628104,10.170319 5.0861887,9.1317675 5.1226697,9.008658 C 5.2836952,8.4652615 5.4161571,8.1055541 5.5650498,7.8073593 C 5.6571848,7.6228355 5.7240398,7.4718615 5.7136169,7.4718615 C 5.7031948,7.4718615 5.6299247,7.5838745 5.5507961,7.7207792 L 5.4069264,7.969697 L 5.3938684,7.0822511 L 5.3808108,6.1948052 L 5.8376126,5.7538169 C 6.8134429,4.811768 8.0130446,4.2288074 9.2472121,4.0968831 C 10.739355,3.9373818 11.887069,4.1929247 13.21271,4.9798108 L 13.69697,5.267261 L 13.69697,5.9211827 L 13.69697,6.5751043 L 13.994377,7.0126606 C 14.492043,7.744845 14.809727,8.477803 14.909009,9.122884 C 14.942424,9.3399883 14.965909,11.121436 14.982701,14.712121 L 15.007346,19.982684 L 10.58613,19.982684 L 6.1649117,19.982684 L 6.1536771,15.556277 L 6.142445,11.12987 L 6.1318286,15.556277 L 6.1212121,19.982684 L 5.0606061,19.982684 L 4,19.982684 L 4.0031312,18.75974 z M 6.1212121,8.0320771 C 6.1212121,6.9241965 6.1059169,6.8106753 5.9891866,7.0521944 C 5.9448784,7.1438723 5.9456251,7.1442537 6.0105987,7.0631545 C 6.0719459,6.9865818 6.0779221,7.0759368 6.0779221,8.0696481 C 6.0779221,8.6694355 6.0876623,9.1601732 6.0995671,9.1601732 C 6.1114719,9.1601732 6.1212121,8.6525299 6.1212121,8.0320771 z M 8.6273368,6.0786325 L 8.6320346,5.2265286 L 8.512987,5.2128316 C 8.4137268,5.2014108 7.8528139,5.4462693 7.8528139,5.5010208 C 7.8528139,5.5091121 7.9843074,5.4596342 8.1450216,5.3910714 C 8.3057359,5.3225074 8.4615801,5.2658844 8.491342,5.2652403 C 8.5330701,5.2643377 8.5469113,5.5142364 8.551819,6.3571429 C 8.5559619,7.0687472 8.5694303,7.3595701 8.5904108,7.1904762 C 8.6081346,7.047619 8.6247519,6.5472896 8.6273364,6.0786329 L 8.6273368,6.0786325 z"
-   id="path5398" /><path
-   style="fill:#00ffff"
-   d="M 4.0027688,18.32684 C 4.0089818,14.613471 4.0812563,9.218955 4.128403,8.9496515 C 4.2494104,8.2584502 4.6439792,7.3078087 5.0921368,6.6277056 L 5.3203463,6.2813853 L 5.3320805,7.1625242 C 5.3436342,8.0302532 5.3418221,8.0506087 5.213032,8.4998792 C 5.1411017,8.7507978 5.0845108,8.9971416 5.0872727,9.0473108 C 5.0920775,9.1346139 5.0931996,9.134813 5.1133883,9.0519481 C 5.1900974,8.7370866 5.4187913,8.0969541 5.5425623,7.8506494 C 5.7123697,7.5127329 5.7040879,7.4641671 5.5277987,7.7640693 L 5.4069264,7.969697 L 5.3951792,7.0841403 L 5.383432,6.198581 L 5.7198545,5.8578039 C 6.6858719,4.8792805 7.9822654,4.2320978 9.2472121,4.0968831 C 10.744459,3.9368359 11.922662,4.200713 13.231602,4.9892463 L 13.69697,5.2695939 L 13.697056,5.9270061 L 13.697143,6.5844156 L 13.959264,6.952381 C 14.242108,7.3494481 14.63613,8.1140372 14.773541,8.5324675 C 14.951091,9.0731225 14.957472,9.2615861 14.982749,14.712121 L 15.007195,19.982684 L 10.58613,19.982684 L 6.1650753,19.982684 L 6.1536745,16.876623 L 6.1422758,13.770563 L 6.1317442,16.876623 L 6.1212121,19.982684 L 5.0606061,19.982684 L 4,19.982684 L 4.0027688,18.32684 z M 5.0281043,11.357143 C 5.0213156,10.755952 5.015761,11.247835 5.015761,12.450216 C 5.0157623,13.652597 5.0213156,14.144481 5.0281043,13.54329 C 5.0348931,12.9421 5.0348931,11.958333 5.0281043,11.357143 z M 5.0705935,9.4510758 C 5.0615156,9.3506026 5.0541952,9.4437229 5.0543273,9.6580087 C 5.054458,9.8722944 5.0618874,9.9544987 5.0708342,9.8406853 C 5.0797814,9.7268706 5.0796732,9.5515468 5.0705944,9.4510749 L 5.0705935,9.4510758 z M 6.1102048,7.4632294 C 6.1023325,7.2417861 6.0958541,7.4112554 6.0958087,7.8398268 C 6.0957619,8.2683983 6.1022043,8.4495784 6.1101225,8.2424494 C 6.1180403,8.0353195 6.1180779,7.684671 6.1102052,7.4632286 L 6.1102048,7.4632294 z M 8.6277541,5.9242424 L 8.6320346,5.2207792 L 8.5184009,5.2207792 C 8.4091325,5.2207792 7.8782697,5.4338251 7.9095628,5.4651182 C 7.9179541,5.47351 8.0445952,5.4317069 8.190987,5.3722225 C 8.3373775,5.3127377 8.4770216,5.2640693 8.5013043,5.2640693 C 8.5297364,5.2640693 8.5476247,5.5916026 8.5515498,6.1839827 C 8.5556797,6.8073922 8.5682537,7.0271541 8.5905584,6.8658009 C 8.6086623,6.7348485 8.6253987,6.3111472 8.6277532,5.9242424 L 8.6277541,5.9242424 z"
-   id="path5400" /><path
-   style="fill:#00ffff"
-   d="M 15.033701,19.365801 C 15.030814,19.026515 15.014385,16.58658 14.997199,13.943723 C 14.966714,9.2568139 14.963723,9.1305359 14.875723,8.8138528 C 14.670749,8.0762472 14.426121,7.5683654 13.958268,6.9090909 L 13.697143,6.5411255 L 13.702117,6.2164502 C 13.704853,6.0378788 13.719424,5.769145 13.734498,5.6192641 L 13.761905,5.3467519 L 14.067693,5.6262325 C 14.447502,5.9733658 14.789108,6.3879857 15.089476,6.8664078 L 15.320346,7.2341359 L 15.309238,13.60841 L 15.29813,19.982684 L 15.168545,19.982684 L 15.038961,19.982684 L 15.033701,19.365801 z"
-   id="path5402" /><path
-   style="fill:#00ffff"
-   d="M 4.0025974,18.02381 C 4.0074303,14.379971 4.0789558,9.2365485 4.1287848,8.9496515 C 4.2484861,8.2604619 4.6561078,7.2778714 5.0962087,6.6176351 L 5.3203463,6.2813853 L 5.3320645,7.1574671 C 5.3435156,8.0137511 5.3408273,8.0445654 5.2130818,8.521103 C 5.0379974,9.1742268 5.0520494,9.2030082 5.2503303,8.5974026 C 5.3399779,8.3235931 5.4570766,8.014887 5.5105489,7.9113892 C 5.624513,7.6908082 5.6020303,7.6120697 5.4858762,7.8249814 C 5.4070494,7.9694732 5.4069065,7.9683177 5.3941576,7.0822511 L 5.3813896,6.1948052 L 5.8283965,5.7601424 C 6.7742554,4.8404026 7.8930892,4.2792195 9.1082251,4.1150494 C 10.63845,3.9083095 11.978087,4.2034139 13.339827,5.0472134 L 13.69697,5.268516 L 13.704346,5.818242 L 13.711723,6.3679654 L 13.736814,5.9061511 C 13.750615,5.6521537 13.773662,5.4326022 13.788039,5.4182589 C 13.84384,5.3625684 14.696208,6.3132199 14.991909,6.7609506 L 15.298701,7.2254723 L 15.298701,13.604077 L 15.298701,19.982684 L 15.169139,19.982684 L 15.03958,19.982684 L 15.028134,17.114719 L 15.016688,14.246753 L 15.006177,17.114719 L 14.995671,19.982684 L 10.580524,19.982684 L 6.1653766,19.982684 L 6.1536693,18.002165 L 6.1419615,16.021645 L 6.1315883,18.002165 L 6.1212121,19.982684 L 5.0606061,19.982684 L 4,19.982684 L 4.0025974,18.02381 z M 5.0262892,12.353319 C 5.0159338,12.29947 5.0070684,12.333333 5.0065879,12.428571 C 5.0061065,12.52381 5.0145797,12.567868 5.0254147,12.526479 C 5.0362502,12.48509 5.0366429,12.407168 5.0262883,12.353319 L 5.0262892,12.353319 z M 14.983,9.9723662 C 14.972645,9.9185173 14.963779,9.952381 14.963299,10.047619 C 14.962818,10.142857 14.97129,10.186916 14.982126,10.145526 C 14.992961,10.104137 14.993355,10.026215 14.983,9.9723662 z M 14.938931,9.0844156 C 14.928043,9.0427489 14.919134,9.0768398 14.919134,9.1601732 C 14.91913,9.2435065 14.928043,9.2775974 14.938931,9.2359307 C 14.949823,9.1942641 14.949823,9.1260823 14.938931,9.0844156 z M 14.894476,8.8463203 C 14.882463,8.8165584 14.872636,8.8409091 14.872636,8.9004329 C 14.872632,8.9599567 14.882463,8.9843074 14.894472,8.9545455 C 14.906476,8.9247835 14.906481,8.8760823 14.894472,8.8463203 L 14.894476,8.8463203 z M 14.852082,8.6758658 C 14.838264,8.641332 14.828004,8.6515896 14.825926,8.7020203 C 14.824048,8.7476541 14.834281,8.7732234 14.848667,8.7588385 C 14.863052,8.7444528 14.864589,8.7071156 14.852082,8.6758658 z M 14.731121,8.299181 C 14.70445,8.2226775 14.675056,8.1676584 14.665797,8.1769177 C 14.656537,8.1861766 14.670779,8.2563476 14.69745,8.3328524 C 14.724121,8.4093558 14.753515,8.4643762 14.762775,8.4551169 C 14.772035,8.445858 14.757792,8.375687 14.731121,8.2991823 L 14.731121,8.299181 z M 14.478442,7.7360801 C 14.381433,7.5431416 14.292684,7.3852814 14.281216,7.3852814 C 14.269753,7.3852814 14.34213,7.5501342 14.442056,7.7516208 C 14.541983,7.9531065 14.630736,8.1109671 14.639281,8.1024208 C 14.647823,8.093874 14.57545,7.9290212 14.478442,7.7360814 L 14.478442,7.7360801 z M 14.117251,7.1115957 C 13.945199,6.84901 13.687359,6.5052117 13.708476,6.5665381 C 13.733939,6.6404887 14.139766,7.2121212 14.16681,7.2121212 C 14.175779,7.2121212 14.153476,7.1668848 14.117251,7.1115957 z M 8.6277541,5.7943723 L 8.6320346,5.2207792 L 8.5295827,5.2207792 C 8.4279463,5.2207792 7.9673957,5.393081 7.9950671,5.4207524 C 8.0029987,5.4286848 8.11081,5.3966762 8.2346463,5.3496221 C 8.3584835,5.3025684 8.4790749,5.2640693 8.502629,5.2640693 C 8.5290823,5.2640693 8.5477848,5.5660952 8.5515498,6.0541126 C 8.5558896,6.616719 8.5671199,6.775613 8.5905584,6.6060606 C 8.6086623,6.4751082 8.6253987,6.1098485 8.6277532,5.7943723 L 8.6277541,5.7943723 z"
-   id="path5404" /><path
-   style="fill:#00ffff"
-   d="M 15.313338,18.482104 C 15.329095,17.656785 15.3429,14.8175 15.344009,12.172581 L 15.346022,7.3636364 L 15.446675,7.5584416 C 15.589766,7.8353913 15.753437,8.3325641 15.867078,8.8354978 L 15.9649,9.2683983 L 15.980017,14.625541 L 15.995134,19.982684 L 15.639913,19.982684 L 15.28468,19.982684 L 15.313338,18.482104 z"
-   id="path5406" /><path
-   style="fill:#00ffff"
-   d="M 4.0184693,15.188312 C 4.0522372,9.9953649 4.0796697,9.0534623 4.2110567,8.5757576 C 4.4021974,7.8807939 4.7134381,7.1902584 5.0890879,6.6277056 L 5.3203463,6.2813853 L 5.3320697,7.1596758 C 5.343161,7.9905043 5.3377095,8.0603017 5.2311918,8.4512935 C 5.1692593,8.6786234 5.1260671,8.8720987 5.1352069,8.8812385 C 5.1443472,8.8903797 5.2068169,8.7279814 5.2740294,8.5203567 C 5.3412437,8.3127333 5.4327312,8.0705814 5.4773381,7.9822442 C 5.5816874,7.7755935 5.5793511,7.7240541 5.4718615,7.8614719 L 5.3872074,7.969697 L 5.3862433,7.0769165 L 5.3852814,6.1841359 L 5.8325528,5.7533359 C 6.694813,4.9228307 7.6615022,4.4005437 8.7835498,4.1589589 C 9.2173541,4.0655589 10.348156,4.0274649 10.798091,4.0910965 C 11.609719,4.2058775 12.356117,4.474255 13.150996,4.9371108 L 13.675325,5.2424242 L 13.69932,5.6969697 C 13.720952,6.1068433 13.724446,6.1217338 13.734827,5.8484848 C 13.754584,5.3287039 13.753061,5.3287342 14.244017,5.8384615 C 14.485974,6.0896745 14.81668,6.4959035 14.988931,6.7534957 L 15.298701,7.2167502 L 15.307723,13.155994 L 15.31674,19.095238 L 15.34019,13.330433 C 15.353087,10.159792 15.37584,7.5534329 15.390753,7.5385255 C 15.436264,7.4930442 15.629156,8.0279004 15.788952,8.6426229 L 15.940364,9.2251082 L 15.961792,14.603896 L 15.983221,19.982684 L 15.511498,19.982684 L 15.039775,19.982684 L 15.02813,17.850649 L 15.016481,15.718615 L 15.006078,17.850649 L 14.995671,19.982684 L 10.580766,19.982684 L 6.165871,19.982684 L 6.1536506,18.781385 L 6.1414303,17.580087 L 6.1313212,18.781385 L 6.1212121,19.982684 L 5.0542515,19.982684 L 3.9872909,19.982684 L 4.0184693,15.188312 z M 14.938662,9.1087662 C 14.924844,9.0742325 14.914584,9.08449 14.912506,9.1349208 C 14.910628,9.1805545 14.920861,9.2061238 14.935247,9.191739 C 14.949632,9.1773532 14.951169,9.140016 14.938662,9.1087662 z M 14.698013,8.2395385 C 14.65526,8.1971026 14.650286,8.2020749 14.673779,8.2637719 C 14.690035,8.3064645 14.714242,8.3304913 14.727571,8.3171628 C 14.7409,8.3038329 14.727597,8.2689035 14.698013,8.2395381 L 14.698013,8.2395385 z M 14.478329,7.7357974 C 14.35555,7.4951225 14.323649,7.5094623 14.441628,7.752297 C 14.493424,7.858916 14.543234,7.9387273 14.552312,7.9296524 C 14.561385,7.9205779 14.528095,7.833342 14.478329,7.735797 L 14.478329,7.7357974 z M 13.91342,6.8225108 C 13.862558,6.7510823 13.811203,6.6926407 13.799299,6.6926407 C 13.787394,6.6926407 13.819268,6.7510823 13.87013,6.8225108 C 13.920991,6.8939394 13.972346,6.952381 13.984251,6.952381 C 13.996156,6.952381 13.964281,6.8939394 13.91342,6.8225108 z M 8.6288268,5.7077922 C 8.6319762,5.2296779 8.630255,5.2208416 8.534632,5.224197 C 8.4810606,5.2260753 8.4615801,5.2374403 8.491342,5.2494494 C 8.5309472,5.2654299 8.5469074,5.4473074 8.5508732,5.9278498 C 8.5548017,6.4039615 8.5658186,6.530874 8.5909541,6.3896104 C 8.610019,6.2824675 8.627061,5.9756494 8.628826,5.7077922 L 8.6288268,5.7077922 z M 8.2857143,5.3290043 C 8.3690476,5.296913 8.4080087,5.2700528 8.3722944,5.2693152 C 8.3365801,5.2685792 8.2489177,5.2947342 8.1774892,5.3274411 C 8.0103004,5.4039961 8.0880649,5.4051186 8.2857143,5.3290043 z"
-   id="path5408" /><path
-   style="fill:#00ffff"
-   d="M 4.0174545,15.160214 C 4.051526,9.876703 4.0741589,9.1063987 4.2109844,8.5735377 C 4.3798541,7.9158848 4.7399442,7.1304788 5.1427996,6.5411255 L 5.3203463,6.2813853 L 5.3320697,7.1591104 C 5.3412671,7.8478576 5.3290944,8.0935511 5.2755299,8.3002623 C 5.1868926,8.6423281 5.2214026,8.6728779 5.3327403,8.3509074 C 5.3805424,8.2126697 5.4517182,8.021645 5.4909074,7.9264069 L 5.5621619,7.7532468 L 5.4746835,7.8614719 L 5.3872074,7.969697 L 5.3862433,7.0769165 L 5.3852814,6.1841359 L 5.8324156,5.753468 C 6.7285065,4.8903784 7.7707606,4.3410697 8.9134199,4.1296589 C 9.1010831,4.094939 9.5460693,4.0746636 10.082251,4.0764052 C 10.879645,4.0789961 10.982255,4.0883818 11.380952,4.1952134 C 12.017896,4.3658827 12.560771,4.5934247 13.150996,4.9371108 L 13.675325,5.2424242 L 13.699727,5.6103896 C 13.718203,5.8890264 13.726827,5.9258087 13.735238,5.7619048 C 13.756874,5.3403013 13.76542,5.3415325 14.239935,5.8345814 C 14.477017,6.080926 14.812229,6.4902108 14.984848,6.7441035 L 15.298701,7.2057268 L 15.308346,12.414552 L 15.317991,17.623377 L 15.340814,12.5945 C 15.353364,9.8286169 15.37632,7.552945 15.391827,7.5374506 C 15.436186,7.4931139 15.665485,8.1353307 15.808913,8.7056277 L 15.939567,9.2251082 L 15.965636,14.603896 L 15.991723,19.982684 L 15.515918,19.982684 L 15.040113,19.982684 L 15.028117,18.521645 L 15.016126,17.060606 L 15.005896,18.521645 L 14.995671,19.982684 L 10.581108,19.982684 L 6.1665472,19.982684 L 6.1536108,19.235931 L 6.1406745,18.489177 L 6.1309433,19.235931 L 6.1212121,19.982684 L 5.053784,19.982684 L 3.9863554,19.982684 L 4.0174545,15.160214 z M 14.47619,7.7316017 C 14.450706,7.6839827 14.420113,7.6450216 14.408208,7.6450216 C 14.396303,7.6450216 14.407416,7.6839827 14.4329,7.7316017 C 14.458385,7.7792208 14.488978,7.8181818 14.500883,7.8181818 C 14.512788,7.8181818 14.501675,7.7792208 14.47619,7.7316017 z M 8.6228978,5.5989831 C 8.6160182,5.4067091 8.5909091,5.2429169 8.5670996,5.2350017 C 8.5391325,5.2257043 8.5298126,5.4236714 8.5407688,5.7942879 C 8.5554277,6.2901961 8.5629926,6.3395385 8.5965662,6.1582701 C 8.6179281,6.0429368 8.6297762,5.7912593 8.622897,5.598984 L 8.6228978,5.5989831 z M 8.3290043,5.3073593 C 8.3647186,5.2842788 8.3744589,5.2653952 8.3506494,5.2653952 C 8.3268398,5.2653948 8.2781385,5.2842788 8.2424242,5.3073593 C 8.20671,5.3304398 8.1969697,5.3493234 8.2207792,5.3493234 C 8.2445887,5.3493238 8.29329,5.3304398 8.3290043,5.3073593 z"
-   id="path5410" /><path
-   style="fill:#00ffff"
-   d="M 4.0162524,15.145022 C 4.0490922,9.9052108 4.074358,9.0753571 4.2175792,8.5324675 C 4.3447043,8.0505948 4.6491255,7.3460221 4.9502879,6.8366429 C 5.3536528,6.1543983 5.3420775,6.1444065 5.3414775,7.1743532 C 5.3411082,7.8064 5.3231628,8.1231667 5.2781368,8.2923593 C 5.2435823,8.4222048 5.222203,8.5353342 5.2306277,8.5437589 C 5.2390528,8.5521848 5.2995662,8.416726 5.365103,8.2427416 C 5.4306407,8.0687584 5.5022593,7.8874459 5.5242567,7.8398268 C 5.5533026,7.7769498 5.5400173,7.7828758 5.4757294,7.8614719 L 5.3872074,7.969697 L 5.3862433,7.0769165 L 5.3852814,6.1841359 L 5.8324156,5.753468 C 6.7285065,4.8903784 7.7707606,4.3410697 8.9134199,4.1296589 C 9.0966385,4.095761 9.5502121,4.0739688 10.060606,4.0745437 C 10.798606,4.075374 10.956481,4.0882693 11.316017,4.1770827 C 12.021506,4.3513524 12.778203,4.6824312 13.469697,5.1193818 L 13.69697,5.2629939 L 13.703455,5.5557407 C 13.707022,5.7167494 13.717234,5.7900433 13.726147,5.7186147 C 13.772268,5.3490515 13.75842,5.3496926 14.114026,5.7006524 C 14.488861,6.070587 14.761675,6.4030152 15.076403,6.8733152 L 15.298701,7.2055052 L 15.308078,11.37548 L 15.31745,15.545455 L 15.343268,11.541126 C 15.357468,9.3387446 15.37342,7.5270563 15.378719,7.5151515 C 15.420026,7.4223251 15.660835,8.1020636 15.834693,8.8022485 L 15.939688,9.2251082 L 15.969775,14.603896 L 15.999866,19.982684 L 15.520368,19.982684 L 15.04087,19.982684 L 15.028082,19.170996 L 15.015286,18.359307 L 15.005481,19.170996 L 14.995671,19.982684 L 10.58155,19.982684 L 6.1674325,19.982684 L 6.153516,19.517316 L 6.1395991,19.051948 L 6.1304069,19.517316 L 6.1212121,19.982684 L 5.0535723,19.982684 L 3.9859329,19.982684 L 4.0162524,15.145022 z M 8.6283303,5.8701299 C 8.6267597,5.8273134 8.6132762,5.8346866 8.5887446,5.8917749 C 8.5376052,6.0107831 8.5376052,6.0791329 8.5887446,6 C 8.6118251,5.9642857 8.6296381,5.9058442 8.628329,5.8701299 L 8.6283303,5.8701299 z M 8.5750264,5.2992424 C 8.5612074,5.2647087 8.5509494,5.2749662 8.5488723,5.325397 C 8.5469913,5.3710307 8.5572242,5.3966 8.5716091,5.3822152 C 8.5859931,5.3678294 8.5875316,5.3304922 8.5750264,5.2992424 z"
-   id="path5412" /><path
-   style="fill:#00ffff"
-   d="M 4.0153459,15.123377 C 4.0483965,9.7015022 4.0709485,9.0320762 4.2401571,8.4501732 C 4.3860848,7.9483364 4.6744541,7.2972641 4.9706039,6.8009957 C 5.3633892,6.1427913 5.3522489,6.1279801 5.3305792,7.2795584 C 5.3203,7.8258013 5.2986333,8.3214286 5.2824299,8.3809524 C 5.2455584,8.5163978 5.2900952,8.4236896 5.4262143,8.0816463 C 5.4982203,7.9007048 5.5041866,7.8599706 5.4523827,7.9029641 C 5.3921177,7.9529779 5.3856896,7.8665892 5.3892892,7.055084 L 5.3932978,6.1515152 L 5.8546576,5.7254792 C 6.4058182,5.2165199 6.8569939,4.9011255 7.4415584,4.6161567 C 8.2199524,4.2366991 8.8042675,4.1002814 9.8051732,4.0643355 C 11.080004,4.0185532 11.962255,4.2498831 13.188268,4.9513991 L 13.696879,5.2424242 L 13.701905,5.5021645 C 13.706455,5.7375087 13.709892,5.7466126 13.738502,5.5990892 C 13.755866,5.5095407 13.778978,5.4273688 13.789866,5.4164853 C 13.837052,5.3692978 14.62981,6.2371567 14.949177,6.6856225 L 15.298701,7.1764407 L 15.309242,10.560082 L 15.319788,13.943723 L 15.331165,10.729437 C 15.337489,8.9430835 15.359286,7.5151515 15.380229,7.5151515 C 15.437268,7.5151515 15.576199,7.8660277 15.757329,8.4675325 L 15.920273,9.008658 L 15.950494,11.930736 C 15.967113,13.537879 15.983104,16.007035 15.986026,17.417749 L 15.991342,19.982684 L 15.516775,19.982684 L 15.042212,19.982684 L 15.027926,19.582251 L 15.013636,19.181818 L 15.004654,19.582251 L 14.995671,19.982684 L 10.582065,19.982684 L 6.1684576,19.982684 L 6.1533152,19.690476 L 6.1381697,19.398268 L 6.1296909,19.690476 L 6.1212121,19.982684 L 5.0534693,19.982684 L 3.9857242,19.982684 L 4.0153459,15.123377 z"
-   id="path5414" /><path
-   style="fill:#00ffff"
-   d="M 4.0147701,15.123377 C 4.0469398,9.7427537 4.0706489,9.0278978 4.2358424,8.4578502 C 4.4315883,7.7823727 4.9232,6.7680087 5.2234913,6.4199892 L 5.3430879,6.2813853 L 5.3296286,7.2770563 C 5.3222264,7.8246753 5.3016892,8.3116883 5.2839905,8.3593074 C 5.2662922,8.4069264 5.3013221,8.3411165 5.3618359,8.2130632 C 5.4793333,7.9644238 5.4982043,7.8833714 5.4285714,7.9264069 C 5.4002407,7.9439165 5.3852814,7.6415043 5.3852814,7.0512597 L 5.3852814,6.1493593 L 5.8506494,5.7268662 C 6.8061143,4.8594351 7.7105983,4.3739082 8.7774294,4.1557719 C 9.2869004,4.0516004 10.482208,4.0285208 10.969697,4.1134433 C 11.76419,4.2518476 12.363498,4.4780307 13.187749,4.9505524 L 13.696879,5.2424242 L 13.700831,5.4588745 C 13.704749,5.6736775 13.7051,5.6742022 13.747169,5.5278126 L 13.789558,5.3803004 L 14.136558,5.7226177 C 14.50397,6.0850641 14.732788,6.362758 15.083403,6.8717165 L 15.298701,7.1842485 L 15.309147,9.7198286 L 15.319589,12.255411 L 15.33116,9.8852814 C 15.337524,8.58171 15.359645,7.5151515 15.38032,7.5151515 C 15.437576,7.5151515 15.585489,7.8872381 15.762645,8.4769017 L 15.922403,9.008658 L 15.951355,11.649351 C 15.967281,13.101732 15.982792,15.570887 15.985827,17.136364 L 15.991342,19.982684 L 15.517524,19.982684 L 15.043706,19.982684 L 15.027489,19.777056 L 15.011277,19.571429 L 15.003472,19.777056 L 14.995671,19.982684 L 10.582576,19.982684 L 6.1694801,19.982684 L 6.1529108,19.798701 L 6.136339,19.614719 L 6.128774,19.798701 L 6.1212121,19.982684 L 5.0534641,19.982684 L 3.985716,19.982684 L 4.0147701,15.123377 z"
-   id="path5416" /><path
-   style="fill:#00ffff"
-   d="M 4.0018576,16.963203 C 4.0041074,13.309677 4.0671199,9.3349537 4.1292732,8.9261251 C 4.2189212,8.336442 4.6058346,7.3725381 5.0191693,6.7091567 C 5.3602048,6.1618126 5.3513022,6.1454814 5.3348074,7.2882312 C 5.3238048,8.0504758 5.3319974,8.2672922 5.3690632,8.1948199 C 5.4533602,8.0300004 5.4862909,7.8907342 5.4332091,7.9235407 C 5.3987489,7.944839 5.3852814,7.6985961 5.3852814,7.0472009 L 5.3852814,6.1412394 L 5.8506494,5.7207498 C 6.5927359,5.0502277 7.259932,4.6352403 8.0361299,4.3614091 C 8.7290247,4.1169658 9.0314251,4.0744571 10.060606,4.0768251 C 10.93719,4.0788424 11.016368,4.0858498 11.42145,4.1972736 C 12.010732,4.3593641 12.553593,4.5897139 13.173606,4.9407632 L 13.69697,5.2370896 L 13.698918,5.4345636 C 13.700823,5.6268835 13.702234,5.6288948 13.753035,5.5116532 L 13.805195,5.3912706 L 14.198545,5.7930381 C 14.617459,6.2209173 14.727619,6.355016 15.077247,6.8626866 L 15.298701,7.1842485 L 15.308952,8.8756727 L 15.319203,10.5671 L 15.331152,9.0411255 C 15.337723,8.2018398 15.359931,7.5151515 15.380502,7.5151515 C 15.434342,7.5151515 15.569667,7.8494004 15.757333,8.4458874 L 15.920771,8.965368 L 15.951113,11.38961 C 15.967805,12.722944 15.983684,15.20184 15.986403,16.898268 L 15.991342,19.982684 L 15.518165,19.982684 C 15.061874,19.982684 15.044312,19.979206 15.026221,19.885281 L 15.007468,19.787879 L 15.001567,19.885281 L 14.995671,19.982684 L 10.582961,19.982684 L 6.1702515,19.982684 L 6.1522186,19.863636 L 6.1341853,19.744589 L 6.1276987,19.863636 L 6.1212121,19.982684 L 5.0606061,19.982684 L 4,19.982684 L 4.0018576,16.963203 z"
-   id="path5418" /><path
-   style="fill:#00ffff"
-   d=""
-   id="path5420" /><path
-   style="fill:#00ffff"
-   d="M 4.0018918,16.876623 C 4.0041355,13.197268 4.0659264,9.3452693 4.1294294,8.9261251 C 4.1543433,8.7616835 4.2331723,8.4499961 4.3046052,8.2334844 C 4.4619004,7.756726 4.9345238,6.7953372 5.1578576,6.4978355 L 5.3203463,6.2813853 L 5.3419913,7.2554113 C 5.3607632,8.1001429 5.3708195,8.2099039 5.4177489,8.0822848 C 5.483097,7.9045792 5.483958,7.8921762 5.4285714,7.9264069 C 5.4002368,7.9439186 5.3852814,7.6393892 5.3852814,7.0449147 L 5.3852814,6.1366684 L 5.8452567,5.7207416 C 6.7719861,4.8827615 7.6900091,4.3874939 8.7402597,4.1589069 C 9.1642022,4.0666351 10.37842,4.0276797 10.851983,4.0911558 C 11.597221,4.1910481 12.337156,4.4632922 13.209957,4.9587242 L 13.69697,5.2351714 L 13.698502,5.4119567 C 13.699948,5.578358 13.703268,5.5829208 13.755061,5.4896203 C 13.808771,5.3928641 13.820394,5.4011351 14.241827,5.8359407 C 14.479281,6.0809359 14.814221,6.4817277 14.986134,6.7265905 L 15.298701,7.1717957 L 15.308671,8.3283221 L 15.318632,9.4848485 L 15.331126,8.5 C 15.337996,7.9583333 15.360333,7.5151515 15.380762,7.5151515 C 15.431632,7.5151515 15.562195,7.8315948 15.755848,8.4242424 L 15.918524,8.9220779 L 15.949961,11.21645 C 15.967251,12.478355 15.983636,14.966991 15.986372,16.746753 L 15.991342,19.982684 L 15.518758,19.982684 C 15.181199,19.982684 15.039939,19.967223 15.024342,19.928571 C 15.00687,19.885281 15.001823,19.885281 14.999087,19.928571 C 14.996377,19.971485 14.082472,19.982684 10.5831,19.982684 L 6.1705238,19.982684 L 6.1517641,19.885281 L 6.1330017,19.787879 L 6.1271069,19.885281 L 6.1212121,19.982684 L 5.0606061,19.982684 L 4,19.982684 L 4.0018918,16.876623 z"
-   id="path5422" /><path
-   style="fill:#00ffff"
-   d="M 4.0017571,16.811688 C 4.0038355,13.060462 4.0647333,9.2915078 4.1294355,8.9097095 C 4.1547965,8.7600498 4.2250437,8.4775823 4.2855377,8.2820039 C 4.4199753,7.8473597 4.9351225,6.7932169 5.1574377,6.4978355 L 5.3203463,6.2813853 L 5.3320459,7.1796537 C 5.3426117,7.9906926 5.3712225,8.2032316 5.4442264,8.012987 C 5.4579312,7.9772727 5.4502749,7.9480519 5.427213,7.9480519 C 5.4014983,7.9480519 5.3852814,7.5972706 5.3852814,7.0410645 L 5.3852814,6.1340766 L 5.842255,5.7214446 C 6.768481,4.8850948 7.6858537,4.3902338 8.7402597,4.1581667 C 9.1590052,4.0660026 10.374996,4.0274844 10.851983,4.0912727 C 11.601641,4.1915273 12.322511,4.4561515 13.219736,4.9604515 C 13.689126,5.2242823 13.69697,5.2312515 13.69697,5.3845242 C 13.69697,5.5219472 13.703532,5.5313831 13.752519,5.46439 C 13.802714,5.3957437 13.849827,5.4314433 14.241485,5.8349039 C 14.479866,6.0804688 14.815255,6.4798221 14.986801,6.7223558 L 15.298701,7.1633273 L 15.308273,7.9777662 L 15.317848,8.7922078 L 15.331095,8.1504641 C 15.341035,7.668997 15.357563,7.5129688 15.397281,7.5257307 C 15.426394,7.5350866 15.557069,7.8530922 15.687671,8.2324095 L 15.925121,8.9220779 L 15.953277,11.064935 C 15.968762,12.243506 15.983662,14.731861 15.986385,16.594612 L 15.991342,19.981432 L 11.081147,19.982314 C 6.4344468,19.983148 6.169884,19.979116 6.1511022,19.907182 C 6.1322745,19.835066 6.1309978,19.835053 6.1262338,19.906926 C 6.1215957,19.976878 6.0399342,19.982684 5.0606061,19.982684 L 4,19.982684 L 4.0017571,16.811688 z"
-   id="path5424" /><path
-   style="fill:#00ffff"
-   d="M 4.0016489,16.681818 C 4.0035385,12.90078 4.0627602,9.3077545 4.1297524,8.9097095 C 4.1982506,8.5027203 4.3735814,7.9807299 4.6127126,7.4718615 C 4.8308169,7.0077342 5.2499537,6.3030303 5.3078961,6.3030303 C 5.3255745,6.3030303 5.3458156,6.6585498 5.3528766,7.0930736 L 5.3657156,7.8831169 L 5.3754974,7.0096087 L 5.3852814,6.1361004 L 5.7780043,5.7758424 C 6.3320939,5.2675545 6.8399312,4.9139095 7.4415584,4.6173835 C 8.2838407,4.2022442 8.7386442,4.0976329 9.8441558,4.0647459 C 11.152779,4.0258165 11.918792,4.2299139 13.231602,4.9673 C 13.663385,5.2098264 13.69697,5.2381602 13.69697,5.3599056 C 13.69697,5.4650779 13.708554,5.4815052 13.755342,5.4426753 C 13.836632,5.375213 14.573736,6.1394277 14.986766,6.7193918 L 15.298701,7.1573983 L 15.307684,7.7367065 C 15.315251,8.2244727 15.318926,8.2527394 15.330957,7.9155844 C 15.338814,7.6953463 15.361593,7.5151515 15.381576,7.5151515 C 15.433229,7.5151515 15.564494,7.8401173 15.771567,8.4806563 L 15.950749,9.0349056 L 15.978156,14.508795 L 16.005558,19.982684 L 11.088641,19.982684 C 7.1956065,19.982684 6.1671701,19.971416 6.1498823,19.928571 C 6.1324139,19.885281 6.1273641,19.885281 6.1246299,19.928571 C 6.1219931,19.970296 5.8784082,19.982684 5.0606061,19.982684 L 4,19.982684 L 4.0016489,16.681818 z M 5.4285714,8.012987 C 5.4285714,7.9772727 5.4097022,7.9480519 5.3866398,7.9480519 C 5.3635784,7.9480519 5.3559216,7.9772727 5.3696264,8.012987 C 5.3833316,8.0487013 5.4022004,8.0779221 5.411558,8.0779221 C 5.4209152,8.0779221 5.4285714,8.0487013 5.4285714,8.012987 z"
-   id="path5426" /><path
-   style="fill:#00ffff"
-   d="M 4.0016065,16.638528 C 4.0034377,12.821516 4.0617814,9.3109823 4.1301104,8.9063615 C 4.2066039,8.4533926 4.4167645,7.8624494 4.7036459,7.2936541 C 4.9788117,6.7480879 5.2500658,6.3030303 5.3074121,6.3030303 C 5.3248706,6.3030303 5.3453701,6.5221861 5.3529649,6.7900433 L 5.3667753,7.2770563 L 5.3760281,6.7065784 L 5.3852814,6.1361004 L 5.7780043,5.7758424 C 6.3320939,5.2675545 6.8399312,4.9139095 7.4415584,4.6173835 C 8.2838407,4.2022442 8.7386442,4.0976329 9.8441558,4.0647459 C 11.170364,4.0252931 11.91645,4.2269814 13.274892,4.9921645 C 13.663,5.2107779 13.69697,5.2404251 13.69697,5.3605169 C 13.69697,5.4658087 13.708394,5.481639 13.755922,5.4421948 C 13.802693,5.4033775 13.907788,5.4897913 14.26458,5.8604468 C 14.511918,6.1173948 14.845316,6.512026 15.005459,6.7374052 L 15.296636,7.1471861 L 15.305675,7.5584416 C 15.311519,7.824155 15.320377,7.8882675 15.330714,7.7396035 C 15.341394,7.58599 15.363913,7.5151338 15.398463,7.5264299 C 15.426931,7.5357346 15.563255,7.8730442 15.701416,8.2760039 L 15.95261,9.008658 L 15.978957,14.495671 L 16.005303,19.982684 L 11.088511,19.982684 C 7.195581,19.982684 6.1671701,19.971416 6.1498823,19.928571 C 6.1324139,19.885281 6.1273641,19.885281 6.1246299,19.928571 C 6.1219931,19.970296 5.8784082,19.982684 5.0606061,19.982684 L 4,19.982684 L 4.0016065,16.638528 z M 5.4148532,7.9832251 C 5.4010342,7.9486913 5.3907762,7.9589489 5.3886991,8.0093797 C 5.3868182,8.0550134 5.3970511,8.0805827 5.4114359,8.0661978 C 5.4258199,8.0518121 5.4273584,8.0144749 5.4148532,7.9832251 z"
-   id="path5428" /><path
-   style="fill:#f4d7d7"
-   d="M 4.0013476,16.573147 C 4.0030558,12.252115 4.0588823,9.2595926 4.1460991,8.8138528 C 4.2371004,8.3487762 4.4465758,7.7823468 4.7304433,7.2337662 C 4.9922896,6.7277424 5.2553152,6.3030303 5.3068524,6.3030303 C 5.324003,6.3030303 5.3448502,6.4345238 5.3531797,6.5952381 C 5.367642,6.8742684 5.3687061,6.8705043 5.3768026,6.5117732 L 5.3852814,6.1361004 L 5.7640693,5.7891749 C 6.2414922,5.3519121 6.4392264,5.1991866 6.9082645,4.9054238 C 7.8848797,4.2937615 8.784739,4.0519481 10.084307,4.0519481 C 11.239104,4.0519481 12.103498,4.3113143 13.361472,5.0352775 C 13.640078,5.1956156 13.69697,5.2468519 13.69697,5.3374247 C 13.69697,5.4126182 13.71561,5.4393394 13.756991,5.4234606 C 13.844255,5.3899727 14.574814,6.1531861 14.967935,6.688532 L 15.298701,7.1389688 L 15.305186,7.4461078 C 15.308753,7.6150342 15.319788,7.6996753 15.32971,7.6341991 C 15.371883,7.3557853 15.452957,7.5049879 15.759004,8.4242424 L 15.953567,9.008658 L 15.97916,14.495811 L 16.004753,19.982964 L 10.002377,19.982377 L 4,19.981791 L 4.0013476,16.573147 z"
-   id="path13120" /><path
-   style="fill:#f4d7d7"
-   d="M 4.0015087,18.564935 C 4.0047,15.563725 4.0848048,9.7629515 4.1301857,9.2467532 C 4.1846407,8.6273528 4.3517649,8.0579961 4.6702377,7.4069264 C 4.9195926,6.8971576 5.2551061,6.3315853 5.2884065,6.3648857 C 5.3028887,6.3793701 5.3281732,6.4736489 5.3445918,6.574397 C 5.3709346,6.7360372 5.3750814,6.7215632 5.3798628,6.4513091 L 5.3852814,6.1450416 L 5.8939394,5.7047221 C 7.2893593,4.4967723 8.3482489,4.08589 10.060606,4.0879247 C 10.83571,4.0888459 11.221866,4.1442104 11.813398,4.3392307 C 12.561277,4.5857952 13.63681,5.160129 13.681095,5.336581 C 13.694558,5.3902299 13.740303,5.4451485 13.782745,5.458619 C 13.905433,5.4975597 14.59981,6.240319 14.964779,6.7230195 C 15.28997,7.1531087 15.298701,7.1710714 15.298701,7.4101381 C 15.298701,7.6164043 15.308446,7.6475351 15.359706,7.6049952 C 15.410087,7.5631805 15.443052,7.6131225 15.549074,7.8919022 C 15.619675,8.0775463 15.736615,8.4145022 15.808935,8.6406926 L 15.940429,9.0519481 L 15.966186,14.517316 L 15.991939,19.982684 L 9.9959697,19.982684 L 4,19.982684 L 4.0015087,18.564935 z"
-   id="path13122" /><path
-   style="fill:#f4d7d7"
-   d="M 4.0012394,18.218615 C 4.0033498,15.209737 4.0810636,9.8150818 4.1304844,9.2467532 C 4.1883602,8.5812082 4.4032307,7.8921199 4.7631177,7.2179156 C 5.0647026,6.6529359 5.2592584,6.3357377 5.2871216,6.3636009 C 5.2990117,6.37549 5.3239658,6.4495169 5.3425784,6.5281061 C 5.3713848,6.6497359 5.3770784,6.6315697 5.3808502,6.4059913 L 5.3852814,6.1409887 L 5.8722944,5.7183108 C 7.2718996,4.5035961 8.3376498,4.088639 10.060606,4.0875619 C 11.095169,4.0869152 11.793346,4.2506576 12.722944,4.7119545 C 13.079437,4.8888584 13.65368,5.230926 13.65368,5.2663797 C 13.65368,5.2823797 13.883416,5.5270398 14.164199,5.8100719 C 14.444987,6.0931035 14.815117,6.5127913 14.98671,6.7427113 C 15.280251,7.1360264 15.298701,7.1740602 15.298701,7.385871 C 15.298701,7.5614987 15.312082,7.6058597 15.359563,7.5876403 C 15.434095,7.5590394 15.524792,7.7650667 15.765965,8.5108225 L 15.940961,9.0519481 L 15.969377,14.517316 L 15.997792,19.982684 L 9.9989004,19.982684 L 4,19.982684 L 4.0012394,18.218615 z"
-   id="path13124" /><path
-   style="fill:#f4d7d7"
-   d="M 4.0171082,15.729437 C 4.0487281,11.355281 4.0949874,9.2891554 4.1714398,8.8363719 C 4.2701879,8.2515437 4.741242,7.1368758 5.1484571,6.5244268 L 5.2746939,6.334568 L 5.3280351,6.4594918 C 5.3797052,6.5805022 5.3814377,6.577429 5.383329,6.3613805 L 5.3852814,6.1383463 L 5.8722944,5.7149658 C 6.9211251,4.8031749 7.8405216,4.332781 8.915274,4.1580766 C 9.5690866,4.0517957 10.653887,4.0621788 11.226563,4.1801965 C 11.906121,4.3202416 12.682693,4.6416714 13.350649,5.0593775 C 13.670892,5.2596424 14.571983,6.1884078 15.019242,6.7792208 C 15.280996,7.1249905 15.297827,7.1611749 15.298251,7.3790905 C 15.298602,7.5604247 15.311974,7.6059017 15.359563,7.5876403 C 15.433909,7.5591104 15.523788,7.7628896 15.766745,8.5108225 L 15.942519,9.0519481 L 15.972446,14.517316 L 16.002372,19.982684 L 9.994368,19.982684 L 3.9863636,19.982684 L 4.0171082,15.729437 z"
-   id="path13126" /><path
-   style="fill:#f4d7d7"
-   d="M 4.0163208,15.676921 C 4.0504571,10.83346 4.0926792,9.2072108 4.1975082,8.6981883 C 4.3171524,8.1172281 4.7521558,7.1241762 5.1510277,6.5214403 C 5.2707061,6.3405926 5.2708996,6.3405048 5.326526,6.4407597 C 5.378339,6.534142 5.3823199,6.5269675 5.3837472,6.3376216 L 5.3852814,6.134116 L 5.8722944,5.712955 C 6.6613351,5.0306035 7.3629766,4.6037983 8.1035879,4.3556706 C 8.6929463,4.1582169 9.1685779,4.0907558 9.995671,4.0873074 C 10.768333,4.0840866 11.202351,4.1400234 11.781281,4.3174433 C 12.117,4.420329 12.932658,4.7983545 13.298667,5.0206926 C 13.619429,5.2155476 14.460939,6.0672134 14.931459,6.6731939 C 15.274623,7.1151563 15.298701,7.1596844 15.298701,7.3523048 C 15.298701,7.4984844 15.316039,7.5584416 15.358307,7.5584416 C 15.429922,7.5584416 15.534061,7.7956996 15.767299,8.4902861 L 15.9421,9.0108749 L 15.973485,14.496781 L 16.004861,19.982684 L 9.9954156,19.982684 L 3.9859723,19.982684 L 4.0163208,15.676921 z"
-   id="path13128" /><path
-   style="fill:#f4d7d7"
-   d="M 4.0163208,15.676921 C 4.0504571,10.83346 4.0926792,9.2072108 4.1975082,8.6981883 C 4.3171524,8.1172281 4.7521558,7.1241762 5.1510277,6.5214403 C 5.2707061,6.3405926 5.2708996,6.3405048 5.326526,6.4407597 C 5.378339,6.534142 5.3823199,6.5269675 5.3837472,6.3376216 L 5.3852814,6.134116 L 5.8722944,5.712955 C 6.6613351,5.0306035 7.3629766,4.6037983 8.1035879,4.3556706 C 8.6929463,4.1582169 9.1685779,4.0907558 9.995671,4.0873074 C 10.768333,4.0840866 11.202351,4.1400234 11.781281,4.3174433 C 12.117,4.420329 12.932658,4.7983545 13.298667,5.0206926 C 13.619429,5.2155476 14.460939,6.0672134 14.931459,6.6731939 C 15.274623,7.1151563 15.298701,7.1596844 15.298701,7.3523048 C 15.298701,7.4984844 15.316039,7.5584416 15.358307,7.5584416 C 15.429922,7.5584416 15.534061,7.7956996 15.767299,8.4902861 L 15.9421,9.0108749 L 15.973485,14.496781 L 16.004861,19.982684 L 9.9954156,19.982684 L 3.9859723,19.982684 L 4.0163208,15.676921 z"
-   id="path13130" /><path
-   style="fill:#f4d7d7"
-   d="M 4.0151242,15.599567 C 4.0474225,10.785339 4.088519,9.2273987 4.1971234,8.7000511 C 4.3145745,8.1297528 4.724974,7.1795424 5.1288091,6.5428983 C 5.2567974,6.3411242 5.2685983,6.3331649 5.325132,6.4104797 C 5.3800139,6.4855342 5.3852814,6.4769584 5.3852814,6.3125792 C 5.3852814,6.1395273 5.4010797,6.118561 5.7857143,5.7811537 C 6.8498935,4.8476403 7.7929874,4.351929 8.8703195,4.1598177 C 9.3373723,4.0765333 10.586325,4.0626225 11.034632,4.1357134 C 11.705264,4.2450515 12.786831,4.6778706 13.393723,5.079768 C 13.681498,5.2703398 14.686827,6.3206108 15.041173,6.8008658 C 15.25639,7.0925584 15.296853,7.175868 15.297697,7.3290177 C 15.298286,7.4350896 15.323121,7.5252732 15.357316,7.545468 C 15.445,7.5972541 15.502506,7.7254234 15.736494,8.39059 L 15.949801,8.9969688 L 15.97771,14.489826 L 16.005619,19.982684 L 9.995671,19.982684 L 3.985716,19.982684 L 4.0151242,15.599567 z"
-   id="path13132" /><path
-   style="fill:#f4d7d7"
-   d="M 4.0151926,15.556277 C 4.0471346,10.752931 4.0875411,9.2321571 4.1973961,8.6987312 C 4.314174,8.1316827 4.7253355,7.1789701 5.1256009,6.5479567 C 5.236,6.3739134 5.269319,6.3472615 5.3219242,6.3909199 C 5.3755013,6.4353835 5.3852814,6.4199645 5.3852814,6.2910299 C 5.3852814,6.1620195 5.4207139,6.1062489 5.6155519,5.9285861 C 6.7464771,4.8973554 7.7343558,4.3599515 8.8701299,4.1581022 C 9.390961,4.0655411 10.690238,4.0631316 11.149511,4.1538762 C 11.833667,4.2890532 12.795043,4.6860433 13.393939,5.0806887 C 13.680061,5.2692294 14.684879,6.317829 15.042294,6.8008658 C 15.245797,7.0758944 15.298563,7.1799675 15.298623,7.3064316 C 15.298667,7.394016 15.325394,7.4923719 15.358022,7.5249987 C 15.4559,7.622871 15.537775,7.8103606 15.750736,8.4242424 L 15.953472,9.008658 L 15.979364,14.495671 L 16.005247,19.982684 L 9.9955022,19.982684 L 3.9857584,19.982684 L 4.0151926,15.556277 z"
-   id="path13134" /><path
-   style="fill:#f4d7d7"
-   d="M 4.0145506,15.512987 C 4.0450152,10.762378 4.0860316,9.2395165 4.1981866,8.6949048 C 4.2837766,8.279284 4.4937558,7.7286719 4.7767013,7.177903 C 5.0947312,6.5588442 5.2400874,6.3431576 5.3188866,6.3733952 C 5.3695684,6.3928446 5.3852814,6.3677667 5.3852814,6.2674216 C 5.3852814,6.1585532 5.4416381,6.0852459 5.7133273,5.8407121 C 6.6904931,4.9612139 7.6268926,4.4341615 8.6250325,4.2018602 C 9.3089654,4.0426866 10.685749,4.0401541 11.359307,4.1968325 C 11.953896,4.3351433 12.869121,4.7323606 13.39384,5.079842 C 13.679251,5.2688524 14.685554,6.3186472 15.037212,6.794245 C 15.23155,7.0570753 15.293385,7.1782866 15.310476,7.3299022 C 15.322623,7.4376779 15.351446,7.538061 15.374528,7.5529732 C 15.445887,7.5990805 15.5401,7.8171 15.751035,8.4242424 L 15.954078,9.008658 L 15.973035,13.662338 C 15.983468,16.221861 15.999909,18.691017 16.009567,19.149351 L 16.027134,19.982684 L 10.006511,19.982684 L 3.9858853,19.982684 L 4.0145506,15.512987 z"
-   id="path13136" /><path
-   style="fill:#f4d7d7"
-   d=""
-   id="path13138" /><path
-   style="fill:#f4d7d7"
-   d=""
-   id="path13140" /><path
-   style="fill:#f4d7d7"
-   d="M 3.9878351,17.569274 C 4.0014788,14.095253 4.0774532,9.6929987 4.1333325,9.1385281 C 4.1917831,8.5585532 4.3803294,7.9646693 4.7230494,7.2810424 C 5.0554333,6.618032 5.2368268,6.3419061 5.3192169,6.3735221 C 5.3690645,6.3926511 5.3852814,6.3681173 5.3852814,6.2735671 C 5.3852814,6.1804584 5.4381182,6.0978775 5.5909091,5.9521818 C 6.6206455,4.9702658 7.734739,4.3556216 8.8465338,4.1560589 C 9.3756797,4.0610784 10.657831,4.0609294 11.154758,4.1557896 C 11.830974,4.2848753 12.785139,4.6771074 13.377048,5.0693156 C 13.680636,5.2704779 14.683502,6.3126372 15.043316,6.8008658 C 15.194654,7.0062165 15.29858,7.1913792 15.298623,7.2557558 C 15.298667,7.3154701 15.350632,7.4615727 15.414108,7.5804312 C 15.47758,7.6992905 15.62419,8.0595238 15.739913,8.3809524 L 15.950312,8.965368 L 15.970983,12.645022 C 15.982351,14.668831 16.000485,17.147727 16.011277,18.15368 L 16.0309,19.982684 L 10.004628,19.982694 L 3.978355,19.982708 L 3.9878351,17.569274 z"
-   id="path13142" /><path
-   style="fill:#f4d7d7"
-   d="M 3.9893784,17.482692 C 4.0047052,14.006152 4.0789333,9.6563165 4.1317667,9.1385281 C 4.1560606,8.9004329 4.2330498,8.519787 4.3028528,8.2926485 C 4.5092459,7.6210429 5.1793723,6.3306229 5.3080528,6.3569952 C 5.3374939,6.363029 5.3686212,6.3192641 5.377226,6.2597403 C 5.3967494,6.1246935 5.4856805,6.0270948 5.9481299,5.6331987 C 6.7498368,4.9503364 7.6432883,4.452387 8.4328909,4.2483589 C 9.2325567,4.0417299 10.624589,4.0189779 11.380952,4.2001727 C 11.962385,4.3394593 12.836935,4.7155351 13.329004,5.0378762 C 13.918987,5.424355 15.298537,6.9828771 15.298792,7.2632113 C 15.298844,7.318445 15.354987,7.4707792 15.42355,7.6017316 C 15.492113,7.732684 15.636532,8.0844039 15.744485,8.3833312 L 15.940758,8.9268364 L 15.966121,11.024023 C 15.980074,12.177477 16.002277,14.665043 16.015472,16.551948 L 16.039459,19.982684 L 10.008909,19.982692 L 3.978355,19.982703 L 3.9893784,17.482692 z"
-   id="path13144" /><path
-   style="fill:#f4d7d7"
-   d="M 3.9893784,17.482692 C 4.0047052,14.006152 4.0789333,9.6563165 4.1317667,9.1385281 C 4.1560606,8.9004329 4.2330498,8.519787 4.3028528,8.2926485 C 4.5092459,7.6210429 5.1793723,6.3306229 5.3080528,6.3569952 C 5.3374939,6.363029 5.3686212,6.3192641 5.377226,6.2597403 C 5.3967494,6.1246935 5.4856805,6.0270948 5.9481299,5.6331987 C 6.7498368,4.9503364 7.6432883,4.452387 8.4328909,4.2483589 C 9.2325567,4.0417299 10.624589,4.0189779 11.380952,4.2001727 C 11.962385,4.3394593 12.836935,4.7155351 13.329004,5.0378762 C 13.918987,5.424355 15.298537,6.9828771 15.298792,7.2632113 C 15.298844,7.318445 15.354987,7.4707792 15.42355,7.6017316 C 15.492113,7.732684 15.636532,8.0844039 15.744485,8.3833312 L 15.940758,8.9268364 L 15.966121,11.024023 C 15.980074,12.177477 16.002277,14.665043 16.015472,16.551948 L 16.039459,19.982684 L 10.008909,19.982692 L 3.978355,19.982703 L 3.9893784,17.482692 z"
-   id="path13146" /><path
-   style="fill:#ffd5d5"
-   d="M 3.9893784,17.482692 C 4.0047052,14.006152 4.0789333,9.6563165 4.1317667,9.1385281 C 4.1560606,8.9004329 4.2330498,8.519787 4.3028528,8.2926485 C 4.5092459,7.6210429 5.1793723,6.3306229 5.3080528,6.3569952 C 5.3374939,6.363029 5.3686212,6.3192641 5.377226,6.2597403 C 5.3967494,6.1246935 5.4856805,6.0270948 5.9481299,5.6331987 C 6.7498368,4.9503364 7.6432883,4.452387 8.4328909,4.2483589 C 9.2325567,4.0417299 10.624589,4.0189779 11.380952,4.2001727 C 11.962385,4.3394593 12.836935,4.7155351 13.329004,5.0378762 C 13.918987,5.424355 15.298537,6.9828771 15.298792,7.2632113 C 15.298844,7.318445 15.354987,7.4707792 15.42355,7.6017316 C 15.492113,7.732684 15.636532,8.0844039 15.744485,8.3833312 L 15.940758,8.9268364 L 15.966121,11.024023 C 15.980074,12.177477 16.002277,14.665043 16.015472,16.551948 L 16.039459,19.982684 L 10.008909,19.982692 L 3.978355,19.982703 L 3.9893784,17.482692 z"
-   id="path13148" /><path
-   style="fill:#ffd5d5"
-   d="M 3.9759848,17.201299 C 4.0209675,12.791954 4.0824844,9.5988693 4.1316879,9.1193913 C 4.1602459,8.8411048 4.2309169,8.512632 4.3221632,8.2340814 C 4.547297,7.5468087 5.1203043,6.4417957 5.3019745,6.3445684 C 5.3477931,6.3200472 5.3852814,6.2646736 5.3852814,6.2215169 C 5.3852814,6.0805866 6.1870554,5.3821052 6.8063429,4.9835277 C 7.290555,4.6718861 7.9722541,4.3636186 8.4390727,4.2452004 C 9.3272381,4.0198996 10.738082,4.0172697 11.532468,4.2394359 C 12.171208,4.4180723 13.091801,4.8375909 13.463,5.1191874 C 13.536697,5.1750935 13.821853,5.4497203 14.096684,5.7294662 C 14.859,6.5054221 15.2601,7.0199416 15.32,7.2987013 C 15.337909,7.3820346 15.390532,7.525219 15.436944,7.6168892 C 15.483359,7.708558 15.618095,8.0366052 15.736364,8.345881 L 15.95139,8.9082009 L 15.991853,12.356698 C 16.014113,14.253371 16.03284,16.74513 16.033476,17.893939 L 16.034632,19.982684 L 9.9911212,19.982684 L 3.94761,19.982684 L 3.9759848,17.201299 z"
-   id="path13444" /><path
-   style="fill:#ffd5d5"
-   d="M 3.9746983,17.028139 C 4.0167818,12.767234 4.0811983,9.5513446 4.1339368,9.0783818 C 4.1872303,8.6004468 4.3249455,8.1366476 4.5865597,7.5540381 C 4.8072134,7.0626511 5.168216,6.4420918 5.2951879,6.3359216 C 5.3447403,6.2944887 5.3852814,6.2341416 5.3852814,6.2018186 C 5.3852814,6.086381 6.2498645,5.3373303 6.7601883,5.0106385 C 6.8849407,4.9307758 6.987013,4.8447368 6.987013,4.8194411 C 6.987013,4.7941468 6.998168,4.7846039 7.0118017,4.7982377 C 7.0254355,4.8118701 7.2565126,4.7172758 7.5253061,4.5880251 C 7.7995606,4.4561489 8.1989939,4.3061013 8.4355372,4.246097 C 9.3091299,4.0244909 10.700035,4.0139589 11.493805,4.2229385 C 11.939918,4.340387 12.585316,4.6086026 13.076251,4.8805714 C 13.419766,5.0708745 13.568519,5.1927446 14.042004,5.6718082 C 14.86116,6.5006126 15.198636,6.93279 15.346212,7.3419913 C 15.384853,7.4491342 15.536926,7.8439913 15.684156,8.2194519 L 15.951844,8.9021082 L 15.992043,11.747591 C 16.014152,13.312606 16.032779,15.805736 16.033437,17.287879 L 16.034632,19.982684 L 9.9900736,19.982684 L 3.9455177,19.982684 L 3.9746983,17.028139 z"
-   id="path13446" /><path
-   style="fill:#ffd5d5"
-   d="M 4.0467091,9.481242 C 4.0487848,9.4308104 4.0590429,9.4205528 4.0728619,9.4550866 C 4.0853671,9.4863364 4.0838294,9.5236745 4.0694446,9.5380593 C 4.0550589,9.5524433 4.0448281,9.5268758 4.0467078,9.4812411 L 4.0467091,9.481242 z"
-   id="path13448" /><path
-   style="fill:#ffd5d5"
-   d="M 4.0584169,9.8961039 C 4.058416,9.6937229 4.0658732,9.6109307 4.0749874,9.7121212 C 4.0841,9.8133117 4.0841013,9.9788961 4.0749874,10.080087 C 4.0658719,10.181277 4.058416,10.098485 4.058416,9.8961039 L 4.0584169,9.8961039 z"
-   id="path13450" /></svg>
\ No newline at end of file
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_wait.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_wait.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="20px" height="20px" viewBox="0 -0.5 20 20" enable-background="new 0 -0.5 20 20" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="9.9995" y1="5" x2="9.9995" y2="15.0251">
-	<stop  offset="0" style="stop-color:#8CE0FF"/>
-	<stop  offset="0.1167" style="stop-color:#78D6F9"/>
-	<stop  offset="0.4027" style="stop-color:#4DBFED"/>
-	<stop  offset="0.6262" style="stop-color:#33B0E5"/>
-	<stop  offset="0.7582" style="stop-color:#29ABE2"/>
-</linearGradient>
-<rect y="5" fill="url(#SVGID_1_)" width="20" height="10"/>
-<rect fill="none" width="20" height="20"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="12.9995" y1="5" x2="12.9995" y2="15.0251">
-	<stop  offset="0" style="stop-color:#E6F7FF"/>
-	<stop  offset="0.7527" style="stop-color:#69D6FF"/>
-</linearGradient>
-<polygon fill="url(#SVGID_2_)" points="16,15 6,15 10,5 20,5 "/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_settingform_b.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_settingform_b.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="50px" height="10px" viewBox="0 0 50 10" enable-background="new 0 0 50 10" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="#eee9e9" width="50" height="10"/>
-<rect y="8.998" opacity="0.3" width="50" height="1.002"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_settingform_bl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_settingform_bl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#eee9e9" d="M10,0H0v4c0,3.313,2.687,6,6,6h4V0z"/>
-<path opacity="0.3" d="M6,8.998C3.242,8.998,1.001,6.757,1.001,4V0H0v4c0,3.313,2.687,6,6,6h4V8.998H6z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_settingform_br.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_settingform_br.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#eee9e9" d="M0,0h10v4c0,3.313-2.686,6-6.001,6H0V0z"/>
-<path opacity="0.3" d="M8.998,4c0,2.757-2.242,4.998-5,4.998H0V10h3.999C7.314,10,10,7.313,10,4V0H8.998V4z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_settingform_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_settingform_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="50px" height="30px" viewBox="0 0 50 30" enable-background="new 0 0 50 30" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="#eee9e9" width="50" height="30"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_settingform_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_settingform_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="30px" viewBox="0 0 10 30" enable-background="new 0 0 10 30" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="#eee9e9" width="10" height="30"/>
-<rect opacity="0.3" width="1.001" height="30"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_settingform_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_settingform_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="30px" viewBox="0 0 10 30" enable-background="new 0 0 10 30" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="#eee9e9" width="10" height="30"/>
-<rect x="8.998" opacity="0.3" width="1.002" height="30"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_settingform_t.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_settingform_t.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="50px" height="10px" viewBox="0 0 50 10" enable-background="new 0 0 50 10" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="#eee9e9" width="50" height="10"/>
-<rect opacity="0.3" width="50" height="1"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_settingform_tl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_settingform_tl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#eee9e9" d="M10,10H0V6c0-3.313,2.687-6,6-6h4V10z"/>
-<path opacity="0.3" d="M1.001,6c0-2.756,2.241-5,4.999-5h4V0H6C2.687,0,0,2.687,0,6v4h1.001V6z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_settingform_tr.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_settingform_tr.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#eee9e9" d="M0,10h10V6c0-3.313-2.686-6-6.001-6H0V10z"/>
-<path opacity="0.3" d="M3.998,1c2.758,0,5,2.244,5,5v4H10V6c0-3.313-2.686-6-6.001-6H0v1H3.998z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_settinggroup_b.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_settinggroup_b.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="50px" height="10px" viewBox="0 0 50 10" enable-background="new 0 0 50 10" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="#ffd700" width="50" height="10"/>
-<rect y="8.998" opacity="0.3" width="50" height="1.002"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_settinggroup_bl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_settinggroup_bl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#ffd700" d="M10,0H0v4c0,3.313,2.687,6,6,6h4V0z"/>
-<path opacity="0.3" d="M6,8.998C3.242,8.998,1.001,6.757,1.001,4V0H0v4c0,3.313,2.687,6,6,6h4V8.998H6z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_settinggroup_br.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_settinggroup_br.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#ffd700" d="M0,0h10v4c0,3.313-2.686,6-6.001,6H0V0z"/>
-<path opacity="0.3" d="M8.998,4c0,2.757-2.242,4.998-5,4.998H0V10h3.999C7.314,10,10,7.313,10,4V0H8.998V4z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_settinggroup_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_settinggroup_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="50px" height="30px" viewBox="0 0 50 30" enable-background="new 0 0 50 30" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="#ffd700" width="50" height="30"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_settinggroup_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_settinggroup_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="30px" viewBox="0 0 10 30" enable-background="new 0 0 10 30" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="#ffd700" width="10" height="30"/>
-<rect opacity="0.3" width="1.001" height="30"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_settinggroup_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_settinggroup_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="30px" viewBox="0 0 10 30" enable-background="new 0 0 10 30" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="#ffd700" width="10" height="30"/>
-<rect x="8.998" opacity="0.3" width="1.002" height="30"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_settinggroup_t.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_settinggroup_t.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="50px" height="10px" viewBox="0 0 50 10" enable-background="new 0 0 50 10" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="#ffd700" width="50" height="10"/>
-<rect opacity="0.3" width="50" height="1"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_settinggroup_tl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_settinggroup_tl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#ffd700" d="M10,10H0V6c0-3.313,2.687-6,6-6h4V10z"/>
-<path opacity="0.3" d="M1.001,6c0-2.756,2.241-5,4.999-5h4V0H6C2.687,0,0,2.687,0,6v4h1.001V6z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_settinggroup_tr.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_settinggroup_tr.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#ffd700" d="M0,10h10V6c0-3.313-2.686-6-6.001-6H0V10z"/>
-<path opacity="0.3" d="M3.998,1c2.758,0,5,2.244,5,5v4H10V6c0-3.313-2.686-6-6.001-6H0v1H3.998z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_settingitem_background_b.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_settingitem_background_b.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="50px" height="10px" viewBox="0 0 50 10" enable-background="new 0 0 50 10" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="#f8f8ff" width="50" height="10"/>
-<rect y="8.998" opacity="0.3" width="50" height="1.002"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_settingitem_background_bl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_settingitem_background_bl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#f8f8ff" d="M10,0H0v4c0,3.313,2.687,6,6,6h4V0z"/>
-<path opacity="0.3" d="M6,8.998C3.242,8.998,1.001,6.757,1.001,4V0H0v4c0,3.313,2.687,6,6,6h4V8.998H6z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_settingitem_background_br.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_settingitem_background_br.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#f8f8ff" d="M0,0h10v4c0,3.313-2.686,6-6.001,6H0V0z"/>
-<path opacity="0.3" d="M8.998,4c0,2.757-2.242,4.998-5,4.998H0V10h3.999C7.314,10,10,7.313,10,4V0H8.998V4z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_settingitem_background_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_settingitem_background_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="50px" height="30px" viewBox="0 0 50 30" enable-background="new 0 0 50 30" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="#f8f8ff" width="50" height="30"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_settingitem_background_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_settingitem_background_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="30px" viewBox="0 0 10 30" enable-background="new 0 0 10 30" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="#f8f8ff" width="10" height="30"/>
-<rect opacity="0.3" width="1.001" height="30"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_settingitem_background_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_settingitem_background_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="30px" viewBox="0 0 10 30" enable-background="new 0 0 10 30" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="#f8f8ff" width="10" height="30"/>
-<rect x="8.998" opacity="0.3" width="1.002" height="30"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_settingitem_background_t.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_settingitem_background_t.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="50px" height="10px" viewBox="0 0 50 10" enable-background="new 0 0 50 10" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="#f8f8ff" width="50" height="10"/>
-<rect opacity="0.3" width="50" height="1"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_settingitem_background_tl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_settingitem_background_tl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#f8f8ff" d="M10,10H0V6c0-3.313,2.687-6,6-6h4V10z"/>
-<path opacity="0.3" d="M1.001,6c0-2.756,2.241-5,4.999-5h4V0H6C2.687,0,0,2.687,0,6v4h1.001V6z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_settingitem_background_tr.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_settingitem_background_tr.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#f8f8ff" d="M0,10h10V6c0-3.313-2.686-6-6.001-6H0V10z"/>
-<path opacity="0.3" d="M3.998,1c2.758,0,5,2.244,5,5v4H10V6c0-3.313-2.686-6-6.001-6H0v1H3.998z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_status_latched_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_status_latched_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="198px" height="60px" viewBox="0 0 198 60" enable-background="new 0 0 198 60" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="99.0005" y1="60" x2="99.0005" y2="-0.1772">
-	<stop  offset="0" style="stop-color:#00B9FF"/>
-	<stop  offset="0.2458" style="stop-color:#00A0EE"/>
-	<stop  offset="0.563" style="stop-color:#0087DC"/>
-	<stop  offset="0.7527" style="stop-color:#007DD5"/>
-</linearGradient>
-<rect fill="url(#SVGID_1_)" width="198" height="60"/>
-<rect opacity="0.5" fill="#FFFFFF" width="198" height="1"/>
-<rect y="59" fill="#005EC2" width="198" height="1"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_status_latched_cl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_status_latched_cl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="21px" height="60px" viewBox="0 0 21 60" enable-background="new 0 0 21 60" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="11" y1="60" x2="11" y2="-0.1772">
-	<stop  offset="0" style="stop-color:#00B9FF"/>
-	<stop  offset="0.2458" style="stop-color:#00A0EE"/>
-	<stop  offset="0.563" style="stop-color:#0087DC"/>
-	<stop  offset="0.7527" style="stop-color:#007DD5"/>
-</linearGradient>
-<rect x="1" fill="url(#SVGID_1_)" width="20" height="60"/>
-<rect x="1" opacity="0.5" fill="#FFFFFF" width="20" height="1"/>
-<rect x="1" y="59" fill="#005EC2" width="20" height="1"/>
-<rect x="1" y="1" opacity="0.35" fill="#FFFFFF" width="1" height="59"/>
-<rect fill="none" width="1" height="60"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_status_latched_cr.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_status_latched_cr.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="21px" height="60px" viewBox="0 0 21 60" enable-background="new 0 0 21 60" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="10.0005" y1="60" x2="10.0005" y2="-0.1772">
-	<stop  offset="0" style="stop-color:#00B9FF"/>
-	<stop  offset="0.2458" style="stop-color:#00A0EE"/>
-	<stop  offset="0.563" style="stop-color:#0087DC"/>
-	<stop  offset="0.7527" style="stop-color:#007DD5"/>
-</linearGradient>
-<rect fill="url(#SVGID_1_)" width="20" height="60"/>
-<rect opacity="0.5" fill="#FFFFFF" width="20" height="1"/>
-<rect y="59" fill="#005EC2" width="20" height="1"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="131.7227" y1="1" x2="131.7227" y2="60.0005" gradientTransform="matrix(-0.9833 0 0 1 149.0223 0)">
-	<stop  offset="0.011" style="stop-color:#007DD5"/>
-	<stop  offset="1" style="stop-color:#005EC2"/>
-</linearGradient>
-<rect x="19" y="1" opacity="0.5" fill="url(#SVGID_2_)" width="1" height="59"/>
-<rect fill="none" width="21" height="60"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_status_latched_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_status_latched_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="60px" height="60px" viewBox="0 0 60 60" enable-background="new 0 0 60 60" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="30.0005" y1="60" x2="30.0005" y2="-0.1772">
-	<stop  offset="0" style="stop-color:#00B9FF"/>
-	<stop  offset="0.2458" style="stop-color:#00A0EE"/>
-	<stop  offset="0.563" style="stop-color:#0087DC"/>
-	<stop  offset="0.7527" style="stop-color:#007DD5"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" d="M0,0v50c0,5.523,4.477,10,10,10h50V0H0z"/>
-<rect opacity="0.5" fill="#FFFFFF" width="60" height="1"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="29.9995" y1="50" x2="29.9995" y2="60.0952">
-	<stop  offset="0.011" style="stop-color:#007DD5"/>
-	<stop  offset="1" style="stop-color:#005EC2"/>
-</linearGradient>
-<path fill="url(#SVGID_2_)" d="M10,59c-4.962,0-9-4.038-9-9H0c0,5.523,4.477,10,10,10h50v-1H10z"/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="59.5" y1="1" x2="59.5" y2="60.0005">
-	<stop  offset="0.011" style="stop-color:#007DD5"/>
-	<stop  offset="1" style="stop-color:#005EC2"/>
-</linearGradient>
-<rect x="59" y="1" opacity="0.5" fill="url(#SVGID_3_)" width="1" height="59"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_status_latched_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_status_latched_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="60px" height="60px" viewBox="0 0 60 60" enable-background="new 0 0 60 60" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="30.0005" y1="60" x2="30.0005" y2="-0.1772">
-	<stop  offset="0" style="stop-color:#00B9FF"/>
-	<stop  offset="0.2458" style="stop-color:#00A0EE"/>
-	<stop  offset="0.563" style="stop-color:#0087DC"/>
-	<stop  offset="0.7527" style="stop-color:#007DD5"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" d="M60,0v50c0,5.523-4.477,10-10,10H0V0H60z"/>
-<rect opacity="0.5" fill="#FFFFFF" width="60" height="1"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="161.3828" y1="50" x2="161.3828" y2="60.0952" gradientTransform="matrix(-0.9833 0 0 1 188.6884 0)">
-	<stop  offset="0.011" style="stop-color:#007DD5"/>
-	<stop  offset="1" style="stop-color:#005EC2"/>
-</linearGradient>
-<path fill="url(#SVGID_2_)" d="M50,59c4.962,0,9-4.038,9-9h1c0,5.523-4.477,10-10,10H0v-1H50z"/>
-<rect y="1" opacity="0.35" fill="#FFFFFF" width="1" height="59"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_status_normal_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_status_normal_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="198px" height="60px" viewBox="0 0 198 60" enable-background="new 0 0 198 60" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="98.9995" y1="0" x2="98.9995" y2="60.0005">
-	<stop  offset="0" style="stop-color:#00B9FF"/>
-	<stop  offset="0.2458" style="stop-color:#00A0EE"/>
-	<stop  offset="0.563" style="stop-color:#0087DC"/>
-	<stop  offset="0.7527" style="stop-color:#007DD5"/>
-</linearGradient>
-<rect fill="url(#SVGID_1_)" width="198" height="60"/>
-<rect opacity="0.5" fill="#FFFFFF" width="198" height="1"/>
-<rect y="59" fill="#005EC2" width="198" height="1"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_status_normal_cl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_status_normal_cl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="21px" height="60px" viewBox="0 0 21 60" enable-background="new 0 0 21 60" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="10.9995" y1="0" x2="10.9995" y2="60.0005">
-	<stop  offset="0" style="stop-color:#00B9FF"/>
-	<stop  offset="0.2458" style="stop-color:#00A0EE"/>
-	<stop  offset="0.563" style="stop-color:#0087DC"/>
-	<stop  offset="0.7527" style="stop-color:#007DD5"/>
-</linearGradient>
-<rect x="1" fill="url(#SVGID_1_)" width="20" height="60"/>
-<rect x="1" opacity="0.5" fill="#FFFFFF" width="20" height="1"/>
-<rect x="1" y="59" fill="#005EC2" width="20" height="1"/>
-<rect x="1" y="1" opacity="0.35" fill="#FFFFFF" width="1" height="59"/>
-<rect fill="none" width="1" height="60"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_status_normal_cr.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_status_normal_cr.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="21px" height="60px" viewBox="0 0 21 60" enable-background="new 0 0 21 60" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="9.9995" y1="0" x2="9.9995" y2="60.0005">
-	<stop  offset="0" style="stop-color:#00B9FF"/>
-	<stop  offset="0.2458" style="stop-color:#00A0EE"/>
-	<stop  offset="0.563" style="stop-color:#0087DC"/>
-	<stop  offset="0.7527" style="stop-color:#007DD5"/>
-</linearGradient>
-<rect fill="url(#SVGID_1_)" width="20" height="60"/>
-<rect opacity="0.5" fill="#FFFFFF" width="20" height="1"/>
-<rect y="59" fill="#005EC2" width="20" height="1"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="131.7227" y1="1" x2="131.7227" y2="60.0005" gradientTransform="matrix(-0.9833 0 0 1 149.0223 0)">
-	<stop  offset="0.011" style="stop-color:#007DD5"/>
-	<stop  offset="1" style="stop-color:#005EC2"/>
-</linearGradient>
-<rect x="19" y="1" opacity="0.5" fill="url(#SVGID_2_)" width="1" height="59"/>
-<rect fill="none" width="21" height="60"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_status_normal_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_status_normal_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="60px" height="60px" viewBox="0 0 60 60" enable-background="new 0 0 60 60" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="29.9995" y1="0" x2="29.9995" y2="60.0005">
-	<stop  offset="0" style="stop-color:#00B9FF"/>
-	<stop  offset="0.2458" style="stop-color:#00A0EE"/>
-	<stop  offset="0.563" style="stop-color:#0087DC"/>
-	<stop  offset="0.7527" style="stop-color:#007DD5"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" d="M0,0v50c0,5.523,4.477,10,10,10h50V0H0z"/>
-<rect opacity="0.5" fill="#FFFFFF" width="60" height="1"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="29.9995" y1="50" x2="29.9995" y2="60.0952">
-	<stop  offset="0.011" style="stop-color:#007DD5"/>
-	<stop  offset="1" style="stop-color:#005EC2"/>
-</linearGradient>
-<path fill="url(#SVGID_2_)" d="M10,59c-4.962,0-9-4.038-9-9H0c0,5.523,4.477,10,10,10h50v-1H10z"/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="59.5" y1="1" x2="59.5" y2="60.0005">
-	<stop  offset="0.011" style="stop-color:#007DD5"/>
-	<stop  offset="1" style="stop-color:#005EC2"/>
-</linearGradient>
-<rect x="59" y="1" opacity="0.5" fill="url(#SVGID_3_)" width="1" height="59"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_status_normal_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_status_normal_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="60px" height="60px" viewBox="0 0 60 60" enable-background="new 0 0 60 60" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="161.1016" y1="0" x2="161.1016" y2="60.0005" gradientTransform="matrix(-0.9833 0 0 1 188.4159 0)">
-	<stop  offset="0" style="stop-color:#00B9FF"/>
-	<stop  offset="0.2458" style="stop-color:#00A0EE"/>
-	<stop  offset="0.563" style="stop-color:#0087DC"/>
-	<stop  offset="0.7527" style="stop-color:#007DD5"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" d="M60,0v50c0,5.523-4.477,10-10,10H0V0H60z"/>
-<rect opacity="0.5" fill="#FFFFFF" width="60" height="1"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="161.1016" y1="50" x2="161.1016" y2="60.0952" gradientTransform="matrix(-0.9833 0 0 1 188.4159 0)">
-	<stop  offset="0.011" style="stop-color:#007DD5"/>
-	<stop  offset="1" style="stop-color:#005EC2"/>
-</linearGradient>
-<path fill="url(#SVGID_2_)" d="M50,59c4.962,0,9-4.038,9-9h1c0,5.523-4.477,10-10,10H0v-1H50z"/>
-<rect y="1" opacity="0.35" fill="#FFFFFF" width="1" height="59"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_status_pressed_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_status_pressed_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="198px" height="60px" viewBox="0 0 198 60" enable-background="new 0 0 198 60" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="98.9995" y1="0" x2="98.9995" y2="60.0005">
-	<stop  offset="0" style="stop-color:#8CE0FF"/>
-	<stop  offset="0.1167" style="stop-color:#78D6F9"/>
-	<stop  offset="0.4027" style="stop-color:#4DBFED"/>
-	<stop  offset="0.6262" style="stop-color:#33B0E5"/>
-	<stop  offset="0.7582" style="stop-color:#29ABE2"/>
-</linearGradient>
-<rect fill="url(#SVGID_1_)" width="198" height="60"/>
-<rect opacity="0.5" fill="#FFFFFF" width="198" height="1"/>
-<rect y="59" fill="#2B8FFF" width="198" height="1"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_status_pressed_cl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_status_pressed_cl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="21px" height="60px" viewBox="0 0 21 60" enable-background="new 0 0 21 60" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="10.9995" y1="0" x2="10.9995" y2="60.0005">
-	<stop  offset="0" style="stop-color:#8CE0FF"/>
-	<stop  offset="0.1167" style="stop-color:#78D6F9"/>
-	<stop  offset="0.4027" style="stop-color:#4DBFED"/>
-	<stop  offset="0.6262" style="stop-color:#33B0E5"/>
-	<stop  offset="0.7582" style="stop-color:#29ABE2"/>
-</linearGradient>
-<rect x="1" fill="url(#SVGID_1_)" width="20" height="60"/>
-<rect x="1" opacity="0.5" fill="#FFFFFF" width="20" height="1"/>
-<rect x="1" y="59" fill="#2B8FFF" width="20" height="1"/>
-<rect x="1" y="1" opacity="0.35" fill="#FFFFFF" width="1" height="59"/>
-<rect fill="none" width="21" height="60"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_status_pressed_cr.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_status_pressed_cr.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="21px" height="60px" viewBox="0 0 21 60" enable-background="new 0 0 21 60" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="9.9995" y1="0" x2="9.9995" y2="60.0005">
-	<stop  offset="0" style="stop-color:#8CE0FF"/>
-	<stop  offset="0.1167" style="stop-color:#78D6F9"/>
-	<stop  offset="0.4027" style="stop-color:#4DBFED"/>
-	<stop  offset="0.6262" style="stop-color:#33B0E5"/>
-	<stop  offset="0.7582" style="stop-color:#29ABE2"/>
-</linearGradient>
-<rect fill="url(#SVGID_1_)" width="20" height="60"/>
-<rect opacity="0.5" fill="#FFFFFF" width="20" height="1"/>
-<rect y="59" fill="#2B8FFF" width="20" height="1"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="131.7227" y1="1" x2="131.7227" y2="60.0005" gradientTransform="matrix(-0.9833 0 0 1 149.0223 0)">
-	<stop  offset="0.011" style="stop-color:#007DD5"/>
-	<stop  offset="1" style="stop-color:#005EC2"/>
-</linearGradient>
-<rect x="19" y="1" opacity="0.35" fill="url(#SVGID_2_)" width="1" height="59"/>
-<rect fill="none" width="21" height="60"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_status_pressed_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_status_pressed_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="60px" height="60px" viewBox="0 0 60 60" enable-background="new 0 0 60 60" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="29.9995" y1="0" x2="29.9995" y2="60.0005">
-	<stop  offset="0" style="stop-color:#8CE0FF"/>
-	<stop  offset="0.1167" style="stop-color:#78D6F9"/>
-	<stop  offset="0.4027" style="stop-color:#4DBFED"/>
-	<stop  offset="0.6262" style="stop-color:#33B0E5"/>
-	<stop  offset="0.7582" style="stop-color:#29ABE2"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" d="M0,0v50c0,5.523,4.477,10,10,10h50V0H0z"/>
-<rect opacity="0.5" fill="#FFFFFF" width="60" height="1"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="29.9995" y1="50" x2="29.9995" y2="60.0952">
-	<stop  offset="0" style="stop-color:#29ABE2"/>
-	<stop  offset="1" style="stop-color:#2B8FFF"/>
-</linearGradient>
-<path fill="url(#SVGID_2_)" d="M10,59c-4.962,0-9-4.038-9-9H0c0,5.523,4.477,10,10,10h50v-1H10z"/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="59.5" y1="1" x2="59.5" y2="60.0005">
-	<stop  offset="0.011" style="stop-color:#007DD5"/>
-	<stop  offset="1" style="stop-color:#005EC2"/>
-</linearGradient>
-<rect x="59" y="1" opacity="0.35" fill="url(#SVGID_3_)" width="1" height="59"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_status_pressed_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_status_pressed_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="60px" height="60px" viewBox="0 0 60 60" enable-background="new 0 0 60 60" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="161.1016" y1="0" x2="161.1016" y2="60.0005" gradientTransform="matrix(-0.9833 0 0 1 188.4159 0)">
-	<stop  offset="0" style="stop-color:#8CE0FF"/>
-	<stop  offset="0.1167" style="stop-color:#78D6F9"/>
-	<stop  offset="0.4027" style="stop-color:#4DBFED"/>
-	<stop  offset="0.6262" style="stop-color:#33B0E5"/>
-	<stop  offset="0.7582" style="stop-color:#29ABE2"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" d="M60,0v50c0,5.523-4.477,10-10,10H0V0H60z"/>
-<rect opacity="0.5" fill="#FFFFFF" width="60" height="1"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="161.1016" y1="50" x2="161.1016" y2="60.0952" gradientTransform="matrix(-0.9833 0 0 1 188.4159 0)">
-	<stop  offset="0" style="stop-color:#29ABE2"/>
-	<stop  offset="1" style="stop-color:#2B8FFF"/>
-</linearGradient>
-<path fill="url(#SVGID_2_)" d="M50,59c4.962,0,9-4.038,9-9h1c0,5.523-4.477,10-10,10H0v-1H50z"/>
-<rect y="1" opacity="0.35" fill="#FFFFFF" width="1" height="59"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_status_trans_latched_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_status_trans_latched_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="60px" height="60px" viewBox="0 0 60 60" enable-background="new 0 0 60 60" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="30.0005" y1="59.668" x2="30.0005" y2="-0.3315">
-	<stop  offset="0" style="stop-color:#4D4D4D"/>
-	<stop  offset="1" style="stop-color:#000000"/>
-</linearGradient>
-<rect opacity="0.6" fill="url(#SVGID_1_)" width="60" height="60"/>
-<rect opacity="0.4" fill="#FFFFFF" width="60" height="1"/>
-<rect y="59" opacity="0.4" fill="#FFFFFF" width="60" height="1"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_status_trans_latched_cl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_status_trans_latched_cl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="60px" height="60px" viewBox="0 0 60 60" enable-background="new 0 0 60 60" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="30.0005" y1="59.668" x2="30.0005" y2="-0.3315">
-	<stop  offset="0" style="stop-color:#4D4D4D"/>
-	<stop  offset="1" style="stop-color:#000000"/>
-</linearGradient>
-<rect opacity="0.6" fill="url(#SVGID_1_)" width="60" height="60"/>
-<polygon opacity="0.4" fill="#FFFFFF" points="60,1 60,0 0,0 0,60 60,60 60,59 1,59 1,1 "/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_status_trans_latched_cr.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_status_trans_latched_cr.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="60px" height="60px" viewBox="0 0 60 60" enable-background="new 0 0 60 60" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="30.0005" y1="59.668" x2="30.0005" y2="-0.3315" gradientTransform="matrix(-1 0 0 1 60 0)">
-	<stop  offset="0" style="stop-color:#4D4D4D"/>
-	<stop  offset="1" style="stop-color:#000000"/>
-</linearGradient>
-<rect opacity="0.6" fill="url(#SVGID_1_)" width="60" height="60"/>
-<polygon opacity="0.4" fill="#FFFFFF" points="0,1 0,0 60,0 60,60 0,60 0,59 59,59 59,1 "/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_status_trans_latched_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_status_trans_latched_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="60px" height="60px" viewBox="0 0 60 60" enable-background="new 0 0 60 60" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="30.0005" y1="59.668" x2="30.0005" y2="-0.3315">
-	<stop  offset="0" style="stop-color:#4D4D4D"/>
-	<stop  offset="1" style="stop-color:#000000"/>
-</linearGradient>
-<path opacity="0.6" fill="url(#SVGID_1_)" d="M0,0v50c0,5.523,4.477,10,10,10h50V0H0z"/>
-<path opacity="0.4" fill="#FFFFFF" d="M0,0v50c0,5.523,4.477,10,10,10h50V0H0z M59.001,59.001H9.999c-4.963,0-9-4.037-9-9.001V0.999
-	h58.002V59.001z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_status_trans_latched_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_status_trans_latched_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="60px" height="60px" viewBox="0 0 60 60" enable-background="new 0 0 60 60" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="30.0005" y1="59.668" x2="30.0005" y2="-0.3315" gradientTransform="matrix(-1 0 0 1 60 0)">
-	<stop  offset="0" style="stop-color:#4D4D4D"/>
-	<stop  offset="1" style="stop-color:#000000"/>
-</linearGradient>
-<path opacity="0.6" fill="url(#SVGID_1_)" d="M60,0v50c0,5.523-4.477,10-10,10H0V0H60z"/>
-<path opacity="0.4" fill="#FFFFFF" d="M0,0v60h50c5.523,0,10-4.477,10-10V0H0z M0.999,0.999h58.002V50c0,4.964-4.037,9.001-9,9.001
-	H0.999V0.999z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_status_trans_normal_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_status_trans_normal_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="60px" height="60px" viewBox="0 0 60 60" enable-background="new 0 0 60 60" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="29.9995" y1="0" x2="29.9995" y2="59.6665">
-	<stop  offset="0" style="stop-color:#4D4D4D"/>
-	<stop  offset="1" style="stop-color:#000000"/>
-</linearGradient>
-<rect opacity="0.6" fill="url(#SVGID_1_)" width="60" height="60"/>
-<rect opacity="0.4" fill="#FFFFFF" width="60" height="1"/>
-<rect y="59" opacity="0.4" fill="#FFFFFF" width="60" height="1"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_status_trans_normal_cl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_status_trans_normal_cl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="60px" height="60px" viewBox="0 0 60 60" enable-background="new 0 0 60 60" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="29.9995" y1="0" x2="29.9995" y2="59.6665">
-	<stop  offset="0" style="stop-color:#4D4D4D"/>
-	<stop  offset="1" style="stop-color:#000000"/>
-</linearGradient>
-<rect opacity="0.6" fill="url(#SVGID_1_)" width="60" height="60"/>
-<polygon opacity="0.4" fill="#FFFFFF" points="60,1 60,0 0,0 0,60 60,60 60,59 1,59 1,1 "/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_status_trans_normal_cr.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_status_trans_normal_cr.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="60px" height="60px" viewBox="0 0 60 60" enable-background="new 0 0 60 60" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="29.9995" y1="0" x2="29.9995" y2="59.6665" gradientTransform="matrix(-1 0 0 1 60 0)">
-	<stop  offset="0" style="stop-color:#4D4D4D"/>
-	<stop  offset="1" style="stop-color:#000000"/>
-</linearGradient>
-<rect opacity="0.6" fill="url(#SVGID_1_)" width="60" height="60"/>
-<polygon opacity="0.4" fill="#FFFFFF" points="0,1 0,0 60,0 60,60 0,60 0,59 59,59 59,1 "/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_status_trans_normal_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_status_trans_normal_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="60px" height="60px" viewBox="0 0 60 60" enable-background="new 0 0 60 60" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="29.9995" y1="0" x2="29.9995" y2="59.6665">
-	<stop  offset="0" style="stop-color:#4D4D4D"/>
-	<stop  offset="1" style="stop-color:#000000"/>
-</linearGradient>
-<path opacity="0.6" fill="url(#SVGID_1_)" d="M0,0v50c0,5.523,4.477,10,10,10h50V0H0z"/>
-<path opacity="0.4" fill="#FFFFFF" d="M0,0v50c0,5.523,4.477,10,10,10h50V0H0z M59,59.001H10c-4.963,0-9-4.037-9-9.001V0.999H59
-	V59.001z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_status_trans_normal_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_status_trans_normal_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="60px" height="60px" viewBox="0 0 60 60" enable-background="new 0 0 60 60" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="29.9995" y1="0" x2="29.9995" y2="59.6665" gradientTransform="matrix(-1 0 0 1 60 0)">
-	<stop  offset="0" style="stop-color:#4D4D4D"/>
-	<stop  offset="1" style="stop-color:#000000"/>
-</linearGradient>
-<path opacity="0.6" fill="url(#SVGID_1_)" d="M60,0v50c0,5.523-4.477,10-10,10H0V0H60z"/>
-<path opacity="0.4" fill="#FFFFFF" d="M0,0v60h50c5.523,0,10-4.477,10-10V0H0z M1,0.999h58.001V50c0,4.964-4.037,9.001-9.001,9.001
-	H1V0.999z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_status_trans_pressed_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_status_trans_pressed_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="60px" height="60px" viewBox="0 0 60 60" enable-background="new 0 0 60 60" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="29.9995" y1="0" x2="29.9995" y2="59.6665">
-	<stop  offset="0" style="stop-color:#333333"/>
-	<stop  offset="1" style="stop-color:#000000"/>
-</linearGradient>
-<rect opacity="0.9" fill="url(#SVGID_1_)" width="60" height="60"/>
-<rect opacity="0.4" fill="#FFFFFF" width="60" height="1"/>
-<rect y="59" opacity="0.4" fill="#FFFFFF" width="60" height="1"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_status_trans_pressed_cl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_status_trans_pressed_cl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="60px" height="60px" viewBox="0 0 60 60" enable-background="new 0 0 60 60" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="29.9995" y1="0" x2="29.9995" y2="59.6665">
-	<stop  offset="0" style="stop-color:#333333"/>
-	<stop  offset="1" style="stop-color:#000000"/>
-</linearGradient>
-<rect opacity="0.9" fill="url(#SVGID_1_)" width="60" height="60"/>
-<polygon opacity="0.4" fill="#FFFFFF" points="60,1 60,0 0,0 0,60 60,60 60,59 1,59 1,1 "/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_status_trans_pressed_cr.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_status_trans_pressed_cr.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="60px" height="60px" viewBox="0 0 60 60" enable-background="new 0 0 60 60" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="29.9995" y1="0" x2="29.9995" y2="59.6665" gradientTransform="matrix(-1 0 0 1 60 0)">
-	<stop  offset="0" style="stop-color:#333333"/>
-	<stop  offset="1" style="stop-color:#000000"/>
-</linearGradient>
-<rect opacity="0.9" fill="url(#SVGID_1_)" width="60" height="60"/>
-<polygon opacity="0.4" fill="#FFFFFF" points="0,1 0,0 60,0 60,60 0,60 0,59 59,59 59,1 "/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_status_trans_pressed_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_status_trans_pressed_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="60px" height="60px" viewBox="0 0 60 60" enable-background="new 0 0 60 60" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="29.9995" y1="0" x2="29.9995" y2="59.6665">
-	<stop  offset="0" style="stop-color:#333333"/>
-	<stop  offset="1" style="stop-color:#000000"/>
-</linearGradient>
-<path opacity="0.9" fill="url(#SVGID_1_)" d="M0,0v50c0,5.523,4.477,10,10,10h50V0H0z"/>
-<path opacity="0.4" fill="#FFFFFF" d="M0,0v50c0,5.523,4.477,10,10,10h50V0H0z M59,59.001H10c-4.963,0-9-4.037-9-9.001V0.999H59
-	V59.001z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_status_trans_pressed_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_status_trans_pressed_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="60px" height="60px" viewBox="0 0 60 60" enable-background="new 0 0 60 60" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="29.9995" y1="0" x2="29.9995" y2="59.6665" gradientTransform="matrix(-1 0 0 1 60 0)">
-	<stop  offset="0" style="stop-color:#333333"/>
-	<stop  offset="1" style="stop-color:#000000"/>
-</linearGradient>
-<path opacity="0.9" fill="url(#SVGID_1_)" d="M60,0v50c0,5.523-4.477,10-10,10H0V0H60z"/>
-<path opacity="0.4" fill="#FFFFFF" d="M0,0v60h50c5.523,0,10-4.477,10-10V0H0z M1,0.999h58.001V50c0,4.964-4.037,9.001-9.001,9.001
-	H1V0.999z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_statusbar_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_statusbar_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_statusbar_l.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,5 +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="20px" version="1.1" viewBox="0 0 20 20" 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="20" width="20"/>
-<rect height="20" width="20"/>
+<rect height="20" width="19" x="1"/>
+<rect fill="#FFFFFF" fill-opacity="0.1" height="20" stroke-opacity="0.1" width="2"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_statusbar_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_statusbar_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_statusbar_r.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,5 +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="20px" version="1.1" viewBox="0 0 20 20" 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="20" width="20"/>
-<rect height="20" width="20"/>
+<rect height="20" width="19"/>
+<rect fill="#FFFFFF" fill-opacity="0.1" height="20" stroke-opacity="0.1" width="2" x="18"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_statusbar_trans_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_statusbar_trans_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_statusbar_trans_c.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,5 +2,5 @@
 <!DOCTYPE svg 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 20 20" 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="20" width="20"/>
-<rect fill-opacity="0.8" height="20" stroke-opacity="0.8" width="20"/>
+<rect fill-opacity="0.6" height="20" stroke-opacity="0.6" width="20"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_statusbar_trans_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_statusbar_trans_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_statusbar_trans_l.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,5 +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="20px" version="1.1" viewBox="0 0 20 20" 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="20" width="20"/>
-<rect fill-opacity="0.8" height="20" stroke-opacity="0.8" width="20"/>
+<rect fill-opacity="0.6" height="20" stroke-opacity="0.6" width="19" x="1"/>
+<rect fill="#FFFFFF" fill-opacity="0.1" height="20" stroke-opacity="0.1" width="2"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_statusbar_trans_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_statusbar_trans_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_statusbar_trans_r.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,5 +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="20px" version="1.1" viewBox="0 0 20 20" 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="20" width="20"/>
-<rect fill-opacity="0.8" height="20" stroke-opacity="0.8" width="20"/>
+<rect fill-opacity="0.6" height="20" stroke-opacity="0.6" width="19"/>
+<rect fill="#FFFFFF" fill-opacity="0.1" height="20" stroke-opacity="0.1" width="2" x="18"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_active_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_active_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_active_c.svg	Mon May 03 12:48:33 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="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
 <rect fill="none" height="55" width="55"/>
-<g>
-<rect fill="url(#SVGID_1_)" height="55" width="55"/>
+<rect fill="url(#SVGID_1_)" fill-opacity="0.5" fill-rule="evenodd" height="55" stroke-opacity="0.5" width="55"/>
+<rect fill="#FFFFFF" fill-opacity="0.4" fill-rule="evenodd" height="1" stroke-opacity="0.4" width="55"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="27.5005" x2="27.5005" y1="55" y2="4.882813e-004">
-<stop offset="0" style="stop-color:#FAFAFA"/>
-<stop offset="0.8" style="stop-color:#FAFAFA"/>
-<stop offset="1" style="stop-color:#EBEBF5"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="27.4995" x2="27.4995" y1="0" y2="55.0005">
+<stop offset="0" style="stop-color:#1E1E1E"/>
+<stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 </defs>
-</g>
-<rect fill="#DCDCDC" height="1" width="55"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_active_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_active_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_active_l.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,18 +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="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
 <rect fill="none" height="55" width="55"/>
-<path d="M1.181,54.903c-0.264,0.034-0.493,0.058-0.676,0.071C0.733,54.96,0.958,54.937,1.181,54.903z" fill="#DCDCDC"/>
-<path d="M0.505,54.975C0.337,54.984,0.17,55,0,55C0,55,0.195,54.997,0.505,54.975z" fill="#DCDCDC"/>
-<g>
-<path d="M16,0c-4.4,0-8,3.6-8,8v39c0,4.418-3.582,8-8,8h55V0H16z" fill="url(#SVGID_1_)"/>
+<path d="M55,0H30c-6.627,0-11.016,4.881-12,12l-6,32  c-1.723,6.381-5.377,11-12,11h55V0z" fill="url(#SVGID_1_)" fill-opacity="0.5" fill-rule="evenodd" stroke-opacity="0.5"/>
+<path d="M1.203,54.914C0.813,54.949,0.412,54.967,0,54.967  C0,54.967,0.48,54.962,1.203,54.914z M30,0c-6.627,0-11.016,4.877-12,11.992l-6,31.98c-1.615,5.978-4.928,10.409-10.791,10.94  c1.551-0.104,4.217-0.411,5.696-1.313c2.985-1.82,4.95-4.822,6.173-9.365l6.02-32.057C20.053,5.264,24.273,1,30.114,1H55V0H30z" fill="#FFFFFF" fill-opacity="0.4" fill-rule="evenodd" stroke-opacity="0.4"/>
+<rect fill="none" fill-rule="evenodd" height="55" width="55"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="27.5" x2="27.5" y1="55" y2="4.882813e-004">
-<stop offset="0" style="stop-color:#FAFAFA"/>
-<stop offset="0.8" style="stop-color:#FAFAFA"/>
-<stop offset="1" style="stop-color:#EBEBF5"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="27.5" x2="27.5" y1="0" y2="55.0005">
+<stop offset="0" style="stop-color:#1E1E1E"/>
+<stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 </defs>
-</g>
-<path d="M16,0c-4.4,0-8,3.6-8,8v39c0,4.016-2.962,7.331-6.819,7.903C3.616,54.588,9,53.195,9,47V8  c0-3.859,3.14-7,7-7h39V0H16z" fill="#DCDCDC"/>
-<rect fill="none" height="55" width="55"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_active_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_active_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_active_r.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,18 +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="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
 <rect fill="none" height="55" width="55"/>
-<path d="M54.495,54.975C54.805,54.997,55,55,55,55C54.83,55,54.663,54.984,54.495,54.975z" fill="#DCDCDC"/>
-<path d="M53.818,54.903c0.223,0.033,0.448,0.057,0.677,0.071C54.312,54.961,54.082,54.938,53.818,54.903z" fill="#DCDCDC"/>
-<g>
-<path d="M55,55c-4.418,0-8-3.582-8-8V8c0-4.4-3.6-8-8-8H0v55H55z" fill="url(#SVGID_1_)"/>
+<path d="M0,0h25c6.627,0,11.016,4.881,11.999,12  l6.002,32C44.723,50.381,48.377,55,55,55H0V0z" fill="url(#SVGID_1_)" fill-opacity="0.5" fill-rule="evenodd" stroke-opacity="0.5"/>
+<path d="M53.797,54.914c0.389,0.035,0.79,0.053,1.203,0.053  C55,54.967,54.521,54.962,53.797,54.914z M25,0c6.627,0,11.016,4.877,11.999,11.992l6.002,31.98  c1.614,5.978,4.926,10.409,10.79,10.94c-1.552-0.104-4.217-0.411-5.697-1.313c-2.984-1.82-4.949-4.822-6.172-9.365l-6.02-32.057  C34.947,5.264,30.727,1,24.886,1H0V0H25z" fill="#FFFFFF" fill-opacity="0.4" fill-rule="evenodd" stroke-opacity="0.4"/>
+<rect fill="none" height="55" width="55"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="27.5" x2="27.5" y1="55" y2="4.882813e-004">
-<stop offset="0" style="stop-color:#FAFAFA"/>
-<stop offset="0.8" style="stop-color:#FAFAFA"/>
-<stop offset="1" style="stop-color:#EBEBF5"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="27.5" x2="27.5" y1="0" y2="55.0005">
+<stop offset="0" style="stop-color:#1E1E1E"/>
+<stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 </defs>
-</g>
-<path d="M47,47V8c0-4.4-3.6-8-8-8H0v1h39c3.859,0,7,3.141,7,7v39c0,6.195,5.384,7.588,7.818,7.903  C49.962,54.331,47,51.016,47,47z" fill="#DCDCDC"/>
-<rect fill="none" height="55" width="55"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_mask_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_mask_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_mask_c.svg	Mon May 03 12:48:33 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="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g>
-<rect height="55" width="55"/>
-</g>
+<rect fill="none" height="55" width="55"/>
+<rect fill-rule="evenodd" height="55" width="55"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_mask_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_mask_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_mask_l.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,8 +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="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
 <rect fill="none" height="55" width="55"/>
-<rect fill="none" height="55" width="55" x="0"/>
-<g>
-<path d="M16,0c-4.4,0-8,3.6-8,8v39c0,4.418-3.582,8-8,8h55V0H16z"/>
-</g>
+<path d="M55,0H30c-6.627,0-11.016,4.881-12,12l-6,32c-1.723,6.381-5.377,11-12,11h55V0z" fill-rule="evenodd"/>
+<rect fill="none" fill-rule="evenodd" height="55" width="55"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_mask_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_mask_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_mask_r.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,8 +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="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
 <rect fill="none" height="55" width="55"/>
-<rect fill="none" height="55" width="55"/>
-<g>
-<path d="M55,55c-4.418,0-8-3.582-8-8V8c0-4.4-3.6-8-8-8H0v55H55z"/>
-</g>
+<path d="M0,0h25c6.627,0,11.016,4.881,11.999,12l6.002,32C44.723,50.381,48.377,55,55,55H0  V0z" fill-rule="evenodd"/>
+<rect fill="none" fill-rule="evenodd" height="55" width="55"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_passive_normal_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_passive_normal_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_passive_normal_c.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,18 +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="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
 <rect fill="none" height="55" width="55"/>
-<g>
-<rect fill="url(#SVGID_1_)" height="55" width="55"/>
+<rect fill="url(#SVGID_1_)" fill-rule="evenodd" height="55" width="55"/>
+<rect fill="#FFFFFF" fill-opacity="0.4" fill-rule="evenodd" height="1" stroke-opacity="0.4" width="55"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="27.4995" x2="27.4995" y1="0" y2="55.0005">
-<stop offset="0" style="stop-color:#F0F0F0"/>
-<stop offset="0.85" style="stop-color:#C8C8D2"/>
-<stop offset="1" style="stop-color:#AAAAB4"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="27.4995" x2="27.4995" y1="1" y2="55">
+<stop offset="0" style="stop-color:#787878"/>
+<stop offset="1" style="stop-color:#3C3C3C"/>
 </linearGradient>
 </defs>
-</g>
-<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="55"/>
-<g fill-opacity="0.2" stroke-opacity="0.2">
-<rect fill="#FFFFFF" height="1" width="55" y="1"/>
-</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_passive_normal_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_passive_normal_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_passive_normal_l.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,19 +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="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
 <rect fill="none" height="55" width="55"/>
-<g>
-<path d="M16,0c-4.4,0-8,3.6-8,8v39c0,4.418-3.582,8-8,8h55V0H16z" fill="url(#SVGID_1_)"/>
+<path d="M55,0H30c-6.627,0-11.016,4.881-12,12l-6,32  c-1.723,6.381-5.377,11-12,11h55V0z" fill="url(#SVGID_1_)" fill-rule="evenodd"/>
+<path d="M1.203,54.914C0.813,54.949,0.412,54.967,0,54.967  C0,54.967,0.48,54.962,1.203,54.914z M30,0c-6.627,0-11.016,4.877-12,11.992l-6,31.98c-1.615,5.978-4.928,10.409-10.791,10.94  c1.551-0.104,4.217-0.411,5.696-1.313c2.985-1.82,4.95-4.822,6.173-9.365l6.02-32.057C20.053,5.264,24.273,1,30.114,1H55V0H30z" fill="#FFFFFF" fill-opacity="0.4" fill-rule="evenodd" stroke-opacity="0.4"/>
+<rect fill="none" fill-rule="evenodd" height="55" width="55"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="27.5" x2="27.5" y1="0" y2="55.0005">
-<stop offset="0" style="stop-color:#F0F0F0"/>
-<stop offset="0.85" style="stop-color:#C8C8D2"/>
-<stop offset="1" style="stop-color:#AAAAB4"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="27.5" x2="27.5" y1="1" y2="55">
+<stop offset="0" style="stop-color:#787878"/>
+<stop offset="1" style="stop-color:#3C3C3C"/>
 </linearGradient>
 </defs>
-</g>
-<path d="M16,0c-4.4,0-8,3.6-8,8v39c0,4.016-2.962,7.331-6.819,7.903C3.616,54.588,9,53.195,9,47V8c0-3.859,3.14-7,7-7  h39V0H16z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<g fill-opacity="0.2" stroke-opacity="0.2">
-<path d="M16,1c-3.86,0-7,3.141-7,7v39c0,6.426-5.89,7.792-8.404,7.974C2.744,54.824,10,53.816,10,47V8   c0-3.309,2.691-6,6-6h39V1H16z" fill="#FFFFFF"/>
-</g>
-<rect fill="none" height="55" width="55"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_passive_normal_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_passive_normal_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_passive_normal_r.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,19 +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="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
 <rect fill="none" height="55" width="55"/>
-<g>
-<path d="M55,55c-4.418,0-8-3.582-8-8V8c0-4.4-3.6-8-8-8H0v55H55z" fill="url(#SVGID_1_)"/>
+<path d="M0,0h25c6.627,0,11.016,4.881,11.999,12l6.002,32  C44.723,50.381,48.377,55,55,55H0V0z" fill="url(#SVGID_1_)" fill-rule="evenodd"/>
+<path d="M53.797,54.914c0.389,0.035,0.79,0.053,1.203,0.053  C55,54.967,54.521,54.962,53.797,54.914z M25,0c6.627,0,11.016,4.877,11.999,11.992l6.002,31.98  c1.614,5.978,4.926,10.409,10.79,10.94c-1.552-0.104-4.217-0.411-5.697-1.313c-2.984-1.82-4.949-4.822-6.172-9.365l-6.02-32.057  C34.947,5.264,30.727,1,24.886,1H0V0H25z" fill="#FFFFFF" fill-opacity="0.4" fill-rule="evenodd" stroke-opacity="0.4"/>
+<rect fill="none" fill-rule="evenodd" height="55" width="55"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="27.5" x2="27.5" y1="0" y2="55.0005">
-<stop offset="0" style="stop-color:#F0F0F0"/>
-<stop offset="0.85" style="stop-color:#C8C8D2"/>
-<stop offset="1" style="stop-color:#AAAAB4"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="27.5" x2="27.5" y1="1" y2="55">
+<stop offset="0" style="stop-color:#787878"/>
+<stop offset="1" style="stop-color:#3C3C3C"/>
 </linearGradient>
 </defs>
-</g>
-<path d="M47,47V8c0-4.4-3.6-8-8-8H0v1h39c3.859,0,7,3.141,7,7v39c0,6.195,5.384,7.588,7.818,7.903  C49.962,54.331,47,51.016,47,47z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<g fill-opacity="0.2" stroke-opacity="0.2">
-<path d="M46,47V8c0-3.859-3.141-7-7-7H0v1h39c3.309,0,6,2.691,6,6v39c0,6.816,7.256,7.824,9.404,7.974   C51.89,54.792,46,53.426,46,47z" fill="#FFFFFF"/>
-</g>
-<rect fill="none" height="55" width="55"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_passive_pressed_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_passive_pressed_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_passive_pressed_c.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,17 +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="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
 <rect fill="none" height="55" width="55"/>
-<g>
-<rect fill="url(#SVGID_1_)" height="55" width="55"/>
+<rect fill="url(#SVGID_1_)" fill-rule="evenodd" height="55" width="55"/>
+<rect fill="#FFFFFF" fill-opacity="0.4" fill-rule="evenodd" height="1" stroke-opacity="0.4" width="55"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="27.4995" x2="27.4995" y1="0" y2="55.0005">
-<stop offset="0" style="stop-color:#AAAAB4"/>
-<stop offset="1" style="stop-color:#D2D2DC"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="27.5005" x2="27.5005" y1="54.666" y2="1.2289">
+<stop offset="0" style="stop-color:#787878"/>
+<stop offset="1" style="stop-color:#3C3C3C"/>
 </linearGradient>
 </defs>
-</g>
-<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="55"/>
-<g fill-opacity="0.2" stroke-opacity="0.2">
-<rect fill="#FFFFFF" height="1" width="55" y="1"/>
-</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_passive_pressed_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_passive_pressed_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_passive_pressed_l.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,18 +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="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
 <rect fill="none" height="55" width="55"/>
-<g>
-<path d="M16,0c-4.4,0-8,3.6-8,8v39c0,4.418-3.582,8-8,8h55V0H16z" fill="url(#SVGID_1_)"/>
+<path d="M55,0H30c-6.627,0-11.016,4.881-12,12l-6,32  c-1.723,6.381-5.377,11-12,11h55V0z" fill="url(#SVGID_1_)" fill-rule="evenodd"/>
+<path d="M1.203,54.914C0.813,54.949,0.412,54.967,0,54.967  C0,54.967,0.48,54.962,1.203,54.914z M30,0c-6.627,0-11.016,4.877-12,11.992l-6,31.98c-1.615,5.978-4.928,10.409-10.791,10.94  c1.551-0.104,4.217-0.411,5.696-1.313c2.985-1.82,4.95-4.822,6.173-9.365l6.02-32.057C20.053,5.264,24.273,1,30.114,1H55V0H30z" fill="#FFFFFF" fill-opacity="0.4" fill-rule="evenodd" stroke-opacity="0.4"/>
+<rect fill="none" fill-rule="evenodd" height="55" width="55"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="27.5" x2="27.5" y1="0" y2="55.0005">
-<stop offset="0" style="stop-color:#AAAAB4"/>
-<stop offset="1" style="stop-color:#D2D2DC"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="27.5" x2="27.5" y1="54.666" y2="1.2289">
+<stop offset="0" style="stop-color:#787878"/>
+<stop offset="1" style="stop-color:#3C3C3C"/>
 </linearGradient>
 </defs>
-</g>
-<path d="M16,0c-4.4,0-8,3.6-8,8v39c0,4.016-2.962,7.331-6.819,7.903C3.616,54.588,9,53.195,9,47V8c0-3.859,3.14-7,7-7  h39V0H16z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<g fill-opacity="0.2" stroke-opacity="0.2">
-<path d="M16,1c-3.86,0-7,3.141-7,7v39c0,6.426-5.89,7.792-8.404,7.974C2.744,54.824,10,53.816,10,47V8   c0-3.309,2.691-6,6-6h39V1H16z" fill="#FFFFFF"/>
-</g>
-<rect fill="none" height="55" width="55"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_passive_pressed_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_passive_pressed_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_passive_pressed_r.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,18 +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="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
 <rect fill="none" height="55" width="55"/>
-<g>
-<path d="M55,55c-4.418,0-8-3.582-8-8V8c0-4.4-3.6-8-8-8H0v55H55z" fill="url(#SVGID_1_)"/>
+<path d="M0,0h25c6.627,0,11.016,4.881,11.999,12l6.002,32  C44.723,50.381,48.377,55,55,55H0V0z" fill="url(#SVGID_1_)" fill-rule="evenodd"/>
+<path d="M53.797,54.914c0.389,0.035,0.79,0.053,1.203,0.053  C55,54.967,54.521,54.962,53.797,54.914z M25,0c6.627,0,11.016,4.877,11.999,11.992l6.002,31.98  c1.614,5.978,4.926,10.409,10.79,10.94c-1.552-0.104-4.217-0.411-5.697-1.313c-2.984-1.82-4.949-4.822-6.172-9.365l-6.02-32.057  C34.947,5.264,30.727,1,24.886,1H0V0H25z" fill="#FFFFFF" fill-opacity="0.4" fill-rule="evenodd" stroke-opacity="0.4"/>
+<rect fill="none" fill-rule="evenodd" height="55" width="55"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="27.5" x2="27.5" y1="0" y2="55.0005">
-<stop offset="0" style="stop-color:#AAAAB4"/>
-<stop offset="1" style="stop-color:#D2D2DC"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="27.5" x2="27.5" y1="54.666" y2="1.2289">
+<stop offset="0" style="stop-color:#787878"/>
+<stop offset="1" style="stop-color:#3C3C3C"/>
 </linearGradient>
 </defs>
-</g>
-<path d="M47,47V8c0-4.4-3.6-8-8-8H0v1h39c3.859,0,7,3.141,7,7v39c0,6.195,5.384,7.588,7.818,7.903  C49.962,54.331,47,51.016,47,47z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<g fill-opacity="0.2" stroke-opacity="0.2">
-<path d="M46,47V8c0-3.859-3.141-7-7-7H0v1h39c3.309,0,6,2.691,6,6v39c0,6.816,7.256,7.824,9.404,7.974   C51.89,54.792,46,53.426,46,47z" fill="#FFFFFF"/>
-</g>
-<rect fill="none" height="55" width="55"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_ext_b.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_ext_b.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="336px" height="10px" viewBox="0 0 336 10" enable-background="new 0 0 336 10" xml:space="preserve">
-<defs>
-</defs>
-<rect opacity="0.8" width="336" height="10"/>
-<rect y="8.998" fill="#FFFFFF" width="336" height="1.002"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_ext_bl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_ext_bl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
-<defs>
-</defs>
-<path opacity="0.8" d="M10,0H0v3c0,3.313,3.687,7,7,7h3V0z"/>
-<path fill="#FFFFFF" d="M6,8.998C3.242,8.998,1.001,6.757,1.001,4V0H0v4c0,3.313,2.687,6,6,6h4V8.998H6z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_ext_br.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_ext_br.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
-<defs>
-</defs>
-<path opacity="0.8" d="M0,0h10v3c0,3.313-3.686,7-7.001,7H0V0z"/>
-<path fill="#FFFFFF" d="M8.998,4c0,2.757-2.242,4.998-5,4.998H0V10h3.999C7.314,10,10,7.313,10,4V0H8.998V4z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_ext_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_ext_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="336px" height="200px" viewBox="0 0 336 200" enable-background="new 0 0 336 200" xml:space="preserve">
-<defs>
-</defs>
-<rect opacity="0.8" width="336" height="200"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_ext_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_ext_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="200px" viewBox="0 0 10 200" enable-background="new 0 0 10 200" xml:space="preserve">
-<defs>
-</defs>
-<rect opacity="0.8" width="10" height="200"/>
-<rect fill="#FFFFFF" width="1.001" height="200"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_ext_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_ext_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="200px" viewBox="0 0 10 200" enable-background="new 0 0 10 200" xml:space="preserve">
-<defs>
-</defs>
-<rect opacity="0.8" width="10" height="200"/>
-<rect x="8.998" fill="#FFFFFF" width="1.002" height="200"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_ext_t.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_ext_t.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="336px" height="10px" viewBox="0 0 336 10" enable-background="new 0 0 336 10" xml:space="preserve">
-<defs>
-</defs>
-<rect opacity="0.8" width="336" height="10"/>
-<rect fill="#FFFFFF" width="336" height="1"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_ext_tl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_ext_tl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
-<defs>
-</defs>
-<path opacity="0.8" d="M10,10H0V7c0-3.313,3.687-7,7-7h3V10z"/>
-<path fill="#FFFFFF" d="M1.001,6c0-2.756,2.241-5,4.999-5h4V0H6C2.687,0,0,2.687,0,6v4h1.001V6z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_ext_tr.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_ext_tr.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
-<defs>
-</defs>
-<path opacity="0.8" d="M0,10h10V7c0-3.313-3.686-7-7.001-7H0V10z"/>
-<path fill="#FFFFFF" d="M3.998,1c2.758,0,5,2.244,5,5v4H10V6c0-3.313-2.686-6-6.001-6H0v1H3.998z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_disabled_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_disabled_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_disabled_c.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,13 +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="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="url(#SVGID_1_)" height="60" width="30"/>
-<rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="30" y="59"/>
-<rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="30"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15.0005" x2="15.0005" y1="59.667" y2="0.2582">
-<stop offset="0" style="stop-color:#D2D2D2"/>
-<stop offset="1" style="stop-color:#AAAAAA"/>
-</linearGradient>
-</defs>
+<rect fill="none" height="60" width="30" y="0"/>
+<rect fill="#AAAAAA" fill-opacity="0.8" height="60" stroke-opacity="0.8" width="30"/>
+<rect fill="#646464" fill-opacity="0.5" height="1" stroke-opacity="0.5" width="30" y="59"/>
+<rect fill="#646464" fill-opacity="0.5" height="1" stroke-opacity="0.5" width="30"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_disabled_cl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_disabled_cl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_disabled_cl.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,12 +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="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" y="0"/>
-<rect fill="url(#SVGID_1_)" height="60" width="30" x="0"/>
-<polygon fill-opacity="0.1" points="1,59 1,1 30,1 30,0 0,0 0,60 30,60 30,59 " stroke-opacity="0.1"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15.0005" x2="15.0005" y1="59.667" y2="0.2582">
-<stop offset="0" style="stop-color:#D2D2D2"/>
-<stop offset="1" style="stop-color:#AAAAAA"/>
-</linearGradient>
-</defs>
+<rect fill="#AAAAAA" fill-opacity="0.8" height="60" stroke-opacity="0.8" width="30"/>
+<polygon fill="#646464" fill-opacity="0.5" points="1,59 1,1 30,1 30,0 0,0 0,60 30,60 30,59 " stroke-opacity="0.5"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_disabled_cr.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_disabled_cr.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_disabled_cr.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,12 +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="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" y="0"/>
-<rect fill="url(#SVGID_1_)" height="60" width="30"/>
-<polygon fill-opacity="0.1" points="30,0 0,0 0,1 29,1 29,59 0,59 0,60 30,60 " stroke-opacity="0.1"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="59.667" y2="0.2582">
-<stop offset="0" style="stop-color:#D2D2D2"/>
-<stop offset="1" style="stop-color:#AAAAAA"/>
-</linearGradient>
-</defs>
+<rect fill="#AAAAAA" fill-opacity="0.8" height="60" stroke-opacity="0.8" width="30"/>
+<polygon fill="#646464" fill-opacity="0.5" points="30,0 0,0 0,1 29,1 29,59 0,59 0,60 30,60 " stroke-opacity="0.5"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_disabled_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_disabled_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_disabled_l.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,12 +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="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" y="0"/>
-<rect fill="url(#SVGID_1_)" height="60" width="30"/>
-<polygon fill="#9696A0" fill-opacity="0.5" points="1,59 1,1 30,1 30,0 0,0 0,60 30,60 30,59 " stroke-opacity="0.5"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="59.667" y2="0.2582">
-<stop offset="0" style="stop-color:#D2D2D2"/>
-<stop offset="1" style="stop-color:#AAAAAA"/>
-</linearGradient>
-</defs>
+<rect fill="#AAAAAA" fill-opacity="0.8" height="60" stroke-opacity="0.8" width="30"/>
+<polygon fill="#646464" fill-opacity="0.5" points="1,59 1,1 30,1 30,0 0,0 0,60 30,60 30,59 " stroke-opacity="0.5"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_disabled_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_disabled_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_disabled_r.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,12 +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="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" y="0"/>
-<rect fill="url(#SVGID_1_)" height="60" width="30"/>
-<polygon fill-opacity="0.1" points="30,0 0,0 0,1 29,1 29,59 0,59 0,60 30,60 " stroke-opacity="0.1"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="59.667" y2="0.2582">
-<stop offset="0" style="stop-color:#D2D2D2"/>
-<stop offset="1" style="stop-color:#AAAAAA"/>
-</linearGradient>
-</defs>
+<rect fill="#AAAAAA" fill-opacity="0.8" height="60" stroke-opacity="0.8" width="30"/>
+<polygon fill="#646464" fill-opacity="0.5" points="30,0 0,0 0,1 29,1 29,59 0,59 0,60 30,60 " stroke-opacity="0.5"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_latched_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_latched_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_latched_c.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,18 +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="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" x="0" y="0"/>
+<rect fill="none" height="60" width="30" y="0"/>
 <rect fill="url(#SVGID_1_)" height="60" width="30"/>
 <rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="30" y="59"/>
 <rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="30"/>
 <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="3" stroke-opacity="0.4" width="30" y="1"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="-0.5" y2="59.7705">
-<stop offset="0" style="stop-color:#C8C8D2"/>
-<stop offset="0.9" style="stop-color:#9696A0"/>
-<stop offset="0.9" style="stop-color:#8C8C96"/>
-<stop offset="1" style="stop-color:#82828C"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="-0.5" y2="59.7705">
+<stop offset="0" style="stop-color:#CDCDD2"/>
+<stop offset="0.9" style="stop-color:#9B9BA0"/>
+<stop offset="0.9" style="stop-color:#919196"/>
+<stop offset="1" style="stop-color:#87878C"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_latched_cl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_latched_cl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_latched_cl.svg	Mon May 03 12:48:33 2010 +0300
@@ -7,11 +7,11 @@
 <polygon fill-opacity="0.2" points="0,0 0,60 1,60 1,1 30,1 30,0 " stroke-opacity="0.2"/>
 <polygon fill="#FFFFFF" fill-opacity="0.4" points="1,1 1,59 30,59 30,58 2,58 2,4 30,4 30,1 " stroke-opacity="0.4"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="-0.5" y2="59.7705">
-<stop offset="0" style="stop-color:#C8C8D2"/>
-<stop offset="0.9" style="stop-color:#9696A0"/>
-<stop offset="0.9" style="stop-color:#8C8C96"/>
-<stop offset="1" style="stop-color:#82828C"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="-0.5" y2="59.7705">
+<stop offset="0" style="stop-color:#CDCDD2"/>
+<stop offset="0.9" style="stop-color:#9B9BA0"/>
+<stop offset="0.9" style="stop-color:#919196"/>
+<stop offset="1" style="stop-color:#87878C"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_latched_cr.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_latched_cr.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_latched_cr.svg	Mon May 03 12:48:33 2010 +0300
@@ -8,10 +8,10 @@
 <polygon fill="#FFFFFF" fill-opacity="0.4" points="0,1 0,4 28,4 28,58 0,58 0,59 29,59 29,1 " stroke-opacity="0.4"/>
 <defs>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="-0.5" y2="59.7705">
-<stop offset="0" style="stop-color:#C8C8D2"/>
-<stop offset="0.9" style="stop-color:#9696A0"/>
-<stop offset="0.9" style="stop-color:#8C8C96"/>
-<stop offset="1" style="stop-color:#82828C"/>
+<stop offset="0" style="stop-color:#CDCDD2"/>
+<stop offset="0.9" style="stop-color:#9B9BA0"/>
+<stop offset="0.9" style="stop-color:#919196"/>
+<stop offset="1" style="stop-color:#87878C"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_latched_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_latched_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_latched_l.svg	Mon May 03 12:48:33 2010 +0300
@@ -8,10 +8,10 @@
 <polygon fill="#FFFFFF" fill-opacity="0.4" points="1,1 1,59 30,59 30,58 2,58 2,4 30,4 30,1 " stroke-opacity="0.4"/>
 <defs>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="-0.5" y2="59.7705">
-<stop offset="0" style="stop-color:#C8C8D2"/>
-<stop offset="0.9" style="stop-color:#9696A0"/>
-<stop offset="0.9" style="stop-color:#8C8C96"/>
-<stop offset="1" style="stop-color:#82828C"/>
+<stop offset="0" style="stop-color:#CDCDD2"/>
+<stop offset="0.9" style="stop-color:#9B9BA0"/>
+<stop offset="0.9" style="stop-color:#919196"/>
+<stop offset="1" style="stop-color:#87878C"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_latched_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_latched_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_latched_r.svg	Mon May 03 12:48:33 2010 +0300
@@ -8,10 +8,10 @@
 <polygon fill="#FFFFFF" fill-opacity="0.4" points="0,1 0,4 28,4 28,58 0,58 0,59 29,59 29,1 " stroke-opacity="0.4"/>
 <defs>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="-0.5" y2="59.7705">
-<stop offset="0" style="stop-color:#C8C8D2"/>
-<stop offset="0.9" style="stop-color:#9696A0"/>
-<stop offset="0.9" style="stop-color:#8C8C96"/>
-<stop offset="1" style="stop-color:#82828C"/>
+<stop offset="0" style="stop-color:#CDCDD2"/>
+<stop offset="0.9" style="stop-color:#9B9BA0"/>
+<stop offset="0.9" style="stop-color:#919196"/>
+<stop offset="1" style="stop-color:#87878C"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_normal_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_normal_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_normal_c.svg	Mon May 03 12:48:33 2010 +0300
@@ -9,9 +9,9 @@
 <defs>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="-0.5" y2="59.7705">
 <stop offset="0" style="stop-color:#FAFAFF"/>
-<stop offset="0.9" style="stop-color:#D2D2DC"/>
-<stop offset="0.9" style="stop-color:#C8C8D2"/>
-<stop offset="1" style="stop-color:#BEBEC8"/>
+<stop offset="0.9" style="stop-color:#D7D7DC"/>
+<stop offset="0.9" style="stop-color:#CDCDD2"/>
+<stop offset="1" style="stop-color:#C3C3C8"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_normal_cl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_normal_cl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_normal_cl.svg	Mon May 03 12:48:33 2010 +0300
@@ -10,9 +10,9 @@
 <defs>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="-0.5" y2="59.7705">
 <stop offset="0" style="stop-color:#FAFAFF"/>
-<stop offset="0.9" style="stop-color:#D2D2DC"/>
-<stop offset="0.9" style="stop-color:#C8C8D2"/>
-<stop offset="1" style="stop-color:#BEBEC8"/>
+<stop offset="0.9" style="stop-color:#D7D7DC"/>
+<stop offset="0.9" style="stop-color:#CDCDD2"/>
+<stop offset="1" style="stop-color:#C3C3C8"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_normal_cr.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_normal_cr.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_normal_cr.svg	Mon May 03 12:48:33 2010 +0300
@@ -10,9 +10,9 @@
 <defs>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="-0.5" y2="59.7705">
 <stop offset="0" style="stop-color:#FAFAFF"/>
-<stop offset="0.9" style="stop-color:#D2D2DC"/>
-<stop offset="0.9" style="stop-color:#C8C8D2"/>
-<stop offset="1" style="stop-color:#BEBEC8"/>
+<stop offset="0.9" style="stop-color:#D7D7DC"/>
+<stop offset="0.9" style="stop-color:#CDCDD2"/>
+<stop offset="1" style="stop-color:#C3C3C8"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_normal_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_normal_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_normal_l.svg	Mon May 03 12:48:33 2010 +0300
@@ -4,9 +4,9 @@
 <rect fill="none" height="60" width="30" y="0"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="-0.5" y2="59.7705">
 <stop offset="0" style="stop-color:#FAFAFF"/>
-<stop offset="0.9" style="stop-color:#D2D2DC"/>
-<stop offset="0.9" style="stop-color:#C8C8D2"/>
-<stop offset="1" style="stop-color:#BEBEC8"/>
+<stop offset="0.9" style="stop-color:#D7D7DC"/>
+<stop offset="0.9" style="stop-color:#CDCDD2"/>
+<stop offset="1" style="stop-color:#C3C3C8"/>
 </linearGradient>
 <rect fill="url(#SVGID_1_)" height="60" width="30"/>
 <rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="30" y="59"/>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_normal_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_normal_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_normal_r.svg	Mon May 03 12:48:33 2010 +0300
@@ -4,9 +4,9 @@
 <rect fill="none" height="60" width="30" y="0"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="-0.5" y2="59.7705">
 <stop offset="0" style="stop-color:#FAFAFF"/>
-<stop offset="0.9" style="stop-color:#D2D2DC"/>
-<stop offset="0.9" style="stop-color:#C8C8D2"/>
-<stop offset="1" style="stop-color:#BEBEC8"/>
+<stop offset="0.9" style="stop-color:#D7D7DC"/>
+<stop offset="0.9" style="stop-color:#CDCDD2"/>
+<stop offset="1" style="stop-color:#C3C3C8"/>
 </linearGradient>
 <rect fill="url(#SVGID_1_)" height="60" width="30"/>
 <rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="30" y="59"/>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_disabled_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_disabled_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_disabled_c.svg	Mon May 03 12:48:33 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="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" y="0"/>
-<rect fill="#666666" fill-opacity="0.6" height="60" stroke-opacity="0.6" width="30"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="30" y="59"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="30"/>
+<rect fill="#646464" fill-opacity="0.6" height="60" stroke-opacity="0.6" width="30"/>
+<rect fill="#646464" fill-opacity="0.6" height="1" stroke-opacity="0.6" width="30" y="59"/>
+<rect fill="#646464" fill-opacity="0.6" height="1" stroke-opacity="0.6" width="30"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_disabled_cl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_disabled_cl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_disabled_cl.svg	Mon May 03 12:48:33 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="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" y="0"/>
-<rect fill="#666666" fill-opacity="0.6" height="60" stroke-opacity="0.6" width="30"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="1,59 1,1 30,1 30,0 0,0 0,60 30,60 30,59 " stroke-opacity="0.4"/>
+<rect fill="#646464" fill-opacity="0.6" height="60" stroke-opacity="0.6" width="30"/>
+<polygon fill="#646464" fill-opacity="0.6" points="1,59 1,1 30,1 30,0 0,0 0,60 30,60 30,59 " stroke-opacity="0.6"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_disabled_cr.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_disabled_cr.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_disabled_cr.svg	Mon May 03 12:48:33 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="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" y="0"/>
-<rect fill="#666666" fill-opacity="0.6" height="60" stroke-opacity="0.6" width="30"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="30,0 0,0 0,1 29,1 29,59 0,59 0,60 30,60 " stroke-opacity="0.4"/>
+<rect fill="#646464" fill-opacity="0.6" height="60" stroke-opacity="0.6" width="30"/>
+<polygon fill="#646464" fill-opacity="0.6" points="30,0 0,0 0,1 29,1 29,59 0,59 0,60 30,60 " stroke-opacity="0.6"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_disabled_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_disabled_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_disabled_l.svg	Mon May 03 12:48:33 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="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" y="0"/>
-<rect fill="#666666" fill-opacity="0.6" height="60" stroke-opacity="0.6" width="30"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="1,59 1,1 30,1 30,0 0,0 0,60 30,60 30,59 " stroke-opacity="0.4"/>
+<rect fill="#646464" fill-opacity="0.6" height="60" stroke-opacity="0.6" width="30"/>
+<polygon fill="#646464" fill-opacity="0.6" points="1,59 1,1 30,1 30,0 0,0 0,60 30,60 30,59 " stroke-opacity="0.6"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_disabled_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_disabled_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_disabled_r.svg	Mon May 03 12:48:33 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="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" y="0"/>
-<rect fill="#666666" fill-opacity="0.6" height="60" stroke-opacity="0.6" width="30"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="30,0 0,0 0,1 29,1 29,59 0,59 0,60 30,60 " stroke-opacity="0.4"/>
+<rect fill="#646464" fill-opacity="0.6" height="60" stroke-opacity="0.6" width="30"/>
+<polygon fill="#646464" fill-opacity="0.6" points="30,0 0,0 0,1 29,1 29,59 0,59 0,60 30,60 " stroke-opacity="0.6"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_highlight_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_highlight_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_highlight_c.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,15 +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="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" y="0"/>
-<rect fill="#666666" fill-opacity="0.6" height="60" stroke-opacity="0.6" width="30"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="4.882813e-004" y2="59.8766">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="1" y2="59.0005">
+<stop offset="0" style="stop-color:#3C3C3C"/>
+<stop offset="1" style="stop-color:#1E1E1E"/>
+</linearGradient>
+<rect fill="url(#SVGID_1_)" fill-opacity="0.7" height="58" stroke-opacity="0.7" width="30" y="1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="-29.9995" y2="59.8148">
 <stop offset="0" style="stop-color:#66B8CC"/>
 <stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
-<rect fill="url(#SVGID_1_)" height="2" width="30" y="58"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="0" y2="59.8761">
+<rect fill="url(#SVGID_2_)" height="3" width="30" y="57"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="14.9995" x2="14.9995" y1="0" y2="89.8143">
 <stop offset="0" style="stop-color:#66B8CC"/>
 <stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
-<rect fill="url(#SVGID_2_)" height="2" width="30"/>
+<rect fill="url(#SVGID_3_)" height="3" width="30"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_highlight_cl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_highlight_cl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_highlight_cl.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,12 +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" y="0"/>
-<rect fill="#666666" fill-opacity="0.6" height="60" stroke-opacity="0.6" width="30"/>
-<polygon fill="url(#SVGID_1_)" points="2,58 2,2 30,2 30,0 0,0 0,60 30,60 30,58 "/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="0" y2="59.8766">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15.5" x2="15.5" y1="1" y2="59.0005">
+<stop offset="0" style="stop-color:#3C3C3C"/>
+<stop offset="1" style="stop-color:#1E1E1E"/>
+</linearGradient>
+<rect fill="url(#SVGID_1_)" fill-opacity="0.7" height="58" stroke-opacity="0.7" width="29" x="1" y="1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="15" x2="15" y1="0" y2="59.8766">
 <stop offset="0" style="stop-color:#66B8CC"/>
 <stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
-</defs>
+<polygon fill="url(#SVGID_2_)" points="3,57 3,3 30,3 30,0 0,0 0,60 30,60 30,57 "/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_highlight_cr.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_highlight_cr.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_highlight_cr.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,12 +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" y="0"/>
-<rect fill="#666666" fill-opacity="0.6" height="60" stroke-opacity="0.6" width="30"/>
-<polygon fill="url(#SVGID_1_)" points="30,0 0,0 0,2 28,2 28,58 0,58 0,60 30,60 "/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="0" y2="59.8766">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.5" x2="14.5" y1="1" y2="59.0005">
+<stop offset="0" style="stop-color:#3C3C3C"/>
+<stop offset="1" style="stop-color:#1E1E1E"/>
+</linearGradient>
+<rect fill="url(#SVGID_1_)" fill-opacity="0.7" height="58" stroke-opacity="0.7" width="29" y="1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="15" x2="15" y1="0" y2="59.8766">
 <stop offset="0" style="stop-color:#66B8CC"/>
 <stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
-</defs>
+<polygon fill="url(#SVGID_2_)" points="30,0 0,0 0,3 27,3 27,57 0,57 0,60 30,60 "/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_highlight_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_highlight_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_highlight_l.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,12 +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" y="0"/>
-<rect fill="#666666" fill-opacity="0.6" height="60" stroke-opacity="0.6" width="30"/>
-<polygon fill="url(#SVGID_1_)" points="2,58 2,2 30,2 30,0 0,0 0,60 30,60 30,58 "/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="0" y2="59.8766">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15.5" x2="15.5" y1="1" y2="59.0005">
+<stop offset="0" style="stop-color:#3C3C3C"/>
+<stop offset="1" style="stop-color:#1E1E1E"/>
+</linearGradient>
+<rect fill="url(#SVGID_1_)" fill-opacity="0.7" height="58" stroke-opacity="0.7" width="29" x="1" y="1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="15" x2="15" y1="0" y2="59.8766">
 <stop offset="0" style="stop-color:#66B8CC"/>
 <stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
-</defs>
+<polygon fill="url(#SVGID_2_)" points="3,57 3,3 30,3 30,0 0,0 0,60 30,60 30,57 "/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_highlight_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_highlight_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_highlight_r.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,12 +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" y="0"/>
-<rect fill="#666666" fill-opacity="0.6" height="60" stroke-opacity="0.6" width="30"/>
-<polygon fill="url(#SVGID_1_)" points="30,0 0,0 0,2 28,2 28,58 0,58 0,60 30,60 "/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="0" y2="59.8766">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.5" x2="14.5" y1="1" y2="59.0005">
+<stop offset="0" style="stop-color:#3C3C3C"/>
+<stop offset="1" style="stop-color:#1E1E1E"/>
+</linearGradient>
+<rect fill="url(#SVGID_1_)" fill-opacity="0.7" height="58" stroke-opacity="0.7" width="29" y="1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="15" x2="15" y1="0" y2="59.8766">
 <stop offset="0" style="stop-color:#66B8CC"/>
 <stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
-</defs>
+<polygon fill="url(#SVGID_2_)" points="30,0 0,0 0,3 27,3 27,57 0,57 0,60 30,60 "/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_latched_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_latched_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_latched_c.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,13 +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" y="0"/>
-<rect fill="url(#SVGID_1_)" fill-opacity="0.6" height="60" stroke-opacity="0.6" width="30"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="30" y="59"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="30"/>
+<rect fill="url(#SVGID_1_)" fill-opacity="0.8" height="60" stroke-opacity="0.8" width="30"/>
+<rect fill="#282828" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="30" y="59"/>
+<rect fill="#282828" fill-opacity="0.3" height="1" stroke-opacity="0.3" width="30"/>
+<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="30" y="1"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="0" y2="60.0005">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="1" style="stop-color:#000000"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="-0.5" y2="59.7705">
+<stop offset="0" style="stop-color:#A0A0A0"/>
+<stop offset="1" style="stop-color:#646464"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_latched_cl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_latched_cl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_latched_cl.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,12 +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" y="0"/>
-<rect fill="url(#SVGID_1_)" fill-opacity="0.6" height="60" stroke-opacity="0.6" width="30"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="30,1 30,0 0,0 0,60 30,60 30,59 1,59 1,1 " stroke-opacity="0.4"/>
+<rect fill="url(#SVGID_1_)" fill-opacity="0.8" height="60" stroke-opacity="0.8" width="30"/>
+<rect fill="#282828" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="30" y="59"/>
+<rect fill="#282828" fill-opacity="0.3" height="1" stroke-opacity="0.3" width="30"/>
+<rect fill="#FFFFFF" fill-opacity="0.3" height="58" stroke-opacity="0.3" width="1" y="1"/>
+<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="30" y="1"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="0" y2="60.0005">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="1" style="stop-color:#000000"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="-0.5" y2="59.7705">
+<stop offset="0" style="stop-color:#A0A0A0"/>
+<stop offset="1" style="stop-color:#646464"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_latched_cr.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_latched_cr.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_latched_cr.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,12 +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" y="0"/>
-<rect fill="url(#SVGID_1_)" fill-opacity="0.6" height="60" stroke-opacity="0.6" width="30"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="0,0 0,1 29,1 29,59 0,59 0,60 30,60 30,59 30,1 30,0 " stroke-opacity="0.4"/>
+<rect fill="url(#SVGID_1_)" fill-opacity="0.8" height="60" stroke-opacity="0.8" width="30"/>
+<rect fill="#282828" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="30" y="59"/>
+<rect fill="#282828" fill-opacity="0.3" height="1" stroke-opacity="0.3" width="30"/>
+<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="30" y="1"/>
+<rect fill="#141414" fill-opacity="0.3" height="58" stroke-opacity="0.3" width="1" x="29" y="1"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="0" y2="60.0005">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="1" style="stop-color:#000000"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="-0.5" y2="59.7705">
+<stop offset="0" style="stop-color:#A0A0A0"/>
+<stop offset="1" style="stop-color:#646464"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_latched_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_latched_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_latched_l.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,12 +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" y="0"/>
-<rect fill="url(#SVGID_1_)" fill-opacity="0.6" height="60" stroke-opacity="0.6" width="30"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="30,1 30,0 0,0 0,60 30,60 30,59 1,59 1,1 " stroke-opacity="0.4"/>
+<rect fill="url(#SVGID_1_)" fill-opacity="0.8" height="60" stroke-opacity="0.8" width="30"/>
+<rect fill="#282828" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="30" y="59"/>
+<rect fill="#282828" fill-opacity="0.3" height="1" stroke-opacity="0.3" width="30"/>
+<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="30" y="1"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="0" y2="60.0005">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="1" style="stop-color:#000000"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="-0.5" y2="59.7705">
+<stop offset="0" style="stop-color:#A0A0A0"/>
+<stop offset="1" style="stop-color:#646464"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_latched_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_latched_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_latched_r.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,12 +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" y="0"/>
-<rect fill="url(#SVGID_1_)" fill-opacity="0.6" height="60" stroke-opacity="0.6" width="30"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="0,0 0,1 29,1 29,59 0,59 0,60 30,60 30,0 " stroke-opacity="0.4"/>
+<rect fill="url(#SVGID_1_)" fill-opacity="0.8" height="60" stroke-opacity="0.8" width="30"/>
+<rect fill="#282828" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="30" y="59"/>
+<rect fill="#282828" fill-opacity="0.3" height="1" stroke-opacity="0.3" width="30"/>
+<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="30" y="1"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="0" y2="60.0005">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="1" style="stop-color:#000000"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="-0.5" y2="59.7705">
+<stop offset="0" style="stop-color:#A0A0A0"/>
+<stop offset="1" style="stop-color:#646464"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_normal_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_normal_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_normal_c.svg	Mon May 03 12:48:33 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="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="url(#SVGID_1_)" fill-opacity="0.6" height="60" stroke-opacity="0.6" width="30"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="30" y="59"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="30"/>
+<rect fill="none" height="60" width="30" y="0"/>
+<rect fill="url(#SVGID_1_)" fill-opacity="0.7" height="60" stroke-opacity="0.7" width="30"/>
+<rect fill="#282828" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="30" y="59"/>
+<rect fill="#282828" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="30"/>
+<rect fill="#C8C8C8" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="30" y="1"/>
 <defs>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="-0.5" y2="59.7705">
-<stop offset="0" style="stop-color:#4D4D4D"/>
+<stop offset="0" style="stop-color:#3C3C3C"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 </defs>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_normal_cl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_normal_cl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_normal_cl.svg	Mon May 03 12:48:33 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="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" y="0"/>
-<rect fill="url(#SVGID_1_)" fill-opacity="0.6" height="60" stroke-opacity="0.6" width="30" x="0"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="30,1 30,0 0,0 0,60 30,60 30,59 1,59 1,1 " stroke-opacity="0.4"/>
+<rect fill="url(#SVGID_1_)" fill-opacity="0.7" height="60" stroke-opacity="0.7" width="30" x="0"/>
+<rect fill="#282828" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="30" y="59"/>
+<rect fill="#282828" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="30"/>
+<rect fill="#C8C8C8" fill-opacity="0.3" height="58" stroke-opacity="0.3" width="1" y="1"/>
+<rect fill="#C8C8C8" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="30" y="1"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15.0005" x2="15.0005" y1="-0.5" y2="59.7705">
-<stop offset="0" style="stop-color:#4D4D4D"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="-0.5" y2="59.7705">
+<stop offset="0" style="stop-color:#3C3C3C"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 </defs>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_normal_cr.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_normal_cr.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_normal_cr.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,11 +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" y="0"/>
-<rect fill="url(#SVGID_1_)" fill-opacity="0.6" height="60" stroke-opacity="0.6" width="30"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="0,0 0,1 29,1 29,59 0,59 0,60 30,60 30,59 30,1 30,0 " stroke-opacity="0.4"/>
+<rect fill="url(#SVGID_1_)" fill-opacity="0.7" height="60" stroke-opacity="0.7" width="30"/>
+<rect fill="#282828" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="30" y="59"/>
+<rect fill="#282828" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="30"/>
+<rect fill="#C8C8C8" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="30" y="1"/>
+<rect fill="#141414" fill-opacity="0.3" height="58" stroke-opacity="0.3" width="1" x="29" y="1"/>
 <defs>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="-0.5" y2="59.7705">
-<stop offset="0" style="stop-color:#4D4D4D"/>
+<stop offset="0" style="stop-color:#3C3C3C"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 </defs>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_normal_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_normal_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_normal_l.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,12 +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="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" y="0"/>
-<rect fill="url(#SVGID_1_)" fill-opacity="0.6" height="60" stroke-opacity="0.6" width="30"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="30,1 30,0 0,0 0,60 30,60 30,59 1,59 1,1 " stroke-opacity="0.4"/>
+<rect fill="url(#SVGID_1_)" fill-opacity="0.7" height="60" stroke-opacity="0.7" width="30" x="0"/>
+<rect fill="#282828" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="30" y="59"/>
+<rect fill="#282828" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="30"/>
+<rect fill="#C8C8C8" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="30" y="1"/>
 <defs>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="-0.5" y2="59.7705">
-<stop offset="0" style="stop-color:#4D4D4D"/>
+<stop offset="0" style="stop-color:#3C3C3C"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 </defs>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_normal_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_normal_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_normal_r.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,11 +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" y="0"/>
-<rect fill="url(#SVGID_1_)" fill-opacity="0.6" height="60" stroke-opacity="0.6" width="30"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="0,0 0,1 29,1 29,59 0,59 0,60 30,60 30,0 " stroke-opacity="0.4"/>
+<rect fill="url(#SVGID_1_)" fill-opacity="0.7" height="60" stroke-opacity="0.7" width="30"/>
+<rect fill="#282828" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="30" y="59"/>
+<rect fill="#282828" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="30"/>
+<rect fill="#C8C8C8" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="30" y="1"/>
 <defs>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="-0.5" y2="59.7705">
-<stop offset="0" style="stop-color:#4D4D4D"/>
+<stop offset="0" style="stop-color:#3C3C3C"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 </defs>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_pressed_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_pressed_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_pressed_c.svg	Mon May 03 12:48:33 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" y="0"/>
-<rect fill="url(#SVGID_1_)" fill-opacity="0.9" height="60" stroke-opacity="0.9" width="30"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="30" y="59"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="30"/>
+<rect fill="url(#SVGID_1_)" fill-opacity="0.8" height="60" stroke-opacity="0.8" width="30"/>
+<rect fill="#282828" fill-opacity="0.3" height="1" stroke-opacity="0.3" width="30" y="59"/>
+<rect fill="#282828" fill-opacity="0.3" height="1" stroke-opacity="0.3" width="30"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15.0005" x2="15.0005" y1="59.834" y2="9.765625e-004">
-<stop offset="0" style="stop-color:#333333"/>
-<stop offset="1" style="stop-color:#000000"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15.0005" x2="15.0005" y1="60.5" y2="0.2305">
+<stop offset="0" style="stop-color:#B4B4B4"/>
+<stop offset="1" style="stop-color:#5A5A5A"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_pressed_cl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_pressed_cl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_pressed_cl.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,12 +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" y="0"/>
-<rect fill="url(#SVGID_1_)" fill-opacity="0.9" height="60" stroke-opacity="0.9" width="30"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="30,1 30,0 0,0 0,60 30,60 30,59 1,59 1,1 " stroke-opacity="0.4"/>
+<rect fill="url(#SVGID_1_)" fill-opacity="0.8" height="60" stroke-opacity="0.8" width="30"/>
+<rect fill="#282828" fill-opacity="0.3" height="1" stroke-opacity="0.3" width="30" y="59"/>
+<rect fill="#282828" fill-opacity="0.3" height="1" stroke-opacity="0.3" width="30"/>
+<rect fill="#FFFFFF" fill-opacity="0.4" height="58" stroke-opacity="0.4" width="1" y="1"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="59.834" y2="9.765625e-004">
-<stop offset="0" style="stop-color:#333333"/>
-<stop offset="1" style="stop-color:#000000"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="60.5" y2="0.2305">
+<stop offset="0" style="stop-color:#B4B4B4"/>
+<stop offset="1" style="stop-color:#5A5A5A"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_pressed_cr.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_pressed_cr.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_pressed_cr.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,12 +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" y="0"/>
-<rect fill="url(#SVGID_1_)" fill-opacity="0.9" height="60" stroke-opacity="0.9" width="30"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="0,0 0,1 29,1 29,59 0,59 0,60 30,60 30,59 30,1 30,0 " stroke-opacity="0.4"/>
+<rect fill="url(#SVGID_1_)" fill-opacity="0.8" height="60" stroke-opacity="0.8" width="30"/>
+<rect fill="#282828" fill-opacity="0.3" height="1" stroke-opacity="0.3" width="30" y="59"/>
+<rect fill="#282828" fill-opacity="0.3" height="1" stroke-opacity="0.3" width="30"/>
+<rect fill="#141414" 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="59.834" y2="9.765625e-004">
-<stop offset="0" style="stop-color:#333333"/>
-<stop offset="1" style="stop-color:#000000"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="60.5" y2="0.2305">
+<stop offset="0" style="stop-color:#B4B4B4"/>
+<stop offset="1" style="stop-color:#5A5A5A"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_pressed_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_pressed_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_pressed_l.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,12 +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" y="0"/>
-<rect fill="url(#SVGID_1_)" fill-opacity="0.9" height="60" stroke-opacity="0.9" width="30"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="30,1 30,0 0,0 0,60 30,60 30,59 1,59 1,1 " stroke-opacity="0.4"/>
+<rect fill="url(#SVGID_1_)" fill-opacity="0.8" height="60" stroke-opacity="0.8" width="30"/>
+<rect fill="#282828" fill-opacity="0.3" height="1" stroke-opacity="0.3" width="30" y="59"/>
+<rect fill="#282828" fill-opacity="0.3" height="1" stroke-opacity="0.3" width="30"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="59.834" y2="9.765625e-004">
-<stop offset="0" style="stop-color:#333333"/>
-<stop offset="1" style="stop-color:#000000"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="60.5" y2="0.2305">
+<stop offset="0" style="stop-color:#B4B4B4"/>
+<stop offset="1" style="stop-color:#5A5A5A"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_pressed_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_pressed_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_pressed_r.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,12 +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" y="0"/>
-<rect fill="url(#SVGID_1_)" fill-opacity="0.9" height="60" stroke-opacity="0.9" width="30"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="0,0 0,1 29,1 29,59 0,59 0,60 30,60 30,0 " stroke-opacity="0.4"/>
+<rect fill="url(#SVGID_1_)" fill-opacity="0.8" height="60" stroke-opacity="0.8" width="30"/>
+<rect fill="#282828" fill-opacity="0.3" height="1" stroke-opacity="0.3" width="30" y="59"/>
+<rect fill="#282828" fill-opacity="0.3" height="1" stroke-opacity="0.3" width="30"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="59.834" y2="9.765625e-004">
-<stop offset="0" style="stop-color:#333333"/>
-<stop offset="1" style="stop-color:#000000"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="60.5" y2="0.2305">
+<stop offset="0" style="stop-color:#B4B4B4"/>
+<stop offset="1" style="stop-color:#5A5A5A"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_disabled_b.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_disabled_b.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_disabled_b.svg	Mon May 03 12:48:33 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 60 30" width="60px" 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="60" x="0"/>
-<rect fill="#666666" fill-opacity="0.6" height="30" stroke-opacity="0.6" width="60"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="59,29 1,29 1,0 0,0 0,30 60,30 60,0 59,0 " stroke-opacity="0.4"/>
+<rect fill="#646464" fill-opacity="0.6" height="30" stroke-opacity="0.6" width="60"/>
+<polygon fill="#646464" fill-opacity="0.6" points="59,29 1,29 1,0 0,0 0,30 60,30 60,0 59,0 " stroke-opacity="0.6"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_disabled_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_disabled_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_disabled_c.svg	Mon May 03 12:48:33 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 60 30" width="60px" 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="60" x="0"/>
-<rect fill="#666666" fill-opacity="0.6" height="30" stroke-opacity="0.6" width="60"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="1" x="59"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="1"/>
+<rect fill="#646464" fill-opacity="0.6" height="30" stroke-opacity="0.6" width="60"/>
+<rect fill="#646464" fill-opacity="0.6" height="30" stroke-opacity="0.6" width="1" x="59"/>
+<rect fill="#646464" fill-opacity="0.6" height="30" stroke-opacity="0.6" width="1"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_disabled_cb.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_disabled_cb.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_disabled_cb.svg	Mon May 03 12:48:33 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 60 30" width="60px" 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="60" x="0"/>
-<rect fill="#666666" fill-opacity="0.6" height="30" stroke-opacity="0.6" width="60"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="59,29 1,29 1,0 0,0 0,30 60,30 60,0 59,0 " stroke-opacity="0.4"/>
+<rect fill="#646464" fill-opacity="0.6" height="30" stroke-opacity="0.6" width="60"/>
+<polygon fill="#646464" fill-opacity="0.6" points="59,29 1,29 1,0 0,0 0,30 60,30 60,0 59,0 " stroke-opacity="0.6"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_disabled_ct.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_disabled_ct.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_disabled_ct.svg	Mon May 03 12:48:33 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 60 30" width="60px" 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="60" x="0"/>
-<rect fill="#666666" fill-opacity="0.6" height="30" stroke-opacity="0.6" width="60"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="0,0 0,30 1,30 1,1 59,1 59,30 60,30 60,0 " stroke-opacity="0.4"/>
+<rect fill="#646464" fill-opacity="0.6" height="30" stroke-opacity="0.6" width="60"/>
+<polygon fill="#646464" fill-opacity="0.6" points="0,0 0,30 1,30 1,1 59,1 59,30 60,30 60,0 " stroke-opacity="0.6"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_disabled_t.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_disabled_t.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_disabled_t.svg	Mon May 03 12:48:33 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 60 30" width="60px" 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="60" x="0"/>
-<rect fill="#666666" fill-opacity="0.6" height="30" stroke-opacity="0.6" width="60"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="0,0 0,30 1,30 1,1 59,1 59,30 60,30 60,0 " stroke-opacity="0.4"/>
+<rect fill="#646464" fill-opacity="0.6" height="30" stroke-opacity="0.6" width="60"/>
+<polygon fill="#646464" fill-opacity="0.6" points="0,0 0,30 1,30 1,1 59,1 59,30 60,30 60,0 " stroke-opacity="0.6"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_highlight_b.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_highlight_b.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_highlight_b.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,12 +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="30px" version="1.1" viewBox="0 0 60 30" width="60px" 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="60" x="0"/>
-<rect fill="#666666" fill-opacity="0.6" height="30" stroke-opacity="0.6" width="60"/>
-<polygon fill="url(#SVGID_1_)" points="58,28 2,28 2,0 0,0 0,30 60,30 60,0 58,0 "/>
-<defs>
-<linearGradient gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 3945.4998 -1222.5004)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-1237.5" x2="-1237.5" y1="-3945.4995" y2="-3885.6233">
+<linearGradient gradientTransform="matrix(0 -1 1 0 4392.5005 -1675.5)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-1690.5" x2="-1690.5" y1="-4392.5" y2="-4332.5">
+<stop offset="0" style="stop-color:#3C3C3C"/>
+<stop offset="1" style="stop-color:#1E1E1E"/>
+</linearGradient>
+<rect fill="url(#SVGID_1_)" fill-opacity="0.7" height="30" stroke-opacity="0.7" width="60"/>
+<linearGradient gradientTransform="matrix(0 -1 1 0 4392.5005 -1675.5)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-1690.5" x2="-1690.5" y1="-4392.5" y2="-4332.624">
 <stop offset="0" style="stop-color:#66B8CC"/>
 <stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
-</defs>
+<polygon fill="url(#SVGID_2_)" points="57,27 3,27 3,0 0,0 0,30 60,30 60,0 57,0 "/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_highlight_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_highlight_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_highlight_c.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,13 +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="30px" version="1.1" viewBox="0 0 60 30" width="60px" 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="60" x="0"/>
-<rect fill="#666666" fill-opacity="0.6" height="30" stroke-opacity="0.6" width="60"/>
-<rect fill="url(#SVGID_1_)" height="30" width="2" x="58"/>
-<rect fill="url(#SVGID_1_)" height="30" width="2"/>
-<defs>
-<linearGradient gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 3885.4998 -1162.5004)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-1177.5" x2="-1177.5" y1="-3885.4995" y2="-3825.6233">
+<linearGradient gradientTransform="matrix(0 -1 1 0 4332.5005 -1615.5)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-1630.5" x2="-1630.5" y1="-4332.5" y2="-4272.5">
+<stop offset="0" style="stop-color:#3C3C3C"/>
+<stop offset="1" style="stop-color:#1E1E1E"/>
+</linearGradient>
+<rect fill="url(#SVGID_1_)" fill-opacity="0.7" height="30" stroke-opacity="0.7" width="60"/>
+<linearGradient gradientTransform="matrix(0 -1 1 0 4332.5005 -1615.5)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-1630.5" x2="-1630.5" y1="-4362.5" y2="-4272.6855">
 <stop offset="0" style="stop-color:#66B8CC"/>
 <stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
-</defs>
+<rect fill="url(#SVGID_2_)" height="30" width="3" x="57"/>
+<linearGradient gradientTransform="matrix(0 -1 1 0 4332.5005 -1615.5)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-1630.5" x2="-1630.5" y1="-4332.5" y2="-4242.6855">
+<stop offset="0" style="stop-color:#66B8CC"/>
+<stop offset="1" style="stop-color:#3F89A9"/>
+</linearGradient>
+<rect fill="url(#SVGID_3_)" height="30" width="3"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_highlight_cb.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_highlight_cb.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_highlight_cb.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,12 +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="30px" version="1.1" viewBox="0 0 60 30" width="60px" 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="60" x="0"/>
-<rect fill="#666666" fill-opacity="0.6" height="30" stroke-opacity="0.6" width="60"/>
-<polygon fill="url(#SVGID_1_)" points="58,28 2,28 2,0 0,0 0,30 60,30 60,0 58,0 "/>
-<defs>
-<linearGradient gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 3915.4998 -1192.5004)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-1207.5" x2="-1207.5" y1="-3915.4995" y2="-3855.6233">
+<linearGradient gradientTransform="matrix(0 -1 1 0 4362.5005 -1645.5)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-1660.5" x2="-1660.5" y1="-4362.5" y2="-4302.5">
+<stop offset="0" style="stop-color:#3C3C3C"/>
+<stop offset="1" style="stop-color:#1E1E1E"/>
+</linearGradient>
+<rect fill="url(#SVGID_1_)" fill-opacity="0.7" height="30" stroke-opacity="0.7" width="60"/>
+<linearGradient gradientTransform="matrix(0 -1 1 0 4362.5005 -1645.5)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-1660.5" x2="-1660.5" y1="-4362.5" y2="-4302.624">
 <stop offset="0" style="stop-color:#66B8CC"/>
 <stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
-</defs>
+<polygon fill="url(#SVGID_2_)" points="57,27 3,27 3,0 0,0 0,30 60,30 60,0 57,0 "/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_highlight_ct.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_highlight_ct.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_highlight_ct.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,12 +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="30px" version="1.1" viewBox="0 0 60 30" width="60px" 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="60" x="0"/>
-<rect fill="#666666" fill-opacity="0.6" height="30" stroke-opacity="0.6" width="60"/>
-<polygon fill="url(#SVGID_1_)" points="0,0 0,30 2,30 2,2 58,2 58,30 60,30 60,0 "/>
-<defs>
-<linearGradient gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 3855.4998 -1132.5004)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-1147.5" x2="-1147.5" y1="-3855.4995" y2="-3795.6233">
+<linearGradient gradientTransform="matrix(0 -1 1 0 4302.5005 -1585.5)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-1600.5" x2="-1600.5" y1="-4302.5" y2="-4242.5">
+<stop offset="0" style="stop-color:#3C3C3C"/>
+<stop offset="1" style="stop-color:#1E1E1E"/>
+</linearGradient>
+<rect fill="url(#SVGID_1_)" fill-opacity="0.7" height="30" stroke-opacity="0.7" width="60"/>
+<linearGradient gradientTransform="matrix(0 -1 1 0 4302.5005 -1585.5)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-1600.5" x2="-1600.5" y1="-4302.5" y2="-4242.624">
 <stop offset="0" style="stop-color:#66B8CC"/>
 <stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
-</defs>
+<polygon fill="url(#SVGID_2_)" points="0,0 0,30 3,30 3,3 57,3 57,30 60,30 60,0 "/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_highlight_t.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_highlight_t.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_highlight_t.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,12 +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="30px" version="1.1" viewBox="0 0 60 30" width="60px" 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="60" x="0"/>
-<rect fill="#666666" fill-opacity="0.6" height="30" stroke-opacity="0.6" width="60"/>
-<polygon fill="url(#SVGID_1_)" points="0,0 0,30 2,30 2,2 58,2 58,30 60,30 60,0 "/>
-<defs>
-<linearGradient gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 3825.4998 -1102.5004)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-1117.5" x2="-1117.5" y1="-3825.4995" y2="-3765.6233">
+<linearGradient gradientTransform="matrix(0 -1 1 0 4272.5005 -1555.5)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-1570.5" x2="-1570.5" y1="-4272.5" y2="-4212.5">
+<stop offset="0" style="stop-color:#3C3C3C"/>
+<stop offset="1" style="stop-color:#1E1E1E"/>
+</linearGradient>
+<rect fill="url(#SVGID_1_)" fill-opacity="0.7" height="30" stroke-opacity="0.7" width="60"/>
+<linearGradient gradientTransform="matrix(0 -1 1 0 4272.5005 -1555.5)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-1570.5" x2="-1570.5" y1="-4272.5" y2="-4212.624">
 <stop offset="0" style="stop-color:#66B8CC"/>
 <stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
-</defs>
+<polygon fill="url(#SVGID_2_)" points="0,0 0,30 3,30 3,3 57,3 57,30 60,30 60,0 "/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_latched_b.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_latched_b.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_latched_b.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,12 +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="30px" version="1.1" viewBox="0 0 60 30" width="60px" 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="60" x="0"/>
-<rect fill="url(#SVGID_1_)" fill-opacity="0.6" height="30" stroke-opacity="0.6" width="60"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="1,0 0,0 0,30 60,30 60,0 59,0 59,29 1,29 " stroke-opacity="0.4"/>
+<rect fill="url(#SVGID_1_)" fill-opacity="0.8" height="30" stroke-opacity="0.8" width="60"/>
+<rect fill="#282828" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="1" x="59"/>
+<rect fill="#282828" fill-opacity="0.3" height="30" stroke-opacity="0.3" width="1"/>
+<rect fill="#FFFFFF" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="1" x="1"/>
 <defs>
-<linearGradient gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 3208.4998 -1959.5004)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-1974.5" x2="-1974.5" y1="-3208.4995" y2="-3148.4995">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="1" style="stop-color:#000000"/>
+<linearGradient gradientTransform="matrix(0 -1 1 0 3656.5 -2409.5)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2424.5" x2="-2424.5" y1="-3656.9995" y2="-3596.7295">
+<stop offset="0" style="stop-color:#A0A0A0"/>
+<stop offset="1" style="stop-color:#646464"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_latched_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_latched_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_latched_c.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,13 +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="30px" version="1.1" viewBox="0 0 60 30" width="60px" 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="60" x="0"/>
-<rect fill="url(#SVGID_1_)" fill-opacity="0.6" height="30" stroke-opacity="0.6" width="60"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="1" x="59"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="1"/>
+<rect fill="url(#SVGID_1_)" fill-opacity="0.8" height="30" stroke-opacity="0.8" width="60"/>
+<rect fill="#282828" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="1" x="59"/>
+<rect fill="#282828" fill-opacity="0.3" height="30" stroke-opacity="0.3" width="1"/>
+<rect fill="#FFFFFF" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="1" x="1"/>
 <defs>
-<linearGradient gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 3148.4998 -1899.5004)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-1914.5" x2="-1914.5" y1="-3148.4995" y2="-3088.4995">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="1" style="stop-color:#000000"/>
+<linearGradient gradientTransform="matrix(0 -1 1 0 3596.5 -2349.5)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2364.5" x2="-2364.5" y1="-3596.9995" y2="-3536.7295">
+<stop offset="0" style="stop-color:#A0A0A0"/>
+<stop offset="1" style="stop-color:#646464"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_latched_cb.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_latched_cb.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_latched_cb.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,12 +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="30px" version="1.1" viewBox="0 0 60 30" width="60px" 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="60" x="0"/>
-<rect fill="url(#SVGID_1_)" fill-opacity="0.6" height="30" stroke-opacity="0.6" width="60"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="1,0 0,0 0,30 60,30 60,0 59,0 59,29 1,29 " stroke-opacity="0.4"/>
+<rect fill="url(#SVGID_1_)" fill-opacity="0.8" height="30" stroke-opacity="0.8" width="60"/>
+<rect fill="#282828" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="1" x="59"/>
+<rect fill="#282828" fill-opacity="0.3" height="30" stroke-opacity="0.3" width="1"/>
+<rect fill="#FFFFFF" fill-opacity="0.3" height="1" stroke-opacity="0.3" width="58" x="1" y="29"/>
+<rect fill="#FFFFFF" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="1" x="1"/>
 <defs>
-<linearGradient gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 3178.4998 -1929.5004)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-1944.5" x2="-1944.5" y1="-3178.4995" y2="-3118.4995">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="1" style="stop-color:#000000"/>
+<linearGradient gradientTransform="matrix(0 -1 1 0 3626.5 -2379.5)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2394.5" x2="-2394.5" y1="-3626.9995" y2="-3566.7295">
+<stop offset="0" style="stop-color:#A0A0A0"/>
+<stop offset="1" style="stop-color:#646464"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_latched_ct.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_latched_ct.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_latched_ct.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,12 +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="30px" version="1.1" viewBox="0 0 60 30" width="60px" 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="60" x="0"/>
-<rect fill="url(#SVGID_1_)" fill-opacity="0.6" height="30" stroke-opacity="0.6" width="60"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="0,30 1,30 1,1 59,1 59,30 60,30 60,0 59,0 1,0 0,0 " stroke-opacity="0.4"/>
+<rect fill="url(#SVGID_1_)" fill-opacity="0.8" height="30" stroke-opacity="0.8" width="60"/>
+<rect fill="#282828" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="1" x="59"/>
+<rect fill="#282828" fill-opacity="0.3" height="30" stroke-opacity="0.3" width="1"/>
+<rect fill="#FFFFFF" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="1" x="1"/>
+<rect fill="#141414" fill-opacity="0.3" height="1" stroke-opacity="0.3" width="58" x="1"/>
 <defs>
-<linearGradient gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 3118.4998 -1869.5004)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-1884.5" x2="-1884.5" y1="-3118.4995" y2="-3058.4995">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="1" style="stop-color:#000000"/>
+<linearGradient gradientTransform="matrix(0 -1 1 0 3566.5 -2319.5)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2334.5" x2="-2334.5" y1="-3566.9995" y2="-3506.7295">
+<stop offset="0" style="stop-color:#A0A0A0"/>
+<stop offset="1" style="stop-color:#646464"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_latched_t.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_latched_t.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_latched_t.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,12 +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="30px" version="1.1" viewBox="0 0 60 30" width="60px" 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="60" x="0"/>
-<rect fill="url(#SVGID_1_)" fill-opacity="0.6" height="30" stroke-opacity="0.6" width="60"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="0,30 1,30 1,1 59,1 59,30 60,30 60,0 0,0 " stroke-opacity="0.4"/>
+<rect fill="url(#SVGID_1_)" fill-opacity="0.8" height="30" stroke-opacity="0.8" width="60"/>
+<rect fill="#282828" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="1" x="59"/>
+<rect fill="#282828" fill-opacity="0.3" height="30" stroke-opacity="0.3" width="1"/>
+<rect fill="#FFFFFF" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="1" x="1"/>
 <defs>
-<linearGradient gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 3088.4998 -1839.5004)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-1854.5" x2="-1854.5" y1="-3088.4995" y2="-3028.4995">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="1" style="stop-color:#000000"/>
+<linearGradient gradientTransform="matrix(0 -1 1 0 3536.5 -2289.5)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2304.5" x2="-2304.5" y1="-3536.9995" y2="-3476.7295">
+<stop offset="0" style="stop-color:#A0A0A0"/>
+<stop offset="1" style="stop-color:#646464"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_normal_b.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_normal_b.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_normal_b.svg	Mon May 03 12:48:33 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 60 30" width="60px" 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="60"/>
-<rect fill="url(#SVGID_1_)" fill-opacity="0.6" height="30" stroke-opacity="0.6" width="60"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="1,0 0,0 0,30 60,30 60,0 59,0 59,29 1,29 " stroke-opacity="0.4"/>
+<rect fill="none" height="30" width="60" x="0"/>
+<rect fill="url(#SVGID_1_)" fill-opacity="0.7" height="30" stroke-opacity="0.7" width="60"/>
+<rect fill="#282828" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="1" x="59"/>
+<rect fill="#282828" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="1"/>
+<rect fill="#C8C8C8" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="1" x="1"/>
 <defs>
-<linearGradient gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 2454.4993 -2713.5007)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2728.501" x2="-2728.501" y1="-2455" y2="-2394.73">
-<stop offset="0" style="stop-color:#4D4D4D"/>
+<linearGradient gradientTransform="matrix(0 -1 1 0 2903.5 -3162.5)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-3177.5" x2="-3177.5" y1="-2904" y2="-2843.73">
+<stop offset="0" style="stop-color:#3C3C3C"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 </defs>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_normal_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_normal_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_normal_c.svg	Mon May 03 12:48:33 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 60 30" width="60px" 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="60" y="0"/>
-<rect fill="url(#SVGID_1_)" fill-opacity="0.6" height="30" stroke-opacity="0.6" width="60"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="1" x="59"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="1"/>
+<rect fill="url(#SVGID_1_)" fill-opacity="0.7" height="30" stroke-opacity="0.7" width="60"/>
+<rect fill="#282828" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="1" x="59"/>
+<rect fill="#282828" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="1"/>
+<rect fill="#C8C8C8" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="1" x="1"/>
 <defs>
-<linearGradient gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 2394.4988 -2653.5002)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2668.501" x2="-2668.501" y1="-2394.9995" y2="-2334.7295">
-<stop offset="0" style="stop-color:#4D4D4D"/>
+<linearGradient gradientTransform="matrix(0 -1 1 0 2843.5 -3102.5)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-3117.5" x2="-3117.5" y1="-2844" y2="-2783.73">
+<stop offset="0" style="stop-color:#3C3C3C"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 </defs>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_normal_cb.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_normal_cb.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_normal_cb.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,12 +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 60 30" width="60px" 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="60"/>
-<rect fill="url(#SVGID_1_)" fill-opacity="0.6" height="30" stroke-opacity="0.6" width="60"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="1,0 0,0 0,30 60,30 60,0 59,0 59,29 1,29 " stroke-opacity="0.4"/>
+<rect fill="none" height="30" width="60" x="0"/>
+<rect fill="url(#SVGID_1_)" fill-opacity="0.7" height="30" stroke-opacity="0.7" width="60"/>
+<rect fill="#282828" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="1" x="59"/>
+<rect fill="#282828" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="1"/>
+<rect fill="#C8C8C8" fill-opacity="0.3" height="1" stroke-opacity="0.3" width="58" x="1" y="29"/>
+<rect fill="#C8C8C8" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="1" x="1"/>
 <defs>
-<linearGradient gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 2424.4993 -2683.5007)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2698.501" x2="-2698.501" y1="-2425" y2="-2364.73">
-<stop offset="0" style="stop-color:#4D4D4D"/>
+<linearGradient gradientTransform="matrix(0 -1 1 0 2873.5 -3132.5)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-3147.5" x2="-3147.5" y1="-2874" y2="-2813.73">
+<stop offset="0" style="stop-color:#3C3C3C"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 </defs>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_normal_ct.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_normal_ct.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_normal_ct.svg	Mon May 03 12:48:33 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 60 30" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<rect fill="url(#SVGID_1_)" fill-opacity="0.6" height="30" stroke-opacity="0.6" width="60"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="0,30 1,30 1,1 59,1 59,30 60,30 60,0 59,0 1,0 0,0 " stroke-opacity="0.4"/>
+<rect fill="url(#SVGID_1_)" fill-opacity="0.7" height="30" stroke-opacity="0.7" width="60"/>
+<rect fill="#282828" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="1" x="59" y="0"/>
+<rect fill="#282828" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="1" y="0"/>
+<rect fill="#C8C8C8" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="1" x="1" y="0"/>
+<rect fill="#141414" fill-opacity="0.3" height="1" stroke-opacity="0.3" width="58" x="1" y="0"/>
 <defs>
-<linearGradient gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 2394.4993 -2653.5007)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2668.501" x2="-2668.501" y1="-2395" y2="-2334.73">
-<stop offset="0" style="stop-color:#4D4D4D"/>
+<linearGradient gradientTransform="matrix(0 -1 1 0 2843.4995 -3102.4995)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-3117.5" x2="-3117.5" y1="-2843.9995" y2="-2783.7295">
+<stop offset="0" style="stop-color:#3C3C3C"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 </defs>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_normal_t.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_normal_t.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_normal_t.svg	Mon May 03 12:48:33 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 60 30" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<rect fill="url(#SVGID_1_)" fill-opacity="0.6" height="30" stroke-opacity="0.6" width="60"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="0,30 1,30 1,1 59,1 59,30 60,30 60,0 0,0 " stroke-opacity="0.4"/>
+<rect fill="none" height="30" width="60" x="0"/>
+<rect fill="url(#SVGID_1_)" fill-opacity="0.7" height="30" stroke-opacity="0.7" width="60"/>
+<rect fill="#282828" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="1" x="59" y="0"/>
+<rect fill="#282828" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="1" y="0"/>
+<rect fill="#C8C8C8" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="1" x="1" y="0"/>
 <defs>
-<linearGradient gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 2394.4993 -2653.5007)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2668.501" x2="-2668.501" y1="-2395" y2="-2334.73">
-<stop offset="0" style="stop-color:#4D4D4D"/>
+<linearGradient gradientTransform="matrix(0 -1 1 0 2783.5 -3042.5)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-3057.5" x2="-3057.5" y1="-2784" y2="-2723.73">
+<stop offset="0" style="stop-color:#3C3C3C"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 </defs>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_pressed_b.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_pressed_b.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_pressed_b.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,12 +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="30px" version="1.1" viewBox="0 0 60 30" width="60px" 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="60" x="0"/>
-<rect fill="url(#SVGID_1_)" fill-opacity="0.9" height="30" stroke-opacity="0.9" width="60"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="1,0 0,0 0,30 60,30 60,0 59,0 59,29 1,29 " stroke-opacity="0.4"/>
+<rect fill="url(#SVGID_1_)" fill-opacity="0.8" height="30" stroke-opacity="0.8" width="60"/>
+<rect fill="#282828" fill-opacity="0.3" height="30" stroke-opacity="0.3" width="1" x="59"/>
+<rect fill="#282828" fill-opacity="0.3" height="30" stroke-opacity="0.3" width="1"/>
+<rect fill="none" height="30" width="60"/>
 <defs>
-<linearGradient gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 2828.4998 -2339.5002)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2354.5" x2="-2354.5" y1="-2768.667" y2="-2828.5005">
-<stop offset="0" style="stop-color:#333333"/>
-<stop offset="1" style="stop-color:#000000"/>
+<linearGradient gradientTransform="matrix(0 -1 1 0 3279 -2789)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2804" x2="-2804" y1="-3218.5" y2="-3278.77">
+<stop offset="0" style="stop-color:#B4B4B4"/>
+<stop offset="1" style="stop-color:#5A5A5A"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_pressed_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_pressed_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_pressed_c.svg	Mon May 03 12:48:33 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="30px" version="1.1" viewBox="0 0 60 30" width="60px" 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="60" x="0"/>
-<rect fill="url(#SVGID_1_)" fill-opacity="0.9" height="30" stroke-opacity="0.9" width="60"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="1" x="59"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="1"/>
+<rect fill="url(#SVGID_1_)" fill-opacity="0.8" height="30" stroke-opacity="0.8" width="60"/>
+<rect fill="#282828" fill-opacity="0.3" height="30" stroke-opacity="0.3" width="1" x="59"/>
+<rect fill="#282828" fill-opacity="0.3" height="30" stroke-opacity="0.3" width="1"/>
 <defs>
-<linearGradient gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 2768.4998 -2279.5002)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2294.5" x2="-2294.5" y1="-2708.667" y2="-2768.5005">
-<stop offset="0" style="stop-color:#333333"/>
-<stop offset="1" style="stop-color:#000000"/>
+<linearGradient gradientTransform="matrix(0 -1 1 0 3219 -2729)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2744" x2="-2744" y1="-3158.5" y2="-3218.77">
+<stop offset="0" style="stop-color:#B4B4B4"/>
+<stop offset="1" style="stop-color:#5A5A5A"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_pressed_cb.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_pressed_cb.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_pressed_cb.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,12 +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="30px" version="1.1" viewBox="0 0 60 30" width="60px" 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="60" x="0"/>
-<rect fill="url(#SVGID_1_)" fill-opacity="0.9" height="30" stroke-opacity="0.9" width="60"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="1,0 0,0 0,30 60,30 60,0 59,0 59,29 1,29 " stroke-opacity="0.4"/>
+<rect fill="url(#SVGID_1_)" fill-opacity="0.8" height="30" stroke-opacity="0.8" width="60"/>
+<rect fill="#282828" fill-opacity="0.3" height="30" stroke-opacity="0.3" width="1" x="59"/>
+<rect fill="#282828" fill-opacity="0.3" height="30" stroke-opacity="0.3" width="1"/>
+<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="58" x="1" y="29"/>
 <defs>
-<linearGradient gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 2798.4998 -2309.5002)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2324.5" x2="-2324.5" y1="-2738.667" y2="-2798.5005">
-<stop offset="0" style="stop-color:#333333"/>
-<stop offset="1" style="stop-color:#000000"/>
+<linearGradient gradientTransform="matrix(0 -1 1 0 3249 -2759)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2774" x2="-2774" y1="-3188.5" y2="-3248.77">
+<stop offset="0" style="stop-color:#B4B4B4"/>
+<stop offset="1" style="stop-color:#5A5A5A"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_pressed_ct.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_pressed_ct.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_pressed_ct.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,12 +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="30px" version="1.1" viewBox="0 0 60 30" width="60px" 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="60" x="0"/>
-<rect fill="url(#SVGID_1_)" fill-opacity="0.9" height="30" stroke-opacity="0.9" width="60"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="0,30 1,30 1,1 59,1 59,30 60,30 60,0 59,0 1,0 0,0 " stroke-opacity="0.4"/>
+<rect fill="url(#SVGID_1_)" fill-opacity="0.8" height="30" stroke-opacity="0.8" width="60"/>
+<rect fill="#282828" fill-opacity="0.3" height="30" stroke-opacity="0.3" width="1" x="59"/>
+<rect fill="#282828" fill-opacity="0.3" height="30" stroke-opacity="0.3" width="1"/>
+<rect fill="#141414" fill-opacity="0.2" height="1" stroke-opacity="0.2" width="58" x="1"/>
 <defs>
-<linearGradient gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 2738.4998 -2249.5002)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2264.5" x2="-2264.5" y1="-2678.667" y2="-2738.5005">
-<stop offset="0" style="stop-color:#333333"/>
-<stop offset="1" style="stop-color:#000000"/>
+<linearGradient gradientTransform="matrix(0 -1 1 0 3189 -2699)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2714" x2="-2714" y1="-3128.5" y2="-3188.77">
+<stop offset="0" style="stop-color:#B4B4B4"/>
+<stop offset="1" style="stop-color:#5A5A5A"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_pressed_t.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_pressed_t.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_pressed_t.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,12 +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="30px" version="1.1" viewBox="0 0 60 30" width="60px" 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="60" x="0"/>
-<rect fill="url(#SVGID_1_)" fill-opacity="0.9" height="30" stroke-opacity="0.9" width="60"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="0,30 1,30 1,1 59,1 59,30 60,30 60,0 0,0 " stroke-opacity="0.4"/>
+<rect fill="url(#SVGID_1_)" fill-opacity="0.8" height="30" stroke-opacity="0.8" width="60"/>
+<rect fill="#282828" fill-opacity="0.3" height="30" stroke-opacity="0.3" width="1" x="59"/>
+<rect fill="#282828" fill-opacity="0.3" height="30" stroke-opacity="0.3" width="1"/>
 <defs>
-<linearGradient gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 2708.4998 -2219.5002)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2234.5" x2="-2234.5" y1="-2648.667" y2="-2708.5005">
-<stop offset="0" style="stop-color:#333333"/>
-<stop offset="1" style="stop-color:#000000"/>
+<linearGradient gradientTransform="matrix(0 -1 1 0 3159 -2669)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2684" x2="-2684" y1="-3098.5" y2="-3158.77">
+<stop offset="0" style="stop-color:#B4B4B4"/>
+<stop offset="1" style="stop-color:#5A5A5A"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_latched_b.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_latched_b.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_latched_b.svg	Mon May 03 12:48:33 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 60 30" width="60px" 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="60"/>
+<rect fill="none" height="30" width="60" x="0"/>
 <rect fill="url(#SVGID_1_)" height="30" width="60"/>
 <rect fill-opacity="0.1" height="29" stroke-opacity="0.1" width="1" x="59"/>
 <polygon fill-opacity="0.2" points="0,30 60,30 60,29 1,29 1,0 0,0 " stroke-opacity="0.2"/>
 <polygon fill="#FFFFFF" fill-opacity="0.4" points="1,29 59,29 59,0 58,0 58,28 4,28 4,0 1,0 " stroke-opacity="0.4"/>
 <defs>
-<linearGradient gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 1460.4991 -2311.5007)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2326.501" x2="-2326.501" y1="-1460.9995" y2="-1400.7295">
-<stop offset="0" style="stop-color:#C8C8D2"/>
-<stop offset="0.9" style="stop-color:#9696A0"/>
-<stop offset="0.9" style="stop-color:#8C8C96"/>
-<stop offset="1" style="stop-color:#82828C"/>
+<linearGradient gradientTransform="matrix(0 -1 1 0 1460.5 -2311.5)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2326.5005" x2="-2326.5005" y1="-1460.9995" y2="-1400.7295">
+<stop offset="0" style="stop-color:#CDCDD2"/>
+<stop offset="0.9" style="stop-color:#9B9BA0"/>
+<stop offset="0.9" style="stop-color:#919196"/>
+<stop offset="1" style="stop-color:#87878C"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_latched_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_latched_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_latched_c.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,18 +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 60 30" width="60px" 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="60"/>
+<rect fill="none" height="30" width="60" x="0"/>
 <rect fill="url(#SVGID_1_)" height="30" width="60"/>
 <rect fill-opacity="0.1" height="30" stroke-opacity="0.1" width="1" x="59"/>
 <rect fill-opacity="0.2" height="30" stroke-opacity="0.2" width="1"/>
 <rect fill="#FFFFFF" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="1" x="58"/>
 <rect fill="#FFFFFF" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="3" x="1"/>
 <defs>
-<linearGradient gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 1400.4991 -2251.5007)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2266.501" x2="-2266.501" y1="-1400.9995" y2="-1340.7295">
-<stop offset="0" style="stop-color:#C8C8D2"/>
-<stop offset="0.9" style="stop-color:#9696A0"/>
-<stop offset="0.9" style="stop-color:#8C8C96"/>
-<stop offset="1" style="stop-color:#82828C"/>
+<linearGradient gradientTransform="matrix(0 -1 1 0 1400.5 -2251.5)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2266.5005" x2="-2266.5005" y1="-1400.9995" y2="-1340.7295">
+<stop offset="0" style="stop-color:#CDCDD2"/>
+<stop offset="0.9" style="stop-color:#9B9BA0"/>
+<stop offset="0.9" style="stop-color:#919196"/>
+<stop offset="1" style="stop-color:#87878C"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_latched_cb.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_latched_cb.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_latched_cb.svg	Mon May 03 12:48:33 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 60 30" width="60px" 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="60"/>
+<rect fill="none" height="30" width="60" x="0"/>
 <rect fill="url(#SVGID_1_)" height="30" width="60"/>
 <rect fill-opacity="0.1" height="29" stroke-opacity="0.1" width="1" x="59"/>
 <polygon fill-opacity="0.2" points="0,30 60,30 60,29 1,29 1,0 0,0 " stroke-opacity="0.2"/>
 <polygon fill="#FFFFFF" fill-opacity="0.4" points="1,29 59,29 59,0 58,0 58,28 4,28 4,0 1,0 " stroke-opacity="0.4"/>
 <defs>
-<linearGradient gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 1430.4991 -2281.5007)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2296.501" x2="-2296.501" y1="-1430.9995" y2="-1370.7295">
-<stop offset="0" style="stop-color:#C8C8D2"/>
-<stop offset="0.9" style="stop-color:#9696A0"/>
-<stop offset="0.9" style="stop-color:#8C8C96"/>
-<stop offset="1" style="stop-color:#82828C"/>
+<linearGradient gradientTransform="matrix(0 -1 1 0 1430.5 -2281.5)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2296.5005" x2="-2296.5005" y1="-1430.9995" y2="-1370.7295">
+<stop offset="0" style="stop-color:#CDCDD2"/>
+<stop offset="0.9" style="stop-color:#9B9BA0"/>
+<stop offset="0.9" style="stop-color:#919196"/>
+<stop offset="1" style="stop-color:#87878C"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_latched_ct.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_latched_ct.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_latched_ct.svg	Mon May 03 12:48:33 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 60 30" width="60px" 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="60"/>
+<rect fill="none" height="30" width="60" x="0"/>
 <rect fill="url(#SVGID_1_)" height="30" width="60"/>
 <rect fill-opacity="0.1" height="29" stroke-opacity="0.1" width="1" x="59" y="1"/>
 <polygon fill-opacity="0.2" points="0,30 1,30 1,1 60,1 60,0 0,0 " stroke-opacity="0.2"/>
 <polygon fill="#FFFFFF" fill-opacity="0.4" points="1,30 4,30 4,2 58,2 58,30 59,30 59,1 1,1 " stroke-opacity="0.4"/>
 <defs>
-<linearGradient gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 1370.4991 -2221.5007)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2236.501" x2="-2236.501" y1="-1370.9995" y2="-1310.7295">
-<stop offset="0" style="stop-color:#C8C8D2"/>
-<stop offset="0.9" style="stop-color:#9696A0"/>
-<stop offset="0.9" style="stop-color:#8C8C96"/>
-<stop offset="1" style="stop-color:#82828C"/>
+<linearGradient gradientTransform="matrix(0 -1 1 0 1370.5 -2221.5)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2236.5005" x2="-2236.5005" y1="-1370.9995" y2="-1310.7295">
+<stop offset="0" style="stop-color:#CDCDD2"/>
+<stop offset="0.9" style="stop-color:#9B9BA0"/>
+<stop offset="0.9" style="stop-color:#919196"/>
+<stop offset="1" style="stop-color:#87878C"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_latched_t.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_latched_t.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_latched_t.svg	Mon May 03 12:48:33 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 60 30" width="60px" 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="60"/>
+<rect fill="none" height="30" width="60" x="0"/>
 <rect fill="url(#SVGID_1_)" height="30" width="60"/>
 <rect fill-opacity="0.1" height="29" stroke-opacity="0.1" width="1" x="59" y="1"/>
 <polygon fill-opacity="0.2" points="0,30 1,30 1,1 60,1 60,0 0,0 " stroke-opacity="0.2"/>
 <polygon fill="#FFFFFF" fill-opacity="0.4" points="1,30 4,30 4,2 58,2 58,30 59,30 59,1 1,1 " stroke-opacity="0.4"/>
 <defs>
-<linearGradient gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 1340.4991 -2191.5007)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2206.501" x2="-2206.501" y1="-1340.9995" y2="-1280.7295">
-<stop offset="0" style="stop-color:#C8C8D2"/>
-<stop offset="0.9" style="stop-color:#9696A0"/>
-<stop offset="0.9" style="stop-color:#8C8C96"/>
-<stop offset="1" style="stop-color:#82828C"/>
+<linearGradient gradientTransform="matrix(0 -1 1 0 1340.5 -2191.5)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2206.5005" x2="-2206.5005" y1="-1340.9995" y2="-1280.7295">
+<stop offset="0" style="stop-color:#CDCDD2"/>
+<stop offset="0.9" style="stop-color:#9B9BA0"/>
+<stop offset="0.9" style="stop-color:#919196"/>
+<stop offset="1" style="stop-color:#87878C"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_normal_b.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_normal_b.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_normal_b.svg	Mon May 03 12:48:33 2010 +0300
@@ -4,9 +4,9 @@
 <rect fill="none" height="30" width="60" x="0"/>
 <linearGradient gradientTransform="matrix(0 -1 1 0 730.5 -3081.5)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-3096.5005" x2="-3096.5005" y1="-731" y2="-670.73">
 <stop offset="0" style="stop-color:#FAFAFF"/>
-<stop offset="0.9" style="stop-color:#D2D2DC"/>
-<stop offset="0.9" style="stop-color:#C8C8D2"/>
-<stop offset="1" style="stop-color:#BEBEC8"/>
+<stop offset="0.9" style="stop-color:#D7D7DC"/>
+<stop offset="0.9" style="stop-color:#CDCDD2"/>
+<stop offset="1" style="stop-color:#C3C3C8"/>
 </linearGradient>
 <rect fill="url(#SVGID_1_)" height="30" width="60"/>
 <rect fill-opacity="0.1" height="30" stroke-opacity="0.1" width="1" x="59"/>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_normal_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_normal_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_normal_c.svg	Mon May 03 12:48:33 2010 +0300
@@ -9,9 +9,9 @@
 <defs>
 <linearGradient gradientTransform="matrix(0 -1 1 0 670.5 -3021.5)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-3036.5005" x2="-3036.5005" y1="-671" y2="-610.73">
 <stop offset="0" style="stop-color:#FAFAFF"/>
-<stop offset="0.9" style="stop-color:#D2D2DC"/>
-<stop offset="0.9" style="stop-color:#C8C8D2"/>
-<stop offset="1" style="stop-color:#BEBEC8"/>
+<stop offset="0.9" style="stop-color:#D7D7DC"/>
+<stop offset="0.9" style="stop-color:#CDCDD2"/>
+<stop offset="1" style="stop-color:#C3C3C8"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_normal_cb.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_normal_cb.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_normal_cb.svg	Mon May 03 12:48:33 2010 +0300
@@ -10,9 +10,9 @@
 <defs>
 <linearGradient gradientTransform="matrix(0 -1 1 0 700.5 -3051.5)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-3066.5005" x2="-3066.5005" y1="-701" y2="-640.73">
 <stop offset="0" style="stop-color:#FAFAFF"/>
-<stop offset="0.9" style="stop-color:#D2D2DC"/>
-<stop offset="0.9" style="stop-color:#C8C8D2"/>
-<stop offset="1" style="stop-color:#BEBEC8"/>
+<stop offset="0.9" style="stop-color:#D7D7DC"/>
+<stop offset="0.9" style="stop-color:#CDCDD2"/>
+<stop offset="1" style="stop-color:#C3C3C8"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_normal_ct.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_normal_ct.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_normal_ct.svg	Mon May 03 12:48:33 2010 +0300
@@ -10,9 +10,9 @@
 <defs>
 <linearGradient gradientTransform="matrix(0 -1 1 0 640.5 -2991.5)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-3006.5005" x2="-3006.5005" y1="-641" y2="-580.73">
 <stop offset="0" style="stop-color:#FAFAFF"/>
-<stop offset="0.9" style="stop-color:#D2D2DC"/>
-<stop offset="0.9" style="stop-color:#C8C8D2"/>
-<stop offset="1" style="stop-color:#BEBEC8"/>
+<stop offset="0.9" style="stop-color:#D7D7DC"/>
+<stop offset="0.9" style="stop-color:#CDCDD2"/>
+<stop offset="1" style="stop-color:#C3C3C8"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_normal_t.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_normal_t.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_normal_t.svg	Mon May 03 12:48:33 2010 +0300
@@ -4,9 +4,9 @@
 <rect fill="none" height="30" width="60" x="0"/>
 <linearGradient gradientTransform="matrix(0 -1 1 0 610.5 -2961.5)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2976.5005" x2="-2976.5005" y1="-611" y2="-550.73">
 <stop offset="0" style="stop-color:#FAFAFF"/>
-<stop offset="0.9" style="stop-color:#D2D2DC"/>
-<stop offset="0.9" style="stop-color:#C8C8D2"/>
-<stop offset="1" style="stop-color:#BEBEC8"/>
+<stop offset="0.9" style="stop-color:#D7D7DC"/>
+<stop offset="0.9" style="stop-color:#CDCDD2"/>
+<stop offset="1" style="stop-color:#C3C3C8"/>
 </linearGradient>
 <rect fill="url(#SVGID_1_)" height="30" width="60"/>
 <rect fill-opacity="0.1" height="30" stroke-opacity="0.1" width="1" x="59"/>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_b.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_b.svg	Mon May 03 12:48:33 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="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"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="149.9995" x2="149.9995" y1="-27.9995" y2="7.6726">
+<stop offset="0" style="stop-color:#E6E6EB"/>
+<stop offset="0.15" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#FFFFFF"/>
+</linearGradient>
+<rect fill="url(#SVGID_1_)" height="8" width="300"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="149.9995" x2="149.9995" y1="-29.9995" y2="9.8756">
+<stop offset="0" style="stop-color:#66B8CC"/>
+<stop offset="1" style="stop-color:#3F89A9"/>
+</linearGradient>
+<rect fill="url(#SVGID_2_)" height="3" width="300" y="7"/>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_bl.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_bl.svg	Mon May 03 12:48:33 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="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"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="6" x2="6" y1="-27.9995" y2="7.6726">
+<stop offset="0" style="stop-color:#E6E6EB"/>
+<stop offset="0.15" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#FFFFFF"/>
+</linearGradient>
+<path d="M2,6c0,1.103,0.897,2,2,2h6V0H2V6z" fill="url(#SVGID_1_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="5" x2="5" y1="-29.9995" y2="9.8757">
+<stop offset="0" style="stop-color:#66B8CC"/>
+<stop offset="1" style="stop-color:#3F89A9"/>
+</linearGradient>
+<path d="M0,0v6c0,2.2,1.8,4,4,4h6V7H4C3.458,7,3,6.541,3,6V0H0z" fill="url(#SVGID_2_)"/>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_br.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_br.svg	Mon May 03 12:48:33 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="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"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4" x2="4" y1="-27.9995" y2="7.6726">
+<stop offset="0" style="stop-color:#E6E6EB"/>
+<stop offset="0.15" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#FFFFFF"/>
+</linearGradient>
+<path d="M0,8h6c1.104,0,2-0.897,2-2V0H0V8z" fill="url(#SVGID_1_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="5" x2="5" y1="-29.9995" y2="9.8757">
+<stop offset="0" style="stop-color:#66B8CC"/>
+<stop offset="1" style="stop-color:#3F89A9"/>
+</linearGradient>
+<path d="M7,6c0,0.541-0.458,1-1,1H0v3h6c2.2,0,4-1.8,4-4V0H7V6z" fill="url(#SVGID_2_)"/>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_c.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_c.svg	Mon May 03 12:48:33 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="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="url(#SVGID_1_)" height="20" width="300"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="149.9995" x2="149.9995" y1="-8" y2="27.6731">
+<stop offset="0" style="stop-color:#E6E6EB"/>
+<stop offset="0.15" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#FFFFFF"/>
+</linearGradient>
+</defs>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_l.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_l.svg	Mon May 03 12:48:33 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="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"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="6" x2="6" y1="-8" y2="27.6731">
+<stop offset="0" style="stop-color:#E6E6EB"/>
+<stop offset="0.15" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#FFFFFF"/>
+</linearGradient>
+<rect fill="url(#SVGID_1_)" height="20" width="8" x="2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="1.5" x2="1.5" y1="-10.0005" y2="29.8757">
+<stop offset="0" style="stop-color:#66B8CC"/>
+<stop offset="1" style="stop-color:#3F89A9"/>
+</linearGradient>
+<rect fill="url(#SVGID_2_)" height="20" width="3"/>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_r.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_r.svg	Mon May 03 12:48:33 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="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"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4" x2="4" y1="-8" y2="27.6731">
+<stop offset="0" style="stop-color:#E6E6EB"/>
+<stop offset="0.15" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#FFFFFF"/>
+</linearGradient>
+<rect fill="url(#SVGID_1_)" height="20" width="8"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="8.5" x2="8.5" y1="-10.0005" y2="29.8757">
+<stop offset="0" style="stop-color:#66B8CC"/>
+<stop offset="1" style="stop-color:#3F89A9"/>
+</linearGradient>
+<rect fill="url(#SVGID_2_)" height="20" width="3" x="7"/>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_t.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_t.svg	Mon May 03 12:48:33 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 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"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="149.9995" x2="149.9995" y1="2" y2="37.6721">
+<stop offset="0" style="stop-color:#E6E6EB"/>
+<stop offset="0.15" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#FFFFFF"/>
+</linearGradient>
+<rect fill="url(#SVGID_1_)" height="8" width="300" y="2"/>
+<rect fill="#3C3C3C" fill-opacity="0.1" height="2" stroke-opacity="0.1" width="300" y="2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="149.9995" x2="149.9995" y1="0" y2="39.8751">
+<stop offset="0" style="stop-color:#66B8CC"/>
+<stop offset="1" style="stop-color:#3F89A9"/>
+</linearGradient>
+<rect fill="url(#SVGID_2_)" height="3" width="300"/>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_tl.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_tl.svg	Mon May 03 12:48:33 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"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="6" x2="6" y1="2" y2="37.6721">
+<stop offset="0" style="stop-color:#E6E6EB"/>
+<stop offset="0.15" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#FFFFFF"/>
+</linearGradient>
+<path d="M10,2H4C2.897,2,2,2.897,2,4v6h8V2z" fill="url(#SVGID_1_)"/>
+<path d="M4,2C2.897,2,2,2.897,2,4h8V2H4z" fill="#3C3C3C" fill-opacity="0.1" stroke-opacity="0.1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="5" x2="5" y1="0" y2="39.8752">
+<stop offset="0" style="stop-color:#66B8CC"/>
+<stop offset="1" style="stop-color:#3F89A9"/>
+</linearGradient>
+<path d="M3,4c0-0.542,0.458-1,1-1h6V0H4C1.8,0,0,1.8,0,4v6h3V4z" fill="url(#SVGID_2_)"/>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_tr.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_tr.svg	Mon May 03 12:48:33 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"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4" x2="4" y1="2" y2="37.6721">
+<stop offset="0" style="stop-color:#E6E6EB"/>
+<stop offset="0.15" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#FFFFFF"/>
+</linearGradient>
+<path d="M8,4c0-1.103-0.896-2-2-2H0v8h8V4z" fill="url(#SVGID_1_)"/>
+<path d="M8,4c0-1.103-0.896-2-2-2H0v2H8z" fill="#3C3C3C" fill-opacity="0.1" stroke-opacity="0.1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="5" x2="5" y1="0" y2="39.8752">
+<stop offset="0" style="stop-color:#66B8CC"/>
+<stop offset="1" style="stop-color:#3F89A9"/>
+</linearGradient>
+<path d="M10,4c0-2.2-1.8-4-4-4H0v3h6c0.542,0,1,0.458,1,1v6h3V4z" fill="url(#SVGID_2_)"/>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_b.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_b.svg	Mon May 03 12:48:33 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 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="url(#SVGID_1_)" height="9.5" width="300"/>
+<rect fill="#B4B4B9" height="1" width="300" y="9"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="149.9995" x2="149.9995" y1="-29.4995" y2="9.5663">
+<stop offset="0" style="stop-color:#E6E6EB"/>
+<stop offset="0.15" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#FFFFFF"/>
+</linearGradient>
+</defs>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_bl.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_bl.svg	Mon May 03 12:48:33 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.5,6c0,1.93,1.57,3.5,3.5,3.5h6V0H0.5V6z" fill="url(#SVGID_1_)"/>
+<path d="M0,0v6c0,2.2,1.8,4,4,4h6V9H4C2.346,9,1,7.654,1,6V0H0z" fill="#B4B4B9"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5.25" x2="5.25" y1="-29.4995" y2="9.5663">
+<stop offset="0" style="stop-color:#E6E6EB"/>
+<stop offset="0.15" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#FFFFFF"/>
+</linearGradient>
+</defs>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_br.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_br.svg	Mon May 03 12:48:33 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,9.5h6c1.93,0,3.5-1.57,3.5-3.5V0H0V9.5z" fill="url(#SVGID_1_)"/>
+<path d="M9,6c0,1.654-1.346,3-3,3H0v1h6c2.2,0,4-1.8,4-4V0H9V6z" fill="#B4B4B9"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4.75" x2="4.75" y1="-29.4995" y2="9.5663">
+<stop offset="0" style="stop-color:#E6E6EB"/>
+<stop offset="0.15" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#FFFFFF"/>
+</linearGradient>
+</defs>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_c.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_c.svg	Mon May 03 12:48:33 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="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="url(#SVGID_1_)" height="20" width="300"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="149.9995" x2="149.9995" y1="-9.5" y2="29.5668">
+<stop offset="0" style="stop-color:#E6E6EB"/>
+<stop offset="0.15" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#FFFFFF"/>
+</linearGradient>
+</defs>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_l.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_l.svg	Mon May 03 12:48:33 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="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="url(#SVGID_1_)" height="20" width="9.5" x="0.5"/>
+<rect fill="#B4B4B9" height="20" width="1"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5.25" x2="5.25" y1="-9.5" y2="29.5668">
+<stop offset="0" style="stop-color:#E6E6EB"/>
+<stop offset="0.15" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#FFFFFF"/>
+</linearGradient>
+</defs>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_r.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_r.svg	Mon May 03 12:48:33 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="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="url(#SVGID_1_)" height="20" width="9.5"/>
+<rect fill="#B4B4B9" height="20" width="1" x="9"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4.75" x2="4.75" y1="-9.5" y2="29.5668">
+<stop offset="0" style="stop-color:#E6E6EB"/>
+<stop offset="0.15" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#FFFFFF"/>
+</linearGradient>
+</defs>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_t.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_t.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +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="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="url(#SVGID_1_)" height="9.5" width="300" y="0.5"/>
+<rect fill="#B4B4B9" height="1" width="300"/>
+<rect fill="#646464" fill-opacity="0.1" height="1" stroke-opacity="0.1" width="300" y="1"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="149.9995" x2="149.9995" y1="0.5" y2="39.5658">
+<stop offset="0" style="stop-color:#E6E6EB"/>
+<stop offset="0.15" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#FFFFFF"/>
+</linearGradient>
+</defs>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_tl.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_tl.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +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="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,0.5H4C2.07,0.5,0.5,2.07,0.5,4v6H10V0.5z" fill="url(#SVGID_1_)"/>
+<path d="M1,4c0-1.654,1.346-3,3-3h6V0H4C1.8,0,0,1.8,0,4v6h1V4z" fill="#B4B4B9"/>
+<path d="M4,1C2.346,1,1,2.346,1,4c0-1.654,1.346-2,3-2h6V1H4z" fill="#646464" fill-opacity="0.1" stroke-opacity="0.1"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5.25" x2="5.25" y1="0.5" y2="39.5658">
+<stop offset="0" style="stop-color:#E6E6EB"/>
+<stop offset="0.15" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#FFFFFF"/>
+</linearGradient>
+</defs>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_tr.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_tr.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +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="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="M9.5,4c0-1.93-1.57-3.5-3.5-3.5H0V10h9.5V4z" fill="url(#SVGID_1_)"/>
+<path d="M10,4c0-2.2-1.8-4-4-4H0v1h6c1.654,0,3,1.346,3,3v6h1V4z" fill="#B4B4B9"/>
+<path d="M6,1H0v1h6c1.654,0,3,0.346,3,2C9,2.346,7.654,1,6,1z" fill="#646464" fill-opacity="0.1" stroke-opacity="0.1"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4.75" x2="4.75" y1="0.5" y2="39.5658">
+<stop offset="0" style="stop-color:#E6E6EB"/>
+<stop offset="0.15" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#FFFFFF"/>
+</linearGradient>
+</defs>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_highlight_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_highlight_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_highlight_c.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,17 +2,20 @@
 <!DOCTYPE svg 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 40 40" 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="40" width="40"/>
-<rect fill="url(#SVGID_1_)" height="40" width="40"/>
-<rect fill="#FFFFFF" fill-opacity="0.2" height="1" stroke-opacity="0.2" width="40" y="38"/>
-<rect fill="#FFFFFF" fill-opacity="0.2" height="3" stroke-opacity="0.2" width="40" y="1"/>
+<rect fill="#FFFFFF" fill-opacity="0.1" height="2" stroke-opacity="0.1" width="40" y="38"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="19.9995" x2="19.9995" y1="0.2319" y2="39.2324">
+<stop offset="0" style="stop-color:#00BAFF"/>
+<stop offset="0.9835" style="stop-color:#0075BD"/>
+<stop offset="1" style="stop-color:#0075BD"/>
+</linearGradient>
+<rect fill="url(#SVGID_1_)" height="39" width="40"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-39.3335" x2="79.1721" y1="37" y2="37">
+<stop offset="0" style="stop-color:#3AB9E0"/>
+<stop offset="0.5055" style="stop-color:#F8FBFF"/>
+<stop offset="1" style="stop-color:#3AB9E0"/>
+</linearGradient>
+<rect fill="url(#SVGID_2_)" fill-opacity="0.8" height="2" stroke-opacity="0.8" width="40" y="36"/>
 <rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="40"/>
-<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="40" y="39"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="19.9995" x2="19.9995" y1="-0.3335" y2="39.847">
-<stop offset="0" style="stop-color:#66B8CC"/>
-<stop offset="0.9" style="stop-color:#3F89A9"/>
-<stop offset="0.9" style="stop-color:#3880A4"/>
-<stop offset="1" style="stop-color:#3278A0"/>
-</linearGradient>
-</defs>
+<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="40" y="38"/>
+<rect fill="#FFFFFF" fill-opacity="0.5" height="1" stroke-opacity="0.5" width="40" y="1"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_highlight_cl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_highlight_cl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_highlight_cl.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,15 +2,27 @@
 <!DOCTYPE svg 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 40 40" 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="40" width="40"/>
-<rect fill="url(#SVGID_1_)" height="40" width="40"/>
-<polygon fill="#FFFFFF" fill-opacity="0.2" points="1,1 1,39 40,39 40,38 2,38 2,4 40,4 40,2 40,1 " stroke-opacity="0.2"/>
-<polygon fill-opacity="0.2" points="40,39 1,39 1,1 40,1 40,0 0,0 0,40 40,40 " stroke-opacity="0.2"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="20" x2="20" y1="-0.3335" y2="39.847">
-<stop offset="0" style="stop-color:#66B8CC"/>
-<stop offset="0.9" style="stop-color:#3F89A9"/>
-<stop offset="0.9" style="stop-color:#3880A4"/>
-<stop offset="1" style="stop-color:#3278A0"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="0.5" x2="0.5" y1="2" y2="38.0005">
+<stop offset="0" style="stop-color:#808080"/>
+<stop offset="0.0988" style="stop-color:#BEBEBE"/>
+<stop offset="0.1832" style="stop-color:#EDEDED"/>
+<stop offset="0.2253" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#262626"/>
 </linearGradient>
-</defs>
+<rect fill="url(#SVGID_1_)" fill-opacity="0.4" height="36" stroke-opacity="0.4" width="1" y="2"/>
+<rect fill="#FFFFFF" fill-opacity="0.1" height="2" stroke-opacity="0.1" width="40" y="38"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="20" x2="20" y1="0.2319" y2="39.2324">
+<stop offset="0" style="stop-color:#00BAFF"/>
+<stop offset="0.9835" style="stop-color:#0075BD"/>
+<stop offset="1" style="stop-color:#0075BD"/>
+</linearGradient>
+<rect fill="url(#SVGID_2_)" height="39" width="40"/>
+<rect fill="#FFFFFF" fill-opacity="0.5" height="1" stroke-opacity="0.5" width="40" y="1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="1" x2="118.5015" y1="37" y2="37">
+<stop offset="0" style="stop-color:#3AB9E0"/>
+<stop offset="0.5055" style="stop-color:#F8FBFF"/>
+<stop offset="1" style="stop-color:#3AB9E0"/>
+</linearGradient>
+<rect fill="url(#SVGID_3_)" fill-opacity="0.8" height="2" stroke-opacity="0.8" width="39" x="1" y="36"/>
+<polygon fill-opacity="0.2" points="1,38 1,1 40,1 40,0 0,0 0,39 40,39 40,38 " stroke-opacity="0.2"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_highlight_cr.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_highlight_cr.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_highlight_cr.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,15 +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 40 40" 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="40" width="40"/>
-<rect fill="url(#SVGID_1_)" height="40" width="40"/>
-<polygon fill="#FFFFFF" fill-opacity="0.2" points="0,1 0,2 0,4 38,4 38,38 0,38 0,39 39,39 39,1 " stroke-opacity="0.2"/>
-<polygon fill-opacity="0.2" points="0,39 39,39 39,1 0,1 0,0 40,0 40,40 0,40 " stroke-opacity="0.2"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="20" x2="20" y1="-0.3335" y2="39.847">
-<stop offset="0" style="stop-color:#66B8CC"/>
-<stop offset="0.9" style="stop-color:#3F89A9"/>
-<stop offset="0.9" style="stop-color:#3880A4"/>
-<stop offset="1" style="stop-color:#3278A0"/>
+<rect fill="#FFFFFF" fill-opacity="0.1" height="2" stroke-opacity="0.1" width="40" y="38"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="20" x2="20" y1="0.2319" y2="39.2324">
+<stop offset="0" style="stop-color:#00BAFF"/>
+<stop offset="0.9835" style="stop-color:#0075BD"/>
+<stop offset="1" style="stop-color:#0075BD"/>
 </linearGradient>
-</defs>
+<rect fill="url(#SVGID_1_)" height="39" width="40"/>
+<rect fill="#FFFFFF" fill-opacity="0.5" height="1" stroke-opacity="0.5" width="40" y="1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-78.6611" x2="38.8404" y1="37" y2="37">
+<stop offset="0" style="stop-color:#3AB9E0"/>
+<stop offset="0.5055" style="stop-color:#F8FBFF"/>
+<stop offset="1" style="stop-color:#3AB9E0"/>
+</linearGradient>
+<rect fill="url(#SVGID_2_)" fill-opacity="0.8" height="2" stroke-opacity="0.8" width="39" y="36"/>
+<polygon fill-opacity="0.2" points="0,1 39,1 39,38 0,38 0,39 40,39 40,0 0,0 " stroke-opacity="0.2"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_highlight_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_highlight_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_highlight_l.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,15 +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 60 40" width="60px" 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="60"/>
-<rect fill="url(#SVGID_1_)" height="40" width="60"/>
-<path d="M0,0v40h60V0H0z M59,39H1V1h58V39z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M1,1v38h58V1H1z M58,38H2V4h56V38z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="-0.3335" y2="39.847">
-<stop offset="0" style="stop-color:#66B8CC"/>
-<stop offset="0.9" style="stop-color:#3F89A9"/>
-<stop offset="0.9" style="stop-color:#3880A4"/>
-<stop offset="1" style="stop-color:#3278A0"/>
+<path d="M2,30V0H0v30c0,5.5,4.5,10,10,10h50v-2H10C5.589,38,2,34.411,2,30z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30.5" x2="30.5" y1="0.2319" y2="39.2319">
+<stop offset="0" style="stop-color:#00BAFF"/>
+<stop offset="0.9835" style="stop-color:#0075BD"/>
+<stop offset="1" style="stop-color:#0075BD"/>
 </linearGradient>
-</defs>
+<path d="M60,0H1v30c0,4.963,4.037,9,9,9h50V0z" fill="url(#SVGID_1_)"/>
+<rect fill="#FFFFFF" fill-opacity="0.5" height="1" stroke-opacity="0.5" width="58" x="2" y="1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="2" x2="59" y1="33" y2="33">
+<stop offset="0" style="stop-color:#3AB9E0"/>
+<stop offset="0.5055" style="stop-color:#F8FBFF"/>
+<stop offset="1" style="stop-color:#3AB9E0"/>
+</linearGradient>
+<path d="M2,28v2c0,4.411,3.589,8,8,8h49v-2H10C5.589,36,2,32.411,2,28z" fill="url(#SVGID_2_)" fill-opacity="0.8" stroke-opacity="0.8"/>
+<path d="M1,0v30c0,4.963,4.037,9,9,9h50V0H1z M59,38H10c-4.411,0-8-3.589-8-8V1h57V38z" fill-opacity="0.2" stroke-opacity="0.2"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_highlight_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_highlight_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_highlight_r.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,16 +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 60 40" width="60px" 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="60"/>
-<rect fill-opacity="0.2" height="40" stroke-opacity="0.2" width="1" x="59"/>
-<rect fill="url(#SVGID_1_)" height="40" width="60"/>
-<path d="M0,0v40h60V0H0z M59,39H1V1h58V39z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M1,1v38h58V1H1z M58,38H2V4h56V38z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="-0.3335" y2="39.847">
-<stop offset="0" style="stop-color:#66B8CC"/>
-<stop offset="0.9" style="stop-color:#3F89A9"/>
-<stop offset="0.9" style="stop-color:#3880A4"/>
-<stop offset="1" style="stop-color:#3278A0"/>
+<path d="M58,0v30c0,4.411-3.589,8-8,8H0v2h50c5.5,0,10-4.5,10-10V0H58z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
+<linearGradient gradientTransform="matrix(-1 0 0 1 -1619 0)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-1648.5" x2="-1648.5" y1="0.2319" y2="39.2319">
+<stop offset="0" style="stop-color:#00BAFF"/>
+<stop offset="0.9835" style="stop-color:#0075BD"/>
+<stop offset="1" style="stop-color:#0075BD"/>
 </linearGradient>
-</defs>
+<path d="M0,0h59v30c0,4.963-4.037,9-9,9H0V0z" fill="url(#SVGID_1_)"/>
+<rect fill="#FFFFFF" fill-opacity="0.5" height="1" stroke-opacity="0.5" width="58" y="1"/>
+<linearGradient gradientTransform="matrix(-1 0 0 1 -1619 0)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-1677" x2="-1620" y1="33" y2="33">
+<stop offset="0" style="stop-color:#3AB9E0"/>
+<stop offset="0.5055" style="stop-color:#F8FBFF"/>
+<stop offset="1" style="stop-color:#3AB9E0"/>
+</linearGradient>
+<path d="M58,28v2c0,4.411-3.589,8-8,8H1v-2h49C54.411,36,58,32.411,58,28z" fill="url(#SVGID_2_)" fill-opacity="0.8" stroke-opacity="0.8"/>
+<path d="M0,0v39h50c4.963,0,9-4.037,9-9V0H0z M1,1h57v29c0,4.411-3.589,8-8,8H1V1z" fill-opacity="0.2" stroke-opacity="0.2"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_latched_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_latched_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_latched_c.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,16 +2,25 @@
 <!DOCTYPE svg 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 40 40" 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="40" width="40"/>
-<rect fill="url(#SVGID_1_)" height="40" width="40"/>
-<rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="40" y="39"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="40" y="38"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="3" stroke-opacity="0.4" width="40"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="19.9995" x2="19.9995" y1="-0.3335" y2="39.847">
-<stop offset="0" style="stop-color:#C8C8D2"/>
-<stop offset="0.9" style="stop-color:#9696A0"/>
-<stop offset="0.9" style="stop-color:#8C8C96"/>
-<stop offset="1" style="stop-color:#82828C"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="19.9995" x2="19.9995" y1="-0.1704" y2="38.8301">
+<stop offset="0" style="stop-color:#646464"/>
+<stop offset="0.2679" style="stop-color:#585858"/>
+<stop offset="0.75" style="stop-color:#464646"/>
+<stop offset="0.8457" style="stop-color:#525252"/>
+<stop offset="1" style="stop-color:#6E6E6E"/>
 </linearGradient>
-</defs>
+<rect fill="url(#SVGID_1_)" height="39" width="40"/>
+<rect fill="#FFFFFF" fill-opacity="0.1" height="2" stroke-opacity="0.1" width="40" y="38"/>
+<rect fill="#FFFFFF" fill-opacity="0.7" height="1" stroke-opacity="0.7" width="40" y="1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="19.9995" x2="19.9995" y1="1.769" y2="18.0023">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#999999"/>
+</linearGradient>
+<rect fill="url(#SVGID_2_)" fill-opacity="0.1" height="16" stroke-opacity="0.1" width="40" y="2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-39.3335" x2="79.2265" y1="37" y2="37">
+<stop offset="0" style="stop-color:#666666"/>
+<stop offset="0.5055" style="stop-color:#F8FBFF"/>
+<stop offset="1" style="stop-color:#666666"/>
+</linearGradient>
+<rect fill="url(#SVGID_3_)" fill-opacity="0.4" height="2" stroke-opacity="0.4" width="40" y="36"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_latched_cl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_latched_cl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_latched_cl.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,16 +2,33 @@
 <!DOCTYPE svg 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 40 40" 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="40" width="40"/>
-<rect fill="url(#SVGID_1_)" height="40" width="40"/>
-<rect fill-opacity="0.2" height="40" stroke-opacity="0.2" width="1"/>
-<rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="39" x="1" y="39"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="1,0 1,39 40,39 40,38 2,38 2,3 40,3 40,1 40,0 " stroke-opacity="0.4"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="20" x2="20" y1="-0.3335" y2="39.847">
-<stop offset="0" style="stop-color:#C8C8D2"/>
-<stop offset="0.9" style="stop-color:#9696A0"/>
-<stop offset="0.9" style="stop-color:#8C8C96"/>
-<stop offset="1" style="stop-color:#82828C"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="20" x2="20" y1="-0.1704" y2="38.8301">
+<stop offset="0" style="stop-color:#646464"/>
+<stop offset="0.2679" style="stop-color:#585858"/>
+<stop offset="0.75" style="stop-color:#464646"/>
+<stop offset="0.8457" style="stop-color:#525252"/>
+<stop offset="1" style="stop-color:#6E6E6E"/>
+</linearGradient>
+<rect fill="url(#SVGID_1_)" height="39" width="40"/>
+<rect fill="#FFFFFF" fill-opacity="0.1" height="2" stroke-opacity="0.1" width="40" y="38"/>
+<rect fill="#FFFFFF" fill-opacity="0.7" height="1" stroke-opacity="0.7" width="40" y="1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="20" x2="20" y1="1.769" y2="18.0023">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#999999"/>
 </linearGradient>
-</defs>
+<rect fill="url(#SVGID_2_)" fill-opacity="0.1" height="16" stroke-opacity="0.1" width="40" y="2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="0.5" x2="0.5" y1="2" y2="38.0005">
+<stop offset="0" style="stop-color:#828282"/>
+<stop offset="0.0971" style="stop-color:#BEBEBE"/>
+<stop offset="0.1826" style="stop-color:#EDEDED"/>
+<stop offset="0.2253" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#505050"/>
+</linearGradient>
+<rect fill="url(#SVGID_3_)" fill-opacity="0.4" height="36" stroke-opacity="0.4" width="1" y="2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="1" x2="118.555" y1="37" y2="37">
+<stop offset="0" style="stop-color:#666666"/>
+<stop offset="0.5055" style="stop-color:#F8FBFF"/>
+<stop offset="1" style="stop-color:#666666"/>
+</linearGradient>
+<rect fill="url(#SVGID_4_)" fill-opacity="0.4" height="2" stroke-opacity="0.4" width="39" x="1" y="36"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_latched_cr.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_latched_cr.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_latched_cr.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,16 +2,33 @@
 <!DOCTYPE svg 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 40 40" 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="40" width="40"/>
-<rect fill="url(#SVGID_1_)" height="40" width="40"/>
-<rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="39" y="39"/>
-<rect fill-opacity="0.2" height="40" stroke-opacity="0.2" width="1" x="39"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="0,0 0,1 0,3 38,3 38,38 0,38 0,39 39,39 39,0 " stroke-opacity="0.4"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="20" x2="20" y1="-0.3335" y2="39.847">
-<stop offset="0" style="stop-color:#C8C8D2"/>
-<stop offset="0.9" style="stop-color:#9696A0"/>
-<stop offset="0.9" style="stop-color:#8C8C96"/>
-<stop offset="1" style="stop-color:#82828C"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="20" x2="20" y1="-0.1704" y2="38.8301">
+<stop offset="0" style="stop-color:#646464"/>
+<stop offset="0.2679" style="stop-color:#585858"/>
+<stop offset="0.75" style="stop-color:#464646"/>
+<stop offset="0.8457" style="stop-color:#525252"/>
+<stop offset="1" style="stop-color:#6E6E6E"/>
+</linearGradient>
+<rect fill="url(#SVGID_1_)" height="39" width="40"/>
+<rect fill="#FFFFFF" fill-opacity="0.1" height="2" stroke-opacity="0.1" width="40" y="38"/>
+<rect fill="#FFFFFF" fill-opacity="0.7" height="1" stroke-opacity="0.7" width="40" y="1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="20" x2="20" y1="1.769" y2="18.0023">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#999999"/>
 </linearGradient>
-</defs>
+<rect fill="url(#SVGID_2_)" fill-opacity="0.1" height="16" stroke-opacity="0.1" width="40" y="2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="39.5" x2="39.5" y1="2" y2="38.0005">
+<stop offset="0" style="stop-color:#828282"/>
+<stop offset="0.0971" style="stop-color:#BEBEBE"/>
+<stop offset="0.1826" style="stop-color:#EDEDED"/>
+<stop offset="0.2253" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#505050"/>
+</linearGradient>
+<rect fill="url(#SVGID_3_)" fill-opacity="0.4" height="36" stroke-opacity="0.4" width="1" x="39" y="2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-78.6611" x2="38.8938" y1="37" y2="37">
+<stop offset="0" style="stop-color:#666666"/>
+<stop offset="0.5055" style="stop-color:#F8FBFF"/>
+<stop offset="1" style="stop-color:#666666"/>
+</linearGradient>
+<rect fill="url(#SVGID_4_)" fill-opacity="0.4" height="2" stroke-opacity="0.4" width="39" y="36"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_latched_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_latched_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_latched_l.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,17 +2,37 @@
 <!DOCTYPE svg 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 60 40" width="60px" 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="60"/>
-<rect fill="url(#SVGID_1_)" height="40" width="60"/>
-<rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="58" x="1" y="39"/>
-<rect fill-opacity="0.2" height="40" stroke-opacity="0.2" width="1" x="59"/>
-<rect fill-opacity="0.2" height="40" stroke-opacity="0.2" width="1"/>
-<path d="M1,0v39h58V0H1z M58,38H2V3h56V38z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="-0.3335" y2="39.847">
-<stop offset="0" style="stop-color:#C8C8D2"/>
-<stop offset="0.9" style="stop-color:#9696A0"/>
-<stop offset="0.9" style="stop-color:#8C8C96"/>
-<stop offset="1" style="stop-color:#82828C"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30.5" x2="30.5" y1="-0.1704" y2="38.8301">
+<stop offset="0" style="stop-color:#646464"/>
+<stop offset="0.2679" style="stop-color:#585858"/>
+<stop offset="0.75" style="stop-color:#464646"/>
+<stop offset="0.8457" style="stop-color:#525252"/>
+<stop offset="1" style="stop-color:#6E6E6E"/>
+</linearGradient>
+<path d="M1,0v30c0,4.963,4.037,9,9,9h50V0H1z" fill="url(#SVGID_1_)"/>
+<path d="M2,30V0H0v30c0,5.5,4.5,10,10,10h50v-2H10C5.589,38,2,34.411,2,30z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="31.5" x2="31.5" y1="2.125" y2="20.8817">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#505050"/>
 </linearGradient>
-</defs>
+<polygon fill="url(#SVGID_2_)" fill-opacity="0.7" points="3,1 3,21 4,21 4,2 60,2 60,1 " stroke-opacity="0.7"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="32" x2="32" y1="1.769" y2="18.0023">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#999999"/>
+</linearGradient>
+<rect fill="url(#SVGID_3_)" fill-opacity="0.1" height="16" stroke-opacity="0.1" width="56" x="4" y="2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="59.5" x2="59.5" y1="2" y2="38.0005">
+<stop offset="0" style="stop-color:#828282"/>
+<stop offset="0.0971" style="stop-color:#BEBEBE"/>
+<stop offset="0.1826" style="stop-color:#EDEDED"/>
+<stop offset="0.2253" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#505050"/>
+</linearGradient>
+<rect fill="url(#SVGID_4_)" fill-opacity="0.4" height="36" stroke-opacity="0.4" width="1" x="59" y="2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="3" x2="59" y1="33" y2="33">
+<stop offset="0" style="stop-color:#666666"/>
+<stop offset="0.5055" style="stop-color:#F8FBFF"/>
+<stop offset="1" style="stop-color:#666666"/>
+</linearGradient>
+<path d="M3,28v2c0,4.411,3.589,8,8,8h48v-2H11C6.589,36,3,32.411,3,28z" fill="url(#SVGID_5_)" fill-opacity="0.4" stroke-opacity="0.4"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_latched_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_latched_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_latched_r.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,17 +2,37 @@
 <!DOCTYPE svg 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 60 40" width="60px" 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="60"/>
-<rect fill-opacity="0.2" height="40" stroke-opacity="0.2" width="1" x="59"/>
-<rect fill="url(#SVGID_1_)" height="40" width="60"/>
-<rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="58" x="1" y="39"/>
-<rect fill-opacity="0.2" height="40" stroke-opacity="0.2" width="1"/>
-<path d="M1,0v39h58V0H1z M58,38H2V3h56V38z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="-0.3335" y2="39.847">
-<stop offset="0" style="stop-color:#C8C8D2"/>
-<stop offset="0.9" style="stop-color:#9696A0"/>
-<stop offset="0.9" style="stop-color:#8C8C96"/>
-<stop offset="1" style="stop-color:#82828C"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.5" x2="29.5" y1="-0.1704" y2="38.8301">
+<stop offset="0" style="stop-color:#646464"/>
+<stop offset="0.2679" style="stop-color:#585858"/>
+<stop offset="0.75" style="stop-color:#464646"/>
+<stop offset="0.8457" style="stop-color:#525252"/>
+<stop offset="1" style="stop-color:#6E6E6E"/>
+</linearGradient>
+<path d="M0,0v39h50c4.963,0,9-4.037,9-9V0H0z" fill="url(#SVGID_1_)"/>
+<path d="M58,0v30c0,4.411-3.589,8-8,8H0v2h50c5.5,0,10-4.5,10-10V0H58z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="28.5" x2="28.5" y1="2.125" y2="20.8817">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#505050"/>
 </linearGradient>
-</defs>
+<polygon fill="url(#SVGID_2_)" fill-opacity="0.7" points="0,1 0,2 56,2 56,21 57,21 57,1 " stroke-opacity="0.7"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="28" x2="28" y1="1.769" y2="18.0023">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#999999"/>
+</linearGradient>
+<rect fill="url(#SVGID_3_)" fill-opacity="0.1" height="16" stroke-opacity="0.1" width="56" y="2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="0.5" x2="0.5" y1="2" y2="38.0005">
+<stop offset="0" style="stop-color:#828282"/>
+<stop offset="0.0971" style="stop-color:#BEBEBE"/>
+<stop offset="0.1826" style="stop-color:#EDEDED"/>
+<stop offset="0.2253" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#505050"/>
+</linearGradient>
+<rect fill="url(#SVGID_4_)" fill-opacity="0.4" height="36" stroke-opacity="0.4" width="1" y="2"/>
+<linearGradient gradientTransform="matrix(-1 0 0 1 -1619 0)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="-1676" x2="-1620" y1="33" y2="33">
+<stop offset="0" style="stop-color:#666666"/>
+<stop offset="0.5055" style="stop-color:#F8FBFF"/>
+<stop offset="1" style="stop-color:#666666"/>
+</linearGradient>
+<path d="M57,28v2c0,4.411-3.589,8-8,8H1v-2h48C53.411,36,57,32.411,57,28z" fill="url(#SVGID_5_)" fill-opacity="0.4" stroke-opacity="0.4"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_normal_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_normal_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_normal_c.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,15 +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="40px" version="1.1" viewBox="0 0 40 40" 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="40" width="40"/>
-<rect fill="url(#SVGID_1_)" height="40" width="40"/>
-<rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="40" y="39"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="40" y="38"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="19.9995" x2="19.9995" y1="-0.3335" y2="39.847">
-<stop offset="0" style="stop-color:#FAFAFF"/>
-<stop offset="0.9" style="stop-color:#D2D2DC"/>
-<stop offset="0.9" style="stop-color:#C8C8D2"/>
-<stop offset="1" style="stop-color:#BEBEC8"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="19.9995" x2="19.9995" y1="0" y2="38.79">
+<stop offset="0" style="stop-color:#0D0D0D"/>
+<stop offset="0.7418" style="stop-color:#000000"/>
+<stop offset="0.8629" style="stop-color:#0C0C0C"/>
+<stop offset="1" style="stop-color:#1F1F1F"/>
 </linearGradient>
-</defs>
+<rect fill="url(#SVGID_1_)" height="39" width="40"/>
+<rect fill="#FFFFFF" fill-opacity="0.1" height="2" stroke-opacity="0.1" width="40" y="38"/>
+<rect fill="#FFFFFF" fill-opacity="0.7" height="1" stroke-opacity="0.7" width="40" y="1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="19.9995" x2="19.9995" y1="2" y2="18.1051">
+<stop offset="0" style="stop-color:#666666"/>
+<stop offset="1" style="stop-color:#262626"/>
+</linearGradient>
+<rect fill="url(#SVGID_2_)" fill-opacity="0.5" height="16" stroke-opacity="0.5" width="40" y="2"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_normal_cl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_normal_cl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_normal_cl.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,16 +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="40px" version="1.1" viewBox="0 0 40 40" 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="40" width="40"/>
-<rect fill="url(#SVGID_1_)" height="40" width="40"/>
-<rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="40" y="39"/>
-<rect fill="#FFFFFF" fill-opacity="0.5" height="39" stroke-opacity="0.5" width="1"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="39" x="1" y="38"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="20" x2="20" y1="-0.3335" y2="39.847">
-<stop offset="0" style="stop-color:#FAFAFF"/>
-<stop offset="0.9" style="stop-color:#D2D2DC"/>
-<stop offset="0.9" style="stop-color:#C8C8D2"/>
-<stop offset="1" style="stop-color:#BEBEC8"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="20" x2="20" y1="0" y2="38.79">
+<stop offset="0" style="stop-color:#0D0D0D"/>
+<stop offset="0.7418" style="stop-color:#000000"/>
+<stop offset="0.8629" style="stop-color:#0C0C0C"/>
+<stop offset="1" style="stop-color:#1F1F1F"/>
 </linearGradient>
-</defs>
+<rect fill="url(#SVGID_1_)" height="39" width="40"/>
+<rect fill="#FFFFFF" fill-opacity="0.1" height="2" stroke-opacity="0.1" width="40" y="38"/>
+<rect fill="#FFFFFF" fill-opacity="0.7" height="1" stroke-opacity="0.7" width="40" y="1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="20" x2="20" y1="2" y2="18.1051">
+<stop offset="0" style="stop-color:#666666"/>
+<stop offset="1" style="stop-color:#262626"/>
+</linearGradient>
+<rect fill="url(#SVGID_2_)" fill-opacity="0.5" height="16" stroke-opacity="0.5" width="40" y="2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="0.5" x2="0.5" y1="2" y2="38.0005">
+<stop offset="0" style="stop-color:#808080"/>
+<stop offset="0.0988" style="stop-color:#BEBEBE"/>
+<stop offset="0.1832" style="stop-color:#EDEDED"/>
+<stop offset="0.2253" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#262626"/>
+</linearGradient>
+<rect fill="url(#SVGID_3_)" fill-opacity="0.4" height="36" stroke-opacity="0.4" width="1" y="2"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_normal_cr.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_normal_cr.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_normal_cr.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,16 +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="40px" version="1.1" viewBox="0 0 40 40" 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="40" width="40"/>
-<rect fill="url(#SVGID_1_)" height="40" width="40"/>
-<rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="40" y="39"/>
-<rect fill="#9696A0" fill-opacity="0.5" height="39" stroke-opacity="0.5" width="1" x="39"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="39" y="38"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="20" x2="20" y1="-0.3335" y2="39.847">
-<stop offset="0" style="stop-color:#FAFAFF"/>
-<stop offset="0.9" style="stop-color:#D2D2DC"/>
-<stop offset="0.9" style="stop-color:#C8C8D2"/>
-<stop offset="1" style="stop-color:#BEBEC8"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="20" x2="20" y1="0" y2="38.79">
+<stop offset="0" style="stop-color:#0D0D0D"/>
+<stop offset="0.7418" style="stop-color:#000000"/>
+<stop offset="0.8629" style="stop-color:#0C0C0C"/>
+<stop offset="1" style="stop-color:#1F1F1F"/>
 </linearGradient>
-</defs>
+<rect fill="url(#SVGID_1_)" height="39" width="40"/>
+<rect fill="#FFFFFF" fill-opacity="0.1" height="2" stroke-opacity="0.1" width="40" y="38"/>
+<rect fill="#FFFFFF" fill-opacity="0.7" height="1" stroke-opacity="0.7" width="40" y="1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="20" x2="20" y1="2" y2="18.1051">
+<stop offset="0" style="stop-color:#666666"/>
+<stop offset="1" style="stop-color:#262626"/>
+</linearGradient>
+<rect fill="url(#SVGID_2_)" fill-opacity="0.5" height="16" stroke-opacity="0.5" width="40" y="2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="39.5" x2="39.5" y1="2" y2="38.0005">
+<stop offset="0" style="stop-color:#808080"/>
+<stop offset="0.0988" style="stop-color:#BEBEBE"/>
+<stop offset="0.1832" style="stop-color:#EDEDED"/>
+<stop offset="0.2253" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#262626"/>
+</linearGradient>
+<rect fill="url(#SVGID_3_)" fill-opacity="0.4" height="36" stroke-opacity="0.4" width="1" x="39" y="2"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_normal_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_normal_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_normal_l.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,16 +2,30 @@
 <!DOCTYPE svg 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 60 40" width="60px" 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="60"/>
-<rect fill="url(#SVGID_1_)" height="40" width="60"/>
-<rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="60" y="39"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="1,38 1,0 0,0 0,39 59,39 59,38 " stroke-opacity="0.4"/>
-<rect fill="#9696A0" fill-opacity="0.5" height="39" stroke-opacity="0.5" width="1" x="59"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="-0.3335" y2="39.847">
-<stop offset="0" style="stop-color:#FAFAFF"/>
-<stop offset="0.9" style="stop-color:#D2D2DC"/>
-<stop offset="0.9" style="stop-color:#C8C8D2"/>
-<stop offset="1" style="stop-color:#BEBEC8"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30.5" x2="30.5" y1="0" y2="38.79">
+<stop offset="0" style="stop-color:#0D0D0D"/>
+<stop offset="0.7418" style="stop-color:#000000"/>
+<stop offset="0.8629" style="stop-color:#0C0C0C"/>
+<stop offset="1" style="stop-color:#1F1F1F"/>
+</linearGradient>
+<path d="M1,0v30c0,4.963,4.038,9,9,9h50V0H1z" fill="url(#SVGID_1_)"/>
+<path d="M2,30V0H0v30c0,5.5,4.5,10,10,10h50v-2H10C5.589,38,2,34.411,2,30z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="31.5" x2="31.5" y1="2.0415" y2="21.0016">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#262626"/>
 </linearGradient>
-</defs>
+<polygon fill="url(#SVGID_2_)" fill-opacity="0.7" points="3,1 3,21 4,21 4,2 60,2 60,1 " stroke-opacity="0.7"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="32" x2="32" y1="2" y2="18.1051">
+<stop offset="0" style="stop-color:#666666"/>
+<stop offset="1" style="stop-color:#262626"/>
+</linearGradient>
+<rect fill="url(#SVGID_3_)" fill-opacity="0.5" height="16" stroke-opacity="0.5" width="56" x="4" y="2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="59.5" x2="59.5" y1="2" y2="38.0005">
+<stop offset="0" style="stop-color:#808080"/>
+<stop offset="0.0988" style="stop-color:#BEBEBE"/>
+<stop offset="0.1832" style="stop-color:#EDEDED"/>
+<stop offset="0.2253" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#262626"/>
+</linearGradient>
+<rect fill="url(#SVGID_4_)" fill-opacity="0.2" height="36" stroke-opacity="0.2" width="1" x="59" y="2"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_normal_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_normal_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_normal_r.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,16 +2,30 @@
 <!DOCTYPE svg 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 60 40" width="60px" 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="60"/>
-<rect fill="url(#SVGID_1_)" height="40" width="60"/>
-<rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="60" y="39"/>
-<rect fill="#FFFFFF" fill-opacity="0.5" height="39" stroke-opacity="0.5" width="1"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="59,0 59,38 1,38 1,39 60,39 60,0 " stroke-opacity="0.4"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="-0.3335" y2="39.847">
-<stop offset="0" style="stop-color:#FAFAFF"/>
-<stop offset="0.9" style="stop-color:#D2D2DC"/>
-<stop offset="0.9" style="stop-color:#C8C8D2"/>
-<stop offset="1" style="stop-color:#BEBEC8"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.5" x2="29.5" y1="0" y2="38.79">
+<stop offset="0" style="stop-color:#0D0D0D"/>
+<stop offset="0.7418" style="stop-color:#000000"/>
+<stop offset="0.8629" style="stop-color:#0C0C0C"/>
+<stop offset="1" style="stop-color:#1F1F1F"/>
+</linearGradient>
+<path d="M0,0v39h50c4.963,0,9-4.037,9-9V0H0z" fill="url(#SVGID_1_)"/>
+<path d="M58,0v30c0,4.411-3.589,8-8,8H0v2h50c5.5,0,10-4.5,10-10V0H58z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="28.5" x2="28.5" y1="2.0415" y2="21.0016">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#262626"/>
 </linearGradient>
-</defs>
+<polygon fill="url(#SVGID_2_)" fill-opacity="0.7" points="0,1 0,2 56,2 56,21 57,21 57,1 " stroke-opacity="0.7"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="28" x2="28" y1="2" y2="18.1051">
+<stop offset="0" style="stop-color:#666666"/>
+<stop offset="1" style="stop-color:#262626"/>
+</linearGradient>
+<rect fill="url(#SVGID_3_)" fill-opacity="0.5" height="16" stroke-opacity="0.5" width="56" y="2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="0.5" x2="0.5" y1="2" y2="38.0005">
+<stop offset="0" style="stop-color:#808080"/>
+<stop offset="0.0988" style="stop-color:#BEBEBE"/>
+<stop offset="0.1832" style="stop-color:#EDEDED"/>
+<stop offset="0.2253" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#262626"/>
+</linearGradient>
+<rect fill="url(#SVGID_4_)" fill-opacity="0.2" height="36" stroke-opacity="0.2" width="1" y="2"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_pressed_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_pressed_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_pressed_c.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,14 +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 40 40" 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="40" width="40"/>
-<rect fill="url(#SVGID_1_)" height="40" width="40"/>
-<rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="40" y="39"/>
-<rect fill="#FFFFFF" fill-opacity="0.2" height="1" stroke-opacity="0.2" width="40" y="38"/>
-<rect fill="#FFFFFF" fill-opacity="0.2" height="1" stroke-opacity="0.2" width="40"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="20.0005" x2="20.0005" y1="39.7783" y2="-0.0051">
-<stop offset="0" style="stop-color:#65B8CC"/>
-<stop offset="1" style="stop-color:#306D8C"/>
+<rect fill="#FFFFFF" fill-opacity="0.1" height="2" stroke-opacity="0.1" width="40" y="38"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="20.0005" x2="20.0005" y1="39" y2="4.882813e-004">
+<stop offset="0" style="stop-color:#009DD9"/>
+<stop offset="1" style="stop-color:#004F80"/>
 </linearGradient>
-</defs>
+<rect fill="url(#SVGID_1_)" height="39" width="40"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-39.3335" x2="79.1721" y1="37" y2="37">
+<stop offset="0" style="stop-color:#3AB9E0"/>
+<stop offset="0.5055" style="stop-color:#F8FBFF"/>
+<stop offset="1" style="stop-color:#3AB9E0"/>
+</linearGradient>
+<rect fill="url(#SVGID_2_)" fill-opacity="0.7" height="2" stroke-opacity="0.7" width="40" y="36"/>
+<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="40"/>
+<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="40" y="38"/>
+<rect fill="#FFFFFF" fill-opacity="0.3" height="1" stroke-opacity="0.3" width="40" y="1"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_pressed_cl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_pressed_cl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_pressed_cl.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,14 +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="40px" version="1.1" viewBox="0 0 40 40" 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="40" width="40"/>
-<rect fill="url(#SVGID_1_)" height="40" width="40"/>
-<rect fill-opacity="0.2" height="40" stroke-opacity="0.2" width="1"/>
-<rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="39" x="1" y="39"/>
-<polygon fill="#FFFFFF" fill-opacity="0.2" points="40,1 40,0 1,0 1,39 40,39 40,38 2,38 2,1 " stroke-opacity="0.2"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="20" x2="20" y1="39.7783" y2="-0.0051">
-<stop offset="0" style="stop-color:#65B8CC"/>
-<stop offset="1" style="stop-color:#306D8C"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="0.5" x2="0.5" y1="2" y2="38.0005">
+<stop offset="0" style="stop-color:#808080"/>
+<stop offset="0.0988" style="stop-color:#BEBEBE"/>
+<stop offset="0.1832" style="stop-color:#EDEDED"/>
+<stop offset="0.2253" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#262626"/>
 </linearGradient>
-</defs>
+<rect fill="url(#SVGID_1_)" fill-opacity="0.4" height="36" stroke-opacity="0.4" width="1" y="2"/>
+<rect fill="#FFFFFF" fill-opacity="0.1" height="2" stroke-opacity="0.1" width="40" y="38"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="20" x2="20" y1="39" y2="4.882813e-004">
+<stop offset="0" style="stop-color:#009DD9"/>
+<stop offset="1" style="stop-color:#004F80"/>
+</linearGradient>
+<rect fill="url(#SVGID_2_)" height="39" width="40"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="1" x2="118.5015" y1="37" y2="37">
+<stop offset="0" style="stop-color:#3AB9E0"/>
+<stop offset="0.5055" style="stop-color:#F8FBFF"/>
+<stop offset="1" style="stop-color:#3AB9E0"/>
+</linearGradient>
+<rect fill="url(#SVGID_3_)" fill-opacity="0.7" height="2" stroke-opacity="0.7" width="39" x="1" y="36"/>
+<polygon fill-opacity="0.2" points="1,38 1,1 40,1 40,0 0,0 0,39 40,39 40,38 " stroke-opacity="0.2"/>
+<rect fill="#FFFFFF" fill-opacity="0.3" height="1" stroke-opacity="0.3" width="40" y="1"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_pressed_cr.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_pressed_cr.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_pressed_cr.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,14 +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="40px" version="1.1" viewBox="0 0 40 40" 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="40" width="40"/>
-<rect fill="url(#SVGID_1_)" height="40" width="40"/>
-<rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="39" y="39"/>
-<rect fill-opacity="0.2" height="40" stroke-opacity="0.2" width="1" x="39"/>
-<polygon fill="#FFFFFF" fill-opacity="0.2" points="0,0 0,1 38,1 38,38 0,38 0,39 39,39 39,0 " stroke-opacity="0.2"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="20" x2="20" y1="39.7783" y2="-0.0051">
-<stop offset="0" style="stop-color:#65B8CC"/>
-<stop offset="1" style="stop-color:#306D8C"/>
+<rect fill="#FFFFFF" fill-opacity="0.1" height="2" stroke-opacity="0.1" width="40" y="38"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="20" x2="20" y1="39" y2="4.882813e-004">
+<stop offset="0" style="stop-color:#009DD9"/>
+<stop offset="1" style="stop-color:#004F80"/>
 </linearGradient>
-</defs>
+<rect fill="url(#SVGID_1_)" height="39" width="40"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-78.6611" x2="38.8404" y1="37" y2="37">
+<stop offset="0" style="stop-color:#3AB9E0"/>
+<stop offset="0.5055" style="stop-color:#F8FBFF"/>
+<stop offset="1" style="stop-color:#3AB9E0"/>
+</linearGradient>
+<rect fill="url(#SVGID_2_)" fill-opacity="0.7" height="2" stroke-opacity="0.7" width="39" y="36"/>
+<polygon fill-opacity="0.2" points="0,1 39,1 39,38 0,38 0,39 40,39 40,0 0,0 " stroke-opacity="0.2"/>
+<rect fill="#FFFFFF" fill-opacity="0.3" height="1" stroke-opacity="0.3" width="40" y="1"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_pressed_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_pressed_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_pressed_l.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,15 +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="40px" version="1.1" viewBox="0 0 60 40" width="60px" 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="60"/>
-<rect fill="url(#SVGID_1_)" height="40" width="60"/>
-<rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="58" x="1" y="39"/>
-<rect fill-opacity="0.2" height="40" stroke-opacity="0.2" width="1" x="59"/>
-<rect fill-opacity="0.2" height="40" stroke-opacity="0.2" width="1"/>
-<path d="M1,0v39h58V0H1z M58,38H2V1h56V38z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="39.7783" y2="-0.0051">
-<stop offset="0" style="stop-color:#65B8CC"/>
-<stop offset="1" style="stop-color:#306D8C"/>
+<path d="M2,30V0H0v30c0,5.5,4.5,10,10,10h50v-2H10C5.589,38,2,34.411,2,30z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30.5" x2="30.5" y1="39" y2="0">
+<stop offset="0" style="stop-color:#009DD9"/>
+<stop offset="1" style="stop-color:#004F80"/>
 </linearGradient>
-</defs>
+<path d="M60,0H1v30c0,4.963,4.038,9,9,9h50V0z" fill="url(#SVGID_1_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="2" x2="59" y1="33" y2="33">
+<stop offset="0" style="stop-color:#3AB9E0"/>
+<stop offset="0.5055" style="stop-color:#F8FBFF"/>
+<stop offset="1" style="stop-color:#3AB9E0"/>
+</linearGradient>
+<path d="M2,28v2c0,4.411,3.589,8,8,8h49v-2H10C5.589,36,2,32.411,2,28z" fill="url(#SVGID_2_)" fill-opacity="0.7" stroke-opacity="0.7"/>
+<path d="M1,0v30c0,4.963,4.038,9,9,9h50V0H1z M59,38H10c-4.411,0-8-3.589-8-8V1h57V38z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<rect fill="#FFFFFF" fill-opacity="0.3" height="1" stroke-opacity="0.3" width="58" x="2" y="1"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_pressed_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_pressed_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_pressed_r.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,15 +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="40px" version="1.1" viewBox="0 0 60 40" width="60px" 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="60"/>
-<rect fill="url(#SVGID_1_)" height="40" width="60"/>
-<rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="58" x="1" y="39"/>
-<rect fill-opacity="0.2" height="40" stroke-opacity="0.2" width="1" x="59"/>
-<rect fill-opacity="0.2" height="40" stroke-opacity="0.2" width="1"/>
-<path d="M1,0v39h58V0H1z M58,38H2V1h56V38z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="39.7783" y2="-0.0051">
-<stop offset="0" style="stop-color:#65B8CC"/>
-<stop offset="1" style="stop-color:#306D8C"/>
+<path d="M58,0v30c0,4.411-3.589,8-8,8H0v2h50c5.5,0,10-4.5,10-10V0H58z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
+<linearGradient gradientTransform="matrix(-1 0 0 1 -1619 0)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-1648.5" x2="-1648.5" y1="39" y2="0">
+<stop offset="0" style="stop-color:#009DD9"/>
+<stop offset="1" style="stop-color:#004F80"/>
 </linearGradient>
-</defs>
+<path d="M0,0h59v30c0,4.963-4.037,9-9,9H0V0z" fill="url(#SVGID_1_)"/>
+<linearGradient gradientTransform="matrix(-1 0 0 1 -1619 0)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-1677" x2="-1620" y1="33" y2="33">
+<stop offset="0" style="stop-color:#3AB9E0"/>
+<stop offset="0.5055" style="stop-color:#F8FBFF"/>
+<stop offset="1" style="stop-color:#3AB9E0"/>
+</linearGradient>
+<path d="M58,28v2c0,4.411-3.589,8-8,8H1v-2h49C54.411,36,58,32.411,58,28z" fill="url(#SVGID_2_)" fill-opacity="0.7" stroke-opacity="0.7"/>
+<path d="M0,0v39h50c4.963,0,9-4.037,9-9V0H0z M1,1h57v29c0,4.411-3.589,8-8,8H1V1z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<rect fill="#FFFFFF" fill-opacity="0.3" height="1" stroke-opacity="0.3" width="58" y="1"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_highlight_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_highlight_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_highlight_c.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,19 +2,22 @@
 <!DOCTYPE svg 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 40 40" 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="40" width="40"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="19.9995" x2="19.9995" y1="0" y2="40.1089">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="19.9995" x2="19.9995" y1="3.6216" y2="38.7848">
 <stop offset="0" style="stop-color:#4D4D4D"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
-<rect fill="url(#SVGID_1_)" fill-opacity="0.6" height="40" stroke-opacity="0.6" width="40"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="19.9995" x2="19.9995" y1="0" y2="60.2536">
-<stop offset="0" style="stop-color:#66B8CC"/>
-<stop offset="1" style="stop-color:#3F89A9"/>
+<rect fill="url(#SVGID_1_)" fill-opacity="0.6" height="38" stroke-opacity="0.6" width="40" y="1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="19.9995" x2="19.9995" y1="-19.7495" y2="40.0889">
+<stop offset="0" style="stop-color:#00BAFF"/>
+<stop offset="0.9835" style="stop-color:#0075BD"/>
+<stop offset="1" style="stop-color:#0075BD"/>
 </linearGradient>
-<rect fill="url(#SVGID_2_)" height="2" width="40"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="19.9995" x2="19.9995" y1="-19.9995" y2="40.2541">
-<stop offset="0" style="stop-color:#66B8CC"/>
-<stop offset="1" style="stop-color:#3F89A9"/>
+<rect fill="url(#SVGID_2_)" height="2" width="40" y="38"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="19.9995" x2="19.9995" y1="0.25" y2="60.0884">
+<stop offset="0" style="stop-color:#00BAFF"/>
+<stop offset="0.9835" style="stop-color:#0075BD"/>
+<stop offset="1" style="stop-color:#0075BD"/>
 </linearGradient>
-<rect fill="url(#SVGID_3_)" height="2" width="40" y="38"/>
+<rect fill="url(#SVGID_3_)" height="2" width="40"/>
+<rect fill="#FFFFFF" fill-opacity="0.25" height="1" stroke-opacity="0.25" width="40" y="3"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_highlight_cl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_highlight_cl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_highlight_cl.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,14 +2,27 @@
 <!DOCTYPE svg 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 40 40" 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="40" width="40"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="20" x2="20" y1="0" y2="40.1089">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="20" x2="20" y1="3.6216" y2="38.7848">
 <stop offset="0" style="stop-color:#4D4D4D"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
-<rect fill="url(#SVGID_1_)" fill-opacity="0.6" height="40" stroke-opacity="0.6" width="40"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="20" x2="20" y1="0" y2="40.1693">
-<stop offset="0" style="stop-color:#66B8CC"/>
-<stop offset="1" style="stop-color:#3F89A9"/>
+<rect fill="url(#SVGID_1_)" fill-opacity="0.6" height="38" stroke-opacity="0.6" width="40" y="1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="20" x2="20" y1="-19.7495" y2="40.0889">
+<stop offset="0" style="stop-color:#00BAFF"/>
+<stop offset="0.9835" style="stop-color:#0075BD"/>
+<stop offset="1" style="stop-color:#0075BD"/>
 </linearGradient>
-<polygon fill="url(#SVGID_2_)" points="40,38 2,38 2,2 40,2 40,0 0,0 0,40 40,40 "/>
+<rect fill="url(#SVGID_2_)" height="2" width="40" y="38"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="20" x2="20" y1="0.25" y2="60.0884">
+<stop offset="0" style="stop-color:#00BAFF"/>
+<stop offset="0.9835" style="stop-color:#0075BD"/>
+<stop offset="1" style="stop-color:#0075BD"/>
+</linearGradient>
+<rect fill="url(#SVGID_3_)" height="2" width="40"/>
+<rect fill="#FFFFFF" fill-opacity="0.25" height="1" stroke-opacity="0.25" width="40" y="3"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="0.5" x2="0.5" y1="4" y2="38.0005">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#505050"/>
+</linearGradient>
+<rect fill="url(#SVGID_4_)" fill-opacity="0.4" height="34" stroke-opacity="0.4" width="1" y="4"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_highlight_cr.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_highlight_cr.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_highlight_cr.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,14 +2,27 @@
 <!DOCTYPE svg 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 40 40" 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="40" width="40"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="20" x2="20" y1="0" y2="40.1089">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="20" x2="20" y1="3.6216" y2="38.7848">
 <stop offset="0" style="stop-color:#4D4D4D"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
-<rect fill="url(#SVGID_1_)" fill-opacity="0.6" height="40" stroke-opacity="0.6" width="40"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="20" x2="20" y1="0" y2="40.1693">
-<stop offset="0" style="stop-color:#66B8CC"/>
-<stop offset="1" style="stop-color:#3F89A9"/>
+<rect fill="url(#SVGID_1_)" fill-opacity="0.6" height="38" stroke-opacity="0.6" width="40" y="1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="20" x2="20" y1="-19.7495" y2="40.0889">
+<stop offset="0" style="stop-color:#00BAFF"/>
+<stop offset="0.9835" style="stop-color:#0075BD"/>
+<stop offset="1" style="stop-color:#0075BD"/>
 </linearGradient>
-<polygon fill="url(#SVGID_2_)" points="0,38 38,38 38,2 0,2 0,0 40,0 40,40 0,40 "/>
+<rect fill="url(#SVGID_2_)" height="2" width="40" y="38"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="20" x2="20" y1="0.25" y2="60.0884">
+<stop offset="0" style="stop-color:#00BAFF"/>
+<stop offset="0.9835" style="stop-color:#0075BD"/>
+<stop offset="1" style="stop-color:#0075BD"/>
+</linearGradient>
+<rect fill="url(#SVGID_3_)" height="2" width="40"/>
+<rect fill="#FFFFFF" fill-opacity="0.25" height="1" stroke-opacity="0.25" width="40" y="3"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="39.5" x2="39.5" y1="4" y2="38.0005">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#505050"/>
+</linearGradient>
+<rect fill="url(#SVGID_4_)" fill-opacity="0.4" height="34" stroke-opacity="0.4" width="1" x="39" y="4"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_highlight_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_highlight_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_highlight_l.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,14 +2,22 @@
 <!DOCTYPE svg 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 60 40" width="60px" 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="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="0" y2="40.1089">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30.5" x2="30.5" y1="3.6216" y2="38.7848">
 <stop offset="0" style="stop-color:#4D4D4D"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
-<rect fill="url(#SVGID_1_)" fill-opacity="0.6" height="40" stroke-opacity="0.6" width="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="0" y2="40.1693">
-<stop offset="0" style="stop-color:#66B8CC"/>
-<stop offset="1" style="stop-color:#3F89A9"/>
+<path d="M1,1v29c0,4.963,4.037,9,9,9h50V1H1z" fill="url(#SVGID_1_)" fill-opacity="0.6" stroke-opacity="0.6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="0.1665" y2="40.0592">
+<stop offset="0" style="stop-color:#00BAFF"/>
+<stop offset="0.9835" style="stop-color:#0075BD"/>
+<stop offset="1" style="stop-color:#0075BD"/>
 </linearGradient>
-<path d="M0,0v40h60V0H0z M58,38H2V2h56V38z" fill="url(#SVGID_2_)"/>
+<path d="M10,38c-4.411,0-8-3.59-8-8V2h58V0H0v30c0,5.5,4.5,10,10,10h50v-2H10z" fill="url(#SVGID_2_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="31.5" x2="31.5" y1="4" y2="21.0194">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="0.011" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#3C3C3C"/>
+</linearGradient>
+<polygon fill="url(#SVGID_3_)" fill-opacity="0.25" points="3,3 3,21 4,21 4,4 60,4 60,3 " stroke-opacity="0.25"/>
+<rect fill-opacity="0.2" height="34" stroke-opacity="0.2" width="1" x="59" y="4"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_highlight_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_highlight_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_highlight_r.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,14 +2,22 @@
 <!DOCTYPE svg 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 60 40" width="60px" 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="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="0" y2="40.1089">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.5" x2="29.5" y1="3.6216" y2="38.7848">
 <stop offset="0" style="stop-color:#4D4D4D"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
-<rect fill="url(#SVGID_1_)" fill-opacity="0.6" height="40" stroke-opacity="0.6" width="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="0" y2="40.1693">
-<stop offset="0" style="stop-color:#66B8CC"/>
-<stop offset="1" style="stop-color:#3F89A9"/>
+<path d="M0,1v38h50c4.963,0,9-4.037,9-9V1H0z" fill="url(#SVGID_1_)" fill-opacity="0.6" stroke-opacity="0.6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="0.1665" y2="40.0592">
+<stop offset="0" style="stop-color:#00BAFF"/>
+<stop offset="0.9835" style="stop-color:#0075BD"/>
+<stop offset="1" style="stop-color:#0075BD"/>
 </linearGradient>
-<path d="M0,0v40h60V0H0z M58,38H2V2h56V38z" fill="url(#SVGID_2_)"/>
+<path d="M0,0v2h58v28c0,4.41-3.589,8-8,8H0v2h50c5.5,0,10-4.5,10-10V0H0z" fill="url(#SVGID_2_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="28.5" x2="28.5" y1="4" y2="21.0194">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="0.011" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#3C3C3C"/>
+</linearGradient>
+<polygon fill="url(#SVGID_3_)" fill-opacity="0.25" points="0,3 0,4 56,4 56,21 57,21 57,3 " stroke-opacity="0.25"/>
+<rect fill-opacity="0.2" height="34" stroke-opacity="0.2" width="1" y="4"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_latched_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_latched_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_latched_c.svg	Mon May 03 12:48:33 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="40px" version="1.1" viewBox="0 0 40 40" 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="40" width="40"/>
-<rect fill="url(#SVGID_1_)" fill-opacity="0.6" height="40" stroke-opacity="0.6" width="40"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="40"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="40" y="39"/>
+<rect fill="url(#SVGID_1_)" fill-opacity="0.7" height="39" stroke-opacity="0.7" width="40"/>
+<rect fill="#FFFFFF" fill-opacity="0.1" height="2" stroke-opacity="0.1" width="40" y="38"/>
+<rect fill="#FFFFFF" fill-opacity="0.3" height="1" stroke-opacity="0.3" width="40" y="1"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="19.9995" x2="19.9995" y1="0" y2="40.1089">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="1" style="stop-color:#000000"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="19.9995" x2="19.9995" y1="0" y2="38.5553">
+<stop offset="0" style="stop-color:#828282"/>
+<stop offset="1" style="stop-color:#3C3C3C"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_latched_cl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_latched_cl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_latched_cl.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,12 +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="40px" version="1.1" viewBox="0 0 40 40" 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="40" width="40"/>
-<rect fill="url(#SVGID_1_)" fill-opacity="0.6" height="40" stroke-opacity="0.6" width="40"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="40,39 1,39 1,1 40,1 40,0 0,0 0,40 40,40 " stroke-opacity="0.4"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="20" x2="20" y1="0" y2="40.1089">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="1" style="stop-color:#000000"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="20" x2="20" y1="0" y2="38.5553">
+<stop offset="0" style="stop-color:#828282"/>
+<stop offset="1" style="stop-color:#3C3C3C"/>
 </linearGradient>
-</defs>
+<rect fill="url(#SVGID_1_)" fill-opacity="0.7" height="39" stroke-opacity="0.7" width="40"/>
+<rect fill="#FFFFFF" fill-opacity="0.1" height="2" stroke-opacity="0.1" width="40" y="38"/>
+<rect fill="#FFFFFF" fill-opacity="0.3" height="1" stroke-opacity="0.3" width="40" y="1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="0.5" x2="0.5" y1="2" y2="38.0005">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#505050"/>
+</linearGradient>
+<rect fill="url(#SVGID_2_)" fill-opacity="0.5" height="36" stroke-opacity="0.5" width="1" y="2"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_latched_cr.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_latched_cr.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_latched_cr.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,12 +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 40 40" 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="40" width="40"/>
-<rect fill="url(#SVGID_1_)" fill-opacity="0.6" height="40" stroke-opacity="0.6" width="40"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="0,39 39,39 39,1 0,1 0,0 40,0 40,40 0,40 " stroke-opacity="0.4"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="20" x2="20" y1="0" y2="40.1089">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="1" style="stop-color:#000000"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="20" x2="20" y1="0" y2="38.5553">
+<stop offset="0" style="stop-color:#828282"/>
+<stop offset="1" style="stop-color:#3C3C3C"/>
 </linearGradient>
-</defs>
+<rect fill="url(#SVGID_1_)" fill-opacity="0.7" height="39" stroke-opacity="0.7" width="40"/>
+<rect fill="#FFFFFF" fill-opacity="0.1" height="2" stroke-opacity="0.1" width="40" y="38"/>
+<rect fill="#FFFFFF" fill-opacity="0.3" height="1" stroke-opacity="0.3" width="40" y="1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="39.5" x2="39.5" y1="2" y2="38.0005">
+<stop offset="0" style="stop-color:#828282"/>
+<stop offset="0.0971" style="stop-color:#BEBEBE"/>
+<stop offset="0.1826" style="stop-color:#EDEDED"/>
+<stop offset="0.2253" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#282828"/>
+</linearGradient>
+<rect fill="url(#SVGID_2_)" fill-opacity="0.4" height="36" stroke-opacity="0.4" width="1" x="39" y="2"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_latched_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_latched_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_latched_l.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,12 +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="40px" version="1.1" viewBox="0 0 60 40" width="60px" 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="60"/>
-<rect fill="url(#SVGID_1_)" fill-opacity="0.6" height="40" stroke-opacity="0.6" width="60"/>
-<path d="M0,0v40h60V0H0z M59,39H1V1h58V39z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="0" y2="40.1089">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="1" style="stop-color:#000000"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30.5" x2="30.5" y1="0" y2="38.5553">
+<stop offset="0" style="stop-color:#828282"/>
+<stop offset="1" style="stop-color:#3C3C3C"/>
 </linearGradient>
-</defs>
+<path d="M1,0v30c0,4.963,4.037,9,9,9h50V0H1z" fill="url(#SVGID_1_)" fill-opacity="0.7" stroke-opacity="0.7"/>
+<path d="M2,30V0H0v30c0,5.5,4.5,10,10,10h50v-2H10C5.589,38,2,34.41,2,30z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="31.5" x2="31.5" y1="2.2119" y2="21.0297">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="0.011" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#3C3C3C"/>
+</linearGradient>
+<polygon fill="url(#SVGID_2_)" fill-opacity="0.3" points="3,1 3,21 4,21 4,2 60,2 60,1 " stroke-opacity="0.3"/>
+<rect fill-opacity="0.2" height="36" stroke-opacity="0.2" width="1" x="59" y="2"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_latched_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_latched_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_latched_r.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,13 +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="40px" version="1.1" viewBox="0 0 60 40" width="60px" 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="60"/>
-<rect fill-opacity="0.2" height="40" stroke-opacity="0.2" width="1" x="59"/>
-<rect fill="url(#SVGID_1_)" fill-opacity="0.6" height="40" stroke-opacity="0.6" width="60"/>
-<path d="M0,0v40h60V0H0z M59,39H1V1h58V39z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="0" y2="40.1089">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="1" style="stop-color:#000000"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.5" x2="29.5" y1="0" y2="38.5553">
+<stop offset="0" style="stop-color:#828282"/>
+<stop offset="1" style="stop-color:#3C3C3C"/>
 </linearGradient>
-</defs>
+<path d="M0,0v39h50c4.963,0,9-4.037,9-9V0H0z" fill="url(#SVGID_1_)" fill-opacity="0.7" stroke-opacity="0.7"/>
+<path d="M58,0v30c0,4.41-3.589,8-8,8H0v2h50c5.5,0,10-4.5,10-10V0H58z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="28.5" x2="28.5" y1="2.2119" y2="21.0297">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="0.011" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#3C3C3C"/>
+</linearGradient>
+<polygon fill="url(#SVGID_2_)" fill-opacity="0.3" points="0,1 0,2 56,2 56,21 57,21 57,1 " stroke-opacity="0.3"/>
+<rect fill-opacity="0.2" height="36" stroke-opacity="0.2" width="1" y="2"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_normal_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_normal_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_normal_c.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,13 +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="40px" version="1.1" viewBox="0 0 40 40" 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="40" width="40"/>
-<rect fill="url(#SVGID_1_)" fill-opacity="0.6" height="40" stroke-opacity="0.6" width="40"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="40"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="40" y="39"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="19.9995" x2="19.9995" y1="-0.3335" y2="39.847">
-<stop offset="0" style="stop-color:#4D4D4D"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="19.9995" x2="19.9995" y1="2.6904" y2="38.7789">
+<stop offset="0" style="stop-color:#6E6E6E"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
-</defs>
+<rect fill="url(#SVGID_1_)" fill-opacity="0.6" height="39" stroke-opacity="0.6" width="40"/>
+<rect fill="#FFFFFF" fill-opacity="0.1" height="2" stroke-opacity="0.1" width="40" y="38"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="19.9995" x2="19.9995" y1="1" y2="17.5058">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="0.011" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#262626"/>
+</linearGradient>
+<rect fill="url(#SVGID_2_)" fill-opacity="0.25" height="1" stroke-opacity="0.25" width="40" y="1"/>
+<rect fill="#C8C8C8" fill-opacity="0.05" height="16" stroke-opacity="0.05" width="40" y="2"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_normal_cl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_normal_cl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_normal_cl.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,12 +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="40px" version="1.1" viewBox="0 0 40 40" 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="40" width="40"/>
-<rect fill="url(#SVGID_1_)" fill-opacity="0.6" height="40" stroke-opacity="0.6" width="40"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="40,39 1,39 1,1 40,1 40,0 0,0 0,40 40,40 " stroke-opacity="0.4"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="20" x2="20" y1="-0.3335" y2="39.847">
-<stop offset="0" style="stop-color:#4D4D4D"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="20" x2="20" y1="2.6904" y2="38.7789">
+<stop offset="0" style="stop-color:#6E6E6E"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
-</defs>
+<rect fill="url(#SVGID_1_)" fill-opacity="0.6" height="39" stroke-opacity="0.6" width="40"/>
+<rect fill="#FFFFFF" fill-opacity="0.1" height="2" stroke-opacity="0.1" width="40" y="38"/>
+<rect fill="#FFFFFF" fill-opacity="0.25" height="1" stroke-opacity="0.25" width="40" y="1"/>
+<rect fill="#C8C8C8" fill-opacity="0.05" height="16" stroke-opacity="0.05" width="40" y="2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="0.5" x2="0.5" y1="2" y2="38.0005">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#505050"/>
+</linearGradient>
+<rect fill="url(#SVGID_2_)" fill-opacity="0.4" height="36" stroke-opacity="0.4" width="1" y="2"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_normal_cr.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_normal_cr.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_normal_cr.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,12 +2,22 @@
 <!DOCTYPE svg 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 40 40" 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="40" width="40"/>
-<rect fill="url(#SVGID_1_)" fill-opacity="0.6" height="40" stroke-opacity="0.6" width="40"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="0,39 39,39 39,1 0,1 0,0 40,0 40,40 0,40 " stroke-opacity="0.4"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="20" x2="20" y1="-0.3335" y2="39.847">
-<stop offset="0" style="stop-color:#4D4D4D"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="20" x2="20" y1="2.6904" y2="38.7789">
+<stop offset="0" style="stop-color:#6E6E6E"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
-</defs>
+<rect fill="url(#SVGID_1_)" fill-opacity="0.6" height="39" stroke-opacity="0.6" width="40"/>
+<rect fill="#FFFFFF" fill-opacity="0.1" height="2" stroke-opacity="0.1" width="40" y="38"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="20" x2="20" y1="1" y2="17.5058">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="0.011" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#262626"/>
+</linearGradient>
+<rect fill="url(#SVGID_2_)" fill-opacity="0.25" height="1" stroke-opacity="0.25" width="40" y="1"/>
+<rect fill="#C8C8C8" fill-opacity="0.05" height="16" stroke-opacity="0.05" width="40" y="2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="39.5" x2="39.5" y1="2" y2="38.0005">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#505050"/>
+</linearGradient>
+<rect fill="url(#SVGID_3_)" fill-opacity="0.4" height="36" stroke-opacity="0.4" width="1" x="39" y="2"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_normal_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_normal_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_normal_l.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,12 +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="40px" version="1.1" viewBox="0 0 60 40" width="60px" 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="60"/>
-<rect fill="url(#SVGID_1_)" fill-opacity="0.6" height="40" stroke-opacity="0.6" width="60"/>
-<path d="M0,0v40h60V0H0z M59,39H1V1h58V39z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="-0.3335" y2="39.847">
-<stop offset="0" style="stop-color:#4D4D4D"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30.5" x2="30.5" y1="2.6904" y2="38.7789">
+<stop offset="0" style="stop-color:#6E6E6E"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
-</defs>
+<path d="M1,0v30c0,4.963,4.037,9,9,9h50V0H1z" fill="url(#SVGID_1_)" fill-opacity="0.6" stroke-opacity="0.6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="31.5" x2="31.5" y1="1.917" y2="20.9353">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#323232"/>
+</linearGradient>
+<polygon fill="url(#SVGID_2_)" fill-opacity="0.25" points="3,1 3,21 4,21 4,2 60,2 60,1 " stroke-opacity="0.25"/>
+<rect fill="#C8C8C8" fill-opacity="0.05" height="16" stroke-opacity="0.05" width="56" x="4" y="2"/>
+<rect fill-opacity="0.2" height="36" stroke-opacity="0.2" width="1" x="59" y="2"/>
+<path d="M2,30V0H0v30c0,5.5,4.5,10,10,10h50v-2H10C5.589,38,2,34.41,2,30z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_normal_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_normal_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_normal_r.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,13 +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="40px" version="1.1" viewBox="0 0 60 40" width="60px" 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="60"/>
-<rect fill-opacity="0.2" height="40" stroke-opacity="0.2" width="1" x="59"/>
-<rect fill="url(#SVGID_1_)" fill-opacity="0.6" height="40" stroke-opacity="0.6" width="60"/>
-<path d="M0,0v40h60V0H0z M59,39H1V1h58V39z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="-0.3335" y2="39.847">
-<stop offset="0" style="stop-color:#4D4D4D"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.5" x2="29.5" y1="2.6904" y2="38.7789">
+<stop offset="0" style="stop-color:#6E6E6E"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
-</defs>
+<path d="M0,0v39h50c4.963,0,9-4.037,9-9V0H0z" fill="url(#SVGID_1_)" fill-opacity="0.6" stroke-opacity="0.6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="28.5" x2="28.5" y1="1.917" y2="20.9353">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#323232"/>
+</linearGradient>
+<polygon fill="url(#SVGID_2_)" fill-opacity="0.25" points="0,1 0,2 56,2 56,21 57,21 57,1 " stroke-opacity="0.25"/>
+<rect fill="#C8C8C8" fill-opacity="0.05" height="16" stroke-opacity="0.05" width="56" y="2"/>
+<rect fill-opacity="0.2" height="36" stroke-opacity="0.2" width="1" y="2"/>
+<path d="M58,0v30c0,4.41-3.589,8-8,8H0v2h50c5.5,0,10-4.5,10-10V0H58z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_pressed_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_pressed_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_pressed_c.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,12 +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="40px" version="1.1" viewBox="0 0 40 40" 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="40" width="40"/>
-<rect fill="url(#SVGID_1_)" fill-opacity="0.9" height="40" stroke-opacity="0.9" width="40"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="40"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="40" y="39"/>
+<rect fill="url(#SVGID_1_)" fill-opacity="0.6" height="39" stroke-opacity="0.6" width="40"/>
+<rect fill="#FFFFFF" fill-opacity="0.1" height="2" stroke-opacity="0.1" width="40" y="38"/>
+<rect fill="#FFFFFF" fill-opacity="0.25" height="1" stroke-opacity="0.25" width="40" y="1"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="20.0005" x2="20.0005" y1="40" y2="4.882813e-004">
-<stop offset="0" style="stop-color:#333333"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="20.0005" x2="20.0005" y1="36.3096" y2="0.222">
+<stop offset="0" style="stop-color:#6E6E6E"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 </defs>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_pressed_cl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_pressed_cl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_pressed_cl.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,12 +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="40px" version="1.1" viewBox="0 0 40 40" 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="40" width="40"/>
-<rect fill="url(#SVGID_1_)" fill-opacity="0.9" height="40" stroke-opacity="0.9" width="40"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="40,39 1,39 1,1 40,1 40,0 0,0 0,40 40,40 " stroke-opacity="0.4"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="20" x2="20" y1="40" y2="4.882813e-004">
-<stop offset="0" style="stop-color:#333333"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="20" x2="20" y1="36.3096" y2="0.222">
+<stop offset="0" style="stop-color:#6E6E6E"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
-</defs>
+<rect fill="url(#SVGID_1_)" fill-opacity="0.6" height="39" stroke-opacity="0.6" width="40"/>
+<rect fill="#FFFFFF" fill-opacity="0.1" height="2" stroke-opacity="0.1" width="40" y="38"/>
+<rect fill="#FFFFFF" fill-opacity="0.25" height="1" stroke-opacity="0.25" width="40" y="1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="0.5" x2="0.5" y1="38" y2="2.0005">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#505050"/>
+</linearGradient>
+<rect fill="url(#SVGID_2_)" fill-opacity="0.5" height="36" stroke-opacity="0.5" width="1" y="2"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_pressed_cr.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_pressed_cr.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_pressed_cr.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,12 +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="40px" version="1.1" viewBox="0 0 40 40" 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="40" width="40"/>
-<rect fill="url(#SVGID_1_)" fill-opacity="0.9" height="40" stroke-opacity="0.9" width="40"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="0,39 39,39 39,1 0,1 0,0 40,0 40,40 0,40 " stroke-opacity="0.4"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="20" x2="20" y1="40" y2="4.882813e-004">
-<stop offset="0" style="stop-color:#333333"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="20" x2="20" y1="36.3096" y2="0.222">
+<stop offset="0" style="stop-color:#6E6E6E"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
-</defs>
+<rect fill="url(#SVGID_1_)" fill-opacity="0.6" height="39" stroke-opacity="0.6" width="40"/>
+<rect fill="#FFFFFF" fill-opacity="0.1" height="2" stroke-opacity="0.1" width="40" y="38"/>
+<rect fill="#FFFFFF" fill-opacity="0.25" height="1" stroke-opacity="0.25" width="40" y="1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="39.5" x2="39.5" y1="38" y2="2.0005">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#505050"/>
+</linearGradient>
+<rect fill="url(#SVGID_2_)" fill-opacity="0.5" height="36" stroke-opacity="0.5" width="1" x="39" y="2"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_pressed_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_pressed_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_pressed_l.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,12 +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="40px" version="1.1" viewBox="0 0 60 40" width="60px" 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="60"/>
-<rect fill="url(#SVGID_1_)" fill-opacity="0.9" height="40" stroke-opacity="0.9" width="60"/>
-<path d="M0,0v40h60V0H0z M59,39H1V1h58V39z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="40" y2="4.882813e-004">
-<stop offset="0" style="stop-color:#333333"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30.5" x2="30.5" y1="36.3096" y2="0.222">
+<stop offset="0" style="stop-color:#6E6E6E"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
-</defs>
+<path d="M1,0v30c0,4.963,4.037,9,9,9h50V0H1z" fill="url(#SVGID_1_)" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M2,30V0H0v30c0,5.5,4.5,10,10,10h50v-2H10C5.589,38,2,34.41,2,30z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="31.5" x2="31.5" y1="2.001" y2="20.948">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="0.011" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#282828"/>
+</linearGradient>
+<polygon fill="url(#SVGID_2_)" fill-opacity="0.25" points="3,1 3,21 4,21 4,2 60,2 60,1 " stroke-opacity="0.25"/>
+<rect fill-opacity="0.2" height="36" stroke-opacity="0.2" width="1" x="59" y="2"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_pressed_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_pressed_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_pressed_r.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,13 +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="40px" version="1.1" viewBox="0 0 60 40" width="60px" 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="60"/>
-<rect fill-opacity="0.2" height="40" stroke-opacity="0.2" width="1" x="59"/>
-<rect fill="url(#SVGID_1_)" fill-opacity="0.9" height="40" stroke-opacity="0.9" width="60"/>
-<path d="M0,0v40h60V0H0z M59,39H1V1h58V39z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="40" y2="4.882813e-004">
-<stop offset="0" style="stop-color:#333333"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.5" x2="29.5" y1="36.3096" y2="0.222">
+<stop offset="0" style="stop-color:#6E6E6E"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
-</defs>
+<path d="M0,0v39h50c4.963,0,9-4.037,9-9V0H0z" fill="url(#SVGID_1_)" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M58,0v30c0,4.41-3.589,8-8,8H0v2h50c5.5,0,10-4.5,10-10V0H58z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="28.5" x2="28.5" y1="2.001" y2="20.948">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#282828"/>
+</linearGradient>
+<polygon fill="url(#SVGID_2_)" fill-opacity="0.25" points="0,1 0,2 56,2 56,21 57,21 57,1 " stroke-opacity="0.25"/>
+<rect fill-opacity="0.2" height="36" stroke-opacity="0.2" width="1" y="2"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_b.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_b.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_b.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,13 +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 50 10" width="50px" 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="50"/>
-<g>
-<rect fill="url(#SVGID_1_)" height="10" width="50"/>
+<rect fill="url(#SVGID_1_)" height="9" width="50"/>
+<rect fill="#5A5A64" fill-opacity="0.2" height="2" stroke-opacity="0.2" width="50" y="7"/>
+<rect fill="#5A5A64" fill-opacity="0.3" height="1" stroke-opacity="0.3" width="50" y="8"/>
+<rect fill="#FFFFFF" height="1" width="50" y="9"/>
+<rect fill-opacity="0.1" height="3" stroke-opacity="0.1" width="50" y="6"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="24.9995" x2="24.9995" y1="-59.7495" y2="10.2617">
-<stop offset="0" style="stop-color:#B3B3B3"/>
-<stop offset="1" style="stop-color:#4D4D4D"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="24.9995" x2="24.9995" y1="-58.9995" y2="8.863">
+<stop offset="0" style="stop-color:#CCCCCC"/>
+<stop offset="0.0043" style="stop-color:#CCCCCC"/>
+<stop offset="0.35" style="stop-color:#FFFFFF"/>
+<stop offset="0.7" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#D9D9D9"/>
 </linearGradient>
 </defs>
-</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_bl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_bl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_bl.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,13 +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>
-<path d="M0,0v4c0,3.3,2.7,6,6,6h4V0H0z" fill="url(#SVGID_1_)"/>
+<path d="M1,0v4c0,2.757,2.243,5,5,5h4V0H1z" fill="url(#SVGID_1_)"/>
+<path d="M6,7C4.346,7,3,5.654,3,4V0H1v4c0,2.757,2.243,5,5,5h4V7H6z" fill="#5A5A64" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M6,8C3.794,8,2,6.206,2,4V0H1v4c0,2.757,2.243,5,5,5h4V8H6z" fill="#5A5A64" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M6,9C3.243,9,1,6.757,1,4V0H0v4c0,3.3,2.7,6,6,6h4V9H6z" fill="#FFFFFF"/>
+<path d="M4,6C2.897,6,2,5.104,2,4V0H1v4c0,2.757,2.243,5,5,5h4V6H4z" fill-opacity="0.1" stroke-opacity="0.1"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="-59.7495" y2="10.2617">
-<stop offset="0" style="stop-color:#B3B3B3"/>
-<stop offset="1" style="stop-color:#4D4D4D"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5.5" x2="5.5" y1="-58.9995" y2="8.863">
+<stop offset="0" style="stop-color:#CCCCCC"/>
+<stop offset="0.0043" style="stop-color:#CCCCCC"/>
+<stop offset="0.35" style="stop-color:#FFFFFF"/>
+<stop offset="0.7" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#D9D9D9"/>
 </linearGradient>
 </defs>
-</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_br.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_br.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_br.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,13 +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>
-<path d="M0,0v10h4c3.3,0,6-2.7,6-6V0H0z" fill="url(#SVGID_1_)"/>
+<path d="M0,0v9h4c2.757,0,5-2.243,5-5V0H0z" fill="url(#SVGID_1_)"/>
+<path d="M7,0v4c0,1.654-1.346,3-3,3H0v2h4c2.757,0,5-2.243,5-5V0H7z" fill="#5A5A64" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M8,0v4c0,2.206-1.794,4-4,4H0v1h4c2.757,0,5-2.243,5-5V0H8z" fill="#5A5A64" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M9,0v4c0,2.757-2.243,5-5,5H0v1h4c3.3,0,6-2.7,6-6V0H9z" fill="#FFFFFF"/>
+<path d="M8,0v4c0,1.104-0.897,2-2,2H0v3h4c2.757,0,5-2.243,5-5V0H8z" fill-opacity="0.1" stroke-opacity="0.1"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="-59.7495" y2="10.2617">
-<stop offset="0" style="stop-color:#B3B3B3"/>
-<stop offset="1" style="stop-color:#4D4D4D"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4.5" x2="4.5" y1="-58.9995" y2="8.863">
+<stop offset="0" style="stop-color:#CCCCCC"/>
+<stop offset="0.0043" style="stop-color:#CCCCCC"/>
+<stop offset="0.35" style="stop-color:#FFFFFF"/>
+<stop offset="0.7" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#D9D9D9"/>
 </linearGradient>
 </defs>
-</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_c.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,13 +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="50px" version="1.1" viewBox="0 0 50 50" width="50px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
 <rect fill="none" height="50" width="50"/>
-<g>
 <rect fill="url(#SVGID_1_)" height="50" width="50"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="24.9995" x2="24.9995" y1="-9.75" y2="60.2617">
-<stop offset="0" style="stop-color:#B3B3B3"/>
-<stop offset="1" style="stop-color:#4D4D4D"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="24.9995" x2="24.9995" y1="-9" y2="58.8632">
+<stop offset="0" style="stop-color:#CCCCCC"/>
+<stop offset="0.0043" style="stop-color:#CCCCCC"/>
+<stop offset="0.35" style="stop-color:#FFFFFF"/>
+<stop offset="0.7" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#D9D9D9"/>
 </linearGradient>
 </defs>
-</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_l.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,13 +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="50px" version="1.1" viewBox="0 0 10 50" 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="50" width="10"/>
-<g>
-<rect fill="url(#SVGID_1_)" height="50" width="10"/>
+<rect fill="url(#SVGID_1_)" height="50" width="9" x="1"/>
+<rect fill="#5A5A64" fill-opacity="0.2" height="50" stroke-opacity="0.2" width="2" x="1"/>
+<rect fill="#5A5A64" fill-opacity="0.3" height="50" stroke-opacity="0.3" width="1" x="1"/>
+<rect fill="#FFFFFF" height="50" width="1"/>
+<rect fill-opacity="0.1" height="50" stroke-opacity="0.1" width="1" x="1"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="-9.75" y2="60.2617">
-<stop offset="0" style="stop-color:#B3B3B3"/>
-<stop offset="1" style="stop-color:#4D4D4D"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5.5" x2="5.5" y1="-9" y2="58.8632">
+<stop offset="0" style="stop-color:#CCCCCC"/>
+<stop offset="0.0043" style="stop-color:#CCCCCC"/>
+<stop offset="0.35" style="stop-color:#FFFFFF"/>
+<stop offset="0.7" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#D9D9D9"/>
 </linearGradient>
 </defs>
-</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_r.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,13 +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="50px" version="1.1" viewBox="0 0 10 50" 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="50" width="10"/>
-<g>
-<rect fill="url(#SVGID_1_)" height="50" width="10"/>
+<rect fill="url(#SVGID_1_)" height="50" width="9"/>
+<rect fill="#5A5A64" fill-opacity="0.2" height="50" stroke-opacity="0.2" width="2" x="7"/>
+<rect fill="#5A5A64" fill-opacity="0.3" height="50" stroke-opacity="0.3" width="1" x="8"/>
+<rect fill="#FFFFFF" height="50" width="1" x="9"/>
+<rect fill-opacity="0.1" height="50" stroke-opacity="0.1" width="1" x="8"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="-9.75" y2="60.2617">
-<stop offset="0" style="stop-color:#B3B3B3"/>
-<stop offset="1" style="stop-color:#4D4D4D"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4.5" x2="4.5" y1="-9" y2="58.8632">
+<stop offset="0" style="stop-color:#CCCCCC"/>
+<stop offset="0.0043" style="stop-color:#CCCCCC"/>
+<stop offset="0.35" style="stop-color:#FFFFFF"/>
+<stop offset="0.7" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#D9D9D9"/>
 </linearGradient>
 </defs>
-</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_t.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_t.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_t.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,13 +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 50 10" width="50px" 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="50"/>
-<g>
-<rect fill="url(#SVGID_1_)" height="10" width="50"/>
+<rect fill="url(#SVGID_1_)" height="9" width="50" y="1"/>
+<rect fill="#5A5A64" fill-opacity="0.2" height="2" stroke-opacity="0.2" width="50" y="1"/>
+<rect fill="#5A5A64" fill-opacity="0.3" height="1" stroke-opacity="0.3" width="50" y="1"/>
+<rect fill="#FFFFFF" height="1" width="50"/>
+<rect fill-opacity="0.1" height="3" stroke-opacity="0.1" width="50" y="1"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="24.9995" x2="24.9995" y1="0.25" y2="70.2612">
-<stop offset="0" style="stop-color:#B3B3B3"/>
-<stop offset="1" style="stop-color:#4D4D4D"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="24.9995" x2="24.9995" y1="1" y2="68.8625">
+<stop offset="0" style="stop-color:#CCCCCC"/>
+<stop offset="0.0043" style="stop-color:#CCCCCC"/>
+<stop offset="0.35" style="stop-color:#FFFFFF"/>
+<stop offset="0.7" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#D9D9D9"/>
 </linearGradient>
 </defs>
-</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_tl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_tl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_tl.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,13 +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>
-<path d="M6,0C2.7,0,0,2.7,0,6v4h10V0H6z" fill="url(#SVGID_1_)"/>
+<path d="M6,1C3.243,1,1,3.243,1,6v4h9V1H6z" fill="url(#SVGID_1_)"/>
+<path d="M6,1C3.243,1,1,3.243,1,6v4h2V6c0-1.654,1.346-3,3-3h4V1H6z" fill="#5A5A64" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M6,1C3.243,1,1,3.243,1,6v4h1V6c0-2.206,1.794-4,4-4h4V1H6z" fill="#5A5A64" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M6,0C2.7,0,0,2.7,0,6v4h1V6c0-2.757,2.243-5,5-5h4V0H6z" fill="#FFFFFF"/>
+<path d="M6,1C3.243,1,1,3.243,1,6v4h1V6c0-1.104,0.897-2,2-2h6V1H6z" fill-opacity="0.1" stroke-opacity="0.1"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="0.25" y2="70.2612">
-<stop offset="0" style="stop-color:#B3B3B3"/>
-<stop offset="1" style="stop-color:#4D4D4D"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5.5" x2="5.5" y1="1" y2="68.8625">
+<stop offset="0" style="stop-color:#CCCCCC"/>
+<stop offset="0.0043" style="stop-color:#CCCCCC"/>
+<stop offset="0.35" style="stop-color:#FFFFFF"/>
+<stop offset="0.7" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#D9D9D9"/>
 </linearGradient>
 </defs>
-</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_tr.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_tr.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_tr.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,13 +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>
-<path d="M10,6c0-3.3-2.7-6-6-6H0v10h10V6z" fill="url(#SVGID_1_)"/>
+<path d="M9,6c0-2.757-2.243-5-5-5H0v9h9V6z" fill="url(#SVGID_1_)"/>
+<path d="M4,1H0v2h4c1.654,0,3,1.346,3,3v4h2V6C9,3.243,6.757,1,4,1z" fill="#5A5A64" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M4,1H0v1h4c2.206,0,4,1.794,4,4v4h1V6C9,3.243,6.757,1,4,1z" fill="#5A5A64" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M4,0H0v1h4c2.757,0,5,2.243,5,5v4h1V6C10,2.7,7.3,0,4,0z" fill="#FFFFFF"/>
+<path d="M4,1H0v3h6c1.103,0,2,0.896,2,2v4h1V6C9,3.243,6.757,1,4,1z" fill-opacity="0.1" stroke-opacity="0.1"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="0.25" y2="70.2612">
-<stop offset="0" style="stop-color:#B3B3B3"/>
-<stop offset="1" style="stop-color:#4D4D4D"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4.5" x2="4.5" y1="1" y2="68.8625">
+<stop offset="0" style="stop-color:#CCCCCC"/>
+<stop offset="0.0043" style="stop-color:#CCCCCC"/>
+<stop offset="0.35" style="stop-color:#FFFFFF"/>
+<stop offset="0.7" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#D9D9D9"/>
 </linearGradient>
 </defs>
-</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_highlight_pri_c.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_highlight_pri_c.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="50px" version="1.1" viewBox="0 0 25 50" width="25px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="50" width="25"/>
+<rect fill-opacity="0.3" height="5" stroke-opacity="0.3" width="25" y="45"/>
+<rect fill-opacity="0.5" height="5" stroke-opacity="0.5" width="25" y="44"/>
+<rect fill-opacity="0.1" height="3" stroke-opacity="0.1" width="25" y="3"/>
+<rect fill-opacity="0.3" height="2" stroke-opacity="0.3" width="25" y="3"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="12.4995" x2="12.4995" y1="4.882813e-004" y2="48.0745">
+<stop offset="0" style="stop-color:#6BD7FF"/>
+<stop offset="0.3" style="stop-color:#00BAFF"/>
+<stop offset="0.7" style="stop-color:#0083CA"/>
+<stop offset="1" style="stop-color:#00BAFF"/>
+</linearGradient>
+<rect fill="url(#SVGID_1_)" height="4" width="25" y="44"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="12.4995" x2="12.4995" y1="0" y2="48.074">
+<stop offset="0" style="stop-color:#6BD7FF"/>
+<stop offset="0.3" style="stop-color:#00BAFF"/>
+<stop offset="0.7" style="stop-color:#0083CA"/>
+<stop offset="1" style="stop-color:#00BAFF"/>
+</linearGradient>
+<rect fill="url(#SVGID_2_)" height="4" width="25"/>
+<rect fill-opacity="0.4" height="1" stroke-opacity="0.4" width="25" y="4"/>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_highlight_pri_l.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_highlight_pri_l.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +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="50px" version="1.1" viewBox="0 0 25 50" width="25px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="50" width="25"/>
+<path d="M0,45c0,3,1.8,5,4,5h21v-5H0z" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M0,44c0,3,1.8,5,4,5h21v-5H0z" fill-opacity="0.5" stroke-opacity="0.5"/>
+<polygon fill-opacity="0.1" points="3,3 3,45 6,45 6,6 25,6 25,3 " stroke-opacity="0.1"/>
+<polygon fill-opacity="0.3" points="3,3 3,45 5,45 5,5 25,5 25,3 " stroke-opacity="0.3"/>
+<path d="M4,44V4h21V0H4C1.8,0,0,1.8,0,4v40c0,2.2,1.8,4,4,4h21v-4H4z" fill="url(#SVGID_1_)"/>
+<rect fill-opacity="0.4" height="1" stroke-opacity="0.4" width="21" x="4" y="4"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="12.5" x2="12.5" y1="0" y2="48.0744">
+<stop offset="0" style="stop-color:#6BD7FF"/>
+<stop offset="0.3" style="stop-color:#00BAFF"/>
+<stop offset="0.7" style="stop-color:#0083CA"/>
+<stop offset="1" style="stop-color:#00BAFF"/>
+</linearGradient>
+</defs>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_highlight_pri_r.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_highlight_pri_r.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +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="50px" version="1.1" viewBox="0 0 25 50" width="25px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="50" width="25"/>
+<path d="M0,45v5h21c2.2,0,4-2,4-5H0z" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M0,44v5h21c2.2,0,4-2,4-5H0z" fill-opacity="0.5" stroke-opacity="0.5"/>
+<polygon fill-opacity="0.1" points="0,3 0,6 19,6 19,45 22,45 22,3 " stroke-opacity="0.1"/>
+<polygon fill-opacity="0.3" points="0,3 0,5 20,5 20,45 22,45 22,3 " stroke-opacity="0.3"/>
+<path d="M21,0H0v4h21v40H0v4h21c2.2,0,4-1.8,4-4V4C25,1.8,23.2,0,21,0z" fill="url(#SVGID_1_)"/>
+<rect fill-opacity="0.4" height="1" stroke-opacity="0.4" width="21" y="4"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="12.5" x2="12.5" y1="0" y2="48.0744">
+<stop offset="0" style="stop-color:#6BD7FF"/>
+<stop offset="0.3" style="stop-color:#00BAFF"/>
+<stop offset="0.7" style="stop-color:#0083CA"/>
+<stop offset="1" style="stop-color:#00BAFF"/>
+</linearGradient>
+</defs>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_highlight_sec_c.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_highlight_sec_c.svg	Mon May 03 12:48:33 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="50px" version="1.1" viewBox="0 0 25 50" width="25px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="50" width="25"/>
+<rect fill="url(#SVGID_1_)" fill-opacity="0.8" height="48" stroke-opacity="0.8" width="25"/>
+<rect fill="none" height="50" width="25"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="12.4995" x2="12.4995" y1="0" y2="48.0005">
+<stop offset="0" style="stop-color:#193C70"/>
+<stop offset="1" style="stop-color:#18234D"/>
+</linearGradient>
+</defs>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_highlight_sec_l.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_highlight_sec_l.svg	Mon May 03 12:48:33 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="50px" version="1.1" viewBox="0 0 25 50" width="25px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="50" width="25"/>
+<path d="M4,0C1.8,0,0,1.801,0,4v40c0,2.201,1.8,4,4,4h21V0H4z" fill="url(#SVGID_1_)" fill-opacity="0.8" stroke-opacity="0.8"/>
+<rect fill="none" height="50" width="25"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="12.5" x2="12.5" y1="0" y2="48.0005">
+<stop offset="0" style="stop-color:#193C70"/>
+<stop offset="1" style="stop-color:#18234D"/>
+</linearGradient>
+</defs>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_highlight_sec_r.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_highlight_sec_r.svg	Mon May 03 12:48:33 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="50px" version="1.1" viewBox="0 0 25 50" width="25px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="50" width="25"/>
+<path d="M21,0H0v48h21c2.2,0,4-1.799,4-4V4C25,1.801,23.2,0,21,0z" fill="url(#SVGID_1_)" fill-opacity="0.8" stroke-opacity="0.8"/>
+<rect fill="none" height="50" width="25"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="12.5" x2="12.5" y1="0" y2="48.0005">
+<stop offset="0" style="stop-color:#193C70"/>
+<stop offset="1" style="stop-color:#18234D"/>
+</linearGradient>
+</defs>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_b.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_b.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_b.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,16 +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="10px" version="1.1" viewBox="0 0 50 10" width="50px" 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="50"/>
-<g>
-<rect fill="url(#SVGID_1_)" height="10" width="50"/>
+<rect fill="url(#SVGID_1_)" fill-opacity="0.7" height="8" stroke-opacity="0.7" width="50"/>
+<rect fill="none" height="10" width="50"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="24.9995" x2="24.9995" y1="-59.7495" y2="10.2617">
-<stop offset="0" style="stop-color:#B3B3B3"/>
-<stop offset="0.103" style="stop-color:#A8A8A8;stop-opacity:0"/>
-<stop offset="0.9" style="stop-color:#585858;stop-opacity:0"/>
-<stop offset="1" style="stop-color:#4D4D4D"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="24.9995" x2="24.9995" y1="-57.9995" y2="8.0034">
+<stop offset="0" style="stop-color:#505050"/>
+<stop offset="0.2" style="stop-color:#FFFFFF;stop-opacity:0"/>
+<stop offset="0.8" style="stop-color:#F9F9F9;stop-opacity:0"/>
+<stop offset="1" style="stop-color:#3C3C3C"/>
 </linearGradient>
 </defs>
-</g>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="50" y="9"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_bl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_bl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_bl.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,16 +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="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>
-<path d="M0,0v4c0,3.3,2.7,6,6,6h4V0H0z" fill="url(#SVGID_1_)"/>
+<path d="M2,0v4c0,2.206,1.794,4,4,4h4V0H2z" fill="url(#SVGID_1_)" fill-opacity="0.7" stroke-opacity="0.7"/>
+<rect fill="none" height="10" width="10"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="-59.7495" y2="10.2617">
-<stop offset="0" style="stop-color:#B3B3B3"/>
-<stop offset="0.103" style="stop-color:#A8A8A8;stop-opacity:0"/>
-<stop offset="0.9" style="stop-color:#585858;stop-opacity:0"/>
-<stop offset="1" style="stop-color:#4D4D4D"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="6" x2="6" y1="-57.9995" y2="8.0034">
+<stop offset="0" style="stop-color:#505050"/>
+<stop offset="0.2" style="stop-color:#FFFFFF;stop-opacity:0"/>
+<stop offset="0.8" style="stop-color:#F9F9F9;stop-opacity:0"/>
+<stop offset="1" style="stop-color:#3C3C3C"/>
 </linearGradient>
 </defs>
-</g>
-<path d="M6,9C3.243,9,1,6.757,1,4V0H0v4c0,3.3,2.7,6,6,6h4V9H6z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_br.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_br.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_br.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,16 +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="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>
-<path d="M0,0v10h4c3.3,0,6-2.7,6-6V0H0z" fill="url(#SVGID_1_)"/>
+<path d="M0,0v8h4c2.206,0,4-1.794,4-4V0H0z" fill="url(#SVGID_1_)" fill-opacity="0.7" stroke-opacity="0.7"/>
+<rect fill="none" height="10" width="10"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="-59.7495" y2="10.2617">
-<stop offset="0" style="stop-color:#B3B3B3"/>
-<stop offset="0.103" style="stop-color:#A8A8A8;stop-opacity:0"/>
-<stop offset="0.9" style="stop-color:#585858;stop-opacity:0"/>
-<stop offset="1" style="stop-color:#4D4D4D"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4" x2="4" y1="-57.9995" y2="8.0034">
+<stop offset="0" style="stop-color:#505050"/>
+<stop offset="0.2" style="stop-color:#FFFFFF;stop-opacity:0"/>
+<stop offset="0.8" style="stop-color:#F9F9F9;stop-opacity:0"/>
+<stop offset="1" style="stop-color:#3C3C3C"/>
 </linearGradient>
 </defs>
-</g>
-<path d="M9,0v4c0,2.757-2.243,5-5,5H0v1h4c3.3,0,6-2.7,6-6V0H9z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_c.svg	Mon May 03 12:48:33 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="50px" version="1.1" viewBox="0 0 50 50" width="50px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
 <rect fill="none" height="50" width="50"/>
-<g>
-<rect fill="url(#SVGID_1_)" height="50" width="50"/>
+<rect fill="url(#SVGID_1_)" fill-opacity="0.7" height="50" stroke-opacity="0.7" width="50"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="24.9995" x2="24.9995" y1="-9.75" y2="60.2617">
-<stop offset="0" style="stop-color:#B3B3B3"/>
-<stop offset="0.103" style="stop-color:#A8A8A8;stop-opacity:0"/>
-<stop offset="0.9" style="stop-color:#585858;stop-opacity:0"/>
-<stop offset="1" style="stop-color:#4D4D4D"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="24.9995" x2="24.9995" y1="-8" y2="58.0036">
+<stop offset="0" style="stop-color:#505050"/>
+<stop offset="0.2" style="stop-color:#FFFFFF;stop-opacity:0"/>
+<stop offset="0.8" style="stop-color:#F9F9F9;stop-opacity:0"/>
+<stop offset="1" style="stop-color:#3C3C3C"/>
 </linearGradient>
 </defs>
-</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_l.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,16 +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="50px" version="1.1" viewBox="0 0 10 50" 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="50" width="10"/>
-<g>
-<rect fill="url(#SVGID_1_)" height="50" width="10"/>
+<rect fill="url(#SVGID_1_)" fill-opacity="0.7" height="50" stroke-opacity="0.7" width="8" x="2"/>
+<rect fill="none" height="50" width="10"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="-9.75" y2="60.2617">
-<stop offset="0" style="stop-color:#B3B3B3"/>
-<stop offset="0.103" style="stop-color:#A8A8A8;stop-opacity:0"/>
-<stop offset="0.9" style="stop-color:#585858;stop-opacity:0"/>
-<stop offset="1" style="stop-color:#4D4D4D"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="6" x2="6" y1="-8" y2="58.0036">
+<stop offset="0" style="stop-color:#505050"/>
+<stop offset="0.2" style="stop-color:#FFFFFF;stop-opacity:0"/>
+<stop offset="0.8" style="stop-color:#F9F9F9;stop-opacity:0"/>
+<stop offset="1" style="stop-color:#3C3C3C"/>
 </linearGradient>
 </defs>
-</g>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="50" stroke-opacity="0.4" width="1"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_r.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,16 +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="50px" version="1.1" viewBox="0 0 10 50" 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="50" width="10"/>
-<g>
-<rect fill="url(#SVGID_1_)" height="50" width="10"/>
+<rect fill="url(#SVGID_1_)" fill-opacity="0.7" height="50" stroke-opacity="0.7" width="8"/>
+<rect fill="none" height="50" width="10"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="-9.75" y2="60.2617">
-<stop offset="0" style="stop-color:#B3B3B3"/>
-<stop offset="0.103" style="stop-color:#A8A8A8;stop-opacity:0"/>
-<stop offset="0.9" style="stop-color:#585858;stop-opacity:0"/>
-<stop offset="1" style="stop-color:#4D4D4D"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4" x2="4" y1="-8" y2="58.0036">
+<stop offset="0" style="stop-color:#505050"/>
+<stop offset="0.2" style="stop-color:#FFFFFF;stop-opacity:0"/>
+<stop offset="0.8" style="stop-color:#F9F9F9;stop-opacity:0"/>
+<stop offset="1" style="stop-color:#3C3C3C"/>
 </linearGradient>
 </defs>
-</g>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="50" stroke-opacity="0.4" width="1" x="9"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_t.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_t.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_t.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,16 +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="10px" version="1.1" viewBox="0 0 50 10" width="50px" 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="50"/>
-<g>
-<rect fill="url(#SVGID_1_)" height="10" width="50"/>
+<rect fill="url(#SVGID_1_)" fill-opacity="0.7" height="8" stroke-opacity="0.7" width="50" y="2"/>
+<rect fill="none" height="10" width="50"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="24.9995" x2="24.9995" y1="0.25" y2="70.2612">
-<stop offset="0" style="stop-color:#B3B3B3"/>
-<stop offset="0.103" style="stop-color:#A8A8A8;stop-opacity:0"/>
-<stop offset="0.9" style="stop-color:#585858;stop-opacity:0"/>
-<stop offset="1" style="stop-color:#4D4D4D"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="24.9995" x2="24.9995" y1="2" y2="68.003">
+<stop offset="0" style="stop-color:#505050"/>
+<stop offset="0.2" style="stop-color:#FFFFFF;stop-opacity:0"/>
+<stop offset="0.8" style="stop-color:#F9F9F9;stop-opacity:0"/>
+<stop offset="1" style="stop-color:#3C3C3C"/>
 </linearGradient>
 </defs>
-</g>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="50"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_tl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_tl.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_tl.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,16 +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="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>
-<path d="M6,0C2.7,0,0,2.7,0,6v4h10V0H6z" fill="url(#SVGID_1_)"/>
+<path d="M6,2C3.794,2,2,3.794,2,6v4h8V2H6z" fill="url(#SVGID_1_)" fill-opacity="0.7" stroke-opacity="0.7"/>
+<rect fill="none" height="10" width="10"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="0.25" y2="70.2612">
-<stop offset="0" style="stop-color:#B3B3B3"/>
-<stop offset="0.103" style="stop-color:#A8A8A8;stop-opacity:0"/>
-<stop offset="0.9" style="stop-color:#585858;stop-opacity:0"/>
-<stop offset="1" style="stop-color:#4D4D4D"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="6" x2="6" y1="2" y2="68.003">
+<stop offset="0" style="stop-color:#505050"/>
+<stop offset="0.2" style="stop-color:#FFFFFF;stop-opacity:0"/>
+<stop offset="0.8" style="stop-color:#F9F9F9;stop-opacity:0"/>
+<stop offset="1" style="stop-color:#3C3C3C"/>
 </linearGradient>
 </defs>
-</g>
-<path d="M6,0C2.7,0,0,2.7,0,6v4h1V6c0-2.757,2.243-5,5-5h4V0H6z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_tr.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_tr.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_tr.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,16 +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="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>
-<path d="M10,6c0-3.3-2.7-6-6-6H0v10h10V6z" fill="url(#SVGID_1_)"/>
+<path d="M8,6c0-2.206-1.794-4-4-4H0v8h8V6z" fill="url(#SVGID_1_)" fill-opacity="0.7" stroke-opacity="0.7"/>
+<rect fill="none" height="10" width="10"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="0.25" y2="70.2612">
-<stop offset="0" style="stop-color:#B3B3B3"/>
-<stop offset="0.103" style="stop-color:#A8A8A8;stop-opacity:0"/>
-<stop offset="0.9" style="stop-color:#585858;stop-opacity:0"/>
-<stop offset="1" style="stop-color:#4D4D4D"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4" x2="4" y1="2" y2="68.003">
+<stop offset="0" style="stop-color:#505050"/>
+<stop offset="0.2" style="stop-color:#FFFFFF;stop-opacity:0"/>
+<stop offset="0.8" style="stop-color:#F9F9F9;stop-opacity:0"/>
+<stop offset="1" style="stop-color:#3C3C3C"/>
 </linearGradient>
 </defs>
-</g>
-<path d="M4,0H0v1h4c2.757,0,5,2.243,5,5v4h1V6C10,2.7,7.3,0,4,0z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_vprogbar_wait.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_vprogbar_wait.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="20px" version="1.1" viewBox="0 -0.5 20 20" width="20px" x="0px" y="0px">
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="9.9995" x2="9.9995" y1="5" y2="15.0251">
-<stop offset="0" style="stop-color:#8CE0FF"/>
-<stop offset="0.1167" style="stop-color:#78D6F9"/>
-<stop offset="0.4027" style="stop-color:#4DBFED"/>
-<stop offset="0.6262" style="stop-color:#33B0E5"/>
-<stop offset="0.7582" style="stop-color:#29ABE2"/>
-<stop offset="1" style="stop-color:#29ABE2"/>
-</linearGradient>
-<rect fill="url(#SVGID_1_)" height="10" transform="matrix(7.549789E-08,0.9999999,-1,7.549789E-08,19.99988,-3.051758E-05)" width="20" y="5"/>
-<rect fill="none" height="20" transform="matrix(7.549789E-08,0.9999999,-1,7.549789E-08,19.99988,-3.051758E-05)" width="20"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="12.9995" x2="12.9995" y1="5" y2="15.0251">
-<stop offset="0" style="stop-color:#E6F7FF"/>
-<stop offset="0.7527" style="stop-color:#69D6FF"/>
-<stop offset="1" style="stop-color:#69D6FF"/>
-</linearGradient>
-<polygon fill="url(#SVGID_2_)" points="16,15 6,15 10,5 20,5 " transform="matrix(7.549789E-08,0.9999999,-1,7.549789E-08,19.99988,-3.051758E-05)"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_battery_bg.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_battery_bg.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_battery_bg.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,14 +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="15px" version="1.1" viewBox="0 0 30 15" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<polygon fill="url(#SVGID_1_)" points="3,4 1,4 1,11 3,11 3,15 29,15 29,0 3,0 "/>
-<rect fill-opacity="0.2" height="8" stroke-opacity="0.2" width="2" x="22" y="3.5"/>
-<polygon fill-opacity="0.2" points="9,3.5 9,6.5 6,6.5 6,8.5 9,8.5 9,11.5 11,11.5 11,8.5 14,8.5 14,6.5 11,6.5 11,3.5 " stroke-opacity="0.2"/>
 <rect fill="none" height="15" width="30"/>
-<defs>
-<linearGradient gradientTransform="matrix(0 -1 1 0 -1172 -152)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-167" x2="-152" y1="1187" y2="1187">
-<stop offset="0" style="stop-color:#C8C8C8"/>
-<stop offset="1" style="stop-color:#B4B4B4"/>
-</linearGradient>
-</defs>
+<path d="M5.5,14C4.675,14,4,13.325,4,12.5v-10C4,1.675,4.675,1,5.5,1l0,0C6.325,1,7,1.675,7,2.5v10  C7,13.325,6.325,14,5.5,14L5.5,14z" fill="#BEBEBE"/>
+<path d="M10.5,14C9.675,14,9,13.325,9,12.5v-10C9,1.675,9.675,1,10.5,1l0,0C11.325,1,12,1.675,12,2.5v10  C12,13.325,11.325,14,10.5,14L10.5,14z" fill="#BEBEBE"/>
+<path d="M15.5,14c-0.825,0-1.5-0.675-1.5-1.5v-10C14,1.675,14.675,1,15.5,1l0,0C16.325,1,17,1.675,17,2.5v10  C17,13.325,16.325,14,15.5,14L15.5,14z" fill="#BEBEBE"/>
+<path d="M20.5,14c-0.825,0-1.5-0.675-1.5-1.5v-10C19,1.675,19.675,1,20.5,1l0,0C21.325,1,22,1.675,22,2.5v10  C22,13.325,21.325,14,20.5,14L20.5,14z" fill="#BEBEBE"/>
+<path d="M25.5,14c-0.825,0-1.5-0.675-1.5-1.5v-10C24,1.675,24.675,1,25.5,1l0,0C26.325,1,27,1.675,27,2.5v10  C27,13.325,26.325,14,25.5,14L25.5,14z" fill="#BEBEBE"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_battery_full.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_battery_full.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_battery_full.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,14 +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="15px" version="1.1" viewBox="0 0 30 15" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<polygon fill="url(#SVGID_1_)" points="3,4 1,4 1,11 3,11 3,15 29,15 29,0 3,0 "/>
-<rect fill-opacity="0.2" height="8" stroke-opacity="0.2" width="2" x="22" y="3.5"/>
-<polygon fill-opacity="0.2" points="9,3.5 9,6.5 6,6.5 6,8.5 9,8.5 9,11.5 11,11.5 11,8.5 14,8.5 14,6.5 11,6.5 11,3.5 " stroke-opacity="0.2"/>
 <rect fill="none" height="15" width="30"/>
-<defs>
-<linearGradient gradientTransform="matrix(0 -1 1 0 -407.5 -1291.5)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-1291.4995" x2="-1306.4995" y1="422.499" y2="422.499">
-<stop offset="0" style="stop-color:#92DE2F"/>
-<stop offset="1" style="stop-color:#19B016"/>
-</linearGradient>
-</defs>
+<path d="M5.5,14C4.675,14,4,13.325,4,12.5v-10C4,1.675,4.675,1,5.5,1l0,0C6.325,1,7,1.675,7,2.5v10  C7,13.325,6.325,14,5.5,14L5.5,14z" fill="#88FF00"/>
+<path d="M10.5,14C9.675,14,9,13.325,9,12.5v-10C9,1.675,9.675,1,10.5,1l0,0C11.325,1,12,1.675,12,2.5v10  C12,13.325,11.325,14,10.5,14L10.5,14z" fill="#88FF00"/>
+<path d="M15.5,14c-0.825,0-1.5-0.675-1.5-1.5v-10C14,1.675,14.675,1,15.5,1l0,0C16.325,1,17,1.675,17,2.5v10  C17,13.325,16.325,14,15.5,14L15.5,14z" fill="#88FF00"/>
+<path d="M20.5,14c-0.825,0-1.5-0.675-1.5-1.5v-10C19,1.675,19.675,1,20.5,1l0,0C21.325,1,22,1.675,22,2.5v10  C22,13.325,21.325,14,20.5,14L20.5,14z" fill="#88FF00"/>
+<path d="M25.5,14c-0.825,0-1.5-0.675-1.5-1.5v-10C24,1.675,24.675,1,25.5,1l0,0C26.325,1,27,1.675,27,2.5v10  C27,13.325,26.325,14,25.5,14L25.5,14z" fill="#88FF00"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_battery_low.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_battery_low.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_battery_low.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,14 +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="15px" version="1.1" viewBox="0 0 30 15" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<polygon fill="url(#SVGID_1_)" points="3,4 1,4 1,11 3,11 3,15 29,15 29,0 3,0 "/>
-<rect fill-opacity="0.2" height="8" stroke-opacity="0.2" width="2" x="22" y="3.5"/>
-<polygon fill-opacity="0.2" points="9,3.5 9,6.5 6,6.5 6,8.5 9,8.5 9,11.5 11,11.5 11,8.5 14,8.5 14,6.5 11,6.5 11,3.5 " stroke-opacity="0.2"/>
 <rect fill="none" height="15" width="30"/>
-<defs>
-<linearGradient gradientTransform="matrix(0 -1 1 0 -999 57)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="57" x2="42" y1="1013.999" y2="1013.999">
-<stop offset="0" style="stop-color:#FA772B"/>
-<stop offset="1" style="stop-color:#CC2500"/>
-</linearGradient>
-</defs>
+<path d="M5.5,14C4.675,14,4,13.325,4,12.5v-10C4,1.675,4.675,1,5.5,1l0,0C6.325,1,7,1.675,7,2.5v10  C7,13.325,6.325,14,5.5,14L5.5,14z" fill="#E34D15"/>
+<path d="M10.5,14C9.675,14,9,13.325,9,12.5v-10C9,1.675,9.675,1,10.5,1l0,0C11.325,1,12,1.675,12,2.5v10  C12,13.325,11.325,14,10.5,14L10.5,14z" fill="#E34D15"/>
+<path d="M15.5,14c-0.825,0-1.5-0.675-1.5-1.5v-10C14,1.675,14.675,1,15.5,1l0,0C16.325,1,17,1.675,17,2.5v10  C17,13.325,16.325,14,15.5,14L15.5,14z" fill="#E34D15"/>
+<path d="M20.5,14c-0.825,0-1.5-0.675-1.5-1.5v-10C19,1.675,19.675,1,20.5,1l0,0C21.325,1,22,1.675,22,2.5v10  C22,13.325,21.325,14,20.5,14L20.5,14z" fill="#E34D15"/>
+<path d="M25.5,14c-0.825,0-1.5-0.675-1.5-1.5v-10C24,1.675,24.675,1,25.5,1l0,0C26.325,1,27,1.675,27,2.5v10  C27,13.325,26.325,14,25.5,14L25.5,14z" fill="#E34D15"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_battery_medium.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_battery_medium.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_battery_medium.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,14 +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="15px" version="1.1" viewBox="0 0 30 15" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<polygon fill="url(#SVGID_1_)" points="3,4 1,4 1,11 3,11 3,15 29,15 29,0 3,0 "/>
-<rect fill-opacity="0.2" height="8" stroke-opacity="0.2" width="2" x="22" y="3.5"/>
-<polygon fill-opacity="0.2" points="9,3.5 9,6.5 6,6.5 6,8.5 9,8.5 9,11.5 11,11.5 11,8.5 14,8.5 14,6.5 11,6.5 11,3.5 " stroke-opacity="0.2"/>
 <rect fill="none" height="15" width="30"/>
-<defs>
-<linearGradient gradientTransform="matrix(0 -1 1 0 -407.5 -1291.5)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-1291.4995" x2="-1306.4995" y1="422.499" y2="422.499">
-<stop offset="0" style="stop-color:#FAD347"/>
-<stop offset="1" style="stop-color:#FA9600"/>
-</linearGradient>
-</defs>
+<path d="M5.5,14C4.675,14,4,13.325,4,12.5v-10C4,1.675,4.675,1,5.5,1l0,0C6.325,1,7,1.675,7,2.5v10  C7,13.325,6.325,14,5.5,14L5.5,14z" fill="#FACD40"/>
+<path d="M10.5,14C9.675,14,9,13.325,9,12.5v-10C9,1.675,9.675,1,10.5,1l0,0C11.325,1,12,1.675,12,2.5v10  C12,13.325,11.325,14,10.5,14L10.5,14z" fill="#FACD40"/>
+<path d="M15.5,14c-0.825,0-1.5-0.675-1.5-1.5v-10C14,1.675,14.675,1,15.5,1l0,0C16.325,1,17,1.675,17,2.5v10  C17,13.325,16.325,14,15.5,14L15.5,14z" fill="#FACD40"/>
+<path d="M20.5,14c-0.825,0-1.5-0.675-1.5-1.5v-10C19,1.675,19.675,1,20.5,1l0,0C21.325,1,22,1.675,22,2.5v10  C22,13.325,21.325,14,20.5,14L20.5,14z" fill="#FACD40"/>
+<path d="M25.5,14c-0.825,0-1.5-0.675-1.5-1.5v-10C24,1.675,24.675,1,25.5,1l0,0C26.325,1,27,1.675,27,2.5v10  C27,13.325,26.325,14,25.5,14L25.5,14z" fill="#FACD40"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_combobox_button_disabled.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_combobox_button_disabled.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_combobox_button_disabled.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,13 +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="38px" version="1.1" viewBox="0 0 38 38" width="38px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
 <rect fill="none" height="38" width="38"/>
-<path d="M34,0H0v38h34c2.201,0,4-1.8,4-4V4C38,1.8,36.201,0,34,0z" fill="url(#SVGID_1_)"/>
+<path d="M34,0H0v38h34c2.201,0,4-1.8,4-4V4C38,1.8,36.201,0,34,0z" fill="#AAAAAA" fill-opacity="0.8" stroke-opacity="0.8"/>
 <path d="M19,27c-0.412,0-0.795-0.217-0.996-0.576L9.156,14.871c-0.209-0.361-0.207-0.799,0-1.154  c0.203-0.355,0.586-0.576,0.996-0.576h17.693c0.412,0,0.795,0.223,0.998,0.576c0.209,0.355,0.209,0.793,0,1.154l-8.848,11.553  C19.787,26.783,19.41,27,19,27z" fill="#787878" fill-opacity="0.5" stroke-opacity="0.5"/>
 <path d="M34,0H0v1h34c1.654,0,3,1.346,3,3v30c0,1.654-1.346,3-3,3H0v1h34c2.201,0,4-1.8,4-4V4C38,1.8,36.201,0,34,0z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="19" x2="19" y1="38" y2="4.882813e-004">
-<stop offset="0" style="stop-color:#D2D2D2"/>
-<stop offset="1" style="stop-color:#AAAAAA"/>
-</linearGradient>
-</defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_combobox_button_highlight.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_combobox_button_highlight.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_combobox_button_highlight.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,9 +2,9 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="38px" version="1.1" viewBox="0 0 38 38" width="38px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
 <rect fill="none" height="38" width="38"/>
-<path d="M34,0H0v38h34c2.2,0,4-1.8,4-4V4C38,1.8,36.2,0,34,0z" fill="url(#SVGID_1_)"/>
-<path d="M19,27c-0.412,0-0.795-0.217-0.997-0.576L9.155,14.871c-0.208-0.361-0.206-0.799,0-1.154  c0.204-0.355,0.586-0.576,0.997-0.576h17.693c0.411,0,0.795,0.223,0.998,0.576c0.209,0.355,0.209,0.793,0,1.154l-8.848,11.553  C19.787,26.783,19.41,27,19,27z" fill="#FFFFFF"/>
-<path d="M34,0H0v38h34c2.2,0,4-1.8,4-4V4C38,1.8,36.2,0,34,0z M37,34c0,1.654-1.346,3-3,3H1V1h33  c1.654,0,3,1.346,3,3V34z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M34,0H0v38h34c2.201,0,4-1.8,4-4V4C38,1.8,36.201,0,34,0z" fill="url(#SVGID_1_)"/>
+<path d="M19,27c-0.411,0-0.795-0.217-0.996-0.576L9.156,14.871c-0.209-0.361-0.207-0.799,0-1.154  c0.203-0.355,0.586-0.576,0.997-0.576h17.692c0.412,0,0.795,0.223,0.999,0.576c0.208,0.355,0.208,0.793,0,1.154l-8.848,11.553  C19.787,26.783,19.41,27,19,27z" fill="#FFFFFF"/>
+<path d="M34,0H0v38h34c2.201,0,4-1.8,4-4V4C38,1.8,36.201,0,34,0z M37,34c0,1.654-1.346,3-3,3H1V1h33  c1.654,0,3,1.346,3,3V34z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
 <defs>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="19" x2="19" y1="0" y2="38.5298">
 <stop offset="0" style="stop-color:#66B8CC"/>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_combobox_button_latched.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_combobox_button_latched.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_combobox_button_latched.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,17 +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="38px" version="1.1" viewBox="0 0 38 38" width="38px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
 <rect fill="none" height="38" width="38"/>
-<path d="M34,0H0v38h34c2.199,0,4-1.8,4-4V4C38,1.8,36.199,0,34,0z" fill="url(#SVGID_1_)"/>
+<path d="M34,0H0v38h34c2.2,0,4-1.8,4-4V4C38,1.8,36.2,0,34,0z" fill="url(#SVGID_1_)"/>
 <g>
 <g>
-<path d="M19,27c-0.412,0-0.795-0.217-0.998-0.576L9.154,14.871c-0.207-0.361-0.205-0.799,0-1.154    s0.586-0.576,0.998-0.576h17.693c0.41,0,0.795,0.223,0.998,0.576c0.209,0.355,0.209,0.793,0,1.154l-8.848,11.553    C19.787,26.783,19.41,27,19,27z" fill="#FFFFFF"/>
+<path d="M19,27c-0.412,0-0.795-0.217-0.997-0.576L9.155,14.871c-0.208-0.361-0.206-0.799,0-1.154    c0.204-0.355,0.586-0.576,0.997-0.576h17.693c0.411,0,0.795,0.223,0.998,0.576c0.209,0.355,0.209,0.793,0,1.154l-8.848,11.553    C19.787,26.783,19.41,27,19,27z" fill="#FFFFFF"/>
 </g>
 </g>
-<path d="M34,0H0v38h34c2.199,0,4-1.8,4-4V4C38,1.8,36.199,0,34,0z M37,34c0,1.654-1.346,3-3,3H1V1h33  c1.654,0,3,1.346,3,3V34z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M34,0H0v38h34c2.2,0,4-1.8,4-4V4C38,1.8,36.2,0,34,0z M37,34c0,1.654-1.346,3-3,3H1V1h33c1.654,0,3,1.346,3,3  V34z" fill-opacity="0.2" stroke-opacity="0.2"/>
 <defs>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="19" x2="19" y1="0" y2="38.0005">
-<stop offset="0" style="stop-color:#C8C8D2"/>
-<stop offset="1" style="stop-color:#8C8C96"/>
+<stop offset="0" style="stop-color:#CDCDD2"/>
+<stop offset="1" style="stop-color:#919196"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_divider_h_thin.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_divider_h_thin.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="360px" height="2px" viewBox="0 0 360 2" enable-background="new 0 0 360 2" xml:space="preserve">
-<defs>
-</defs>
-<rect y="1" fill="#FFFFFF" width="360" height="1"/>
-<rect opacity="0.2" width="360" height="1"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_editor_cursor_drag.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_editor_cursor_drag.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="50px" height="50px" viewBox="0 0 50 50" enable-background="new 0 0 50 50" xml:space="preserve">
-<defs>
-</defs>
-<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" fill="#69FF00" d="M25,50C11.193,50,0,38.807,0,25S11.193,0,25,0
-	C25,17.5,25,34.5,25,50z"/>
-<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" fill="#5ACE00" d="M25,49C11.746,49,1,38.254,1,25S11.746,1,25,1V0
-	C11.193,0,0,11.193,0,25s11.193,25,25,25V49z"/>
-<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" fill="#FF0000" d="M25,50c13.807,0,25-11.193,25-25S38.807,0,25,0
-	C25,17.5,25,34.5,25,50z"/>
-<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" fill="#FF0000" d="M25,50c13.807,0,25-11.193,25-25S38.807,0,25,0v1
-	c13.254,0,24,10.746,24,24S38.254,49,25,49V50z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_editor_handle_begin.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_editor_handle_begin.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_editor_handle_begin.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,21 +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="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<rect fill="none" height="16" width="16"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="7.9995" x2="7.9995" y1="0" y2="16.0718">
-<stop offset="0" style="stop-color:#B4B4BE"/>
-<stop offset="1" style="stop-color:#E6E6F0"/>
-</linearGradient>
-<circle cx="8" cy="8" fill="url(#SVGID_1_)" r="8"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="7.9995" x2="7.9995" y1="0" y2="16.0005">
-<stop offset="0" style="stop-color:#A0A0AA"/>
-<stop offset="1" style="stop-color:#E6E6F0"/>
-</linearGradient>
-<path d="M8,0C3.582,0,0,3.582,0,8c0,4.418,3.582,8,8,8c4.418,0,8-3.582,8-8C16,3.582,12.418,0,8,0z M8,15  c-3.86,0-7-3.141-7-7c0-3.86,3.14-7,7-7c3.859,0,7,3.14,7,7C15,11.859,11.859,15,8,15z" fill="url(#SVGID_2_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="7.9995" x2="7.9995" y1="3" y2="12.8575">
+<circle cx="8" cy="8" fill-opacity="0.1" r="8" stroke-opacity="0.1"/>
+<path d="M8,15c-3.86,0-7-3.141-7-7c0-3.86,3.14-7,7-7c3.859,0,7,3.14,7,7C15,11.859,11.859,15,8,15L8,15z" fill="url(#SVGID_1_)"/>
+<path d="M8,2C4.691,2,2,4.691,2,8s2.691,6,6,6s6-2.691,6-6S11.309,2,8,2z M8,13c-2.757,0-5-2.244-5-5  c0-2.757,2.243-5,5-5s5,2.243,5,5C13,10.756,10.757,13,8,13z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M8,1C4.14,1,1,4.14,1,8c0,3.859,3.14,7,7,7c3.859,0,7-3.141,7-7C15,4.14,11.859,1,8,1z M8,14  c-3.309,0-6-2.691-6-6s2.691-6,6-6s6,2.691,6,6S11.309,14,8,14z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="7.9995" x2="7.9995" y1="1" y2="15.0005">
 <stop offset="0" style="stop-color:#66B8CC"/>
 <stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
-<circle cx="8" cy="8" fill="url(#SVGID_3_)" r="5"/>
-<path d="M8,3C5.238,3,3,5.239,3,8c0,2.762,2.238,5,5,5s5-2.238,5-5C13,5.239,10.762,3,8,3z M8,12  c-2.206,0-4-1.795-4-4c0-2.206,1.794-4,4-4c2.205,0,4,1.794,4,4C12,10.205,10.205,12,8,12z" fill-opacity="0.2" stroke-opacity="0.2"/>
+</defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_editor_handle_end.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_editor_handle_end.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_editor_handle_end.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,21 +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="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<rect fill="none" height="16" width="16"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="7.9995" x2="7.9995" y1="0" y2="16.0718">
-<stop offset="0" style="stop-color:#B4B4BE"/>
-<stop offset="1" style="stop-color:#E6E6F0"/>
-</linearGradient>
-<circle cx="8" cy="8" fill="url(#SVGID_1_)" r="8"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="7.9995" x2="7.9995" y1="0" y2="16.0005">
-<stop offset="0" style="stop-color:#A0A0AA"/>
-<stop offset="1" style="stop-color:#E6E6F0"/>
-</linearGradient>
-<path d="M8,0C3.582,0,0,3.582,0,8c0,4.418,3.582,8,8,8c4.418,0,8-3.582,8-8C16,3.582,12.418,0,8,0z M8,15  c-3.86,0-7-3.141-7-7c0-3.86,3.14-7,7-7c3.859,0,7,3.14,7,7C15,11.859,11.859,15,8,15z" fill="url(#SVGID_2_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="7.9995" x2="7.9995" y1="3" y2="12.8575">
+<circle cx="8" cy="8" fill-opacity="0.1" r="8" stroke-opacity="0.1"/>
+<path d="M8,15c-3.86,0-7-3.141-7-7c0-3.86,3.14-7,7-7c3.859,0,7,3.14,7,7C15,11.859,11.859,15,8,15L8,15z" fill="url(#SVGID_1_)"/>
+<path d="M8,2C4.691,2,2,4.691,2,8s2.691,6,6,6s6-2.691,6-6S11.309,2,8,2z M8,13c-2.757,0-5-2.244-5-5  c0-2.757,2.243-5,5-5s5,2.243,5,5C13,10.756,10.757,13,8,13z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M8,1C4.14,1,1,4.14,1,8c0,3.859,3.14,7,7,7c3.859,0,7-3.141,7-7C15,4.14,11.859,1,8,1z M8,14  c-3.309,0-6-2.691-6-6s2.691-6,6-6s6,2.691,6,6S11.309,14,8,14z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="7.9995" x2="7.9995" y1="1" y2="15.0005">
 <stop offset="0" style="stop-color:#66B8CC"/>
 <stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
-<circle cx="8" cy="8" fill="url(#SVGID_3_)" r="5"/>
-<path d="M8,3C5.238,3,3,5.239,3,8c0,2.762,2.238,5,5,5s5-2.238,5-5C13,5.239,10.762,3,8,3z M8,12  c-2.206,0-4-1.795-4-4c0-2.206,1.794-4,4-4c2.205,0,4,1.794,4,4C12,10.205,10.205,12,8,12z" fill-opacity="0.2" stroke-opacity="0.2"/>
+</defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_input_h_swipe.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_input_h_swipe.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_input_h_swipe.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,16 +1,118 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="126px" version="1.1" viewBox="55.5 -55.5 15 126" width="15px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<path d="M55.5,70.5h9c3.3,0,6-2.7,6-6v-114c0-3.3-2.7-6-6-6h-9V70.5z" fill="url(#SVGID_1_)"/>
-<rect fill="#14141E" fill-opacity="0.3" height="28" stroke-opacity="0.3" width="1" x="59.5" y="-6.5"/>
-<rect fill="#FFFFFF" fill-opacity="0.5" height="28" stroke-opacity="0.5" width="1" x="60.5" y="-6.5"/>
-<rect fill="#14141E" fill-opacity="0.3" height="28" stroke-opacity="0.3" width="1" x="63.5" y="-6.5"/>
-<rect fill="#FFFFFF" fill-opacity="0.5" height="28" stroke-opacity="0.5" width="1" x="64.5" y="-6.5"/>
-<path d="M55.5,70.5h9c3.3,0,6-2.7,6-6v-114c0-3.3-2.7-6-6-6h-9V70.5z   M64.5-54.5c2.757,0,5,2.243,5,5v114c0,2.757-2.243,5-5,5h-8v-124H64.5z" fill="#14141E" fill-opacity="0.3" stroke-opacity="0.3"/>
-<defs>
-<linearGradient gradientTransform="matrix(4.489659e-011 -1 -1 -4.489659e-011 -30.5195 127.9805)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="120.4805" x2="120.4805" y1="-101.019" y2="-86.5195">
-<stop offset="0" style="stop-color:#F0F0F0"/>
-<stop offset="1" style="stop-color:#AAAAAA"/>
+<svg baseProfile="tiny" height="126px" version="1.1" viewBox="0 0 15 126" width="15px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<linearGradient gradientTransform="matrix(0 -1 1 0 -4113.5 1613.5)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="1550.499" x2="1550.499" y1="4113.5" y2="4128">
+<stop offset="0" style="stop-color:#F5F5FA"/>
+<stop offset="1" style="stop-color:#D2D2D7"/>
+</linearGradient>
+<path d="M0,126h9c3.3,0,6-2.7,6-6V6c0-3.3-2.7-6-6-6H0V126z" fill="url(#SVGID_1_)"/>
+<path d="M0,1h9c2.757,0,5,2.243,5,5v114c0,2.757-2.243,5-5,5H0v1h9c3.3,0,6-2.7,6-6V6c0-3.3-2.7-6-6-6  H0V1z" fill="#14141E" fill-opacity="0.4" stroke-opacity="0.4"/>
+<linearGradient gradientTransform="matrix(0 -1 1 0 -4113.5 1613.5)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="1522.501" x2="1522.501" y1="4119.5" y2="4115.6333">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#D2D2D7"/>
+</linearGradient>
+<circle cx="4" cy="91" fill="url(#SVGID_2_)" r="2"/>
+<path d="M3,91c0-0.931,0.639-1.706,1.5-1.93C4.34,89.029,4.174,89,4,89c-1.104,0-2,0.896-2,2  s0.896,2,2,2c0.174,0,0.34-0.029,0.5-0.07C3.639,92.706,3,91.931,3,91z" fill="#141419" fill-opacity="0.1" stroke-opacity="0.1"/>
+<linearGradient gradientTransform="matrix(0 -1 1 0 -4113.5 1613.5)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="1522.501" x2="1522.501" y1="4125.5" y2="4121.6333">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#D2D2D7"/>
+</linearGradient>
+<circle cx="10" cy="91" fill="url(#SVGID_3_)" r="2"/>
+<path d="M9,91c0-0.931,0.639-1.706,1.5-1.93C10.34,89.029,10.174,89,10,89c-1.104,0-2,0.896-2,2  s0.896,2,2,2c0.174,0,0.34-0.029,0.5-0.07C9.639,92.706,9,91.931,9,91z" fill="#141419" fill-opacity="0.1" stroke-opacity="0.1"/>
+<linearGradient gradientTransform="matrix(0 -1 1 0 -4113.5 1613.5)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="1529.501" x2="1529.501" y1="4119.5" y2="4115.6333">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#D2D2D7"/>
+</linearGradient>
+<circle cx="4" cy="84" fill="url(#SVGID_4_)" r="2"/>
+<path d="M3,84c0-0.931,0.639-1.706,1.5-1.93C4.34,82.029,4.174,82,4,82c-1.104,0-2,0.896-2,2  s0.896,2,2,2c0.174,0,0.34-0.029,0.5-0.07C3.639,85.706,3,84.931,3,84z" fill="#141419" fill-opacity="0.1" stroke-opacity="0.1"/>
+<linearGradient gradientTransform="matrix(0 -1 1 0 -4113.5 1613.5)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="1529.501" x2="1529.501" y1="4125.5" y2="4121.6333">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#D2D2D7"/>
+</linearGradient>
+<circle cx="10" cy="84" fill="url(#SVGID_5_)" r="2"/>
+<path d="M9,84c0-0.931,0.639-1.706,1.5-1.93C10.34,82.029,10.174,82,10,82c-1.104,0-2,0.896-2,2  s0.896,2,2,2c0.174,0,0.34-0.029,0.5-0.07C9.639,85.706,9,84.931,9,84z" fill="#141419" fill-opacity="0.1" stroke-opacity="0.1"/>
+<linearGradient gradientTransform="matrix(0 -1 1 0 -4113.5 1613.5)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="1536.501" x2="1536.501" y1="4119.5" y2="4115.6333">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#D2D2D7"/>
+</linearGradient>
+<circle cx="4" cy="77" fill="url(#SVGID_6_)" r="2"/>
+<path d="M3,77c0-0.931,0.639-1.706,1.5-1.93C4.34,75.029,4.174,75,4,75c-1.104,0-2,0.896-2,2  s0.896,2,2,2c0.174,0,0.34-0.029,0.5-0.07C3.639,78.706,3,77.931,3,77z" fill="#141419" fill-opacity="0.1" stroke-opacity="0.1"/>
+<linearGradient gradientTransform="matrix(0 -1 1 0 -4113.5 1613.5)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="1536.501" x2="1536.501" y1="4125.5" y2="4121.6333">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#D2D2D7"/>
+</linearGradient>
+<circle cx="10" cy="77" fill="url(#SVGID_7_)" r="2"/>
+<path d="M9,77c0-0.931,0.639-1.706,1.5-1.93C10.34,75.029,10.174,75,10,75c-1.104,0-2,0.896-2,2  s0.896,2,2,2c0.174,0,0.34-0.029,0.5-0.07C9.639,78.706,9,77.931,9,77z" fill="#141419" fill-opacity="0.1" stroke-opacity="0.1"/>
+<linearGradient gradientTransform="matrix(0 -1 1 0 -4113.5 1613.5)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="1543.501" x2="1543.501" y1="4119.5" y2="4115.6333">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#D2D2D7"/>
+</linearGradient>
+<circle cx="4" cy="70" fill="url(#SVGID_8_)" r="2"/>
+<path d="M3,70c0-0.931,0.639-1.706,1.5-1.93C4.34,68.029,4.174,68,4,68c-1.104,0-2,0.896-2,2  s0.896,2,2,2c0.174,0,0.34-0.029,0.5-0.071C3.639,71.706,3,70.931,3,70z" fill="#141419" fill-opacity="0.1" stroke-opacity="0.1"/>
+<linearGradient gradientTransform="matrix(0 -1 1 0 -4113.5 1613.5)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="1543.501" x2="1543.501" y1="4125.5" y2="4121.6333">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#D2D2D7"/>
 </linearGradient>
-</defs>
+<circle cx="10" cy="70" fill="url(#SVGID_9_)" r="2"/>
+<path d="M9,70c0-0.931,0.639-1.706,1.5-1.93C10.34,68.029,10.174,68,10,68c-1.104,0-2,0.896-2,2  s0.896,2,2,2c0.174,0,0.34-0.029,0.5-0.071C9.639,71.706,9,70.931,9,70z" fill="#141419" fill-opacity="0.1" stroke-opacity="0.1"/>
+<linearGradient gradientTransform="matrix(0 -1 1 0 -4113.5 1613.5)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="1550.501" x2="1550.501" y1="4119.5" y2="4115.6333">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#D2D2D7"/>
+</linearGradient>
+<circle cx="4" cy="63" fill="url(#SVGID_10_)" r="2"/>
+<path d="M3,63c0-0.931,0.639-1.706,1.5-1.93C4.34,61.029,4.174,61,4,61c-1.104,0-2,0.896-2,2  s0.896,2,2,2c0.174,0,0.34-0.029,0.5-0.071C3.639,64.706,3,63.931,3,63z" fill="#141419" fill-opacity="0.1" stroke-opacity="0.1"/>
+<linearGradient gradientTransform="matrix(0 -1 1 0 -4113.5 1613.5)" gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="1550.501" x2="1550.501" y1="4125.5" y2="4121.6333">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#D2D2D7"/>
+</linearGradient>
+<circle cx="10" cy="63" fill="url(#SVGID_11_)" r="2"/>
+<path d="M9,63c0-0.931,0.639-1.706,1.5-1.93C10.34,61.029,10.174,61,10,61c-1.104,0-2,0.896-2,2  s0.896,2,2,2c0.174,0,0.34-0.029,0.5-0.071C9.639,64.706,9,63.931,9,63z" fill="#141419" fill-opacity="0.1" stroke-opacity="0.1"/>
+<linearGradient gradientTransform="matrix(0 -1 1 0 -4113.5 1613.5)" gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="1557.501" x2="1557.501" y1="4119.5" y2="4115.6333">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#D2D2D7"/>
+</linearGradient>
+<circle cx="4" cy="56" fill="url(#SVGID_12_)" r="2"/>
+<path d="M3,56c0-0.931,0.639-1.706,1.5-1.93C4.34,54.029,4.174,54,4,54c-1.104,0-2,0.896-2,2  s0.896,2,2,2c0.174,0,0.34-0.029,0.5-0.071C3.639,57.706,3,56.931,3,56z" fill="#141419" fill-opacity="0.1" stroke-opacity="0.1"/>
+<linearGradient gradientTransform="matrix(0 -1 1 0 -4113.5 1613.5)" gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="1557.501" x2="1557.501" y1="4125.5" y2="4121.6333">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#D2D2D7"/>
+</linearGradient>
+<circle cx="10" cy="56" fill="url(#SVGID_13_)" r="2"/>
+<path d="M9,56c0-0.931,0.639-1.706,1.5-1.93C10.34,54.029,10.174,54,10,54c-1.104,0-2,0.896-2,2  s0.896,2,2,2c0.174,0,0.34-0.029,0.5-0.071C9.639,57.706,9,56.931,9,56z" fill="#141419" fill-opacity="0.1" stroke-opacity="0.1"/>
+<linearGradient gradientTransform="matrix(0 -1 1 0 -4113.5 1613.5)" gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="1564.501" x2="1564.501" y1="4119.5" y2="4115.6333">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#D2D2D7"/>
+</linearGradient>
+<circle cx="4" cy="49" fill="url(#SVGID_14_)" r="2"/>
+<path d="M3,49c0-0.931,0.639-1.706,1.5-1.93C4.34,47.029,4.174,47,4,47c-1.104,0-2,0.896-2,2  s0.896,2,2,2c0.174,0,0.34-0.029,0.5-0.071C3.639,50.706,3,49.931,3,49z" fill="#141419" fill-opacity="0.1" stroke-opacity="0.1"/>
+<linearGradient gradientTransform="matrix(0 -1 1 0 -4113.5 1613.5)" gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="1564.501" x2="1564.501" y1="4125.5" y2="4121.6333">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#D2D2D7"/>
+</linearGradient>
+<circle cx="10" cy="49" fill="url(#SVGID_15_)" r="2"/>
+<path d="M9,49c0-0.931,0.639-1.706,1.5-1.93C10.34,47.029,10.174,47,10,47c-1.104,0-2,0.896-2,2  s0.896,2,2,2c0.174,0,0.34-0.029,0.5-0.071C9.639,50.706,9,49.931,9,49z" fill="#141419" fill-opacity="0.1" stroke-opacity="0.1"/>
+<linearGradient gradientTransform="matrix(0 -1 1 0 -4113.5 1613.5)" gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="1571.501" x2="1571.501" y1="4119.5" y2="4115.6333">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#D2D2D7"/>
+</linearGradient>
+<circle cx="4" cy="42" fill="url(#SVGID_16_)" r="2"/>
+<path d="M3,42c0-0.931,0.639-1.706,1.5-1.93C4.34,40.029,4.174,40,4,40c-1.104,0-2,0.896-2,2  s0.896,2,2,2c0.174,0,0.34-0.029,0.5-0.071C3.639,43.706,3,42.931,3,42z" fill="#141419" fill-opacity="0.1" stroke-opacity="0.1"/>
+<linearGradient gradientTransform="matrix(0 -1 1 0 -4113.5 1613.5)" gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="1571.501" x2="1571.501" y1="4125.5" y2="4121.6333">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#D2D2D7"/>
+</linearGradient>
+<circle cx="10" cy="42" fill="url(#SVGID_17_)" r="2"/>
+<path d="M9,42c0-0.931,0.639-1.706,1.5-1.93C10.34,40.029,10.174,40,10,40c-1.104,0-2,0.896-2,2  s0.896,2,2,2c0.174,0,0.34-0.029,0.5-0.071C9.639,43.706,9,42.931,9,42z" fill="#141419" fill-opacity="0.1" stroke-opacity="0.1"/>
+<linearGradient gradientTransform="matrix(0 -1 1 0 -4113.5 1613.5)" gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="1578.501" x2="1578.501" y1="4119.5" y2="4115.6333">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#D2D2D7"/>
+</linearGradient>
+<circle cx="4" cy="35" fill="url(#SVGID_18_)" r="2"/>
+<path d="M3,35c0-0.931,0.639-1.706,1.5-1.93C4.34,33.029,4.174,33,4,33c-1.104,0-2,0.896-2,2  s0.896,2,2,2c0.174,0,0.34-0.029,0.5-0.071C3.639,36.706,3,35.931,3,35z" fill="#141419" fill-opacity="0.1" stroke-opacity="0.1"/>
+<linearGradient gradientTransform="matrix(0 -1 1 0 -4113.5 1613.5)" gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="1578.501" x2="1578.501" y1="4125.5" y2="4121.6333">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#D2D2D7"/>
+</linearGradient>
+<circle cx="10" cy="35" fill="url(#SVGID_19_)" r="2"/>
+<path d="M9,35c0-0.931,0.639-1.706,1.5-1.93C10.34,33.029,10.174,33,10,33c-1.104,0-2,0.896-2,2  s0.896,2,2,2c0.174,0,0.34-0.029,0.5-0.071C9.639,36.706,9,35.931,9,35z" fill="#141419" fill-opacity="0.1" stroke-opacity="0.1"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_input_swipe.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_input_swipe.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +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="15px" version="1.1" viewBox="0 0 126 15" width="126px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<path d="M0,0v9c0,3.3,2.7,6,6,6h114c3.3,0,6-2.7,6-6V0H0z" fill="url(#SVGID_1_)"/>
-<rect fill="#14141E" fill-opacity="0.3" height="1" stroke-opacity="0.3" width="28" x="49" y="4"/>
-<rect fill="#FFFFFF" fill-opacity="0.5" height="1" stroke-opacity="0.5" width="28" x="49" y="5"/>
-<rect fill="#14141E" fill-opacity="0.3" height="1" stroke-opacity="0.3" width="28" x="49" y="8"/>
-<rect fill="#FFFFFF" fill-opacity="0.5" height="1" stroke-opacity="0.5" width="28" x="49" y="9"/>
-<path d="M0,0v9c0,3.3,2.7,6,6,6h114c3.3,0,6-2.7,6-6V0H0z M125,9c0,2.757-2.243,5-5,5H6  c-2.757,0-5-2.243-5-5V1h124V9z" fill="#14141E" fill-opacity="0.3" stroke-opacity="0.3"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="63.0005" x2="63.0005" y1="15" y2="0.5005">
-<stop offset="0" style="stop-color:#F0F0F0"/>
-<stop offset="1" style="stop-color:#AAAAAA"/>
-</linearGradient>
-</defs>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_input_v_swipe.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_input_v_swipe.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="15px" version="1.1" viewBox="0 0 126 15" width="126px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="62.9995" x2="62.9995" y1="0" y2="14.5005">
+<stop offset="0" style="stop-color:#F5F5FA"/>
+<stop offset="1" style="stop-color:#D2D2D7"/>
+</linearGradient>
+<path d="M0,0v9c0,3.3,2.7,6,6,6h114c3.3,0,6-2.7,6-6V0H0z" fill="url(#SVGID_1_)"/>
+<path d="M125,0v9c0,2.757-2.243,5-5,5H6c-2.757,0-5-2.243-5-5V0H0v9c0,3.3,2.7,6,6,6h114  c3.3,0,6-2.7,6-6V0H125z" fill="#14141E" fill-opacity="0.4" stroke-opacity="0.4"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="35" x2="35" y1="6" y2="2.1333">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#D2D2D7"/>
+</linearGradient>
+<circle cx="35" cy="4" fill="url(#SVGID_2_)" r="2"/>
+<path d="M35,3c0.931,0,1.706,0.639,1.929,1.5C36.971,4.34,37,4.174,37,4c0-1.104-0.896-2-2-2  s-2,0.896-2,2c0,0.174,0.029,0.34,0.071,0.5C33.294,3.639,34.069,3,35,3z" fill="#141419" fill-opacity="0.1" stroke-opacity="0.1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="35" x2="35" y1="12" y2="8.1333">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#D2D2D7"/>
+</linearGradient>
+<circle cx="35" cy="10" fill="url(#SVGID_3_)" r="2"/>
+<path d="M35,9c0.931,0,1.706,0.639,1.929,1.5C36.971,10.34,37,10.174,37,10c0-1.104-0.896-2-2-2  s-2,0.896-2,2c0,0.174,0.029,0.34,0.071,0.5C33.294,9.639,34.069,9,35,9z" fill="#141419" fill-opacity="0.1" stroke-opacity="0.1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="42" x2="42" y1="6" y2="2.1333">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#D2D2D7"/>
+</linearGradient>
+<circle cx="42" cy="4" fill="url(#SVGID_4_)" r="2"/>
+<path d="M42,3c0.931,0,1.706,0.639,1.929,1.5C43.971,4.34,44,4.174,44,4c0-1.104-0.896-2-2-2  s-2,0.896-2,2c0,0.174,0.029,0.34,0.071,0.5C40.294,3.639,41.069,3,42,3z" fill="#141419" fill-opacity="0.1" stroke-opacity="0.1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="42" x2="42" y1="12" y2="8.1333">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#D2D2D7"/>
+</linearGradient>
+<circle cx="42" cy="10" fill="url(#SVGID_5_)" r="2"/>
+<path d="M42,9c0.931,0,1.706,0.639,1.929,1.5C43.971,10.34,44,10.174,44,10c0-1.104-0.896-2-2-2  s-2,0.896-2,2c0,0.174,0.029,0.34,0.071,0.5C40.294,9.639,41.069,9,42,9z" fill="#141419" fill-opacity="0.1" stroke-opacity="0.1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="49" x2="49" y1="6" y2="2.1333">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#D2D2D7"/>
+</linearGradient>
+<circle cx="49" cy="4" fill="url(#SVGID_6_)" r="2"/>
+<path d="M49,3c0.931,0,1.706,0.639,1.929,1.5C50.971,4.34,51,4.174,51,4c0-1.104-0.896-2-2-2  s-2,0.896-2,2c0,0.174,0.029,0.34,0.071,0.5C47.294,3.639,48.069,3,49,3z" fill="#141419" fill-opacity="0.1" stroke-opacity="0.1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="49" x2="49" y1="12" y2="8.1333">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#D2D2D7"/>
+</linearGradient>
+<circle cx="49" cy="10" fill="url(#SVGID_7_)" r="2"/>
+<path d="M49,9c0.931,0,1.706,0.639,1.929,1.5C50.971,10.34,51,10.174,51,10c0-1.104-0.896-2-2-2  s-2,0.896-2,2c0,0.174,0.029,0.34,0.071,0.5C47.294,9.639,48.069,9,49,9z" fill="#141419" fill-opacity="0.1" stroke-opacity="0.1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="56" x2="56" y1="6" y2="2.1333">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#D2D2D7"/>
+</linearGradient>
+<circle cx="56" cy="4" fill="url(#SVGID_8_)" r="2"/>
+<path d="M56,3c0.931,0,1.706,0.639,1.929,1.5C57.971,4.34,58,4.174,58,4c0-1.104-0.896-2-2-2  s-2,0.896-2,2c0,0.174,0.029,0.34,0.071,0.5C54.294,3.639,55.069,3,56,3z" fill="#141419" fill-opacity="0.1" stroke-opacity="0.1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="56" x2="56" y1="12" y2="8.1333">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#D2D2D7"/>
+</linearGradient>
+<circle cx="56" cy="10" fill="url(#SVGID_9_)" r="2"/>
+<path d="M56,9c0.931,0,1.706,0.639,1.929,1.5C57.971,10.34,58,10.174,58,10c0-1.104-0.896-2-2-2  s-2,0.896-2,2c0,0.174,0.029,0.34,0.071,0.5C54.294,9.639,55.069,9,56,9z" fill="#141419" fill-opacity="0.1" stroke-opacity="0.1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="63.0005" x2="63.0005" y1="6" y2="2.1333">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#D2D2D7"/>
+</linearGradient>
+<circle cx="63" cy="4" fill="url(#SVGID_10_)" r="2"/>
+<path d="M63,3c0.931,0,1.706,0.639,1.93,1.5C64.971,4.34,65,4.174,65,4c0-1.104-0.896-2-2-2  s-2,0.896-2,2c0,0.174,0.029,0.34,0.071,0.5C61.294,3.639,62.069,3,63,3z" fill="#141419" fill-opacity="0.1" stroke-opacity="0.1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="63.0005" x2="63.0005" y1="12" y2="8.1333">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#D2D2D7"/>
+</linearGradient>
+<circle cx="63" cy="10" fill="url(#SVGID_11_)" r="2"/>
+<path d="M63,9c0.931,0,1.706,0.639,1.93,1.5C64.971,10.34,65,10.174,65,10c0-1.104-0.896-2-2-2  s-2,0.896-2,2c0,0.174,0.029,0.34,0.071,0.5C61.294,9.639,62.069,9,63,9z" fill="#141419" fill-opacity="0.1" stroke-opacity="0.1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="70" x2="70" y1="6" y2="2.1333">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#D2D2D7"/>
+</linearGradient>
+<circle cx="70" cy="4" fill="url(#SVGID_12_)" r="2"/>
+<path d="M70,3c0.931,0,1.706,0.639,1.93,1.5C71.971,4.34,72,4.174,72,4c0-1.104-0.896-2-2-2  s-2,0.896-2,2c0,0.174,0.029,0.34,0.07,0.5C68.294,3.639,69.069,3,70,3z" fill="#141419" fill-opacity="0.1" stroke-opacity="0.1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="70" x2="70" y1="12" y2="8.1333">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#D2D2D7"/>
+</linearGradient>
+<circle cx="70" cy="10" fill="url(#SVGID_13_)" r="2"/>
+<path d="M70,9c0.931,0,1.706,0.639,1.93,1.5C71.971,10.34,72,10.174,72,10c0-1.104-0.896-2-2-2  s-2,0.896-2,2c0,0.174,0.029,0.34,0.07,0.5C68.294,9.639,69.069,9,70,9z" fill="#141419" fill-opacity="0.1" stroke-opacity="0.1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="77" x2="77" y1="6" y2="2.1333">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#D2D2D7"/>
+</linearGradient>
+<circle cx="77" cy="4" fill="url(#SVGID_14_)" r="2"/>
+<path d="M77,3c0.931,0,1.706,0.639,1.93,1.5C78.971,4.34,79,4.174,79,4c0-1.104-0.896-2-2-2  s-2,0.896-2,2c0,0.174,0.029,0.34,0.07,0.5C75.294,3.639,76.069,3,77,3z" fill="#141419" fill-opacity="0.1" stroke-opacity="0.1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="77" x2="77" y1="12" y2="8.1333">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#D2D2D7"/>
+</linearGradient>
+<circle cx="77" cy="10" fill="url(#SVGID_15_)" r="2"/>
+<path d="M77,9c0.931,0,1.706,0.639,1.93,1.5C78.971,10.34,79,10.174,79,10c0-1.104-0.896-2-2-2  s-2,0.896-2,2c0,0.174,0.029,0.34,0.07,0.5C75.294,9.639,76.069,9,77,9z" fill="#141419" fill-opacity="0.1" stroke-opacity="0.1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="84" x2="84" y1="6" y2="2.1333">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#D2D2D7"/>
+</linearGradient>
+<circle cx="84" cy="4" fill="url(#SVGID_16_)" r="2"/>
+<path d="M84,3c0.931,0,1.706,0.639,1.93,1.5C85.971,4.34,86,4.174,86,4c0-1.104-0.896-2-2-2  s-2,0.896-2,2c0,0.174,0.029,0.34,0.07,0.5C82.294,3.639,83.069,3,84,3z" fill="#141419" fill-opacity="0.1" stroke-opacity="0.1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="84" x2="84" y1="12" y2="8.1333">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#D2D2D7"/>
+</linearGradient>
+<circle cx="84" cy="10" fill="url(#SVGID_17_)" r="2"/>
+<path d="M84,9c0.931,0,1.706,0.639,1.93,1.5C85.971,10.34,86,10.174,86,10c0-1.104-0.896-2-2-2  s-2,0.896-2,2c0,0.174,0.029,0.34,0.07,0.5C82.294,9.639,83.069,9,84,9z" fill="#141419" fill-opacity="0.1" stroke-opacity="0.1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="91" x2="91" y1="6" y2="2.1333">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#D2D2D7"/>
+</linearGradient>
+<circle cx="91" cy="4" fill="url(#SVGID_18_)" r="2"/>
+<path d="M91,3c0.931,0,1.706,0.639,1.93,1.5C92.971,4.34,93,4.174,93,4c0-1.104-0.896-2-2-2  s-2,0.896-2,2c0,0.174,0.029,0.34,0.07,0.5C89.294,3.639,90.069,3,91,3z" fill="#141419" fill-opacity="0.1" stroke-opacity="0.1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="91" x2="91" y1="12" y2="8.1333">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#D2D2D7"/>
+</linearGradient>
+<circle cx="91" cy="10" fill="url(#SVGID_19_)" r="2"/>
+<path d="M91,9c0.931,0,1.706,0.639,1.93,1.5C92.971,10.34,93,10.174,93,10c0-1.104-0.896-2-2-2  s-2,0.896-2,2c0,0.174,0.029,0.34,0.07,0.5C89.294,9.639,90.069,9,91,9z" fill="#141419" fill-opacity="0.1" stroke-opacity="0.1"/>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_list_mask_b.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_list_mask_b.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="50px" height="50px" viewBox="0 0 50 50" enable-background="new 0 0 50 50" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="25.0005" y1="50" x2="25.0005" y2="-0.124">
-	<stop  offset="0" style="stop-color:#000000; stop-opacity:1.0"/>
-	<stop  offset="0.4" style="stop-color:#000000; stop-opacity:0.3"/>	
-	<stop  offset="1" style="stop-color:#000000; stop-opacity:0"/>
-</linearGradient>
-<rect fill="url(#SVGID_1_)" width="50" height="50"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_list_mask_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_list_mask_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="50px" height="50px" viewBox="0 0 50 50" enable-background="new 0 0 50 50" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="25.0005" y1="50" x2="25.0005" y2="-0.1245" gradientTransform="matrix(1.192488e-008 -1 -1 -1.192488e-008 50.0001 49.9999)">
-	<stop  offset="0" style="stop-color:#000000; stop-opacity:1.0"/>
-	<stop  offset="0.4" style="stop-color:#000000; stop-opacity:0.3"/>	
-	<stop  offset="1" style="stop-color:#000000; stop-opacity:0"/>
-</linearGradient>
-<rect fill="url(#SVGID_1_)" width="50" height="50"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_list_mask_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_list_mask_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="50px" height="50px" viewBox="0 0 50 50" enable-background="new 0 0 50 50" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="25.0005" y1="50" x2="25.0005" y2="-0.1245" gradientTransform="matrix(-1.187998e-008 -1 1 -1.187998e-008 -6.103516e-005 49.9999)">
-	<stop  offset="0" style="stop-color:#000000; stop-opacity:1.0"/>
-	<stop  offset="0.4" style="stop-color:#000000; stop-opacity:0.3"/>	
-	<stop  offset="1" style="stop-color:#000000; stop-opacity:0"/>
-</linearGradient>
-<rect fill="url(#SVGID_1_)" width="50" height="50"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_list_mask_t.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_list_mask_t.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="50px" height="50px" viewBox="0 0 50 50" enable-background="new 0 0 50 50" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="25.0005" y1="50" x2="25.0005" y2="-0.124">
-	<stop  offset="0" style="stop-color:#000000; stop-opacity:0"/>
-	<stop  offset="0.6" style="stop-color:#000000; stop-opacity:0.3"/>	
-	<stop  offset="1" style="stop-color:#000000; stop-opacity:1.0"/>
-</linearGradient>
-<rect fill="url(#SVGID_1_)" width="50" height="50"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_popup_separator.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_popup_separator.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="6px" height="6px" viewBox="0 0 6 6" enable-background="new 0 0 6 6" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="3.0005" y1="5.9468" x2="3.0005" y2="-0.0522">
-	<stop  offset="0.6" style="stop-color:#B2B2B2"/>
-	<stop  offset="1" style="stop-color:#808080"/>
-</linearGradient>
-<rect fill="url(#SVGID_1_)" width="6" height="6"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_progslider_handle_pause_normal.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_progslider_handle_pause_normal.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="30px" height="20px" viewBox="0 0 30 20" enable-background="new 0 0 30 20" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="-2187.52" y1="2095.5107" x2="-2187.52" y2="2078.0105" gradientTransform="matrix(1 0 0 -1 2202.52 2096.9805)">
-	<stop  offset="0" style="stop-color:#00B9FF"/>
-	<stop  offset="1" style="stop-color:#007DD5"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" d="M29,16c0,1.656-1.344,3-3,3H4c-1.657,0-3-1.344-3-3V4c0-1.656,1.343-3,3-3h22c1.656,0,3,1.344,3,3V16
-	z"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="14.9995" y1="1.834" x2="14.9995" y2="17.8344">
-	<stop  offset="0" style="stop-color:#8CE0FF"/>
-	<stop  offset="1" style="stop-color:#009CEF"/>
-</linearGradient>
-<path fill="url(#SVGID_2_)" enable-background="new    " d="M26,1H4C2.343,1,1,2.344,1,4v12c0,1.656,1.343,3,3,3h22
-	c1.656,0,3-1.344,3-3V4C29,2.344,27.656,1,26,1z M28,15.999C28,17.104,27.104,18,26,18H4.001C2.897,18,2,17.104,2,15.999V3.998
-	c0-1.102,0.897-1.999,2.001-1.999H26c1.104,0,2,0.897,2,1.999V15.999z"/>
-<rect fill="none" width="30" height="20"/>
-<rect x="10.799" y="5.799" fill="#FFFFFF" width="3.152" height="8.402"/>
-<rect x="16.049" y="5.799" fill="#FFFFFF" width="3.152" height="8.402"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_progslider_handle_pause_pressed.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_progslider_handle_pause_pressed.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="30px" height="20px" viewBox="0 0 30 20" enable-background="new 0 0 30 20" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="-2187.52" y1="2095.5107" x2="-2187.52" y2="2078.0105" gradientTransform="matrix(1 0 0 -1 2202.52 2096.9805)">
-	<stop  offset="0" style="stop-color:#8CE0FF"/>
-	<stop  offset="1" style="stop-color:#29ABE2"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" d="M29,16c0,1.656-1.344,3-3,3H4c-1.657,0-3-1.344-3-3V4c0-1.656,1.343-3,3-3h22c1.656,0,3,1.344,3,3V16
-	z"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="14.9995" y1="1.834" x2="14.9995" y2="17.8344">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="1" style="stop-color:#8CE0FF"/>
-</linearGradient>
-<path fill="url(#SVGID_2_)" enable-background="new    " d="M26,1H4C2.343,1,1,2.344,1,4v12c0,1.656,1.343,3,3,3h22
-	c1.656,0,3-1.344,3-3V4C29,2.344,27.656,1,26,1z M28,15.999C28,17.104,27.104,18,26,18H4.001C2.897,18,2,17.104,2,15.999V3.998
-	c0-1.102,0.897-1.999,2.001-1.999H26c1.104,0,2,0.897,2,1.999V15.999z"/>
-<rect fill="none" width="30" height="20"/>
-<rect x="10.799" y="5.799" fill="#FFFFFF" width="3.152" height="8.402"/>
-<rect x="16.049" y="5.799" fill="#FFFFFF" width="3.152" height="8.402"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_progslider_handle_play_normal.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_progslider_handle_play_normal.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="30px" height="20px" viewBox="0 0 30 20" enable-background="new 0 0 30 20" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="-2187.52" y1="2096.0107" x2="-2187.52" y2="2078.5105" gradientTransform="matrix(1 0 0 -1 2202.52 2097.4805)">
-	<stop  offset="0" style="stop-color:#00B9FF"/>
-	<stop  offset="1" style="stop-color:#007DD5"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" d="M29,16c0,1.656-1.344,3-3,3H4c-1.657,0-3-1.344-3-3V4c0-1.656,1.343-3,3-3h22c1.656,0,3,1.344,3,3V16
-	z"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="14.9995" y1="1.834" x2="14.9995" y2="17.8344">
-	<stop  offset="0" style="stop-color:#8CE0FF"/>
-	<stop  offset="1" style="stop-color:#009CEF"/>
-</linearGradient>
-<path fill="url(#SVGID_2_)" enable-background="new    " d="M26,1H4C2.343,1,1,2.344,1,4v12c0,1.656,1.343,3,3,3h22
-	c1.656,0,3-1.344,3-3V4C29,2.344,27.656,1,26,1z M28,15.999C28,17.104,27.104,18,26,18H4.001C2.897,18,2,17.104,2,15.999V3.998
-	c0-1.102,0.897-1.999,2.001-1.999H26c1.104,0,2,0.897,2,1.999V15.999z"/>
-<rect fill="none" width="30" height="20"/>
-<path fill="#FFFFFF" d="M11.649,4.75v10.5L20.049,10L11.649,4.75z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_progslider_handle_play_pressed.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_progslider_handle_play_pressed.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="30px" height="20px" viewBox="0 -0.25 30 20" enable-background="new 0 -0.25 30 20" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="-2187.52" y1="2095.5107" x2="-2187.52" y2="2078.0105" gradientTransform="matrix(1 0 0 -1 2202.52 2096.9805)">
-	<stop  offset="0" style="stop-color:#8CE0FF"/>
-	<stop  offset="1" style="stop-color:#29ABE2"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" d="M29,16c0,1.656-1.344,3-3,3H4c-1.656,0-3-1.344-3-3V4c0-1.656,1.344-3,3-3h22c1.656,0,3,1.344,3,3V16
-	z"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="14.9995" y1="1.834" x2="14.9995" y2="17.8344">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="1" style="stop-color:#8CE0FF"/>
-</linearGradient>
-<path fill="url(#SVGID_2_)" enable-background="new    " d="M26,1H4C2.344,1,1,2.344,1,4v12c0,1.656,1.344,3,3,3h22
-	c1.656,0,3-1.344,3-3V4C29,2.344,27.656,1,26,1z M28,15.999C28,17.104,27.104,18,26,18H4c-1.104,0-2-0.896-2-2.001V3.998
-	c0-1.102,0.896-1.999,2-1.999h22c1.104,0,2,0.897,2,1.999V15.999z"/>
-<rect fill="none" width="30" height="20"/>
-<path fill="#FFFFFF" d="M11.649,4.5V15l8.399-5.25L11.649,4.5z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_progslider_rated.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_progslider_rated.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="138px" height="21px" viewBox="0 0 138 21" enable-background="new 0 0 138 21" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="68.9995" y1="-0.0752" x2="68.9995" y2="20.9253">
-	<stop  offset="0" style="stop-color:#8CE0FF"/>
-	<stop  offset="1" style="stop-color:#29ABE2"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" d="M13.583,7.992L11,0L8.417,7.992H0l6.82,4.933l-2.619,7.999L11,15.961l6.799,4.963l-2.619-7.999
-	L22,7.992H13.583z M42.583,7.992L40,0l-2.583,7.992H29l6.82,4.933l-2.619,7.999L40,15.961l6.799,4.963l-2.619-7.999L51,7.992H42.583
-	z M71.583,7.992L69,0l-2.583,7.992H58l6.82,4.933l-2.619,7.999L69,15.961l6.799,4.963l-2.619-7.999L80,7.992H71.583z M100.583,7.992
-	L98,0l-2.583,7.992H87l6.82,4.933l-2.619,7.999L98,15.961l6.799,4.963l-2.619-7.999L109,7.992H100.583z M138,7.992h-8.417L127,0
-	l-2.583,7.992H116l6.82,4.933l-2.619,7.999L127,15.961l6.798,4.963l-2.617-7.999L138,7.992z"/>
-<rect fill="none" width="138" height="21"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_progslider_unrated.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_progslider_unrated.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="138px" height="21px" viewBox="0 0 138 21" enable-background="new 0 0 138 21" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="68.9995" y1="-0.0752" x2="68.9995" y2="20.9253">
-	<stop  offset="0" style="stop-color:#E6E6E6"/>
-	<stop  offset="1" style="stop-color:#B2B2B2"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" d="M13.583,7.992L11,0L8.417,7.992H0l6.82,4.933l-2.619,7.999L11,15.961l6.799,4.963l-2.619-7.999
-	L22,7.992H13.583z M42.583,7.992L40,0l-2.583,7.992H29l6.82,4.933l-2.619,7.999L40,15.961l6.799,4.963l-2.619-7.999L51,7.992H42.583
-	z M71.583,7.992L69,0l-2.583,7.992H58l6.82,4.933l-2.619,7.999L69,15.961l6.799,4.963l-2.619-7.999L80,7.992H71.583z M100.583,7.992
-	L98,0l-2.583,7.992H87l6.82,4.933l-2.619,7.999L98,15.961l6.799,4.963l-2.619-7.999L109,7.992H100.583z M138,7.992h-8.417L127,0
-	l-2.583,7.992H116l6.82,4.933l-2.619,7.999L127,15.961l6.798,4.963l-2.617-7.999L138,7.992z"/>
-<rect fill="none" width="138" height="21"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_screen_bg_lsc.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_screen_bg_lsc.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_screen_bg_lsc.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,235 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="640px" height="360px" viewBox="0 0 640 360" enable-background="new 0 0 640 360" xml:space="preserve">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="360px" version="1.1" viewBox="0 0 640 360" width="640px" 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="360" width="640"/>
 <defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="7.9336" y1="54.3247" x2="413.5938" y2="217.4871" gradientTransform="matrix(1.192488e-008 -1 1 1.192488e-008 140.0001 500.0001)">
-	<stop  offset="0" style="stop-color:#808080"/>
-	<stop  offset="0.2099" style="stop-color:#848484"/>
-	<stop  offset="0.4539" style="stop-color:#929292"/>
-	<stop  offset="0.7148" style="stop-color:#AAAAAA"/>
-	<stop  offset="0.9861" style="stop-color:#CACACA"/>
-	<stop  offset="1" style="stop-color:#CCCCCC"/>
-</linearGradient>
-<rect x="0.001" fill="url(#SVGID_1_)" width="639.681" height="360"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="320.0005" y1="267.5767" x2="320.0005" y2="-146.6588" gradientTransform="matrix(1.192488e-008 -1 1 1.192488e-008 140.0001 500.0001)">
-	<stop  offset="0" style="stop-color:#B2B2B2"/>
-	<stop  offset="1" style="stop-color:#4D4D4D"/>
-</linearGradient>
-<rect x="0.001" opacity="0.2" fill="url(#SVGID_2_)" width="639.681" height="360"/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="225.5308" y1="-155.0391" x2="460.4275" y2="407.7134" gradientTransform="matrix(1.192488e-008 -1 1 1.192488e-008 140.0001 500.0001)">
-	<stop  offset="0.2582" style="stop-color:#666666"/>
-	<stop  offset="0.5549" style="stop-color:#E6E6E6"/>
-	<stop  offset="1" style="stop-color:#F2F2F2"/>
-</linearGradient>
-<path fill="url(#SVGID_3_)" d="M639.682,46.103c0,0-107.884,163.236-344.264,201.342c-105.176,16.956-175.938,27.247-245.712,8.282
-	c-5.382-1.611-6.966-0.523-10.569,1.252c-4.108,2.023-11.862,5.446-22.293,5.446c-16.86,0-16.484-11.53-16.842-29.422
-	c-0.003-0.179,0-84.64,0-84.64s46.765,18.523,124.848-25.984C202.932,77.871,337.741,0,362.707,0c24.965,0,114.192,0,114.192,0
-	S489.361,75.774,639.682,46.103z"/>
-<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="234.873" y1="92.1318" x2="234.873" y2="499.9971" gradientTransform="matrix(1.192488e-008 -1 1 1.192488e-008 140.0001 500.0001)">
-	<stop  offset="0" style="stop-color:#F2F2F2"/>
-	<stop  offset="1" style="stop-color:#999999"/>
-</linearGradient>
-<path fill="url(#SVGID_4_)" d="M232.131,360c0,0,17.183-48.806,138.165-107.882c122.465-59.799,177.697-68.434,269.386-81.864
-	c0.708-0.104,0,189.746,0,189.746h-72.725c0,0-51.762-17.395-151.777-18.663C339.522,340.377,273.486,346.889,232.131,360z"/>
-<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="144.3105" y1="-151.5811" x2="393.8274" y2="317.5103" gradientTransform="matrix(1.192488e-008 -1 1 1.192488e-008 140.0001 500.0001)">
-	<stop  offset="0.5" style="stop-color:#808080"/>
-	<stop  offset="0.6541" style="stop-color:#AAAAAA"/>
-	<stop  offset="0.7981" style="stop-color:#CBCBCB"/>
-	<stop  offset="0.9183" style="stop-color:#DEDEDE"/>
-	<stop  offset="1" style="stop-color:#E6E6E6"/>
-</linearGradient>
-<path fill="url(#SVGID_5_)" d="M639.682,18.533c0,0-82.366,97.997-238.438,178.59C255.428,272.422,211.58,291.78,125.771,360H0.001
-	v-74.706c0,0,2.675-19.95,18.165-21.237c12.229-1.017,18.023,4.499,23.83,19.945c4.586,12.202,4.486,33.735,4.486,33.735
-	S248.035,233.808,367.076,156.9C477.179,85.77,579.709,0,579.709,0h59.973V18.533z"/>
-<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="184.4014" y1="-160.0723" x2="447.8064" y2="444.5632" gradientTransform="matrix(1.192488e-008 -1 1 1.192488e-008 140.0001 500.0001)">
-	<stop  offset="0" style="stop-color:#999999"/>
-	<stop  offset="0.0743" style="stop-color:#9E9E9E"/>
-	<stop  offset="0.6736" style="stop-color:#BFBFBF"/>
-	<stop  offset="1" style="stop-color:#CCCCCC"/>
-</linearGradient>
-<path opacity="0.9" fill="url(#SVGID_6_)" d="M0.001,312.161c0,0,128.36-22.646,197.894-36.892
-	c74.435-15.25,155.405-53.995,155.405-53.995l1.08,2.553c0,0,28.398-17.135,43.356-27c13.813-9.109,82.109-41.138,82.109-41.138
-	s-5.899-3.575-7.311-5.386c-0.476-0.61-0.919-1.596,0.454-2.467c0.45-0.286,4.911-2.856,5.578-3.281
-	c2.37-1.501,64.616-39.624,75.907-50.242c11.29-10.619,16.496-21.933,12.036-31.209c-4.336-9.02-12.863-16.278-12.863-16.278
-	s25.895-20.063,28.907-22.333c0.768-0.578,0.994-0.71,2.145-0.813c2.062-0.184,4.874,0.288,6.893,0.438
-	c0.313,0.023,0.577,0.249,0.345,0.594c-0.549,0.813-1.795,2.326-2.428,3.844c-0.657,1.577-0.83,3.641,3.571,3.297
-	c4.873-0.381,16.539-6.671,18.875-8.438c0.517-0.391,0.251-0.813-0.5-0.688c-0.822,0.137-8.013,0.992-9.822,1.141
-	c-5.325,0.438-6.936,0.463-8.662,0.375c-0.611-0.031-0.878-0.188-0.533-0.688c0.421-0.611,4.184-5.109,7.128-8.141
-	c1.437-1.479,5.284-5.611,7.08-7.688c0.297-0.344,0.058-0.689-0.549-0.281c-1.69,1.141-7.039,4.729-9.507,6.673
-	c-4.096,3.221-6.756,5.191-9.666,7.296c-2.225,1.609-2.802,2.258-4.119,1.922c-13.319-3.396-17.831-4.729-29.609-11.979
-	C546.389,7.168,547.682,0,547.682,0h-7.103c0,0,4.324,1.785,7.018,7.773c1.087,2.418-0.767,11.053-1.754,15.167
-	c-3.787,15.779-17.361,31.299-33.918,48.582c-22.55,23.54-40.928,39.434-45.989,53.874c-3.354,9.567,0.376,16.509,2.808,20.28
-	c1.499,2.325,2.914,3.114-0.958,5.688c-2.258,1.502-59.688,37.059-71.074,43.981c-11.388,6.922-40.976,24.367-40.976,24.367
-	s-0.856-2.064-0.912-2.164c-2.512-4.439-7.469-3.722-16.097-2.391c-21.786,3.361-113.102,31.521-140.08,38.86
-	c-30.325,8.25-74.685,17.25-103.506,13.5c-22.515-2.93-30.69-18.107-30.69-18.107s-27.674-6.757-64.45,3.541V312.161z"/>
-<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="485.1577" y1="-83.561" x2="342.2344" y2="123.7783" gradientTransform="matrix(1.192488e-008 -1 1 1.192488e-008 140.0001 500.0001)">
-	<stop  offset="0" style="stop-color:#808080"/>
-	<stop  offset="0.0278" style="stop-color:#898989"/>
-	<stop  offset="0.1595" style="stop-color:#ADADAD"/>
-	<stop  offset="0.2982" style="stop-color:#CBCBCB"/>
-	<stop  offset="0.4441" style="stop-color:#E2E2E2"/>
-	<stop  offset="0.6003" style="stop-color:#F2F2F2"/>
-	<stop  offset="0.7739" style="stop-color:#FCFCFC"/>
-	<stop  offset="1" style="stop-color:#FFFFFF"/>
-</linearGradient>
-<path opacity="0.8" fill="url(#SVGID_7_)" d="M163.56,117.521C104.542,151.045,0.001,204.52,0.001,204.52V0h59.202
-	c225.218,8.525,224.729,15.506,333.425,18.006C392.628,18.006,271.83,56.023,163.56,117.521z"/>
-<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="259.9189" y1="184.8765" x2="259.9189" y2="499.6821" gradientTransform="matrix(1.192488e-008 -1 1 1.192488e-008 140.0001 500.0001)">
-	<stop  offset="0" style="stop-color:#E6E6E6"/>
-	<stop  offset="1" style="stop-color:#808080"/>
-</linearGradient>
-<path fill="url(#SVGID_8_)" d="M324.935,359.997c-1.604-13.431,29.173-89.858,155.482-160.53
-	c125.61-70.28,159.265-79.305,159.265-79.305v210.095c0,0-57.319,7.674-130.733,2.559c-73.413-5.116-114.623-6.755-143.941-0.32
-	C332.95,339.53,324.972,360.314,324.935,359.997z"/>
-<path opacity="0.5" fill="#FFFFFF" d="M148.302,360l154.521-149.772c0,0,97.774-4.158,152.273-57.881
-	c39.507-38.943,55.975-88.186,64.761-117.998C527.868,7.166,537.165,0,537.165,0h35.908c0,0-31.416,15.801-37.188,18.039
-	s-9.159,2.527-11.223,14.71c-11.541,68.112-27.57,140.384-63.476,195.386c-43.353,66.413-109.184,100.457-109.184,100.457
-	S312.119,329.301,199.274,360H148.302z"/>
-<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="442.6968" y1="508.5093" x2="370.0065" y2="189.7106" gradientTransform="matrix(1.192488e-008 -1 1 1.192488e-008 140.0001 500.0001)">
-	<stop  offset="0" style="stop-color:#808080"/>
-	<stop  offset="0.0334" style="stop-color:#909090"/>
-	<stop  offset="0.1019" style="stop-color:#AAAAAA"/>
-	<stop  offset="0.1807" style="stop-color:#C0C0C0"/>
-	<stop  offset="0.2727" style="stop-color:#D1D1D1"/>
-	<stop  offset="0.3864" style="stop-color:#DDDDDD"/>
-	<stop  offset="0.546" style="stop-color:#E4E4E4"/>
-	<stop  offset="0.989" style="stop-color:#E6E6E6"/>
-</linearGradient>
-<path opacity="0.54" fill="url(#SVGID_9_)" d="M639.682,0H476.899c0.167,0.953,5.422,30.197,45.845,44.811
-	c-9.213,55.194-25.56,113.773-41.608,147.09c123.947-69.208,158.547-78.724,158.547-78.724V0z"/>
-<linearGradient id="SVGID_10_" gradientUnits="userSpaceOnUse" x1="108.7754" y1="379.9116" x2="237.9194" y2="163.0476" gradientTransform="matrix(1.192488e-008 -1 1 1.192488e-008 140.0001 500.0001)">
-	<stop  offset="0" style="stop-color:#666666"/>
-	<stop  offset="0.0471" style="stop-color:#747474"/>
-	<stop  offset="0.1426" style="stop-color:#8B8B8B"/>
-	<stop  offset="0.2533" style="stop-color:#9D9D9D"/>
-	<stop  offset="0.3868" style="stop-color:#A9A9A9"/>
-	<stop  offset="0.5663" style="stop-color:#B0B0B0"/>
-	<stop  offset="0.989" style="stop-color:#B2B2B2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="319.9995" x2="319.9995" y1="0" y2="360.0005">
+<stop offset="0" style="stop-color:#FAFAFA"/>
+<stop offset="1" style="stop-color:#E6E6F0"/>
 </linearGradient>
-<path opacity="0.2" fill="url(#SVGID_10_)" d="M426.017,226.544c-16.949,7.313-35.405,15.748-55.537,25.573
-	C249.438,311.194,232.246,360,232.246,360c23.962-7.594,56.379-12.968,93.979-15.965
-	C331.73,323.864,357.538,276.584,426.017,226.544z M639.682,322.469c0,0-57.031,7.674-130.481,2.559
-	c-73.449-5.117-114.68-6.755-144.013-0.32c-18.28,4.01-28.728,12.482-34.345,18.972c26.088-1.923,54.472-2.724,84.542-2.343
-	C515.451,342.605,566.958,360,566.958,360h72.725V322.469z"/>
-<linearGradient id="SVGID_11_" gradientUnits="userSpaceOnUse" x1="317.665" y1="229.7788" x2="306.9257" y2="270.784" gradientTransform="matrix(1.192488e-008 -1 1 1.192488e-008 140.0001 500.0001)">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="1" style="stop-color:#4D4D4D"/>
-</linearGradient>
-<path opacity="0.04" fill="url(#SVGID_11_)" d="M148.375,360l154.597-149.772c0,0,97.823-4.158,152.35-57.881
-	c39.526-38.943,56.002-88.186,64.792-117.998C528.128,7.166,537.43,0,537.43,0h35.926c0,0-31.432,15.801-37.206,18.039
-	c-5.773,2.238-9.163,2.527-11.228,14.71c-11.547,68.112-27.584,140.384-63.507,195.386
-	c-43.374,66.413-109.238,100.457-109.238,100.457S312.273,329.301,199.373,360H148.375z"/>
-<linearGradient id="SVGID_12_" gradientUnits="userSpaceOnUse" x1="140" y1="342.3599" x2="379.8394" y2="342.3599" gradientTransform="matrix(1.192488e-008 -1 1 1.192488e-008 140.0001 500.0001)">
-	<stop  offset="0" style="stop-color:#666666"/>
-	<stop  offset="0.0334" style="stop-color:#767676"/>
-	<stop  offset="0.1019" style="stop-color:#919191"/>
-	<stop  offset="0.1807" style="stop-color:#A7A7A7"/>
-	<stop  offset="0.2727" style="stop-color:#B8B8B8"/>
-	<stop  offset="0.3864" style="stop-color:#C3C3C3"/>
-	<stop  offset="0.546" style="stop-color:#CACACA"/>
-	<stop  offset="0.989" style="stop-color:#CCCCCC"/>
-</linearGradient>
-<path opacity="0.25" fill="url(#SVGID_12_)" d="M325.096,359.997c-1.604-13.431,29.187-89.858,155.558-160.53
-	c125.674-70.28,159.028-79.305,159.028-79.305v210.095c0,0-57.031,7.674-130.481,2.559c-73.449-5.116-114.68-6.755-144.013-0.32
-	C333.115,339.53,325.133,360.314,325.096,359.997z"/>
-<path opacity="0.19" fill="#FFFFFF" d="M0.001,312.161c0,0,128.424-22.646,197.992-36.892
-	c74.472-15.25,155.482-53.995,155.482-53.995l1.08,2.553c0,0,28.413-17.135,43.378-27c13.819-9.109,82.15-41.138,82.15-41.138
-	s-5.902-3.575-7.314-5.386c-0.476-0.61-0.919-1.596,0.455-2.467c0.449-0.286,4.913-2.856,5.58-3.281
-	c2.372-1.501,64.648-39.624,75.945-50.242c11.296-10.619,16.504-21.933,12.042-31.209c-4.338-9.02-12.87-16.278-12.87-16.278
-	s25.908-20.063,28.922-22.333c0.768-0.578,0.995-0.71,2.146-0.813c2.063-0.184,4.877,0.288,6.896,0.438
-	c0.313,0.023,0.577,0.249,0.345,0.594c-0.549,0.813-1.796,2.326-2.429,3.844c-0.658,1.577-0.831,3.641,3.572,3.297
-	c4.875-0.381,16.548-6.671,18.885-8.438c0.517-0.391,0.251-0.813-0.5-0.688c-0.823,0.137-8.017,0.992-9.827,1.141
-	c-5.328,0.438-6.939,0.463-8.667,0.375c-0.611-0.031-0.878-0.188-0.533-0.688c0.421-0.611,4.186-5.109,7.132-8.141
-	c1.437-1.479,5.285-5.611,7.083-7.688c0.297-0.344,0.058-0.689-0.549-0.281c-1.691,1.141-7.043,4.729-9.512,6.673
-	c-4.098,3.221-6.759,5.191-9.671,7.296c-2.226,1.609-2.804,2.258-4.121,1.922c-13.326-3.396-17.84-4.729-29.624-11.979
-	C546.66,7.168,547.953,0,547.953,0h-7.105c0,0,4.326,1.785,7.021,7.773c1.088,2.418-0.767,11.053-1.755,15.167
-	c-3.788,15.779-17.369,31.299-33.935,48.582c-22.561,23.54-40.947,39.434-46.012,53.874c-3.355,9.567,0.376,16.509,2.809,20.28
-	c1.5,2.325,2.916,3.114-0.958,5.688c-2.259,1.502-59.718,37.059-71.109,43.981c-11.394,6.922-40.996,24.367-40.996,24.367
-	s-0.856-2.064-0.912-2.164c-2.514-4.439-7.473-3.722-16.104-2.391c-21.796,3.361-113.158,31.521-140.149,38.86
-	c-30.341,8.25-74.722,17.25-103.558,13.5c-22.526-2.93-30.705-18.107-30.705-18.107s-27.688-6.757-64.481,3.541V312.161z"/>
-<linearGradient id="SVGID_13_" gradientUnits="userSpaceOnUse" x1="449.5337" y1="21.8091" x2="376.3511" y2="136.9056" gradientTransform="matrix(1.192488e-008 -1 1 1.192488e-008 140.0001 500.0001)">
-	<stop  offset="0" style="stop-color:#808080"/>
-	<stop  offset="1" style="stop-color:#CCCCCC"/>
-</linearGradient>
-<path opacity="0.37" fill="url(#SVGID_13_)" d="M639.682,46.103c0,0-108.506,163.236-344.264,201.342
-	c-104.899,16.956-176.121,27.247-245.712,8.282c-5.368-1.611-6.976-0.523-10.569,1.252c-4.097,2.023-11.889,5.446-22.293,5.446
-	c-16.816,0-16.485-11.53-16.842-29.422c-0.003-0.179,0-84.64,0-84.64s46.97,18.523,124.848-25.984
-	C202.727,77.871,337.807,0,362.707,0c24.9,0,114.192,0,114.192,0S489.757,75.774,639.682,46.103z"/>
-<linearGradient id="SVGID_14_" gradientUnits="userSpaceOnUse" x1="366.145" y1="229.1509" x2="640.6119" y2="678.278" gradientTransform="matrix(1.192488e-008 -1 1 1.192488e-008 140.0001 500.0001)">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="1" style="stop-color:#666666"/>
-</linearGradient>
-<path opacity="0.97" fill="url(#SVGID_14_)" d="M639.682,18.533c0,0-81.52,97.997-237.181,178.59
-	C257.07,272.422,211.354,291.78,125.771,360H0.001v-74.706c0,0,2.716-19.95,18.165-21.237c12.196-1.017,18.039,4.499,23.83,19.945
-	c4.574,12.202,4.486,33.735,4.486,33.735S248.348,233.808,367.076,156.9C476.889,85.77,579.709,0,579.709,0h59.973V18.533z"/>
-<path opacity="0.14" fill="#666666" d="M481.135,191.901c-20.622,11.568-38.974,23.872-54.766,35.447
-	c85.935-37.186,136.891-45.067,213.313-56.292v-57.88C639.682,113.177,606.416,121.621,481.135,191.901z"/>
-<linearGradient id="SVGID_15_" gradientUnits="userSpaceOnUse" x1="359.1479" y1="323.9536" x2="426.5731" y2="485.4869" gradientTransform="matrix(1.192488e-008 -1 1 1.192488e-008 140.0001 500.0001)">
-	<stop  offset="0" style="stop-color:#666666"/>
-	<stop  offset="0.1169" style="stop-color:#8D8D8D"/>
-	<stop  offset="0.2947" style="stop-color:#C4C4C4"/>
-	<stop  offset="0.4278" style="stop-color:#E5E5E5"/>
-	<stop  offset="0.5" style="stop-color:#F2F2F2"/>
-	<stop  offset="1" style="stop-color:#B2B2B2"/>
-</linearGradient>
-<path opacity="0.41" fill="url(#SVGID_15_)" d="M559.608,52.291c2.53,2.872,5.413,6.648,7.41,10.813
-	c4.448,9.276-0.744,20.59-12.005,31.209c-6.62,6.242-30.802,21.987-50.091,34.213c-4.932,17.558-10.638,34.73-17.413,51.13
-	C590.935,119.743,639.682,46.066,639.682,46.066C606.869,52.562,580.558,54,559.608,52.291z"/>
-<linearGradient id="SVGID_16_" gradientUnits="userSpaceOnUse" x1="479.8423" y1="409.5708" x2="454.8545" y2="299.9815" gradientTransform="matrix(1.192488e-008 -1 1 1.192488e-008 140.0001 500.0001)">
-	<stop  offset="0" style="stop-color:#999999"/>
-	<stop  offset="0.0506" style="stop-color:#AAAAAA"/>
-	<stop  offset="0.134" style="stop-color:#C0C0C0"/>
-	<stop  offset="0.2325" style="stop-color:#D1D1D1"/>
-	<stop  offset="0.3544" style="stop-color:#DDDDDD"/>
-	<stop  offset="0.5254" style="stop-color:#E4E4E4"/>
-	<stop  offset="1" style="stop-color:#E6E6E6"/>
-</linearGradient>
-<path opacity="0.24" fill="url(#SVGID_16_)" d="M546.404,22.94c0.985-4.114,2.834-12.749,1.75-15.167
-	C545.467,1.785,541.155,0,541.155,0h-64.256c0.167,0.953,5.912,30.197,46.208,44.811c-0.933,6.307-1.977,12.582-3.117,18.821
-	C533.038,49.439,543.209,36.283,546.404,22.94z"/>
-<linearGradient id="SVGID_17_" gradientUnits="userSpaceOnUse" x1="280.8638" y1="109.4741" x2="185.0135" y2="-63.256" gradientTransform="matrix(1.192488e-008 -1 1 1.192488e-008 140.0001 500.0001)">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="0.0693" style="stop-color:#EEEEEE"/>
-	<stop  offset="0.2924" style="stop-color:#BEBEBE"/>
-	<stop  offset="0.5041" style="stop-color:#989898"/>
-	<stop  offset="0.6986" style="stop-color:#7C7C7C"/>
-	<stop  offset="0.87" style="stop-color:#6C6C6C"/>
-	<stop  offset="1" style="stop-color:#666666"/>
-</linearGradient>
-<polygon opacity="0.5" fill="url(#SVGID_17_)" points="0.318,0 639.999,0 639.682,360 0.001,360 "/>
-<linearGradient id="SVGID_18_" gradientUnits="userSpaceOnUse" x1="500.9312" y1="-76.5669" x2="454.7408" y2="-3.9219" gradientTransform="matrix(1.192488e-008 -1 1 1.192488e-008 140.0001 500.0001)">
-	<stop  offset="0.3901" style="stop-color:#808080"/>
-	<stop  offset="0.7824" style="stop-color:#C4C4C4"/>
-	<stop  offset="1" style="stop-color:#E6E6E6"/>
-</linearGradient>
-<path opacity="0.5" fill="url(#SVGID_18_)" d="M0.001,148.094c0,0,46.97,18.793,124.848-25.715C202.727,77.871,337.807,0,362.707,0
-	H0.001V148.094z"/>
-<linearGradient id="SVGID_19_" gradientUnits="userSpaceOnUse" x1="485.1577" y1="-83.561" x2="342.2344" y2="123.7783" gradientTransform="matrix(1.192488e-008 -1 1 1.192488e-008 140.0001 500.0001)">
-	<stop  offset="0" style="stop-color:#B2B2B2"/>
-	<stop  offset="1" style="stop-color:#4D4D4D"/>
-</linearGradient>
-<path opacity="0.31" fill="url(#SVGID_19_)" d="M163.56,117.521C104.542,151.045,0.001,204.52,0.001,204.52V0h59.202
-	c225.218,8.525,224.729,15.506,333.425,18.006C392.628,18.006,271.83,56.023,163.56,117.521z"/>
-<linearGradient id="SVGID_20_" gradientUnits="userSpaceOnUse" x1="319.5732" y1="140.2192" x2="296.7632" y2="154.1037" gradientTransform="matrix(1.192488e-008 -1 1 1.192488e-008 140.0001 500.0001)">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="0.1743" style="stop-color:#FCFCFC"/>
-	<stop  offset="0.3249" style="stop-color:#F1F1F1"/>
-	<stop  offset="0.4668" style="stop-color:#DFDFDF"/>
-	<stop  offset="0.6033" style="stop-color:#C6C6C6"/>
-	<stop  offset="0.736" style="stop-color:#A6A6A6"/>
-	<stop  offset="0.8659" style="stop-color:#7E7E7E"/>
-	<stop  offset="0.9911" style="stop-color:#505050"/>
-	<stop  offset="1" style="stop-color:#4D4D4D"/>
-</linearGradient>
-<path opacity="0.18" fill="url(#SVGID_20_)" d="M124.849,122.379C46.96,166.888,0.021,148.363,0.021,148.363s-0.003,84.461,0,84.64
-	c0.357,17.892-1.271,29.701,15.547,29.701c10.405,0,18.447-3.702,22.545-5.726c3.594-1.775,5.188-2.863,10.557-1.253
-	c36.93,10.063,74.229,11.888,116.779,8.853c64.441-30.231,142.157-69.339,200.059-106.838C424.789,119.347,481.94,76.462,522,45.115
-	C480.307,30.354,475.298,0,475.298,0S387.61,0,362.707,0S202.738,77.872,124.849,122.379z"/>
-<rect x="0.001" opacity="0.5" fill="#FFFFFF" width="639.998" height="360"/>
+</defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_screen_bg_prt.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_screen_bg_prt.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_screen_bg_prt.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,235 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="360px" height="640px" viewBox="0 0 360 640" enable-background="new 0 0 360 640" xml:space="preserve">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="640px" version="1.1" viewBox="0 0 360 640" width="360px" 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="640" width="360"/>
 <defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="-132.0664" y1="194.3247" x2="273.5945" y2="357.4873">
-	<stop  offset="0" style="stop-color:#808080"/>
-	<stop  offset="0.2099" style="stop-color:#848484"/>
-	<stop  offset="0.4539" style="stop-color:#929292"/>
-	<stop  offset="0.7148" style="stop-color:#AAAAAA"/>
-	<stop  offset="0.9861" style="stop-color:#CACACA"/>
-	<stop  offset="1" style="stop-color:#CCCCCC"/>
-</linearGradient>
-<rect y="0.001" fill="url(#SVGID_1_)" width="360" height="639.681"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="180" y1="407.5771" x2="180" y2="-6.6583">
-	<stop  offset="0" style="stop-color:#B2B2B2"/>
-	<stop  offset="1" style="stop-color:#4D4D4D"/>
-</linearGradient>
-<rect y="0.001" opacity="0.2" fill="url(#SVGID_2_)" width="360" height="639.681"/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="85.5303" y1="-15.0386" x2="320.427" y2="547.7139">
-	<stop  offset="0.2582" style="stop-color:#666666"/>
-	<stop  offset="0.5549" style="stop-color:#E6E6E6"/>
-	<stop  offset="1" style="stop-color:#F2F2F2"/>
-</linearGradient>
-<path fill="url(#SVGID_3_)" d="M313.897,639.683c0,0-163.236-107.884-201.343-344.265C95.599,190.242,85.308,119.48,104.273,49.706
-	c1.611-5.382,0.523-6.966-1.252-10.569c-2.023-4.108-5.446-11.862-5.446-22.293c0-16.86,11.53-16.484,29.422-16.842
-	c0.179-0.003,84.641,0,84.641,0s-18.523,46.765,25.984,124.848C282.129,202.932,360,337.741,360,362.707
-	c0,24.965,0,114.192,0,114.192S284.226,489.361,313.897,639.683z"/>
-<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="94.8726" y1="232.1313" x2="94.8725" y2="639.9976">
-	<stop  offset="0" style="stop-color:#F2F2F2"/>
-	<stop  offset="1" style="stop-color:#999999"/>
-</linearGradient>
-<path fill="url(#SVGID_4_)" d="M0,232.131c0,0,48.806,17.183,107.882,138.166c59.799,122.465,68.434,177.697,81.864,269.386
-	c0.104,0.708-189.746,0-189.746,0v-72.725c0,0,17.395-51.762,18.664-151.777C19.623,339.522,13.111,273.486,0,232.131z"/>
-<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="4.3105" y1="-11.582" x2="253.8281" y2="457.5106">
-	<stop  offset="0.5" style="stop-color:#808080"/>
-	<stop  offset="0.6541" style="stop-color:#AAAAAA"/>
-	<stop  offset="0.7981" style="stop-color:#CBCBCB"/>
-	<stop  offset="0.9183" style="stop-color:#DEDEDE"/>
-	<stop  offset="1" style="stop-color:#E6E6E6"/>
-</linearGradient>
-<path fill="url(#SVGID_5_)" d="M341.467,639.683c0,0-97.997-82.366-178.59-238.438C87.578,255.428,68.22,211.58,0,125.771V0.001
-	h74.706c0,0,19.951,2.675,21.238,18.165c1.016,12.229-4.499,18.023-19.945,23.83c-12.202,4.586-33.735,4.486-33.735,4.486
-	S126.192,248.035,203.1,367.076C274.23,477.18,360,579.71,360,579.71v59.973H341.467z"/>
-<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="44.4014" y1="-20.0718" x2="307.8064" y2="584.5637">
-	<stop  offset="0" style="stop-color:#999999"/>
-	<stop  offset="0.0743" style="stop-color:#9E9E9E"/>
-	<stop  offset="0.6736" style="stop-color:#BFBFBF"/>
-	<stop  offset="1" style="stop-color:#CCCCCC"/>
-</linearGradient>
-<path opacity="0.9" fill="url(#SVGID_6_)" d="M47.839,0.001c0,0,22.646,128.36,36.892,197.894
-	c15.25,74.435,53.995,155.405,53.995,155.405l-2.553,1.08c0,0,17.135,28.398,27,43.356c9.109,13.813,41.139,82.109,41.139,82.109
-	s3.575-5.899,5.386-7.311c0.61-0.476,1.596-0.919,2.467,0.454c0.286,0.45,2.856,4.911,3.281,5.578
-	c1.501,2.37,39.624,64.616,50.242,75.907c10.619,11.29,21.933,16.496,31.209,12.036c9.02-4.336,16.278-12.863,16.278-12.863
-	s20.063,25.895,22.333,28.907c0.578,0.768,0.71,0.994,0.813,2.145c0.184,2.062-0.288,4.874-0.438,6.893
-	c-0.023,0.313-0.249,0.577-0.594,0.345c-0.813-0.549-2.326-1.795-3.844-2.428c-1.577-0.657-3.641-0.83-3.297,3.571
-	c0.381,4.873,6.671,16.539,8.438,18.875c0.391,0.517,0.813,0.251,0.688-0.5c-0.137-0.822-0.992-8.013-1.141-9.822
-	c-0.438-5.325-0.463-6.936-0.375-8.662c0.031-0.611,0.188-0.878,0.688-0.533c0.611,0.421,5.109,4.184,8.141,7.128
-	c1.479,1.437,5.611,5.284,7.688,7.08c0.344,0.297,0.689,0.058,0.281-0.549c-1.141-1.69-4.729-7.039-6.673-9.507
-	c-3.221-4.096-5.191-6.756-7.296-9.666c-1.609-2.225-2.258-2.802-1.922-4.119c3.396-13.319,4.729-17.831,11.979-29.609
-	c4.188-6.807,11.356-5.514,11.356-5.514v-7.103c0,0-1.785,4.324-7.773,7.018c-2.418,1.087-11.053-0.767-15.167-1.754
-	c-15.779-3.787-31.299-17.361-48.582-33.918c-23.54-22.55-39.434-40.928-53.874-45.989c-9.567-3.354-16.509,0.376-20.28,2.808
-	c-2.325,1.499-3.114,2.914-5.688-0.958c-1.502-2.258-37.06-59.688-43.981-71.074c-6.922-11.388-24.367-40.976-24.367-40.976
-	s2.064-0.856,2.164-0.912c4.439-2.512,3.722-7.469,2.391-16.097c-3.361-21.786-31.521-113.103-38.86-140.081
-	c-8.25-30.325-17.25-74.685-13.5-103.506c2.929-22.515,18.107-30.69,18.107-30.69s6.757-27.674-3.541-64.45H47.839z"/>
-<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="345.1563" y1="56.4385" x2="202.2328" y2="263.778">
-	<stop  offset="0" style="stop-color:#808080"/>
-	<stop  offset="0.0278" style="stop-color:#898989"/>
-	<stop  offset="0.1595" style="stop-color:#ADADAD"/>
-	<stop  offset="0.2982" style="stop-color:#CBCBCB"/>
-	<stop  offset="0.4441" style="stop-color:#E2E2E2"/>
-	<stop  offset="0.6003" style="stop-color:#F2F2F2"/>
-	<stop  offset="0.7739" style="stop-color:#FCFCFC"/>
-	<stop  offset="1" style="stop-color:#FFFFFF"/>
-</linearGradient>
-<path opacity="0.8" fill="url(#SVGID_7_)" d="M242.479,163.56C208.955,104.542,155.479,0.001,155.479,0.001H360v59.202
-	c-8.525,225.218-15.506,224.729-18.006,333.425C341.994,392.629,303.977,271.83,242.479,163.56z"/>
-<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="119.9194" y1="324.877" x2="119.9194" y2="639.6826">
-	<stop  offset="0" style="stop-color:#E6E6E6"/>
-	<stop  offset="1" style="stop-color:#808080"/>
-</linearGradient>
-<path fill="url(#SVGID_8_)" d="M0.003,324.936c13.43-1.604,89.858,29.173,160.53,155.482
-	c70.28,125.61,79.306,159.265,79.306,159.265H29.743c0,0-7.673-57.319-2.559-130.733c5.117-73.413,6.755-114.623,0.32-143.941
-	C20.47,332.95-0.314,324.973,0.003,324.936z"/>
-<path opacity="0.5" fill="#FFFFFF" d="M0,148.302l149.772,154.521c0,0,4.158,97.775,57.882,152.274
-	c38.943,39.507,88.186,55.975,117.998,64.761C352.834,527.868,360,537.165,360,537.165v35.908c0,0-15.801-31.416-18.039-37.188
-	s-2.527-9.159-14.71-11.223c-68.112-11.541-140.384-27.57-195.386-63.476C65.452,417.835,31.408,352.004,31.408,352.004
-	S30.699,312.119,0,199.274V148.302z"/>
-<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="302.6963" y1="648.5098" x2="230.006" y2="329.711">
-	<stop  offset="0" style="stop-color:#808080"/>
-	<stop  offset="0.0334" style="stop-color:#909090"/>
-	<stop  offset="0.1019" style="stop-color:#AAAAAA"/>
-	<stop  offset="0.1807" style="stop-color:#C0C0C0"/>
-	<stop  offset="0.2727" style="stop-color:#D1D1D1"/>
-	<stop  offset="0.3864" style="stop-color:#DDDDDD"/>
-	<stop  offset="0.546" style="stop-color:#E4E4E4"/>
-	<stop  offset="0.989" style="stop-color:#E6E6E6"/>
-</linearGradient>
-<path opacity="0.54" fill="url(#SVGID_9_)" d="M360,639.683V476.899c-0.953,0.167-30.197,5.422-44.811,45.845
-	c-55.194-9.213-113.773-25.56-147.09-41.608c69.208,123.947,78.724,158.547,78.724,158.547H360z"/>
-<linearGradient id="SVGID_10_" gradientUnits="userSpaceOnUse" x1="-31.2251" y1="519.9121" x2="97.9191" y2="303.0478">
-	<stop  offset="0" style="stop-color:#666666"/>
-	<stop  offset="0.0471" style="stop-color:#747474"/>
-	<stop  offset="0.1426" style="stop-color:#8B8B8B"/>
-	<stop  offset="0.2533" style="stop-color:#9D9D9D"/>
-	<stop  offset="0.3868" style="stop-color:#A9A9A9"/>
-	<stop  offset="0.5663" style="stop-color:#B0B0B0"/>
-	<stop  offset="0.989" style="stop-color:#B2B2B2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="179.9995" x2="179.9995" y1="0" y2="640.0005">
+<stop offset="0" style="stop-color:#FAFAFA"/>
+<stop offset="1" style="stop-color:#E6E6F0"/>
 </linearGradient>
-<path opacity="0.2" fill="url(#SVGID_10_)" d="M133.455,426.018c-7.312-16.949-15.748-35.405-25.573-55.537
-	C48.806,249.438,0,232.246,0,232.246c7.594,23.962,12.968,56.379,15.965,93.979C36.136,331.73,83.416,357.538,133.455,426.018z
-	 M37.531,639.683c0,0-7.674-57.031-2.559-130.481c5.117-73.449,6.755-114.68,0.32-144.013c-4.01-18.28-12.482-28.728-18.972-34.345
-	c1.923,26.088,2.724,54.472,2.343,84.542C17.395,515.451,0,566.958,0,566.958v72.725H37.531z"/>
-<linearGradient id="SVGID_11_" gradientUnits="userSpaceOnUse" x1="177.6655" y1="369.7793" x2="166.9262" y2="410.7846">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="1" style="stop-color:#4D4D4D"/>
-</linearGradient>
-<path opacity="0.04" fill="url(#SVGID_11_)" d="M0,148.375l149.772,154.597c0,0,4.158,97.824,57.882,152.35
-	c38.943,39.526,88.186,56.002,117.998,64.792C352.834,528.129,360,537.431,360,537.431v35.926c0,0-15.801-31.432-18.039-37.206
-	c-2.238-5.773-2.527-9.163-14.71-11.228c-68.112-11.547-140.384-27.584-195.386-63.507
-	C65.452,418.042,31.408,352.178,31.408,352.178S30.699,312.273,0,199.373V148.375z"/>
-<linearGradient id="SVGID_12_" gradientUnits="userSpaceOnUse" x1="0" y1="482.3604" x2="239.8389" y2="482.3604">
-	<stop  offset="0" style="stop-color:#666666"/>
-	<stop  offset="0.0334" style="stop-color:#767676"/>
-	<stop  offset="0.1019" style="stop-color:#919191"/>
-	<stop  offset="0.1807" style="stop-color:#A7A7A7"/>
-	<stop  offset="0.2727" style="stop-color:#B8B8B8"/>
-	<stop  offset="0.3864" style="stop-color:#C3C3C3"/>
-	<stop  offset="0.546" style="stop-color:#CACACA"/>
-	<stop  offset="0.989" style="stop-color:#CCCCCC"/>
-</linearGradient>
-<path opacity="0.25" fill="url(#SVGID_12_)" d="M0.003,325.097c13.43-1.604,89.858,29.187,160.53,155.558
-	c70.28,125.674,79.306,159.028,79.306,159.028H29.743c0,0-7.673-57.031-2.559-130.481c5.117-73.449,6.755-114.68,0.32-144.013
-	C20.47,333.115-0.314,325.134,0.003,325.097z"/>
-<path opacity="0.19" fill="#FFFFFF" d="M47.839,0.001c0,0,22.646,128.424,36.892,197.992
-	c15.25,74.472,53.995,155.482,53.995,155.482l-2.553,1.08c0,0,17.135,28.413,27,43.378c9.109,13.819,41.139,82.15,41.139,82.15
-	s3.575-5.902,5.386-7.314c0.61-0.476,1.596-0.919,2.467,0.455c0.286,0.449,2.856,4.913,3.281,5.58
-	c1.501,2.372,39.624,64.648,50.242,75.945c10.619,11.296,21.933,16.504,31.209,12.042c9.02-4.338,16.278-12.87,16.278-12.87
-	s20.063,25.908,22.333,28.922c0.578,0.768,0.71,0.995,0.813,2.146c0.184,2.063-0.288,4.877-0.438,6.896
-	c-0.023,0.313-0.249,0.577-0.594,0.345c-0.813-0.549-2.326-1.796-3.844-2.429c-1.577-0.658-3.641-0.831-3.297,3.572
-	c0.381,4.875,6.671,16.548,8.438,18.885c0.391,0.517,0.813,0.251,0.688-0.5c-0.137-0.823-0.992-8.017-1.141-9.827
-	c-0.438-5.328-0.463-6.939-0.375-8.667c0.031-0.611,0.188-0.878,0.688-0.533c0.611,0.421,5.109,4.186,8.141,7.132
-	c1.479,1.437,5.611,5.285,7.688,7.083c0.344,0.297,0.689,0.058,0.281-0.549c-1.141-1.691-4.729-7.043-6.673-9.512
-	c-3.221-4.098-5.191-6.759-7.296-9.671c-1.609-2.226-2.258-2.804-1.922-4.121c3.396-13.326,4.729-17.84,11.979-29.624
-	c4.188-6.81,11.356-5.517,11.356-5.517v-7.105c0,0-1.785,4.326-7.773,7.021c-2.418,1.088-11.053-0.767-15.167-1.755
-	c-15.779-3.788-31.299-17.369-48.582-33.935c-23.54-22.561-39.434-40.947-53.874-46.012c-9.567-3.355-16.509,0.376-20.28,2.809
-	c-2.325,1.5-3.114,2.916-5.688-0.958c-1.502-2.259-37.06-59.718-43.981-71.109c-6.922-11.394-24.367-40.996-24.367-40.996
-	s2.064-0.856,2.164-0.912c4.439-2.514,3.722-7.473,2.391-16.104c-3.361-21.797-31.521-113.159-38.86-140.15
-	c-8.25-30.341-17.25-74.722-13.5-103.558c2.929-22.526,18.107-30.705,18.107-30.705s6.757-27.688-3.541-64.481H47.839z"/>
-<linearGradient id="SVGID_13_" gradientUnits="userSpaceOnUse" x1="309.5332" y1="161.8081" x2="236.3506" y2="276.9047">
-	<stop  offset="0" style="stop-color:#808080"/>
-	<stop  offset="1" style="stop-color:#CCCCCC"/>
-</linearGradient>
-<path opacity="0.37" fill="url(#SVGID_13_)" d="M313.897,639.683c0,0-163.236-108.506-201.343-344.265
-	c-16.956-104.899-27.247-176.121-8.282-245.712c1.611-5.368,0.523-6.976-1.252-10.569c-2.023-4.097-5.446-11.889-5.446-22.293
-	c0-16.816,11.53-16.485,29.422-16.842c0.179-0.003,84.641,0,84.641,0s-18.523,46.97,25.984,124.848
-	C282.129,202.727,360,337.808,360,362.707c0,24.9,0,114.192,0,114.192S284.226,489.758,313.897,639.683z"/>
-<linearGradient id="SVGID_14_" gradientUnits="userSpaceOnUse" x1="226.1445" y1="369.1504" x2="500.6118" y2="818.2781">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="1" style="stop-color:#666666"/>
-</linearGradient>
-<path opacity="0.97" fill="url(#SVGID_14_)" d="M341.467,639.683c0,0-97.997-81.52-178.59-237.181
-	C87.578,257.07,68.22,211.354,0,125.771V0.001h74.706c0,0,19.951,2.716,21.238,18.165c1.016,12.196-4.499,18.039-19.945,23.83
-	c-12.202,4.574-33.735,4.486-33.735,4.486S126.192,248.348,203.1,367.076C274.23,476.89,360,579.71,360,579.71v59.973H341.467z"/>
-<path opacity="0.14" fill="#666666" d="M168.099,481.136c-11.569-20.622-23.872-38.974-35.447-54.766
-	c37.185,85.935,45.067,136.891,56.292,213.313h57.88C246.823,639.683,238.379,606.416,168.099,481.136z"/>
-<linearGradient id="SVGID_15_" gradientUnits="userSpaceOnUse" x1="219.1475" y1="463.9541" x2="286.5726" y2="625.4874">
-	<stop  offset="0" style="stop-color:#666666"/>
-	<stop  offset="0.1169" style="stop-color:#8D8D8D"/>
-	<stop  offset="0.2947" style="stop-color:#C4C4C4"/>
-	<stop  offset="0.4278" style="stop-color:#E5E5E5"/>
-	<stop  offset="0.5" style="stop-color:#F2F2F2"/>
-	<stop  offset="1" style="stop-color:#B2B2B2"/>
-</linearGradient>
-<path opacity="0.41" fill="url(#SVGID_15_)" d="M307.709,559.608c-2.872,2.53-6.648,5.413-10.813,7.41
-	c-9.276,4.448-20.59-0.744-31.209-12.005c-6.242-6.62-21.987-30.802-34.213-50.091c-17.558-4.932-34.73-10.638-51.13-17.413
-	c59.912,103.426,133.589,152.173,133.589,152.173C307.438,606.869,306,580.559,307.709,559.608z"/>
-<linearGradient id="SVGID_16_" gradientUnits="userSpaceOnUse" x1="339.8418" y1="549.5713" x2="314.854" y2="439.982">
-	<stop  offset="0" style="stop-color:#999999"/>
-	<stop  offset="0.0506" style="stop-color:#AAAAAA"/>
-	<stop  offset="0.134" style="stop-color:#C0C0C0"/>
-	<stop  offset="0.2325" style="stop-color:#D1D1D1"/>
-	<stop  offset="0.3544" style="stop-color:#DDDDDD"/>
-	<stop  offset="0.5254" style="stop-color:#E4E4E4"/>
-	<stop  offset="1" style="stop-color:#E6E6E6"/>
-</linearGradient>
-<path opacity="0.24" fill="url(#SVGID_16_)" d="M337.06,546.404c4.114,0.985,12.749,2.834,15.167,1.75
-	c5.988-2.687,7.773-6.999,7.773-6.999v-64.256c-0.953,0.167-30.197,5.912-44.811,46.208c-6.307-0.933-12.582-1.977-18.821-3.117
-	C310.561,533.038,323.717,543.21,337.06,546.404z"/>
-<linearGradient id="SVGID_17_" gradientUnits="userSpaceOnUse" x1="140.8643" y1="249.4741" x2="45.014" y2="76.744">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="0.0693" style="stop-color:#EEEEEE"/>
-	<stop  offset="0.2924" style="stop-color:#BEBEBE"/>
-	<stop  offset="0.5041" style="stop-color:#989898"/>
-	<stop  offset="0.6986" style="stop-color:#7C7C7C"/>
-	<stop  offset="0.87" style="stop-color:#6C6C6C"/>
-	<stop  offset="1" style="stop-color:#666666"/>
-</linearGradient>
-<polygon opacity="0.5" fill="url(#SVGID_17_)" points="360,0.318 360,639.999 0,639.683 0,0.001 "/>
-<linearGradient id="SVGID_18_" gradientUnits="userSpaceOnUse" x1="360.9316" y1="63.4326" x2="314.7413" y2="136.0776">
-	<stop  offset="0.3901" style="stop-color:#808080"/>
-	<stop  offset="0.7824" style="stop-color:#C4C4C4"/>
-	<stop  offset="1" style="stop-color:#E6E6E6"/>
-</linearGradient>
-<path opacity="0.5" fill="url(#SVGID_18_)" d="M211.906,0.001c0,0-18.793,46.97,25.715,124.848
-	C282.129,202.727,360,337.808,360,362.707V0.001H211.906z"/>
-<linearGradient id="SVGID_19_" gradientUnits="userSpaceOnUse" x1="345.1563" y1="56.4385" x2="202.2328" y2="263.778">
-	<stop  offset="0" style="stop-color:#B2B2B2"/>
-	<stop  offset="1" style="stop-color:#4D4D4D"/>
-</linearGradient>
-<path opacity="0.31" fill="url(#SVGID_19_)" d="M242.479,163.56C208.955,104.542,155.479,0.001,155.479,0.001H360v59.202
-	c-8.525,225.218-15.506,224.729-18.006,333.425C341.994,392.629,303.977,271.83,242.479,163.56z"/>
-<linearGradient id="SVGID_20_" gradientUnits="userSpaceOnUse" x1="179.5737" y1="280.2192" x2="156.7636" y2="294.1037">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="0.1743" style="stop-color:#FCFCFC"/>
-	<stop  offset="0.3249" style="stop-color:#F1F1F1"/>
-	<stop  offset="0.4668" style="stop-color:#DFDFDF"/>
-	<stop  offset="0.6033" style="stop-color:#C6C6C6"/>
-	<stop  offset="0.736" style="stop-color:#A6A6A6"/>
-	<stop  offset="0.8659" style="stop-color:#7E7E7E"/>
-	<stop  offset="0.9911" style="stop-color:#505050"/>
-	<stop  offset="1" style="stop-color:#4D4D4D"/>
-</linearGradient>
-<path opacity="0.18" fill="url(#SVGID_20_)" d="M237.621,124.849C193.112,46.96,211.637,0.021,211.637,0.021s-84.461-0.003-84.64,0
-	c-17.892,0.357-29.701-1.271-29.701,15.547c0,10.405,3.702,18.447,5.726,22.545c1.775,3.594,2.863,5.188,1.252,10.557
-	c-10.063,36.93-11.888,74.229-8.853,116.779c30.232,64.441,69.339,142.157,106.839,200.06
-	C240.653,424.789,283.538,481.94,314.885,522C329.646,480.308,360,475.299,360,475.299s0-87.688,0-112.592
-	S282.128,202.738,237.621,124.849z"/>
-<rect y="0.001" opacity="0.5" fill="#FFFFFF" width="360" height="639.999"/>
+</defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_signal_bg.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_signal_bg.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_signal_bg.svg	Mon May 03 12:48:33 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="15px" version="1.1" viewBox="0 0 30 15" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<rect fill="#BEBEBE" height="3" width="4" x="1" y="6"/>
-<rect fill="#BEBEBE" height="6" width="4" x="7" y="4.5"/>
-<rect fill="#BEBEBE" height="9" width="4" x="13" y="3"/>
-<rect fill="#BEBEBE" height="12" width="4" x="19" y="1.5"/>
-<rect fill="#BEBEBE" height="15" width="4" x="25"/>
-<rect fill="none" height="15" width="30"/>
+<svg baseProfile="tiny" height="15px" version="1.1" viewBox="0 1.524 30 15" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M24.5,15.524c-0.825,0-1.5-0.675-1.5-1.5v-10c0-0.825,0.675-1.5,1.5-1.5l0,0c0.825,0,1.5,0.675,1.5,1.5v10  C26,14.85,25.325,15.524,24.5,15.524L24.5,15.524z" fill="#BEBEBE"/>
+<path d="M19.5,15.024c-0.825,0-1.5-0.675-1.5-1.5v-9c0-0.825,0.675-1.5,1.5-1.5l0,0c0.825,0,1.5,0.675,1.5,1.5v9  C21,14.35,20.325,15.024,19.5,15.024L19.5,15.024z" fill="#BEBEBE"/>
+<path d="M14.5,14.524c-0.825,0-1.5-0.675-1.5-1.5v-8c0-0.825,0.675-1.5,1.5-1.5l0,0c0.825,0,1.5,0.675,1.5,1.5v8  C16,13.85,15.325,14.524,14.5,14.524L14.5,14.524z" fill="#BEBEBE"/>
+<path d="M9.5,14.024c-0.825,0-1.5-0.675-1.5-1.5v-7c0-0.825,0.675-1.5,1.5-1.5l0,0c0.825,0,1.5,0.675,1.5,1.5v7  C11,13.35,10.325,14.024,9.5,14.024L9.5,14.024z" fill="#BEBEBE"/>
+<path d="M4.5,13.524c-0.825,0-1.5-0.675-1.5-1.5v-6c0-0.825,0.675-1.5,1.5-1.5l0,0c0.825,0,1.5,0.675,1.5,1.5v6  C6,12.85,5.325,13.524,4.5,13.524L4.5,13.524z" fill="#BEBEBE"/>
+<rect fill="none" height="15" width="30" y="1.524"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_signal_full.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_signal_full.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_signal_full.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,22 +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="15px" version="1.1" viewBox="0 0 30 15" width="30px" 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="3" width="4" x="1" y="6"/>
-<rect fill="url(#SVGID_1_)" height="6" width="4" x="7" y="4.5"/>
-<rect fill="url(#SVGID_3_)" height="9" width="4" x="13" y="3"/>
-<rect fill="url(#SVGID_1_)" height="12" width="4" x="19" y="1.5"/>
-<rect fill="url(#SVGID_3_)" height="15" width="4" x="25"/>
+<path d="M24.5,14c-0.825,0-1.5-0.675-1.5-1.5v-10C23,1.675,23.675,1,24.5,1l0,0C25.325,1,26,1.675,26,2.5v10  C26,13.325,25.325,14,24.5,14L24.5,14z" fill="#01EEFF"/>
+<path d="M19.5,13.5c-0.825,0-1.5-0.675-1.5-1.5V3c0-0.825,0.675-1.5,1.5-1.5l0,0C20.325,1.5,21,2.175,21,3v9  C21,12.825,20.325,13.5,19.5,13.5L19.5,13.5z" fill="#01EEFF"/>
+<path d="M14.5,13c-0.825,0-1.5-0.675-1.5-1.5v-8C13,2.675,13.675,2,14.5,2l0,0C15.325,2,16,2.675,16,3.5v8  C16,12.325,15.325,13,14.5,13L14.5,13z" fill="#01EEFF"/>
+<path d="M9.5,12.5C8.675,12.5,8,11.825,8,11V4c0-0.825,0.675-1.5,1.5-1.5l0,0C10.325,2.5,11,3.175,11,4v7  C11,11.825,10.325,12.5,9.5,12.5L9.5,12.5z" fill="#01EEFF"/>
+<path d="M4.5,12C3.675,12,3,11.325,3,10.5v-6C3,3.675,3.675,3,4.5,3l0,0C5.325,3,6,3.675,6,4.5v6  C6,11.325,5.325,12,4.5,12L4.5,12z" fill="#01EEFF"/>
 <rect fill="none" height="15" width="30"/>
-<defs>
-<linearGradient gradientTransform="matrix(0 1 -1 0 -1287.5 291.5005)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-284.001" x2="-284.001" y1="-1316.4995" y2="-1288.578">
-<stop offset="0" style="stop-color:#47DAFA"/>
-<stop offset="1" style="stop-color:#0070FA"/>
-</linearGradient>
-</defs>
-<defs>
-<linearGradient gradientTransform="matrix(0 1 -1 0 -1287.5 291.5005)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-284.001" x2="-284.001" y1="-1316.4995" y2="-1288.578">
-<stop offset="0" style="stop-color:#47DAFA"/>
-<stop offset="1" style="stop-color:#0070FA"/>
-</linearGradient>
-</defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_signal_low.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_signal_low.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_signal_low.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,22 +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="15px" version="1.1" viewBox="0 0 30 15" width="30px" 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="3" width="4" x="1" y="6"/>
-<rect fill="url(#SVGID_1_)" height="6" width="4" x="7" y="4.5"/>
-<rect fill="url(#SVGID_3_)" height="9" width="4" x="13" y="3"/>
-<rect fill="url(#SVGID_1_)" height="12" width="4" x="19" y="1.5"/>
-<rect fill="url(#SVGID_3_)" height="15" width="4" x="25"/>
+<path d="M24.5,14c-0.825,0-1.5-0.675-1.5-1.5v-10C23,1.675,23.675,1,24.5,1l0,0C25.325,1,26,1.675,26,2.5v10  C26,13.325,25.325,14,24.5,14L24.5,14z" fill="#E34D15"/>
+<path d="M19.5,13.5c-0.825,0-1.5-0.675-1.5-1.5V3c0-0.825,0.675-1.5,1.5-1.5l0,0C20.325,1.5,21,2.175,21,3v9  C21,12.825,20.325,13.5,19.5,13.5L19.5,13.5z" fill="#E34D15"/>
+<path d="M14.5,13c-0.825,0-1.5-0.675-1.5-1.5v-8C13,2.675,13.675,2,14.5,2l0,0C15.325,2,16,2.675,16,3.5v8  C16,12.325,15.325,13,14.5,13L14.5,13z" fill="#E34D15"/>
+<path d="M9.5,12.5C8.675,12.5,8,11.825,8,11V4c0-0.825,0.675-1.5,1.5-1.5l0,0C10.325,2.5,11,3.175,11,4v7  C11,11.825,10.325,12.5,9.5,12.5L9.5,12.5z" fill="#E34D15"/>
+<path d="M4.5,12C3.675,12,3,11.325,3,10.5v-6C3,3.675,3.675,3,4.5,3l0,0C5.325,3,6,3.675,6,4.5v6  C6,11.325,5.325,12,4.5,12L4.5,12z" fill="#E34D15"/>
 <rect fill="none" height="15" width="30"/>
-<defs>
-<linearGradient gradientTransform="matrix(0 1 -1 0 253 659.0005)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-651.501" x2="-651.501" y1="223.834" y2="251.8419">
-<stop offset="0" style="stop-color:#FA772B"/>
-<stop offset="1" style="stop-color:#CC2500"/>
-</linearGradient>
-</defs>
-<defs>
-<linearGradient gradientTransform="matrix(0 1 -1 0 253 659.0005)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-651.501" x2="-651.501" y1="223.834" y2="251.8419">
-<stop offset="0" style="stop-color:#FA772B"/>
-<stop offset="1" style="stop-color:#CC2500"/>
-</linearGradient>
-</defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_signal_medium.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_signal_medium.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_signal_medium.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,22 +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="15px" version="1.1" viewBox="0 0 30 15" width="30px" 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="3" width="4" x="1" y="6"/>
-<rect fill="url(#SVGID_1_)" height="6" width="4" x="7" y="4.5"/>
-<rect fill="url(#SVGID_3_)" height="9" width="4" x="13" y="3"/>
-<rect fill="url(#SVGID_1_)" height="12" width="4" x="19" y="1.5"/>
-<rect fill="url(#SVGID_3_)" height="15" width="4" x="25"/>
+<path d="M24.5,14c-0.825,0-1.5-0.675-1.5-1.5v-10C23,1.675,23.675,1,24.5,1l0,0C25.325,1,26,1.675,26,2.5v10  C26,13.325,25.325,14,24.5,14L24.5,14z" fill="#FACD40"/>
+<path d="M19.5,13.5c-0.825,0-1.5-0.675-1.5-1.5V3c0-0.825,0.675-1.5,1.5-1.5l0,0C20.325,1.5,21,2.175,21,3v9  C21,12.825,20.325,13.5,19.5,13.5L19.5,13.5z" fill="#FACD40"/>
+<path d="M14.5,13c-0.825,0-1.5-0.675-1.5-1.5v-8C13,2.675,13.675,2,14.5,2l0,0C15.325,2,16,2.675,16,3.5v8  C16,12.325,15.325,13,14.5,13L14.5,13z" fill="#FACD40"/>
+<path d="M9.5,12.5C8.675,12.5,8,11.825,8,11V4c0-0.825,0.675-1.5,1.5-1.5l0,0C10.325,2.5,11,3.175,11,4v7  C11,11.825,10.325,12.5,9.5,12.5L9.5,12.5z" fill="#FACD40"/>
+<path d="M4.5,12C3.675,12,3,11.325,3,10.5v-6C3,3.675,3.675,3,4.5,3l0,0C5.325,3,6,3.675,6,4.5v6  C6,11.325,5.325,12,4.5,12L4.5,12z" fill="#FACD40"/>
 <rect fill="none" height="15" width="30"/>
-<defs>
-<linearGradient gradientTransform="matrix(0 1 -1 0 28 886.0005)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-878.501" x2="-878.501" y1="-1.0825" y2="26.9175">
-<stop offset="0" style="stop-color:#FAD347"/>
-<stop offset="1" style="stop-color:#FA9600"/>
-</linearGradient>
-</defs>
-<defs>
-<linearGradient gradientTransform="matrix(0 1 -1 0 28 886.0005)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-878.501" x2="-878.501" y1="-1.0825" y2="26.9175">
-<stop offset="0" style="stop-color:#FAD347"/>
-<stop offset="1" style="stop-color:#FA9600"/>
-</linearGradient>
-</defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_h_tick.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_h_tick.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="3px" height="6px" viewBox="0 0 3 6" enable-background="new 0 0 3 6" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#B2B2B2" d="M3,4.5C3,5.328,2.328,6,1.5,6l0,0C0.672,6,0,5.328,0,4.5v-3C0,0.672,0.672,0,1.5,0l0,0
-	C2.328,0,3,0.672,3,1.5V4.5z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_v_tick.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_v_tick.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="6px" height="3px" viewBox="0 0 6 3" enable-background="new 0 0 6 3" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#B2B2B2" d="M4.5,0C5.328,0,6,0.672,6,1.5l0,0C6,2.328,5.328,3,4.5,3h-3C0.672,3,0,2.328,0,1.5l0,0
-	C0,0.672,0.672,0,1.5,0H4.5z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_space_itut.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_space_itut.svg	Mon May 03 12:48:33 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="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="M28.5,18.471h-27v-6.945h3.301v3.563h20.4v-3.563h3.3v6.943L28.5,18.471z"/>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_space_vkb.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_space_vkb.svg	Mon May 03 12:48:33 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="30px" version="1.1" viewBox="0 0 86 30" width="86px" 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="86"/>
+<rect fill="none" height="27.001" width="83.008" x="1.496" y="1.5"/>
+<polygon points="80.974,8.537 80.974,17.923 5.029,17.925 5.029,8.537 1.496,8.537 1.496,21.464 84.504,21.464 84.504,8.537 "/>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_status_handle_indication.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_status_handle_indication.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="20px" height="60px" viewBox="0 0 20 60" enable-background="new 0 0 20 60" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="9.9995" y1="0" x2="9.9995" y2="59.3335">
-	<stop  offset="0" style="stop-color:#8CE0FF"/>
-	<stop  offset="1" style="stop-color:#009CEF"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" d="M20,60H4c-2.209,0-4-1.791-4-4V4c0-2.209,1.791-4,4-4h16V60z"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="10.001" y1="1" x2="10.001" y2="59.9672">
-	<stop  offset="0" style="stop-color:#00B9FF"/>
-	<stop  offset="1" style="stop-color:#007DD5"/>
-</linearGradient>
-<path fill="url(#SVGID_2_)" d="M19,59H4c-1.652,0-2.998-1.346-2.998-3.001V4c0-1.654,1.346-3,2.998-3h15V59L19,59z"/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="9.9995" y1="28" x2="9.9995" y2="34.1005">
-	<stop  offset="0" style="stop-color:#FFFF00"/>
-	<stop  offset="1" style="stop-color:#FFFF00"/>
-</linearGradient>
-<circle fill="url(#SVGID_3_)" cx="10" cy="31" r="3"/>
-<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="9.9995" y1="38" x2="9.9995" y2="44.1">
-	<stop  offset="0" style="stop-color:#FF0000"/>
-	<stop  offset="1" style="stop-color:#FF0000"/>
-</linearGradient>
-<circle fill="url(#SVGID_4_)" cx="10" cy="41" r="3"/>
-<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="9.9995" y1="18" x2="9.9995" y2="24.1">
-	<stop  offset="0" style="stop-color:#00FF00"/>
-	<stop  offset="1" style="stop-color:#00FF00"/>
-</linearGradient>
-<circle fill="url(#SVGID_5_)" cx="10" cy="21" r="3"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_status_handle_normal.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_status_handle_normal.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="20px" height="60px" viewBox="0 0 20 60" enable-background="new 0 0 20 60" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="9.9995" y1="0" x2="9.9995" y2="59.3335">
-	<stop  offset="0" style="stop-color:#8CE0FF"/>
-	<stop  offset="1" style="stop-color:#009CEF"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" d="M20,60H4c-2.209,0-4-1.791-4-4V4c0-2.209,1.791-4,4-4h16V60z"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="10.001" y1="1" x2="10.001" y2="59.9672">
-	<stop  offset="0" style="stop-color:#00B9FF"/>
-	<stop  offset="1" style="stop-color:#007DD5"/>
-</linearGradient>
-<path fill="url(#SVGID_2_)" d="M19,59H4c-1.652,0-2.998-1.346-2.998-3.001V4c0-1.654,1.346-3,2.998-3h15V59L19,59z"/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="9.9995" y1="28" x2="9.9995" y2="34.1005">
-	<stop  offset="0" style="stop-color:#00B9FF"/>
-	<stop  offset="1" style="stop-color:#007DD5"/>
-</linearGradient>
-<circle fill="url(#SVGID_3_)" cx="10" cy="31" r="3"/>
-<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="9.9995" y1="38" x2="9.9995" y2="44.1">
-	<stop  offset="0" style="stop-color:#00B9FF"/>
-	<stop  offset="1" style="stop-color:#007DD5"/>
-</linearGradient>
-<circle fill="url(#SVGID_4_)" cx="10" cy="41" r="3"/>
-<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="9.9995" y1="18" x2="9.9995" y2="24.1">
-	<stop  offset="0" style="stop-color:#00B9FF"/>
-	<stop  offset="1" style="stop-color:#007DD5"/>
-</linearGradient>
-<circle fill="url(#SVGID_5_)" cx="10" cy="21" r="3"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_status_minimize.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_status_minimize.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="60px" viewBox="0 0 10 60" enable-background="new 0 0 10 60" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="4.9995" y1="18" x2="4.9995" y2="22">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="0.5" style="stop-color:#00B9FF"/>
-	<stop  offset="1" style="stop-color:#125987"/>
-</linearGradient>
-<circle fill="url(#SVGID_1_)" cx="5" cy="20" r="2"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="4.9995" y1="38" x2="4.9995" y2="42">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="0.5" style="stop-color:#00B9FF"/>
-	<stop  offset="1" style="stop-color:#125987"/>
-</linearGradient>
-<circle fill="url(#SVGID_2_)" cx="5" cy="40" r="2"/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="4.9995" y1="28" x2="4.9995" y2="32.0005">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="0.5" style="stop-color:#00B9FF"/>
-	<stop  offset="1" style="stop-color:#125987"/>
-</linearGradient>
-<circle fill="url(#SVGID_3_)" cx="5" cy="30" r="2"/>
-<rect fill="none" width="10" height="60"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_text_selection_handle.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_text_selection_handle.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="none" width="16" height="16"/>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="7.9995" y1="0" x2="7.9995" y2="16.0718">
-	<stop  offset="0" style="stop-color:#8CE0FF"/>
-	<stop  offset="1" style="stop-color:#009CEF"/>
-</linearGradient>
-<circle fill="url(#SVGID_1_)" cx="8" cy="8" r="8"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="7.9995" y1="1" x2="7.9995" y2="14.8003">
-	<stop  offset="0" style="stop-color:#404040"/>
-	<stop  offset="1" style="stop-color:#000000"/>
-</linearGradient>
-<circle fill="url(#SVGID_2_)" cx="8" cy="8" r="7"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_titlebar_handle_normal.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_titlebar_handle_normal.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_titlebar_handle_normal.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,21 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg 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 20 60" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="9.9995" x2="9.9995" y1="0" y2="59.3335">
+<stop offset="0" style="stop-color:#0D0D0D"/>
+<stop offset="0.7418" style="stop-color:#000000"/>
+<stop offset="0.8629" style="stop-color:#0C0C0C"/>
+<stop offset="1" style="stop-color:#1F1F1F"/>
+</linearGradient>
 <path d="M20,60H4c-2.209,0-4-1.791-4-4V4c0-2.209,1.791-4,4-4h16V60z" fill="url(#SVGID_1_)"/>
-<path d="M4,1C2.346,1,1,2.346,1,4v52c0,1.654,1.346,3,3,3h15V1H4z M18,58H4c-1.103,0-2-0.897-2-2V4  c0-1.103,0.897-2,2-2h14V58z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M4,0C1.791,0,0,1.791,0,4v52c0,2.209,1.791,4,4,4h16V0H4z M19,59H4c-1.652,0-2.998-1.346-2.998-3.001V4  c0-1.654,1.346-3,2.998-3h15V59z" fill-opacity="0.1" stroke-opacity="0.1"/>
-<rect fill="#FFFFFF" fill-opacity="0.7" fill-rule="evenodd" height="1" stroke-opacity="0.7" width="8" x="6" y="21"/>
-<rect fill-opacity="0.1" fill-rule="evenodd" height="1" stroke-opacity="0.1" width="8" x="6" y="20"/>
-<rect fill="#FFFFFF" fill-opacity="0.7" fill-rule="evenodd" height="1" stroke-opacity="0.7" width="8" x="6" y="31"/>
-<rect fill-opacity="0.1" fill-rule="evenodd" height="1" stroke-opacity="0.1" width="8" x="6" y="30"/>
-<rect fill="#FFFFFF" fill-opacity="0.7" fill-rule="evenodd" height="1" stroke-opacity="0.7" width="8" x="6" y="41"/>
-<rect fill-opacity="0.1" fill-rule="evenodd" height="1" stroke-opacity="0.1" width="8" x="6" y="40"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="9.9995" x2="9.9995" y1="0" y2="59.3335">
-<stop offset="0" style="stop-color:#FAFAFF"/>
-<stop offset="0.9" style="stop-color:#D2D2DC"/>
-<stop offset="0.9" style="stop-color:#C8C8D2"/>
-<stop offset="1" style="stop-color:#BEBEC8"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="9.9995" x2="9.9995" y1="3.5562" y2="26.6996">
+<stop offset="0" style="stop-color:#666666"/>
+<stop offset="1" style="stop-color:#262626"/>
+</linearGradient>
+<path d="M4,1C2.346,1,1,2.346,1,4v23h18V1H4z" fill="url(#SVGID_2_)" fill-opacity="0.5" stroke-opacity="0.5"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="9.9995" x2="9.9995" y1="1" y2="59.0005">
+<stop offset="0" style="stop-color:#666666"/>
+<stop offset="0.011" style="stop-color:#666666"/>
+<stop offset="1" style="stop-color:#262626"/>
 </linearGradient>
-</defs>
+<path d="M4,1C2.346,1,1,2.346,1,4v52c0,1.654,1.346,3,3,3h15V1H4z M18,58H4  c-1.103,0-2-0.898-2-2V4c0-1.104,0.897-2,2-2h14V58z" fill="url(#SVGID_3_)" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M4,0C1.791,0,0,1.791,0,4v52c0,2.209,1.791,4,4,4h16V0H4z M19,59H4c-1.652,0-2.998-1.346-2.998-3.002V4  c0-1.654,1.346-3,2.998-3h15V59z" fill-opacity="0.1" stroke-opacity="0.1"/>
+<rect fill="#FFFFFF" fill-opacity="0.5" fill-rule="evenodd" height="1" stroke-opacity="0.5" width="8" x="6" y="21"/>
+<rect fill="#646464" fill-opacity="0.5" fill-rule="evenodd" height="1" stroke-opacity="0.5" width="8" x="6" y="20"/>
+<rect fill="#FFFFFF" fill-opacity="0.5" fill-rule="evenodd" height="1" stroke-opacity="0.5" width="8" x="6" y="31"/>
+<rect fill="#646464" fill-opacity="0.5" fill-rule="evenodd" height="1" stroke-opacity="0.5" width="8" x="6" y="30"/>
+<rect fill="#FFFFFF" fill-opacity="0.5" fill-rule="evenodd" height="1" stroke-opacity="0.5" width="8" x="6" y="41"/>
+<rect fill="#646464" fill-opacity="0.5" fill-rule="evenodd" height="1" stroke-opacity="0.5" width="8" x="6" y="40"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_titlebar_handle_pressed.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_titlebar_handle_pressed.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_titlebar_handle_pressed.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,8 +2,8 @@
 <!DOCTYPE svg 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 20 60" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
 <path d="M20,60H4c-2.209,0-4-1.791-4-4V4c0-2.209,1.791-4,4-4h16V60z" fill="url(#SVGID_1_)"/>
-<path d="M4,1C2.346,1,1,2.346,1,4v52c0,1.654,1.346,3,3,3h15V1H4z M18,58H4c-1.104,0-2-0.897-2-2V4  c0-1.103,0.896-2,2-2h14V58z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M4,0C1.791,0,0,1.791,0,4v52c0,2.209,1.791,4,4,4h16V0H4z M19,59H4c-1.652,0-2.998-1.346-2.998-3.001V4  c0-1.654,1.346-3,2.998-3h15V59z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M4,1C2.346,1,1,2.346,1,4v52c0,1.654,1.346,3,3,3h15V1H4z M18,58H4c-1.103,0-2-0.898-2-2V4  c0-1.104,0.897-2,2-2h14V58z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M4,0C1.791,0,0,1.791,0,4v52c0,2.209,1.791,4,4,4h16V0H4z M19,59H4c-1.652,0-2.998-1.346-2.998-3.002V4  c0-1.654,1.346-3,2.998-3h15V59z" fill-opacity="0.2" stroke-opacity="0.2"/>
 <rect fill="#FFFFFF" fill-opacity="0.4" fill-rule="evenodd" height="1" stroke-opacity="0.4" width="8" x="6" y="21"/>
 <rect fill-opacity="0.2" fill-rule="evenodd" height="1" stroke-opacity="0.2" width="8" x="6" y="20"/>
 <rect fill="#FFFFFF" fill-opacity="0.4" fill-rule="evenodd" height="1" stroke-opacity="0.4" width="8" x="6" y="31"/>
@@ -11,9 +11,9 @@
 <rect fill="#FFFFFF" fill-opacity="0.4" fill-rule="evenodd" height="1" stroke-opacity="0.4" width="8" x="6" y="41"/>
 <rect fill-opacity="0.2" fill-rule="evenodd" height="1" stroke-opacity="0.2" width="8" x="6" y="40"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="10.0005" x2="10.0005" y1="60" y2="0.3326">
-<stop offset="0" style="stop-color:#65B8CC"/>
-<stop offset="1" style="stop-color:#306D8C"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="10.0005" x2="10.0005" y1="60" y2="0.6675">
+<stop offset="0" style="stop-color:#009DD9"/>
+<stop offset="1" style="stop-color:#004F80"/>
 </linearGradient>
 </defs>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_titlebar_minimize.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_titlebar_minimize.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_titlebar_minimize.svg	Mon May 03 12:48:33 2010 +0300
@@ -2,18 +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="40px" version="1.1" viewBox="0 0 10 40" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4.9995" x2="4.9995" y1="8" y2="12">
-<stop offset="0" style="stop-color:#66B8CC"/>
-<stop offset="1" style="stop-color:#3F89A9"/>
+<stop offset="0" style="stop-color:#969696"/>
+<stop offset="1" style="stop-color:#323232"/>
 </linearGradient>
 <circle cx="5" cy="10" fill="url(#SVGID_1_)" r="2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="4.9995" x2="4.9995" y1="28" y2="32">
-<stop offset="0" style="stop-color:#66B8CC"/>
-<stop offset="1" style="stop-color:#3F89A9"/>
+<stop offset="0" style="stop-color:#969696"/>
+<stop offset="1" style="stop-color:#323232"/>
 </linearGradient>
 <circle cx="5" cy="30" fill="url(#SVGID_2_)" r="2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="4.9995" x2="4.9995" y1="18" y2="22.0005">
-<stop offset="0" style="stop-color:#66B8CC"/>
-<stop offset="1" style="stop-color:#3F89A9"/>
+<stop offset="0" style="stop-color:#969696"/>
+<stop offset="1" style="stop-color:#323232"/>
 </linearGradient>
 <circle cx="5" cy="20" fill="url(#SVGID_3_)" r="2"/>
 <rect fill="none" height="40" width="10"/>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_trackpoint_activated.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_trackpoint_activated.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_trackpoint_activated.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,12 +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="64px" version="1.1" viewBox="0 0 64 64" width="64px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<circle cx="32" cy="32" fill="#FFFFFF" r="32"/>
-<circle cx="32" cy="32" fill="url(#SVGID_1_)" r="28.444"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="31.9995" x2="31.9995" y1="3.5557" y2="60.5586">
+<linearGradient gradientTransform="matrix(0 1 -1 0 3173.9492 5878.6792)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-5815.6792" x2="-5877.6792" y1="3141.9502" y2="3141.9502">
+<stop offset="0" style="stop-color:#FAFAFA"/>
+<stop offset="1" style="stop-color:#DCDCE6"/>
+</linearGradient>
+<circle cx="32" cy="32" fill="url(#SVGID_1_)" r="31"/>
+<path d="M32,1C14.881,1,1,14.881,1,32c0,17.121,13.881,31,31,31s31-13.879,31-31  C63,14.881,49.119,1,32,1z M32,61C16.009,61,3,47.99,3,32S16.009,4,32,4s29,12.01,29,28S47.991,61,32,61z" fill="#14141E" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M2,33C2,16.433,15.434,3,32,3s30,13.433,30,30h0.975C62.985,32.667,63,32.336,63,32  C63,14.881,49.119,1,32,1S1,14.881,1,32c0,0.336,0.015,0.667,0.025,1H2z" fill="#14141E" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M32,0C14.328,0,0,14.328,0,32s14.328,32,32,32c17.673,0,32-14.328,32-32S49.673,0,32,0z M32,62  C15.458,62,2,48.542,2,32S15.458,2,32,2s30,13.458,30,30S48.542,62,32,62z" fill="#FFFFFF"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="31.9995" x2="31.9995" y1="6" y2="58.0005">
 <stop offset="0" style="stop-color:#66CCAD"/>
 <stop offset="1" style="stop-color:#3FA990"/>
 </linearGradient>
-</defs>
+<path d="M32,58C17.665,58,6,46.338,6,32C6,17.663,17.665,6,32,6c14.336,0,26,11.663,26,26  C58,46.338,46.336,58,32,58L32,58z" fill="url(#SVGID_2_)"/>
+<path d="M32,6C17.665,6,6,17.663,6,32c0,14.338,11.665,26,26,26c14.336,0,26-11.662,26-26  C58,17.663,46.336,6,32,6z M32,56C18.767,56,8,45.233,8,32S18.767,8,32,8s24,10.767,24,24S45.233,56,32,56z" fill="#14141E" fill-opacity="0.2" stroke-opacity="0.2"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_trackpoint_normal.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_trackpoint_normal.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_trackpoint_normal.svg	Mon May 03 12:48:33 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="36px" version="1.1" viewBox="0 0 36 36" width="36px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<circle cx="18" cy="18" fill="#FFFFFF" r="18"/>
-<circle cx="18" cy="18" fill="url(#SVGID_1_)" r="16"/>
-<defs>
-<linearGradient gradientTransform="matrix(0 1 -1 0 3145.9492 5878.6792)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-5876.6792" x2="-5844.6792" y1="3127.9492" y2="3127.9492">
+<linearGradient gradientTransform="matrix(0 1 -1 0 3145.9492 5878.6792)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-5843.6792" x2="-5877.6792" y1="3127.9502" y2="3127.9502">
+<stop offset="0" style="stop-color:#FAFAFA"/>
+<stop offset="1" style="stop-color:#DCDCE6"/>
+</linearGradient>
+<circle cx="18" cy="18" fill="url(#SVGID_1_)" r="17"/>
+<path d="M18,1.5C8.888,1.5,1.5,8.888,1.5,18S8.888,34.5,18,34.5S34.5,27.112,34.5,18  S27.112,1.5,18,1.5z M18,33C9.717,33,3,26.283,3,18S9.717,3,18,3s15,6.717,15,15S26.283,33,18,33z" fill="#14141E" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M18,0C8.059,0,0,8.059,0,18s8.059,18,18,18s18-8.059,18-18S27.941,0,18,0z M18,34C9.164,34,2,26.836,2,18  S9.164,2,18,2s16,7.164,16,16S26.836,34,18,34z" fill="#FFFFFF"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="17.9995" x2="17.9995" y1="6" y2="30.0005">
 <stop offset="0" style="stop-color:#66CCAD"/>
 <stop offset="1" style="stop-color:#3FA990"/>
 </linearGradient>
-</defs>
+<path d="M18,30c-6.616,0-12-5.383-12-12S11.384,6,18,6s12,5.383,12,12S24.616,30,18,30L18,30z" fill="url(#SVGID_2_)"/>
+<path d="M18,6C11.384,6,6,11.383,6,18s5.384,12,12,12s12-5.383,12-12S24.616,6,18,6z M18,29  c-6.065,0-11-4.935-11-11S11.935,7,18,7s11,4.935,11,11S24.065,29,18,29z" fill="#14141E" fill-opacity="0.2" stroke-opacity="0.2"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_trackpoint_pressed.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_trackpoint_pressed.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_trackpoint_pressed.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,12 +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="64px" version="1.1" viewBox="0 0 64 64" width="64px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<circle cx="32" cy="32" fill="#FFFFFF" r="32"/>
-<circle cx="32" cy="32" fill="url(#SVGID_1_)" r="28.444"/>
-<defs>
-<linearGradient gradientTransform="matrix(0 1 -1 0 3173.9492 5878.6792)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-5818.2349" x2="-5875.1235" y1="3141.9502" y2="3141.9502">
-<stop offset="0" style="stop-color:#59B397"/>
-<stop offset="1" style="stop-color:#2A7362"/>
+<linearGradient gradientTransform="matrix(0 1 -1 0 3173.9492 5878.6792)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-5815.6792" x2="-5877.6792" y1="3141.9502" y2="3141.9502">
+<stop offset="0" style="stop-color:#FAFAFA"/>
+<stop offset="1" style="stop-color:#DCDCE6"/>
 </linearGradient>
-</defs>
+<circle cx="32" cy="32" fill="url(#SVGID_1_)" r="31"/>
+<path d="M32,1C14.881,1,1,14.881,1,32c0,17.121,13.881,31,31,31s31-13.879,31-31  C63,14.881,49.119,1,32,1z M32,61C16.009,61,3,47.99,3,32S16.009,4,32,4s29,12.01,29,28S47.991,61,32,61z" fill="#14141E" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M2,33C2,16.433,15.434,3,32,3s30,13.433,30,30h0.975C62.985,32.667,63,32.336,63,32  C63,14.881,49.119,1,32,1S1,14.881,1,32c0,0.336,0.015,0.667,0.025,1H2z" fill="#14141E" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M32,0C14.328,0,0,14.328,0,32s14.328,32,32,32c17.673,0,32-14.328,32-32S49.673,0,32,0z M32,62  C15.458,62,2,48.542,2,32S15.458,2,32,2s30,13.458,30,30S48.542,62,32,62z" fill="#FFFFFF"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="32.0005" x2="32.0005" y1="58" y2="6.0005">
+<stop offset="0" style="stop-color:#52CCA7"/>
+<stop offset="1" style="stop-color:#348C77"/>
+</linearGradient>
+<path d="M32,58C17.665,58,6,46.338,6,32C6,17.663,17.665,6,32,6c14.336,0,26,11.663,26,26  C58,46.338,46.336,58,32,58L32,58z" fill="url(#SVGID_2_)"/>
+<path d="M32,6C17.665,6,6,17.663,6,32c0,14.338,11.665,26,26,26c14.336,0,26-11.662,26-26  C58,17.663,46.336,6,32,6z M32,56C18.767,56,8,45.233,8,32S18.767,8,32,8s24,10.767,24,24S45.233,56,32,56z" fill="#14141E" fill-opacity="0.2" stroke-opacity="0.2"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_tumbler_devider.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_tumbler_devider.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="3px" height="3px" viewBox="0 0 3 3" enable-background="new 0 0 3 3" xml:space="preserve">
-<rect fill="#CCCCCC" width="3" height="3"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_tumbler_divider.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_tumbler_divider.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_tumbler_divider.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,5 +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="70px" version="1.1" viewBox="0 0 3 70" width="3px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<rect fill="#CCCCCC" height="70" width="3"/>
+<rect fill-opacity="0.2" height="70" stroke-opacity="0.2" width="2"/>
+<rect fill-opacity="0.2" height="70" stroke-opacity="0.2" width="1" x="1"/>
+<rect fill="#FFFFFF" fill-opacity="0.4" height="70" stroke-opacity="0.4" width="1" x="2"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_tumbler_highlight_pri.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_tumbler_highlight_pri.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +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="35px" version="1.1" viewBox="0 0 70 35" width="70px" 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="35" width="70"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="34.9995" x2="34.9995" y1="0" y2="35.0005">
-<stop offset="0" style="stop-color:#66B8CC"/>
-<stop offset="1" style="stop-color:#3F89A9"/>
-</linearGradient>
-</defs>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_tumbler_highlight_sec.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_tumbler_highlight_sec.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +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="35px" version="1.1" viewBox="0 0 70 35" width="70px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<rect fill-opacity="0.3" height="35" stroke-opacity="0.3" width="70"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_about.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_about.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_about.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,127 +1,137 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<g>
 <rect fill="none" height="60" width="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="29.69" x2="29.69" y1="7.35" y2="51.92">
-<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"/>
+<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"/>
 </linearGradient>
-<path d="M44.078,49.588c0,1.353-1.096,2.449-2.449,2.449H17.754c-1.353,0-2.449-1.097-2.449-2.449 V9.795c0-1.353,1.096-2.449,2.449-2.449h23.875c1.354,0,2.449,1.097,2.449,2.449V49.588z" fill="url(#SVGID_1)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="29.69" x2="29.69" y1="7.35" y2="51.16">
-<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"/>
+<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"/>
 </linearGradient>
-<path d="M41.629,7.346H17.754c-1.353,0-2.449,1.097-2.449,2.449v39.792 c0,0.652,0.26,1.244,0.676,1.684c-0.037-0.148-0.064-0.3-0.064-0.459v-1.225V11.02V9.795c0-1.013,0.824-1.837,1.837-1.837h23.875 c1.014,0,1.838,0.824,1.838,1.837v1.224v38.568v1.225c0,0.159-0.027,0.311-0.064,0.459c0.416-0.439,0.676-1.031,0.676-1.684V9.795 C44.078,8.443,42.982,7.346,41.629,7.346z" fill="url(#SVGID_2)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="29.69" x2="29.69" y1="10.45" y2="40.41">
-<stop offset="0" stop-color="#B6BBBD"/>
-<stop offset="1" stop-color="#F0FBFF"/>
+<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"/>
+</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">
+<stop offset="0" style="stop-color:#6E6E6E"/>
+<stop offset="1" style="stop-color:#333333"/>
 </linearGradient>
-<rect fill="url(#SVGID_3)" fill-opacity="0.6" height="29.998" stroke-opacity="0.6" width="25.101" x="17.142" y="10.407"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="29.69" x2="29.69" y1="11.06" y2="39.8">
-<stop offset="0" stop-color="#6E6E6E"/>
-<stop offset="1" stop-color="#333333"/>
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_4)" height="28.773" width="23.875" x="17.754" y="11.02"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="29.69" x2="29.69" y1="11.67" y2="39.18">
-<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"/>
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_5)" height="27.549" width="22.651" x="18.366" y="11.632"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6" x1="29.69" x2="29.69" y1="12.11" y2="23.06">
-<stop offset="0" stop-color="#85EFFF"/>
-<stop offset="1" stop-color="#3BA1D9"/>
+<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"/>
+<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"/>
+</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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_6)" points="41.018,21.427 18.366,23.876 18.366,12.244 41.018,12.244 "/>
-<rect fill="#9FE4FF" height="0.612" width="22.651" x="18.366" y="11.632"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7" x1="29.87" x2="29.87" y1="10.44" y2="7.99">
-<stop offset="0" stop-color="#FFFFFF"/>
-<stop offset="1" stop-color="#D1D7D9"/>
+<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="1" style="stop-color:#FFFFFF"/>
 </linearGradient>
-<path d="M27.163,10.407c-0.686,0-1.224-0.448-1.224-1.02V8.979c0-0.573,0.538-1.021,1.224-1.021h5.416 c0.687,0,1.225,0.448,1.225,1.021v0.408c0,0.572-0.538,1.02-1.225,1.02H27.163z" fill="url(#SVGID_7)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8" x1="29.87" x2="29.87" y1="8.32" y2="9.9">
-<stop offset="0" stop-color="#6C7375"/>
-<stop offset="1" stop-color="#BDC2C4"/>
-</linearGradient>
-<path d="M33.19,9.388c0,0.226-0.273,0.408-0.612,0.408h-5.416c-0.338,0-0.612-0.182-0.612-0.408V8.979 c0-0.226,0.274-0.409,0.612-0.409h5.416c0.339,0,0.612,0.183,0.612,0.409V9.388z" fill="url(#SVGID_8)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9" x1="29.6" x2="29.6" y1="41.04" y2="50.14">
-<stop offset="0" stop-color="#B6BBBD"/>
-<stop offset="1" stop-color="#FFFFFF"/>
+<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"/>
 </linearGradient>
-<path d="M27.384,50.2c-1.312,0-2.378-1.058-2.378-2.354v-4.475 c0-1.299,1.066-2.354,2.378-2.354h4.425c1.313,0,2.38,1.056,2.38,2.354v4.475c0,1.297-1.066,2.354-2.38,2.354H27.384z" fill="url(#SVGID_9)" fill-opacity="0.6" stroke-opacity="0.6"/>
-<path d="M27.382,49.588c-0.972,0-1.764-0.78-1.764-1.742v-4.475 c0-0.961,0.792-1.742,1.764-1.742h4.432c0.973,0,1.763,0.781,1.763,1.742v4.475c0,0.96-0.79,1.742-1.763,1.742H27.382z" fill="#020202" fill-opacity="0.5" stroke-opacity="0.5"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10" x1="29.6" x2="29.6" y1="42.21" y2="48.99">
-<stop offset="0" stop-color="#A6A8AB"/>
-<stop offset="0.7" stop-color="#58595B"/>
-<stop offset="1" stop-color="#808184"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M32.965,47.846c0,0.625-0.514,1.131-1.146,1.131h-4.443c-0.632,0-1.146-0.506-1.146-1.131 v-4.475c0-0.624,0.514-1.13,1.146-1.13h4.443c0.632,0,1.146,0.506,1.146,1.13V47.846z" fill="url(#SVGID_10)"/>
-<path d="M28.679,47.752c-0.675,0-1.225-0.549-1.225-1.225V44.69 c0-0.676,0.549-1.224,1.225-1.224h1.836c0.676,0,1.225,0.548,1.225,1.224v1.837c0,0.676-0.549,1.225-1.225,1.225H28.679z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11" x1="29.6" x2="29.6" y1="44.06" y2="47.14">
-<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"/>
+<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"/>
 </linearGradient>
-<path d="M28.679,47.14c-0.337,0-0.612-0.274-0.612-0.612V44.69c0-0.336,0.275-0.612,0.612-0.612 h1.836c0.338,0,0.612,0.276,0.612,0.612v1.837c0,0.338-0.274,0.612-0.612,0.612H28.679z" fill="url(#SVGID_11)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12" x1="19.85" x2="19.85" y1="41.59" y2="48.99">
-<stop offset="0" stop-color="#B6BBBD"/>
-<stop offset="1" stop-color="#F0FBFF"/>
+<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"/>
 </linearGradient>
-<path d="M19.496,48.977c-1.297,0-2.354-1.058-2.354-2.355 v-2.638c0-1.296,1.057-2.354,2.354-2.354h0.707c1.298,0,2.354,1.059,2.354,2.355v2.638c0,1.297-1.057,2.354-2.354,2.354H19.496z" fill="url(#SVGID_12)" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13" x1="19.85" x2="19.85" y1="42.21" y2="48.37">
-<stop offset="0" stop-color="#231F20"/>
-<stop offset="1" stop-color="#6D6E70"/>
-</linearGradient>
-<path d="M19.496,48.363c-0.962,0-1.742-0.78-1.742-1.742 v-2.638c0-0.961,0.78-1.741,1.742-1.741h0.707c0.96,0,1.742,0.78,1.742,1.742v2.638c0,0.961-0.782,1.741-1.742,1.741H19.496z" fill="url(#SVGID_13)" fill-opacity="0.7" stroke-opacity="0.7"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14" x1="19.85" x2="19.85" y1="42.83" y2="47.76">
-<stop offset="0" stop-color="#C6FF45"/>
-<stop offset="0.73" stop-color="#66A00E"/>
-<stop offset="1" stop-color="#387300"/>
+<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"/>
 </linearGradient>
-<path d="M21.333,46.621c0,0.625-0.505,1.131-1.13,1.131h-0.707c-0.624,0-1.13-0.506-1.13-1.131 v-2.638c0-0.624,0.506-1.13,1.13-1.13h0.707c0.625,0,1.13,0.506,1.13,1.131V46.621z" fill="url(#SVGID_14)"/>
-<path d="M38.654,48.977c-1.299,0-2.355-1.058-2.355-2.355 v-2.638c0-1.298,1.057-2.354,2.355-2.354h0.705c1.298,0,2.355,1.057,2.355,2.354v2.638c0,1.298-1.058,2.355-2.355,2.355H38.654z" fill="url(#SVGID_12)" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M38.654,48.363c-0.962,0-1.744-0.78-1.744-1.742 v-2.638c0-0.961,0.781-1.742,1.744-1.742h0.705c0.961,0,1.743,0.78,1.743,1.742v2.638c0,0.961-0.782,1.742-1.743,1.742H38.654z" fill="url(#SVGID_13)" fill-opacity="0.7" stroke-opacity="0.7"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17" x1="39.01" x2="39.01" y1="42.83" y2="47.76">
-<stop offset="0" stop-color="#FFC142"/>
-<stop offset="0.75" stop-color="#CF4E18"/>
-<stop offset="1" stop-color="#B52100"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M40.49,46.621c0,0.625-0.507,1.131-1.131,1.131h-0.705c-0.625,0-1.131-0.506-1.131-1.131 v-2.638c0-0.624,0.506-1.13,1.131-1.13h0.705c0.624,0,1.131,0.506,1.131,1.13V46.621z" fill="url(#SVGID_17)"/>
-<g transform="matrix(0.5 0 0 0.5 30 30)">
-<rect fill="none" height="59.996" width="59.996"/>
-<path d="M30.295,21.957c0.98,0,1.767-0.243,2.359-0.727 c0.592-0.485,0.888-1.15,0.888-2c0-0.825-0.306-1.487-0.915-1.982c-0.609-0.495-1.387-0.744-2.332-0.744 c-0.993,0-1.778,0.245-2.358,0.735c-0.581,0.491-0.87,1.154-0.87,1.991c0,0.849,0.296,1.515,0.888,2 C28.547,21.714,29.327,21.957,30.295,21.957z" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M30.295,21.344c0.98,0,1.767-0.242,2.359-0.727s0.888-1.15,0.888-2 c0-0.825-0.306-1.486-0.915-1.982c-0.609-0.495-1.387-0.744-2.332-0.744c-0.993,0-1.778,0.245-2.358,0.735 c-0.581,0.49-0.87,1.154-0.87,1.991c0,0.849,0.296,1.515,0.888,2C28.547,21.102,29.327,21.344,30.295,21.344z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="8.77" y2="51.63">
-<stop offset="0" stop-color="#E5FFB2"/>
-<stop offset="0.39" stop-color="#6AAB18"/>
-<stop offset="0.68" stop-color="#247307"/>
-<stop offset="1" stop-color="#C2FF4A"/>
+<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)">
+<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>
-<circle cx="29.998" cy="29.998" fill="url(#SVGID_1_)" r="21.427"/>
-<radialGradient cx="30.2" cy="11.02" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="39.38">
-<stop offset="0" stop-color="#AFED23"/>
-<stop offset="0.81" stop-color="#358C0C"/>
-<stop offset="1" stop-color="#67AD1A"/>
-</radialGradient>
-<path d="M29.998,50.813c-11.478,0-20.815-9.337-20.815-20.814S18.521,9.183,29.998,9.183 c11.479,0,20.814,9.337,20.814,20.815S41.475,50.813,29.998,50.813L29.998,50.813z" fill="url(#SVGID_2_)"/>
-<polygon fill-opacity="0.1" points="25.252,27.84 27.297,27.84 27.297,45.543 33.251,45.543 33.251,24.451 25.252,24.451 " stroke-opacity="0.1"/>
-<polygon fill-opacity="0.2" points="25.252,27.228 27.297,27.228 27.297,44.932 33.251,44.932 33.251,23.838 25.252,23.838 " stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="29.25" x2="29.25" y1="15.88" y2="44.66">
-<stop offset="0" stop-color="#F6FDFF"/>
-<stop offset="1" stop-color="#ADB3B5"/>
+<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>
-<polygon fill="url(#SVGID_3_)" points="25.252,26.616 27.297,26.616 27.297,44.318 33.251,44.318 33.251,23.226 25.252,23.226 "/>
-<path d="M30.274,21.038c0.981,0,1.767-0.242,2.359-0.727s0.888-1.15,0.888-2 c0-0.825-0.306-1.486-0.915-1.982c-0.609-0.495-1.387-0.744-2.332-0.744c-0.992,0-1.778,0.245-2.357,0.735 c-0.581,0.49-0.871,1.154-0.871,1.991c0,0.849,0.296,1.515,0.888,2C28.525,20.796,29.305,21.038,30.274,21.038z" fill="url(#SVGID_3_)"/>
+<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 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_active_call.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,45 +1,33 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5609 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="423.0967" x2="429.6524" y1="-578.646" y2="-582.9078">
+<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.1333" style="stop-color:#A7E722"/>
-<stop offset="0.6303" style="stop-color:#428C0F"/>
-<stop offset="1" style="stop-color:#5CA617"/>
-</linearGradient>
-<path d="M19.081,33.91c2.089-3.595,4.591-6.496,7.281-9.188c2.593-2.591,6.72-5.3,8.562-6.256l9.604-10.282  c-0.845-0.3-3.693-0.464-7.279,0.616c-3.586,1.083-11.736,6.303-16.979,11.547c-5.242,5.246-9.727,12.347-10.581,14.595  c-1.343,3.541-1.221,7.445-0.929,8.58c0,0,0.34,1.035,1.144,2.377C10.248,46.475,19.081,33.91,19.081,33.91z" fill="url(#SVGID_1_)"/>
-<path d="M31.184,20.8c1.488-1.036,2.87-1.882,3.74-2.334L44.271,8.46  c-0.132-0.058-0.209-0.088-0.209-0.088c-0.247-0.088-0.642-0.162-1.124-0.219c-0.793,0.006-1.596,0.093-2.401,0.27  C34.843,9.673,31.019,14.958,31.184,20.8z" fill="#020202" fill-opacity="0.05" stroke-opacity="0.05"/>
-<path d="M31.906,20.306c1.205-0.809,2.291-1.462,3.018-1.84l9.377-10.04  c-0.146-0.063-0.233-0.098-0.233-0.098c-0.231-0.08-0.604-0.152-1.06-0.203c-0.751,0.006-1.51,0.087-2.27,0.253  C35.275,9.576,31.636,14.695,31.906,20.306z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M44.079,8.263c-0.21-0.073-0.55-0.137-0.962-0.186c-0.681,0.006-1.369,0.08-2.06,0.231  c-5.087,1.116-8.426,5.984-7.978,11.233c0.725-0.455,1.363-0.826,1.844-1.076l9.424-10.088C44.178,8.302,44.079,8.263,44.079,8.263z  " fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="40.9697" cy="9.21" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="12.2872">
-<stop offset="0" style="stop-color:#A7E722"/>
-<stop offset="0.6242" style="stop-color:#428C0F"/>
+<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"/>
 </radialGradient>
-<path d="M34.924,18.466l0.929,1.55c0,0,15.101-6.784,14.084-8.038c-0.513-0.631-0.577-0.656-1.237-1.263  c-1.985-1.815-4.172-2.531-4.172-2.531c-0.186-0.063-0.481-0.12-0.845-0.161c-0.596,0.004-1.2,0.068-1.806,0.201  c-4.591,1.009-7.57,5.501-6.963,10.257C34.916,18.477,34.921,18.47,34.924,18.466z" fill="url(#SVGID_2_)"/>
-<path d="M17.483,34.105c-0.988-0.139-2.007-0.119-3.027,0.105c-2.418,0.531-4.376,2.066-5.646,4.131  c-0.367,2.35-0.25,4.408-0.05,5.18c0,0,0.34,1.035,1.144,2.377c0.29,0.482,6.54-8.264,8.556-11.107L17.483,34.105z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M18.366,34.135c-0.989-0.139-2.008-0.117-3.029,0.105c-3.313,0.727-5.775,3.332-6.76,6.623  c-0.026,1.025,0.034,1.873,0.127,2.398c0.003,0.012,0.005,0.033,0.01,0.047c0,0,0.34,1.033,1.144,2.379  c0.3,0.498,6.981-8.887,8.75-11.383L18.366,34.135z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="437.4258" cy="-571.231" gradientTransform="matrix(0.2095 0.9787 -0.9682 0.2124 -629.4526 -270.6148)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="14.6187">
-<stop offset="0" style="stop-color:#A7E722"/>
-<stop offset="0.6242" style="stop-color:#428C0F"/>
-<stop offset="1" style="stop-color:#5CA617"/>
-</radialGradient>
-<path d="M11.202,47.738c0.616,0.74,0.646,0.953,1.295,1.523c1.194,1.055,9.301-13.611,9.301-13.611  l-2.683-1.719c-0.941-0.111-1.914-0.08-2.89,0.135c-4.777,1.049-7.806,5.869-6.87,10.832C9.749,45.686,10.349,46.709,11.202,47.738z  " fill="url(#SVGID_3_)"/>
-<path d="M49.937,11.978c-0.179-0.22-0.381-0.446-0.578-0.67l-13.944,7.959l0.438,0.749  C35.853,20.016,50.953,13.231,49.937,11.978z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="422.2881" x2="427.4786" y1="-610.9287" y2="-594.4409">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.6788" style="stop-color:#387300"/>
-<stop offset="1" style="stop-color:#66A00E"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M35.853,20.016l1.178,1.981c0.302,0.515,0.972,0.674,1.569,0.422l4.09-2.334l8.043-4.668  c0.632-0.363,0.878-1.119,0.549-1.686c0,0-0.333-0.501-1.349-1.751L35.853,20.016z" fill="url(#SVGID_4_)"/>
-<path d="M21.798,35.65l-0.725-0.473l-9.215,13.486c0.216,0.205,0.43,0.414,0.639,0.598  C13.691,50.316,21.798,35.65,21.798,35.65z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="439.6982" x2="451.5232" y1="-577.7549" y2="-564.7323">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.6788" style="stop-color:#387300"/>
-<stop offset="1" style="stop-color:#66A00E"/>
+<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"/>
+<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"/>
 </linearGradient>
-<path d="M12.498,49.262c1.193,1.049,1.686,1.369,1.686,1.369c0.567,0.367,1.363,0.17,1.781-0.441l7.9-11.605  c0.419-0.615,0.307-1.412-0.26-1.777l-1.808-1.156L12.498,49.262z" fill="url(#SVGID_5_)"/>
+<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>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_active_mode.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,134 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
 <rect fill="none" height="60" width="60"/>
-<rect fill="none" height="59.996" width="59.996"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="29.69" x2="29.69" y1="7.35" y2="51.92">
-<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"/>
+<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"/>
 </linearGradient>
-<path d="M44.078,49.588c0,1.353-1.096,2.449-2.449,2.449H17.754c-1.353,0-2.449-1.097-2.449-2.449 V9.795c0-1.353,1.096-2.449,2.449-2.449h23.875c1.354,0,2.449,1.097,2.449,2.449V49.588z" fill="url(#SVGID_1)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="29.69" x2="29.69" y1="7.35" y2="51.16">
-<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"/>
+<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"/>
 </linearGradient>
-<path d="M41.629,7.346H17.754c-1.353,0-2.449,1.097-2.449,2.449v39.792 c0,0.652,0.26,1.244,0.676,1.684c-0.037-0.148-0.064-0.3-0.064-0.459v-1.225V11.02V9.795c0-1.013,0.824-1.837,1.837-1.837h23.875 c1.014,0,1.838,0.824,1.838,1.837v1.224v38.568v1.225c0,0.159-0.027,0.311-0.064,0.459c0.416-0.439,0.676-1.031,0.676-1.684V9.795 C44.078,8.443,42.982,7.346,41.629,7.346z" fill="url(#SVGID_2)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="29.69" x2="29.69" y1="10.45" y2="40.41">
-<stop offset="0" stop-color="#B6BBBD"/>
-<stop offset="1" stop-color="#F0FBFF"/>
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_3)" fill-opacity="0.6" height="29.998" stroke-opacity="0.6" width="25.101" x="17.142" y="10.407"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="29.69" x2="29.69" y1="11.06" y2="39.8">
-<stop offset="0" stop-color="#6E6E6E"/>
-<stop offset="1" stop-color="#333333"/>
+<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">
+<stop offset="0" style="stop-color:#6E6E6E"/>
+<stop offset="1" style="stop-color:#333333"/>
+</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"/>
 </linearGradient>
-<rect fill="url(#SVGID_4)" height="28.773" width="23.875" x="17.754" y="11.02"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="29.69" x2="29.69" y1="11.67" y2="39.18">
-<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"/>
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_5)" height="27.549" width="22.651" x="18.366" y="11.632"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6" x1="29.69" x2="29.69" y1="12.11" y2="23.06">
-<stop offset="0" stop-color="#85EFFF"/>
-<stop offset="1" stop-color="#3BA1D9"/>
+<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"/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_6)" points="41.018,21.427 18.366,23.876 18.366,12.244 41.018,12.244 "/>
-<rect fill="#9FE4FF" height="0.612" width="22.651" x="18.366" y="11.632"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7" x1="29.87" x2="29.87" y1="10.44" y2="7.99">
-<stop offset="0" stop-color="#FFFFFF"/>
-<stop offset="1" stop-color="#D1D7D9"/>
+<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"/>
 </linearGradient>
-<path d="M27.163,10.407c-0.686,0-1.224-0.448-1.224-1.02V8.979c0-0.573,0.538-1.021,1.224-1.021h5.416 c0.687,0,1.225,0.448,1.225,1.021v0.408c0,0.572-0.538,1.02-1.225,1.02H27.163z" fill="url(#SVGID_7)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8" x1="29.87" x2="29.87" y1="8.32" y2="9.9">
-<stop offset="0" stop-color="#6C7375"/>
-<stop offset="1" stop-color="#BDC2C4"/>
+<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="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"/>
 </linearGradient>
-<path d="M33.19,9.388c0,0.226-0.273,0.408-0.612,0.408h-5.416c-0.338,0-0.612-0.182-0.612-0.408V8.979 c0-0.226,0.274-0.409,0.612-0.409h5.416c0.339,0,0.612,0.183,0.612,0.409V9.388z" fill="url(#SVGID_8)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9" x1="29.6" x2="29.6" y1="41.04" y2="50.14">
-<stop offset="0" stop-color="#B6BBBD"/>
-<stop offset="1" stop-color="#FFFFFF"/>
+<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"/>
 </linearGradient>
-<path d="M27.384,50.2c-1.312,0-2.378-1.058-2.378-2.354v-4.475 c0-1.299,1.066-2.354,2.378-2.354h4.425c1.313,0,2.38,1.056,2.38,2.354v4.475c0,1.297-1.066,2.354-2.38,2.354H27.384z" fill="url(#SVGID_9)" fill-opacity="0.6" stroke-opacity="0.6"/>
-<path d="M27.382,49.588c-0.972,0-1.764-0.78-1.764-1.742v-4.475 c0-0.961,0.792-1.742,1.764-1.742h4.432c0.973,0,1.763,0.781,1.763,1.742v4.475c0,0.96-0.79,1.742-1.763,1.742H27.382z" fill="#020202" fill-opacity="0.5" stroke-opacity="0.5"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10" x1="29.6" x2="29.6" y1="42.21" y2="48.99">
-<stop offset="0" stop-color="#A6A8AB"/>
-<stop offset="0.7" stop-color="#58595B"/>
-<stop offset="1" stop-color="#808184"/>
+<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"/>
 </linearGradient>
-<path d="M32.965,47.846c0,0.625-0.514,1.131-1.146,1.131h-4.443c-0.632,0-1.146-0.506-1.146-1.131 v-4.475c0-0.624,0.514-1.13,1.146-1.13h4.443c0.632,0,1.146,0.506,1.146,1.13V47.846z" fill="url(#SVGID_10)"/>
-<path d="M28.679,47.752c-0.675,0-1.225-0.549-1.225-1.225V44.69 c0-0.676,0.549-1.224,1.225-1.224h1.836c0.676,0,1.225,0.548,1.225,1.224v1.837c0,0.676-0.549,1.225-1.225,1.225H28.679z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11" x1="29.6" x2="29.6" y1="44.06" y2="47.14">
-<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"/>
+<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"/>
 </linearGradient>
-<path d="M28.679,47.14c-0.337,0-0.612-0.274-0.612-0.612V44.69c0-0.336,0.275-0.612,0.612-0.612 h1.836c0.338,0,0.612,0.276,0.612,0.612v1.837c0,0.338-0.274,0.612-0.612,0.612H28.679z" fill="url(#SVGID_11)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12" x1="19.85" x2="19.85" y1="41.59" y2="48.99">
-<stop offset="0" stop-color="#B6BBBD"/>
-<stop offset="1" stop-color="#F0FBFF"/>
+<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"/>
 </linearGradient>
-<path d="M19.496,48.977c-1.297,0-2.354-1.058-2.354-2.355 v-2.638c0-1.296,1.057-2.354,2.354-2.354h0.707c1.298,0,2.354,1.059,2.354,2.355v2.638c0,1.297-1.057,2.354-2.354,2.354H19.496z" fill="url(#SVGID_12)" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13" x1="19.85" x2="19.85" y1="42.21" y2="48.37">
-<stop offset="0" stop-color="#231F20"/>
-<stop offset="1" stop-color="#6D6E70"/>
+<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"/>
 </linearGradient>
-<path d="M19.496,48.363c-0.962,0-1.742-0.78-1.742-1.742 v-2.638c0-0.961,0.78-1.741,1.742-1.741h0.707c0.96,0,1.742,0.78,1.742,1.742v2.638c0,0.961-0.782,1.741-1.742,1.741H19.496z" fill="url(#SVGID_13)" fill-opacity="0.7" stroke-opacity="0.7"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14" x1="19.85" x2="19.85" y1="42.83" y2="47.76">
-<stop offset="0" stop-color="#C6FF45"/>
-<stop offset="0.73" stop-color="#66A00E"/>
-<stop offset="1" stop-color="#387300"/>
+<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"/>
 </linearGradient>
-<path d="M21.333,46.621c0,0.625-0.505,1.131-1.13,1.131h-0.707c-0.624,0-1.13-0.506-1.13-1.131 v-2.638c0-0.624,0.506-1.13,1.13-1.13h0.707c0.625,0,1.13,0.506,1.13,1.131V46.621z" fill="url(#SVGID_14)"/>
-<path d="M38.654,48.977c-1.299,0-2.355-1.058-2.355-2.355 v-2.638c0-1.298,1.057-2.354,2.355-2.354h0.705c1.298,0,2.355,1.057,2.355,2.354v2.638c0,1.298-1.058,2.355-2.355,2.355H38.654z" fill="url(#SVGID_12)" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M38.654,48.363c-0.962,0-1.744-0.78-1.744-1.742 v-2.638c0-0.961,0.781-1.742,1.744-1.742h0.705c0.961,0,1.743,0.78,1.743,1.742v2.638c0,0.961-0.782,1.742-1.743,1.742H38.654z" fill="url(#SVGID_13)" fill-opacity="0.7" stroke-opacity="0.7"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17" x1="39.01" x2="39.01" y1="42.83" y2="47.76">
-<stop offset="0" stop-color="#FFC142"/>
-<stop offset="0.75" stop-color="#CF4E18"/>
-<stop offset="1" stop-color="#B52100"/>
+<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"/>
 </linearGradient>
-<path d="M40.49,46.621c0,0.625-0.507,1.131-1.131,1.131h-0.705c-0.625,0-1.131-0.506-1.131-1.131 v-2.638c0-0.624,0.506-1.13,1.131-1.13h0.705c0.624,0,1.131,0.506,1.131,1.13V46.621z" fill="url(#SVGID_17)"/>
+<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="11.3525" x2="11.3525" y1="16.041" y2="26.3361">
+<rect fill="none" height="30" width="30" x="0.002"/>
+<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"/>
 </linearGradient>
-<path d="M20.93,20.279c0,0.277-0.223,0.508-0.497,0.508h-7.751c-0.271,0-0.496,0.229-0.496,0.508v4.592  c0,0.279-0.163,0.35-0.359,0.156l-9.935-9.746c-0.198-0.193-0.135-0.352,0.138-0.352h18.403c0.272,0,0.497,0.229,0.497,0.508V20.279  z" fill="url(#SVGID_1_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="11.9546" x2="11.9546" y1="16.958" y2="24.3341">
+<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"/>
 </linearGradient>
-<path d="M3.98,16.945H19.93v2.842h-7.248c-0.824,0-1.496,0.676-1.496,1.508v2.719L3.98,16.945z" fill="url(#SVGID_2_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="18.6484" x2="18.6484" y1="3.875" y2="14.2085">
+<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"/>
 </linearGradient>
-<path d="M9.072,9.721c0-0.279,0.223-0.508,0.496-0.508h7.752c0.272,0,0.495-0.229,0.495-0.508l0.001-4.592  c0-0.281,0.162-0.35,0.359-0.156l9.934,9.744c0.198,0.193,0.135,0.352-0.138,0.352H9.568c-0.272,0-0.496-0.229-0.496-0.506V9.721z" fill="url(#SVGID_3_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="18.0469" x2="18.0469" y1="5.959" y2="13.0835">
+<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"/>
 </linearGradient>
-<path d="M10.072,13.053v-2.84h7.248c0.824,0,1.495-0.678,1.495-1.508l0.001-2.719l7.204,7.066H10.072z" fill="url(#SVGID_4_)"/>
-<rect fill="none" height="30" width="30"/>
+<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"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_add_contact_picture.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,154 +1,111 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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:#A6A8AB"/>
-<stop offset="1" style="stop-color:#231F20"/>
-</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:#A9AAAD"/>
-<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:#F4FCFF"/>
-<stop offset="0.6242" style="stop-color:#C9CED1"/>
-<stop offset="1" style="stop-color:#9CA4A7"/>
-</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_)"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <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:#A6A8AB"/>
-<stop offset="1" style="stop-color:#231F20"/>
-</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:#A9AAAD"/>
-<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:#BC5800"/>
-<stop offset="0.3" style="stop-color:#A23600"/>
-<stop offset="1" style="stop-color:#D07100"/>
-</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="#600909" 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="#600909" 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:#8BC53F"/>
-<stop offset="0.3758" style="stop-color:#33773B"/>
-<stop offset="0.6303" style="stop-color:#004F3C"/>
-<stop offset="1" style="stop-color:#007338"/>
-</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:#BC5800"/>
-<stop offset="0.3" style="stop-color:#A23600"/>
-<stop offset="1" style="stop-color:#D07100"/>
+<rect fill="none" height="60" width="60"/>
+<path d="M58,53c0,2.762-2.238,5-5,5H7c-2.762,0-5-2.238-5-5V7c0-2.762,2.238-5,5-5h46c2.762,0,5,2.238,5,5V53z" fill="#E6E6E6"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 39.9805)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-72.52" x2="-72.52" y1="32.0566" y2="-9.48">
+<stop offset="0" style="stop-color:#949494"/>
+<stop offset="1" style="stop-color:#393939"/>
 </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="#600909" 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:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
-</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:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
-</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:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
-</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:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
-</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:#D2FF8A"/>
-<stop offset="1" style="stop-color:#138F00"/>
+<path d="M47.152,42.693c-1.711-0.891-10.189-3.861-10.353-4.045l0,0c-0.959-1.101-0.922-3.529-0.438-4.584  l0,0c0.035-0.074,0.068-0.146,0.104-0.203c0.119-0.184,0.226-0.365,0.339-0.549H36.8c0.837-1.365,1.539-2.726,2.111-4  c1.039,0.359,2.371-0.605,3.032-2.24c0.688-1.689,0.392-3.447-0.661-3.922c-0.062-0.027-0.123-0.029-0.183-0.049V23.1  c0.135-0.535,0.197-0.848,0.197-0.848c1.818-8.154-2.139-14.619-11.721-14.938c-3.938,0-5.834,1.789-7.295,3.662  c-2.377,0.367-6.146,2.545-3.488,12.09c-0.1,0.014-0.201,0.031-0.299,0.07c-1.061,0.449-1.395,2.188-0.742,3.889  c0.648,1.699,2.037,2.715,3.1,2.27c0.064-0.027,0.121-0.074,0.18-0.115c0.584,1.316,1.303,2.718,2.166,4.132h-0.004  c0.031,0.049,0.059,0.099,0.09,0.146c0.018,0.029,0.035,0.055,0.051,0.084c0.002,0.004,0.004,0.006,0.004,0.006  c0.064,0.104,0.125,0.209,0.193,0.313c0.545,0.855,0.68,3.316-0.172,4.58c-0.223,0.293-8.578,3.226-10.516,4.252  C10.625,43.871,7,46.58,7,52.686h46C53,46.58,48.863,43.582,47.152,42.693z M18.811,23.063c0.021-0.02,0.043-0.041,0.066-0.061  c0.002,0.016,0.004,0.025,0.01,0.041C18.859,23.047,18.836,23.057,18.811,23.063z" fill="url(#SVGID_1_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 39.9805)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-72.52" x2="-72.52" y1="31.2559" y2="-12.5599">
+<stop offset="0" style="stop-color:#7A7A7A"/>
+<stop offset="0.7515" style="stop-color:#0A0A0A"/>
+<stop offset="1" style="stop-color:#5F5F5F"/>
 </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:#D2FF8A"/>
-<stop offset="1" style="stop-color:#138F00"/>
-</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:#A7FF00"/>
-<stop offset="0.2303" style="stop-color:#D6FF61"/>
-<stop offset="1" style="stop-color:#138F00"/>
-</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:#A7FF00"/>
-<stop offset="0.2303" style="stop-color:#D6FF61"/>
-<stop offset="1" style="stop-color:#138F00"/>
-</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:#C9CDCE"/>
-<stop offset="1" style="stop-color:#6E7273"/>
-</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:#E6E9E8"/>
-<stop offset="1" style="stop-color:#ADB2B5"/>
-</linearGradient>
-<path d="M2.142,1.727v55.43h55.716V1.727H2.142z M57.144,56.447H2.856V2.438h54.287V56.447z" fill="url(#SVGID_18_)"/>
+<path d="M7.645,52.686c0.172-4,2.02-6.963,5.496-8.807c1.014-0.539,4.008-1.676,6.412-2.592  c3.986-1.516,4.131-1.598,4.311-1.84c0.938-1.383,0.877-3.664,0.406-4.877l-0.535-0.957c-0.779-1.275-1.494-2.641-2.125-4.059  l-0.301-0.67l-0.617,0.396l-0.074,0.053c-0.098,0.047-0.191,0.066-0.291,0.066c-0.598,0-1.494-0.691-1.984-1.971  c-0.568-1.479-0.244-2.811,0.4-3.082c0.025-0.012,0.098-0.023,0.15-0.031l0.195-0.031l0.582-0.055l-0.418-1.711  c0,0-1.465-5.891,0.197-8.439c0.836-1.281,2.051-1.717,2.932-1.854l0.244-0.039l0.154-0.193c1.293-1.656,2.99-3.422,6.799-3.422  c4.238,0.143,7.525,1.553,9.484,4.082c1.938,2.504,2.514,6.084,1.621,10.088c-0.004,0.023-0.211,1.451-0.211,1.451l0.444,0.139  c0.039,0.014,0.08,0.021,0.121,0.029c0.627,0.281,0.924,1.629,0.321,3.104c-0.51,1.264-1.391,1.922-1.996,1.922  c-0.086,0-0.168-0.014-0.245-0.041l-0.543-0.188l-0.236,0.525c-0.612,1.359-1.312,2.684-2.075,3.929l-0.535,0.957  c-0.498,1.273-0.521,3.841,0.598,5.121c0,0,1.869,0.826,3.637,1.482c2.502,0.93,5.928,2.201,6.9,2.705  c0.889,0.463,5.199,3.002,5.492,8.807H7.645V52.686z" fill="url(#SVGID_2_)"/>
+<rect fill="none" height="60" width="60"/>
 </g>
 <g transform="matrix(1 0 0 1 30 30)">
-<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"/>
+<polygon fill="none" points="0,7.489 0,24.514 0,30 30,30 30,24.514 30,5.713 30,0 0,0 "/>
+<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="1" style="stop-color:#E6E6E6"/>
 </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"/>
+<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__)"/>
+<radialGradient cx="5.4297" cy="19.583" gradientTransform="matrix(1 0 0 1.008 0 -14.4484)" gradientUnits="userSpaceOnUse" id="SVGID_2__" r="1.8354">
+<stop offset="0" style="stop-color:#F2F2F2"/>
+<stop offset="1" style="stop-color:#D9D9D9"/>
+</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"/>
 </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"/>
+<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">
+<stop offset="0" style="stop-color:#808080"/>
+<stop offset="1" style="stop-color:#E6E6E6"/>
+</linearGradient>
+<rect fill="url(#SVGID_4_)" height="3.366" width="5.244" x="22.179" y="6.185"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="24.8008" x2="24.8008" y1="9.249" y2="6.4746">
+<stop offset="0" style="stop-color:#000000"/>
+<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"/>
+<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"/>
+<stop offset="0.6848" style="stop-color:#121212"/>
+<stop offset="1" style="stop-color:#A6A6A6"/>
 </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"/>
+<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"/>
 </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"/>
+<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">
+<stop offset="0" style="stop-color:#1A1A1A"/>
+<stop offset="0.503" style="stop-color:#343434"/>
+<stop offset="0.7515" style="stop-color:#9E9E9E"/>
+<stop offset="1" style="stop-color:#CFCFCF"/>
 </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>
+<circle cx="15.366" cy="15.674" fill="url(#SVGID_8_)" r="6.028"/>
+<radialGradient cx="13.751" cy="1.9536" gradientTransform="matrix(0.991 3.000000e-004 -3.000000e-004 0.991 2.3474 14.2158)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="6.5314">
+<stop offset="0" style="stop-color:#000000"/>
+<stop offset="0.5917" style="stop-color:#000000"/>
+<stop offset="0.627" style="stop-color:#050505"/>
+<stop offset="0.7652" style="stop-color:#121212"/>
+<stop offset="0.8876" style="stop-color:#171717"/>
+<stop offset="1" style="stop-color:#171717"/>
+</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"/>
+</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">
+<stop offset="0" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#3B3B3B"/>
+</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="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"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="15" x2="15" y1="4.8535" y2="25.2888">
+<stop offset="0" style="stop-color:#F2F2F2"/>
+<stop offset="0.3212" style="stop-color:#E6E6E6"/>
+<stop offset="1" style="stop-color:#666666"/>
+</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.792c0,0-0.389-0.214-0.389-0.792V7.489c0-0.222,0.175-0.401,0.389-0.401h7.551h0.389V6.697  V5.713c0-0.221,0.174-0.399,0.389-0.399h18.116c0.215,0,0.39,0.179,0.39,0.399v18.801c0,0.626-0.39,0.792-0.39,0.792  c0.427,0,0.778-0.356,0.778-0.792V5.713C29,5.276,28.648,4.921,28.222,4.921z" fill="url(#SVGID_13_)"/>
+<rect fill="none" height="30" width="30"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_application.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_application.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_application.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,57 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<g>
 <rect fill="none" height="60" width="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="29.88" x2="29.88" y1="8.34" y2="16.6">
-<stop offset="0" stop-color="#AFED23"/>
-<stop offset="1" stop-color="#7DC51A"/>
+<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"/>
 </linearGradient>
-<path d="M47.864,14.56l-2.21-4.607c0,0-0.5-1.314-2.064-1.565H16.171 c-1.564,0.25-2.064,1.565-2.064,1.565l-2.21,4.607c-0.537,0.604-0.662,1.376-0.688,1.834h37.344 C48.527,15.936,48.402,15.164,47.864,14.56z" fill="url(#SVGID_1)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="29.89" x2="29.89" y1="13.53" y2="50.7">
-<stop offset="0" stop-color="#AFED23"/>
-<stop offset="0.14" stop-color="#AFED23"/>
-<stop offset="0.69" stop-color="#3E8A0D"/>
-<stop offset="0.95" stop-color="#7EF524"/>
-<stop offset="1" stop-color="#7EF524"/>
+<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"/>
 </linearGradient>
-<path d="M48.573,47.088c0,1.473-1.194,2.668-2.667,2.668H13.878c-1.476,0-2.669-1.195-2.669-2.668 V16.394c0-1.473,1.193-2.668,2.669-2.668h32.027c1.473,0,2.667,1.195,2.667,2.668L48.573,47.088L48.573,47.088z" fill="url(#SVGID_2)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="29.89" x2="29.89" y1="13.58" y2="41.11">
-<stop offset="0" stop-color="#67AD1A"/>
-<stop offset="1" stop-color="#358C0C"/>
+<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"/>
 </linearGradient>
-<path d="M16.548,40.415h26.688c1.476,0,2.67-1.194,2.67-2.67v-24.02H13.878v24.019 C13.878,39.22,15.072,40.415,16.548,40.415z" fill="url(#SVGID_3)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="29.89" x2="29.89" y1="37.97" y2="50.26">
-<stop offset="0" stop-color="#358C0C"/>
-<stop offset="0.78" stop-color="#67AD1A"/>
-<stop offset="1" stop-color="#AFED23"/>
+<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"/>
 </linearGradient>
-<path d="M44.614,40.021c-0.315,0.191-0.669,0.313-1.052,0.36c-0.087,0.021-0.189,0.034-0.327,0.034 H16.548c-0.14,0-0.243-0.013-0.331-0.034c-0.38-0.048-0.735-0.167-1.049-0.36l-3.585,8.41c0.464,0.788,1.313,1.324,2.295,1.324 h32.027c0.979,0,1.828-0.536,2.294-1.324L44.614,40.021z" fill="url(#SVGID_4)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="29.89" x2="29.89" y1="38.15" y2="49.36">
-<stop offset="0" stop-color="#0C4A06"/>
-<stop offset="0.32" stop-color="#0A5E1C"/>
-<stop offset="0.74" stop-color="#41AD1A"/>
-<stop offset="1" stop-color="#89D920"/>
+<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"/>
 </linearGradient>
-<path d="M15.168,41.355c0.314,0.191,0.669,0.314,1.049,0.363 c0.087,0.018,0.191,0.031,0.331,0.031h26.688c0.138,0,0.241-0.014,0.327-0.031c0.383-0.049,0.736-0.172,1.052-0.363l3.216,7.551 c0.139-0.145,0.266-0.301,0.369-0.474l-3.584-8.41c-0.316,0.192-0.668,0.313-1.051,0.36c-0.088,0.021-0.191,0.034-0.328,0.034 H16.548c-0.14,0-0.243-0.013-0.331-0.034c-0.38-0.048-0.735-0.168-1.049-0.36l-3.585,8.409c0.102,0.174,0.229,0.329,0.368,0.475 L15.168,41.355z" fill="url(#SVGID_5)" fill-opacity="0.3" stroke-opacity="0.3"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6" x1="29.89" x2="29.89" y1="13.58" y2="41.11">
-<stop offset="0" stop-color="#87CC1F"/>
-<stop offset="0.62" stop-color="#086311"/>
-<stop offset="1" stop-color="#06421E"/>
+<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"/>
 </linearGradient>
-<path d="M13.878,13.726v24.019c0,1.476,1.194,2.67,2.67,2.67 h26.688c1.476,0,2.67-1.194,2.67-2.67V13.726H13.878z M44.571,37.744c0,0.736-0.601,1.338-1.336,1.338H16.548 c-0.736,0-1.338-0.6-1.338-1.338V15.06h29.36L44.571,37.744L44.571,37.744z" fill="url(#SVGID_6)" fill-opacity="0.3" stroke-opacity="0.3"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7" x1="29.89" x2="29.89" y1="8.36" y2="13.86">
-<stop offset="0" stop-color="#AFED23"/>
-<stop offset="1" stop-color="#358C0C"/>
+<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"/>
 </linearGradient>
-<path d="M45.905,11.056c0-1.473-1.194-2.668-2.67-2.668H16.548c-1.476,0-2.67,1.195-2.67,2.668v2.669 h32.027V11.056z" fill="url(#SVGID_7)"/>
-<path d="M13.878,13.726h32.027c0.864,0,1.624,0.418,2.114,1.059 c-0.055-0.076-0.095-0.154-0.156-0.224l-2.211-4.607c0,0-0.499-1.314-2.063-1.565H16.171c-1.564,0.25-2.064,1.565-2.064,1.565 l-2.21,4.607c-0.188,0.211-0.31,0.441-0.412,0.672C11.917,14.343,12.821,13.726,13.878,13.726z" fill="#C7FF5A" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M48.175,15.009c0.013,0.02,0.021,0.041,0.034,0.062C48.199,15.047,48.188,15.031,48.175,15.009z" fill="#C7FF5A"/>
-<path d="M11.371,15.508c-0.006,0.018-0.011,0.037-0.017,0.056C11.36,15.547,11.365,15.526,11.371,15.508z" fill="#C7FF5A"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8" x1="29.89" x2="29.89" y1="13.53" y2="50.7">
-<stop offset="0" stop-color="#D4FFA8"/>
-<stop offset="0.68" stop-color="#75D911"/>
-<stop offset="1" stop-color="#7EF524"/>
+<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"/>
+<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"/>
 </linearGradient>
-<path d="M45.905,13.726H13.878c-1.476,0-2.669,1.195-2.669,2.668v30.693 c0,1.474,1.193,2.669,2.669,2.669h32.027c1.473,0,2.667-1.195,2.667-2.669V16.394C48.573,14.92,47.379,13.726,45.905,13.726z M47.24,47.088c0,0.737-0.602,1.336-1.335,1.336H13.878c-0.734,0-1.336-0.599-1.336-1.336V16.394c0-0.736,0.601-1.334,1.336-1.334 h32.027c0.733,0,1.335,0.598,1.335,1.334V47.088z" fill="url(#SVGID_8)"/>
-<rect fill="none" height="59.996" width="59.996"/>
+<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>
+<rect fill="none" height="60" width="60"/>
+</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_applications_download.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,50 +1,55 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
-<rect fill="none" height="60" width="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="30.15" x2="30.15" y1="11.3" y2="21.22">
-<stop offset="0" stop-color="#D49757"/>
-<stop offset="0.62" stop-color="#8A4117"/>
-<stop offset="1" stop-color="#702200"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<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"/>
 </linearGradient>
-<path d="M49.903,15.148c0,0-18.838,0-19.228,0c-0.39,0-0.844-0.17-1.121-0.85 c-0.175-0.594-0.644-1.933-0.644-1.933c-0.177-0.548-0.417-1.04-1.208-1.04h-17.32c-0.695,0-1.202,0.589-1.202,1.314v12.154h41.932 v-8.391C51.113,15.678,50.598,15.148,49.903,15.148z" fill="url(#SVGID_1)"/>
-<path d="M49.903,15.148c0,0-18.838,0-19.228,0 c-0.39,0-0.844-0.17-1.121-0.85c-0.175-0.594-0.644-1.933-0.644-1.933c-0.177-0.548-0.417-1.04-1.208-1.04h-17.32 c-0.695,0-1.202,0.589-1.202,1.314v0.612c0-0.725,0.507-1.313,1.202-1.313h17.32c0.792,0,1.031,0.491,1.208,1.04 c0,0,0.468,1.339,0.644,1.933c0.277,0.679,0.731,0.85,1.121,0.85c0.391,0,19.228,0,19.228,0c0.694,0,1.211,0.53,1.211,1.254v-0.612 C51.113,15.678,50.598,15.148,49.903,15.148z" fill="#FFF7F5" fill-opacity="0.5" stroke-opacity="0.5"/>
-<rect height="7.346" width="39.484" x="10.411" y="18.06"/>
-<rect fill="#F2F2F2" height="6.122" width="38.26" x="11.022" y="18.672"/>
-<polygon fill="#231F20" fill-opacity="0.4" points="51.113,23.57 9.181,23.57 9.181,22.958 51.113,22.958 " stroke-opacity="0.4"/>
-<polygon fill="#231F20" fill-opacity="0.15" points="51.113,22.958 9.181,22.958 9.181,22.345 51.113,22.345 " stroke-opacity="0.15"/>
-<polygon fill="#231F20" fill-opacity="0.05" points="51.113,22.345 9.181,22.345 9.181,21.733 51.113,21.733 " stroke-opacity="0.05"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="30" x2="30" y1="48.67" y2="23.57">
-<stop offset="0" stop-color="#C79101"/>
-<stop offset="0.03" stop-color="#C79101"/>
-<stop offset="0.04" stop-color="#FEEFA7"/>
-<stop offset="0.33" stop-color="#FEE570"/>
-<stop offset="0.67" stop-color="#F0C12B"/>
-<stop offset="1" stop-color="#E6A501"/>
+<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"/>
+<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"/>
+<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"/>
 </linearGradient>
-<path d="M52.113,23.57H7.883c-1.294,0-1.455,1.434-1.455,1.434l2.146,21.831 c0.258,1.705,1.534,1.836,1.836,1.836c0.062,0,39.113,0,39.174,0c0.302,0,1.579-0.131,1.836-1.836l2.146-21.831 C53.567,25.003,53.407,23.57,52.113,23.57z" fill="url(#SVGID_2)"/>
-<path d="M7.883,24.182h44.23c0.992,0,1.316,0.838,1.414,1.232l0.04-0.411c0,0-0.16-1.434-1.454-1.434H7.883 c-1.294,0-1.455,1.434-1.455,1.434l0.041,0.411C6.566,25.021,6.89,24.182,7.883,24.182z" fill="#FCF3D0"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="29.99" x2="29.99" y1="48.67" y2="45">
-<stop offset="0" stop-color="#FCDA5E"/>
-<stop offset="1" stop-color="#FFB418"/>
+<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"/>
+<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"/>
 </linearGradient>
-<path d="M8.394,44.996l0.18,1.838 c0.258,1.705,1.534,1.836,1.836,1.836c0.062,0,39.113,0,39.174,0c0.302,0,1.579-0.131,1.836-1.836l0.154-1.838H8.394z" fill="url(#SVGID_3)" fill-opacity="0.25" stroke-opacity="0.25"/>
-<g transform="matrix(0.5 0 0 0.5 30 30)">
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30.05" x2="30.04" y1="5.29" y2="53.46">
-<stop offset="0" stop-color="#C6FF45"/>
-<stop offset="0.73" stop-color="#66A00E"/>
-<stop offset="1" stop-color="#387300"/>
+<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"/>
+</g>
+<g transform="matrix(1 0 0 1 30 30)">
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_1_)" points="9.296,32.451 29.883,53.938 50.791,32.426 39.523,32.422 39.515,5.833 20.331,5.831 20.331,32.449 "/>
-<line fill="none" x1="39.515" x2="20.331" y1="5.841" y2="5.84"/>
-<polygon fill="#E7FFB9" points="20.331,5.34 39.516,5.341 39.515,6.34 20.331,6.339 "/>
-<polygon fill="#E7FFB9" points="39.221,32.462 51.006,32.465 50.113,33.464 39.221,33.464 "/>
-<polygon fill="#E7FFB9" points="8.643,32.449 20.313,32.449 20.313,33.449 9.695,33.449 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="48.38" x2="10.72" y1="43.53" y2="43.53">
-<stop offset="0" stop-color="#AAE535"/>
-<stop offset="1" stop-color="#5D9C0A"/>
+<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 "/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_2_)" points="50.141,32.424 29.883,53.221 9.849,32.397 8.458,32.4 29.881,54.655 51.54,32.424 "/>
-<rect fill="none" height="59.996" width="59.996"/>
+<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>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_applications_games.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,208 +1,269 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
-<rect fill="none" height="60" width="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="30.15" x2="30.15" y1="11.3" y2="21.22">
-<stop offset="0" stop-color="#D49757"/>
-<stop offset="0.62" stop-color="#8A4117"/>
-<stop offset="1" stop-color="#702200"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<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"/>
+</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"/>
+<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"/>
+<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"/>
+</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"/>
+<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"/>
 </linearGradient>
-<path d="M49.903,15.148c0,0-18.838,0-19.228,0c-0.39,0-0.844-0.17-1.121-0.85 c-0.175-0.594-0.644-1.933-0.644-1.933c-0.177-0.548-0.417-1.04-1.208-1.04h-17.32c-0.695,0-1.202,0.589-1.202,1.314v12.154h41.932 v-8.391C51.113,15.678,50.598,15.148,49.903,15.148z" fill="url(#SVGID_1)"/>
-<path d="M49.903,15.148c0,0-18.838,0-19.228,0 c-0.39,0-0.844-0.17-1.121-0.85c-0.175-0.594-0.644-1.933-0.644-1.933c-0.177-0.548-0.417-1.04-1.208-1.04h-17.32 c-0.695,0-1.202,0.589-1.202,1.314v0.612c0-0.725,0.507-1.313,1.202-1.313h17.32c0.792,0,1.031,0.491,1.208,1.04 c0,0,0.468,1.339,0.644,1.933c0.277,0.679,0.731,0.85,1.121,0.85c0.391,0,19.228,0,19.228,0c0.694,0,1.211,0.53,1.211,1.254v-0.612 C51.113,15.678,50.598,15.148,49.903,15.148z" fill="#FFF7F5" fill-opacity="0.5" stroke-opacity="0.5"/>
-<rect height="7.346" width="39.484" x="10.411" y="18.06"/>
-<rect fill="#F2F2F2" height="6.122" width="38.26" x="11.022" y="18.672"/>
-<polygon fill="#231F20" fill-opacity="0.4" points="51.113,23.57 9.181,23.57 9.181,22.958 51.113,22.958 " stroke-opacity="0.4"/>
-<polygon fill="#231F20" fill-opacity="0.15" points="51.113,22.958 9.181,22.958 9.181,22.345 51.113,22.345 " stroke-opacity="0.15"/>
-<polygon fill="#231F20" fill-opacity="0.05" points="51.113,22.345 9.181,22.345 9.181,21.733 51.113,21.733 " stroke-opacity="0.05"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="30" x2="30" y1="48.67" y2="23.57">
-<stop offset="0" stop-color="#C79101"/>
-<stop offset="0.03" stop-color="#C79101"/>
-<stop offset="0.04" stop-color="#FEEFA7"/>
-<stop offset="0.33" stop-color="#FEE570"/>
-<stop offset="0.67" stop-color="#F0C12B"/>
-<stop offset="1" stop-color="#E6A501"/>
+<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"/>
+</g>
+<g transform="matrix(1 0 0 1 30 30)">
+<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"/>
 </linearGradient>
-<path d="M52.113,23.57H7.883c-1.294,0-1.455,1.434-1.455,1.434l2.146,21.831 c0.258,1.705,1.534,1.836,1.836,1.836c0.062,0,39.113,0,39.174,0c0.302,0,1.579-0.131,1.836-1.836l2.146-21.831 C53.567,25.003,53.407,23.57,52.113,23.57z" fill="url(#SVGID_2)"/>
-<path d="M7.883,24.182h44.23c0.992,0,1.316,0.838,1.414,1.232l0.04-0.411c0,0-0.16-1.434-1.454-1.434H7.883 c-1.294,0-1.455,1.434-1.455,1.434l0.041,0.411C6.566,25.021,6.89,24.182,7.883,24.182z" fill="#FCF3D0"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="29.99" x2="29.99" y1="48.67" y2="45">
-<stop offset="0" stop-color="#FCDA5E"/>
-<stop offset="1" stop-color="#FFB418"/>
+<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"/>
 </linearGradient>
-<path d="M8.394,44.996l0.18,1.838 c0.258,1.705,1.534,1.836,1.836,1.836c0.062,0,39.113,0,39.174,0c0.302,0,1.579-0.131,1.836-1.836l0.154-1.838H8.394z" fill="url(#SVGID_3)" fill-opacity="0.25" stroke-opacity="0.25"/>
-<g transform="matrix(0.5 0 0 0.5 30 30)">
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.69" x2="29.69" y1="14.26" y2="30.59">
-<stop offset="0" stop-color="#E9F0F2"/>
-<stop offset="0.04" stop-color="#E9F0F2"/>
-<stop offset="0.54" stop-color="#A8B2B8"/>
-<stop offset="1" stop-color="#A1AAAD"/>
+<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.2" style="stop-color:#303030"/>
+<stop offset="0.7212" style="stop-color:#141414"/>
+<stop offset="1" style="stop-color:#262626"/>
 </linearGradient>
-<rect fill="url(#SVGID_1_)" height="15.917" width="21.427" x="18.979" y="14.387"/>
-<rect fill="#FFFFFF" height="0.612" width="20.814" x="19.592" y="14.387"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="6.42" x2="18.16" y1="33.47" y2="35.4">
-<stop offset="0" stop-color="#949899"/>
-<stop offset="0.33" stop-color="#B0B5B8"/>
-<stop offset="0.72" stop-color="#848D8F"/>
-<stop offset="1" stop-color="#8A9294"/>
+<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"/>
 </linearGradient>
-<path d="M6.735,22.311c0,0,0,18.071,0.642,21.266c0.641,3.197,5.772,3.838,7.695,0 c1.924-3.836,5.131-12.954,5.131-12.954s-2.564-6.394-5.771-7.671C11.225,21.672,6.735,22.311,6.735,22.311z" fill="url(#SVGID_2_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="6.35" x2="18.09" y1="33.88" y2="35.82">
-<stop offset="0" stop-color="#646263"/>
-<stop offset="0.2" stop-color="#303030"/>
-<stop offset="0.72" stop-color="#141414"/>
-<stop offset="1" stop-color="#262626"/>
+<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.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.2" style="stop-color:#303030"/>
+<stop offset="0.7212" style="stop-color:#141414"/>
+<stop offset="1" style="stop-color:#262626"/>
 </linearGradient>
-<path d="M15.073,42.549c-1.924,3.835-7.054,3.197-7.695,0 c-0.548-2.738-0.627-16.376-0.64-20.238H6.735c0,0,0,18.071,0.642,21.266c0.641,3.197,5.772,3.838,7.695,0 c1.924-3.836,5.131-12.954,5.131-12.954s-0.069-0.174-0.198-0.466C19.276,32.193,16.711,39.281,15.073,42.549z" fill="url(#SVGID_3_)" fill-opacity="0.3" stroke-opacity="0.3"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="53.58" x2="41.84" y1="33.47" y2="35.4">
-<stop offset="0" stop-color="#949899"/>
-<stop offset="0.33" stop-color="#B0B5B8"/>
-<stop offset="0.72" stop-color="#848D8F"/>
-<stop offset="1" stop-color="#8A9294"/>
+<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.2" style="stop-color:#303030"/>
+<stop offset="0.7212" style="stop-color:#141414"/>
+<stop offset="1" style="stop-color:#262626"/>
 </linearGradient>
-<path d="M53.263,22.311c0,0,0,18.071-0.642,21.266c-0.641,3.197-5.771,3.838-7.695,0 c-1.925-3.836-5.131-12.954-5.131-12.954s2.564-6.394,5.772-7.671C48.773,21.672,53.263,22.311,53.263,22.311z" fill="url(#SVGID_4)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="41" x2="52.85" y1="32.62" y2="34.58">
-<stop offset="0" stop-color="#646263"/>
-<stop offset="0.2" stop-color="#303030"/>
-<stop offset="0.72" stop-color="#141414"/>
-<stop offset="1" stop-color="#262626"/>
+<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.2" style="stop-color:#303030"/>
+<stop offset="0.7212" style="stop-color:#141414"/>
+<stop offset="1" style="stop-color:#262626"/>
 </linearGradient>
-<path d="M52.621,42.549c-0.641,3.197-5.771,3.835-7.695,0 c-1.638-3.268-4.203-10.355-4.931-12.393c-0.13,0.292-0.2,0.467-0.2,0.467s3.206,9.119,5.131,12.954 c1.925,3.838,7.055,3.196,7.695,0c0.642-3.195,0.642-21.266,0.642-21.266h-0.001C53.25,26.172,53.172,39.811,52.621,42.549z" fill="url(#SVGID_5)" fill-opacity="0.3" stroke-opacity="0.3"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6" x1="23.26" x2="23.26" y1="14.54" y2="30.21">
-<stop offset="0" stop-color="#646263"/>
-<stop offset="0.2" stop-color="#303030"/>
-<stop offset="0.72" stop-color="#141414"/>
-<stop offset="1" stop-color="#262626"/>
+<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.2" style="stop-color:#303030"/>
+<stop offset="0.7212" style="stop-color:#141414"/>
+<stop offset="1" style="stop-color:#262626"/>
 </linearGradient>
-<path d="M18.979,30.305h5.153 c2.101-2.009,3.417-4.831,3.417-7.958c0-3.13-1.316-5.952-3.417-7.959h-5.153V30.305z" fill="url(#SVGID_6)" fill-opacity="0.05" stroke-opacity="0.05"/>
-<path d="M18.979,30.305h4.245 c2.268-1.911,3.713-4.769,3.713-7.958c0-3.192-1.445-6.049-3.713-7.959h-4.245V30.305z" fill="url(#SVGID_6)" fill-opacity="0.1" stroke-opacity="0.1"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8" x1="13.47" x2="13.47" y1="22.26" y2="33.3">
-<stop offset="0" stop-color="#646263"/>
-<stop offset="0.2" stop-color="#303030"/>
-<stop offset="0.72" stop-color="#141414"/>
-<stop offset="1" stop-color="#262626"/>
+<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"/>
 </linearGradient>
-<path d="M14.432,22.951c-3.207-1.279-7.697-0.64-7.697-0.64 s0,2.159,0.028,5.114c1.84,3.524,5.525,5.94,9.768,5.94c0.978,0,1.92-0.141,2.824-0.381c0.516-1.413,0.849-2.362,0.849-2.362 S17.639,24.228,14.432,22.951z" fill="url(#SVGID_8)" fill-opacity="0.1" stroke-opacity="0.1"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9" x1="13.47" x2="13.47" y1="22.25" y2="32.69">
-<stop offset="0" stop-color="#646263"/>
-<stop offset="0.2" stop-color="#303030"/>
-<stop offset="0.72" stop-color="#141414"/>
-<stop offset="1" stop-color="#262626"/>
+<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"/>
 </linearGradient>
-<path d="M14.432,22.951c-3.207-1.279-7.697-0.64-7.697-0.64 s0,1.429,0.014,3.556c1.449,4.008,5.28,6.888,9.781,6.888c1.071,0,2.104-0.166,3.078-0.467c0.368-1.017,0.595-1.665,0.595-1.665 S17.639,24.228,14.432,22.951z" fill="url(#SVGID_9)" fill-opacity="0.2" stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10" x1="16.53" x2="16.53" y1="13.03" y2="31.72">
-<stop offset="0" stop-color="#E9F0F2"/>
-<stop offset="0.04" stop-color="#E9F0F2"/>
-<stop offset="0.4" stop-color="#D4D9DB"/>
-<stop offset="0.73" stop-color="#B0BCBF"/>
-<stop offset="1" stop-color="#D0DADE"/>
+<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.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.2" style="stop-color:#303030"/>
+<stop offset="0.7212" style="stop-color:#141414"/>
+<stop offset="1" style="stop-color:#262626"/>
 </linearGradient>
-<circle cx="16.531" cy="22.347" fill="url(#SVGID_10)" r="9.489"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11" x1="16.53" x2="16.53" y1="12.73" y2="32.02">
-<stop offset="0" stop-color="#F6FDFF"/>
-<stop offset="0.04" stop-color="#F6FDFF"/>
-<stop offset="0.4" stop-color="#E6EBED"/>
-<stop offset="0.73" stop-color="#B0BCBF"/>
-<stop offset="1" stop-color="#D0DADE"/>
+<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.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.2" style="stop-color:#303030"/>
+<stop offset="0.7212" style="stop-color:#141414"/>
+<stop offset="1" style="stop-color:#262626"/>
 </linearGradient>
-<path d="M16.531,12.55c-5.41,0-9.795,4.386-9.795,9.795c0,5.409,4.386,9.795,9.795,9.795 c5.411,0,9.795-4.386,9.795-9.795S21.941,12.55,16.531,12.55z M16.531,31.529c-5.063,0-9.183-4.121-9.183-9.183 c0-5.065,4.12-9.184,9.183-9.184c5.063,0,9.183,4.119,9.183,9.184C25.714,27.409,21.594,31.529,16.531,31.529z" fill="url(#SVGID_11)"/>
-<path d="M32.447,22.347c0,3.127,1.318,5.949,3.42,7.958 h4.539V14.387h-4.539C33.766,16.395,32.447,19.216,32.447,22.347z" fill="url(#SVGID_6)" fill-opacity="0.05" stroke-opacity="0.05"/>
-<path d="M33.061,22.347c0,3.189,1.446,6.047,3.715,7.958 h3.631V14.387h-3.631C34.507,16.298,33.061,19.154,33.061,22.347z" fill="url(#SVGID_6)" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M53.236,27.425c0.026-2.956,0.026-5.114,0.026-5.114 s-4.489-0.639-7.695,0.64c-3.207,1.277-5.772,7.672-5.772,7.672s0.334,0.949,0.85,2.362c0.902,0.239,1.847,0.38,2.822,0.38 C47.713,33.365,51.396,30.95,53.236,27.425z" fill="url(#SVGID_8)" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M53.248,25.866c0.015-2.126,0.015-3.556,0.015-3.556 s-4.489-0.639-7.695,0.64c-3.207,1.277-5.772,7.671-5.772,7.671s0.228,0.648,0.596,1.665c0.975,0.301,2.007,0.467,3.076,0.467 C47.969,32.754,51.801,29.874,53.248,25.866z" fill="url(#SVGID_9)" fill-opacity="0.2" stroke-opacity="0.2"/>
-<circle cx="43.467" cy="22.347" fill="url(#SVGID_10)" r="9.489"/>
-<path d="M43.467,12.55c-5.408,0-9.795,4.386-9.795,9.795c0,5.409,4.387,9.795,9.795,9.795 c5.411,0,9.796-4.386,9.796-9.795S48.878,12.55,43.467,12.55z M43.467,31.529c-5.063,0-9.183-4.121-9.183-9.183 c0-5.065,4.12-9.184,9.183-9.184c5.064,0,9.184,4.119,9.184,9.184C52.65,27.409,48.531,31.529,43.467,31.529z" fill="url(#SVGID_11)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18" x1="16.53" x2="16.53" y1="17.08" y2="28.57">
-<stop offset="0" stop-color="#646263"/>
-<stop offset="0.2" stop-color="#303030"/>
-<stop offset="0.72" stop-color="#141414"/>
-<stop offset="1" stop-color="#262626"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M16.007,28.468c-0.725,0-1.313-0.588-1.313-1.313 v-2.36h-2.36c-0.724,0-1.313-0.588-1.313-1.313v-1.135c0-0.725,0.59-1.313,1.313-1.313h2.36V18.76c0-0.724,0.588-1.312,1.313-1.312 h1.135c0.725,0,1.313,0.588,1.313,1.312v2.273h2.36c0.725,0,1.225,0.588,1.225,1.313v1.135c0,0.725-0.5,1.313-1.225,1.313h-2.36 v2.36c0,0.725-0.588,1.313-1.313,1.313H16.007z" fill="url(#SVGID_18)" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19" x1="16.53" x2="16.53" y1="16.46" y2="27.96">
-<stop offset="0" stop-color="#646263"/>
-<stop offset="0.2" stop-color="#666666"/>
-<stop offset="0.72" stop-color="#141414"/>
-<stop offset="1" stop-color="#262626"/>
+<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.2" style="stop-color:#303030"/>
+<stop offset="0.7212" style="stop-color:#141414"/>
+<stop offset="1" style="stop-color:#262626"/>
 </linearGradient>
-<path d="M16.007,27.855c-0.725,0-1.313-0.588-1.313-1.313v-2.36h-2.36 c-0.724,0-1.313-0.588-1.313-1.313v-1.135c0-0.725,0.59-1.313,1.313-1.313h2.36v-2.273c0-0.724,0.588-1.312,1.313-1.312h1.135 c0.725,0,1.313,0.588,1.313,1.312v2.273h2.36c0.725,0,1.225,0.588,1.225,1.313v1.135c0,0.725-0.5,1.313-1.225,1.313h-2.36v2.36 c0,0.725-0.588,1.313-1.313,1.313H16.007z" fill="url(#SVGID_19)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_20" x1="16.53" x2="16.53" y1="17.12" y2="27.34">
-<stop offset="0" stop-color="#A0A3A6"/>
-<stop offset="0.39" stop-color="#7B7E80"/>
-<stop offset="0.72" stop-color="#474B4D"/>
-<stop offset="1" stop-color="#63686A"/>
+<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.2" style="stop-color:#666666"/>
+<stop offset="0.7212" style="stop-color:#141414"/>
+<stop offset="1" style="stop-color:#262626"/>
 </linearGradient>
-<path d="M20.816,21.033h-2.972v-2.886c0-0.386-0.313-0.7-0.701-0.7h-1.135 c-0.388,0-0.701,0.313-0.701,0.7v2.886h-2.972c-0.388,0-0.701,0.313-0.701,0.701v1.135c0,0.388,0.313,0.701,0.701,0.701h2.972v2.972 c0,0.388,0.313,0.701,0.701,0.701h1.135c0.388,0,0.701-0.313,0.701-0.701V23.57h2.972c0.388,0,0.612-0.313,0.612-0.701v-1.135 C21.428,21.347,21.204,21.033,20.816,21.033z" fill="url(#SVGID_20)"/>
-<path d="M12.333,21.646h2.972v-0.612h-2.972c-0.388,0-0.701,0.313-0.701,0.701v0.612 C11.633,21.959,11.946,21.646,12.333,21.646z" fill="#FFFFFF"/>
-<path d="M16.007,18.06h1.135c0.388,0,0.701,0.313,0.701,0.7v-0.612c0-0.386-0.313-0.7-0.701-0.7h-1.135 c-0.388,0-0.701,0.313-0.701,0.7v0.612C15.306,18.374,15.62,18.06,16.007,18.06z" fill="#FFFFFF"/>
-<path d="M20.816,21.033h-2.972v0.612h2.972c0.388,0,0.612,0.313,0.612,0.701v-0.612 C21.428,21.347,21.204,21.033,20.816,21.033z" fill="#FFFFFF"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_21" x1="47.75" x2="47.75" y1="20.74" y2="24.42">
-<stop offset="0" stop-color="#646263"/>
-<stop offset="0.2" stop-color="#303030"/>
-<stop offset="0.72" stop-color="#141414"/>
-<stop offset="1" stop-color="#262626"/>
+<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"/>
 </linearGradient>
-<path d="M47.752,24.795c-1.013,0-1.837-0.825-1.837-1.837 c0-1.013,0.824-1.837,1.837-1.837c1.012,0,1.836,0.824,1.836,1.837C49.588,23.97,48.764,24.795,47.752,24.795L47.752,24.795z" fill="url(#SVGID_21)" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_22" x1="47.75" x2="47.75" y1="20.25" y2="23.93">
-<stop offset="0" stop-color="#646263"/>
-<stop offset="0.2" stop-color="#666666"/>
-<stop offset="0.72" stop-color="#141414"/>
-<stop offset="1" stop-color="#262626"/>
+<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.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.2" style="stop-color:#666666"/>
+<stop offset="0.7212" style="stop-color:#141414"/>
+<stop offset="1" style="stop-color:#262626"/>
 </linearGradient>
-<path d="M47.752,24.304c-1.013,0-1.837-0.825-1.837-1.836c0-1.013,0.824-1.837,1.837-1.837 c1.012,0,1.836,0.824,1.836,1.837C49.588,23.479,48.764,24.304,47.752,24.304L47.752,24.304z" fill="url(#SVGID_22)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_23" x1="47.75" x2="47.75" y1="20.99" y2="23.44">
-<stop offset="0" stop-color="#F0653D"/>
-<stop offset="0.1" stop-color="#C94832"/>
-<stop offset="0.75" stop-color="#89181F"/>
-<stop offset="1" stop-color="#961A22"/>
+<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"/>
+</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.2" style="stop-color:#303030"/>
+<stop offset="0.7212" style="stop-color:#141414"/>
+<stop offset="1" style="stop-color:#262626"/>
 </linearGradient>
-<circle cx="47.752" cy="22.468" fill="url(#SVGID_23)" r="1.225"/>
-<path d="M39.181,24.795c-1.013,0-1.837-0.825-1.837-1.837 c0-1.013,0.824-1.837,1.837-1.837s1.837,0.824,1.837,1.837C41.018,23.97,40.193,24.795,39.181,24.795L39.181,24.795z" fill="url(#SVGID_21)" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M39.181,24.304c-1.013,0-1.837-0.825-1.837-1.836c0-1.013,0.824-1.837,1.837-1.837 s1.837,0.824,1.837,1.837C41.018,23.479,40.193,24.304,39.181,24.304L39.181,24.304z" fill="url(#SVGID_22)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_26" x1="39.18" x2="39.18" y1="21.17" y2="23.62">
-<stop offset="0" stop-color="#AFED23"/>
-<stop offset="0.74" stop-color="#358C0C"/>
-<stop offset="1" stop-color="#67AD1A"/>
+<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.2" style="stop-color:#666666"/>
+<stop offset="0.7212" style="stop-color:#141414"/>
+<stop offset="1" style="stop-color:#262626"/>
 </linearGradient>
-<circle cx="39.181" cy="22.468" fill="url(#SVGID_26)" r="1.225"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_27" x1="43.47" x2="43.47" y1="16.64" y2="20.32">
-<stop offset="0" stop-color="#646263"/>
-<stop offset="0.2" stop-color="#303030"/>
-<stop offset="0.72" stop-color="#141414"/>
-<stop offset="1" stop-color="#262626"/>
+<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"/>
 </linearGradient>
-<path d="M43.467,20.509c-1.014,0-1.838-0.823-1.838-1.837 c0-1.013,0.824-1.836,1.838-1.836c1.012,0,1.836,0.824,1.836,1.836C45.303,19.685,44.479,20.509,43.467,20.509L43.467,20.509z" fill="url(#SVGID_27)" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_28" x1="43.47" x2="43.47" y1="16.03" y2="19.71">
-<stop offset="0" stop-color="#646263"/>
-<stop offset="0.2" stop-color="#666666"/>
-<stop offset="0.72" stop-color="#141414"/>
-<stop offset="1" stop-color="#262626"/>
+<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.2" style="stop-color:#303030"/>
+<stop offset="0.7212" style="stop-color:#141414"/>
+<stop offset="1" style="stop-color:#262626"/>
 </linearGradient>
-<path d="M43.467,19.896c-1.014,0-1.838-0.824-1.838-1.836c0-1.013,0.824-1.837,1.838-1.837 c1.012,0,1.836,0.824,1.836,1.837C45.303,19.072,44.479,19.896,43.467,19.896L43.467,19.896z" fill="url(#SVGID_28)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_29" x1="43.47" x2="43.47" y1="16.7" y2="19.16">
-<stop offset="0" stop-color="#FEEFA7"/>
-<stop offset="0.51" stop-color="#FFC501"/>
-<stop offset="1" stop-color="#F6A800"/>
+<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.2" style="stop-color:#666666"/>
+<stop offset="0.7212" style="stop-color:#141414"/>
+<stop offset="1" style="stop-color:#262626"/>
 </linearGradient>
-<circle cx="43.467" cy="18.06" fill="url(#SVGID_29)" r="1.224"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_30" x1="43.47" x2="43.47" y1="25.5" y2="29.18">
-<stop offset="0" stop-color="#646263"/>
-<stop offset="0.2" stop-color="#303030"/>
-<stop offset="0.72" stop-color="#141414"/>
-<stop offset="1" stop-color="#262626"/>
+<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"/>
 </linearGradient>
-<path d="M43.467,29.08c-1.014,0-1.838-0.825-1.838-1.836 c0-1.014,0.824-1.837,1.838-1.837c1.012,0,1.836,0.823,1.836,1.837C45.303,28.255,44.479,29.08,43.467,29.08L43.467,29.08z" fill="url(#SVGID_30)" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_31" x1="43.47" x2="43.47" y1="24.88" y2="28.56">
-<stop offset="0" stop-color="#646263"/>
-<stop offset="0.2" stop-color="#666666"/>
-<stop offset="0.72" stop-color="#141414"/>
-<stop offset="1" stop-color="#262626"/>
+<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.2" style="stop-color:#303030"/>
+<stop offset="0.7212" style="stop-color:#141414"/>
+<stop offset="1" style="stop-color:#262626"/>
 </linearGradient>
-<path d="M43.467,28.468c-1.014,0-1.838-0.825-1.838-1.836c0-1.014,0.824-1.836,1.838-1.836 c1.012,0,1.836,0.823,1.836,1.836C45.303,27.643,44.479,28.468,43.467,28.468L43.467,28.468z" fill="url(#SVGID_31)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_32" x1="43.47" x2="43.47" y1="25.47" y2="27.92">
-<stop offset="0" stop-color="#96E9FA"/>
-<stop offset="0.73" stop-color="#005BCC"/>
-<stop offset="1" stop-color="#0087D9"/>
+<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.2" style="stop-color:#666666"/>
+<stop offset="0.7212" style="stop-color:#141414"/>
+<stop offset="1" style="stop-color:#262626"/>
 </linearGradient>
-<circle cx="43.467" cy="26.631" fill="url(#SVGID_32)" r="1.224"/>
-<rect fill="none" height="59.996" width="59.996"/>
+<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"/>
+</linearGradient>
+<circle cx="23.104" cy="13.036" fill="url(#SVGID_32_)" r="0.737"/>
+<rect fill="none" height="30" width="30"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_applications_office.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,226 +1,226 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<rect fill="none" height="60" width="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="30.15" x2="30.15" y1="11.3" y2="21.22">
-<stop offset="0" stop-color="#D49757"/>
-<stop offset="0.62" stop-color="#8A4117"/>
-<stop offset="1" stop-color="#702200"/>
+<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"/>
 </linearGradient>
-<path d="M49.903,15.148c0,0-18.838,0-19.228,0c-0.39,0-0.844-0.17-1.121-0.85 c-0.175-0.594-0.644-1.933-0.644-1.933c-0.177-0.548-0.417-1.04-1.208-1.04h-17.32c-0.695,0-1.202,0.589-1.202,1.314v12.154h41.932 v-8.391C51.113,15.678,50.598,15.148,49.903,15.148z" fill="url(#SVGID_1)"/>
-<path d="M49.903,15.148c0,0-18.838,0-19.228,0 c-0.39,0-0.844-0.17-1.121-0.85c-0.175-0.594-0.644-1.933-0.644-1.933c-0.177-0.548-0.417-1.04-1.208-1.04h-17.32 c-0.695,0-1.202,0.589-1.202,1.314v0.612c0-0.725,0.507-1.313,1.202-1.313h17.32c0.792,0,1.031,0.491,1.208,1.04 c0,0,0.468,1.339,0.644,1.933c0.277,0.679,0.731,0.85,1.121,0.85c0.391,0,19.228,0,19.228,0c0.694,0,1.211,0.53,1.211,1.254v-0.612 C51.113,15.678,50.598,15.148,49.903,15.148z" fill="#FFF7F5" fill-opacity="0.5" stroke-opacity="0.5"/>
-<rect height="7.346" width="39.484" x="10.411" y="18.06"/>
-<rect fill="#F2F2F2" height="6.122" width="38.26" x="11.022" y="18.672"/>
-<polygon fill="#231F20" fill-opacity="0.4" points="51.113,23.57 9.181,23.57 9.181,22.958 51.113,22.958 " stroke-opacity="0.4"/>
-<polygon fill="#231F20" fill-opacity="0.15" points="51.113,22.958 9.181,22.958 9.181,22.345 51.113,22.345 " stroke-opacity="0.15"/>
-<polygon fill="#231F20" fill-opacity="0.05" points="51.113,22.345 9.181,22.345 9.181,21.733 51.113,21.733 " stroke-opacity="0.05"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="30" x2="30" y1="48.67" y2="23.57">
-<stop offset="0" stop-color="#C79101"/>
-<stop offset="0.03" stop-color="#C79101"/>
-<stop offset="0.04" stop-color="#FEEFA7"/>
-<stop offset="0.33" stop-color="#FEE570"/>
-<stop offset="0.67" stop-color="#F0C12B"/>
-<stop offset="1" stop-color="#E6A501"/>
+<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"/>
+<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"/>
+<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"/>
 </linearGradient>
-<path d="M52.113,23.57H7.883c-1.294,0-1.455,1.434-1.455,1.434l2.146,21.831 c0.258,1.705,1.534,1.836,1.836,1.836c0.062,0,39.113,0,39.174,0c0.302,0,1.579-0.131,1.836-1.836l2.146-21.831 C53.567,25.003,53.407,23.57,52.113,23.57z" fill="url(#SVGID_2)"/>
-<path d="M7.883,24.182h44.23c0.992,0,1.316,0.838,1.414,1.232l0.04-0.411c0,0-0.16-1.434-1.454-1.434H7.883 c-1.294,0-1.455,1.434-1.455,1.434l0.041,0.411C6.566,25.021,6.89,24.182,7.883,24.182z" fill="#FCF3D0"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="29.99" x2="29.99" y1="48.67" y2="45">
-<stop offset="0" stop-color="#FCDA5E"/>
-<stop offset="1" stop-color="#FFB418"/>
+<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"/>
+<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"/>
 </linearGradient>
-<path d="M8.394,44.996l0.18,1.838 c0.258,1.705,1.534,1.836,1.836,1.836c0.062,0,39.113,0,39.174,0c0.302,0,1.579-0.131,1.836-1.836l0.154-1.838H8.394z" fill="url(#SVGID_3)" fill-opacity="0.25" stroke-opacity="0.25"/>
-<rect fill="none" height="59.996" width="59.996"/>
+<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"/>
 </g>
 <g transform="matrix(1 0 0 1 30 30)">
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9438" x2="14.9438" y1="3.3545" y2="10.7021">
-<stop offset="0" style="stop-color:#6B6B6B"/>
-<stop offset="0.7697" style="stop-color:#5E5E5E"/>
-<stop offset="1" style="stop-color:#363636"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="14.94" x2="14.94" y1="3.354" y2="10.7">
+<stop offset="0" stop-color="#6B6B6B"/>
+<stop offset="0.7697" stop-color="#5E5E5E"/>
+<stop offset="1" stop-color="#363636"/>
 </linearGradient>
-<path d="M24.169,10.713V3.966c0.011-0.331-0.264-0.601-0.603-0.601H6.333c-0.338,0-0.613,0.27-0.613,0.601  v6.747H24.169z" fill="url(#SVGID_1_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9448" x2="14.9448" y1="4.3574" y2="9.7051">
-<stop offset="0" style="stop-color:#E6E6E6"/>
-<stop offset="0.8182" style="stop-color:#7C7E87"/>
-<stop offset="1" style="stop-color:#94979D"/>
+<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"/>
 </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.9448" x2="14.9448" y1="4.9058" y2="9.2098">
-<stop offset="0" style="stop-color:#686C6E"/>
-<stop offset="1" style="stop-color:#CAD3D6"/>
+<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"/>
 </linearGradient>
-<path d="M7.863,9.182c-0.338,0-0.612-0.28-0.612-0.625V5.521c0-0.346,0.274-0.625,0.612-0.625  h14.162c0.338,0,0.613,0.279,0.613,0.625v3.035c0,0.345-0.275,0.625-0.613,0.625H7.863z" fill="url(#SVGID_3_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="14.9429" x2="14.9429" y1="-0.0059" y2="10.6835">
-<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"/>
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_4_)" height="3.035" width="14.159" x="7.863" y="5.521"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="14.9429" x2="14.9429" y1="1.9434" y2="9.6801">
-<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"/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_5_)" points="7.863,6.937 22.022,6.413 22.022,5.521 7.863,5.521 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="14.9438" x2="14.9438" y1="10.4663" y2="25.6522">
-<stop offset="0" style="stop-color:#6B6B6B"/>
-<stop offset="0.7212" style="stop-color:#363636"/>
-<stop offset="0.9636" style="stop-color:#5E5E5E"/>
-<stop offset="1" style="stop-color:#5E5E5E"/>
+<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">
+<stop offset="0" stop-color="#6B6B6B"/>
+<stop offset="0.7212" stop-color="#363636"/>
+<stop offset="0.9636" stop-color="#5E5E5E"/>
+<stop offset="1" stop-color="#5E5E5E"/>
 </linearGradient>
-<path d="M5.72,10.672v14.387c0,0.338,0.274,0.613,0.612,0.613h17.225c0.339,0,0.612-0.275,0.612-0.613V10.672  H5.72z" fill="url(#SVGID_6_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="14.9438" x2="14.9438" y1="11.4937" y2="24.6548">
-<stop offset="0" style="stop-color:#E6E6E6"/>
-<stop offset="0.8182" style="stop-color:#7C7E87"/>
-<stop offset="1" style="stop-color:#94979D"/>
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_7_)" height="13" width="16.449" x="6.72" y="11.672"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="9.7158" x2="9.7158" y1="12.9604" y2="17.1118">
-<stop offset="0" style="stop-color:#646263"/>
-<stop offset="0.2" style="stop-color:#4D4D4D"/>
-<stop offset="0.7212" style="stop-color:#242424"/>
-<stop offset="1" style="stop-color:#373737"/>
+<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.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.144  c0-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.928H8.644z" fill="url(#SVGID_8_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M10.788,17.01H8.644c-0.512,0-0.928-0.416-0.928-0.928v0.656c0,0.512,0.416,0.928,0.928,0.928  h2.145c0.512,0,0.928-0.416,0.928-0.928v-0.656C11.716,16.594,11.3,17.01,10.788,17.01z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="9.7158" x2="9.7158" y1="13.4731" y2="16.5867">
-<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"/>
+<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"/>
+<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"/>
 </linearGradient>
-<path d="M11.216,16.082c0,0.234-0.192,0.428-0.428,0.428H8.644c-0.235,0-0.428-0.193-0.428-0.428v-2.144  c0-0.236,0.192-0.428,0.428-0.428h2.145c0.235,0,0.428,0.191,0.428,0.428V16.082z" fill="url(#SVGID_9_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="14.7153" x2="14.7153" y1="12.9604" y2="17.1118">
-<stop offset="0" style="stop-color:#646263"/>
-<stop offset="0.2" style="stop-color:#4D4D4D"/>
-<stop offset="0.7212" style="stop-color:#242424"/>
-<stop offset="1" style="stop-color:#373737"/>
+<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.2" stop-color="#4D4D4D"/>
+<stop offset="0.7212" stop-color="#242424"/>
+<stop offset="1" stop-color="#373737"/>
 </linearGradient>
-<path d="M13.644,17.01c-0.512,0-0.928-0.416-0.928-0.928v-2.144  c0-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.928H13.644z" fill="url(#SVGID_10_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M15.788,17.01h-2.145c-0.512,0-0.928-0.416-0.928-0.928v0.656  c0,0.512,0.416,0.928,0.928,0.928h2.145c0.512,0,0.928-0.416,0.928-0.928v-0.656C16.716,16.594,16.3,17.01,15.788,17.01z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="14.7153" x2="14.7153" y1="13.4731" y2="16.5867">
-<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"/>
+<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"/>
+<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"/>
 </linearGradient>
-<path d="M16.216,16.082c0,0.234-0.192,0.428-0.428,0.428h-2.145c-0.235,0-0.428-0.193-0.428-0.428v-2.144  c0-0.236,0.192-0.428,0.428-0.428h2.145c0.235,0,0.428,0.191,0.428,0.428V16.082z" fill="url(#SVGID_11_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="19.7158" x2="19.7158" y1="12.9604" y2="17.1118">
-<stop offset="0" style="stop-color:#646263"/>
-<stop offset="0.2" style="stop-color:#4D4D4D"/>
-<stop offset="0.7212" style="stop-color:#242424"/>
-<stop offset="1" style="stop-color:#373737"/>
+<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.2" stop-color="#4D4D4D"/>
+<stop offset="0.7212" stop-color="#242424"/>
+<stop offset="1" stop-color="#373737"/>
 </linearGradient>
-<path d="M18.644,17.01c-0.512,0-0.928-0.416-0.928-0.928v-2.144  c0-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.928H18.644z" fill="url(#SVGID_12_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M20.788,17.01h-2.145c-0.512,0-0.928-0.416-0.928-0.928v0.656  c0,0.512,0.416,0.928,0.928,0.928h2.145c0.512,0,0.928-0.416,0.928-0.928v-0.656C21.716,16.594,21.3,17.01,20.788,17.01z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="19.7158" x2="19.7158" y1="13.4731" y2="16.5867">
-<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"/>
+<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"/>
+<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"/>
 </linearGradient>
-<path d="M21.216,16.082c0,0.234-0.192,0.428-0.428,0.428h-2.145c-0.235,0-0.428-0.193-0.428-0.428v-2.144  c0-0.236,0.192-0.428,0.428-0.428h2.145c0.235,0,0.428,0.191,0.428,0.428V16.082z" fill="url(#SVGID_13_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="9.7158" x2="9.7158" y1="18.626" y2="22.7773">
-<stop offset="0" style="stop-color:#646263"/>
-<stop offset="0.2" style="stop-color:#4D4D4D"/>
-<stop offset="0.7212" style="stop-color:#242424"/>
-<stop offset="1" style="stop-color:#373737"/>
+<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.2" stop-color="#4D4D4D"/>
+<stop offset="0.7212" stop-color="#242424"/>
+<stop offset="1" stop-color="#373737"/>
 </linearGradient>
-<path d="M8.644,22.676c-0.512,0-0.928-0.416-0.928-0.928v-2.145  c0-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.928H8.644z" fill="url(#SVGID_14_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M10.788,22.676H8.644c-0.512,0-0.928-0.416-0.928-0.928v0.656  c0,0.512,0.416,0.928,0.928,0.928h2.145c0.512,0,0.928-0.416,0.928-0.928v-0.656C11.716,22.26,11.3,22.676,10.788,22.676z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="9.7158" x2="9.7158" y1="19.1387" y2="22.2522">
-<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"/>
+<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"/>
+<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"/>
 </linearGradient>
-<path d="M11.216,21.748c0,0.236-0.192,0.428-0.428,0.428H8.644c-0.235,0-0.428-0.191-0.428-0.428v-2.145  c0-0.234,0.192-0.428,0.428-0.428h2.145c0.235,0,0.428,0.193,0.428,0.428V21.748z" fill="url(#SVGID_15_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="14.7153" x2="14.7153" y1="18.626" y2="22.7773">
-<stop offset="0" style="stop-color:#646263"/>
-<stop offset="0.2" style="stop-color:#4D4D4D"/>
-<stop offset="0.7212" style="stop-color:#242424"/>
-<stop offset="1" style="stop-color:#373737"/>
+<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.2" stop-color="#4D4D4D"/>
+<stop offset="0.7212" stop-color="#242424"/>
+<stop offset="1" stop-color="#373737"/>
 </linearGradient>
-<path d="M13.644,22.676c-0.512,0-0.928-0.416-0.928-0.928v-2.145  c0-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.928H13.644z" fill="url(#SVGID_16_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M15.788,22.676h-2.145c-0.512,0-0.928-0.416-0.928-0.928v0.656  c0,0.512,0.416,0.928,0.928,0.928h2.145c0.512,0,0.928-0.416,0.928-0.928v-0.656C16.716,22.26,16.3,22.676,15.788,22.676z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="14.7153" x2="14.7153" y1="19.1387" y2="22.2522">
-<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"/>
+<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"/>
+<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"/>
 </linearGradient>
-<path d="M16.216,21.748c0,0.236-0.192,0.428-0.428,0.428h-2.145c-0.235,0-0.428-0.191-0.428-0.428v-2.145  c0-0.234,0.192-0.428,0.428-0.428h2.145c0.235,0,0.428,0.193,0.428,0.428V21.748z" fill="url(#SVGID_17_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="19.7158" x2="19.7158" y1="18.626" y2="22.7773">
-<stop offset="0" style="stop-color:#646263"/>
-<stop offset="0.2" style="stop-color:#4D4D4D"/>
-<stop offset="0.7212" style="stop-color:#242424"/>
-<stop offset="1" style="stop-color:#373737"/>
+<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.2" stop-color="#4D4D4D"/>
+<stop offset="0.7212" stop-color="#242424"/>
+<stop offset="1" stop-color="#373737"/>
 </linearGradient>
-<path d="M18.644,22.676c-0.512,0-0.928-0.416-0.928-0.928v-2.145  c0-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.928H18.644z" fill="url(#SVGID_18_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M20.788,22.676h-2.145c-0.512,0-0.928-0.416-0.928-0.928v0.656  c0,0.512,0.416,0.928,0.928,0.928h2.145c0.512,0,0.928-0.416,0.928-0.928v-0.656C21.716,22.26,21.3,22.676,20.788,22.676z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="19.7158" x2="19.7158" y1="19.1387" y2="22.2522">
-<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"/>
+<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"/>
+<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"/>
 </linearGradient>
-<path d="M21.216,21.748c0,0.236-0.192,0.428-0.428,0.428h-2.145c-0.235,0-0.428-0.191-0.428-0.428v-2.145  c0-0.234,0.192-0.428,0.428-0.428h2.145c0.235,0,0.428,0.193,0.428,0.428V21.748z" fill="url(#SVGID_19_)"/>
-<polygon fill-opacity="0.35" fill-rule="evenodd" points="24.169,10.713 24.169,10.672 24.169,9.891 15.621,18.438   15.998,18.814 10.336,24.479 10.473,24.617 9.831,24.629 9.57,25.672 16.504,25.672 19.678,22.496 20.056,22.873 24.169,18.76 " stroke-opacity="0.35"/>
-<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 327.5859 -136.9729)" gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="-109.7026" x2="-105.4287" y1="322.8125" y2="322.8125">
-<stop offset="0" style="stop-color:#262626"/>
-<stop offset="0.3091" style="stop-color:#A2A2A2"/>
-<stop offset="0.8606" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
+<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"/>
+<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 327.5859 -136.9729)" gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="-109.7" x2="-105.4" y1="322.8" y2="322.8">
+<stop offset="0" stop-color="#262626"/>
+<stop offset="0.3091" stop-color="#A2A2A2"/>
+<stop offset="0.8606" stop-color="#000000"/>
+<stop offset="1" stop-color="#000000"/>
 </linearGradient>
-<path d="M27.231,11.263c-0.834-0.834-1.765-1.257-2.077-0.943  l-7.364,7.362l3.021,3.021l7.364-7.363C28.488,13.028,28.065,12.096,27.231,11.263z" fill="url(#SVGID_20_)" fill-rule="evenodd"/>
-<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 327.5859 -136.9729)" gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="-109.1689" x2="-105.9634" y1="333.2266" y2="333.2266">
-<stop offset="0" style="stop-color:#CECECE"/>
-<stop offset="0.3818" style="stop-color:#FFFFFF"/>
-<stop offset="0.7455" style="stop-color:#8B8B8B"/>
-<stop offset="1" style="stop-color:#B2B2B2"/>
+<path d="M27.23,11.26c-0.834-0.834-1.765-1.257-2.077-0.943l-7.364,7.362,3.021,3.021,7.364-7.363c0.32-0.31-0.11-1.24-0.94-2.08z" fill="url(#SVGID_20_)" fill-rule="evenodd"/>
+<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 327.5859 -136.9729)" gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="-109.2" x2="-106" y1="333.2" y2="333.2">
+<stop offset="0" stop-color="#CECECE"/>
+<stop offset="0.3818" stop-color="#FFFFFF"/>
+<stop offset="0.7455" stop-color="#8B8B8B"/>
+<stop offset="1" stop-color="#B2B2B2"/>
 </linearGradient>
-<polygon fill="url(#SVGID_21_)" fill-rule="evenodd" points="14.391,26.369 12.125,24.104 17.412,18.814   19.678,21.082 "/>
-<linearGradient gradientTransform="matrix(0.7071 0.7071 0.0471 -0.0471 72.2638 118.3492)" gradientUnits="userSpaceOnUse" id="SVGID_22_" x1="-109.1665" x2="-105.9624" y1="358.0654" y2="358.0654">
-<stop offset="0" style="stop-color:#B2B2B2"/>
-<stop offset="0.3818" style="stop-color:#FFFFFF"/>
-<stop offset="0.8" style="stop-color:#4D4D4D"/>
-<stop offset="1" style="stop-color:#B2B2B2"/>
+<polygon fill="url(#SVGID_21_)" fill-rule="evenodd" points="14.39,26.37,12.12,24.1,17.41,18.81,19.68,21.08"/>
+<linearGradient gradientTransform="matrix(0.7071 0.7071 0.0471 -0.0471 72.2638 118.3492)" gradientUnits="userSpaceOnUse" id="SVGID_22_" x1="-109.2" x2="-106" y1="358.1" y2="358.1">
+<stop offset="0" stop-color="#B2B2B2"/>
+<stop offset="0.3818" stop-color="#FFFFFF"/>
+<stop offset="0.8" stop-color="#4D4D4D"/>
+<stop offset="1" stop-color="#B2B2B2"/>
 </linearGradient>
-<polygon fill="url(#SVGID_22_)" fill-rule="evenodd" points="14.391,26.369 12.125,24.104 11.748,24.48   14.014,26.746 "/>
-<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.377" y="20.248"/>
-<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.754" 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.1675" x2="-105.9639" y1="339.6367" y2="339.6367">
-<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"/>
+<polygon fill="url(#SVGID_22_)" fill-rule="evenodd" points="14.39,26.37,12.12,24.1,11.75,24.48,14.01,26.75"/>
+<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"/>
 </linearGradient>
-<path d="M13.636,26.369l-0.756-0.756l-0.755-0.754c-0.755,0.754-1.51,0.754-1.51,0.754l-0.756,3.021  l3.021-0.756C12.88,27.879,12.88,27.123,13.636,26.369z" 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.7026" x2="-105.4297" y1="328.9541" y2="328.9541">
-<stop offset="0" style="stop-color:#CECECE"/>
-<stop offset="0.3818" style="stop-color:#FFFFFF"/>
-<stop offset="0.7455" style="stop-color:#8B8B8B"/>
-<stop offset="1" style="stop-color:#B2B2B2"/>
+<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">
+<stop offset="0" stop-color="#CECECE"/>
+<stop offset="0.3818" stop-color="#FFFFFF"/>
+<stop offset="0.7455" stop-color="#8B8B8B"/>
+<stop offset="1" stop-color="#B2B2B2"/>
 </linearGradient>
-<polygon fill="url(#SVGID_24_)" fill-rule="evenodd" points="20.056,21.459 17.035,18.438 17.79,17.682   20.812,20.703 "/>
-<path d="M11.222,25.465l1.807,1.807  c0.059-0.148,0.146-0.313,0.267-0.488l-1.584-1.584C11.535,25.318,11.371,25.406,11.222,25.465z" fill="#020202" fill-opacity="0.1" fill-rule="evenodd" stroke-opacity="0.1"/>
-<path d="M13.295,26.783c0.094-0.135,0.2-0.273,0.341-0.414  l-0.756-0.756l-0.755-0.754c-0.141,0.139-0.279,0.246-0.414,0.34L13.295,26.783z" fill="#020202" fill-opacity="0.3" fill-rule="evenodd" stroke-opacity="0.3"/>
-<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 327.5859 -136.9729)" gradientUnits="userSpaceOnUse" id="SVGID_25_" x1="-108.1001" x2="-107.0317" y1="338.835" y2="338.835">
-<stop offset="0" style="stop-color:#666666"/>
-<stop offset="0.3455" style="stop-color:#969696"/>
-<stop offset="0.7818" style="stop-color:#3B3B3B"/>
-<stop offset="1" style="stop-color:#2B2B2B"/>
+<polygon fill="url(#SVGID_24_)" fill-rule="evenodd" points="20.06,21.46,17.04,18.44,17.79,17.68,20.81,20.7"/>
+<path d="M11.22,25.46l1.807,1.807c0.059-0.148,0.146-0.313,0.267-0.488l-1.584-1.584c-0.18,0.12-0.35,0.21-0.5,0.26z" fill="#020202" fill-opacity="0.1" fill-rule="evenodd" stroke-opacity="0.1"/>
+<path d="M13.3,26.78c0.094-0.135,0.2-0.273,0.341-0.414l-0.756-0.756-0.755-0.754c-0.141,0.139-0.279,0.246-0.414,0.34l1.59,1.58z" fill="#020202" fill-opacity="0.3" fill-rule="evenodd" stroke-opacity="0.3"/>
+<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 327.5859 -136.9729)" gradientUnits="userSpaceOnUse" id="SVGID_25_" x1="-108.1" x2="-107" y1="338.8" y2="338.8">
+<stop offset="0" stop-color="#666666"/>
+<stop offset="0.3455" stop-color="#969696"/>
+<stop offset="0.7818" stop-color="#3B3B3B"/>
+<stop offset="1" stop-color="#2B2B2B"/>
 </linearGradient>
-<path d="M12.313,26.936c-0.104,0.104-0.357,0.02-0.565-0.189  c-0.209-0.209-0.293-0.461-0.189-0.566c0.104-0.104,0.358-0.02,0.566,0.189C12.334,26.578,12.418,26.83,12.313,26.936z" fill="url(#SVGID_25_)" fill-rule="evenodd"/>
+<path d="M12.31,26.94c-0.104,0.104-0.357,0.02-0.565-0.189-0.209-0.209-0.293-0.461-0.189-0.566,0.104-0.104,0.358-0.02,0.566,0.189,0.21,0.21,0.3,0.46,0.19,0.57z" fill="url(#SVGID_25_)" fill-rule="evenodd"/>
 <rect fill="none" fill-rule="evenodd" height="30" width="30"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_applications_user.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,89 +1,90 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<rect fill="none" height="60" width="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="30.15" x2="30.15" y1="11.3" y2="21.22">
-<stop offset="0" stop-color="#D49757"/>
-<stop offset="0.62" stop-color="#8A4117"/>
-<stop offset="1" stop-color="#702200"/>
+<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"/>
 </linearGradient>
-<path d="M49.903,15.148c0,0-18.838,0-19.228,0c-0.39,0-0.844-0.17-1.121-0.85 c-0.175-0.594-0.644-1.933-0.644-1.933c-0.177-0.548-0.417-1.04-1.208-1.04h-17.32c-0.695,0-1.202,0.589-1.202,1.314v12.154h41.932 v-8.391C51.113,15.678,50.598,15.148,49.903,15.148z" fill="url(#SVGID_1)"/>
-<path d="M49.903,15.148c0,0-18.838,0-19.228,0 c-0.39,0-0.844-0.17-1.121-0.85c-0.175-0.594-0.644-1.933-0.644-1.933c-0.177-0.548-0.417-1.04-1.208-1.04h-17.32 c-0.695,0-1.202,0.589-1.202,1.314v0.612c0-0.725,0.507-1.313,1.202-1.313h17.32c0.792,0,1.031,0.491,1.208,1.04 c0,0,0.468,1.339,0.644,1.933c0.277,0.679,0.731,0.85,1.121,0.85c0.391,0,19.228,0,19.228,0c0.694,0,1.211,0.53,1.211,1.254v-0.612 C51.113,15.678,50.598,15.148,49.903,15.148z" fill="#FFF7F5" fill-opacity="0.5" stroke-opacity="0.5"/>
-<rect height="7.346" width="39.484" x="10.411" y="18.06"/>
-<rect fill="#F2F2F2" height="6.122" width="38.26" x="11.022" y="18.672"/>
-<polygon fill="#231F20" fill-opacity="0.4" points="51.113,23.57 9.181,23.57 9.181,22.958 51.113,22.958 " stroke-opacity="0.4"/>
-<polygon fill="#231F20" fill-opacity="0.15" points="51.113,22.958 9.181,22.958 9.181,22.345 51.113,22.345 " stroke-opacity="0.15"/>
-<polygon fill="#231F20" fill-opacity="0.05" points="51.113,22.345 9.181,22.345 9.181,21.733 51.113,21.733 " stroke-opacity="0.05"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="30" x2="30" y1="48.67" y2="23.57">
-<stop offset="0" stop-color="#C79101"/>
-<stop offset="0.03" stop-color="#C79101"/>
-<stop offset="0.04" stop-color="#FEEFA7"/>
-<stop offset="0.33" stop-color="#FEE570"/>
-<stop offset="0.67" stop-color="#F0C12B"/>
-<stop offset="1" stop-color="#E6A501"/>
+<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"/>
+<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"/>
+<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"/>
 </linearGradient>
-<path d="M52.113,23.57H7.883c-1.294,0-1.455,1.434-1.455,1.434l2.146,21.831 c0.258,1.705,1.534,1.836,1.836,1.836c0.062,0,39.113,0,39.174,0c0.302,0,1.579-0.131,1.836-1.836l2.146-21.831 C53.567,25.003,53.407,23.57,52.113,23.57z" fill="url(#SVGID_2)"/>
-<path d="M7.883,24.182h44.23c0.992,0,1.316,0.838,1.414,1.232l0.04-0.411c0,0-0.16-1.434-1.454-1.434H7.883 c-1.294,0-1.455,1.434-1.455,1.434l0.041,0.411C6.566,25.021,6.89,24.182,7.883,24.182z" fill="#FCF3D0"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="29.99" x2="29.99" y1="48.67" y2="45">
-<stop offset="0" stop-color="#FCDA5E"/>
-<stop offset="1" stop-color="#FFB418"/>
+<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"/>
+<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"/>
 </linearGradient>
-<path d="M8.394,44.996l0.18,1.838 c0.258,1.705,1.534,1.836,1.836,1.836c0.062,0,39.113,0,39.174,0c0.302,0,1.579-0.131,1.836-1.836l0.154-1.838H8.394z" fill="url(#SVGID_3)" fill-opacity="0.25" stroke-opacity="0.25"/>
-<rect fill="none" height="59.996" width="59.996"/>
+<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"/>
 </g>
 <g transform="matrix(1 0 0 1 30 30)">
-<linearGradient gradientTransform="matrix(1 0 0 -1 -21.02 31.5195)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="35.96" x2="35.96" y1="27.3496" y2="23.2196">
+<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"/>
 </linearGradient>
-<path d="M23.932,7.28l-1.104-2.304c0,0-0.25-0.657-1.032-0.782H8.085C7.304,4.319,7.054,4.977,7.054,4.977  L5.948,7.28C5.68,7.582,5.617,7.968,5.604,8.197h18.672C24.264,7.968,24.201,7.582,23.932,7.28z" fill="url(#SVGID_1_)"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -21.02 31.5195)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="35.9648" x2="35.9648" y1="24.7539" y2="6.1694">
+<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"/>
 </linearGradient>
-<path d="M24.287,23.544c0,0.736-0.598,1.334-1.334,1.334H6.939c-0.738,0-1.334-0.598-1.334-1.334V8.197  c0-0.737,0.597-1.334,1.334-1.334h16.013c0.737,0,1.334,0.597,1.334,1.334L24.287,23.544L24.287,23.544z" fill="url(#SVGID_2_)"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -21.02 31.5195)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="35.9658" x2="35.9658" y1="24.7295" y2="10.965">
+<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"/>
 </linearGradient>
-<path d="M8.274,20.207h13.344c0.737,0,1.335-0.597,1.335-1.334V6.862H6.939v12.01  C6.939,19.61,7.536,20.207,8.274,20.207z" fill="url(#SVGID_3_)"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -21.02 31.5195)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="35.9648" x2="35.9648" y1="12.5347" y2="6.3903">
+<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"/>
 </linearGradient>
-<path d="M22.307,20.011c-0.157,0.095-0.334,0.156-0.525,0.18c-0.044,0.011-0.095,0.017-0.164,0.017H8.274  c-0.07,0-0.122-0.006-0.166-0.017c-0.19-0.024-0.367-0.083-0.524-0.18l-1.792,4.205c0.232,0.394,0.657,0.661,1.147,0.661h16.013  c0.489,0,0.914-0.268,1.147-0.661L22.307,20.011z" fill="url(#SVGID_4_)"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -21.02 31.5195)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="35.9648" x2="35.9648" y1="12.4448" y2="6.8392">
+<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"/>
 </linearGradient>
-<path d="M7.584,20.678c0.157,0.096,0.334,0.156,0.524,0.182  c0.044,0.009,0.096,0.016,0.166,0.016h13.344c0.069,0,0.12-0.008,0.163-0.016c0.191-0.025,0.368-0.086,0.526-0.182l1.608,3.775  c0.069-0.072,0.133-0.15,0.184-0.237l-1.791-4.205c-0.158,0.097-0.335,0.157-0.526,0.181c-0.044,0.01-0.095,0.017-0.164,0.017H8.274  c-0.07,0-0.122-0.007-0.166-0.017c-0.19-0.024-0.367-0.084-0.524-0.181l-1.792,4.205c0.051,0.087,0.115,0.164,0.184,0.237  L7.584,20.678z" fill="url(#SVGID_5_)" fill-opacity="0.3" stroke-opacity="0.3"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -21.02 31.5195)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="35.9658" x2="35.9658" y1="24.7295" y2="10.9655">
+<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"/>
 </linearGradient>
-<path d="M6.939,6.863v12.01c0,0.737,0.597,1.334,1.335,1.334  h13.344c0.737,0,1.335-0.597,1.335-1.334V6.863H6.939z M22.285,18.872c0,0.368-0.3,0.669-0.668,0.669H8.274  c-0.368,0-0.669-0.3-0.669-0.669V7.53h14.68V18.872L22.285,18.872z" fill="url(#SVGID_6_)" fill-opacity="0.3" stroke-opacity="0.3"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -21.02 31.5195)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="35.9648" x2="35.9648" y1="27.3389" y2="24.5894">
+<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"/>
 </linearGradient>
-<path d="M22.952,5.528c0-0.737-0.597-1.334-1.335-1.334H8.274c-0.738,0-1.335,0.597-1.335,1.334v1.334h16.013  V5.528z" fill="url(#SVGID_7_)"/>
-<path d="M6.939,6.863h16.013c0.433,0,0.813,0.209,1.058,0.529  c-0.027-0.038-0.048-0.077-0.078-0.112l-1.105-2.303c0,0-0.25-0.657-1.031-0.783H8.085C7.304,4.319,7.054,4.977,7.054,4.977  L5.948,7.28C5.854,7.386,5.793,7.501,5.742,7.616C5.958,7.172,6.41,6.863,6.939,6.863z" fill="#C7FF5A" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M24.088,7.504c0.006,0.01,0.01,0.021,0.017,0.031C24.1,7.523,24.094,7.516,24.088,7.504z" fill="#C7FF5A"/>
-<path d="M5.686,7.754C5.683,7.763,5.68,7.772,5.677,7.782C5.68,7.773,5.683,7.763,5.686,7.754z" fill="#C7FF5A"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -21.02 31.5195)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="35.9648" x2="35.9648" y1="24.7539" y2="6.1694">
+<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"/>
+<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"/>
 </linearGradient>
-<path d="M22.952,6.863H6.939c-0.738,0-1.334,0.597-1.334,1.334v15.346c0,0.737,0.597,1.335,1.334,1.335  h16.013c0.737,0,1.334-0.598,1.334-1.335V8.197C24.287,7.46,23.689,6.863,22.952,6.863z M23.62,23.544  c0,0.368-0.301,0.668-0.668,0.668H6.939c-0.367,0-0.668-0.3-0.668-0.668V8.197c0-0.368,0.3-0.667,0.668-0.667h16.013  c0.367,0,0.668,0.299,0.668,0.667V23.544z" fill="url(#SVGID_8_)"/>
+<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"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_avatar.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_avatar.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_avatar.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <rect fill="none" height="60" width="60"/>
-<path d="M46.691,42.35c-1.665-0.866-9.918-3.756-10.072-3.936l-0.002,0.002 c-0.934-1.068-0.896-3.433-0.43-4.46c0.001-0.001,0.002-0.001,0.002-0.002c0.032-0.071,0.065-0.139,0.104-0.197 c0.113-0.177,0.219-0.354,0.326-0.533l0,0c0.813-1.329,1.494-2.651,2.054-3.892c1.009,0.349,2.307-0.59,2.95-2.18 c0.667-1.645,0.379-3.354-0.645-3.815c-0.058-0.026-0.119-0.03-0.178-0.048c0-0.001,0-0.002,0-0.002 c0.133-0.521,0.191-0.826,0.191-0.826c1.77-7.934-2.078-14.223-11.402-14.533c-3.832,0-5.617,0.578-7.039,2.398 c-2.313,0.357-6.039,3.642-3.453,12.927c-0.098,0.016-0.195,0.031-0.289,0.071c-1.032,0.436-1.355,2.128-0.724,3.782 c0.633,1.653,1.983,2.643,3.017,2.208c0.063-0.027,0.117-0.072,0.176-0.11c0.568,1.279,1.266,2.646,2.104,4.02H23.38 c0.022,0.037,0.046,0.073,0.067,0.11c0.023,0.038,0.045,0.076,0.068,0.114c0.002,0.003,0.005,0.005,0.007,0.008 c0.061,0.101,0.12,0.201,0.185,0.301c0.532,0.833,0.663,3.229-0.166,4.457c-0.208,0.283-8.346,3.135-10.23,4.136 c-2.161,1.147-5.688,3.782-5.688,9.723h44.756C52.378,46.132,48.354,43.216,46.691,42.35z" fill="url(#SVGID_1)"/>
-<path d="M7.659,51.072c-0.022,0.323-0.037,0.655-0.037,1h44.756c0-0.345-0.017-0.676-0.042-1H7.659z" fill="#FFFFFF" fill-opacity="0.15"/>
-<path d="M22.551,11.326c1.422-1.82,3.207-2.398,7.039-2.398c7.565,0.252,11.524,4.44,11.804,10.248 C41.535,12.856,37.58,8.194,29.59,7.928c-3.832,0-5.617,0.578-7.039,2.398c-1.81,0.279-4.472,2.367-4.311,7.704 C18.419,13.429,20.858,11.588,22.551,11.326z" fill="#FFFFFF" fill-opacity="0.5"/>
-<path d="M36.617,38.416c-0.441-0.505-0.66-1.3-0.725-2.106c-0.086,1.09,0.098,2.389,0.725,3.106 l0.002-0.002c0.154,0.18,8.407,3.069,10.072,3.936c1.566,0.816,5.225,3.453,5.645,8.723h0.042c0-5.94-4.024-8.856-5.687-9.723 c-1.665-0.866-9.918-3.756-10.072-3.936L36.617,38.416z" fill="#FFFFFF" fill-opacity="0.5"/>
-<path d="M13.311,43.35c1.885-1.001,10.022-3.853,10.23-4.136c0.508-0.752,0.652-1.938,0.568-2.938 c-0.053,0.717-0.225,1.429-0.568,1.938c-0.208,0.283-8.346,3.135-10.23,4.136c-2.161,1.147-5.688,3.782-5.688,9.723h0.037 C8.029,46.833,11.275,44.431,13.311,43.35z" fill="#FFFFFF" fill-opacity="0.5"/>
+<path d="M46.69,42.35c-1.665-0.866-9.918-3.756-10.07-3.936l-0.002,0.002c-0.934-1.068-0.896-3.433-0.43-4.46,0.001-0.001,0.002-0.001,0.002-0.002,0.032-0.071,0.065-0.139,0.104-0.197,0.113-0.177,0.219-0.354,0.326-0.533,0.813-1.329,1.494-2.651,2.054-3.892,1.009,0.349,2.307-0.59,2.95-2.18,0.667-1.645,0.379-3.354-0.645-3.815-0.058-0.026-0.119-0.03-0.178-0.048v-0.002c0.133-0.521,0.191-0.826,0.191-0.826,1.77-7.934-2.078-14.22-11.4-14.53-3.832,0-5.617,0.578-7.039,2.398-2.313,0.357-6.039,3.642-3.453,12.93-0.098,0.016-0.195,0.031-0.289,0.071-1.032,0.436-1.355,2.128-0.724,3.782,0.633,1.653,1.983,2.643,3.017,2.208,0.063-0.027,0.117-0.072,0.176-0.11,0.568,1.279,1.266,2.646,2.104,4.02h-0.01c0.022,0.037,0.046,0.073,0.067,0.11,0.023,0.038,0.045,0.076,0.068,0.114,0.002,0.003,0.005,0.005,0.007,0.008,0.061,0.101,0.12,0.201,0.185,0.301,0.532,0.833,0.663,3.229-0.166,4.457-0.208,0.283-8.346,3.135-10.23,4.136-2.161,1.147-5.688,3.782-5.688,9.723h44.76c-0.01-5.95-4.04-8.86-5.7-9.73z" fill="url(#SVGID_1)"/>
+<path d="M7.659,51.07c-0.022,0.323-0.037,0.655-0.037,1h44.76c0-0.345-0.017-0.676-0.042-1h-44.68z" fill="#FFFFFF" fill-opacity="0.15"/>
+<path d="M22.55,11.33c1.422-1.82,3.207-2.398,7.039-2.398,7.565,0.252,11.52,4.44,11.8,10.25,0.15-6.32-3.81-10.99-11.8-11.25-3.832,0-5.617,0.578-7.039,2.398-1.81,0.279-4.472,2.367-4.311,7.704,0.18-4.6,2.62-6.44,4.31-6.7z" fill="#FFFFFF" fill-opacity="0.5"/>
+<path d="M36.62,38.42c-0.441-0.505-0.66-1.3-0.725-2.106-0.086,1.09,0.098,2.389,0.725,3.106l0.002-0.002c0.154,0.18,8.407,3.069,10.07,3.936,1.566,0.816,5.225,3.453,5.645,8.723h0.042c0-5.94-4.024-8.856-5.687-9.723-1.665-0.866-9.918-3.756-10.07-3.936z" fill="#FFFFFF" fill-opacity="0.5"/>
+<path d="M13.31,43.35c1.885-1.001,10.02-3.853,10.23-4.136,0.508-0.752,0.652-1.938,0.568-2.938-0.053,0.717-0.225,1.429-0.568,1.938-0.208,0.283-8.346,3.135-10.23,4.136-2.161,1.147-5.688,3.782-5.688,9.723h0.037c0.37-5.24,3.621-7.64,5.651-8.72z" fill="#FFFFFF" fill-opacity="0.5"/>
 <defs>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="30" x2="30" y1="8.6" y2="52.35">
 <stop offset="0" stop-color="#8E8E8E"/>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bell.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bell.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<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"/>
+</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"/>
+</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"/>
+</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"/>
+<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"/>
+</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"/>
+</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"/>
+<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"/>
+<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"/>
+<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"/>
+</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"/>
+</g>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bluetooth.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bluetooth.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bluetooth.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,26 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<g>
 <rect fill="none" height="60" width="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="30" x2="30" y1="7.35" y2="52.71">
-<stop offset="0" stop-color="#F2F2F2"/>
-<stop offset="0.25" stop-color="#4F88BD"/>
-<stop offset="0.73" stop-color="#0055A3"/>
-<stop offset="1" stop-color="#64AEFB"/>
+<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"/>
 </linearGradient>
-<path d="M29.998,7.346c-9.593,0-16.224,4.832-16.224,22.653c0,17.82,6.631,22.65,16.224,22.65 c9.592,0,16.223-4.83,16.223-22.65C46.221,12.178,39.59,7.346,29.998,7.346z" fill="url(#SVGID_1)"/>
-<radialGradient cx="31.02" cy="5.34" gradientUnits="userSpaceOnUse" id="SVGID_2" r="45.26">
-<stop offset="0" stop-color="#36B5FF"/>
-<stop offset="0.16" stop-color="#36B5FF"/>
-<stop offset="0.82" stop-color="#1B66D8"/>
-<stop offset="1" stop-color="#2183E0"/>
-</radialGradient>
-<path d="M29.998,51.895c-7.658,0-15.485-2.6-15.485-21.896S22.34,8.101,29.998,8.101 c7.657,0,15.485,2.602,15.485,21.898C45.482,49.295,37.654,51.895,29.998,51.895L29.998,51.895z" fill="url(#SVGID_2)"/>
-<path d="M39.953,22.475L28.574,10.828v15.348l-6.25-6.401l-2.283,2.331l7.857,8.059l-7.856,8.057l2.277,2.329 l6.256-6.399V49.5l11.378-11.645l-7.514-7.69L39.953,22.475z M35.409,22.501l-3.633,3.713l-0.005-7.432L35.409,22.501z M35.409,37.834l-3.638,3.709l0.006-7.431L35.409,37.834z" fill="#FFFFFF"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="30" x2="30" y1="10.83" y2="49.55">
-<stop offset="0" stop-color="#0B81FA"/>
-<stop offset="1" stop-color="#47DAFA"/>
+<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"/>
 </linearGradient>
-<path d="M28.884,11.593l10.629,10.882l-7.293,7.465l-0.219,0.225l0.219,0.225l7.293,7.464 L28.884,48.734V34.151v-0.765l-0.53,0.54l-6.036,6.175l-1.84-1.879l7.639-7.833l0.219-0.224l-0.219-0.224l-7.638-7.835l1.844-1.883 l6.031,6.177l0.53,0.542v-0.767V11.593 M31.469,26.979l0.527-0.541l3.633-3.714l0.219-0.223l-0.219-0.225l-3.638-3.719l-0.528-0.542 v0.766l0.004,7.432L31.469,26.979 M31.463,42.307l0.527-0.54l3.637-3.709l0.221-0.226l-0.221-0.223l-3.63-3.723l-0.529-0.541 l-0.001,0.766l-0.004,7.432V42.307 M28.574,10.828v15.348l-6.25-6.401l-2.283,2.331l7.857,8.059l-7.856,8.057l2.277,2.329 l6.256-6.399V49.5l11.378-11.645l-7.514-7.69l7.514-7.69L28.574,10.828L28.574,10.828z M31.777,26.214l-0.006-7.432l3.638,3.719 L31.777,26.214L31.777,26.214z M31.771,41.542l0.006-7.431l3.633,3.721L31.771,41.542L31.771,41.542z" fill="url(#SVGID_3)"/>
-<rect fill="none" height="59.997" width="59.996" y="0"/>
+<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"/>
+</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"/>
+<rect fill="none" height="60" width="60"/>
+</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bluetooth_active_connection.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,58 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
 <rect fill="none" height="60" width="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="30" x2="30" y1="7.35" y2="52.71">
-<stop offset="0" stop-color="#F2F2F2"/>
-<stop offset="0.25" stop-color="#4F88BD"/>
-<stop offset="0.73" stop-color="#0055A3"/>
-<stop offset="1" stop-color="#64AEFB"/>
+<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"/>
 </linearGradient>
-<path d="M29.998,7.346c-9.593,0-16.224,4.832-16.224,22.653c0,17.82,6.631,22.65,16.224,22.65 c9.592,0,16.223-4.83,16.223-22.65C46.221,12.178,39.59,7.346,29.998,7.346z" fill="url(#SVGID_1)"/>
-<radialGradient cx="31.02" cy="5.34" gradientUnits="userSpaceOnUse" id="SVGID_2" r="45.26">
-<stop offset="0" stop-color="#36B5FF"/>
-<stop offset="0.16" stop-color="#36B5FF"/>
-<stop offset="0.82" stop-color="#1B66D8"/>
-<stop offset="1" stop-color="#2183E0"/>
-</radialGradient>
-<path d="M29.998,51.895c-7.658,0-15.485-2.6-15.485-21.896S22.34,8.101,29.998,8.101 c7.657,0,15.485,2.602,15.485,21.898C45.482,49.295,37.654,51.895,29.998,51.895L29.998,51.895z" fill="url(#SVGID_2)"/>
-<path d="M39.953,22.475L28.574,10.828v15.348l-6.25-6.401l-2.283,2.331l7.857,8.059l-7.856,8.057l2.277,2.329 l6.256-6.399V49.5l11.378-11.645l-7.514-7.69L39.953,22.475z M35.409,22.501l-3.633,3.713l-0.005-7.432L35.409,22.501z M35.409,37.834l-3.638,3.709l0.006-7.431L35.409,37.834z" fill="#FFFFFF"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="30" x2="30" y1="10.83" y2="49.55">
-<stop offset="0" stop-color="#0B81FA"/>
-<stop offset="1" stop-color="#47DAFA"/>
+<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"/>
 </linearGradient>
-<path d="M28.884,11.593l10.629,10.882l-7.293,7.465l-0.219,0.225l0.219,0.225l7.293,7.464 L28.884,48.734V34.151v-0.765l-0.53,0.54l-6.036,6.175l-1.84-1.879l7.639-7.833l0.219-0.224l-0.219-0.224l-7.638-7.835l1.844-1.883 l6.031,6.177l0.53,0.542v-0.767V11.593 M31.469,26.979l0.527-0.541l3.633-3.714l0.219-0.223l-0.219-0.225l-3.638-3.719l-0.528-0.542 v0.766l0.004,7.432L31.469,26.979 M31.463,42.307l0.527-0.54l3.637-3.709l0.221-0.226l-0.221-0.223l-3.63-3.723l-0.529-0.541 l-0.001,0.766l-0.004,7.432V42.307 M28.574,10.828v15.348l-6.25-6.401l-2.283,2.331l7.857,8.059l-7.856,8.057l2.277,2.329 l6.256-6.399V49.5l11.378-11.645l-7.514-7.69l7.514-7.69L28.574,10.828L28.574,10.828z M31.777,26.214l-0.006-7.432l3.638,3.719 L31.777,26.214L31.777,26.214z M31.771,41.542l0.006-7.431l3.633,3.721L31.771,41.542L31.771,41.542z" fill="url(#SVGID_3)"/>
-<rect fill="none" height="59.997" width="59.996" y="0"/>
+<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"/>
+</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"/>
+<rect fill="none" height="60" width="60"/>
 </g>
 <g transform="matrix(1 0 0 1 30 30)">
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="11.3525" x2="11.3525" y1="16.041" y2="26.3361">
+<rect fill="none" height="30" width="30" x="0.002"/>
+<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"/>
 </linearGradient>
-<path d="M20.93,20.279c0,0.277-0.223,0.508-0.497,0.508h-7.751c-0.271,0-0.496,0.229-0.496,0.508v4.592  c0,0.279-0.163,0.35-0.359,0.156l-9.935-9.746c-0.198-0.193-0.135-0.352,0.138-0.352h18.403c0.272,0,0.497,0.229,0.497,0.508V20.279  z" fill="url(#SVGID_1_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="11.9546" x2="11.9546" y1="16.958" y2="24.3341">
+<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"/>
 </linearGradient>
-<path d="M3.98,16.945H19.93v2.842h-7.248c-0.824,0-1.496,0.676-1.496,1.508v2.719L3.98,16.945z" fill="url(#SVGID_2_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="18.6484" x2="18.6484" y1="3.875" y2="14.2085">
+<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"/>
 </linearGradient>
-<path d="M9.072,9.721c0-0.279,0.223-0.508,0.496-0.508h7.752c0.272,0,0.495-0.229,0.495-0.508l0.001-4.592  c0-0.281,0.162-0.35,0.359-0.156l9.934,9.744c0.198,0.193,0.135,0.352-0.138,0.352H9.568c-0.272,0-0.496-0.229-0.496-0.506V9.721z" fill="url(#SVGID_3_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="18.0469" x2="18.0469" y1="5.959" y2="13.0835">
+<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"/>
 </linearGradient>
-<path d="M10.072,13.053v-2.84h7.248c0.824,0,1.495-0.678,1.495-1.508l0.001-2.719l7.204,7.066H10.072z" fill="url(#SVGID_4_)"/>
-<rect fill="none" height="30" width="30"/>
+<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"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bluetooth_hide.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 fill-opacity="0.5" stroke-opacity="0.5">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<g fill-opacity="None" stroke-opacity="None">
 <rect fill="none" height="60" width="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="30" x2="30" y1="7.35" y2="52.71">
-<stop offset="0" stop-color="#F2F2F2"/>
-<stop offset="0.25" stop-color="#4F88BD"/>
-<stop offset="0.73" stop-color="#0055A3"/>
-<stop offset="1" stop-color="#64AEFB"/>
+<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"/>
 </linearGradient>
-<path d="M29.998,7.346c-9.593,0-16.224,4.832-16.224,22.653c0,17.82,6.631,22.65,16.224,22.65 c9.592,0,16.223-4.83,16.223-22.65C46.221,12.178,39.59,7.346,29.998,7.346z" fill="url(#SVGID_1)"/>
-<radialGradient cx="31.02" cy="5.34" gradientUnits="userSpaceOnUse" id="SVGID_2" r="45.26">
-<stop offset="0" stop-color="#36B5FF"/>
-<stop offset="0.16" stop-color="#36B5FF"/>
-<stop offset="0.82" stop-color="#1B66D8"/>
-<stop offset="1" stop-color="#2183E0"/>
-</radialGradient>
-<path d="M29.998,51.895c-7.658,0-15.485-2.6-15.485-21.896S22.34,8.101,29.998,8.101 c7.657,0,15.485,2.602,15.485,21.898C45.482,49.295,37.654,51.895,29.998,51.895L29.998,51.895z" fill="url(#SVGID_2)"/>
-<path d="M39.953,22.475L28.574,10.828v15.348l-6.25-6.401l-2.283,2.331l7.857,8.059l-7.856,8.057l2.277,2.329 l6.256-6.399V49.5l11.378-11.645l-7.514-7.69L39.953,22.475z M35.409,22.501l-3.633,3.713l-0.005-7.432L35.409,22.501z M35.409,37.834l-3.638,3.709l0.006-7.431L35.409,37.834z" fill="#FFFFFF"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="30" x2="30" y1="10.83" y2="49.55">
-<stop offset="0" stop-color="#0B81FA"/>
-<stop offset="1" stop-color="#47DAFA"/>
+<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"/>
 </linearGradient>
-<path d="M28.884,11.593l10.629,10.882l-7.293,7.465l-0.219,0.225l0.219,0.225l7.293,7.464 L28.884,48.734V34.151v-0.765l-0.53,0.54l-6.036,6.175l-1.84-1.879l7.639-7.833l0.219-0.224l-0.219-0.224l-7.638-7.835l1.844-1.883 l6.031,6.177l0.53,0.542v-0.767V11.593 M31.469,26.979l0.527-0.541l3.633-3.714l0.219-0.223l-0.219-0.225l-3.638-3.719l-0.528-0.542 v0.766l0.004,7.432L31.469,26.979 M31.463,42.307l0.527-0.54l3.637-3.709l0.221-0.226l-0.221-0.223l-3.63-3.723l-0.529-0.541 l-0.001,0.766l-0.004,7.432V42.307 M28.574,10.828v15.348l-6.25-6.401l-2.283,2.331l7.857,8.059l-7.856,8.057l2.277,2.329 l6.256-6.399V49.5l11.378-11.645l-7.514-7.69l7.514-7.69L28.574,10.828L28.574,10.828z M31.777,26.214l-0.006-7.432l3.638,3.719 L31.777,26.214L31.777,26.214z M31.771,41.542l0.006-7.431l3.633,3.721L31.771,41.542L31.771,41.542z" fill="url(#SVGID_3)"/>
-<rect fill="none" height="59.997" width="59.996" y="0"/>
+<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"/>
+</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"/>
+<rect fill="none" height="60" width="60"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bluetooth_multiple_connection.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bluetooth_multiple_connection.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bluetooth_multiple_connection.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,58 +1,60 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
 <rect fill="none" height="60" width="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="30" x2="30" y1="7.35" y2="52.71">
-<stop offset="0" stop-color="#F2F2F2"/>
-<stop offset="0.25" stop-color="#4F88BD"/>
-<stop offset="0.73" stop-color="#0055A3"/>
-<stop offset="1" stop-color="#64AEFB"/>
+<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"/>
 </linearGradient>
-<path d="M29.998,7.346c-9.593,0-16.224,4.832-16.224,22.653c0,17.82,6.631,22.65,16.224,22.65 c9.592,0,16.223-4.83,16.223-22.65C46.221,12.178,39.59,7.346,29.998,7.346z" fill="url(#SVGID_1)"/>
-<radialGradient cx="31.02" cy="5.34" gradientUnits="userSpaceOnUse" id="SVGID_2" r="45.26">
-<stop offset="0" stop-color="#36B5FF"/>
-<stop offset="0.16" stop-color="#36B5FF"/>
-<stop offset="0.82" stop-color="#1B66D8"/>
-<stop offset="1" stop-color="#2183E0"/>
-</radialGradient>
-<path d="M29.998,51.895c-7.658,0-15.485-2.6-15.485-21.896S22.34,8.101,29.998,8.101 c7.657,0,15.485,2.602,15.485,21.898C45.482,49.295,37.654,51.895,29.998,51.895L29.998,51.895z" fill="url(#SVGID_2)"/>
-<path d="M39.953,22.475L28.574,10.828v15.348l-6.25-6.401l-2.283,2.331l7.857,8.059l-7.856,8.057l2.277,2.329 l6.256-6.399V49.5l11.378-11.645l-7.514-7.69L39.953,22.475z M35.409,22.501l-3.633,3.713l-0.005-7.432L35.409,22.501z M35.409,37.834l-3.638,3.709l0.006-7.431L35.409,37.834z" fill="#FFFFFF"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="30" x2="30" y1="10.83" y2="49.55">
-<stop offset="0" stop-color="#0B81FA"/>
-<stop offset="1" stop-color="#47DAFA"/>
+<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"/>
 </linearGradient>
-<path d="M28.884,11.593l10.629,10.882l-7.293,7.465l-0.219,0.225l0.219,0.225l7.293,7.464 L28.884,48.734V34.151v-0.765l-0.53,0.54l-6.036,6.175l-1.84-1.879l7.639-7.833l0.219-0.224l-0.219-0.224l-7.638-7.835l1.844-1.883 l6.031,6.177l0.53,0.542v-0.767V11.593 M31.469,26.979l0.527-0.541l3.633-3.714l0.219-0.223l-0.219-0.225l-3.638-3.719l-0.528-0.542 v0.766l0.004,7.432L31.469,26.979 M31.463,42.307l0.527-0.54l3.637-3.709l0.221-0.226l-0.221-0.223l-3.63-3.723l-0.529-0.541 l-0.001,0.766l-0.004,7.432V42.307 M28.574,10.828v15.348l-6.25-6.401l-2.283,2.331l7.857,8.059l-7.856,8.057l2.277,2.329 l6.256-6.399V49.5l11.378-11.645l-7.514-7.69l7.514-7.69L28.574,10.828L28.574,10.828z M31.777,26.214l-0.006-7.432l3.638,3.719 L31.777,26.214L31.777,26.214z M31.771,41.542l0.006-7.431l3.633,3.721L31.771,41.542L31.771,41.542z" fill="url(#SVGID_3)"/>
-<rect fill="none" height="59.997" width="59.996" y="0"/>
+<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"/>
+</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"/>
+<rect fill="none" height="60" width="60"/>
 </g>
 <g transform="matrix(1 0 0 1 30 30)">
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="18" x2="18" y1="3.8481" y2="14.1812">
+<rect fill="none" height="30" width="30" x="0.002"/>
+<path d="M29.587,12.96l-9.934-9.744C19.32,2.889,18.979,2.82,18.75,2.82c-0.561,0-1.156,0.443-1.156,1.266  l-0.002,3.91l-4.872-4.78c-0.333-0.327-0.675-0.396-0.903-0.396c-0.561,0-1.156,0.443-1.156,1.266l-0.002,4.1h-3.16  c-0.824,0-1.496,0.677-1.496,1.508v3.826c0,0.7,0.48,1.285,1.125,1.453H1.256c-0.549,0-0.986,0.271-1.172,0.724  c-0.185,0.455-0.061,0.956,0.333,1.342l9.934,9.744c0.334,0.327,0.676,0.396,0.904,0.396c0.56,0,1.155-0.443,1.155-1.266l0.002-3.91  l4.872,4.78c0.334,0.327,0.676,0.396,0.904,0.396c0.56,0,1.155-0.443,1.155-1.266l0.002-4.1h3.16c0.824,0,1.496-0.677,1.496-1.508  v-3.826c0-0.7-0.48-1.285-1.125-1.453h5.871c0.549,0,0.986-0.271,1.172-0.724C30.104,13.847,29.98,13.346,29.587,12.96z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="18.002" x2="18.002" y1="3.8481" y2="14.1812">
 <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"/>
 </linearGradient>
-<path d="M28.885,13.674L18.951,3.93c-0.197-0.193-0.359-0.123-0.359,0.156L18.59,8.678  c0,0.279-0.223,0.508-0.494,0.508h-0.721L12.018,3.93c-0.197-0.193-0.359-0.123-0.359,0.156l-0.002,4.592  c0,0.279-0.223,0.508-0.494,0.508h-0.6H7.496C7.223,9.186,7,9.414,7,9.693v3.826c0,0.277,0.224,0.506,0.496,0.506h3.066h11.031  h7.152C29.02,14.025,29.082,13.867,28.885,13.674z" fill="url(#SVGID_1_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="17.3975" x2="17.3975" y1="5.978" y2="13.133">
+<path d="M28.887,13.674L18.953,3.93c-0.197-0.193-0.359-0.123-0.359,0.156l-0.002,4.592  c0,0.279-0.223,0.508-0.494,0.508h-0.721L12.02,3.93c-0.197-0.193-0.359-0.123-0.359,0.156l-0.002,4.592  c0,0.279-0.223,0.508-0.494,0.508h-0.6H7.498c-0.273,0-0.496,0.229-0.496,0.508v3.826c0,0.277,0.224,0.506,0.496,0.506h3.066h11.031  h7.152C29.021,14.025,29.084,13.867,28.887,13.674z" fill="url(#SVGID_1__)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="17.3994" x2="17.3994" y1="5.978" y2="13.133">
 <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"/>
 </linearGradient>
-<path d="M8,13.025v-2.84h3.162c0.824,0,1.494-0.676,1.494-1.508l0.002-2.719l4.309,4.227h1.129  c0.824,0,1.494-0.676,1.494-1.508l0.002-2.719l7.203,7.066H8z" fill="url(#SVGID_2_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="11.9995" x2="11.9995" y1="16.0342" y2="26.3792">
+<path d="M8.002,13.025v-2.84h3.162c0.824,0,1.494-0.676,1.494-1.508l0.002-2.719l4.309,4.227h1.129  c0.824,0,1.494-0.676,1.494-1.508l0.002-2.719l7.203,7.066H8.002z" fill="url(#SVGID_2__)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="12.002" x2="12.002" y1="16.0352" y2="26.3801">
 <stop offset="0" style="stop-color:#CDEDBD"/>
 <stop offset="0.9879" style="stop-color:#139900"/>
 <stop offset="1" style="stop-color:#139900"/>
 </linearGradient>
-<path d="M1.115,16.324l9.934,9.744c0.197,0.193,0.359,0.125,0.359-0.156l0.002-4.592  c0-0.279,0.223-0.508,0.494-0.508h0.721l5.357,5.256c0.197,0.193,0.359,0.125,0.359-0.156l0.002-4.592  c0-0.279,0.223-0.508,0.494-0.508h0.6h3.066c0.273,0,0.496-0.229,0.496-0.508v-3.826c0-0.277-0.224-0.506-0.496-0.506h-3.066H8.406  H1.254C0.98,15.973,0.918,16.131,1.115,16.324z" fill="url(#SVGID_3_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="12.6021" x2="12.6021" y1="16.9727" y2="24.1645">
+<path d="M1.117,16.324l9.934,9.744c0.197,0.193,0.359,0.125,0.359-0.156l0.002-4.592  c0-0.279,0.223-0.508,0.494-0.508h0.721l5.357,5.256c0.197,0.193,0.359,0.125,0.359-0.156l0.002-4.592  c0-0.279,0.223-0.508,0.494-0.508h0.6h3.066c0.273,0,0.496-0.229,0.496-0.508v-3.826c0-0.277-0.224-0.506-0.496-0.506h-3.066H8.408  H1.256C0.982,15.973,0.92,16.131,1.117,16.324z" fill="url(#SVGID_3__)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="12.6045" x2="12.6045" y1="16.9727" y2="24.1645">
 <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"/>
 </linearGradient>
-<path d="M22,16.973v2.84h-3.162c-0.824,0-1.494,0.678-1.494,1.508l-0.002,2.719l-4.309-4.227h-1.129  c-0.824,0-1.494,0.678-1.494,1.508l-0.002,2.719l-7.203-7.066H22z" fill="url(#SVGID_4_)"/>
-<rect fill="none" height="30" width="30"/>
+<path d="M22.002,16.973v2.84H18.84c-0.824,0-1.494,0.678-1.494,1.508l-0.002,2.719l-4.309-4.227h-1.129  c-0.824,0-1.494,0.678-1.494,1.508l-0.002,2.719l-7.203-7.066H22.002z" fill="url(#SVGID_4_)"/>
+<rect fill="none" height="30" width="30" x="0.002"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bluetooth_off.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,37 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
 <rect fill="none" height="60" width="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="30" x2="30" y1="7.35" y2="52.71">
-<stop offset="0" stop-color="#F2F2F2"/>
-<stop offset="0.25" stop-color="#4F88BD"/>
-<stop offset="0.73" stop-color="#0055A3"/>
-<stop offset="1" stop-color="#64AEFB"/>
+<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"/>
 </linearGradient>
-<path d="M29.998,7.346c-9.593,0-16.224,4.832-16.224,22.653c0,17.82,6.631,22.65,16.224,22.65 c9.592,0,16.223-4.83,16.223-22.65C46.221,12.178,39.59,7.346,29.998,7.346z" fill="url(#SVGID_1)"/>
-<radialGradient cx="31.02" cy="5.34" gradientUnits="userSpaceOnUse" id="SVGID_2" r="45.26">
-<stop offset="0" stop-color="#36B5FF"/>
-<stop offset="0.16" stop-color="#36B5FF"/>
-<stop offset="0.82" stop-color="#1B66D8"/>
-<stop offset="1" stop-color="#2183E0"/>
-</radialGradient>
-<path d="M29.998,51.895c-7.658,0-15.485-2.6-15.485-21.896S22.34,8.101,29.998,8.101 c7.657,0,15.485,2.602,15.485,21.898C45.482,49.295,37.654,51.895,29.998,51.895L29.998,51.895z" fill="url(#SVGID_2)"/>
-<path d="M39.953,22.475L28.574,10.828v15.348l-6.25-6.401l-2.283,2.331l7.857,8.059l-7.856,8.057l2.277,2.329 l6.256-6.399V49.5l11.378-11.645l-7.514-7.69L39.953,22.475z M35.409,22.501l-3.633,3.713l-0.005-7.432L35.409,22.501z M35.409,37.834l-3.638,3.709l0.006-7.431L35.409,37.834z" fill="#FFFFFF"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="30" x2="30" y1="10.83" y2="49.55">
-<stop offset="0" stop-color="#0B81FA"/>
-<stop offset="1" stop-color="#47DAFA"/>
+<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"/>
 </linearGradient>
-<path d="M28.884,11.593l10.629,10.882l-7.293,7.465l-0.219,0.225l0.219,0.225l7.293,7.464 L28.884,48.734V34.151v-0.765l-0.53,0.54l-6.036,6.175l-1.84-1.879l7.639-7.833l0.219-0.224l-0.219-0.224l-7.638-7.835l1.844-1.883 l6.031,6.177l0.53,0.542v-0.767V11.593 M31.469,26.979l0.527-0.541l3.633-3.714l0.219-0.223l-0.219-0.225l-3.638-3.719l-0.528-0.542 v0.766l0.004,7.432L31.469,26.979 M31.463,42.307l0.527-0.54l3.637-3.709l0.221-0.226l-0.221-0.223l-3.63-3.723l-0.529-0.541 l-0.001,0.766l-0.004,7.432V42.307 M28.574,10.828v15.348l-6.25-6.401l-2.283,2.331l7.857,8.059l-7.856,8.057l2.277,2.329 l6.256-6.399V49.5l11.378-11.645l-7.514-7.69l7.514-7.69L28.574,10.828L28.574,10.828z M31.777,26.214l-0.006-7.432l3.638,3.719 L31.777,26.214L31.777,26.214z M31.771,41.542l0.006-7.431l3.633,3.721L31.771,41.542L31.771,41.542z" fill="url(#SVGID_3)"/>
-<rect fill="none" height="59.997" width="59.996" y="0"/>
+<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"/>
+</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"/>
+<rect fill="none" height="60" width="60"/>
 </g>
 <g transform="matrix(2 0 0 2 0 0)">
-<linearGradient gradientTransform="matrix(1 0 0 -1 -257 -316)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="261.2295" x2="282.7705" y1="-330.6934" y2="-330.6934">
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_1_)" points="24.702,25.229 4.229,5.254 5.299,4.158 25.771,24.133 "/>
-<rect fill="none" height="30" width="30.001"/>
+<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"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_browser.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_browser.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_browser.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,50 +1,63 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
 <rect fill="none" height="60" width="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="30" x2="30" y1="51.18" y2="8.63">
-<stop offset="0" stop-color="#004E8C"/>
-<stop offset="1" stop-color="#1B66D8"/>
+<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"/>
 </linearGradient>
-<circle cx="30" cy="30" fill="url(#SVGID_1)" r="21.429"/>
-<radialGradient cx="29.7" cy="22.59" gradientUnits="userSpaceOnUse" id="SVGID_2" r="25.8">
-<stop offset="0" stop-color="#94FFFF"/>
-<stop offset="0.5" stop-color="#36B5FF"/>
-<stop offset="1" stop-color="#1B66D8"/>
+<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"/>
 </radialGradient>
-<circle cx="30" cy="30" fill="url(#SVGID_2)" r="20.88"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="30" x2="30" y1="8.94" y2="50.99">
-<stop offset="0" stop-color="#31A7F8"/>
-<stop offset="0.5" stop-color="#1E74DC"/>
-<stop offset="1" stop-color="#88D6EB"/>
+<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"/>
 </linearGradient>
-<path d="M30.001,9.121C18.468,9.121,9.119,18.471,9.119,30 c0,11.533,9.349,20.879,20.882,20.879S50.88,41.533,50.88,30C50.88,18.471,41.534,9.121,30.001,9.121z M30.001,49.051 c-10.843,0-19.663-8.818-19.663-19.658c0-10.844,8.82-19.662,19.663-19.662c10.841,0,19.66,8.818,19.66,19.662 C49.661,40.232,40.842,49.051,30.001,49.051z" fill="url(#SVGID_3)" fill-opacity="0.3"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="9.46" x2="12.78" y1="32.84" y2="32.84">
-<stop offset="0" stop-color="#58595B"/>
-<stop offset="1" stop-color="#000000"/>
+<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="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="1" style="stop-color:#000000"/>
 </linearGradient>
-<path d="M11.08,29.66c-0.223-0.295-0.725-0.295-0.946-0.295c-0.437,0-0.669,0.311-0.673,0.615 v0.021l0.001,0.031c-0.001,0.537,0.029,1.139,0.094,1.871c0.013,0.137,0.029,0.275,0.047,0.414l0.024,0.201 c0.056,0.434,0.121,0.861,0.195,1.273l0.034,0.182c0.032,0.164,0.063,0.324,0.098,0.484c0.09,0.406,0.198,0.826,0.332,1.291 c0.02,0.066,0.037,0.135,0.055,0.199c0.028,0.109,0.058,0.217,0.091,0.322l0.005,0.014l0.012,0.033 c-0.003-0.008-0.008-0.023-0.01-0.037l1.197-0.08c0.02-0.188,0.025-0.381,0.02-0.576c-0.01-0.303-0.021-0.676-0.107-0.99 l1.112-1.494l0.12-0.162v-0.203v-1.162v-0.254l-0.179-0.178L11.08,29.66z" fill="url(#SVGID_4)" fill-opacity="0.3"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="15.86" x2="50.59" y1="26.76" y2="26.76">
-<stop offset="0" stop-color="#58595B"/>
-<stop offset="1" stop-color="#000000"/>
-</linearGradient>
-<path d="M50.584,25.908c-0.015-0.078-0.029-0.135-0.043-0.191 c-0.011-0.041-0.021-0.084-0.029-0.123c-0.106-0.496-0.237-1.006-0.392-1.527l-0.018-0.057c-0.032-0.117-0.067-0.234-0.104-0.35 c-0.188-0.586-0.393-1.148-0.608-1.666c-0.027-0.064-0.057-0.125-0.084-0.188l-0.045-0.1c-0.207-0.475-0.436-0.947-0.677-1.402 l-0.03-0.059c-0.047-0.09-0.093-0.182-0.142-0.27c-0.296-0.533-0.604-1.041-0.918-1.512c-0.032-0.049-0.069-0.102-0.106-0.154 c-0.023-0.031-0.045-0.061-0.066-0.092c-0.302-0.438-0.618-0.863-0.946-1.268l-0.064-0.082c-0.044-0.055-0.088-0.111-0.134-0.166 c-0.381-0.457-0.783-0.898-1.199-1.318c-0.056-0.055-0.115-0.113-0.176-0.172l-0.049-0.047c-0.375-0.367-0.774-0.73-1.184-1.072 l-0.08-0.07c-0.041-0.037-0.083-0.072-0.125-0.105c-0.446-0.367-0.931-0.729-1.436-1.076c-0.062-0.041-0.125-0.084-0.189-0.123 l-0.076-0.051c-0.455-0.301-0.93-0.59-1.405-0.854l-0.073-0.041c-0.039-0.023-0.078-0.045-0.118-0.068 c-0.529-0.283-1.081-0.551-1.643-0.791l-0.142-0.059l-0.153-0.063c-0.148-0.061-0.297-0.113-0.443-0.166 c-0.077-0.025-0.152-0.053-0.228-0.08l-0.283-0.105l-0.254,0.162c-0.17,0.107-0.84,0.49-1.235,0.715 c-0.438-0.059-1.499-0.191-2.57-0.295c0.33-0.033,0.786-0.07,1.43-0.111l0.09-1.203l-0.047-0.014 c-0.039-0.01-0.077-0.02-0.116-0.027L34.38,9.65l-0.075-0.016c-0.655-0.131-1.271-0.227-1.882-0.291h-0.004l-0.085-0.008 c-0.698-0.072-1.409-0.107-2.112-0.107c-0.621,0-1.262,0.033-1.964,0.1c-0.108,0.01-0.214,0.021-0.321,0.033 c-0.693,0.078-1.3,0.17-1.873,0.285l-0.02,0.004l-0.015,0.002c-0.604,0.125-1.211,0.281-1.856,0.479 c-0.058,0.018-0.116,0.037-0.174,0.055l-0.13,0.043c-0.547,0.176-1.082,0.371-1.596,0.582c-0.042,0.018-0.071,0.029-0.1,0.039 l-0.078,0.031c-0.564,0.24-1.128,0.512-1.688,0.813c-0.06,0.031-0.118,0.066-0.177,0.1l-0.072,0.041 c-0.157,0.088-0.315,0.186-0.473,0.283l-0.203,0.127l-1.118,0.684l1.242,0.416c0.186,0.063,0.385,0.094,0.592,0.094 c0.67,0,1.317-0.33,1.838-0.594c0.209-0.105,0.521-0.264,0.648-0.289c0.152,0.047,0.306,0.068,0.458,0.068 c0.568,0,1.035-0.307,1.446-0.578l0.111-0.07c0.134-0.043,0.362-0.129,0.818-0.299c0.465-0.176,1.314-0.494,1.54-0.547 c0.44-0.006,0.966-0.068,1.339-0.301c0.352,0.059,0.976,0.156,1.619,0.24c-0.047,0.029-0.093,0.059-0.132,0.098 c-0.209,0.191-1.335,0.533-1.68,0.578c-0.648,0.08-0.908,0.406-1.012,0.666c-0.135,0.336-0.054,0.672,0.078,0.945 c-0.245,0.162-0.545,0.342-0.804,0.479c0.001-0.006,0.003-0.012,0.004-0.02c0.093-0.518,0.16-0.891-0.091-1.189 c-0.128-0.154-0.317-0.24-0.518-0.24c-0.296,0-0.526,0.182-0.712,0.361c-0.519,0.502-0.833,1.129-0.952,1.365l-0.022,0.043 l-0.019,0.035c-0.225,0.432-0.317,0.736-0.191,1.689c-0.057,0.039-0.22,0.102-0.446,0.102c-0.03,0-0.058-0.002-0.079-0.004 c-0.146-0.158-0.349-0.248-0.576-0.248l0,0c-0.524,0-1.238,0.59-2.123,1.754l-0.284,0.375l0.289,0.371l0.269,0.342 c-4.215,3.26-4.246,3.445-4.291,3.717c-0.008,0.025-0.045,0.139-0.095,0.293c-0.628,1.953-0.977,3.414-0.638,4.195 c0.785,1.813,1.67,3.506,2.816,3.598c0.101,0.01,0.212,0.012,0.332,0.012c1.051,0,2.753-0.316,3.571-0.484 c0.151,0.283,0.335,0.615,0.437,0.795l0.182,0.322l0.37-0.012c0,0,0.2-0.006,0.448-0.006c0.287,0,0.478,0.008,0.602,0.018 c0.447,1.307,1.3,4.318,1.142,4.943l-0.003,0.002c-1.441,2.16,0.306,4.975,1.145,6.328c0.066,0.107,0.126,0.203,0.177,0.287 c0.324,0.922,0.716,1.531,1.545,1.531c0.062,0,0.124-0.004,0.188-0.006c0.047-0.004,0.096-0.006,0.146-0.006 c0.092,0,0.157,0.012,0.225,0.035l0.076,0.027l0.08,0.008c0.155,0.012,0.306,0.033,0.453,0.055c0.255,0.035,0.519,0.07,0.788,0.07 c0.721,0,1.293-0.271,1.787-0.855c0.019-0.002,0.036-0.004,0.054-0.006c0.519-0.072,0.713-0.332,0.779-0.564 c0.039-0.039,0.09-0.086,0.131-0.125c0.204-0.188,0.447-0.41,0.615-0.674c0.076-0.045,0.161-0.096,0.258-0.152 c0.167-0.104,0.355-0.217,0.504-0.293c0.131-0.039,0.246-0.117,0.334-0.225c0.209-0.256,0.166-0.549,0.131-0.783 c-0.035-0.242-0.071-0.49,0.06-0.758c0.738-0.355,2.051-1.23,2.263-1.373L37.627,38.5c-0.014,0.117-0.048,0.432-0.101,0.629 c-0.279,0.279-0.512,0.703-0.586,0.846l-0.048,0.094l-0.015,0.104c-0.019,0.137-0.094,0.85,0.306,1.311 c0.202,0.23,0.49,0.359,0.813,0.359c0.103,0,0.21-0.014,0.319-0.039c1.027-0.232,2.85-2.701,2.998-4.064 c0.072-0.658-0.185-1.174-0.704-1.418l-0.387-0.184l-0.304,0.303l-1.125,1.125c-0.381,0.035-0.678,0.148-0.879,0.326 c0.012-0.48-0.035-0.973-0.086-1.451c-0.155-1.447-0.185-2.369,0.703-2.996l0.045-0.033l0.039-0.039 c0.32-0.326,0.675-0.611,1.051-0.914c0.88-0.705,1.79-1.436,2.332-2.758l0.022-0.057c0.174-0.451,0.437-1.131,0.081-1.65 c-0.088-0.129-0.275-0.326-0.623-0.398c0.461-0.184,0.815-0.332,0.85-0.344l0.107-0.045l0.083-0.08l1.898-1.822l0.278-0.268 l-0.122-0.367c-0.017-0.047-0.12-0.334-0.411-0.746c0.554,0.074,1.029,0.207,1.185,0.326c0.057,0.123,0.171,0.396,0.292,0.682 c2.089,4.926,2.382,5.178,2.926,5.188c0.021,0,0.037,0.002,0.051,0.004c0.043,0.002,0.083,0.004,0.119,0.004 c0.31,0,0.486-0.158,0.564-0.252c0.227-0.273,0.163-0.609,0.14-0.734l-0.009-0.043c-0.025-0.295-0.008-1.619,0.034-2.707 c0.003,0.004,0.004,0.006,0.006,0.01l1.12-0.445L50.584,25.908z M34.126,19.885c-0.087,0.004-0.182,0.01-0.282,0.012 c-0.322,0.016-0.688,0.031-1.053,0.031c-0.956,0-1.174-0.117-1.196-0.131c-0.113-0.082-0.229-0.143-0.35-0.188 c0.216-0.049,0.464-0.215,0.719-0.709c0.251,0.488,0.592,0.918,1.115,0.918c0.141,0,0.277-0.033,0.406-0.1 C33.661,19.721,33.951,19.82,34.126,19.885z M33.751,17.221c-0.072,0-0.131-0.004-0.176-0.006c0.049-0.129,0.107-0.203,0.154-0.244 c0.06,0.092,0.141,0.174,0.232,0.244C33.888,17.219,33.817,17.221,33.751,17.221z M29.948,18.5c0.327,0.641,0.569,0.916,0.762,1.037 c-0.475,0.037-0.832,0.338-1.126,0.625c-0.206-0.068-0.565-0.287-0.672-0.438c-0.063-0.09-0.138-0.166-0.221-0.232 C29.211,19.344,29.667,18.861,29.948,18.5z M28.141,18.027l-0.679-0.033l-2.278-0.111c0.278-0.229,0.542-0.443,0.696-0.57 c0.043-0.016,0.205-0.061,0.607-0.061c0.241,0,0.473,0.018,0.619,0.029L28.141,18.027z" fill="url(#SVGID_5)" fill-opacity="0.3"/>
-<radialGradient cx="30.36" cy="15.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"/>
+<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"/>
+</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"/>
 </radialGradient>
-<path d="M10.069,29.988c0,0,0,0,0,0.002c0,0.006,0.001,0.01,0.001,0.016c0,0.623,0.039,1.236,0.093,1.844 c0.018,0.199,0.047,0.398,0.069,0.6c0.053,0.416,0.116,0.828,0.19,1.236c0.041,0.215,0.081,0.434,0.127,0.646 c0.094,0.422,0.203,0.838,0.322,1.248c0.049,0.17,0.088,0.342,0.14,0.508c0.007,0.018,0.015,0.033,0.019,0.053 c0.017-0.162,0.021-0.328,0.017-0.496c-0.04-1.201-0.232-1.047-0.232-1.047l1.356-1.822v-1.162l-1.59-1.59 C10.581,30.023,10.07,29.943,10.069,29.988z" fill="url(#SVGID_6)"/>
-<path d="M22.83,11.963c0.587,0.193,1.066-0.199,1.613-0.549c0.193-0.039,2.338-0.895,2.57-0.895 c0.231,0,1.011-0.031,1.204-0.34c0,0,3.357,0.584,3.863,0.389c0.275-0.107,1.432-0.201,2.425-0.266 c-0.056-0.012-0.106-0.027-0.162-0.039c-0.054-0.012-0.106-0.02-0.161-0.031c-0.623-0.125-1.252-0.225-1.894-0.289 c0,0-0.01,0-0.016-0.002c-0.674-0.068-1.358-0.104-2.052-0.104c-0.644,0-1.277,0.037-1.906,0.098 c-0.11,0.01-0.221,0.021-0.332,0.035c-0.607,0.066-1.21,0.154-1.8,0.273c-0.01,0.004-0.021,0.004-0.031,0.006 c-0.612,0.127-1.213,0.283-1.802,0.463c-0.102,0.031-0.199,0.064-0.302,0.096c-0.522,0.17-1.038,0.357-1.544,0.564 c-0.06,0.027-0.119,0.049-0.18,0.072c-0.557,0.238-1.1,0.502-1.63,0.785c-0.08,0.043-0.156,0.088-0.235,0.133 c-0.227,0.127-0.439,0.268-0.659,0.402C20.892,13.129,22.253,11.768,22.83,11.963z" fill="url(#SVGID_6)"/>
-<radialGradient cx="30.36" cy="15.27" gradientUnits="userSpaceOnUse" id="SVGID_8" r="23.56">
-<stop offset="0" stop-color="#B2F56E"/>
-<stop offset="0.32" stop-color="#B2F56E"/>
-<stop offset="0.73" stop-color="#5CBF1B"/>
-<stop offset="1" stop-color="#227A00"/>
+<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"/>
 </radialGradient>
-<path d="M49.983,26.01c-0.021-0.102-0.049-0.197-0.069-0.297c-0.106-0.498-0.233-0.99-0.378-1.473 c-0.038-0.131-0.076-0.264-0.117-0.395c-0.176-0.549-0.372-1.09-0.592-1.617c-0.039-0.092-0.084-0.184-0.124-0.273 c-0.202-0.465-0.421-0.92-0.657-1.363c-0.055-0.107-0.109-0.217-0.166-0.32c-0.279-0.502-0.575-0.992-0.893-1.469 c-0.054-0.082-0.115-0.16-0.17-0.242c-0.291-0.422-0.596-0.832-0.916-1.229c-0.064-0.078-0.127-0.16-0.194-0.24 c-0.368-0.441-0.756-0.867-1.161-1.277c-0.069-0.07-0.143-0.139-0.215-0.207c-0.369-0.363-0.756-0.715-1.152-1.049 c-0.068-0.055-0.132-0.115-0.199-0.17c-0.448-0.365-0.914-0.715-1.395-1.043c-0.084-0.057-0.17-0.113-0.256-0.168 c-0.442-0.293-0.898-0.57-1.365-0.83c-0.064-0.033-0.124-0.072-0.188-0.107c-0.52-0.277-1.05-0.533-1.594-0.768 c-0.097-0.041-0.195-0.078-0.29-0.119c-0.212-0.088-0.432-0.156-0.646-0.236c-0.255,0.164-1.438,0.832-1.438,0.832 s-5.141-0.701-5.491-0.352c-0.351,0.352-1.721,0.711-2.034,0.75c-0.309,0.041-0.955,0.207-0.181,1.162 c-0.116,0.117-2.325,1.656-2.325,0.957c0-0.701,0.494-1.953-0.2-1.283c-0.498,0.482-0.796,1.135-0.86,1.258 c-0.162,0.313-0.263,0.461-0.145,1.357c0.118,0.895-1.43,0.891-1.534,0.658c-0.276-0.621-1.809,1.395-1.809,1.395l0.646,0.828 c0,0-4.51,3.473-4.548,3.707c-0.039,0.234-1.164,3.25-0.775,4.146c0.39,0.898,1.375,3.158,2.307,3.232 c1.221,0.102,4.186-0.559,4.186-0.559c0.08,0.197,0.638,1.191,0.638,1.191s1.452-0.049,1.534,0.109 c0.026,0.053,1.75,5.121,1.182,5.793c-1.357,2.033,0.775,5.012,1.369,6.02c0.594,1.73,0.977,0.955,1.758,1.24 c0.962,0.082,1.772,0.438,2.589-0.613c0.237-0.195,0.641-0.041,0.641-0.313c0-0.15,0.698-0.598,0.878-1.018 c0.188-0.088,0.674-0.414,1.003-0.572c0.299-0.02-0.283-0.818,0.309-1.666c0.64-0.252,2.364-1.414,2.364-1.414 c0.078-1.705-0.839-3.811,0.873-5.02c1.104-1.125,2.553-1.766,3.255-3.479c0.194-0.506,0.628-1.541-0.62-1.23 c-1.172,0.295-2.479,0.361-1.861-0.154c-0.07-0.635-0.85-0.932-1.549-1.551c-0.361-0.855-0.93-2.379-0.93-2.379l-1.24-1.885 l0.155-0.389l1.474,2.17l1.474,1.781c0.542,1.783,1.007,1.939,1.007,1.939c0.816-0.287,2.752-1.084,2.752-1.084l1.899-1.822 c0,0-0.195-0.582-0.967-1.318l-0.584-0.348c-0.126,0.357-0.802,0.49-0.802,0.49l-1.641-1.963l0.61-0.123l0.471,0.895l1.128,0.391 c0,0,0.313-0.229,0.893,0.371c0.473-0.039,2.318,0.09,2.749,0.637c0.085,0.107,2.286,5.605,2.721,5.613 c0.19,0.002,0.329,0.076,0.267-0.256c-0.078-0.156,0-3.609,0.116-4.35c0.295-0.627,0.343-0.002,1.04,1.189 C49.991,26.068,49.989,26.039,49.983,26.01z M30.61,12.688c0.154-0.459,1.047-0.615,1.047-0.615s-0.256,0.473-0.197,0.717 c0.06,0.246-0.408,0.4-0.46,0.98c-0.051,0.578-1.117,0.24-1.204,0.037C29.708,13.604,30.453,13.145,30.61,12.688z M34.434,20.488 c-0.661,0-2.645,0.195-3.19-0.193s-0.97,0.039-1.363,0.43c-0.257,0.252-1.193-0.26-1.467-0.65c-0.271-0.391-1.188-0.361-1.188-0.361 l0.208-1.111l-2.637-0.127l-1.499,0.439l-1.41,0.039l0.79-0.375l0.983-0.232c0,0,1.431-1.176,1.859-1.525 c0.363-0.297,1.811-0.131,1.811-0.131l1.589,1.146c0,0-0.353,0.898-0.508,1.09c0.582-0.037,1.27-1.098,1.27-1.098 c-1.24-1.139-1.189-1.525-1.189-1.525l1.633,1.146l0.016,0.01c0,0,0.661,1.559,0.937,1.559c0.271,0,0.619-1.072,0.619-1.072 l0.465-0.117c0.207,0.49,0.595,1.602,1.059,1.342c0.269-0.146,0.71-0.014,1.215,0.182c0.509,0.193,0.854-0.105,1.267,0.258 C35.647,21.213,34.707,20.566,34.434,20.488z M35.471,17.807c-0.681-0.26-2.984,0.586-2.47-0.795 c0.275-0.748,0.98-0.902,1.223-0.406c0.063,0.203,0.83,0.52,0.824,0.09c-0.006-0.432,0.771-0.658,0.883-0.338 C35.517,16.654,37.55,18.205,35.471,17.807z M39.81,19.117c-0.377-0.305,0.169-0.564-0.387-1.041 c-0.799-0.684-1.421-0.979-0.334-1.531c1.341-0.17,0.217,0.428,0.44,0.785c0.119,0.189,0.796,0.828,1.325,1.609 C41.294,19.59,40.185,19.42,39.81,19.117z" fill="url(#SVGID_8)"/>
-<path d="M40.351,36.871l-1.293,1.293c0,0-0.778,0-0.815,0.311c-0.017,0.133-0.063,0.709-0.192,1.006 c-0.258,0.18-0.569,0.775-0.569,0.775s-0.159,1.15,0.699,0.955S41.677,37.496,40.351,36.871z" fill="url(#SVGID_6)"/>
+<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"/>
+</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"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_calculator.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_calculator.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_calculator.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,178 +1,276 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<g>
+<rect fill="none" height="60" width="60"/>
 <rect fill="none" height="60" width="60"/>
-<rect fill="none" height="59.996" width="59.996"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="30.3" x2="30.3" y1="21.02" y2="51.38">
-<stop offset="0" stop-color="#B5B9BC"/>
-<stop offset="0.82" stop-color="#7C7E87"/>
-<stop offset="1" stop-color="#94979D"/>
+<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"/>
+</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">
+<stop offset="0" style="stop-color:#6B6B6B"/>
+<stop offset="0.7212" style="stop-color:#363636"/>
+<stop offset="0.9636" style="stop-color:#5E5E5E"/>
+<stop offset="1" style="stop-color:#5E5E5E"/>
 </linearGradient>
-<path d="M12.856,21.427V50.2c0,0.677,0.548,1.225,1.224,1.225h32.447c0.676,0,1.225-0.548,1.225-1.225 V21.427H12.856z" fill="url(#SVGID_1)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="30.3" x2="30.3" y1="21.02" y2="51.38">
-<stop offset="0" stop-color="#6B6B6B"/>
-<stop offset="0.72" stop-color="#363636"/>
-<stop offset="0.96" stop-color="#5E5E5E"/>
-<stop offset="1" stop-color="#5E5E5E"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M47.14,21.427v0.612v27.549V50.2c0,0.338-0.274,0.612-0.612,0.612H14.081 c-0.337,0-0.612-0.274-0.612-0.612v-0.612V22.039v-0.612h-0.612V50.2c0,0.677,0.548,1.225,1.224,1.225h32.447 c0.676,0,1.225-0.548,1.225-1.225V21.427H47.14z" fill="url(#SVGID_2)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="30.3" x2="30.3" y1="21.02" y2="50.77">
-<stop offset="0" stop-color="#D1D7D9"/>
-<stop offset="0.07" stop-color="#D1D7D9"/>
-<stop offset="0.26" stop-color="#CED3D6"/>
-<stop offset="0.66" stop-color="#CEDBE0"/>
-<stop offset="1" stop-color="#ADB3B5"/>
+<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"/>
+</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">
+<stop offset="0" style="stop-color:#6B6B6B"/>
+<stop offset="0.7212" style="stop-color:#363636"/>
+<stop offset="0.9636" style="stop-color:#5E5E5E"/>
+<stop offset="1" style="stop-color:#5E5E5E"/>
 </linearGradient>
-<path d="M46.527,21.729V50.2H14.121l0.017-28.773h-0.669V50.2 c0,0.339,0.316,0.612,0.653,0.612h32.406c0.338,0,0.611-0.273,0.611-0.612V21.729H46.527z" fill="url(#SVGID_3)" fill-opacity="0.6" stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="30.3" x2="30.3" y1="6.71" y2="21.4">
-<stop offset="0" stop-color="#B5B9BC"/>
-<stop offset="0.82" stop-color="#7C7E87"/>
-<stop offset="1" stop-color="#94979D"/>
+<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"/>
 </linearGradient>
-<path d="M47.751,21.427V7.935c0.021-0.663-0.528-1.2-1.204-1.2H14.082c-0.677,0-1.226,0.537-1.226,1.2 v13.492H47.751z" fill="url(#SVGID_4)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="30.3" x2="30.3" y1="7.33" y2="21.41">
-<stop offset="0" stop-color="#D1D7D9"/>
-<stop offset="0.07" stop-color="#D1D7D9"/>
-<stop offset="0.26" stop-color="#CED3D6"/>
-<stop offset="0.66" stop-color="#CEDBE0"/>
-<stop offset="1" stop-color="#ADB3B5"/>
+<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">
+<stop offset="0" style="stop-color:#171717"/>
+<stop offset="1" style="stop-color:#2E2E2E"/>
+</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"/>
 </linearGradient>
-<path d="M46.988,7.529c-0.115-0.118-0.271-0.183-0.441-0.183 H14.082c-0.339,0-0.614,0.264-0.614,0.588v0.612v12.268v0.612h33.67L47.14,8.528V7.916C47.144,7.772,47.09,7.635,46.988,7.529z M46.527,8.528l-0.001,12.287H14.081V7.935l32.466,0.024L46.527,8.528z" fill="url(#SVGID_5)" fill-opacity="0.6" stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6" x1="30.3" x2="30.3" y1="6.71" y2="21.4">
-<stop offset="0" stop-color="#6B6B6B"/>
-<stop offset="0.72" stop-color="#363636"/>
-<stop offset="0.96" stop-color="#5E5E5E"/>
-<stop offset="1" stop-color="#5E5E5E"/>
+<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"/>
 </linearGradient>
-<path d="M46.547,6.734H14.082c-0.677,0-1.226,0.537-1.226,1.2v13.492h0.612v-0.612V8.547V7.935 c0-0.324,0.275-0.588,0.614-0.588h32.465c0.17,0,0.326,0.064,0.441,0.183c0.102,0.106,0.155,0.243,0.151,0.387v0.612l0,0 l-0.001,12.899h0.612V7.935C47.771,7.271,47.223,6.734,46.547,6.734z" fill="url(#SVGID_6)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7" x1="30.3" x2="30.3" y1="9.81" y2="18.42">
-<stop offset="0" stop-color="#686C6E"/>
-<stop offset="1" stop-color="#CAD3D6"/>
+<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"/>
+<path d="M29.424,14.36h-3.188v-0.398c0-0.341,0.076-0.671,0.232-0.991c0.152-0.315,0.553-0.717,1.201-1.203  c0.375-0.28,0.615-0.5,0.719-0.659c0.105-0.159,0.158-0.317,0.158-0.475c0-0.253-0.092-0.452-0.271-0.598  c-0.182-0.145-0.418-0.218-0.703-0.218c-0.244,0-0.662,0.057-1.254,0.167V9.393c0.506-0.106,0.949-0.159,1.328-0.159  c0.559,0,0.996,0.124,1.309,0.368c0.313,0.247,0.469,0.583,0.469,1.006c0,0.187-0.037,0.378-0.115,0.575  c-0.076,0.196-0.193,0.377-0.355,0.542c-0.164,0.162-0.396,0.359-0.701,0.591c-0.342,0.259-0.582,0.459-0.713,0.603  c-0.131,0.142-0.232,0.292-0.299,0.448c-0.07,0.156-0.105,0.307-0.109,0.451h2.293V14.36z" fill="#FFFFFF"/>
+<path d="M35.371,11.667c0.283,0.086,0.498,0.229,0.641,0.432c0.143,0.201,0.215,0.461,0.215,0.776  c0,0.519-0.15,0.901-0.449,1.146c-0.303,0.246-0.77,0.368-1.404,0.368c-0.402,0-0.801-0.052-1.199-0.156v-0.599  c0.461,0.111,0.85,0.167,1.172,0.167c0.359,0,0.611-0.076,0.758-0.226c0.148-0.148,0.223-0.388,0.223-0.72  c0-0.312-0.094-0.543-0.283-0.698c-0.188-0.155-0.467-0.234-0.84-0.234h-0.572v-0.55h0.576c0.691,0,1.037-0.268,1.037-0.804  c0-0.25-0.074-0.438-0.221-0.563c-0.148-0.125-0.367-0.188-0.662-0.188c-0.189,0-0.539,0.051-1.043,0.156V9.374  c0.441-0.094,0.838-0.14,1.186-0.14c0.545,0,0.955,0.105,1.229,0.316c0.271,0.21,0.408,0.525,0.408,0.944  c0,0.283-0.064,0.522-0.193,0.717C35.818,11.405,35.625,11.557,35.371,11.667z" fill="#FFFFFF"/>
+<path d="M40.631,13.347h-0.553v1.013h-0.873v-1.013h-2.188v-0.55l2.416-3.53h0.645v3.53h0.553V13.347z   M39.205,10.589l-1.443,2.208h1.443V10.589z" fill="#FFFFFF"/>
+<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.2" style="stop-color:#4D4D4D"/>
+<stop offset="0.7212" style="stop-color:#242424"/>
+<stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
-<path d="M17.143,18.366c-0.676,0-1.226-0.562-1.226-1.25 v-6.072c0-0.689,0.55-1.25,1.226-1.25h26.322c0.676,0,1.226,0.56,1.226,1.25v6.072c0,0.688-0.55,1.25-1.226,1.25H17.143z" fill="url(#SVGID_7)" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8" x1="30.3" x2="30.3" y1="10.45" y2="17.88">
-<stop offset="0" stop-color="#171717"/>
-<stop offset="1" stop-color="#2E2E2E"/>
+<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"/>
+<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"/>
 </linearGradient>
-<path d="M44.071,17.117c0,0.344-0.274,0.625-0.614,0.625H17.143c-0.338,0-0.613-0.28-0.613-0.625 v-6.072c0-0.345,0.274-0.625,0.613-0.625h26.314c0.34,0,0.614,0.28,0.614,0.625V17.117z" fill="url(#SVGID_8)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9" x1="30.3" x2="30.3" y1="-0.01" y2="21.37">
-<stop offset="0" stop-color="#45E8FF"/>
-<stop offset="0.15" stop-color="#45E8FF"/>
-<stop offset="0.56" stop-color="#30A4D5"/>
-<stop offset="0.87" stop-color="#1347BA"/>
-<stop offset="1" stop-color="#1C65C3"/>
+<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.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"/>
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_9)" height="6.072" width="26.314" x="17.143" y="11.045"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10" x1="30.3" x2="30.3" y1="3.88" y2="19.37">
-<stop offset="0" stop-color="#45E8FF"/>
-<stop offset="0.15" stop-color="#45E8FF"/>
-<stop offset="0.56" stop-color="#4FADD5"/>
-<stop offset="0.87" stop-color="#1347BA"/>
-<stop offset="1" stop-color="#1C65C3"/>
+<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.2" style="stop-color:#4D4D4D"/>
+<stop offset="0.7212" style="stop-color:#242424"/>
+<stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
-<polygon fill="url(#SVGID_10)" points="17.143,13.876 43.457,12.829 43.457,11.045 17.143,11.045 "/>
-<path d="M26.604,16.135h-2.64V15.68h0.958v-3.047l-0.958,0.178v-0.456l1.32-0.436h0.361v3.76h0.958 L26.604,16.135L26.604,16.135z" fill="#FFFFFF"/>
-<path d="M29.826,16.135h-2.638v-0.33c0-0.282,0.063-0.555,0.191-0.819c0.127-0.262,0.458-0.594,0.995-0.996 c0.311-0.232,0.509-0.414,0.596-0.546c0.087-0.131,0.13-0.263,0.13-0.394c0-0.209-0.076-0.374-0.225-0.495 c-0.149-0.12-0.345-0.181-0.583-0.181c-0.201,0-0.546,0.046-1.036,0.139v-0.491c0.418-0.088,0.785-0.131,1.1-0.131 c0.461,0,0.823,0.103,1.081,0.305c0.259,0.205,0.389,0.482,0.389,0.832c0,0.154-0.031,0.313-0.094,0.476 c-0.063,0.163-0.162,0.313-0.295,0.448c-0.136,0.134-0.328,0.297-0.58,0.489c-0.285,0.214-0.482,0.38-0.591,0.498 c-0.107,0.117-0.19,0.242-0.246,0.371c-0.058,0.129-0.087,0.253-0.09,0.373h1.897v0.452H29.826z" fill="#FFFFFF"/>
-<path d="M34.748,13.907c0.235,0.072,0.414,0.19,0.531,0.357c0.117,0.166,0.178,0.381,0.178,0.642 c0,0.429-0.125,0.747-0.373,0.949c-0.25,0.203-0.637,0.305-1.16,0.305c-0.333,0-0.664-0.043-0.993-0.129v-0.496 c0.38,0.092,0.703,0.139,0.97,0.139c0.298,0,0.507-0.063,0.628-0.187c0.122-0.123,0.183-0.321,0.183-0.597 c0-0.257-0.078-0.449-0.232-0.577c-0.156-0.128-0.389-0.193-0.697-0.193h-0.473v-0.456h0.477c0.572,0,0.857-0.221,0.857-0.665 c0-0.207-0.061-0.362-0.182-0.466c-0.122-0.104-0.305-0.156-0.549-0.156c-0.156,0-0.445,0.042-0.863,0.129v-0.497 c0.367-0.078,0.694-0.116,0.982-0.116c0.45,0,0.789,0.088,1.015,0.262s0.339,0.435,0.339,0.782c0,0.234-0.053,0.432-0.16,0.593 C35.118,13.69,34.959,13.815,34.748,13.907z" fill="#FFFFFF"/>
-<path d="M39.102,15.297h-0.457v0.838h-0.723v-0.838h-1.811v-0.455l2-2.921h0.533v2.921h0.457V15.297z M37.922,13.015l-1.195,1.827h1.195V13.015z" fill="#FFFFFF"/>
-<path d="M40.566,13.456h0.143c0.452,0,0.801,0.113,1.045,0.335c0.244,0.223,0.367,0.542,0.367,0.953 c0,0.472-0.125,0.828-0.373,1.063c-0.249,0.235-0.621,0.353-1.117,0.353c-0.361,0-0.685-0.041-0.969-0.122v-0.493 c0.326,0.085,0.637,0.128,0.93,0.128c0.248,0,0.443-0.068,0.58-0.203c0.138-0.135,0.207-0.37,0.207-0.702 c0-0.275-0.078-0.482-0.232-0.62c-0.154-0.14-0.385-0.208-0.695-0.208c-0.204,0-0.407,0.01-0.61,0.031v-2.048h2.173v0.453h-1.447 V13.456L40.566,13.456z" fill="#FFFFFF"/>
-<circle cx="30.957" cy="15.698" fill="#FFFFFF" r="0.491"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11" x1="41.32" x2="41.32" y1="42.22" y2="47.78">
-<stop offset="0" stop-color="#646263"/>
-<stop offset="0.2" stop-color="#4D4D4D"/>
-<stop offset="0.72" stop-color="#242424"/>
-<stop offset="1" stop-color="#373737"/>
+<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"/>
+<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"/>
+</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.2" style="stop-color:#4D4D4D"/>
+<stop offset="0.7212" style="stop-color:#242424"/>
+<stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
-<path d="M39.793,47.752c-0.676,0-1.225-0.549-1.225-1.225 v-3.061c0-0.676,0.549-1.225,1.225-1.225h3.061c0.676,0,1.225,0.549,1.225,1.225v3.061c0,0.676-0.549,1.225-1.225,1.225H39.793z" fill="url(#SVGID_11)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M42.854,47.752h-3.061c-0.676,0-1.225-0.549-1.225-1.225 v0.612c0,0.675,0.549,1.224,1.225,1.224h3.061c0.676,0,1.225-0.549,1.225-1.224v-0.612C44.078,47.203,43.529,47.752,42.854,47.752z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12" x1="41.32" x2="41.32" y1="42.8" y2="47.25">
-<stop offset="0" stop-color="#F0653D"/>
-<stop offset="0.1" stop-color="#C94832"/>
-<stop offset="0.75" stop-color="#89181F"/>
-<stop offset="1" stop-color="#961A22"/>
+<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"/>
+<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"/>
 </linearGradient>
-<path d="M43.467,46.527c0,0.338-0.274,0.612-0.613,0.612h-3.061c-0.338,0-0.612-0.274-0.612-0.612 v-3.061c0-0.34,0.274-0.613,0.612-0.613h3.061c0.339,0,0.613,0.273,0.613,0.613V46.527z" fill="url(#SVGID_12)"/>
-<path d="M32.447,47.752c-0.677,0-1.225-0.549-1.225-1.225 v-3.061c0-0.676,0.548-1.225,1.225-1.225h3.061c0.676,0,1.225,0.549,1.225,1.225v3.061c0,0.676-0.549,1.225-1.225,1.225H32.447z" fill="url(#SVGID_11)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M35.508,47.752h-3.061c-0.677,0-1.225-0.549-1.225-1.225 v0.612c0,0.675,0.548,1.224,1.225,1.224h3.061c0.676,0,1.225-0.549,1.225-1.224v-0.612C36.732,47.203,36.184,47.752,35.508,47.752z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14" x1="33.98" x2="33.98" y1="42.8" y2="47.25">
-<stop offset="0" stop-color="#E4EBED"/>
-<stop offset="0.26" stop-color="#D6DCDE"/>
-<stop offset="0.66" stop-color="#B6C3C7"/>
-<stop offset="0.98" stop-color="#D2D9DB"/>
-<stop offset="1" stop-color="#D2D9DB"/>
+<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"/>
+<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.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"/>
 </linearGradient>
-<path d="M36.119,46.527c0,0.338-0.273,0.612-0.611,0.612h-3.061c-0.34,0-0.613-0.274-0.613-0.612 v-3.061c0-0.34,0.273-0.613,0.613-0.613h3.061c0.338,0,0.611,0.273,0.611,0.613V46.527z" fill="url(#SVGID_14)"/>
-<path d="M25.1,47.752c-0.676,0-1.224-0.549-1.224-1.225 v-3.061c0-0.676,0.548-1.225,1.224-1.225h3.061c0.676,0,1.225,0.549,1.225,1.225v3.061c0,0.676-0.549,1.225-1.225,1.225H25.1z" fill="url(#SVGID_11)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M28.161,47.752H25.1c-0.676,0-1.224-0.549-1.224-1.225v0.612 c0,0.675,0.548,1.224,1.224,1.224h3.061c0.676,0,1.225-0.549,1.225-1.224v-0.612C29.386,47.203,28.837,47.752,28.161,47.752z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M28.773,46.527c0,0.338-0.273,0.612-0.612,0.612H25.1c-0.338,0-0.612-0.274-0.612-0.612 v-3.061c0-0.34,0.274-0.613,0.612-0.613h3.061c0.339,0,0.612,0.273,0.612,0.613V46.527z" fill="url(#SVGID_14)"/>
-<path d="M17.754,47.752c-0.676,0-1.225-0.549-1.225-1.225v-3.061c0-0.676,0.549-1.225,1.225-1.225 h3.061c0.676,0,1.224,0.549,1.224,1.225v3.061c0,0.676-0.548,1.225-1.224,1.225H17.754z" fill="url(#SVGID_11)"/>
-<path d="M20.815,47.752h-3.061c-0.676,0-1.225-0.549-1.225-1.225 v0.612c0,0.675,0.549,1.224,1.225,1.224h3.061c0.676,0,1.224-0.549,1.224-1.224v-0.612C22.039,47.203,21.491,47.752,20.815,47.752z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M21.427,46.527c0,0.338-0.273,0.612-0.612,0.612h-3.061c-0.339,0-0.612-0.274-0.612-0.612 v-3.061c0-0.34,0.273-0.613,0.612-0.613h3.061c0.338,0,0.612,0.273,0.612,0.613V46.527z" fill="url(#SVGID_14)"/>
-<path d="M42.854,39.181h-3.061c-0.676,0-1.225-0.549-1.225-1.224 v0.611c0,0.676,0.549,1.225,1.225,1.225h3.061c0.676,0,1.225-0.549,1.225-1.225v-0.611C44.078,38.632,43.529,39.181,42.854,39.181z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19" x1="41.32" x2="41.32" y1="33.67" y2="39.16">
-<stop offset="0" stop-color="#646263"/>
-<stop offset="0.2" stop-color="#4D4D4D"/>
-<stop offset="0.72" stop-color="#242424"/>
-<stop offset="1" stop-color="#373737"/>
+<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"/>
+<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.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"/>
 </linearGradient>
-<path d="M39.793,39.181c-0.676,0-1.225-0.549-1.225-1.224 v-3.062c0-0.675,0.549-1.225,1.225-1.225h3.061c0.676,0,1.225,0.55,1.225,1.225v3.062c0,0.675-0.549,1.224-1.225,1.224H39.793z" fill="url(#SVGID_19)" fill-opacity="0.9" stroke-opacity="0.9"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_20" x1="41.32" x2="41.32" y1="34.23" y2="38.68">
-<stop offset="0" stop-color="#A0A3A6"/>
-<stop offset="0.13" stop-color="#838688"/>
-<stop offset="0.26" stop-color="#7B7E80"/>
-<stop offset="0.66" stop-color="#474B4D"/>
-<stop offset="1" stop-color="#707577"/>
+<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"/>
+<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.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"/>
+</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"/>
+<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.2" style="stop-color:#4D4D4D"/>
+<stop offset="0.7212" style="stop-color:#242424"/>
+<stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
-<path d="M43.467,37.957c0,0.338-0.274,0.611-0.613,0.611h-3.061c-0.338,0-0.612-0.273-0.612-0.611 v-3.062c0-0.339,0.274-0.612,0.612-0.612h3.061c0.339,0,0.613,0.273,0.613,0.612V37.957z" fill="url(#SVGID_20)"/>
-<rect fill="#231F20" fill-opacity="0.5" height="0.612" stroke-opacity="0.5" width="33.671" x="13.468" y="21.427"/>
-<path d="M35.508,39.181h-3.061c-0.677,0-1.225-0.549-1.225-1.224 v0.611c0,0.676,0.548,1.225,1.225,1.225h3.061c0.676,0,1.225-0.549,1.225-1.225v-0.611C36.732,38.632,36.184,39.181,35.508,39.181z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M32.447,39.181c-0.677,0-1.225-0.549-1.225-1.224 v-3.062c0-0.675,0.548-1.225,1.225-1.225h3.061c0.676,0,1.225,0.55,1.225,1.225v3.062c0,0.675-0.549,1.224-1.225,1.224H32.447z" fill="url(#SVGID_19)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_22" x1="33.98" x2="33.98" y1="34.23" y2="38.68">
-<stop offset="0" stop-color="#E4EBED"/>
-<stop offset="0.26" stop-color="#D6DCDE"/>
-<stop offset="0.66" stop-color="#B6C3C7"/>
-<stop offset="0.98" stop-color="#D2D9DB"/>
-<stop offset="1" stop-color="#D2D9DB"/>
+<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"/>
+</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"/>
+<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.2" style="stop-color:#4D4D4D"/>
+<stop offset="0.7212" style="stop-color:#242424"/>
+<stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
-<path d="M36.119,37.957c0,0.338-0.273,0.611-0.611,0.611h-3.061c-0.34,0-0.613-0.273-0.613-0.611 v-3.062c0-0.339,0.273-0.612,0.613-0.612h3.061c0.338,0,0.611,0.273,0.611,0.612V37.957z" fill="url(#SVGID_22)"/>
-<path d="M28.161,39.181H25.1c-0.676,0-1.224-0.549-1.224-1.224v0.611 c0,0.676,0.548,1.225,1.224,1.225h3.061c0.676,0,1.225-0.549,1.225-1.225v-0.611C29.386,38.632,28.837,39.181,28.161,39.181z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M25.1,39.181c-0.676,0-1.224-0.549-1.224-1.224 v-3.062c0-0.675,0.548-1.225,1.224-1.225h3.061c0.676,0,1.225,0.55,1.225,1.225v3.062c0,0.675-0.549,1.224-1.225,1.224H25.1z" fill="url(#SVGID_19)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M28.773,37.957c0,0.338-0.273,0.611-0.612,0.611H25.1c-0.338,0-0.612-0.273-0.612-0.611 v-3.062c0-0.339,0.274-0.612,0.612-0.612h3.061c0.339,0,0.612,0.273,0.612,0.612V37.957z" fill="url(#SVGID_22)"/>
-<path d="M20.815,39.181h-3.061c-0.676,0-1.225-0.549-1.225-1.224 v0.611c0,0.676,0.549,1.225,1.225,1.225h3.061c0.676,0,1.224-0.549,1.224-1.225v-0.611C22.039,38.632,21.491,39.181,20.815,39.181z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M17.754,39.181c-0.676,0-1.225-0.549-1.225-1.224 v-3.062c0-0.675,0.549-1.225,1.225-1.225h3.061c0.676,0,1.224,0.55,1.224,1.225v3.062c0,0.675-0.548,1.224-1.224,1.224H17.754z" fill="url(#SVGID_19)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M21.427,37.957c0,0.338-0.273,0.611-0.612,0.611h-3.061c-0.339,0-0.612-0.273-0.612-0.611 v-3.062c0-0.339,0.273-0.612,0.612-0.612h3.061c0.338,0,0.612,0.273,0.612,0.612V37.957z" fill="url(#SVGID_22)"/>
-<path d="M42.854,30.609h-3.061c-0.676,0-1.225-0.548-1.225-1.224 v0.612c0,0.675,0.549,1.225,1.225,1.225h3.061c0.676,0,1.225-0.55,1.225-1.225v-0.612C44.078,30.061,43.529,30.609,42.854,30.609z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_27" x1="41.32" x2="41.32" y1="25.11" y2="30.66">
-<stop offset="0" stop-color="#646263"/>
-<stop offset="0.2" stop-color="#4D4D4D"/>
-<stop offset="0.72" stop-color="#242424"/>
-<stop offset="1" stop-color="#373737"/>
+<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"/>
+</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"/>
+<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.2" style="stop-color:#4D4D4D"/>
+<stop offset="0.7212" style="stop-color:#242424"/>
+<stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
-<path d="M39.793,30.609c-0.676,0-1.225-0.548-1.225-1.224 v-3.061c0-0.675,0.549-1.225,1.225-1.225h3.061c0.676,0,1.225,0.549,1.225,1.225v3.061c0,0.675-0.549,1.224-1.225,1.224H39.793z" fill="url(#SVGID_27)" fill-opacity="0.9" stroke-opacity="0.9"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_28" x1="41.32" x2="41.32" y1="25.66" y2="30.11">
-<stop offset="0" stop-color="#A0A3A6"/>
-<stop offset="0.13" stop-color="#838688"/>
-<stop offset="0.26" stop-color="#7B7E80"/>
-<stop offset="0.66" stop-color="#474B4D"/>
-<stop offset="1" stop-color="#707577"/>
+<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"/>
+</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"/>
+<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.2" style="stop-color:#4D4D4D"/>
+<stop offset="0.7212" style="stop-color:#242424"/>
+<stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
-<path d="M43.467,29.386c0,0.338-0.274,0.612-0.613,0.612h-3.061c-0.338,0-0.612-0.274-0.612-0.612 v-3.061c0-0.339,0.274-0.612,0.612-0.612h3.061c0.339,0,0.613,0.273,0.613,0.612V29.386z" fill="url(#SVGID_28)"/>
-<path d="M35.508,30.609h-3.061c-0.677,0-1.225-0.548-1.225-1.224 v0.612c0,0.675,0.548,1.225,1.225,1.225h3.061c0.676,0,1.225-0.55,1.225-1.225v-0.612C36.732,30.061,36.184,30.609,35.508,30.609z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M32.447,30.609c-0.677,0-1.225-0.548-1.225-1.224 v-3.061c0-0.675,0.548-1.225,1.225-1.225h3.061c0.676,0,1.225,0.549,1.225,1.225v3.061c0,0.675-0.549,1.224-1.225,1.224H32.447z" fill="url(#SVGID_27)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_30" x1="33.98" x2="33.98" y1="25.66" y2="30.11">
-<stop offset="0" stop-color="#E4EBED"/>
-<stop offset="0.26" stop-color="#D6DCDE"/>
-<stop offset="0.66" stop-color="#B6C3C7"/>
-<stop offset="0.98" stop-color="#D2D9DB"/>
-<stop offset="1" stop-color="#D2D9DB"/>
+<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"/>
+</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.2" style="stop-color:#4D4D4D"/>
+<stop offset="0.7212" style="stop-color:#242424"/>
+<stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
-<path d="M36.119,29.386c0,0.338-0.273,0.612-0.611,0.612h-3.061c-0.34,0-0.613-0.274-0.613-0.612 v-3.061c0-0.339,0.273-0.612,0.613-0.612h3.061c0.338,0,0.611,0.273,0.611,0.612V29.386z" fill="url(#SVGID_30)"/>
-<path d="M28.161,30.609H25.1c-0.676,0-1.224-0.548-1.224-1.224v0.612 c0,0.675,0.548,1.225,1.224,1.225h3.061c0.676,0,1.225-0.55,1.225-1.225v-0.612C29.386,30.061,28.837,30.609,28.161,30.609z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M25.1,30.609c-0.676,0-1.224-0.548-1.224-1.224 v-3.061c0-0.675,0.548-1.225,1.224-1.225h3.061c0.676,0,1.225,0.549,1.225,1.225v3.061c0,0.675-0.549,1.224-1.225,1.224H25.1z" fill="url(#SVGID_27)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M28.773,29.386c0,0.338-0.273,0.612-0.612,0.612H25.1c-0.338,0-0.612-0.274-0.612-0.612 v-3.061c0-0.339,0.274-0.612,0.612-0.612h3.061c0.339,0,0.612,0.273,0.612,0.612V29.386z" fill="url(#SVGID_30)"/>
-<path d="M17.754,30.609c-0.676,0-1.225-0.548-1.225-1.224 v-3.061c0-0.675,0.549-1.225,1.225-1.225h3.061c0.676,0,1.224,0.549,1.224,1.225v3.061c0,0.675-0.548,1.224-1.224,1.224H17.754z" fill="url(#SVGID_27)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M20.815,30.609h-3.061c-0.676,0-1.225-0.548-1.225-1.224 v0.612c0,0.675,0.549,1.225,1.225,1.225h3.061c0.676,0,1.224-0.55,1.224-1.225v-0.612C22.039,30.061,21.491,30.609,20.815,30.609z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M21.427,29.386c0,0.338-0.273,0.612-0.612,0.612h-3.061c-0.339,0-0.612-0.274-0.612-0.612 v-3.061c0-0.339,0.273-0.612,0.612-0.612h3.061c0.338,0,0.612,0.273,0.612,0.612V29.386z" fill="url(#SVGID_30)"/>
-<rect fill="#FFFFFF" fill-opacity="0.6" height="0.612" stroke-opacity="0.6" width="33.671" x="13.468" y="22.651"/>
-<rect fill="#231F20" fill-opacity="0.3" height="0.612" stroke-opacity="0.3" width="33.671" x="13.468" y="22.039"/>
+<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"/>
+<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"/>
+</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"/>
+</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_calendar.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_calendar.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_calendar.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,100 +1,105 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<g>
 <rect fill="none" height="60" width="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="30" x2="30" y1="11.79" y2="48.83">
-<stop offset="0" stop-color="#DDE3E6"/>
-<stop offset="0.24" stop-color="#C9CED1"/>
-<stop offset="0.96" stop-color="#899396"/>
-<stop offset="1" stop-color="#899396"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-72.52" x2="-72.52" y1="30.8438" y2="-15.6104">
+<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"/>
 </linearGradient>
-<path d="M51.796,47.85c0,0.668-0.543,1.211-1.212,1.211H9.411c-0.668,0-1.211-0.543-1.211-1.211 V13.005c0-0.668,0.543-1.211,1.211-1.211h41.173c0.669,0,1.212,0.543,1.212,1.211V47.85z" fill="url(#SVGID_1)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="30" x2="30" y1="11.6" y2="49.1">
-<stop offset="0" stop-color="#ECF3F5"/>
-<stop offset="0.25" stop-color="#ECF3F5"/>
-<stop offset="0.86" stop-color="#7E878A"/>
-<stop offset="1" stop-color="#B0B8BB"/>
+<path d="M55.5,8.382h-51C3.672,8.382,3,9.054,3,9.883v43.161c0,0.827,0.672,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 gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-72.52" x2="-72.52" y1="29.8403" y2="-14.5312">
+<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"/>
 </linearGradient>
-<path d="M50.584,12.407c0.33,0,0.6,0.268,0.6,0.6V47.85c0,0.33-0.269,0.598-0.6,0.598H9.411 c-0.33,0-0.599-0.268-0.599-0.598V13.005c0-0.331,0.269-0.599,0.599-0.599L50.584,12.407 M50.584,11.794H9.411 c-0.668,0-1.211,0.543-1.211,1.212V47.85c0,0.668,0.543,1.211,1.211,1.211h41.173c0.669,0,1.212-0.543,1.212-1.211V13.005 C51.796,12.337,51.253,11.794,50.584,11.794L50.584,11.794z" fill="url(#SVGID_2)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="29.97" x2="29.97" y1="14.02" y2="46.8">
-<stop offset="0" stop-color="#707173"/>
-<stop offset="1" stop-color="#000000"/>
+<path d="M4.5,53.784c-0.41,0-0.742-0.333-0.742-0.741V9.883C3.758,9.472,4.09,9.14,4.5,9.14h51  c0.412,0,0.742,0.333,0.742,0.743v43.161c0,0.408-0.33,0.741-0.742,0.741L4.5,53.784L4.5,53.784z" fill="url(#SVGID_2_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-72.5571" x2="-72.5571" y1="27.8345" y2="-12.7649">
+<stop offset="0" style="stop-color:#707173"/>
+<stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
-<rect fill="url(#SVGID_3)" fill-opacity="0.4" height="33.148" stroke-opacity="0.4" width="39.529" x="10.203" y="13.82"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="38.08" x2="40.37" y1="47.65" y2="51.32">
-<stop offset="0" stop-color="#737373"/>
-<stop offset="1" stop-color="#DEDEDE"/>
+<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"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-72.5347" x2="-72.5348" y1="16.5146" y2="-11.7964">
+<stop offset="0" style="stop-color:#737373"/>
+<stop offset="0.6606" style="stop-color:#737373"/>
+<stop offset="1" style="stop-color:#DEDEDE"/>
 </linearGradient>
-<rect fill="url(#SVGID_4)" height="22.5" width="37.267" x="11.352" y="23.447"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="32.52" x2="25.99" y1="42.89" y2="21.55">
-<stop offset="0" stop-color="#FFFFFF"/>
-<stop offset="1" stop-color="#CCCCCC"/>
+<rect fill="url(#SVGID_4_)" height="27.871" width="46.163" x="6.904" y="22.815"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="-69.3926" x2="-77.4889" y1="-7.9272" y2="18.5136">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#CCCCCC"/>
 </linearGradient>
-<path d="M40.864,44.215c-2.954,0.771-11.439,1.683-11.439,1.683h-18.06V23.396h37.267 c0,0-0.54,15.014-1.059,17.106C47.115,42.352,45.118,43.103,40.864,44.215z" fill="url(#SVGID_5)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6" x1="30" x2="30" y1="14.91" y2="23.24">
-<stop offset="0" stop-color="#FF7042"/>
-<stop offset="1" stop-color="#991B23"/>
+<path d="M43.459,48.54c-3.66,0.956-14.168,2.085-14.168,2.085H6.918V22.754H53.08  c0,0-0.666,18.598-1.311,21.188C51.203,46.232,48.729,47.163,43.459,48.54z" fill="url(#SVGID_5_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-72.521" x2="-72.521" y1="26.7407" y2="16.4258">
+<stop offset="0" style="stop-color:#FF7042"/>
+<stop offset="1" style="stop-color:#991B23"/>
 </linearGradient>
-<rect fill="url(#SVGID_6)" height="8.438" width="37.267" x="11.365" y="14.958"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7" x1="38.74" x2="40.67" y1="41.86" y2="45.48">
-<stop offset="0" stop-color="#FFFFFF"/>
-<stop offset="1" stop-color="#000000"/>
+<rect fill="url(#SVGID_6_)" height="10.453" width="46.162" x="6.918" y="12.301"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="-61.6943" x2="-59.3015" y1="-6.646" y2="-11.1237">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
-<path d="M40.405,44.686 c-2.712,0.525-6.438,1.021-11.541,1.071l19.086-9.022c0,0,0.017,1.963-0.377,3.769C47.573,40.503,47.256,43.358,40.405,44.686z" fill="url(#SVGID_7)" fill-opacity="0.42" stroke-opacity="0.42"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8" x1="39.1" x2="37.93" y1="45.72" y2="43.14">
-<stop offset="0" stop-color="#9C9C9C"/>
-<stop offset="1" stop-color="#FFFFFF"/>
+<path d="M42.891,49.125c-3.358,0.65-7.975,1.264-14.292,1.327  l23.638-11.177c0,0,0.021,2.432-0.467,4.668C51.77,43.941,51.377,47.479,42.891,49.125z" fill="url(#SVGID_7_)" fill-opacity="0.42" stroke-opacity="0.42"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="-61.2495" x2="-62.6952" y1="-11.4277" y2="-8.2283">
+<stop offset="0" style="stop-color:#9C9C9C"/>
+<stop offset="1" style="stop-color:#FFFFFF"/>
 </linearGradient>
-<path d="M28.34,45.893c0,0,11.11-0.098,15.242-5.76c0,0,2.96,3.646,3.992,0.37 C47.135,42.754,43.17,45.975,28.34,45.893z" fill="url(#SVGID_8)"/>
-<path d="M43.672,40.735c0,0,2.207,2.321,3.461,0.773c0.236-0.354,0.377-0.701,0.44-1.028 c-1.032,3.276-3.991-0.37-3.991-0.37c-4.133,5.663-15.243,5.759-15.243,5.759C33.492,45.869,41.103,44.256,43.672,40.735z" fill="#FFFFFF"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9" x1="34.36" x2="19.67" y1="49.19" y2="30.72">
-<stop offset="0" stop-color="#303030"/>
-<stop offset="1" stop-color="#000000"/>
+<path d="M27.945,50.618c0,0,13.764-0.12,18.883-7.134c0,0,3.664,4.517,4.941,0.457  C51.229,46.73,46.316,50.721,27.945,50.618z" fill="url(#SVGID_8_)"/>
+<path d="M46.938,44.23c0,0,2.734,2.875,4.287,0.957c0.293-0.438,0.467-0.869,0.545-1.272  c-1.276,4.058-4.94-0.46-4.94-0.46c-5.119,7.016-18.883,7.136-18.883,7.136C34.328,50.591,43.756,48.591,46.938,44.23z" fill="#FFFFFF"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="-79.5366" x2="-79.5366" y1="-6.4883" y2="11.8389">
+<stop offset="0" style="stop-color:#303030"/>
+<stop offset="1" style="stop-color:#000000"/>
+</linearGradient>
+<polygon fill="url(#SVGID_9_)" points="24.822,27.157 22.977,27.157 17.369,28.926 17.369,30.961 21.361,30.024 21.361,44.113   17.369,44.236 17.369,46.27 28.598,45.881 28.598,43.891 24.822,44.007 "/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="-65.4268" x2="-65.4268" y1="-6.4873" y2="11.8388">
+<stop offset="0" style="stop-color:#303030"/>
+<stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
-<polygon fill="url(#SVGID_9)" points="25.818,26.952 24.328,26.952 19.802,28.38 19.802,30.023 23.025,29.266 23.025,40.641 19.802,40.74 19.802,42.382 28.865,42.068 28.865,40.461 25.818,40.555 "/>
-<path d="M33.813,40.167c0.028-0.591,0.187-1.137,0.478-1.638c0.291-0.5,0.648-0.961,1.072-1.382 c0.426-0.42,1.012-0.944,1.765-1.571c1.349-1.109,2.205-2.008,2.565-2.707c0.365-0.693,0.547-1.395,0.547-2.107 c0-1.266-0.404-2.223-1.212-2.872c-0.808-0.651-1.987-0.977-3.542-0.977c-1.258,0-2.553,0.203-3.88,0.608V29.3h0.022 c1.264-0.452,2.343-0.679,3.23-0.683c0.844-0.003,1.475,0.188,1.896,0.571c0.42,0.384,0.629,0.956,0.629,1.718 c0,0.435-0.13,0.873-0.389,1.318c-0.262,0.443-0.887,1.074-1.881,1.896c-0.826,0.688-1.511,1.323-2.051,1.9 c-0.543,0.58-0.996,1.279-1.367,2.093c-0.367,0.817-0.551,1.745-0.551,2.786v1.09l9.152-0.316V39.97L33.813,40.167z" fill="url(#SVGID_9)"/>
-<polygon fill="#FFE6E6" points="48.632,15.2 11.365,15.2 11.365,14.718 48.632,14.718 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11" x1="39.42" x2="44.39" y1="18.82" y2="18.82">
-<stop offset="0" stop-color="#FB6C41"/>
-<stop offset="0.5" stop-color="#FFB69E"/>
-<stop offset="1" stop-color="#FB6C41"/>
+<path d="M34.727,43.525c0.033-0.73,0.23-1.407,0.59-2.027c0.361-0.619,0.806-1.191,1.328-1.711  c0.527-0.52,1.256-1.17,2.188-1.947c1.672-1.374,2.729-2.488,3.179-3.354c0.452-0.857,0.68-1.729,0.68-2.61  c0-1.567-0.502-2.753-1.504-3.557c-1-0.807-2.463-1.21-4.39-1.21c-1.557,0-3.159,0.251-4.803,0.754v2.204h0.024  c1.566-0.56,2.902-0.841,4.002-0.846c1.045-0.004,1.826,0.232,2.349,0.707c0.521,0.476,0.782,1.183,0.782,2.128  c0,0.537-0.161,1.082-0.481,1.631c-0.325,0.549-1.101,1.332-2.332,2.35c-1.022,0.854-1.868,1.641-2.539,2.355  c-0.672,0.717-1.233,1.582-1.692,2.592c-0.455,1.011-0.685,2.16-0.685,3.451v1.348l11.341-0.391v-2.111L34.727,43.525z" fill="url(#SVGID_10_)"/>
+<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.631" y="8.382"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="-60.8442" x2="-54.6872" y1="21.8984" y2="21.8984">
+<stop offset="0" style="stop-color:#FB6C41"/>
+<stop offset="0.497" style="stop-color:#FFB69E"/>
+<stop offset="1" style="stop-color:#FB6C41"/>
 </linearGradient>
-<path d="M44.307,18.818c0,1.279-1.104,2.317-2.461,2.317c-1.359,0-2.461-1.038-2.461-2.317 c0-1.28,1.103-2.316,2.461-2.316C43.203,16.502,44.307,17.538,44.307,18.818z" fill="url(#SVGID_11)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12" x1="15.98" x2="20.95" y1="18.82" y2="18.82">
-<stop offset="0" stop-color="#FB6C41"/>
-<stop offset="0.5" stop-color="#FFB69E"/>
-<stop offset="1" stop-color="#FB6C41"/>
-</linearGradient>
-<ellipse cx="18.396" cy="18.818" fill="url(#SVGID_12)" rx="2.462" ry="2.317"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13" x1="41.85" x2="41.85" y1="16.38" y2="20.52">
-<stop offset="0" stop-color="#4A050A"/>
-<stop offset="1" stop-color="#B00F25"/>
+<ellipse cx="44.676" cy="17.082" fill="url(#SVGID_11_)" rx="3.049" ry="2.87"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="-89.8911" x2="-83.7336" y1="21.8984" y2="21.8984">
+<stop offset="0" style="stop-color:#FB6C41"/>
+<stop offset="0.497" style="stop-color:#FFB69E"/>
+<stop offset="1" style="stop-color:#FB6C41"/>
 </linearGradient>
-<path d="M44.307,18.224c0,1.361-1.104,2.461-2.461,2.461c-1.359,0-2.461-1.101-2.461-2.461 c0-1.357,1.103-2.461,2.461-2.461C43.203,15.763,44.307,16.867,44.307,18.224z" fill="url(#SVGID_13)"/>
-<rect fill="#231F20" fill-opacity="0.4" height="6.147" stroke-opacity="0.4" width="4.854" x="15.975" y="11.794"/>
-<rect fill="#231F20" fill-opacity="0.4" height="6.147" stroke-opacity="0.4" width="4.854" x="39.392" y="11.794"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14" x1="40.1" x2="43.59" y1="14.62" y2="14.62">
-<stop offset="0" stop-color="#B6B4B5"/>
-<stop offset="0.12" stop-color="#FFFCFE"/>
-<stop offset="0.68" stop-color="#595959"/>
-<stop offset="0.95" stop-color="#D4D3D3"/>
-<stop offset="1" stop-color="#D4D3D3"/>
+<ellipse cx="15.629" cy="17.082" fill="url(#SVGID_12_)" rx="3.049" ry="2.87"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="-57.8442" x2="-57.8442" y1="24.9229" y2="19.7907">
+<stop offset="0" style="stop-color:#4A050A"/>
+<stop offset="1" style="stop-color:#B00F25"/>
+</linearGradient>
+<path d="M47.725,16.346c0,1.686-1.367,3.05-3.049,3.05c-1.684,0-3.049-1.364-3.049-3.05  c0-1.681,1.365-3.048,3.049-3.048C46.357,13.297,47.725,14.665,47.725,16.346z" fill="url(#SVGID_13_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="-60.0093" x2="-55.6903" y1="27.0977" y2="27.0977">
+<stop offset="0" style="stop-color:#B6B4B5"/>
+<stop offset="0.1152" style="stop-color:#FFFCFE"/>
+<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="M41.846,9.434c-0.971,0-1.757,0.788-1.757,1.759v6.856c0,0.971,0.786,1.758,1.757,1.758 s1.758-0.787,1.758-1.758v-6.856C43.604,10.222,42.816,9.434,41.846,9.434z" fill="url(#SVGID_14)"/>
-<path d="M20.858,18.224c0,1.361-1.104,2.461-2.462,2.461c-1.359,0-2.461-1.101-2.461-2.461 c0-1.357,1.102-2.461,2.461-2.461C19.754,15.763,20.858,16.867,20.858,18.224z" fill="url(#SVGID_13)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16" x1="16.65" x2="20.14" y1="14.62" y2="14.62">
-<stop offset="0" stop-color="#B6B4B5"/>
-<stop offset="0.12" stop-color="#FFFCFE"/>
-<stop offset="0.68" stop-color="#595959"/>
-<stop offset="0.95" stop-color="#D4D3D3"/>
-<stop offset="1" stop-color="#D4D3D3"/>
+<path d="M44.676,5.458c-1.201,0-2.176,0.977-2.176,2.178v8.494c0,1.202,0.975,2.177,2.176,2.177  s2.178-0.975,2.178-2.177V7.636C46.854,6.435,45.877,5.458,44.676,5.458z" fill="url(#SVGID_14_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="-86.8911" x2="-86.8911" y1="24.9229" y2="19.7907">
+<stop offset="0" style="stop-color:#4A050A"/>
+<stop offset="1" style="stop-color:#B00F25"/>
 </linearGradient>
-<path d="M18.396,9.434c-0.971,0-1.756,0.788-1.756,1.759v6.856c0,0.971,0.785,1.758,1.756,1.758 c0.97,0,1.759-0.787,1.759-1.758v-6.856C20.155,10.222,19.366,9.434,18.396,9.434z" fill="url(#SVGID_16)"/>
-<polygon fill="#701619" points="48.632,23.636 11.365,23.636 11.365,23.156 48.632,23.156 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17" x1="46" x2="47.65" y1="43.14" y2="43.14">
-<stop offset="0" stop-color="#D2D3D4"/>
-<stop offset="1" stop-color="#000000"/>
+<path d="M18.678,16.346c0,1.686-1.365,3.05-3.051,3.05c-1.684,0-3.047-1.364-3.047-3.05  c0-1.681,1.363-3.048,3.047-3.048C17.313,13.297,18.678,14.665,18.678,16.346z" fill="url(#SVGID_15_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="-89.0562" x2="-84.7366" y1="27.0977" y2="27.0977">
+<stop offset="0" style="stop-color:#B6B4B5"/>
+<stop offset="0.1152" style="stop-color:#FFFCFE"/>
+<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="M46.029,41.877 c-2.577,2.077-8.758,3.303-12.666,3.895c10.73-0.617,13.841-3.279,14.211-5.269C47.115,41.879,46.569,41.863,46.029,41.877z" fill="url(#SVGID_17)" fill-opacity="0.35" stroke-opacity="0.35"/>
-<rect fill="none" height="59.996" width="59.996"/>
+<path d="M15.627,5.458c-1.201,0-2.174,0.977-2.174,2.178v8.494c0,1.202,0.973,2.177,2.174,2.177  c1.203,0,2.18-0.975,2.18-2.177V7.636C17.807,6.435,16.83,5.458,15.627,5.458z" fill="url(#SVGID_16_)"/>
+<polygon fill="#701619" points="53.08,23.051 6.918,23.051 6.918,22.455 53.08,22.455 "/>
+<rect fill="none" height="60" width="60"/>
+</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_calendar_alarm.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,147 +1,165 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
 <rect fill="none" height="60" width="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="30" x2="30" y1="11.79" y2="48.83">
-<stop offset="0" stop-color="#DDE3E6"/>
-<stop offset="0.24" stop-color="#C9CED1"/>
-<stop offset="0.96" stop-color="#899396"/>
-<stop offset="1" stop-color="#899396"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-72.52" x2="-72.52" y1="30.8438" y2="-15.6104">
+<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"/>
 </linearGradient>
-<path d="M51.796,47.85c0,0.668-0.543,1.211-1.212,1.211H9.411c-0.668,0-1.211-0.543-1.211-1.211 V13.005c0-0.668,0.543-1.211,1.211-1.211h41.173c0.669,0,1.212,0.543,1.212,1.211V47.85z" fill="url(#SVGID_1)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="30" x2="30" y1="11.6" y2="49.1">
-<stop offset="0" stop-color="#ECF3F5"/>
-<stop offset="0.25" stop-color="#ECF3F5"/>
-<stop offset="0.86" stop-color="#7E878A"/>
-<stop offset="1" stop-color="#B0B8BB"/>
+<path d="M55.5,8.382h-51C3.672,8.382,3,9.054,3,9.883v43.161c0,0.827,0.672,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 gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-72.52" x2="-72.52" y1="29.8403" y2="-14.5312">
+<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"/>
 </linearGradient>
-<path d="M50.584,12.407c0.33,0,0.6,0.268,0.6,0.6V47.85c0,0.33-0.269,0.598-0.6,0.598H9.411 c-0.33,0-0.599-0.268-0.599-0.598V13.005c0-0.331,0.269-0.599,0.599-0.599L50.584,12.407 M50.584,11.794H9.411 c-0.668,0-1.211,0.543-1.211,1.212V47.85c0,0.668,0.543,1.211,1.211,1.211h41.173c0.669,0,1.212-0.543,1.212-1.211V13.005 C51.796,12.337,51.253,11.794,50.584,11.794L50.584,11.794z" fill="url(#SVGID_2)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="29.97" x2="29.97" y1="14.02" y2="46.8">
-<stop offset="0" stop-color="#707173"/>
-<stop offset="1" stop-color="#000000"/>
+<path d="M4.5,53.784c-0.41,0-0.742-0.333-0.742-0.741V9.883C3.758,9.472,4.09,9.14,4.5,9.14h51  c0.412,0,0.742,0.333,0.742,0.743v43.161c0,0.408-0.33,0.741-0.742,0.741L4.5,53.784L4.5,53.784z" fill="url(#SVGID_2_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-72.5571" x2="-72.5571" y1="27.8345" y2="-12.7649">
+<stop offset="0" style="stop-color:#707173"/>
+<stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
-<rect fill="url(#SVGID_3)" fill-opacity="0.4" height="33.148" stroke-opacity="0.4" width="39.529" x="10.203" y="13.82"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="38.08" x2="40.37" y1="47.65" y2="51.32">
-<stop offset="0" stop-color="#737373"/>
-<stop offset="1" stop-color="#DEDEDE"/>
+<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"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-72.5347" x2="-72.5348" y1="16.5146" y2="-11.7964">
+<stop offset="0" style="stop-color:#737373"/>
+<stop offset="0.6606" style="stop-color:#737373"/>
+<stop offset="1" style="stop-color:#DEDEDE"/>
 </linearGradient>
-<rect fill="url(#SVGID_4)" height="22.5" width="37.267" x="11.352" y="23.447"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="32.52" x2="25.99" y1="42.89" y2="21.55">
-<stop offset="0" stop-color="#FFFFFF"/>
-<stop offset="1" stop-color="#CCCCCC"/>
+<rect fill="url(#SVGID_4_)" height="27.871" width="46.163" x="6.904" y="22.815"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="-69.3926" x2="-77.4889" y1="-7.9272" y2="18.5136">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#CCCCCC"/>
 </linearGradient>
-<path d="M40.864,44.215c-2.954,0.771-11.439,1.683-11.439,1.683h-18.06V23.396h37.267 c0,0-0.54,15.014-1.059,17.106C47.115,42.352,45.118,43.103,40.864,44.215z" fill="url(#SVGID_5)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6" x1="30" x2="30" y1="14.91" y2="23.24">
-<stop offset="0" stop-color="#FF7042"/>
-<stop offset="1" stop-color="#991B23"/>
+<path d="M43.459,48.54c-3.66,0.956-14.168,2.085-14.168,2.085H6.918V22.754H53.08  c0,0-0.666,18.598-1.311,21.188C51.203,46.232,48.729,47.163,43.459,48.54z" fill="url(#SVGID_5_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-72.521" x2="-72.521" y1="26.7407" y2="16.4258">
+<stop offset="0" style="stop-color:#FF7042"/>
+<stop offset="1" style="stop-color:#991B23"/>
 </linearGradient>
-<rect fill="url(#SVGID_6)" height="8.438" width="37.267" x="11.365" y="14.958"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7" x1="38.74" x2="40.67" y1="41.86" y2="45.48">
-<stop offset="0" stop-color="#FFFFFF"/>
-<stop offset="1" stop-color="#000000"/>
+<rect fill="url(#SVGID_6_)" height="10.453" width="46.162" x="6.918" y="12.301"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="-61.6943" x2="-59.3015" y1="-6.646" y2="-11.1237">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
-<path d="M40.405,44.686 c-2.712,0.525-6.438,1.021-11.541,1.071l19.086-9.022c0,0,0.017,1.963-0.377,3.769C47.573,40.503,47.256,43.358,40.405,44.686z" fill="url(#SVGID_7)" fill-opacity="0.42" stroke-opacity="0.42"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8" x1="39.1" x2="37.93" y1="45.72" y2="43.14">
-<stop offset="0" stop-color="#9C9C9C"/>
-<stop offset="1" stop-color="#FFFFFF"/>
+<path d="M42.891,49.125c-3.358,0.65-7.975,1.264-14.292,1.327  l23.638-11.177c0,0,0.021,2.432-0.467,4.668C51.77,43.941,51.377,47.479,42.891,49.125z" fill="url(#SVGID_7_)" fill-opacity="0.42" stroke-opacity="0.42"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="-61.2495" x2="-62.6952" y1="-11.4277" y2="-8.2283">
+<stop offset="0" style="stop-color:#9C9C9C"/>
+<stop offset="1" style="stop-color:#FFFFFF"/>
 </linearGradient>
-<path d="M28.34,45.893c0,0,11.11-0.098,15.242-5.76c0,0,2.96,3.646,3.992,0.37 C47.135,42.754,43.17,45.975,28.34,45.893z" fill="url(#SVGID_8)"/>
-<path d="M43.672,40.735c0,0,2.207,2.321,3.461,0.773c0.236-0.354,0.377-0.701,0.44-1.028 c-1.032,3.276-3.991-0.37-3.991-0.37c-4.133,5.663-15.243,5.759-15.243,5.759C33.492,45.869,41.103,44.256,43.672,40.735z" fill="#FFFFFF"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9" x1="34.36" x2="19.67" y1="49.19" y2="30.72">
-<stop offset="0" stop-color="#303030"/>
-<stop offset="1" stop-color="#000000"/>
+<path d="M27.945,50.618c0,0,13.764-0.12,18.883-7.134c0,0,3.664,4.517,4.941,0.457  C51.229,46.73,46.316,50.721,27.945,50.618z" fill="url(#SVGID_8_)"/>
+<path d="M46.938,44.23c0,0,2.734,2.875,4.287,0.957c0.293-0.438,0.467-0.869,0.545-1.272  c-1.276,4.058-4.94-0.46-4.94-0.46c-5.119,7.016-18.883,7.136-18.883,7.136C34.328,50.591,43.756,48.591,46.938,44.23z" fill="#FFFFFF"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="-79.5366" x2="-79.5366" y1="-6.4883" y2="11.8389">
+<stop offset="0" style="stop-color:#303030"/>
+<stop offset="1" style="stop-color:#000000"/>
+</linearGradient>
+<polygon fill="url(#SVGID_9_)" points="24.822,27.157 22.977,27.157 17.369,28.926 17.369,30.961 21.361,30.024 21.361,44.113   17.369,44.236 17.369,46.27 28.598,45.881 28.598,43.891 24.822,44.007 "/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="-65.4268" x2="-65.4268" y1="-6.4873" y2="11.8388">
+<stop offset="0" style="stop-color:#303030"/>
+<stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
-<polygon fill="url(#SVGID_9)" points="25.818,26.952 24.328,26.952 19.802,28.38 19.802,30.023 23.025,29.266 23.025,40.641 19.802,40.74 19.802,42.382 28.865,42.068 28.865,40.461 25.818,40.555 "/>
-<path d="M33.813,40.167c0.028-0.591,0.187-1.137,0.478-1.638c0.291-0.5,0.648-0.961,1.072-1.382 c0.426-0.42,1.012-0.944,1.765-1.571c1.349-1.109,2.205-2.008,2.565-2.707c0.365-0.693,0.547-1.395,0.547-2.107 c0-1.266-0.404-2.223-1.212-2.872c-0.808-0.651-1.987-0.977-3.542-0.977c-1.258,0-2.553,0.203-3.88,0.608V29.3h0.022 c1.264-0.452,2.343-0.679,3.23-0.683c0.844-0.003,1.475,0.188,1.896,0.571c0.42,0.384,0.629,0.956,0.629,1.718 c0,0.435-0.13,0.873-0.389,1.318c-0.262,0.443-0.887,1.074-1.881,1.896c-0.826,0.688-1.511,1.323-2.051,1.9 c-0.543,0.58-0.996,1.279-1.367,2.093c-0.367,0.817-0.551,1.745-0.551,2.786v1.09l9.152-0.316V39.97L33.813,40.167z" fill="url(#SVGID_9)"/>
-<polygon fill="#FFE6E6" points="48.632,15.2 11.365,15.2 11.365,14.718 48.632,14.718 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11" x1="39.42" x2="44.39" y1="18.82" y2="18.82">
-<stop offset="0" stop-color="#FB6C41"/>
-<stop offset="0.5" stop-color="#FFB69E"/>
-<stop offset="1" stop-color="#FB6C41"/>
+<path d="M34.727,43.525c0.033-0.73,0.23-1.407,0.59-2.027c0.361-0.619,0.806-1.191,1.328-1.711  c0.527-0.52,1.256-1.17,2.188-1.947c1.672-1.374,2.729-2.488,3.179-3.354c0.452-0.857,0.68-1.729,0.68-2.61  c0-1.567-0.502-2.753-1.504-3.557c-1-0.807-2.463-1.21-4.39-1.21c-1.557,0-3.159,0.251-4.803,0.754v2.204h0.024  c1.566-0.56,2.902-0.841,4.002-0.846c1.045-0.004,1.826,0.232,2.349,0.707c0.521,0.476,0.782,1.183,0.782,2.128  c0,0.537-0.161,1.082-0.481,1.631c-0.325,0.549-1.101,1.332-2.332,2.35c-1.022,0.854-1.868,1.641-2.539,2.355  c-0.672,0.717-1.233,1.582-1.692,2.592c-0.455,1.011-0.685,2.16-0.685,3.451v1.348l11.341-0.391v-2.111L34.727,43.525z" fill="url(#SVGID_10_)"/>
+<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.631" y="8.382"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="-60.8442" x2="-54.6872" y1="21.8984" y2="21.8984">
+<stop offset="0" style="stop-color:#FB6C41"/>
+<stop offset="0.497" style="stop-color:#FFB69E"/>
+<stop offset="1" style="stop-color:#FB6C41"/>
 </linearGradient>
-<path d="M44.307,18.818c0,1.279-1.104,2.317-2.461,2.317c-1.359,0-2.461-1.038-2.461-2.317 c0-1.28,1.103-2.316,2.461-2.316C43.203,16.502,44.307,17.538,44.307,18.818z" fill="url(#SVGID_11)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12" x1="15.98" x2="20.95" y1="18.82" y2="18.82">
-<stop offset="0" stop-color="#FB6C41"/>
-<stop offset="0.5" stop-color="#FFB69E"/>
-<stop offset="1" stop-color="#FB6C41"/>
-</linearGradient>
-<ellipse cx="18.396" cy="18.818" fill="url(#SVGID_12)" rx="2.462" ry="2.317"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13" x1="41.85" x2="41.85" y1="16.38" y2="20.52">
-<stop offset="0" stop-color="#4A050A"/>
-<stop offset="1" stop-color="#B00F25"/>
+<ellipse cx="44.676" cy="17.082" fill="url(#SVGID_11_)" rx="3.049" ry="2.87"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="-89.8911" x2="-83.7336" y1="21.8984" y2="21.8984">
+<stop offset="0" style="stop-color:#FB6C41"/>
+<stop offset="0.497" style="stop-color:#FFB69E"/>
+<stop offset="1" style="stop-color:#FB6C41"/>
 </linearGradient>
-<path d="M44.307,18.224c0,1.361-1.104,2.461-2.461,2.461c-1.359,0-2.461-1.101-2.461-2.461 c0-1.357,1.103-2.461,2.461-2.461C43.203,15.763,44.307,16.867,44.307,18.224z" fill="url(#SVGID_13)"/>
-<rect fill="#231F20" fill-opacity="0.4" height="6.147" stroke-opacity="0.4" width="4.854" x="15.975" y="11.794"/>
-<rect fill="#231F20" fill-opacity="0.4" height="6.147" stroke-opacity="0.4" width="4.854" x="39.392" y="11.794"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14" x1="40.1" x2="43.59" y1="14.62" y2="14.62">
-<stop offset="0" stop-color="#B6B4B5"/>
-<stop offset="0.12" stop-color="#FFFCFE"/>
-<stop offset="0.68" stop-color="#595959"/>
-<stop offset="0.95" stop-color="#D4D3D3"/>
-<stop offset="1" stop-color="#D4D3D3"/>
+<ellipse cx="15.629" cy="17.082" fill="url(#SVGID_12_)" rx="3.049" ry="2.87"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="-57.8442" x2="-57.8442" y1="24.9229" y2="19.7907">
+<stop offset="0" style="stop-color:#4A050A"/>
+<stop offset="1" style="stop-color:#B00F25"/>
+</linearGradient>
+<path d="M47.725,16.346c0,1.686-1.367,3.05-3.049,3.05c-1.684,0-3.049-1.364-3.049-3.05  c0-1.681,1.365-3.048,3.049-3.048C46.357,13.297,47.725,14.665,47.725,16.346z" fill="url(#SVGID_13_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="-60.0093" x2="-55.6903" y1="27.0977" y2="27.0977">
+<stop offset="0" style="stop-color:#B6B4B5"/>
+<stop offset="0.1152" style="stop-color:#FFFCFE"/>
+<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="M41.846,9.434c-0.971,0-1.757,0.788-1.757,1.759v6.856c0,0.971,0.786,1.758,1.757,1.758 s1.758-0.787,1.758-1.758v-6.856C43.604,10.222,42.816,9.434,41.846,9.434z" fill="url(#SVGID_14)"/>
-<path d="M20.858,18.224c0,1.361-1.104,2.461-2.462,2.461c-1.359,0-2.461-1.101-2.461-2.461 c0-1.357,1.102-2.461,2.461-2.461C19.754,15.763,20.858,16.867,20.858,18.224z" fill="url(#SVGID_13)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16" x1="16.65" x2="20.14" y1="14.62" y2="14.62">
-<stop offset="0" stop-color="#B6B4B5"/>
-<stop offset="0.12" stop-color="#FFFCFE"/>
-<stop offset="0.68" stop-color="#595959"/>
-<stop offset="0.95" stop-color="#D4D3D3"/>
-<stop offset="1" stop-color="#D4D3D3"/>
+<path d="M44.676,5.458c-1.201,0-2.176,0.977-2.176,2.178v8.494c0,1.202,0.975,2.177,2.176,2.177  s2.178-0.975,2.178-2.177V7.636C46.854,6.435,45.877,5.458,44.676,5.458z" fill="url(#SVGID_14_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="-86.8911" x2="-86.8911" y1="24.9229" y2="19.7907">
+<stop offset="0" style="stop-color:#4A050A"/>
+<stop offset="1" style="stop-color:#B00F25"/>
 </linearGradient>
-<path d="M18.396,9.434c-0.971,0-1.756,0.788-1.756,1.759v6.856c0,0.971,0.785,1.758,1.756,1.758 c0.97,0,1.759-0.787,1.759-1.758v-6.856C20.155,10.222,19.366,9.434,18.396,9.434z" fill="url(#SVGID_16)"/>
-<polygon fill="#701619" points="48.632,23.636 11.365,23.636 11.365,23.156 48.632,23.156 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17" x1="46" x2="47.65" y1="43.14" y2="43.14">
-<stop offset="0" stop-color="#D2D3D4"/>
-<stop offset="1" stop-color="#000000"/>
+<path d="M18.678,16.346c0,1.686-1.365,3.05-3.051,3.05c-1.684,0-3.047-1.364-3.047-3.05  c0-1.681,1.363-3.048,3.047-3.048C17.313,13.297,18.678,14.665,18.678,16.346z" fill="url(#SVGID_15_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="-89.0562" x2="-84.7366" y1="27.0977" y2="27.0977">
+<stop offset="0" style="stop-color:#B6B4B5"/>
+<stop offset="0.1152" style="stop-color:#FFFCFE"/>
+<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="M46.029,41.877 c-2.577,2.077-8.758,3.303-12.666,3.895c10.73-0.617,13.841-3.279,14.211-5.269C47.115,41.879,46.569,41.863,46.029,41.877z" fill="url(#SVGID_17)" fill-opacity="0.35" stroke-opacity="0.35"/>
-<rect fill="none" height="59.996" width="59.996"/>
+<path d="M15.627,5.458c-1.201,0-2.174,0.977-2.174,2.178v8.494c0,1.202,0.973,2.177,2.174,2.177  c1.203,0,2.18-0.975,2.18-2.177V7.636C17.807,6.435,16.83,5.458,15.627,5.458z" fill="url(#SVGID_16_)"/>
+<polygon fill="#701619" points="53.08,23.051 6.918,23.051 6.918,22.455 53.08,22.455 "/>
+<rect fill="none" height="60" width="60"/>
 </g>
 <g transform="matrix(1 0 0 1 30 30)">
-<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"/>
+<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"/>
 </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"/>
+<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"/>
 </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"/>
+<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"/>
 </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"/>
+<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"/>
+<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"/>
 </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>
+<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"/>
+</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"/>
+<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"/>
+<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"/>
+<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"/>
+</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"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_calendar_dynamic.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_calendar_dynamic.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<g>
+<rect fill="none" height="60" width="60"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="8.1353" y2="54.5899">
+<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"/>
+</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="30" x2="30" y1="9.1396" y2="53.5106">
+<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"/>
+</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.9629" x2="29.9629" y1="11.1455" y2="51.7439">
+<stop offset="0" style="stop-color:#707173"/>
+<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"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="29.9854" x2="29.9853" y1="22.4663" y2="50.7773">
+<stop offset="0" style="stop-color:#737373"/>
+<stop offset="0.6606" style="stop-color:#737373"/>
+<stop offset="1" style="stop-color:#DEDEDE"/>
+</linearGradient>
+<rect fill="url(#SVGID_4_)" fill-rule="evenodd" height="27.871" width="46.162" x="6.904" y="22.815"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="33.1284" x2="25.0323" y1="46.9072" y2="20.4671">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#CCCCCC"/>
+</linearGradient>
+<path d="M43.46,48.54c-3.661,0.956-14.169,2.085-14.169,2.085H6.919  V22.754h46.162c0,0-0.667,18.597-1.312,21.188C51.203,46.232,48.729,47.162,43.46,48.54z" fill="url(#SVGID_5_)" fill-rule="evenodd"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="30" x2="30" y1="12.2397" y2="22.5541">
+<stop offset="0" style="stop-color:#FF7042"/>
+<stop offset="1" style="stop-color:#991B23"/>
+</linearGradient>
+<rect fill="url(#SVGID_6_)" fill-rule="evenodd" height="10.453" width="46.162" x="6.919" y="12.301"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="40.8252" x2="43.2182" y1="45.627" y2="50.105">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#000000"/>
+</linearGradient>
+<path d="M42.892,49.125  c-3.36,0.65-7.976,1.264-14.294,1.326l23.639-11.176c0,0,0.021,2.431-0.467,4.667C51.77,43.942,51.377,47.479,42.892,49.125z" fill="url(#SVGID_7_)" fill-opacity="0.42" fill-rule="evenodd" stroke-opacity="0.42"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="41.271" x2="39.8252" y1="50.4082" y2="47.2086">
+<stop offset="0" style="stop-color:#9C9C9C"/>
+<stop offset="1" style="stop-color:#FFFFFF"/>
+</linearGradient>
+<path d="M27.946,50.618c0,0,13.763-0.12,18.882-7.134  c0,0,3.664,4.517,4.941,0.458C51.229,46.73,46.316,50.721,27.946,50.618z" fill="url(#SVGID_8_)" fill-rule="evenodd"/>
+<path d="M46.938,44.23c0,0,2.733,2.877,4.287,0.958  c0.292-0.438,0.466-0.869,0.544-1.273c-1.277,4.058-4.941-0.46-4.941-0.46c-5.119,7.016-18.882,7.136-18.882,7.136  C34.328,50.591,43.756,48.591,46.938,44.23z" fill="#FFFFFF" fill-rule="evenodd"/>
+<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"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="41.6763" x2="47.8338" 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"/>
+</linearGradient>
+<ellipse cx="44.676" cy="17.082" fill="url(#SVGID_9_)" fill-rule="evenodd" rx="3.049" ry="2.87"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" 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"/>
+</linearGradient>
+<ellipse cx="15.629" cy="17.082" fill="url(#SVGID_10_)" fill-rule="evenodd" rx="3.049" ry="2.87"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" 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"/>
+</linearGradient>
+<path d="M47.725,16.346c0,1.686-1.366,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.358,13.297,47.725,14.665,47.725,16.346z" fill="url(#SVGID_11_)" fill-rule="evenodd"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="42.5112" x2="46.8307" y1="11.8828" y2="11.8828">
+<stop offset="0" style="stop-color:#B6B4B5"/>
+<stop offset="0.1152" style="stop-color:#FFFCFE"/>
+<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_12_)" fill-rule="evenodd"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" 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"/>
+</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_13_)" fill-rule="evenodd"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" 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.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_14_)" fill-rule="evenodd"/>
+<polygon fill="#701619" points="53.081,23.051 6.919,23.051 6.919,22.455 53.081,22.455 53.081,23.051 "/>
+<rect fill="none" fill-rule="evenodd" height="60" width="60"/>
+</g>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_assistant.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,162 +1,152 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5609 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="423.0967" x2="429.6524" y1="-578.646" y2="-582.9078">
+<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.1333" style="stop-color:#A7E722"/>
-<stop offset="0.6303" style="stop-color:#428C0F"/>
-<stop offset="1" style="stop-color:#5CA617"/>
-</linearGradient>
-<path d="M19.081,33.91c2.089-3.595,4.591-6.496,7.281-9.188c2.593-2.591,6.72-5.3,8.562-6.256l9.604-10.282  c-0.845-0.3-3.693-0.464-7.279,0.616c-3.586,1.083-11.736,6.303-16.979,11.547c-5.242,5.246-9.727,12.347-10.581,14.595  c-1.343,3.541-1.221,7.445-0.929,8.58c0,0,0.34,1.035,1.144,2.377C10.248,46.475,19.081,33.91,19.081,33.91z" fill="url(#SVGID_1_)"/>
-<path d="M31.184,20.8c1.488-1.036,2.87-1.882,3.74-2.334L44.271,8.46  c-0.132-0.058-0.209-0.088-0.209-0.088c-0.247-0.088-0.642-0.162-1.124-0.219c-0.793,0.006-1.596,0.093-2.401,0.27  C34.843,9.673,31.019,14.958,31.184,20.8z" fill="#020202" fill-opacity="0.05" stroke-opacity="0.05"/>
-<path d="M31.906,20.306c1.205-0.809,2.291-1.462,3.018-1.84l9.377-10.04  c-0.146-0.063-0.233-0.098-0.233-0.098c-0.231-0.08-0.604-0.152-1.06-0.203c-0.751,0.006-1.51,0.087-2.27,0.253  C35.275,9.576,31.636,14.695,31.906,20.306z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M44.079,8.263c-0.21-0.073-0.55-0.137-0.962-0.186c-0.681,0.006-1.369,0.08-2.06,0.231  c-5.087,1.116-8.426,5.984-7.978,11.233c0.725-0.455,1.363-0.826,1.844-1.076l9.424-10.088C44.178,8.302,44.079,8.263,44.079,8.263z  " fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="40.9697" cy="9.21" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="12.2872">
-<stop offset="0" style="stop-color:#A7E722"/>
-<stop offset="0.6242" style="stop-color:#428C0F"/>
+<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"/>
 </radialGradient>
-<path d="M34.924,18.466l0.929,1.55c0,0,15.101-6.784,14.084-8.038c-0.513-0.631-0.577-0.656-1.237-1.263  c-1.985-1.815-4.172-2.531-4.172-2.531c-0.186-0.063-0.481-0.12-0.845-0.161c-0.596,0.004-1.2,0.068-1.806,0.201  c-4.591,1.009-7.57,5.501-6.963,10.257C34.916,18.477,34.921,18.47,34.924,18.466z" fill="url(#SVGID_2_)"/>
-<path d="M17.483,34.105c-0.988-0.139-2.007-0.119-3.027,0.105c-2.418,0.531-4.376,2.066-5.646,4.131  c-0.367,2.35-0.25,4.408-0.05,5.18c0,0,0.34,1.035,1.144,2.377c0.29,0.482,6.54-8.264,8.556-11.107L17.483,34.105z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M18.366,34.135c-0.989-0.139-2.008-0.117-3.029,0.105c-3.313,0.727-5.775,3.332-6.76,6.623  c-0.026,1.025,0.034,1.873,0.127,2.398c0.003,0.012,0.005,0.033,0.01,0.047c0,0,0.34,1.033,1.144,2.379  c0.3,0.498,6.981-8.887,8.75-11.383L18.366,34.135z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="437.4258" cy="-571.231" gradientTransform="matrix(0.2095 0.9787 -0.9682 0.2124 -629.4526 -270.6148)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="14.6187">
-<stop offset="0" style="stop-color:#A7E722"/>
-<stop offset="0.6242" style="stop-color:#428C0F"/>
-<stop offset="1" style="stop-color:#5CA617"/>
-</radialGradient>
-<path d="M11.202,47.738c0.616,0.74,0.646,0.953,1.295,1.523c1.194,1.055,9.301-13.611,9.301-13.611  l-2.683-1.719c-0.941-0.111-1.914-0.08-2.89,0.135c-4.777,1.049-7.806,5.869-6.87,10.832C9.749,45.686,10.349,46.709,11.202,47.738z  " fill="url(#SVGID_3_)"/>
-<path d="M49.937,11.978c-0.179-0.22-0.381-0.446-0.578-0.67l-13.944,7.959l0.438,0.749  C35.853,20.016,50.953,13.231,49.937,11.978z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="422.2881" x2="427.4786" y1="-610.9287" y2="-594.4409">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.6788" style="stop-color:#387300"/>
-<stop offset="1" style="stop-color:#66A00E"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M35.853,20.016l1.178,1.981c0.302,0.515,0.972,0.674,1.569,0.422l4.09-2.334l8.043-4.668  c0.632-0.363,0.878-1.119,0.549-1.686c0,0-0.333-0.501-1.349-1.751L35.853,20.016z" fill="url(#SVGID_4_)"/>
-<path d="M21.798,35.65l-0.725-0.473l-9.215,13.486c0.216,0.205,0.43,0.414,0.639,0.598  C13.691,50.316,21.798,35.65,21.798,35.65z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="439.6982" x2="451.5232" y1="-577.7549" y2="-564.7323">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.6788" style="stop-color:#387300"/>
-<stop offset="1" style="stop-color:#66A00E"/>
+<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"/>
+<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"/>
 </linearGradient>
-<path d="M12.498,49.262c1.193,1.049,1.686,1.369,1.686,1.369c0.567,0.367,1.363,0.17,1.781-0.441l7.9-11.605  c0.419-0.615,0.307-1.412-0.26-1.777l-1.808-1.156L12.498,49.262z" fill="url(#SVGID_5_)"/>
+<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(0.5 0 0 0.5 30 30)">
-<rect height="60" style="fill:none;" width="60"/>
-<radialGradient cx="-3973.4507" cy="1721.54" gradientTransform="matrix(0.857 0 0 -0.8542 3435.7136 1489.142)" gradientUnits="userSpaceOnUse" id="SVGID_1__" r="38.9126">
+<g transform="matrix(1 0 0 1 30 30)">
+<path d="M30,0.001H14.961C14.955,0.001,14.949,0,14.943,0c-0.006,0-0.012,0.001-0.019,0.001H0v30h30V0.001z" fill="none"/>
+<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"/>
 </radialGradient>
-<path d="M46.208,31.145c-0.08-0.039-0.172-0.047-0.258-0.072V31.07  c-0.019-0.004-0.032-0.006-0.05-0.008c-0.129-0.037-0.254-0.064-0.391-0.07c-16.32-2.84-23.806-11.882-24.372-9.488  c-0.45,1.902-5.024,6.028-7.422,8.08c0.022,0.094,0.032,0.174,0.054,0.266c0,0,0.082,0.422,0.264,1.138  c-0.19,0.021-0.376,0.062-0.556,0.136c-1.526,0.644-2.004,3.142-1.066,5.586c0.93,2.44,2.924,3.901,4.45,3.261  c0.096-0.043,0.176-0.109,0.26-0.162c0.884,1.991,1.976,4.125,3.306,6.268c2.232,2.652,5.652,5.764,9.428,5.764  c4.568,0,7.362-2.496,9.285-5.018c0.053-0.108,0.1-0.206,0.155-0.293c1.425-2.225,2.578-4.457,3.513-6.535  c1.491,0.516,3.405-0.872,4.355-3.219C48.148,34.35,47.718,31.826,46.208,31.145z" style="fill:url(#SVGID_1__);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="157.7227" x2="164.7713" y1="-158.0142" y2="-151.0208">
+<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"/>
 </linearGradient>
-<path d="M29.184,50.563c-2.782,0-5.584-1.295-7.646-3.246c2.182,2.293,5.12,4.523,8.316,4.523  c4.568,0,7.362-2.496,9.285-5.018c0.053-0.108,0.1-0.206,0.155-0.293c1.424-2.225,2.578-4.457,3.513-6.535  C37.609,49.078,33.75,50.563,29.184,50.563z" style="fill:url(#SVGID_2__);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="160.8613" x2="160.8613" y1="-135.3486" y2="-145.7298">
+<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"/>
 </linearGradient>
-<path d="M29.396,8.392c-5.658,0-8.38,2.574-10.482,5.26c-3.414,0.53-8.832,3.658-5.008,17.38  c2.394-2.054,6.782-7.626,7.229-9.53c0.57-2.416,8.184,6.816,24.813,9.566c0.196-0.769,0.282-1.22,0.282-1.22  C48.844,18.134,43.164,8.85,29.396,8.392z" style="fill:url(#SVGID_3__);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="164.4121" x2="155.0067" y1="-145.2808" y2="-139.6971">
+<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"/>
 </linearGradient>
-<path d="M21.156,20.38c0,0,8.138,10.692,24.678,10.675C45.834,31.055,38.042,29.832,21.156,20.38z" style="fill:url(#SVGID_4__);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="154.1572" x2="154.2398" y1="-138.6094" y2="-144.5831">
+<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"/>
 </linearGradient>
-<path d="M19.198,14.448c0,0-7.966,0.478-5.01,13.984C14.188,28.432,13.21,19.182,19.198,14.448z" style="fill:url(#SVGID_5__);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="162.1787" x2="161.886" y1="-136.2373" y2="-138.9433">
+<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"/>
 </linearGradient>
-<path d="M33.258,16.318c-3.71-0.528-9.984-3.814-12.446-2.642c0,0,8.05-9.188,22.262,1.276  C43.074,14.952,39.688,17.234,33.258,16.318z" style="fill:url(#SVGID_6_);"/>
-<path d="M29.854,51.84c1.572,0,2.928-0.298,4.121-0.792  c0.34-0.446,0.545-0.952,0.545-1.502c0-1.774-1.985-3.162-4.518-3.162c-1.522,0-2.904,0.521-3.724,1.36  c-4.036-1.006-6.59-3.542-8.11-5.734c0.298,0.602,0.618,1.211,0.956,1.824c0.01,0.016,0.018,0.032,0.026,0.046  c0.34,0.618,0.7,1.238,1.082,1.864H20.23c0.03,0.048,0.056,0.096,0.088,0.145c0.012,0.023,0.028,0.043,0.042,0.067  c0.024,0.042,0.044,0.078,0.068,0.12C22.658,48.729,26.078,51.84,29.854,51.84z" style="opacity:0.3;fill:#020202;enable-background:new    ;"/>
-<path d="M12.898,37.732c0.078,0.123,0.152,0.24,0.226,0.357  c0.18,0.271,0.376,0.526,0.576,0.75l0,0c0.97,1.061,2.162,1.551,3.158,1.131c0.096-0.043,0.176-0.109,0.26-0.162  c0.048,0.109,0.108,0.224,0.154,0.336c0.332-0.979,0.484-2.248,0.45-3.91c-0.008-0.342-0.02-0.692-0.046-1.049  c-0.144-2.203-0.524-3.892-1.122-5.023l-0.062-0.906l0.012-0.308c0.132-10.178,5.52-17.014,13.406-17.014  c7.938,0,13.328,6.9,13.41,17.176l0.01,0.084l-0.092,1.4c-0.479,1.112-0.784,2.654-0.914,4.592  c-0.028,0.358-0.038,0.709-0.051,1.112c-0.031,1.599,0.127,2.876,0.459,3.864c0.023-0.055,0.052-0.11,0.074-0.164  c1.172,0.404,2.598-0.372,3.617-1.855l0,0c0.137-0.199,0.266-0.412,0.393-0.631c0.121-0.234,0.24-0.472,0.346-0.732  c0.988-2.428,0.559-4.951-0.954-5.631c-0.08-0.039-0.172-0.047-0.258-0.072v-0.002c0.196-0.768,0.282-1.22,0.282-1.22  c0.1-0.444,0.184-0.882,0.258-1.32c0.02-0.122,0.039-0.246,0.06-0.37c0.052-0.334,0.099-0.668,0.138-1  c0.013-0.108,0.024-0.216,0.037-0.324c0.092-0.874,0.131-1.73,0.121-2.566c0-0.074-0.004-0.15-0.008-0.224  c-0.004-0.378-0.021-0.75-0.054-1.118c0-0.042-0.005-0.086-0.009-0.128c-0.073-0.842-0.201-1.658-0.377-2.452  c-0.01-0.038-0.021-0.078-0.032-0.116c-0.089-0.38-0.188-0.756-0.304-1.126c-0.002-0.006-0.006-0.016-0.006-0.02  c-0.721-1.846-1.639-3.516-2.729-4.982c-0.008-0.004-0.008-0.004-0.008-0.004c-0.719-0.84-1.543-1.598-2.471-2.272  c-0.01-0.008-0.021-0.016-0.031-0.026c-0.448-0.316-0.916-0.614-1.408-0.892c-0.044-0.024-0.086-0.046-0.128-0.07  c-0.476-0.264-0.98-0.51-1.507-0.734c-0.063-0.026-0.127-0.054-0.195-0.084c-0.52-0.212-1.061-0.41-1.622-0.586  c-0.08-0.026-0.162-0.048-0.242-0.072c-0.563-0.168-1.151-0.32-1.766-0.446c-0.08-0.016-0.16-0.034-0.242-0.046  c-0.626-0.126-1.276-0.228-1.944-0.306c-0.06-0.008-0.121-0.012-0.184-0.02c-0.706-0.076-1.43-0.132-2.186-0.156  c-5.658,0-8.38,2.574-10.482,5.26c-0.226,0.034-0.462,0.08-0.706,0.142c-0.01,0-0.02,0.006-0.03,0.006  c-0.238,0.066-0.476,0.138-0.722,0.228c-0.008,0.004-0.018,0.004-0.028,0.01c-0.246,0.094-0.492,0.2-0.742,0.326  c-0.006,0.004-0.012,0.004-0.016,0.006c-0.254,0.13-0.504,0.28-0.75,0.448v0.004c-1.524,2.262-2.654,4.968-3.318,8.022  c0,0.542,0.022,1.122,0.076,1.726c0,0.01,0,0.018,0,0.024c0.028,0.292,0.054,0.6,0.094,0.91c0.004,0.03,0.01,0.058,0.012,0.088  c0.038,0.292,0.078,0.588,0.126,0.894c0.008,0.058,0.02,0.124,0.028,0.184c0.046,0.28,0.094,0.564,0.152,0.858  c0.016,0.1,0.04,0.204,0.058,0.304c0.05,0.264,0.102,0.522,0.16,0.792c0.036,0.158,0.08,0.324,0.114,0.484  c0.054,0.224,0.106,0.448,0.164,0.678c0.098,0.398,0.204,0.804,0.322,1.222c-0.148,0.022-0.292,0.055-0.428,0.114  c-1.526,0.644-2.004,3.142-1.066,5.586c0.098,0.263,0.214,0.506,0.34,0.744C12.796,37.55,12.848,37.643,12.898,37.732z   M14.02,30.932c0.004,0.021,0.01,0.039,0.014,0.057C14,30.992,13.968,31,13.938,31.004C13.96,30.98,13.992,30.956,14.02,30.932z" style="opacity:0.3;fill:#020202;enable-background:new    ;"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="152.8643" x2="161.4521" y1="-153.2881" y2="-153.2881">
+<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"/>
 </linearGradient>
-<path d="M30.002,50.902c-12.264,0-16.192-11.351-16.224-11.463c-0.164-0.472,0.094-0.985,0.57-1.142  c0.472-0.157,0.984,0.097,1.142,0.568c0.138,0.418,3.572,10.229,14.512,10.229c0.498,0,0.902,0.406,0.902,0.904  C30.904,50.5,30.5,50.902,30.002,50.902L30.002,50.902z" style="fill:url(#SVGID_7_);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="152.8711" x2="161.4521" y1="-153.5132" y2="-153.5132">
+<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"/>
 </linearGradient>
-<path d="M30.002,50c-11.756,0-15.37-10.85-15.37-10.85h-0.89c0,0.1,0,0.193,0.036,0.289  c0.034,0.115,3.96,11.463,16.224,11.463c0.498,0,0.902-0.402,0.902-0.902H30.002z" style="fill:url(#SVGID_8_);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="160.957" x2="160.957" y1="-146.4697" y2="-136.6049">
+<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"/>
 </linearGradient>
-<path d="M46.273,29.208L46.273,29.208L46.273,29.208C46.258,15.904,39.414,9.32,30.002,9.32  s-16.26,6.584-16.272,19.888l0,0l0,0c0,0.008,0-0.01,0,0l0,0l-0.3,9.33l2.758-0.181l-0.602-9.102  C15.622,17.602,22.03,11.03,29.91,11.03c7.878,0,14.285,6.57,14.322,18.22l-0.596,9.107l2.758,0.181L46.273,29.208L46.273,29.208  C46.273,29.198,46.273,29.214,46.273,29.208z" style="fill:url(#SVGID_9_);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="160.9551" x2="160.9551" y1="-142.7939" y2="-135.3807">
+<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"/>
 </linearGradient>
-<path d="M46.996,29.302h-0.004C46.979,15.998,39.322,8.156,29.91,8.156  c-9.406,0-17.07,7.842-17.086,21.146v0.014c0,0.008,0,0.018,0,0.026h0.004l0.902,0.772C14.026,17.264,20.68,9.32,29.91,9.32  c9.238,0,16.074,7.932,16.363,20.794l0.719-0.772h0.004c0-0.008-0.004-0.018-0.004-0.026L46.996,29.302z" style="fill:url(#SVGID_10_);"/>
-<path d="M13.828,28.304c-0.062,0-0.132,0-0.202,0.006  c-0.26,0.018-0.518,0.074-0.77,0.156c-0.01,0.282-0.034,0.546-0.034,0.836v0.014c0,0.008,0,0.018,0,0.026h0.004l0.134,2.08  l0.208-0.014l0.136-0.059c0.144-0.056,0.292-0.096,0.52-0.105c1.082,0,1.828,1.89,2.044,5.193c0.022,0.297,0.032,0.592,0.038,0.879  h0.208l-0.532-8.061c0-0.11,0.014-0.21,0.016-0.32C15.098,28.518,14.51,28.304,13.828,28.304z" style="opacity:0.2;fill:#020202;enable-background:new    ;"/>
-<path d="M15.49,38.866c-0.158-0.472-0.67-0.726-1.142-0.568  c-0.476,0.156-0.734,0.67-0.57,1.142c0.012,0.039,0.45,1.297,1.466,2.971c0.58-0.174,1.064-0.514,1.444-1.036  C15.894,40.02,15.532,38.994,15.49,38.866z" style="opacity:0.2;fill:#020202;enable-background:new    ;"/>
-<linearGradient gradientTransform="matrix(-2.3056 0.0176 0.0176 -2.0388 -855.3356 -226.559)" gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="-377.894" x2="-377.894" y1="-127.5771" y2="-134.6783">
+<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"/>
 </linearGradient>
-<path d="M10.422,35.664c0.228,3.432,2.058,6.104,4.088,5.968c2.03-0.136,2.49-2.956,2.266-6.386  s-1.054-6.17-3.084-6.034C11.66,29.348,10.196,32.234,10.422,35.664z" style="fill:url(#SVGID_11_);"/>
-<linearGradient gradientTransform="matrix(-2 0 0 -2 -801.6758 -262)" gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="-407.2915" x2="-407.2915" y1="-145.4619" y2="-151.8709">
+<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">
 <stop offset="0" style="stop-color:#7A7A7A"/>
 <stop offset="0.7818" style="stop-color:#212121"/>
 <stop offset="1" style="stop-color:#666666"/>
 </linearGradient>
-<path d="M10.136,35.693c0.222,3.367,1.828,6.002,3.59,5.885c1.764-0.118,2.14-2.883,1.918-6.248  c-0.222-3.37-0.96-6.06-2.722-5.944C11.164,29.504,9.916,32.324,10.136,35.693z" style="fill:url(#SVGID_12_);"/>
-<linearGradient gradientTransform="matrix(-2 0 0 -2 -801.6758 -262)" gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="-406.9038" x2="-406.9038" y1="-145.2993" y2="-151.566">
+<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"/>
 </linearGradient>
-<path d="M12.336,29.902c0.972,1.06,1.386,3.172,1.478,5.577c0.084,2.195-0.072,4.111-0.828,5.295  c-1.292-0.558-2.366-2.674-2.534-5.273C10.276,32.857,11.088,30.582,12.336,29.902z" style="fill:url(#SVGID_13_);"/>
-<path d="M12.922,30.516c0.012,0,0.024,0.004,0.036,0.004  c0.234-0.098,0.48-0.158,0.734-0.176c2.03-0.132,2.86,2.604,3.084,6.034c0.022,0.31,0.032,0.614,0.042,0.914  c0.02-0.646,0.004-1.33-0.042-2.044c-0.224-3.43-1.054-6.17-3.084-6.034c-0.254,0.014-0.5,0.078-0.734,0.176  c-0.012,0-0.024-0.002-0.036-0.002c-1.724,0.112-2.946,2.82-2.792,6.088C10.27,32.734,11.406,30.618,12.922,30.516z" style="opacity:0.3;fill:#FFFFFF;enable-background:new    ;"/>
-<path d="M46.172,28.304c-0.76,0-1.406,0.268-1.949,0.79  c0.004,0.052,0.01,0.104,0.01,0.156l-0.528,8.066h0.384c0.008-0.289,0.02-0.582,0.038-0.879c0.218-3.297,0.962-5.191,2.124-5.191  h0.004c0.145,0.008,0.294,0.046,0.441,0.104l0.133,0.059l0.031,0.002l0.133-2.068h0.004c0-0.008-0.004-0.018-0.004-0.026  l0.004-0.014h-0.004c0-0.306-0.024-0.588-0.032-0.888c-0.192-0.052-0.388-0.094-0.59-0.104  C46.305,28.304,46.236,28.304,46.172,28.304z" style="opacity:0.2;fill:#020202;enable-background:new    ;"/>
-<linearGradient gradientTransform="matrix(2.3056 0.0176 -0.0176 -2.0388 626.1911 -226.559)" gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="-252.4751" x2="-252.4751" y1="-126.4946" y2="-133.5958">
+<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"/>
 </linearGradient>
-<path d="M49.578,35.664c-0.227,3.432-2.055,6.104-4.086,5.968c-2.032-0.136-2.49-2.956-2.266-6.386  c0.226-3.43,1.053-6.17,3.086-6.034C48.344,29.348,49.805,32.234,49.578,35.664z" style="fill:url(#SVGID_14_);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 572.5313 -262)" gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="-262.7183" x2="-262.7183" y1="-145.4629" y2="-151.8709">
+<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">
 <stop offset="0" style="stop-color:#7A7A7A"/>
 <stop offset="0.7818" style="stop-color:#212121"/>
 <stop offset="1" style="stop-color:#666666"/>
 </linearGradient>
-<path d="M49.863,35.693c-0.221,3.367-1.827,6.002-3.59,5.885c-1.76-0.118-2.14-2.883-1.914-6.248  c0.219-3.37,0.959-6.06,2.719-5.944C48.838,29.502,50.084,32.324,49.863,35.693z" style="fill:url(#SVGID_15_);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 572.5313 -262)" gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="-262.3306" x2="-262.3306" y1="-145.2988" y2="-151.5661">
+<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"/>
 </linearGradient>
-<path d="M47.664,29.902c-0.969,1.06-1.387,3.172-1.479,5.577c-0.08,2.195,0.076,4.111,0.828,5.295  c1.295-0.558,2.366-2.674,2.536-5.273C49.723,32.857,48.912,30.582,47.664,29.902z" style="fill:url(#SVGID_16_);"/>
-<path d="M47.078,30.516c-0.014,0-0.023,0.004-0.034,0.004  c-0.235-0.098-0.478-0.158-0.731-0.176c-2.033-0.132-2.86,2.604-3.086,6.034c-0.024,0.31-0.037,0.614-0.043,0.914  c-0.021-0.646-0.006-1.33,0.043-2.044c0.226-3.43,1.053-6.17,3.086-6.034c0.254,0.014,0.496,0.078,0.731,0.176  c0.011,0,0.021-0.002,0.034-0.002c1.722,0.112,2.949,2.82,2.792,6.088C49.732,32.734,48.598,30.618,47.078,30.516z" style="opacity:0.3;fill:#FFFFFF;enable-background:new    ;"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="161" x2="161" y1="-154.5908" y2="-156.8966">
+<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"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="15.002" x2="15.002" y1="26.0142" y2="28.9689">
 <stop offset="0" style="stop-color:#7A7A7A"/>
 <stop offset="0.7818" style="stop-color:#212121"/>
 <stop offset="1" style="stop-color:#666666"/>
 </linearGradient>
-<ellipse cx="30.002" cy="49.546" rx="3.616" ry="2.262" style="fill:url(#SVGID_17_);"/>
+<ellipse cx="15.002" cy="27.53" fill="url(#SVGID_17_)" rx="2.316" ry="1.449"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_car.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,106 +1,107 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5609 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="423.0967" x2="429.6524" y1="-578.646" y2="-582.9078">
+<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.1333" style="stop-color:#A7E722"/>
-<stop offset="0.6303" style="stop-color:#428C0F"/>
-<stop offset="1" style="stop-color:#5CA617"/>
-</linearGradient>
-<path d="M19.081,33.91c2.089-3.595,4.591-6.496,7.281-9.188c2.593-2.591,6.72-5.3,8.562-6.256l9.604-10.282  c-0.845-0.3-3.693-0.464-7.279,0.616c-3.586,1.083-11.736,6.303-16.979,11.547c-5.242,5.246-9.727,12.347-10.581,14.595  c-1.343,3.541-1.221,7.445-0.929,8.58c0,0,0.34,1.035,1.144,2.377C10.248,46.475,19.081,33.91,19.081,33.91z" fill="url(#SVGID_1_)"/>
-<path d="M31.184,20.8c1.488-1.036,2.87-1.882,3.74-2.334L44.271,8.46  c-0.132-0.058-0.209-0.088-0.209-0.088c-0.247-0.088-0.642-0.162-1.124-0.219c-0.793,0.006-1.596,0.093-2.401,0.27  C34.843,9.673,31.019,14.958,31.184,20.8z" fill="#020202" fill-opacity="0.05" stroke-opacity="0.05"/>
-<path d="M31.906,20.306c1.205-0.809,2.291-1.462,3.018-1.84l9.377-10.04  c-0.146-0.063-0.233-0.098-0.233-0.098c-0.231-0.08-0.604-0.152-1.06-0.203c-0.751,0.006-1.51,0.087-2.27,0.253  C35.275,9.576,31.636,14.695,31.906,20.306z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M44.079,8.263c-0.21-0.073-0.55-0.137-0.962-0.186c-0.681,0.006-1.369,0.08-2.06,0.231  c-5.087,1.116-8.426,5.984-7.978,11.233c0.725-0.455,1.363-0.826,1.844-1.076l9.424-10.088C44.178,8.302,44.079,8.263,44.079,8.263z  " fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="40.9697" cy="9.21" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="12.2872">
-<stop offset="0" style="stop-color:#A7E722"/>
-<stop offset="0.6242" style="stop-color:#428C0F"/>
+<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"/>
 </radialGradient>
-<path d="M34.924,18.466l0.929,1.55c0,0,15.101-6.784,14.084-8.038c-0.513-0.631-0.577-0.656-1.237-1.263  c-1.985-1.815-4.172-2.531-4.172-2.531c-0.186-0.063-0.481-0.12-0.845-0.161c-0.596,0.004-1.2,0.068-1.806,0.201  c-4.591,1.009-7.57,5.501-6.963,10.257C34.916,18.477,34.921,18.47,34.924,18.466z" fill="url(#SVGID_2_)"/>
-<path d="M17.483,34.105c-0.988-0.139-2.007-0.119-3.027,0.105c-2.418,0.531-4.376,2.066-5.646,4.131  c-0.367,2.35-0.25,4.408-0.05,5.18c0,0,0.34,1.035,1.144,2.377c0.29,0.482,6.54-8.264,8.556-11.107L17.483,34.105z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M18.366,34.135c-0.989-0.139-2.008-0.117-3.029,0.105c-3.313,0.727-5.775,3.332-6.76,6.623  c-0.026,1.025,0.034,1.873,0.127,2.398c0.003,0.012,0.005,0.033,0.01,0.047c0,0,0.34,1.033,1.144,2.379  c0.3,0.498,6.981-8.887,8.75-11.383L18.366,34.135z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="437.4258" cy="-571.231" gradientTransform="matrix(0.2095 0.9787 -0.9682 0.2124 -629.4526 -270.6148)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="14.6187">
-<stop offset="0" style="stop-color:#A7E722"/>
-<stop offset="0.6242" style="stop-color:#428C0F"/>
-<stop offset="1" style="stop-color:#5CA617"/>
-</radialGradient>
-<path d="M11.202,47.738c0.616,0.74,0.646,0.953,1.295,1.523c1.194,1.055,9.301-13.611,9.301-13.611  l-2.683-1.719c-0.941-0.111-1.914-0.08-2.89,0.135c-4.777,1.049-7.806,5.869-6.87,10.832C9.749,45.686,10.349,46.709,11.202,47.738z  " fill="url(#SVGID_3_)"/>
-<path d="M49.937,11.978c-0.179-0.22-0.381-0.446-0.578-0.67l-13.944,7.959l0.438,0.749  C35.853,20.016,50.953,13.231,49.937,11.978z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="422.2881" x2="427.4786" y1="-610.9287" y2="-594.4409">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.6788" style="stop-color:#387300"/>
-<stop offset="1" style="stop-color:#66A00E"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M35.853,20.016l1.178,1.981c0.302,0.515,0.972,0.674,1.569,0.422l4.09-2.334l8.043-4.668  c0.632-0.363,0.878-1.119,0.549-1.686c0,0-0.333-0.501-1.349-1.751L35.853,20.016z" fill="url(#SVGID_4_)"/>
-<path d="M21.798,35.65l-0.725-0.473l-9.215,13.486c0.216,0.205,0.43,0.414,0.639,0.598  C13.691,50.316,21.798,35.65,21.798,35.65z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="439.6982" x2="451.5232" y1="-577.7549" y2="-564.7323">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.6788" style="stop-color:#387300"/>
-<stop offset="1" style="stop-color:#66A00E"/>
+<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"/>
+<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"/>
 </linearGradient>
-<path d="M12.498,49.262c1.193,1.049,1.686,1.369,1.686,1.369c0.567,0.367,1.363,0.17,1.781-0.441l7.9-11.605  c0.419-0.615,0.307-1.412-0.26-1.777l-1.808-1.156L12.498,49.262z" fill="url(#SVGID_5_)"/>
+<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(0.5 0 0 0.5 30 30)">
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="170.2559" x2="149.9089" y1="-140.6289" y2="-152.619">
-<stop offset="0" style="stop-color:#FF7236"/>
-<stop offset="1" style="stop-color:#BA1212"/>
+<g transform="matrix(1 0 0 1 30 30)">
+<path d="M27.61,11.99l-1.636-5.233c-0.38-1.531-2.51-3.757-4.97-3.757h-12c-2.461,0-4.588,2.226-4.955,3.701l-1.652,5.291c-0.846,0.74-1.393,1.81-1.393,3.01v6c0,0.883,0.391,1.67,1,2.22v1.78c0,1.103,1.01,2,2.25,2h2.5c1.24,0,2.25-0.9,2.25-2v-1h12v1c0,1.103,1.01,2,2.25,2h2.5c1.24,0,2.25-0.897,2.25-2v-1.78c0.609-0.55,1-1.337,1-2.22v-6c0-1.2-0.55-2.28-1.39-3.01z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="5.5" x2="5.5" y1="22" y2="26">
+<stop offset="0" stop-color="#000000"/>
+<stop offset="0.6848" stop-color="#000000"/>
+<stop offset="1" stop-color="#646464"/>
 </linearGradient>
-<polygon points="49.813,29.024 44.074,27.054 43.977,26.426 41.363,22.988 42.54,17.054   41.992,13.336 31.204,15.504 15.934,15.554 13.848,27.054 13.07,27.238 8.536,29.156 5,29.136 5,38.336 55,38.336 55,29.136 " style="fill:url(#SVGID_1__);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="170.7686" x2="170.7686" y1="-141.4971" y2="-152.3484">
-<stop offset="0" style="stop-color:#FF7236"/>
-<stop offset="1" style="stop-color:#BA1212"/>
+<path d="M3,22v3c0,0.55,0.563,1,1.25,1h2.5c0.688,0,1.25-0.45,1.25-1v-3h-5z" fill="url(#SVGID_1__)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="24.5" x2="24.5" y1="22" y2="26">
+<stop offset="0" stop-color="#000000"/>
+<stop offset="0.6848" stop-color="#000000"/>
+<stop offset="1" stop-color="#646464"/>
 </linearGradient>
-<polygon points="45.046,28.93 55,30.734 55,29.136 44.074,27.054 " style="fill:url(#SVGID_2__);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="150.5176" x2="150.5176" y1="-137.749" y2="-156.9571">
-<stop offset="0" style="stop-color:#FF7236"/>
-<stop offset="1" style="stop-color:#BA1212"/>
+<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"/>
+</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">
+<stop offset="0" stop-color="#4D4D4D"/>
+<stop offset="1" stop-color="#000000"/>
 </linearGradient>
-<polygon points="12.75,28.93 13.07,27.238 5,29.136 5,30.668 " style="fill:url(#SVGID_3__);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="160.4697" x2="160.4697" y1="-137.7554" y2="-156.9545">
-<stop offset="0" style="stop-color:#FF824D"/>
-<stop offset="1" style="stop-color:#CC2F21"/>
+<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"/>
 </linearGradient>
-<polygon points="42.258,15.136 41.992,13.336 15.934,15.554 15.622,17.29 " style="fill:url(#SVGID_4__);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="157.3682" x2="157.3682" y1="-138.7998" y2="-148.366">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#4F4F4F"/>
+<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"/>
 </linearGradient>
-<polygon points="18.23,18.782 16.848,26.426 28.626,26.426 28.626,17.968 " style="fill:url(#SVGID_5__);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="165.1436" x2="165.1436" y1="-138.8008" y2="-148.3666">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.6182" style="stop-color:#868686"/>
-<stop offset="0.9636" style="stop-color:#E4E4E4"/>
-<stop offset="1" style="stop-color:#E4E4E4"/>
+<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"/>
 </linearGradient>
-<polygon points="42.54,17.054 32.598,17.726 32.598,26.36 43.977,26.426 " style="fill:url(#SVGID_6_);"/>
-<path d="M23.738,38.074c0-4.028-3.266-7.292-7.292-7.292  c-4.026,0-7.292,3.266-7.292,7.292c0,0.09,0.024,0.172,0.028,0.262h14.532C23.714,38.246,23.738,38.164,23.738,38.074z" style="opacity:0.3;enable-background:new    ;"/>
-<path d="M43.527,30.782c-4.023,0-7.289,3.266-7.289,7.292  c0,0.09,0.023,0.172,0.023,0.262h14.532c0.004-0.09,0.028-0.172,0.028-0.262C50.82,34.046,47.559,30.782,43.527,30.782z" style="opacity:0.3;enable-background:new    ;"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="154.2227" x2="154.2227" y1="-144.5356" y2="-153.8351">
-<stop offset="0" style="stop-color:#808080"/>
-<stop offset="0.5" style="stop-color:#636363"/>
-<stop offset="1" style="stop-color:#1C1C1C"/>
+<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"/>
+</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"/>
 </linearGradient>
-<circle cx="16.446" cy="39.376" r="6.708" style="fill:url(#SVGID_7_);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="154.2227" x2="154.2227" y1="-147.0005" y2="-154.4222">
-<stop offset="0" style="stop-color:#B0B0B0"/>
-<stop offset="1" style="stop-color:#444444"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M16.446,33.126c3.446,0,6.25,2.804,6.25,6.25s-2.804,6.25-6.25,6.25  c-3.446,0-6.25-2.804-6.25-6.25S13,33.126,16.446,33.126 M16.446,32.086c-4.028,0-7.292,3.262-7.292,7.29s3.266,7.292,7.292,7.292  c4.026,0,7.292-3.266,7.292-7.292S20.472,32.086,16.446,32.086L16.446,32.086z" style="fill:url(#SVGID_8_);"/>
-<circle cx="16.446" cy="39.376" r="3.126" style="fill:#A3A3A3;"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="167.7656" x2="167.7656" y1="-144.5356" y2="-153.8351">
-<stop offset="0" style="stop-color:#808080"/>
-<stop offset="0.5" style="stop-color:#636363"/>
-<stop offset="1" style="stop-color:#1C1C1C"/>
+<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"/>
 </linearGradient>
-<circle cx="43.529" cy="39.376" r="6.706" style="fill:url(#SVGID_9_);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="167.7646" x2="167.7646" y1="-147.1313" y2="-154.4224">
-<stop offset="0" style="stop-color:#B0B0B0"/>
-<stop offset="1" style="stop-color:#444444"/>
+<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"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="15" x2="15" y1="23" y2="21">
+<stop offset="0" stop-color="#565656"/>
+<stop offset="1" stop-color="#212121"/>
 </linearGradient>
-<path d="M43.527,33.126c3.451,0,6.25,2.804,6.25,6.25s-2.799,6.25-6.25,6.25  c-3.445,0-6.25-2.804-6.25-6.25S40.082,33.126,43.527,33.126 M43.527,32.086c-4.023,0-7.289,3.262-7.289,7.29  s3.266,7.292,7.289,7.292c4.033,0,7.293-3.266,7.293-7.292S47.559,32.086,43.527,32.086L43.527,32.086z" style="fill:url(#SVGID_10_);"/>
-<circle cx="43.527" cy="39.376" r="3.126" style="fill:#A3A3A3;"/>
-<rect height="60" style="fill:none;" width="60"/>
+<path d="M22,21h-14c-1.1,0-2,0.9-2,2h18c0-1.1-0.9-2-2-2z" fill="url(#SVGID_13_)"/>
+<rect fill="none" height="30" width="30"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_duration.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_duration.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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)">
+<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"/>
+</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"/>
+</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"/>
+<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"/>
+</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"/>
+</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"/>
+</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"/>
+<rect fill="#404041" height="2.335" width="0.777" x="14.611" y="4.396"/>
+<rect fill="#404041" height="2.333" width="0.777" x="14.611" y="23.842"/>
+<rect fill="#404041" height="0.779" width="2.333" x="23.556" y="14.896"/>
+<rect fill="#404041" height="0.779" width="2.332" x="4.111" y="14.896"/>
+<rect fill="#404041" height="1.88" transform="matrix(0.4993 0.8664 -0.8664 0.4993 20.7592 -15.0708)" width="0.628" x="23.106" y="9.486"/>
+<rect fill="#404041" height="1.88" transform="matrix(0.4968 0.8679 -0.8679 0.4968 20.7962 4.4286)" width="0.629" x="6.265" y="19.208"/>
+<rect fill="#404041" height="1.882" transform="matrix(0.8671 0.4981 -0.4981 0.8671 6.0604 -8.9813)" width="0.627" x="19.548" y="5.926"/>
+<rect fill="#404041" height="1.884" transform="matrix(0.8674 0.4977 -0.4977 0.8674 13.1416 -1.9014)" width="0.626" x="9.825" y="22.763"/>
+<rect fill="#404041" height="1.882" transform="matrix(0.8675 -0.4975 0.4975 0.8675 -2.0724 5.954)" width="0.628" x="9.825" y="5.926"/>
+<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"/>
+<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"/>
+</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"/>
+</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"/>
+</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"/>
+<rect fill="none" height="30" width="30"/>
+</g>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_fax.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,289 +1,296 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5609 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="423.0967" x2="429.6524" y1="-578.646" y2="-582.9078">
+<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.1333" style="stop-color:#A7E722"/>
-<stop offset="0.6303" style="stop-color:#428C0F"/>
-<stop offset="1" style="stop-color:#5CA617"/>
-</linearGradient>
-<path d="M19.081,33.91c2.089-3.595,4.591-6.496,7.281-9.188c2.593-2.591,6.72-5.3,8.562-6.256l9.604-10.282  c-0.845-0.3-3.693-0.464-7.279,0.616c-3.586,1.083-11.736,6.303-16.979,11.547c-5.242,5.246-9.727,12.347-10.581,14.595  c-1.343,3.541-1.221,7.445-0.929,8.58c0,0,0.34,1.035,1.144,2.377C10.248,46.475,19.081,33.91,19.081,33.91z" fill="url(#SVGID_1_)"/>
-<path d="M31.184,20.8c1.488-1.036,2.87-1.882,3.74-2.334L44.271,8.46  c-0.132-0.058-0.209-0.088-0.209-0.088c-0.247-0.088-0.642-0.162-1.124-0.219c-0.793,0.006-1.596,0.093-2.401,0.27  C34.843,9.673,31.019,14.958,31.184,20.8z" fill="#020202" fill-opacity="0.05" stroke-opacity="0.05"/>
-<path d="M31.906,20.306c1.205-0.809,2.291-1.462,3.018-1.84l9.377-10.04  c-0.146-0.063-0.233-0.098-0.233-0.098c-0.231-0.08-0.604-0.152-1.06-0.203c-0.751,0.006-1.51,0.087-2.27,0.253  C35.275,9.576,31.636,14.695,31.906,20.306z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M44.079,8.263c-0.21-0.073-0.55-0.137-0.962-0.186c-0.681,0.006-1.369,0.08-2.06,0.231  c-5.087,1.116-8.426,5.984-7.978,11.233c0.725-0.455,1.363-0.826,1.844-1.076l9.424-10.088C44.178,8.302,44.079,8.263,44.079,8.263z  " fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="40.9697" cy="9.21" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="12.2872">
-<stop offset="0" style="stop-color:#A7E722"/>
-<stop offset="0.6242" style="stop-color:#428C0F"/>
+<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"/>
 </radialGradient>
-<path d="M34.924,18.466l0.929,1.55c0,0,15.101-6.784,14.084-8.038c-0.513-0.631-0.577-0.656-1.237-1.263  c-1.985-1.815-4.172-2.531-4.172-2.531c-0.186-0.063-0.481-0.12-0.845-0.161c-0.596,0.004-1.2,0.068-1.806,0.201  c-4.591,1.009-7.57,5.501-6.963,10.257C34.916,18.477,34.921,18.47,34.924,18.466z" fill="url(#SVGID_2_)"/>
-<path d="M17.483,34.105c-0.988-0.139-2.007-0.119-3.027,0.105c-2.418,0.531-4.376,2.066-5.646,4.131  c-0.367,2.35-0.25,4.408-0.05,5.18c0,0,0.34,1.035,1.144,2.377c0.29,0.482,6.54-8.264,8.556-11.107L17.483,34.105z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M18.366,34.135c-0.989-0.139-2.008-0.117-3.029,0.105c-3.313,0.727-5.775,3.332-6.76,6.623  c-0.026,1.025,0.034,1.873,0.127,2.398c0.003,0.012,0.005,0.033,0.01,0.047c0,0,0.34,1.033,1.144,2.379  c0.3,0.498,6.981-8.887,8.75-11.383L18.366,34.135z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="437.4258" cy="-571.231" gradientTransform="matrix(0.2095 0.9787 -0.9682 0.2124 -629.4526 -270.6148)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="14.6187">
-<stop offset="0" style="stop-color:#A7E722"/>
-<stop offset="0.6242" style="stop-color:#428C0F"/>
-<stop offset="1" style="stop-color:#5CA617"/>
-</radialGradient>
-<path d="M11.202,47.738c0.616,0.74,0.646,0.953,1.295,1.523c1.194,1.055,9.301-13.611,9.301-13.611  l-2.683-1.719c-0.941-0.111-1.914-0.08-2.89,0.135c-4.777,1.049-7.806,5.869-6.87,10.832C9.749,45.686,10.349,46.709,11.202,47.738z  " fill="url(#SVGID_3_)"/>
-<path d="M49.937,11.978c-0.179-0.22-0.381-0.446-0.578-0.67l-13.944,7.959l0.438,0.749  C35.853,20.016,50.953,13.231,49.937,11.978z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="422.2881" x2="427.4786" y1="-610.9287" y2="-594.4409">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.6788" style="stop-color:#387300"/>
-<stop offset="1" style="stop-color:#66A00E"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M35.853,20.016l1.178,1.981c0.302,0.515,0.972,0.674,1.569,0.422l4.09-2.334l8.043-4.668  c0.632-0.363,0.878-1.119,0.549-1.686c0,0-0.333-0.501-1.349-1.751L35.853,20.016z" fill="url(#SVGID_4_)"/>
-<path d="M21.798,35.65l-0.725-0.473l-9.215,13.486c0.216,0.205,0.43,0.414,0.639,0.598  C13.691,50.316,21.798,35.65,21.798,35.65z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="439.6982" x2="451.5232" y1="-577.7549" y2="-564.7323">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.6788" style="stop-color:#387300"/>
-<stop offset="1" style="stop-color:#66A00E"/>
+<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"/>
+<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"/>
 </linearGradient>
-<path d="M12.498,49.262c1.193,1.049,1.686,1.369,1.686,1.369c0.567,0.367,1.363,0.17,1.781-0.441l7.9-11.605  c0.419-0.615,0.307-1.412-0.26-1.777l-1.808-1.156L12.498,49.262z" fill="url(#SVGID_5_)"/>
+<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(0.5 0 0 0.5 30 30)">
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="161" x2="161" y1="-135.1333" y2="-142.1849">
+<g transform="matrix(1 0 0 1 30 30)">
+<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"/>
+</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"/>
+<rect fill="#020202" fill-opacity="0.15" height="0.378" stroke-opacity="0.15" width="21.567" x="4.217" y="9.334"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="15.0005" x2="15.0005" y1="1.915" y2="10.6297">
 <stop offset="0" style="stop-color:#D9D9D9"/>
 <stop offset="0.5382" style="stop-color:#B3B3B3"/>
 <stop offset="1" style="stop-color:#B3B3B3"/>
 </linearGradient>
-<rect height="13.47" style="fill:url(#SVGID_1__);" width="30.615" x="14.694" y="8.266"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="161" x2="161" y1="-135.0688" y2="-141.3504">
+<rect fill="url(#SVGID_2__)" height="8.323" width="18.919" x="5.541" y="1.915"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="15.0005" x2="15.0005" y1="1.835" y2="9.598">
 <stop offset="0" style="stop-color:#EDEDED"/>
 <stop offset="1" style="stop-color:#BDBDBD"/>
 </linearGradient>
-<polygon points="45.307,13.598 45.307,21.736 14.694,21.736 14.694,8.266 26.224,8.266 32.54,8.586   44.082,11.888 45.004,12.85 " style="fill:url(#SVGID_2__);"/>
-<rect height="0.612" style="opacity:0.2;fill:#020202;enable-background:new    ;" width="22.653" x="22.654" y="20.512"/>
-<rect height="0.612" style="opacity:0.1;fill:#020202;enable-background:new    ;" width="22.653" x="22.654" y="19.9"/>
-<rect height="0.612" style="opacity:0.5;fill:#020202;enable-background:new    ;" width="22.04" x="18.98" y="16.838"/>
-<rect height="0.614" style="opacity:0.2;fill:#020202;enable-background:new    ;" width="22.04" x="18.98" y="16.224"/>
-<rect height="0.614" style="opacity:0.5;fill:#020202;enable-background:new    ;" width="22.04" x="18.98" y="13.164"/>
-<rect height="0.612" style="opacity:0.2;fill:#020202;enable-background:new    ;" width="22.04" x="18.98" y="12.552"/>
-<path d="M26.07,8.268c0,0,11.112,1.682,15.245,7.346  c0,0,3.123-4.286,3.992-1.956C44.868,11.408,40.902,8.186,26.07,8.268z" style="opacity:0.05;fill:#050505;enable-background:new    ;"/>
-<path d="M26.07,8.268c0,0,11.112,0.458,15.245,6.122  c0,0,3.123-3.674,3.992-0.73C44.868,11.408,40.902,8.186,26.07,8.268z" style="opacity:0.1;fill:#050505;enable-background:new    ;"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="164.1357" x2="163.5586" y1="-135.3989" y2="-137.5425">
+<polygon fill="url(#SVGID_3__)" points="24.46,5.21 24.46,10.238 5.541,10.238 5.541,1.915 12.667,1.915 16.569,2.111 23.704,4.152   24.272,4.748 "/>
+<rect fill="#020202" fill-opacity="0.5" height="0.376" stroke-opacity="0.5" width="13.621" x="8.19" y="7.213"/>
+<rect fill="#020202" fill-opacity="0.2" height="0.379" stroke-opacity="0.2" width="13.621" x="8.19" y="6.834"/>
+<rect fill="#020202" fill-opacity="0.2" height="0.38" stroke-opacity="0.2" width="18.919" x="5.541" y="9.712"/>
+<rect fill="#020202" fill-opacity="0.1" height="0.378" stroke-opacity="0.1" width="18.919" x="5.541" y="9.334"/>
+<rect fill="#020202" fill-opacity="0.03" height="0.379" stroke-opacity="0.03" width="18.919" x="5.541" y="8.955"/>
+<rect fill="#020202" fill-opacity="0.5" height="0.376" stroke-opacity="0.5" width="13.621" x="8.19" y="4.942"/>
+<rect fill="#020202" fill-opacity="0.2" height="0.38" stroke-opacity="0.2" width="13.621" x="8.19" y="4.563"/>
+<path d="M12.572,1.916c0,0,6.867,1.039,9.42,4.539  c0,0,1.93-2.649,2.467-1.208C24.188,3.855,21.738,1.864,12.572,1.916z" fill="#050505" fill-opacity="0.05" fill-rule="evenodd" stroke-opacity="0.05"/>
+<path d="M12.572,1.916c0,0,6.867,0.282,9.42,3.781  c0,0,1.93-2.271,2.467-0.45C24.188,3.855,21.738,1.864,12.572,1.916z" fill="#050505" fill-opacity="0.1" fill-rule="evenodd" stroke-opacity="0.1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="18.876" x2="18.1627" y1="2.2437" y2="4.8932">
 <stop offset="0" style="stop-color:#FFFFFF"/>
 <stop offset="0.0061" style="stop-color:#FFFFFF"/>
 <stop offset="1" style="stop-color:#D9D9D9"/>
 </linearGradient>
-<path d="M26.07,8.268c0,0,11.112,0.098,15.245,5.762c0,0,2.957-3.648,3.992-0.372  C44.868,11.408,40.902,8.186,26.07,8.268z" style="fill:url(#SVGID_3__);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="161" x2="161" y1="-141.3848" y2="-156.6929">
-<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"/>
+<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"/>
 </linearGradient>
-<path d="M50.816,49.288c0,1.353-1.099,2.45-2.45,2.45H11.632c-1.352,0-2.45-1.098-2.45-2.45V23.572  c0-1.352,1.098-2.45,2.45-2.45h36.734c1.352,0,2.45,1.098,2.45,2.45V49.288z" style="fill:url(#SVGID_4__);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="161" x2="161" y1="-141.3848" y2="-156.6919">
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M48.368,21.124H11.632c-1.352,0-2.45,1.098-2.45,2.45v25.714c0,1.353,1.098,2.45,2.45,2.45  c-1.014,0-1.836-0.824-1.836-1.838v-0.612V24.186v-0.614c0-1.012,0.822-1.836,1.836-1.836h36.734c1.014,0,1.836,0.824,1.836,1.836  v0.614v25.102V49.9c0,1.014-0.822,1.838-1.836,1.838c1.352,0,2.45-1.098,2.45-2.45V23.572C50.816,22.22,49.718,21.124,48.368,21.124  z" style="fill:url(#SVGID_5__);"/>
-<path d="M45.307,47.45h-2.451c-0.676,0-1.224-0.548-1.224-1.224v0.613  c0,0.676,0.548,1.225,1.224,1.225h2.451c0.676,0,1.223-0.549,1.223-1.225v-0.613C46.532,46.9,45.982,47.45,45.307,47.45z" style="opacity:0.4;fill:#231F20;enable-background:new    ;"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="168.041" x2="168.041" y1="-152.2827" y2="-154.7474">
+<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"/>
+</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">
+<stop offset="0" style="stop-color:#171717"/>
+<stop offset="1" style="stop-color:#2E2E2E"/>
+</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"/>
+</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"/>
+</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.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
-<path d="M42.857,47.45c-0.676,0-1.224-0.548-1.224-1.224  v-2.449c0-0.676,0.548-1.223,1.224-1.223h2.451c0.676,0,1.224,0.547,1.224,1.223v2.449c0,0.676-0.548,1.224-1.224,1.224H42.857z" style="opacity:0.8;fill:url(#SVGID_6_);enable-background:new    ;"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="168.041" x2="168.041" y1="-152.5596" y2="-154.466">
-<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"/>
-</linearGradient>
-<path d="M45.918,46.225c0,0.34-0.273,0.613-0.611,0.613h-2.451c-0.338,0-0.611-0.273-0.611-0.613  v-2.449c0-0.34,0.273-0.613,0.611-0.613h2.451c0.338,0,0.611,0.273,0.611,0.613V46.225z" style="fill:url(#SVGID_7_);"/>
-<path d="M38.57,47.45h-2.448c-0.677,0-1.224-0.548-1.224-1.224v0.613  c0,0.676,0.547,1.225,1.224,1.225h2.448c0.676,0,1.226-0.549,1.226-1.225v-0.613C39.796,46.9,39.246,47.45,38.57,47.45z" style="opacity:0.4;fill:#231F20;enable-background:new    ;"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="164.6738" x2="164.6738" y1="-152.2534" y2="-154.7776">
-<stop offset="0" style="stop-color:#646263"/>
-<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="M36.124,47.45c-0.676,0-1.224-0.548-1.224-1.224  v-2.449c0-0.676,0.548-1.223,1.224-1.223h2.448c0.676,0,1.226,0.547,1.226,1.223v2.449c0,0.676-0.55,1.224-1.226,1.224H36.124z" style="opacity:0.8;fill:url(#SVGID_8_);enable-background:new    ;"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="164.6729" x2="164.6729" y1="-152.5596" y2="-154.466">
-<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"/>
-</linearGradient>
-<path d="M39.184,46.225c0,0.34-0.273,0.613-0.613,0.613h-2.448c-0.338,0-0.614-0.273-0.614-0.613  v-2.449c0-0.34,0.276-0.613,0.614-0.613h2.448c0.34,0,0.613,0.273,0.613,0.613V46.225z" style="fill:url(#SVGID_9_);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="161.3066" x2="161.3066" y1="-152.2534" y2="-154.7479">
-<stop offset="0" style="stop-color:#646263"/>
-<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="M29.386,47.45c-0.674,0-1.222-0.548-1.222-1.224  v-2.449c0-0.676,0.548-1.223,1.222-1.223h2.45c0.676,0,1.225,0.547,1.225,1.223v2.449c0,0.676-0.549,1.224-1.225,1.224H29.386z" style="opacity:0.8;fill:url(#SVGID_10_);enable-background:new    ;"/>
-<path d="M31.836,47.45h-2.45c-0.674,0-1.222-0.548-1.222-1.224v0.613  c0,0.676,0.548,1.225,1.222,1.225h2.45c0.676,0,1.225-0.549,1.225-1.225v-0.613C33.061,46.9,32.512,47.45,31.836,47.45z" style="opacity:0.4;fill:#231F20;enable-background:new    ;"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="161.3057" x2="161.3057" y1="-152.5596" y2="-154.466">
+<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"/>
+<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"/>
 </linearGradient>
-<path d="M32.45,46.225c0,0.34-0.274,0.613-0.614,0.613h-2.45c-0.338,0-0.612-0.273-0.612-0.613  v-2.449c0-0.34,0.274-0.613,0.612-0.613h2.45c0.34,0,0.614,0.273,0.614,0.613V46.225z" style="fill:url(#SVGID_11_);"/>
-<path d="M45.307,41.328h-2.451c-0.676,0-1.224-0.549-1.224-1.225  v0.612c0,0.677,0.548,1.224,1.224,1.224h2.451c0.676,0,1.223-0.547,1.223-1.224v-0.612C46.532,40.779,45.982,41.328,45.307,41.328z" style="opacity:0.4;fill:#231F20;enable-background:new    ;"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="168.041" x2="168.041" y1="-149.2212" y2="-151.6869">
+<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.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
-<path d="M42.857,41.328c-0.676,0-1.224-0.549-1.224-1.225  v-2.449c0-0.674,0.548-1.225,1.224-1.225h2.451c0.676,0,1.224,0.551,1.224,1.225v2.449c0,0.676-0.548,1.225-1.224,1.225H42.857z" style="opacity:0.8;fill:url(#SVGID_12_);enable-background:new    ;"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="168.041" x2="168.041" y1="-149.499" y2="-151.4055">
+<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"/>
+<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"/>
+</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.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"/>
+<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"/>
 </linearGradient>
-<path d="M45.918,40.104c0,0.338-0.273,0.612-0.611,0.612h-2.451c-0.338,0-0.611-0.274-0.611-0.612  v-2.449c0-0.338,0.273-0.614,0.611-0.614h2.451c0.338,0,0.611,0.276,0.611,0.614V40.104z" style="fill:url(#SVGID_13_);"/>
-<path d="M38.57,41.328h-2.448c-0.677,0-1.224-0.549-1.224-1.225v0.612  c0,0.677,0.547,1.224,1.224,1.224h2.448c0.676,0,1.226-0.547,1.226-1.224v-0.612C39.796,40.779,39.246,41.328,38.57,41.328z" style="opacity:0.4;fill:#231F20;enable-background:new    ;"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="164.6738" x2="164.6738" y1="-149.1919" y2="-151.7171">
+<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.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
-<path d="M36.124,41.328c-0.676,0-1.224-0.549-1.224-1.225  v-2.449c0-0.674,0.548-1.225,1.224-1.225h2.448c0.676,0,1.226,0.551,1.226,1.225v2.449c0,0.676-0.55,1.225-1.226,1.225H36.124z" style="opacity:0.8;fill:url(#SVGID_14_);enable-background:new    ;"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="164.6729" x2="164.6729" y1="-149.499" y2="-151.4055">
+<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"/>
+<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"/>
 </linearGradient>
-<path d="M39.184,40.104c0,0.338-0.273,0.612-0.613,0.612h-2.448c-0.338,0-0.614-0.274-0.614-0.612  v-2.449c0-0.338,0.276-0.614,0.614-0.614h2.448c0.34,0,0.613,0.276,0.613,0.614V40.104z" style="fill:url(#SVGID_15_);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="161.3066" x2="161.3066" y1="-149.1919" y2="-151.6874">
+<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.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
-<path d="M29.386,41.328c-0.674,0-1.222-0.549-1.222-1.225  v-2.449c0-0.674,0.548-1.225,1.222-1.225h2.45c0.676,0,1.225,0.551,1.225,1.225v2.449c0,0.676-0.549,1.225-1.225,1.225H29.386z" style="opacity:0.8;fill:url(#SVGID_16_);enable-background:new    ;"/>
-<path d="M31.836,41.328h-2.45c-0.674,0-1.222-0.549-1.222-1.225v0.612  c0,0.677,0.548,1.224,1.222,1.224h2.45c0.676,0,1.225-0.547,1.225-1.224v-0.612C33.061,40.779,32.512,41.328,31.836,41.328z" style="opacity:0.4;fill:#231F20;enable-background:new    ;"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="161.3057" x2="161.3057" y1="-149.499" y2="-151.4055">
+<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"/>
+<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"/>
 </linearGradient>
-<path d="M32.45,40.104c0,0.338-0.274,0.612-0.614,0.612h-2.45c-0.338,0-0.612-0.274-0.612-0.612  v-2.449c0-0.338,0.274-0.614,0.612-0.614h2.45c0.34,0,0.614,0.276,0.614,0.614V40.104z" style="fill:url(#SVGID_17_);"/>
-<path d="M45.307,35.206h-2.451c-0.676,0-1.224-0.548-1.224-1.224  v0.611c0,0.676,0.548,1.225,1.224,1.225h2.451c0.676,0,1.223-0.549,1.223-1.225V33.98C46.532,34.656,45.982,35.206,45.307,35.206z" style="opacity:0.4;fill:#231F20;enable-background:new    ;"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="168.041" x2="168.041" y1="-146.1592" y2="-148.6264">
+<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.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
-<path d="M42.857,35.206c-0.676,0-1.224-0.548-1.224-1.224  v-2.45c0-0.675,0.548-1.224,1.224-1.224h2.451c0.676,0,1.224,0.549,1.224,1.224v2.45c0,0.676-0.548,1.224-1.224,1.224H42.857z" style="opacity:0.8;fill:url(#SVGID_18_);enable-background:new    ;"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="168.041" x2="168.041" y1="-146.437" y2="-148.3429">
+<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"/>
+<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"/>
 </linearGradient>
-<path d="M45.918,33.98c0,0.338-0.273,0.611-0.611,0.611h-2.451c-0.338,0-0.611-0.273-0.611-0.611  v-2.451c0-0.338,0.273-0.611,0.611-0.611h2.451c0.338,0,0.611,0.273,0.611,0.611V33.98z" style="fill:url(#SVGID_19_);"/>
-<path d="M38.57,35.206h-2.448c-0.677,0-1.224-0.548-1.224-1.224v0.611  c0,0.676,0.547,1.225,1.224,1.225h2.448c0.676,0,1.226-0.549,1.226-1.225V33.98C39.796,34.656,39.246,35.206,38.57,35.206z" style="opacity:0.4;fill:#231F20;enable-background:new    ;"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="164.6738" x2="164.6738" y1="-146.1299" y2="-148.6566">
+<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.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
-<path d="M36.124,35.206c-0.676,0-1.224-0.548-1.224-1.224  v-2.45c0-0.675,0.548-1.224,1.224-1.224h2.448c0.676,0,1.226,0.549,1.226,1.224v2.45c0,0.676-0.55,1.224-1.226,1.224H36.124z" style="opacity:0.8;fill:url(#SVGID_20_);enable-background:new    ;"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="164.6729" x2="164.6729" y1="-146.437" y2="-148.3429">
+<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"/>
+<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"/>
 </linearGradient>
-<path d="M39.184,33.98c0,0.338-0.273,0.611-0.613,0.611h-2.448c-0.338,0-0.614-0.273-0.614-0.611  v-2.451c0-0.338,0.276-0.611,0.614-0.611h2.448c0.34,0,0.613,0.273,0.613,0.611V33.98z" style="fill:url(#SVGID_21_);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_22_" x1="161.3066" x2="161.3066" y1="-146.1299" y2="-148.6269">
+<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.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
-<path d="M29.386,35.206c-0.674,0-1.222-0.548-1.222-1.224  v-2.45c0-0.675,0.548-1.224,1.222-1.224h2.45c0.676,0,1.225,0.549,1.225,1.224v2.45c0,0.676-0.549,1.224-1.225,1.224H29.386z" style="opacity:0.8;fill:url(#SVGID_22_);enable-background:new    ;"/>
-<path d="M31.836,35.206h-2.45c-0.674,0-1.222-0.548-1.222-1.224v0.611  c0,0.676,0.548,1.225,1.222,1.225h2.45c0.676,0,1.225-0.549,1.225-1.225V33.98C33.061,34.656,32.512,35.206,31.836,35.206z" style="opacity:0.4;fill:#231F20;enable-background:new    ;"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_23_" x1="161.3057" x2="161.3057" y1="-146.437" y2="-148.3429">
+<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"/>
+<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"/>
 </linearGradient>
-<path d="M32.45,33.98c0,0.338-0.274,0.611-0.614,0.611h-2.45c-0.338,0-0.612-0.273-0.612-0.611  v-2.451c0-0.338,0.274-0.611,0.612-0.611h2.45c0.34,0,0.614,0.273,0.614,0.611V33.98z" style="fill:url(#SVGID_23_);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_24_" x1="164.6748" x2="164.6748" y1="-142.4873" y2="-145.5609">
-<stop offset="0" style="stop-color:#686C6E"/>
-<stop offset="1" style="stop-color:#E4EEF2"/>
+<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.2" style="stop-color:#4D4D4D"/>
+<stop offset="0.7212" style="stop-color:#242424"/>
+<stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
-<path d="M27.552,29.082c-0.676,0-1.226-0.556-1.226-1.238  v-3.642c0-0.686,0.55-1.24,1.226-1.24H47.15c0.676,0,1.224,0.554,1.224,1.24v3.642c0,0.682-0.548,1.238-1.224,1.238H27.552z" style="opacity:0.4;fill:url(#SVGID_24_);enable-background:new    ;"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_25_" x1="164.6738" x2="164.6738" y1="-142.8013" y2="-145.2792">
+<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"/>
+<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"/>
+</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">
+<stop offset="0" style="stop-color:#D9D9D9"/>
+<stop offset="0.5382" style="stop-color:#B3B3B3"/>
+<stop offset="1" style="stop-color:#B3B3B3"/>
+</linearGradient>
+<rect fill="url(#SVGID_30_)" height="6.053" width="18.919" x="5.541" y="22.032"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_31_" x1="15.0005" x2="15.0005" y1="21.604" y2="23.7331">
 <stop offset="0" style="stop-color:#171717"/>
 <stop offset="1" style="stop-color:#2E2E2E"/>
 </linearGradient>
-<path d="M47.756,27.844c0,0.342-0.273,0.62-0.613,0.62H27.552c-0.338,0-0.614-0.278-0.614-0.62  v-3.642c0-0.344,0.276-0.622,0.614-0.622h19.591c0.34,0,0.613,0.278,0.613,0.622V27.844z" style="fill:url(#SVGID_25_);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_26_" x1="164.6738" x2="164.6738" y1="-139.7861" y2="-146.1987">
-<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"/>
-</linearGradient>
-<rect height="3.642" style="fill:url(#SVGID_26_);" width="19.591" x="27.552" y="24.202"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_27_" x1="164.6738" x2="164.6738" y1="-141.0332" y2="-145.4888">
-<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"/>
-</linearGradient>
-<polygon points="27.552,25.816 47.143,24.772 47.143,24.186 27.552,24.186 " style="fill:url(#SVGID_27_);"/>
-<path d="M17.142,49.288h1.224c3.376,0,6.124-2.748,6.124-6.124v-22.04  c0-3.376-2.748-6.122-6.124-6.122h-1.224c-0.87,0-1.698,0.184-2.45,0.514v5.608h-3.06c-0.212,0-0.416,0.038-0.614,0.088v21.954  C11.02,46.54,13.768,49.288,17.142,49.288z" style="opacity:0.1;fill:#050505;enable-background:new    ;"/>
-<path d="M17.142,48.674h1.224c3.04,0,5.51-2.47,5.51-5.51v-22.04  c0-3.04-2.47-5.51-5.51-5.51h-1.224c-0.88,0-1.708,0.212-2.45,0.58v4.93h-3.06v22.042C11.632,46.204,14.106,48.674,17.142,48.674z" style="opacity:0.2;fill:#050505;enable-background:new    ;"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_28_" x1="154.8779" x2="154.8779" y1="-139.1777" y2="-155.3331">
-<stop offset="0" style="stop-color:#727678"/>
-<stop offset="0.7394" style="stop-color:#252629"/>
-<stop offset="1" style="stop-color:#494C4F"/>
+<path d="M24.568,21.584H5.433c-0.21,0-0.382,0.172-0.382,0.383v1.751H24.95v-1.751  C24.95,21.756,24.779,21.584,24.568,21.584z" fill="url(#SVGID_31_)"/>
+<path d="M24.568,21.206H5.433c-0.21,0-0.382,0.171-0.382,0.384v0.377  c0-0.211,0.171-0.383,0.382-0.383h19.135c0.211,0,0.382,0.172,0.382,0.383V21.59C24.95,21.377,24.779,21.206,24.568,21.206z" fill="#FFFFFF" fill-opacity="0.35" stroke-opacity="0.35"/>
+<linearGradient gradientTransform="matrix(-1 0 0 -1 -7634.4854 1952.6084)" gradientUnits="userSpaceOnUse" id="SVGID_32_" x1="-7649.4858" x2="-7649.4858" y1="1924.4653" y2="1930.1107">
+<stop offset="0" style="stop-color:#EDEDED"/>
+<stop offset="1" style="stop-color:#BDBDBD"/>
 </linearGradient>
-<path d="M23.266,43.164c0,2.706-2.192,4.898-4.898,4.898h-1.226c-2.706,0-4.896-2.194-4.896-4.898  v-22.04c0-2.706,2.192-4.898,4.896-4.898h1.224c2.708,0,4.898,2.194,4.898,4.898v22.04H23.266z" style="fill:url(#SVGID_28_);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_29_" x1="154.877" x2="154.877" y1="-139.1299" y2="-143.4803">
-<stop offset="0" style="stop-color:#B5BCBF"/>
-<stop offset="1" style="stop-color:#494C4F"/>
-</linearGradient>
-<path d="M18.368,16.224h-1.226c-2.706,0-4.896,2.194-4.896,4.898v3.674  c0-2.706,2.192-4.898,4.896-4.898h1.224c2.708,0,4.898,2.194,4.898,4.898v-3.674C23.266,18.418,21.074,16.224,18.368,16.224z" style="fill:url(#SVGID_29_);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_30_" x1="154.877" x2="154.877" y1="-139.1191" y2="-142.234">
-<stop offset="0" style="stop-color:#D5DDE0"/>
-<stop offset="1" style="stop-color:#494C4F"/>
+<polygon fill="url(#SVGID_32_)" points="5.541,24.79 5.541,22.032 24.46,22.032 24.46,28.085 17.334,28.085 13.432,27.889   6.298,25.848 5.729,25.252 "/>
+<rect fill="#020202" fill-opacity="0.3" height="0.38" stroke-opacity="0.3" width="18.919" x="5.541" y="22.032"/>
+<rect fill="#020202" fill-opacity="0.15" height="0.378" stroke-opacity="0.15" width="18.919" x="5.541" y="22.412"/>
+<rect fill="#020202" fill-opacity="0.05" height="0.378" stroke-opacity="0.05" width="18.919" x="5.541" y="22.79"/>
+<rect fill="#020202" fill-opacity="0.5" height="0.376" stroke-opacity="0.5" width="13.621" x="8.19" y="24.682"/>
+<rect fill="#020202" fill-opacity="0.2" height="0.38" stroke-opacity="0.2" width="13.621" x="8.19" y="25.058"/>
+<path d="M17.429,28.084c0,0-6.867-1.039-9.421-4.539  c0,0-1.929,2.649-2.467,1.208C5.813,26.145,8.263,28.136,17.429,28.084z" fill="#050505" fill-opacity="0.05" fill-rule="evenodd" stroke-opacity="0.05"/>
+<path d="M17.429,28.084c0,0-6.867-0.282-9.421-3.781  c0,0-1.929,2.271-2.467,0.45C5.813,26.145,8.263,28.136,17.429,28.084z" fill="#050505" fill-opacity="0.1" fill-rule="evenodd" stroke-opacity="0.1"/>
+<linearGradient gradientTransform="matrix(-1 0 0 -1 -7634.4854 1952.6084)" gradientUnits="userSpaceOnUse" id="SVGID_33_" x1="-7645.6104" x2="-7646.3232" y1="1924.8521" y2="1927.5011">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="0.0061" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#D9D9D9"/>
 </linearGradient>
-<path d="M18.368,16.224h-1.226c-2.706,0-4.896,2.194-4.896,4.898v0.614  c0-2.706,2.192-4.898,4.896-4.898h1.224c2.708,0,4.898,2.194,4.898,4.898v-0.614C23.266,18.418,21.074,16.224,18.368,16.224z" style="fill:url(#SVGID_30_);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_31_" x1="154.877" x2="154.877" y1="-138.873" y2="-155.1352">
-<stop offset="0" style="stop-color:#A0A7A8"/>
-<stop offset="0.7576" style="stop-color:#252629"/>
-<stop offset="1" style="stop-color:#1F2021"/>
-</linearGradient>
-<path d="M18.368,19.898h-1.226c-0.65,0-1.27,0.128-1.836,0.362v24.129h4.896V20.26  C19.636,20.028,19.018,19.898,18.368,19.898z" style="fill:url(#SVGID_31_);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_32_" x1="154.877" x2="154.877" y1="-150.7632" y2="-155.1131">
-<stop offset="0" style="stop-color:#252629"/>
-<stop offset="1" style="stop-color:#5A5D61"/>
-</linearGradient>
-<path d="M18.368,44.389h-1.226c-2.706,0-4.896-2.195-4.896-4.898v3.674  c0,2.706,2.192,4.898,4.896,4.898h1.224c2.708,0,4.898-2.194,4.898-4.898V39.49C23.266,42.195,21.074,44.389,18.368,44.389z" style="fill:url(#SVGID_32_);"/>
-<rect height="60" style="fill:none;" width="60"/>
+<path d="M17.429,28.084c0,0-6.867-0.059-9.421-3.56  c0,0-1.829,2.256-2.467,0.229C5.813,26.145,8.263,28.136,17.429,28.084z" fill="url(#SVGID_33_)" fill-rule="evenodd"/>
+<rect fill="none" height="30" width="30" x="0"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_fax_home.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,90 +1,314 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5609 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="423.0967" x2="429.6524" y1="-578.646" y2="-582.9078">
+<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.1333" style="stop-color:#A7E722"/>
-<stop offset="0.6303" style="stop-color:#428C0F"/>
-<stop offset="1" style="stop-color:#5CA617"/>
-</linearGradient>
-<path d="M19.081,33.91c2.089-3.595,4.591-6.496,7.281-9.188c2.593-2.591,6.72-5.3,8.562-6.256l9.604-10.282  c-0.845-0.3-3.693-0.464-7.279,0.616c-3.586,1.083-11.736,6.303-16.979,11.547c-5.242,5.246-9.727,12.347-10.581,14.595  c-1.343,3.541-1.221,7.445-0.929,8.58c0,0,0.34,1.035,1.144,2.377C10.248,46.475,19.081,33.91,19.081,33.91z" fill="url(#SVGID_1_)"/>
-<path d="M31.184,20.8c1.488-1.036,2.87-1.882,3.74-2.334L44.271,8.46  c-0.132-0.058-0.209-0.088-0.209-0.088c-0.247-0.088-0.642-0.162-1.124-0.219c-0.793,0.006-1.596,0.093-2.401,0.27  C34.843,9.673,31.019,14.958,31.184,20.8z" fill="#020202" fill-opacity="0.05" stroke-opacity="0.05"/>
-<path d="M31.906,20.306c1.205-0.809,2.291-1.462,3.018-1.84l9.377-10.04  c-0.146-0.063-0.233-0.098-0.233-0.098c-0.231-0.08-0.604-0.152-1.06-0.203c-0.751,0.006-1.51,0.087-2.27,0.253  C35.275,9.576,31.636,14.695,31.906,20.306z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M44.079,8.263c-0.21-0.073-0.55-0.137-0.962-0.186c-0.681,0.006-1.369,0.08-2.06,0.231  c-5.087,1.116-8.426,5.984-7.978,11.233c0.725-0.455,1.363-0.826,1.844-1.076l9.424-10.088C44.178,8.302,44.079,8.263,44.079,8.263z  " fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="40.9697" cy="9.21" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="12.2872">
-<stop offset="0" style="stop-color:#A7E722"/>
-<stop offset="0.6242" style="stop-color:#428C0F"/>
+<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"/>
 </radialGradient>
-<path d="M34.924,18.466l0.929,1.55c0,0,15.101-6.784,14.084-8.038c-0.513-0.631-0.577-0.656-1.237-1.263  c-1.985-1.815-4.172-2.531-4.172-2.531c-0.186-0.063-0.481-0.12-0.845-0.161c-0.596,0.004-1.2,0.068-1.806,0.201  c-4.591,1.009-7.57,5.501-6.963,10.257C34.916,18.477,34.921,18.47,34.924,18.466z" fill="url(#SVGID_2_)"/>
-<path d="M17.483,34.105c-0.988-0.139-2.007-0.119-3.027,0.105c-2.418,0.531-4.376,2.066-5.646,4.131  c-0.367,2.35-0.25,4.408-0.05,5.18c0,0,0.34,1.035,1.144,2.377c0.29,0.482,6.54-8.264,8.556-11.107L17.483,34.105z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M18.366,34.135c-0.989-0.139-2.008-0.117-3.029,0.105c-3.313,0.727-5.775,3.332-6.76,6.623  c-0.026,1.025,0.034,1.873,0.127,2.398c0.003,0.012,0.005,0.033,0.01,0.047c0,0,0.34,1.033,1.144,2.379  c0.3,0.498,6.981-8.887,8.75-11.383L18.366,34.135z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="437.4258" cy="-571.231" gradientTransform="matrix(0.2095 0.9787 -0.9682 0.2124 -629.4526 -270.6148)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="14.6187">
-<stop offset="0" style="stop-color:#A7E722"/>
-<stop offset="0.6242" style="stop-color:#428C0F"/>
-<stop offset="1" style="stop-color:#5CA617"/>
-</radialGradient>
-<path d="M11.202,47.738c0.616,0.74,0.646,0.953,1.295,1.523c1.194,1.055,9.301-13.611,9.301-13.611  l-2.683-1.719c-0.941-0.111-1.914-0.08-2.89,0.135c-4.777,1.049-7.806,5.869-6.87,10.832C9.749,45.686,10.349,46.709,11.202,47.738z  " fill="url(#SVGID_3_)"/>
-<path d="M49.937,11.978c-0.179-0.22-0.381-0.446-0.578-0.67l-13.944,7.959l0.438,0.749  C35.853,20.016,50.953,13.231,49.937,11.978z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="422.2881" x2="427.4786" y1="-610.9287" y2="-594.4409">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.6788" style="stop-color:#387300"/>
-<stop offset="1" style="stop-color:#66A00E"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M35.853,20.016l1.178,1.981c0.302,0.515,0.972,0.674,1.569,0.422l4.09-2.334l8.043-4.668  c0.632-0.363,0.878-1.119,0.549-1.686c0,0-0.333-0.501-1.349-1.751L35.853,20.016z" fill="url(#SVGID_4_)"/>
-<path d="M21.798,35.65l-0.725-0.473l-9.215,13.486c0.216,0.205,0.43,0.414,0.639,0.598  C13.691,50.316,21.798,35.65,21.798,35.65z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="439.6982" x2="451.5232" y1="-577.7549" y2="-564.7323">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.6788" style="stop-color:#387300"/>
-<stop offset="1" style="stop-color:#66A00E"/>
+<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"/>
+<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"/>
 </linearGradient>
-<path d="M12.498,49.262c1.193,1.049,1.686,1.369,1.686,1.369c0.567,0.367,1.363,0.17,1.781-0.441l7.9-11.605  c0.419-0.615,0.307-1.412-0.26-1.777l-1.808-1.156L12.498,49.262z" fill="url(#SVGID_5_)"/>
+<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)">
-<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"/>
+<polygon fill="none" points="0,11.605 0,11.61 0,22.205 0,22.21 0,30 30,30 30,22.205 30,11.61 30,0 0,0 "/>
+<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.128,24.718,0,23.591,0,22.205V11.61c0-1.387,1.128-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="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"/>
+</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.753  c0-0.221,0.179-0.398,0.399-0.398h20.756c0.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"/>
+<rect fill="#020202" fill-opacity="0.15" height="0.378" stroke-opacity="0.15" width="21.567" x="4.217" y="9.334"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="15" x2="15" y1="1.915" y2="10.6297">
+<stop offset="0" style="stop-color:#D9D9D9"/>
+<stop offset="0.5382" style="stop-color:#B3B3B3"/>
+<stop offset="1" style="stop-color:#B3B3B3"/>
+</linearGradient>
+<rect fill="url(#SVGID_2__)" height="8.323" width="18.918" x="5.541" y="1.915"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="15" x2="15" y1="1.835" y2="9.598">
+<stop offset="0" style="stop-color:#EDEDED"/>
+<stop offset="1" style="stop-color:#BDBDBD"/>
+</linearGradient>
+<polygon fill="url(#SVGID_3__)" points="24.459,5.21 24.459,10.238 5.541,10.238 5.541,1.915 12.667,1.915 16.569,2.111   23.704,4.152 24.272,4.748 "/>
+<rect fill="#020202" fill-opacity="0.5" height="0.377" stroke-opacity="0.5" width="13.621" x="8.19" y="7.212"/>
+<rect fill="#020202" fill-opacity="0.2" height="0.379" stroke-opacity="0.2" width="13.621" x="8.19" y="6.833"/>
+<rect fill="#020202" fill-opacity="0.2" height="0.379" stroke-opacity="0.2" width="18.918" x="5.541" y="9.712"/>
+<rect fill="#020202" fill-opacity="0.1" height="0.378" stroke-opacity="0.1" width="18.918" x="5.541" y="9.334"/>
+<rect fill="#020202" fill-opacity="0.03" height="0.379" stroke-opacity="0.03" width="18.918" x="5.541" y="8.955"/>
+<rect fill="#020202" fill-opacity="0.5" height="0.377" stroke-opacity="0.5" width="13.621" x="8.19" y="4.941"/>
+<rect fill="#020202" fill-opacity="0.2" height="0.379" stroke-opacity="0.2" width="13.621" x="8.19" y="4.563"/>
+<path d="M12.572,1.916c0,0,6.867,1.039,9.421,4.539  c0,0,1.93-2.648,2.467-1.209C24.188,3.855,21.738,1.864,12.572,1.916z" fill="#050505" fill-opacity="0.05" fill-rule="evenodd" stroke-opacity="0.05"/>
+<path d="M12.572,1.916c0,0,6.867,0.282,9.421,3.781  c0,0,1.93-2.27,2.467-0.451C24.188,3.855,21.738,1.864,12.572,1.916z" fill="#050505" fill-opacity="0.1" fill-rule="evenodd" stroke-opacity="0.1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="18.876" x2="18.1629" y1="2.2437" y2="4.8927">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="0.0061" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#D9D9D9"/>
+</linearGradient>
+<path d="M12.572,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.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"/>
+</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.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"/>
+</linearGradient>
+<path d="M4.223,23.718v1.818c0,0.221,0.179,0.4,0.399,0.4h20.756c0.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.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"/>
+</linearGradient>
+<path d="M27.487,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.323,10.096,27.487,10.096  z" fill="url(#SVGID_7_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="10.4927" x2="10.4927" y1="11.9312" y2="15.3514">
+<stop offset="0" style="stop-color:#686C6E"/>
+<stop offset="1" style="stop-color:#E4EEF2"/>
+</linearGradient>
+<path d="M5.005,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.978c0.416,0,0.756,0.343,0.756,0.767v1.873c0,0.421-0.34,0.766-0.756,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">
+<stop offset="0" style="stop-color:#171717"/>
+<stop offset="1" style="stop-color:#2E2E2E"/>
 </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"/>
+<path d="M16.356,14.563c0,0.21-0.17,0.383-0.379,0.383H5.005c-0.209,0-0.379-0.173-0.379-0.383V12.69  c0-0.214,0.17-0.385,0.379-0.385h10.972c0.209,0,0.379,0.171,0.379,0.385V14.563z" fill="url(#SVGID_9_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="10.4912" x2="10.4912" 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"/>
+</linearGradient>
+<rect fill="url(#SVGID_10_)" height="1.873" width="10.972" x="5.005" y="12.69"/>
+<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"/>
+</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.9116" x2="24.9116" y1="11.897" y2="14.1399">
+<stop offset="0" style="stop-color:#646263"/>
+<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.993,13.762,25.668,14.085,25.27,14.085z" fill="#231F20" 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"/>
 </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"/>
+<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.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.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.662z" 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.776,14.085,22.377,14.085z" fill="#231F20" 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"/>
+</linearGradient>
+<path d="M22.741,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.1279" x2="19.1279" y1="11.897" y2="14.1399">
+<stop offset="0" style="stop-color:#646263"/>
+<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.486,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.486,14.085z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="19.1284" x2="19.1284" 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"/>
+</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.9116" x2="24.9116" y1="14.7866" y2="17.0326">
+<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0.2" style="stop-color:#4D4D4D"/>
+<stop offset="0.7212" style="stop-color:#242424"/>
+<stop offset="1" style="stop-color:#373737"/>
 </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"/>
+<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.993,16.652,25.668,16.978,25.27,16.978z" fill="#231F20" 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"/>
+</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.0326">
+<stop offset="0" style="stop-color:#646263"/>
+<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.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.662z" 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.776,16.978,22.377,16.978z" fill="#231F20" 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"/>
+</linearGradient>
+<path d="M22.741,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.1279" x2="19.1279" y1="14.7866" y2="17.0326">
+<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0.2" style="stop-color:#4D4D4D"/>
+<stop offset="0.7212" style="stop-color:#242424"/>
+<stop offset="1" style="stop-color:#373737"/>
 </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"/>
+<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.486,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.486,16.978z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_23_" x1="19.1284" x2="19.1284" 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"/>
+</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.9116" x2="24.9116" y1="17.6792" y2="19.9231">
+<stop offset="0" style="stop-color:#646263"/>
+<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.993,19.546,25.668,19.868,25.27,19.868z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_25_" x1="24.9111" x2="24.9111" y1="18.0503" 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"/>
+</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.6792" y2="19.9231">
+<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0.2" style="stop-color:#4D4D4D"/>
+<stop offset="0.7212" style="stop-color:#242424"/>
+<stop offset="1" style="stop-color:#373737"/>
 </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>
+<path d="M21.662,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.662z" 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.776,19.868,22.377,19.868z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_27_" x1="22.02" x2="22.02" y1="18.0503" 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"/>
+</linearGradient>
+<path d="M22.741,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.1279" x2="19.1279" y1="17.6792" y2="19.9231">
+<stop offset="0" style="stop-color:#646263"/>
+<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.486,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.486,19.868z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_29_" x1="19.1284" x2="19.1284" y1="18.0503" 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"/>
+</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 -7758.4854 1952.6084)" gradientUnits="userSpaceOnUse" id="SVGID_30_" x1="-7773.4854" x2="-7773.4854" y1="1924.5239" y2="1930.8613">
+<stop offset="0" style="stop-color:#D9D9D9"/>
+<stop offset="0.5382" style="stop-color:#B3B3B3"/>
+<stop offset="1" style="stop-color:#B3B3B3"/>
+</linearGradient>
+<rect fill="url(#SVGID_30_)" height="6.053" width="18.918" x="5.541" y="22.032"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_31_" x1="15" x2="15" y1="21.605" y2="23.7331">
+<stop offset="0" style="stop-color:#171717"/>
+<stop offset="1" style="stop-color:#2E2E2E"/>
+</linearGradient>
+<path d="M24.568,21.585H5.433c-0.21,0-0.382,0.171-0.382,0.383v1.75H24.95v-1.75  C24.95,21.756,24.779,21.585,24.568,21.585z" fill="url(#SVGID_31_)"/>
+<path d="M24.568,21.206H5.433c-0.21,0-0.382,0.17-0.382,0.384v0.378c0-0.212,0.171-0.383,0.382-0.383  h19.135c0.211,0,0.382,0.171,0.382,0.383V21.59C24.95,21.376,24.779,21.206,24.568,21.206z" fill="#FFFFFF" fill-opacity="0.35" stroke-opacity="0.35"/>
+<linearGradient gradientTransform="matrix(-1 0 0 -1 -7758.4854 1952.6084)" gradientUnits="userSpaceOnUse" id="SVGID_32_" x1="-7773.4854" x2="-7773.4854" y1="1924.4653" y2="1930.1107">
+<stop offset="0" style="stop-color:#EDEDED"/>
+<stop offset="1" style="stop-color:#BDBDBD"/>
+</linearGradient>
+<polygon fill="url(#SVGID_32_)" points="5.541,24.79 5.541,22.032 24.459,22.032 24.459,28.085 17.334,28.085 13.432,27.889   6.298,25.848 5.729,25.252 "/>
+<rect fill="#020202" fill-opacity="0.3" height="0.38" stroke-opacity="0.3" width="18.918" x="5.541" y="22.032"/>
+<rect fill="#020202" fill-opacity="0.15" height="0.378" stroke-opacity="0.15" width="18.918" x="5.541" y="22.412"/>
+<rect fill="#020202" fill-opacity="0.05" height="0.379" stroke-opacity="0.05" width="18.918" x="5.541" y="22.79"/>
+<rect fill="#020202" fill-opacity="0.5" height="0.377" stroke-opacity="0.5" width="13.621" x="8.19" y="24.682"/>
+<rect fill="#020202" fill-opacity="0.2" height="0.379" stroke-opacity="0.2" width="13.621" x="8.19" y="25.059"/>
+<path d="M17.429,28.084c0,0-6.867-1.039-9.421-4.539  c0,0-1.93,2.648-2.467,1.209C5.813,26.145,8.263,28.136,17.429,28.084z" fill="#050505" fill-opacity="0.05" fill-rule="evenodd" stroke-opacity="0.05"/>
+<path d="M17.429,28.084c0,0-6.867-0.282-9.421-3.781  c0,0-1.93,2.27-2.467,0.451C5.813,26.145,8.263,28.136,17.429,28.084z" fill="#050505" fill-opacity="0.1" fill-rule="evenodd" stroke-opacity="0.1"/>
+<linearGradient gradientTransform="matrix(-1 0 0 -1 -7758.4854 1952.6084)" gradientUnits="userSpaceOnUse" id="SVGID_33_" x1="-7769.6108" x2="-7770.3237" y1="1924.8521" y2="1927.5011">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="0.0061" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#D9D9D9"/>
+</linearGradient>
+<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.263,28.136,17.429,28.084z" fill="url(#SVGID_33_)" fill-rule="evenodd"/>
+<rect fill="none" height="30" width="30" x="0"/>
+<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -216.8074 280.5271)" gradientUnits="userSpaceOnUse" id="SVGID_34_" x1="476.6157" x2="476.6157" y1="533.1255" y2="503.1255">
+<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"/>
+</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_)"/>
+<radialGradient cx="527.4526" cy="963.3052" gradientTransform="matrix(0.4708 0 0 -0.4709 -226.8932 469.2089)" gradientUnits="userSpaceOnUse" id="SVGID_35_" r="29.2365">
+<stop offset="0" style="stop-color:#96E9FA"/>
+<stop offset="0.15" style="stop-color:#96E9FA"/>
+<stop offset="0.7455" style="stop-color:#005BCC"/>
+<stop offset="1" style="stop-color:#0087D9"/>
+</radialGradient>
+<path d="M28.786,21.5c0,4.024-3.264,7.286-7.285,7.286c-4.025,0-7.285-3.262-7.285-7.286  c0-4.022,3.26-7.286,7.285-7.286C25.522,14.214,28.786,17.478,28.786,21.5z" fill="url(#SVGID_35_)"/>
+<polygon fill-opacity="0.3" points="25.704,22.889 21.499,18.435 17.297,22.889 16.659,22.209 21.499,17.077 26.342,22.209   25.704,22.889 " stroke-opacity="0.3"/>
+<polygon fill-opacity="0.3" points="21.5,19.845 17.627,23.951 17.627,25.793 20.532,25.793 20.532,22.889 22.469,22.889 22.469,25.793   25.374,25.793 25.374,23.95 " stroke-opacity="0.3"/>
+<polygon fill="#FFFFFF" points="25.704,22.188 21.499,17.734 17.297,22.188 16.659,21.51 21.499,16.377 26.342,21.51 25.704,22.188   "/>
+<polygon fill="#FFFFFF" points="21.5,19.146 17.627,23.252 17.627,25.094 20.532,25.094 20.532,22.188 22.469,22.188 22.469,25.094   25.374,25.094 25.374,23.25 "/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_fax_work.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,90 +1,313 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5609 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="423.0967" x2="429.6524" y1="-578.646" y2="-582.9078">
+<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.1333" style="stop-color:#A7E722"/>
-<stop offset="0.6303" style="stop-color:#428C0F"/>
-<stop offset="1" style="stop-color:#5CA617"/>
-</linearGradient>
-<path d="M19.081,33.91c2.089-3.595,4.591-6.496,7.281-9.188c2.593-2.591,6.72-5.3,8.562-6.256l9.604-10.282  c-0.845-0.3-3.693-0.464-7.279,0.616c-3.586,1.083-11.736,6.303-16.979,11.547c-5.242,5.246-9.727,12.347-10.581,14.595  c-1.343,3.541-1.221,7.445-0.929,8.58c0,0,0.34,1.035,1.144,2.377C10.248,46.475,19.081,33.91,19.081,33.91z" fill="url(#SVGID_1_)"/>
-<path d="M31.184,20.8c1.488-1.036,2.87-1.882,3.74-2.334L44.271,8.46  c-0.132-0.058-0.209-0.088-0.209-0.088c-0.247-0.088-0.642-0.162-1.124-0.219c-0.793,0.006-1.596,0.093-2.401,0.27  C34.843,9.673,31.019,14.958,31.184,20.8z" fill="#020202" fill-opacity="0.05" stroke-opacity="0.05"/>
-<path d="M31.906,20.306c1.205-0.809,2.291-1.462,3.018-1.84l9.377-10.04  c-0.146-0.063-0.233-0.098-0.233-0.098c-0.231-0.08-0.604-0.152-1.06-0.203c-0.751,0.006-1.51,0.087-2.27,0.253  C35.275,9.576,31.636,14.695,31.906,20.306z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M44.079,8.263c-0.21-0.073-0.55-0.137-0.962-0.186c-0.681,0.006-1.369,0.08-2.06,0.231  c-5.087,1.116-8.426,5.984-7.978,11.233c0.725-0.455,1.363-0.826,1.844-1.076l9.424-10.088C44.178,8.302,44.079,8.263,44.079,8.263z  " fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="40.9697" cy="9.21" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="12.2872">
-<stop offset="0" style="stop-color:#A7E722"/>
-<stop offset="0.6242" style="stop-color:#428C0F"/>
+<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"/>
 </radialGradient>
-<path d="M34.924,18.466l0.929,1.55c0,0,15.101-6.784,14.084-8.038c-0.513-0.631-0.577-0.656-1.237-1.263  c-1.985-1.815-4.172-2.531-4.172-2.531c-0.186-0.063-0.481-0.12-0.845-0.161c-0.596,0.004-1.2,0.068-1.806,0.201  c-4.591,1.009-7.57,5.501-6.963,10.257C34.916,18.477,34.921,18.47,34.924,18.466z" fill="url(#SVGID_2_)"/>
-<path d="M17.483,34.105c-0.988-0.139-2.007-0.119-3.027,0.105c-2.418,0.531-4.376,2.066-5.646,4.131  c-0.367,2.35-0.25,4.408-0.05,5.18c0,0,0.34,1.035,1.144,2.377c0.29,0.482,6.54-8.264,8.556-11.107L17.483,34.105z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M18.366,34.135c-0.989-0.139-2.008-0.117-3.029,0.105c-3.313,0.727-5.775,3.332-6.76,6.623  c-0.026,1.025,0.034,1.873,0.127,2.398c0.003,0.012,0.005,0.033,0.01,0.047c0,0,0.34,1.033,1.144,2.379  c0.3,0.498,6.981-8.887,8.75-11.383L18.366,34.135z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="437.4258" cy="-571.231" gradientTransform="matrix(0.2095 0.9787 -0.9682 0.2124 -629.4526 -270.6148)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="14.6187">
-<stop offset="0" style="stop-color:#A7E722"/>
-<stop offset="0.6242" style="stop-color:#428C0F"/>
-<stop offset="1" style="stop-color:#5CA617"/>
-</radialGradient>
-<path d="M11.202,47.738c0.616,0.74,0.646,0.953,1.295,1.523c1.194,1.055,9.301-13.611,9.301-13.611  l-2.683-1.719c-0.941-0.111-1.914-0.08-2.89,0.135c-4.777,1.049-7.806,5.869-6.87,10.832C9.749,45.686,10.349,46.709,11.202,47.738z  " fill="url(#SVGID_3_)"/>
-<path d="M49.937,11.978c-0.179-0.22-0.381-0.446-0.578-0.67l-13.944,7.959l0.438,0.749  C35.853,20.016,50.953,13.231,49.937,11.978z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="422.2881" x2="427.4786" y1="-610.9287" y2="-594.4409">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.6788" style="stop-color:#387300"/>
-<stop offset="1" style="stop-color:#66A00E"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M35.853,20.016l1.178,1.981c0.302,0.515,0.972,0.674,1.569,0.422l4.09-2.334l8.043-4.668  c0.632-0.363,0.878-1.119,0.549-1.686c0,0-0.333-0.501-1.349-1.751L35.853,20.016z" fill="url(#SVGID_4_)"/>
-<path d="M21.798,35.65l-0.725-0.473l-9.215,13.486c0.216,0.205,0.43,0.414,0.639,0.598  C13.691,50.316,21.798,35.65,21.798,35.65z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="439.6982" x2="451.5232" y1="-577.7549" y2="-564.7323">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.6788" style="stop-color:#387300"/>
-<stop offset="1" style="stop-color:#66A00E"/>
+<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"/>
+<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"/>
 </linearGradient>
-<path d="M12.498,49.262c1.193,1.049,1.686,1.369,1.686,1.369c0.567,0.367,1.363,0.17,1.781-0.441l7.9-11.605  c0.419-0.615,0.307-1.412-0.26-1.777l-1.808-1.156L12.498,49.262z" fill="url(#SVGID_5_)"/>
+<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)">
-<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"/>
+<polygon fill="none" points="0,11.61 0,22.205 0,30 30,30 30,22.205 30,11.61 30,0 0,0 "/>
+<path d="M21.5,30c-1.33,0-2.65-0.315-3.833-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.587-0.152,0.863C29.094,27.091,25.6,30,21.5,30L21.5,30z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="15" x2="15" 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"/>
+</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"/>
+<rect fill="#020202" fill-opacity="0.15" height="0.378" stroke-opacity="0.15" width="21.567" x="4.217" y="9.334"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="15" x2="15" y1="1.915" y2="10.6297">
+<stop offset="0" style="stop-color:#D9D9D9"/>
+<stop offset="0.5382" style="stop-color:#B3B3B3"/>
+<stop offset="1" style="stop-color:#B3B3B3"/>
+</linearGradient>
+<rect fill="url(#SVGID_2__)" height="8.323" width="18.918" x="5.541" y="1.915"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="15" x2="15" y1="1.835" y2="9.598">
+<stop offset="0" style="stop-color:#EDEDED"/>
+<stop offset="1" style="stop-color:#BDBDBD"/>
+</linearGradient>
+<polygon fill="url(#SVGID_3__)" points="24.459,5.21 24.459,10.238 5.541,10.238 5.541,1.915 12.666,1.915 16.568,2.111   23.703,4.152 24.271,4.748 "/>
+<rect fill="#020202" fill-opacity="0.5" height="0.377" stroke-opacity="0.5" width="13.621" x="8.189" y="7.212"/>
+<rect fill="#020202" fill-opacity="0.2" height="0.379" stroke-opacity="0.2" width="13.621" x="8.189" y="6.833"/>
+<rect fill="#020202" fill-opacity="0.2" height="0.379" stroke-opacity="0.2" width="18.918" x="5.541" y="9.712"/>
+<rect fill="#020202" fill-opacity="0.1" height="0.378" stroke-opacity="0.1" width="18.918" x="5.541" y="9.334"/>
+<rect fill="#020202" fill-opacity="0.03" height="0.379" stroke-opacity="0.03" width="18.918" x="5.541" y="8.955"/>
+<rect fill="#020202" fill-opacity="0.5" height="0.377" stroke-opacity="0.5" width="13.621" x="8.189" y="4.941"/>
+<rect fill="#020202" fill-opacity="0.2" height="0.379" stroke-opacity="0.2" width="13.621" x="8.189" y="4.563"/>
+<path d="M12.571,1.916c0,0,6.867,1.039,9.421,4.539  c0,0,1.93-2.648,2.467-1.209C24.188,3.855,21.737,1.864,12.571,1.916z" fill="#050505" fill-opacity="0.05" fill-rule="evenodd" stroke-opacity="0.05"/>
+<path d="M12.571,1.916c0,0,6.867,0.282,9.421,3.781  c0,0,1.93-2.27,2.467-0.451C24.188,3.855,21.737,1.864,12.571,1.916z" fill="#050505" fill-opacity="0.1" fill-rule="evenodd" stroke-opacity="0.1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="18.875" x2="18.1619" y1="2.2437" y2="4.8927">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="0.0061" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#D9D9D9"/>
+</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="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"/>
+</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" x2="15" 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"/>
+</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="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"/>
+</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.4922" x2="10.4922" y1="11.9312" y2="15.3514">
+<stop offset="0" style="stop-color:#686C6E"/>
+<stop offset="1" style="stop-color:#E4EEF2"/>
 </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"/>
+<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.4902" x2="10.4902" y1="12.3164" y2="14.996">
+<stop offset="0" style="stop-color:#171717"/>
+<stop offset="1" style="stop-color:#2E2E2E"/>
+</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"/>
+</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"/>
+</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.2" style="stop-color:#4D4D4D"/>
+<stop offset="0.7212" style="stop-color:#242424"/>
+<stop offset="1" style="stop-color:#373737"/>
 </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"/>
+<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"/>
+<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"/>
+</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.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"/>
+<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"/>
+</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.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"/>
+<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"/>
 </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"/>
+<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.0326">
+<stop offset="0" style="stop-color:#646263"/>
+<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"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="24.9102" x2="24.9102" 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"/>
+</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.0326">
+<stop offset="0" style="stop-color:#646263"/>
+<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"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="22.0195" x2="22.0195" 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"/>
 </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"/>
+<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.0326">
+<stop offset="0" style="stop-color:#646263"/>
+<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"/>
+<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"/>
+</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.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"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_25_" x1="24.9102" x2="24.9102" y1="18.0503" 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"/>
+</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.6792" y2="19.9231">
+<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0.2" style="stop-color:#4D4D4D"/>
+<stop offset="0.7212" style="stop-color:#242424"/>
+<stop offset="1" style="stop-color:#373737"/>
 </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>
+<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"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_27_" x1="22.0195" x2="22.0195" y1="18.0503" 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"/>
+</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.6792" y2="19.9231">
+<stop offset="0" style="stop-color:#646263"/>
+<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"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_29_" x1="19.1279" x2="19.1279" y1="18.0503" 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"/>
+</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 -7890.4863 1952.6084)" gradientUnits="userSpaceOnUse" id="SVGID_30_" x1="-7905.4863" x2="-7905.4863" y1="1924.5239" y2="1930.8613">
+<stop offset="0" style="stop-color:#D9D9D9"/>
+<stop offset="0.5382" style="stop-color:#B3B3B3"/>
+<stop offset="1" style="stop-color:#B3B3B3"/>
+</linearGradient>
+<rect fill="url(#SVGID_30_)" height="6.053" width="18.918" x="5.541" y="22.032"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_31_" x1="15" x2="15" y1="21.605" y2="23.7331">
+<stop offset="0" style="stop-color:#171717"/>
+<stop offset="1" style="stop-color:#2E2E2E"/>
+</linearGradient>
+<path d="M24.567,21.585H5.432c-0.209,0-0.381,0.171-0.381,0.383v1.75h19.898v-1.75  C24.949,21.756,24.778,21.585,24.567,21.585z" fill="url(#SVGID_31_)"/>
+<path d="M24.567,21.206H5.432c-0.209,0-0.381,0.17-0.381,0.384v0.378  c0-0.212,0.172-0.383,0.381-0.383h19.136c0.211,0,0.382,0.171,0.382,0.383V21.59C24.949,21.376,24.778,21.206,24.567,21.206z" fill="#FFFFFF" fill-opacity="0.35" stroke-opacity="0.35"/>
+<linearGradient gradientTransform="matrix(-1 0 0 -1 -7890.4863 1952.6084)" gradientUnits="userSpaceOnUse" id="SVGID_32_" x1="-7905.4863" x2="-7905.4863" y1="1924.4653" y2="1930.1107">
+<stop offset="0" style="stop-color:#EDEDED"/>
+<stop offset="1" style="stop-color:#BDBDBD"/>
+</linearGradient>
+<polygon fill="url(#SVGID_32_)" points="5.541,24.79 5.541,22.032 24.459,22.032 24.459,28.085 17.334,28.085 13.432,27.889   6.297,25.848 5.729,25.252 "/>
+<rect fill="#020202" fill-opacity="0.3" height="0.38" stroke-opacity="0.3" width="18.918" x="5.541" y="22.032"/>
+<rect fill="#020202" fill-opacity="0.15" height="0.378" stroke-opacity="0.15" width="18.918" x="5.541" y="22.412"/>
+<rect fill="#020202" fill-opacity="0.05" height="0.379" stroke-opacity="0.05" width="18.918" x="5.541" y="22.79"/>
+<rect fill="#020202" fill-opacity="0.5" height="0.377" stroke-opacity="0.5" width="13.621" x="8.189" y="24.682"/>
+<rect fill="#020202" fill-opacity="0.2" height="0.379" stroke-opacity="0.2" width="13.621" x="8.189" y="25.059"/>
+<path d="M17.429,28.084c0,0-6.867-1.039-9.421-4.539  c0,0-1.93,2.648-2.467,1.209C5.813,26.145,8.262,28.136,17.429,28.084z" fill="#050505" fill-opacity="0.05" fill-rule="evenodd" stroke-opacity="0.05"/>
+<path d="M17.429,28.084c0,0-6.867-0.282-9.421-3.781  c0,0-1.93,2.27-2.467,0.451C5.813,26.145,8.262,28.136,17.429,28.084z" fill="#050505" fill-opacity="0.1" fill-rule="evenodd" stroke-opacity="0.1"/>
+<linearGradient gradientTransform="matrix(-1 0 0 -1 -7890.4863 1952.6084)" gradientUnits="userSpaceOnUse" id="SVGID_33_" x1="-7901.6113" x2="-7902.3242" y1="1924.8521" y2="1927.5011">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="0.0061" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#D9D9D9"/>
+</linearGradient>
+<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 -249.8076 280.5271)" gradientUnits="userSpaceOnUse" id="SVGID_34_" x1="542.6152" x2="542.6152" y1="533.1255" y2="503.1255">
+<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"/>
+</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_)"/>
+<radialGradient cx="542.4775" cy="530.1011" gradientTransform="matrix(0.5 0 0 -0.5 -249.8076 280.6384)" gradientUnits="userSpaceOnUse" id="SVGID_35_" r="27.5291">
+<stop offset="0" style="stop-color:#96E9FA"/>
+<stop offset="0.15" style="stop-color:#96E9FA"/>
+<stop offset="0.7455" style="stop-color:#005BCC"/>
+<stop offset="1" style="stop-color:#0087D9"/>
+</radialGradient>
+<path d="M28.785,21.5c0,4.024-3.263,7.286-7.285,7.286c-4.023,0-7.285-3.262-7.285-7.286  c0-4.023,3.262-7.286,7.285-7.286C25.522,14.214,28.785,17.477,28.785,21.5z" fill="url(#SVGID_35_)"/>
+<path d="M22.518,20.029v-2.035h-5.086v8.138H21.5h1.018h3.051v-6.103H22.518z M21.5,24.098h-3.052V23.08H21.5V24.098z   M21.5,22.063h-3.052v-1.018H21.5V22.063z M18.448,20.029v-1.018H21.5v1.018H18.448z M24.552,24.098h-2.034V23.08h2.034V24.098z   M24.552,22.063h-2.034v-1.018h2.034V22.063z" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M22.518,19.329v-2.034h-5.086v8.137H21.5h1.018h3.051v-6.103H22.518z M21.5,23.397h-3.052v-1.017H21.5  V23.397z M21.5,21.363h-3.052v-1.018H21.5V21.363z M18.448,19.329v-1.018H21.5v1.018H18.448z M24.552,23.397h-2.034v-1.017h2.034  V23.397z M24.552,21.363h-2.034v-1.018h2.034V21.363z" fill="#FFFFFF"/>
+<rect fill-opacity="0.3" height="6.103" stroke-opacity="0.3" width="1.017" x="22.518" y="19.329"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_group.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,224 +1,213 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5609 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="423.0967" x2="429.6524" y1="-578.646" y2="-582.9078">
+<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.1333" style="stop-color:#A7E722"/>
-<stop offset="0.6303" style="stop-color:#428C0F"/>
-<stop offset="1" style="stop-color:#5CA617"/>
-</linearGradient>
-<path d="M19.081,33.91c2.089-3.595,4.591-6.496,7.281-9.188c2.593-2.591,6.72-5.3,8.562-6.256l9.604-10.282  c-0.845-0.3-3.693-0.464-7.279,0.616c-3.586,1.083-11.736,6.303-16.979,11.547c-5.242,5.246-9.727,12.347-10.581,14.595  c-1.343,3.541-1.221,7.445-0.929,8.58c0,0,0.34,1.035,1.144,2.377C10.248,46.475,19.081,33.91,19.081,33.91z" fill="url(#SVGID_1_)"/>
-<path d="M31.184,20.8c1.488-1.036,2.87-1.882,3.74-2.334L44.271,8.46  c-0.132-0.058-0.209-0.088-0.209-0.088c-0.247-0.088-0.642-0.162-1.124-0.219c-0.793,0.006-1.596,0.093-2.401,0.27  C34.843,9.673,31.019,14.958,31.184,20.8z" fill="#020202" fill-opacity="0.05" stroke-opacity="0.05"/>
-<path d="M31.906,20.306c1.205-0.809,2.291-1.462,3.018-1.84l9.377-10.04  c-0.146-0.063-0.233-0.098-0.233-0.098c-0.231-0.08-0.604-0.152-1.06-0.203c-0.751,0.006-1.51,0.087-2.27,0.253  C35.275,9.576,31.636,14.695,31.906,20.306z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M44.079,8.263c-0.21-0.073-0.55-0.137-0.962-0.186c-0.681,0.006-1.369,0.08-2.06,0.231  c-5.087,1.116-8.426,5.984-7.978,11.233c0.725-0.455,1.363-0.826,1.844-1.076l9.424-10.088C44.178,8.302,44.079,8.263,44.079,8.263z  " fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="40.9697" cy="9.21" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="12.2872">
-<stop offset="0" style="stop-color:#A7E722"/>
-<stop offset="0.6242" style="stop-color:#428C0F"/>
+<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"/>
 </radialGradient>
-<path d="M34.924,18.466l0.929,1.55c0,0,15.101-6.784,14.084-8.038c-0.513-0.631-0.577-0.656-1.237-1.263  c-1.985-1.815-4.172-2.531-4.172-2.531c-0.186-0.063-0.481-0.12-0.845-0.161c-0.596,0.004-1.2,0.068-1.806,0.201  c-4.591,1.009-7.57,5.501-6.963,10.257C34.916,18.477,34.921,18.47,34.924,18.466z" fill="url(#SVGID_2_)"/>
-<path d="M17.483,34.105c-0.988-0.139-2.007-0.119-3.027,0.105c-2.418,0.531-4.376,2.066-5.646,4.131  c-0.367,2.35-0.25,4.408-0.05,5.18c0,0,0.34,1.035,1.144,2.377c0.29,0.482,6.54-8.264,8.556-11.107L17.483,34.105z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M18.366,34.135c-0.989-0.139-2.008-0.117-3.029,0.105c-3.313,0.727-5.775,3.332-6.76,6.623  c-0.026,1.025,0.034,1.873,0.127,2.398c0.003,0.012,0.005,0.033,0.01,0.047c0,0,0.34,1.033,1.144,2.379  c0.3,0.498,6.981-8.887,8.75-11.383L18.366,34.135z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="437.4258" cy="-571.231" gradientTransform="matrix(0.2095 0.9787 -0.9682 0.2124 -629.4526 -270.6148)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="14.6187">
-<stop offset="0" style="stop-color:#A7E722"/>
-<stop offset="0.6242" style="stop-color:#428C0F"/>
-<stop offset="1" style="stop-color:#5CA617"/>
-</radialGradient>
-<path d="M11.202,47.738c0.616,0.74,0.646,0.953,1.295,1.523c1.194,1.055,9.301-13.611,9.301-13.611  l-2.683-1.719c-0.941-0.111-1.914-0.08-2.89,0.135c-4.777,1.049-7.806,5.869-6.87,10.832C9.749,45.686,10.349,46.709,11.202,47.738z  " fill="url(#SVGID_3_)"/>
-<path d="M49.937,11.978c-0.179-0.22-0.381-0.446-0.578-0.67l-13.944,7.959l0.438,0.749  C35.853,20.016,50.953,13.231,49.937,11.978z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="422.2881" x2="427.4786" y1="-610.9287" y2="-594.4409">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.6788" style="stop-color:#387300"/>
-<stop offset="1" style="stop-color:#66A00E"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M35.853,20.016l1.178,1.981c0.302,0.515,0.972,0.674,1.569,0.422l4.09-2.334l8.043-4.668  c0.632-0.363,0.878-1.119,0.549-1.686c0,0-0.333-0.501-1.349-1.751L35.853,20.016z" fill="url(#SVGID_4_)"/>
-<path d="M21.798,35.65l-0.725-0.473l-9.215,13.486c0.216,0.205,0.43,0.414,0.639,0.598  C13.691,50.316,21.798,35.65,21.798,35.65z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="439.6982" x2="451.5232" y1="-577.7549" y2="-564.7323">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.6788" style="stop-color:#387300"/>
-<stop offset="1" style="stop-color:#66A00E"/>
+<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"/>
+<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"/>
 </linearGradient>
-<path d="M12.498,49.262c1.193,1.049,1.686,1.369,1.686,1.369c0.567,0.367,1.363,0.17,1.781-0.441l7.9-11.605  c0.419-0.615,0.307-1.412-0.26-1.777l-1.808-1.156L12.498,49.262z" fill="url(#SVGID_5_)"/>
+<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(0.5 0 0 0.5 30 30)">
-<radialGradient cx="12.6943" cy="-163.1411" gradientTransform="matrix(1.8702 0 0 -1.8638 18.6454 -261.7752)" gradientUnits="userSpaceOnUse" id="SVGID_1__" r="5.9351">
-<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"/>
+<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"/>
 </radialGradient>
-<path d="M46.91,37.354c-1.044-0.453-1.012-2.678-0.582-3.35c0.076-0.118,0.145-0.234,0.216-0.352  h-8.731c0.069,0.117,0.138,0.233,0.213,0.352c0.431,0.672,0.463,2.896-0.58,3.35C36.4,37.809,42.3,41.758,42.3,41.758  S47.954,37.807,46.91,37.354z" style="fill:url(#SVGID_1__);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="167.0898" x2="167.0898" y1="-149.4712" y2="-154.0435">
-<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"/>
+<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"/>
 </linearGradient>
-<path d="M53.188,39.672c-1.098-0.572-6.541-2.477-6.644-2.598l-4.157,3.458l-4.467-3.591  c-0.126,0.185-5.504,2.07-6.748,2.73c-1.426,0.756-3.754,2.494-3.754,6.414h29.521C56.939,42.166,54.286,40.242,53.188,39.672z" style="fill:url(#SVGID_2__);"/>
-<polygon points="36.9,37.386 42.384,41.758 47.536,37.475   46.542,37.074 42.384,40.532 37.918,36.941 " style="opacity:0.3;fill:#020202;enable-background:new    ;"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="167.1094" x2="167.1094" y1="-152.0737" y2="-149.5491">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+<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"/>
 </linearGradient>
-<polygon points="42.384,41.758 36.9,37.386 36.582,37.525 42.384,42.148 47.857,37.6 47.54,37.473 " style="fill:url(#SVGID_3__);"/>
-<radialGradient cx="12.9829" cy="-152.1655" gradientTransform="matrix(1.8702 0 0 -1.8638 18.6454 -261.7752)" gradientUnits="userSpaceOnUse" id="SVGID_4__" r="7.9669">
-<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"/>
+<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"/>
 </radialGradient>
-<path d="M49.42,27.128c-0.038-0.016-0.08-0.018-0.118-0.03c0-0.002,0-0.002,0-0.002  c-0.008-0.002-0.014-0.004-0.014-0.004c-0.065-0.016-0.124-0.028-0.185-0.032c-7.289-1.27-10.636-5.308-10.886-4.238  c-0.202,0.85-2.245,2.692-3.315,3.61c0.008,0.042,0.016,0.078,0.023,0.12c0,0,0.04,0.188,0.12,0.508  c-0.084,0.01-0.168,0.028-0.248,0.06c-0.682,0.29-0.896,1.404-0.478,2.496c0.418,1.09,1.306,1.741,1.99,1.456  c0.041-0.018,0.078-0.047,0.115-0.072c0.396,0.891,0.881,1.844,1.477,2.8c0.998,1.187,2.525,2.576,4.211,2.576  c2.041,0,3.291-1.118,4.146-2.242c0.022-0.048,0.045-0.094,0.068-0.13c0.636-0.994,1.152-1.992,1.57-2.92  c0.666,0.23,1.521-0.389,1.947-1.438C50.286,28.562,50.094,27.434,49.42,27.128z" style="fill:url(#SVGID_4__);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="165.7725" x2="168.922" y1="-149.5288" y2="-146.4038">
-<stop offset="0" style="stop-color:#FFC6B3"/>
-<stop offset="1" style="stop-color:#FFA98E"/>
+<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"/>
 </linearGradient>
-<path d="M41.813,35.805c-1.242,0-2.494-0.578-3.416-1.453c0.974,1.026,2.287,2.024,3.715,2.024  c2.041,0,3.291-1.118,4.146-2.242c0.021-0.048,0.044-0.094,0.068-0.13c0.636-0.994,1.152-1.992,1.57-2.92  C45.578,35.141,43.854,35.805,41.813,35.805z" style="fill:url(#SVGID_5__);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="167.0273" x2="167.0273" y1="-139.5527" y2="-144.1897">
-<stop offset="0" style="stop-color:#8A5D3B"/>
-<stop offset="0.3758" style="stop-color:#632F00"/>
-<stop offset="1" style="stop-color:#361700"/>
+<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"/>
 </linearGradient>
-<path d="M41.908,16.966c-2.53,0-3.744,1.148-4.682,2.35c-1.528,0.234-3.947,1.634-2.238,7.764  c1.07-0.918,3.029-3.406,3.229-4.256c0.255-1.08,3.656,3.042,11.084,4.274c0.089-0.344,0.126-0.544,0.126-0.544  C50.596,21.318,48.059,17.172,41.908,16.966z" style="fill:url(#SVGID_6_);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="168.6123" x2="164.4106" y1="-143.9883" y2="-141.4939">
-<stop offset="0" style="stop-color:#8A5D3B"/>
-<stop offset="0.3636" style="stop-color:#632F00"/>
-<stop offset="1" style="stop-color:#361700"/>
+<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"/>
 </linearGradient>
-<path d="M38.227,22.322c0,0,3.635,4.778,11.023,4.768C49.25,27.09,45.773,26.544,38.227,22.322z" style="fill:url(#SVGID_7_);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="164.0332" x2="164.0701" y1="-141.0078" y2="-143.6764">
-<stop offset="0" style="stop-color:#8A5D3B"/>
-<stop offset="0.3758" style="stop-color:#632F00"/>
-<stop offset="1" style="stop-color:#361700"/>
+<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"/>
 </linearGradient>
-<path d="M37.354,19.672c0,0-3.56,0.212-2.24,6.246C35.113,25.918,34.678,21.786,37.354,19.672z" style="fill:url(#SVGID_8_);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="167.6152" x2="167.4844" y1="-139.9482" y2="-141.1576">
-<stop offset="0" style="stop-color:#A87C4F"/>
-<stop offset="1" style="stop-color:#632F00"/>
+<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"/>
 </linearGradient>
-<path d="M43.632,20.508c-1.655-0.236-4.46-1.706-5.558-1.18c0,0,3.598-4.106,9.943,0.568  C48.018,19.896,46.506,20.916,43.632,20.508z" style="fill:url(#SVGID_9_);"/>
-<radialGradient cx="-0.3296" cy="-163.1411" gradientTransform="matrix(1.8702 0 0 -1.8638 18.6454 -261.7752)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="5.9342">
-<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"/>
+<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"/>
 </radialGradient>
-<path d="M22.552,37.354c-1.042-0.453-1.01-2.678-0.58-3.35c0.074-0.118,0.144-0.234,0.216-0.352  h-8.73c0.07,0.117,0.138,0.233,0.214,0.352c0.43,0.672,0.46,2.896-0.58,3.35c-1.046,0.455,4.854,4.404,4.854,4.404  S23.6,37.807,22.552,37.354z" style="fill:url(#SVGID_10_);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="154.9111" x2="154.9111" y1="-149.4712" y2="-154.0435">
-<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"/>
+<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"/>
 </linearGradient>
-<path d="M28.832,39.672c-1.098-0.572-6.542-2.477-6.644-2.598l-4.158,3.458l-4.466-3.591  c-0.126,0.185-5.504,2.07-6.75,2.73c-1.424,0.756-3.752,2.494-3.752,6.414h29.522C32.582,42.166,29.93,40.242,28.832,39.672z" style="fill:url(#SVGID_11_);"/>
-<polygon points="12.544,37.386 18.03,41.758 23.182,37.475   22.188,37.074 18.03,40.532 13.562,36.941 " style="opacity:0.3;fill:#020202;enable-background:new    ;"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="154.9316" x2="154.9316" y1="-152.0737" y2="-149.5491">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+<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"/>
 </linearGradient>
-<polygon points="18.03,41.758 12.542,37.386 12.226,37.525 18.03,42.148 23.502,37.6 23.184,37.473   " style="fill:url(#SVGID_12_);"/>
-<radialGradient cx="-0.0405" cy="-152.1655" gradientTransform="matrix(1.8702 0 0 -1.8638 18.6454 -261.7752)" gradientUnits="userSpaceOnUse" id="SVGID_13_" r="7.9677">
-<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"/>
+<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"/>
 </radialGradient>
-<path d="M25.064,27.128c-0.038-0.016-0.08-0.018-0.118-0.03c0-0.002,0-0.002,0-0.002  c-0.008-0.002-0.014-0.004-0.024-0.004c-0.056-0.016-0.114-0.028-0.174-0.032c-7.29-1.27-10.634-5.308-10.886-4.238  c-0.204,0.85-2.246,2.692-3.316,3.61c0.008,0.042,0.016,0.078,0.024,0.12c0,0,0.04,0.188,0.12,0.508  c-0.086,0.01-0.17,0.028-0.248,0.06c-0.682,0.29-0.894,1.404-0.478,2.496c0.418,1.09,1.306,1.741,1.99,1.456  c0.042-0.018,0.078-0.047,0.116-0.072c0.396,0.891,0.88,1.844,1.476,2.8c0.998,1.187,2.526,2.576,4.212,2.576  c2.04,0,3.29-1.118,4.146-2.242c0.022-0.048,0.044-0.094,0.068-0.13c0.636-0.994,1.152-1.992,1.57-2.92  c0.668,0.23,1.522-0.389,1.946-1.438C25.928,28.562,25.738,27.434,25.064,27.128z" style="fill:url(#SVGID_13_);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="153.5947" x2="156.743" y1="-149.5293" y2="-146.4057">
-<stop offset="0" style="stop-color:#FFC6B3"/>
-<stop offset="1" style="stop-color:#FFA98E"/>
+<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"/>
 </linearGradient>
-<path d="M17.458,35.805c-1.242,0-2.494-0.578-3.416-1.453c0.974,1.026,2.288,2.024,3.716,2.024  c2.04,0,3.29-1.118,4.146-2.242c0.022-0.048,0.044-0.094,0.068-0.13c0.636-0.994,1.152-1.992,1.57-2.92  C21.222,35.141,19.498,35.805,17.458,35.805z" style="fill:url(#SVGID_14_);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="154.8477" x2="154.8477" y1="-139.5527" y2="-144.1897">
-<stop offset="0" style="stop-color:#8A5D3B"/>
-<stop offset="0.3758" style="stop-color:#632F00"/>
-<stop offset="1" style="stop-color:#361700"/>
+<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"/>
 </linearGradient>
-<path d="M17.552,16.966c-2.53,0-3.744,1.148-4.684,2.35c-1.526,0.234-3.946,1.634-2.236,7.764  c1.07-0.918,3.028-3.406,3.23-4.256c0.254-1.08,3.656,3.042,11.084,4.274c0.086-0.344,0.126-0.544,0.126-0.544  C26.24,21.318,23.704,17.172,17.552,16.966z" style="fill:url(#SVGID_15_);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="156.4355" x2="152.2336" y1="-143.9878" y2="-141.4933">
-<stop offset="0" style="stop-color:#8A5D3B"/>
-<stop offset="0.3636" style="stop-color:#632F00"/>
-<stop offset="1" style="stop-color:#361700"/>
+<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"/>
 </linearGradient>
-<path d="M13.872,22.322c0,0,3.636,4.778,11.026,4.768C24.896,27.09,21.416,26.544,13.872,22.322z" style="fill:url(#SVGID_16_);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="151.8545" x2="151.8914" y1="-141.0093" y2="-143.6763">
-<stop offset="0" style="stop-color:#8A5D3B"/>
-<stop offset="0.3758" style="stop-color:#632F00"/>
-<stop offset="1" style="stop-color:#361700"/>
+<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"/>
 </linearGradient>
-<path d="M12.996,19.672c0,0-3.558,0.212-2.238,6.246C10.758,25.918,10.322,21.786,12.996,19.672z" style="fill:url(#SVGID_17_);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="155.4385" x2="155.3077" y1="-139.9482" y2="-141.1576">
-<stop offset="0" style="stop-color:#A87C4F"/>
-<stop offset="1" style="stop-color:#632F00"/>
+<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"/>
 </linearGradient>
-<path d="M19.278,20.508c-1.656-0.236-4.46-1.706-5.56-1.18c0,0,3.6-4.106,9.946,0.568  C23.662,19.896,22.148,20.916,19.278,20.508z" style="fill:url(#SVGID_18_);"/>
-<path d="M46.641,40.864c-1.013-0.528-4.162-1.698-6.695-2.636  l-1.422-0.53l-0.256-0.103l-0.332-0.128L37.3,37.212l-0.392,0.172c-0.002,0.002-0.006,0.002-0.008,0.005h-0.002  c-1.652,0.646-4.813,1.795-5.729,2.285c-0.357,0.19-0.772,0.442-1.192,0.774c-0.442-0.364-0.852-0.62-1.146-0.774  c-0.79-0.41-3.808-1.506-5.492-2.136l-0.156-0.062l-0.004,0.002l-0.698-0.283l-0.634,0.279c-0.622,0.243-1.386,0.535-2.206,0.846  l-0.076,0.029c-2.42,0.92-5.164,1.963-6.214,2.522C10.996,42.122,9.3,43.891,8.3,46.09h19.118h5.166h19.04  C50.055,42.818,47.355,41.234,46.641,40.864z" style="opacity:0.15;fill:#231F20;enable-background:new    ;"/>
-<path d="M18.104,22.872c-1.122,0.954-1.424,2.864-0.698,4.76  c0.684,1.788,2.096,2.988,3.516,2.988h0.004c0.212,0.442,0.434,0.878,0.662,1.308h-0.066l0.542,0.896c0,0,0.142,0.23,0.308,0.506  c0.452-0.766,0.848-1.528,1.172-2.246c0.668,0.23,1.522-0.389,1.946-1.438c0.44-1.084,0.25-2.212-0.424-2.518  c-0.038-0.016-0.08-0.018-0.118-0.03c0-0.002,0-0.002,0-0.002c-0.008-0.002-0.014-0.004-0.024-0.004  c-0.056-0.016-0.114-0.028-0.174-0.032c-0.014-0.004-0.024-0.006-0.038-0.01c-0.03-0.006-0.064-0.014-0.1-0.022  c0.114,0.022,0.218,0.046,0.334,0.066c0.086-0.344,0.126-0.544,0.126-0.544c1.166-5.234-1.372-9.38-7.522-9.586  c-0.012,0-0.02,0.002-0.034,0.002C17.36,18.634,17.546,20.6,18.104,22.872z" style="opacity:0.15;fill:#231F20;enable-background:new    ;"/>
-<path d="M37.227,19.316c-1.528,0.234-3.947,1.634-2.238,7.758  c-0.066,0.012-0.129,0.022-0.192,0.046c-0.683,0.29-0.896,1.404-0.478,2.496c0.418,1.09,1.306,1.741,1.99,1.456  c0.041-0.018,0.078-0.047,0.115-0.072c0.33,0.742,0.729,1.532,1.198,2.326c0.524-0.883,1.022-1.794,1.472-2.738  c1.293-0.154,2.557-1.278,3.211-2.888c0.743-1.838,0.506-3.746-0.545-4.74c0.471-2.124,0.545-4.146,0.234-5.986  c-0.03-0.002-0.057-0.006-0.086-0.006C39.378,16.966,38.164,18.116,37.227,19.316z M34.996,27.072  c0.014-0.012,0.029-0.026,0.042-0.038c0,0.01,0.004,0.016,0.006,0.026C35.029,27.062,35.012,27.07,34.996,27.072z M38.52,22.662  L38.52,22.662c-0.018-0.004-0.041-0.014-0.058-0.016C38.479,22.648,38.502,22.658,38.52,22.662z" style="opacity:0.15;fill:#231F20;enable-background:new    ;"/>
-<path d="M46.37,41.386c-0.979-0.51-4.112-1.672-6.628-2.608  l-1.436-0.533l-0.248-0.1l-0.343-0.131l-0.968-0.39c-0.032-0.042-0.055-0.101-0.082-0.146c-1.7,0.655-4.62,1.726-5.494,2.193  c-0.357,0.189-0.772,0.442-1.192,0.773c-0.442-0.363-0.852-0.619-1.146-0.773c-0.79-0.41-3.808-1.506-5.492-2.136L23.256,37.5  l-1.192,0.521c-0.64,0.25-1.438,0.553-2.288,0.877c-2.404,0.914-5.13,1.951-6.148,2.49c-2.142,1.135-3.714,2.726-4.676,4.697h18.464  h5.166h18.38C49.464,43.156,47.027,41.729,46.37,41.386z" style="opacity:0.3;fill:#231F20;enable-background:new    ;"/>
-<path d="M17.958,27.42c0.596,1.56,1.788,2.608,2.962,2.608  c0.124,0,0.244-0.01,0.362-0.034c0.404,0.865,0.838,1.71,1.302,2.523h-0.018l0.136,0.225c0.31-0.566,0.6-1.126,0.838-1.658  c0.668,0.23,1.522-0.389,1.946-1.438c0.44-1.084,0.25-2.212-0.424-2.518c-0.038-0.016-0.08-0.018-0.118-0.03  c0-0.002,0-0.002,0-0.002c-0.008-0.002-0.014-0.004-0.024-0.004c-0.056-0.016-0.114-0.028-0.174-0.032  c-0.014-0.004-0.024-0.006-0.038-0.01c-0.03-0.006-0.064-0.014-0.1-0.022c0.114,0.022,0.218,0.046,0.334,0.066  c0.086-0.344,0.126-0.544,0.126-0.544c1.128-5.07-1.226-9.112-6.966-9.544c-0.16,1.694,0.052,3.728,0.672,6.114  C17.626,23.778,17.264,25.606,17.958,27.42z" style="opacity:0.3;fill:#231F20;enable-background:new    ;"/>
-<path d="M37.227,19.316c-1.528,0.234-3.947,1.634-2.238,7.758  c-0.066,0.012-0.129,0.022-0.192,0.046c-0.683,0.29-0.896,1.404-0.478,2.496c0.418,1.09,1.306,1.741,1.99,1.456  c0.041-0.018,0.078-0.047,0.115-0.072c0.248,0.557,0.536,1.139,0.858,1.729c0.51-0.879,0.993-1.783,1.43-2.714  c0.026,0.002,0.05,0.002,0.078,0.002c1.16,0,2.353-1.022,2.966-2.54c0.717-1.768,0.42-3.57-0.65-4.288  c0.049-0.212,0.072-0.332,0.072-0.332c0.467-2.086,0.534-4.07,0.221-5.862C39.221,17.144,38.098,18.202,37.227,19.316z   M34.996,27.072c0.014-0.012,0.029-0.026,0.042-0.038c0,0.01,0.004,0.016,0.006,0.026C35.029,27.062,35.012,27.07,34.996,27.072z   M38.52,22.662L38.52,22.662c-0.018-0.004-0.041-0.014-0.058-0.016C38.479,22.648,38.502,22.658,38.52,22.662z" style="opacity:0.3;fill:#231F20;enable-background:new    ;"/>
-<radialGradient cx="6.2334" cy="-164.9893" gradientTransform="matrix(1.8702 0 0 -1.8638 18.6454 -261.7752)" gradientUnits="userSpaceOnUse" id="SVGID_19_" r="8.6765">
-<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"/>
+<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;"/>
+<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"/>
 </radialGradient>
-<path d="M36.918,38.521c-1.527-0.664-1.477-3.914-0.848-4.897c0.109-0.17,0.207-0.342,0.313-0.515  h-12.77c0.106,0.173,0.206,0.345,0.314,0.515c0.63,0.983,0.68,4.233-0.848,4.897c-1.528,0.662,7.098,6.438,7.098,6.438  S38.445,39.184,36.918,38.521z" style="fill:url(#SVGID_19_);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="161" x2="161" y1="-149.9604" y2="-156.6436">
-<stop offset="0" style="stop-color:#FF7236"/>
-<stop offset="1" style="stop-color:#BA1212"/>
+<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"/>
 </linearGradient>
-<path d="M46.098,41.91c-1.605-0.836-9.563-3.622-9.714-3.794l-6.08,5.05l-6.532-5.246  c-0.18,0.268-8.046,3.023-9.868,3.99c-2.084,1.105-5.486,3.646-5.486,9.376H51.58C51.58,45.557,47.7,42.746,46.098,41.91z" style="fill:url(#SVGID_20_);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="161.0293" x2="161.0293" y1="-149.522" y2="-153.4313">
-<stop offset="0" style="stop-color:#BC1C24"/>
-<stop offset="1" style="stop-color:#6B1C24"/>
+<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"/>
 </linearGradient>
-<polygon points="22.284,38.568 30.302,44.958 37.836,38.7 36.382,38.116 30.302,43.166 23.772,37.92   " style="fill:url(#SVGID_21_);"/>
-<path d="M22.66,39.58c0,0-11.44,2.986-11.44,11.004c0,0-1.634,0-1.646,0  C9.574,45.654,13.418,41.82,22.66,39.58z" style="fill:#FF7B56;"/>
-<path d="M37.189,39.395c0,0,11.44,2.987,11.44,11.004c0,0,1.636,0,1.647,0  C50.277,45.468,46.432,41.636,37.189,39.395z" style="fill:#FF7B56;"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_22_" x1="161.0293" x2="161.0293" y1="-153.7666" y2="-150.0747">
-<stop offset="0" style="stop-color:#FFA98E"/>
-<stop offset="0.9628" style="stop-color:#D45D36"/>
-<stop offset="1" style="stop-color:#D45D36"/>
+<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"/>
+<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"/>
 </linearGradient>
-<polygon points="30.302,44.958 22.282,38.568 21.816,38.773 30.302,45.534 38.302,38.88   37.838,38.693 " style="fill:url(#SVGID_22_);"/>
-<radialGradient cx="6.6563" cy="-148.9424" gradientTransform="matrix(1.8702 0 0 -1.8638 18.6454 -261.7752)" gradientUnits="userSpaceOnUse" id="SVGID_23_" r="11.6472">
-<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"/>
+<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"/>
 </radialGradient>
-<path d="M40.588,23.574c-0.054-0.026-0.115-0.03-0.172-0.044c0-0.002,0-0.004,0-0.004  c-0.01-0.002-0.02-0.004-0.032-0.006c-0.084-0.022-0.17-0.042-0.256-0.044c-10.66-1.856-15.55-7.76-15.918-6.198  c-0.294,1.244-3.282,3.936-4.848,5.278c0.014,0.06,0.02,0.114,0.036,0.174c0,0,0.054,0.276,0.172,0.744  c-0.124,0.014-0.246,0.04-0.364,0.09c-0.996,0.42-1.308,2.052-0.698,3.646c0.61,1.596,1.912,2.548,2.908,2.13  c0.06-0.028,0.114-0.07,0.17-0.108c0.578,1.3,1.29,2.696,2.158,4.094c1.458,1.732,3.692,3.766,6.158,3.766  c2.982,0,4.808-1.632,6.064-3.279c0.032-0.068,0.062-0.133,0.103-0.19c0.93-1.454,1.684-2.91,2.291-4.268  c0.975,0.336,2.227-0.568,2.847-2.102C41.852,25.668,41.574,24.02,40.588,23.574z" style="fill:url(#SVGID_23_);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_24_" x1="159.0752" x2="163.6788" y1="-150.0449" y2="-145.4773">
-<stop offset="0" style="stop-color:#FFC6B3"/>
-<stop offset="1" style="stop-color:#FFA98E"/>
+<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"/>
 </linearGradient>
-<path d="M29.464,36.256c-1.816,0-3.644-0.846-4.992-2.12c1.426,1.498,3.344,2.956,5.432,2.956  c2.983,0,4.808-1.632,6.064-3.279c0.032-0.068,0.062-0.133,0.103-0.19c0.93-1.454,1.684-2.91,2.291-4.268  C34.968,35.286,32.45,36.256,29.464,36.256z" style="fill:url(#SVGID_24_);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_25_" x1="160.9082" x2="160.9082" y1="-135.458" y2="-142.2371">
-<stop offset="0" style="stop-color:#8A5D3B"/>
-<stop offset="0.3758" style="stop-color:#632F00"/>
-<stop offset="1" style="stop-color:#361700"/>
+<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"/>
 </linearGradient>
-<path d="M29.604,8.714c-3.694,0-5.472,1.68-6.846,3.436c-2.228,0.344-5.766,2.39-3.27,11.35  c1.566-1.34,4.428-4.978,4.722-6.222c0.372-1.576,5.344,4.452,16.206,6.248c0.126-0.502,0.186-0.796,0.186-0.796  C42.307,15.078,38.598,9.014,29.604,8.714z" style="fill:url(#SVGID_25_);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_26_" x1="163.2275" x2="157.0844" y1="-141.9429" y2="-138.296">
-<stop offset="0" style="stop-color:#8A5D3B"/>
-<stop offset="0.3636" style="stop-color:#632F00"/>
-<stop offset="1" style="stop-color:#361700"/>
+<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"/>
 </linearGradient>
-<path d="M24.222,16.544c0,0,5.316,6.984,16.118,6.97C40.34,23.516,35.254,22.716,24.222,16.544z" style="fill:url(#SVGID_26_);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_27_" x1="156.5313" x2="156.5852" y1="-137.5854" y2="-141.4876">
-<stop offset="0" style="stop-color:#8A5D3B"/>
-<stop offset="0.3758" style="stop-color:#632F00"/>
-<stop offset="1" style="stop-color:#361700"/>
+<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"/>
 </linearGradient>
-<path d="M22.946,12.67c0,0-5.206,0.31-3.274,9.132C19.672,21.802,19.036,15.762,22.946,12.67z" style="fill:url(#SVGID_27_);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_28_" x1="161.7695" x2="161.5782" y1="-136.0381" y2="-137.8074">
-<stop offset="0" style="stop-color:#A87C4F"/>
-<stop offset="1" style="stop-color:#632F00"/>
+<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"/>
 </linearGradient>
-<path d="M32.128,13.892c-2.424-0.346-6.524-2.494-8.13-1.726c0,0,5.26-6,14.542,0.83  C38.54,12.996,36.328,14.49,32.128,13.892z" style="fill:url(#SVGID_28_);"/>
-<rect height="60" style="fill:none;" width="60"/>
+<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"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_landline.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,52 +1,43 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5609 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="423.0967" x2="429.6524" y1="-578.646" y2="-582.9078">
+<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.1333" style="stop-color:#A7E722"/>
-<stop offset="0.6303" style="stop-color:#428C0F"/>
-<stop offset="1" style="stop-color:#5CA617"/>
-</linearGradient>
-<path d="M19.081,33.91c2.089-3.595,4.591-6.496,7.281-9.188c2.593-2.591,6.72-5.3,8.562-6.256l9.604-10.282  c-0.845-0.3-3.693-0.464-7.279,0.616c-3.586,1.083-11.736,6.303-16.979,11.547c-5.242,5.246-9.727,12.347-10.581,14.595  c-1.343,3.541-1.221,7.445-0.929,8.58c0,0,0.34,1.035,1.144,2.377C10.248,46.475,19.081,33.91,19.081,33.91z" fill="url(#SVGID_1_)"/>
-<path d="M31.184,20.8c1.488-1.036,2.87-1.882,3.74-2.334L44.271,8.46  c-0.132-0.058-0.209-0.088-0.209-0.088c-0.247-0.088-0.642-0.162-1.124-0.219c-0.793,0.006-1.596,0.093-2.401,0.27  C34.843,9.673,31.019,14.958,31.184,20.8z" fill="#020202" fill-opacity="0.05" stroke-opacity="0.05"/>
-<path d="M31.906,20.306c1.205-0.809,2.291-1.462,3.018-1.84l9.377-10.04  c-0.146-0.063-0.233-0.098-0.233-0.098c-0.231-0.08-0.604-0.152-1.06-0.203c-0.751,0.006-1.51,0.087-2.27,0.253  C35.275,9.576,31.636,14.695,31.906,20.306z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M44.079,8.263c-0.21-0.073-0.55-0.137-0.962-0.186c-0.681,0.006-1.369,0.08-2.06,0.231  c-5.087,1.116-8.426,5.984-7.978,11.233c0.725-0.455,1.363-0.826,1.844-1.076l9.424-10.088C44.178,8.302,44.079,8.263,44.079,8.263z  " fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="40.9697" cy="9.21" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="12.2872">
-<stop offset="0" style="stop-color:#A7E722"/>
-<stop offset="0.6242" style="stop-color:#428C0F"/>
+<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"/>
 </radialGradient>
-<path d="M34.924,18.466l0.929,1.55c0,0,15.101-6.784,14.084-8.038c-0.513-0.631-0.577-0.656-1.237-1.263  c-1.985-1.815-4.172-2.531-4.172-2.531c-0.186-0.063-0.481-0.12-0.845-0.161c-0.596,0.004-1.2,0.068-1.806,0.201  c-4.591,1.009-7.57,5.501-6.963,10.257C34.916,18.477,34.921,18.47,34.924,18.466z" fill="url(#SVGID_2_)"/>
-<path d="M17.483,34.105c-0.988-0.139-2.007-0.119-3.027,0.105c-2.418,0.531-4.376,2.066-5.646,4.131  c-0.367,2.35-0.25,4.408-0.05,5.18c0,0,0.34,1.035,1.144,2.377c0.29,0.482,6.54-8.264,8.556-11.107L17.483,34.105z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M18.366,34.135c-0.989-0.139-2.008-0.117-3.029,0.105c-3.313,0.727-5.775,3.332-6.76,6.623  c-0.026,1.025,0.034,1.873,0.127,2.398c0.003,0.012,0.005,0.033,0.01,0.047c0,0,0.34,1.033,1.144,2.379  c0.3,0.498,6.981-8.887,8.75-11.383L18.366,34.135z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="437.4258" cy="-571.231" gradientTransform="matrix(0.2095 0.9787 -0.9682 0.2124 -629.4526 -270.6148)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="14.6187">
-<stop offset="0" style="stop-color:#A7E722"/>
-<stop offset="0.6242" style="stop-color:#428C0F"/>
-<stop offset="1" style="stop-color:#5CA617"/>
-</radialGradient>
-<path d="M11.202,47.738c0.616,0.74,0.646,0.953,1.295,1.523c1.194,1.055,9.301-13.611,9.301-13.611  l-2.683-1.719c-0.941-0.111-1.914-0.08-2.89,0.135c-4.777,1.049-7.806,5.869-6.87,10.832C9.749,45.686,10.349,46.709,11.202,47.738z  " fill="url(#SVGID_3_)"/>
-<path d="M49.937,11.978c-0.179-0.22-0.381-0.446-0.578-0.67l-13.944,7.959l0.438,0.749  C35.853,20.016,50.953,13.231,49.937,11.978z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="422.2881" x2="427.4786" y1="-610.9287" y2="-594.4409">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.6788" style="stop-color:#387300"/>
-<stop offset="1" style="stop-color:#66A00E"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M35.853,20.016l1.178,1.981c0.302,0.515,0.972,0.674,1.569,0.422l4.09-2.334l8.043-4.668  c0.632-0.363,0.878-1.119,0.549-1.686c0,0-0.333-0.501-1.349-1.751L35.853,20.016z" fill="url(#SVGID_4_)"/>
-<path d="M21.798,35.65l-0.725-0.473l-9.215,13.486c0.216,0.205,0.43,0.414,0.639,0.598  C13.691,50.316,21.798,35.65,21.798,35.65z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="439.6982" x2="451.5232" y1="-577.7549" y2="-564.7323">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.6788" style="stop-color:#387300"/>
-<stop offset="1" style="stop-color:#66A00E"/>
+<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"/>
+<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"/>
 </linearGradient>
-<path d="M12.498,49.262c1.193,1.049,1.686,1.369,1.686,1.369c0.567,0.367,1.363,0.17,1.781-0.441l7.9-11.605  c0.419-0.615,0.307-1.412-0.26-1.777l-1.808-1.156L12.498,49.262z" fill="url(#SVGID_5_)"/>
+<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(0.5 0 0 0.5 30 30)">
-<path d="M45.307,45.458h-2.451c-0.676,0-1.224-0.548-1.224-1.224  v0.613c0,0.676,0.548,1.225,1.224,1.225h2.451c0.676,0,1.223-0.549,1.223-1.225v-0.613C46.532,44.91,45.982,45.458,45.307,45.458z" style="opacity:0.4;fill:#231F20;enable-background:new    ;"/>
-<path d="M38.57,45.458h-2.448c-0.677,0-1.224-0.548-1.224-1.224v0.613  c0,0.676,0.547,1.225,1.224,1.225h2.448c0.676,0,1.226-0.549,1.226-1.225v-0.613C39.796,44.91,39.246,45.458,38.57,45.458z" style="opacity:0.4;fill:#231F20;enable-background:new    ;"/>
-<path d="M31.836,45.458h-2.45c-0.674,0-1.222-0.548-1.222-1.224v0.613  c0,0.676,0.548,1.225,1.222,1.225h2.45c0.676,0,1.225-0.549,1.225-1.225v-0.613C33.061,44.91,32.512,45.458,31.836,45.458z" style="opacity:0.4;fill:#231F20;enable-background:new    ;"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="161" x2="161" y1="-139.3936" y2="-154.7007">
+<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"/>
+</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"/>
@@ -54,211 +45,211 @@
 <stop offset="0.9636" style="stop-color:#ADB3B5"/>
 <stop offset="1" style="stop-color:#595C5E"/>
 </linearGradient>
-<path d="M50.816,45.307c0,1.352-1.099,2.449-2.45,2.449H11.632c-1.352,0-2.45-1.098-2.45-2.449V19.592  c0-1.352,1.098-2.45,2.45-2.45h36.734c1.352,0,2.45,1.098,2.45,2.45V45.307z" style="fill:url(#SVGID_1__);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="161" x2="161" y1="-139.3936" y2="-154.7017">
+<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"/>
 </linearGradient>
-<path d="M48.368,17.142H11.632c-1.352,0-2.45,1.098-2.45,2.45v25.715c0,1.352,1.098,2.449,2.45,2.449  c-1.014,0-1.836-0.824-1.836-1.838v-0.611V20.206v-0.614c0-1.012,0.822-1.836,1.836-1.836h36.734c1.014,0,1.836,0.824,1.836,1.836  v0.614v25.103v0.611c0,1.014-0.822,1.838-1.836,1.838c1.352,0,2.45-1.098,2.45-2.449V19.592  C50.816,18.24,49.718,17.142,48.368,17.142z" style="fill:url(#SVGID_2__);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="168.041" x2="168.041" y1="-150.2925" y2="-152.7572">
+<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.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
-<path d="M42.857,43.468c-0.676,0-1.224-0.548-1.224-1.224  v-2.448c0-0.676,0.548-1.224,1.224-1.224h2.451c0.676,0,1.224,0.548,1.224,1.224v2.448c0,0.676-0.548,1.224-1.224,1.224H42.857z" style="opacity:0.8;fill:url(#SVGID_3__);enable-background:new    ;"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="168.041" x2="168.041" y1="-150.5698" y2="-152.4763">
+<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"/>
 </linearGradient>
-<path d="M45.918,42.244c0,0.34-0.273,0.613-0.611,0.613h-2.451c-0.338,0-0.611-0.273-0.611-0.613  v-2.448c0-0.34,0.273-0.614,0.611-0.614h2.451c0.338,0,0.611,0.274,0.611,0.614V42.244z" style="fill:url(#SVGID_4__);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="164.6738" x2="164.6738" y1="-150.2632" y2="-152.7874">
+<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.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
-<path d="M36.124,43.468c-0.676,0-1.224-0.548-1.224-1.224  v-2.448c0-0.676,0.548-1.224,1.224-1.224h2.448c0.676,0,1.226,0.548,1.226,1.224v2.448c0,0.676-0.55,1.224-1.226,1.224H36.124z" style="opacity:0.8;fill:url(#SVGID_5__);enable-background:new    ;"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="164.6729" x2="164.6729" y1="-150.5698" y2="-152.4763">
+<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"/>
 </linearGradient>
-<path d="M39.184,42.244c0,0.34-0.273,0.613-0.613,0.613h-2.448c-0.338,0-0.614-0.273-0.614-0.613  v-2.448c0-0.34,0.276-0.614,0.614-0.614h2.448c0.34,0,0.613,0.274,0.613,0.614V42.244z" style="fill:url(#SVGID_6_);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="161.3066" x2="161.3066" y1="-150.2632" y2="-152.7577">
+<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.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
-<path d="M29.386,43.468c-0.674,0-1.222-0.548-1.222-1.224  v-2.448c0-0.676,0.548-1.224,1.222-1.224h2.45c0.676,0,1.225,0.548,1.225,1.224v2.448c0,0.676-0.549,1.224-1.225,1.224H29.386z" style="opacity:0.8;fill:url(#SVGID_7_);enable-background:new    ;"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="161.3057" x2="161.3057" y1="-150.5698" y2="-152.4763">
+<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"/>
 </linearGradient>
-<path d="M32.45,42.244c0,0.34-0.274,0.613-0.614,0.613h-2.45c-0.338,0-0.612-0.273-0.612-0.613v-2.448  c0-0.34,0.274-0.614,0.612-0.614h2.45c0.34,0,0.614,0.274,0.614,0.614V42.244z" style="fill:url(#SVGID_8_);"/>
-<path d="M45.307,37.348h-2.451c-0.676,0-1.224-0.548-1.224-1.224  v0.612c0,0.676,0.548,1.224,1.224,1.224h2.451c0.676,0,1.223-0.548,1.223-1.224v-0.612C46.532,36.798,45.982,37.348,45.307,37.348z" style="opacity:0.4;fill:#231F20;enable-background:new    ;"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="168.041" x2="168.041" y1="-147.2314" y2="-149.6967">
+<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"/>
+<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.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
-<path d="M42.857,37.348c-0.676,0-1.224-0.548-1.224-1.224  v-2.45c0-0.674,0.548-1.224,1.224-1.224h2.451c0.676,0,1.224,0.55,1.224,1.224v2.45c0,0.676-0.548,1.224-1.224,1.224H42.857z" style="opacity:0.8;fill:url(#SVGID_9_);enable-background:new    ;"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="168.041" x2="168.041" y1="-147.5083" y2="-149.4147">
+<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"/>
 </linearGradient>
-<path d="M45.918,36.124c0,0.338-0.273,0.612-0.611,0.612h-2.451c-0.338,0-0.611-0.274-0.611-0.612  v-2.45c0-0.338,0.273-0.613,0.611-0.613h2.451c0.338,0,0.611,0.275,0.611,0.613V36.124z" style="fill:url(#SVGID_10_);"/>
-<path d="M38.57,37.348h-2.448c-0.677,0-1.224-0.548-1.224-1.224v0.612  c0,0.676,0.547,1.224,1.224,1.224h2.448c0.676,0,1.226-0.548,1.226-1.224v-0.612C39.796,36.798,39.246,37.348,38.57,37.348z" style="opacity:0.4;fill:#231F20;enable-background:new    ;"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="164.6738" x2="164.6738" y1="-147.2021" y2="-149.7268">
+<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"/>
+<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.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
-<path d="M36.124,37.348c-0.676,0-1.224-0.548-1.224-1.224  v-2.45c0-0.674,0.548-1.224,1.224-1.224h2.448c0.676,0,1.226,0.55,1.226,1.224v2.45c0,0.676-0.55,1.224-1.226,1.224H36.124z" style="opacity:0.8;fill:url(#SVGID_11_);enable-background:new    ;"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="164.6729" x2="164.6729" y1="-147.5083" y2="-149.4147">
+<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"/>
 </linearGradient>
-<path d="M39.184,36.124c0,0.338-0.273,0.612-0.613,0.612h-2.448c-0.338,0-0.614-0.274-0.614-0.612  v-2.45c0-0.338,0.276-0.613,0.614-0.613h2.448c0.34,0,0.613,0.275,0.613,0.613V36.124z" style="fill:url(#SVGID_12_);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="161.3066" x2="161.3066" y1="-147.2021" y2="-149.6971">
+<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.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
-<path d="M29.386,37.348c-0.674,0-1.222-0.548-1.222-1.224  v-2.45c0-0.674,0.548-1.224,1.222-1.224h2.45c0.676,0,1.225,0.55,1.225,1.224v2.45c0,0.676-0.549,1.224-1.225,1.224H29.386z" style="opacity:0.8;fill:url(#SVGID_13_);enable-background:new    ;"/>
-<path d="M31.836,37.348h-2.45c-0.674,0-1.222-0.548-1.222-1.224v0.612  c0,0.676,0.548,1.224,1.222,1.224h2.45c0.676,0,1.225-0.548,1.225-1.224v-0.612C33.061,36.798,32.512,37.348,31.836,37.348z" style="opacity:0.4;fill:#231F20;enable-background:new    ;"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="161.3057" x2="161.3057" y1="-147.5083" y2="-149.4147">
+<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"/>
+<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"/>
 </linearGradient>
-<path d="M32.45,36.124c0,0.338-0.274,0.612-0.614,0.612h-2.45c-0.338,0-0.612-0.274-0.612-0.612  v-2.45c0-0.338,0.274-0.613,0.612-0.613h2.45c0.34,0,0.614,0.275,0.614,0.613V36.124z" style="fill:url(#SVGID_14_);"/>
-<path d="M45.307,31.225h-2.451c-0.676,0-1.224-0.549-1.224-1.225  v0.611c0,0.677,0.548,1.225,1.224,1.225h2.451c0.676,0,1.223-0.548,1.223-1.225V30C46.532,30.676,45.982,31.225,45.307,31.225z" style="opacity:0.4;fill:#231F20;enable-background:new    ;"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="168.041" x2="168.041" y1="-144.1694" y2="-146.6351">
+<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"/>
+<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.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
-<path d="M42.857,31.225c-0.676,0-1.224-0.549-1.224-1.225  v-2.45c0-0.674,0.548-1.224,1.224-1.224h2.451c0.676,0,1.224,0.55,1.224,1.224V30c0,0.676-0.548,1.225-1.224,1.225H42.857z" style="opacity:0.8;fill:url(#SVGID_15_);enable-background:new    ;"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="168.041" x2="168.041" y1="-144.4478" y2="-146.3531">
+<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"/>
 </linearGradient>
-<path d="M45.918,30c0,0.338-0.273,0.611-0.611,0.611h-2.451c-0.338,0-0.611-0.273-0.611-0.611v-2.45  c0-0.338,0.273-0.612,0.611-0.612h2.451c0.338,0,0.611,0.274,0.611,0.612V30z" style="fill:url(#SVGID_16_);"/>
-<path d="M38.57,31.225h-2.448c-0.677,0-1.224-0.549-1.224-1.225v0.611  c0,0.677,0.547,1.225,1.224,1.225h2.448c0.676,0,1.226-0.548,1.226-1.225V30C39.796,30.676,39.246,31.225,38.57,31.225z" style="opacity:0.4;fill:#231F20;enable-background:new    ;"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="164.6738" x2="164.6738" y1="-144.1401" y2="-146.6653">
+<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"/>
+<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.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
-<path d="M36.124,31.225c-0.676,0-1.224-0.549-1.224-1.225  v-2.45c0-0.674,0.548-1.224,1.224-1.224h2.448c0.676,0,1.226,0.55,1.226,1.224V30c0,0.676-0.55,1.225-1.226,1.225H36.124z" style="opacity:0.8;fill:url(#SVGID_17_);enable-background:new    ;"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="164.6729" x2="164.6729" y1="-144.4478" y2="-146.3531">
+<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"/>
 </linearGradient>
-<path d="M39.184,30c0,0.338-0.273,0.611-0.613,0.611h-2.448c-0.338,0-0.614-0.273-0.614-0.611v-2.45  c0-0.338,0.276-0.612,0.614-0.612h2.448c0.34,0,0.613,0.274,0.613,0.612V30z" style="fill:url(#SVGID_18_);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="161.3066" x2="161.3066" y1="-144.1401" y2="-146.6355">
+<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.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
-<path d="M29.386,31.225c-0.674,0-1.222-0.549-1.222-1.225  v-2.45c0-0.674,0.548-1.224,1.222-1.224h2.45c0.676,0,1.225,0.55,1.225,1.224V30c0,0.676-0.549,1.225-1.225,1.225H29.386z" style="opacity:0.8;fill:url(#SVGID_19_);enable-background:new    ;"/>
-<path d="M31.836,31.225h-2.45c-0.674,0-1.222-0.549-1.222-1.225v0.611  c0,0.677,0.548,1.225,1.222,1.225h2.45c0.676,0,1.225-0.548,1.225-1.225V30C33.061,30.676,32.512,31.225,31.836,31.225z" style="opacity:0.4;fill:#231F20;enable-background:new    ;"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="161.3057" x2="161.3057" y1="-144.4478" y2="-146.3531">
+<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"/>
+<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"/>
 </linearGradient>
-<path d="M32.45,30c0,0.338-0.274,0.611-0.614,0.611h-2.45c-0.338,0-0.612-0.273-0.612-0.611v-2.45  c0-0.338,0.274-0.612,0.612-0.612h2.45c0.34,0,0.614,0.274,0.614,0.612V30z" style="fill:url(#SVGID_20_);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="164.6748" x2="164.6748" y1="-140.4971" y2="-143.5716">
+<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"/>
 </linearGradient>
-<path d="M27.552,25.102c-0.676,0-1.226-0.556-1.226-1.238  V20.22c0-0.686,0.55-1.24,1.226-1.24H47.15c0.676,0,1.224,0.554,1.224,1.24v3.642c0,0.682-0.548,1.238-1.224,1.238H27.552V25.102z" style="opacity:0.4;fill:url(#SVGID_21_);enable-background:new    ;"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_22_" x1="164.6738" x2="164.6738" y1="-140.811" y2="-143.2879">
+<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">
 <stop offset="0" style="stop-color:#171717"/>
 <stop offset="1" style="stop-color:#2E2E2E"/>
 </linearGradient>
-<path d="M47.756,23.864c0,0.342-0.273,0.62-0.613,0.62H27.552c-0.338,0-0.614-0.278-0.614-0.62V20.22  c0-0.344,0.276-0.622,0.614-0.622h19.591c0.34,0,0.613,0.278,0.613,0.622V23.864z" style="fill:url(#SVGID_22_);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_23_" x1="164.6738" x2="164.6738" y1="-137.793" y2="-144.2089">
+<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"/>
 </linearGradient>
-<rect height="3.642" style="fill:url(#SVGID_23_);" width="19.591" x="27.552" y="20.22"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_24_" x1="164.6738" x2="164.6738" y1="-139.0425" y2="-143.4982">
+<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"/>
 </linearGradient>
-<polygon points="27.552,21.836 47.143,20.792 47.143,20.206 27.552,20.206 " style="fill:url(#SVGID_24_);"/>
-<path d="M11.02,39.184c0,3.377,2.748,6.125,6.124,6.125h1.224  c3.376,0,6.124-2.748,6.124-6.125V17.142h-9.798h-3.06c-0.218,0-0.412,0.07-0.614,0.126V39.184z" style="opacity:0.1;fill:#050505;enable-background:new    ;"/>
-<path d="M17.142,44.693h1.224c3.04,0,5.51-2.469,5.51-5.51V17.142  h-9.182h-3.06v22.042C11.632,42.223,14.106,44.693,17.142,44.693z" style="opacity:0.2;fill:#050505;enable-background:new    ;"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_25_" x1="154.8779" x2="154.8779" y1="-137.188" y2="-153.3424">
+<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"/>
 </linearGradient>
-<path d="M23.266,39.184c0,2.707-2.192,4.898-4.898,4.898h-1.226c-2.706,0-4.896-2.193-4.896-4.898  V17.142c0-2.706,2.192-4.898,4.896-4.898h1.224c2.708,0,4.898,2.194,4.898,4.898v22.042H23.266z" style="fill:url(#SVGID_25_);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_26_" x1="154.877" x2="154.877" y1="-137.1401" y2="-141.489">
+<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"/>
 </linearGradient>
-<path d="M18.368,12.244h-1.226c-2.706,0-4.896,2.194-4.896,4.898v3.674  c0-2.706,2.192-4.898,4.896-4.898h1.224c2.708,0,4.898,2.194,4.898,4.898v-3.674C23.266,14.438,21.074,12.244,18.368,12.244z" style="fill:url(#SVGID_26_);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_27_" x1="154.877" x2="154.877" y1="-137.1304" y2="-140.2452">
+<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"/>
 </linearGradient>
-<path d="M18.368,12.244h-1.226c-2.706,0-4.896,2.194-4.896,4.898v0.614  c0-2.706,2.192-4.898,4.896-4.898h1.224c2.708,0,4.898,2.194,4.898,4.898v-0.614C23.266,14.438,21.074,12.244,18.368,12.244z" style="fill:url(#SVGID_27_);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_28_" x1="154.877" x2="154.877" y1="-136.8833" y2="-153.1441">
+<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"/>
 </linearGradient>
-<path d="M18.368,15.918h-1.226c-0.65,0-1.27,0.128-1.836,0.362v24.128h4.896V16.28  C19.636,16.046,19.018,15.918,18.368,15.918z" style="fill:url(#SVGID_28_);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_29_" x1="154.877" x2="154.877" y1="-148.7729" y2="-153.1223">
+<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"/>
 </linearGradient>
-<path d="M18.368,40.408h-1.226c-2.706,0-4.896-2.194-4.896-4.898v3.674  c0,2.707,2.192,4.898,4.896,4.898h1.224c2.708,0,4.898-2.193,4.898-4.898V35.51C23.266,38.214,21.074,40.408,18.368,40.408z" style="fill:url(#SVGID_29_);"/>
-<rect height="60" style="fill:none;" width="60"/>
+<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"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_landline_home.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,90 +1,269 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5609 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="423.0967" x2="429.6524" y1="-578.646" y2="-582.9078">
+<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.1333" style="stop-color:#A7E722"/>
-<stop offset="0.6303" style="stop-color:#428C0F"/>
-<stop offset="1" style="stop-color:#5CA617"/>
-</linearGradient>
-<path d="M19.081,33.91c2.089-3.595,4.591-6.496,7.281-9.188c2.593-2.591,6.72-5.3,8.562-6.256l9.604-10.282  c-0.845-0.3-3.693-0.464-7.279,0.616c-3.586,1.083-11.736,6.303-16.979,11.547c-5.242,5.246-9.727,12.347-10.581,14.595  c-1.343,3.541-1.221,7.445-0.929,8.58c0,0,0.34,1.035,1.144,2.377C10.248,46.475,19.081,33.91,19.081,33.91z" fill="url(#SVGID_1_)"/>
-<path d="M31.184,20.8c1.488-1.036,2.87-1.882,3.74-2.334L44.271,8.46  c-0.132-0.058-0.209-0.088-0.209-0.088c-0.247-0.088-0.642-0.162-1.124-0.219c-0.793,0.006-1.596,0.093-2.401,0.27  C34.843,9.673,31.019,14.958,31.184,20.8z" fill="#020202" fill-opacity="0.05" stroke-opacity="0.05"/>
-<path d="M31.906,20.306c1.205-0.809,2.291-1.462,3.018-1.84l9.377-10.04  c-0.146-0.063-0.233-0.098-0.233-0.098c-0.231-0.08-0.604-0.152-1.06-0.203c-0.751,0.006-1.51,0.087-2.27,0.253  C35.275,9.576,31.636,14.695,31.906,20.306z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M44.079,8.263c-0.21-0.073-0.55-0.137-0.962-0.186c-0.681,0.006-1.369,0.08-2.06,0.231  c-5.087,1.116-8.426,5.984-7.978,11.233c0.725-0.455,1.363-0.826,1.844-1.076l9.424-10.088C44.178,8.302,44.079,8.263,44.079,8.263z  " fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="40.9697" cy="9.21" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="12.2872">
-<stop offset="0" style="stop-color:#A7E722"/>
-<stop offset="0.6242" style="stop-color:#428C0F"/>
+<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"/>
 </radialGradient>
-<path d="M34.924,18.466l0.929,1.55c0,0,15.101-6.784,14.084-8.038c-0.513-0.631-0.577-0.656-1.237-1.263  c-1.985-1.815-4.172-2.531-4.172-2.531c-0.186-0.063-0.481-0.12-0.845-0.161c-0.596,0.004-1.2,0.068-1.806,0.201  c-4.591,1.009-7.57,5.501-6.963,10.257C34.916,18.477,34.921,18.47,34.924,18.466z" fill="url(#SVGID_2_)"/>
-<path d="M17.483,34.105c-0.988-0.139-2.007-0.119-3.027,0.105c-2.418,0.531-4.376,2.066-5.646,4.131  c-0.367,2.35-0.25,4.408-0.05,5.18c0,0,0.34,1.035,1.144,2.377c0.29,0.482,6.54-8.264,8.556-11.107L17.483,34.105z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M18.366,34.135c-0.989-0.139-2.008-0.117-3.029,0.105c-3.313,0.727-5.775,3.332-6.76,6.623  c-0.026,1.025,0.034,1.873,0.127,2.398c0.003,0.012,0.005,0.033,0.01,0.047c0,0,0.34,1.033,1.144,2.379  c0.3,0.498,6.981-8.887,8.75-11.383L18.366,34.135z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="437.4258" cy="-571.231" gradientTransform="matrix(0.2095 0.9787 -0.9682 0.2124 -629.4526 -270.6148)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="14.6187">
-<stop offset="0" style="stop-color:#A7E722"/>
-<stop offset="0.6242" style="stop-color:#428C0F"/>
-<stop offset="1" style="stop-color:#5CA617"/>
-</radialGradient>
-<path d="M11.202,47.738c0.616,0.74,0.646,0.953,1.295,1.523c1.194,1.055,9.301-13.611,9.301-13.611  l-2.683-1.719c-0.941-0.111-1.914-0.08-2.89,0.135c-4.777,1.049-7.806,5.869-6.87,10.832C9.749,45.686,10.349,46.709,11.202,47.738z  " fill="url(#SVGID_3_)"/>
-<path d="M49.937,11.978c-0.179-0.22-0.381-0.446-0.578-0.67l-13.944,7.959l0.438,0.749  C35.853,20.016,50.953,13.231,49.937,11.978z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="422.2881" x2="427.4786" y1="-610.9287" y2="-594.4409">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.6788" style="stop-color:#387300"/>
-<stop offset="1" style="stop-color:#66A00E"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M35.853,20.016l1.178,1.981c0.302,0.515,0.972,0.674,1.569,0.422l4.09-2.334l8.043-4.668  c0.632-0.363,0.878-1.119,0.549-1.686c0,0-0.333-0.501-1.349-1.751L35.853,20.016z" fill="url(#SVGID_4_)"/>
-<path d="M21.798,35.65l-0.725-0.473l-9.215,13.486c0.216,0.205,0.43,0.414,0.639,0.598  C13.691,50.316,21.798,35.65,21.798,35.65z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="439.6982" x2="451.5232" y1="-577.7549" y2="-564.7323">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.6788" style="stop-color:#387300"/>
-<stop offset="1" style="stop-color:#66A00E"/>
+<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"/>
+<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"/>
 </linearGradient>
-<path d="M12.498,49.262c1.193,1.049,1.686,1.369,1.686,1.369c0.567,0.367,1.363,0.17,1.781-0.441l7.9-11.605  c0.419-0.615,0.307-1.412-0.26-1.777l-1.808-1.156L12.498,49.262z" fill="url(#SVGID_5_)"/>
+<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)">
-<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"/>
+<polygon fill="none" points="0,8 0,25.294 0,30 30,30 30,25.294 30,8 30,0 0,0 "/>
+<path d="M21.5,30c-2.037,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.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.647h-0.321C25.486,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="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"/>
+</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="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"/>
+</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.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.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"/>
+</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.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.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"/>
+</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.4121" x2="15.4121" y1="20.7324" y2="24.0876">
+<stop offset="0" style="stop-color:#646263"/>
+<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="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"/>
+<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.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"/>
+</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"/>
+<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.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.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"/>
 </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"/>
+<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"/>
+<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.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.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"/>
+</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.4121" x2="15.4121" y1="16.6152" y2="19.9724">
+<stop offset="0" style="stop-color:#646263"/>
+<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"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" 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"/>
 </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"/>
+<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"/>
+<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.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"/>
+</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"/>
+<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.2" style="stop-color:#4D4D4D"/>
+<stop offset="0.7212" style="stop-color:#242424"/>
+<stop offset="1" style="stop-color:#373737"/>
 </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"/>
+<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"/>
+</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.4121" x2="15.4121" y1="12.498" y2="15.8522">
+<stop offset="0" style="stop-color:#646263"/>
+<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"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_20_" 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"/>
+</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"/>
+</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">
+<stop offset="0" style="stop-color:#171717"/>
+<stop offset="1" style="stop-color:#2E2E2E"/>
 </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>
+<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"/>
+</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"/>
+</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.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"/>
+</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.7656" x2="6.7656" y1="3.082" y2="8.9318">
+<stop offset="0" style="stop-color:#B5BCBF"/>
+<stop offset="1" style="stop-color:#494C4F"/>
+</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.7656" x2="6.7656" y1="3.0688" y2="7.2577">
+<stop offset="0" style="stop-color:#D5DDE0"/>
+<stop offset="1" style="stop-color:#494C4F"/>
+</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.7637" x2="6.7637" 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"/>
+</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.7656" x2="6.7656" y1="18.7295" y2="24.5792">
+<stop offset="0" style="stop-color:#252629"/>
+<stop offset="1" style="stop-color:#5A5D61"/>
+</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 -281.6006 280.5271)" gradientUnits="userSpaceOnUse" id="SVGID_30_" x1="606.2012" x2="606.2012" y1="533.1255" y2="503.1255">
+<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"/>
+</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_)"/>
+<radialGradient cx="673.1133" cy="963.3052" gradientTransform="matrix(0.4708 0 0 -0.4709 -295.4703 469.2089)" gradientUnits="userSpaceOnUse" id="SVGID_31_" r="29.24">
+<stop offset="0" style="stop-color:#96E9FA"/>
+<stop offset="0.15" style="stop-color:#96E9FA"/>
+<stop offset="0.7455" style="stop-color:#005BCC"/>
+<stop offset="1" style="stop-color:#0087D9"/>
+</radialGradient>
+<path d="M28.786,21.5c0,4.024-3.264,7.286-7.286,7.286c-4.024,0-7.285-3.262-7.285-7.286  c0-4.022,3.261-7.286,7.285-7.286C25.522,14.214,28.786,17.478,28.786,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"/>
+<polygon fill-opacity="0.3" points="21.5,19.845 17.627,23.951 17.627,25.793 20.531,25.793 20.531,22.889 22.469,22.889 22.469,25.793   25.373,25.793 25.373,23.95 " stroke-opacity="0.3"/>
+<polygon fill="#FFFFFF" points="25.703,22.188 21.499,17.734 17.297,22.188 16.658,21.51 21.499,16.377 26.342,21.51 25.703,22.188   "/>
+<polygon fill="#FFFFFF" points="21.5,19.146 17.627,23.252 17.627,25.094 20.531,25.094 20.531,22.188 22.469,22.188 22.469,25.094   25.373,25.094 25.373,23.25 "/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_landline_work.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,90 +1,268 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5609 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="423.0967" x2="429.6524" y1="-578.646" y2="-582.9078">
+<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.1333" style="stop-color:#A7E722"/>
-<stop offset="0.6303" style="stop-color:#428C0F"/>
-<stop offset="1" style="stop-color:#5CA617"/>
-</linearGradient>
-<path d="M19.081,33.91c2.089-3.595,4.591-6.496,7.281-9.188c2.593-2.591,6.72-5.3,8.562-6.256l9.604-10.282  c-0.845-0.3-3.693-0.464-7.279,0.616c-3.586,1.083-11.736,6.303-16.979,11.547c-5.242,5.246-9.727,12.347-10.581,14.595  c-1.343,3.541-1.221,7.445-0.929,8.58c0,0,0.34,1.035,1.144,2.377C10.248,46.475,19.081,33.91,19.081,33.91z" fill="url(#SVGID_1_)"/>
-<path d="M31.184,20.8c1.488-1.036,2.87-1.882,3.74-2.334L44.271,8.46  c-0.132-0.058-0.209-0.088-0.209-0.088c-0.247-0.088-0.642-0.162-1.124-0.219c-0.793,0.006-1.596,0.093-2.401,0.27  C34.843,9.673,31.019,14.958,31.184,20.8z" fill="#020202" fill-opacity="0.05" stroke-opacity="0.05"/>
-<path d="M31.906,20.306c1.205-0.809,2.291-1.462,3.018-1.84l9.377-10.04  c-0.146-0.063-0.233-0.098-0.233-0.098c-0.231-0.08-0.604-0.152-1.06-0.203c-0.751,0.006-1.51,0.087-2.27,0.253  C35.275,9.576,31.636,14.695,31.906,20.306z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M44.079,8.263c-0.21-0.073-0.55-0.137-0.962-0.186c-0.681,0.006-1.369,0.08-2.06,0.231  c-5.087,1.116-8.426,5.984-7.978,11.233c0.725-0.455,1.363-0.826,1.844-1.076l9.424-10.088C44.178,8.302,44.079,8.263,44.079,8.263z  " fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="40.9697" cy="9.21" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="12.2872">
-<stop offset="0" style="stop-color:#A7E722"/>
-<stop offset="0.6242" style="stop-color:#428C0F"/>
+<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"/>
 </radialGradient>
-<path d="M34.924,18.466l0.929,1.55c0,0,15.101-6.784,14.084-8.038c-0.513-0.631-0.577-0.656-1.237-1.263  c-1.985-1.815-4.172-2.531-4.172-2.531c-0.186-0.063-0.481-0.12-0.845-0.161c-0.596,0.004-1.2,0.068-1.806,0.201  c-4.591,1.009-7.57,5.501-6.963,10.257C34.916,18.477,34.921,18.47,34.924,18.466z" fill="url(#SVGID_2_)"/>
-<path d="M17.483,34.105c-0.988-0.139-2.007-0.119-3.027,0.105c-2.418,0.531-4.376,2.066-5.646,4.131  c-0.367,2.35-0.25,4.408-0.05,5.18c0,0,0.34,1.035,1.144,2.377c0.29,0.482,6.54-8.264,8.556-11.107L17.483,34.105z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M18.366,34.135c-0.989-0.139-2.008-0.117-3.029,0.105c-3.313,0.727-5.775,3.332-6.76,6.623  c-0.026,1.025,0.034,1.873,0.127,2.398c0.003,0.012,0.005,0.033,0.01,0.047c0,0,0.34,1.033,1.144,2.379  c0.3,0.498,6.981-8.887,8.75-11.383L18.366,34.135z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="437.4258" cy="-571.231" gradientTransform="matrix(0.2095 0.9787 -0.9682 0.2124 -629.4526 -270.6148)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="14.6187">
-<stop offset="0" style="stop-color:#A7E722"/>
-<stop offset="0.6242" style="stop-color:#428C0F"/>
-<stop offset="1" style="stop-color:#5CA617"/>
-</radialGradient>
-<path d="M11.202,47.738c0.616,0.74,0.646,0.953,1.295,1.523c1.194,1.055,9.301-13.611,9.301-13.611  l-2.683-1.719c-0.941-0.111-1.914-0.08-2.89,0.135c-4.777,1.049-7.806,5.869-6.87,10.832C9.749,45.686,10.349,46.709,11.202,47.738z  " fill="url(#SVGID_3_)"/>
-<path d="M49.937,11.978c-0.179-0.22-0.381-0.446-0.578-0.67l-13.944,7.959l0.438,0.749  C35.853,20.016,50.953,13.231,49.937,11.978z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="422.2881" x2="427.4786" y1="-610.9287" y2="-594.4409">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.6788" style="stop-color:#387300"/>
-<stop offset="1" style="stop-color:#66A00E"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M35.853,20.016l1.178,1.981c0.302,0.515,0.972,0.674,1.569,0.422l4.09-2.334l8.043-4.668  c0.632-0.363,0.878-1.119,0.549-1.686c0,0-0.333-0.501-1.349-1.751L35.853,20.016z" fill="url(#SVGID_4_)"/>
-<path d="M21.798,35.65l-0.725-0.473l-9.215,13.486c0.216,0.205,0.43,0.414,0.639,0.598  C13.691,50.316,21.798,35.65,21.798,35.65z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="439.6982" x2="451.5232" y1="-577.7549" y2="-564.7323">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.6788" style="stop-color:#387300"/>
-<stop offset="1" style="stop-color:#66A00E"/>
+<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"/>
+<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"/>
 </linearGradient>
-<path d="M12.498,49.262c1.193,1.049,1.686,1.369,1.686,1.369c0.567,0.367,1.363,0.17,1.781-0.441l7.9-11.605  c0.419-0.615,0.307-1.412-0.26-1.777l-1.808-1.156L12.498,49.262z" fill="url(#SVGID_5_)"/>
+<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)">
-<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"/>
+<polygon fill="none" points="0,8 0,25.294 0,30 30,30 30,25.294 30,8 30,0 0,0 "/>
+<path d="M21.5,30c-2.037,0-3.985-0.729-5.53-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.647H27.03C25.485,29.271,23.536,30,21.5,30L21.5,30z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" 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"/>
+</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="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"/>
+</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.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.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"/>
+</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.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.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"/>
+</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.4121" x2="15.4121" y1="20.7324" y2="24.0876">
+<stop offset="0" style="stop-color:#646263"/>
+<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="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"/>
+<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.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"/>
+</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"/>
+<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.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.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"/>
 </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"/>
+<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"/>
+<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.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.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"/>
+</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.4121" x2="15.4121" y1="16.6152" y2="19.9724">
+<stop offset="0" style="stop-color:#646263"/>
+<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"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" 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"/>
 </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"/>
+<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"/>
+<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.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"/>
+</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"/>
+<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.2" style="stop-color:#4D4D4D"/>
+<stop offset="0.7212" style="stop-color:#242424"/>
+<stop offset="1" style="stop-color:#373737"/>
 </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"/>
+<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"/>
+</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.4121" x2="15.4121" y1="12.498" y2="15.8522">
+<stop offset="0" style="stop-color:#646263"/>
+<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"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_20_" 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"/>
+</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"/>
+</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">
+<stop offset="0" style="stop-color:#171717"/>
+<stop offset="1" style="stop-color:#2E2E2E"/>
 </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>
+<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.9414" x2="19.9414" 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"/>
+</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.9414" x2="19.9414" 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"/>
+</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.8746">
+<stop offset="0" style="stop-color:#727678"/>
+<stop offset="0.7394" style="stop-color:#252629"/>
+<stop offset="1" style="stop-color:#494C4F"/>
+</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"/>
+</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"/>
+</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.6079">
+<stop offset="0" style="stop-color:#A0A7A8"/>
+<stop offset="0.7576" style="stop-color:#252629"/>
+<stop offset="1" style="stop-color:#1F2021"/>
+</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"/>
+</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 -316.6406 280.5271)" gradientUnits="userSpaceOnUse" id="SVGID_30_" x1="676.2813" x2="676.2813" y1="533.1255" y2="503.1255">
+<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"/>
+</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_)"/>
+<radialGradient cx="676.1436" cy="530.1011" gradientTransform="matrix(0.5 0 0 -0.5 -316.6406 280.6384)" gradientUnits="userSpaceOnUse" id="SVGID_31_" r="27.5291">
+<stop offset="0" style="stop-color:#96E9FA"/>
+<stop offset="0.15" style="stop-color:#96E9FA"/>
+<stop offset="0.7455" style="stop-color:#005BCC"/>
+<stop offset="1" style="stop-color:#0087D9"/>
+</radialGradient>
+<path d="M28.785,21.5c0,4.024-3.263,7.286-7.285,7.286c-4.023,0-7.285-3.262-7.285-7.286  c0-4.023,3.262-7.286,7.285-7.286C25.522,14.214,28.785,17.477,28.785,21.5z" fill="url(#SVGID_31_)"/>
+<path d="M22.518,20.029v-2.035h-5.086v8.138H21.5h1.018h3.051v-6.103H22.518z M21.5,24.098h-3.052V23.08H21.5V24.098z   M21.5,22.063h-3.052v-1.018H21.5V22.063z M18.448,20.029v-1.018H21.5v1.018H18.448z M24.552,24.098h-2.034V23.08h2.034V24.098z   M24.552,22.063h-2.034v-1.018h2.034V22.063z" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M22.518,19.329v-2.034h-5.086v8.137H21.5h1.018h3.051v-6.103H22.518z M21.5,23.397h-3.052v-1.017H21.5  V23.397z M21.5,21.363h-3.052v-1.018H21.5V21.363z M18.448,19.329v-1.018H21.5v1.018H18.448z M24.552,23.397h-2.034v-1.017h2.034  V23.397z M24.552,21.363h-2.034v-1.018h2.034V21.363z" fill="#FFFFFF"/>
+<rect fill-opacity="0.3" height="6.103" stroke-opacity="0.3" width="1.017" x="22.518" y="19.329"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_mobile.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,49 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5609 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="423.0967" x2="429.6524" y1="-578.646" y2="-582.9078">
+<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.1333" style="stop-color:#A7E722"/>
-<stop offset="0.6303" style="stop-color:#428C0F"/>
-<stop offset="1" style="stop-color:#5CA617"/>
-</linearGradient>
-<path d="M19.081,33.91c2.089-3.595,4.591-6.496,7.281-9.188c2.593-2.591,6.72-5.3,8.562-6.256l9.604-10.282  c-0.845-0.3-3.693-0.464-7.279,0.616c-3.586,1.083-11.736,6.303-16.979,11.547c-5.242,5.246-9.727,12.347-10.581,14.595  c-1.343,3.541-1.221,7.445-0.929,8.58c0,0,0.34,1.035,1.144,2.377C10.248,46.475,19.081,33.91,19.081,33.91z" fill="url(#SVGID_1_)"/>
-<path d="M31.184,20.8c1.488-1.036,2.87-1.882,3.74-2.334L44.271,8.46  c-0.132-0.058-0.209-0.088-0.209-0.088c-0.247-0.088-0.642-0.162-1.124-0.219c-0.793,0.006-1.596,0.093-2.401,0.27  C34.843,9.673,31.019,14.958,31.184,20.8z" fill="#020202" fill-opacity="0.05" stroke-opacity="0.05"/>
-<path d="M31.906,20.306c1.205-0.809,2.291-1.462,3.018-1.84l9.377-10.04  c-0.146-0.063-0.233-0.098-0.233-0.098c-0.231-0.08-0.604-0.152-1.06-0.203c-0.751,0.006-1.51,0.087-2.27,0.253  C35.275,9.576,31.636,14.695,31.906,20.306z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M44.079,8.263c-0.21-0.073-0.55-0.137-0.962-0.186c-0.681,0.006-1.369,0.08-2.06,0.231  c-5.087,1.116-8.426,5.984-7.978,11.233c0.725-0.455,1.363-0.826,1.844-1.076l9.424-10.088C44.178,8.302,44.079,8.263,44.079,8.263z  " fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="40.9697" cy="9.21" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="12.2872">
-<stop offset="0" style="stop-color:#A7E722"/>
-<stop offset="0.6242" style="stop-color:#428C0F"/>
+<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"/>
 </radialGradient>
-<path d="M34.924,18.466l0.929,1.55c0,0,15.101-6.784,14.084-8.038c-0.513-0.631-0.577-0.656-1.237-1.263  c-1.985-1.815-4.172-2.531-4.172-2.531c-0.186-0.063-0.481-0.12-0.845-0.161c-0.596,0.004-1.2,0.068-1.806,0.201  c-4.591,1.009-7.57,5.501-6.963,10.257C34.916,18.477,34.921,18.47,34.924,18.466z" fill="url(#SVGID_2_)"/>
-<path d="M17.483,34.105c-0.988-0.139-2.007-0.119-3.027,0.105c-2.418,0.531-4.376,2.066-5.646,4.131  c-0.367,2.35-0.25,4.408-0.05,5.18c0,0,0.34,1.035,1.144,2.377c0.29,0.482,6.54-8.264,8.556-11.107L17.483,34.105z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M18.366,34.135c-0.989-0.139-2.008-0.117-3.029,0.105c-3.313,0.727-5.775,3.332-6.76,6.623  c-0.026,1.025,0.034,1.873,0.127,2.398c0.003,0.012,0.005,0.033,0.01,0.047c0,0,0.34,1.033,1.144,2.379  c0.3,0.498,6.981-8.887,8.75-11.383L18.366,34.135z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="437.4258" cy="-571.231" gradientTransform="matrix(0.2095 0.9787 -0.9682 0.2124 -629.4526 -270.6148)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="14.6187">
-<stop offset="0" style="stop-color:#A7E722"/>
-<stop offset="0.6242" style="stop-color:#428C0F"/>
-<stop offset="1" style="stop-color:#5CA617"/>
-</radialGradient>
-<path d="M11.202,47.738c0.616,0.74,0.646,0.953,1.295,1.523c1.194,1.055,9.301-13.611,9.301-13.611  l-2.683-1.719c-0.941-0.111-1.914-0.08-2.89,0.135c-4.777,1.049-7.806,5.869-6.87,10.832C9.749,45.686,10.349,46.709,11.202,47.738z  " fill="url(#SVGID_3_)"/>
-<path d="M49.937,11.978c-0.179-0.22-0.381-0.446-0.578-0.67l-13.944,7.959l0.438,0.749  C35.853,20.016,50.953,13.231,49.937,11.978z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="422.2881" x2="427.4786" y1="-610.9287" y2="-594.4409">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.6788" style="stop-color:#387300"/>
-<stop offset="1" style="stop-color:#66A00E"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M35.853,20.016l1.178,1.981c0.302,0.515,0.972,0.674,1.569,0.422l4.09-2.334l8.043-4.668  c0.632-0.363,0.878-1.119,0.549-1.686c0,0-0.333-0.501-1.349-1.751L35.853,20.016z" fill="url(#SVGID_4_)"/>
-<path d="M21.798,35.65l-0.725-0.473l-9.215,13.486c0.216,0.205,0.43,0.414,0.639,0.598  C13.691,50.316,21.798,35.65,21.798,35.65z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="439.6982" x2="451.5232" y1="-577.7549" y2="-564.7323">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.6788" style="stop-color:#387300"/>
-<stop offset="1" style="stop-color:#66A00E"/>
+<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"/>
+<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"/>
 </linearGradient>
-<path d="M12.498,49.262c1.193,1.049,1.686,1.369,1.686,1.369c0.567,0.367,1.363,0.17,1.781-0.441l7.9-11.605  c0.419-0.615,0.307-1.412-0.26-1.777l-1.808-1.156L12.498,49.262z" fill="url(#SVGID_5_)"/>
+<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(0.5 0 0 0.5 30 30)">
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="161" x2="161" y1="-133.1313" y2="-158.8042">
+<g transform="matrix(1 0 0 1 30 30)">
+<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"/>
@@ -51,62 +41,51 @@
 <stop offset="0.9636" style="stop-color:#ADB3B5"/>
 <stop offset="1" style="stop-color:#595C5E"/>
 </linearGradient>
-<path d="M46.574,52.922c0,1.557-1.264,2.818-2.822,2.818H16.248c-1.558,0-2.82-1.262-2.82-2.818V7.082  c0-1.556,1.262-2.82,2.82-2.82h27.504c1.559,0,2.822,1.264,2.822,2.82V52.922z" style="fill:url(#SVGID_1__);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="161.002" x2="161.002" y1="-133.1313" y2="-158.3649">
+<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"/>
 </linearGradient>
-<path d="M43.752,4.262H16.248c-1.558,0-2.82,1.264-2.82,2.82v45.84c0,0.752,0.3,1.432,0.78,1.938  c-0.044-0.172-0.072-0.344-0.072-0.529v-1.408V8.492v-1.41c0-1.168,0.95-2.118,2.114-2.118h27.504c1.166,0,2.114,0.95,2.114,2.118  v1.41v44.43v1.408c0,0.186-0.028,0.357-0.072,0.529c0.481-0.506,0.782-1.186,0.782-1.938V7.082  C46.574,5.526,45.311,4.262,43.752,4.262z" style="fill:url(#SVGID_2__);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="161" x2="161" y1="-134.9199" y2="-152.1733">
+<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"/>
 </linearGradient>
-<rect height="34.554" style="opacity:0.6;fill:url(#SVGID_3__);enable-background:new    ;" width="28.918" x="15.542" y="7.788"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="161" x2="161" y1="-135.271" y2="-151.8217">
+<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">
 <stop offset="0" style="stop-color:#6E6E6E"/>
 <stop offset="1" style="stop-color:#333333"/>
 </linearGradient>
-<rect height="33.146" style="fill:url(#SVGID_4__);" width="27.504" x="16.248" y="8.492"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="161" x2="161" y1="-135.623" y2="-151.4692">
+<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"/>
 </linearGradient>
-<rect height="31.735" style="fill:url(#SVGID_5__);" width="26.094" x="16.954" y="9.198"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="161" x2="161" y1="-135.876" y2="-142.1815">
+<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"/>
 </linearGradient>
-<polygon points="43.046,20.48 16.954,23.3 16.954,9.904 43.046,9.904 " style="fill:url(#SVGID_6_);"/>
-<rect height="0.708" style="fill:#9FE4FF;" width="26.094" x="16.954" y="9.198"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="161.1025" x2="161.1025" y1="-134.9092" y2="-133.4971">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#D1D7D9"/>
-</linearGradient>
-<path d="M27.088,7.788c-0.792,0-1.412-0.516-1.412-1.176V6.14c0-0.658,0.622-1.176,1.412-1.176h6.238  c0.79,0,1.408,0.518,1.408,1.176v0.47c0,0.66-0.621,1.176-1.408,1.176h-6.238V7.788z" style="fill:url(#SVGID_7_);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="161.1035" x2="161.1035" y1="-133.6899" y2="-134.6008">
-<stop offset="0" style="stop-color:#6C7375"/>
-<stop offset="1" style="stop-color:#BDC2C4"/>
-</linearGradient>
-<path d="M34.034,6.612c0,0.26-0.318,0.47-0.708,0.47h-6.238c-0.39,0-0.708-0.21-0.708-0.47V6.14  c0-0.262,0.316-0.468,0.708-0.468h6.238c0.388,0,0.708,0.208,0.708,0.468V6.612z" style="fill:url(#SVGID_8_);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="160.9453" x2="160.9453" y1="-152.5391" y2="-157.7801">
+<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"/>
+<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="1" style="stop-color:#FFFFFF"/>
 </linearGradient>
-<path d="M27.344,53.626c-1.512,0-2.744-1.216-2.744-2.712  V45.76c0-1.494,1.232-2.71,2.744-2.71h5.094c1.515,0,2.744,1.216,2.744,2.71v5.154c0,1.496-1.229,2.712-2.744,2.712H27.344z" style="opacity:0.6;fill:url(#SVGID_9_);enable-background:new    ;"/>
-<path d="M27.34,52.922c-1.122,0-2.032-0.902-2.032-2.008V45.76  c0-1.107,0.91-2.008,2.032-2.008h5.104c1.123,0,2.031,0.9,2.031,2.008v5.154c0,1.105-0.908,2.008-2.031,2.008H27.34z" style="opacity:0.5;fill:#020202;enable-background:new    ;"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="160.9453" x2="160.9453" y1="-153.2129" y2="-157.1145">
+<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"/>
 </linearGradient>
-<path d="M33.771,50.914c0,0.718-0.594,1.3-1.319,1.3h-5.12c-0.728,0-1.32-0.582-1.32-1.3V45.76  c0-0.716,0.592-1.298,1.32-1.298h5.12c0.726,0,1.319,0.582,1.319,1.298V50.914z" style="fill:url(#SVGID_10_);"/>
-<path d="M28.836,50.805c-0.782,0-1.414-0.633-1.414-1.41v-2.119  c0-0.775,0.632-1.407,1.414-1.407h2.112c0.78,0,1.411,0.632,1.411,1.407v2.119c0,0.777-0.631,1.41-1.411,1.41H28.836z" style="opacity:0.2;fill:#020202;enable-background:new    ;"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="160.9453" x2="160.9453" y1="-154.2798" y2="-156.0522">
+<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"/>
@@ -114,39 +93,39 @@
 <stop offset="0.9636" style="stop-color:#ADB3B5"/>
 <stop offset="1" style="stop-color:#595C5E"/>
 </linearGradient>
-<path d="M28.836,50.098c-0.392,0-0.708-0.313-0.708-0.703v-2.119c0-0.385,0.314-0.703,0.708-0.703  h2.112c0.39,0,0.708,0.316,0.708,0.703v2.119c0,0.388-0.316,0.703-0.708,0.703H28.836z" style="fill:url(#SVGID_11_);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="155.3301" x2="155.3301" y1="-152.8564" y2="-157.1148">
+<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"/>
 </linearGradient>
-<path d="M18.256,52.214c-1.496,0-2.714-1.216-2.714-2.712  v-3.036c0-1.498,1.218-2.714,2.714-2.714h0.81c1.498,0,2.714,1.216,2.714,2.714v3.036c0,1.496-1.216,2.712-2.714,2.712H18.256z" style="opacity:0.4;fill:url(#SVGID_12_);enable-background:new    ;"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="155.3311" x2="155.3311" y1="-153.2139" y2="-156.7607">
+<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"/>
 </linearGradient>
-<path d="M18.256,51.51c-1.106,0-2.008-0.9-2.008-2.008v-3.036  c0-1.11,0.902-2.006,2.008-2.006h0.81c1.11,0,2.01,0.896,2.01,2.006v3.036c0,1.107-0.9,2.008-2.01,2.008H18.256z" style="opacity:0.7;fill:url(#SVGID_13_);enable-background:new    ;"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="155.3301" x2="155.3301" y1="-153.5693" y2="-156.4081">
+<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"/>
 </linearGradient>
-<path d="M20.37,49.502c0,0.721-0.582,1.303-1.302,1.303h-0.812c-0.718,0-1.302-0.582-1.302-1.303  v-3.036c0-0.72,0.584-1.302,1.302-1.302h0.81c0.72,0,1.302,0.582,1.302,1.302v3.036H20.37z" style="fill:url(#SVGID_14_);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="166.3652" x2="166.3652" y1="-152.8564" y2="-157.1148">
+<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"/>
 </linearGradient>
-<path d="M40.322,52.214c-1.494,0-2.711-1.216-2.711-2.712  v-3.036c0-1.498,1.217-2.714,2.711-2.714h0.812c1.5,0,2.714,1.216,2.714,2.714v3.036c0,1.496-1.214,2.712-2.714,2.712H40.322z" style="opacity:0.4;fill:url(#SVGID_15_);enable-background:new    ;"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="166.3643" x2="166.3643" y1="-153.2139" y2="-156.7607">
+<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"/>
 </linearGradient>
-<path d="M40.322,51.51c-1.108,0-2.008-0.9-2.008-2.008v-3.036  c0-1.11,0.899-2.006,2.008-2.006h0.812c1.11,0,2.009,0.896,2.009,2.006v3.036c0,1.107-0.898,2.008-2.009,2.008H40.322z" style="opacity:0.7;fill:url(#SVGID_16_);enable-background:new    ;"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="166.3652" x2="166.3652" y1="-153.5693" y2="-156.4081">
+<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"/>
 </linearGradient>
-<path d="M42.438,49.502c0,0.721-0.582,1.303-1.301,1.303h-0.813c-0.717,0-1.301-0.582-1.301-1.303  v-3.036c0-0.72,0.584-1.302,1.301-1.302h0.813c0.719,0,1.301,0.582,1.301,1.302V49.502z" style="fill:url(#SVGID_17_);"/>
-<rect height="60" style="fill:none;" width="60"/>
+<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"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_mobile_home.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,90 +1,149 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5609 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="423.0967" x2="429.6524" y1="-578.646" y2="-582.9078">
+<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.1333" style="stop-color:#A7E722"/>
-<stop offset="0.6303" style="stop-color:#428C0F"/>
-<stop offset="1" style="stop-color:#5CA617"/>
-</linearGradient>
-<path d="M19.081,33.91c2.089-3.595,4.591-6.496,7.281-9.188c2.593-2.591,6.72-5.3,8.562-6.256l9.604-10.282  c-0.845-0.3-3.693-0.464-7.279,0.616c-3.586,1.083-11.736,6.303-16.979,11.547c-5.242,5.246-9.727,12.347-10.581,14.595  c-1.343,3.541-1.221,7.445-0.929,8.58c0,0,0.34,1.035,1.144,2.377C10.248,46.475,19.081,33.91,19.081,33.91z" fill="url(#SVGID_1_)"/>
-<path d="M31.184,20.8c1.488-1.036,2.87-1.882,3.74-2.334L44.271,8.46  c-0.132-0.058-0.209-0.088-0.209-0.088c-0.247-0.088-0.642-0.162-1.124-0.219c-0.793,0.006-1.596,0.093-2.401,0.27  C34.843,9.673,31.019,14.958,31.184,20.8z" fill="#020202" fill-opacity="0.05" stroke-opacity="0.05"/>
-<path d="M31.906,20.306c1.205-0.809,2.291-1.462,3.018-1.84l9.377-10.04  c-0.146-0.063-0.233-0.098-0.233-0.098c-0.231-0.08-0.604-0.152-1.06-0.203c-0.751,0.006-1.51,0.087-2.27,0.253  C35.275,9.576,31.636,14.695,31.906,20.306z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M44.079,8.263c-0.21-0.073-0.55-0.137-0.962-0.186c-0.681,0.006-1.369,0.08-2.06,0.231  c-5.087,1.116-8.426,5.984-7.978,11.233c0.725-0.455,1.363-0.826,1.844-1.076l9.424-10.088C44.178,8.302,44.079,8.263,44.079,8.263z  " fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="40.9697" cy="9.21" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="12.2872">
-<stop offset="0" style="stop-color:#A7E722"/>
-<stop offset="0.6242" style="stop-color:#428C0F"/>
+<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"/>
 </radialGradient>
-<path d="M34.924,18.466l0.929,1.55c0,0,15.101-6.784,14.084-8.038c-0.513-0.631-0.577-0.656-1.237-1.263  c-1.985-1.815-4.172-2.531-4.172-2.531c-0.186-0.063-0.481-0.12-0.845-0.161c-0.596,0.004-1.2,0.068-1.806,0.201  c-4.591,1.009-7.57,5.501-6.963,10.257C34.916,18.477,34.921,18.47,34.924,18.466z" fill="url(#SVGID_2_)"/>
-<path d="M17.483,34.105c-0.988-0.139-2.007-0.119-3.027,0.105c-2.418,0.531-4.376,2.066-5.646,4.131  c-0.367,2.35-0.25,4.408-0.05,5.18c0,0,0.34,1.035,1.144,2.377c0.29,0.482,6.54-8.264,8.556-11.107L17.483,34.105z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M18.366,34.135c-0.989-0.139-2.008-0.117-3.029,0.105c-3.313,0.727-5.775,3.332-6.76,6.623  c-0.026,1.025,0.034,1.873,0.127,2.398c0.003,0.012,0.005,0.033,0.01,0.047c0,0,0.34,1.033,1.144,2.379  c0.3,0.498,6.981-8.887,8.75-11.383L18.366,34.135z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="437.4258" cy="-571.231" gradientTransform="matrix(0.2095 0.9787 -0.9682 0.2124 -629.4526 -270.6148)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="14.6187">
-<stop offset="0" style="stop-color:#A7E722"/>
-<stop offset="0.6242" style="stop-color:#428C0F"/>
-<stop offset="1" style="stop-color:#5CA617"/>
-</radialGradient>
-<path d="M11.202,47.738c0.616,0.74,0.646,0.953,1.295,1.523c1.194,1.055,9.301-13.611,9.301-13.611  l-2.683-1.719c-0.941-0.111-1.914-0.08-2.89,0.135c-4.777,1.049-7.806,5.869-6.87,10.832C9.749,45.686,10.349,46.709,11.202,47.738z  " fill="url(#SVGID_3_)"/>
-<path d="M49.937,11.978c-0.179-0.22-0.381-0.446-0.578-0.67l-13.944,7.959l0.438,0.749  C35.853,20.016,50.953,13.231,49.937,11.978z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="422.2881" x2="427.4786" y1="-610.9287" y2="-594.4409">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.6788" style="stop-color:#387300"/>
-<stop offset="1" style="stop-color:#66A00E"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M35.853,20.016l1.178,1.981c0.302,0.515,0.972,0.674,1.569,0.422l4.09-2.334l8.043-4.668  c0.632-0.363,0.878-1.119,0.549-1.686c0,0-0.333-0.501-1.349-1.751L35.853,20.016z" fill="url(#SVGID_4_)"/>
-<path d="M21.798,35.65l-0.725-0.473l-9.215,13.486c0.216,0.205,0.43,0.414,0.639,0.598  C13.691,50.316,21.798,35.65,21.798,35.65z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="439.6982" x2="451.5232" y1="-577.7549" y2="-564.7323">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.6788" style="stop-color:#387300"/>
-<stop offset="1" style="stop-color:#66A00E"/>
+<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"/>
+<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"/>
 </linearGradient>
-<path d="M12.498,49.262c1.193,1.049,1.686,1.369,1.686,1.369c0.567,0.367,1.363,0.17,1.781-0.441l7.9-11.605  c0.419-0.615,0.307-1.412-0.26-1.777l-1.808-1.156L12.498,49.262z" fill="url(#SVGID_5_)"/>
+<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)">
-<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"/>
+<polygon fill="none" points="7.52,0 0,0 0,30 7.52,30 22.48,30 30,30 30,0 22.48,0 "/>
+<path d="M7.52,30c-0.672,0-1.299-0.26-1.775-0.732l-0.053-0.04l-0.094-0.121c-0.045-0.045-0.131-0.151-0.205-0.268  l-0.057-0.101c-0.041-0.06-0.105-0.18-0.158-0.305l-0.023-0.059l-0.033-0.114c-0.035-0.101-0.066-0.199-0.086-0.302  c-0.033-0.155-0.049-0.324-0.049-0.492V2.534C4.986,1.137,6.123,0,7.52,0H22.48c1.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.52z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="15" x2="15" 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"/>
+</linearGradient>
+<path d="M24.014,27.467c0,0.847-0.688,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.846,0,1.533,0.687,1.533,1.534V27.467z" fill="url(#SVGID_1__)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="15" x2="15" 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"/>
+</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.516-1.151,1.15-1.151H22.48c0.633,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.326,1,22.48,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"/>
 </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"/>
+<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" x2="15" y1="3.3267" y2="21.3309">
+<stop offset="0" style="stop-color:#6E6E6E"/>
+<stop offset="1" style="stop-color:#333333"/>
+</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="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"/>
 </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"/>
+<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"/>
+</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"/>
+<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="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.488,0.663,1.488,1.476v2.805c0,0.813-0.668,1.475-1.488,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.609,0,1.105,0.488,1.105,1.09v2.805c0,0.602-0.496,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.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"/>
 </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"/>
+<path d="M17.051,26.376c0,0.391-0.322,0.707-0.719,0.707h-2.783c-0.396,0-0.719-0.316-0.719-0.707v-2.805  c0-0.391,0.322-0.708,0.719-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.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"/>
+</linearGradient>
+<path d="M14.365,26.316c-0.424,0-0.768-0.344-0.768-0.769v-1.149c0-0.424,0.344-0.769,0.768-0.769h1.15  c0.424,0,0.768,0.345,0.768,0.769v1.149c0,0.425-0.344,0.769-0.768,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"/>
 </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"/>
+<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.662,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.8452" y2="26.7065">
+<stop offset="0" style="stop-color:#231F20"/>
+<stop offset="1" style="stop-color:#6D6E70"/>
+</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.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"/>
+</linearGradient>
+<path d="M9.764,25.607c0,0.393-0.318,0.709-0.709,0.709H8.611c-0.391,0-0.707-0.316-0.707-0.709v-1.652  c0-0.392,0.316-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"/>
 </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>
+<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.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.8452" y2="26.7065">
+<stop offset="0" style="stop-color:#231F20"/>
+<stop offset="1" style="stop-color:#6D6E70"/>
+</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.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"/>
+</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_)"/>
+<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -316.6406 360.4753)" gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="676.2813" x2="676.2813" y1="693.022" y2="663.022">
+<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"/>
+</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_)"/>
+<radialGradient cx="751.8848" cy="1129.7896" gradientTransform="matrix(0.4708 0 0 -0.4709 -332.5567 547.6061)" gradientUnits="userSpaceOnUse" id="SVGID_17_" r="29.2379">
+<stop offset="0" style="stop-color:#96E9FA"/>
+<stop offset="0.15" style="stop-color:#96E9FA"/>
+<stop offset="0.7455" style="stop-color:#005BCC"/>
+<stop offset="1" style="stop-color:#0087D9"/>
+</radialGradient>
+<path d="M28.785,21.5c0,4.024-3.264,7.286-7.285,7.286c-4.025,0-7.285-3.262-7.285-7.286  c0-4.022,3.26-7.286,7.285-7.286C25.521,14.214,28.785,17.478,28.785,21.5z" fill="url(#SVGID_17_)"/>
+<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"/>
+<polygon fill-opacity="0.3" points="21.5,19.845 17.627,23.951 17.627,25.793 20.531,25.793 20.531,22.889 22.469,22.889 22.469,25.793   25.373,25.793 25.373,23.95 " stroke-opacity="0.3"/>
+<polygon fill="#FFFFFF" points="25.703,22.188 21.498,17.734 17.297,22.188 16.658,21.51 21.498,16.377 26.342,21.51 25.703,22.188   "/>
+<polygon fill="#FFFFFF" points="21.5,19.146 17.627,23.252 17.627,25.094 20.531,25.094 20.531,22.188 22.469,22.188 22.469,25.094   25.373,25.094 25.373,23.25 "/>
+<rect fill="none" height="30" width="30"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_mobile_work.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,90 +1,148 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5609 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="423.0967" x2="429.6524" y1="-578.646" y2="-582.9078">
+<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.1333" style="stop-color:#A7E722"/>
-<stop offset="0.6303" style="stop-color:#428C0F"/>
-<stop offset="1" style="stop-color:#5CA617"/>
-</linearGradient>
-<path d="M19.081,33.91c2.089-3.595,4.591-6.496,7.281-9.188c2.593-2.591,6.72-5.3,8.562-6.256l9.604-10.282  c-0.845-0.3-3.693-0.464-7.279,0.616c-3.586,1.083-11.736,6.303-16.979,11.547c-5.242,5.246-9.727,12.347-10.581,14.595  c-1.343,3.541-1.221,7.445-0.929,8.58c0,0,0.34,1.035,1.144,2.377C10.248,46.475,19.081,33.91,19.081,33.91z" fill="url(#SVGID_1_)"/>
-<path d="M31.184,20.8c1.488-1.036,2.87-1.882,3.74-2.334L44.271,8.46  c-0.132-0.058-0.209-0.088-0.209-0.088c-0.247-0.088-0.642-0.162-1.124-0.219c-0.793,0.006-1.596,0.093-2.401,0.27  C34.843,9.673,31.019,14.958,31.184,20.8z" fill="#020202" fill-opacity="0.05" stroke-opacity="0.05"/>
-<path d="M31.906,20.306c1.205-0.809,2.291-1.462,3.018-1.84l9.377-10.04  c-0.146-0.063-0.233-0.098-0.233-0.098c-0.231-0.08-0.604-0.152-1.06-0.203c-0.751,0.006-1.51,0.087-2.27,0.253  C35.275,9.576,31.636,14.695,31.906,20.306z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M44.079,8.263c-0.21-0.073-0.55-0.137-0.962-0.186c-0.681,0.006-1.369,0.08-2.06,0.231  c-5.087,1.116-8.426,5.984-7.978,11.233c0.725-0.455,1.363-0.826,1.844-1.076l9.424-10.088C44.178,8.302,44.079,8.263,44.079,8.263z  " fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="40.9697" cy="9.21" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="12.2872">
-<stop offset="0" style="stop-color:#A7E722"/>
-<stop offset="0.6242" style="stop-color:#428C0F"/>
+<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"/>
 </radialGradient>
-<path d="M34.924,18.466l0.929,1.55c0,0,15.101-6.784,14.084-8.038c-0.513-0.631-0.577-0.656-1.237-1.263  c-1.985-1.815-4.172-2.531-4.172-2.531c-0.186-0.063-0.481-0.12-0.845-0.161c-0.596,0.004-1.2,0.068-1.806,0.201  c-4.591,1.009-7.57,5.501-6.963,10.257C34.916,18.477,34.921,18.47,34.924,18.466z" fill="url(#SVGID_2_)"/>
-<path d="M17.483,34.105c-0.988-0.139-2.007-0.119-3.027,0.105c-2.418,0.531-4.376,2.066-5.646,4.131  c-0.367,2.35-0.25,4.408-0.05,5.18c0,0,0.34,1.035,1.144,2.377c0.29,0.482,6.54-8.264,8.556-11.107L17.483,34.105z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M18.366,34.135c-0.989-0.139-2.008-0.117-3.029,0.105c-3.313,0.727-5.775,3.332-6.76,6.623  c-0.026,1.025,0.034,1.873,0.127,2.398c0.003,0.012,0.005,0.033,0.01,0.047c0,0,0.34,1.033,1.144,2.379  c0.3,0.498,6.981-8.887,8.75-11.383L18.366,34.135z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="437.4258" cy="-571.231" gradientTransform="matrix(0.2095 0.9787 -0.9682 0.2124 -629.4526 -270.6148)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="14.6187">
-<stop offset="0" style="stop-color:#A7E722"/>
-<stop offset="0.6242" style="stop-color:#428C0F"/>
-<stop offset="1" style="stop-color:#5CA617"/>
-</radialGradient>
-<path d="M11.202,47.738c0.616,0.74,0.646,0.953,1.295,1.523c1.194,1.055,9.301-13.611,9.301-13.611  l-2.683-1.719c-0.941-0.111-1.914-0.08-2.89,0.135c-4.777,1.049-7.806,5.869-6.87,10.832C9.749,45.686,10.349,46.709,11.202,47.738z  " fill="url(#SVGID_3_)"/>
-<path d="M49.937,11.978c-0.179-0.22-0.381-0.446-0.578-0.67l-13.944,7.959l0.438,0.749  C35.853,20.016,50.953,13.231,49.937,11.978z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="422.2881" x2="427.4786" y1="-610.9287" y2="-594.4409">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.6788" style="stop-color:#387300"/>
-<stop offset="1" style="stop-color:#66A00E"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M35.853,20.016l1.178,1.981c0.302,0.515,0.972,0.674,1.569,0.422l4.09-2.334l8.043-4.668  c0.632-0.363,0.878-1.119,0.549-1.686c0,0-0.333-0.501-1.349-1.751L35.853,20.016z" fill="url(#SVGID_4_)"/>
-<path d="M21.798,35.65l-0.725-0.473l-9.215,13.486c0.216,0.205,0.43,0.414,0.639,0.598  C13.691,50.316,21.798,35.65,21.798,35.65z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="439.6982" x2="451.5232" y1="-577.7549" y2="-564.7323">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.6788" style="stop-color:#387300"/>
-<stop offset="1" style="stop-color:#66A00E"/>
+<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"/>
+<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"/>
 </linearGradient>
-<path d="M12.498,49.262c1.193,1.049,1.686,1.369,1.686,1.369c0.567,0.367,1.363,0.17,1.781-0.441l7.9-11.605  c0.419-0.615,0.307-1.412-0.26-1.777l-1.808-1.156L12.498,49.262z" fill="url(#SVGID_5_)"/>
+<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)">
-<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"/>
+<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.041-0.041l-0.055-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.534v11.236  C28.023,15.142,30,18.164,30,21.5c0,3.895-2.619,7.257-6.385,8.225C23.258,29.905,22.869,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"/>
+</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"/>
+</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"/>
 </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"/>
+<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">
+<stop offset="0" style="stop-color:#6E6E6E"/>
+<stop offset="1" style="stop-color:#333333"/>
+</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"/>
 </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"/>
+<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"/>
+</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"/>
+<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="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"/>
 </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"/>
+<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"/>
+</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"/>
 </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"/>
+<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.445c0.813,0,1.475,0.66,1.475,1.474v1.652c0,0.815-0.662,1.476-1.475,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"/>
+</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.445  c0.602,0,1.09,0.49,1.09,1.092v1.652c0,0.603-0.488,1.093-1.09,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"/>
+</linearGradient>
+<path d="M9.762,25.607c0,0.393-0.316,0.709-0.707,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.445c0.391,0,0.707,0.315,0.707,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"/>
 </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>
+<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"/>
+</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"/>
+</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"/>
+<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -353.9307 360.4753)" gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="750.8613" x2="750.8613" y1="693.022" y2="663.022">
+<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"/>
+</linearGradient>
+<path d="M21.5,29c-4.137,0-7.5-3.364-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.636,25.635,29,21.5,29L21.5,29z" fill="url(#SVGID_16_)"/>
+<radialGradient cx="750.7217" cy="689.9976" gradientTransform="matrix(0.5 0 0 -0.5 -353.9307 360.5867)" gradientUnits="userSpaceOnUse" id="SVGID_17_" r="27.5326">
+<stop offset="0" style="stop-color:#96E9FA"/>
+<stop offset="0.15" style="stop-color:#96E9FA"/>
+<stop offset="0.7455" style="stop-color:#005BCC"/>
+<stop offset="1" style="stop-color:#0087D9"/>
+</radialGradient>
+<path d="M28.785,21.5c0,4.024-3.264,7.286-7.285,7.286c-4.025,0-7.287-3.262-7.287-7.286  c0-4.023,3.262-7.286,7.287-7.286C25.521,14.214,28.785,17.477,28.785,21.5z" fill="url(#SVGID_17_)"/>
+<path d="M22.516,20.029v-2.035H17.43v8.138h4.07h1.016h3.053v-6.103H22.516z M21.5,24.098h-3.053V23.08H21.5V24.098z   M21.5,22.063h-3.053v-1.018H21.5V22.063z M18.447,20.029v-1.018H21.5v1.018H18.447z M24.551,24.098h-2.035V23.08h2.035V24.098z   M24.551,22.063h-2.035v-1.018h2.035V22.063z" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M22.516,19.329v-2.034H17.43v8.137h4.07h1.016h3.053v-6.103H22.516z M21.5,23.397h-3.053v-1.017H21.5V23.397  z M21.5,21.363h-3.053v-1.018H21.5V21.363z M18.447,19.329v-1.018H21.5v1.018H18.447z M24.551,23.397h-2.035v-1.017h2.035V23.397z   M24.551,21.363h-2.035v-1.018h2.035V21.363z" fill="#FFFFFF"/>
+<rect fill-opacity="0.3" height="6.103" stroke-opacity="0.3" width="1.018" x="22.516" y="19.329"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_muted.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,141 +1,263 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
 <rect fill="none" height="60" width="60"/>
-<path d="M45.756,20.456L45.756,20.456c1.752-3.447,1.191-7.768-1.692-10.65 c-2.882-2.882-7.203-3.443-10.649-1.692c0,0,0,0,0,0c-0.002,0.001-0.002,0.001-0.004,0.002c-0.84,0.427-1.629,0.987-2.333,1.69 l-8.224,8.225c-0.238-0.238-0.627-0.238-0.866,0l-0.433,0.433c0,0,0,0,0-0.001l-1.731,1.732c-0.238,0.238-0.238,0.627,0,0.866 l-3.896,3.896c-3.585,3.586-3.585,9.401,0,12.987c2.313,2.312,5.55,3.124,8.52,2.456c0.143-0.033,0.285-0.065,0.426-0.104 c0.119-0.034,0.239-0.069,0.357-0.108c0.032-0.011,0.065-0.019,0.098-0.029v3.061c-0.707,0.068-1.224,0.319-1.224,1.104v4.27h-4.298 c-0.132,0-0.26,0.016-0.384,0.042c-0.021,0.004-0.039,0.013-0.061,0.018c-0.105,0.026-0.206,0.059-0.302,0.102 c-0.01,0.004-0.018,0.01-0.027,0.014c-0.619,0.289-1.05,0.906-1.05,1.627v0.402c0,0.065,0.003,0.131,0.011,0.265 c0.006,0.122,0.015,0.3,0.027,0.592h0h18.288h0.001c0.025-0.608,0.039-0.73,0.039-0.856v-0.402c0-0.721-0.432-1.338-1.051-1.626 c-0.01-0.005-0.018-0.011-0.027-0.015c-0.096-0.043-0.197-0.074-0.301-0.101c-0.021-0.005-0.041-0.014-0.061-0.019 c-0.125-0.025-0.253-0.041-0.385-0.041h-4.298l-0.001-4.27c0-0.785-0.517-1.036-1.223-1.104v-5.362l3.809-3.809 c0.239,0.237,0.628,0.237,0.867,0l2.164-2.164c0.237-0.238,0.237-0.628,0-0.866c0,0,8.499-8.524,8.632-8.675c0,0,0,0,0-0.001 c0.514-0.584,0.943-1.215,1.283-1.882C45.754,20.458,45.756,20.457,45.756,20.456z" fill-opacity="0.1" stroke-opacity="0.1"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="30.23" x2="43.21" y1="10.69" y2="23.68">
-<stop offset="0" stop-color="#A8B1B3"/>
-<stop offset="0.38" stop-color="#FFFFFF"/>
-<stop offset="0.71" stop-color="#686E70"/>
-<stop offset="1" stop-color="#A6B0B3"/>
+<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.3818" style="stop-color:#FFFFFF"/>
+<stop offset="0.7091" style="stop-color:#686E70"/>
+<stop offset="1" style="stop-color:#A6B0B3"/>
+</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"/>
+<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,11.821-4.509,16.33,0c4.51,4.511,4.508,11.821,0,16.329l1.632-1.633C52.198,17.202,52.199,9.893,47.688,5.382z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
+<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="267.0962" x2="290.1899" y1="493.0283" y2="493.0283">
+<stop offset="0" style="stop-color:#4D4D4D"/>
+<stop offset="0.3818" style="stop-color:#7A7A7A"/>
+<stop offset="0.7091" style="stop-color:#1A1A1A"/>
+<stop offset="1" style="stop-color:#4D4D4D"/>
+</linearGradient>
+<path d="M21.019,15.725l-8.709,8.707c-4.51,4.51-4.51,11.821,0,16.33c4.508,4.51,11.821,4.51,16.33,0  l8.708-8.709L21.019,15.725z" fill="url(#SVGID_2_)"/>
+<path d="M16.664,36.407c-4.51-4.509-8.318-8.01-3.81-12.52l-0.544,0.544c-4.51,4.51-4.51,11.821,0,16.33  c4.508,4.51,11.821,4.51,16.33,0l0.543-0.545C24.674,44.728,21.173,40.916,16.664,36.407z" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M15.031,38.04c-4.508-4.508-6.685-9.643-2.177-14.152l-0.544,0.544c-4.51,4.51-4.51,11.821,0,16.33  c4.508,4.51,11.821,4.51,16.33,0l0.543-0.545C24.674,44.728,19.541,42.55,15.031,38.04z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M13.398,39.674C8.889,35.164,7.8,28.941,12.31,24.432l0,0c-4.51,4.51-4.51,11.821,0,16.33  c4.508,4.51,11.821,4.51,16.33,0l0,0C24.131,45.271,17.909,44.183,13.398,39.674z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="266.3257" x2="290.9585" y1="483.7915" y2="483.7915">
+<stop offset="0" style="stop-color:#4D4D4D"/>
+<stop offset="0.3818" style="stop-color:#7A7A7A"/>
+<stop offset="0.7091" style="stop-color:#1A1A1A"/>
+<stop offset="1" style="stop-color:#4D4D4D"/>
 </linearGradient>
-<path d="M44.064,9.805c-3.584-3.586-9.4-3.586-12.986,0l-8.225,8.225L35.84,31.017l8.225-8.226 C47.65,19.205,47.651,13.391,44.064,9.805z" fill="url(#SVGID_1)"/>
-<path d="M44.064,9.805c-3.584-3.586-9.4-3.586-12.986,0l-1.299,1.298 c3.586-3.586,7.669-1.854,11.256,1.731c3.586,3.587,5.316,7.669,1.73,11.255l1.299-1.298C47.65,19.205,47.651,13.391,44.064,9.805z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M44.064,9.805c-3.584-3.586-9.4-3.586-12.986,0l-1.299,1.298 c3.586-3.586,9.401-3.586,12.986,0c3.587,3.587,3.586,9.4,0,12.986l1.299-1.298C47.65,19.205,47.651,13.391,44.064,9.805z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="16.16" x2="29.14" y1="24.76" y2="37.75">
-<stop offset="0" stop-color="#4D4D4D"/>
-<stop offset="0.38" stop-color="#7A7A7A"/>
-<stop offset="0.71" stop-color="#1A1A1A"/>
-<stop offset="1" stop-color="#4D4D4D"/>
-</linearGradient>
-<path d="M22.854,18.03l-6.927,6.926c-3.585,3.586-3.585,9.402,0,12.988 c3.586,3.586,9.4,3.586,12.987,0l6.926-6.926L22.854,18.03z" fill="url(#SVGID_2)"/>
-<path d="M19.39,34.479c-3.585-3.585-6.617-6.369-3.03-9.956l-0.433,0.433 c-3.585,3.586-3.585,9.401,0,12.987c3.586,3.587,9.4,3.587,12.987,0l0.433-0.433C25.76,41.096,22.977,38.066,19.39,34.479z" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M18.092,35.777c-3.586-3.585-5.318-7.668-1.732-11.255l-0.433,0.433 c-3.585,3.586-3.585,9.401,0,12.987c3.586,3.587,9.4,3.587,12.987,0l0.433-0.433C25.76,41.096,21.678,39.365,18.092,35.777z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M16.793,37.076c-3.586-3.585-4.452-8.534-0.867-12.121l0,0 c-3.585,3.586-3.585,9.401,0,12.987c3.586,3.587,9.4,3.587,12.987,0l0,0C25.327,41.529,20.379,40.664,16.793,37.076z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="20.92" x2="34.77" y1="19.14" y2="32.99">
-<stop offset="0" stop-color="#4D4D4D"/>
-<stop offset="0.38" stop-color="#7A7A7A"/>
-<stop offset="0.71" stop-color="#1A1A1A"/>
-<stop offset="1" stop-color="#4D4D4D"/>
+<path d="M34.626,35.862c-0.301,0.3-0.79,0.3-1.09,0L17.208,19.534c-0.299-0.3-0.299-0.789,0-1.089  l2.721-2.721c0.301-0.3,0.791-0.3,1.09,0l16.328,16.328c0.3,0.3,0.3,0.79,0,1.089L34.626,35.862z" fill="url(#SVGID_3_)"/>
+<path d="M37.347,32.053L21.019,15.725c-0.3-0.3-0.79-0.3-1.09,0l-0.544,0.544  c0.301-0.299,0.79-0.299,1.09,0l16.328,16.328c0.3,0.3,0.3,0.79,0,1.089l0.544-0.544C37.647,32.843,37.647,32.353,37.347,32.053z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
+<rect fill-opacity="0.1" height="0.77" stroke-opacity="0.1" transform="matrix(0.7071 0.7071 -0.7071 0.7071 27.5824 -8.4675)" width="23.093" x="12.465" y="28.674"/>
+<rect fill="#FFFFFF" fill-opacity="0.2" height="0.771" stroke-opacity="0.2" transform="matrix(0.7071 0.7071 -0.7071 0.7071 25.326 -13.911)" width="23.091" x="17.909" y="23.23"/>
+<rect fill-opacity="0.2" height="0.769" stroke-opacity="0.2" transform="matrix(0.7071 0.7071 -0.7071 0.7071 27.3549 -9.0122)" width="23.091" x="13.01" y="28.13"/>
+<rect fill-opacity="0.4" height="0.769" stroke-opacity="0.4" transform="matrix(0.7071 0.7071 -0.7071 0.7071 27.131 -9.5558)" width="23.092" x="13.554" y="27.586"/>
+<path d="M22.652,15.179c0.301-0.299,0.301-0.786,0-1.087l-1.089,1.087C21.864,15.481,22.351,15.48,22.652,15.179z" fill="#FFFFFF"/>
+<path d="M27.005,10.824c0.301-0.3,0.301-0.787,0-1.088l-1.087,1.088C26.217,11.126,26.705,11.125,27.005,10.824z" fill="#FFFFFF"/>
+<path d="M31.361,6.471c0.291-0.291,0.293-0.753,0.021-1.055c-0.19,0.167-0.384,0.329-0.566,0.511l-0.544,0.544  C30.571,6.771,31.059,6.771,31.361,6.471z" fill="#FFFFFF"/>
+<circle cx="27.006" cy="15.181" fill="#FFFFFF" r="0.769"/>
+<circle cx="31.359" cy="10.825" fill="#FFFFFF" r="0.77"/>
+<circle cx="35.715" cy="6.471" fill="#FFFFFF" r="0.77"/>
+<circle cx="27.549" cy="20.078" fill="#FFFFFF" r="0.769"/>
+<circle cx="31.905" cy="15.724" fill="#FFFFFF" r="0.77"/>
+<circle cx="36.26" cy="11.369" fill="#FFFFFF" r="0.769"/>
+<path d="M37.891,30.42c-0.299,0.301-0.299,0.788,0,1.089l1.089-1.089C38.68,30.119,38.193,30.119,37.891,30.42z" fill="#FFFFFF"/>
+<path d="M42.246,26.065c-0.301,0.301-0.301,0.788,0,1.089l1.088-1.089C43.033,25.765,42.547,25.766,42.246,26.065z" fill="#FFFFFF"/>
+<path d="M47.657,21.689c-0.302-0.272-0.766-0.27-1.057,0.021c-0.301,0.3-0.301,0.788,0,1.088l0.544-0.544  C47.326,22.073,47.49,21.881,47.657,21.689z" fill="#FFFFFF"/>
+<circle cx="37.892" cy="26.065" fill="#FFFFFF" r="0.77"/>
+<circle cx="42.246" cy="21.71" fill="#FFFFFF" r="0.77"/>
+<circle cx="46.6" cy="17.357" fill="#FFFFFF" r="0.77"/>
+<circle cx="32.992" cy="25.521" fill="#FFFFFF" r="0.769"/>
+<circle cx="37.347" cy="21.167" fill="#FFFFFF" r="0.77"/>
+<circle cx="41.702" cy="16.813" fill="#FFFFFF" r="0.769"/>
+<circle cx="32.448" cy="20.622" fill="#FFFFFF" r="0.77"/>
+<circle cx="36.803" cy="16.269" fill="#FFFFFF" r="0.769"/>
+<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.7152" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
-<path d="M33.676,34.047c-0.239,0.237-0.627,0.237-0.867,0L19.823,21.06 c-0.238-0.238-0.238-0.627,0-0.866l2.164-2.164c0.239-0.238,0.628-0.238,0.866,0L35.84,31.017c0.238,0.238,0.238,0.628,0,0.866 L33.676,34.047z" fill="url(#SVGID_3)"/>
-<path d="M35.84,31.017L22.854,18.03c-0.238-0.238-0.627-0.238-0.866,0 l-0.433,0.433c0.239-0.238,0.627-0.238,0.866,0l12.987,12.986c0.238,0.238,0.238,0.627,0,0.865l0.433-0.432 C36.078,31.645,36.078,31.255,35.84,31.017z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
-<rect fill-opacity="0.1" height="0.611" stroke-opacity="0.1" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 22.8299 66.726)" width="18.365" x="16.052" y="28.329"/>
-<rect fill="#FFFFFF" fill-opacity="0.2" height="0.613" stroke-opacity="0.2" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 33.2816 62.3972)" width="18.366" x="20.38" y="24"/>
-<rect fill-opacity="0.2" height="0.613" stroke-opacity="0.2" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 23.8754 66.2943)" width="18.365" x="16.485" y="27.896"/>
-<rect fill-opacity="0.4" height="0.613" stroke-opacity="0.4" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 24.9208 65.8606)" width="18.365" x="16.918" y="27.463"/>
-<path d="M24.152,17.597c0.239-0.239,0.239-0.626,0-0.866l-0.866,0.866 C23.525,17.836,23.913,17.836,24.152,17.597z" fill="#FFFFFF"/>
-<path d="M27.614,14.133c0.24-0.239,0.24-0.625,0-0.866l-0.865,0.866 C26.988,14.373,27.376,14.373,27.614,14.133z" fill="#FFFFFF"/>
-<path d="M31.078,10.671c0.231-0.231,0.234-0.6,0.018-0.839c-0.152,0.133-0.307,0.262-0.451,0.406 l-0.433,0.433C30.451,10.909,30.838,10.909,31.078,10.671z" fill="#FFFFFF"/>
-<circle cx="27.614" cy="17.597" fill="#FFFFFF" r="0.612"/>
-<circle cx="31.078" cy="14.133" fill="#FFFFFF" r="0.612"/>
-<circle cx="34.541" cy="10.671" fill="#FFFFFF" r="0.612"/>
-<circle cx="28.047" cy="21.492" fill="#FFFFFF" r="0.612"/>
-<circle cx="31.511" cy="18.03" fill="#FFFFFF" r="0.612"/>
-<circle cx="34.975" cy="14.566" fill="#FFFFFF" r="0.612"/>
-<path d="M36.273,29.718c-0.24,0.24-0.24,0.626,0,0.866l0.865-0.866 C36.898,29.479,36.512,29.479,36.273,29.718z" fill="#FFFFFF"/>
-<path d="M39.735,26.255c-0.239,0.239-0.239,0.626,0,0.866l0.866-0.866 C40.362,26.015,39.975,26.016,39.735,26.255z" fill="#FFFFFF"/>
-<path d="M44.039,22.774c-0.24-0.217-0.608-0.215-0.84,0.017c-0.24,0.239-0.24,0.626,0,0.866l0.432-0.433 C43.775,23.079,43.906,22.926,44.039,22.774z" fill="#FFFFFF"/>
-<circle cx="36.273" cy="26.255" fill="#FFFFFF" r="0.612"/>
-<circle cx="39.735" cy="22.792" fill="#FFFFFF" r="0.612"/>
-<circle cx="43.199" cy="19.328" fill="#FFFFFF" r="0.612"/>
-<circle cx="32.376" cy="25.821" fill="#FFFFFF" r="0.612"/>
-<circle cx="35.84" cy="22.358" fill="#FFFFFF" r="0.612"/>
-<circle cx="39.303" cy="18.896" fill="#FFFFFF" r="0.612"/>
-<circle cx="31.943" cy="21.925" fill="#FFFFFF" r="0.612"/>
-<circle cx="35.407" cy="18.463" fill="#FFFFFF" r="0.612"/>
-<circle cx="38.869" cy="15" fill="#FFFFFF" r="0.612"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="33.64" x2="23.87" y1="7.71" y2="17.49">
-<stop offset="0" stop-color="#4D4D4D"/>
-<stop offset="0.2" stop-color="#504E4E"/>
-<stop offset="0.72" stop-color="#000000"/>
-<stop offset="1" stop-color="#000000"/>
+<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.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.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.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.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.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.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.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.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.7152" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
-<path d="M24.585,17.164c0.239-0.239,0.239-0.626,0-0.866l-0.866,0.866 C23.958,17.404,24.346,17.403,24.585,17.164z" fill="url(#SVGID_4)"/>
-<path d="M28.047,13.7c0.239-0.238,0.239-0.626,0-0.865L27.182,13.7 C27.421,13.94,27.809,13.94,28.047,13.7z" fill="url(#SVGID_4)"/>
-<path d="M31.511,10.238c0.231-0.231,0.234-0.599,0.018-0.839c-0.151,0.133-0.306,0.262-0.45,0.407 l-0.434,0.433C30.884,10.477,31.271,10.477,31.511,10.238z" fill="url(#SVGID_4)"/>
-<circle cx="28.047" cy="17.164" fill="url(#SVGID_4)" r="0.612"/>
-<circle cx="31.511" cy="13.7" fill="url(#SVGID_4)" r="0.612"/>
-<circle cx="34.975" cy="10.238" fill="url(#SVGID_4)" r="0.612"/>
-<circle cx="28.48" cy="21.06" fill="url(#SVGID_4)" r="0.612"/>
-<circle cx="31.943" cy="17.597" fill="url(#SVGID_4)" r="0.612"/>
-<circle cx="35.407" cy="14.133" fill="url(#SVGID_4)" r="0.612"/>
-<path d="M36.705,29.285c-0.238,0.239-0.238,0.626,0,0.866l0.866-0.866 C37.332,29.045,36.945,29.046,36.705,29.285z" fill="url(#SVGID_4)"/>
-<path d="M40.168,25.822c-0.239,0.239-0.239,0.626,0,0.866l0.866-0.866 C40.795,25.582,40.408,25.583,40.168,25.822z" fill="url(#SVGID_4)"/>
-<path d="M44.473,22.342c-0.241-0.217-0.609-0.215-0.842,0.017c-0.238,0.239-0.238,0.626,0,0.865 l0.434-0.433C44.209,22.646,44.34,22.493,44.473,22.342z" fill="url(#SVGID_4)"/>
-<circle cx="36.705" cy="25.821" fill="url(#SVGID_4)" r="0.612"/>
-<circle cx="40.168" cy="22.358" fill="url(#SVGID_4)" r="0.612"/>
-<circle cx="43.631" cy="18.896" fill="url(#SVGID_4)" r="0.612"/>
-<circle cx="32.809" cy="25.389" fill="url(#SVGID_4)" r="0.612"/>
-<circle cx="36.273" cy="21.925" fill="url(#SVGID_4)" r="0.612"/>
-<circle cx="39.735" cy="18.463" fill="url(#SVGID_4)" r="0.612"/>
-<circle cx="32.376" cy="21.492" fill="url(#SVGID_4)" r="0.612"/>
-<circle cx="35.84" cy="18.03" fill="url(#SVGID_4)" r="0.612"/>
-<circle cx="39.303" cy="14.566" fill="url(#SVGID_4)" r="0.612"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_25" x1="30.48" x2="23.8" y1="46.86" y2="46.86">
-<stop offset="0" stop-color="#4D4D4D"/>
-<stop offset="0.25" stop-color="#1A1A1A"/>
-<stop offset="0.62" stop-color="#7A7A7A"/>
-<stop offset="1" stop-color="#4D4D4D"/>
+<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.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.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.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.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.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.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.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.7152" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
-<path d="M30.225,48.788c-0.001,0.966-0.778,1.75-1.738,1.75H25.84c-0.959,0-1.737-0.784-1.737-1.749 v-4.468c0-0.966,0.778-1.13,1.737-1.13l2.646,0.001c0.96-0.001,1.737,0.163,1.737,1.129L30.225,48.788z" fill="url(#SVGID_25)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_26" x1="17.98" x2="36.35" y1="50.12" y2="50.12">
-<stop offset="0" stop-color="#4D4D4D"/>
-<stop offset="0.38" stop-color="#999999"/>
-<stop offset="0.75" stop-color="#1A1A1A"/>
-<stop offset="1" stop-color="#4D4D4D"/>
+<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.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.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.7152" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#000000"/>
+</linearGradient>
+<circle cx="41.702" cy="11.369" fill="url(#SVGID_24_)" r="0.769"/>
+<linearGradient gradientTransform="matrix(1 0 0 1 -374.1758 -502.9102)" gradientUnits="userSpaceOnUse" id="SVGID_25_" x1="404.7837" x2="396.38" y1="554.8911" y2="554.8911">
+<stop offset="0" style="stop-color:#4D4D4D"/>
+<stop offset="0.2545" style="stop-color:#1A1A1A"/>
+<stop offset="0.6182" style="stop-color:#7A7A7A"/>
+<stop offset="1" style="stop-color:#4D4D4D"/>
 </linearGradient>
-<path d="M36.309,51.652c0.025-0.609,0.039-0.73,0.039-0.856v-0.401c0-0.996-0.816-1.803-1.824-1.803 H19.805c-1.007,0-1.824,0.807-1.824,1.803v0.401c0,0.126,0.013,0.247,0.039,0.856H36.309z" fill="url(#SVGID_26)"/>
-<path d="M18.093,49.793h18.142c-0.08-0.225-0.203-0.427-0.361-0.602 H18.455C18.297,49.366,18.174,49.568,18.093,49.793z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M17.991,51.051c0.006,0.123,0.016,0.304,0.028,0.602h18.289 c0.013-0.298,0.021-0.479,0.028-0.602H17.991z" fill-opacity="0.35" stroke-opacity="0.35"/>
-<path d="M18.455,49.191h17.418c-0.333-0.366-0.811-0.6-1.35-0.6 H19.805C19.267,48.591,18.788,48.825,18.455,49.191z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M29.995,44.564v-0.243c0-0.966-0.72-1.13-1.607-1.129l-2.449-0.001 c-0.887,0-1.607,0.164-1.607,1.13v0.243c0.312,0.572,0.911,0.965,1.607,0.965h2.449C29.084,45.529,29.683,45.137,29.995,44.564z" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M29.613,43.693V43.46c-0.295-0.211-0.73-0.268-1.225-0.268l-2.449-0.001 c-0.494,0-0.93,0.058-1.224,0.269v0.233c0,0.676,0.549,1.225,1.224,1.225h2.449C29.063,44.918,29.613,44.369,29.613,43.693z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M28.914,37.943l1.312-1.312V25.939c0-0.237-0.049-0.461-0.13-0.668 l-1.038-1.038c-0.208-0.082-0.432-0.13-0.668-0.13H25.94c-1.012,0-1.836,0.824-1.836,1.836v14.535 C25.865,40.147,27.55,39.306,28.914,37.943z" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M28.914,37.943l0.7-0.699V25.939c0-0.676-0.55-1.224-1.224-1.224H25.94 c-0.675,0-1.224,0.548-1.224,1.224v14.393C26.253,39.936,27.709,39.146,28.914,37.943z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_27" x1="27.16" x2="27.16" y1="25.51" y2="44.04">
-<stop offset="0" stop-color="#4D4D4D"/>
-<stop offset="0.38" stop-color="#7A7A7A"/>
-<stop offset="0.71" stop-color="#1A1A1A"/>
-<stop offset="1" stop-color="#4D4D4D"/>
+<path d="M30.288,54.397c-0.001,1.216-0.979,2.203-2.185,2.203h-3.328c-1.207,0-2.185-0.987-2.185-2.2v-5.618  c0-1.215,0.978-1.42,2.185-1.42h3.327c1.207,0,2.184,0.205,2.184,1.42L30.288,54.397z" fill="url(#SVGID_25_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_26_" x1="14.8921" x2="37.9844" y1="56.0747" y2="56.0747">
+<stop offset="0" style="stop-color:#4D4D4D"/>
+<stop offset="0.3818" style="stop-color:#999999"/>
+<stop offset="0.7515" style="stop-color:#1A1A1A"/>
+<stop offset="1" style="stop-color:#4D4D4D"/>
 </linearGradient>
-<path d="M29,43.693c0,0.338-0.273,0.612-0.612,0.612h-2.449c-0.338,0-0.612-0.274-0.612-0.612V25.939 c0-0.338,0.274-0.612,0.612-0.612h2.449c0.339,0,0.612,0.274,0.612,0.612V43.693z" fill="url(#SVGID_27)"/>
-<path d="M27.164,28.778c-1.688,0-3.061-1.374-3.061-3.061 c0-1.688,1.373-3.061,3.061-3.061c1.687,0,3.061,1.373,3.061,3.061C30.225,27.404,28.851,28.778,27.164,28.778L27.164,28.778z" fill-opacity="0.35" stroke-opacity="0.35"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_28" x1="27.16" x2="27.16" y1="23.31" y2="28.1">
-<stop offset="0" stop-color="#9D9B9C"/>
-<stop offset="0.15" stop-color="#D6D4D4"/>
-<stop offset="0.7" stop-color="#555557"/>
-<stop offset="0.99" stop-color="#575757"/>
-<stop offset="1" stop-color="#575757"/>
+<path d="M37.937,58c0.032-0.767,0.048-0.92,0.048-1.078v-0.506c0-1.251-1.026-2.267-2.292-2.267H17.186  c-1.266,0-2.293,1.016-2.293,2.267v0.506c0,0.158,0.019,0.312,0.049,1.078H37.937z" fill="url(#SVGID_26_)"/>
+<path d="M15.032,55.661h22.811c-0.101-0.282-0.255-0.537-0.453-0.755H15.488  C15.29,55.124,15.135,55.379,15.032,55.661z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M14.904,57.243c0.009,0.154,0.02,0.381,0.035,0.757h22.997c0.017-0.376,0.028-0.603,0.037-0.757H14.904z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M15.488,54.906H37.39c-0.42-0.462-1.021-0.757-1.698-0.757H17.186  C16.509,54.149,15.908,54.444,15.488,54.906z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M30,49.086v-0.304c0-1.215-0.906-1.42-2.022-1.42h-3.079c-1.115,0-2.02,0.205-2.02,1.42v0.304  c0.391,0.721,1.147,1.216,2.02,1.216h3.079C28.854,50.302,29.606,49.807,30,49.086z" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M29.518,47.992v-0.294c-0.371-0.265-0.918-0.336-1.54-0.336h-3.079c-0.62,0-1.169,0.071-1.539,0.336v0.294  c0,0.85,0.69,1.54,1.539,1.54h3.079C28.827,49.532,29.518,48.842,29.518,47.992z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M28.64,40.762l1.648-1.649V25.67c0-0.298-0.062-0.58-0.164-0.84l-1.305-1.307  c-0.261-0.104-0.542-0.163-0.841-0.163h-3.079c-1.273,0-2.309,1.036-2.309,2.31v18.275C24.807,43.534,26.924,42.476,28.64,40.762z" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M28.64,40.762l0.878-0.879V25.67c0-0.85-0.691-1.54-1.54-1.54h-3.079c-0.849,0-1.539,0.69-1.539,1.54v18.097  C25.293,43.269,27.125,42.275,28.64,40.762z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_27_" x1="26.4395" x2="26.4395" y1="25.1289" y2="48.4234">
+<stop offset="0" style="stop-color:#4D4D4D"/>
+<stop offset="0.3818" style="stop-color:#7A7A7A"/>
+<stop offset="0.7091" style="stop-color:#1A1A1A"/>
+<stop offset="1" style="stop-color:#4D4D4D"/>
 </linearGradient>
-<circle cx="27.164" cy="25.717" fill="url(#SVGID_28)" r="2.449"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_29" x1="27.16" x2="27.16" y1="24.52" y2="26.91">
-<stop offset="0" stop-color="#646464"/>
-<stop offset="1" stop-color="#EBEBEB"/>
+<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.9879" style="stop-color:#575757"/>
+<stop offset="1" style="stop-color:#575757"/>
 </linearGradient>
-<path d="M27.164,26.941c-0.676,0-1.225-0.549-1.225-1.224s0.549-1.225,1.225-1.225 c0.674,0,1.224,0.549,1.224,1.225S27.838,26.941,27.164,26.941L27.164,26.941z" fill="url(#SVGID_29)"/>
-<rect fill-opacity="0.2" height="0.612" stroke-opacity="0.2" width="6.122" x="24.103" y="47.979"/>
-<rect fill-opacity="0.1" height="0.611" stroke-opacity="0.1" width="6.122" x="24.103" y="47.367"/>
-<rect fill="none" height="59.996" width="59.996"/>
+<circle cx="26.439" cy="25.39" fill="url(#SVGID_28_)" r="3.079"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_29_" x1="26.4385" x2="26.4385" y1="23.8794" y2="26.8862">
+<stop offset="0" style="stop-color:#646464"/>
+<stop offset="1" style="stop-color:#EBEBEB"/>
+</linearGradient>
+<path d="M26.439,26.93c-0.851,0-1.541-0.691-1.541-1.54c0-0.85,0.69-1.54,1.541-1.54  c0.847,0,1.539,0.69,1.539,1.54C27.978,26.238,27.287,26.93,26.439,26.93L26.439,26.93z" fill="url(#SVGID_29_)"/>
+<rect fill-opacity="0.2" height="0.769" stroke-opacity="0.2" width="7.697" x="22.59" y="53.381"/>
+<rect fill-opacity="0.1" height="0.77" stroke-opacity="0.1" width="7.697" x="22.59" y="52.611"/>
+<rect fill="none" height="60" width="60"/>
 </g>
 <g transform="matrix(2 0 0 2 0 0)">
-<linearGradient gradientTransform="matrix(1 0 0 -1 -257 -316)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="261.2295" x2="282.7705" y1="-330.6934" y2="-330.6934">
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_1_)" points="24.702,25.229 4.229,5.254 5.299,4.158 25.771,24.133 "/>
-<rect fill="none" height="30" width="30.001"/>
+<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"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_pager.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,49 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5609 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="423.0967" x2="429.6524" y1="-578.646" y2="-582.9078">
+<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.1333" style="stop-color:#A7E722"/>
-<stop offset="0.6303" style="stop-color:#428C0F"/>
-<stop offset="1" style="stop-color:#5CA617"/>
-</linearGradient>
-<path d="M19.081,33.91c2.089-3.595,4.591-6.496,7.281-9.188c2.593-2.591,6.72-5.3,8.562-6.256l9.604-10.282  c-0.845-0.3-3.693-0.464-7.279,0.616c-3.586,1.083-11.736,6.303-16.979,11.547c-5.242,5.246-9.727,12.347-10.581,14.595  c-1.343,3.541-1.221,7.445-0.929,8.58c0,0,0.34,1.035,1.144,2.377C10.248,46.475,19.081,33.91,19.081,33.91z" fill="url(#SVGID_1_)"/>
-<path d="M31.184,20.8c1.488-1.036,2.87-1.882,3.74-2.334L44.271,8.46  c-0.132-0.058-0.209-0.088-0.209-0.088c-0.247-0.088-0.642-0.162-1.124-0.219c-0.793,0.006-1.596,0.093-2.401,0.27  C34.843,9.673,31.019,14.958,31.184,20.8z" fill="#020202" fill-opacity="0.05" stroke-opacity="0.05"/>
-<path d="M31.906,20.306c1.205-0.809,2.291-1.462,3.018-1.84l9.377-10.04  c-0.146-0.063-0.233-0.098-0.233-0.098c-0.231-0.08-0.604-0.152-1.06-0.203c-0.751,0.006-1.51,0.087-2.27,0.253  C35.275,9.576,31.636,14.695,31.906,20.306z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M44.079,8.263c-0.21-0.073-0.55-0.137-0.962-0.186c-0.681,0.006-1.369,0.08-2.06,0.231  c-5.087,1.116-8.426,5.984-7.978,11.233c0.725-0.455,1.363-0.826,1.844-1.076l9.424-10.088C44.178,8.302,44.079,8.263,44.079,8.263z  " fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="40.9697" cy="9.21" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="12.2872">
-<stop offset="0" style="stop-color:#A7E722"/>
-<stop offset="0.6242" style="stop-color:#428C0F"/>
+<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"/>
 </radialGradient>
-<path d="M34.924,18.466l0.929,1.55c0,0,15.101-6.784,14.084-8.038c-0.513-0.631-0.577-0.656-1.237-1.263  c-1.985-1.815-4.172-2.531-4.172-2.531c-0.186-0.063-0.481-0.12-0.845-0.161c-0.596,0.004-1.2,0.068-1.806,0.201  c-4.591,1.009-7.57,5.501-6.963,10.257C34.916,18.477,34.921,18.47,34.924,18.466z" fill="url(#SVGID_2_)"/>
-<path d="M17.483,34.105c-0.988-0.139-2.007-0.119-3.027,0.105c-2.418,0.531-4.376,2.066-5.646,4.131  c-0.367,2.35-0.25,4.408-0.05,5.18c0,0,0.34,1.035,1.144,2.377c0.29,0.482,6.54-8.264,8.556-11.107L17.483,34.105z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M18.366,34.135c-0.989-0.139-2.008-0.117-3.029,0.105c-3.313,0.727-5.775,3.332-6.76,6.623  c-0.026,1.025,0.034,1.873,0.127,2.398c0.003,0.012,0.005,0.033,0.01,0.047c0,0,0.34,1.033,1.144,2.379  c0.3,0.498,6.981-8.887,8.75-11.383L18.366,34.135z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="437.4258" cy="-571.231" gradientTransform="matrix(0.2095 0.9787 -0.9682 0.2124 -629.4526 -270.6148)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="14.6187">
-<stop offset="0" style="stop-color:#A7E722"/>
-<stop offset="0.6242" style="stop-color:#428C0F"/>
-<stop offset="1" style="stop-color:#5CA617"/>
-</radialGradient>
-<path d="M11.202,47.738c0.616,0.74,0.646,0.953,1.295,1.523c1.194,1.055,9.301-13.611,9.301-13.611  l-2.683-1.719c-0.941-0.111-1.914-0.08-2.89,0.135c-4.777,1.049-7.806,5.869-6.87,10.832C9.749,45.686,10.349,46.709,11.202,47.738z  " fill="url(#SVGID_3_)"/>
-<path d="M49.937,11.978c-0.179-0.22-0.381-0.446-0.578-0.67l-13.944,7.959l0.438,0.749  C35.853,20.016,50.953,13.231,49.937,11.978z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="422.2881" x2="427.4786" y1="-610.9287" y2="-594.4409">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.6788" style="stop-color:#387300"/>
-<stop offset="1" style="stop-color:#66A00E"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M35.853,20.016l1.178,1.981c0.302,0.515,0.972,0.674,1.569,0.422l4.09-2.334l8.043-4.668  c0.632-0.363,0.878-1.119,0.549-1.686c0,0-0.333-0.501-1.349-1.751L35.853,20.016z" fill="url(#SVGID_4_)"/>
-<path d="M21.798,35.65l-0.725-0.473l-9.215,13.486c0.216,0.205,0.43,0.414,0.639,0.598  C13.691,50.316,21.798,35.65,21.798,35.65z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="439.6982" x2="451.5232" y1="-577.7549" y2="-564.7323">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.6788" style="stop-color:#387300"/>
-<stop offset="1" style="stop-color:#66A00E"/>
+<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"/>
+<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"/>
 </linearGradient>
-<path d="M12.498,49.262c1.193,1.049,1.686,1.369,1.686,1.369c0.567,0.367,1.363,0.17,1.781-0.441l7.9-11.605  c0.419-0.615,0.307-1.412-0.26-1.777l-1.808-1.156L12.498,49.262z" fill="url(#SVGID_5_)"/>
+<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(0.5 0 0 0.5 30 30)">
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="161" x2="161" y1="-138.1694" y2="-153.478">
+<g transform="matrix(1 0 0 1 30 30)">
+<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"/>
@@ -51,73 +41,73 @@
 <stop offset="0.9636" style="stop-color:#ADB3B5"/>
 <stop offset="1" style="stop-color:#595C5E"/>
 </linearGradient>
-<path d="M50.816,42.857c0,1.353-1.099,2.451-2.45,2.451H11.632c-1.352,0-2.45-1.099-2.45-2.451V17.142  c0-1.352,1.098-2.45,2.45-2.45h36.734c1.352,0,2.45,1.098,2.45,2.45V42.857z" style="fill:url(#SVGID_1__);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="161" x2="161" y1="-138.1694" y2="-153.4771">
+<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"/>
 </linearGradient>
-<path d="M48.368,14.694H11.632c-1.352,0-2.45,1.098-2.45,2.45v25.713c0,1.353,1.098,2.451,2.45,2.451  c-1.012,0-1.836-0.824-1.836-1.838v-0.613V17.756v-0.614c0-1.012,0.824-1.836,1.836-1.836h36.734c1.016,0,1.836,0.824,1.836,1.836  v0.614v25.102v0.613c0,1.014-0.82,1.838-1.836,1.838c1.352,0,2.45-1.099,2.45-2.451V17.142  C50.816,15.792,49.718,14.694,48.368,14.694z" style="fill:url(#SVGID_2__);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="161.001" x2="161.001" y1="-140.4063" y2="-147.2606">
+<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"/>
 </linearGradient>
-<path d="M13.692,32.43c-0.676,0-1.226-0.556-1.226-1.238  V20.022c0-0.686,0.55-1.24,1.226-1.24h32.623c0.676,0,1.226,0.554,1.226,1.24v11.169c0,0.683-0.55,1.238-1.226,1.238H13.692z" style="opacity:0.4;fill:url(#SVGID_3__);enable-background:new    ;"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="161" x2="161" y1="-140.7256" y2="-147.0228">
+<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">
 <stop offset="0" style="stop-color:#171717"/>
 <stop offset="1" style="stop-color:#2E2E2E"/>
 </linearGradient>
-<path d="M46.918,31.191c0,0.343-0.273,0.621-0.613,0.621H13.692c-0.34,0-0.614-0.278-0.614-0.621  V20.022c0-0.344,0.274-0.622,0.614-0.622h32.615c0.34,0,0.613,0.278,0.613,0.622v11.169H46.918z" style="fill:url(#SVGID_4__);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="161" x2="161" y1="-130.8403" y2="-150.5097">
+<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"/>
 </linearGradient>
-<rect height="11.169" style="fill:url(#SVGID_5__);" width="32.615" x="13.692" y="20.022"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="160.999" x2="160.999" y1="-134.8784" y2="-148.12">
+<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"/>
 </linearGradient>
-<polygon points="13.692,24.85 46.305,23.804 46.305,20.006 13.692,20.006 " style="fill:url(#SVGID_6_);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="162.9805" x2="162.9805" y1="-148.5093" y2="-151.0052">
+<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.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
-<path d="M29.606,39.962c-0.676,0-1.222-0.548-1.222-1.224  v-2.45c0-0.674,0.546-1.224,1.222-1.224h8.708c0.676,0,1.226,0.55,1.226,1.224v2.45c0,0.676-0.55,1.224-1.226,1.224H29.606z" style="opacity:0.8;fill:url(#SVGID_7_);enable-background:new    ;"/>
-<path d="M38.313,39.962h-8.708c-0.676,0-1.222-0.548-1.222-1.224  v0.611c0,0.676,0.546,1.225,1.222,1.225h8.708c0.676,0,1.226-0.549,1.226-1.225v-0.611C39.54,39.414,38.988,39.962,38.313,39.962z" style="opacity:0.4;fill:#231F20;enable-background:new    ;"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="162.9785" x2="162.9785" y1="-148.8169" y2="-150.7223">
+<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"/>
+<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"/>
 </linearGradient>
-<path d="M38.926,38.738c0,0.338-0.273,0.611-0.613,0.611h-8.708c-0.34,0-0.614-0.273-0.614-0.611  v-2.45c0-0.338,0.274-0.612,0.614-0.612h8.708c0.34,0,0.613,0.274,0.613,0.612V38.738z" style="fill:url(#SVGID_8_);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="155.625" x2="155.625" y1="-148.5093" y2="-151.0052">
+<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.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
-<path d="M14.894,39.962c-0.672,0-1.222-0.548-1.222-1.224  v-2.45c0-0.674,0.55-1.224,1.222-1.224h8.71c0.676,0,1.222,0.55,1.222,1.224v2.45c0,0.676-0.546,1.224-1.222,1.224H14.894z" style="opacity:0.8;fill:url(#SVGID_9_);enable-background:new    ;"/>
-<path d="M23.606,39.962h-8.712c-0.672,0-1.222-0.548-1.222-1.224  v0.611c0,0.676,0.55,1.225,1.222,1.225h8.71c0.676,0,1.222-0.549,1.222-1.225v-0.611C24.828,39.414,24.282,39.962,23.606,39.962z" style="opacity:0.4;fill:#231F20;enable-background:new    ;"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="155.625" x2="155.625" y1="-148.8169" y2="-150.7223">
+<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"/>
+<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"/>
 </linearGradient>
-<path d="M24.218,38.738c0,0.338-0.274,0.611-0.614,0.611h-8.71c-0.336,0-0.61-0.273-0.61-0.611v-2.45  c0-0.338,0.274-0.612,0.61-0.612h8.71c0.34,0,0.614,0.274,0.614,0.612V38.738z" style="fill:url(#SVGID_10_);"/>
-<rect height="60" style="fill:none;" width="60"/>
+<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"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_service.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,77 +1,73 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5609 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="423.0967" x2="429.6527" y1="-578.646" y2="-582.908">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.6061" style="stop-color:#154EBD"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
-</linearGradient>
-<path d="M19.081,33.911c2.089-3.597,4.591-6.497,7.281-9.189c2.593-2.591,6.72-5.3,8.562-6.256l9.604-10.282  c-0.845-0.3-3.693-0.464-7.279,0.616c-3.586,1.083-11.736,6.303-16.979,11.547c-5.242,5.246-9.727,12.347-10.581,14.595  c-1.343,3.541-1.221,7.445-0.929,8.581c0,0,0.34,1.034,1.144,2.377C10.248,46.476,19.081,33.911,19.081,33.911z" fill="url(#SVGID_1_)"/>
-<path d="M31.184,20.8c1.488-1.036,2.87-1.882,3.74-2.334L44.271,8.46  c-0.132-0.058-0.209-0.088-0.209-0.088c-0.247-0.088-0.642-0.162-1.124-0.219c-0.793,0.006-1.596,0.093-2.401,0.27  C34.843,9.673,31.019,14.958,31.184,20.8z" fill="#020202" fill-opacity="0.05" stroke-opacity="0.05"/>
-<path d="M31.906,20.306c1.205-0.809,2.291-1.462,3.018-1.84l9.377-10.04  c-0.146-0.063-0.233-0.098-0.233-0.098c-0.231-0.08-0.604-0.152-1.06-0.203c-0.751,0.006-1.51,0.087-2.27,0.253  C35.275,9.576,31.636,14.695,31.906,20.306z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M44.079,8.263c-0.21-0.073-0.55-0.137-0.962-0.186c-0.681,0.006-1.369,0.08-2.06,0.231  c-5.087,1.116-8.426,5.984-7.978,11.233c0.725-0.455,1.363-0.826,1.844-1.076l9.424-10.088C44.178,8.302,44.079,8.263,44.079,8.263z  " fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="43.3906" cy="8.9175" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="18.5073">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.6061" style="stop-color:#154EBD"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+<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"/>
 </radialGradient>
-<path d="M34.924,18.466l0.929,1.55c0,0,15.101-6.784,14.084-8.038c-0.513-0.631-0.577-0.656-1.237-1.263  c-1.985-1.815-4.172-2.531-4.172-2.531c-0.186-0.063-0.481-0.12-0.845-0.161c-0.596,0.004-1.2,0.068-1.806,0.201  c-4.591,1.009-7.57,5.501-6.963,10.257C34.916,18.477,34.921,18.47,34.924,18.466z" fill="url(#SVGID_2_)"/>
-<path d="M17.483,34.106c-0.988-0.14-2.007-0.119-3.027,0.105c-2.418,0.53-4.376,2.066-5.646,4.131  c-0.367,2.35-0.25,4.407-0.05,5.18c0,0,0.34,1.034,1.144,2.377c0.29,0.482,6.54-8.264,8.556-11.107L17.483,34.106z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M18.366,34.136c-0.989-0.14-2.008-0.118-3.029,0.105c-3.313,0.727-5.775,3.332-6.76,6.623  c-0.026,1.025,0.034,1.872,0.127,2.397c0.003,0.013,0.005,0.034,0.01,0.048c0,0,0.34,1.033,1.144,2.379  c0.3,0.498,6.981-8.888,8.75-11.384L18.366,34.136z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="437.4258" cy="-571.231" gradientTransform="matrix(0.2095 0.9787 -0.9682 0.2124 -629.4526 -270.6148)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="14.6198">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.6061" style="stop-color:#154EBD"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
-</radialGradient>
-<path d="M11.202,47.738c0.616,0.74,0.646,0.954,1.295,1.524c1.194,1.055,9.301-13.612,9.301-13.612  l-2.683-1.719c-0.941-0.111-1.914-0.079-2.89,0.136c-4.777,1.048-7.806,5.868-6.87,10.832C9.749,45.686,10.349,46.71,11.202,47.738z  " fill="url(#SVGID_3_)"/>
-<path d="M49.937,11.978c-0.179-0.22-0.381-0.446-0.578-0.67l-13.944,7.959l0.438,0.749  C35.853,20.016,50.953,13.231,49.937,11.978z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="422.2881" x2="427.4786" y1="-610.9287" y2="-594.4409">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.8121" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M35.853,20.016l1.178,1.981c0.302,0.515,0.972,0.674,1.569,0.422l4.09-2.334l8.043-4.668  c0.632-0.363,0.878-1.119,0.549-1.686c0,0-0.333-0.501-1.349-1.751L35.853,20.016z" fill="url(#SVGID_4_)"/>
-<path d="M21.798,35.65l-0.725-0.472l-9.215,13.486c0.216,0.204,0.43,0.414,0.639,0.598  C13.691,50.317,21.798,35.65,21.798,35.65z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="439.6982" x2="451.5232" y1="-577.7549" y2="-564.7323">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.8121" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+<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"/>
 </linearGradient>
-<path d="M12.498,49.262c1.193,1.05,1.686,1.37,1.686,1.37c0.567,0.367,1.363,0.169,1.781-0.442l7.9-11.605  c0.419-0.614,0.307-1.411-0.26-1.777l-1.808-1.156L12.498,49.262z" fill="url(#SVGID_5_)"/>
+<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"/>
+</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"/>
+</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(0.5 0 0 0.5 30 30)">
-<path d="M30,54.705C16.376,54.705,5.294,43.623,5.294,30  C5.294,16.376,16.376,5.294,30,5.294c13.623,0,24.705,11.083,24.705,24.706C54.705,43.623,43.623,54.705,30,54.705L30,54.705z" style="opacity:0.6;enable-background:new    ;"/>
-<radialGradient cx="2.7217" cy="-242.9165" gradientTransform="matrix(0.618 0 0 -0.618 28.3176 -128.0637)" gradientUnits="userSpaceOnUse" id="SVGID_1__" r="48.9069">
+<g transform="matrix(1 0 0 1 30 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"/>
 </radialGradient>
-<circle cx="30" cy="30" r="22.941" style="fill:url(#SVGID_1__);"/>
-<path d="M52.122,28.744c-0.509-8.961-6.312-16.677-14.788-19.661l-1.032,0.169  l-5.995-1.147l-7.474,4.456l-0.281,1.878h-4.336l1.714,2.914l-4.643,3.787l-1.082,4.675l3.834,6.795l3.914-0.799l1.429,1.229  l1.117,0.111l0.738,2.883l-0.974,2.527l3.552,9.086h3.623l3.592-2.9v-1.185l0.947-1.47l0.783-0.4  c-0.199,0.303-0.512,0.998-0.512,0.998c-0.033,0.236,0.51,4.862,2.104,4.5c1.211-0.273,5.533-8.303,5.615-9.066  c0.164-1.51-0.658-2.134-1.162-2.37l-0.562-0.265l-2.58,2.587c-0.276,0.021-0.526,0.067-0.751,0.134v-2.147l2.802-2.737l1.426-4.595  l2.173-1.769l-0.477-0.866l1.639-1.578l-0.916-1.669l0.697,0.084l4.082,9.138l0.836-0.666c-0.025-0.447-0.074-0.887-0.125-1.329  L52.122,28.744z M30.275,18.466l-0.341-0.911h2.049l0.997,2.243h-1.484v-1.333H30.275z M37.035,22.983l1.637,2.388l0.111,0.286  l-1.677-1.013l-0.401-1.445L37.035,22.983z M39.496,27.155l0.494,0.494l-0.639,0.143l-0.145-0.177L39.496,27.155z M26.695,11.093  l1.041,1.611l-1.183,0.362l-0.462-0.263L26.695,11.093z" style="opacity:0.3;enable-background:new    ;"/>
-<path d="M30,7.059C17.331,7.059,7.059,17.331,7.059,30  c0,12.674,10.272,22.941,22.941,22.941c12.674,0,22.941-10.268,22.941-22.941C52.941,17.331,42.674,7.059,30,7.059z M30,51.176  C18.323,51.176,8.823,41.677,8.823,30c0-11.677,9.5-21.177,21.177-21.177c11.677,0,21.176,9.5,21.176,21.177  C51.176,41.677,41.677,51.176,30,51.176z" style="opacity:0.3;fill:url(#SVGID_2__);enable-background:new    ;"/>
-<radialGradient cx="182.1514" cy="-162.9028" gradientTransform="matrix(1.7647 0 0 -1.7647 -290.1173 -274.2362)" gradientUnits="userSpaceOnUse" id="SVGID_3__" r="15.4155">
+<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"/>
+</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"/>
 </radialGradient>
-<path d="M42.431,36.555l-2.388,2.391c0,0-1.443,0-1.511,0.572c-0.032,0.246-0.111,1.313-0.354,1.863  c-0.48,0.332-1.054,1.434-1.054,1.434s-0.298,2.129,1.296,1.768C40.004,44.224,44.883,37.707,42.431,36.555z" style="fill:url(#SVGID_3__);"/>
-<radialGradient cx="182.1514" cy="-162.9023" gradientTransform="matrix(1.7647 0 0 -1.7647 -290.1173 -274.2362)" gradientUnits="userSpaceOnUse" id="SVGID_4__" r="17.8322">
+<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"/>
 </radialGradient>
-<path d="M37.041,9.916c-0.392,0.148-0.66,0.25-0.66,0.25L30.48,9.037l-2.894,1.811l1.523,2.356  l-2.663,0.819l-1.435-0.819l0.504-1.431l-1.871,1.295l-0.333,2.255h-3.554l1.314,2.238l-4.996,4.073l-0.94,4.066l1.855,3.591  L18.104,30l3.914-0.799l1.43,1.228l1.299,0.127l1.414,5.53l-0.941,2.446l2.079,4.595l0.585,1.908h3.623l2.048-1.108l1.543-1.793  v-2.169l2.936-1.498v-3.213l1.16-2.208l2.59-2.329l0.619-2.7l-3.387,0.755l-0.891-1.085l0.633-1.013l-2.404-1.454l-1.025-3.687  l1.776-1.158l1.636,2.388l0.613,1.572l1.228,1.229l1.435,0.75l1.594-0.258l1.77-1.703l-1.246-2.273l-1.568,0.409L41.146,20.8  l1.349-0.94l4.23,0.512v1.505l3.681,7.585l0.837-0.669C50.746,20.045,44.965,12.704,37.041,9.916z M35.119,20.169l-1.932,0.512  h-2.573v-1.333h-2.46l-1.946,0.514l-2.966-0.821l-0.821-1.535l4.096-0.921h4.098L30,14.945h2.049l1.14,2.561l1.933,0.678v1.985  H35.119z M39.523,16.79l-3.482-0.616v-1.228l1.741-0.41l0.512-0.614l1.229,1.023L39.523,16.79L39.523,16.79z" style="fill:url(#SVGID_4__);"/>
-<rect height="60" style="fill:none;" width="60"/>
-<defs>
-<linearGradient gradientTransform="matrix(1.7647 0 0 -1.7647 -290.1173 -274.2362)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="181.4004" x2="181.4004" y1="-159.4634" y2="-185.5335">
-<stop offset="0" style="stop-color:#31A7F8"/>
-<stop offset="0.497" style="stop-color:#1E74DC"/>
-<stop offset="1" style="stop-color:#C8E4EB"/>
-</linearGradient>
-</defs>
+<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>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_callduration.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_callduration.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,112 +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(0.2118 0.9773 -0.9773 0.2118 -634.5609 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="423.0967" x2="429.6527" y1="-578.646" y2="-582.908">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.6061" style="stop-color:#154EBD"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
-</linearGradient>
-<path d="M19.081,33.911c2.089-3.597,4.591-6.497,7.281-9.189c2.593-2.591,6.72-5.3,8.562-6.256l9.604-10.282  c-0.845-0.3-3.693-0.464-7.279,0.616c-3.586,1.083-11.736,6.303-16.979,11.547c-5.242,5.246-9.727,12.347-10.581,14.595  c-1.343,3.541-1.221,7.445-0.929,8.581c0,0,0.34,1.034,1.144,2.377C10.248,46.476,19.081,33.911,19.081,33.911z" fill="url(#SVGID_1_)"/>
-<path d="M31.184,20.8c1.488-1.036,2.87-1.882,3.74-2.334L44.271,8.46  c-0.132-0.058-0.209-0.088-0.209-0.088c-0.247-0.088-0.642-0.162-1.124-0.219c-0.793,0.006-1.596,0.093-2.401,0.27  C34.843,9.673,31.019,14.958,31.184,20.8z" fill="#020202" fill-opacity="0.05" stroke-opacity="0.05"/>
-<path d="M31.906,20.306c1.205-0.809,2.291-1.462,3.018-1.84l9.377-10.04  c-0.146-0.063-0.233-0.098-0.233-0.098c-0.231-0.08-0.604-0.152-1.06-0.203c-0.751,0.006-1.51,0.087-2.27,0.253  C35.275,9.576,31.636,14.695,31.906,20.306z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M44.079,8.263c-0.21-0.073-0.55-0.137-0.962-0.186c-0.681,0.006-1.369,0.08-2.06,0.231  c-5.087,1.116-8.426,5.984-7.978,11.233c0.725-0.455,1.363-0.826,1.844-1.076l9.424-10.088C44.178,8.302,44.079,8.263,44.079,8.263z  " fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="43.3906" cy="8.9175" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="18.5073">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.6061" style="stop-color:#154EBD"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
-</radialGradient>
-<path d="M34.924,18.466l0.929,1.55c0,0,15.101-6.784,14.084-8.038c-0.513-0.631-0.577-0.656-1.237-1.263  c-1.985-1.815-4.172-2.531-4.172-2.531c-0.186-0.063-0.481-0.12-0.845-0.161c-0.596,0.004-1.2,0.068-1.806,0.201  c-4.591,1.009-7.57,5.501-6.963,10.257C34.916,18.477,34.921,18.47,34.924,18.466z" fill="url(#SVGID_2_)"/>
-<path d="M17.483,34.106c-0.988-0.14-2.007-0.119-3.027,0.105c-2.418,0.53-4.376,2.066-5.646,4.131  c-0.367,2.35-0.25,4.407-0.05,5.18c0,0,0.34,1.034,1.144,2.377c0.29,0.482,6.54-8.264,8.556-11.107L17.483,34.106z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M18.366,34.136c-0.989-0.14-2.008-0.118-3.029,0.105c-3.313,0.727-5.775,3.332-6.76,6.623  c-0.026,1.025,0.034,1.872,0.127,2.397c0.003,0.013,0.005,0.034,0.01,0.048c0,0,0.34,1.033,1.144,2.379  c0.3,0.498,6.981-8.888,8.75-11.384L18.366,34.136z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="437.4258" cy="-571.231" gradientTransform="matrix(0.2095 0.9787 -0.9682 0.2124 -629.4526 -270.6148)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="14.6198">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.6061" style="stop-color:#154EBD"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
-</radialGradient>
-<path d="M11.202,47.738c0.616,0.74,0.646,0.954,1.295,1.524c1.194,1.055,9.301-13.612,9.301-13.612  l-2.683-1.719c-0.941-0.111-1.914-0.079-2.89,0.136c-4.777,1.048-7.806,5.868-6.87,10.832C9.749,45.686,10.349,46.71,11.202,47.738z  " fill="url(#SVGID_3_)"/>
-<path d="M49.937,11.978c-0.179-0.22-0.381-0.446-0.578-0.67l-13.944,7.959l0.438,0.749  C35.853,20.016,50.953,13.231,49.937,11.978z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="422.2881" x2="427.4786" y1="-610.9287" y2="-594.4409">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.8121" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
-</linearGradient>
-<path d="M35.853,20.016l1.178,1.981c0.302,0.515,0.972,0.674,1.569,0.422l4.09-2.334l8.043-4.668  c0.632-0.363,0.878-1.119,0.549-1.686c0,0-0.333-0.501-1.349-1.751L35.853,20.016z" fill="url(#SVGID_4_)"/>
-<path d="M21.798,35.65l-0.725-0.472l-9.215,13.486c0.216,0.204,0.43,0.414,0.639,0.598  C13.691,50.317,21.798,35.65,21.798,35.65z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="439.6982" x2="451.5232" y1="-577.7549" y2="-564.7323">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.8121" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
-</linearGradient>
-<path d="M12.498,49.262c1.193,1.05,1.686,1.37,1.686,1.37c0.567,0.367,1.363,0.169,1.781-0.442l7.9-11.605  c0.419-0.614,0.307-1.411-0.26-1.777l-1.808-1.156L12.498,49.262z" fill="url(#SVGID_5_)"/>
-<rect fill="none" height="60" width="60"/>
-</g>
-<g transform="matrix(0.5 0 0 0.5 30 30)">
-<rect fill="none" height="60" width="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="30" x2="30" y1="7.65" y2="51.22">
-<stop offset="0" stop-color="#BDC2C4"/>
-<stop offset="1" stop-color="#454B4D"/>
-</linearGradient>
-<path d="M29.998,51.425c-12.154,0-22.04-9.886-22.04-22.039c0-12.152,9.886-22.04,22.04-22.04 c12.153,0,22.039,9.887,22.039,22.04C52.037,41.539,42.151,51.425,29.998,51.425L29.998,51.425z" fill="url(#SVGID_1)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="30" x2="30" y1="8.27" y2="50.72">
-<stop offset="0" stop-color="#D1D7D9"/>
-<stop offset="0.24" stop-color="#BDC2C4"/>
-<stop offset="1" stop-color="#697173"/>
-</linearGradient>
-<circle cx="29.998" cy="29.385" fill="url(#SVGID_2)" r="21.427"/>
-<path d="M30.745,30.133c7.176,0,14.106-0.448,20.667-1.272 c-0.281-11.59-9.756-20.902-21.414-20.902c-11.59,0-21.027,9.205-21.41,20.702C15.587,29.61,23.023,30.133,30.745,30.133z" fill="#F1F1F2" fill-opacity="0.35" stroke-opacity="0.35"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="8.78" x2="51.53" y1="18.83" y2="18.83">
-<stop offset="0" stop-color="#C0C5C7"/>
-<stop offset="0.2" stop-color="#F7FDFF"/>
-<stop offset="0.8" stop-color="#F7FDFF"/>
-<stop offset="1" stop-color="#CDD3D5"/>
-</linearGradient>
-<path d="M29.998,8.571c11.73,0,21.255,9.429,21.42,21.121c0-0.102,0.007-0.204,0.007-0.306 c0-11.834-9.593-21.427-21.427-21.427S8.571,17.552,8.571,29.386c0,0.103,0.006,0.204,0.007,0.306 C8.743,18,18.267,8.571,29.998,8.571z" fill="url(#SVGID_3)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="30" x2="30" y1="48.67" y2="10.48">
-<stop offset="0" stop-color="#BDC2C4"/>
-<stop offset="1" stop-color="#454B4D"/>
-</linearGradient>
-<path d="M29.998,48.363c-10.465,0-18.979-8.513-18.979-18.978s8.513-18.979,18.979-18.979 c10.465,0,18.979,8.514,18.979,18.979S40.463,48.363,29.998,48.363L29.998,48.363z" fill="url(#SVGID_4)"/>
-<radialGradient cx="30" cy="62.44" gradientUnits="userSpaceOnUse" id="SVGID_5" r="66.73">
-<stop offset="0" stop-color="#FAF9F9"/>
-<stop offset="0.4" stop-color="#FAF9F9"/>
-<stop offset="1" stop-color="#808184"/>
-</radialGradient>
-<path d="M29.998,47.752c-10.126,0-18.366-8.238-18.366-18.366c0-10.126,8.24-18.366,18.366-18.366 c10.127,0,18.365,8.24,18.365,18.366C48.363,39.514,40.125,47.752,29.998,47.752L29.998,47.752z" fill="url(#SVGID_5)"/>
-<path d="M29.998,30.697c6.058,0,11.84-0.509,17.139-1.427 c-0.063-9.398-7.725-17.026-17.139-17.026c-9.413,0-17.076,7.627-17.14,17.026C18.159,30.188,23.94,30.697,29.998,30.697z" fill="#FFFFFF" fill-opacity="0.7" stroke-opacity="0.7"/>
-<rect fill="#404041" height="3.673" width="1.224" x="29.386" y="12.694"/>
-<rect fill="#404041" height="3.673" width="1.224" x="29.386" y="43.305"/>
-<rect fill="#404041" height="1.224" width="3.673" x="43.467" y="29.224"/>
-<rect fill="#404041" height="1.224" width="3.673" x="12.856" y="29.224"/>
-<rect fill="#404041" height="2.965" transform="matrix(-0.5007 -0.8656 0.8656 -0.5007 45.7079 70.7357)" width="0.989" x="42.76" y="20.703"/>
-<rect fill="#404041" height="2.965" transform="matrix(-0.4998 -0.8661 0.8661 -0.4998 -7.3583 70.732)" width="0.988" x="16.251" y="36.008"/>
-<rect fill="#404041" height="2.964" transform="matrix(-0.8659 -0.5002 0.5002 -0.8659 61.9565 49.7736)" width="0.988" x="37.155" y="15.101"/>
-<rect fill="#404041" height="2.964" transform="matrix(-0.8658 -0.5004 0.5004 -0.8658 20.127 91.5796)" width="0.988" x="21.85" y="41.609"/>
-<rect fill="#404041" height="2.965" transform="matrix(-0.8661 0.4998 -0.4998 -0.8661 49.9881 19.7728)" width="0.988" x="21.852" y="15.098"/>
-<rect fill="#404041" height="2.964" transform="matrix(-0.8662 0.4998 -0.4998 -0.8662 91.7979 61.5927)" width="0.989" x="37.157" y="41.606"/>
-<rect fill="#404041" height="2.964" transform="matrix(-0.5 0.866 -0.866 -0.5 44.3279 18.7772)" width="0.988" x="16.249" y="20.704"/>
-<rect fill="#404041" height="2.964" transform="matrix(-0.499 0.8666 -0.8666 -0.499 97.3271 18.7183)" width="0.988" x="42.759" y="36.01"/>
-<path d="M31.497,30.254c-0.06-0.294-0.207-0.555-0.409-0.761 l2.109-6.953l-1.758-0.533l-2.19,7.218c-0.381,0.216-0.661,0.586-0.751,1.029h-4.01v0.613h4.011c0.017,0.08,0.041,0.158,0.069,0.234 l-9.448,9.445l0.794,0.795l9.414-9.412c0.202,0.1,0.428,0.16,0.67,0.16c0.74,0,1.357-0.524,1.499-1.225h14.418v-0.611H31.497z" fill="#231F20" fill-opacity="0.2" stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6" x1="32.4" x2="29.66" y1="21.15" y2="30.18">
-<stop offset="0" stop-color="#58595B"/>
-<stop offset="1" stop-color="#231F20"/>
-</linearGradient>
-<polygon fill="url(#SVGID_6)" points="33.197,21.673 31.439,21.14 28.773,29.927 30.531,30.46 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7" x1="19.58" x2="30.34" y1="40.02" y2="29.25">
-<stop offset="0" stop-color="#58595B"/>
-<stop offset="1" stop-color="#231F20"/>
-</linearGradient>
-<polygon fill="url(#SVGID_7)" points="30.752,29.638 29.958,28.843 19.12,39.68 19.914,40.475 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8" x1="35.2" x2="35.2" y1="29.3" y2="30.19">
-<stop offset="0" stop-color="#FF0000"/>
-<stop offset="1" stop-color="#A8000B"/>
-</linearGradient>
-<path d="M45.915,29.386H31.497c-0.142-0.699-0.759-1.225-1.499-1.225c-0.742,0-1.359,0.526-1.5,1.225 h-4.011v0.612h4.011c0.141,0.699,0.758,1.225,1.5,1.225c0.74,0,1.357-0.525,1.499-1.225h14.418V29.386z" fill="url(#SVGID_8)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9" x1="30" x2="30" y1="28.72" y2="30.61">
-<stop offset="0" stop-color="#FFE2D9"/>
-<stop offset="1" stop-color="#F23D3D"/>
-</linearGradient>
-<circle cx="29.998" cy="29.691" fill="url(#SVGID_9)" r="0.918"/>
-<rect fill="none" height="59.996" width="59.996"/>
-</g>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_camera.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_camera.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_camera.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,112 +1,116 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<g>
 <rect fill="none" height="60" width="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="10.92" x2="18.86" y1="15.93" y2="15.93">
-<stop offset="0" stop-color="#F0F0F0"/>
-<stop offset="0.48" stop-color="#7C8284"/>
-<stop offset="1" stop-color="#E6E6E6"/>
+<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="1" style="stop-color:#E6E6E6"/>
 </linearGradient>
-<path d="M18.913,18.095v-3.06c0-0.723-0.533-1.261-1.187-1.261H12.14 c-0.651,0-1.187,0.538-1.187,1.261v3.06H18.913z" fill="url(#SVGID_1)"/>
-<radialGradient cx="14.93" cy="14.71" gradientUnits="userSpaceOnUse" id="SVGID_2" r="2.91">
-<stop offset="0" stop-color="#F2F2F2"/>
-<stop offset="1" stop-color="#D9D9D9"/>
+<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_)"/>
+<radialGradient cx="-92.3433" cy="12.1729" gradientTransform="matrix(0.931 0 0 -0.9385 97.5175 22.6984)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="3.803">
+<stop offset="0" style="stop-color:#F2F2F2"/>
+<stop offset="1" style="stop-color:#D9D9D9"/>
 </radialGradient>
-<path d="M17.726,13.774H12.14c-0.651,0-1.187,0.538-1.187,1.261v0.617 c0-0.723,0.534-1.261,1.187-1.261h5.586c0.653,0,1.187,0.538,1.187,1.261v-0.617C18.913,14.313,18.379,13.774,17.726,13.774z" fill="url(#SVGID_2)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="30" x2="30" y1="14.08" y2="46.27">
-<stop offset="0" stop-color="#D0D4D5"/>
-<stop offset="0.12" stop-color="#D0D4D5"/>
-<stop offset="0.42" stop-color="#B0B6B8"/>
-<stop offset="0.42" stop-color="#9FA6A8"/>
-<stop offset="0.66" stop-color="#7D8588"/>
-<stop offset="0.97" stop-color="#ADB3B5"/>
-<stop offset="0.97" stop-color="#595C5E"/>
-<stop offset="1" stop-color="#ADB3B5"/>
-<stop offset="1" stop-color="#595C5E"/>
+<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"/>
 </linearGradient>
-<path d="M50.813,14.131H22.294c-0.673,0-1.225,0.561-1.225,1.247v1.548H9.183 c-0.673,0-1.225,0.561-1.225,1.247v26.8c0,0.687,0.551,1.247,1.225,1.247h41.629c0.674,0,1.225-0.561,1.225-1.247V15.378 C52.037,14.691,51.486,14.131,50.813,14.131z" fill="url(#SVGID_3)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="45.42" x2="45.42" y1="16.14" y2="21.42">
-<stop offset="0" stop-color="#808080"/>
-<stop offset="1" stop-color="#E6E6E6"/>
+<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">
+<stop offset="0" style="stop-color:#808080"/>
+<stop offset="1" style="stop-color:#E6E6E6"/>
 </linearGradient>
-<polygon fill="url(#SVGID_4)" points="49.551,21.419 41.297,21.418 41.301,16.119 49.553,16.121 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="45.43" x2="45.43" y1="20.94" y2="16.58">
-<stop offset="0" stop-color="#000000"/>
-<stop offset="1" stop-color="#3B3B3B"/>
+<polygon fill="url(#SVGID_4_)" points="53.955,19.492 43.843,19.491 43.847,12.998 53.957,12.999  "/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="-53.6196" x2="-53.6196" y1="20.0713" y2="25.4231">
+<stop offset="0" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#3B3B3B"/>
 </linearGradient>
-<rect fill="url(#SVGID_5)" height="4.409" width="7.215" x="41.818" y="16.566"/>
-<path d="M42.865,31.56c-0.002,6.788-5.505,13.483-12.295,13.48 c-6.786-0.003-12.288-6.7-12.286-13.487c0.003-6.789,5.507-12.287,12.296-12.286C37.367,19.269,42.867,24.771,42.865,31.56z" fill="#231F20" fill-opacity="0.5" stroke-opacity="0.5"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6" x1="30.57" x2="30.57" y1="18.73" y2="43.36">
-<stop offset="0" stop-color="#CFCFCF"/>
-<stop offset="0.11" stop-color="#CFCFCF"/>
-<stop offset="0.68" stop-color="#121212"/>
-<stop offset="1" stop-color="#A6A6A6"/>
+<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"/>
+<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"/>
+<stop offset="0.6848" style="stop-color:#121212"/>
+<stop offset="1" style="stop-color:#A6A6A6"/>
 </linearGradient>
-<path d="M42.818,31.063c-0.003,6.762-5.484,12.243-12.248,12.24 C23.81,43.3,18.329,37.816,18.33,31.055c0.003-6.763,5.487-12.242,12.248-12.241C37.342,18.818,42.82,24.3,42.818,31.063z" fill="url(#SVGID_6)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7" x1="30.57" x2="30.57" y1="19.26" y2="42.58">
-<stop offset="0" stop-color="#F2F2F2"/>
-<stop offset="1" stop-color="#606769"/>
+<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"/>
 </linearGradient>
-<path d="M42.205,31.064c-0.002,6.423-5.211,11.629-11.635,11.625 c-6.427-0.002-11.633-5.209-11.628-11.635c0-6.423,5.21-11.629,11.636-11.628C37.004,19.43,42.208,24.64,42.205,31.064z" fill="url(#SVGID_7)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8" x1="23.87" x2="37.28" y1="24.35" y2="37.77">
-<stop offset="0" stop-color="#1A1A1A"/>
-<stop offset="0.5" stop-color="#343434"/>
-<stop offset="0.75" stop-color="#9E9E9E"/>
-<stop offset="1" stop-color="#CFCFCF"/>
+<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">
+<stop offset="0" style="stop-color:#1A1A1A"/>
+<stop offset="0.503" style="stop-color:#343434"/>
+<stop offset="0.7515" style="stop-color:#9E9E9E"/>
+<stop offset="1" style="stop-color:#CFCFCF"/>
 </linearGradient>
-<path d="M40.064,31.063c-0.003,5.24-4.254,9.486-9.494,9.484c-5.24-0.001-9.487-4.252-9.484-9.491 c0.001-5.242,4.252-9.489,9.489-9.487C35.818,21.571,40.065,25.82,40.064,31.063z" fill="url(#SVGID_8)"/>
-<radialGradient cx="31.54" cy="31.82" gradientUnits="userSpaceOnUse" id="SVGID_9" r="10.19">
-<stop offset="0" stop-color="#000000"/>
-<stop offset="0.59" stop-color="#000000"/>
-<stop offset="0.63" stop-color="#050505"/>
-<stop offset="0.77" stop-color="#121212"/>
-<stop offset="0.89" stop-color="#171717"/>
-<stop offset="1" stop-color="#171717"/>
+<path d="M42.332,31.304c-0.003,6.42-5.213,11.621-11.63,11.62c-6.42-0.001-11.623-5.209-11.62-11.627   c0.002-6.423,5.208-11.626,11.624-11.623C37.13,19.677,42.332,24.881,42.332,31.304z" fill="url(#SVGID_8_)"/>
+<radialGradient cx="-71.3799" cy="23.7412" gradientTransform="matrix(0.9226 2.793056e-004 2.793056e-004 -0.9226 97.7313 54.1515)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="13.5274">
+<stop offset="0" style="stop-color:#000000"/>
+<stop offset="0.5917" style="stop-color:#000000"/>
+<stop offset="0.627" style="stop-color:#050505"/>
+<stop offset="0.7652" style="stop-color:#121212"/>
+<stop offset="0.8876" style="stop-color:#171717"/>
+<stop offset="1" style="stop-color:#171717"/>
 </radialGradient>
-<circle cx="30.575" cy="31.058" fill="url(#SVGID_9)" r="8.877"/>
-<radialGradient cx="26.55" cy="25.04" gradientUnits="userSpaceOnUse" id="SVGID_10" r="16.37">
-<stop offset="0" stop-color="#242424"/>
-<stop offset="0.43" stop-color="#242424"/>
-<stop offset="0.78" stop-color="#000000"/>
-<stop offset="1" stop-color="#000000"/>
+<circle cx="30.706" cy="31.3" fill="url(#SVGID_9_)" r="10.874"/>
+<radialGradient cx="-77.2124" cy="16.4063" gradientTransform="matrix(0.9306 0 0 -0.9306 97.6075 39.1861)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="21.5485">
+<stop offset="0" style="stop-color:#242424"/>
+<stop offset="0.4303" style="stop-color:#242424"/>
+<stop offset="0.7818" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#000000"/>
 </radialGradient>
-<path d="M37.922,31.061c-0.002,4.06-3.293,7.346-7.35,7.344c-4.058-0.001-7.346-3.291-7.344-7.35 c0.001-4.056,3.292-7.344,7.348-7.343C34.635,23.713,37.923,27.003,37.922,31.061z" fill="url(#SVGID_10)"/>
-<radialGradient cx="28.71" cy="21.4" gradientUnits="userSpaceOnUse" id="SVGID_11" r="17.58">
-<stop offset="0" stop-color="#A700F5"/>
-<stop offset="0.31" stop-color="#A700F5"/>
-<stop offset="0.44" stop-color="#5E008A"/>
-<stop offset="0.81" stop-color="#0E1402"/>
-<stop offset="1" stop-color="#0E1402"/>
+<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"/>
 </radialGradient>
-<path d="M37.002,31.06c-0.001,3.55-2.881,6.428-6.431,6.427c-3.547-0.002-6.425-2.882-6.425-6.431 c0.003-3.553,2.881-6.426,6.428-6.426C34.127,24.632,37.004,27.51,37.002,31.06z" fill="url(#SVGID_11)"/>
-<radialGradient cx="30.57" cy="36.39" gradientUnits="userSpaceOnUse" id="SVGID_12" r="7.14">
-<stop offset="0" stop-color="#48630C"/>
-<stop offset="0.79" stop-color="#000000"/>
-<stop offset="1" stop-color="#000000"/>
+<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.7879" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#000000"/>
 </radialGradient>
-<path d="M37.002,31.285c-0.001,3.379-2.881,6.119-6.431,6.117c-3.547,0-6.425-2.742-6.425-6.121 c0,0,2.203,3.732,6.425,3.732C34.797,35.015,37.002,31.285,37.002,31.285z" fill="url(#SVGID_12)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13" x1="15.16" x2="15.16" y1="20.9" y2="25.18">
-<stop offset="0" stop-color="#808080"/>
-<stop offset="1" stop-color="#E6E6E6"/>
+<path d="M38.581,31.575c-0.001,4.14-3.529,7.498-7.879,7.496c-4.345-0.001-7.872-3.36-7.872-7.5   c0,0,2.698,4.573,7.872,4.573C35.879,36.146,38.581,31.575,38.581,31.575z" fill="url(#SVGID_12_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="-90.6953" x2="-90.6953" y1="20.1304" y2="14.8813">
+<stop offset="0" style="stop-color:#808080"/>
+<stop offset="1" style="stop-color:#E6E6E6"/>
 </linearGradient>
-<circle cx="15.162" cy="23" fill="url(#SVGID_13)" r="2.143"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14" x1="15.16" x2="15.16" y1="24.99" y2="21.16">
-<stop offset="0" stop-color="#000000"/>
-<stop offset="1" stop-color="#3B3B3B"/>
+<circle cx="11.825" cy="21.428" fill="url(#SVGID_13_)" r="2.625"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="-90.6958" x2="-90.6958" y1="15.1157" y2="19.8095">
+<stop offset="0" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#3B3B3B"/>
 </linearGradient>
-<circle cx="15.162" cy="23" fill="url(#SVGID_14)" r="1.837"/>
-<path d="M15.162,23.189c0.631,0,1.191-0.285,1.576-0.726 c-0.232-0.651-0.847-1.118-1.576-1.118c-0.73,0-1.344,0.468-1.577,1.118C13.969,22.905,14.529,23.189,15.162,23.189z" fill="#FFFFFF" fill-opacity="0.25" stroke-opacity="0.25"/>
-<polygon fill="#F1F1F2" fill-opacity="0.2" points="41.996,17.797 48.909,17.823 48.909,16.751 41.996,16.751 " stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15" x1="30.54" x2="30.54" y1="23.15" y2="31">
-<stop offset="0" stop-color="#F8FBFF"/>
-<stop offset="1" stop-color="#808080"/>
+<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"/>
+<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="1" style="stop-color:#808080"/>
 </linearGradient>
-<path d="M30.543,30.959c2.848,0,5.533-0.432,7.901-1.192 c-0.673-3.758-3.95-6.614-7.901-6.614c-3.952,0-7.229,2.855-7.902,6.612C25.01,30.527,27.695,30.959,30.543,30.959z" fill="url(#SVGID_15)" fill-opacity="0.35" stroke-opacity="0.35"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16" x1="30" x2="30" y1="14.02" y2="46.19">
-<stop offset="0" stop-color="#F2F2F2"/>
-<stop offset="0.32" stop-color="#E6E6E6"/>
-<stop offset="1" stop-color="#666666"/>
+<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"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="-72.52" x2="-72.52" y1="28.5479" y2="-10.8621">
+<stop offset="0" style="stop-color:#F2F2F2"/>
+<stop offset="0.3212" style="stop-color:#E6E6E6"/>
+<stop offset="1" style="stop-color:#666666"/>
 </linearGradient>
-<path d="M50.813,14.131H22.294c-0.673,0-1.225,0.561-1.225,1.247v1.548H9.183 c-0.673,0-1.225,0.561-1.225,1.247v26.8c0,0.687,0.551,1.247,1.225,1.247c0,0-0.612-0.338-0.612-1.247v-26.8 c0-0.348,0.275-0.63,0.612-0.63h11.886h0.612v-0.617v-1.548c0-0.348,0.275-0.63,0.612-0.63h28.519c0.339,0,0.612,0.282,0.612,0.63 v29.596c0,0.986-0.612,1.247-0.612,1.247c0.674,0,1.225-0.561,1.225-1.247V15.378C52.037,14.691,51.486,14.131,50.813,14.131z" fill="url(#SVGID_16)"/>
-<rect fill="none" height="59.996" width="59.996"/>
+<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.528c0,0-0.749-0.414-0.749-1.528V15.514c0-0.426,0.337-0.772,0.749-0.772h14.564h0.749v-0.756   v-1.897c0-0.426,0.337-0.772,0.75-0.772h34.939c0.413,0,0.749,0.346,0.749,0.772v36.256c0,1.208-0.749,1.527-0.749,1.527   c0.824,0,1.499-0.688,1.499-1.527V12.09C57,11.248,56.323,10.563,55.499,10.563z" fill="url(#SVGID_16_)"/>
+</g>
+<rect fill="none" height="60" width="60"/>
+</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_car.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_car.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_car.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,81 +1,79 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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="12.8003" x2="12.8003" y1="35.3491" y2="50.0708">
-<stop offset="0" style="stop-color:#7B7B7B"/>
-<stop offset="0.1455" style="stop-color:#565656"/>
-<stop offset="0.3091" style="stop-color:#8C8C8C"/>
-<stop offset="0.6848" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#646464"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="12.8" x2="12.8" y1="35.35" y2="50.07">
+<stop offset="0" stop-color="#7B7B7B"/>
+<stop offset="0.1455" stop-color="#565656"/>
+<stop offset="0.3091" stop-color="#8C8C8C"/>
+<stop offset="0.6848" stop-color="#000000"/>
+<stop offset="1" stop-color="#646464"/>
 </linearGradient>
-<path d="M16.683,48.771c0,0.746-0.605,1.352-1.351,1.352H10.27c-0.747,0-1.352-0.605-1.352-1.352v-12.07  c0-0.746,0.604-1.352,1.352-1.352h5.063c0.745,0,1.351,0.605,1.351,1.352V48.771z" fill="url(#SVGID_1_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="47.3281" x2="47.3281" y1="35.3491" y2="50.1226">
-<stop offset="0" style="stop-color:#7B7B7B"/>
-<stop offset="0.1455" style="stop-color:#565656"/>
-<stop offset="0.3091" style="stop-color:#8C8C8C"/>
-<stop offset="0.6848" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#646464"/>
+<path d="M16.68,48.77c0,0.746-0.605,1.352-1.351,1.352h-5.06c-0.747,0-1.352-0.605-1.352-1.352v-12.07c0-0.746,0.604-1.352,1.352-1.352h5.063c0.745,0,1.351,0.605,1.351,1.352v12.07z" fill="url(#SVGID_1_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="47.33" x2="47.33" y1="35.35" y2="50.12">
+<stop offset="0" stop-color="#7B7B7B"/>
+<stop offset="0.1455" stop-color="#565656"/>
+<stop offset="0.3091" stop-color="#8C8C8C"/>
+<stop offset="0.6848" stop-color="#000000"/>
+<stop offset="1" stop-color="#646464"/>
 </linearGradient>
-<path d="M51.21,48.771c0,0.746-0.604,1.352-1.352,1.352h-5.063c-0.746,0-1.351-0.605-1.351-1.352v-12.07  c0-0.746,0.604-1.352,1.351-1.352h5.063c0.747,0,1.352,0.605,1.352,1.352V48.771z" fill="url(#SVGID_2_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="29.9985" x2="29.9985" y1="9.8779" y2="33.2271">
-<stop offset="0" style="stop-color:#FEE377"/>
-<stop offset="0.511" style="stop-color:#FFC501"/>
-<stop offset="1" style="stop-color:#FF8800"/>
+<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"/>
 </linearGradient>
-<path d="M45.96,12.92c-0.27-0.631-0.71-1.577-2.432-1.892c-1.956-0.358-5.486-1.15-13.367-1.15  c-7.882,0-11.742,0.76-13.691,1.15c-1.576,0.314-2.163,1.261-2.433,1.892c-0.271,0.631-4.412,9.908-4.774,14.773l2.342,5.314h36.788  l2.342-5.314C50.375,22.828,46.23,13.551,45.96,12.92z" fill="url(#SVGID_3_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="7.499" x2="52.499" y1="35.3521" y2="35.3521">
-<stop offset="0" style="stop-color:#DA8C00"/>
-<stop offset="0.25" style="stop-color:#F7B901"/>
-<stop offset="0.75" style="stop-color:#FFC501"/>
-<stop offset="1" style="stop-color:#DA8C00"/>
+<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"/>
 </linearGradient>
-<path d="M52.446,30.845c-0.067-0.902-0.405-3.941-4.505-4.662c-4.098-0.721-4.746,2.434-7.296,4.527  c-2.938,2.414-6.791,2.117-10.484,2.117c-3.692,0-7.869,0.297-10.81-2.117c-2.55-2.094-3.198-5.248-7.296-4.527  c-4.099,0.721-4.438,3.76-4.504,4.662c-0.361,4.863,1.222,10.609,1.892,12.43c0.444,1.211,2.161,1.352,2.161,1.352h36.788  c0,0,1.675-0.006,2.161-1.352C51.213,41.451,52.807,35.708,52.446,30.845z" fill="url(#SVGID_4_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="12.0552" x2="47.9525" y1="21.0884" y2="21.0884">
-<stop offset="0" style="stop-color:#FF9000"/>
-<stop offset="0.511" style="stop-color:#FFC501"/>
-<stop offset="1" style="stop-color:#FF8800"/>
+<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"/>
 </linearGradient>
-<path d="M43.528,11.028c-1.956-0.358-5.486-1.15-13.367-1.15c-7.882,0-11.742,0.76-13.691,1.15  c-0.256,0.051-0.48,0.119-0.687,0.199c-1.815,3.072-4.801,14.604-3.728,14.417c4.098-0.721,4.746,2.432,7.296,4.525  c2.94,2.414,7.117,2.117,10.81,2.117c3.693,0,7.546,0.297,10.484-2.117c2.55-2.094,3.198-5.246,7.296-4.525  c1.073,0.188-1.803-11.353-3.688-14.42C44.041,11.146,43.802,11.078,43.528,11.028z" fill="url(#SVGID_5_)"/>
-<path d="M12.056,26.183c4.098-0.721,4.746,2.434,7.296,4.527c2.94,2.414,7.117,2.117,10.81,2.117  c3.693,0,7.546,0.297,10.484-2.117c2.55-2.094,3.198-5.248,7.296-4.527c1.225,0.216,2.107,0.64,2.753,1.149  c-0.04-0.358-0.093-0.73-0.163-1.121c-0.631-0.454-1.465-0.83-2.59-1.028c-4.098-0.721-4.746,2.434-7.296,4.527  c-2.938,2.414-6.791,2.287-10.484,2.287c-3.692,0-7.869,0.127-10.81-2.287c-2.55-2.094-3.198-5.248-7.296-4.527  c-1.125,0.198-1.959,0.574-2.589,1.028c-0.07,0.391-0.124,0.763-0.164,1.12C9.949,26.822,10.832,26.399,12.056,26.183z" fill="#191919" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M15.362,12.638c2.108-0.423,6.285-1.245,14.812-1.245s12.345,0.857,14.461,1.245  c0.126,0.023,0.243,0.051,0.356,0.08c-0.255-0.603-0.504-1.113-0.738-1.494c-0.212-0.078-0.451-0.146-0.725-0.195  c-1.956-0.358-5.486-1.15-13.367-1.15c-7.882,0-11.742,0.76-13.691,1.15c-0.256,0.051-0.48,0.119-0.687,0.199  c-0.224,0.378-0.465,0.885-0.714,1.481C15.164,12.684,15.259,12.658,15.362,12.638z" fill="#FFFFFF" fill-opacity="0.35" stroke-opacity="0.35"/>
-<path d="M10.921,27.734c0.374-0.066,0.729-0.1,1.053-0.1c1.844,0,2.712,1.051,3.914,2.506  c0.601,0.725,1.28,1.545,2.15,2.26c2.786,2.287,6.491,2.479,9.747,2.479c0.408,0,0.816-0.002,1.22-0.006  c0.393-0.004,0.783-0.006,1.167-0.006c0.388,0,0.777,0.002,1.166,0.006c0.395,0.004,0.791,0.006,1.186,0.006  c3.247,0,6.649-0.191,9.437-2.479c0.869-0.715,1.55-1.537,2.149-2.262c1.202-1.453,2.07-2.504,3.913-2.504  c0.325,0,0.681,0.033,1.055,0.1c1.315,0.23,2.316,0.721,3.007,1.457c-0.471-1.18-1.56-2.553-4.143-3.008  c-4.098-0.721-4.746,2.434-7.296,4.527c-2.938,2.414-6.791,2.117-10.484,2.117c-3.692,0-7.869,0.297-10.81-2.117  c-2.55-2.094-3.198-5.248-7.296-4.527c-2.581,0.455-3.67,1.826-4.14,3.006C8.604,28.453,9.605,27.964,10.921,27.734z" fill="#FFFFFF" fill-opacity="0.35" stroke-opacity="0.35"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="29.9985" x2="29.9985" y1="44.6655" y2="40.1625">
-<stop offset="0" style="stop-color:#565656"/>
-<stop offset="1" style="stop-color:#212121"/>
+<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"/>
+<path d="M15.36,12.64c2.108-0.423,6.285-1.245,14.81-1.245s12.34,0.857,14.46,1.245c0.126,0.023,0.243,0.051,0.356,0.08-0.255-0.603-0.504-1.113-0.738-1.494-0.212-0.078-0.451-0.146-0.725-0.195-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-0.224,0.378-0.465,0.885-0.714,1.481,0.1-0.04,0.2-0.06,0.3-0.08z" fill="#FFFFFF" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M10.92,27.73c0.374-0.066,0.729-0.1,1.053-0.1,1.844,0,2.712,1.051,3.914,2.506,0.601,0.725,1.28,1.545,2.15,2.26,2.786,2.287,6.491,2.479,9.747,2.479,0.408,0,0.816-0.002,1.22-0.006,0.393-0.004,0.783-0.006,1.167-0.006,0.388,0,0.777,0.002,1.166,0.006,0.395,0.004,0.791,0.006,1.186,0.006,3.247,0,6.649-0.191,9.437-2.479,0.869-0.715,1.55-1.537,2.149-2.262,1.202-1.453,2.07-2.504,3.913-2.504,0.325,0,0.681,0.033,1.055,0.1,1.315,0.23,2.316,0.721,3.007,1.457-0.471-1.18-1.56-2.553-4.143-3.008-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-2.581,0.455-3.67,1.826-4.14,3.006,0.684-0.75,1.685-1.24,3-1.47z" fill="#FFFFFF" fill-opacity="0.35" stroke-opacity="0.35"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="30" x2="30" y1="44.67" y2="40.16">
+<stop offset="0" stop-color="#565656"/>
+<stop offset="1" stop-color="#212121"/>
 </linearGradient>
-<path d="M43.28,39.763H16.717c-1.493,0-2.702,1.209-2.702,2.701v2.162h31.968v-2.162  C45.982,40.972,44.772,39.763,43.28,39.763z" fill="url(#SVGID_6_)"/>
-<path d="M43.28,39.763H16.717c-1.493,0-2.702,1.209-2.702,2.701v0.811c0-1.492,1.209-2.701,2.702-2.701H43.28  c1.492,0,2.702,1.209,2.702,2.701v-0.811C45.982,40.972,44.772,39.763,43.28,39.763z" fill="#1A1A1A"/>
-<ellipse cx="12.553" cy="31.716" 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 33.1405 58.9116)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="9.0625" x2="15.8756" y1="32.0796" y2="30.1862">
-<stop offset="0" style="stop-color:#565656"/>
-<stop offset="0.489" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#646464"/>
+<path d="M43.28,39.76h-26.56c-1.493,0-2.702,1.209-2.702,2.701v2.162h31.97v-2.162c-0.01-1.49-1.22-2.7-2.71-2.7z" fill="url(#SVGID_6_)"/>
+<path d="M43.28,39.76h-26.56c-1.493,0-2.702,1.209-2.702,2.701v0.811c0-1.492,1.209-2.701,2.702-2.701h26.56c1.492,0,2.702,1.209,2.702,2.701v-0.811c0-1.49-1.21-2.7-2.7-2.7z" fill="#1A1A1A"/>
+<ellipse cx="12.55" 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 33.1405 58.9116)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="9.062" x2="15.88" y1="32.08" y2="30.19">
+<stop offset="0" stop-color="#565656"/>
+<stop offset="0.489" stop-color="#000000"/>
+<stop offset="1" stop-color="#646464"/>
 </linearGradient>
-<path d="M9.063,32.08c0.47,1.688,2.374,2.631,4.255,2.109c1.882-0.523,3.026-2.314,2.558-4.004  c-0.47-1.688-2.375-2.631-4.256-2.107C9.737,28.599,8.592,30.392,9.063,32.08z" fill="url(#SVGID_7_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="12.1978" x2="12.1978" y1="28.0469" y2="32.9824">
-<stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="1" style="stop-color:#949DA1"/>
+<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"/>
 </linearGradient>
-<path d="M12,32.982c-1.176,0-2.15-0.668-2.427-1.66c-0.165-0.592-0.059-1.225,0.299-1.785  c0.376-0.588,0.977-1.02,1.693-1.219c0.274-0.076,0.554-0.115,0.83-0.115c1.177,0,2.151,0.668,2.428,1.66  c0.349,1.254-0.546,2.602-1.994,3.004C12.557,32.943,12.277,32.982,12,32.982L12,32.982z" fill="url(#SVGID_8_)"/>
-<ellipse cx="47.404" cy="31.716" 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)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="44.0176" x2="51.04" y1="31.1323" y2="31.1323">
-<stop offset="0" style="stop-color:#565656"/>
-<stop offset="0.489" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#646464"/>
+<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)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="44.02" x2="51.04" y1="31.13" y2="31.13">
+<stop offset="0" stop-color="#565656"/>
+<stop offset="0.489" stop-color="#000000"/>
+<stop offset="1" stop-color="#646464"/>
 </linearGradient>
-<path d="M50.935,32.08c-0.469,1.688-2.374,2.631-4.254,2.109c-1.882-0.523-3.027-2.314-2.558-4.004  c0.47-1.688,2.375-2.631,4.255-2.107C50.26,28.599,51.405,30.392,50.935,32.08z" fill="url(#SVGID_9_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="47.7988" x2="47.7988" y1="28.0918" y2="33.0472">
-<stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="1" style="stop-color:#949DA1"/>
+<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"/>
 </linearGradient>
-<path d="M47.998,32.982c-0.279,0-0.558-0.039-0.83-0.115c-1.448-0.402-2.343-1.75-1.994-3.004  c0.276-0.992,1.251-1.66,2.428-1.66c0.277,0,0.557,0.039,0.83,0.115c0.717,0.199,1.318,0.633,1.693,1.219  c0.358,0.561,0.464,1.193,0.299,1.785C50.148,32.314,49.173,32.982,47.998,32.982L47.998,32.982z" fill="url(#SVGID_10_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="29.9985" x2="29.9985" y1="12.8066" y2="24.6304">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="1" style="stop-color:#000000"/>
+<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">
+<stop offset="0" stop-color="#4D4D4D"/>
+<stop offset="1" stop-color="#000000"/>
 </linearGradient>
-<path d="M47.267,23.347c-0.226-0.722-2.567-8.243-2.567-8.243s-0.067-0.812-1.081-1.014  c-0.992-0.198-5.62-1.284-13.728-1.284c-8.106,0-12.52,1.086-13.512,1.284c-1.014,0.202-1.081,1.014-1.081,1.014  s-2.341,7.521-2.566,8.243c-0.169,0.539,0.473,0.473,0.473,0.473s5.519,0.811,16.599,0.811s16.991-0.811,16.991-0.811  S47.435,23.886,47.267,23.347z" fill="url(#SVGID_11_)"/>
-<path d="M43.512,14.621l-0.249-0.052c-3.887-0.811-8.385-1.222-13.372-1.222  c-7.414,0-11.695,0.91-13.102,1.21c-0.123,0.025-0.224,0.047-0.304,0.063c-0.563,0.112-0.641,0.47-0.649,0.541l-0.009,0.06  l-0.013,0.043c0,0-0.959,3.078-1.71,5.489l30.534-4.027c-0.271-0.868-0.456-1.462-0.456-1.462l-0.015-0.059l-0.006-0.044  C44.152,15.091,44.075,14.733,43.512,14.621z" fill="#FFFFFF" fill-opacity="0.25" stroke-opacity="0.25"/>
+<path d="M47.27,23.35c-0.226-0.722-2.567-8.243-2.567-8.243s-0.067-0.812-1.081-1.014c-0.992-0.198-5.62-1.284-13.73-1.284-8.106,0-12.52,1.086-13.51,1.284-1.014,0.202-1.081,1.014-1.081,1.014s-2.341,7.521-2.566,8.243c-0.169,0.539,0.473,0.473,0.473,0.473s5.519,0.811,16.6,0.811,16.99-0.811,16.99-0.811,0.65,0.07,0.48-0.47z" fill="url(#SVGID_11_)"/>
+<path d="M43.51,14.62l-0.249-0.052c-3.887-0.811-8.385-1.222-13.37-1.222-7.414,0-11.7,0.91-13.1,1.21-0.123,0.025-0.224,0.047-0.304,0.063-0.563,0.112-0.641,0.47-0.649,0.541l-0.009,0.06-0.013,0.043s-0.959,3.078-1.71,5.489l30.53-4.027c-0.271-0.868-0.456-1.462-0.456-1.462l-0.015-0.059-0.006-0.044c0-0.07-0.07-0.43-0.64-0.54z" fill="#FFFFFF" fill-opacity="0.25" stroke-opacity="0.25"/>
 <rect fill="none" height="60" width="60"/>
-</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_clock.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_clock.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_clock.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,70 +1,72 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<g>
 <rect fill="none" height="60" width="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="30" x2="30" y1="7.65" y2="51.22">
-<stop offset="0" stop-color="#BDC2C4"/>
-<stop offset="1" stop-color="#454B4D"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M29.998,51.425c-12.154,0-22.04-9.886-22.04-22.039c0-12.152,9.886-22.04,22.04-22.04 c12.153,0,22.039,9.887,22.039,22.04C52.037,41.539,42.151,51.425,29.998,51.425L29.998,51.425z" fill="url(#SVGID_1)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="30" x2="30" y1="8.27" y2="50.72">
-<stop offset="0" stop-color="#D1D7D9"/>
-<stop offset="0.24" stop-color="#BDC2C4"/>
-<stop offset="1" stop-color="#697173"/>
+<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"/>
+<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"/>
 </linearGradient>
-<circle cx="29.998" cy="29.385" fill="url(#SVGID_2)" r="21.427"/>
-<path d="M30.745,30.133c7.176,0,14.106-0.448,20.667-1.272 c-0.281-11.59-9.756-20.902-21.414-20.902c-11.59,0-21.027,9.205-21.41,20.702C15.587,29.61,23.023,30.133,30.745,30.133z" fill="#F1F1F2" fill-opacity="0.35" stroke-opacity="0.35"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="8.78" x2="51.53" y1="18.83" y2="18.83">
-<stop offset="0" stop-color="#C0C5C7"/>
-<stop offset="0.2" stop-color="#F7FDFF"/>
-<stop offset="0.8" stop-color="#F7FDFF"/>
-<stop offset="1" stop-color="#CDD3D5"/>
+<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"/>
 </linearGradient>
-<path d="M29.998,8.571c11.73,0,21.255,9.429,21.42,21.121c0-0.102,0.007-0.204,0.007-0.306 c0-11.834-9.593-21.427-21.427-21.427S8.571,17.552,8.571,29.386c0,0.103,0.006,0.204,0.007,0.306 C8.743,18,18.267,8.571,29.998,8.571z" fill="url(#SVGID_3)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="30" x2="30" y1="48.67" y2="10.48">
-<stop offset="0" stop-color="#BDC2C4"/>
-<stop offset="1" stop-color="#454B4D"/>
+<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"/>
 </linearGradient>
-<path d="M29.998,48.363c-10.465,0-18.979-8.513-18.979-18.978s8.513-18.979,18.979-18.979 c10.465,0,18.979,8.514,18.979,18.979S40.463,48.363,29.998,48.363L29.998,48.363z" fill="url(#SVGID_4)"/>
-<radialGradient cx="30" cy="62.44" gradientUnits="userSpaceOnUse" id="SVGID_5" r="66.73">
-<stop offset="0" stop-color="#FAF9F9"/>
-<stop offset="0.4" stop-color="#FAF9F9"/>
-<stop offset="1" stop-color="#808184"/>
-</radialGradient>
-<path d="M29.998,47.752c-10.126,0-18.366-8.238-18.366-18.366c0-10.126,8.24-18.366,18.366-18.366 c10.127,0,18.365,8.24,18.365,18.366C48.363,39.514,40.125,47.752,29.998,47.752L29.998,47.752z" fill="url(#SVGID_5)"/>
-<path d="M29.998,30.697c6.058,0,11.84-0.509,17.139-1.427 c-0.063-9.398-7.725-17.026-17.139-17.026c-9.413,0-17.076,7.627-17.14,17.026C18.159,30.188,23.94,30.697,29.998,30.697z" fill="#FFFFFF" fill-opacity="0.7" stroke-opacity="0.7"/>
-<rect fill="#404041" height="3.673" width="1.224" x="29.386" y="12.694"/>
-<rect fill="#404041" height="3.673" width="1.224" x="29.386" y="43.305"/>
-<rect fill="#404041" height="1.224" width="3.673" x="43.467" y="29.224"/>
-<rect fill="#404041" height="1.224" width="3.673" x="12.856" y="29.224"/>
-<rect fill="#404041" height="2.965" transform="matrix(-0.5007 -0.8656 0.8656 -0.5007 45.7079 70.7357)" width="0.989" x="42.76" y="20.703"/>
-<rect fill="#404041" height="2.965" transform="matrix(-0.4998 -0.8661 0.8661 -0.4998 -7.3583 70.732)" width="0.988" x="16.251" y="36.008"/>
-<rect fill="#404041" height="2.964" transform="matrix(-0.8659 -0.5002 0.5002 -0.8659 61.9565 49.7736)" width="0.988" x="37.155" y="15.101"/>
-<rect fill="#404041" height="2.964" transform="matrix(-0.8658 -0.5004 0.5004 -0.8658 20.127 91.5796)" width="0.988" x="21.85" y="41.609"/>
-<rect fill="#404041" height="2.965" transform="matrix(-0.8661 0.4998 -0.4998 -0.8661 49.9881 19.7728)" width="0.988" x="21.852" y="15.098"/>
-<rect fill="#404041" height="2.964" transform="matrix(-0.8662 0.4998 -0.4998 -0.8662 91.7979 61.5927)" width="0.989" x="37.157" y="41.606"/>
-<rect fill="#404041" height="2.964" transform="matrix(-0.5 0.866 -0.866 -0.5 44.3279 18.7772)" width="0.988" x="16.249" y="20.704"/>
-<rect fill="#404041" height="2.964" transform="matrix(-0.499 0.8666 -0.8666 -0.499 97.3271 18.7183)" width="0.988" x="42.759" y="36.01"/>
-<path d="M31.497,30.254c-0.06-0.294-0.207-0.555-0.409-0.761 l2.109-6.953l-1.758-0.533l-2.19,7.218c-0.381,0.216-0.661,0.586-0.751,1.029h-4.01v0.613h4.011c0.017,0.08,0.041,0.158,0.069,0.234 l-9.448,9.445l0.794,0.795l9.414-9.412c0.202,0.1,0.428,0.16,0.67,0.16c0.74,0,1.357-0.524,1.499-1.225h14.418v-0.611H31.497z" fill="#231F20" fill-opacity="0.2" stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6" x1="32.4" x2="29.66" y1="21.15" y2="30.18">
-<stop offset="0" stop-color="#58595B"/>
-<stop offset="1" stop-color="#231F20"/>
+<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"/>
+<rect fill="#404041" height="4.667" width="1.556" x="29.221" y="8.795"/>
+<rect fill="#404041" height="4.667" width="1.556" x="29.221" y="47.684"/>
+<rect fill="#404041" height="1.556" width="4.667" x="47.11" y="29.795"/>
+<rect fill="#404041" height="1.556" width="4.666" x="8.223" y="29.795"/>
+<rect fill="#404041" height="3.764" transform="matrix(0.4993 0.8664 -0.8664 0.4993 41.5175 -30.1421)" width="1.256" x="46.211" y="18.97"/>
+<rect fill="#404041" height="3.765" transform="matrix(0.4997 0.8662 -0.8662 0.4997 41.4868 8.7601)" width="1.257" x="12.531" y="38.413"/>
+<rect fill="#404041" height="3.766" transform="matrix(0.8662 0.4997 -0.4997 0.8662 12.1761 -18.0101)" width="1.255" x="39.095" y="11.851"/>
+<rect fill="#404041" height="3.765" transform="matrix(0.8661 0.4999 -0.4999 0.8661 26.4169 -3.7873)" width="1.256" x="19.649" y="45.529"/>
+<rect fill="#404041" height="3.766" transform="matrix(0.8666 -0.499 0.499 0.8666 -4.1483 11.9502)" width="1.256" x="19.65" y="11.851"/>
+<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"/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_6)" points="33.197,21.673 31.439,21.14 28.773,29.927 30.531,30.46 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7" x1="19.58" x2="30.34" y1="40.02" y2="29.25">
-<stop offset="0" stop-color="#58595B"/>
-<stop offset="1" stop-color="#231F20"/>
+<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"/>
+</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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_7)" points="30.752,29.638 29.958,28.843 19.12,39.68 19.914,40.475 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8" x1="35.2" x2="35.2" y1="29.3" y2="30.19">
-<stop offset="0" stop-color="#FF0000"/>
-<stop offset="1" stop-color="#A8000B"/>
+<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"/>
 </linearGradient>
-<path d="M45.915,29.386H31.497c-0.142-0.699-0.759-1.225-1.499-1.225c-0.742,0-1.359,0.526-1.5,1.225 h-4.011v0.612h4.011c0.141,0.699,0.758,1.225,1.5,1.225c0.74,0,1.357-0.525,1.499-1.225h14.418V29.386z" fill="url(#SVGID_8)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9" x1="30" x2="30" y1="28.72" y2="30.61">
-<stop offset="0" stop-color="#FFE2D9"/>
-<stop offset="1" stop-color="#F23D3D"/>
-</linearGradient>
-<circle cx="29.998" cy="29.691" fill="url(#SVGID_9)" r="0.918"/>
-<rect fill="none" height="59.996" width="59.996"/>
+<circle cx="30" cy="30.389" fill="url(#SVGID_9_)" r="1.167"/>
+<rect fill="none" height="60" width="60"/>
+</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_clock_home.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_clock_home.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<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"/>
+</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"/>
+</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"/>
+<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"/>
+</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"/>
+</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"/>
+</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"/>
+<rect fill="#404041" height="4.667" width="1.556" x="29.221" y="8.795"/>
+<rect fill="#404041" height="4.667" width="1.556" x="29.221" y="47.684"/>
+<rect fill="#404041" height="1.556" width="4.667" x="47.11" y="29.795"/>
+<rect fill="#404041" height="1.556" width="4.666" x="8.223" y="29.795"/>
+<rect fill="#404041" height="3.764" transform="matrix(0.4993 0.8664 -0.8664 0.4993 41.5175 -30.1421)" width="1.256" x="46.211" y="18.97"/>
+<rect fill="#404041" height="3.765" transform="matrix(0.4997 0.8662 -0.8662 0.4997 41.4868 8.7601)" width="1.257" x="12.531" y="38.413"/>
+<rect fill="#404041" height="3.766" transform="matrix(0.8662 0.4997 -0.4997 0.8662 12.1761 -18.0101)" width="1.255" x="39.095" y="11.851"/>
+<rect fill="#404041" height="3.765" transform="matrix(0.8661 0.4999 -0.4999 0.8661 26.4169 -3.7873)" width="1.256" x="19.649" y="45.529"/>
+<rect fill="#404041" height="3.766" transform="matrix(0.8666 -0.499 0.499 0.8666 -4.1483 11.9502)" width="1.256" x="19.65" y="11.851"/>
+<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"/>
+<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"/>
+</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"/>
+</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"/>
+</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"/>
+</linearGradient>
+<circle cx="30" cy="30.389" fill="url(#SVGID_9_)" r="1.167"/>
+<rect fill="none" height="60" width="60"/>
+</g>
+<g transform="matrix(1 0 0 1 30 30)">
+<polygon fill="none" points="30.414,14.408 30.414,0 0.414,0 0.414,14.41 0,14.824 0.414,15.237 0.414,30 30.414,30 30.414,15.236   30.828,14.821 "/>
+<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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+<rect fill="none" height="30" width="30" x="0.414"/>
+</g>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_clock_night_home.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_clock_night_home.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<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"/>
+<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"/>
+<stop offset="1" style="stop-color:#4E4E4E"/>
+</linearGradient>
+<circle cx="29.998" cy="29.385" fill="url(#SVGID_1_)" r="27.222"/>
+<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"/>
+</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="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_)"/>
+<path d="M29.998,31.052c7.696,0,15.042-0.647,21.776-1.813  C51.692,17.3,41.958,7.609,29.998,7.609c-11.958,0-21.694,9.689-21.775,21.629C14.958,30.405,22.302,31.052,29.998,31.052z" fill="#676767" fill-opacity="0.7" stroke-opacity="0.7"/>
+<rect fill="#F3F2F2" height="4.668" width="1.554" x="29.223" y="8.179"/>
+<rect fill="#F3F2F2" height="4.667" width="1.554" x="29.223" y="47.069"/>
+<rect fill="#F3F2F2" height="1.555" width="4.668" x="47.108" y="29.182"/>
+<rect fill="#F3F2F2" height="1.555" width="4.667" x="8.22" y="29.182"/>
+<rect fill="#F3F2F2" height="3.766" transform="matrix(-0.4992 -0.8665 0.8665 -0.4992 52.6823 70.936)" width="1.256" x="46.214" y="18.36"/>
+<rect fill="#F3F2F2" height="3.767" transform="matrix(-0.4991 -0.8666 0.8666 -0.4991 -14.667 70.8857)" width="1.254" x="12.528" y="37.799"/>
+<rect fill="#F3F2F2" height="3.767" transform="matrix(-0.8657 -0.5006 0.5006 -0.8657 67.5346 44.3631)" width="1.254" x="39.092" y="11.238"/>
+<rect fill="#F3F2F2" height="3.764" transform="matrix(-0.8659 -0.5002 0.5002 -0.8659 14.4172 97.4599)" width="1.255" x="19.645" y="44.915"/>
+<rect fill="#F3F2F2" height="3.767" transform="matrix(-0.8662 0.4997 -0.4997 -0.8662 44.4025 14.3518)" width="1.254" x="19.653" y="11.237"/>
+<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"/>
+<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"/>
+</linearGradient>
+<polygon fill="url(#SVGID_4_)" points="34.062,19.587 31.829,18.911 28.442,30.074 30.675,30.75 "/>
+<linearGradient gradientTransform="matrix(1 0 0 1 -144.0156 -215.7637)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="160.7793" x2="174.448" y1="258.6592" y2="244.9778">
+<stop offset="0" style="stop-color:#E5E5E5"/>
+<stop offset="1" style="stop-color:#989897"/>
+</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"/>
+</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"/>
+</linearGradient>
+<circle cx="29.998" cy="29.774" fill="url(#SVGID_7_)" r="1.166"/>
+<rect fill="none" height="59.996" width="59.995"/>
+</g>
+<g transform="matrix(1 0 0 1 30 30)">
+<polygon fill="none" points="30.414,14.408 30.414,0 0.414,0 0.414,14.41 0,14.824 0.414,15.237 0.414,30 30.414,30 30.414,15.236   30.828,14.821 "/>
+<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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+<rect fill="none" height="30" width="30" x="0.414"/>
+</g>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_computer.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_computer.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<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"/>
+</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"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="19.0908" y2="9.5508">
+<stop offset="0" style="stop-color:#808080"/>
+<stop offset="1" style="stop-color:#303030"/>
+</linearGradient>
+<rect fill="url(#SVGID_2_)" height="9.738" width="33.269" x="13.365" y="9.353"/>
+<rect fill="#FFFFFF" fill-opacity="0.25" height="1.218" stroke-opacity="0.25" width="33.269" x="13.365" y="19.091"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30" x2="30" y1="10.6196" y2="17.8277">
+<stop offset="0" style="stop-color:#8B8B8B"/>
+<stop offset="1" style="stop-color:#454545"/>
+</linearGradient>
+<rect fill="url(#SVGID_3_)" height="7.305" width="30.831" x="14.585" y="10.569"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="30" x2="30" y1="11.542" y2="16.6561">
+<stop offset="0" style="stop-color:#525252"/>
+<stop offset="1" style="stop-color:#1C1C1C"/>
+</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"/>
+</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="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"/>
+</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">
+<stop offset="0" style="stop-color:#8B8B8B"/>
+<stop offset="1" style="stop-color:#454545"/>
+</linearGradient>
+<rect fill="url(#SVGID_8_)" height="4.869" width="25.565" x="17.217" y="48.544"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="22.6953" x2="22.6953" y1="52.1328" y2="49.7734">
+<stop offset="0" style="stop-color:#525252"/>
+<stop offset="1" style="stop-color:#1C1C1C"/>
+</linearGradient>
+<rect fill="url(#SVGID_9_)" height="2.436" width="6.087" x="19.651" y="49.761"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="30" x2="30" y1="52.1328" y2="49.7734">
+<stop offset="0" style="stop-color:#525252"/>
+<stop offset="1" style="stop-color:#1C1C1C"/>
+</linearGradient>
+<rect fill="url(#SVGID_10_)" height="2.436" width="6.087" x="26.956" y="49.761"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="37.3037" x2="37.3037" y1="52.2217" y2="49.7861">
+<stop offset="0" style="stop-color:#525252"/>
+<stop offset="1" style="stop-color:#1C1C1C"/>
+</linearGradient>
+<rect fill="url(#SVGID_11_)" height="2.436" width="6.088" x="34.26" y="49.761"/>
+<rect fill="none" height="60" width="60"/>
+</g>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_corrupted.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_corrupted.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_corrupted.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,73 +1,126 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<rect fill="none" height="60" width="60"/>
-<path d="M21.888,26.229l4.026-14.596H5.51c-0.677,0-1.225,0.549-1.225,1.225v34.286c0,0.677,0.548,1.225,1.225,1.225 h17.025l5.475-10.199L21.888,26.229z" fill="#F1F1F2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="15.18" x2="15.18" y1="11.63" y2="48.37">
-<stop offset="0" stop-color="#757575"/>
-<stop offset="0.24" stop-color="#000000"/>
-<stop offset="0.86" stop-color="#000000"/>
-<stop offset="1" stop-color="#363636"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="18.3677" x2="18.3677" y1="9.4238" y2="48.3162">
+<stop offset="0" style="stop-color:#F2F2F2"/>
+<stop offset="0.8727" style="stop-color:#A9ADAD"/>
+<stop offset="1" style="stop-color:#DBDCDD"/>
+</linearGradient>
+<polygon fill="url(#SVGID_1_)" points="26.794,34.85 31.693,28.114 26.642,21.226 30.979,15.053 28.232,9.424 5.042,9.424   5.042,43.791 29.68,43.791 31.283,41.176 "/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="42.4102" x2="42.4102" y1="10.6484" y2="45.1921">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<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"/>
+</linearGradient>
+<polygon fill="url(#SVGID_2_)" points="52.303,10.648 32.518,10.648 32.791,11.21 51.746,11.21 51.746,44.455 34.309,44.455   33.965,45.016 52.303,45.016 "/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="42.2686" x2="42.2686" y1="11.21" y2="44.6258">
+<stop offset="0" style="stop-color:#F2F2F2"/>
+<stop offset="0.8727" style="stop-color:#A9ADAD"/>
+<stop offset="1" style="stop-color:#DBDCDD"/>
 </linearGradient>
-<path d="M23.266,46.531c-0.338,0-0.612-0.275-0.612-0.613v-1.225c0-0.336,0.274-0.611,0.612-0.611h1.57 l1.238-2.309l-7.937-15.545l5.918-7.861l0.675-2.449h-1.465c-0.338,0-0.612-0.275-0.612-0.613v-1.224 c0-0.336,0.274-0.612,0.612-0.612h2.141l0.508-1.837H5.51c-0.677,0-1.225,0.549-1.225,1.225v34.286c0,0.677,0.548,1.225,1.225,1.225 h17.025l0.984-1.836H23.266z M9.796,45.918c0,0.338-0.276,0.613-0.612,0.613H6.734c-0.337,0-0.612-0.275-0.612-0.613v-1.225 c0-0.336,0.275-0.611,0.612-0.611h2.449c0.336,0,0.612,0.275,0.612,0.611V45.918z M9.796,15.306c0,0.337-0.276,0.613-0.612,0.613 H6.734c-0.337,0-0.612-0.275-0.612-0.613v-1.224c0-0.336,0.275-0.612,0.612-0.612h2.449c0.336,0,0.612,0.276,0.612,0.612V15.306z M15.306,45.918c0,0.338-0.276,0.613-0.611,0.613h-2.45c-0.337,0-0.612-0.275-0.612-0.613v-1.225c0-0.336,0.275-0.611,0.612-0.611 h2.45c0.335,0,0.611,0.275,0.611,0.611V45.918z M15.306,15.306c0,0.337-0.276,0.613-0.611,0.613h-2.45 c-0.337,0-0.612-0.275-0.612-0.613v-1.224c0-0.336,0.275-0.612,0.612-0.612h2.45c0.335,0,0.611,0.276,0.611,0.612V15.306z M20.816,45.918c0,0.338-0.276,0.613-0.612,0.613h-2.448c-0.338,0-0.613-0.275-0.613-0.613v-1.225c0-0.336,0.275-0.611,0.613-0.611 h2.448c0.336,0,0.612,0.275,0.612,0.611V45.918z M20.816,15.306c0,0.337-0.276,0.613-0.612,0.613h-2.448 c-0.338,0-0.613-0.275-0.613-0.613v-1.224c0-0.336,0.275-0.612,0.613-0.612h2.448c0.336,0,0.612,0.276,0.612,0.612V15.306z" fill="url(#SVGID_1)"/>
-<path d="M5.51,11.632c-0.677,0-1.225,0.549-1.225,1.225v0.612c0-0.675,0.548-1.225,1.225-1.225 h20.235l0.169-0.612H5.51z" fill="#FFFFFF" fill-opacity="0.55"/>
-<path d="M5.51,47.755c-0.677,0-1.225-0.547-1.225-1.224v0.611c0,0.677,0.548,1.225,1.225,1.225h17.025 l0.328-0.612H5.51z" fill="#FFFFFF" fill-opacity="0.1"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="15.05" x2="15.05" y1="17.85" y2="42.34">
-<stop offset="0" stop-color="#000000"/>
-<stop offset="0.5" stop-color="#666666"/>
-<stop offset="1" stop-color="#000000"/>
+<polygon fill="url(#SVGID_3_)" points="35.658,16.366 32.791,11.21 51.746,11.21 51.746,44.455 38.49,44.455 "/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="17.5327" x2="17.5327" y1="9.4238" y2="48.3162">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<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"/>
+</linearGradient>
+<polygon fill="url(#SVGID_4_)" points="5.598,43.23 5.598,9.985 28.506,9.985 28.232,9.424 5.042,9.424 5.042,43.791 29.68,43.791   30.023,43.23 "/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="40.4873" x2="40.4873" y1="13.4229" y2="41.8574">
+<stop offset="0" style="stop-color:#B3B3B3"/>
+<stop offset="1" style="stop-color:#666666"/>
 </linearGradient>
-<polygon fill="url(#SVGID_2)" points="19.668,26.229 24.226,17.755 4.286,17.755 4.286,42.245 25.82,42.245 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="16.85" x2="16.85" y1="42.25" y2="17.76">
-<stop offset="0" stop-color="#36B5FF"/>
-<stop offset="1" stop-color="#1B66D8"/>
+<polygon fill="url(#SVGID_5_)" points="50.047,13.577 33.947,13.577 35.264,16.277 30.928,22.45 35.979,29.337 31.08,36.074   34.701,41.176 50.047,41.176 "/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="19.5796" x2="19.5796" y1="9.4399" y2="48.3313">
+<stop offset="0" style="stop-color:#B3B3B3"/>
+<stop offset="1" style="stop-color:#666666"/>
+</linearGradient>
+<polygon fill="url(#SVGID_6_)" points="31.693,28.114 26.642,21.226 30.979,15.053 29.661,12.353 7.466,12.353 7.466,39.951   30.415,39.951 26.794,34.85 "/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="40.1436" x2="40.1436" y1="15.1265" y2="40.1341">
+<stop offset="0" style="stop-color:#41ACFA"/>
+<stop offset="1" style="stop-color:#8DC8E1"/>
 </linearGradient>
-<path d="M21.438,26.229l2.788-8.473H7.347c-0.673,0-1.224,0.551-1.224,1.225v22.041 c0,0.673,0.551,1.225,1.224,1.225H25.82l1.763-4.077L21.438,26.229z" fill="url(#SVGID_3)"/>
-<path d="M7.347,41.021c-0.673,0-1.224,0.062-1.224-0.612c0,0.674,0.551,1.225,1.224,1.225h18.803 l0.329-0.612H7.347z" fill="#FFFFFF" fill-opacity="0.5"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="16.14" x2="16.14" y1="17.76" y2="42.34">
-<stop offset="0" stop-color="#000000"/>
-<stop offset="1" stop-color="#404040"/>
+<polygon fill="url(#SVGID_7_)" points="49.359,14.213 34.256,14.213 35.264,16.277 30.928,22.45 35.979,29.337 31.08,36.074   34.348,40.678 49.359,40.678 "/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="33.7588" x2="33.7588" y1="11.124" y2="23.6764">
+<stop offset="0" style="stop-color:#F5F5F5"/>
+<stop offset="0.8061" style="stop-color:#37749E"/>
+<stop offset="1" style="stop-color:#D6D6D6"/>
+</linearGradient>
+<polygon fill="url(#SVGID_8_)" points="31.691,36.074 36.59,29.337 31.539,22.45 35.875,16.277 33.131,10.648 32.518,10.648   35.264,16.277 30.928,22.45 35.979,29.337 31.08,36.074 35.57,42.4 33.965,45.016 34.578,45.016 36.182,42.4 "/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="19.5513" x2="19.5513" y1="9.4399" y2="48.3321">
+<stop offset="0" style="stop-color:#41ACFA"/>
+<stop offset="1" style="stop-color:#8DC8E1"/>
 </linearGradient>
-<path d="M7.347,41.633c-0.337,0-0.612-0.274-0.612-0.612V18.98c0-0.337,0.275-0.612,0.612-0.612h16.709 l0.17-0.612H7.347c-0.673,0-1.224,0.551-1.224,1.225v22.041c0,0.673,0.551,1.225,1.224,1.225H25.82l0.329-0.612H7.347z" fill="url(#SVGID_4)"/>
-<path d="M22.663,18.98H8.571c-0.677,0-1.225,0.548-1.225,1.224v7.959l13.718-1.149l-0.401-0.785 L22.663,18.98z" fill="#FFFFFF" fill-opacity="0.2"/>
-<path d="M55.714,45.918V11.632c0-0.676-0.549-1.224-1.225-1.224H31.424l-4.025,14.596l6.122,11.939l-5.476,10.199 h26.444C55.165,47.143,55.714,46.595,55.714,45.918z" fill="#F1F1F2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="41.88" x2="41.88" y1="10.41" y2="47.14">
-<stop offset="0" stop-color="#757575"/>
-<stop offset="0.24" stop-color="#000000"/>
-<stop offset="0.86" stop-color="#000000"/>
-<stop offset="1" stop-color="#363636"/>
+<polygon fill="url(#SVGID_9_)" points="26.642,21.226 30.979,15.053 29.971,12.989 8.124,12.989 8.124,39.453 26.794,34.85 "/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="28.8608" x2="28.8608" y1="9.2871" y2="21.281">
+<stop offset="0" style="stop-color:#F5F5F5"/>
+<stop offset="0.8061" style="stop-color:#37749E"/>
+<stop offset="1" style="stop-color:#D6D6D6"/>
 </linearGradient>
-<path d="M55.714,45.918V11.632c0-0.676-0.549-1.224-1.225-1.224H31.424l-0.507,1.836h0.308 c0.336,0,0.612,0.277,0.612,0.612v1.225c0,0.337-0.276,0.613-0.612,0.613h-0.982l-0.676,2.449l7.245,19.8l-5.48,4.077l-0.985,1.837 h0.879c0.336,0,0.612,0.275,0.612,0.611v1.225c0,0.338-0.276,0.613-0.612,0.613H29.03l-0.985,1.836h26.444 C55.165,47.143,55.714,46.595,55.714,45.918z M37.347,44.693c0,0.338-0.275,0.613-0.611,0.613h-2.449 c-0.337,0-0.612-0.275-0.612-0.613v-1.225c0-0.336,0.275-0.611,0.612-0.611h2.449c0.336,0,0.611,0.275,0.611,0.611V44.693z M37.347,14.082c0,0.337-0.275,0.613-0.611,0.613h-2.449c-0.337,0-0.612-0.276-0.612-0.613v-1.225c0-0.335,0.275-0.612,0.612-0.612 h2.449c0.336,0,0.611,0.277,0.611,0.612V14.082z M42.857,44.693c0,0.338-0.276,0.613-0.612,0.613h-2.449 c-0.338,0-0.612-0.275-0.612-0.613v-1.225c0-0.336,0.274-0.611,0.612-0.611h2.449c0.336,0,0.612,0.275,0.612,0.611V44.693z M42.857,14.082c0,0.337-0.276,0.613-0.612,0.613h-2.449c-0.338,0-0.612-0.276-0.612-0.613v-1.225c0-0.335,0.274-0.612,0.612-0.612 h2.449c0.336,0,0.612,0.277,0.612,0.612V14.082z M48.367,44.693c0,0.338-0.275,0.613-0.612,0.613h-2.448 c-0.338,0-0.613-0.275-0.613-0.613v-1.225c0-0.336,0.275-0.611,0.613-0.611h2.448c0.337,0,0.612,0.275,0.612,0.611V44.693z M48.367,14.082c0,0.337-0.275,0.613-0.612,0.613h-2.448c-0.338,0-0.613-0.276-0.613-0.613v-1.225c0-0.335,0.275-0.612,0.613-0.612 h2.448c0.337,0,0.612,0.277,0.612,0.612V14.082z M53.878,44.693c0,0.338-0.277,0.613-0.613,0.613h-2.448 c-0.338,0-0.612-0.275-0.612-0.613v-1.225c0-0.336,0.274-0.611,0.612-0.611h2.448c0.336,0,0.613,0.275,0.613,0.611V44.693z M53.878,14.082c0,0.337-0.277,0.613-0.613,0.613h-2.448c-0.338,0-0.612-0.276-0.612-0.613v-1.225c0-0.335,0.274-0.612,0.612-0.612 h2.448c0.336,0,0.613,0.277,0.613,0.612V14.082z" fill="url(#SVGID_5)"/>
-<path d="M55.714,12.245v-0.612c0-0.676-0.549-1.224-1.225-1.224H31.424l-0.168,0.612h23.233 C55.165,11.02,55.714,11.569,55.714,12.245z" fill="#FFFFFF" fill-opacity="0.55"/>
-<path d="M55.714,45.918v-0.611c0,0.677-0.549,1.225-1.225,1.225H28.373l-0.328,0.611h26.444 C55.165,47.143,55.714,46.595,55.714,45.918z" fill="#FFFFFF" fill-opacity="0.1"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6" x1="42.73" x2="42.73" y1="16.63" y2="41.12">
-<stop offset="0" stop-color="#000000"/>
-<stop offset="0.5" stop-color="#666666"/>
-<stop offset="1" stop-color="#000000"/>
+<polygon fill="url(#SVGID_10_)" points="31.693,28.114 26.642,21.226 30.979,15.053 28.232,9.424 27.621,9.424 30.365,15.053   26.029,21.226 31.08,28.114 26.182,34.85 30.672,41.176 29.067,43.791 29.68,43.791 31.283,41.176 26.794,34.85 "/>
+<polygon fill="#FFFFFF" fill-opacity="0.05" points="50.047,39.947 33.828,39.947 34.701,41.176 50.047,41.176 " stroke-opacity="0.05"/>
+<polygon fill="#FFFFFF" fill-opacity="0.05" points="7.466,38.723 7.466,39.951 30.415,39.951 29.543,38.723 " stroke-opacity="0.05"/>
+<polygon fill="#FFFFFF" fill-opacity="0.05" points="50.047,39.234 33.322,39.234 34.701,41.176 50.047,41.176 " stroke-opacity="0.05"/>
+<polygon fill="#FFFFFF" fill-opacity="0.05" points="7.466,38.01 7.466,39.951 30.415,39.951 29.037,38.01 " stroke-opacity="0.05"/>
+<polygon fill="#FFFFFF" fill-opacity="0.05" points="50.047,38.521 32.816,38.521 34.701,41.176 50.047,41.176 " stroke-opacity="0.05"/>
+<polygon fill="#FFFFFF" fill-opacity="0.05" points="7.466,37.297 7.466,39.951 30.415,39.951 28.531,37.297 " stroke-opacity="0.05"/>
+<polygon fill="#FFFFFF" fill-opacity="0.05" points="50.047,37.811 32.311,37.811 34.701,41.176 50.047,41.176 " stroke-opacity="0.05"/>
+<polygon fill="#FFFFFF" fill-opacity="0.05" points="7.466,36.586 7.466,39.951 30.415,39.951 28.025,36.586 " stroke-opacity="0.05"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="25.2661" x2="25.2661" y1="9.439" y2="48.3326">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#0071BB"/>
+</linearGradient>
+<polygon fill="url(#SVGID_11_)" points="19.229,39.453 30.062,39.453 26.794,34.85 31.305,28.647 28.423,24.149 "/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="19.5298" x2="19.5298" y1="9.4395" y2="48.3322">
+<stop offset="0" style="stop-color:#146BAF"/>
+<stop offset="1" style="stop-color:#013B77"/>
 </linearGradient>
-<polygon fill="url(#SVGID_6)" points="55.714,16.531 29.736,16.531 42.015,34.188 31.331,41.021 55.714,41.021 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7" x1="41.03" x2="41.03" y1="41.02" y2="16.53">
-<stop offset="0" stop-color="#36B5FF"/>
-<stop offset="1" stop-color="#1B66D8"/>
+<polygon fill="url(#SVGID_12_)" points="8.999,39.453 30.062,39.453 22.98,34.85 28.856,32.014 21.617,19.762 "/>
+<radialGradient cx="47.2637" cy="23.0933" gradientUnits="userSpaceOnUse" id="SVGID_13_" r="7.9973">
+<stop offset="0" style="stop-color:#3FA8F4"/>
+<stop offset="1" style="stop-color:#CDDBE1"/>
+</radialGradient>
+<circle cx="43.64" cy="19.906" fill="url(#SVGID_13_)" r="3.29"/>
+<polygon fill="#FFFFFF" fill-opacity="0.3" points="31.246,21.997 52.303,19.411 52.303,10.648 32.518,10.648 35.264,16.277 " stroke-opacity="0.3"/>
+<polygon fill="#FFFFFF" fill-opacity="0.3" points="5.042,23.459 26.961,20.772 30.979,15.053 28.232,9.424 5.042,9.424 " stroke-opacity="0.3"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="20.458" x2="54.9136" y1="49.8662" y2="49.8662">
+<stop offset="0" style="stop-color:#C6C6C6"/>
+<stop offset="1" style="stop-color:#8C8C8C"/>
 </linearGradient>
-<path d="M54.271,39.796V17.755c0-0.673-0.553-1.225-1.225-1.225H30.129l-2.338,8.473l6.123,11.939 l-2.189,4.077h21.322C53.719,41.021,54.271,40.469,54.271,39.796z" fill="url(#SVGID_7)"/>
-<path d="M53.878,39.184c0,0.674-0.552,0.612-1.225,0.612H31.988l-0.328,0.612h20.993 C53.326,40.408,53.878,39.857,53.878,39.184z" fill="#FFFFFF" fill-opacity="0.5"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8" x1="41.72" x2="41.72" y1="16.53" y2="41.12">
-<stop offset="0" stop-color="#000000"/>
-<stop offset="1" stop-color="#404040"/>
+<polygon fill="url(#SVGID_14_)" points="54.957,49.154 31.426,49.154 30.553,50.578 54.957,50.578 "/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="15.2666" x2="52.9591" y1="48.6416" y2="48.6416">
+<stop offset="0" style="stop-color:#C6C6C6"/>
+<stop offset="1" style="stop-color:#8C8C8C"/>
 </linearGradient>
-<path d="M53.878,39.796V17.755c0-0.673-0.552-1.225-1.225-1.225H29.736l-0.17,0.612h23.087 c0.337,0,0.611,0.275,0.611,0.612v22.041c0,0.338-0.274,0.612-0.611,0.612H31.66l-0.329,0.612h21.322 C53.326,41.021,53.878,40.469,53.878,39.796z" fill="url(#SVGID_8)"/>
-<path d="M52.653,18.98c0-0.676-0.549-1.225-1.225-1.225H30.622l-1.999,7.249l0.401,0.785l23.629-1.912 V18.98z" fill="#FFFFFF" fill-opacity="0.2"/>
-<radialGradient cx="25.05" cy="27.35" gradientUnits="userSpaceOnUse" id="SVGID_9" r="9.6">
-<stop offset="0" stop-color="#B6D8F8"/>
-<stop offset="1" stop-color="#288CEB"/>
-</radialGradient>
-<polygon fill="url(#SVGID_9)" points="25.47,41.604 26.164,41.604 28.01,38.168 21.888,26.229 24.053,18.384 23.416,18.384 21.234,26.297 27.318,38.161 "/>
-<radialGradient cx="27.6" cy="26.23" gradientUnits="userSpaceOnUse" id="SVGID_10" r="11.02">
-<stop offset="0" stop-color="#B6D8F8"/>
-<stop offset="1" stop-color="#288CEB"/>
-</radialGradient>
-<polygon fill="url(#SVGID_10)" points="31.664,40.399 32.359,40.399 34.212,36.95 28.051,24.938 30.188,17.197 29.553,17.197 27.398,25.004 33.521,36.943 "/>
+<polygon fill="url(#SVGID_15_)" points="15.308,47.93 15.308,49.354 26.267,49.354 27.14,47.93 "/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="42.9424" x2="42.9424" y1="22.2153" y2="49.467">
+<stop offset="0" style="stop-color:#F5F5F5"/>
+<stop offset="0.8061" style="stop-color:#929497"/>
+<stop offset="1" style="stop-color:#D6D6D6"/>
+</linearGradient>
+<polygon fill="url(#SVGID_16_)" points="54.957,22.215 31.092,22.215 30.928,22.45 35.979,29.337 31.08,36.074 35.57,42.4   31.303,49.354 54.957,49.354 "/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="23.5005" x2="23.5005" y1="21.022" y2="48.1933">
+<stop offset="0" style="stop-color:#F5F5F5"/>
+<stop offset="0.8061" style="stop-color:#929497"/>
+<stop offset="1" style="stop-color:#D6D6D6"/>
+</linearGradient>
+<polygon fill="url(#SVGID_17_)" points="26.794,34.85 31.693,28.114 26.642,21.226 26.807,20.991 15.308,20.991 15.308,48.129   27.018,48.129 31.283,41.176 "/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="30.7891" x2="49.1836" y1="23.6563" y2="41.4616">
+<stop offset="0" style="stop-color:#F5F5F5"/>
+<stop offset="1" style="stop-color:#CCCCCC"/>
+</linearGradient>
+<polygon fill="url(#SVGID_18_)" points="36.59,29.337 31.691,36.074 36.182,42.4 32.291,48.74 54.346,48.74 54.346,22.828   31.816,22.828 "/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="23.4995" x2="23.4995" y1="21.7104" y2="47.4548">
+<stop offset="0" style="stop-color:#F5F5F5"/>
+<stop offset="1" style="stop-color:#CCCCCC"/>
+</linearGradient>
+<polygon fill="url(#SVGID_19_)" points="30.672,41.176 26.182,34.85 31.08,28.114 26.306,21.603 15.92,21.603 15.92,47.516   26.781,47.516 "/>
+<polygon fill-opacity="0.3" points="52.324,22.221 31.258,22.221 31.641,21.608 52.324,21.608 " stroke-opacity="0.3"/>
+<polygon fill-opacity="0.3" points="14.709,20.327 14.709,43.811 15.321,43.811 15.321,20.939 26.857,20.939 27.287,20.327 " stroke-opacity="0.3"/>
+<rect fill="none" height="60" width="60"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_custom.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_custom.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_custom.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,37 +1,37 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_1)" points="30.736,19.219 42.881,25.074 30.736,30.929 24.883,43.072 19.027,30.929 6.883,25.074 19.027,19.219 24.883,7.074 "/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_2)" points="39.816,25.074 29.74,29.931 24.883,40.007 20.023,29.931 9.949,25.074 20.023,20.217 24.883,10.141 29.74,20.217 "/>
+<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"/>
 </linearGradient>
-<path d="M24.883,7.474l5.549,11.511l0.176,0.364l0.363,0.177l11.512,5.549l-11.512,5.548l-0.363,0.177 l-0.176,0.364l-5.549,11.511l-5.551-11.511l-0.176-0.364l-0.363-0.177L7.281,25.074l11.512-5.549l0.363-0.177l0.176-0.364 L24.883,7.474 M24.883,4.808L18.291,18.48L4.615,25.074l13.676,6.591l6.592,13.675l6.592-13.675l13.674-6.591L31.475,18.48 L24.883,4.808L24.883,4.808z" fill="url(#SVGID_3)"/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_4)" points="46.385,38.88 53.969,42.535 46.385,46.191 42.73,53.775 39.074,46.191 31.49,42.535 39.074,38.88 42.73,31.297 "/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_5)" points="52.055,42.535 45.764,45.567 42.73,51.859 39.695,45.567 33.404,42.535 39.695,39.502 42.73,33.21 45.764,39.502 "/>
+<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"/>
 </linearGradient>
-<path d="M42.73,31.545l3.465,7.188l0.109,0.227l0.229,0.11l7.188,3.466L46.533,46l-0.229,0.11l-0.109,0.227 l-3.465,7.187l-3.465-7.187l-0.109-0.227L38.928,46l-7.188-3.465l7.188-3.466l0.229-0.11l0.109-0.227L42.73,31.545 M42.73,29.879 l-4.117,8.54l-8.539,4.116l8.539,4.115l4.117,8.541l4.115-8.541l8.539-4.115l-8.539-4.116L42.73,29.879L42.73,29.879z" fill="url(#SVGID_6)"/>
+<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)"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_data_import.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <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"/>
@@ -10,52 +10,52 @@
 <stop offset="0.96" stop-color="#ADB3B5"/>
 <stop offset="1" stop-color="#595C5E"/>
 </linearGradient>
-<path d="M31.223,42.854c0,1.354-1.097,2.449-2.449,2.449H9.183c-1.353,0-2.449-1.096-2.449-2.449 V9.795c0-1.353,1.096-2.449,2.449-2.449h19.59c1.353,0,2.449,1.097,2.449,2.449V42.854z" fill="url(#SVGID_1)"/>
+<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"/>
 </linearGradient>
-<path d="M28.773,7.346H9.183c-1.353,0-2.449,1.097-2.449,2.449v33.058c0,0.654,0.26,1.244,0.677,1.684 c-0.038-0.147-0.065-0.299-0.065-0.459v-1.225V11.02V9.795c0-1.013,0.824-1.837,1.837-1.837h19.59c1.013,0,1.836,0.824,1.836,1.837 v1.224v31.834v1.225c0,0.16-0.026,0.312-0.064,0.459c0.417-0.439,0.678-1.029,0.678-1.684V9.795 C31.223,8.443,30.126,7.346,28.773,7.346z" fill="url(#SVGID_2)"/>
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_3)" fill-opacity="0.6" height="23.876" stroke-opacity="0.6" width="20.815" x="8.571" y="10.407"/>
+<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">
 <stop offset="0" stop-color="#3D3D3D"/>
 <stop offset="1" stop-color="#1A1A1A"/>
 </linearGradient>
-<rect fill="url(#SVGID_4)" height="22.651" width="19.59" x="9.183" y="11.02"/>
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_5)" height="21.427" width="18.366" x="9.795" y="11.632"/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_6)" points="28.161,18.978 9.795,21.427 9.795,12.244 28.161,12.244 "/>
-<rect fill="#9FE4FF" height="0.612" width="18.366" x="9.795" y="11.632"/>
+<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"/>
 <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"/>
 </linearGradient>
-<path d="M17.113,10.407c-0.686,0-1.224-0.448-1.224-1.021V8.979c0-0.572,0.538-1.021,1.224-1.021h4.37 c0.686,0,1.224,0.448,1.224,1.021v0.408c0,0.573-0.538,1.021-1.224,1.021H17.113z" fill="url(#SVGID_7)"/>
+<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"/>
 </linearGradient>
-<path d="M22.095,9.387c0,0.226-0.273,0.409-0.612,0.409h-4.37c-0.338,0-0.612-0.183-0.612-0.409V8.979 c0-0.226,0.274-0.408,0.612-0.408h4.37c0.338,0,0.612,0.183,0.612,0.408V9.387z" fill="url(#SVGID_8)"/>
+<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"/>
 </linearGradient>
-<path d="M17.072,43.467c-1.312,0-2.379-1.057-2.379-2.355 V37.25c0-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.354H17.072z" fill="url(#SVGID_9)" fill-opacity="0.6" stroke-opacity="0.6"/>
-<path d="M17.068,42.854c-0.972,0-1.763-0.781-1.763-1.742V37.25 c0-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.741H17.068z" fill="#020202" fill-opacity="0.5" stroke-opacity="0.5"/>
+<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"/>
@@ -64,40 +64,40 @@
 <stop offset="0.96" stop-color="#ADB3B5"/>
 <stop offset="1" stop-color="#595C5E"/>
 </linearGradient>
-<path d="M22.039,41.111c0,0.625-0.514,1.131-1.146,1.131h-3.83c-0.633,0-1.146-0.506-1.146-1.131 V37.25c0-0.625,0.514-1.131,1.146-1.131h3.83c0.632,0,1.146,0.506,1.146,1.131V41.111z" fill="url(#SVGID_10)"/>
-<path d="M18.366,41.018c-0.675,0-1.225-0.549-1.225-1.225v-1.225 c0-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.225H18.366z" fill="#020202" fill-opacity="0.5" stroke-opacity="0.5"/>
+<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"/>
 </linearGradient>
-<path d="M18.366,40.405c-0.337,0-0.612-0.275-0.612-0.612v-1.225c0-0.336,0.275-0.611,0.612-0.611 h1.224c0.337,0,0.612,0.275,0.612,0.611v1.225c0,0.337-0.275,0.612-0.612,0.612H18.366z" fill="url(#SVGID_11)"/>
+<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"/>
 </linearGradient>
-<path d="M11.02,42.242c-1.35,0-2.449-1.057-2.449-2.355 v-2.025c0-1.297,1.099-2.354,2.449-2.354l0,0c1.35,0,2.449,1.057,2.449,2.354v2.025C13.468,41.186,12.37,42.242,11.02,42.242 L11.02,42.242z" fill="url(#SVGID_12)" fill-opacity="0.6" stroke-opacity="0.6"/>
+<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"/>
 </linearGradient>
-<path d="M11.02,41.629c-1,0-1.812-0.78-1.812-1.742v-2.025 c0-0.961,0.813-1.742,1.812-1.742l0,0c1,0,1.812,0.781,1.812,1.743v2.025C12.832,40.849,12.02,41.629,11.02,41.629L11.02,41.629z" fill="url(#SVGID_13)" fill-opacity="0.7" stroke-opacity="0.7"/>
+<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"/>
 </linearGradient>
-<path d="M12.195,39.887c0,0.625-0.526,1.131-1.175,1.131l0,0c-0.649,0-1.175-0.506-1.175-1.131 v-2.025c0-0.623,0.526-1.129,1.175-1.129l0,0c0.649,0,1.175,0.506,1.175,1.13V39.887z" fill="url(#SVGID_14)"/>
-<path d="M26.981,42.242c-1.374,0-2.493-1.057-2.493-2.355 v-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.354H26.981z" fill="url(#SVGID_12)" fill-opacity="0.6" stroke-opacity="0.6"/>
-<path d="M26.981,41.629c-1.018,0-1.845-0.78-1.845-1.742 v-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.742H26.981z" fill="url(#SVGID_13)" fill-opacity="0.7" stroke-opacity="0.7"/>
+<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"/>
 </linearGradient>
-<path d="M28.089,39.887c0,0.625-0.536,1.131-1.196,1.131h0.089c-0.66,0-1.196-0.506-1.196-1.131 v-2.025c0-0.624,0.536-1.13,1.196-1.13h-0.089c0.66,0,1.196,0.506,1.196,1.13V39.887z" fill="url(#SVGID_17)"/>
-<rect fill="#020202" fill-opacity="0.2" height="37.957" stroke-opacity="0.2" width="1.225" x="21.427" y="7.346"/>
-<rect fill="#020202" fill-opacity="0.1" height="37.957" stroke-opacity="0.1" width="2.449" x="22.039" y="7.346"/>
+<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"/>
@@ -106,7 +106,7 @@
 <stop offset="0.96" stop-color="#ADB3B5"/>
 <stop offset="1" stop-color="#595C5E"/>
 </linearGradient>
-<path d="M51.425,48.977c0,1.352-1.097,2.448-2.448,2.448H25.1c-1.352,0-2.449-1.097-2.449-2.448 V9.795c0-1.353,1.097-2.449,2.449-2.449h23.876c1.352,0,2.448,1.097,2.448,2.449V48.977z" fill="url(#SVGID_18)"/>
+<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"/>
@@ -114,43 +114,43 @@
 <stop offset="0.66" stop-color="#B2BEC2"/>
 <stop offset="1" stop-color="#ADB3B5"/>
 </linearGradient>
-<path d="M48.977,7.346H25.1c-1.352,0-2.449,1.097-2.449,2.449v39.181c0,0.652,0.26,1.242,0.677,1.683 c-0.038-0.147-0.065-0.3-0.065-0.459v-1.224V11.02V9.795c0-1.013,0.824-1.837,1.836-1.837h23.876c1.012,0,1.836,0.824,1.836,1.837 v1.224v37.957V50.2c0,0.159-0.027,0.312-0.064,0.459c0.416-0.44,0.677-1.03,0.677-1.683V9.795 C51.425,8.443,50.328,7.346,48.977,7.346z" fill="url(#SVGID_19)"/>
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_20)" fill-opacity="0.6" height="29.386" stroke-opacity="0.6" width="25.1" x="24.488" y="10.407"/>
+<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">
 <stop offset="0" stop-color="#6E6E6E"/>
 <stop offset="1" stop-color="#333333"/>
 </linearGradient>
-<rect fill="url(#SVGID_21)" height="28.161" width="23.876" x="25.1" y="11.02"/>
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_22)" height="26.937" width="22.651" x="25.712" y="11.632"/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_23)" points="48.363,20.815 25.712,23.264 25.712,12.244 48.363,12.244 "/>
-<rect fill="#9FE4FF" height="0.612" width="22.651" x="25.712" y="11.632"/>
+<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"/>
 <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="1" stop-color="#FFFFFF"/>
 </linearGradient>
-<path d="M34.73,49.588c-1.312,0-2.379-1.057-2.379-2.354 V42.76c0-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.354H34.73z" fill="url(#SVGID_24)" fill-opacity="0.6" stroke-opacity="0.6"/>
-<path d="M34.728,48.977c-0.972,0-1.763-0.781-1.763-1.742V42.76 c0-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.742H34.728z" fill="#020202" fill-opacity="0.5" stroke-opacity="0.5"/>
+<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"/>
 </linearGradient>
-<path d="M40.311,47.234c0,0.623-0.514,1.129-1.146,1.129h-4.442c-0.633,0-1.146-0.506-1.146-1.129 V42.76c0-0.625,0.514-1.131,1.146-1.131h4.442c0.632,0,1.146,0.506,1.146,1.131V47.234z" fill="url(#SVGID_25)"/>
-<path d="M36.025,47.14c-0.676,0-1.225-0.549-1.225-1.225v-1.837 c0-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.225H36.025z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
+<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"/>
@@ -159,40 +159,40 @@
 <stop offset="0.96" stop-color="#ADB3B5"/>
 <stop offset="1" stop-color="#595C5E"/>
 </linearGradient>
-<path d="M36.025,46.527c-0.336,0-0.612-0.275-0.612-0.612v-1.837c0-0.336,0.276-0.611,0.612-0.611 h1.837c0.337,0,0.612,0.275,0.612,0.611v1.837c0,0.337-0.275,0.612-0.612,0.612H36.025z" fill="url(#SVGID_26)"/>
+<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"/>
 </linearGradient>
-<path d="M26.843,48.363c-1.298,0-2.355-1.057-2.355-2.354 v-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.354H26.843z" fill="url(#SVGID_27)" fill-opacity="0.4" stroke-opacity="0.4"/>
+<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"/>
 </linearGradient>
-<path d="M26.843,47.752c-0.961,0-1.743-0.781-1.743-1.742 v-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.742H26.843z" fill="url(#SVGID_28)" fill-opacity="0.7" stroke-opacity="0.7"/>
+<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"/>
 </linearGradient>
-<path d="M28.679,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.639 c0-0.623,0.506-1.129,1.13-1.129h0.706c0.624,0,1.13,0.506,1.13,1.13V46.01z" fill="url(#SVGID_29)"/>
-<path d="M46,48.363c-1.299,0-2.355-1.057-2.355-2.354v-2.639 c0-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.354H46z" fill="url(#SVGID_27)" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M46,47.752c-0.961,0-1.742-0.781-1.742-1.742v-2.639 c0-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.742H46z" fill="url(#SVGID_28)" fill-opacity="0.7" stroke-opacity="0.7"/>
+<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"/>
 </linearGradient>
-<path d="M47.836,46.01c0,0.624-0.506,1.13-1.13,1.13H46c-0.625,0-1.131-0.506-1.131-1.13v-2.639 c0-0.624,0.506-1.13,1.131-1.13h0.706c0.624,0,1.13,0.506,1.13,1.13V46.01z" fill="url(#SVGID_32)"/>
-<rect fill="none" height="59.996" width="59.996"/>
-<polygon fill-opacity="0.1" points="24.281,35.936 16.112,35.937 16.114,26.479 24.281,26.477 24.281,20.355 35.76,31.51 24.282,41.943 " stroke-opacity="0.1"/>
-<polygon fill-opacity="0.2" points="24.893,35.323 16.725,35.324 16.727,27.091 24.893,27.089 24.893,21.804 34.88,31.508 24.895,40.505 " stroke-opacity="0.2"/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_33)" points="25.506,39.066 33.999,30.894 25.505,22.641 25.505,27.088 17.339,27.09 17.337,34.713 25.505,34.711 "/>
-<polygon fill="#FFFFFF" points="33.999,30.894 25.505,22.641 25.505,23.252 33.684,31.198 "/>
-<polygon fill="#FFFFFF" points="17.339,27.703 25.505,27.7 25.505,27.088 17.339,27.09 17.337,34.713 17.337,34.713 "/>
+<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"/>
+<polygon fill="#FFFFFF" points="17.34,27.7,25.5,27.7,25.5,27.09,17.34,27.09,17.34,34.71,17.34,34.71"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_default_server.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_default_server.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<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.3818" style="stop-color:#FFFFFF"/>
+<stop offset="0.7091" style="stop-color:#686E70"/>
+<stop offset="1" style="stop-color:#A6B0B3"/>
+</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"/>
+</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"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30" x2="30" y1="15.5947" y2="6.3742">
+<stop offset="0" style="stop-color:#808080"/>
+<stop offset="1" style="stop-color:#303030"/>
+</linearGradient>
+<rect fill="url(#SVGID_3_)" height="9.412" width="32.59" x="13.705" y="6.183"/>
+<rect fill="#FFFFFF" fill-opacity="0.25" height="1.177" stroke-opacity="0.25" width="32.59" x="13.705" y="15.595"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="30.0015" x2="30.0015" y1="7.4082" y2="14.3725">
+<stop offset="0" style="stop-color:#8B8B8B"/>
+<stop offset="1" style="stop-color:#454545"/>
+</linearGradient>
+<rect fill="url(#SVGID_4_)" height="7.058" width="30.263" x="14.87" y="7.359"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="30.0005" x2="30.0005" y1="8.2974" y2="13.2402">
+<stop offset="0" style="stop-color:#525252"/>
+<stop offset="1" style="stop-color:#1C1C1C"/>
+</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"/>
+</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"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="30" x2="30" y1="28.0029" y2="18.7824">
+<stop offset="0" style="stop-color:#808080"/>
+<stop offset="1" style="stop-color:#303030"/>
+</linearGradient>
+<rect fill="url(#SVGID_7_)" height="9.412" width="32.59" x="13.705" y="18.591"/>
+<rect fill="#FFFFFF" fill-opacity="0.25" height="1.176" stroke-opacity="0.25" width="32.59" x="13.705" y="28.003"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="30.0015" x2="30.0015" y1="19.8154" y2="26.7816">
+<stop offset="0" style="stop-color:#8B8B8B"/>
+<stop offset="1" style="stop-color:#454545"/>
+</linearGradient>
+<rect fill="url(#SVGID_8_)" height="7.06" width="30.263" x="14.87" y="19.767"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="30.0005" x2="30.0005" y1="20.7056" y2="25.6484">
+<stop offset="0" style="stop-color:#525252"/>
+<stop offset="1" style="stop-color:#1C1C1C"/>
+</linearGradient>
+<rect fill="url(#SVGID_9_)" height="4.706" width="27.939" x="16.031" y="20.942"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="26.957" x2="31.9189" y1="50.5098" y2="50.5098">
+<stop offset="0" style="stop-color:#1A1A1A"/>
+<stop offset="0.3212" style="stop-color:#C7C7C7"/>
+<stop offset="0.6848" style="stop-color:#4D4D4D"/>
+<stop offset="0.8545" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#7A7A7A"/>
+</linearGradient>
+<path d="M26.939,48.367v3.674c0,0.338,0.274,0.612,0.612,0.612h3.674c0.338,0,0.612-0.274,0.612-0.612  v-3.674H26.939z" fill="url(#SVGID_10_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="26.9565" x2="31.918" y1="48.6738" y2="48.6738">
+<stop offset="0" style="stop-color:#1A1A1A"/>
+<stop offset="0.3212" style="stop-color:#C7C7C7"/>
+<stop offset="0.6848" style="stop-color:#4D4D4D"/>
+<stop offset="0.8545" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#7A7A7A"/>
+</linearGradient>
+<rect fill="url(#SVGID_11_)" height="0.612" width="4.897" x="26.938" y="48.367"/>
+<g>
+<rect fill="none" height="60" width="60"/>
+</g>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="30.0005" x2="30.0005" y1="48.9316" y2="42.9805">
+<stop offset="0" style="stop-color:#808080"/>
+<stop offset="1" style="stop-color:#303030"/>
+</linearGradient>
+<rect fill="url(#SVGID_12_)" height="6.122" width="37.996" x="11.002" y="42.857"/>
+<rect fill-opacity="0.5" height="0.612" stroke-opacity="0.5" width="37.996" x="11.002" y="42.857"/>
+<rect fill-opacity="0.2" height="0.612" stroke-opacity="0.2" width="37.996" x="11.002" y="43.47"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="12.8589" x2="12.8589" y1="48.9404" y2="44.1797">
+<stop offset="0" style="stop-color:#999999"/>
+<stop offset="1" style="stop-color:#4D4D4D"/>
+</linearGradient>
+<rect fill="url(#SVGID_13_)" height="4.897" width="2.476" x="11.621" y="44.082"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="17.8115" x2="17.8115" y1="48.9404" y2="44.1797">
+<stop offset="0" style="stop-color:#999999"/>
+<stop offset="1" style="stop-color:#4D4D4D"/>
+</linearGradient>
+<rect fill="url(#SVGID_14_)" height="4.897" width="2.476" x="16.574" y="44.082"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="22.7642" x2="22.7642" y1="48.9404" y2="44.1797">
+<stop offset="0" style="stop-color:#999999"/>
+<stop offset="1" style="stop-color:#4D4D4D"/>
+</linearGradient>
+<rect fill="url(#SVGID_15_)" height="4.897" width="2.476" x="21.526" y="44.082"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="27.7158" x2="27.7158" y1="48.9404" y2="44.1797">
+<stop offset="0" style="stop-color:#999999"/>
+<stop offset="1" style="stop-color:#4D4D4D"/>
+</linearGradient>
+<rect fill="url(#SVGID_16_)" height="4.897" width="2.476" x="26.478" y="44.082"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="32.668" x2="32.668" y1="48.9404" y2="44.1797">
+<stop offset="0" style="stop-color:#999999"/>
+<stop offset="1" style="stop-color:#4D4D4D"/>
+</linearGradient>
+<rect fill="url(#SVGID_17_)" height="4.897" width="2.477" x="31.43" y="44.082"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="37.6211" x2="37.6211" y1="48.9404" y2="44.1797">
+<stop offset="0" style="stop-color:#999999"/>
+<stop offset="1" style="stop-color:#4D4D4D"/>
+</linearGradient>
+<rect fill="url(#SVGID_18_)" height="4.897" width="2.477" x="36.383" y="44.082"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="42.5723" x2="42.5723" y1="48.9404" y2="44.1797">
+<stop offset="0" style="stop-color:#999999"/>
+<stop offset="1" style="stop-color:#4D4D4D"/>
+</linearGradient>
+<rect fill="url(#SVGID_19_)" height="4.897" width="2.477" x="41.334" y="44.082"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="47.5254" x2="47.5254" y1="48.9404" y2="44.1797">
+<stop offset="0" style="stop-color:#999999"/>
+<stop offset="1" style="stop-color:#4D4D4D"/>
+</linearGradient>
+<rect fill="url(#SVGID_20_)" height="4.897" width="2.477" x="46.287" y="44.082"/>
+<rect fill-opacity="0.5" height="0.612" stroke-opacity="0.5" width="37.996" x="11.002" y="48.367"/>
+<rect fill="#CCCCCC" fill-opacity="0.5" height="0.612" stroke-opacity="0.5" width="37.996" x="11.002" y="47.755"/>
+<rect fill-opacity="0.3" height="0.612" stroke-opacity="0.3" width="4.897" x="26.938" y="48.979"/>
+<rect fill-opacity="0.1" height="0.612" stroke-opacity="0.1" width="4.897" x="26.938" y="49.592"/>
+<rect fill-opacity="0.3" height="4.897" stroke-opacity="0.3" width="0.612" x="18.979" y="52.653"/>
+<rect fill-opacity="0.3" height="4.897" stroke-opacity="0.3" width="0.612" x="39.184" y="52.653"/>
+<rect fill-opacity="0.1" height="4.897" stroke-opacity="0.1" width="0.612" x="18.367" y="52.653"/>
+<rect fill-opacity="0.1" height="4.897" stroke-opacity="0.1" width="0.612" x="39.796" y="52.653"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="29.3872" x2="29.3872" y1="52.1279" y2="57.9301">
+<stop offset="0" style="stop-color:#1A1A1A"/>
+<stop offset="0.3212" style="stop-color:#C7C7C7"/>
+<stop offset="0.6848" style="stop-color:#4D4D4D"/>
+<stop offset="0.8545" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#7A7A7A"/>
+</linearGradient>
+<rect fill="url(#SVGID_21_)" height="6.122" width="18.367" x="20.204" y="52.041"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_22_" x1="19.8979" x2="19.8979" y1="52.1279" y2="57.9301">
+<stop offset="0" style="stop-color:#1A1A1A"/>
+<stop offset="0.3212" style="stop-color:#C7C7C7"/>
+<stop offset="0.6848" style="stop-color:#4D4D4D"/>
+<stop offset="0.8545" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#7A7A7A"/>
+</linearGradient>
+<path d="M19.592,52.653v4.897c0,0.339,0.274,0.612,0.612,0.612v-6.122  C19.866,52.041,19.592,52.314,19.592,52.653z" fill="url(#SVGID_22_)"/>
+<path d="M19.592,52.653v4.897c0,0.339,0.274,0.612,0.612,0.612v-6.122C19.866,52.041,19.592,52.314,19.592,52.653z" fill-opacity="0.3" stroke-opacity="0.3"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_23_" x1="38.877" x2="38.877" y1="52.1279" y2="57.9301">
+<stop offset="0" style="stop-color:#1A1A1A"/>
+<stop offset="0.3212" style="stop-color:#C7C7C7"/>
+<stop offset="0.6848" style="stop-color:#4D4D4D"/>
+<stop offset="0.8545" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#7A7A7A"/>
+</linearGradient>
+<path d="M38.571,52.041v6.122c0.339,0,0.612-0.273,0.612-0.612v-4.897  C39.184,52.314,38.91,52.041,38.571,52.041z" fill="url(#SVGID_23_)"/>
+<path d="M38.571,52.041v6.122c0.339,0,0.612-0.273,0.612-0.612v-4.897C39.184,52.314,38.91,52.041,38.571,52.041z" fill-opacity="0.3" stroke-opacity="0.3"/>
+</g>
+<g transform="matrix(1 0 0 1 30 30)">
+<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"/>
+</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"/>
+</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"/>
+</g>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_device_lock.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,140 +1,153 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
 <rect fill="none" height="60" width="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="30" x2="30" y1="4.26" y2="55.61">
-<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"/>
+<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"/>
 </linearGradient>
-<path d="M46.574,52.922c0,1.557-1.264,2.818-2.822,2.818H16.248c-1.558,0-2.82-1.262-2.82-2.818V7.082 c0-1.556,1.262-2.82,2.82-2.82h27.504c1.559,0,2.822,1.264,2.822,2.82V52.922z" fill="url(#SVGID_1)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="30" x2="30" y1="4.26" y2="54.73">
-<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"/>
+<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"/>
 </linearGradient>
-<path d="M43.752,4.262H16.248c-1.558,0-2.82,1.264-2.82,2.82v45.84c0,0.752,0.3,1.432,0.78,1.938 c-0.044-0.172-0.072-0.344-0.072-0.529v-1.408V8.492v-1.41c0-1.168,0.95-2.118,2.114-2.118h27.504c1.166,0,2.114,0.95,2.114,2.118 v1.41v44.43v1.408c0,0.186-0.028,0.357-0.072,0.529c0.481-0.506,0.782-1.186,0.782-1.938V7.082 C46.574,5.526,45.311,4.262,43.752,4.262z" fill="url(#SVGID_2)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="30" x2="30" y1="7.84" y2="42.35">
-<stop offset="0" stop-color="#B6BBBD"/>
-<stop offset="1" stop-color="#F0FBFF"/>
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_3)" fill-opacity="0.6" height="34.554" stroke-opacity="0.6" width="28.918" x="15.542" y="7.788"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="30" x2="30" y1="8.54" y2="41.64">
-<stop offset="0" stop-color="#6E6E6E"/>
-<stop offset="1" stop-color="#333333"/>
+<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">
+<stop offset="0" style="stop-color:#6E6E6E"/>
+<stop offset="1" style="stop-color:#333333"/>
+</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"/>
 </linearGradient>
-<rect fill="url(#SVGID_4)" height="33.146" width="27.504" x="16.248" y="8.492"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="30" x2="30" y1="9.25" y2="40.94">
-<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"/>
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_5)" height="31.735" width="26.094" x="16.954" y="9.198"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6" x1="30" x2="30" y1="9.75" y2="22.36">
-<stop offset="0" stop-color="#85EFFF"/>
-<stop offset="1" stop-color="#3BA1D9"/>
+<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"/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_6)" points="43.046,20.48 16.954,23.3 16.954,9.904 43.046,9.904 "/>
-<rect fill="#9FE4FF" height="0.708" width="26.094" x="16.954" y="9.198"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7" x1="30.2" x2="30.2" y1="7.82" y2="4.99">
-<stop offset="0" stop-color="#FFFFFF"/>
-<stop offset="1" stop-color="#D1D7D9"/>
+<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"/>
 </linearGradient>
-<path d="M27.088,7.788c-0.792,0-1.412-0.516-1.412-1.176V6.14c0-0.658,0.622-1.176,1.412-1.176h6.238 c0.79,0,1.408,0.518,1.408,1.176v0.47c0,0.66-0.621,1.176-1.408,1.176h-6.238V7.788z" fill="url(#SVGID_7)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8" x1="30.21" x2="30.21" y1="5.38" y2="7.2">
-<stop offset="0" stop-color="#6C7375"/>
-<stop offset="1" stop-color="#BDC2C4"/>
+<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="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"/>
 </linearGradient>
-<path d="M34.034,6.612c0,0.26-0.318,0.47-0.708,0.47h-6.238c-0.39,0-0.708-0.21-0.708-0.47V6.14 c0-0.262,0.316-0.468,0.708-0.468h6.238c0.388,0,0.708,0.208,0.708,0.468V6.612z" fill="url(#SVGID_8)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9" x1="29.89" x2="29.89" y1="43.08" y2="53.56">
-<stop offset="0" stop-color="#B6BBBD"/>
-<stop offset="1" stop-color="#FFFFFF"/>
+<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"/>
 </linearGradient>
-<path d="M27.344,53.626c-1.512,0-2.744-1.216-2.744-2.712 V45.76c0-1.494,1.232-2.71,2.744-2.71h5.094c1.515,0,2.744,1.216,2.744,2.71v5.154c0,1.496-1.229,2.712-2.744,2.712H27.344z" fill="url(#SVGID_9)" fill-opacity="0.6" stroke-opacity="0.6"/>
-<path d="M27.34,52.922c-1.122,0-2.032-0.902-2.032-2.008V45.76 c0-1.107,0.91-2.008,2.032-2.008h5.104c1.123,0,2.031,0.9,2.031,2.008v5.154c0,1.105-0.908,2.008-2.031,2.008H27.34z" fill="#020202" fill-opacity="0.5" stroke-opacity="0.5"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10" x1="29.89" x2="29.89" y1="44.43" y2="52.23">
-<stop offset="0" stop-color="#A6A8AB"/>
-<stop offset="0.7" stop-color="#58595B"/>
-<stop offset="1" stop-color="#808184"/>
+<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"/>
 </linearGradient>
-<path d="M33.771,50.914c0,0.718-0.594,1.3-1.319,1.3h-5.12c-0.728,0-1.32-0.582-1.32-1.3V45.76 c0-0.716,0.592-1.298,1.32-1.298h5.12c0.726,0,1.319,0.582,1.319,1.298V50.914z" fill="url(#SVGID_10)"/>
-<path d="M28.836,50.805c-0.782,0-1.414-0.633-1.414-1.41v-2.119 c0-0.775,0.632-1.407,1.414-1.407h2.112c0.78,0,1.411,0.632,1.411,1.407v2.119c0,0.777-0.631,1.41-1.411,1.41H28.836z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11" x1="29.89" x2="29.89" y1="46.56" y2="50.1">
-<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"/>
+<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"/>
 </linearGradient>
-<path d="M28.836,50.098c-0.392,0-0.708-0.313-0.708-0.703v-2.119c0-0.385,0.314-0.703,0.708-0.703 h2.112c0.39,0,0.708,0.316,0.708,0.703v2.119c0,0.388-0.316,0.703-0.708,0.703H28.836z" fill="url(#SVGID_11)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12" x1="18.66" x2="18.66" y1="43.71" y2="52.23">
-<stop offset="0" stop-color="#B6BBBD"/>
-<stop offset="1" stop-color="#F0FBFF"/>
+<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"/>
 </linearGradient>
-<path d="M18.256,52.214c-1.496,0-2.714-1.216-2.714-2.712 v-3.036c0-1.498,1.218-2.714,2.714-2.714h0.81c1.498,0,2.714,1.216,2.714,2.714v3.036c0,1.496-1.216,2.712-2.714,2.712H18.256z" fill="url(#SVGID_12)" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13" x1="18.66" x2="18.66" y1="44.43" y2="51.52">
-<stop offset="0" stop-color="#231F20"/>
-<stop offset="1" stop-color="#6D6E70"/>
+<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"/>
 </linearGradient>
-<path d="M18.256,51.51c-1.106,0-2.008-0.9-2.008-2.008v-3.036 c0-1.11,0.902-2.006,2.008-2.006h0.81c1.11,0,2.01,0.896,2.01,2.006v3.036c0,1.107-0.9,2.008-2.01,2.008H18.256z" fill="url(#SVGID_13)" fill-opacity="0.7" stroke-opacity="0.7"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14" x1="18.66" x2="18.66" y1="45.14" y2="50.82">
-<stop offset="0" stop-color="#C6FF45"/>
-<stop offset="0.73" stop-color="#66A00E"/>
-<stop offset="1" stop-color="#387300"/>
+<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"/>
 </linearGradient>
-<path d="M20.37,49.502c0,0.721-0.582,1.303-1.302,1.303h-0.812c-0.718,0-1.302-0.582-1.302-1.303 v-3.036c0-0.72,0.584-1.302,1.302-1.302h0.81c0.72,0,1.302,0.582,1.302,1.302v3.036H20.37z" fill="url(#SVGID_14)"/>
-<path d="M40.322,52.214c-1.494,0-2.711-1.216-2.711-2.712 v-3.036c0-1.498,1.217-2.714,2.711-2.714h0.812c1.5,0,2.714,1.216,2.714,2.714v3.036c0,1.496-1.214,2.712-2.714,2.712H40.322z" fill="url(#SVGID_12)" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M40.322,51.51c-1.108,0-2.008-0.9-2.008-2.008v-3.036 c0-1.11,0.899-2.006,2.008-2.006h0.812c1.11,0,2.009,0.896,2.009,2.006v3.036c0,1.107-0.898,2.008-2.009,2.008H40.322z" fill="url(#SVGID_13)" fill-opacity="0.7" stroke-opacity="0.7"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17" x1="40.73" x2="40.73" y1="45.14" y2="50.82">
-<stop offset="0" stop-color="#FFC142"/>
-<stop offset="0.75" stop-color="#CF4E18"/>
-<stop offset="1" stop-color="#B52100"/>
+<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"/>
 </linearGradient>
-<path d="M42.438,49.502c0,0.721-0.582,1.303-1.301,1.303h-0.813c-0.717,0-1.301-0.582-1.301-1.303 v-3.036c0-0.72,0.584-1.302,1.301-1.302h0.813c0.719,0,1.301,0.582,1.301,1.302V49.502z" fill="url(#SVGID_17)"/>
+<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 8.3999 5.04)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-1.0313" x2="14.444" y1="-3.8467" y2="-3.8467">
+<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">
 <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.106,3.081c-4.303,0-7.794,3.46-7.854,7.749v2.881h2.657V10.83  c0.061-2.818,2.366-5.092,5.198-5.092c2.831,0,5.136,2.273,5.198,5.092v3.863h2.655V10.83C22.898,6.541,19.408,3.081,15.106,3.081z" fill="url(#SVGID_1_)"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 8.3999 5.04)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-0.5474" x2="13.9592" y1="-4.0928" y2="-4.0928">
+<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"/>
 </linearGradient>
-<path d="M20.793,14.203V10.83c-0.066-3.084-2.617-5.582-5.687-5.582c-3.072,0-5.623,2.498-5.689,5.572v3.873  H7.743V10.83c0.057-4,3.359-7.258,7.363-7.258c4.003,0,7.304,3.258,7.361,7.265v3.366H20.793z" fill="url(#SVGID_2_)"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 8.3999 5.04)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-0.2461" x2="13.6586" y1="-4.0938" y2="-4.0938">
-<stop offset="0" style="stop-color:#B4B4B4"/>
-<stop offset="0.5" style="stop-color:#E6E6E6"/>
-<stop offset="1" style="stop-color:#BEBEBE"/>
+<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"/>
 </linearGradient>
-<path d="M8.049,14.388V10.83c0.054-3.832,3.22-6.951,7.057-6.951c3.835,0,7.001,3.123,7.056,6.962v3.056H21.1  V10.83c-0.07-3.25-2.76-5.889-5.994-5.889c-3.236,0-5.925,2.634-5.995,5.872v3.574L8.049,14.388L8.049,14.388z" fill="url(#SVGID_3_)"/>
-<g>
-<rect fill="none" height="30" width="30"/>
-</g>
-<linearGradient gradientTransform="matrix(1 0 0 -1 8.3999 5.04)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-3.1958" x2="16.3945" y1="-15.3169" y2="-15.3169">
+<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"/>
 </linearGradient>
-<path d="M24.795,26.633c0,0.338-0.273,0.612-0.611,0.612H5.816c-0.338,0-0.612-0.274-0.612-0.612V14.082  c0-0.338,0.274-0.613,0.612-0.613h18.368c0.338,0,0.61,0.275,0.61,0.613L24.795,26.633L24.795,26.633z" fill="url(#SVGID_4_)"/>
-<path d="M24.184,13.469H5.816c-0.338,0-0.612,0.275-0.612,0.613v0.611  c0-0.338,0.274-0.611,0.612-0.611h18.368c0.338,0,0.61,0.273,0.61,0.611v-0.611C24.795,13.744,24.521,13.469,24.184,13.469z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<rect fill="#EE8F11" fill-opacity="0.5" height="2.144" stroke-opacity="0.5" width="19.591" x="5.204" y="16.225"/>
-<rect fill-opacity="0.25" height="0.308" stroke-opacity="0.25" width="19.591" x="5.204" y="16.225"/>
-<path d="M24.184,27.245H5.816c-0.338,0-0.612-0.274-0.612-0.612v-0.611  c0,0.338,0.274,0.611,0.612,0.611h18.368c0.338,0,0.61-0.273,0.61-0.611v0.611C24.795,26.971,24.521,27.245,24.184,27.245z" fill-opacity="0.25" stroke-opacity="0.25"/>
-<rect fill="#FEE38E" fill-opacity="0.25" height="0.307" stroke-opacity="0.25" width="19.591" x="5.204" y="18.367"/>
+<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__)"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_device_update.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,123 +1,132 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
 <rect fill="none" height="60" width="60"/>
-<rect fill="none" height="59.996" width="59.996"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="29.69" x2="29.69" y1="7.35" y2="51.92">
-<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"/>
+<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"/>
 </linearGradient>
-<path d="M44.078,49.588c0,1.353-1.096,2.449-2.449,2.449H17.754c-1.353,0-2.449-1.097-2.449-2.449 V9.795c0-1.353,1.096-2.449,2.449-2.449h23.875c1.354,0,2.449,1.097,2.449,2.449V49.588z" fill="url(#SVGID_1)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="29.69" x2="29.69" y1="7.35" y2="51.16">
-<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"/>
+<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"/>
 </linearGradient>
-<path d="M41.629,7.346H17.754c-1.353,0-2.449,1.097-2.449,2.449v39.792 c0,0.652,0.26,1.244,0.676,1.684c-0.037-0.148-0.064-0.3-0.064-0.459v-1.225V11.02V9.795c0-1.013,0.824-1.837,1.837-1.837h23.875 c1.014,0,1.838,0.824,1.838,1.837v1.224v38.568v1.225c0,0.159-0.027,0.311-0.064,0.459c0.416-0.439,0.676-1.031,0.676-1.684V9.795 C44.078,8.443,42.982,7.346,41.629,7.346z" fill="url(#SVGID_2)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="29.69" x2="29.69" y1="10.45" y2="40.41">
-<stop offset="0" stop-color="#B6BBBD"/>
-<stop offset="1" stop-color="#F0FBFF"/>
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_3)" fill-opacity="0.6" height="29.998" stroke-opacity="0.6" width="25.101" x="17.142" y="10.407"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="29.69" x2="29.69" y1="11.06" y2="39.8">
-<stop offset="0" stop-color="#6E6E6E"/>
-<stop offset="1" stop-color="#333333"/>
+<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">
+<stop offset="0" style="stop-color:#6E6E6E"/>
+<stop offset="1" style="stop-color:#333333"/>
 </linearGradient>
-<rect fill="url(#SVGID_4)" height="28.773" width="23.875" x="17.754" y="11.02"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="29.69" x2="29.69" y1="11.67" y2="39.18">
-<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"/>
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_5)" height="27.549" width="22.651" x="18.366" y="11.632"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6" x1="29.69" x2="29.69" y1="12.11" y2="23.06">
-<stop offset="0" stop-color="#85EFFF"/>
-<stop offset="1" stop-color="#3BA1D9"/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_6)" points="41.018,21.427 18.366,23.876 18.366,12.244 41.018,12.244 "/>
-<rect fill="#9FE4FF" height="0.612" width="22.651" x="18.366" y="11.632"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7" x1="29.87" x2="29.87" y1="10.44" y2="7.99">
-<stop offset="0" stop-color="#FFFFFF"/>
-<stop offset="1" stop-color="#D1D7D9"/>
+<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"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M27.163,10.407c-0.686,0-1.224-0.448-1.224-1.02V8.979c0-0.573,0.538-1.021,1.224-1.021h5.416 c0.687,0,1.225,0.448,1.225,1.021v0.408c0,0.572-0.538,1.02-1.225,1.02H27.163z" fill="url(#SVGID_7)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8" x1="29.87" x2="29.87" y1="8.32" y2="9.9">
-<stop offset="0" stop-color="#6C7375"/>
-<stop offset="1" stop-color="#BDC2C4"/>
+<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="1" style="stop-color:#FFFFFF"/>
 </linearGradient>
-<path d="M33.19,9.388c0,0.226-0.273,0.408-0.612,0.408h-5.416c-0.338,0-0.612-0.182-0.612-0.408V8.979 c0-0.226,0.274-0.409,0.612-0.409h5.416c0.339,0,0.612,0.183,0.612,0.409V9.388z" fill="url(#SVGID_8)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9" x1="29.6" x2="29.6" y1="41.04" y2="50.14">
-<stop offset="0" stop-color="#B6BBBD"/>
-<stop offset="1" stop-color="#FFFFFF"/>
+<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"/>
 </linearGradient>
-<path d="M27.384,50.2c-1.312,0-2.378-1.058-2.378-2.354v-4.475 c0-1.299,1.066-2.354,2.378-2.354h4.425c1.313,0,2.38,1.056,2.38,2.354v4.475c0,1.297-1.066,2.354-2.38,2.354H27.384z" fill="url(#SVGID_9)" fill-opacity="0.6" stroke-opacity="0.6"/>
-<path d="M27.382,49.588c-0.972,0-1.764-0.78-1.764-1.742v-4.475 c0-0.961,0.792-1.742,1.764-1.742h4.432c0.973,0,1.763,0.781,1.763,1.742v4.475c0,0.96-0.79,1.742-1.763,1.742H27.382z" fill="#020202" fill-opacity="0.5" stroke-opacity="0.5"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10" x1="29.6" x2="29.6" y1="42.21" y2="48.99">
-<stop offset="0" stop-color="#A6A8AB"/>
-<stop offset="0.7" stop-color="#58595B"/>
-<stop offset="1" stop-color="#808184"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M32.965,47.846c0,0.625-0.514,1.131-1.146,1.131h-4.443c-0.632,0-1.146-0.506-1.146-1.131 v-4.475c0-0.624,0.514-1.13,1.146-1.13h4.443c0.632,0,1.146,0.506,1.146,1.13V47.846z" fill="url(#SVGID_10)"/>
-<path d="M28.679,47.752c-0.675,0-1.225-0.549-1.225-1.225V44.69 c0-0.676,0.549-1.224,1.225-1.224h1.836c0.676,0,1.225,0.548,1.225,1.224v1.837c0,0.676-0.549,1.225-1.225,1.225H28.679z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11" x1="29.6" x2="29.6" y1="44.06" y2="47.14">
-<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"/>
+<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"/>
 </linearGradient>
-<path d="M28.679,47.14c-0.337,0-0.612-0.274-0.612-0.612V44.69c0-0.336,0.275-0.612,0.612-0.612 h1.836c0.338,0,0.612,0.276,0.612,0.612v1.837c0,0.338-0.274,0.612-0.612,0.612H28.679z" fill="url(#SVGID_11)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12" x1="19.85" x2="19.85" y1="41.59" y2="48.99">
-<stop offset="0" stop-color="#B6BBBD"/>
-<stop offset="1" stop-color="#F0FBFF"/>
+<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"/>
 </linearGradient>
-<path d="M19.496,48.977c-1.297,0-2.354-1.058-2.354-2.355 v-2.638c0-1.296,1.057-2.354,2.354-2.354h0.707c1.298,0,2.354,1.059,2.354,2.355v2.638c0,1.297-1.057,2.354-2.354,2.354H19.496z" fill="url(#SVGID_12)" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13" x1="19.85" x2="19.85" y1="42.21" y2="48.37">
-<stop offset="0" stop-color="#231F20"/>
-<stop offset="1" stop-color="#6D6E70"/>
+<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"/>
 </linearGradient>
-<path d="M19.496,48.363c-0.962,0-1.742-0.78-1.742-1.742 v-2.638c0-0.961,0.78-1.741,1.742-1.741h0.707c0.96,0,1.742,0.78,1.742,1.742v2.638c0,0.961-0.782,1.741-1.742,1.741H19.496z" fill="url(#SVGID_13)" fill-opacity="0.7" stroke-opacity="0.7"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14" x1="19.85" x2="19.85" y1="42.83" y2="47.76">
-<stop offset="0" stop-color="#C6FF45"/>
-<stop offset="0.73" stop-color="#66A00E"/>
-<stop offset="1" stop-color="#387300"/>
+<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"/>
 </linearGradient>
-<path d="M21.333,46.621c0,0.625-0.505,1.131-1.13,1.131h-0.707c-0.624,0-1.13-0.506-1.13-1.131 v-2.638c0-0.624,0.506-1.13,1.13-1.13h0.707c0.625,0,1.13,0.506,1.13,1.131V46.621z" fill="url(#SVGID_14)"/>
-<path d="M38.654,48.977c-1.299,0-2.355-1.058-2.355-2.355 v-2.638c0-1.298,1.057-2.354,2.355-2.354h0.705c1.298,0,2.355,1.057,2.355,2.354v2.638c0,1.298-1.058,2.355-2.355,2.355H38.654z" fill="url(#SVGID_12)" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M38.654,48.363c-0.962,0-1.744-0.78-1.744-1.742 v-2.638c0-0.961,0.781-1.742,1.744-1.742h0.705c0.961,0,1.743,0.78,1.743,1.742v2.638c0,0.961-0.782,1.742-1.743,1.742H38.654z" fill="url(#SVGID_13)" fill-opacity="0.7" stroke-opacity="0.7"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17" x1="39.01" x2="39.01" y1="42.83" y2="47.76">
-<stop offset="0" stop-color="#FFC142"/>
-<stop offset="0.75" stop-color="#CF4E18"/>
-<stop offset="1" stop-color="#B52100"/>
+<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"/>
 </linearGradient>
-<path d="M40.49,46.621c0,0.625-0.507,1.131-1.131,1.131h-0.705c-0.625,0-1.131-0.506-1.131-1.131 v-2.638c0-0.624,0.506-1.13,1.131-1.13h0.705c0.624,0,1.131,0.506,1.131,1.13V46.621z" fill="url(#SVGID_17)"/>
+<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(0.5 0 0 0.5 30 30)">
-<rect fill="none" height="60" width="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30.05" x2="30.04" y1="5.29" y2="53.46">
-<stop offset="0" stop-color="#C6FF45"/>
-<stop offset="0.73" stop-color="#66A00E"/>
-<stop offset="1" stop-color="#387300"/>
+<g transform="matrix(1 0 0 1 30 30)">
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_1_)" points="9.296,32.451 29.883,53.938 50.791,32.426 39.523,32.422 39.515,5.833 20.331,5.831 20.331,32.449 "/>
-<line fill="none" x1="39.515" x2="20.331" y1="5.841" y2="5.84"/>
-<polygon fill="#E7FFB9" points="20.331,5.34 39.516,5.341 39.515,6.34 20.331,6.339 "/>
-<polygon fill="#E7FFB9" points="39.221,32.462 51.006,32.465 50.113,33.464 39.221,33.464 "/>
-<polygon fill="#E7FFB9" points="8.643,32.449 20.313,32.449 20.313,33.449 9.695,33.449 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="48.38" x2="10.72" y1="43.53" y2="43.53">
-<stop offset="0" stop-color="#AAE535"/>
-<stop offset="1" stop-color="#5D9C0A"/>
+<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 "/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_2_)" points="50.141,32.424 29.883,53.221 9.849,32.397 8.458,32.4 29.881,54.655 51.54,32.424 "/>
-<rect fill="none" height="59.996" width="59.996"/>
+<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>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_dialer.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_dialer.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_dialer.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,46 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <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"/>
 </linearGradient>
-<rect fill="url(#SVGID_1)" height="10.425" width="10.424" x="11.962" y="5.674"/>
-<rect fill="url(#SVGID_1)" height="10.425" width="10.424" x="24.705" y="5.674"/>
-<rect fill="url(#SVGID_1)" height="10.425" width="10.424" x="37.609" y="5.674"/>
-<rect fill="url(#SVGID_1)" height="10.425" width="10.424" x="11.962" y="18.25"/>
-<rect fill="url(#SVGID_1)" height="10.425" width="10.424" x="24.705" y="18.25"/>
-<rect fill="url(#SVGID_1)" height="10.425" width="10.424" x="37.609" y="18.25"/>
-<rect fill="url(#SVGID_1)" height="10.424" width="10.424" x="11.962" y="30.99"/>
-<rect fill="url(#SVGID_1)" height="10.424" width="10.424" x="24.705" y="30.99"/>
-<rect fill="url(#SVGID_1)" height="10.426" width="10.424" x="24.705" y="43.896"/>
-<rect fill="url(#SVGID_1)" height="10.424" width="10.424" x="37.609" y="30.99"/>
+<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"/>
+<rect fill="url(#SVGID_1)" height="10.42" width="10.42" x="37.61" y="5.674"/>
+<rect fill="url(#SVGID_1)" height="10.42" width="10.42" x="11.96" y="18.25"/>
+<rect fill="url(#SVGID_1)" height="10.42" width="10.42" x="24.7" y="18.25"/>
+<rect fill="url(#SVGID_1)" height="10.42" width="10.42" x="37.61" y="18.25"/>
+<rect fill="url(#SVGID_1)" height="10.42" width="10.42" x="11.96" y="30.99"/>
+<rect fill="url(#SVGID_1)" height="10.42" width="10.42" x="24.7" y="30.99"/>
+<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"/>
 </linearGradient>
-<path d="M21.161,6.898v7.976h-7.975V6.898H21.161 M22.386,5.674H11.962v10.425h10.424V5.674 L22.386,5.674z" fill="url(#SVGID_11)"/>
-<path d="M33.905,6.898v7.976H25.93V6.898H33.905 M35.13,5.674H24.705v10.425h10.424L35.13,5.674 L35.13,5.674z" fill="url(#SVGID_11)"/>
-<path d="M46.81,6.898v7.976h-7.976V6.898H46.81 M48.033,5.674H37.609v10.425h10.424V5.674 L48.033,5.674z" fill="url(#SVGID_11)"/>
+<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"/>
 </linearGradient>
-<path d="M21.161,19.475v7.977h-7.975v-7.977H21.161 M22.386,18.25H11.962v10.425h10.424V18.25 L22.386,18.25z" fill="url(#SVGID_14)"/>
-<path d="M33.905,19.475v7.977H25.93v-7.977H33.905 M35.13,18.25H24.705v10.425h10.424L35.13,18.25 L35.13,18.25z" fill="url(#SVGID_14)"/>
-<path d="M46.81,19.475v7.977h-7.976v-7.977H46.81 M48.033,18.25H37.609v10.425h10.424V18.25 L48.033,18.25z" fill="url(#SVGID_14)"/>
+<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"/>
 </linearGradient>
-<path d="M21.161,32.215v7.975h-7.975v-7.975H21.161 M22.386,30.99H11.962v10.424h10.424V30.99 L22.386,30.99z" fill="url(#SVGID_17)"/>
-<path d="M33.905,32.215v7.975H25.93v-7.975H33.905 M35.13,30.99H24.705v10.424h10.424L35.13,30.99 L35.13,30.99z" fill="url(#SVGID_17)"/>
+<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"/>
 </linearGradient>
-<path d="M33.905,45.121v7.978H25.93v-7.978H33.905 M35.13,43.896H24.705v10.426h10.424L35.13,43.896 L35.13,43.896z" fill="url(#SVGID_19)"/>
-<path d="M46.81,32.215v7.975h-7.976v-7.975H46.81 M48.033,30.99H37.609v10.424h10.424V30.99 L48.033,30.99z" fill="url(#SVGID_17)"/>
-<rect fill="none" height="59.996" width="59.996"/>
+<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)"/>
+<rect fill="none" height="60" width="60"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_dialled_voice_call.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,62 +1,62 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5609 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="423.0967" x2="429.6527" y1="-578.646" y2="-582.908">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.6061" style="stop-color:#154EBD"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
-</linearGradient>
-<path d="M19.081,33.911c2.089-3.597,4.591-6.497,7.281-9.189c2.593-2.591,6.72-5.3,8.562-6.256l9.604-10.282  c-0.845-0.3-3.693-0.464-7.279,0.616c-3.586,1.083-11.736,6.303-16.979,11.547c-5.242,5.246-9.727,12.347-10.581,14.595  c-1.343,3.541-1.221,7.445-0.929,8.581c0,0,0.34,1.034,1.144,2.377C10.248,46.476,19.081,33.911,19.081,33.911z" fill="url(#SVGID_1_)"/>
-<path d="M31.184,20.8c1.488-1.036,2.87-1.882,3.74-2.334L44.271,8.46  c-0.132-0.058-0.209-0.088-0.209-0.088c-0.247-0.088-0.642-0.162-1.124-0.219c-0.793,0.006-1.596,0.093-2.401,0.27  C34.843,9.673,31.019,14.958,31.184,20.8z" fill="#020202" fill-opacity="0.05" stroke-opacity="0.05"/>
-<path d="M31.906,20.306c1.205-0.809,2.291-1.462,3.018-1.84l9.377-10.04  c-0.146-0.063-0.233-0.098-0.233-0.098c-0.231-0.08-0.604-0.152-1.06-0.203c-0.751,0.006-1.51,0.087-2.27,0.253  C35.275,9.576,31.636,14.695,31.906,20.306z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M44.079,8.263c-0.21-0.073-0.55-0.137-0.962-0.186c-0.681,0.006-1.369,0.08-2.06,0.231  c-5.087,1.116-8.426,5.984-7.978,11.233c0.725-0.455,1.363-0.826,1.844-1.076l9.424-10.088C44.178,8.302,44.079,8.263,44.079,8.263z  " fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="43.3906" cy="8.9175" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="18.5073">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.6061" style="stop-color:#154EBD"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+<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"/>
 </radialGradient>
-<path d="M34.924,18.466l0.929,1.55c0,0,15.101-6.784,14.084-8.038c-0.513-0.631-0.577-0.656-1.237-1.263  c-1.985-1.815-4.172-2.531-4.172-2.531c-0.186-0.063-0.481-0.12-0.845-0.161c-0.596,0.004-1.2,0.068-1.806,0.201  c-4.591,1.009-7.57,5.501-6.963,10.257C34.916,18.477,34.921,18.47,34.924,18.466z" fill="url(#SVGID_2_)"/>
-<path d="M17.483,34.106c-0.988-0.14-2.007-0.119-3.027,0.105c-2.418,0.53-4.376,2.066-5.646,4.131  c-0.367,2.35-0.25,4.407-0.05,5.18c0,0,0.34,1.034,1.144,2.377c0.29,0.482,6.54-8.264,8.556-11.107L17.483,34.106z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M18.366,34.136c-0.989-0.14-2.008-0.118-3.029,0.105c-3.313,0.727-5.775,3.332-6.76,6.623  c-0.026,1.025,0.034,1.872,0.127,2.397c0.003,0.013,0.005,0.034,0.01,0.048c0,0,0.34,1.033,1.144,2.379  c0.3,0.498,6.981-8.888,8.75-11.384L18.366,34.136z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="437.4258" cy="-571.231" gradientTransform="matrix(0.2095 0.9787 -0.9682 0.2124 -629.4526 -270.6148)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="14.6198">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.6061" style="stop-color:#154EBD"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
-</radialGradient>
-<path d="M11.202,47.738c0.616,0.74,0.646,0.954,1.295,1.524c1.194,1.055,9.301-13.612,9.301-13.612  l-2.683-1.719c-0.941-0.111-1.914-0.079-2.89,0.136c-4.777,1.048-7.806,5.868-6.87,10.832C9.749,45.686,10.349,46.71,11.202,47.738z  " fill="url(#SVGID_3_)"/>
-<path d="M49.937,11.978c-0.179-0.22-0.381-0.446-0.578-0.67l-13.944,7.959l0.438,0.749  C35.853,20.016,50.953,13.231,49.937,11.978z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="422.2881" x2="427.4786" y1="-610.9287" y2="-594.4409">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.8121" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M35.853,20.016l1.178,1.981c0.302,0.515,0.972,0.674,1.569,0.422l4.09-2.334l8.043-4.668  c0.632-0.363,0.878-1.119,0.549-1.686c0,0-0.333-0.501-1.349-1.751L35.853,20.016z" fill="url(#SVGID_4_)"/>
-<path d="M21.798,35.65l-0.725-0.472l-9.215,13.486c0.216,0.204,0.43,0.414,0.639,0.598  C13.691,50.317,21.798,35.65,21.798,35.65z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="439.6982" x2="451.5232" y1="-577.7549" y2="-564.7323">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.8121" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+<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"/>
 </linearGradient>
-<path d="M12.498,49.262c1.193,1.05,1.686,1.37,1.686,1.37c0.567,0.367,1.363,0.169,1.781-0.442l7.9-11.605  c0.419-0.614,0.307-1.411-0.26-1.777l-1.808-1.156L12.498,49.262z" fill="url(#SVGID_5_)"/>
+<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"/>
+</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"/>
+</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(0.5 0 0 0.5 0 0)">
-<linearGradient gradientTransform="matrix(2 2.000000e-004 2.000000e-004 -2 -296.7427 -320.1567)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="163.3652" x2="163.3652" y1="-162.0562" y2="-186.8191">
+<g>
+<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"/>
 </linearGradient>
-<polygon points="50.762,28.576 30.054,7.056 9.146,28.576 20.414,28.576 20.42,53.164 39.73,53.168   39.727,28.576 " style="fill:url(#SVGID_1__);"/>
-<linearGradient gradientTransform="matrix(2 2.000000e-004 2.000000e-004 -2 -296.7427 -320.1567)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="163.3887" x2="163.3887" y1="-163.2979" y2="-174.6362">
+<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"/>
 </linearGradient>
-<polygon points="9.794,28.572 30.052,7.776 50.208,28.576 51.602,28.576 30.054,6.34 8.398,28.572 " style="fill:url(#SVGID_2__);"/>
-<line style="fill:none;" x1="20.42" x2="39.73" y1="53.156" y2="53.16"/>
-<polygon points="39.734,53.66 20.42,53.656 20.42,52.656 39.732,52.66 " style="fill:#33AEDB;"/>
-<rect height="60" style="fill:none;" width="60"/>
+<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 "/>
+<rect fill="none" height="30" width="30" x="0.152" y="0.436"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
 <rect fill="none" height="60" width="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="30" x2="30" y1="8.47" y2="51.33">
-<stop offset="0" stop-color="#F2F2F2"/>
-<stop offset="0.25" stop-color="#4F88BD"/>
-<stop offset="0.73" stop-color="#0055A3"/>
-<stop offset="1" stop-color="#64AEFB"/>
+<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"/>
 </linearGradient>
-<path d="M30,51.428C18.184,51.428,8.57,41.816,8.57,30C8.57,18.186,18.184,8.572,30,8.572 c11.814,0,21.43,9.613,21.43,21.428C51.43,41.816,41.814,51.428,30,51.428L30,51.428z" fill="url(#SVGID_1)"/>
-<radialGradient cx="29.8" cy="13.11" gradientUnits="userSpaceOnUse" id="SVGID_2" r="39.33">
-<stop offset="0" stop-color="#96E9FA"/>
-<stop offset="0.15" stop-color="#96E9FA"/>
-<stop offset="0.75" stop-color="#005BCC"/>
-<stop offset="1" stop-color="#0087D9"/>
+<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"/>
 </radialGradient>
-<path d="M50.816,30c0,11.498-9.322,20.816-20.816,20.816C18.504,50.816,9.184,41.498,9.184,30 c0-11.494,9.32-20.816,20.816-20.816C41.494,9.184,50.816,18.506,50.816,30z" fill="url(#SVGID_2)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="30" x2="30" y1="15.46" y2="43.93">
-<stop offset="0" stop-color="#0B81FA"/>
-<stop offset="1" stop-color="#47DAFA"/>
+<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"/>
 </linearGradient>
-<path d="M29.998,44.193c-3.898,0-7.273-1.402-10.029-4.172c-2.762-2.773-4.16-6.152-4.16-10.041 c0-3.871,1.402-7.238,4.168-10.008c2.771-2.764,6.143-4.164,10.021-4.164c3.898,0,7.273,1.398,10.033,4.156 c2.758,2.758,4.16,6.127,4.16,10.016c0,2.268-0.469,4.27-1.387,5.949c-1.176,2.16-2.906,3.262-5.145,3.262 c-1.936,0-3.418-0.859-4.414-2.555c-1.078,0.883-2.398,1.33-3.936,1.33c-2.152,0-3.908-0.84-5.217-2.49 c-1.186-1.494-1.787-3.336-1.787-5.477c0-2.152,0.604-3.986,1.795-5.453c1.285-1.604,3.041-2.42,5.209-2.42 c1.107,0,2.068,0.213,2.873,0.633v-0.313h4.09v10.496c0,2.27,0.971,2.27,1.387,2.27c0.299,0,1.215,0,1.947-1.867 c0.4-1.041,0.604-2.174,0.604-3.365c0-2.805-0.98-5.139-3.004-7.141c-1.992-1.971-4.418-2.971-7.209-2.971 c-2.84,0-5.186,0.965-7.174,2.947c-1.986,1.984-2.953,4.328-2.953,7.164c0,2.842,0.973,5.189,2.967,7.182 c1.967,1.975,4.373,2.973,7.16,2.973h0.611v4.059H29.998L29.998,44.193z M29.311,26.146c-0.887,0-1.553,0.389-2.039,1.184 c-0.455,0.734-0.684,1.633-0.684,2.67c0,3.535,1.553,3.943,2.723,3.943c1.158,0,2.701-0.42,2.701-4.072 C32.012,26.531,30.469,26.146,29.311,26.146L29.311,26.146z" fill="url(#SVGID_3)"/>
-<path d="M43.578,29.98c0,2.176-0.438,4.061-1.313,5.654c-1.063,1.961-2.598,2.943-4.605,2.943 c-1.953,0-3.363-0.982-4.242-2.943c-1.059,1.145-2.43,1.719-4.107,1.719c-1.967,0-3.543-0.752-4.736-2.258 c-1.102-1.391-1.656-3.084-1.656-5.096c0-2.021,0.555-3.707,1.656-5.064c1.178-1.467,2.756-2.197,4.736-2.197 c1.477,0,2.639,0.4,3.486,1.207v-0.885h2.863v9.883c0,1.922,0.664,2.883,2,2.883c1.09,0,1.928-0.754,2.516-2.256 c0.43-1.119,0.648-2.313,0.648-3.59c0-2.953-1.063-5.477-3.188-7.576c-2.121-2.1-4.668-3.146-7.639-3.146 c-2.982,0-5.518,1.041-7.607,3.125c-2.086,2.086-3.131,4.615-3.131,7.598c0,2.979,1.045,5.52,3.145,7.615 c2.092,2.102,4.627,3.152,7.594,3.152v2.834c-3.744,0-6.945-1.332-9.596-3.992c-2.654-2.666-3.982-5.873-3.982-9.609 c0-3.727,1.33-6.914,3.99-9.576c2.664-2.654,5.855-3.984,9.588-3.984c3.744,0,6.945,1.322,9.6,3.979 C42.25,23.045,43.578,26.24,43.578,29.98z M32.625,29.871c0-2.893-1.105-4.336-3.314-4.336c-1.104,0-1.961,0.49-2.561,1.479 c-0.52,0.832-0.773,1.826-0.773,2.986c0,3.039,1.109,4.557,3.332,4.557C31.52,34.557,32.625,32.996,32.625,29.871z" fill="#FFFFFF"/>
+<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"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email_group.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,184 +1,207 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<g>
 <rect fill="none" height="60" width="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="30" x2="30" y1="8.47" y2="51.33">
-<stop offset="0" stop-color="#F2F2F2"/>
-<stop offset="0.25" stop-color="#4F88BD"/>
-<stop offset="0.73" stop-color="#0055A3"/>
-<stop offset="1" stop-color="#64AEFB"/>
+<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"/>
 </linearGradient>
-<path d="M30,51.428C18.184,51.428,8.57,41.816,8.57,30C8.57,18.186,18.184,8.572,30,8.572 c11.814,0,21.43,9.613,21.43,21.428C51.43,41.816,41.814,51.428,30,51.428L30,51.428z" fill="url(#SVGID_1)"/>
-<radialGradient cx="29.8" cy="13.11" gradientUnits="userSpaceOnUse" id="SVGID_2" r="39.33">
-<stop offset="0" stop-color="#96E9FA"/>
-<stop offset="0.15" stop-color="#96E9FA"/>
-<stop offset="0.75" stop-color="#005BCC"/>
-<stop offset="1" stop-color="#0087D9"/>
+<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"/>
 </radialGradient>
-<path d="M50.816,30c0,11.498-9.322,20.816-20.816,20.816C18.504,50.816,9.184,41.498,9.184,30 c0-11.494,9.32-20.816,20.816-20.816C41.494,9.184,50.816,18.506,50.816,30z" fill="url(#SVGID_2)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="30" x2="30" y1="15.46" y2="43.93">
-<stop offset="0" stop-color="#0B81FA"/>
-<stop offset="1" stop-color="#47DAFA"/>
+<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"/>
 </linearGradient>
-<path d="M29.998,44.193c-3.898,0-7.273-1.402-10.029-4.172c-2.762-2.773-4.16-6.152-4.16-10.041 c0-3.871,1.402-7.238,4.168-10.008c2.771-2.764,6.143-4.164,10.021-4.164c3.898,0,7.273,1.398,10.033,4.156 c2.758,2.758,4.16,6.127,4.16,10.016c0,2.268-0.469,4.27-1.387,5.949c-1.176,2.16-2.906,3.262-5.145,3.262 c-1.936,0-3.418-0.859-4.414-2.555c-1.078,0.883-2.398,1.33-3.936,1.33c-2.152,0-3.908-0.84-5.217-2.49 c-1.186-1.494-1.787-3.336-1.787-5.477c0-2.152,0.604-3.986,1.795-5.453c1.285-1.604,3.041-2.42,5.209-2.42 c1.107,0,2.068,0.213,2.873,0.633v-0.313h4.09v10.496c0,2.27,0.971,2.27,1.387,2.27c0.299,0,1.215,0,1.947-1.867 c0.4-1.041,0.604-2.174,0.604-3.365c0-2.805-0.98-5.139-3.004-7.141c-1.992-1.971-4.418-2.971-7.209-2.971 c-2.84,0-5.186,0.965-7.174,2.947c-1.986,1.984-2.953,4.328-2.953,7.164c0,2.842,0.973,5.189,2.967,7.182 c1.967,1.975,4.373,2.973,7.16,2.973h0.611v4.059H29.998L29.998,44.193z M29.311,26.146c-0.887,0-1.553,0.389-2.039,1.184 c-0.455,0.734-0.684,1.633-0.684,2.67c0,3.535,1.553,3.943,2.723,3.943c1.158,0,2.701-0.42,2.701-4.072 C32.012,26.531,30.469,26.146,29.311,26.146L29.311,26.146z" fill="url(#SVGID_3)"/>
-<path d="M43.578,29.98c0,2.176-0.438,4.061-1.313,5.654c-1.063,1.961-2.598,2.943-4.605,2.943 c-1.953,0-3.363-0.982-4.242-2.943c-1.059,1.145-2.43,1.719-4.107,1.719c-1.967,0-3.543-0.752-4.736-2.258 c-1.102-1.391-1.656-3.084-1.656-5.096c0-2.021,0.555-3.707,1.656-5.064c1.178-1.467,2.756-2.197,4.736-2.197 c1.477,0,2.639,0.4,3.486,1.207v-0.885h2.863v9.883c0,1.922,0.664,2.883,2,2.883c1.09,0,1.928-0.754,2.516-2.256 c0.43-1.119,0.648-2.313,0.648-3.59c0-2.953-1.063-5.477-3.188-7.576c-2.121-2.1-4.668-3.146-7.639-3.146 c-2.982,0-5.518,1.041-7.607,3.125c-2.086,2.086-3.131,4.615-3.131,7.598c0,2.979,1.045,5.52,3.145,7.615 c2.092,2.102,4.627,3.152,7.594,3.152v2.834c-3.744,0-6.945-1.332-9.596-3.992c-2.654-2.666-3.982-5.873-3.982-9.609 c0-3.727,1.33-6.914,3.99-9.576c2.664-2.654,5.855-3.984,9.588-3.984c3.744,0,6.945,1.322,9.6,3.979 C42.25,23.045,43.578,26.24,43.578,29.98z M32.625,29.871c0-2.893-1.105-4.336-3.314-4.336c-1.104,0-1.961,0.49-2.561,1.479 c-0.52,0.832-0.773,1.826-0.773,2.986c0,3.039,1.109,4.557,3.332,4.557C31.52,34.557,32.625,32.996,32.625,29.871z" fill="#FFFFFF"/>
-<g transform="matrix(0.5 0 0 0.5 30 30)">
-<radialGradient cx="42.39" cy="42.29" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="11.1">
+<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"/>
+</g>
+<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"/>
 </radialGradient>
-<path d="M46.91,37.354c-1.044-0.453-1.012-2.678-0.582-3.35c0.076-0.118,0.145-0.234,0.216-0.352 h-8.731c0.069,0.117,0.138,0.233,0.213,0.352c0.431,0.672,0.463,2.896-0.58,3.35C36.4,37.809,42.3,41.758,42.3,41.758 S47.954,37.807,46.91,37.354z" fill="url(#SVGID_1_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="42.18" x2="42.18" y1="36.94" y2="46.09">
+<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"/>
 </linearGradient>
-<path d="M53.188,39.672c-1.098-0.572-6.541-2.477-6.644-2.598l-4.157,3.458l-4.467-3.591 c-0.126,0.185-5.504,2.07-6.748,2.73c-1.426,0.756-3.754,2.494-3.754,6.414h29.521C56.939,42.166,54.286,40.242,53.188,39.672z" fill="url(#SVGID_2_)"/>
-<polygon fill="#020202" fill-opacity="0.3" points="36.9,37.386 42.384,41.758 47.536,37.475 46.542,37.074 42.384,40.532 37.918,36.941 " stroke-opacity="0.3"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="42.22" x2="42.22" y1="42.15" y2="37.1">
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_3_)" points="42.384,41.758 36.9,37.386 36.582,37.525 42.384,42.148 47.857,37.6 47.54,37.473 "/>
-<radialGradient cx="42.93" cy="21.83" gradientUnits="userSpaceOnUse" id="SVGID_4" r="14.9">
+<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"/>
 </radialGradient>
-<path d="M49.42,27.128c-0.038-0.016-0.08-0.018-0.118-0.03c0-0.002,0-0.002,0-0.002 c-0.008-0.002-0.014-0.004-0.014-0.004c-0.065-0.016-0.124-0.028-0.185-0.032c-7.289-1.27-10.636-5.308-10.886-4.238 c-0.202,0.85-2.245,2.692-3.315,3.61c0.008,0.042,0.016,0.078,0.023,0.12c0,0,0.04,0.188,0.12,0.508 c-0.084,0.01-0.168,0.028-0.248,0.06c-0.682,0.29-0.896,1.404-0.478,2.496c0.418,1.09,1.306,1.741,1.99,1.456 c0.041-0.018,0.078-0.047,0.115-0.072c0.396,0.891,0.881,1.844,1.477,2.8c0.998,1.187,2.525,2.576,4.211,2.576 c2.041,0,3.291-1.118,4.146-2.242c0.022-0.048,0.045-0.094,0.068-0.13c0.636-0.994,1.152-1.992,1.57-2.92 c0.666,0.23,1.521-0.389,1.947-1.438C50.286,28.562,50.094,27.434,49.42,27.128z" fill="url(#SVGID_4)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="39.55" x2="45.84" y1="37.06" y2="30.81">
+<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"/>
 </linearGradient>
-<path d="M41.813,35.805c-1.242,0-2.494-0.578-3.416-1.453c0.974,1.026,2.287,2.024,3.715,2.024 c2.041,0,3.291-1.118,4.146-2.242c0.021-0.048,0.044-0.094,0.068-0.13c0.636-0.994,1.152-1.992,1.57-2.92 C45.578,35.141,43.854,35.805,41.813,35.805z" fill="url(#SVGID_5)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6" x1="42.05" x2="42.05" y1="17.11" y2="26.38">
+<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"/>
 </linearGradient>
-<path d="M41.908,16.966c-2.53,0-3.744,1.148-4.682,2.35c-1.528,0.234-3.947,1.634-2.238,7.764 c1.07-0.918,3.029-3.406,3.229-4.256c0.255-1.08,3.656,3.042,11.084,4.274c0.089-0.344,0.126-0.544,0.126-0.544 C50.596,21.318,48.059,17.172,41.908,16.966z" fill="url(#SVGID_6)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7" x1="45.22" x2="36.82" y1="25.98" y2="20.99">
+<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"/>
 </linearGradient>
-<path d="M38.227,22.322c0,0,3.635,4.778,11.023,4.768C49.25,27.09,45.773,26.544,38.227,22.322z" fill="url(#SVGID_7)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8" x1="36.07" x2="36.14" y1="20.02" y2="25.35">
+<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"/>
 </linearGradient>
-<path d="M37.354,19.672c0,0-3.56,0.212-2.24,6.246C35.113,25.918,34.678,21.786,37.354,19.672z" fill="url(#SVGID_8)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9" x1="43.23" x2="42.97" y1="17.9" y2="20.32">
+<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"/>
 </linearGradient>
-<path d="M43.632,20.508c-1.655-0.236-4.46-1.706-5.558-1.18c0,0,3.598-4.106,9.943,0.568 C48.018,19.896,46.506,20.916,43.632,20.508z" fill="url(#SVGID_9)"/>
-<radialGradient cx="18.03" cy="42.29" gradientUnits="userSpaceOnUse" id="SVGID_10" r="11.1">
+<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"/>
 </radialGradient>
-<path d="M22.552,37.354c-1.042-0.453-1.01-2.678-0.58-3.35c0.074-0.118,0.144-0.234,0.216-0.352 h-8.73c0.07,0.117,0.138,0.233,0.214,0.352c0.43,0.672,0.46,2.896-0.58,3.35c-1.046,0.455,4.854,4.404,4.854,4.404 S23.6,37.807,22.552,37.354z" fill="url(#SVGID_10)"/>
-<path d="M28.832,39.672c-1.098-0.572-6.542-2.477-6.644-2.598l-4.158,3.458l-4.466-3.591 c-0.126,0.185-5.504,2.07-6.75,2.73c-1.424,0.756-3.752,2.494-3.752,6.414h29.522C32.582,42.166,29.93,40.242,28.832,39.672z" fill="url(#SVGID_2_)"/>
-<polygon fill="#020202" fill-opacity="0.3" points="12.544,37.386 18.03,41.758 23.182,37.475 22.188,37.074 18.03,40.532 13.562,36.941 " stroke-opacity="0.3"/>
-<polygon fill="url(#SVGID_3_)" points="18.03,41.758 12.542,37.386 12.226,37.525 18.03,42.148 23.502,37.6 23.184,37.473 "/>
-<radialGradient cx="18.57" cy="21.83" gradientUnits="userSpaceOnUse" id="SVGID_13" r="14.9">
+<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"/>
+</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"/>
+</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"/>
 </radialGradient>
-<path d="M25.064,27.128c-0.038-0.016-0.08-0.018-0.118-0.03c0-0.002,0-0.002,0-0.002 c-0.008-0.002-0.014-0.004-0.024-0.004c-0.056-0.016-0.114-0.028-0.174-0.032c-7.29-1.27-10.634-5.308-10.886-4.238 c-0.204,0.85-2.246,2.692-3.316,3.61c0.008,0.042,0.016,0.078,0.024,0.12c0,0,0.04,0.188,0.12,0.508 c-0.086,0.01-0.17,0.028-0.248,0.06c-0.682,0.29-0.894,1.404-0.478,2.496c0.418,1.09,1.306,1.741,1.99,1.456 c0.042-0.018,0.078-0.047,0.116-0.072c0.396,0.891,0.88,1.844,1.476,2.8c0.998,1.187,2.526,2.576,4.212,2.576 c2.04,0,3.29-1.118,4.146-2.242c0.022-0.048,0.044-0.094,0.068-0.13c0.636-0.994,1.152-1.992,1.57-2.92 c0.668,0.23,1.522-0.389,1.946-1.438C25.928,28.562,25.738,27.434,25.064,27.128z" fill="url(#SVGID_13)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14" x1="15.19" x2="21.49" y1="37.06" y2="30.81">
+<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"/>
 </linearGradient>
-<path d="M17.458,35.805c-1.242,0-2.494-0.578-3.416-1.453c0.974,1.026,2.288,2.024,3.716,2.024 c2.04,0,3.29-1.118,4.146-2.242c0.022-0.048,0.044-0.094,0.068-0.13c0.636-0.994,1.152-1.992,1.57-2.92 C21.222,35.141,19.498,35.805,17.458,35.805z" fill="url(#SVGID_14)"/>
-<path d="M17.552,16.966c-2.53,0-3.744,1.148-4.684,2.35c-1.526,0.234-3.946,1.634-2.236,7.764 c1.07-0.918,3.028-3.406,3.23-4.256c0.254-1.08,3.656,3.042,11.084,4.274c0.086-0.344,0.126-0.544,0.126-0.544 C26.24,21.318,23.704,17.172,17.552,16.966z" fill="url(#SVGID_6)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16" x1="20.87" x2="12.47" y1="25.98" y2="20.99">
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M13.872,22.322c0,0,3.636,4.778,11.026,4.768C24.896,27.09,21.416,26.544,13.872,22.322z" fill="url(#SVGID_16)"/>
-<path d="M12.996,19.672c0,0-3.558,0.212-2.238,6.246C10.758,25.918,10.322,21.786,12.996,19.672z" fill="url(#SVGID_8)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18" x1="18.88" x2="18.62" y1="17.9" y2="20.32">
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M19.278,20.508c-1.656-0.236-4.46-1.706-5.56-1.18c0,0,3.6-4.106,9.946,0.568 C23.662,19.896,22.148,20.916,19.278,20.508z" fill="url(#SVGID_18)"/>
-<path d="M46.641,40.864c-1.013-0.528-4.162-1.698-6.695-2.636 l-1.422-0.53l-0.256-0.103l-0.332-0.128L37.3,37.212l-0.392,0.172c-0.002,0.002-0.006,0.002-0.008,0.005h-0.002 c-1.652,0.646-4.813,1.795-5.729,2.285c-0.357,0.19-0.772,0.442-1.192,0.774c-0.442-0.364-0.852-0.62-1.146-0.774 c-0.79-0.41-3.808-1.506-5.492-2.136l-0.156-0.062l-0.004,0.002l-0.698-0.283l-0.634,0.279c-0.622,0.243-1.386,0.535-2.206,0.846 l-0.076,0.029c-2.42,0.92-5.164,1.963-6.214,2.522C10.996,42.122,9.3,43.891,8.3,46.09h19.118h5.166h19.04 C50.055,42.818,47.355,41.234,46.641,40.864z" fill="#231F20" fill-opacity="0.15" stroke-opacity="0.15"/>
-<path d="M18.104,22.872c-1.122,0.954-1.424,2.864-0.698,4.76 c0.684,1.788,2.096,2.988,3.516,2.988h0.004c0.212,0.442,0.434,0.878,0.662,1.308h-0.066l0.542,0.896c0,0,0.142,0.23,0.308,0.506 c0.452-0.766,0.848-1.528,1.172-2.246c0.668,0.23,1.522-0.389,1.946-1.438c0.44-1.084,0.25-2.212-0.424-2.518 c-0.038-0.016-0.08-0.018-0.118-0.03c0-0.002,0-0.002,0-0.002c-0.008-0.002-0.014-0.004-0.024-0.004 c-0.056-0.016-0.114-0.028-0.174-0.032c-0.014-0.004-0.024-0.006-0.038-0.01c-0.03-0.006-0.064-0.014-0.1-0.022 c0.114,0.022,0.218,0.046,0.334,0.066c0.086-0.344,0.126-0.544,0.126-0.544c1.166-5.234-1.372-9.38-7.522-9.586 c-0.012,0-0.02,0.002-0.034,0.002C17.36,18.634,17.546,20.6,18.104,22.872z" fill="#231F20" fill-opacity="0.15" stroke-opacity="0.15"/>
-<path d="M37.227,19.316c-1.528,0.234-3.947,1.634-2.238,7.758 c-0.066,0.012-0.129,0.022-0.192,0.046c-0.683,0.29-0.896,1.404-0.478,2.496c0.418,1.09,1.306,1.741,1.99,1.456 c0.041-0.018,0.078-0.047,0.115-0.072c0.33,0.742,0.729,1.532,1.198,2.326c0.524-0.883,1.022-1.794,1.472-2.738 c1.293-0.154,2.557-1.278,3.211-2.888c0.743-1.838,0.506-3.746-0.545-4.74c0.471-2.124,0.545-4.146,0.234-5.986 c-0.03-0.002-0.057-0.006-0.086-0.006C39.378,16.966,38.164,18.116,37.227,19.316z M34.996,27.072 c0.014-0.012,0.029-0.026,0.042-0.038c0,0.01,0.004,0.016,0.006,0.026C35.029,27.062,35.012,27.07,34.996,27.072z M38.52,22.662 L38.52,22.662c-0.018-0.004-0.041-0.014-0.058-0.016C38.479,22.648,38.502,22.658,38.52,22.662z" fill="#231F20" fill-opacity="0.15" stroke-opacity="0.15"/>
-<path d="M46.37,41.386c-0.979-0.51-4.112-1.672-6.628-2.608 l-1.436-0.533l-0.248-0.1l-0.343-0.131l-0.968-0.39c-0.032-0.042-0.055-0.101-0.082-0.146c-1.7,0.655-4.62,1.726-5.494,2.193 c-0.357,0.189-0.772,0.442-1.192,0.773c-0.442-0.363-0.852-0.619-1.146-0.773c-0.79-0.41-3.808-1.506-5.492-2.136L23.256,37.5 l-1.192,0.521c-0.64,0.25-1.438,0.553-2.288,0.877c-2.404,0.914-5.13,1.951-6.148,2.49c-2.142,1.135-3.714,2.726-4.676,4.697h18.464 h5.166h18.38C49.464,43.156,47.027,41.729,46.37,41.386z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M17.958,27.42c0.596,1.56,1.788,2.608,2.962,2.608 c0.124,0,0.244-0.01,0.362-0.034c0.404,0.865,0.838,1.71,1.302,2.523h-0.018l0.136,0.225c0.31-0.566,0.6-1.126,0.838-1.658 c0.668,0.23,1.522-0.389,1.946-1.438c0.44-1.084,0.25-2.212-0.424-2.518c-0.038-0.016-0.08-0.018-0.118-0.03 c0-0.002,0-0.002,0-0.002c-0.008-0.002-0.014-0.004-0.024-0.004c-0.056-0.016-0.114-0.028-0.174-0.032 c-0.014-0.004-0.024-0.006-0.038-0.01c-0.03-0.006-0.064-0.014-0.1-0.022c0.114,0.022,0.218,0.046,0.334,0.066 c0.086-0.344,0.126-0.544,0.126-0.544c1.128-5.07-1.226-9.112-6.966-9.544c-0.16,1.694,0.052,3.728,0.672,6.114 C17.626,23.778,17.264,25.606,17.958,27.42z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M37.227,19.316c-1.528,0.234-3.947,1.634-2.238,7.758 c-0.066,0.012-0.129,0.022-0.192,0.046c-0.683,0.29-0.896,1.404-0.478,2.496c0.418,1.09,1.306,1.741,1.99,1.456 c0.041-0.018,0.078-0.047,0.115-0.072c0.248,0.557,0.536,1.139,0.858,1.729c0.51-0.879,0.993-1.783,1.43-2.714 c0.026,0.002,0.05,0.002,0.078,0.002c1.16,0,2.353-1.022,2.966-2.54c0.717-1.768,0.42-3.57-0.65-4.288 c0.049-0.212,0.072-0.332,0.072-0.332c0.467-2.086,0.534-4.07,0.221-5.862C39.221,17.144,38.098,18.202,37.227,19.316z M34.996,27.072c0.014-0.012,0.029-0.026,0.042-0.038c0,0.01,0.004,0.016,0.006,0.026C35.029,27.062,35.012,27.07,34.996,27.072z M38.52,22.662L38.52,22.662c-0.018-0.004-0.041-0.014-0.058-0.016C38.479,22.648,38.502,22.658,38.52,22.662z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
-<radialGradient cx="30.3" cy="45.73" gradientUnits="userSpaceOnUse" id="SVGID_19" r="16.23">
+<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;"/>
+<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"/>
 </radialGradient>
-<path d="M36.918,38.521c-1.527-0.664-1.477-3.914-0.848-4.897c0.109-0.17,0.207-0.342,0.313-0.515 h-12.77c0.106,0.173,0.206,0.345,0.314,0.515c0.63,0.983,0.68,4.233-0.848,4.897c-1.528,0.662,7.098,6.438,7.098,6.438 S38.445,39.184,36.918,38.521z" fill="url(#SVGID_19)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_20" x1="30" x2="30" y1="37.92" y2="51.29">
+<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"/>
 </linearGradient>
-<path d="M46.098,41.91c-1.605-0.836-9.563-3.622-9.714-3.794l-6.08,5.05l-6.532-5.246 c-0.18,0.268-8.046,3.023-9.868,3.99c-2.084,1.105-5.486,3.646-5.486,9.376H51.58C51.58,45.557,47.7,42.746,46.098,41.91z" fill="url(#SVGID_20)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_21" x1="30.06" x2="30.06" y1="37.04" y2="44.86">
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_21)" points="22.284,38.568 30.302,44.958 37.836,38.7 36.382,38.116 30.302,43.166 23.772,37.92 "/>
-<path d="M22.66,39.58c0,0-11.44,2.986-11.44,11.004c0,0-1.634,0-1.646,0 C9.574,45.654,13.418,41.82,22.66,39.58z" fill="#FF7B56"/>
-<path d="M37.189,39.395c0,0,11.44,2.987,11.44,11.004c0,0,1.636,0,1.647,0 C50.277,45.468,46.432,41.636,37.189,39.395z" fill="#FF7B56"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_22" x1="30.06" x2="30.06" y1="45.53" y2="38.15">
+<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"/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_22)" points="30.302,44.958 22.282,38.568 21.816,38.773 30.302,45.534 38.302,38.88 37.838,38.693 "/>
-<radialGradient cx="31.09" cy="15.82" gradientUnits="userSpaceOnUse" id="SVGID_23" r="21.78">
+<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"/>
 </radialGradient>
-<path d="M40.588,23.574c-0.054-0.026-0.115-0.03-0.172-0.044c0-0.002,0-0.004,0-0.004 c-0.01-0.002-0.02-0.004-0.032-0.006c-0.084-0.022-0.17-0.042-0.256-0.044c-10.66-1.856-15.55-7.76-15.918-6.198 c-0.294,1.244-3.282,3.936-4.848,5.278c0.014,0.06,0.02,0.114,0.036,0.174c0,0,0.054,0.276,0.172,0.744 c-0.124,0.014-0.246,0.04-0.364,0.09c-0.996,0.42-1.308,2.052-0.698,3.646c0.61,1.596,1.912,2.548,2.908,2.13 c0.06-0.028,0.114-0.07,0.17-0.108c0.578,1.3,1.29,2.696,2.158,4.094c1.458,1.732,3.692,3.766,6.158,3.766 c2.982,0,4.808-1.632,6.064-3.279c0.032-0.068,0.062-0.133,0.103-0.19c0.93-1.454,1.684-2.91,2.291-4.268 c0.975,0.336,2.227-0.568,2.847-2.102C41.852,25.668,41.574,24.02,40.588,23.574z" fill="url(#SVGID_23)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_24" x1="26.15" x2="35.36" y1="38.09" y2="28.95">
+<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"/>
 </linearGradient>
-<path d="M29.464,36.256c-1.816,0-3.644-0.846-4.992-2.12c1.426,1.498,3.344,2.956,5.432,2.956 c2.983,0,4.808-1.632,6.064-3.279c0.032-0.068,0.062-0.133,0.103-0.19c0.93-1.454,1.684-2.91,2.291-4.268 C34.968,35.286,32.45,36.256,29.464,36.256z" fill="url(#SVGID_24)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_25" x1="29.82" x2="29.82" y1="8.92" y2="22.47">
+<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"/>
 </linearGradient>
-<path d="M29.604,8.714c-3.694,0-5.472,1.68-6.846,3.436c-2.228,0.344-5.766,2.39-3.27,11.35 c1.566-1.34,4.428-4.978,4.722-6.222c0.372-1.576,5.344,4.452,16.206,6.248c0.126-0.502,0.186-0.796,0.186-0.796 C42.307,15.078,38.598,9.014,29.604,8.714z" fill="url(#SVGID_25)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_26" x1="34.45" x2="22.17" y1="21.89" y2="14.59">
+<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"/>
 </linearGradient>
-<path d="M24.222,16.544c0,0,5.316,6.984,16.118,6.97C40.34,23.516,35.254,22.716,24.222,16.544z" fill="url(#SVGID_26)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_27" x1="21.06" x2="21.17" y1="13.17" y2="20.98">
+<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"/>
 </linearGradient>
-<path d="M22.946,12.67c0,0-5.206,0.31-3.274,9.132C19.672,21.802,19.036,15.762,22.946,12.67z" fill="url(#SVGID_27)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_28" x1="31.54" x2="31.16" y1="10.08" y2="13.61">
+<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"/>
 </linearGradient>
-<path d="M32.128,13.892c-2.424-0.346-6.524-2.494-8.13-1.726c0,0,5.26-6,14.542,0.83 C38.54,12.996,36.328,14.49,32.128,13.892z" fill="url(#SVGID_28)"/>
-<rect fill="none" height="60" width="60"/>
+<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"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email_home.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email_home.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<g>
+<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"/>
+</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"/>
+</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"/>
+</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"/>
+</g>
+<g transform="matrix(1 0 0 1 30 30)">
+<polygon fill="none" points="30.414,14.408 30.414,0 0.414,0 0.414,14.41 0,14.824 0.414,15.237 0.414,30 30.414,30 30.414,15.236   30.828,14.821 "/>
+<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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+<rect fill="none" height="30" width="30" x="0.414"/>
+</g>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email_setup.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,50 +1,50 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
 <rect fill="none" height="60" width="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="30" x2="30" y1="8.47" y2="51.33">
-<stop offset="0" stop-color="#F2F2F2"/>
-<stop offset="0.25" stop-color="#4F88BD"/>
-<stop offset="0.73" stop-color="#0055A3"/>
-<stop offset="1" stop-color="#64AEFB"/>
+<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"/>
 </linearGradient>
-<path d="M30,51.428C18.184,51.428,8.57,41.816,8.57,30C8.57,18.186,18.184,8.572,30,8.572 c11.814,0,21.43,9.613,21.43,21.428C51.43,41.816,41.814,51.428,30,51.428L30,51.428z" fill="url(#SVGID_1)"/>
-<radialGradient cx="29.8" cy="13.11" gradientUnits="userSpaceOnUse" id="SVGID_2" r="39.33">
-<stop offset="0" stop-color="#96E9FA"/>
-<stop offset="0.15" stop-color="#96E9FA"/>
-<stop offset="0.75" stop-color="#005BCC"/>
-<stop offset="1" stop-color="#0087D9"/>
+<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"/>
 </radialGradient>
-<path d="M50.816,30c0,11.498-9.322,20.816-20.816,20.816C18.504,50.816,9.184,41.498,9.184,30 c0-11.494,9.32-20.816,20.816-20.816C41.494,9.184,50.816,18.506,50.816,30z" fill="url(#SVGID_2)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="30" x2="30" y1="15.46" y2="43.93">
-<stop offset="0" stop-color="#0B81FA"/>
-<stop offset="1" stop-color="#47DAFA"/>
+<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"/>
 </linearGradient>
-<path d="M29.998,44.193c-3.898,0-7.273-1.402-10.029-4.172c-2.762-2.773-4.16-6.152-4.16-10.041 c0-3.871,1.402-7.238,4.168-10.008c2.771-2.764,6.143-4.164,10.021-4.164c3.898,0,7.273,1.398,10.033,4.156 c2.758,2.758,4.16,6.127,4.16,10.016c0,2.268-0.469,4.27-1.387,5.949c-1.176,2.16-2.906,3.262-5.145,3.262 c-1.936,0-3.418-0.859-4.414-2.555c-1.078,0.883-2.398,1.33-3.936,1.33c-2.152,0-3.908-0.84-5.217-2.49 c-1.186-1.494-1.787-3.336-1.787-5.477c0-2.152,0.604-3.986,1.795-5.453c1.285-1.604,3.041-2.42,5.209-2.42 c1.107,0,2.068,0.213,2.873,0.633v-0.313h4.09v10.496c0,2.27,0.971,2.27,1.387,2.27c0.299,0,1.215,0,1.947-1.867 c0.4-1.041,0.604-2.174,0.604-3.365c0-2.805-0.98-5.139-3.004-7.141c-1.992-1.971-4.418-2.971-7.209-2.971 c-2.84,0-5.186,0.965-7.174,2.947c-1.986,1.984-2.953,4.328-2.953,7.164c0,2.842,0.973,5.189,2.967,7.182 c1.967,1.975,4.373,2.973,7.16,2.973h0.611v4.059H29.998L29.998,44.193z M29.311,26.146c-0.887,0-1.553,0.389-2.039,1.184 c-0.455,0.734-0.684,1.633-0.684,2.67c0,3.535,1.553,3.943,2.723,3.943c1.158,0,2.701-0.42,2.701-4.072 C32.012,26.531,30.469,26.146,29.311,26.146L29.311,26.146z" fill="url(#SVGID_3)"/>
-<path d="M43.578,29.98c0,2.176-0.438,4.061-1.313,5.654c-1.063,1.961-2.598,2.943-4.605,2.943 c-1.953,0-3.363-0.982-4.242-2.943c-1.059,1.145-2.43,1.719-4.107,1.719c-1.967,0-3.543-0.752-4.736-2.258 c-1.102-1.391-1.656-3.084-1.656-5.096c0-2.021,0.555-3.707,1.656-5.064c1.178-1.467,2.756-2.197,4.736-2.197 c1.477,0,2.639,0.4,3.486,1.207v-0.885h2.863v9.883c0,1.922,0.664,2.883,2,2.883c1.09,0,1.928-0.754,2.516-2.256 c0.43-1.119,0.648-2.313,0.648-3.59c0-2.953-1.063-5.477-3.188-7.576c-2.121-2.1-4.668-3.146-7.639-3.146 c-2.982,0-5.518,1.041-7.607,3.125c-2.086,2.086-3.131,4.615-3.131,7.598c0,2.979,1.045,5.52,3.145,7.615 c2.092,2.102,4.627,3.152,7.594,3.152v2.834c-3.744,0-6.945-1.332-9.596-3.992c-2.654-2.666-3.982-5.873-3.982-9.609 c0-3.727,1.33-6.914,3.99-9.576c2.664-2.654,5.855-3.984,9.588-3.984c3.744,0,6.945,1.322,9.6,3.979 C42.25,23.045,43.578,26.24,43.578,29.98z M32.625,29.871c0-2.893-1.105-4.336-3.314-4.336c-1.104,0-1.961,0.49-2.561,1.479 c-0.52,0.832-0.773,1.826-0.773,2.986c0,3.039,1.109,4.557,3.332,4.557C31.52,34.557,32.625,32.996,32.625,29.871z" fill="#FFFFFF"/>
+<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"/>
 </g>
-<g transform="matrix(0.5 0 0 0.5 30 30)">
-<rect fill="none" height="60" width="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="8.52" y2="50.07">
-<stop offset="0" stop-color="#FFFFFF"/>
-<stop offset="0.1" stop-color="#FFFFFF"/>
-<stop offset="0.74" stop-color="#929497"/>
-<stop offset="1" stop-color="#C8C8C8"/>
+<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:#929497"/>
+<stop offset="1" style="stop-color:#C8C8C8"/>
 </linearGradient>
-<path d="M47.14,25.712h-1.06c-0.674,0-1.396-0.523-1.607-1.163l-0.817-1.981 c-0.304-0.6-0.164-1.48,0.313-1.956l0.749-0.749c0.948-0.949,1.017-1.171,1.413-1.961l0.536-1.071 c-1.173-1.554-2.558-2.939-4.112-4.111l-1.07,0.533c-0.602,0.301-1.484,0.938-1.961,1.414l-0.748,0.749 c-0.478,0.476-1.359,0.618-1.959,0.313l-1.98-0.817c-0.643-0.212-1.165-0.938-1.165-1.61v-1.059c0-0.673-0.175-1.748-0.388-2.387 l-0.377-1.134c-0.953-0.133-1.921-0.206-2.908-0.206c-0.988,0-1.958,0.073-2.908,0.206l-0.378,1.134 c-0.213,0.639-0.387,1.713-0.387,2.387v1.059c0,0.673-0.523,1.397-1.162,1.608l-1.982,0.818c-0.6,0.304-1.48,0.163-1.956-0.313 l-0.75-0.749c-0.477-0.476-1.36-1.112-1.961-1.414l-1.07-0.536c-1.554,1.173-2.939,2.558-4.112,4.112l0.535,1.07 c0.301,0.603,0.938,1.485,1.414,1.961l0.75,0.75c0.476,0.476,0.617,1.357,0.312,1.957l-0.819,1.982 c-0.211,0.64-0.934,1.163-1.608,1.163h-1.058c-0.675,0-1.748,0.173-2.387,0.388l-1.134,0.377c-0.134,0.951-0.207,1.92-0.207,2.908 c0,0.987,0.073,1.957,0.207,2.907l1.134,0.379c0.639,0.214,1.712,0.387,2.387,0.387h1.058c0.675,0,1.398,0.523,1.608,1.164 l0.817,1.98c0.305,0.6,0.164,1.48-0.313,1.956l-0.749,0.749c-0.476,0.475-1.112,1.359-1.414,1.961l-0.536,1.07 c1.173,1.555,2.558,2.939,4.112,4.111l1.07-0.533c0.603-0.301,1.485-0.938,1.961-1.414l0.749-0.748 c0.476-0.476,1.358-0.618,1.958-0.313l1.98,0.816c0.642,0.213,1.165,0.938,1.165,1.61v1.059c0,0.674,0.174,1.747,0.387,2.387 l0.378,1.133c0.951,0.133,1.92,0.206,2.908,0.206c0.987,0,1.955-0.073,2.908-0.206l0.377-1.133c0.213-0.64,0.388-1.713,0.388-2.387 v-1.059c0-0.674,0.522-1.397,1.162-1.608l1.981-0.817c0.601-0.305,1.48-0.163,1.957,0.313l0.748,0.748 c0.477,0.476,1.359,1.111,1.961,1.414l1.072,0.535c1.554-1.172,2.938-2.557,4.11-4.111l-0.536-1.07 c-0.299-0.602-0.936-1.486-1.413-1.961l-0.747-0.749c-0.478-0.476-0.617-1.357-0.313-1.958l0.815-1.979 c0.214-0.642,0.937-1.165,1.609-1.165h1.061c0.673,0,1.747-0.172,2.386-0.387l1.135-0.379c0.133-0.949,0.207-1.92,0.207-2.907 c0-0.988-0.074-1.956-0.207-2.908L49.525,26.1C48.887,25.886,47.813,25.712,47.14,25.712z M29.998,36.732 c-4.059,0-7.347-3.289-7.347-7.347c0-4.057,3.288-7.347,7.347-7.347c4.057,0,7.346,3.29,7.346,7.347 C37.344,33.443,34.055,36.732,29.998,36.732z" fill="url(#SVGID_1_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="22.6" x2="37.39" y1="32.78" y2="32.78">
-<stop offset="0" stop-color="#7A7A7A"/>
-<stop offset="0.5" stop-color="#FFFFFF"/>
-<stop offset="1" stop-color="#7A7A7A"/>
+<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="M29.998,36.732c4.057,0,7.346-3.289,7.346-7.347c0-0.192-0.014-0.378-0.028-0.566 c-0.29,3.792-3.451,6.782-7.317,6.782c-3.867,0-7.028-2.989-7.318-6.782c-0.015,0.188-0.029,0.375-0.029,0.566 C22.651,33.443,25.939,36.732,29.998,36.732z" fill="url(#SVGID_2_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30" x2="30" y1="41.78" y2="16.69">
-<stop offset="0" stop-color="#FFFFFF"/>
-<stop offset="0.52" stop-color="#C8C8C8"/>
-<stop offset="1" stop-color="#929497"/>
+<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:#929497"/>
 </linearGradient>
-<path d="M29.998,16.3c-7.227,0-13.086,5.859-13.086,13.086c0,7.228,5.859,13.085,13.086,13.085 c7.227,0,13.086-5.857,13.086-13.085C43.084,22.159,37.225,16.3,29.998,16.3z M29.998,39.498c-5.584,0-10.113-4.526-10.113-10.112 c0-5.585,4.528-10.112,10.113-10.112c5.582,0,10.111,4.527,10.111,10.112C40.109,34.972,35.58,39.498,29.998,39.498z" fill="url(#SVGID_3_)"/>
-<rect fill="none" height="59.996" width="59.996"/>
+<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 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email_work.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email_work.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<g>
+<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"/>
+</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"/>
+</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"/>
+</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"/>
+</g>
+<g transform="matrix(1 0 0 1 30 30)">
+<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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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;"/>
+<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="665.4" x2="665.4" y1="-582.2" y2="-604.8">
+<stop offset="0" stop-color="#CCCCCC"/>
+<stop offset="1" stop-color="#949494"/>
+</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"/>
+</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>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_end_call.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,44 +1,43 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<g>
+<rect fill="none" height="60" width="60"/>
 <g>
-<linearGradient gradientTransform="matrix(-0.5413 0.8408 -0.8408 -0.5413 1896.0922 -2198.2874)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="2876.6201" x2="2883.1765" y1="367.9102" y2="363.6479">
-<stop offset="0" style="stop-color:#FF7236"/>
-<stop offset="0.6242" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#E8522A"/>
-</linearGradient>
-<path d="M19.072,29.698c4.021-1.066,7.842-1.348,11.646-1.35c3.666,0.002,8.5,1.004,10.479,1.631l14.061-0.48  c-0.385-0.81-2.283-2.939-5.582-4.711c-3.303-1.771-11.847-3.841-20.172-3.841S13.896,22.8,11.703,23.785  c-3.453,1.555-6.129,4.401-6.725,5.411c0,0-0.49,0.972-0.873,2.489C3.943,32.337,19.072,29.698,19.072,29.698z" fill="url(#SVGID_1_)"/>
-<path d="M36.902,28.984c1.785,0.32,3.359,0.699,4.295,0.995l13.684-0.467  c-0.053-0.134-0.086-0.21-0.086-0.21c-0.111-0.236-0.338-0.568-0.639-0.949c-0.566-0.557-1.195-1.063-1.889-1.508  C47.357,23.704,40.916,24.737,36.902,28.984z" fill="#020202" fill-opacity="0.05" stroke-opacity="0.05"/>
-<path d="M37.762,29.146c1.424,0.28,2.654,0.586,3.436,0.833l13.729-0.47  c-0.059-0.148-0.096-0.233-0.096-0.233c-0.105-0.221-0.318-0.535-0.605-0.894c-0.535-0.526-1.129-1.006-1.783-1.426  C47.73,23.941,41.537,24.988,37.762,29.146z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M54.885,29.238c-0.096-0.2-0.291-0.485-0.549-0.812c-0.484-0.478-1.023-0.911-1.619-1.293  c-4.387-2.808-10.189-1.726-13.584,2.303c0.834,0.19,1.547,0.38,2.064,0.543l13.797-0.47C54.928,29.336,54.885,29.238,54.885,29.238  z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="-362.4932" cy="2606.3809" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 2153.4434 -1558.1849)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="14.0807">
-<stop offset="0" style="stop-color:#FF7236"/>
-<stop offset="0.6242" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#E8522A"/>
+<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"/>
 </radialGradient>
-<path d="M41.197,29.979l-0.439,1.752c0,0,15.475,5.881,15.643,4.275c0.084-0.809,0.057-0.872,0.018-1.768  c-0.119-2.688-1.16-4.74-1.16-4.74c-0.086-0.176-0.256-0.425-0.482-0.711c-0.424-0.419-0.898-0.801-1.42-1.135  c-3.959-2.533-9.242-1.463-12.176,2.329C41.184,29.981,41.191,29.979,41.197,29.979z" fill="url(#SVGID_2_)"/>
-<path d="M17.805,28.706c-0.6-0.797-1.334-1.503-2.215-2.065c-2.084-1.335-4.555-1.633-6.914-1.072  c-1.92,1.402-3.293,2.939-3.697,3.628c0,0-0.49,0.972-0.873,2.489c-0.135,0.546,10.469-1.219,13.904-1.805L17.805,28.706z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M18.408,29.352c-0.6-0.799-1.336-1.504-2.217-2.067c-2.855-1.829-6.439-1.728-9.463-0.097  c-0.744,0.706-1.299,1.348-1.605,1.785c-0.006,0.011-0.02,0.027-0.027,0.04c0,0-0.49,0.972-0.873,2.491  c-0.141,0.564,11.221-1.348,14.236-1.862L18.408,29.352z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="2885.8242" cy="377.8994" gradientTransform="matrix(-0.5439 0.8402 -0.8348 -0.5344 1899.8433 -2194.1335)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="14.6192">
-<stop offset="0" style="stop-color:#FF7236"/>
-<stop offset="0.6242" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#E8522A"/>
-</radialGradient>
-<path d="M3.725,33.904c-0.088,0.959-0.219,1.131-0.162,1.993c0.098,1.591,16.201-3.049,16.201-3.049  l-0.682-3.112c-0.586-0.744-1.297-1.409-2.139-1.947c-4.119-2.637-9.67-1.369-12.518,2.802C4.148,31.425,3.848,32.573,3.725,33.904z  " fill="url(#SVGID_3_)"/>
-<path d="M56.4,36.007c0.029-0.282,0.047-0.585,0.064-0.883l-15.488-4.232l-0.219,0.84  C40.758,31.731,56.232,37.612,56.4,36.007z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(-0.5413 0.8408 -0.8408 -0.5413 1896.0941 -2198.2864)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="2875.8125" x2="2881.0032" y1="335.625" y2="352.1139">
-<stop offset="0" style="stop-color:#FF7236"/>
-<stop offset="0.6242" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#E8522A"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M40.758,31.731l-0.568,2.234c-0.15,0.577,0.211,1.163,0.811,1.408l4.543,1.241l8.988,2.387  c0.703,0.189,1.412-0.171,1.58-0.804c0,0,0.119-0.59,0.283-2.192L40.758,31.731z" fill="url(#SVGID_4_)"/>
-<path d="M19.764,32.849l-0.178-0.846L3.533,35.023c0.008,0.297,0.012,0.597,0.029,0.874  C3.66,37.488,19.764,32.849,19.764,32.849z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(-0.5413 0.8408 -0.8408 -0.5413 1896.0941 -2198.2869)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="2893.2236" x2="2905.0479" y1="368.8027" y2="381.8245">
-<stop offset="0" style="stop-color:#FF7236"/>
-<stop offset="0.6242" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#E8522A"/>
+<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"/>
 </linearGradient>
-<path d="M3.563,35.897c0.102,1.587,0.225,2.161,0.225,2.161c0.141,0.66,0.844,1.083,1.572,0.946l13.793-2.62  c0.73-0.138,1.213-0.78,1.072-1.44l-0.461-2.096L3.563,35.897z" fill="url(#SVGID_5_)"/>
-<rect fill="none" height="60" width="60"/>
+<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"/>
+</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"/>
+</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>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_fail.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_fail.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<g>
+<rect fill="none" height="60" width="60"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="8.9082" y2="51.5718">
+<stop offset="0" style="stop-color:#E6E6E6"/>
+<stop offset="1" style="stop-color:#FFFFFF"/>
+</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"/>
+</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"/>
+</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"/>
+</g>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_favourites.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_favourites.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_favourites.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,32 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<g>
 <rect fill="none" height="60" width="60"/>
-<polygon fill="url(#SVGID_1)" points="30.254,44.813 15.638,52.732 18.242,36.314 6.194,24.861 22.612,22.267 29.782,7.268 37.326,22.082 53.806,24.266 42.048,36.018 45.063,52.364 "/>
-<radialGradient cx="29.75" cy="13.77" gradientUnits="userSpaceOnUse" id="SVGID_2" r="37.84">
-<stop offset="0" stop-color="#FEE16E"/>
-<stop offset="0.14" stop-color="#FEE16E"/>
-<stop offset="0.55" stop-color="#FFC501"/>
-<stop offset="0.73" stop-color="#F6A800"/>
-<stop offset="1" stop-color="#FED43A"/>
+<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"/>
 </radialGradient>
-<polygon fill="url(#SVGID_2)" points="19.516,35.884 8.763,25.66 23.417,23.344 29.817,9.958 36.55,23.18 51.258,25.129 40.764,35.618 43.455,50.208 30.236,43.469 17.191,50.537 "/>
-<radialGradient cx="30.16" cy="43.05" gradientUnits="userSpaceOnUse" id="SVGID_3" r="13.55">
-<stop offset="0" stop-color="#FED95A"/>
-<stop offset="1" stop-color="#FFC501"/>
+<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"/>
 </radialGradient>
-<polygon fill="url(#SVGID_3)" points="30.236,42.278 17.397,49.234 17.191,50.537 30.236,43.469 43.455,50.208 43.213,48.894 "/>
-<radialGradient cx="30.18" cy="18.37" gradientUnits="userSpaceOnUse" id="SVGID_4" r="52.6">
-<stop offset="0" stop-color="#FEF4CE"/>
-<stop offset="1" stop-color="#FFC501"/>
+<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"/>
 </radialGradient>
-<polygon fill="url(#SVGID_4)" points="24.013,24.534 29.817,12.339 35.954,24.369 50.202,26.185 51.258,25.129 36.55,23.18 29.817,9.958 23.417,23.344 8.763,25.66 9.842,26.688 "/>
+<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 gradientUnits="userSpaceOnUse" id="SVGID_1" x1="29.78" x2="30.34" y1="7.14" y2="51.71">
-<stop offset="0" stop-color="#F2C352"/>
-<stop offset="0.36" stop-color="#F2C352"/>
-<stop offset="0.89" stop-color="#DE7600"/>
-<stop offset="1" stop-color="#E79A26"/>
+<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"/>
 </linearGradient>
 </defs>
+</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_filemgr.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_filemgr.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_filemgr.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,89 +1,88 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<linearGradient gradientTransform="matrix(0.6122 0 0 -0.6122 -280.8977 -334.1658)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="507.833" x2="507.833" y1="-558.3442" y2="-629.5866">
+<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"/>
 </linearGradient>
-<path d="M48.977,49.895c0,0.676-0.549,1.225-1.225,1.225H12.244c-0.676,0-1.225-0.549-1.225-1.225  V8.877c0-0.677,0.549-1.225,1.225-1.225h35.508c0.676,0,1.225,0.548,1.225,1.225V49.895z" style="fill:url(#SVGID_1_);"/>
-<linearGradient gradientTransform="matrix(0.6122 0 0 -0.6122 -280.8977 -334.1658)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="507.833" x2="507.833" y1="-558.3442" y2="-629.5866">
+<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"/>
 </linearGradient>
-<path d="M47.752,7.652H12.244c-0.676,0-1.225,0.548-1.225,1.225v41.018  c0,0.676,0.549,1.225,1.225,1.225h35.508c0.676,0,1.225-0.549,1.225-1.225V8.877C48.977,8.2,48.428,7.652,47.752,7.652z   M48.363,49.895c0,0.337-0.273,0.611-0.611,0.611H12.244c-0.338,0-0.612-0.274-0.612-0.611V8.877c0-0.338,0.274-0.612,0.612-0.612  h35.508c0.338,0,0.611,0.274,0.611,0.612V49.895z" style="fill:url(#SVGID_2_);"/>
-<path d="M45.915,26.631c0,0.676-0.548,1.224-1.225,1.224H15.305c-0.676,0-1.225-0.548-1.225-1.224  V11.938c0-0.677,0.548-1.225,1.225-1.225H44.69c0.677,0,1.225,0.548,1.225,1.225V26.631z" style="fill:url(#SVGID_3_);"/>
-<path d="M15.305,28.467c-1.013,0-1.837-0.824-1.837-1.836V11.938  c0-1.013,0.824-1.837,1.837-1.837H44.69c1.013,0,1.837,0.824,1.837,1.837v14.693c0,1.012-0.824,1.836-1.837,1.836H15.305z" style="opacity:0.2;fill:#020202;enable-background:new    ;"/>
-<path d="M45.915,26.631c0,0.676-0.548,1.224-1.225,1.224H15.305c-0.676,0-1.225-0.548-1.225-1.224  V11.938c0-0.677,0.548-1.225,1.225-1.225H44.69c0.677,0,1.225,0.548,1.225,1.225V26.631z" style="fill:url(#SVGID_3_);"/>
-<linearGradient gradientTransform="matrix(0.6122 0 0 -0.6122 -280.8977 -334.1658)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="507.832" x2="507.832" y1="-573.3447" y2="-583.3787">
+<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_)"/>
+<path d="M11.746,28.859c-1.258,0-2.281-1.023-2.281-2.281V8.323c0-1.258,1.023-2.281,2.281-2.281  h36.508c1.258,0,2.281,1.023,2.281,2.281v18.254c0,1.258-1.023,2.281-2.281,2.281H11.746z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.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_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="30" x2="30" y1="14.4082" y2="22.0395">
 <stop offset="0" style="stop-color:#5B5B5B"/>
 <stop offset="1" style="stop-color:#B0B0B0"/>
 </linearGradient>
-<rect height="6.122" style="fill:url(#SVGID_5_);" width="9.795" x="25.1" y="16.835"/>
-<linearGradient gradientTransform="matrix(0.6122 0 0 -0.6122 -280.8977 -334.1658)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="507.833" x2="507.833" y1="-574.3447" y2="-582.3724">
+<rect fill="url(#SVGID_5_)" height="7.605" width="12.168" x="23.916" y="14.408"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="30" x2="30" y1="15.1685" y2="21.2736">
 <stop offset="0" style="stop-color:#E8E8E8"/>
 <stop offset="1" style="stop-color:#828282"/>
 </linearGradient>
-<rect height="4.897" style="fill:url(#SVGID_6_);" width="8.571" x="25.712" y="17.448"/>
-<path d="M44.69,10.713H15.305c-0.676,0-1.225,0.548-1.225,1.225  v14.693c0,0.676,0.548,1.224,1.225,1.224H44.69c0.677,0,1.225-0.548,1.225-1.224V11.938C45.915,11.261,45.367,10.713,44.69,10.713z   M45.303,26.631c0,0.337-0.274,0.612-0.612,0.612H15.305c-0.338,0-0.612-0.275-0.612-0.612V11.938c0-0.338,0.274-0.612,0.612-0.612  H44.69c0.338,0,0.612,0.274,0.612,0.612V26.631z" style="opacity:0.5;fill:#FFFFFF;enable-background:new    ;"/>
-<polygon points="25.1,22.958 34.896,22.958 34.283,22.345   25.1,22.345 " style="opacity:0.6;fill:#FFFFFF;enable-background:new    ;"/>
-<path d="M14.081,34.59V22.418c0-1.415,1.084-2.521,2.469-2.521h11.215  c1.953,0,2.358,1.681,2.491,2.233l-0.02,0.005c0.107,0.27,0.239,0.695,0.441,1.361c0.02,0.002,0.039,0.004,0.061,0.004l12.64-0.001  c1.399,0,2.538,1.13,2.538,2.521v8.571H14.081z" style="opacity:0.2;fill:#020202;enable-background:new    ;"/>
-<path d="M14.693,33.977V22.418c0-1.071,0.815-1.909,1.857-1.909  h11.215c1.47,0,1.758,1.19,1.896,1.765c0,0,0.329,1.065,0.51,1.659c0.081,0.116,0.345,0.179,0.567,0.179l12.64-0.001  c1.062,0,1.925,0.856,1.925,1.908v7.958H14.693z" style="opacity:0.3;fill:#020202;enable-background:new    ;"/>
-<linearGradient gradientTransform="matrix(0.6122 0 0 -0.6122 -280.8977 -334.1658)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="507.832" x2="507.832" y1="-572.3018" y2="-599.3463">
-<stop offset="0" style="stop-color:#C79101"/>
-<stop offset="0.0303" style="stop-color:#C79101"/>
-<stop offset="0.0364" style="stop-color:#FEEFA7"/>
+<rect fill="url(#SVGID_6_)" height="6.084" width="10.648" x="24.676" y="15.168"/>
+<path d="M48.254,6.803H11.746c-0.84,0-1.52,0.68-1.52,1.521v18.254c0,0.839,0.68,1.521,1.52,1.521  h36.508c0.84,0,1.52-0.682,1.52-1.521V8.323C49.773,7.483,49.094,6.803,48.254,6.803z M49.014,26.578c0,0.418-0.34,0.761-0.76,0.761  H11.746c-0.42,0-0.76-0.342-0.76-0.761V8.323c0-0.419,0.34-0.76,0.76-0.76h36.508c0.42,0,0.76,0.34,0.76,0.76V26.578z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
+<polygon fill="#FFFFFF" fill-opacity="0.6" points="23.916,22.014 36.084,22.014 35.324,21.253 23.916,21.253 " stroke-opacity="0.6"/>
+<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.6727" style="stop-color:#F0C12B"/>
+<stop offset="0.6485" style="stop-color:#F0C12B"/>
 <stop offset="1" style="stop-color:#E6A501"/>
 </linearGradient>
-<path d="M43.377,24.11h-12.58c0,0-0.914,0.055-1.194-0.557c-0.178-0.587-0.536-1.747-0.536-1.747  c-0.178-0.74-0.408-1.297-1.301-1.297H16.55c-0.708,0-1.245,0.581-1.245,1.297v10.947H44.69v-7.347  C44.69,24.691,44.086,24.11,43.377,24.11z" style="fill:url(#SVGID_7_);"/>
-<path d="M43.377,24.11h-12.58c0,0-0.914,0.055-1.194-0.557  c-0.178-0.587-0.536-1.747-0.536-1.747c-0.178-0.74-0.408-1.297-1.301-1.297H16.55c-0.708,0-1.245,0.581-1.245,1.297v0.612  c0-0.716,0.537-1.297,1.245-1.297h11.215c0.893,0,1.123,0.557,1.301,1.297c0,0,0.357,1.16,0.536,1.748  c0.281,0.612,1.194,0.557,1.194,0.557h12.581c0.708,0,1.313,0.581,1.313,1.296v-0.612C44.69,24.691,44.086,24.11,43.377,24.11z" style="opacity:0.8;fill:#FCF3D0;enable-background:new    ;"/>
-<path d="M46.527,47.445c0,0.676-0.549,1.225-1.225,1.225h-30.61c-0.676,0-1.225-0.549-1.225-1.225  V32.141c0-0.677,0.549-1.225,1.225-1.225h30.61c0.676,0,1.225,0.548,1.225,1.225V47.445z" style="fill:url(#SVGID_8_);"/>
-<path d="M14.693,50.506c-1.351,0-2.449-1.098-2.449-2.448V32.753  c0-1.352,1.098-2.449,2.449-2.449h30.61c1.351,0,2.449,1.098,2.449,2.449v15.305c0,1.351-1.099,2.448-2.449,2.448H14.693z" style="opacity:0.2;fill:#020202;enable-background:new    ;"/>
-<path d="M14.693,49.895c-1.013,0-1.836-0.824-1.836-1.837V32.753  c0-1.013,0.824-1.837,1.836-1.837h30.61c1.013,0,1.837,0.824,1.837,1.837v15.305c0,1.013-0.824,1.837-1.837,1.837H14.693z" style="opacity:0.3;fill:#020202;enable-background:new    ;"/>
-<path d="M46.527,47.445c0,0.676-0.549,1.225-1.225,1.225h-30.61c-0.676,0-1.225-0.549-1.225-1.225  V32.141c0-0.677,0.549-1.225,1.225-1.225h30.61c0.676,0,1.225,0.548,1.225,1.225V47.445z" style="fill:url(#SVGID_8_);"/>
-<linearGradient gradientTransform="matrix(0.6122 0 0 -0.6122 -280.8977 -334.1658)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="507.832" x2="507.832" y1="-607.3447" y2="-618.3831">
+<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="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"/>
+<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_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="30" x2="30" y1="40.2671" y2="48.6622">
 <stop offset="0" style="stop-color:#5B5B5B"/>
 <stop offset="1" style="stop-color:#B0B0B0"/>
 </linearGradient>
-<rect height="6.734" style="fill:url(#SVGID_10_);" width="11.02" x="24.488" y="37.65"/>
-<linearGradient gradientTransform="matrix(0.6122 0 0 -0.6122 -280.8977 -334.1658)" gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="507.832" x2="507.832" y1="-608.3447" y2="-617.3753">
+<rect fill="url(#SVGID_10_)" height="8.367" width="13.691" x="23.154" y="40.267"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="30" x2="30" y1="41.0278" y2="47.8963">
 <stop offset="0" style="stop-color:#E8E8E8"/>
 <stop offset="1" style="stop-color:#828282"/>
 </linearGradient>
-<rect height="5.51" style="fill:url(#SVGID_11_);" width="9.795" x="25.1" y="38.263"/>
-<path d="M45.303,30.916h-30.61c-0.676,0-1.225,0.548-1.225,1.225  v15.305c0,0.676,0.549,1.225,1.225,1.225h30.61c0.676,0,1.225-0.549,1.225-1.225V32.141C46.527,31.464,45.979,30.916,45.303,30.916z   M45.915,47.445c0,0.338-0.274,0.612-0.612,0.612h-30.61c-0.338,0-0.612-0.274-0.612-0.612V32.141c0-0.339,0.274-0.612,0.612-0.612  h30.61c0.338,0,0.612,0.273,0.612,0.612V47.445z" style="opacity:0.5;fill:#FFFFFF;enable-background:new    ;"/>
-<polygon points="22.605,30.916 24.074,35.201 35.922,35.201 37.391,30.916 " style="fill:#FFFFFF;"/>
-<linearGradient gradientTransform="matrix(0.6122 0 0 -0.6122 -280.8977 -334.1658)" gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="507.833" x2="507.833" y1="-596.3447" y2="-602.3656">
+<rect fill="url(#SVGID_11_)" height="6.845" width="12.168" x="23.916" y="41.028"/>
+<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"/>
 </linearGradient>
-<polygon points="35.508,34.59 24.488,34.59 23.264,30.916 36.732,30.916 " style="fill:url(#SVGID_12_);"/>
-<polygon points="23.217,10.713 24.686,14.387 35.311,14.387 36.778,10.713 " style="fill:#FFFFFF;"/>
-<linearGradient gradientTransform="matrix(0.6122 0 0 -0.6122 -280.8977 -334.1658)" gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="507.832" x2="507.832" y1="-563.3442" y2="-568.3618">
+<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"/>
 </linearGradient>
-<polygon points="34.896,13.774 25.1,13.774 23.876,10.713 36.119,10.713 " style="fill:url(#SVGID_13_);"/>
-<rect height="1.224" style="opacity:0.2;fill:#020202;enable-background:new    ;" width="29.385" x="15.305" y="29.692"/>
-<rect height="0.612" style="opacity:0.1;fill:#020202;enable-background:new    ;" width="29.385" x="15.305" y="29.08"/>
-<rect height="0.612" style="opacity:0.05;fill:#020202;enable-background:new    ;" width="29.385" x="15.305" y="28.467"/>
-<polygon points="35.508,44.385 24.488,44.385 25.1,43.772   34.896,43.772 " style="opacity:0.8;fill:#FFFFFF;enable-background:new    ;"/>
-<rect height="59.996" style="fill:none;" width="59.996"/>
+<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"/>
+<rect fill="#020202" fill-opacity="0.1" height="0.76" stroke-opacity="0.1" width="36.508" x="11.746" y="29.62"/>
+<rect fill="#020202" fill-opacity="0.05" height="0.761" stroke-opacity="0.05" width="36.508" x="11.746" y="28.859"/>
+<polygon fill="#FFFFFF" fill-opacity="0.8" points="36.846,48.634 23.154,48.634 23.916,47.873 36.084,47.873 " stroke-opacity="0.8"/>
+<rect fill="none" height="60" width="60"/>
 <defs>
-<linearGradient gradientTransform="matrix(0.6122 0 0 -0.6122 -280.8977 -334.1658)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="507.833" x2="507.833" y1="-563.3442" y2="-591.4395">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30" x2="30" y1="6.8027" y2="28.1705">
 <stop offset="0" style="stop-color:#FFFFFF"/>
 <stop offset="0.7879" style="stop-color:#A6A6A6"/>
 <stop offset="1" style="stop-color:#B1B1B1"/>
 </linearGradient>
 </defs>
 <defs>
-<linearGradient gradientTransform="matrix(0.6122 0 0 -0.6122 -280.8977 -334.1658)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="507.832" x2="507.832" y1="-596.3447" y2="-625.4428">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="30" x2="30" y1="31.9014" y2="54.0325">
 <stop offset="0" style="stop-color:#FFFFFF"/>
 <stop offset="0.7879" style="stop-color:#A6A6A6"/>
 <stop offset="1" style="stop-color:#B1B1B1"/>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_flash.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_flash.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<g>
+<rect fill="none" height="60" width="60.001"/>
+<radialGradient cx="-2784.4399" cy="950.8906" gradientTransform="matrix(2.2479 0 0 -2.2479 6289.1426 2167.5063)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="11.5664">
+<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"/>
+</radialGradient>
+<path d="M30.001,4C44.36,4,55.999,15.639,55.999,30c0,14.355-11.639,26-25.998,26  C15.644,56,3.999,44.355,3.999,30C3.999,15.639,15.644,4,30.001,4z" fill="url(#SVGID_1_)"/>
+<path d="M10.954,21.855c14.129-24.376,34.65-9.408,38.398,0.283  c0.004,0.043,0.035,0.021,0.021-0.025c-1.256-9.354-9.393-16.57-19.244-16.57c-9.758,0-17.836,7.076-19.209,16.299  C10.909,21.906,10.941,21.922,10.954,21.855z" fill="url(#SVGID_2_)" fill-opacity="0.9" stroke-opacity="0.9"/>
+<radialGradient cx="-2784.6987" cy="972.9805" gradientTransform="matrix(2.2479 0 0 -2.2479 6289.1426 2167.5063)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="20.134">
+<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"/>
+</radialGradient>
+<path d="M30.13,6.475c-9.691,0-17.723,6.912-19.182,15.391c4.369,2.057,7.584-2.965,17.989-2.326  c9.461,0.411,16.292,4.969,20.405,2.609C48.022,13.534,39.923,6.475,30.13,6.475z" fill="url(#SVGID_3_)"/>
+<path d="M40.485,13.187c-9.441,0-13.418,7.935-15.832,14.851c-2.535,7.271-4.158,8.449-7.061,8.449h-0.861  c-0.667,0-1.205,0.537-1.205,1.203v6.673c0,0.671,0.538,1.206,1.205,1.206h0.861c8.631,0,12.34-6.012,14.545-11.559  c1.281,0,6.207,0,6.207,0c0.672,0,1.209-0.538,1.209-1.207v-6.672c0-0.671-0.537-1.207-1.209-1.207c0,0-1.121,0-2.246,0  c1.559-2.259,3.027-2.647,4.387-2.647h0.859c0.666,0,1.205-0.542,1.205-1.21v-6.672c0-0.663-0.539-1.207-1.205-1.207L40.485,13.187  L40.485,13.187z" fill="#1F2430"/>
+<radialGradient cx="-2784.8672" cy="951.167" gradientTransform="matrix(2.2479 0 0 -2.2479 6289.1426 2167.5063)" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="6.1">
+<stop offset="0" style="stop-color:#1F2430"/>
+<stop offset="0.1011" style="stop-color:#1F2430"/>
+<stop offset="1" style="stop-color:#FFFFFF"/>
+</radialGradient>
+<path d="M40.485,14.391c-8.629,0-12.268,7.097-14.693,14.041l0,0c-2.504,7.183-4.342,9.258-8.199,9.258  h-0.861v6.678h0.861c8.127,0,11.533-5.752,13.721-11.566c0.99,0,7.035,0,7.035,0v-6.67c0,0-2.956,0-4.377,0  c1.818-3.563,3.754-5.064,6.51-5.064h0.863v-6.674h-0.859V14.391z" fill="url(#SVGID_4_)"/>
+<path d="M26.401,28.646L26.401,28.646c-2.291,6.567-4.151,9.69-9.023,9.69v5.38c8.25,0,11.383-5.817,13.486-11.557  c0.284,0,6.827,0,6.827,0v-5.387c0,0-4.159,0-4.751,0c2.047-4.433,4.256-6.352,7.752-6.352v-5.381  C32.188,15.041,28.753,21.918,26.401,28.646z" fill="#FFFFFF"/>
+<path d="M30.13,6.475c-9.691,0-17.723,6.912-19.182,15.391c4.369,2.057,7.584-2.965,17.989-2.326  c9.461,0.411,16.292,4.969,20.405,2.609C48.022,13.534,39.923,6.475,30.13,6.475z" fill="#FFFFFF" fill-opacity="0.3"/>
+<rect fill="none" height="60" width="60.001"/>
+<defs>
+<linearGradient gradientTransform="matrix(1.1364 0 0 -1.1364 921.2343 225.8096)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-784.1318" x2="-784.1318" y1="179.2046" y2="193.8286">
+<stop offset="0" style="stop-color:#627995"/>
+<stop offset="0.8708" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#FFFFFF"/>
+</linearGradient>
+</defs>
+</g>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_folder.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_folder.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<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"/>
+</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"/>
+<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"/>
+<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"/>
+</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"/>
+<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"/>
+</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"/>
+</g>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_friend.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_friend.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<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"/>
+<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"/>
+<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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_friends.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_friends.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_friends.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,182 +1,204 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<g>
 <rect fill="none" height="60" width="60"/>
-<radialGradient cx="42.4" cy="42.28" 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"/>
+<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"/>
 </radialGradient>
-<path d="M46.906,37.352c-1.044-0.453-1.01-2.678-0.58-3.351c0.074-0.117,0.143-0.234,0.215-0.353 h-8.732c0.071,0.118,0.14,0.235,0.217,0.353c0.43,0.673,0.462,2.896-0.58,3.351c-1.047,0.453,4.854,4.402,4.854,4.402 S47.95,37.805,46.906,37.352z" fill="url(#SVGID_1)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="42.17" x2="42.17" y1="36.94" y2="46.08">
-<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"/>
+<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"/>
 </linearGradient>
-<path d="M53.184,39.668c-1.098-0.571-6.541-2.477-6.645-2.596l-4.157,3.455l-4.468-3.588 c-0.123,0.183-5.504,2.068-6.747,2.729c-1.425,0.757-3.753,2.496-3.753,6.414h29.521C56.935,42.164,54.281,40.24,53.184,39.668z" fill="url(#SVGID_2)"/>
-<polygon fill="#020202" fill-opacity="0.3" points="36.898,37.383 42.382,41.754 47.533,37.473 46.54,37.072 42.382,40.527 37.916,36.939 " stroke-opacity="0.3"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="28.2" x2="37.16" y1="41.84" y2="41.84">
-<stop offset="0" stop-color="#3BC8EB"/>
-<stop offset="1" stop-color="#2D9BD2"/>
+<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"/>
 </linearGradient>
-<path d="M37.156,38.075c0,0-7.826,2.043-7.826,7.524c0,0-1.119,0.001-1.128,0 C28.203,42.229,30.834,39.607,37.156,38.075z" fill="url(#SVGID_3)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="47.09" x2="56.04" y1="41.71" y2="41.71">
-<stop offset="0" stop-color="#3BC8EB"/>
-<stop offset="1" stop-color="#2D9BD2"/>
+<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"/>
 </linearGradient>
-<path d="M47.092,37.947c0,0,7.824,2.044,7.824,7.525c0,0,1.119,0,1.127,0 C56.043,42.102,53.413,39.481,47.092,37.947z" fill="url(#SVGID_4)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="42.22" x2="42.22" y1="42.15" y2="37.1">
-<stop offset="0" stop-color="#3BC8EB"/>
-<stop offset="1" stop-color="#2D9BD2"/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_5)" points="42.382,41.754 36.897,37.383 36.579,37.521 42.382,42.146 47.854,37.597 47.535,37.469 "/>
-<radialGradient cx="42.94" cy="21.82" gradientUnits="userSpaceOnUse" id="SVGID_6" 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"/>
+<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"/>
 </radialGradient>
-<path d="M49.416,27.128c-0.037-0.017-0.08-0.019-0.116-0.031c0-0.001,0-0.002,0-0.002 c-0.008-0.002-0.013-0.003-0.022-0.004c-0.057-0.015-0.115-0.027-0.174-0.031c-7.29-1.269-10.636-5.307-10.887-4.238 c-0.201,0.851-2.245,2.691-3.316,3.609c0.01,0.041,0.015,0.078,0.022,0.119c0,0,0.039,0.188,0.12,0.509 c-0.085,0.009-0.168,0.027-0.248,0.061c-0.681,0.289-0.896,1.404-0.479,2.496c0.418,1.09,1.309,1.743,1.989,1.456 c0.043-0.018,0.079-0.047,0.115-0.072c0.396,0.89,0.882,1.844,1.478,2.8c0.998,1.186,2.525,2.577,4.213,2.577 c2.039,0,3.287-1.118,4.146-2.243c0.021-0.048,0.043-0.093,0.068-0.131c0.635-0.993,1.152-1.991,1.568-2.919 c0.666,0.23,1.521-0.389,1.947-1.438C50.281,28.56,50.09,27.433,49.416,27.128z" fill="url(#SVGID_6)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7" x1="39.54" x2="45.84" y1="37.06" y2="30.81">
-<stop offset="0" stop-color="#FFC6B3"/>
-<stop offset="1" stop-color="#FFA98E"/>
+<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"/>
 </linearGradient>
-<path d="M41.811,35.801c-1.244,0-2.494-0.578-3.417-1.449c0.976,1.025,2.288,2.023,3.717,2.023 c2.04,0,3.288-1.118,4.146-2.243c0.021-0.048,0.044-0.093,0.068-0.131c0.635-0.993,1.152-1.991,1.569-2.919 C45.574,35.138,43.85,35.801,41.811,35.801z" fill="url(#SVGID_7)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8" x1="42.05" x2="42.05" y1="17.1" y2="26.37">
-<stop offset="0" stop-color="#8A5D3B"/>
-<stop offset="0.38" stop-color="#632F00"/>
-<stop offset="1" stop-color="#361700"/>
+<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"/>
 </linearGradient>
-<path d="M41.904,16.965c-2.527,0-3.744,1.149-4.681,2.35c-1.526,0.236-3.946,1.635-2.237,7.764 c1.07-0.917,3.028-3.406,3.229-4.256c0.253-1.08,3.655,3.044,11.083,4.272c0.088-0.343,0.128-0.545,0.128-0.545 C50.592,21.317,48.055,17.17,41.904,16.965z" fill="url(#SVGID_8)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9" x1="45.22" x2="36.82" y1="25.97" y2="20.99">
-<stop offset="0" stop-color="#8A5D3B"/>
-<stop offset="0.36" stop-color="#632F00"/>
-<stop offset="1" stop-color="#361700"/>
+<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"/>
 </linearGradient>
-<path d="M38.225,22.32c0,0,3.635,4.777,11.023,4.768C49.247,27.088,45.77,26.542,38.225,22.32z" fill="url(#SVGID_9)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10" x1="36.06" x2="36.14" y1="20.01" y2="25.35">
-<stop offset="0" stop-color="#8A5D3B"/>
-<stop offset="0.38" stop-color="#632F00"/>
-<stop offset="1" stop-color="#361700"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M37.35,19.67c0,0-3.559,0.214-2.238,6.246C35.111,25.916,34.676,21.785,37.35,19.67z" fill="url(#SVGID_10)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11" x1="43.23" x2="42.97" y1="17.9" y2="20.32">
-<stop offset="0" stop-color="#A87C4F"/>
-<stop offset="1" stop-color="#632F00"/>
-</linearGradient>
-<path d="M43.631,20.507c-1.658-0.237-4.461-1.706-5.561-1.181c0,0,3.598-4.105,9.943,0.568 C48.014,19.894,46.502,20.915,43.631,20.507z" fill="url(#SVGID_11)"/>
-<radialGradient cx="18.04" cy="42.28" gradientUnits="userSpaceOnUse" id="SVGID_12" 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"/>
+<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"/>
 </radialGradient>
-<path d="M22.552,37.352c-1.043-0.453-1.01-2.678-0.58-3.351c0.075-0.117,0.143-0.234,0.217-0.353 h-8.733c0.071,0.118,0.14,0.235,0.215,0.353c0.431,0.673,0.462,2.896-0.58,3.351c-1.046,0.453,4.854,4.402,4.854,4.402 S23.597,37.805,22.552,37.352z" fill="url(#SVGID_12)"/>
-<path d="M28.83,39.668c-1.098-0.571-6.541-2.477-6.643-2.596l-4.158,3.455l-4.467-3.588 c-0.124,0.183-5.504,2.068-6.748,2.729c-1.425,0.757-3.752,2.496-3.752,6.414H32.58C32.58,42.164,29.927,40.24,28.83,39.668z" fill="url(#SVGID_2)"/>
-<polygon fill="#020202" fill-opacity="0.3" points="12.544,37.383 18.028,41.754 23.179,37.473 22.187,37.072 18.028,40.527 13.561,36.939 " stroke-opacity="0.3"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14" x1="3.85" x2="12.8" y1="41.84" y2="41.84">
-<stop offset="0" stop-color="#3BC8EB"/>
-<stop offset="1" stop-color="#2D9BD2"/>
+<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"/>
 </linearGradient>
-<path d="M12.802,38.075c0,0-7.826,2.043-7.826,7.524c0,0-1.119,0.001-1.126,0 C3.85,42.229,6.481,39.607,12.802,38.075z" fill="url(#SVGID_14)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15" x1="22.74" x2="31.69" y1="41.71" y2="41.71">
-<stop offset="0" stop-color="#3BC8EB"/>
-<stop offset="1" stop-color="#2D9BD2"/>
+<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"/>
+</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"/>
+</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"/>
 </linearGradient>
-<path d="M22.738,37.947c0,0,7.825,2.044,7.825,7.525c0,0,1.119,0,1.127,0 C31.689,42.102,29.059,39.481,22.738,37.947z" fill="url(#SVGID_15)"/>
-<polygon fill="url(#SVGID_5)" points="18.028,41.754 12.543,37.383 12.225,37.521 18.028,42.146 23.5,37.597 23.182,37.469 "/>
-<radialGradient cx="18.58" cy="21.82" gradientUnits="userSpaceOnUse" id="SVGID_17" 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"/>
+<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"/>
 </radialGradient>
-<path d="M25.063,27.128c-0.037-0.017-0.079-0.019-0.116-0.031c0-0.001,0-0.002,0-0.002 c-0.008-0.002-0.013-0.003-0.023-0.004c-0.056-0.015-0.115-0.027-0.174-0.031c-7.29-1.269-10.635-5.307-10.887-4.238 c-0.202,0.851-2.245,2.691-3.316,3.609c0.009,0.041,0.015,0.078,0.023,0.119c0,0,0.039,0.188,0.119,0.509 c-0.085,0.009-0.168,0.027-0.249,0.061c-0.68,0.289-0.895,1.404-0.477,2.496c0.417,1.09,1.307,1.743,1.989,1.456 c0.042-0.018,0.078-0.047,0.116-0.072c0.396,0.89,0.881,1.844,1.477,2.8c0.999,1.186,2.525,2.577,4.212,2.577 c2.04,0,3.288-1.118,4.146-2.243c0.022-0.048,0.045-0.093,0.068-0.131c0.636-0.993,1.152-1.991,1.569-2.919 c0.667,0.23,1.521-0.389,1.947-1.438C25.927,28.56,25.737,27.433,25.063,27.128z" fill="url(#SVGID_17)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18" x1="15.19" x2="21.49" y1="37.06" y2="30.81">
-<stop offset="0" stop-color="#FFC6B3"/>
-<stop offset="1" stop-color="#FFA98E"/>
+<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"/>
 </linearGradient>
-<path d="M17.456,35.801c-1.242,0-2.494-0.578-3.416-1.449c0.976,1.025,2.287,2.023,3.716,2.023 c2.04,0,3.288-1.118,4.146-2.243c0.022-0.048,0.044-0.093,0.068-0.131c0.636-0.993,1.152-1.991,1.569-2.919 C21.22,35.138,19.497,35.801,17.456,35.801z" fill="url(#SVGID_18)"/>
-<path d="M17.551,16.965c-2.528,0-3.744,1.149-4.682,2.35c-1.526,0.236-3.946,1.635-2.236,7.764 c1.07-0.917,3.028-3.406,3.229-4.256c0.254-1.08,3.656,3.044,11.084,4.272c0.086-0.343,0.127-0.545,0.127-0.545 C26.238,21.317,23.701,17.17,17.551,16.965z" fill="url(#SVGID_8)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_20" x1="20.87" x2="12.47" y1="25.97" y2="20.99">
-<stop offset="0" stop-color="#8A5D3B"/>
-<stop offset="0.36" stop-color="#632F00"/>
-<stop offset="1" stop-color="#361700"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M13.87,22.32c0,0,3.635,4.777,11.024,4.768C24.894,27.088,21.415,26.542,13.87,22.32z" fill="url(#SVGID_20)"/>
-<path d="M12.997,19.67c0,0-3.56,0.214-2.24,6.246C10.756,25.916,10.322,21.785,12.997,19.67z" fill="url(#SVGID_10)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_22" x1="18.87" x2="18.61" y1="17.9" y2="20.31">
-<stop offset="0" stop-color="#A87C4F"/>
-<stop offset="1" stop-color="#632F00"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M19.276,20.507c-1.657-0.237-4.46-1.706-5.56-1.181c0,0,3.598-4.105,9.943,0.568 C23.66,19.894,22.148,20.915,19.276,20.507z" fill="url(#SVGID_22)"/>
-<path d="M46.639,40.859c-1.014-0.527-4.164-1.695-6.693-2.635 l-1.423-0.529l-0.255-0.103l-0.334-0.128l-0.636-0.256l-0.393,0.172c-0.003,0-0.007,0.002-0.009,0.002l-0.002,0.002 c-1.65,0.645-4.812,1.797-5.728,2.283c-0.358,0.189-0.772,0.442-1.191,0.773c-0.44-0.363-0.85-0.619-1.146-0.773 c-0.789-0.41-3.808-1.506-5.491-2.136l-0.157-0.063l-0.004,0.002l-0.698-0.28l-0.635,0.277c-0.621,0.243-1.387,0.534-2.205,0.846 l-0.076,0.029c-2.42,0.92-5.165,1.962-6.214,2.521c-2.356,1.25-4.052,3.019-5.053,5.218h19.117h5.166h19.035 C50.053,42.814,47.353,41.231,46.639,40.859z" fill="#231F20" fill-opacity="0.15" stroke-opacity="0.15"/>
-<path d="M18.102,22.87c-1.12,0.952-1.423,2.862-0.696,4.758 c0.682,1.787,2.095,2.988,3.515,2.988c0.001,0,0.004,0,0.004,0c0.213,0.442,0.434,0.88,0.662,1.31H21.52l0.542,0.896 c0,0,0.141,0.23,0.307,0.505c0.452-0.767,0.85-1.528,1.172-2.245c0.667,0.23,1.521-0.389,1.947-1.438 c0.439-1.085,0.249-2.212-0.425-2.518c-0.037-0.016-0.079-0.018-0.116-0.03c0-0.001,0-0.002,0-0.002 c-0.008-0.002-0.013-0.003-0.023-0.004c-0.056-0.015-0.115-0.027-0.174-0.031c-0.014-0.002-0.025-0.006-0.038-0.008 c-0.028-0.006-0.065-0.014-0.099-0.021c0.114,0.02,0.217,0.045,0.333,0.064c0.086-0.344,0.127-0.545,0.127-0.545 c1.166-5.233-1.371-9.38-7.521-9.585c-0.012,0-0.02,0.002-0.032,0.002C17.359,18.634,17.544,20.598,18.102,22.87z" fill="#231F20" fill-opacity="0.15" stroke-opacity="0.15"/>
-<path d="M37.224,19.314c-1.526,0.236-3.944,1.634-2.238,7.759 c-0.064,0.011-0.129,0.021-0.191,0.046c-0.681,0.289-0.896,1.404-0.478,2.496c0.418,1.09,1.308,1.743,1.988,1.456 c0.043-0.018,0.079-0.047,0.115-0.072c0.332,0.742,0.73,1.531,1.197,2.326c0.523-0.883,1.021-1.796,1.473-2.738 c1.295-0.154,2.558-1.277,3.21-2.89c0.745-1.836,0.507-3.746-0.544-4.739c0.471-2.123,0.544-4.146,0.234-5.986 c-0.029-0.001-0.057-0.005-0.086-0.006C39.377,16.965,38.16,18.114,37.224,19.314z M34.994,27.07 c0.014-0.011,0.029-0.026,0.041-0.038c0.002,0.009,0.005,0.016,0.008,0.026C35.026,27.061,35.011,27.068,34.994,27.07z M38.518,22.661L38.518,22.661c-0.018-0.003-0.042-0.014-0.061-0.015C38.476,22.646,38.499,22.657,38.518,22.661z" fill="#231F20" fill-opacity="0.15" stroke-opacity="0.15"/>
-<path d="M46.365,41.383c-0.98-0.508-4.11-1.67-6.627-2.605 l-1.437-0.533l-0.247-0.102l-0.343-0.131l-0.97-0.39c-0.031-0.043-0.054-0.099-0.082-0.147c-1.697,0.658-4.617,1.729-5.494,2.193 c-0.357,0.19-0.771,0.443-1.191,0.774c-0.441-0.363-0.85-0.619-1.146-0.774c-0.789-0.409-3.808-1.505-5.491-2.135l-0.086-0.035 l-1.192,0.52c-0.641,0.252-1.438,0.555-2.286,0.878c-2.406,0.914-5.132,1.951-6.148,2.489c-2.143,1.139-3.715,2.727-4.677,4.697 h18.465h5.166h18.379C49.461,43.152,47.023,41.726,46.365,41.383z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M17.957,27.418c0.596,1.56,1.788,2.608,2.964,2.608 c0.122,0,0.244-0.012,0.362-0.035c0.403,0.866,0.838,1.711,1.301,2.524h-0.017l0.137,0.224c0.311-0.565,0.599-1.124,0.838-1.657 c0.667,0.23,1.521-0.389,1.947-1.438c0.439-1.085,0.249-2.212-0.425-2.518c-0.037-0.016-0.079-0.018-0.116-0.03 c0-0.001,0-0.002,0-0.002c-0.009-0.002-0.014-0.003-0.023-0.004c-0.056-0.015-0.114-0.027-0.174-0.031 c-0.014-0.002-0.025-0.006-0.038-0.008c-0.028-0.006-0.065-0.014-0.099-0.021c0.114,0.02,0.218,0.045,0.334,0.064 c0.086-0.344,0.126-0.545,0.126-0.545c1.129-5.069-1.228-9.109-6.966-9.543c-0.167,1.691,0.046,3.725,0.667,6.109 C17.626,23.776,17.262,25.604,17.957,27.418z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M37.224,19.314c-1.526,0.236-3.944,1.634-2.238,7.759 c-0.064,0.011-0.129,0.021-0.191,0.046c-0.681,0.289-0.896,1.404-0.478,2.496c0.418,1.09,1.308,1.743,1.988,1.456 c0.043-0.018,0.079-0.047,0.115-0.072c0.248,0.557,0.535,1.138,0.858,1.728c0.51-0.878,0.995-1.78,1.43-2.714 c0.025,0.001,0.051,0.002,0.077,0.002c1.161,0,2.354-1.021,2.967-2.54c0.719-1.767,0.422-3.569-0.65-4.287 c0.049-0.213,0.072-0.331,0.072-0.331c0.467-2.086,0.533-4.069,0.221-5.862C39.219,17.142,38.095,18.2,37.224,19.314z M34.994,27.07 c0.014-0.011,0.029-0.026,0.041-0.038c0.002,0.009,0.005,0.016,0.008,0.026C35.026,27.061,35.011,27.068,34.994,27.07z M38.518,22.661L38.518,22.661c-0.018-0.003-0.042-0.014-0.061-0.015C38.476,22.646,38.499,22.657,38.518,22.661z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
-<radialGradient cx="30.31" cy="45.72" gradientUnits="userSpaceOnUse" id="SVGID_23" 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"/>
+<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"/>
+<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"/>
 </radialGradient>
-<path d="M36.914,38.519c-1.525-0.663-1.477-3.914-0.848-4.897c0.109-0.171,0.21-0.344,0.315-0.515 H23.614c0.105,0.171,0.204,0.344,0.314,0.515c0.63,0.983,0.679,4.234-0.848,4.897c-1.527,0.662,7.097,6.437,7.097,6.437 S38.441,39.181,36.914,38.519z" fill="url(#SVGID_23)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_24" x1="30" x2="30" y1="37.92" y2="51.28">
-<stop offset="0" stop-color="#FF7236"/>
-<stop offset="1" stop-color="#BA1212"/>
+<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"/>
 </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.269-8.046,3.024-9.866,3.992c-2.083,1.105-5.486,3.646-5.486,9.375h43.158C51.576,45.554,47.696,42.742,46.094,41.906z" fill="url(#SVGID_24)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_25" x1="30.06" x2="30.06" y1="37.04" y2="44.86">
-<stop offset="0" stop-color="#BC1C24"/>
-<stop offset="1" stop-color="#6B1C24"/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_25)" points="22.282,38.565 30.3,44.955 37.832,38.695 36.379,38.111 30.3,43.163 23.77,37.916 "/>
-<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="#FF7B56"/>
-<path d="M37.186,39.392c0,0,11.441,2.987,11.441,11.003c0,0,1.636,0,1.646,0 C50.273,45.465,46.428,41.633,37.186,39.392z" fill="#FF7B56"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_26" x1="30.06" x2="30.06" y1="45.53" y2="38.15">
-<stop offset="0" stop-color="#FFA98E"/>
-<stop offset="0.96" stop-color="#D45D36"/>
-<stop offset="1" stop-color="#D45D36"/>
+<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"/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_26)" points="30.3,44.955 22.281,38.565 21.815,38.77 30.3,45.531 38.3,38.879 37.834,38.691 "/>
-<radialGradient cx="31.1" cy="15.82" gradientUnits="userSpaceOnUse" id="SVGID_27" 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"/>
+<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"/>
 </radialGradient>
-<path d="M40.584,23.573c-0.055-0.026-0.114-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.696,2.159,4.094c1.458,1.732,3.691,3.766,6.157,3.766 c2.983,0,4.808-1.633,6.063-3.279c0.031-0.068,0.064-0.133,0.102-0.189c0.931-1.453,1.684-2.911,2.294-4.268 c0.974,0.337,2.225-0.569,2.845-2.102C41.85,25.666,41.571,24.017,40.584,23.573z" fill="url(#SVGID_27)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_28" x1="26.15" x2="35.36" y1="38.09" y2="28.95">
-<stop offset="0" stop-color="#FFC6B3"/>
-<stop offset="1" stop-color="#FFA98E"/>
+<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"/>
 </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.068,0.063-0.133,0.1-0.189c0.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_28)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_29" x1="29.82" x2="29.82" y1="8.91" y2="22.47">
-<stop offset="0" stop-color="#8A5D3B"/>
-<stop offset="0.38" stop-color="#632F00"/>
-<stop offset="1" stop-color="#361700"/>
+<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"/>
 </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_29)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_30" x1="34.45" x2="22.17" y1="21.89" y2="14.59">
-<stop offset="0" stop-color="#8A5D3B"/>
-<stop offset="0.36" stop-color="#632F00"/>
-<stop offset="1" stop-color="#361700"/>
+<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"/>
 </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_30)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_31" x1="21.06" x2="21.17" y1="13.17" y2="20.97">
-<stop offset="0" stop-color="#8A5D3B"/>
-<stop offset="0.38" stop-color="#632F00"/>
-<stop offset="1" stop-color="#361700"/>
+<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"/>
 </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_31)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_32" x1="31.54" x2="31.15" y1="10.07" y2="13.61">
-<stop offset="0" stop-color="#A87C4F"/>
-<stop offset="1" stop-color="#632F00"/>
+<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"/>
 </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_32)"/>
-<rect fill="none" height="59.996" width="59.996"/>
+<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"/>
+</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_ftu.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_ftu.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_ftu.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,149 +1,157 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
 <rect fill="none" height="60" width="60"/>
-<rect fill="none" height="59.996" width="59.996"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="29.69" x2="29.69" y1="7.35" y2="51.92">
-<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"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M44.078,49.588c0,1.353-1.096,2.449-2.449,2.449H17.754c-1.353,0-2.449-1.097-2.449-2.449 V9.795c0-1.353,1.096-2.449,2.449-2.449h23.875c1.354,0,2.449,1.097,2.449,2.449V49.588z" fill="url(#SVGID_1)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="29.69" x2="29.69" y1="7.35" y2="51.16">
-<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"/>
+<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"/>
 </linearGradient>
-<path d="M41.629,7.346H17.754c-1.353,0-2.449,1.097-2.449,2.449v39.792 c0,0.652,0.26,1.244,0.676,1.684c-0.037-0.148-0.064-0.3-0.064-0.459v-1.225V11.02V9.795c0-1.013,0.824-1.837,1.837-1.837h23.875 c1.014,0,1.838,0.824,1.838,1.837v1.224v38.568v1.225c0,0.159-0.027,0.311-0.064,0.459c0.416-0.439,0.676-1.031,0.676-1.684V9.795 C44.078,8.443,42.982,7.346,41.629,7.346z" fill="url(#SVGID_2)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="29.69" x2="29.69" y1="10.45" y2="40.41">
-<stop offset="0" stop-color="#B6BBBD"/>
-<stop offset="1" stop-color="#F0FBFF"/>
+<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">
+<stop offset="0" style="stop-color:#6E6E6E"/>
+<stop offset="1" style="stop-color:#333333"/>
 </linearGradient>
-<rect fill="url(#SVGID_3)" fill-opacity="0.6" height="29.998" stroke-opacity="0.6" width="25.101" x="17.142" y="10.407"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="29.69" x2="29.69" y1="11.06" y2="39.8">
-<stop offset="0" stop-color="#6E6E6E"/>
-<stop offset="1" stop-color="#333333"/>
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_4)" height="28.773" width="23.875" x="17.754" y="11.02"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="29.69" x2="29.69" y1="11.67" y2="39.18">
-<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"/>
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_5)" height="27.549" width="22.651" x="18.366" y="11.632"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6" x1="29.69" x2="29.69" y1="12.11" y2="23.06">
-<stop offset="0" stop-color="#85EFFF"/>
-<stop offset="1" stop-color="#3BA1D9"/>
+<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"/>
+<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"/>
+</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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_6)" points="41.018,21.427 18.366,23.876 18.366,12.244 41.018,12.244 "/>
-<rect fill="#9FE4FF" height="0.612" width="22.651" x="18.366" y="11.632"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7" x1="29.87" x2="29.87" y1="10.44" y2="7.99">
-<stop offset="0" stop-color="#FFFFFF"/>
-<stop offset="1" stop-color="#D1D7D9"/>
-</linearGradient>
-<path d="M27.163,10.407c-0.686,0-1.224-0.448-1.224-1.02V8.979c0-0.573,0.538-1.021,1.224-1.021h5.416 c0.687,0,1.225,0.448,1.225,1.021v0.408c0,0.572-0.538,1.02-1.225,1.02H27.163z" fill="url(#SVGID_7)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8" x1="29.87" x2="29.87" y1="8.32" y2="9.9">
-<stop offset="0" stop-color="#6C7375"/>
-<stop offset="1" stop-color="#BDC2C4"/>
+<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="1" style="stop-color:#FFFFFF"/>
 </linearGradient>
-<path d="M33.19,9.388c0,0.226-0.273,0.408-0.612,0.408h-5.416c-0.338,0-0.612-0.182-0.612-0.408V8.979 c0-0.226,0.274-0.409,0.612-0.409h5.416c0.339,0,0.612,0.183,0.612,0.409V9.388z" fill="url(#SVGID_8)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9" x1="29.6" x2="29.6" y1="41.04" y2="50.14">
-<stop offset="0" stop-color="#B6BBBD"/>
-<stop offset="1" stop-color="#FFFFFF"/>
+<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"/>
 </linearGradient>
-<path d="M27.384,50.2c-1.312,0-2.378-1.058-2.378-2.354v-4.475 c0-1.299,1.066-2.354,2.378-2.354h4.425c1.313,0,2.38,1.056,2.38,2.354v4.475c0,1.297-1.066,2.354-2.38,2.354H27.384z" fill="url(#SVGID_9)" fill-opacity="0.6" stroke-opacity="0.6"/>
-<path d="M27.382,49.588c-0.972,0-1.764-0.78-1.764-1.742v-4.475 c0-0.961,0.792-1.742,1.764-1.742h4.432c0.973,0,1.763,0.781,1.763,1.742v4.475c0,0.96-0.79,1.742-1.763,1.742H27.382z" fill="#020202" fill-opacity="0.5" stroke-opacity="0.5"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10" x1="29.6" x2="29.6" y1="42.21" y2="48.99">
-<stop offset="0" stop-color="#A6A8AB"/>
-<stop offset="0.7" stop-color="#58595B"/>
-<stop offset="1" stop-color="#808184"/>
+<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"/>
 </linearGradient>
-<path d="M32.965,47.846c0,0.625-0.514,1.131-1.146,1.131h-4.443c-0.632,0-1.146-0.506-1.146-1.131 v-4.475c0-0.624,0.514-1.13,1.146-1.13h4.443c0.632,0,1.146,0.506,1.146,1.13V47.846z" fill="url(#SVGID_10)"/>
-<path d="M28.679,47.752c-0.675,0-1.225-0.549-1.225-1.225V44.69 c0-0.676,0.549-1.224,1.225-1.224h1.836c0.676,0,1.225,0.548,1.225,1.224v1.837c0,0.676-0.549,1.225-1.225,1.225H28.679z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11" x1="29.6" x2="29.6" y1="44.06" y2="47.14">
-<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"/>
+<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"/>
 </linearGradient>
-<path d="M28.679,47.14c-0.337,0-0.612-0.274-0.612-0.612V44.69c0-0.336,0.275-0.612,0.612-0.612 h1.836c0.338,0,0.612,0.276,0.612,0.612v1.837c0,0.338-0.274,0.612-0.612,0.612H28.679z" fill="url(#SVGID_11)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12" x1="19.85" x2="19.85" y1="41.59" y2="48.99">
-<stop offset="0" stop-color="#B6BBBD"/>
-<stop offset="1" stop-color="#F0FBFF"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M19.496,48.977c-1.297,0-2.354-1.058-2.354-2.355 v-2.638c0-1.296,1.057-2.354,2.354-2.354h0.707c1.298,0,2.354,1.059,2.354,2.355v2.638c0,1.297-1.057,2.354-2.354,2.354H19.496z" fill="url(#SVGID_12)" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13" x1="19.85" x2="19.85" y1="42.21" y2="48.37">
-<stop offset="0" stop-color="#231F20"/>
-<stop offset="1" stop-color="#6D6E70"/>
+<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"/>
 </linearGradient>
-<path d="M19.496,48.363c-0.962,0-1.742-0.78-1.742-1.742 v-2.638c0-0.961,0.78-1.741,1.742-1.741h0.707c0.96,0,1.742,0.78,1.742,1.742v2.638c0,0.961-0.782,1.741-1.742,1.741H19.496z" fill="url(#SVGID_13)" fill-opacity="0.7" stroke-opacity="0.7"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14" x1="19.85" x2="19.85" y1="42.83" y2="47.76">
-<stop offset="0" stop-color="#C6FF45"/>
-<stop offset="0.73" stop-color="#66A00E"/>
-<stop offset="1" stop-color="#387300"/>
+<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"/>
 </linearGradient>
-<path d="M21.333,46.621c0,0.625-0.505,1.131-1.13,1.131h-0.707c-0.624,0-1.13-0.506-1.13-1.131 v-2.638c0-0.624,0.506-1.13,1.13-1.13h0.707c0.625,0,1.13,0.506,1.13,1.131V46.621z" fill="url(#SVGID_14)"/>
-<path d="M38.654,48.977c-1.299,0-2.355-1.058-2.355-2.355 v-2.638c0-1.298,1.057-2.354,2.355-2.354h0.705c1.298,0,2.355,1.057,2.355,2.354v2.638c0,1.298-1.058,2.355-2.355,2.355H38.654z" fill="url(#SVGID_12)" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M38.654,48.363c-0.962,0-1.744-0.78-1.744-1.742 v-2.638c0-0.961,0.781-1.742,1.744-1.742h0.705c0.961,0,1.743,0.78,1.743,1.742v2.638c0,0.961-0.782,1.742-1.743,1.742H38.654z" fill="url(#SVGID_13)" fill-opacity="0.7" stroke-opacity="0.7"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17" x1="39.01" x2="39.01" y1="42.83" y2="47.76">
-<stop offset="0" stop-color="#FFC142"/>
-<stop offset="0.75" stop-color="#CF4E18"/>
-<stop offset="1" stop-color="#B52100"/>
+<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"/>
 </linearGradient>
-<path d="M40.49,46.621c0,0.625-0.507,1.131-1.131,1.131h-0.705c-0.625,0-1.131-0.506-1.131-1.131 v-2.638c0-0.624,0.506-1.13,1.131-1.13h0.705c0.624,0,1.131,0.506,1.131,1.13V46.621z" fill="url(#SVGID_17)"/>
+<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 0)">
-<rect height="30" style="fill:none;" width="30" y="30"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 90.98 146.5195)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-78.29" x2="-78.29" y1="112.9688" y2="94.9707">
-<stop offset="0" style="stop-color:#FFE6DE"/>
-<stop offset="1" style="stop-color:#DB7250"/>
+<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"/>
 </linearGradient>
-<polygon points="15.618,39.622 21.689,42.549 15.618,45.477 12.69,51.549 9.763,45.477 3.691,42.549   9.763,39.622 12.69,33.551 " style="fill:url(#SVGID_1_);"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 90.98 146.5195)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-78.2896" x2="-78.2896" y1="111.4355" y2="96.5039">
-<stop offset="0" style="stop-color:#FF7236"/>
-<stop offset="0.79" style="stop-color:#D11414"/>
-<stop offset="1" style="stop-color:#E8522A"/>
+<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"/>
 </linearGradient>
-<polygon points="20.157,42.549 15.119,44.979 12.69,50.016 10.262,44.979 5.224,42.549 10.262,40.121   12.69,35.084 15.119,40.121 " style="fill:url(#SVGID_2_);"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 90.98 146.5195)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-78.2896" x2="-78.2896" y1="114.1299" y2="93.8633">
-<stop offset="0" style="stop-color:#FF3030"/>
-<stop offset="1" style="stop-color:#9C2D31"/>
+<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"/>
 </linearGradient>
-<path d="M12.69,33.75l2.774,5.755l0.088,0.183l0.183,0.088l5.754,2.773l-5.754,2.775l-0.183,0.088  l-0.088,0.184l-2.774,5.752l-2.774-5.752l-0.088-0.184l-0.183-0.088l-5.754-2.775l5.754-2.773l0.183-0.088l0.088-0.183L12.69,33.75   M12.69,32.417l-3.295,6.837l-6.837,3.295l6.837,3.297l3.296,6.838l3.296-6.838l6.836-3.297l-6.837-3.295L12.69,32.417L12.69,32.417  z" style="fill:url(#SVGID_3_);"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 90.98 146.5195)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-68.562" x2="-68.562" y1="102.2305" y2="94.7988">
-<stop offset="0" style="stop-color:#A6A8AB"/>
-<stop offset="1" style="stop-color:#231F20"/>
+<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"/>
 </linearGradient>
-<path d="M21.614,44.301l-2.329,4.832l-3.222,1.553  c0.442,0.631,1.168,1.047,1.997,1.047h10.151l0.562-0.272l-4.832-2.328L21.614,44.301z" style="opacity:0.2;fill:url(#SVGID_4_);enable-background:new    ;"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 90.98 146.5195)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="-68.7163" x2="-68.7163" y1="101.8027" y2="94.7891">
-<stop offset="0" style="stop-color:#A9AAAD"/>
-<stop offset="1" style="stop-color:#000000"/>
+<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="1" stop-color="#000000"/>
 </linearGradient>
-<path d="M21.614,44.717l-2.193,4.551l-3.251,1.566  c0.449,0.547,1.127,0.896,1.891,0.896h9.735l0.562-0.271l-4.55-2.192L21.614,44.717z" style="opacity:0.4;fill:url(#SVGID_5_);enable-background:new    ;"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 90.98 146.5195)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-69.3667" x2="-69.3667" y1="100.8594" y2="89.6211">
-<stop offset="0" style="stop-color:#FFE6DE"/>
-<stop offset="1" style="stop-color:#DB7250"/>
+<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"/>
 </linearGradient>
-<polygon points="23.441,49.452 27.232,51.279 23.441,53.107 21.614,56.898 19.786,53.107   15.994,51.279 19.786,49.452 21.614,45.66 " style="fill:url(#SVGID_6_);"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 90.98 146.5195)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="-69.3667" x2="-69.3667" y1="99.9023" y2="90.5781">
-<stop offset="0" style="stop-color:#FF7236"/>
-<stop offset="0.79" style="stop-color:#D11414"/>
-<stop offset="1" style="stop-color:#E8522A"/>
+<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"/>
 </linearGradient>
-<polygon points="26.275,51.279 23.13,52.795 21.614,55.941 20.097,52.795 16.951,51.279   20.097,49.764 21.614,46.617 23.13,49.764 " style="fill:url(#SVGID_7_);"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 90.98 146.5195)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="-69.3657" x2="-69.3657" y1="101.5791" y2="88.9229">
-<stop offset="0" style="stop-color:#FF3030"/>
-<stop offset="1" style="stop-color:#9C2D31"/>
+<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"/>
 </linearGradient>
-<path d="M21.614,45.785l1.732,3.594l0.055,0.114l0.114,0.056l3.594,1.73l-3.594,1.732l-0.114,0.055  l-0.055,0.115l-1.732,3.592l-1.732-3.592l-0.055-0.115l-0.114-0.055l-3.594-1.732l3.594-1.73l0.114-0.056l0.055-0.114L21.614,45.785   M21.614,44.953l-2.058,4.27l-4.27,2.057l4.27,2.06l2.058,4.271l2.058-4.271l4.27-2.06l-4.27-2.057L21.614,44.953L21.614,44.953z" style="fill:url(#SVGID_8_);"/>
+<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>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_games.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_games.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_games.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,156 +1,159 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<g>
 <rect fill="none" height="60" width="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="29.8" x2="36.23" y1="20.8" y2="21.41">
-<stop offset="0" stop-color="#333333"/>
-<stop offset="1" stop-color="#A7A8A9"/>
+<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"/>
 </linearGradient>
-<path d="M28.103,10.298l4.682,0.319l0.884,2.22l-1.863,0.785l2.394,1.228l0.088,4.188l-2.481-0.393 l2.481,1.811c0,0-4.461,7.178-1.326,9.055l-3.572,1.714c0,0-4.42-2.526-1.238-7.458C31.329,18.837,28.103,10.298,28.103,10.298z" fill="url(#SVGID_1)"/>
-<polygon fill="#FFFFFF" fill-opacity="0.1" points="31.805,14.847 34.198,16.074 34.261,19.034 34.286,19.038 34.198,14.85 33.115,14.295 "/>
-<path d="M32.784,11.841l0.467,1.172l0.417-0.176l-0.884-2.22l-4.682-0.319 c0,0,0.178,0.472,0.408,1.252L32.784,11.841z" fill="#FFFFFF" fill-opacity="0.1"/>
-<path d="M31.805,19.87l1.987,1.449c0.289-0.533,0.494-0.863,0.494-0.863l-0.34-0.247L31.805,19.87z" fill="#FFFFFF" fill-opacity="0.1"/>
-<path d="M31.885,27.761c-0.093,0.8-0.03,1.542,0.28,2.132l0.795-0.382 C32.308,29.12,31.987,28.497,31.885,27.761z" fill="#FFFFFF" fill-opacity="0.1"/>
-<path d="M32.784,11.34l0.638,1.601l0.246-0.104l-0.884-2.22l-4.682-0.319c0,0,0.102,0.271,0.251,0.739 L32.784,11.34z" fill="#FFFFFF" fill-opacity="0.3"/>
-<polygon fill="#FFFFFF" fill-opacity="0.3" points="31.805,14.345 34.198,15.572 34.271,19.036 34.286,19.038 34.198,14.85 32.578,14.019 "/>
-<path d="M31.859,27.537c-0.062,0.874,0.08,1.663,0.56,2.233l0.541-0.26 C32.243,29.081,31.926,28.372,31.859,27.537z" fill="#FFFFFF" fill-opacity="0.3"/>
-<path d="M31.805,19.368l2.185,1.595c0.181-0.319,0.297-0.507,0.297-0.507l-1.217-0.888L31.805,19.368z " fill="#FFFFFF" fill-opacity="0.3"/>
-<path d="M32.331,16.224c0.111-0.828,0.102-1.608-0.02-2.342l-0.507-0.26l0.422-0.178 c-0.216-0.917-0.616-1.754-1.212-2.502c-0.133-0.166-0.274-0.323-0.42-0.475l-2.492-0.17c0,0,3.227,8.539,0.047,13.469 c-3.182,4.932,1.238,7.458,1.238,7.458l0.576-0.276c-2.031-2.58-1.068-4.87,0.284-8.058c0.545-1.28,1.134-2.679,1.57-4.235 l-0.014-0.01l0.016,0.002C32.035,17.88,32.216,17.076,32.331,16.224z" fill="#231F20" fill-opacity="0.3"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="23.28" x2="28.03" y1="23.19" y2="7.43">
-<stop offset="0" stop-color="#2E3030"/>
-<stop offset="0.65" stop-color="#6E6E6E"/>
-<stop offset="1" stop-color="#4D5152"/>
+<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"/>
+<path d="M33.441,7.556l0.578,1.448l0.514-0.217l-1.092-2.745l-5.785-0.394c0,0,0.219,0.582,0.504,1.547L33.441,7.556  z" fill="#FFFFFF"/>
+<path d="M32.23,17.48l2.457,1.791c0.357-0.659,0.611-1.067,0.611-1.067l-0.42-0.306L32.23,17.48z" fill="#FFFFFF"/>
+<path d="M32.33,27.233c-0.115,0.987-0.037,1.904,0.348,2.633l0.982-0.471C32.854,28.914,32.457,28.143,32.33,27.233z  " fill="#FFFFFF"/>
+<path d="M33.441,6.936l0.787,1.979l0.305-0.128l-1.092-2.745l-5.785-0.394  c0,0,0.125,0.335,0.309,0.913L33.441,6.936z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
+<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"/>
+<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.6545" style="stop-color:#6E6E6E"/>
+<stop offset="1" style="stop-color:#4D5152"/>
 </linearGradient>
-<path d="M31.725,16.142c0.979-7.265-8.015-8.097-8.015-8.097l-3.75-0.698c0,0-0.385,1.037,1.621,2.103 c-3.52,2.37-10.22,7.102-10.551,9.011c-0.219,1.249,3.429,5.817,4.371,2.501c0.629-2.223,4.446-0.835,5.481-1.488 c0.845-0.535,1.768,0.233,1.768,0.233c-7.306,6.633-7.956,13.355-7.956,13.355v9.184h16.53v-9.184 C24.599,27.667,30.708,23.691,31.725,16.142z" fill="url(#SVGID_2)"/>
-<path d="M20.229,14.418l2.827-1.928C23.056,12.49,22.92,16.576,20.229,14.418z" fill="#FCFCFC" fill-opacity="0.3"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="21.64" x2="21.64" y1="11.47" y2="14.75">
-<stop offset="0" stop-color="#1A1A1A"/>
-<stop offset="1" stop-color="#4E4E4E"/>
+<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"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="19.6699" x2="19.6699" y1="7.1016" y2="11.1458">
+<stop offset="0" style="stop-color:#1A1A1A"/>
+<stop offset="1" style="stop-color:#4E4E4E"/>
 </linearGradient>
-<path d="M20.229,14.13l2.827-1.814C23.056,12.315,22.451,15.457,20.229,14.13z" fill="url(#SVGID_3)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="13.47" x2="32.45" y1="43.47" y2="43.47">
-<stop offset="0" stop-color="#363636"/>
-<stop offset="0.65" stop-color="#898C8C"/>
-<stop offset="1" stop-color="#565C5C"/>
+<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"/>
 </linearGradient>
-<path d="M32.449,43.468c0,0.679-0.544,1.227-1.225,1.227H14.6c-0.683,0-1.13-0.548-1.13-1.227l0,0 c0-0.676,0.447-1.223,1.13-1.223h16.625C31.905,42.245,32.449,42.792,32.449,43.468L32.449,43.468z" fill="url(#SVGID_4)"/>
-<path d="M14.6,42.857h16.625c0.573,0,1.046,0.39,1.182,0.917c0.024-0.098,0.043-0.2,0.043-0.307 c0-0.676-0.544-1.223-1.225-1.223H14.6c-0.683,0-1.13,0.547-1.13,1.223c0,0.106,0.015,0.209,0.035,0.307 C13.62,43.247,14.024,42.857,14.6,42.857z" fill="#FFFFFF" fill-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="19.65" x2="33.4" y1="22.37" y2="10.56">
-<stop offset="0" stop-color="#2E3030"/>
-<stop offset="0.65" stop-color="#6E6E6E"/>
-<stop offset="1" stop-color="#4D5152"/>
+<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.6545" style="stop-color:#6E6E6E"/>
+<stop offset="1" style="stop-color:#4D5152"/>
 </linearGradient>
-<path d="M29.243,10.091l-7.411,9.226c0.467,0.099,0.818,0.39,0.818,0.39 c-0.368,0.334-0.708,0.669-1.043,1.003l0.034,0.155l10.094-4.848C32.083,13.134,30.846,11.276,29.243,10.091z" fill="url(#SVGID_5)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6" x1="17.51" x2="31.99" y1="22.03" y2="25.95">
-<stop offset="0" stop-color="#2E3030"/>
-<stop offset="0.65" stop-color="#6E6E6E"/>
-<stop offset="1" stop-color="#4D5152"/>
+<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.6545" style="stop-color:#6E6E6E"/>
+<stop offset="1" style="stop-color:#4D5152"/>
 </linearGradient>
-<path d="M31.725,16.142c0.103-0.759,0.091-1.444-0.003-2.069c-3.725,1.433-8.715,5.364-9.161,5.72 c-7.216,6.605-7.866,13.27-7.866,13.27v0.007l16.53-0.007C24.599,27.667,30.708,23.691,31.725,16.142z" fill="url(#SVGID_6)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7" x1="14.69" x2="31.22" y1="37.66" y2="37.66">
-<stop offset="0" stop-color="#363636"/>
-<stop offset="0.65" stop-color="#898C8C"/>
-<stop offset="1" stop-color="#565C5C"/>
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_7)" height="9.177" width="16.53" x="14.694" y="33.068"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8" x1="13.71" x2="29.7" y1="32.85" y2="31.62">
-<stop offset="0" stop-color="#2E3030"/>
-<stop offset="0.05" stop-color="#2E3030"/>
-<stop offset="0.73" stop-color="#8F8F8F"/>
-<stop offset="1" stop-color="#4D5152"/>
+<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.7333" style="stop-color:#8F8F8F"/>
+<stop offset="1" style="stop-color:#4D5152"/>
 </linearGradient>
-<path d="M14.694,33.062h16.53c-2.007-1.625-3.017-2.433-8.056-2.433 C16.88,30.629,14.694,33.062,14.694,33.062z" fill="url(#SVGID_8)"/>
-<rect fill="#231F20" fill-opacity="0.5" height="0.612" width="16.53" x="14.694" y="41.633"/>
-<rect fill="#FFFFFF" fill-opacity="0.3" height="0.612" width="16.53" x="14.694" y="33.062"/>
-<rect fill="#FFFFFF" fill-opacity="0.2" height="0.612" width="16.53" x="14.694" y="33.674"/>
-<rect fill="#FFFFFF" fill-opacity="0.1" height="0.611" width="16.53" x="14.694" y="34.286"/>
-<rect fill="#231F20" fill-opacity="0.3" height="0.612" width="16.53" x="14.694" y="41.021"/>
-<rect fill="#231F20" fill-opacity="0.1" height="0.612" width="16.53" x="14.694" y="40.408"/>
-<path d="M28.219,28.418c-0.201,1.935,0.462,3.797,3.006,5.868v-1.225 C29.22,31.431,28.386,29.929,28.219,28.418z" fill="#FFFFFF" fill-opacity="0.1"/>
-<path d="M23.71,9.27c0,0,7.557,0.703,8.058,6.421c0.552-6.845-8.058-7.646-8.058-7.646l-3.75-0.698 c0,0-0.215,0.581,0.519,1.321L23.71,9.27z" fill="#FFFFFF" fill-opacity="0.1"/>
-<path d="M14.694,33.062v1.225c0,0,0.65-6.723,7.956-13.355c0,0-0.379-0.312-0.872-0.398 C15.296,26.886,14.694,33.062,14.694,33.062z" fill="#FFFFFF" fill-opacity="0.1"/>
-<path d="M21.581,10.674c-0.387-0.205-0.683-0.409-0.912-0.605c-3.65,2.498-9.334,6.637-9.639,8.392 c-0.034,0.196,0.027,0.475,0.158,0.791C12.271,17.135,18.304,12.881,21.581,10.674z" fill="#FFFFFF" fill-opacity="0.1"/>
-<path d="M14.694,33.062v0.612c0,0,0.65-6.723,7.956-13.355c0,0-0.158-0.127-0.396-0.241 C15.326,26.587,14.694,33.062,14.694,33.062z" fill="#FFFFFF" fill-opacity="0.3"/>
-<path d="M23.71,8.657c0,0,7.818,0.727,8.079,6.715c0.266-6.553-8.079-7.327-8.079-7.327l-3.75-0.698 c0,0-0.09,0.246,0.049,0.621L23.71,8.657z" fill="#FFFFFF" fill-opacity="0.3"/>
-<path d="M28.194,28.13c-0.095,1.82,0.629,3.589,3.03,5.544v-0.612 C29.093,31.326,28.284,29.737,28.194,28.13z" fill="#FFFFFF" fill-opacity="0.3"/>
-<path d="M21.581,10.062c-0.182-0.096-0.336-0.191-0.48-0.287c-3.614,2.454-9.754,6.86-10.07,8.686 c-0.021,0.123-0.005,0.277,0.041,0.453C11.718,16.912,18.155,12.368,21.581,10.062z" fill="#FFFFFF" fill-opacity="0.3"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9" x1="44.49" x2="50.93" y1="28.76" y2="29.37">
-<stop offset="0" stop-color="#888F91"/>
-<stop offset="1" stop-color="#C9C9C9"/>
+<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="#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"/>
+<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"/>
+<path d="M19.596,6.112c-0.479-0.254-0.846-0.504-1.127-0.748C13.955,8.452,6.932,13.567,6.555,15.737  c-0.043,0.241,0.033,0.586,0.195,0.978C8.086,14.098,15.545,8.84,19.596,6.112z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M11.082,33.785v0.756c0,0,0.805-8.309,9.834-16.507c0,0-0.195-0.157-0.49-0.297  C11.863,25.782,11.082,33.785,11.082,33.785z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M22.227,3.621c0,0,9.664,0.897,9.984,8.3c0.328-8.1-9.984-9.058-9.984-9.058L17.592,2  c0,0-0.111,0.305,0.061,0.768L22.227,3.621z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
+<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="1" style="stop-color:#C9C9C9"/>
 </linearGradient>
-<path d="M42.796,18.257l4.683,0.319l0.884,2.22l-1.863,0.785l2.393,1.228l0.088,4.188l-2.48-0.393l2.48,1.812 c0,0-4.461,7.178-1.325,9.054l-3.573,1.714c0,0-4.419-2.526-1.238-7.457C46.022,26.796,42.796,18.257,42.796,18.257z" fill="url(#SVGID_9)"/>
-<polygon fill="#FFFFFF" fill-opacity="0.1" points="46.499,22.806 48.892,24.033 48.954,26.993 48.979,26.997 48.892,22.809 47.81,22.254 "/>
-<path d="M47.479,19.801l0.466,1.171l0.418-0.176l-0.884-2.22l-4.683-0.319 c0,0,0.178,0.473,0.408,1.253L47.479,19.801z" fill="#FFFFFF" fill-opacity="0.1"/>
-<path d="M46.499,27.829l1.986,1.45c0.29-0.534,0.494-0.863,0.494-0.863l-0.339-0.248L46.499,27.829z" fill="#FFFFFF" fill-opacity="0.1"/>
-<path d="M46.579,35.72c-0.094,0.8-0.031,1.542,0.279,2.132l0.796-0.382 C47.001,37.079,46.681,36.457,46.579,35.72z" fill="#FFFFFF" fill-opacity="0.1"/>
-<path d="M47.479,19.299l0.638,1.602l0.246-0.104l-0.884-2.22l-4.683-0.319 c0,0,0.103,0.271,0.252,0.739L47.479,19.299z" fill="#FFFFFF" fill-opacity="0.3"/>
-<polygon fill="#FFFFFF" fill-opacity="0.3" points="46.499,22.304 48.892,23.531 48.964,26.995 48.979,26.997 48.892,22.809 47.272,21.978 "/>
-<path d="M46.554,35.496c-0.063,0.874,0.08,1.664,0.559,2.233l0.542-0.26 C46.937,37.04,46.62,36.332,46.554,35.496z" fill="#FFFFFF" fill-opacity="0.3"/>
-<path d="M46.499,27.327l2.184,1.595c0.182-0.319,0.297-0.506,0.297-0.506l-1.217-0.889L46.499,27.327z " fill="#FFFFFF" fill-opacity="0.3"/>
-<path d="M47.632,24.265c0.098-0.729,0.104-1.422,0.035-2.085l-1.168-0.599l0.998-0.42 c-0.24-0.964-0.678-1.847-1.309-2.641c-0.01-0.012-0.021-0.022-0.031-0.035l-3.361-0.229c0,0,3.227,8.539,0.047,13.47 c-3.181,4.931,1.238,7.457,1.238,7.457l1.141-0.547c-1.918-2.335-1.078-4.34,0.284-7.547c0.526-1.24,1.097-2.588,1.536-4.089 l-0.543-0.396l0.623,0.099C47.336,25.932,47.517,25.124,47.632,24.265z" fill="#231F20" fill-opacity="0.1"/>
-<path d="M47.025,24.183c0.112-0.828,0.101-1.607-0.021-2.342l-0.506-0.26l0.422-0.178 c-0.216-0.917-0.617-1.754-1.212-2.502c-0.134-0.166-0.274-0.323-0.421-0.475l-2.492-0.17c0,0,3.227,8.539,0.047,13.47 c-3.181,4.931,1.238,7.457,1.238,7.457l0.576-0.276c-2.031-2.58-1.068-4.87,0.285-8.057c0.545-1.281,1.133-2.68,1.57-4.236 l-0.014-0.01l0.016,0.002C46.729,25.839,46.91,25.035,47.025,24.183z" fill="#231F20" fill-opacity="0.2"/>
-<path d="M28.942,31.33c0.128,0,0.303-0.014,0.5-0.06c-0.014-0.018-0.029-0.035-0.043-0.052 l1.065-0.511c0.319-0.31,0.613-0.77,0.808-1.454c0.032-0.112,0.109-0.351,0.985-0.421c-1.616-2.513,2.028-8.377,2.028-8.377 l-2.217-1.617c-6.36,4.578-7.381,6.39-7.552,7.37c-0.222,1.273,1.003,2.851,1.383,3.304C26.597,30.342,27.69,31.33,28.942,31.33z" fill="#231F20" fill-opacity="0.1"/>
-<path d="M33.505,14.881c-0.052,0.142-0.419,1.273,0.67,2.476c-0.693,0.479-1.334,0.93-1.933,1.358 l2.044,0.323l-0.088-4.188l-0.572-0.293L33.505,14.881z" fill="#231F20" fill-opacity="0.1"/>
-<path d="M32.449,43.468c0-0.676-0.544-1.223-1.225-1.223v-9.184c-0.002-0.002-0.003-0.003-0.005-0.005 c-2.693,4.346-3.037,7.729-3.057,7.964v3.674h3.062C31.905,44.694,32.449,44.146,32.449,43.468z" fill="#231F20" fill-opacity="0.1"/>
-<path d="M34.229,16.38l-0.031-1.53l-0.023-0.013l-0.095,0.256 C34.046,15.185,33.882,15.707,34.229,16.38z" fill="#231F20" fill-opacity="0.3"/>
-<path d="M28.942,30.718c0.477,0,1.339-0.212,1.741-1.631c0.137-0.483,0.532-0.745,1.306-0.843 c-0.842-2.734,2.297-7.788,2.297-7.788l-1.695-1.236c-4.727,3.391-7.241,5.774-7.471,7.094c-0.141,0.807,0.586,2.015,1.249,2.806 C26.87,29.716,27.872,30.718,28.942,30.718z" fill="#231F20" fill-opacity="0.3"/>
-<path d="M32.449,43.468c0-0.676-0.544-1.223-1.225-1.223v-8.007c-2.126,3.748-2.43,6.563-2.449,6.782 v3.674h2.449C31.905,44.694,32.449,44.146,32.449,43.468z" fill="#231F20" fill-opacity="0.3"/>
-<path d="M34.286,19.038l-0.021-0.997c-0.398,0.275-0.785,0.546-1.158,0.811L34.286,19.038z" fill="#231F20" fill-opacity="0.3"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10" x1="37.97" x2="42.72" y1="31.15" y2="15.39">
-<stop offset="0" stop-color="#8B8E8F"/>
-<stop offset="0.65" stop-color="#C2C2C2"/>
-<stop offset="1" stop-color="#A0A9AB"/>
+<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_)"/>
+<polygon fill="#FFFFFF" fill-opacity="0.5" points="50.395,21.109 53.352,22.625 53.428,26.284 53.459,26.289 53.352,21.111   52.014,20.425 " stroke-opacity="0.5"/>
+<path d="M51.604,17.393l0.576,1.449l0.518-0.217l-1.094-2.745l-5.787-0.393  c0,0,0.221,0.584,0.506,1.547L51.604,17.393z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M50.395,27.317l2.455,1.792c0.355-0.659,0.609-1.067,0.609-1.067l-0.42-0.307L50.395,27.317z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M50.492,37.07c-0.115,0.988-0.037,1.905,0.346,2.634l0.982-0.47C51.014,38.75,50.619,37.98,50.492,37.07z" fill="#FFFFFF"/>
+<path d="M51.604,16.773l0.789,1.979l0.305-0.127l-1.094-2.745l-5.787-0.393  c0,0,0.125,0.335,0.313,0.912L51.604,16.773z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
+<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"/>
+<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.6545" style="stop-color:#C2C2C2"/>
+<stop offset="1" style="stop-color:#A0A9AB"/>
 </linearGradient>
-<path d="M46.419,24.102c0.979-7.266-8.016-8.097-8.016-8.097l-3.749-0.699c0,0-0.386,1.037,1.62,2.103 c-3.52,2.37-10.219,7.102-10.551,9.011c-0.218,1.249,3.43,5.817,4.371,2.501c0.629-2.223,4.447-0.834,5.482-1.488 c0.844-0.535,1.768,0.233,1.768,0.233c-7.306,6.633-7.957,13.355-7.957,13.355v9.184h16.531v-9.184 C39.292,35.626,45.402,31.65,46.419,24.102z" fill="url(#SVGID_10)"/>
-<path d="M34.923,22.377l2.826-1.928C37.749,20.449,37.614,24.535,34.923,22.377z" fill="#FCFCFC" fill-opacity="0.5"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11" x1="36.34" x2="36.34" y1="19.43" y2="22.7">
-<stop offset="0" stop-color="#292929"/>
-<stop offset="1" stop-color="#868686"/>
+<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"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="37.832" x2="37.832" y1="16.939" y2="20.9847">
+<stop offset="0" style="stop-color:#292929"/>
+<stop offset="1" style="stop-color:#868686"/>
 </linearGradient>
-<path d="M34.923,22.089l2.826-1.814C37.749,20.274,37.146,23.417,34.923,22.089z" fill="url(#SVGID_11)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12" x1="28.16" x2="47.14" y1="51.43" y2="51.43">
-<stop offset="0" stop-color="#8C8E8F"/>
-<stop offset="0.65" stop-color="#D9D9D9"/>
-<stop offset="1" stop-color="#AEB2B3"/>
+<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.6545" style="stop-color:#D9D9D9"/>
+<stop offset="1" style="stop-color:#AEB2B3"/>
 </linearGradient>
-<path d="M47.144,51.427c0,0.68-0.544,1.227-1.225,1.227H29.294c-0.683,0-1.131-0.547-1.131-1.227l0,0 c0-0.676,0.448-1.223,1.131-1.223h16.625C46.6,50.204,47.144,50.751,47.144,51.427L47.144,51.427z" fill="url(#SVGID_12)"/>
-<path d="M29.294,50.816h16.625c0.574,0,1.046,0.391,1.182,0.917c0.024-0.098,0.043-0.199,0.043-0.307 c0-0.676-0.544-1.223-1.225-1.223H29.294c-0.683,0-1.131,0.547-1.131,1.223c0,0.107,0.016,0.209,0.036,0.307 C28.313,51.207,28.718,50.816,29.294,50.816z" fill="#FFFFFF" fill-opacity="0.3"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13" x1="34.34" x2="48.09" y1="30.32" y2="18.52">
-<stop offset="0" stop-color="#8B8E8F"/>
-<stop offset="0.65" stop-color="#C2C2C2"/>
-<stop offset="1" stop-color="#A0A9AB"/>
+<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.6545" style="stop-color:#C2C2C2"/>
+<stop offset="1" style="stop-color:#A0A9AB"/>
 </linearGradient>
-<path d="M43.937,18.05l-7.41,9.227c0.467,0.099,0.818,0.389,0.818,0.389 c-0.369,0.334-0.709,0.669-1.043,1.004l0.034,0.154l10.094-4.847C46.776,21.093,45.54,19.235,43.937,18.05z" fill="url(#SVGID_13)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14" x1="32.35" x2="46.82" y1="30.03" y2="33.94">
-<stop offset="0" stop-color="#8B8E8F"/>
-<stop offset="0.65" stop-color="#C2C2C2"/>
-<stop offset="1" stop-color="#A0A9AB"/>
+<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.6545" style="stop-color:#C2C2C2"/>
+<stop offset="1" style="stop-color:#A0A9AB"/>
+</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.6545" style="stop-color:#D9D9D9"/>
+<stop offset="1" style="stop-color:#AEB2B3"/>
 </linearGradient>
-<path d="M46.419,24.102c0.102-0.76,0.09-1.445-0.004-2.069c-3.725,1.432-8.714,5.364-9.16,5.719 c-7.216,6.605-7.867,13.27-7.867,13.27v0.007l16.531-0.007C39.292,35.626,45.402,31.65,46.419,24.102z" fill="url(#SVGID_14)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15" x1="29.39" x2="45.92" y1="45.62" y2="45.62">
-<stop offset="0" stop-color="#8C8E8F"/>
-<stop offset="0.65" stop-color="#D9D9D9"/>
-<stop offset="1" stop-color="#AEB2B3"/>
+<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="#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"/>
+<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"/>
+<path d="M37.756,15.949c-0.479-0.253-0.842-0.504-1.127-0.748  c-4.512,3.087-11.537,8.203-11.914,10.373c-0.041,0.241,0.035,0.587,0.195,0.978C26.248,23.936,33.705,18.678,37.756,15.949z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M29.244,43.623v0.755c0,0,0.805-8.31,9.834-16.508c0,0-0.195-0.157-0.488-0.296  C30.025,35.62,29.244,43.623,29.244,43.623z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M40.387,13.458c0,0,9.664,0.898,9.988,8.3c0.328-8.099-9.988-9.055-9.988-9.055l-4.635-0.864  c0,0-0.111,0.304,0.061,0.768L40.387,13.458z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
+<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.6545" style="stop-color:#DEDEDE"/>
+<stop offset="1" style="stop-color:#A0A9AB"/>
 </linearGradient>
-<rect fill="url(#SVGID_15)" height="9.177" width="16.531" x="29.388" y="41.027"/>
-<rect fill="#231F20" fill-opacity="0.3" height="0.612" width="16.531" x="29.388" y="49.592"/>
-<rect fill="#FFFFFF" fill-opacity="0.5" height="0.612" width="16.531" x="29.388" y="41.021"/>
-<rect fill="#FFFFFF" fill-opacity="0.3" height="0.612" width="16.531" x="29.388" y="41.633"/>
-<rect fill="#FFFFFF" fill-opacity="0.1" height="0.612" width="16.531" x="29.388" y="42.245"/>
-<rect fill="#231F20" fill-opacity="0.2" height="0.612" width="16.531" x="29.388" y="48.979"/>
-<rect fill="#231F20" fill-opacity="0.1" height="0.612" width="16.531" x="29.388" y="48.367"/>
-<path d="M42.913,36.377c-0.201,1.935,0.462,3.798,3.006,5.868v-1.225 C43.915,39.39,43.08,37.888,42.913,36.377z" fill="#FFFFFF" fill-opacity="0.1"/>
-<path d="M38.403,17.229c0,0,7.558,0.703,8.059,6.421c0.551-6.845-8.059-7.645-8.059-7.645 l-3.749-0.699c0,0-0.216,0.582,0.519,1.322L38.403,17.229z" fill="#FFFFFF" fill-opacity="0.1"/>
-<path d="M29.388,41.021v1.225c0,0,0.651-6.723,7.957-13.355c0,0-0.379-0.312-0.873-0.398 C29.989,34.845,29.388,41.021,29.388,41.021z" fill="#FFFFFF" fill-opacity="0.1"/>
-<path d="M36.274,18.633c-0.387-0.205-0.682-0.409-0.911-0.605c-3.65,2.498-9.335,6.637-9.64,8.392 c-0.033,0.196,0.027,0.475,0.158,0.791C26.964,25.094,32.997,20.84,36.274,18.633z" fill="#FFFFFF" fill-opacity="0.1"/>
-<path d="M29.388,41.021v0.612c0,0,0.651-6.723,7.957-13.355c0,0-0.158-0.127-0.396-0.241 C30.021,34.546,29.388,41.021,29.388,41.021z" fill="#FFFFFF" fill-opacity="0.3"/>
-<path d="M38.403,16.616c0,0,7.818,0.727,8.08,6.716c0.266-6.554-8.08-7.327-8.08-7.327l-3.749-0.699 c0,0-0.09,0.247,0.048,0.622L38.403,16.616z" fill="#FFFFFF" fill-opacity="0.3"/>
-<path d="M42.888,36.089c-0.094,1.82,0.629,3.589,3.031,5.544v-0.612 C43.787,39.285,42.978,37.696,42.888,36.089z" fill="#FFFFFF" fill-opacity="0.3"/>
-<path d="M36.274,18.021c-0.181-0.096-0.336-0.191-0.48-0.287c-3.613,2.454-9.753,6.86-10.07,8.686 c-0.021,0.123-0.004,0.277,0.042,0.453C26.411,24.871,32.849,20.327,36.274,18.021z" fill="#FFFFFF" fill-opacity="0.3"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16" x1="29.97" x2="46.5" y1="40.5" y2="39.48">
-<stop offset="0" stop-color="#8B8E8F"/>
-<stop offset="0.65" stop-color="#DEDEDE"/>
-<stop offset="1" stop-color="#A0A9AB"/>
-</linearGradient>
-<path d="M29.388,41.004h16.531c-2.007-1.625-3.018-2.433-8.057-2.433 C31.574,38.571,29.388,41.004,29.388,41.004z" fill="url(#SVGID_16)"/>
+<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"/>
+</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_generic_audio.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,127 +1,128 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="9.5283" x2="30.7861" y1="28.8247" y2="28.8247">
+<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"/>
 </linearGradient>
-<path d="M29.62,11.025H10.696c-0.643,0-1.168,0.52-1.168,1.156v34.443h21.258V12.182  C30.786,11.545,30.263,11.025,29.62,11.025z" fill="url(#SVGID_1_)"/>
-<path d="M29.62,11.025c0.643,0,1.166,0.52,1.166,1.156v34.443H9.528V12.182c0-0.637,0.525-1.156,1.168-1.156H29.62   M29.62,11.941H10.696c-0.136,0-0.252,0.11-0.252,0.24v33.525H29.87V12.182C29.87,12.052,29.755,11.941,29.62,11.941L29.62,11.941z" fill="#FFFFFF"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="7.6943" x2="32.4868" y1="44.1958" y2="44.1958">
-<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"/>
-</linearGradient>
-<rect fill="url(#SVGID_2_)" height="4.857" width="24.926" x="7.694" y="41.767"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="0.912" stroke-opacity="0.4" width="24.926" x="7.694" y="41.767"/>
-<rect fill-opacity="0.15" height="0.912" stroke-opacity="0.15" width="21.258" x="9.528" y="40.855"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="20.1572" x2="20.1572" y1="35.6362" y2="18.5003">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#A8A8A8"/>
-</linearGradient>
-<path d="M20.158,35.636c-4.729,0-8.581-3.85-8.581-8.579c0-4.73,3.852-8.579,8.581-8.579  c4.73,0,8.579,3.849,8.579,8.579C28.737,31.787,24.889,35.636,20.158,35.636L20.158,35.636z" fill="url(#SVGID_3_)"/>
-<radialGradient cx="91.2715" cy="80.064" gradientTransform="matrix(0.6122 0 0 0.6122 -35.717 -21.9584)" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="13.1973">
-<stop offset="0" style="stop-color:#636363"/>
-<stop offset="0.3333" style="stop-color:#808080"/>
-<stop offset="1" style="stop-color:#1C1C1C"/>
-</radialGradient>
-<circle cx="20.159" cy="27.057" fill="url(#SVGID_4_)" r="8.079"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="20.1582" x2="20.1582" y1="33.1772" y2="20.8527">
-<stop offset="0" style="stop-color:#808080"/>
-<stop offset="1" style="stop-color:#313131"/>
-</linearGradient>
-<circle cx="20.158" cy="27.057" fill="url(#SVGID_5_)" r="6.293"/>
-<radialGradient cx="91.2197" cy="80.5132" gradientTransform="matrix(0.6122 0 0 0.6122 -35.717 -21.9584)" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="9.879">
-<stop offset="0" style="stop-color:#B4B4B4"/>
-<stop offset="1" style="stop-color:#696969"/>
-</radialGradient>
-<path d="M25.224,30.779l-2.077-1.844h-5.596l-2.383,1.945c1.15,1.498,2.955,2.469,4.99,2.469  C22.24,33.349,24.078,32.333,25.224,30.779z" fill="url(#SVGID_6_)" fill-opacity="0.5" stroke-opacity="0.5"/>
-<circle cx="20.159" cy="28.064" fill-opacity="0.15" r="4.077" stroke-opacity="0.15"/>
-<radialGradient cx="91.2969" cy="78.3179" gradientTransform="matrix(0.6122 0 0 0.6122 -35.717 -21.9584)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="7.4988">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="1" style="stop-color:#000000"/>
-</radialGradient>
-<circle cx="20.159" cy="27.057" fill="url(#SVGID_7_)" r="4.077"/>
-<circle cx="20.16" cy="27.057" fill="none" fill-opacity="0.15" r="3.543" stroke="#EBEBEB" stroke-opacity="0.15"/>
-<path d="M30.786,46.625h1.834v-3.945v-0.912h-1.834v-0.912v-24.83h-6.683c-1.195,0-2.168,0.968-2.168,2.156v28.443  H30.786z" fill-opacity="0.35" stroke-opacity="0.35"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="22.9355" x2="44.1934" y1="34.8247" y2="34.8247">
-<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"/>
-</linearGradient>
-<path d="M43.027,17.025H24.104c-0.643,0-1.168,0.52-1.168,1.156v34.443h21.258V18.181  C44.193,17.544,43.67,17.025,43.027,17.025z" fill="url(#SVGID_8_)"/>
-<path d="M43.027,17.025c0.643,0,1.166,0.52,1.166,1.156v34.443H22.936V18.181c0-0.637,0.525-1.156,1.168-1.156  H43.027 M43.027,17.941H24.104c-0.137,0-0.252,0.111-0.252,0.24v33.525h19.426V18.181C43.277,18.052,43.162,17.941,43.027,17.941  L43.027,17.941z" fill="#FFFFFF"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="21.1016" x2="45.894" y1="50.1958" y2="50.1958">
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_9_)" height="4.857" width="24.926" x="21.102" y="47.767"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="0.912" stroke-opacity="0.4" width="24.926" x="21.102" y="47.767"/>
-<rect fill-opacity="0.15" height="0.912" stroke-opacity="0.15" width="21.258" x="22.936" y="46.855"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="33.5645" x2="33.5645" y1="41.6362" y2="24.5003">
+<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"/>
+<rect fill-opacity="0.15" height="1.129" stroke-opacity="0.15" width="26.309" x="4.664" y="43.436"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -276 -305)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="293.8184" x2="293.8184" y1="-341.9766" y2="-320.7682">
 <stop offset="0" style="stop-color:#FFFFFF"/>
 <stop offset="1" style="stop-color:#A8A8A8"/>
 </linearGradient>
-<path d="M33.565,41.636c-4.729,0-8.581-3.85-8.581-8.579c0-4.73,3.852-8.579,8.581-8.579  c4.73,0,8.579,3.849,8.579,8.579C42.145,37.787,38.296,41.636,33.565,41.636L33.565,41.636z" fill="url(#SVGID_10_)"/>
-<radialGradient cx="113.1719" cy="89.8647" gradientTransform="matrix(0.6122 0 0 0.6122 -35.717 -21.9584)" gradientUnits="userSpaceOnUse" id="SVGID_11_" r="13.1968">
+<path d="M17.819,36.977c-5.853,0-10.62-4.765-10.62-10.618c0-5.854,4.768-10.618,10.62-10.618  c5.854,0,10.618,4.764,10.618,10.618C28.438,32.212,23.674,36.977,17.819,36.977L17.819,36.977z" fill="url(#SVGID_3_)"/>
+<radialGradient cx="903.1143" cy="-142.9111" gradientTransform="matrix(0.6122 0 0 -0.6122 -535.0661 -61.1312)" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="16.3333">
 <stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.3333" style="stop-color:#808080"/>
 <stop offset="1" style="stop-color:#1C1C1C"/>
 </radialGradient>
-<circle cx="33.566" cy="33.057" fill="url(#SVGID_11_)" r="8.079"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="33.5654" x2="33.5654" y1="39.1772" y2="26.8527">
+<circle cx="17.821" cy="26.358" fill="url(#SVGID_4_)" r="9.999"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -276 -305)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="293.8193" x2="293.8193" y1="-338.9326" y2="-323.6798">
 <stop offset="0" style="stop-color:#808080"/>
 <stop offset="1" style="stop-color:#313131"/>
 </linearGradient>
-<circle cx="33.565" cy="33.057" fill="url(#SVGID_12_)" r="6.293"/>
-<radialGradient cx="113.1201" cy="90.314" gradientTransform="matrix(0.6122 0 0 0.6122 -35.717 -21.9584)" gradientUnits="userSpaceOnUse" id="SVGID_13_" r="9.879">
+<circle cx="17.819" cy="26.358" fill="url(#SVGID_5_)" r="7.788"/>
+<radialGradient cx="903.0488" cy="-143.4668" gradientTransform="matrix(0.6122 0 0 -0.6122 -535.0661 -61.1312)" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="12.2251">
 <stop offset="0" style="stop-color:#B4B4B4"/>
 <stop offset="1" style="stop-color:#696969"/>
 </radialGradient>
-<path d="M38.631,36.779l-2.077-1.844h-5.596l-2.383,1.945c1.151,1.498,2.955,2.469,4.99,2.469  C35.647,39.349,37.485,38.333,38.631,36.779z" fill="url(#SVGID_13_)" fill-opacity="0.5" stroke-opacity="0.5"/>
-<circle cx="33.566" cy="34.064" fill-opacity="0.15" r="4.077" stroke-opacity="0.15"/>
-<radialGradient cx="113.1973" cy="88.1187" gradientTransform="matrix(0.6122 0 0 0.6122 -35.717 -21.9584)" gradientUnits="userSpaceOnUse" id="SVGID_14_" r="7.4984">
+<path d="M24.088,30.964l-2.57-2.281h-6.926l-2.948,2.406  c1.424,1.854,3.657,3.056,6.176,3.056C20.396,34.145,22.671,32.889,24.088,30.964z" fill="url(#SVGID_6_)" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M22.866,27.604c0,2.788-2.26,5.048-5.047,5.048  c-2.787,0-5.044-2.26-5.044-5.048c0-2.785,2.257-5.046,5.044-5.046C20.606,22.558,22.866,24.819,22.866,27.604z" fill-opacity="0.15" stroke-opacity="0.15"/>
+<radialGradient cx="903.1455" cy="-140.748" gradientTransform="matrix(0.6122 0 0 -0.6122 -535.0661 -61.1312)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="9.2803">
 <stop offset="0" style="stop-color:#4D4D4D"/>
 <stop offset="1" style="stop-color:#000000"/>
 </radialGradient>
-<circle cx="33.566" cy="33.057" fill="url(#SVGID_14_)" r="4.077"/>
-<circle cx="33.567" cy="33.057" fill="none" fill-opacity="0.15" r="3.543" stroke="#EBEBEB" stroke-opacity="0.15"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="48.6309" x2="48.6309" y1="7.8311" y2="29.9245">
+<circle cx="17.821" cy="26.358" fill="url(#SVGID_7_)" r="5.045"/>
+<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"/>
+</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"/>
+</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"/>
+<rect fill-opacity="0.15" height="1.13" stroke-opacity="0.15" width="26.31" x="21.257" y="50.859"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -276 -305)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="310.4102" x2="310.4102" y1="-349.4004" y2="-328.192">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#A8A8A8"/>
+</linearGradient>
+<path d="M34.412,44.4c-5.854,0-10.62-4.764-10.62-10.616c0-5.854,4.767-10.619,10.62-10.619  c5.854,0,10.617,4.765,10.617,10.619C45.029,39.639,40.268,44.4,34.412,44.4L34.412,44.4z" fill="url(#SVGID_10_)"/>
+<radialGradient cx="930.2168" cy="-155.041" gradientTransform="matrix(0.6122 0 0 -0.6122 -535.0661 -61.1312)" gradientUnits="userSpaceOnUse" id="SVGID_11_" r="16.333">
+<stop offset="0" style="stop-color:#636363"/>
+<stop offset="0.3333" style="stop-color:#808080"/>
+<stop offset="1" style="stop-color:#1C1C1C"/>
+</radialGradient>
+<circle cx="34.413" cy="33.784" fill="url(#SVGID_11_)" r="9.999"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -276 -305)" gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="310.4121" x2="310.4121" y1="-346.3584" y2="-331.1061">
+<stop offset="0" style="stop-color:#808080"/>
+<stop offset="1" style="stop-color:#313131"/>
+</linearGradient>
+<circle cx="34.412" cy="33.784" fill="url(#SVGID_12_)" r="7.788"/>
+<radialGradient cx="930.1533" cy="-155.5962" gradientTransform="matrix(0.6122 0 0 -0.6122 -535.0661 -61.1312)" gradientUnits="userSpaceOnUse" id="SVGID_13_" r="12.2251">
+<stop offset="0" style="stop-color:#B4B4B4"/>
+<stop offset="1" style="stop-color:#696969"/>
+</radialGradient>
+<path d="M40.682,38.389l-2.57-2.279h-6.926l-2.949,2.406  c1.425,1.854,3.658,3.055,6.176,3.055C36.988,41.57,39.264,40.314,40.682,38.389z" fill="url(#SVGID_13_)" fill-opacity="0.5" stroke-opacity="0.5"/>
+<circle cx="34.413" cy="35.03" fill-opacity="0.15" r="5.046" stroke-opacity="0.15"/>
+<radialGradient cx="930.249" cy="-152.8774" gradientTransform="matrix(0.6122 0 0 -0.6122 -535.0661 -61.1312)" gradientUnits="userSpaceOnUse" id="SVGID_14_" r="9.28">
+<stop offset="0" style="stop-color:#4D4D4D"/>
+<stop offset="1" style="stop-color:#000000"/>
+</radialGradient>
+<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"/>
 </linearGradient>
-<path d="M48.456,7.375l-3.5,2.24c2.092,2.92,3.193,6.302,3.193,10.162c0,3.406-0.834,6.49-2.498,9.199  l3.57,2.012c0.102-0.162,3.084-4.83,3.084-11.211C52.306,15.02,51.034,10.977,48.456,7.375z" fill="url(#SVGID_15_)"/>
-<path d="M44.401,17.931c0-0.637-0.523-1.156-1.166-1.156H39.38c0.246,0.875,0.355,1.84,0.355,3.002  c0,2.086-0.365,3.496-1.3,5.033l-0.495,0.809l5.229,2.947l0.463-0.754c0.166-0.273,0.455-0.783,0.77-1.488V17.931z" fill-opacity="0.35" stroke-opacity="0.35"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="41.8613" x2="41.8613" y1="12.0479" y2="26.224">
+<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"/>
 </linearGradient>
-<path d="M42.329,11.395l-3.475,2.257c1.342,1.872,1.799,3.651,1.799,6.125c0,2.168-0.383,3.781-1.436,5.51  l3.632,2.047C44.296,24.968,46.804,18.484,42.329,11.395z" fill="url(#SVGID_16_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="48.6309" x2="48.6309" y1="7.2407" y2="30.9418">
+<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"/>
 </linearGradient>
-<path d="M48.321,8.063c2.34,3.43,3.479,7.265,3.479,11.714c0,5.178-2.012,9.207-2.76,10.527l-2.688-1.516  c1.528-2.67,2.304-5.699,2.304-9.012c0-3.707-1.004-7.075-2.984-10.019L48.321,8.063 M48.456,7.375l-3.5,2.24  c2.092,2.92,3.193,6.302,3.193,10.162c0,3.406-0.834,6.49-2.498,9.199l3.57,2.012c0.102-0.162,3.084-4.83,3.084-11.211  C52.306,15.02,51.034,10.977,48.456,7.375L48.456,7.375z" fill="url(#SVGID_17_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="41.8613" x2="41.8613" y1="11.7104" y2="27.1655">
+<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"/>
 </linearGradient>
-<path d="M42.169,12.102c4.025,6.789,1.52,12.66,0.492,14.544l-2.748-1.549c0.881-1.6,1.246-3.18,1.246-5.32  c0-2.477-0.467-4.252-1.596-5.984L42.169,12.102 M42.329,11.395l-3.475,2.257c1.342,1.872,1.799,3.651,1.799,6.125  c0,2.168-0.383,3.781-1.436,5.51l3.632,2.047C44.296,24.968,46.804,18.484,42.329,11.395L42.329,11.395z" fill="url(#SVGID_18_)"/>
+<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"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_generic_bluetooth.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,30 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 transform="matrix(1 0 0 1 0 0.001)">
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.8711" x2="45.1289" y1="30" y2="30">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<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"/>
 </linearGradient>
-<path d="M43.963,12.2H16.039c-0.644,0-1.168,0.52-1.168,1.156V47.8h30.258V13.356  C45.129,12.72,44.604,12.2,43.963,12.2z" fill="url(#SVGID_1_)"/>
-<path d="M43.963,12.2c0.642,0,1.166,0.52,1.166,1.156V47.8H14.871V13.356c0-0.637,0.524-1.156,1.168-1.156H43.963   M43.963,13.116H16.039c-0.137,0-0.252,0.11-0.252,0.24v33.525h28.426V13.356C44.213,13.227,44.099,13.116,43.963,13.116  L43.963,13.116z" fill="#FFFFFF"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="13.0371" x2="46.7814" y1="45.3711" y2="45.3711">
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_2_)" height="4.857" width="33.926" x="13.037" y="42.942"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="0.912" stroke-opacity="0.4" width="33.926" x="13.037" y="42.942"/>
-<rect fill-opacity="0.15" height="0.912" stroke-opacity="0.15" width="30.258" x="14.871" y="42.03"/>
-<path d="M35.593,24.372l-6.515-6.671v8.788l-3.58-3.664l-1.308,1.334l4.5,4.615l-4.5,4.613  l1.305,1.332l3.583-3.662v8.787l6.515-6.667l-4.303-4.403L35.593,24.372z M32.991,24.386l-2.08,2.127l-0.003-4.256L32.991,24.386z   M32.991,33.165l-2.083,2.124l0.003-4.255L32.991,33.165z" fill="#FFFFFF" fill-opacity="0.75" stroke-opacity="0.75"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="29.8921" x2="29.8921" y1="38.79" y2="17.9985">
+<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"/>
 </linearGradient>
-<path d="M35.593,23.317l-6.515-6.671v8.788l-3.58-3.664l-1.308,1.334l4.5,4.615l-4.5,4.613l1.305,1.332  l3.583-3.662v8.787l6.515-6.667L31.29,27.72L35.593,23.317z M32.991,23.331l-2.08,2.127l-0.003-4.256L32.991,23.331z M32.991,32.11  l-2.083,2.124l0.003-4.255L32.991,32.11z" fill="url(#SVGID_3_)"/>
+<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"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_group_feeds.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,200 +1,225 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<g>
 <rect fill="none" height="60" width="60"/>
-<radialGradient cx="42.4" cy="42.28" 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"/>
+<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"/>
 </radialGradient>
-<path d="M46.906,37.352c-1.044-0.453-1.01-2.678-0.58-3.351c0.074-0.117,0.143-0.234,0.215-0.353 h-8.732c0.071,0.118,0.14,0.235,0.217,0.353c0.43,0.673,0.462,2.896-0.58,3.351c-1.047,0.453,4.854,4.402,4.854,4.402 S47.95,37.805,46.906,37.352z" fill="url(#SVGID_1)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="42.17" x2="42.17" y1="36.94" y2="46.08">
-<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"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M53.184,39.668c-1.098-0.571-6.541-2.477-6.645-2.596l-4.157,3.455l-4.468-3.588 c-0.123,0.183-5.504,2.068-6.747,2.729c-1.425,0.757-3.753,2.496-3.753,6.414h29.521C56.935,42.164,54.281,40.24,53.184,39.668z" fill="url(#SVGID_2)"/>
-<polygon fill="#020202" fill-opacity="0.3" points="36.898,37.383 42.382,41.754 47.533,37.473 46.54,37.072 42.382,40.527 37.916,36.939 " stroke-opacity="0.3"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="28.2" x2="37.16" y1="41.84" y2="41.84">
-<stop offset="0" stop-color="#3BC8EB"/>
-<stop offset="1" stop-color="#2D9BD2"/>
+<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"/>
 </linearGradient>
-<path d="M37.156,38.075c0,0-7.826,2.043-7.826,7.524c0,0-1.119,0.001-1.128,0 C28.203,42.229,30.834,39.607,37.156,38.075z" fill="url(#SVGID_3)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="47.09" x2="56.04" y1="41.71" y2="41.71">
-<stop offset="0" stop-color="#3BC8EB"/>
-<stop offset="1" stop-color="#2D9BD2"/>
+<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"/>
 </linearGradient>
-<path d="M47.092,37.947c0,0,7.824,2.044,7.824,7.525c0,0,1.119,0,1.127,0 C56.043,42.102,53.413,39.481,47.092,37.947z" fill="url(#SVGID_4)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="42.22" x2="42.22" y1="42.15" y2="37.1">
-<stop offset="0" stop-color="#3BC8EB"/>
-<stop offset="1" stop-color="#2D9BD2"/>
+<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"/>
+</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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_5)" points="42.382,41.754 36.897,37.383 36.579,37.521 42.382,42.146 47.854,37.597 47.535,37.469 "/>
-<radialGradient cx="42.94" cy="21.82" gradientUnits="userSpaceOnUse" id="SVGID_6" 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"/>
-</radialGradient>
-<path d="M49.416,27.128c-0.037-0.017-0.08-0.019-0.116-0.031c0-0.001,0-0.002,0-0.002 c-0.008-0.002-0.013-0.003-0.022-0.004c-0.057-0.015-0.115-0.027-0.174-0.031c-7.29-1.269-10.636-5.307-10.887-4.238 c-0.201,0.851-2.245,2.691-3.316,3.609c0.01,0.041,0.015,0.078,0.022,0.119c0,0,0.039,0.188,0.12,0.509 c-0.085,0.009-0.168,0.027-0.248,0.061c-0.681,0.289-0.896,1.404-0.479,2.496c0.418,1.09,1.309,1.743,1.989,1.456 c0.043-0.018,0.079-0.047,0.115-0.072c0.396,0.89,0.882,1.844,1.478,2.8c0.998,1.186,2.525,2.577,4.213,2.577 c2.039,0,3.287-1.118,4.146-2.243c0.021-0.048,0.043-0.093,0.068-0.131c0.635-0.993,1.152-1.991,1.568-2.919 c0.666,0.23,1.521-0.389,1.947-1.438C50.281,28.56,50.09,27.433,49.416,27.128z" fill="url(#SVGID_6)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7" x1="39.54" x2="45.84" y1="37.06" y2="30.81">
-<stop offset="0" stop-color="#FFC6B3"/>
-<stop offset="1" stop-color="#FFA98E"/>
+<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"/>
 </linearGradient>
-<path d="M41.811,35.801c-1.244,0-2.494-0.578-3.417-1.449c0.976,1.025,2.288,2.023,3.717,2.023 c2.04,0,3.288-1.118,4.146-2.243c0.021-0.048,0.044-0.093,0.068-0.131c0.635-0.993,1.152-1.991,1.569-2.919 C45.574,35.138,43.85,35.801,41.811,35.801z" fill="url(#SVGID_7)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8" x1="42.05" x2="42.05" y1="17.1" y2="26.37">
-<stop offset="0" stop-color="#8A5D3B"/>
-<stop offset="0.38" stop-color="#632F00"/>
-<stop offset="1" stop-color="#361700"/>
+<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"/>
 </linearGradient>
-<path d="M41.904,16.965c-2.527,0-3.744,1.149-4.681,2.35c-1.526,0.236-3.946,1.635-2.237,7.764 c1.07-0.917,3.028-3.406,3.229-4.256c0.253-1.08,3.655,3.044,11.083,4.272c0.088-0.343,0.128-0.545,0.128-0.545 C50.592,21.317,48.055,17.17,41.904,16.965z" fill="url(#SVGID_8)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9" x1="45.22" x2="36.82" y1="25.97" y2="20.99">
-<stop offset="0" stop-color="#8A5D3B"/>
-<stop offset="0.36" stop-color="#632F00"/>
-<stop offset="1" stop-color="#361700"/>
+<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"/>
 </linearGradient>
-<path d="M38.225,22.32c0,0,3.635,4.777,11.023,4.768C49.247,27.088,45.77,26.542,38.225,22.32z" fill="url(#SVGID_9)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10" x1="36.06" x2="36.14" y1="20.01" y2="25.35">
-<stop offset="0" stop-color="#8A5D3B"/>
-<stop offset="0.38" stop-color="#632F00"/>
-<stop offset="1" stop-color="#361700"/>
-</linearGradient>
-<path d="M37.35,19.67c0,0-3.559,0.214-2.238,6.246C35.111,25.916,34.676,21.785,37.35,19.67z" fill="url(#SVGID_10)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11" x1="43.23" x2="42.97" y1="17.9" y2="20.32">
-<stop offset="0" stop-color="#A87C4F"/>
-<stop offset="1" stop-color="#632F00"/>
+<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"/>
 </linearGradient>
-<path d="M43.631,20.507c-1.658-0.237-4.461-1.706-5.561-1.181c0,0,3.598-4.105,9.943,0.568 C48.014,19.894,46.502,20.915,43.631,20.507z" fill="url(#SVGID_11)"/>
-<radialGradient cx="18.04" cy="42.28" gradientUnits="userSpaceOnUse" id="SVGID_12" 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"/>
+<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"/>
 </radialGradient>
-<path d="M22.552,37.352c-1.043-0.453-1.01-2.678-0.58-3.351c0.075-0.117,0.143-0.234,0.217-0.353 h-8.733c0.071,0.118,0.14,0.235,0.215,0.353c0.431,0.673,0.462,2.896-0.58,3.351c-1.046,0.453,4.854,4.402,4.854,4.402 S23.597,37.805,22.552,37.352z" fill="url(#SVGID_12)"/>
-<path d="M28.83,39.668c-1.098-0.571-6.541-2.477-6.643-2.596l-4.158,3.455l-4.467-3.588 c-0.124,0.183-5.504,2.068-6.748,2.729c-1.425,0.757-3.752,2.496-3.752,6.414H32.58C32.58,42.164,29.927,40.24,28.83,39.668z" fill="url(#SVGID_2)"/>
-<polygon fill="#020202" fill-opacity="0.3" points="12.544,37.383 18.028,41.754 23.179,37.473 22.187,37.072 18.028,40.527 13.561,36.939 " stroke-opacity="0.3"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14" x1="3.85" x2="12.8" y1="41.84" y2="41.84">
-<stop offset="0" stop-color="#3BC8EB"/>
-<stop offset="1" stop-color="#2D9BD2"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M12.802,38.075c0,0-7.826,2.043-7.826,7.524c0,0-1.119,0.001-1.126,0 C3.85,42.229,6.481,39.607,12.802,38.075z" fill="url(#SVGID_14)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15" x1="22.74" x2="31.69" y1="41.71" y2="41.71">
-<stop offset="0" stop-color="#3BC8EB"/>
-<stop offset="1" stop-color="#2D9BD2"/>
+<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"/>
 </linearGradient>
-<path d="M22.738,37.947c0,0,7.825,2.044,7.825,7.525c0,0,1.119,0,1.127,0 C31.689,42.102,29.059,39.481,22.738,37.947z" fill="url(#SVGID_15)"/>
-<polygon fill="url(#SVGID_5)" points="18.028,41.754 12.543,37.383 12.225,37.521 18.028,42.146 23.5,37.597 23.182,37.469 "/>
-<radialGradient cx="18.58" cy="21.82" gradientUnits="userSpaceOnUse" id="SVGID_17" 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"/>
+<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"/>
+</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"/>
 </radialGradient>
-<path d="M25.063,27.128c-0.037-0.017-0.079-0.019-0.116-0.031c0-0.001,0-0.002,0-0.002 c-0.008-0.002-0.013-0.003-0.023-0.004c-0.056-0.015-0.115-0.027-0.174-0.031c-7.29-1.269-10.635-5.307-10.887-4.238 c-0.202,0.851-2.245,2.691-3.316,3.609c0.009,0.041,0.015,0.078,0.023,0.119c0,0,0.039,0.188,0.119,0.509 c-0.085,0.009-0.168,0.027-0.249,0.061c-0.68,0.289-0.895,1.404-0.477,2.496c0.417,1.09,1.307,1.743,1.989,1.456 c0.042-0.018,0.078-0.047,0.116-0.072c0.396,0.89,0.881,1.844,1.477,2.8c0.999,1.186,2.525,2.577,4.212,2.577 c2.04,0,3.288-1.118,4.146-2.243c0.022-0.048,0.045-0.093,0.068-0.131c0.636-0.993,1.152-1.991,1.569-2.919 c0.667,0.23,1.521-0.389,1.947-1.438C25.927,28.56,25.737,27.433,25.063,27.128z" fill="url(#SVGID_17)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18" x1="15.19" x2="21.49" y1="37.06" y2="30.81">
-<stop offset="0" stop-color="#FFC6B3"/>
-<stop offset="1" stop-color="#FFA98E"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M17.456,35.801c-1.242,0-2.494-0.578-3.416-1.449c0.976,1.025,2.287,2.023,3.716,2.023 c2.04,0,3.288-1.118,4.146-2.243c0.022-0.048,0.044-0.093,0.068-0.131c0.636-0.993,1.152-1.991,1.569-2.919 C21.22,35.138,19.497,35.801,17.456,35.801z" fill="url(#SVGID_18)"/>
-<path d="M17.551,16.965c-2.528,0-3.744,1.149-4.682,2.35c-1.526,0.236-3.946,1.635-2.236,7.764 c1.07-0.917,3.028-3.406,3.229-4.256c0.254-1.08,3.656,3.044,11.084,4.272c0.086-0.343,0.127-0.545,0.127-0.545 C26.238,21.317,23.701,17.17,17.551,16.965z" fill="url(#SVGID_8)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_20" x1="20.87" x2="12.47" y1="25.97" y2="20.99">
-<stop offset="0" stop-color="#8A5D3B"/>
-<stop offset="0.36" stop-color="#632F00"/>
-<stop offset="1" stop-color="#361700"/>
+<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"/>
 </linearGradient>
-<path d="M13.87,22.32c0,0,3.635,4.777,11.024,4.768C24.894,27.088,21.415,26.542,13.87,22.32z" fill="url(#SVGID_20)"/>
-<path d="M12.997,19.67c0,0-3.56,0.214-2.24,6.246C10.756,25.916,10.322,21.785,12.997,19.67z" fill="url(#SVGID_10)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_22" x1="18.87" x2="18.61" y1="17.9" y2="20.31">
-<stop offset="0" stop-color="#A87C4F"/>
-<stop offset="1" stop-color="#632F00"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M19.276,20.507c-1.657-0.237-4.46-1.706-5.56-1.181c0,0,3.598-4.105,9.943,0.568 C23.66,19.894,22.148,20.915,19.276,20.507z" fill="url(#SVGID_22)"/>
-<path d="M46.639,40.859c-1.014-0.527-4.164-1.695-6.693-2.635 l-1.423-0.529l-0.255-0.103l-0.334-0.128l-0.636-0.256l-0.393,0.172c-0.003,0-0.007,0.002-0.009,0.002l-0.002,0.002 c-1.65,0.645-4.812,1.797-5.728,2.283c-0.358,0.189-0.772,0.442-1.191,0.773c-0.44-0.363-0.85-0.619-1.146-0.773 c-0.789-0.41-3.808-1.506-5.491-2.136l-0.157-0.063l-0.004,0.002l-0.698-0.28l-0.635,0.277c-0.621,0.243-1.387,0.534-2.205,0.846 l-0.076,0.029c-2.42,0.92-5.165,1.962-6.214,2.521c-2.356,1.25-4.052,3.019-5.053,5.218h19.117h5.166h19.035 C50.053,42.814,47.353,41.231,46.639,40.859z" fill="#231F20" fill-opacity="0.15" stroke-opacity="0.15"/>
-<path d="M18.102,22.87c-1.12,0.952-1.423,2.862-0.696,4.758 c0.682,1.787,2.095,2.988,3.515,2.988c0.001,0,0.004,0,0.004,0c0.213,0.442,0.434,0.88,0.662,1.31H21.52l0.542,0.896 c0,0,0.141,0.23,0.307,0.505c0.452-0.767,0.85-1.528,1.172-2.245c0.667,0.23,1.521-0.389,1.947-1.438 c0.439-1.085,0.249-2.212-0.425-2.518c-0.037-0.016-0.079-0.018-0.116-0.03c0-0.001,0-0.002,0-0.002 c-0.008-0.002-0.013-0.003-0.023-0.004c-0.056-0.015-0.115-0.027-0.174-0.031c-0.014-0.002-0.025-0.006-0.038-0.008 c-0.028-0.006-0.065-0.014-0.099-0.021c0.114,0.02,0.217,0.045,0.333,0.064c0.086-0.344,0.127-0.545,0.127-0.545 c1.166-5.233-1.371-9.38-7.521-9.585c-0.012,0-0.02,0.002-0.032,0.002C17.359,18.634,17.544,20.598,18.102,22.87z" fill="#231F20" fill-opacity="0.15" stroke-opacity="0.15"/>
-<path d="M37.224,19.314c-1.526,0.236-3.944,1.634-2.238,7.759 c-0.064,0.011-0.129,0.021-0.191,0.046c-0.681,0.289-0.896,1.404-0.478,2.496c0.418,1.09,1.308,1.743,1.988,1.456 c0.043-0.018,0.079-0.047,0.115-0.072c0.332,0.742,0.73,1.531,1.197,2.326c0.523-0.883,1.021-1.796,1.473-2.738 c1.295-0.154,2.558-1.277,3.21-2.89c0.745-1.836,0.507-3.746-0.544-4.739c0.471-2.123,0.544-4.146,0.234-5.986 c-0.029-0.001-0.057-0.005-0.086-0.006C39.377,16.965,38.16,18.114,37.224,19.314z M34.994,27.07 c0.014-0.011,0.029-0.026,0.041-0.038c0.002,0.009,0.005,0.016,0.008,0.026C35.026,27.061,35.011,27.068,34.994,27.07z M38.518,22.661L38.518,22.661c-0.018-0.003-0.042-0.014-0.061-0.015C38.476,22.646,38.499,22.657,38.518,22.661z" fill="#231F20" fill-opacity="0.15" stroke-opacity="0.15"/>
-<path d="M46.365,41.383c-0.98-0.508-4.11-1.67-6.627-2.605 l-1.437-0.533l-0.247-0.102l-0.343-0.131l-0.97-0.39c-0.031-0.043-0.054-0.099-0.082-0.147c-1.697,0.658-4.617,1.729-5.494,2.193 c-0.357,0.19-0.771,0.443-1.191,0.774c-0.441-0.363-0.85-0.619-1.146-0.774c-0.789-0.409-3.808-1.505-5.491-2.135l-0.086-0.035 l-1.192,0.52c-0.641,0.252-1.438,0.555-2.286,0.878c-2.406,0.914-5.132,1.951-6.148,2.489c-2.143,1.139-3.715,2.727-4.677,4.697 h18.465h5.166h18.379C49.461,43.152,47.023,41.726,46.365,41.383z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M17.957,27.418c0.596,1.56,1.788,2.608,2.964,2.608 c0.122,0,0.244-0.012,0.362-0.035c0.403,0.866,0.838,1.711,1.301,2.524h-0.017l0.137,0.224c0.311-0.565,0.599-1.124,0.838-1.657 c0.667,0.23,1.521-0.389,1.947-1.438c0.439-1.085,0.249-2.212-0.425-2.518c-0.037-0.016-0.079-0.018-0.116-0.03 c0-0.001,0-0.002,0-0.002c-0.009-0.002-0.014-0.003-0.023-0.004c-0.056-0.015-0.114-0.027-0.174-0.031 c-0.014-0.002-0.025-0.006-0.038-0.008c-0.028-0.006-0.065-0.014-0.099-0.021c0.114,0.02,0.218,0.045,0.334,0.064 c0.086-0.344,0.126-0.545,0.126-0.545c1.129-5.069-1.228-9.109-6.966-9.543c-0.167,1.691,0.046,3.725,0.667,6.109 C17.626,23.776,17.262,25.604,17.957,27.418z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M37.224,19.314c-1.526,0.236-3.944,1.634-2.238,7.759 c-0.064,0.011-0.129,0.021-0.191,0.046c-0.681,0.289-0.896,1.404-0.478,2.496c0.418,1.09,1.308,1.743,1.988,1.456 c0.043-0.018,0.079-0.047,0.115-0.072c0.248,0.557,0.535,1.138,0.858,1.728c0.51-0.878,0.995-1.78,1.43-2.714 c0.025,0.001,0.051,0.002,0.077,0.002c1.161,0,2.354-1.021,2.967-2.54c0.719-1.767,0.422-3.569-0.65-4.287 c0.049-0.213,0.072-0.331,0.072-0.331c0.467-2.086,0.533-4.069,0.221-5.862C39.219,17.142,38.095,18.2,37.224,19.314z M34.994,27.07 c0.014-0.011,0.029-0.026,0.041-0.038c0.002,0.009,0.005,0.016,0.008,0.026C35.026,27.061,35.011,27.068,34.994,27.07z M38.518,22.661L38.518,22.661c-0.018-0.003-0.042-0.014-0.061-0.015C38.476,22.646,38.499,22.657,38.518,22.661z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
-<radialGradient cx="30.31" cy="45.72" gradientUnits="userSpaceOnUse" id="SVGID_23" 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"/>
+<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"/>
+<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"/>
 </radialGradient>
-<path d="M36.914,38.519c-1.525-0.663-1.477-3.914-0.848-4.897c0.109-0.171,0.21-0.344,0.315-0.515 H23.614c0.105,0.171,0.204,0.344,0.314,0.515c0.63,0.983,0.679,4.234-0.848,4.897c-1.527,0.662,7.097,6.437,7.097,6.437 S38.441,39.181,36.914,38.519z" fill="url(#SVGID_23)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_24" x1="30" x2="30" y1="37.92" y2="51.28">
-<stop offset="0" stop-color="#FF7236"/>
-<stop offset="1" stop-color="#BA1212"/>
+<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"/>
 </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.269-8.046,3.024-9.866,3.992c-2.083,1.105-5.486,3.646-5.486,9.375h43.158C51.576,45.554,47.696,42.742,46.094,41.906z" fill="url(#SVGID_24)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_25" x1="30.06" x2="30.06" y1="37.04" y2="44.86">
-<stop offset="0" stop-color="#BC1C24"/>
-<stop offset="1" stop-color="#6B1C24"/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_25)" points="22.282,38.565 30.3,44.955 37.832,38.695 36.379,38.111 30.3,43.163 23.77,37.916 "/>
-<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="#FF7B56"/>
-<path d="M37.186,39.392c0,0,11.441,2.987,11.441,11.003c0,0,1.636,0,1.646,0 C50.273,45.465,46.428,41.633,37.186,39.392z" fill="#FF7B56"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_26" x1="30.06" x2="30.06" y1="45.53" y2="38.15">
-<stop offset="0" stop-color="#FFA98E"/>
-<stop offset="0.96" stop-color="#D45D36"/>
-<stop offset="1" stop-color="#D45D36"/>
+<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"/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_26)" points="30.3,44.955 22.281,38.565 21.815,38.77 30.3,45.531 38.3,38.879 37.834,38.691 "/>
-<radialGradient cx="31.1" cy="15.82" gradientUnits="userSpaceOnUse" id="SVGID_27" 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"/>
+<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"/>
 </radialGradient>
-<path d="M40.584,23.573c-0.055-0.026-0.114-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.696,2.159,4.094c1.458,1.732,3.691,3.766,6.157,3.766 c2.983,0,4.808-1.633,6.063-3.279c0.031-0.068,0.064-0.133,0.102-0.189c0.931-1.453,1.684-2.911,2.294-4.268 c0.974,0.337,2.225-0.569,2.845-2.102C41.85,25.666,41.571,24.017,40.584,23.573z" fill="url(#SVGID_27)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_28" x1="26.15" x2="35.36" y1="38.09" y2="28.95">
-<stop offset="0" stop-color="#FFC6B3"/>
-<stop offset="1" stop-color="#FFA98E"/>
+<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"/>
 </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.068,0.063-0.133,0.1-0.189c0.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_28)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_29" x1="29.82" x2="29.82" y1="8.91" y2="22.47">
-<stop offset="0" stop-color="#8A5D3B"/>
-<stop offset="0.38" stop-color="#632F00"/>
-<stop offset="1" stop-color="#361700"/>
+<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"/>
 </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_29)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_30" x1="34.45" x2="22.17" y1="21.89" y2="14.59">
-<stop offset="0" stop-color="#8A5D3B"/>
-<stop offset="0.36" stop-color="#632F00"/>
-<stop offset="1" stop-color="#361700"/>
+<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"/>
 </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_30)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_31" x1="21.06" x2="21.17" y1="13.17" y2="20.97">
-<stop offset="0" stop-color="#8A5D3B"/>
-<stop offset="0.38" stop-color="#632F00"/>
-<stop offset="1" stop-color="#361700"/>
+<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"/>
 </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_31)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_32" x1="31.54" x2="31.15" y1="10.07" y2="13.61">
-<stop offset="0" stop-color="#A87C4F"/>
-<stop offset="1" stop-color="#632F00"/>
+<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"/>
 </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_32)"/>
-<g transform="matrix(0.5 0 0 0.5 30 30)">
-<rect fill="none" height="59.996" width="59.996"/>
-<path d="M51.311,47.291c0,2.219-1.801,4.02-4.021,4.02H12.707c-2.222,0-4.021-1.801-4.021-4.02V12.707 c0-2.221,1.799-4.022,4.021-4.022h34.582c2.221,0,4.021,1.801,4.021,4.022V47.291z" fill="#F7B388"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="10.55" x2="48.97" y1="10.55" y2="48.97">
-<stop offset="0" stop-color="#DF4F20"/>
-<stop offset="0.5" stop-color="#F48228"/>
-<stop offset="1" stop-color="#CF3A21"/>
+<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"/>
+</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="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"/>
+<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"/>
 </linearGradient>
-<path d="M12.707,50.086c-1.542,0-2.797-1.254-2.797-2.795V12.707c0-1.543,1.255-2.798,2.797-2.798 h34.582c1.543,0,2.797,1.255,2.797,2.798v34.584c0,1.541-1.254,2.795-2.797,2.795H12.707z" fill="url(#SVGID_1_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="8.36" y2="51.47">
-<stop offset="0" stop-color="#C5422B"/>
-<stop offset="0.5" stop-color="#F48228"/>
-<stop offset="1" stop-color="#AD1B00"/>
+<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"/>
 </linearGradient>
-<path d="M47.381,9.251c1.854,0,3.363,1.509,3.363,3.363v34.769c0,1.853-1.509,3.361-3.363,3.361 H12.614c-1.853,0-3.362-1.509-3.362-3.361V12.614c0-1.854,1.509-3.363,3.362-3.363H47.381 M47.381,8.571H12.614 c-2.232,0-4.042,1.81-4.042,4.043v34.769c0,2.23,1.809,4.042,4.042,4.042h34.767c2.234,0,4.044-1.812,4.044-4.042V12.614 C51.425,10.381,49.615,8.571,47.381,8.571L47.381,8.571z" fill="url(#SVGID_2_)"/>
-<circle cx="19.476" cy="40.52" fill="#FFFFFF" r="4.132"/>
-<path d="M39.143,44.193h5.51c0-15.907-12.942-28.85-28.85-28.85v5.51 C28.672,20.854,39.143,31.323,39.143,44.193z" fill="#FFFFFF"/>
-<path d="M29.118,44.193h5.51c0-10.381-8.445-18.825-18.825-18.825v5.51 C23.145,30.878,29.118,36.851,29.118,44.193z" fill="#FFFFFF"/>
+<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"/>
+<path d="M20.547,23.614h3.345c0-9.651-7.854-17.506-17.505-17.506v3.344C14.196,9.453,20.547,15.805,20.547,23.614z" fill="#FFFFFF"/>
+<path d="M14.466,23.614h3.343c0-6.299-5.124-11.424-11.422-11.424v3.345C10.842,15.535,14.466,19.158,14.466,23.614z  " fill="#FFFFFF"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_help.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_help.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_help.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,26 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<g>
 <rect fill="none" height="60" width="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="30" x2="30" y1="8.16" y2="51.02">
-<stop offset="0" stop-color="#E5FFB2"/>
-<stop offset="0.39" stop-color="#6AAB18"/>
-<stop offset="0.68" stop-color="#247307"/>
-<stop offset="1" stop-color="#C2FF4A"/>
+<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"/>
 </linearGradient>
-<circle cx="29.998" cy="29.385" fill="url(#SVGID_1)" r="21.427"/>
-<radialGradient cx="30.2" cy="10.41" gradientUnits="userSpaceOnUse" id="SVGID_2" r="39.38">
-<stop offset="0" stop-color="#AFED23"/>
-<stop offset="0.81" stop-color="#358C0C"/>
-<stop offset="1" stop-color="#67AD1A"/>
+<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"/>
 </radialGradient>
-<path d="M29.998,50.2c-11.478,0-20.815-9.337-20.815-20.814S18.521,8.571,29.998,8.571 c11.477,0,20.814,9.337,20.814,20.815S41.475,50.2,29.998,50.2L29.998,50.2z" fill="url(#SVGID_2)"/>
-<path d="M23.264,21.626v-3.515c2.128-0.49,4.146-0.735,6.06-0.735 c2.821,0,4.986,0.547,6.492,1.642c1.507,1.093,2.26,2.697,2.26,4.815c0,1.231-0.291,2.274-0.869,3.129 c-0.581,0.854-4.583,4.875-4.978,5.425c-0.396,0.55-0.592,1.201-0.592,1.955v0.752h-5.615V34.09c0-1.22,0.267-2.25,0.799-3.094 c0.532-0.843,1.461-1.887,2.789-3.13c1.041-0.969,2.332-3.217,2.332-3.695c0-2.163-1.303-3.245-3.91-3.245 C26.562,20.927,24.974,21.16,23.264,21.626z M28.803,44.69c-0.944,0-1.757-0.335-2.439-1.005c-0.68-0.67-1.021-1.488-1.021-2.457 c0-0.957,0.338-1.775,1.013-2.457c0.676-0.682,1.491-1.022,2.447-1.022c0.957,0,1.775,0.341,2.458,1.022s1.022,1.5,1.022,2.457 c0,0.969-0.341,1.787-1.022,2.457C30.58,44.355,29.76,44.69,28.803,44.69z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M23.264,20.78v-3.515c2.128-0.49,4.146-0.735,6.06-0.735 c2.821,0,4.986,0.547,6.492,1.642c1.507,1.093,2.26,2.697,2.26,4.815c0,1.231-0.291,2.274-0.869,3.129 c-0.581,0.854-4.583,4.875-4.978,5.425c-0.396,0.55-0.592,1.202-0.592,1.954v0.754h-5.615v-1.005c0-1.22,0.267-2.251,0.799-3.094 c0.532-0.843,1.461-1.887,2.789-3.13c1.041-0.969,2.332-3.217,2.332-3.695c0-2.163-1.303-3.245-3.91-3.245 C26.562,20.081,24.974,20.314,23.264,20.78z M28.803,43.844c-0.944,0-1.757-0.334-2.439-1.004c-0.68-0.67-1.021-1.489-1.021-2.458 c0-0.956,0.338-1.775,1.013-2.457c0.676-0.682,1.491-1.022,2.447-1.022c0.957,0,1.775,0.341,2.458,1.022 c0.683,0.681,1.022,1.501,1.022,2.457c0,0.969-0.341,1.788-1.022,2.458C30.58,43.51,29.76,43.844,28.803,43.844z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="30.67" x2="30.67" y1="15.45" y2="42.99">
-<stop offset="0" stop-color="#F6FDFF"/>
-<stop offset="1" stop-color="#ADB3B5"/>
+<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"/>
 </linearGradient>
-<path d="M23.264,19.79v-3.515c2.128-0.491,4.146-0.735,6.06-0.735c2.821,0,4.986,0.546,6.492,1.642 c1.507,1.093,2.26,2.697,2.26,4.814c0,1.232-0.291,2.274-0.869,3.129C36.625,25.98,32.623,30,32.229,30.55 c-0.396,0.55-0.592,1.202-0.592,1.955v0.753h-5.615v-1.005c0-1.22,0.267-2.25,0.799-3.093c0.532-0.843,1.461-1.887,2.789-3.13 c1.041-0.968,2.332-3.216,2.332-3.694c0-2.163-1.303-3.245-3.91-3.245C26.562,19.091,24.974,19.323,23.264,19.79z M28.803,42.854 c-0.944,0-1.757-0.334-2.439-1.004c-0.68-0.67-1.021-1.489-1.021-2.457c0-0.957,0.338-1.775,1.013-2.458 c0.676-0.681,1.491-1.022,2.447-1.022c0.957,0,1.775,0.342,2.458,1.022c0.683,0.682,1.022,1.501,1.022,2.458 c0,0.968-0.341,1.787-1.022,2.457C30.58,42.52,29.76,42.854,28.803,42.854z" fill="url(#SVGID_3)"/>
-<rect fill="none" height="59.996" width="59.996"/>
+<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"/>
+</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_hold_call.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_hold_call.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</g>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_hotmarked.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_hotmarked.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,109 +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 gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.9995" x2="29.9995" y1="0.3882" y2="59.6489">
-<stop offset="0" style="stop-color:#A6A8AB"/>
-<stop offset="1" style="stop-color:#231F20"/>
-</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:#A9AAAD"/>
-<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:#F4FCFF"/>
-<stop offset="0.6242" style="stop-color:#C9CED1"/>
-<stop offset="1" style="stop-color:#9CA4A7"/>
-</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:#A6A8AB"/>
-<stop offset="1" style="stop-color:#231F20"/>
-</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:#A9AAAD"/>
-<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:#BC5800"/>
-<stop offset="0.3" style="stop-color:#A23600"/>
-<stop offset="1" style="stop-color:#D07100"/>
-</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="#600909" 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="#600909" 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:#8BC53F"/>
-<stop offset="0.3758" style="stop-color:#33773B"/>
-<stop offset="0.6303" style="stop-color:#004F3C"/>
-<stop offset="1" style="stop-color:#007338"/>
-</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:#BC5800"/>
-<stop offset="0.3" style="stop-color:#A23600"/>
-<stop offset="1" style="stop-color:#D07100"/>
-</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="#600909" 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:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
-</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:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
-</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:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
-</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:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
-</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:#D2FF8A"/>
-<stop offset="1" style="stop-color:#138F00"/>
-</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:#D2FF8A"/>
-<stop offset="1" style="stop-color:#138F00"/>
-</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:#A7FF00"/>
-<stop offset="0.2303" style="stop-color:#D6FF61"/>
-<stop offset="1" style="stop-color:#138F00"/>
-</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:#A7FF00"/>
-<stop offset="0.2303" style="stop-color:#D6FF61"/>
-<stop offset="1" style="stop-color:#138F00"/>
-</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:#C9CDCE"/>
-<stop offset="1" style="stop-color:#6E7273"/>
-</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:#E6E9E8"/>
-<stop offset="1" style="stop-color:#ADB2B5"/>
-</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 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_im.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_im.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_im.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,53 +1,48 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<radialGradient cx="256.7998" cy="-630.0972" gradientTransform="matrix(1 0 0 -1 -228 -618)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="35.2926">
+<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"/>
 </radialGradient>
-<path d="M14.523,49.098c-0.234,0-0.383-0.385-0.383-0.979V39.91l-0.137-0.09  c-5.27-3.59-8.293-8.838-8.293-14.396C5.71,15.049,16.148,6.61,28.976,6.61c12.829,0,23.266,8.44,23.266,18.814  c0,10.375-10.438,18.814-23.266,18.814c-2.895,0-5.729-0.43-8.422-1.277L20.365,42.9l-5.053,5.666  C15.016,48.898,14.721,49.098,14.523,49.098L14.523,49.098z" fill="url(#SVGID_1_)"/>
-<rect fill="#FFFFFF" height="1.084" width="24.166" x="16.875" y="16.938"/>
-<rect fill-opacity="0.1" height="0.541" stroke-opacity="0.1" width="24.166" x="16.875" y="18.568"/>
-<rect fill-opacity="0.2" height="0.541" stroke-opacity="0.2" width="24.166" x="16.875" y="18.021"/>
-<rect fill="#FFFFFF" height="1.084" width="24.166" x="16.875" y="23.938"/>
-<rect fill-opacity="0.1" height="0.541" stroke-opacity="0.1" width="24.166" x="16.875" y="25.568"/>
-<rect fill-opacity="0.2" height="0.541" stroke-opacity="0.2" width="24.166" x="16.875" y="25.021"/>
-<rect fill="#FFFFFF" height="1.084" width="24.166" x="16.875" y="30.938"/>
-<rect fill-opacity="0.1" height="0.541" stroke-opacity="0.1" width="24.166" x="16.875" y="32.568"/>
-<rect fill-opacity="0.2" height="0.541" stroke-opacity="0.2" width="24.166" x="16.875" y="32.021"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -228 -618)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="256.8457" x2="256.8457" y1="-624.0859" y2="-663.8373">
+<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"/>
+<rect fill-opacity="0.1" height="0.616" stroke-opacity="0.1" width="27.511" x="15.059" y="16.985"/>
+<rect fill-opacity="0.2" height="0.616" stroke-opacity="0.2" width="27.511" x="15.059" y="16.363"/>
+<rect fill="#FFFFFF" height="1.234" width="27.511" x="15.059" y="23.099"/>
+<rect fill-opacity="0.1" height="0.616" stroke-opacity="0.1" width="27.511" x="15.059" y="24.955"/>
+<rect fill-opacity="0.2" height="0.616" stroke-opacity="0.2" width="27.511" x="15.059" y="24.332"/>
+<rect fill="#FFFFFF" height="1.234" width="27.511" x="15.059" y="31.067"/>
+<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"/>
 </linearGradient>
-<path d="M28.846,6.303c-12.945,0-23.441,8.513-23.441,19.016c0,5.849,3.26,11.08,8.383,14.568v8  c0,1.405,0.766,1.697,1.701,0.648l4.893-5.485c2.627,0.826,5.479,1.284,8.465,1.284c12.945,0,23.441-8.514,23.441-19.015  C52.287,14.816,41.791,6.303,28.846,6.303z M28.846,43.334c-2.807,0-5.553-0.416-8.166-1.238l-0.615-0.193l-5.277,5.916v-8.459  l-0.438-0.299c-5.049-3.438-7.945-8.444-7.945-13.742c0-9.934,10.068-18.016,22.441-18.016c12.375,0,22.441,8.082,22.441,18.016  C51.287,35.252,41.221,43.334,28.846,43.334z" fill="url(#SVGID_2_)"/>
-<path d="M51.91,28.699c-3.1-2.721-7.469-4.429-12.314-4.429  c-9.374,0-17,6.356-17,14.169c0,1.932,0.47,3.771,1.313,5.451c1.593,0.277,3.239,0.44,4.937,0.44  C40.368,44.334,49.943,37.588,51.91,28.699z" fill-opacity="0.15" stroke-opacity="0.15"/>
-<path d="M51.63,29.789c-2.937-2.762-7.235-4.518-12.034-4.518  c-8.822,0-16,5.907-16,13.168c0,2.021,0.572,3.929,1.564,5.642c1.203,0.155,2.429,0.254,3.686,0.254  C39.893,44.334,49.15,38.133,51.63,29.789z" fill-opacity="0.15" stroke-opacity="0.15"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -228 -618)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="267.5957" x2="267.5957" y1="-643.9727" y2="-671.4998">
+<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"/>
 </linearGradient>
-<path d="M24.596,38.439c0,6.719,6.716,12.166,15,12.166c1.912,0,3.736-0.293,5.418-0.821l3.131,3.51  c0.601,0.671,1.088,0.485,1.088-0.415V47.76c3.277-2.23,5.363-5.578,5.363-9.32c0-6.721-6.715-12.167-15-12.167  C31.313,26.271,24.596,31.719,24.596,38.439z" fill="url(#SVGID_3_)"/>
-<radialGradient cx="267.8867" cy="-645.6387" gradientTransform="matrix(1 0 0 -1 -228 -618)" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="22.6468">
+<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"/>
 </radialGradient>
-<path d="M45.33,48.637l-0.615,0.193c-1.637,0.516-3.359,0.775-5.119,0.775c-7.719,0-14-5.01-14-11.166  c0-6.158,6.281-11.169,14-11.169c7.721,0,14,5.011,14,11.169c0,3.267-1.795,6.36-4.926,8.494l-0.438,0.297v4.66L45.33,48.637z" fill="url(#SVGID_4_)"/>
-<rect fill="none" height="60" width="60"/>
-<g>
-<rect fill="#FFFFFF" height="1" width="16.209" x="31.491" y="41.313"/>
-<rect fill-opacity="0.1" height="0.362" stroke-opacity="0.1" width="16.209" x="31.491" y="42.325"/>
-</g>
-<g>
-<rect fill="#FFFFFF" height="1" width="16.209" x="31.491" y="37.313"/>
-<rect fill-opacity="0.1" height="0.362" stroke-opacity="0.1" width="16.209" x="31.491" y="38.325"/>
-</g>
-<g>
-<rect fill="#FFFFFF" height="1" width="16.209" x="31.491" y="33.313"/>
-<rect fill-opacity="0.1" height="0.362" stroke-opacity="0.1" width="16.209" x="31.491" y="34.325"/>
-</g>
+<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"/>
+<rect fill-opacity="0.1" height="0.412" stroke-opacity="0.1" width="18.451" x="31.698" y="44.031"/>
+<rect fill="#FFFFFF" height="1.138" width="18.451" x="31.698" y="38.325"/>
+<rect fill-opacity="0.1" height="0.413" stroke-opacity="0.1" width="18.451" x="31.698" y="39.478"/>
+<rect fill="#FFFFFF" height="1.138" width="18.451" x="31.698" y="33.771"/>
+<rect fill-opacity="0.1" height="0.413" stroke-opacity="0.1" width="18.451" x="31.698" y="34.924"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_imageprint.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_imageprint.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_imageprint.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,154 +1,151 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<g>
 <rect fill="none" height="60" width="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="30" x2="30" y1="7.77" y2="51.95">
-<stop offset="0" stop-color="#C6FF45"/>
-<stop offset="0.73" stop-color="#66A00E"/>
-<stop offset="1" stop-color="#387300"/>
-</linearGradient>
-<path d="M48.979,20.816h-4.285v-7.959c0-0.677-0.549-1.225-1.225-1.225h-0.612V8.571H17.144v3.062H16.53 c-0.676,0-1.225,0.548-1.225,1.225v7.959h-4.285c-1.353,0-2.449,1.097-2.449,2.449v17.143c0,1.353,1.097,2.449,2.449,2.449h4.898 v6.734h1.225v1.837h25.714v-1.837h1.224v-6.734h4.898c1.353,0,2.449-1.097,2.449-2.449V23.266 C51.429,21.913,50.332,20.816,48.979,20.816z" fill="url(#SVGID_1)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="30" x2="30" y1="11.42" y2="28.56">
-<stop offset="0" stop-color="#ADB3B5"/>
-<stop offset="1" stop-color="#585B5C"/>
+<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"/>
 </linearGradient>
-<path d="M44.694,27.551c0,0.677-0.549,1.225-1.225,1.225H16.53c-0.676,0-1.225-0.548-1.225-1.225V12.857 c0-0.677,0.549-1.225,1.225-1.225H43.47c0.676,0,1.225,0.548,1.225,1.225V27.551z" fill="url(#SVGID_2)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="30" x2="30" y1="20.54" y2="42.58">
-<stop offset="0" stop-color="#BDC3C4"/>
-<stop offset="0.35" stop-color="#DDE3E6"/>
-<stop offset="0.65" stop-color="#949DA1"/>
-<stop offset="0.96" stop-color="#ADB3B5"/>
-<stop offset="1" stop-color="#595C5E"/>
+<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"/>
 </linearGradient>
-<path d="M51.429,40.408c0,1.353-1.097,2.449-2.449,2.449H11.021c-1.353,0-2.449-1.097-2.449-2.449V23.266 c0-1.353,1.097-2.449,2.449-2.449h37.959c1.353,0,2.449,1.097,2.449,2.449V40.408z" fill="url(#SVGID_3)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="30" x2="30" y1="36.05" y2="41.56">
-<stop offset="0" stop-color="#131414"/>
-<stop offset="0.24" stop-color="#252629"/>
-<stop offset="1" stop-color="#444747"/>
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_4)" height="5.511" width="29.389" x="15.306" y="36.122"/>
-<rect fill="#6D6E70" height="0.612" width="28.162" x="15.919" y="48.979"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="30" x2="30" y1="39.68" y2="48.86">
-<stop offset="0" stop-color="#585B5C"/>
-<stop offset="0.79" stop-color="#949DA1"/>
-<stop offset="1" stop-color="#ADB3B5"/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_5)" points="44.694,39.796 44.081,39.796 15.919,39.796 15.306,39.796 15.306,40.408 15.919,40.408 15.919,48.979 44.081,48.979 44.081,40.408 44.694,40.408 "/>
-<rect fill="#020202" fill-opacity="0.15" height="9.184" width="26.939" x="16.53" y="11.633"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6" x1="30" x2="30" y1="8.57" y2="21.39">
-<stop offset="0" stop-color="#D9D9D9"/>
-<stop offset="0.54" stop-color="#B3B3B3"/>
-<stop offset="1" stop-color="#B3B3B3"/>
+<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"/>
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_6)" height="12.245" width="25.714" x="17.144" y="8.571"/>
-<path d="M23.622,8.572c0,0,11.111,1.683,15.244,7.346 c0,0,3.123-4.285,3.991-1.955C42.419,11.713,38.453,8.491,23.622,8.572z" fill="#050505" fill-opacity="0.05"/>
-<path d="M23.622,8.572c0,0,11.111,0.458,15.244,6.122 c0,0,3.123-3.674,3.991-0.731C42.419,11.713,38.453,8.491,23.622,8.572z" fill="#050505" fill-opacity="0.1"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7" x1="33.82" x2="32.67" y1="9.1" y2="13.39">
-<stop offset="0" stop-color="#FFFFFF"/>
-<stop offset="0.01" stop-color="#FFFFFF"/>
-<stop offset="1" stop-color="#D9D9D9"/>
+<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"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="30" x2="30" y1="2.002" y2="18.7534">
+<stop offset="0" style="stop-color:#D9D9D9"/>
+<stop offset="0.5382" style="stop-color:#B3B3B3"/>
+<stop offset="1" style="stop-color:#B3B3B3"/>
 </linearGradient>
-<path d="M23.622,8.572c0,0,11.111,0.099,15.244,5.762 c0,0,2.959-3.648,3.991-0.371C42.419,11.713,38.453,8.491,23.622,8.572z" fill="url(#SVGID_7)"/>
-<rect fill="#020202" fill-opacity="0.2" height="9.796" width="26.939" x="16.53" y="39.796"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8" x1="30" x2="30" y1="37.96" y2="51.79">
-<stop offset="0" stop-color="#F5F5F5"/>
-<stop offset="0.86" stop-color="#8F8F8F"/>
-<stop offset="1" stop-color="#A6A6A6"/>
+<rect fill="url(#SVGID_6_)" height="15.999" width="33.599" x="13.2" y="2.002"/>
+<path d="M21.665,2.002c0,0,14.519,2.2,19.918,9.599  c0,0,4.081-5.6,5.216-2.555C46.226,6.105,41.045,1.897,21.665,2.002z" fill="#050505" fill-opacity="0.05" fill-rule="evenodd" stroke-opacity="0.05"/>
+<path d="M21.665,2.002c0,0,14.519,0.6,19.918,8.001  c0,0,4.081-4.801,5.216-0.957C46.226,6.105,41.045,1.897,21.665,2.002z" fill="#050505" fill-opacity="0.1" fill-rule="evenodd" stroke-opacity="0.1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="34.9932" x2="33.4854" y1="2.6978" y2="8.2986">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="0.0061" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#D9D9D9"/>
 </linearGradient>
-<rect fill="url(#SVGID_8)" height="13.47" width="25.714" x="17.144" y="37.959"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9" x1="30" x2="30" y1="37.35" y2="51.18">
-<stop offset="0" stop-color="#F5F5F5"/>
-<stop offset="0.78" stop-color="#CCCCCC"/>
-<stop offset="1" stop-color="#D1D1D1"/>
+<path d="M21.665,2.002c0,0,14.519,0.13,19.918,7.528  c0,0,3.866-4.768,5.216-0.484C46.226,6.105,41.045,1.897,21.665,2.002z" fill="url(#SVGID_7_)" fill-rule="evenodd"/>
+<rect fill="#020202" fill-opacity="0.2" height="12.798" stroke-opacity="0.2" width="35.199" x="12.398" y="42.801"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="30" x2="30" y1="40.3994" y2="58.4715">
+<stop offset="0" style="stop-color:#F5F5F5"/>
+<stop offset="0.8606" style="stop-color:#8F8F8F"/>
+<stop offset="1" style="stop-color:#A6A6A6"/>
 </linearGradient>
-<polygon fill="url(#SVGID_9)" points="42.857,50.816 36.378,50.816 33.53,50.749 22.96,49.181 18.014,46.817 17.481,46.296 17.144,45.479 17.144,37.347 42.857,37.347 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10" x1="36.7" x2="24.11" y1="35.37" y2="50.02">
-<stop offset="0" stop-color="#C2F3FF"/>
-<stop offset="0.38" stop-color="#2D9BD2"/>
-<stop offset="0.69" stop-color="#1347BA"/>
-<stop offset="1" stop-color="#1347BA"/>
+<rect fill="url(#SVGID_8_)" height="17.601" width="33.599" x="13.2" y="40.399"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="30" x2="30" y1="39.6006" y2="57.6697">
+<stop offset="0" style="stop-color:#F5F5F5"/>
+<stop offset="0.7818" style="stop-color:#CCCCCC"/>
+<stop offset="1" style="stop-color:#D1D1D1"/>
 </linearGradient>
-<polygon fill="url(#SVGID_10)" points="41.633,48.979 24.489,48.979 18.368,47.143 18.368,37.347 41.633,37.347 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11" x1="26.67" x2="28.35" y1="41.29" y2="45.17">
-<stop offset="0" stop-color="#A7FF00"/>
-<stop offset="1" stop-color="#138F00"/>
+<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"/>
 </linearGradient>
-<path d="M32.116,38.617c0,0-7.998,2.333-8.792,10.203C23.324,48.82,31.96,46.827,32.116,38.617z" fill="url(#SVGID_11)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12" x1="25.81" x2="20.62" y1="41.18" y2="44.02">
-<stop offset="0" stop-color="#A7FF00"/>
-<stop offset="1" stop-color="#138F00"/>
+<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"/>
 </linearGradient>
-<path d="M20.987,37.347c0,0,5.354,4.808,5.016,11.633h-1.514l-6.121-2.326v-9.307H20.987z" fill="url(#SVGID_12)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13" x1="17.33" x2="20.84" y1="43.05" y2="42.45">
-<stop offset="0" stop-color="#A7FF00"/>
-<stop offset="1" stop-color="#138F00"/>
+<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"/>
 </linearGradient>
-<path d="M18.368,37.347v9.796c0,0,3.092,1.052,3.081,0.674c-0.149-5.386-1.888-8.77-3.079-10.47H18.368z" fill="url(#SVGID_13)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14" x1="29.75" x2="35.84" y1="42.72" y2="47.45">
-<stop offset="0" stop-color="#A7FF00"/>
-<stop offset="1" stop-color="#138F00"/>
+<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"/>
 </linearGradient>
-<path d="M24.562,48.979c0,0,1.994-6.405,16.022-8.136c0,0-1.317,5.621-7.462,8.136H24.562z" fill="url(#SVGID_14)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15" x1="36.3" x2="27.4" y1="40.26" y2="50.64">
-<stop offset="0" stop-color="#A7FF00"/>
-<stop offset="1" stop-color="#138F00"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M40.563,40.927c0.015-0.052,0.021-0.083,0.021-0.083c-14.34,1.533-16.022,8.137-16.022,8.136h0.366 C24.928,48.979,26.157,42.675,40.563,40.927z" fill="url(#SVGID_15)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16" x1="37.21" x2="33.41" y1="47.84" y2="44.12">
-<stop offset="0" stop-color="#A7FF00"/>
-<stop offset="1" stop-color="#138F00"/>
+<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"/>
 </linearGradient>
-<path d="M27.957,48.979c0,0,4.903-2.057,12.605-8.053c-0.171,2.08-2.283,6.422-7.44,8.053H27.957z" fill="url(#SVGID_16)"/>
-<rect fill="#FFFFFF" fill-opacity="0.3" height="0.612" width="16.53" x="25.103" y="48.367"/>
-<path d="M36.378,50.815c0,0-11.111-1.07-15.244-6.733 c0,0-2.959,4.62-3.99,1.343C17.582,47.675,21.547,50.896,36.378,50.815z" fill="#050505" fill-opacity="0.1"/>
-<path d="M36.378,50.815c0,0-11.104-0.392-15.236-6.055 c0,0-2.967,3.941-3.998,0.664C17.582,47.675,21.547,50.896,36.378,50.815z" fill="#050505" fill-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17" x1="26.79" x2="25.76" y1="48.05" y2="50.77">
-<stop offset="0" stop-color="#FEFEFE"/>
-<stop offset="0.82" stop-color="#E3E3E3"/>
-<stop offset="1" stop-color="#DEDEDE"/>
+<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"/>
+<path d="M38.332,57.198c0,0-14.518-1.398-19.918-8.799  c0,0-3.866,6.038-5.214,1.756C13.774,53.095,18.955,57.304,38.332,57.198z" fill="#050505" fill-opacity="0.1" fill-rule="evenodd" stroke-opacity="0.1"/>
+<path d="M38.332,57.198c0,0-14.508-0.513-19.908-7.91  c0,0-3.876,5.149-5.224,0.867C13.774,53.095,18.955,57.304,38.332,57.198z" fill="#050505" fill-opacity="0.2" fill-rule="evenodd" stroke-opacity="0.2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="25.8027" x2="24.4534" y1="53.5825" y2="57.1418">
+<stop offset="0" style="stop-color:#FEFEFE"/>
+<stop offset="0.8182" style="stop-color:#E3E3E3"/>
+<stop offset="1" style="stop-color:#DEDEDE"/>
 </linearGradient>
-<path d="M36.378,50.815c0,0-11.111-0.099-15.244-5.762 c0,0-2.959,3.648-3.99,0.371C17.582,47.675,21.547,50.896,36.378,50.815z" fill="url(#SVGID_17)"/>
-<rect fill="#020202" fill-opacity="0.1" height="0.612" width="25.714" x="17.144" y="39.184"/>
-<rect fill="#020202" fill-opacity="0.2" height="0.612" width="25.714" x="17.144" y="38.571"/>
-<rect fill="#020202" fill-opacity="0.3" height="0.612" width="25.714" x="17.144" y="37.959"/>
-<rect fill="#020202" fill-opacity="0.5" height="0.612" width="25.714" x="17.144" y="37.347"/>
-<rect fill="#020202" fill-opacity="0.3" height="0.612" width="29.389" x="15.306" y="20.204"/>
-<rect fill="#020202" fill-opacity="0.1" height="0.612" width="29.389" x="15.306" y="19.592"/>
-<rect fill="#FFFFFF" fill-opacity="0.2" height="0.612" width="29.389" x="15.306" y="35.51"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18" x1="30" x2="30" y1="20.54" y2="42.58">
-<stop offset="0" stop-color="#DDE3E6"/>
-<stop offset="0.69" stop-color="#C0CCD1"/>
-<stop offset="1" stop-color="#9BA1A3"/>
+<path d="M38.332,57.198c0,0-14.518-0.13-19.918-7.527  c0,0-3.866,4.767-5.214,0.484C13.774,53.095,18.955,57.304,38.332,57.198z" fill="url(#SVGID_17_)" fill-rule="evenodd"/>
+<rect fill="#020202" fill-opacity="0.1" height="0.802" stroke-opacity="0.1" width="33.599" x="13.2" y="41.999"/>
+<rect fill="#020202" fill-opacity="0.2" height="0.799" stroke-opacity="0.2" width="33.599" x="13.2" y="41.2"/>
+<rect fill="#020202" fill-opacity="0.3" height="0.801" stroke-opacity="0.3" width="33.599" x="13.2" y="40.399"/>
+<rect fill="#020202" fill-opacity="0.5" height="0.799" stroke-opacity="0.5" width="33.599" x="13.2" y="39.601"/>
+<rect fill="#020202" fill-opacity="0.3" height="0.799" stroke-opacity="0.3" width="38.399" x="10.799" y="17.202"/>
+<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"/>
 </linearGradient>
-<path d="M48.979,20.816H11.021c-1.353,0-2.449,1.097-2.449,2.449v17.143c0,1.353,1.097,2.449,2.449,2.449 c-1.013,0-1.837-0.824-1.837-1.837v-0.612v-16.53v-0.612c0-1.013,0.824-1.837,1.837-1.837h37.959c1.014,0,1.837,0.824,1.837,1.837 v0.612v16.53v0.612c0,1.013-0.823,1.837-1.837,1.837c1.353,0,2.449-1.097,2.449-2.449V23.266 C51.429,21.913,50.332,20.816,48.979,20.816z" fill="url(#SVGID_18)"/>
-<path d="M13.47,20.816v2.449c0,1.688,1.373,3.061,3.061,3.061H43.47c1.688,0,3.061-1.373,3.061-3.061 v-2.449H13.47z" fill="#FFFFFF" fill-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19" x1="30" x2="30" y1="20.76" y2="25.65">
-<stop offset="0" stop-color="#A0A7A8"/>
-<stop offset="0.76" stop-color="#252629"/>
-<stop offset="1" stop-color="#1F2021"/>
+<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="1" style="stop-color:#E3E3E3"/>
 </linearGradient>
-<path d="M14.081,20.816v2.449c0,1.353,1.098,2.448,2.449,2.448H43.47c1.352,0,2.449-1.096,2.449-2.448 v-2.449H14.081z" fill="url(#SVGID_19)"/>
-<rect fill="#FFFFFF" fill-opacity="0.2" height="0.612" width="31.838" x="14.081" y="20.816"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_20" x1="47.75" x2="47.75" y1="38.57" y2="41.05">
-<stop offset="0" stop-color="#576266"/>
-<stop offset="1" stop-color="#E3E3E3"/>
+<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"/>
 </linearGradient>
-<path d="M48.979,40.405c0,0.338-0.275,0.612-0.611,0.612h-1.225c-0.339,0-0.613-0.274-0.613-0.612v-1.222 c0-0.338,0.274-0.612,0.613-0.612h1.225c0.336,0,0.611,0.274,0.611,0.612V40.405z" fill="url(#SVGID_20)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_21" x1="47.76" x2="47.76" y1="39.16" y2="40.42">
-<stop offset="0" stop-color="#FFC142"/>
-<stop offset="0.75" stop-color="#CF4E18"/>
-<stop offset="1" stop-color="#B52100"/>
+<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="1" style="stop-color:#C4C4C4"/>
 </linearGradient>
-<rect fill="url(#SVGID_21)" height="1.222" width="1.225" x="47.144" y="39.184"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_22" x1="47.75" x2="47.75" y1="34.9" y2="37.38">
-<stop offset="0" stop-color="#576266"/>
-<stop offset="1" stop-color="#C4C4C4"/>
+<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"/>
 </linearGradient>
-<path d="M48.979,36.734c0,0.339-0.274,0.612-0.613,0.612h-1.223c-0.338,0-0.613-0.273-0.613-0.612V35.51 c0-0.338,0.275-0.611,0.613-0.611h1.223c0.339,0,0.613,0.273,0.613,0.611V36.734z" fill="url(#SVGID_22)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_23" x1="47.75" x2="47.75" y1="35.49" y2="36.75">
-<stop offset="0" stop-color="#C6FF45"/>
-<stop offset="0.73" stop-color="#66A00E"/>
-<stop offset="1" stop-color="#387300"/>
-</linearGradient>
-<rect fill="url(#SVGID_23)" height="1.225" width="1.223" x="47.144" y="35.51"/>
+<rect fill="url(#SVGID_22_)" height="1.6" width="1.598" x="52.398" y="37.199"/>
+<rect fill="none" height="60" width="60"/>
+</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_info.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_info.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_info.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,29 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<g>
+<rect fill="none" height="60" width="60"/>
 <rect fill="none" height="60" width="60"/>
-<rect fill="none" height="59.996" width="59.996"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="30" x2="30" y1="8.77" y2="51.63">
-<stop offset="0" stop-color="#E5FFB2"/>
-<stop offset="0.39" stop-color="#6AAB18"/>
-<stop offset="0.68" stop-color="#247307"/>
-<stop offset="1" stop-color="#C2FF4A"/>
+<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"/>
 </linearGradient>
-<circle cx="29.998" cy="29.998" fill="url(#SVGID_1)" r="21.427"/>
-<radialGradient cx="30.2" cy="11.02" gradientUnits="userSpaceOnUse" id="SVGID_2" r="39.38">
-<stop offset="0" stop-color="#AFED23"/>
-<stop offset="0.81" stop-color="#358C0C"/>
-<stop offset="1" stop-color="#67AD1A"/>
+<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"/>
 </radialGradient>
-<path d="M29.998,50.813c-11.478,0-20.815-9.337-20.815-20.814S18.521,9.183,29.998,9.183 c11.477,0,20.814,9.337,20.814,20.815S41.475,50.813,29.998,50.813L29.998,50.813z" fill="url(#SVGID_2)"/>
-<polygon fill-opacity="0.1" points="25.252,27.84 27.297,27.84 27.297,45.543 33.251,45.543 33.251,24.45 25.252,24.45 " stroke-opacity="0.1"/>
-<path d="M30.295,22.262c0.98,0,1.767-0.243,2.359-0.727 c0.592-0.484,0.888-1.151,0.888-2c0-0.825-0.306-1.486-0.915-1.981c-0.609-0.496-1.387-0.745-2.332-0.745 c-0.993,0-1.778,0.245-2.358,0.735c-0.581,0.49-0.871,1.154-0.871,1.991c0,0.849,0.296,1.516,0.889,2 C28.547,22.02,29.327,22.262,30.295,22.262z" fill-opacity="0.1" stroke-opacity="0.1"/>
-<polygon fill-opacity="0.2" points="25.252,27.228 27.297,27.228 27.297,44.931 33.251,44.931 33.251,23.838 25.252,23.838 " stroke-opacity="0.2"/>
-<path d="M30.295,21.65c0.98,0,1.767-0.243,2.359-0.727 c0.592-0.484,0.888-1.151,0.888-2c0-0.825-0.306-1.485-0.915-1.981s-1.387-0.745-2.332-0.745c-0.993,0-1.778,0.245-2.358,0.735 c-0.581,0.491-0.871,1.154-0.871,1.991c0,0.85,0.296,1.516,0.889,2C28.547,21.407,29.327,21.65,30.295,21.65z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="29.25" x2="29.25" y1="15.88" y2="44.66">
-<stop offset="0" stop-color="#F6FDFF"/>
-<stop offset="1" stop-color="#ADB3B5"/>
+<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"/>
+<path d="M30.39,19.892c1.281,0,2.31-0.316,3.083-0.949c0.773-0.632,1.159-1.504,1.159-2.612  c0-1.08-0.399-1.942-1.196-2.591s-1.813-0.973-3.046-0.973c-1.297,0-2.323,0.319-3.081,0.96c-0.76,0.642-1.138,1.509-1.138,2.604  c0,1.108,0.388,1.98,1.161,2.612C28.105,19.575,29.124,19.892,30.39,19.892z" fill-opacity="0.1" stroke-opacity="0.1"/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_3)" points="25.252,26.616 27.297,26.616 27.297,44.318 33.251,44.318 33.251,23.226 25.252,23.226 "/>
-<path d="M30.274,21.038c0.981,0,1.767-0.242,2.359-0.727s0.888-1.151,0.888-2 c0-0.825-0.306-1.486-0.915-1.982c-0.609-0.496-1.387-0.744-2.332-0.744c-0.992,0-1.778,0.245-2.358,0.735 c-0.581,0.491-0.871,1.154-0.871,1.991c0,0.849,0.296,1.516,0.889,2C28.525,20.795,29.305,21.038,30.274,21.038z" fill="url(#SVGID_3)"/>
+<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"/>
+</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>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_input_device.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,43 +1,86 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.9995" x2="29.9995" y1="14.4238" y2="52.6162">
+<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"/>
 </linearGradient>
-<path d="M11.538,50.193c0,1.269,1.023,2.307,2.276,2.307h32.371  c1.25,0,2.275-1.038,2.275-2.307V16.731c0-1.27-1.025-2.308-2.275-2.308H13.814c-1.253,0-2.276,1.038-2.276,2.308V50.193z" fill="url(#SVGID_1_)" fill-opacity="0.6" stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="29.9995" x2="29.9995" y1="15.5781" y2="51.4569">
+<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.703" style="stop-color:#8D9699"/>
-<stop offset="1" style="stop-color:#B7BDBF"/>
+<stop offset="0.6727" style="stop-color:#A1A9AC"/>
+<stop offset="1" style="stop-color:#C6CDCF"/>
 </linearGradient>
-<path d="M46.186,51.348H13.814c-0.62,0-1.122-0.519-1.122-1.156v-33.46c0-0.636,0.502-1.153,1.122-1.153  h32.371c0.617,0,1.121,0.518,1.121,1.153v33.46C47.307,50.829,46.803,51.348,46.186,51.348L46.186,51.348z" fill="url(#SVGID_2_)"/>
-<rect fill="#FFFFFF" fill-opacity="0.5" height="25.385" stroke-opacity="0.5" width="8.077" x="25.427" y="22.5"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="29.4653" x2="29.4653" y1="47.3076" y2="28.7302">
-<stop offset="0" style="stop-color:#3A3A3A"/>
-<stop offset="0.0121" style="stop-color:#3A3A3A"/>
+<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>
+<path d="M24,47.958c-6.556,0-11.892-5.335-11.892-11.896   c0-6.556,5.335-11.889,11.892-11.889c6.557,0,11.891,5.333,11.891,11.889C35.891,42.623,30.557,47.958,24,47.958L24,47.958z" fill-opacity="0.5" stroke-opacity="0.5"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 8.3999 35.04)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="3.5708" x2="26.8214" y1="-0.2554" y2="-0.2554">
+<stop offset="0" style="stop-color:#262626"/>
+<stop offset="0.3879" style="stop-color:#CCCCCC"/>
+<stop offset="0.7091" style="stop-color:#262626"/>
+<stop offset="1" style="stop-color:#757575"/>
+</linearGradient>
+<path d="M35.453,35.295c0,6.323-5.125,11.454-11.454,11.454c-6.323,0-11.453-5.131-11.453-11.454   c0-6.332,5.13-11.453,11.453-11.453C30.328,23.842,35.453,28.963,35.453,35.295z" fill="url(#SVGID_3_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 8.3999 35.04)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="15.6006" x2="15.6006" y1="9.3652" y2="-9.4998">
+<stop offset="0" style="stop-color:#999999"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
-<rect fill="url(#SVGID_3_)" height="26.538" width="8.077" x="25.427" y="20.479"/>
-<path d="M26.581,21.347v13.269c0,1.594,1.291,2.885,2.885,2.885c1.593,0,2.884-1.291,2.884-2.885V21.347H26.581z" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M19.658,20.77c0,3.863,2.287,7.354,5.769,8.93v6.07c0,2.227,1.813,4.039,4.039,4.039  c2.226,0,4.038-1.813,4.038-4.039v-6.07c3.482-1.576,5.77-5.066,5.77-8.93c0-2.42-0.885-4.634-2.344-6.346H22.001  C20.543,16.136,19.658,18.35,19.658,20.77z" fill-opacity="0.25" stroke-opacity="0.25"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="26.5811" x2="32.3496" y1="28.27" y2="28.27">
-<stop offset="0" style="stop-color:#DDE3E6"/>
-<stop offset="0.7418" style="stop-color:#949DA1"/>
-<stop offset="0.8901" style="stop-color:#CBD2D5"/>
-<stop offset="1" style="stop-color:#CBD2D5"/>
+<path d="M24,45.249c-6.04,0-10.953-4.913-10.953-10.954c0-6.04,4.914-10.953,10.953-10.953   s10.954,4.913,10.954,10.953C34.953,40.336,30.039,45.249,24,45.249L24,45.249z" fill="url(#SVGID_4_)"/>
+<path d="M13.188,16.536c0,4.259,2.52,8.104,6.36,9.848v6.69   c0,2.451,1.996,4.451,4.451,4.451c2.456,0,4.452-2,4.452-4.451v-6.69c3.84-1.744,6.359-5.589,6.359-9.848   c0-1.805-0.455-3.5-1.24-4.992H14.428C13.643,13.036,13.188,14.731,13.188,16.536z" fill-opacity="0.25" stroke-opacity="0.25"/>
+<path d="M20.329,18.189v16.886c0,2.028,1.644,3.672,3.671,3.672   c2.027,0,3.67-1.644,3.67-3.672V18.189H20.329z" fill-opacity="0.5" stroke-opacity="0.5"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 8.3999 35.04)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="11.9292" x2="19.27" y1="7.5596" y2="7.5596">
+<stop offset="0" style="stop-color:#6E6E6E"/>
+<stop offset="0.3455" style="stop-color:#E0E0E0"/>
+<stop offset="0.7515" style="stop-color:#838383"/>
+<stop offset="1" style="stop-color:#C9C9C9"/>
 </linearGradient>
-<path d="M26.581,20.193v13.269c0,1.593,1.291,2.885,2.885,2.885c1.593,0,2.884-1.292,2.884-2.885V20.193  H26.581z" fill="url(#SVGID_4_)"/>
-<path d="M26.581,25.459c0.903,0.32,1.871,0.503,2.885,0.503c1.013,0,1.979-0.183,2.884-0.503v-7.574h-5.769V25.459z" fill-opacity="0.5" stroke-opacity="0.5"/>
-<radialGradient cx="28.0229" cy="13.8242" gradientUnits="userSpaceOnUse" id="SVGID_5_" r="11.171">
-<stop offset="0" style="stop-color:#FF5D24"/>
-<stop offset="0.1333" style="stop-color:#FF5D24"/>
-<stop offset="0.8303" style="stop-color:#982D19"/>
-<stop offset="1" style="stop-color:#E04E1B"/>
+<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"/>
 </radialGradient>
-<circle cx="29.465" cy="16.154" fill="url(#SVGID_5_)" r="8.654"/>
-<rect fill="none" height="60" width="60"/>
+<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>
+<g>
+<path d="M44.482,31.73c-3.273,0-5.938-2.663-5.938-5.939   c0-3.271,2.664-5.934,5.938-5.934s5.936,2.663,5.936,5.934C50.418,29.068,47.756,31.73,44.482,31.73L44.482,31.73z" fill-opacity="0.5" stroke-opacity="0.5"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 8.3999 35.04)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="30.0771" x2="41.6829" y1="9.6299" y2="9.6299">
+<stop offset="0" style="stop-color:#262626"/>
+<stop offset="0.3879" style="stop-color:#CCCCCC"/>
+<stop offset="0.7091" style="stop-color:#262626"/>
+<stop offset="1" style="stop-color:#757575"/>
+</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"/>
+</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>
+<g>
+<path d="M44.48,50.206c-3.271,0-5.937-2.661-5.937-5.938   c0-3.271,2.664-5.933,5.937-5.933s5.938,2.662,5.938,5.933C50.418,47.545,47.754,50.206,44.48,50.206L44.48,50.206z" fill-opacity="0.5" stroke-opacity="0.5"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 8.3999 35.04)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="30.0771" x2="41.6834" y1="-8.8452" y2="-8.8452">
+<stop offset="0" style="stop-color:#262626"/>
+<stop offset="0.3879" style="stop-color:#CCCCCC"/>
+<stop offset="0.7091" style="stop-color:#262626"/>
+<stop offset="1" style="stop-color:#757575"/>
+</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"/>
+</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>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_internet_radio.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,340 +1,339 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.9995" x2="29.9995" y1="15.4229" y2="47.4519">
+<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"/>
 </linearGradient>
-<path d="M52.041,46.225c0,0.676-0.549,1.225-1.225,1.225H9.184c-0.677,0-1.225-0.549-1.225-1.225V16.837  c0-0.677,0.548-1.225,1.225-1.225h41.633c0.676,0,1.225,0.548,1.225,1.225V46.225z" fill="url(#SVGID_1_)"/>
-<path d="M50.816,15.612H9.184c-0.677,0-1.225,0.548-1.225,1.225v9.49l44.082-4.848v-4.642  C52.041,16.16,51.492,15.612,50.816,15.612z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M50.816,16.225c0.337,0,0.612,0.274,0.612,0.612v29.388c0,0.337-0.275,0.612-0.612,0.612H9.184  c-0.338,0-0.612-0.275-0.612-0.612V16.837c0-0.338,0.274-0.612,0.612-0.612H50.816 M50.816,15.612H9.184  c-0.677,0-1.225,0.548-1.225,1.225v29.388c0,0.676,0.548,1.225,1.225,1.225h41.633c0.676,0,1.225-0.549,1.225-1.225V16.837  C52.041,16.16,51.492,15.612,50.816,15.612L50.816,15.612z" fill="#D83506"/>
-<path d="M50.816,46.837H9.184c-0.677,0-1.225-0.549-1.225-1.225v0.612c0,0.676,0.548,1.225,1.225,1.225h41.633  c0.676,0,1.225-0.549,1.225-1.225v-0.612C52.041,46.288,51.492,46.837,50.816,46.837z" fill="#600909"/>
-<path d="M50.816,15.612H9.184c-0.677,0-1.225,0.548-1.225,1.225v0.612  c0-0.677,0.548-1.225,1.225-1.225h41.633c0.676,0,1.225,0.547,1.225,1.225v-0.612C52.041,16.16,51.492,15.612,50.816,15.612z" fill="#FFFFFF" fill-opacity="0.6" stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="42.5508" x2="42.5508" y1="31.9482" y2="22.7159">
+<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,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"/>
 </linearGradient>
-<circle cx="42.55" cy="27.203" fill="url(#SVGID_2_)" r="5.468"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="42.5508" x2="42.5508" y1="32.9951" y2="28.7968">
+<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"/>
 </linearGradient>
-<path d="M42.551,32.67c-2.955,0-5.354-2.345-5.458-5.272c-0.003,0.066-0.011,0.128-0.011,0.194  c0,3.02,2.448,5.468,5.469,5.468c3.02,0,5.468-2.449,5.468-5.468c0-0.066-0.009-0.128-0.009-0.194  C47.904,30.325,45.504,32.67,42.551,32.67z" fill="url(#SVGID_3_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="42.5508" x2="42.5508" y1="34.0615" y2="19.981">
+<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"/>
 </linearGradient>
-<path d="M42.551,34.285c-3.883,0-7.041-3.158-7.041-7.04c0-3.883,3.158-7.041,7.041-7.041  s7.041,3.158,7.041,7.041C49.592,31.127,46.434,34.285,42.551,34.285L42.551,34.285z M42.551,21.123  c-3.377,0-6.122,2.746-6.122,6.123c0,3.375,2.745,6.122,6.122,6.122c3.376,0,6.123-2.747,6.123-6.122  C48.674,23.868,45.927,21.123,42.551,21.123L42.551,21.123z" fill="url(#SVGID_4_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="42.5508" x2="42.5508" y1="22.4209" y2="32.0317">
+<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">
 <stop offset="0" style="stop-color:#CBCBCB"/>
 <stop offset="1" style="stop-color:#4F4F4F"/>
 </linearGradient>
-<circle cx="42.551" cy="27.227" fill="url(#SVGID_5_)" r="4.805"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="42.5508" x2="42.5508" y1="22.7642" y2="31.689">
+<circle cx="45.943" cy="26.642" fill="url(#SVGID_5_)" r="6.104"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="45.9434" x2="45.9434" y1="20.9736" y2="32.3105">
 <stop offset="0" style="stop-color:#FFFFFF"/>
 <stop offset="0.2848" style="stop-color:#FFFFFF"/>
 <stop offset="0.7212" style="stop-color:#7B7B7B"/>
 <stop offset="1" style="stop-color:#A7A7A7"/>
 </linearGradient>
-<circle cx="42.551" cy="27.227" fill="url(#SVGID_6_)" r="4.462"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="42.5508" x2="42.5508" y1="23.1587" y2="31.3975">
+<circle cx="45.943" cy="26.642" fill="url(#SVGID_6_)" r="5.67"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="45.9434" x2="45.9434" y1="21.4746" y2="31.9404">
 <stop offset="0" style="stop-color:#D9D9D9"/>
 <stop offset="0.8242" style="stop-color:#636363"/>
 <stop offset="1" style="stop-color:#636363"/>
 </linearGradient>
-<path d="M46.299,25.514c0.238,0.522,0.371,1.101,0.371,1.712c0,2.273-1.844,4.119-4.119,4.119  c-2.273,0-4.118-1.846-4.118-4.119c0-2.274,1.845-4.119,4.118-4.119C44.215,23.107,45.648,24.095,46.299,25.514z" fill="url(#SVGID_7_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="42.5508" x2="42.5508" y1="26.3252" y2="24.3086">
+<path d="M50.705,24.468c0.303,0.662,0.471,1.396,0.471,2.174c0,2.889-2.342,5.233-5.232,5.233  c-2.888,0-5.232-2.345-5.232-5.233s2.345-5.232,5.232-5.232C48.058,21.409,49.879,22.663,50.705,24.468z" fill="url(#SVGID_7_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="45.9434" x2="45.9434" y1="25.4961" y2="22.9348">
 <stop offset="0" style="stop-color:#636363"/>
 <stop offset="1" style="stop-color:#323232"/>
 </linearGradient>
-<polygon fill="url(#SVGID_8_)" points="41.521,26.248 42.551,24.188 43.58,26.248 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="22.3472" x2="22.3472" y1="30.4082" y2="22.5226">
+<polygon fill="url(#SVGID_8_)" points="44.636,25.397 45.943,22.782 47.251,25.397 "/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="20.2773" x2="20.2773" y1="30.6846" y2="20.667">
 <stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.6667" style="stop-color:#515151"/>
 <stop offset="1" style="stop-color:#323232"/>
 </linearGradient>
-<rect fill="url(#SVGID_9_)" height="8.571" width="22.041" x="11.327" y="22.041"/>
-<rect fill="#D9D9D9" height="0.612" width="22.041" x="11.327" y="30.612"/>
-<polygon fill="#A6A8AB" points="31.531,26.327 31.531,28.163 29.694,28.163 29.694,26.939 29.082,26.939 29.082,28.163   27.245,28.163 27.245,26.939 26.633,26.939 26.633,28.163 24.796,28.163 24.796,26.939 24.184,26.939 24.184,28.163 22.347,28.163   22.347,26.327 21.735,26.327 21.735,28.163 19.898,28.163 19.898,26.939 19.286,26.939 19.286,28.163 17.449,28.163 17.449,26.939   16.837,26.939 16.837,28.163 15,28.163 15,26.939 14.388,26.939 14.388,28.163 13.163,28.163 13.163,26.327 12.551,26.327   12.551,28.775 13.163,28.775 14.388,28.775 15,28.775 16.837,28.775 17.449,28.775 19.286,28.775 19.898,28.775 21.735,28.775   22.347,28.775 24.184,28.775 24.796,28.775 26.633,28.775 27.245,28.775 29.082,28.775 29.694,28.775 31.531,28.775 32.143,28.775   32.143,28.163 32.143,26.327 "/>
-<rect fill="#E00000" height="8.571" width="1.224" x="22.366" y="22.041"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="13.5698" x2="13.5698" y1="37.9336" y2="40.3828">
+<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"/>
+<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"/>
 </linearGradient>
-<circle cx="13.57" cy="39.184" fill="url(#SVGID_10_)" r="1.225"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="13.5698" x2="13.5698" y1="38.3496" y2="39.9824">
+<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">
 <stop offset="0" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#383838"/>
 </linearGradient>
-<circle cx="13.57" cy="39.184" fill="url(#SVGID_11_)" r="0.817"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="17.1929" x2="17.1929" y1="37.9336" y2="40.3828">
+<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"/>
 </linearGradient>
-<circle cx="17.193" cy="39.184" fill="url(#SVGID_12_)" r="1.224"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="17.1929" x2="17.1929" y1="38.3496" y2="39.9824">
+<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">
 <stop offset="0" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#383838"/>
 </linearGradient>
-<circle cx="17.193" cy="39.184" fill="url(#SVGID_13_)" r="0.817"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="20.8667" x2="20.8667" y1="37.9336" y2="40.3828">
+<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"/>
 </linearGradient>
-<circle cx="20.866" cy="39.184" fill="url(#SVGID_14_)" r="1.224"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="20.8667" x2="20.8667" y1="38.3496" y2="39.9824">
+<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">
 <stop offset="0" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#383838"/>
 </linearGradient>
-<circle cx="20.866" cy="39.184" fill="url(#SVGID_15_)" r="0.817"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="24.54" x2="24.54" y1="37.9336" y2="40.3828">
+<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"/>
 </linearGradient>
-<circle cx="24.54" cy="39.184" fill="url(#SVGID_16_)" r="1.225"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="24.54" x2="24.54" y1="38.3496" y2="39.9824">
+<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">
 <stop offset="0" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#383838"/>
 </linearGradient>
-<circle cx="24.54" cy="39.184" fill="url(#SVGID_17_)" r="0.817"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="28.2134" x2="28.2134" y1="37.9336" y2="40.3828">
+<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"/>
 </linearGradient>
-<circle cx="28.213" cy="39.184" fill="url(#SVGID_18_)" r="1.225"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="28.2134" x2="28.2134" y1="38.3496" y2="39.9824">
+<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">
 <stop offset="0" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#383838"/>
 </linearGradient>
-<circle cx="28.214" cy="39.184" fill="url(#SVGID_19_)" r="0.817"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="31.8867" x2="31.8867" y1="37.9336" y2="40.3828">
+<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"/>
 </linearGradient>
-<circle cx="31.887" cy="39.184" fill="url(#SVGID_20_)" r="1.224"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="31.8867" x2="31.8867" y1="38.3496" y2="39.9824">
+<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">
 <stop offset="0" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#383838"/>
 </linearGradient>
-<circle cx="31.887" cy="39.184" fill="url(#SVGID_21_)" r="0.816"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_22_" x1="13.5698" x2="13.5698" y1="41.6074" y2="44.0566">
+<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"/>
 </linearGradient>
-<circle cx="13.57" cy="42.857" fill="url(#SVGID_22_)" r="1.225"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_23_" x1="13.5698" x2="13.5698" y1="42.0234" y2="43.6563">
+<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">
 <stop offset="0" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#383838"/>
 </linearGradient>
-<circle cx="13.57" cy="42.857" fill="url(#SVGID_23_)" r="0.817"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_24_" x1="17.1929" x2="17.1929" y1="41.6074" y2="44.0566">
+<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"/>
 </linearGradient>
-<circle cx="17.193" cy="42.857" fill="url(#SVGID_24_)" r="1.224"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_25_" x1="17.1929" x2="17.1929" y1="42.0234" y2="43.6563">
+<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">
 <stop offset="0" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#383838"/>
 </linearGradient>
-<circle cx="17.193" cy="42.857" fill="url(#SVGID_25_)" r="0.817"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_26_" x1="20.8667" x2="20.8667" y1="41.6074" y2="44.0566">
+<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"/>
 </linearGradient>
-<circle cx="20.866" cy="42.857" fill="url(#SVGID_26_)" r="1.224"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_27_" x1="20.8667" x2="20.8667" y1="42.0234" y2="43.6563">
+<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">
 <stop offset="0" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#383838"/>
 </linearGradient>
-<circle cx="20.866" cy="42.857" fill="url(#SVGID_27_)" r="0.817"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_28_" x1="24.54" x2="24.54" y1="41.6074" y2="44.0566">
+<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"/>
 </linearGradient>
-<circle cx="24.54" cy="42.857" fill="url(#SVGID_28_)" r="1.225"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_29_" x1="24.54" x2="24.54" y1="42.0234" y2="43.6563">
+<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">
 <stop offset="0" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#383838"/>
 </linearGradient>
-<circle cx="24.54" cy="42.857" fill="url(#SVGID_29_)" r="0.817"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_30_" x1="28.2134" x2="28.2134" y1="41.6074" y2="44.0566">
+<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"/>
 </linearGradient>
-<circle cx="28.213" cy="42.857" fill="url(#SVGID_30_)" r="1.225"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_31_" x1="28.2134" x2="28.2134" y1="42.0234" y2="43.6563">
+<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">
 <stop offset="0" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#383838"/>
 </linearGradient>
-<circle cx="28.214" cy="42.857" fill="url(#SVGID_31_)" r="0.817"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_32_" x1="31.8867" x2="31.8867" y1="41.6074" y2="44.0566">
+<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"/>
 </linearGradient>
-<circle cx="31.887" cy="42.857" fill="url(#SVGID_32_)" r="1.224"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_33_" x1="31.8867" x2="31.8867" y1="42.0234" y2="43.6563">
+<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">
 <stop offset="0" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#383838"/>
 </linearGradient>
-<circle cx="31.887" cy="42.857" fill="url(#SVGID_33_)" r="0.816"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_34_" x1="35.5098" x2="35.5098" y1="37.9336" y2="40.3828">
+<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"/>
 </linearGradient>
-<circle cx="35.51" cy="39.184" fill="url(#SVGID_34_)" r="1.225"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_35_" x1="35.5098" x2="35.5098" y1="38.3496" y2="39.9824">
+<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">
 <stop offset="0" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#383838"/>
 </linearGradient>
-<circle cx="35.51" cy="39.184" fill="url(#SVGID_35_)" r="0.817"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_36_" x1="39.1836" x2="39.1836" y1="37.9336" y2="40.3828">
+<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"/>
 </linearGradient>
-<circle cx="39.184" cy="39.184" fill="url(#SVGID_36_)" r="1.225"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_37_" x1="39.1836" x2="39.1836" y1="38.3496" y2="39.9824">
+<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">
 <stop offset="0" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#383838"/>
 </linearGradient>
-<circle cx="39.184" cy="39.184" fill="url(#SVGID_37_)" r="0.816"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_38_" x1="42.8574" x2="42.8574" y1="37.9336" y2="40.3828">
+<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"/>
 </linearGradient>
-<circle cx="42.857" cy="39.184" fill="url(#SVGID_38_)" r="1.225"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_39_" x1="42.8574" x2="42.8574" y1="38.3496" y2="39.9824">
+<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">
 <stop offset="0" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#383838"/>
 </linearGradient>
-<circle cx="42.857" cy="39.184" fill="url(#SVGID_39_)" r="0.816"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_40_" x1="46.5313" x2="46.5313" y1="37.9336" y2="40.3828">
+<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"/>
 </linearGradient>
-<circle cx="46.531" cy="39.184" fill="url(#SVGID_40_)" r="1.224"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_41_" x1="46.5313" x2="46.5313" y1="38.3496" y2="39.9824">
+<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">
 <stop offset="0" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#383838"/>
 </linearGradient>
-<circle cx="46.531" cy="39.184" fill="url(#SVGID_41_)" r="0.817"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_42_" x1="35.5098" x2="35.5098" y1="41.6074" y2="44.0566">
+<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"/>
 </linearGradient>
-<circle cx="35.51" cy="42.857" fill="url(#SVGID_42_)" r="1.225"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_43_" x1="35.5098" x2="35.5098" y1="42.0234" y2="43.6563">
+<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">
 <stop offset="0" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#383838"/>
 </linearGradient>
-<circle cx="35.51" cy="42.857" fill="url(#SVGID_43_)" r="0.817"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_44_" x1="39.1836" x2="39.1836" y1="41.6074" y2="44.0566">
+<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"/>
 </linearGradient>
-<circle cx="39.184" cy="42.857" fill="url(#SVGID_44_)" r="1.225"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_45_" x1="39.1836" x2="39.1836" y1="42.0234" y2="43.6563">
+<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">
 <stop offset="0" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#383838"/>
 </linearGradient>
-<circle cx="39.184" cy="42.857" fill="url(#SVGID_45_)" r="0.816"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_46_" x1="42.8574" x2="42.8574" y1="41.6074" y2="44.0566">
+<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"/>
 </linearGradient>
-<circle cx="42.857" cy="42.857" fill="url(#SVGID_46_)" r="1.225"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_47_" x1="42.8574" x2="42.8574" y1="42.0234" y2="43.6563">
+<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">
 <stop offset="0" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#383838"/>
 </linearGradient>
-<circle cx="42.857" cy="42.857" fill="url(#SVGID_47_)" r="0.816"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_48_" x1="46.5313" x2="46.5313" y1="41.6074" y2="44.0566">
+<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"/>
 </linearGradient>
-<circle cx="46.531" cy="42.857" fill="url(#SVGID_48_)" r="1.224"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_49_" x1="46.5313" x2="46.5313" y1="42.0234" y2="43.6563">
+<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">
 <stop offset="0" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#383838"/>
 </linearGradient>
-<circle cx="46.531" cy="42.857" fill="url(#SVGID_49_)" r="0.817"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_50_" x1="45.6123" x2="45.6123" y1="15.3745" y2="11.2014">
+<path d="M52.037,46.499c0,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,45.462,52.037,45.926,52.037,46.499z" fill="url(#SVGID_49_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_50_" x1="49.833" x2="49.833" y1="11.5854" y2="6.285">
 <stop offset="0" style="stop-color:#CBCBCB"/>
 <stop offset="0.1576" style="stop-color:#808080"/>
 <stop offset="0.6545" style="stop-color:#E5E5E5"/>
 <stop offset="1" style="stop-color:#4F4F4F"/>
 </linearGradient>
-<rect fill="url(#SVGID_50_)" height="4.286" width="5.51" x="42.857" y="11.327"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_51_" x1="35.8164" x2="35.8164" y1="14.252" y2="11.8675">
+<rect fill="url(#SVGID_50_)" height="5.443" width="6.999" x="46.333" y="6.444"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_51_" x1="37.3877" x2="37.3877" y1="10.1592" y2="7.1295">
 <stop offset="0" style="stop-color:#CBCBCB"/>
 <stop offset="0.1576" style="stop-color:#808080"/>
 <stop offset="0.6545" style="stop-color:#E5E5E5"/>
 <stop offset="1" style="stop-color:#4F4F4F"/>
 </linearGradient>
-<rect fill="url(#SVGID_51_)" height="2.449" width="14.082" x="28.775" y="11.939"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_52_" x1="21.4282" x2="21.4282" y1="13.7075" y2="12.5151">
+<rect fill="url(#SVGID_51_)" height="3.111" width="17.89" x="28.443" y="7.221"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_52_" x1="19.1104" x2="19.1104" y1="9.4683" y2="7.9534">
 <stop offset="0" style="stop-color:#CBCBCB"/>
 <stop offset="0.1576" style="stop-color:#808080"/>
 <stop offset="0.6545" style="stop-color:#E5E5E5"/>
 <stop offset="1" style="stop-color:#4F4F4F"/>
 </linearGradient>
-<rect fill="url(#SVGID_52_)" height="1.225" width="14.694" x="14.082" y="12.551"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_53_" x1="13.1636" x2="13.1636" y1="14.252" y2="11.8675">
+<rect fill="url(#SVGID_52_)" height="1.556" width="18.666" x="9.777" y="7.999"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_53_" x1="8.6104" x2="8.6104" y1="10.1592" y2="7.1295">
 <stop offset="0" style="stop-color:#CBCBCB"/>
 <stop offset="0.1576" style="stop-color:#808080"/>
 <stop offset="0.6545" style="stop-color:#E5E5E5"/>
 <stop offset="1" style="stop-color:#4F4F4F"/>
 </linearGradient>
-<rect fill="url(#SVGID_53_)" height="2.449" width="1.836" x="12.245" y="11.939"/>
-<path d="M45.612,15.306c-1.013,0-1.837-0.825-1.837-1.837c0-1.013,0.824-1.836,1.837-1.836  c1.012,0,1.837,0.824,1.837,1.836C47.449,14.481,46.624,15.306,45.612,15.306L45.612,15.306z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<circle cx="45.612" cy="13.469" fill-opacity="0.2" r="1.53" stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_54_" x1="45.6123" x2="45.6123" y1="12.5771" y2="14.3623">
+<rect fill="url(#SVGID_53_)" height="3.111" width="2.334" x="7.443" y="7.221"/>
+<path d="M49.832,11.498c-1.285,0-2.333-1.047-2.333-2.332c0-1.288,1.048-2.334,2.333-2.334s2.334,1.046,2.334,2.334  C52.166,10.451,51.117,11.498,49.832,11.498L49.832,11.498z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<circle cx="49.833" cy="9.166" fill-opacity="0.2" r="1.944" stroke-opacity="0.2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_54_" x1="49.8311" x2="49.8311" y1="8.0317" y2="10.2999">
 <stop offset="0" style="stop-color:#E5E5E5"/>
 <stop offset="0.7576" style="stop-color:#A7A7A7"/>
 <stop offset="1" style="stop-color:#CBCBCB"/>
 </linearGradient>
-<circle cx="45.612" cy="13.469" fill="url(#SVGID_54_)" r="1.225"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_55_" x1="45.6123" x2="45.6123" y1="12.2832" y2="14.6557">
+<circle cx="49.831" cy="9.166" fill="url(#SVGID_54_)" r="1.556"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_55_" x1="49.8311" x2="49.8311" y1="7.6592" y2="10.6737">
 <stop offset="0" style="stop-color:#FFFFFF"/>
 <stop offset="0.2848" style="stop-color:#FFFFFF"/>
 <stop offset="0.7212" style="stop-color:#7B7B7B"/>
 <stop offset="1" style="stop-color:#A7A7A7"/>
 </linearGradient>
-<path d="M45.612,12.551c0.506,0,0.919,0.412,0.919,0.918c0,0.506-0.413,0.918-0.919,0.918  c-0.507,0-0.919-0.413-0.919-0.918C44.693,12.962,45.105,12.551,45.612,12.551 M45.612,12.245c-0.677,0-1.225,0.547-1.225,1.224  c0,0.676,0.548,1.225,1.225,1.225c0.676,0,1.225-0.549,1.225-1.225C46.837,12.792,46.288,12.245,45.612,12.245L45.612,12.245z" fill="url(#SVGID_55_)"/>
+<path d="M49.832,7.999C50.475,7.999,51,8.521,51,9.166c0,0.643-0.525,1.166-1.168,1.166  s-1.166-0.523-1.166-1.166C48.666,8.521,49.189,7.999,49.832,7.999 M49.832,7.61c-0.859,0-1.557,0.694-1.557,1.556  c0,0.858,0.697,1.556,1.557,1.556c0.857,0,1.555-0.697,1.555-1.556C51.387,8.305,50.689,7.61,49.832,7.61L49.832,7.61z" fill="url(#SVGID_55_)"/>
 <rect fill="none" height="60" width="60"/>
 </g>
-<g transform="matrix(0.5 0 0 0.5 30 30)">
-<path d="M30,54.705C16.376,54.705,5.294,43.623,5.294,30  C5.294,16.376,16.376,5.294,30,5.294c13.623,0,24.705,11.083,24.705,24.706C54.705,43.623,43.623,54.705,30,54.705L30,54.705z" style="opacity:0.6;enable-background:new    ;"/>
-<radialGradient cx="2.7217" cy="-242.9165" gradientTransform="matrix(0.618 0 0 -0.618 28.3176 -128.0637)" gradientUnits="userSpaceOnUse" id="SVGID_1__" r="48.9069">
+<g transform="matrix(1 0 0 1 30 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"/>
 </radialGradient>
-<circle cx="30" cy="30" r="22.941" style="fill:url(#SVGID_1__);"/>
-<path d="M52.122,28.744c-0.509-8.961-6.312-16.677-14.788-19.661l-1.032,0.169  l-5.995-1.147l-7.474,4.456l-0.281,1.878h-4.336l1.714,2.914l-4.643,3.787l-1.082,4.675l3.834,6.795l3.914-0.799l1.429,1.229  l1.117,0.111l0.738,2.883l-0.974,2.527l3.552,9.086h3.623l3.592-2.9v-1.185l0.947-1.47l0.783-0.4  c-0.199,0.303-0.512,0.998-0.512,0.998c-0.033,0.236,0.51,4.862,2.104,4.5c1.211-0.273,5.533-8.303,5.615-9.066  c0.164-1.51-0.658-2.134-1.162-2.37l-0.562-0.265l-2.58,2.587c-0.276,0.021-0.526,0.067-0.751,0.134v-2.147l2.802-2.737l1.426-4.595  l2.173-1.769l-0.477-0.866l1.639-1.578l-0.916-1.669l0.697,0.084l4.082,9.138l0.836-0.666c-0.025-0.447-0.074-0.887-0.125-1.329  L52.122,28.744z M30.275,18.466l-0.341-0.911h2.049l0.997,2.243h-1.484v-1.333H30.275z M37.035,22.983l1.637,2.388l0.111,0.286  l-1.677-1.013l-0.401-1.445L37.035,22.983z M39.496,27.155l0.494,0.494l-0.639,0.143l-0.145-0.177L39.496,27.155z M26.695,11.093  l1.041,1.611l-1.183,0.362l-0.462-0.263L26.695,11.093z" style="opacity:0.3;enable-background:new    ;"/>
-<path d="M30,7.059C17.331,7.059,7.059,17.331,7.059,30  c0,12.674,10.272,22.941,22.941,22.941c12.674,0,22.941-10.268,22.941-22.941C52.941,17.331,42.674,7.059,30,7.059z M30,51.176  C18.323,51.176,8.823,41.677,8.823,30c0-11.677,9.5-21.177,21.177-21.177c11.677,0,21.176,9.5,21.176,21.177  C51.176,41.677,41.677,51.176,30,51.176z" style="opacity:0.3;fill:url(#SVGID_2__);enable-background:new    ;"/>
-<radialGradient cx="182.1514" cy="-162.9028" gradientTransform="matrix(1.7647 0 0 -1.7647 -290.1173 -274.2362)" gradientUnits="userSpaceOnUse" id="SVGID_3__" r="15.4155">
+<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"/>
+</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"/>
 </radialGradient>
-<path d="M42.431,36.555l-2.388,2.391c0,0-1.443,0-1.511,0.572c-0.032,0.246-0.111,1.313-0.354,1.863  c-0.48,0.332-1.054,1.434-1.054,1.434s-0.298,2.129,1.296,1.768C40.004,44.224,44.883,37.707,42.431,36.555z" style="fill:url(#SVGID_3__);"/>
-<radialGradient cx="182.1514" cy="-162.9023" gradientTransform="matrix(1.7647 0 0 -1.7647 -290.1173 -274.2362)" gradientUnits="userSpaceOnUse" id="SVGID_4__" r="17.8322">
+<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"/>
 </radialGradient>
-<path d="M37.041,9.916c-0.392,0.148-0.66,0.25-0.66,0.25L30.48,9.037l-2.894,1.811l1.523,2.356  l-2.663,0.819l-1.435-0.819l0.504-1.431l-1.871,1.295l-0.333,2.255h-3.554l1.314,2.238l-4.996,4.073l-0.94,4.066l1.855,3.591  L18.104,30l3.914-0.799l1.43,1.228l1.299,0.127l1.414,5.53l-0.941,2.446l2.079,4.595l0.585,1.908h3.623l2.048-1.108l1.543-1.793  v-2.169l2.936-1.498v-3.213l1.16-2.208l2.59-2.329l0.619-2.7l-3.387,0.755l-0.891-1.085l0.633-1.013l-2.404-1.454l-1.025-3.687  l1.776-1.158l1.636,2.388l0.613,1.572l1.228,1.229l1.435,0.75l1.594-0.258l1.77-1.703l-1.246-2.273l-1.568,0.409L41.146,20.8  l1.349-0.94l4.23,0.512v1.505l3.681,7.585l0.837-0.669C50.746,20.045,44.965,12.704,37.041,9.916z M35.119,20.169l-1.932,0.512  h-2.573v-1.333h-2.46l-1.946,0.514l-2.966-0.821l-0.821-1.535l4.096-0.921h4.098L30,14.945h2.049l1.14,2.561l1.933,0.678v1.985  H35.119z M39.523,16.79l-3.482-0.616v-1.228l1.741-0.41l0.512-0.614l1.229,1.023L39.523,16.79L39.523,16.79z" style="fill:url(#SVGID_4__);"/>
-<rect height="60" style="fill:none;" width="60"/>
-<defs>
-<linearGradient gradientTransform="matrix(1.7647 0 0 -1.7647 -290.1173 -274.2362)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="181.4004" x2="181.4004" y1="-159.4634" y2="-185.5335">
-<stop offset="0" style="stop-color:#31A7F8"/>
-<stop offset="0.497" style="stop-color:#1E74DC"/>
-<stop offset="1" style="stop-color:#C8E4EB"/>
-</linearGradient>
-</defs>
+<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>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_java.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_java.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<g>
+<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"/>
+</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"/>
+<path d="M27.491,4.152c3.781,0,7.693,2.99,7.918,6.729c0.012-0.124,0.021-0.252,0.021-0.383  c0-3.896-4.045-7.063-7.939-7.063s-7.937,3.168-7.937,7.063c0,0.131,0.01,0.258,0.021,0.383C19.8,7.143,23.71,4.152,27.491,4.152z" fill="#FFFFFF" fill-opacity="0.75" stroke-opacity="0.75"/>
+<path d="M30.683,43.608v0.718c1.882-1.107,3.873-2.295,3.873-4.523c0-0.113-0.014-0.225-0.021-0.336  C34.32,41.452,32.454,42.566,30.683,43.608z" fill="#FFFFFF" fill-opacity="0.75" stroke-opacity="0.75"/>
+<path d="M9.003,30.055c2.592,0,3.975,2.285,5.186,4.378h1.452v-0.718h-1.452  c-1.211-2.092-2.594-4.378-5.186-4.378C5.136,29.337,2,33.348,2,37.217c0,0.119,0.013,0.238,0.019,0.358  C2.203,33.822,5.256,30.055,9.003,30.055z" fill="#FFFFFF" fill-opacity="0.75" stroke-opacity="0.75"/>
+<path d="M51.063,18.041H31.026v0.717h20.037c1.447,0,2.629,1.184,2.629,2.626v-0.718  C53.692,19.224,52.511,18.041,51.063,18.041z" fill="#FFFFFF" fill-opacity="0.75" stroke-opacity="0.75"/>
+<path d="M20.612,39.467c-0.008,0.111-0.021,0.223-0.021,0.336c0,2.229,1.993,3.422,3.883,4.525V43.61  C22.696,42.572,20.827,41.453,20.612,39.467z" fill="#FFFFFF" fill-opacity="0.75" stroke-opacity="0.75"/>
+<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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+<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"/>
+</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>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_just_audio.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,73 +1,77 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<linearGradient gradientTransform="matrix(1 0 0 1 2296.5195 1443.9805)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2266.519" x2="-2266.519" y1="-1432.3472" y2="-1395.6118">
+<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="M51.734,11.633H8.266c-0.678,0-1.225,0.549-1.225,1.225v34.285c0,0.678,0.547,1.226,1.225,1.226  h43.468c0.677,0,1.226-0.548,1.226-1.226V12.857C52.959,12.182,52.41,11.633,51.734,11.633z M12.551,45.918  c0,0.338-0.275,0.613-0.611,0.613H9.49c-0.338,0-0.613-0.275-0.613-0.613v-1.225c0-0.336,0.275-0.611,0.613-0.611h2.449  c0.336,0,0.611,0.275,0.611,0.611L12.551,45.918L12.551,45.918z M12.551,15.307c0,0.336-0.275,0.611-0.611,0.611H9.49  c-0.338,0-0.613-0.275-0.613-0.611v-1.225c0-0.336,0.275-0.613,0.613-0.613h2.449c0.336,0,0.611,0.277,0.611,0.613L12.551,15.307  L12.551,15.307z M18.061,45.918c0,0.338-0.275,0.613-0.611,0.613H15c-0.338,0-0.612-0.275-0.612-0.613v-1.225  c0-0.336,0.274-0.611,0.612-0.611h2.449c0.336,0,0.611,0.275,0.611,0.611L18.061,45.918L18.061,45.918z M18.061,15.307  c0,0.336-0.275,0.611-0.611,0.611H15c-0.338,0-0.612-0.275-0.612-0.611v-1.225c0-0.336,0.274-0.613,0.612-0.613h2.449  c0.336,0,0.611,0.277,0.611,0.613L18.061,15.307L18.061,15.307z M23.571,45.918c0,0.338-0.276,0.613-0.612,0.613H20.51  c-0.336,0-0.611-0.275-0.611-0.613v-1.225c0-0.336,0.274-0.611,0.611-0.611h2.449c0.336,0,0.612,0.275,0.612,0.611V45.918z   M23.571,15.307c0,0.336-0.276,0.611-0.612,0.611H20.51c-0.336,0-0.611-0.275-0.611-0.611v-1.225c0-0.336,0.274-0.613,0.611-0.613  h2.449c0.336,0,0.612,0.277,0.612,0.613V15.307z M29.082,45.918c0,0.338-0.276,0.613-0.613,0.613h-2.448  c-0.337,0-0.612-0.275-0.612-0.613v-1.225c0-0.336,0.275-0.611,0.612-0.611h2.448c0.337,0,0.613,0.275,0.613,0.611V45.918z   M29.082,15.307c0,0.336-0.276,0.611-0.613,0.611h-2.448c-0.337,0-0.612-0.275-0.612-0.611v-1.225c0-0.336,0.275-0.613,0.612-0.613  h2.448c0.337,0,0.613,0.277,0.613,0.613V15.307z M34.592,45.918c0,0.338-0.275,0.613-0.611,0.613h-2.448  c-0.339,0-0.613-0.275-0.613-0.613v-1.225c0-0.336,0.274-0.611,0.613-0.611h2.448c0.336,0,0.611,0.275,0.611,0.611V45.918z   M34.592,15.307c0,0.336-0.275,0.611-0.611,0.611h-2.448c-0.339,0-0.613-0.275-0.613-0.611v-1.225c0-0.336,0.274-0.613,0.613-0.613  h2.448c0.336,0,0.611,0.277,0.611,0.613V15.307z M40.102,45.918c0,0.338-0.274,0.613-0.61,0.613h-2.449  c-0.338,0-0.612-0.275-0.612-0.613v-1.225c0-0.336,0.274-0.611,0.612-0.611h2.449c0.336,0,0.61,0.275,0.61,0.611V45.918z   M40.102,15.307c0,0.336-0.274,0.611-0.61,0.611h-2.449c-0.338,0-0.612-0.275-0.612-0.611v-1.225c0-0.336,0.274-0.613,0.612-0.613  h2.449c0.336,0,0.61,0.277,0.61,0.613V15.307z M45.611,45.918c0,0.338-0.275,0.613-0.611,0.613h-2.449  c-0.337,0-0.611-0.275-0.611-0.613v-1.225c0-0.336,0.274-0.611,0.611-0.611H45c0.336,0,0.611,0.275,0.611,0.611V45.918z   M45.611,15.307c0,0.336-0.275,0.611-0.611,0.611h-2.449c-0.337,0-0.611-0.275-0.611-0.611v-1.225c0-0.336,0.274-0.613,0.611-0.613  H45c0.336,0,0.611,0.277,0.611,0.613V15.307z M51.123,45.918c0,0.338-0.277,0.613-0.613,0.613h-2.449  c-0.336,0-0.61-0.275-0.61-0.613v-1.225c0-0.336,0.274-0.611,0.61-0.611h2.449c0.336,0,0.613,0.275,0.613,0.611V45.918z   M51.123,15.307c0,0.336-0.277,0.611-0.613,0.611h-2.449c-0.336,0-0.61-0.275-0.61-0.611v-1.225c0-0.336,0.274-0.613,0.61-0.613  h2.449c0.336,0,0.613,0.277,0.613,0.613V15.307z" fill="url(#SVGID_1_)"/>
-<path d="M51.734,11.633H8.266c-0.678,0-1.225,0.549-1.225,1.225v0.611  c0-0.676,0.547-1.225,1.225-1.225h43.468c0.677,0,1.226,0.549,1.226,1.225v-0.611C52.959,12.182,52.41,11.633,51.734,11.633z" fill="#FFFFFF" fill-opacity="0.55" stroke-opacity="0.55"/>
-<path d="M8.266,48.367h43.468c0.677,0,1.226-0.547,1.226-1.225v-0.611  c0,0.676-0.549,1.225-1.226,1.225H8.266c-0.678,0-1.225-0.549-1.225-1.225v0.611C7.041,47.82,7.588,48.367,8.266,48.367z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
-<linearGradient gradientTransform="matrix(1 0 0 1 2296.5195 1443.9805)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2266.5195" x2="-2266.5195" y1="-1426.1284" y2="-1401.6362">
+<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="24.492" width="45.918" x="7.041" y="17.754"/>
-<linearGradient gradientTransform="matrix(1 0 0 1 2296.5195 1443.9805)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2266.519" x2="-2266.519" y1="-1401.7349" y2="-1426.2271">
+<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="M51.123,41.021c0,0.674-0.553,1.225-1.225,1.225H10.102c-0.673,0-1.225-0.551-1.225-1.225V18.979  c0-0.672,0.552-1.225,1.225-1.225h39.796c0.672,0,1.226,0.553,1.226,1.225L51.123,41.021L51.123,41.021z" fill="url(#SVGID_3_)"/>
-<path d="M49.898,41.021H10.102c-0.673,0-1.225,0.061-1.225-0.613l0,0  c0,0.674,0.552,1.225,1.225,1.225h39.796c0.672,0,1.226-0.551,1.226-1.225l0,0C51.123,41.082,50.57,41.021,49.898,41.021z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
-<linearGradient gradientTransform="matrix(1 0 0 1 2296.5195 1443.9805)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-2266.519" x2="-2266.519" y1="-1426.2261" y2="-1401.6362">
+<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="M49.898,18.367c0.336,0,0.61,0.275,0.61,0.611v22.043c0,0.338-0.274,0.61-0.61,0.61H10.102  c-0.337,0-0.611-0.272-0.611-0.61V18.979c0-0.336,0.274-0.611,0.611-0.611L49.898,18.367 M49.898,17.754H10.102  c-0.673,0-1.225,0.553-1.225,1.225v22.042c0,0.674,0.552,1.226,1.225,1.226h39.796c0.672,0,1.226-0.552,1.226-1.226V18.979  C51.123,18.307,50.57,17.754,49.898,17.754L49.898,17.754z" fill="url(#SVGID_4_)"/>
-<path d="M49.898,25.102v-4.898c0-0.676-0.549-1.225-1.226-1.225H11.326  c-0.676,0-1.225,0.549-1.225,1.225v7.961L49.898,25.102z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
+<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(0.5 0 0 0.5 30 30)">
-<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"/>
+<g transform="matrix(1 0 0 1 30 30)">
+<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="M48.631,13.079l-3.08-7.497L27.85,13.46l0.028,23.917c-2.712-1.771-6.708-2.354-10.768-1.254 c-6.405,1.725-10.542,6.951-9.247,11.665c1.3,4.718,7.543,7.142,13.944,5.415c5.412-1.461,9.159-5.324,9.138-9.451 c-0.018-4.129,0.033-15.338,0-23.445L48.631,13.079z" 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"/>
+<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="27.878,33.26 27.857,13.46 27.85,13.46 27.872,33.258 "/>
-<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"/>
+<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="M30.945,19.08c0.007,1.306,0.01-0.201,0.012,1.223l17.674-7.225l-0.436-1.108L30.945,19.08z" 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"/>
+<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="28.142,38.062 28.142,14.143 45.891,6.413 45.551,5.582 27.454,13.46 27.454,37.378 "/>
-<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"/>
+<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="M17.625,52.389c-4.258,0.021-7.653-1.941-8.447-4.885c-0.484-1.785,0.028-3.761,1.444-5.555 c1.55-1.964,3.944-3.454,6.747-4.191c1.187-0.317,2.386-0.477,3.573-0.484c4.258-0.021,7.651,1.943,8.45,4.885 c1.058,3.9-2.618,8.272-8.196,9.748C20.012,52.221,18.808,52.381,17.625,52.389L17.625,52.389z" fill="url(#SVGID_5)"/>
-<rect fill="none" height="59.996" width="59.996"/>
+<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>
 <g transform="matrix(1 0 0 1 30 30)">
-<linearGradient gradientTransform="matrix(1 0 0 -1 -257 -316)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="261.2295" x2="282.7705" y1="-330.6934" y2="-330.6934">
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_1__)" points="24.702,25.229 4.229,5.254 5.299,4.158 25.771,24.133 "/>
-<rect fill="none" height="30" width="30.001"/>
+<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"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_key_screen.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,149 +1,153 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
 <rect fill="none" height="60" width="60"/>
-<rect fill="none" height="59.996" width="59.996"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="29.69" x2="29.69" y1="7.35" y2="51.92">
-<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"/>
+<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"/>
 </linearGradient>
-<path d="M44.078,49.588c0,1.353-1.096,2.449-2.449,2.449H17.754c-1.353,0-2.449-1.097-2.449-2.449 V9.795c0-1.353,1.096-2.449,2.449-2.449h23.875c1.354,0,2.449,1.097,2.449,2.449V49.588z" fill="url(#SVGID_1)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="29.69" x2="29.69" y1="7.35" y2="51.16">
-<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"/>
+<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"/>
 </linearGradient>
-<path d="M41.629,7.346H17.754c-1.353,0-2.449,1.097-2.449,2.449v39.792 c0,0.652,0.26,1.244,0.676,1.684c-0.037-0.148-0.064-0.3-0.064-0.459v-1.225V11.02V9.795c0-1.013,0.824-1.837,1.837-1.837h23.875 c1.014,0,1.838,0.824,1.838,1.837v1.224v38.568v1.225c0,0.159-0.027,0.311-0.064,0.459c0.416-0.439,0.676-1.031,0.676-1.684V9.795 C44.078,8.443,42.982,7.346,41.629,7.346z" fill="url(#SVGID_2)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="29.69" x2="29.69" y1="10.45" y2="40.41">
-<stop offset="0" stop-color="#B6BBBD"/>
-<stop offset="1" stop-color="#F0FBFF"/>
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_3)" fill-opacity="0.6" height="29.998" stroke-opacity="0.6" width="25.101" x="17.142" y="10.407"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="29.69" x2="29.69" y1="11.06" y2="39.8">
-<stop offset="0" stop-color="#6E6E6E"/>
-<stop offset="1" stop-color="#333333"/>
+<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">
+<stop offset="0" style="stop-color:#6E6E6E"/>
+<stop offset="1" style="stop-color:#333333"/>
+</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"/>
 </linearGradient>
-<rect fill="url(#SVGID_4)" height="28.773" width="23.875" x="17.754" y="11.02"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="29.69" x2="29.69" y1="11.67" y2="39.18">
-<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"/>
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_5)" height="27.549" width="22.651" x="18.366" y="11.632"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6" x1="29.69" x2="29.69" y1="12.11" y2="23.06">
-<stop offset="0" stop-color="#85EFFF"/>
-<stop offset="1" stop-color="#3BA1D9"/>
+<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"/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_6)" points="41.018,21.427 18.366,23.876 18.366,12.244 41.018,12.244 "/>
-<rect fill="#9FE4FF" height="0.612" width="22.651" x="18.366" y="11.632"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7" x1="29.87" x2="29.87" y1="10.44" y2="7.99">
-<stop offset="0" stop-color="#FFFFFF"/>
-<stop offset="1" stop-color="#D1D7D9"/>
+<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"/>
 </linearGradient>
-<path d="M27.163,10.407c-0.686,0-1.224-0.448-1.224-1.02V8.979c0-0.573,0.538-1.021,1.224-1.021h5.416 c0.687,0,1.225,0.448,1.225,1.021v0.408c0,0.572-0.538,1.02-1.225,1.02H27.163z" fill="url(#SVGID_7)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8" x1="29.87" x2="29.87" y1="8.32" y2="9.9">
-<stop offset="0" stop-color="#6C7375"/>
-<stop offset="1" stop-color="#BDC2C4"/>
+<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="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"/>
 </linearGradient>
-<path d="M33.19,9.388c0,0.226-0.273,0.408-0.612,0.408h-5.416c-0.338,0-0.612-0.182-0.612-0.408V8.979 c0-0.226,0.274-0.409,0.612-0.409h5.416c0.339,0,0.612,0.183,0.612,0.409V9.388z" fill="url(#SVGID_8)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9" x1="29.6" x2="29.6" y1="41.04" y2="50.14">
-<stop offset="0" stop-color="#B6BBBD"/>
-<stop offset="1" stop-color="#FFFFFF"/>
+<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"/>
 </linearGradient>
-<path d="M27.384,50.2c-1.312,0-2.378-1.058-2.378-2.354v-4.475 c0-1.299,1.066-2.354,2.378-2.354h4.425c1.313,0,2.38,1.056,2.38,2.354v4.475c0,1.297-1.066,2.354-2.38,2.354H27.384z" fill="url(#SVGID_9)" fill-opacity="0.6" stroke-opacity="0.6"/>
-<path d="M27.382,49.588c-0.972,0-1.764-0.78-1.764-1.742v-4.475 c0-0.961,0.792-1.742,1.764-1.742h4.432c0.973,0,1.763,0.781,1.763,1.742v4.475c0,0.96-0.79,1.742-1.763,1.742H27.382z" fill="#020202" fill-opacity="0.5" stroke-opacity="0.5"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10" x1="29.6" x2="29.6" y1="42.21" y2="48.99">
-<stop offset="0" stop-color="#A6A8AB"/>
-<stop offset="0.7" stop-color="#58595B"/>
-<stop offset="1" stop-color="#808184"/>
+<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"/>
 </linearGradient>
-<path d="M32.965,47.846c0,0.625-0.514,1.131-1.146,1.131h-4.443c-0.632,0-1.146-0.506-1.146-1.131 v-4.475c0-0.624,0.514-1.13,1.146-1.13h4.443c0.632,0,1.146,0.506,1.146,1.13V47.846z" fill="url(#SVGID_10)"/>
-<path d="M28.679,47.752c-0.675,0-1.225-0.549-1.225-1.225V44.69 c0-0.676,0.549-1.224,1.225-1.224h1.836c0.676,0,1.225,0.548,1.225,1.224v1.837c0,0.676-0.549,1.225-1.225,1.225H28.679z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11" x1="29.6" x2="29.6" y1="44.06" y2="47.14">
-<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"/>
+<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"/>
 </linearGradient>
-<path d="M28.679,47.14c-0.337,0-0.612-0.274-0.612-0.612V44.69c0-0.336,0.275-0.612,0.612-0.612 h1.836c0.338,0,0.612,0.276,0.612,0.612v1.837c0,0.338-0.274,0.612-0.612,0.612H28.679z" fill="url(#SVGID_11)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12" x1="19.85" x2="19.85" y1="41.59" y2="48.99">
-<stop offset="0" stop-color="#B6BBBD"/>
-<stop offset="1" stop-color="#F0FBFF"/>
+<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"/>
 </linearGradient>
-<path d="M19.496,48.977c-1.297,0-2.354-1.058-2.354-2.355 v-2.638c0-1.296,1.057-2.354,2.354-2.354h0.707c1.298,0,2.354,1.059,2.354,2.355v2.638c0,1.297-1.057,2.354-2.354,2.354H19.496z" fill="url(#SVGID_12)" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13" x1="19.85" x2="19.85" y1="42.21" y2="48.37">
-<stop offset="0" stop-color="#231F20"/>
-<stop offset="1" stop-color="#6D6E70"/>
+<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"/>
 </linearGradient>
-<path d="M19.496,48.363c-0.962,0-1.742-0.78-1.742-1.742 v-2.638c0-0.961,0.78-1.741,1.742-1.741h0.707c0.96,0,1.742,0.78,1.742,1.742v2.638c0,0.961-0.782,1.741-1.742,1.741H19.496z" fill="url(#SVGID_13)" fill-opacity="0.7" stroke-opacity="0.7"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14" x1="19.85" x2="19.85" y1="42.83" y2="47.76">
-<stop offset="0" stop-color="#C6FF45"/>
-<stop offset="0.73" stop-color="#66A00E"/>
-<stop offset="1" stop-color="#387300"/>
+<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"/>
 </linearGradient>
-<path d="M21.333,46.621c0,0.625-0.505,1.131-1.13,1.131h-0.707c-0.624,0-1.13-0.506-1.13-1.131 v-2.638c0-0.624,0.506-1.13,1.13-1.13h0.707c0.625,0,1.13,0.506,1.13,1.131V46.621z" fill="url(#SVGID_14)"/>
-<path d="M38.654,48.977c-1.299,0-2.355-1.058-2.355-2.355 v-2.638c0-1.298,1.057-2.354,2.355-2.354h0.705c1.298,0,2.355,1.057,2.355,2.354v2.638c0,1.298-1.058,2.355-2.355,2.355H38.654z" fill="url(#SVGID_12)" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M38.654,48.363c-0.962,0-1.744-0.78-1.744-1.742 v-2.638c0-0.961,0.781-1.742,1.744-1.742h0.705c0.961,0,1.743,0.78,1.743,1.742v2.638c0,0.961-0.782,1.742-1.743,1.742H38.654z" fill="url(#SVGID_13)" fill-opacity="0.7" stroke-opacity="0.7"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17" x1="39.01" x2="39.01" y1="42.83" y2="47.76">
-<stop offset="0" stop-color="#FFC142"/>
-<stop offset="0.75" stop-color="#CF4E18"/>
-<stop offset="1" stop-color="#B52100"/>
+<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"/>
 </linearGradient>
-<path d="M40.49,46.621c0,0.625-0.507,1.131-1.131,1.131h-0.705c-0.625,0-1.131-0.506-1.131-1.131 v-2.638c0-0.624,0.506-1.13,1.131-1.13h0.705c0.624,0,1.131,0.506,1.131,1.13V46.621z" fill="url(#SVGID_17)"/>
+<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)">
-<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"/>
+<path d="M0,30v-30h30v30h-30zm23.6-3.75l-8.732-8.732-8.736,8.73h17.46zm2.65-2.65v-17.47l-8.732,8.732,8.73,8.73zm-22.5-0.27l8.465-8.465-8.47-8.459v16.93zm11.12-11.11l8.46-8.47h-16.93l8.468,8.47z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="15" x2="15" y1="0.9941" y2="29.19">
+<stop offset="0" stop-color="#E6E6E6"/>
+<stop offset="0.6182" stop-color="#A8A8A8"/>
+<stop offset="1" 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"/>
+<path d="M0.938,0.938v28.12h28.12v-28.12h-28.12zm12.6,13.93l-10.73,10.73v-21.46l10.73,10.73zm-9.401-12.06h21.46l-10.72,10.73-10.73-10.73zm10.73,13.38l11,11h-22l11-11zm1.32-1.32l11-11v21.99l-11-10.99z" fill="url(#SVGID_1__)"/>
+<polygon fill-opacity="0.6" points="8.547,25.31,7.61,17.81,5.625,17.81,5.625,12.2,24.38,12.2,24.38,17.81,22.39,17.81,21.45,25.31" stroke-opacity="0.6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="15" x2="15" y1="12.1" y2="23.99">
+<stop offset="0" stop-color="#A0F800"/>
+<stop offset="1" 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_)"/>
+<polygon fill="url(#SVGID_2__)" points="6.563,13.14,6.563,16.88,8.438,16.88,9.375,24.38,20.62,24.38,21.56,16.88,23.44,16.88,23.44,13.14"/>
+<path d="M13.12,14.06v-2.886c-0.348,0.048-0.692,0.073-1.03,0.073-0.804,0-1.568-0.139-2.272-0.414-3.952-1.536-3.863-4.501-3.858-4.626l0.019-0.408,0.312-0.265c0.103-0.088,1.06-0.855,2.881-0.855,0.958,0,1.99,0.212,3.066,0.632,1.3,0.506,2.174,1.126,2.762,1.716,0.588-0.589,1.462-1.209,2.762-1.716,1.076-0.42,2.108-0.632,3.066-0.632,1.82,0,2.777,0.767,2.881,0.855l0.313,0.265,0.019,0.408c0.005,0.125,0.094,3.091-3.862,4.632-0.704,0.275-1.469,0.414-2.272,0.414-0.338,0-0.683-0.025-1.03-0.073v2.886h-3.755z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M10.16,9.963c1.436,0.559,2.896,0.346,3.899,0.057v3.105h1.875v-3.1c1.003,0.289,2.464,0.502,3.899-0.057,3.375-1.316,3.267-3.717,3.267-3.717s-1.627-1.379-5.002-0.064c-1.87,0.725-2.72,1.667-3.11,2.369-0.392-0.702-1.242-1.644-3.102-2.369-3.377-1.316-5.004,0.064-5.004,0.064s-0.108,2.401,3.264,3.717z" 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 gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="15" x2="15" y1="4.922" y2="12.87">
+<stop offset="0" stop-color="#A0F800"/>
+<stop offset="1" 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 gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="15" x2="15" y1="12.55" y2="17.37">
+<stop offset="0" stop-color="#D07100"/>
+<stop offset="1" 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"/>
+<rect fill="url(#SVGID_4__)" height="3.738" width="16.88" x="6.563" y="13.14"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="15" x2="15" y1="16.84" y2="24.56">
+<stop offset="0" stop-color="#D07100"/>
+<stop offset="1" 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_)"/>
+<polygon fill="url(#SVGID_5__)" points="20.62,24.38,9.375,24.38,8.438,16.88,21.56,16.88"/>
+<path d="M23.1,6.246s-1.627-1.379-5.002-0.064c-1.86,0.725-2.71,1.667-3.1,2.369-0.392-0.702-1.242-1.644-3.102-2.369-3.377-1.316-5.004,0.064-5.004,0.064s-0.109,2.401,3.267,3.717c1.436,0.559,2.896,0.346,3.899,0.057v3.105h1.875v-3.1c1.003,0.289,2.464,0.502,3.899-0.057,3.37-1.316,3.26-3.717,3.26-3.717z" 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"/>
+<path d="M14.06,9.082c-1.003,0.289-2.464,0.502-3.899-0.057-2.1-0.82-2.85-2.062-3.118-2.881-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.057v-0.938z"/>
+<path d="M22.96,6.144c-0.268,0.819-1.018,2.061-3.121,2.881-1.436,0.559-2.896,0.346-3.899,0.057v0.938c1.003,0.289,2.464,0.502,3.899-0.057,3.375-1.316,3.267-3.717,3.267-3.717s-0.06-0.042-0.15-0.102z"/>
+<rect height="0.938" width="1.875" x="14.06" y="12.19"/>
 </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>
+<rect fill="#FFFFFF" fill-opacity="0.3" height="0.926" stroke-opacity="0.3" width="16.88" x="6.563" y="13.14"/>
+<polygon fill-opacity="0.2" points="21.44,17.81,21.56,16.88,8.438,16.88,8.555,17.81" stroke-opacity="0.2"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_keyboard.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_keyboard.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_keyboard.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,380 +1,381 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.9995" x2="29.9995" y1="16.686" y2="43.3949">
+<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"/>
 </linearGradient>
-<path d="M5,41.538c0,0.977,0.787,1.775,1.751,1.775h46.497c0.963,0,1.752-0.799,1.752-1.775  V18.461c0-0.976-0.789-1.775-1.752-1.775H6.751C5.787,16.686,5,17.485,5,18.461V41.538z" fill="url(#SVGID_1_)" fill-opacity="0.6" stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="29.9995" x2="29.9995" y1="17.5742" y2="42.5028">
+<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"/>
 </linearGradient>
-<path d="M53.248,42.427H6.751c-0.478,0-0.864-0.398-0.864-0.889V18.461c0-0.488,0.387-0.887,0.864-0.887  h46.497c0.477,0,0.864,0.399,0.864,0.887v23.077C54.112,42.028,53.725,42.427,53.248,42.427L53.248,42.427z" fill="url(#SVGID_2_)"/>
-<path d="M23.061,35.278c0,0.49-0.396,0.889-0.887,0.889h-2.663c-0.489,0-0.888-0.398-0.888-0.889v-2.662  c0-0.49,0.398-0.889,0.888-0.889h2.663c0.49,0,0.887,0.398,0.887,0.889V35.278z" fill-opacity="0.25" stroke-opacity="0.25"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="20.8418" x2="20.8418" y1="31.2266" y2="35.7055">
+<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"/>
 </linearGradient>
-<path d="M23.061,34.798c0,0.49-0.396,0.887-0.887,0.887h-2.663c-0.489,0-0.888-0.396-0.888-0.887v-2.662  c0-0.49,0.398-0.889,0.888-0.889h2.663c0.49,0,0.887,0.398,0.887,0.889V34.798z" fill="url(#SVGID_3_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="22.6729" x2="19.0852" y1="33.4658" y2="33.4658">
+<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"/>
 </linearGradient>
-<path d="M19.511,35.241c-0.245,0-0.444-0.199-0.444-0.443v-2.662c0-0.246,0.199-0.445,0.444-0.445h2.663  c0.244,0,0.443,0.199,0.443,0.445v2.662c0,0.244-0.199,0.443-0.443,0.443H19.511z" fill="url(#SVGID_4_)"/>
-<path d="M28.387,35.278c0,0.49-0.398,0.889-0.888,0.889h-2.663c-0.49,0-0.887-0.398-0.887-0.889v-2.662  c0-0.49,0.396-0.889,0.887-0.889h2.663c0.489,0,0.888,0.398,0.888,0.889V35.278z" fill-opacity="0.25" stroke-opacity="0.25"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="26.168" x2="26.168" y1="31.2266" y2="35.7055">
+<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"/>
 </linearGradient>
-<path d="M28.387,34.798c0,0.49-0.398,0.887-0.888,0.887h-2.663c-0.49,0-0.887-0.396-0.887-0.887v-2.662  c0-0.49,0.396-0.889,0.887-0.889h2.663c0.489,0,0.888,0.398,0.888,0.889V34.798z" fill="url(#SVGID_5_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="27.999" x2="24.4114" y1="33.4658" y2="33.4658">
+<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"/>
 </linearGradient>
-<path d="M24.836,35.241c-0.244,0-0.443-0.199-0.443-0.443v-2.662c0-0.246,0.199-0.445,0.443-0.445h2.663  c0.245,0,0.444,0.199,0.444,0.445v2.662c0,0.244-0.199,0.443-0.444,0.443H24.836z" fill="url(#SVGID_6_)"/>
-<path d="M33.712,35.278c0,0.49-0.397,0.889-0.888,0.889h-2.662c-0.49,0-0.889-0.398-0.889-0.889v-2.662  c0-0.49,0.398-0.889,0.889-0.889h2.662c0.49,0,0.888,0.398,0.888,0.889V35.278z" fill-opacity="0.25" stroke-opacity="0.25"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="31.4932" x2="31.4932" y1="31.2266" y2="35.7055">
+<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"/>
 </linearGradient>
-<path d="M33.712,34.798c0,0.49-0.397,0.887-0.888,0.887h-2.662c-0.49,0-0.889-0.396-0.889-0.887v-2.662  c0-0.49,0.398-0.889,0.889-0.889h2.662c0.49,0,0.888,0.398,0.888,0.889V34.798z" fill="url(#SVGID_7_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="33.3232" x2="29.7371" y1="33.4658" y2="33.4658">
+<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"/>
 </linearGradient>
-<path d="M30.162,35.241c-0.245,0-0.444-0.199-0.444-0.443v-2.662c0-0.246,0.199-0.445,0.444-0.445h2.662  c0.246,0,0.443,0.199,0.443,0.445v2.662c0,0.244-0.197,0.443-0.443,0.443H30.162z" fill="url(#SVGID_8_)"/>
-<path d="M39.037,35.278c0,0.49-0.396,0.889-0.887,0.889h-2.662c-0.492,0-0.889-0.398-0.889-0.889v-2.662  c0-0.49,0.396-0.889,0.889-0.889h2.662c0.49,0,0.887,0.398,0.887,0.889V35.278z" fill-opacity="0.25" stroke-opacity="0.25"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="36.8184" x2="36.8184" y1="31.2266" y2="35.7055">
+<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"/>
 </linearGradient>
-<path d="M39.037,34.798c0,0.49-0.396,0.887-0.887,0.887h-2.662c-0.492,0-0.889-0.396-0.889-0.887v-2.662  c0-0.49,0.396-0.889,0.889-0.889h2.662c0.49,0,0.887,0.398,0.887,0.889V34.798z" fill="url(#SVGID_9_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="38.6494" x2="35.0618" y1="33.4658" y2="33.4658">
+<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"/>
 </linearGradient>
-<path d="M35.488,35.241c-0.246,0-0.445-0.199-0.445-0.443v-2.662c0-0.246,0.199-0.445,0.445-0.445h2.662  c0.244,0,0.443,0.199,0.443,0.445v2.662c0,0.244-0.199,0.443-0.443,0.443H35.488z" fill="url(#SVGID_10_)"/>
-<path d="M17.551,35.278c0,0.49-0.396,0.889-0.887,0.889H8.787c-0.491,0-0.889-0.398-0.889-0.889v-2.662  c0-0.49,0.397-0.889,0.889-0.889h7.877c0.49,0,0.887,0.398,0.887,0.889V35.278z" fill-opacity="0.25" stroke-opacity="0.25"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="12.7246" x2="12.7246" y1="31.2266" y2="35.7055">
+<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"/>
 </linearGradient>
-<path d="M17.551,34.798c0,0.49-0.396,0.887-0.887,0.887H8.787c-0.491,0-0.889-0.396-0.889-0.887v-2.662  c0-0.49,0.397-0.889,0.889-0.889h7.877c0.49,0,0.887,0.398,0.887,0.889V34.798z" fill="url(#SVGID_11_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="17.2441" x2="8.3885" y1="33.4658" y2="33.4658">
+<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"/>
 </linearGradient>
-<path d="M8.787,35.241c-0.246,0-0.444-0.199-0.444-0.443v-2.662c0-0.246,0.198-0.445,0.444-0.445h7.877  c0.244,0,0.443,0.199,0.443,0.445v2.662c0,0.244-0.199,0.443-0.443,0.443H8.787z" fill="url(#SVGID_12_)"/>
-<path d="M23.061,24.904c0,0.491-0.396,0.888-0.887,0.888h-5.663c-0.489,0-0.888-0.396-0.888-0.888v-2.663  c0-0.49,0.398-0.888,0.888-0.888h5.663c0.49,0,0.887,0.398,0.887,0.888V24.904z" fill-opacity="0.25" stroke-opacity="0.25"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="19.3418" x2="19.3418" y1="20.854" y2="25.3329">
+<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"/>
 </linearGradient>
-<path d="M23.061,24.424c0,0.49-0.396,0.888-0.887,0.888h-5.663c-0.489,0-0.888-0.397-0.888-0.888v-2.662  c0-0.491,0.398-0.888,0.888-0.888h5.663c0.49,0,0.887,0.397,0.887,0.888V24.424z" fill="url(#SVGID_13_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="22.7197" x2="16.1009" y1="23.0928" y2="23.0928">
+<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"/>
 </linearGradient>
-<path d="M16.511,24.868c-0.245,0-0.444-0.199-0.444-0.444v-2.662c0-0.245,0.199-0.444,0.444-0.444h5.663  c0.244,0,0.443,0.199,0.443,0.444v2.662c0,0.245-0.199,0.444-0.443,0.444H16.511z" fill="url(#SVGID_14_)"/>
-<path d="M28.387,24.904c0,0.491-0.398,0.888-0.888,0.888h-2.663c-0.49,0-0.887-0.396-0.887-0.888v-2.663  c0-0.49,0.396-0.888,0.887-0.888h2.663c0.489,0,0.888,0.398,0.888,0.888V24.904z" fill-opacity="0.25" stroke-opacity="0.25"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="26.168" x2="26.168" y1="20.854" y2="25.3329">
+<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"/>
 </linearGradient>
-<path d="M28.387,24.424c0,0.49-0.398,0.888-0.888,0.888h-2.663c-0.49,0-0.887-0.397-0.887-0.888v-2.662  c0-0.491,0.396-0.888,0.887-0.888h2.663c0.489,0,0.888,0.397,0.888,0.888V24.424z" fill="url(#SVGID_15_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="27.999" x2="24.4114" y1="23.0928" y2="23.0928">
+<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"/>
 </linearGradient>
-<path d="M24.836,24.868c-0.244,0-0.443-0.199-0.443-0.444v-2.662c0-0.245,0.199-0.444,0.443-0.444h2.663  c0.245,0,0.444,0.199,0.444,0.444v2.662c0,0.245-0.199,0.444-0.444,0.444H24.836z" fill="url(#SVGID_16_)"/>
-<path d="M33.712,24.904c0,0.491-0.397,0.888-0.888,0.888h-2.662c-0.49,0-0.889-0.396-0.889-0.888v-2.663  c0-0.49,0.398-0.888,0.889-0.888h2.662c0.49,0,0.888,0.398,0.888,0.888V24.904z" fill-opacity="0.25" stroke-opacity="0.25"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="31.4932" x2="31.4932" y1="20.854" y2="25.3329">
+<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"/>
 </linearGradient>
-<path d="M33.712,24.424c0,0.49-0.397,0.888-0.888,0.888h-2.662c-0.49,0-0.889-0.397-0.889-0.888v-2.662  c0-0.491,0.398-0.888,0.889-0.888h2.662c0.49,0,0.888,0.397,0.888,0.888V24.424z" fill="url(#SVGID_17_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="33.3232" x2="29.7371" y1="23.0928" y2="23.0928">
+<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"/>
 </linearGradient>
-<path d="M30.162,24.868c-0.245,0-0.444-0.199-0.444-0.444v-2.662c0-0.245,0.199-0.444,0.444-0.444h2.662  c0.246,0,0.443,0.199,0.443,0.444v2.662c0,0.245-0.197,0.444-0.443,0.444H30.162z" fill="url(#SVGID_18_)"/>
-<path d="M39.037,24.904c0,0.491-0.396,0.888-0.887,0.888h-2.662c-0.492,0-0.889-0.396-0.889-0.888v-2.663  c0-0.49,0.396-0.888,0.889-0.888h2.662c0.49,0,0.887,0.398,0.887,0.888V24.904z" fill-opacity="0.25" stroke-opacity="0.25"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="36.8184" x2="36.8184" y1="20.854" y2="25.3329">
+<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"/>
 </linearGradient>
-<path d="M39.037,24.424c0,0.49-0.396,0.888-0.887,0.888h-2.662c-0.492,0-0.889-0.397-0.889-0.888v-2.662  c0-0.491,0.396-0.888,0.889-0.888h2.662c0.49,0,0.887,0.397,0.887,0.888V24.424z" fill="url(#SVGID_19_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="38.6494" x2="35.0618" y1="23.0928" y2="23.0928">
+<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"/>
 </linearGradient>
-<path d="M35.488,24.868c-0.246,0-0.445-0.199-0.445-0.444v-2.662c0-0.245,0.199-0.444,0.445-0.444h2.662  c0.244,0,0.443,0.199,0.443,0.444v2.662c0,0.245-0.199,0.444-0.443,0.444H35.488z" fill="url(#SVGID_20_)"/>
-<path d="M44.418,24.904c0,0.491-0.396,0.888-0.887,0.888h-2.663c-0.491,0-0.888-0.396-0.888-0.888v-2.663  c0-0.49,0.396-0.888,0.888-0.888h2.663c0.49,0,0.887,0.398,0.887,0.888V24.904z" fill-opacity="0.25" stroke-opacity="0.25"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="42.1992" x2="42.1992" y1="20.854" y2="25.3329">
+<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"/>
 </linearGradient>
-<path d="M44.418,24.424c0,0.49-0.396,0.888-0.887,0.888h-2.663c-0.491,0-0.888-0.397-0.888-0.888v-2.662  c0-0.491,0.396-0.888,0.888-0.888h2.663c0.49,0,0.887,0.397,0.887,0.888V24.424z" fill="url(#SVGID_21_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_22_" x1="44.0303" x2="40.4426" y1="23.0928" y2="23.0928">
+<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"/>
 </linearGradient>
-<path d="M40.868,24.868c-0.245,0-0.444-0.199-0.444-0.444v-2.662c0-0.245,0.199-0.444,0.444-0.444h2.663  c0.244,0,0.443,0.199,0.443,0.444v2.662c0,0.245-0.199,0.444-0.443,0.444H40.868z" fill="url(#SVGID_22_)"/>
-<path d="M52.102,24.904c0,0.491-0.397,0.888-0.888,0.888h-5.021c-0.49,0-0.887-0.396-0.887-0.888v-2.663  c0-0.49,0.396-0.888,0.887-0.888h5.021c0.49,0,0.888,0.398,0.888,0.888V24.904z" fill-opacity="0.25" stroke-opacity="0.25"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_23_" x1="48.7041" x2="48.7041" y1="20.854" y2="25.3329">
+<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"/>
 </linearGradient>
-<path d="M52.102,24.424c0,0.49-0.397,0.888-0.888,0.888h-5.021c-0.49,0-0.887-0.397-0.887-0.888v-2.662  c0-0.491,0.396-0.888,0.887-0.888h5.021c0.49,0,0.888,0.397,0.888,0.888V24.424z" fill="url(#SVGID_23_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_24_" x1="51.751" x2="45.7814" y1="23.0928" y2="23.0928">
+<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"/>
 </linearGradient>
-<path d="M46.193,24.868c-0.245,0-0.443-0.199-0.443-0.444v-2.662c0-0.245,0.198-0.444,0.443-0.444h5.021  c0.245,0,0.444,0.199,0.444,0.444v2.662c0,0.245-0.199,0.444-0.444,0.444H46.193z" fill="url(#SVGID_24_)"/>
-<path d="M46.775,30.063c0,0.49-0.397,0.889-0.888,0.889h-5.021c-0.49,0-0.887-0.398-0.887-0.889v-2.662  c0-0.49,0.396-0.889,0.887-0.889h5.021c0.49,0,0.888,0.398,0.888,0.889V30.063z" fill-opacity="0.25" stroke-opacity="0.25"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_25_" x1="43.3779" x2="43.3779" y1="26.0132" y2="30.4921">
+<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"/>
 </linearGradient>
-<path d="M46.775,29.583c0,0.49-0.397,0.888-0.888,0.888h-5.021c-0.49,0-0.887-0.397-0.887-0.888v-2.662  c0-0.49,0.396-0.888,0.887-0.888h5.021c0.49,0,0.888,0.397,0.888,0.888V29.583z" fill="url(#SVGID_25_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_26_" x1="46.4248" x2="40.4553" y1="28.252" y2="28.252">
+<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"/>
 </linearGradient>
-<path d="M40.867,30.026c-0.245,0-0.443-0.198-0.443-0.443v-2.662c0-0.245,0.198-0.443,0.443-0.443h5.021  c0.245,0,0.444,0.198,0.444,0.443v2.662c0,0.245-0.199,0.443-0.444,0.443H40.867z" fill="url(#SVGID_26_)"/>
-<path d="M14.551,24.904c0,0.491-0.396,0.888-0.887,0.888H8.787c-0.491,0-0.889-0.396-0.889-0.888v-2.663  c0-0.49,0.397-0.888,0.889-0.888h4.877c0.49,0,0.887,0.398,0.887,0.888V24.904z" fill-opacity="0.25" stroke-opacity="0.25"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_27_" x1="11.2246" x2="11.2246" y1="20.854" y2="25.3329">
+<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"/>
 </linearGradient>
-<path d="M14.551,24.424c0,0.49-0.396,0.888-0.887,0.888H8.787c-0.491,0-0.889-0.397-0.889-0.888v-2.662  c0-0.491,0.397-0.888,0.889-0.888h4.877c0.49,0,0.887,0.397,0.887,0.888V24.424z" fill="url(#SVGID_27_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_28_" x1="14.1973" x2="8.3728" y1="23.0928" y2="23.0928">
+<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"/>
 </linearGradient>
-<path d="M8.787,24.868c-0.246,0-0.444-0.199-0.444-0.444v-2.662c0-0.245,0.198-0.444,0.444-0.444h4.877  c0.244,0,0.443,0.199,0.443,0.444v2.662c0,0.245-0.199,0.444-0.443,0.444H8.787z" fill="url(#SVGID_28_)"/>
-<path d="M12.337,30.063c0,0.49-0.397,0.889-0.888,0.889H8.787c-0.491,0-0.889-0.398-0.889-0.889v-2.662  c0-0.49,0.397-0.888,0.889-0.888h2.662c0.49,0,0.888,0.397,0.888,0.888V30.063z" fill-opacity="0.25" stroke-opacity="0.25"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_29_" x1="10.1177" x2="10.1177" y1="26.0132" y2="30.4921">
+<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"/>
 </linearGradient>
-<path d="M12.337,29.583c0,0.49-0.397,0.888-0.888,0.888H8.787c-0.491,0-0.889-0.397-0.889-0.888v-2.662  c0-0.49,0.397-0.888,0.889-0.888h2.662c0.49,0,0.888,0.397,0.888,0.888V29.583z" fill="url(#SVGID_29_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_30_" x1="11.9482" x2="8.3616" y1="28.252" y2="28.252">
+<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"/>
 </linearGradient>
-<path d="M8.787,30.027c-0.246,0-0.444-0.199-0.444-0.444v-2.662c0-0.246,0.198-0.444,0.444-0.444h2.662  c0.244,0,0.443,0.198,0.443,0.444v2.662c0,0.245-0.199,0.444-0.443,0.444H8.787z" fill="url(#SVGID_30_)"/>
-<path d="M17.662,30.063c0,0.49-0.397,0.889-0.889,0.889h-2.662c-0.49,0-0.887-0.398-0.887-0.889v-2.662  c0-0.49,0.396-0.888,0.887-0.888h2.662c0.491,0,0.889,0.397,0.889,0.888V30.063z" fill-opacity="0.25" stroke-opacity="0.25"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_31_" x1="15.4434" x2="15.4434" y1="26.0132" y2="30.4921">
+<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"/>
 </linearGradient>
-<path d="M17.662,29.583c0,0.49-0.397,0.888-0.889,0.888h-2.662c-0.49,0-0.887-0.397-0.887-0.888v-2.662  c0-0.49,0.396-0.888,0.887-0.888h2.662c0.491,0,0.889,0.397,0.889,0.888V29.583z" fill="url(#SVGID_31_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_32_" x1="17.2734" x2="13.6868" y1="28.252" y2="28.252">
+<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"/>
 </linearGradient>
-<path d="M14.111,30.027c-0.244,0-0.443-0.199-0.443-0.444v-2.662c0-0.246,0.199-0.444,0.443-0.444h2.662  c0.246,0,0.444,0.198,0.444,0.444v2.662c0,0.245-0.198,0.444-0.444,0.444H14.111z" fill="url(#SVGID_32_)"/>
-<path d="M22.988,30.063c0,0.49-0.398,0.889-0.889,0.889h-2.662c-0.49,0-0.889-0.398-0.889-0.889v-2.662  c0-0.49,0.398-0.888,0.889-0.888H22.1c0.49,0,0.889,0.397,0.889,0.888V30.063z" fill-opacity="0.25" stroke-opacity="0.25"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_33_" x1="20.7686" x2="20.7686" y1="26.0132" y2="30.4921">
+<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"/>
 </linearGradient>
-<path d="M22.988,29.583c0,0.49-0.398,0.888-0.889,0.888h-2.662c-0.49,0-0.889-0.397-0.889-0.888v-2.662  c0-0.49,0.398-0.888,0.889-0.888H22.1c0.49,0,0.889,0.397,0.889,0.888V29.583z" fill="url(#SVGID_33_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_34_" x1="22.5986" x2="19.012" y1="28.252" y2="28.252">
+<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"/>
 </linearGradient>
-<path d="M19.438,30.027c-0.245,0-0.444-0.199-0.444-0.444v-2.662c0-0.246,0.199-0.444,0.444-0.444H22.1  c0.245,0,0.443,0.198,0.443,0.444v2.662c0,0.245-0.198,0.444-0.443,0.444H19.438z" fill="url(#SVGID_34_)"/>
-<path d="M28.313,30.063c0,0.49-0.396,0.889-0.887,0.889h-2.664c-0.489,0-0.887-0.398-0.887-0.889v-2.662  c0-0.49,0.397-0.888,0.887-0.888h2.664c0.49,0,0.887,0.397,0.887,0.888V30.063z" fill-opacity="0.25" stroke-opacity="0.25"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_35_" x1="26.0938" x2="26.0938" y1="26.0132" y2="30.4921">
+<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"/>
 </linearGradient>
-<path d="M28.313,29.583c0,0.49-0.396,0.888-0.887,0.888h-2.664c-0.489,0-0.887-0.397-0.887-0.888v-2.662  c0-0.49,0.397-0.888,0.887-0.888h2.664c0.49,0,0.887,0.397,0.887,0.888V29.583z" fill="url(#SVGID_35_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_36_" x1="27.9248" x2="24.3372" y1="28.252" y2="28.252">
+<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"/>
 </linearGradient>
-<path d="M24.762,30.027c-0.244,0-0.443-0.199-0.443-0.444v-2.662c0-0.246,0.199-0.444,0.443-0.444h2.664  c0.244,0,0.443,0.198,0.443,0.444v2.662c0,0.245-0.199,0.444-0.443,0.444H24.762z" fill="url(#SVGID_36_)"/>
-<path d="M33.693,30.063c0,0.49-0.396,0.889-0.887,0.889h-2.664c-0.488,0-0.887-0.398-0.887-0.889v-2.662  c0-0.49,0.398-0.888,0.887-0.888h2.664c0.49,0,0.887,0.397,0.887,0.888V30.063z" fill-opacity="0.25" stroke-opacity="0.25"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_37_" x1="31.4746" x2="31.4746" y1="26.0132" y2="30.4921">
+<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"/>
 </linearGradient>
-<path d="M33.693,29.583c0,0.49-0.396,0.888-0.887,0.888h-2.664c-0.488,0-0.887-0.397-0.887-0.888v-2.662  c0-0.49,0.398-0.888,0.887-0.888h2.664c0.49,0,0.887,0.397,0.887,0.888V29.583z" fill="url(#SVGID_37_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_38_" x1="33.3057" x2="29.7185" y1="28.252" y2="28.252">
+<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"/>
 </linearGradient>
-<path d="M30.143,30.027c-0.244,0-0.443-0.199-0.443-0.444v-2.662c0-0.246,0.199-0.444,0.443-0.444h2.664  c0.244,0,0.443,0.198,0.443,0.444v2.662c0,0.245-0.199,0.444-0.443,0.444H30.143z" fill="url(#SVGID_38_)"/>
-<path d="M39.037,30.063c0,0.49-0.396,0.889-0.887,0.889h-2.662c-0.492,0-0.889-0.398-0.889-0.889v-2.662  c0-0.49,0.396-0.888,0.889-0.888h2.662c0.49,0,0.887,0.397,0.887,0.888V30.063z" fill-opacity="0.25" stroke-opacity="0.25"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_39_" x1="36.8184" x2="36.8184" y1="26.0132" y2="30.4921">
+<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"/>
 </linearGradient>
-<path d="M39.037,29.583c0,0.49-0.396,0.888-0.887,0.888h-2.662c-0.492,0-0.889-0.397-0.889-0.888v-2.662  c0-0.49,0.396-0.888,0.889-0.888h2.662c0.49,0,0.887,0.397,0.887,0.888V29.583z" fill="url(#SVGID_39_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_40_" x1="38.6494" x2="35.0618" y1="28.252" y2="28.252">
+<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"/>
 </linearGradient>
-<path d="M35.488,30.027c-0.246,0-0.445-0.199-0.445-0.444v-2.662c0-0.246,0.199-0.444,0.445-0.444h2.662  c0.244,0,0.443,0.198,0.443,0.444v2.662c0,0.245-0.199,0.444-0.443,0.444H35.488z" fill="url(#SVGID_40_)"/>
-<path d="M52.102,35.278c0,0.49-0.397,0.889-0.888,0.889H40.868c-0.491,0-0.888-0.398-0.888-0.889v-2.662  c0-0.49,0.396-0.887,0.888-0.887h10.346c0.49,0,0.888,0.396,0.888,0.887V35.278z" fill-opacity="0.25" stroke-opacity="0.25"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_41_" x1="46.041" x2="46.041" y1="26.0435" y2="35.6712">
-<stop offset="0" style="stop-color:#8C8C8C"/>
-<stop offset="1" style="stop-color:#2E2E2E"/>
-</linearGradient>
-<path d="M51.215,26.033h-2.662c-0.492,0-0.889,0.397-0.889,0.888v4.328h-6.796  c-0.491,0-0.888,0.396-0.888,0.887v2.662c0,0.49,0.396,0.889,0.888,0.889h10.346c0.49,0,0.888-0.398,0.888-0.889v-7.877  C52.102,26.431,51.705,26.033,51.215,26.033z" fill="url(#SVGID_41_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_42_" x1="46.041" x2="46.041" y1="26.4497" y2="35.2351">
-<stop offset="0" style="stop-color:#686868"/>
-<stop offset="1" style="stop-color:#000000"/>
-</linearGradient>
-<path d="M51.215,26.477h-2.662c-0.246,0-0.445,0.198-0.445,0.444v4.771h-7.239  c-0.245,0-0.444,0.197-0.444,0.443v2.662c0,0.246,0.199,0.445,0.444,0.445h10.346c0.245,0,0.444-0.199,0.444-0.445v-7.877  C51.658,26.675,51.459,26.477,51.215,26.477z" fill="url(#SVGID_42_)"/>
-<path d="M23.061,40.548c0,0.49-0.396,0.889-0.887,0.889h-2.663c-0.489,0-0.888-0.398-0.888-0.889v-2.662  c0-0.49,0.398-0.889,0.888-0.889h2.663c0.49,0,0.887,0.398,0.887,0.889V40.548z" fill-opacity="0.25" stroke-opacity="0.25"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_43_" x1="20.8418" x2="20.8418" y1="36.498" y2="40.9769">
+<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"/>
 </linearGradient>
-<path d="M23.061,40.067c0,0.49-0.396,0.889-0.887,0.889h-2.663c-0.489,0-0.888-0.398-0.888-0.889v-2.662  c0-0.49,0.398-0.887,0.888-0.887h2.663c0.49,0,0.887,0.396,0.887,0.887V40.067z" fill="url(#SVGID_43_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_44_" x1="22.6729" x2="19.0852" y1="38.7363" y2="38.7363">
+<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"/>
 </linearGradient>
-<path d="M19.511,40.511c-0.245,0-0.444-0.197-0.444-0.443v-2.662c0-0.246,0.199-0.443,0.444-0.443h2.663  c0.244,0,0.443,0.197,0.443,0.443v2.662c0,0.246-0.199,0.443-0.443,0.443H19.511z" fill="url(#SVGID_44_)"/>
-<path d="M17.699,40.548c0,0.49-0.398,0.889-0.889,0.889h-2.662c-0.49,0-0.887-0.398-0.887-0.889v-2.662  c0-0.49,0.396-0.889,0.887-0.889h2.662c0.49,0,0.889,0.398,0.889,0.889V40.548z" fill-opacity="0.25" stroke-opacity="0.25"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_45_" x1="15.4805" x2="15.4805" y1="36.498" y2="40.9769">
+<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"/>
 </linearGradient>
-<path d="M17.699,40.067c0,0.49-0.398,0.889-0.889,0.889h-2.662c-0.49,0-0.887-0.398-0.887-0.889v-2.662  c0-0.49,0.396-0.887,0.887-0.887h2.662c0.49,0,0.889,0.396,0.889,0.887V40.067z" fill="url(#SVGID_45_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_46_" x1="17.3105" x2="13.7239" y1="38.7363" y2="38.7363">
+<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"/>
+</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"/>
+</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"/>
 </linearGradient>
-<path d="M14.148,40.511c-0.244,0-0.443-0.197-0.443-0.443v-2.662c0-0.246,0.199-0.443,0.443-0.443h2.662  c0.246,0,0.444,0.197,0.444,0.443v2.662c0,0.246-0.198,0.443-0.444,0.443H14.148z" fill="url(#SVGID_46_)"/>
-<path d="M12.337,40.548c0,0.49-0.397,0.889-0.888,0.889H8.787c-0.491,0-0.889-0.398-0.889-0.889v-2.662  c0-0.49,0.397-0.889,0.889-0.889h2.662c0.49,0,0.888,0.398,0.888,0.889V40.548z" fill-opacity="0.25" stroke-opacity="0.25"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_47_" x1="10.1177" x2="10.1177" y1="36.498" y2="40.9769">
+<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"/>
 </linearGradient>
-<path d="M12.337,40.067c0,0.49-0.397,0.889-0.888,0.889H8.787c-0.491,0-0.889-0.398-0.889-0.889v-2.662  c0-0.49,0.397-0.887,0.889-0.887h2.662c0.49,0,0.888,0.396,0.888,0.887V40.067z" fill="url(#SVGID_47_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_48_" x1="11.9482" x2="8.3616" y1="38.7363" y2="38.7363">
+<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"/>
 </linearGradient>
-<path d="M8.787,40.511c-0.246,0-0.444-0.197-0.444-0.443v-2.662c0-0.246,0.198-0.443,0.444-0.443h2.662  c0.244,0,0.443,0.197,0.443,0.443v2.662c0,0.246-0.199,0.443-0.443,0.443H8.787z" fill="url(#SVGID_48_)"/>
-<path d="M46.859,40.548c0,0.49-0.398,0.889-0.888,0.889h-2.663c-0.49,0-0.887-0.398-0.887-0.889v-2.662  c0-0.49,0.396-0.889,0.887-0.889h2.663c0.489,0,0.888,0.398,0.888,0.889V40.548z" fill-opacity="0.25" stroke-opacity="0.25"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_49_" x1="44.6406" x2="44.6406" y1="36.498" y2="40.9769">
+<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"/>
 </linearGradient>
-<path d="M46.859,40.067c0,0.49-0.398,0.889-0.888,0.889h-2.663c-0.49,0-0.887-0.398-0.887-0.889v-2.662  c0-0.49,0.396-0.887,0.887-0.887h2.663c0.489,0,0.888,0.396,0.888,0.887V40.067z" fill="url(#SVGID_49_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_50_" x1="46.4717" x2="42.884" y1="38.7363" y2="38.7363">
+<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"/>
 </linearGradient>
-<path d="M43.309,40.511c-0.244,0-0.443-0.197-0.443-0.443v-2.662c0-0.246,0.199-0.443,0.443-0.443h2.663  c0.245,0,0.444,0.197,0.444,0.443v2.662c0,0.246-0.199,0.443-0.444,0.443H43.309z" fill="url(#SVGID_50_)"/>
-<path d="M52.102,40.548c0,0.49-0.397,0.889-0.888,0.889h-2.663c-0.49,0-0.887-0.398-0.887-0.889v-2.662  c0-0.49,0.396-0.889,0.887-0.889h2.663c0.49,0,0.888,0.398,0.888,0.889V40.548z" fill-opacity="0.25" stroke-opacity="0.25"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_51_" x1="49.8828" x2="49.8828" y1="36.498" y2="40.9769">
+<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"/>
 </linearGradient>
-<path d="M52.102,40.067c0,0.49-0.397,0.889-0.888,0.889h-2.663c-0.49,0-0.887-0.398-0.887-0.889v-2.662  c0-0.49,0.396-0.887,0.887-0.887h2.663c0.49,0,0.888,0.396,0.888,0.887V40.067z" fill="url(#SVGID_51_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_52_" x1="51.7139" x2="48.1262" y1="38.7363" y2="38.7363">
+<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"/>
 </linearGradient>
-<path d="M48.551,40.511c-0.244,0-0.443-0.197-0.443-0.443v-2.662c0-0.246,0.199-0.443,0.443-0.443h2.663  c0.245,0,0.444,0.197,0.444,0.443v2.662c0,0.246-0.199,0.443-0.444,0.443H48.551z" fill="url(#SVGID_52_)"/>
-<path d="M41.479,40.493c0,0.49-0.398,0.887-0.888,0.887H24.614c-0.489,0-0.888-0.396-0.888-0.887v-2.662  c0-0.49,0.398-0.889,0.888-0.889h15.977c0.489,0,0.888,0.398,0.888,0.889V40.493z" fill-opacity="0.25" stroke-opacity="0.25"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_53_" x1="32.6025" x2="32.6025" y1="36.4414" y2="40.9203">
-<stop offset="0" style="stop-color:#ECF4F8"/>
-<stop offset="0.7939" style="stop-color:#A0A6A7"/>
-<stop offset="1" style="stop-color:#CEDBE0"/>
+<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"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_53_" x1="33.0186" x2="33.0186" y1="37.4727" y2="42.6681">
+<stop offset="0" style="stop-color:#8C8C8C"/>
+<stop offset="1" style="stop-color:#2E2E2E"/>
 </linearGradient>
-<path d="M41.479,40.013c0,0.49-0.398,0.887-0.888,0.887H24.614c-0.489,0-0.888-0.396-0.888-0.887v-2.664  c0-0.488,0.398-0.887,0.888-0.887h15.977c0.489,0,0.888,0.398,0.888,0.887V40.013z" fill="url(#SVGID_53_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_54_" x1="41.2988" x2="24.259" y1="38.6807" y2="38.6807">
-<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"/>
+<path d="M43.314,41.613c0,0.57-0.462,1.03-1.029,1.03H23.752c-0.567,0-1.029-0.46-1.029-1.03v-3.089  c0-0.567,0.462-1.028,1.029-1.028h18.533c0.567,0,1.029,0.461,1.029,1.028V41.613z" fill="url(#SVGID_53_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_54_" x1="33.0186" x2="33.0186" y1="37.9102" y2="42.3335">
+<stop offset="0" style="stop-color:#686868"/>
+<stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
-<path d="M24.614,40.456c-0.245,0-0.444-0.199-0.444-0.443v-2.664c0-0.244,0.199-0.443,0.444-0.443h15.977  c0.245,0,0.444,0.199,0.444,0.443v2.664c0,0.244-0.199,0.443-0.444,0.443H24.614z" fill="url(#SVGID_54_)"/>
-<rect fill="none" height="60.001" width="60"/>
+<path d="M23.752,42.129c-0.284,0-0.516-0.231-0.516-0.516v-3.089c0-0.283,0.231-0.515,0.516-0.515h18.533  c0.284,0,0.516,0.231,0.516,0.515v3.089c0,0.284-0.231,0.516-0.516,0.516H23.752z" fill="url(#SVGID_54_)"/>
+<rect fill="none" height="60" width="60"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_language.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_language.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_language.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,95 +1,104 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
 <rect fill="none" height="60" width="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="30" x2="30" y1="51.18" y2="8.63">
-<stop offset="0" stop-color="#004E8C"/>
-<stop offset="1" stop-color="#1B66D8"/>
+<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"/>
 </linearGradient>
-<circle cx="30" cy="30" fill="url(#SVGID_1)" r="21.429"/>
-<radialGradient cx="29.7" cy="22.59" gradientUnits="userSpaceOnUse" id="SVGID_2" r="25.8">
-<stop offset="0" stop-color="#94FFFF"/>
-<stop offset="0.5" stop-color="#36B5FF"/>
-<stop offset="1" stop-color="#1B66D8"/>
+<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"/>
 </radialGradient>
-<circle cx="30" cy="30" fill="url(#SVGID_2)" r="20.88"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="30" x2="30" y1="8.94" y2="50.99">
-<stop offset="0" stop-color="#31A7F8"/>
-<stop offset="0.5" stop-color="#1E74DC"/>
-<stop offset="1" stop-color="#88D6EB"/>
+<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"/>
 </linearGradient>
-<path d="M30.001,9.121C18.468,9.121,9.119,18.471,9.119,30 c0,11.533,9.349,20.879,20.882,20.879S50.88,41.533,50.88,30C50.88,18.471,41.534,9.121,30.001,9.121z M30.001,49.051 c-10.843,0-19.663-8.818-19.663-19.658c0-10.844,8.82-19.662,19.663-19.662c10.841,0,19.66,8.818,19.66,19.662 C49.661,40.232,40.842,49.051,30.001,49.051z" fill="url(#SVGID_3)" fill-opacity="0.3"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="9.46" x2="12.78" y1="32.84" y2="32.84">
-<stop offset="0" stop-color="#58595B"/>
-<stop offset="1" stop-color="#000000"/>
+<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="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="1" style="stop-color:#000000"/>
 </linearGradient>
-<path d="M11.08,29.66c-0.223-0.295-0.725-0.295-0.946-0.295c-0.437,0-0.669,0.311-0.673,0.615 v0.021l0.001,0.031c-0.001,0.537,0.029,1.139,0.094,1.871c0.013,0.137,0.029,0.275,0.047,0.414l0.024,0.201 c0.056,0.434,0.121,0.861,0.195,1.273l0.034,0.182c0.032,0.164,0.063,0.324,0.098,0.484c0.09,0.406,0.198,0.826,0.332,1.291 c0.02,0.066,0.037,0.135,0.055,0.199c0.028,0.109,0.058,0.217,0.091,0.322l0.005,0.014l0.012,0.033 c-0.003-0.008-0.008-0.023-0.01-0.037l1.197-0.08c0.02-0.188,0.025-0.381,0.02-0.576c-0.01-0.303-0.021-0.676-0.107-0.99 l1.112-1.494l0.12-0.162v-0.203v-1.162v-0.254l-0.179-0.178L11.08,29.66z" fill="url(#SVGID_4)" fill-opacity="0.3"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="15.86" x2="50.59" y1="26.76" y2="26.76">
-<stop offset="0" stop-color="#58595B"/>
-<stop offset="1" stop-color="#000000"/>
-</linearGradient>
-<path d="M50.584,25.908c-0.015-0.078-0.029-0.135-0.043-0.191 c-0.011-0.041-0.021-0.084-0.029-0.123c-0.106-0.496-0.237-1.006-0.392-1.527l-0.018-0.057c-0.032-0.117-0.067-0.234-0.104-0.35 c-0.188-0.586-0.393-1.148-0.608-1.666c-0.027-0.064-0.057-0.125-0.084-0.188l-0.045-0.1c-0.207-0.475-0.436-0.947-0.677-1.402 l-0.03-0.059c-0.047-0.09-0.093-0.182-0.142-0.27c-0.296-0.533-0.604-1.041-0.918-1.512c-0.032-0.049-0.069-0.102-0.106-0.154 c-0.023-0.031-0.045-0.061-0.066-0.092c-0.302-0.438-0.618-0.863-0.946-1.268l-0.064-0.082c-0.044-0.055-0.088-0.111-0.134-0.166 c-0.381-0.457-0.783-0.898-1.199-1.318c-0.056-0.055-0.115-0.113-0.176-0.172l-0.049-0.047c-0.375-0.367-0.774-0.73-1.184-1.072 l-0.08-0.07c-0.041-0.037-0.083-0.072-0.125-0.105c-0.446-0.367-0.931-0.729-1.436-1.076c-0.062-0.041-0.125-0.084-0.189-0.123 l-0.076-0.051c-0.455-0.301-0.93-0.59-1.405-0.854l-0.073-0.041c-0.039-0.023-0.078-0.045-0.118-0.068 c-0.529-0.283-1.081-0.551-1.643-0.791l-0.142-0.059l-0.153-0.063c-0.148-0.061-0.297-0.113-0.443-0.166 c-0.077-0.025-0.152-0.053-0.228-0.08l-0.283-0.105l-0.254,0.162c-0.17,0.107-0.84,0.49-1.235,0.715 c-0.438-0.059-1.499-0.191-2.57-0.295c0.33-0.033,0.786-0.07,1.43-0.111l0.09-1.203l-0.047-0.014 c-0.039-0.01-0.077-0.02-0.116-0.027L34.38,9.65l-0.075-0.016c-0.655-0.131-1.271-0.227-1.882-0.291h-0.004l-0.085-0.008 c-0.698-0.072-1.409-0.107-2.112-0.107c-0.621,0-1.262,0.033-1.964,0.1c-0.108,0.01-0.214,0.021-0.321,0.033 c-0.693,0.078-1.3,0.17-1.873,0.285l-0.02,0.004l-0.015,0.002c-0.604,0.125-1.211,0.281-1.856,0.479 c-0.058,0.018-0.116,0.037-0.174,0.055l-0.13,0.043c-0.547,0.176-1.082,0.371-1.596,0.582c-0.042,0.018-0.071,0.029-0.1,0.039 l-0.078,0.031c-0.564,0.24-1.128,0.512-1.688,0.813c-0.06,0.031-0.118,0.066-0.177,0.1l-0.072,0.041 c-0.157,0.088-0.315,0.186-0.473,0.283l-0.203,0.127l-1.118,0.684l1.242,0.416c0.186,0.063,0.385,0.094,0.592,0.094 c0.67,0,1.317-0.33,1.838-0.594c0.209-0.105,0.521-0.264,0.648-0.289c0.152,0.047,0.306,0.068,0.458,0.068 c0.568,0,1.035-0.307,1.446-0.578l0.111-0.07c0.134-0.043,0.362-0.129,0.818-0.299c0.465-0.176,1.314-0.494,1.54-0.547 c0.44-0.006,0.966-0.068,1.339-0.301c0.352,0.059,0.976,0.156,1.619,0.24c-0.047,0.029-0.093,0.059-0.132,0.098 c-0.209,0.191-1.335,0.533-1.68,0.578c-0.648,0.08-0.908,0.406-1.012,0.666c-0.135,0.336-0.054,0.672,0.078,0.945 c-0.245,0.162-0.545,0.342-0.804,0.479c0.001-0.006,0.003-0.012,0.004-0.02c0.093-0.518,0.16-0.891-0.091-1.189 c-0.128-0.154-0.317-0.24-0.518-0.24c-0.296,0-0.526,0.182-0.712,0.361c-0.519,0.502-0.833,1.129-0.952,1.365l-0.022,0.043 l-0.019,0.035c-0.225,0.432-0.317,0.736-0.191,1.689c-0.057,0.039-0.22,0.102-0.446,0.102c-0.03,0-0.058-0.002-0.079-0.004 c-0.146-0.158-0.349-0.248-0.576-0.248l0,0c-0.524,0-1.238,0.59-2.123,1.754l-0.284,0.375l0.289,0.371l0.269,0.342 c-4.215,3.26-4.246,3.445-4.291,3.717c-0.008,0.025-0.045,0.139-0.095,0.293c-0.628,1.953-0.977,3.414-0.638,4.195 c0.785,1.813,1.67,3.506,2.816,3.598c0.101,0.01,0.212,0.012,0.332,0.012c1.051,0,2.753-0.316,3.571-0.484 c0.151,0.283,0.335,0.615,0.437,0.795l0.182,0.322l0.37-0.012c0,0,0.2-0.006,0.448-0.006c0.287,0,0.478,0.008,0.602,0.018 c0.447,1.307,1.3,4.318,1.142,4.943l-0.003,0.002c-1.441,2.16,0.306,4.975,1.145,6.328c0.066,0.107,0.126,0.203,0.177,0.287 c0.324,0.922,0.716,1.531,1.545,1.531c0.062,0,0.124-0.004,0.188-0.006c0.047-0.004,0.096-0.006,0.146-0.006 c0.092,0,0.157,0.012,0.225,0.035l0.076,0.027l0.08,0.008c0.155,0.012,0.306,0.033,0.453,0.055c0.255,0.035,0.519,0.07,0.788,0.07 c0.721,0,1.293-0.271,1.787-0.855c0.019-0.002,0.036-0.004,0.054-0.006c0.519-0.072,0.713-0.332,0.779-0.564 c0.039-0.039,0.09-0.086,0.131-0.125c0.204-0.188,0.447-0.41,0.615-0.674c0.076-0.045,0.161-0.096,0.258-0.152 c0.167-0.104,0.355-0.217,0.504-0.293c0.131-0.039,0.246-0.117,0.334-0.225c0.209-0.256,0.166-0.549,0.131-0.783 c-0.035-0.242-0.071-0.49,0.06-0.758c0.738-0.355,2.051-1.23,2.263-1.373L37.627,38.5c-0.014,0.117-0.048,0.432-0.101,0.629 c-0.279,0.279-0.512,0.703-0.586,0.846l-0.048,0.094l-0.015,0.104c-0.019,0.137-0.094,0.85,0.306,1.311 c0.202,0.23,0.49,0.359,0.813,0.359c0.103,0,0.21-0.014,0.319-0.039c1.027-0.232,2.85-2.701,2.998-4.064 c0.072-0.658-0.185-1.174-0.704-1.418l-0.387-0.184l-0.304,0.303l-1.125,1.125c-0.381,0.035-0.678,0.148-0.879,0.326 c0.012-0.48-0.035-0.973-0.086-1.451c-0.155-1.447-0.185-2.369,0.703-2.996l0.045-0.033l0.039-0.039 c0.32-0.326,0.675-0.611,1.051-0.914c0.88-0.705,1.79-1.436,2.332-2.758l0.022-0.057c0.174-0.451,0.437-1.131,0.081-1.65 c-0.088-0.129-0.275-0.326-0.623-0.398c0.461-0.184,0.815-0.332,0.85-0.344l0.107-0.045l0.083-0.08l1.898-1.822l0.278-0.268 l-0.122-0.367c-0.017-0.047-0.12-0.334-0.411-0.746c0.554,0.074,1.029,0.207,1.185,0.326c0.057,0.123,0.171,0.396,0.292,0.682 c2.089,4.926,2.382,5.178,2.926,5.188c0.021,0,0.037,0.002,0.051,0.004c0.043,0.002,0.083,0.004,0.119,0.004 c0.31,0,0.486-0.158,0.564-0.252c0.227-0.273,0.163-0.609,0.14-0.734l-0.009-0.043c-0.025-0.295-0.008-1.619,0.034-2.707 c0.003,0.004,0.004,0.006,0.006,0.01l1.12-0.445L50.584,25.908z M34.126,19.885c-0.087,0.004-0.182,0.01-0.282,0.012 c-0.322,0.016-0.688,0.031-1.053,0.031c-0.956,0-1.174-0.117-1.196-0.131c-0.113-0.082-0.229-0.143-0.35-0.188 c0.216-0.049,0.464-0.215,0.719-0.709c0.251,0.488,0.592,0.918,1.115,0.918c0.141,0,0.277-0.033,0.406-0.1 C33.661,19.721,33.951,19.82,34.126,19.885z M33.751,17.221c-0.072,0-0.131-0.004-0.176-0.006c0.049-0.129,0.107-0.203,0.154-0.244 c0.06,0.092,0.141,0.174,0.232,0.244C33.888,17.219,33.817,17.221,33.751,17.221z M29.948,18.5c0.327,0.641,0.569,0.916,0.762,1.037 c-0.475,0.037-0.832,0.338-1.126,0.625c-0.206-0.068-0.565-0.287-0.672-0.438c-0.063-0.09-0.138-0.166-0.221-0.232 C29.211,19.344,29.667,18.861,29.948,18.5z M28.141,18.027l-0.679-0.033l-2.278-0.111c0.278-0.229,0.542-0.443,0.696-0.57 c0.043-0.016,0.205-0.061,0.607-0.061c0.241,0,0.473,0.018,0.619,0.029L28.141,18.027z" fill="url(#SVGID_5)" fill-opacity="0.3"/>
-<radialGradient cx="30.36" cy="15.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"/>
+<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"/>
+</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"/>
 </radialGradient>
-<path d="M10.069,29.988c0,0,0,0,0,0.002c0,0.006,0.001,0.01,0.001,0.016c0,0.623,0.039,1.236,0.093,1.844 c0.018,0.199,0.047,0.398,0.069,0.6c0.053,0.416,0.116,0.828,0.19,1.236c0.041,0.215,0.081,0.434,0.127,0.646 c0.094,0.422,0.203,0.838,0.322,1.248c0.049,0.17,0.088,0.342,0.14,0.508c0.007,0.018,0.015,0.033,0.019,0.053 c0.017-0.162,0.021-0.328,0.017-0.496c-0.04-1.201-0.232-1.047-0.232-1.047l1.356-1.822v-1.162l-1.59-1.59 C10.581,30.023,10.07,29.943,10.069,29.988z" fill="url(#SVGID_6)"/>
-<path d="M22.83,11.963c0.587,0.193,1.066-0.199,1.613-0.549c0.193-0.039,2.338-0.895,2.57-0.895 c0.231,0,1.011-0.031,1.204-0.34c0,0,3.357,0.584,3.863,0.389c0.275-0.107,1.432-0.201,2.425-0.266 c-0.056-0.012-0.106-0.027-0.162-0.039c-0.054-0.012-0.106-0.02-0.161-0.031c-0.623-0.125-1.252-0.225-1.894-0.289 c0,0-0.01,0-0.016-0.002c-0.674-0.068-1.358-0.104-2.052-0.104c-0.644,0-1.277,0.037-1.906,0.098 c-0.11,0.01-0.221,0.021-0.332,0.035c-0.607,0.066-1.21,0.154-1.8,0.273c-0.01,0.004-0.021,0.004-0.031,0.006 c-0.612,0.127-1.213,0.283-1.802,0.463c-0.102,0.031-0.199,0.064-0.302,0.096c-0.522,0.17-1.038,0.357-1.544,0.564 c-0.06,0.027-0.119,0.049-0.18,0.072c-0.557,0.238-1.1,0.502-1.63,0.785c-0.08,0.043-0.156,0.088-0.235,0.133 c-0.227,0.127-0.439,0.268-0.659,0.402C20.892,13.129,22.253,11.768,22.83,11.963z" fill="url(#SVGID_6)"/>
-<radialGradient cx="30.36" cy="15.27" gradientUnits="userSpaceOnUse" id="SVGID_8" r="23.56">
-<stop offset="0" stop-color="#B2F56E"/>
-<stop offset="0.32" stop-color="#B2F56E"/>
-<stop offset="0.73" stop-color="#5CBF1B"/>
-<stop offset="1" stop-color="#227A00"/>
+<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"/>
 </radialGradient>
-<path d="M49.983,26.01c-0.021-0.102-0.049-0.197-0.069-0.297c-0.106-0.498-0.233-0.99-0.378-1.473 c-0.038-0.131-0.076-0.264-0.117-0.395c-0.176-0.549-0.372-1.09-0.592-1.617c-0.039-0.092-0.084-0.184-0.124-0.273 c-0.202-0.465-0.421-0.92-0.657-1.363c-0.055-0.107-0.109-0.217-0.166-0.32c-0.279-0.502-0.575-0.992-0.893-1.469 c-0.054-0.082-0.115-0.16-0.17-0.242c-0.291-0.422-0.596-0.832-0.916-1.229c-0.064-0.078-0.127-0.16-0.194-0.24 c-0.368-0.441-0.756-0.867-1.161-1.277c-0.069-0.07-0.143-0.139-0.215-0.207c-0.369-0.363-0.756-0.715-1.152-1.049 c-0.068-0.055-0.132-0.115-0.199-0.17c-0.448-0.365-0.914-0.715-1.395-1.043c-0.084-0.057-0.17-0.113-0.256-0.168 c-0.442-0.293-0.898-0.57-1.365-0.83c-0.064-0.033-0.124-0.072-0.188-0.107c-0.52-0.277-1.05-0.533-1.594-0.768 c-0.097-0.041-0.195-0.078-0.29-0.119c-0.212-0.088-0.432-0.156-0.646-0.236c-0.255,0.164-1.438,0.832-1.438,0.832 s-5.141-0.701-5.491-0.352c-0.351,0.352-1.721,0.711-2.034,0.75c-0.309,0.041-0.955,0.207-0.181,1.162 c-0.116,0.117-2.325,1.656-2.325,0.957c0-0.701,0.494-1.953-0.2-1.283c-0.498,0.482-0.796,1.135-0.86,1.258 c-0.162,0.313-0.263,0.461-0.145,1.357c0.118,0.895-1.43,0.891-1.534,0.658c-0.276-0.621-1.809,1.395-1.809,1.395l0.646,0.828 c0,0-4.51,3.473-4.548,3.707c-0.039,0.234-1.164,3.25-0.775,4.146c0.39,0.898,1.375,3.158,2.307,3.232 c1.221,0.102,4.186-0.559,4.186-0.559c0.08,0.197,0.638,1.191,0.638,1.191s1.452-0.049,1.534,0.109 c0.026,0.053,1.75,5.121,1.182,5.793c-1.357,2.033,0.775,5.012,1.369,6.02c0.594,1.73,0.977,0.955,1.758,1.24 c0.962,0.082,1.772,0.438,2.589-0.613c0.237-0.195,0.641-0.041,0.641-0.313c0-0.15,0.698-0.598,0.878-1.018 c0.188-0.088,0.674-0.414,1.003-0.572c0.299-0.02-0.283-0.818,0.309-1.666c0.64-0.252,2.364-1.414,2.364-1.414 c0.078-1.705-0.839-3.811,0.873-5.02c1.104-1.125,2.553-1.766,3.255-3.479c0.194-0.506,0.628-1.541-0.62-1.23 c-1.172,0.295-2.479,0.361-1.861-0.154c-0.07-0.635-0.85-0.932-1.549-1.551c-0.361-0.855-0.93-2.379-0.93-2.379l-1.24-1.885 l0.155-0.389l1.474,2.17l1.474,1.781c0.542,1.783,1.007,1.939,1.007,1.939c0.816-0.287,2.752-1.084,2.752-1.084l1.899-1.822 c0,0-0.195-0.582-0.967-1.318l-0.584-0.348c-0.126,0.357-0.802,0.49-0.802,0.49l-1.641-1.963l0.61-0.123l0.471,0.895l1.128,0.391 c0,0,0.313-0.229,0.893,0.371c0.473-0.039,2.318,0.09,2.749,0.637c0.085,0.107,2.286,5.605,2.721,5.613 c0.19,0.002,0.329,0.076,0.267-0.256c-0.078-0.156,0-3.609,0.116-4.35c0.295-0.627,0.343-0.002,1.04,1.189 C49.991,26.068,49.989,26.039,49.983,26.01z M30.61,12.688c0.154-0.459,1.047-0.615,1.047-0.615s-0.256,0.473-0.197,0.717 c0.06,0.246-0.408,0.4-0.46,0.98c-0.051,0.578-1.117,0.24-1.204,0.037C29.708,13.604,30.453,13.145,30.61,12.688z M34.434,20.488 c-0.661,0-2.645,0.195-3.19-0.193s-0.97,0.039-1.363,0.43c-0.257,0.252-1.193-0.26-1.467-0.65c-0.271-0.391-1.188-0.361-1.188-0.361 l0.208-1.111l-2.637-0.127l-1.499,0.439l-1.41,0.039l0.79-0.375l0.983-0.232c0,0,1.431-1.176,1.859-1.525 c0.363-0.297,1.811-0.131,1.811-0.131l1.589,1.146c0,0-0.353,0.898-0.508,1.09c0.582-0.037,1.27-1.098,1.27-1.098 c-1.24-1.139-1.189-1.525-1.189-1.525l1.633,1.146l0.016,0.01c0,0,0.661,1.559,0.937,1.559c0.271,0,0.619-1.072,0.619-1.072 l0.465-0.117c0.207,0.49,0.595,1.602,1.059,1.342c0.269-0.146,0.71-0.014,1.215,0.182c0.509,0.193,0.854-0.105,1.267,0.258 C35.647,21.213,34.707,20.566,34.434,20.488z M35.471,17.807c-0.681-0.26-2.984,0.586-2.47-0.795 c0.275-0.748,0.98-0.902,1.223-0.406c0.063,0.203,0.83,0.52,0.824,0.09c-0.006-0.432,0.771-0.658,0.883-0.338 C35.517,16.654,37.55,18.205,35.471,17.807z M39.81,19.117c-0.377-0.305,0.169-0.564-0.387-1.041 c-0.799-0.684-1.421-0.979-0.334-1.531c1.341-0.17,0.217,0.428,0.44,0.785c0.119,0.189,0.796,0.828,1.325,1.609 C41.294,19.59,40.185,19.42,39.81,19.117z" fill="url(#SVGID_8)"/>
-<path d="M40.351,36.871l-1.293,1.293c0,0-0.778,0-0.815,0.311c-0.017,0.133-0.063,0.709-0.192,1.006 c-0.258,0.18-0.569,0.775-0.569,0.775s-0.159,1.15,0.699,0.955S41.677,37.496,40.351,36.871z" fill="url(#SVGID_6)"/>
+<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"/>
+</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"/>
 </g>
 <g transform="matrix(1 0 0 1 30 30)">
-<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"/>
+<path d="M0,30v-30h30v30h-30zm23.6-3.75l-8.732-8.732-8.736,8.73h17.46zm2.65-2.65v-17.47l-8.732,8.732,8.73,8.73zm-22.5-0.27l8.465-8.465-8.47-8.459v16.93zm11.12-11.11l8.46-8.47h-16.93l8.468,8.47z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="15" x2="15" y1="0.9941" y2="29.19">
+<stop offset="0" stop-color="#E6E6E6"/>
+<stop offset="0.6182" stop-color="#A8A8A8"/>
+<stop offset="1" 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"/>
+<path d="M0.938,0.938v28.12h28.12v-28.12h-28.12zm12.6,13.93l-10.73,10.73v-21.46l10.73,10.73zm-9.401-12.06h21.46l-10.72,10.73-10.73-10.73zm10.73,13.38l11,11h-22l11-11zm1.32-1.32l11-11v21.99l-11-10.99z" fill="url(#SVGID_1__)"/>
+<polygon fill-opacity="0.6" points="8.547,25.31,7.61,17.81,5.625,17.81,5.625,12.2,24.38,12.2,24.38,17.81,22.39,17.81,21.45,25.31" stroke-opacity="0.6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="15" x2="15" y1="12.1" y2="23.99">
+<stop offset="0" stop-color="#A0F800"/>
+<stop offset="1" 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_)"/>
+<polygon fill="url(#SVGID_2__)" points="6.563,13.14,6.563,16.88,8.438,16.88,9.375,24.38,20.62,24.38,21.56,16.88,23.44,16.88,23.44,13.14"/>
+<path d="M13.12,14.06v-2.886c-0.348,0.048-0.692,0.073-1.03,0.073-0.804,0-1.568-0.139-2.272-0.414-3.952-1.536-3.863-4.501-3.858-4.626l0.019-0.408,0.312-0.265c0.103-0.088,1.06-0.855,2.881-0.855,0.958,0,1.99,0.212,3.066,0.632,1.3,0.506,2.174,1.126,2.762,1.716,0.588-0.589,1.462-1.209,2.762-1.716,1.076-0.42,2.108-0.632,3.066-0.632,1.82,0,2.777,0.767,2.881,0.855l0.313,0.265,0.019,0.408c0.005,0.125,0.094,3.091-3.862,4.632-0.704,0.275-1.469,0.414-2.272,0.414-0.338,0-0.683-0.025-1.03-0.073v2.886h-3.755z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M10.16,9.963c1.436,0.559,2.896,0.346,3.899,0.057v3.105h1.875v-3.1c1.003,0.289,2.464,0.502,3.899-0.057,3.375-1.316,3.267-3.717,3.267-3.717s-1.627-1.379-5.002-0.064c-1.87,0.725-2.72,1.667-3.11,2.369-0.392-0.702-1.242-1.644-3.102-2.369-3.377-1.316-5.004,0.064-5.004,0.064s-0.108,2.401,3.264,3.717z" 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 gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="15" x2="15" y1="4.922" y2="12.87">
+<stop offset="0" stop-color="#A0F800"/>
+<stop offset="1" 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 gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="15" x2="15" y1="12.55" y2="17.37">
+<stop offset="0" stop-color="#D07100"/>
+<stop offset="1" 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"/>
+<rect fill="url(#SVGID_4__)" height="3.738" width="16.88" x="6.563" y="13.14"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="15" x2="15" y1="16.84" y2="24.56">
+<stop offset="0" stop-color="#D07100"/>
+<stop offset="1" 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_)"/>
+<polygon fill="url(#SVGID_5__)" points="20.62,24.38,9.375,24.38,8.438,16.88,21.56,16.88"/>
+<path d="M23.1,6.246s-1.627-1.379-5.002-0.064c-1.86,0.725-2.71,1.667-3.1,2.369-0.392-0.702-1.242-1.644-3.102-2.369-3.377-1.316-5.004,0.064-5.004,0.064s-0.109,2.401,3.267,3.717c1.436,0.559,2.896,0.346,3.899,0.057v3.105h1.875v-3.1c1.003,0.289,2.464,0.502,3.899-0.057,3.37-1.316,3.26-3.717,3.26-3.717z" 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"/>
+<path d="M14.06,9.082c-1.003,0.289-2.464,0.502-3.899-0.057-2.1-0.82-2.85-2.062-3.118-2.881-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.057v-0.938z"/>
+<path d="M22.96,6.144c-0.268,0.819-1.018,2.061-3.121,2.881-1.436,0.559-2.896,0.346-3.899,0.057v0.938c1.003,0.289,2.464,0.502,3.899-0.057,3.375-1.316,3.267-3.717,3.267-3.717s-0.06-0.042-0.15-0.102z"/>
+<rect height="0.938" width="1.875" x="14.06" y="12.19"/>
 </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>
+<rect fill="#FFFFFF" fill-opacity="0.3" height="0.926" stroke-opacity="0.3" width="16.88" x="6.563" y="13.14"/>
+<polygon fill-opacity="0.2" points="21.44,17.81,21.56,16.88,8.438,16.88,8.555,17.81" stroke-opacity="0.2"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_location_new.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,80 +1,78 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
 <rect fill="none" height="60" width="60"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 66.98 -1317.4805)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-29.105" x2="-29.105" y1="-1331.915" y2="-1368.765">
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_1_)" points="45.781,13.057 52.039,13.913 52.039,48.859 41.02,50.367 30.002,48.174 23.711,49.359 "/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 66.98 -1317.4805)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-31.4692" x2="-31.4692" y1="-1341.6035" y2="-1368.0845">
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_2_)" points="41.02,23.222 41.02,50.367 30.002,48.174 30.002,39.17 "/>
-<polygon fill-opacity="0.25" points="46.514,13.166 41.02,24.771 30.002,40.737 24.603,49.207   22.033,49.684 44.574,12.896 " stroke-opacity="0.25"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 66.98 -1317.4805)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-41.688" x2="-41.688" y1="-1330.2051" y2="-1367.8351">
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_3_)" points="42.619,14.637 40.934,23.699 30.002,39.557 23.752,49.365 18.371,50.367 7.965,48.408   7.965,13.159 18.066,12.405 30.002,14.062 41.02,12.405 "/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 66.98 -1317.4805)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-42.7935" x2="-42.7935" y1="-1366.3047" y2="-1331.1639">
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_4_)" points="30.002,14.062 30.002,39.557 23.752,49.365 18.371,50.367 18.371,12.448 "/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 66.98 -1317.4805)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="-23.5708" x2="-23.5708" y1="-1340.8135" y2="-1330.5034">
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_5_)" points="41.02,12.405 41.02,23.573 45.799,13.06 "/>
-<path d="M18.983,50.248l9.365-14.045l-3.946-1.963l-5.984,8.276  l-5.84,6.748l-1.867-0.345l7.668-9.029l4.502-6.398l-4.713-2.32L7.965,29.079v-1.076l10.592,2.189l4.947,2.428l5.576-7.825  l-10.873-5.426L7.965,17.569v-1.665l10.572,1.77l11.385,5.683l3.262-5.544l-3.186-1.12l-4.73-3.271l2.257,0.311l2.487,1.819  l3.707,1.35l2.191-3.721l2.143-0.306l-2.854,4.821l4.072,2.19l1.783-2.824l1.838-4.398l1.035,0.141l-2.896,6.246  c0,0-7.08,10.973-11.019,16.865l-9.534,14.059L18.983,50.248z M29.054,35.385l-3.994-2.029l5.489-7.72l3.67,1.783L29.054,35.385z   M31.426,24.107l3.84,1.918l3.438-5.244l-4.039-2.172L31.426,24.107L31.426,24.107z" fill="#FFFFFF" fill-opacity="0.25" stroke-opacity="0.25"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 66.98 -1317.4805)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-41.1392" x2="-41.1392" y1="-1367.4844" y2="-1339.9443">
+<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"/>
 </linearGradient>
-<path d="M43.061,12.683l-2.018,4.834c0,0-1.088,1.722-1.693,2.67l-4.469-2.404l2.873-4.847l-1.457,0.197  l-2.49,4.073l-3.77-1.383l-2.785-2.144l-1.723-0.238l4.491,3.061l3.478,1.225l-3.485,5.928l-11.521-5.75L7.965,16.127v1.209  l10.287,1.799l11.146,5.564l-0.134,0.226l-5.687,7.983l-5.188-2.525L7.961,28.247l0.004,0.605l10.396,2.162l4.862,2.395l-4.83,6.771  l-7.426,8.794l1.38,0.259l6.045-7.003l5.935-8.278l4.414,2.174l-9.438,14.069l0.857-0.161l9.854-14.775l11.044-16.625l2.662-5.856  L43.061,12.683z M30.01,34.064l-1.031,1.586l-4.295-2.197l5.384-7.646l0.423-0.558l4.188,2.09L30.01,34.064z M35.346,26.318  l-4.24-2.118l3.472-5.895l4.446,2.393L35.346,26.318z" fill="url(#SVGID_6_)"/>
-<polygon fill="#FFFFFF" points="36.727,44.57 41.027,35.51 44.891,44.57 41.027,42.229 "/>
-<polygon fill-opacity="0.4" points="44.891,44.57 41.027,35.51 41.027,42.229 " stroke-opacity="0.4"/>
-<ellipse cx="23.633" cy="28.731" fill="#333333" fill-opacity="0.2" rx="4.936" ry="1.904" stroke-opacity="0.2"/>
-<path d="M25.904,28.73c0,0.483-1.019,0.875-2.271,0.875  c-1.252,0-2.271-0.393-2.271-0.875c0-0.486,1.019-0.877,2.271-0.877C24.885,27.854,25.904,28.245,25.904,28.73z" fill="#333333" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M30.088,10.578c-1.104,0.78-3.005,1.878-3.822,1.878c-0.001,0-0.001,0-0.003,0  c-0.186-0.022-0.462-0.203-0.755-0.395c-0.585-0.382-1.389-0.907-2.559-0.916c-0.863,0-2.172,0.844-3.048,1.491l-0.544-1.409  l-4.033,1.55l0.924,2.391l0.544-0.209l4.874,12.626l2.336,1.648l0.605-2.78l-1.22-3.157l0.219-0.562  c0.448-1.156,1.463-3.208,2.277-3.786c0.214-0.151,0.81-0.452,1.288-0.692c0.485-0.246,0.905-0.455,1.152-0.613  c2.037-1.306,2.78-5.877,2.856-6.394l0.242-1.616L30.088,10.578z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<linearGradient gradientTransform="matrix(0.9331 -0.3596 0.3596 0.9331 -243.5577 -1782.5703)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="-401.0029" x2="-402.7411" y1="1777.8945" y2="1777.8945">
+<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 "/>
+<polygon fill-opacity="0.4" points="48.269,47.876 43.529,36.76 43.529,45.003 " stroke-opacity="0.4"/>
+<ellipse cx="22.188" cy="28.443" fill="#333333" fill-opacity="0.2" rx="6.056" ry="2.335" stroke-opacity="0.2"/>
+<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.65" style="stop-color:#D9D9D9"/>
 <stop offset="1" style="stop-color:#AEB2B3"/>
 </linearGradient>
-<polygon fill="url(#SVGID_7_)" points="17.192,14.059 18.831,13.426 23.881,26.508 23.542,28.058 22.242,27.139 "/>
-<linearGradient gradientTransform="matrix(0.9331 -0.3596 0.3596 0.9331 -243.5577 -1782.5703)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="-400.4478" x2="-403.3257" y1="1769.6377" y2="1769.6377">
+<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">
 <stop offset="0" style="stop-color:#4F4F4F"/>
 <stop offset="0.59" style="stop-color:#BFBFBF"/>
 <stop offset="1" style="stop-color:#6B6B6B"/>
 </linearGradient>
-<polygon fill="url(#SVGID_8_)" points="16.227,13.177 18.957,12.127 19.378,13.218 16.648,14.268 "/>
-<rect fill-opacity="0.2" height="0.584" stroke-opacity="0.2" transform="matrix(0.9328 -0.3603 0.3603 0.9328 -3.8333 7.4699)" width="1.756" x="17.239" y="13.724"/>
-<path d="M19.587,13.763c0,0,2.346-1.928,3.367-1.919c1.596,0.011,2.361,1.204,3.227,1.305  c1.264,0.149,4.311-2.001,4.311-2.001s-0.715,4.736-2.544,5.912c-0.481,0.306-2.002,0.993-2.467,1.324  c-1.29,0.915-2.526,4.104-2.526,4.104L19.587,13.763z" fill="#33A02C"/>
-<path d="M23.196,12.466c1.596,0.014,2.361,1.206,3.226,1.308  c0.978,0.113,3.022-1.148,3.896-1.723c0.114-0.542,0.171-0.905,0.171-0.905s-3.048,2.15-4.312,2.001  c-0.863-0.101-1.629-1.294-3.225-1.305c-1.021-0.008-3.366,1.919-3.366,1.919l0.242,0.626C19.829,14.389,22.174,12.46,23.196,12.466  z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<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="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)">
-<g>
-<rect height="15" style="fill:none;" width="15" x="15"/>
-<rect height="4.412" style="opacity:0.6;enable-background:new    ;" transform="matrix(-0.2587 0.9659 -0.9659 -0.2587 29.2728 -12.3701)" width="7.941" x="15.412" y="2.841"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 90.98 116.5195)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-70.1851" x2="-73.1451" y1="114.9482" y2="107.6632">
-<stop offset="0" style="stop-color:#DE8029"/>
-<stop offset="0.26" style="stop-color:#DE4E29"/>
-<stop offset="1" style="stop-color:#D82E09"/>
+<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"/>
 </linearGradient>
-<polygon points="20.174,8.913 16.765,8 18.592,1.181 22.001,2.094  " style="fill:url(#SVGID_1__);"/>
-<rect height="4.411" style="opacity:0.6;enable-background:new    ;" transform="matrix(-0.7072 0.7071 -0.7071 -0.7072 48.0833 -1.2961)" width="9.707" x="19.457" y="7.104"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 90.98 116.5195)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="-63.0112" x2="-70.6762" y1="110.0527" y2="104.0977">
-<stop offset="0" style="stop-color:#DE8029"/>
-<stop offset="0.26" style="stop-color:#DE4E29"/>
-<stop offset="1" style="stop-color:#D82E09"/>
+<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"/>
 </linearGradient>
-<polygon points="22.438,13.677 19.941,11.182 26.182,4.942 28.677,7.438  " style="fill:url(#SVGID_2__);"/>
-</g>
-<rect height="30.002" style="fill:none;" width="30.002"/>
+<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"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_maps.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_maps.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_maps.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,60 +1,60 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
 <rect fill="none" height="60" width="60"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 66.98 -1317.4805)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-29.105" x2="-29.105" y1="-1331.915" y2="-1368.765">
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_1_)" points="45.781,13.057 52.039,13.913 52.039,48.859 41.02,50.367 30.002,48.174 23.711,49.359 "/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 66.98 -1317.4805)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-31.4692" x2="-31.4692" y1="-1341.6035" y2="-1368.0845">
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_2_)" points="41.02,23.222 41.02,50.367 30.002,48.174 30.002,39.17 "/>
-<polygon fill-opacity="0.25" points="46.514,13.166 41.02,24.771 30.002,40.737 24.603,49.207   22.033,49.684 44.574,12.896 " stroke-opacity="0.25"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 66.98 -1317.4805)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-41.688" x2="-41.688" y1="-1330.2051" y2="-1367.8351">
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_3_)" points="42.619,14.637 40.934,23.699 30.002,39.557 23.752,49.365 18.371,50.367 7.965,48.408   7.965,13.159 18.066,12.405 30.002,14.062 41.02,12.405 "/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 66.98 -1317.4805)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-42.7935" x2="-42.7935" y1="-1366.3047" y2="-1331.1639">
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_4_)" points="30.002,14.062 30.002,39.557 23.752,49.365 18.371,50.367 18.371,12.448 "/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 66.98 -1317.4805)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="-23.5708" x2="-23.5708" y1="-1340.8135" y2="-1330.5034">
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_5_)" points="41.02,12.405 41.02,23.573 45.799,13.06 "/>
-<path d="M18.983,50.248l9.365-14.045l-3.946-1.963l-5.984,8.276  l-5.84,6.748l-1.867-0.345l7.668-9.029l4.502-6.398l-4.713-2.32L7.965,29.079v-1.076l10.592,2.189l4.947,2.428l5.576-7.825  l-10.873-5.426L7.965,17.569v-1.665l10.572,1.77l11.385,5.683l3.262-5.544l-3.186-1.12l-4.73-3.271l2.257,0.311l2.487,1.819  l3.707,1.35l2.191-3.721l2.143-0.306l-2.854,4.821l4.072,2.19l1.783-2.824l1.838-4.398l1.035,0.141l-2.896,6.246  c0,0-7.08,10.973-11.019,16.865l-9.534,14.059L18.983,50.248z M29.054,35.385l-3.994-2.029l5.489-7.72l3.67,1.783L29.054,35.385z   M31.426,24.107l3.84,1.918l3.438-5.244l-4.039-2.172L31.426,24.107L31.426,24.107z" fill="#FFFFFF" fill-opacity="0.25" stroke-opacity="0.25"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 66.98 -1317.4805)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-41.1392" x2="-41.1392" y1="-1367.4844" y2="-1339.9443">
+<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"/>
 </linearGradient>
-<path d="M43.061,12.683l-2.018,4.834c0,0-1.088,1.722-1.693,2.67l-4.469-2.404l2.873-4.847l-1.457,0.197  l-2.49,4.073l-3.77-1.383l-2.785-2.144l-1.723-0.238l4.491,3.061l3.478,1.225l-3.485,5.928l-11.521-5.75L7.965,16.127v1.209  l10.287,1.799l11.146,5.564l-0.134,0.226l-5.687,7.983l-5.188-2.525L7.961,28.247l0.004,0.605l10.396,2.162l4.862,2.395l-4.83,6.771  l-7.426,8.794l1.38,0.259l6.045-7.003l5.935-8.278l4.414,2.174l-9.438,14.069l0.857-0.161l9.854-14.775l11.044-16.625l2.662-5.856  L43.061,12.683z M30.01,34.064l-1.031,1.586l-4.295-2.197l5.384-7.646l0.423-0.558l4.188,2.09L30.01,34.064z M35.346,26.318  l-4.24-2.118l3.472-5.895l4.446,2.393L35.346,26.318z" fill="url(#SVGID_6_)"/>
-<polygon fill="#FFFFFF" points="36.727,44.57 41.027,35.51 44.891,44.57 41.027,42.229 "/>
-<polygon fill-opacity="0.4" points="44.891,44.57 41.027,35.51 41.027,42.229 " stroke-opacity="0.4"/>
-<ellipse cx="23.633" cy="28.731" fill="#333333" fill-opacity="0.2" rx="4.936" ry="1.904" stroke-opacity="0.2"/>
-<path d="M25.904,28.73c0,0.483-1.019,0.875-2.271,0.875  c-1.252,0-2.271-0.393-2.271-0.875c0-0.486,1.019-0.877,2.271-0.877C24.885,27.854,25.904,28.245,25.904,28.73z" fill="#333333" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M30.088,10.578c-1.104,0.78-3.005,1.878-3.822,1.878c-0.001,0-0.001,0-0.003,0  c-0.186-0.022-0.462-0.203-0.755-0.395c-0.585-0.382-1.389-0.907-2.559-0.916c-0.863,0-2.172,0.844-3.048,1.491l-0.544-1.409  l-4.033,1.55l0.924,2.391l0.544-0.209l4.874,12.626l2.336,1.648l0.605-2.78l-1.22-3.157l0.219-0.562  c0.448-1.156,1.463-3.208,2.277-3.786c0.214-0.151,0.81-0.452,1.288-0.692c0.485-0.246,0.905-0.455,1.152-0.613  c2.037-1.306,2.78-5.877,2.856-6.394l0.242-1.616L30.088,10.578z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<linearGradient gradientTransform="matrix(0.9331 -0.3596 0.3596 0.9331 -243.5577 -1782.5703)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="-401.0029" x2="-402.7411" y1="1777.8945" y2="1777.8945">
+<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 "/>
+<polygon fill-opacity="0.4" points="48.269,47.876 43.529,36.76 43.529,45.003 " stroke-opacity="0.4"/>
+<ellipse cx="22.188" cy="28.443" fill="#333333" fill-opacity="0.2" rx="6.056" ry="2.335" stroke-opacity="0.2"/>
+<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.65" style="stop-color:#D9D9D9"/>
 <stop offset="1" style="stop-color:#AEB2B3"/>
 </linearGradient>
-<polygon fill="url(#SVGID_7_)" points="17.192,14.059 18.831,13.426 23.881,26.508 23.542,28.058 22.242,27.139 "/>
-<linearGradient gradientTransform="matrix(0.9331 -0.3596 0.3596 0.9331 -243.5577 -1782.5703)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="-400.4478" x2="-403.3257" y1="1769.6377" y2="1769.6377">
+<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">
 <stop offset="0" style="stop-color:#4F4F4F"/>
 <stop offset="0.59" style="stop-color:#BFBFBF"/>
 <stop offset="1" style="stop-color:#6B6B6B"/>
 </linearGradient>
-<polygon fill="url(#SVGID_8_)" points="16.227,13.177 18.957,12.127 19.378,13.218 16.648,14.268 "/>
-<rect fill-opacity="0.2" height="0.584" stroke-opacity="0.2" transform="matrix(0.9328 -0.3603 0.3603 0.9328 -3.8333 7.4699)" width="1.756" x="17.239" y="13.724"/>
-<path d="M19.587,13.763c0,0,2.346-1.928,3.367-1.919c1.596,0.011,2.361,1.204,3.227,1.305  c1.264,0.149,4.311-2.001,4.311-2.001s-0.715,4.736-2.544,5.912c-0.481,0.306-2.002,0.993-2.467,1.324  c-1.29,0.915-2.526,4.104-2.526,4.104L19.587,13.763z" fill="#33A02C"/>
-<path d="M23.196,12.466c1.596,0.014,2.361,1.206,3.226,1.308  c0.978,0.113,3.022-1.148,3.896-1.723c0.114-0.542,0.171-0.905,0.171-0.905s-3.048,2.15-4.312,2.001  c-0.863-0.101-1.629-1.294-3.225-1.305c-1.021-0.008-3.366,1.919-3.366,1.919l0.242,0.626C19.829,14.389,22.174,12.46,23.196,12.466  z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<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="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 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mass_storage.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mass_storage.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<g>
+<rect fill="none" height="60" width="60"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="1.8516" y2="57.6129">
+<stop offset="0" style="stop-color:#6B6B6B"/>
+<stop offset="1" style="stop-color:#141414"/>
+</linearGradient>
+<path d="M51.818,56.545c0,0.805-0.65,1.455-1.455,1.455H9.638c-0.804,0-1.456-0.65-1.456-1.455V3.455  C8.182,2.652,8.834,2,9.638,2h40.726c0.805,0,1.455,0.652,1.455,1.455V56.545z" fill="url(#SVGID_1_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="2.583" y2="56.8955">
+<stop offset="0" style="stop-color:#C7C7C7"/>
+<stop offset="0.7394" style="stop-color:#2B2B2B"/>
+<stop offset="1" style="stop-color:#737373"/>
+</linearGradient>
+<path d="M9.638,57.272c-0.401,0-0.729-0.326-0.729-0.728V3.455c0-0.401,0.327-0.728,0.729-0.728h40.726  c0.401,0,0.728,0.326,0.728,0.728v53.09c0,0.401-0.326,0.728-0.728,0.728H9.638z" fill="url(#SVGID_2_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30" x2="30" y1="3.3145" y2="56.178">
+<stop offset="0" style="stop-color:#8F8F8F"/>
+<stop offset="0.6303" style="stop-color:#393939"/>
+<stop offset="1" style="stop-color:#757575"/>
+</linearGradient>
+<rect fill="url(#SVGID_3_)" height="53.09" width="40.727" x="9.637" y="3.455"/>
+<path d="M45.023,12.962l2.573-2.569c0.853-0.854,0.853-2.235,0-3.088l-1.03-1.027c-0.854-0.852-2.232-0.852-3.086,0  l-2.571,2.57L45.023,12.962z" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M30,44.908c-10.828,0-19.638-8.805-19.638-19.636c0-10.825,8.81-19.638,19.638-19.638  s19.639,8.813,19.639,19.638C49.639,36.104,40.828,44.908,30,44.908L30,44.908z" fill-opacity="0.15" stroke-opacity="0.15"/>
+<path d="M30,44.181c-10.828,0-19.638-8.805-19.638-19.636c0-10.825,8.81-19.637,19.638-19.637  s19.639,8.812,19.639,19.637C49.639,35.376,40.828,44.181,30,44.181L30,44.181z" fill-opacity="0.15" stroke-opacity="0.15"/>
+<path d="M30,43.453c-10.828,0-19.638-8.805-19.638-19.635c0-10.826,8.81-19.638,19.638-19.638  s19.639,8.812,19.639,19.638C49.639,34.648,40.828,43.453,30,43.453L30,43.453z" fill-opacity="0.15" stroke-opacity="0.15"/>
+<path d="M30,42.727c-10.426,0-18.908-8.48-18.908-18.908c0-10.426,8.482-18.91,18.908-18.91  s18.908,8.484,18.908,18.91C48.908,34.246,40.426,42.727,30,42.727L30,42.727z" fill="#BDBDBD"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="29.999" x2="29.999" y1="6.3638" y2="42.0003">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#D4D4D4"/>
+</linearGradient>
+<circle cx="29.999" cy="23.818" fill="url(#SVGID_4_)" r="18.181"/>
+<path d="M30,30.461c-3.662,0-6.644-2.979-6.644-6.643c0-3.662,2.981-6.643,6.644-6.643  c3.663,0,6.645,2.98,6.645,6.643C36.645,27.482,33.663,30.461,30,30.461L30,30.461z" fill="#FFFFFF"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="30" x2="30" y1="18.5815" y2="29.2736">
+<stop offset="0" style="stop-color:#A7A7A7"/>
+<stop offset="1" style="stop-color:#575757"/>
+</linearGradient>
+<circle cx="30" cy="23.818" fill="url(#SVGID_5_)" r="5.455"/>
+<path d="M30,27.818c-1.403,0-2.545-1.141-2.545-2.546c0-1.403,1.142-2.544,2.545-2.544s2.545,1.141,2.545,2.544  C32.545,26.678,31.403,27.818,30,27.818L30,27.818z" fill-opacity="0.15" stroke-opacity="0.15"/>
+<path d="M30,27.091c-1.403,0-2.545-1.141-2.545-2.546c0-1.403,1.142-2.544,2.545-2.544s2.545,1.141,2.545,2.544  C32.545,25.95,31.403,27.091,30,27.091L30,27.091z" fill-opacity="0.15" stroke-opacity="0.15"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="30" x2="30" y1="21.2734" y2="25.8797">
+<stop offset="0" style="stop-color:#F2F2F2"/>
+<stop offset="1" style="stop-color:#9C9C9C"/>
+</linearGradient>
+<path d="M30,26.363c-1.403,0-2.545-1.141-2.545-2.545s1.142-2.545,2.545-2.545s2.545,1.141,2.545,2.545  S31.403,26.363,30,26.363L30,26.363z" fill="url(#SVGID_6_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 0 1816.916)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="30" x2="30" y1="1776.7061" y2="1793.0983">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#BFBFBF"/>
+</linearGradient>
+<path d="M30,30.727c3.81,0,6.91-3.1,6.91-6.908h9.818c0,9.225-7.504,16.727-16.729,16.727  s-16.729-7.502-16.729-16.727h9.819C23.091,27.627,26.191,30.727,30,30.727z" fill="url(#SVGID_7_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="45.2734" x2="46.7285" y1="7.8184" y2="7.8184">
+<stop offset="0" style="stop-color:#F0F0F0"/>
+<stop offset="1" style="stop-color:#D4D4D4"/>
+</linearGradient>
+<path d="M46.729,7.816c0,0.406-0.325,0.73-0.729,0.73c-0.4,0-0.726-0.324-0.726-0.73  c0-0.402,0.325-0.727,0.726-0.727C46.403,7.09,46.729,7.414,46.729,7.816z" fill="url(#SVGID_8_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="48.1797" x2="50.3633" y1="54.728" y2="54.728">
+<stop offset="0" style="stop-color:#F0F0F0"/>
+<stop offset="1" style="stop-color:#D4D4D4"/>
+</linearGradient>
+<path d="M50.363,54.727c0,0.604-0.489,1.093-1.09,1.093c-0.603,0-1.094-0.489-1.094-1.093  c0-0.6,0.491-1.09,1.094-1.09C49.874,53.637,50.363,54.127,50.363,54.727z" fill="url(#SVGID_9_)"/>
+<path d="M25.234,48.957c-1.146,0-3.191-0.967-3.472-1.135c-0.158-0.096-3.782-2.328-2.635-4.234l0.034-0.057  l0.076-0.105l7.997-9.101c0.427-0.602,1.117-0.959,1.856-0.959c0.411,0,0.813,0.112,1.167,0.323  c1.021,0.617,1.392,1.911,0.858,2.969l-4.311,11.394l-0.035,0.058C26.436,48.668,25.888,48.957,25.234,48.957L25.234,48.957z" fill-opacity="0.15" stroke-opacity="0.15"/>
+<path d="M23.779,48.229c-1.146,0-3.19-0.966-3.471-1.134c-0.158-0.097-3.782-2.328-2.635-4.235l0.033-0.057  l0.077-0.104l7.996-9.102c0.428-0.602,1.117-0.959,1.857-0.959c0.41,0,0.813,0.112,1.166,0.324c1.022,0.616,1.393,1.91,0.859,2.969  l-4.311,11.393l-0.035,0.058C24.981,47.94,24.433,48.229,23.779,48.229L23.779,48.229z" fill-opacity="0.15" stroke-opacity="0.15"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="18.1836" x2="29.1768" y1="39.707" y2="39.707">
+<stop offset="0" style="stop-color:#8E8E8E"/>
+<stop offset="0.0364" style="stop-color:#8E8E8E"/>
+<stop offset="1" style="stop-color:#444444"/>
+</linearGradient>
+<path d="M23.779,46.775c-0.917,0-2.807-0.857-3.097-1.031c-0.036-0.021-3.123-2.012-2.386-3.236l0.033-0.057  l8.024-9.132c0.285-0.421,0.771-0.681,1.283-0.681c0.278,0,0.553,0.076,0.792,0.22c0.705,0.426,0.95,1.331,0.567,2.049l-4.302,11.37  l-0.034,0.057C24.562,46.499,24.315,46.775,23.779,46.775L23.779,46.775z" fill="url(#SVGID_10_)"/>
+<linearGradient gradientTransform="matrix(0.5666 0.3407 -0.3408 0.5666 193.5584 513.624)" gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="-588.8296" x2="-588.8296" y1="-492.9287" y2="-472.7992">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#CCCCCC"/>
+</linearGradient>
+<path d="M24.038,45.959c-0.233,0.387-2.597-0.607-2.981-0.838l0,0c-0.384-0.234-2.37-1.852-2.137-2.238  l8.016-9.123c0.234-0.385,0.736-0.508,1.12-0.277l0,0c0.385,0.232,0.509,0.732,0.28,1.117L24.038,45.959z" fill="url(#SVGID_11_)"/>
+<linearGradient gradientTransform="matrix(0.5666 0.3407 -0.3408 0.5666 193.5584 513.624)" gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="-588.8315" x2="-588.8315" y1="-477.6504" y2="-473.626">
+<stop offset="0" style="stop-color:#444444"/>
+<stop offset="0.5455" style="stop-color:#8E8E8E"/>
+<stop offset="1" style="stop-color:#444444"/>
+</linearGradient>
+<path d="M23.201,44.189c-0.384,0.643-1.219,0.852-1.863,0.463c-0.642-0.387-0.849-1.221-0.463-1.863  c0.389-0.641,1.221-0.848,1.863-0.463C23.381,42.715,23.588,43.547,23.201,44.189z" fill="url(#SVGID_12_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="9.6377" x2="11.8174" y1="54.728" y2="54.728">
+<stop offset="0" style="stop-color:#F0F0F0"/>
+<stop offset="1" style="stop-color:#D4D4D4"/>
+</linearGradient>
+<path d="M11.817,54.727c0,0.604-0.487,1.093-1.091,1.093c-0.599,0-1.089-0.489-1.089-1.093  c0-0.6,0.49-1.09,1.089-1.09C11.33,53.637,11.817,54.127,11.817,54.727z" fill="url(#SVGID_13_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="20.9092" x2="20.9092" y1="43.8174" y2="55.5303">
+<stop offset="0" style="stop-color:#8E8E8E"/>
+<stop offset="1" style="stop-color:#444444"/>
+</linearGradient>
+<path d="M14.002,55.527c-1.205,0-2.185-0.98-2.185-2.186V41.965c0-0.195,0.075-0.379,0.215-0.516  l2.387-2.387c0.142-0.141,0.328-0.213,0.514-0.213c0.184,0,0.362,0.064,0.501,0.201c3.761,3.598,8.684,5.67,13.863,5.84  C29.689,44.902,30,45.229,30,45.617v7.725c0,1.205-0.979,2.186-2.18,2.186H14.002z" fill="url(#SVGID_14_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="20.9092" x2="20.9092" y1="43.4331" y2="54.5986">
+<stop offset="0" style="stop-color:#F2F2F2"/>
+<stop offset="1" style="stop-color:#9C9C9C"/>
+</linearGradient>
+<path d="M12.547,41.965v11.377c0,0.803,0.65,1.457,1.455,1.457H27.82c0.802,0,1.45-0.654,1.45-1.457V50  v-3.461v-0.922c-5.55-0.184-10.578-2.447-14.338-6.039L12.547,41.965z" fill="url(#SVGID_15_)"/>
+<path d="M14.933,39.578l-2.386,2.387v0.969l2.386-2.389c3.76,3.592,8.788,5.861,14.338,6.043v-0.049  v-0.922C23.721,45.434,18.692,43.17,14.933,39.578z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="26.7285" x2="26.7285" y1="48.6167" y2="52.1807">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#BFBFBF"/>
+</linearGradient>
+<path d="M26.729,52.181c-1.003,0-1.819-0.815-1.819-1.817c0-1.003,0.816-1.819,1.819-1.819  s1.819,0.816,1.819,1.819C28.548,51.365,27.731,52.181,26.729,52.181L26.729,52.181z" fill="url(#SVGID_16_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="26.7275" x2="26.7275" y1="49.3149" y2="51.453">
+<stop offset="0" style="stop-color:#8E8E8E"/>
+<stop offset="0.0364" style="stop-color:#8E8E8E"/>
+<stop offset="1" style="stop-color:#444444"/>
+</linearGradient>
+<path d="M27.82,50.363c0,0.605-0.492,1.09-1.092,1.09c-0.604,0-1.093-0.484-1.093-1.09  c0-0.602,0.489-1.092,1.093-1.092C27.328,49.271,27.82,49.762,27.82,50.363z" fill="url(#SVGID_17_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="15.0928" x2="15.0928" y1="42.0718" y2="45.6377">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#BFBFBF"/>
+</linearGradient>
+<path d="M15.092,45.638c-1.002,0-1.816-0.817-1.816-1.821c0-1.002,0.814-1.817,1.816-1.817  c1.003,0,1.817,0.815,1.817,1.817C16.909,44.82,16.095,45.638,15.092,45.638L15.092,45.638z" fill="url(#SVGID_18_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="15.0918" x2="15.0918" y1="42.77" y2="44.91">
+<stop offset="0" style="stop-color:#8E8E8E"/>
+<stop offset="0.0364" style="stop-color:#8E8E8E"/>
+<stop offset="1" style="stop-color:#444444"/>
+</linearGradient>
+<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"/>
+</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"/>
+</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"/>
+</g>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mass_storage_offline.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mass_storage_offline.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,102 +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 transform="matrix(1 0 0 1 15 15)">
-<g>
-<rect fill="none" height="60" width="60" x="-15" y="-15"/>
-</g>
-<path d="M33.369,37.043c0,0.676-0.547,1.223-1.225,1.223H-2.141c-0.678,0-1.225-0.547-1.225-1.223V-7.652  c0-0.676,0.547-1.224,1.225-1.224h34.285c0.678,0,1.225,0.548,1.225,1.224V37.043z" fill="#4D4D4D"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -0.0747 30.1592)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15.0764" x2="15.0764" y1="37.8115" y2="-6.8225">
-<stop offset="0" style="stop-color:#444444"/>
-<stop offset="0.5455" style="stop-color:#8E8E8E"/>
-<stop offset="1" style="stop-color:#444444"/>
-</linearGradient>
-<rect fill="url(#SVGID_1_)" height="44.695" width="34.285" x="-2.141" y="-7.652"/>
-<path d="M27.648,0.35l2.164-2.164c0.717-0.716,0.717-1.88,0-2.598l-0.867-0.866  c-0.717-0.718-1.879-0.718-2.6,0l-2.164,2.164L27.648,0.35z" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M15,26.02c-9.115,0-16.531-7.414-16.531-16.529  C-1.531,0.374,5.885-7.042,15-7.042c9.117,0,16.533,7.416,16.533,16.532C31.533,18.605,24.117,26.02,15,26.02L15,26.02z" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M15,25.408c-8.777,0-15.918-7.141-15.918-15.918C-0.918,0.712,6.222-6.43,15-6.43  c8.779,0,15.918,7.142,15.918,15.92C30.918,18.268,23.779,25.408,15,25.408L15,25.408z" fill="#BDBDBD"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -0.0747 30.1592)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="15.0754" x2="15.0754" y1="35.3643" y2="5.3604">
-<stop offset="0" style="stop-color:#F0F0F0"/>
-<stop offset="1" style="stop-color:#D4D4D4"/>
-</linearGradient>
-<circle cx="15" cy="9.49" fill="url(#SVGID_2_)" r="15.307"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -0.0747 30.1592)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="15.0745" x2="15.0745" y1="35.3643" y2="5.3604">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#CCCCCC"/>
-</linearGradient>
-<path d="M15-5.816C6.547-5.816-0.305,1.038-0.305,9.49c0,8.451,6.854,15.307,15.305,15.307  c8.453,0,15.305-6.855,15.305-15.307C30.304,1.038,23.455-5.816,15-5.816z M15,23.57c-7.766,0-14.082-6.316-14.082-14.08  C0.918,1.724,7.234-4.592,15-4.592S29.082,1.724,29.082,9.49C29.082,17.254,22.765,23.57,15,23.57z" fill="url(#SVGID_3_)"/>
-<path d="M15,15.082c-3.082,0-5.592-2.508-5.592-5.592S11.918,3.898,15,3.898s5.592,2.508,5.592,5.592  S18.082,15.082,15,15.082L15,15.082z" fill="#FFFFFF"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -0.0747 30.1592)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="15.0745" x2="15.0745" y1="25.0771" y2="16.0771">
-<stop offset="0" style="stop-color:#BDBDBD"/>
-<stop offset="1" style="stop-color:#7D7D7D"/>
-</linearGradient>
-<circle cx="15" cy="9.49" fill="url(#SVGID_4_)" r="4.592"/>
-<path d="M15,11.632c-1.182,0-2.141-0.96-2.141-2.142c0-1.183,0.959-2.143,2.141-2.143s2.143,0.96,2.143,2.143  C17.142,10.672,16.181,11.632,15,11.632L15,11.632z" fill="#CCCCCC"/>
-<linearGradient gradientTransform="matrix(1 0 0 1 -0.0747 -980.1201)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="15.0745" x2="15.0745" y1="1003.4092" y2="989.6106">
-<stop offset="0" style="stop-color:#F0F0F0"/>
-<stop offset="1" style="stop-color:#D4D4D4"/>
-</linearGradient>
-<path d="M15,15.306c3.209,0,5.816-2.609,5.816-5.815h8.266c0,7.764-6.316,14.08-14.082,14.08  S0.918,17.254,0.918,9.49h8.266C9.183,12.698,11.793,15.306,15,15.306z" fill="url(#SVGID_5_)"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -0.0747 30.1592)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="27.9333" x2="29.156" y1="34.1387" y2="34.1387">
-<stop offset="0" style="stop-color:#F0F0F0"/>
-<stop offset="1" style="stop-color:#D4D4D4"/>
-</linearGradient>
-<circle cx="28.47" cy="-3.98" fill="url(#SVGID_6_)" r="0.612"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -0.0747 30.1592)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="30.3806" x2="32.2186" y1="-5.3506" y2="-5.3506">
-<stop offset="0" style="stop-color:#F0F0F0"/>
-<stop offset="1" style="stop-color:#D4D4D4"/>
-</linearGradient>
-<circle cx="31.224" cy="35.51" fill="url(#SVGID_7_)" r="0.918"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -0.0747 30.1592)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="9.7532" x2="9.7532" y1="13.083" y2="1.2644">
-<stop offset="0" style="stop-color:#444444"/>
-<stop offset="0.5455" style="stop-color:#8E8E8E"/>
-<stop offset="1" style="stop-color:#444444"/>
-</linearGradient>
-<path d="M9.765,28.895c-0.785,0-2.4-0.732-2.646-0.881c-0.029-0.016-2.709-1.721-2.041-2.832  c0.021-0.035,0.047-0.068,0.074-0.1l6.717-7.641c0.256-0.375,0.686-0.605,1.141-0.605c0.248,0,0.492,0.068,0.709,0.199  c0.316,0.188,0.539,0.488,0.627,0.848c0.082,0.332,0.041,0.678-0.121,0.977l-3.598,9.516c-0.016,0.041-0.037,0.078-0.055,0.113  C10.48,28.637,10.254,28.895,9.765,28.895L9.765,28.895z" fill="url(#SVGID_8_)"/>
-<linearGradient gradientTransform="matrix(0.5666 0.3407 0.3408 -0.5666 -331.0199 -35.2638)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="487.6013" x2="487.6013" y1="199.5059" y2="182.5634">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#CCCCCC"/>
-</linearGradient>
-<path d="M9.98,28.129c-0.195,0.324-2.184-0.512-2.508-0.709l0,0c-0.324-0.197-1.996-1.557-1.801-1.881  l6.75-7.68c0.197-0.324,0.619-0.43,0.943-0.234l0,0c0.324,0.195,0.43,0.617,0.232,0.941L9.98,28.129z" fill="url(#SVGID_9_)"/>
-<linearGradient gradientTransform="matrix(0.5666 0.3407 0.3408 -0.5666 -331.0199 -35.2638)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="487.6013" x2="487.6013" y1="186.6445" y2="183.2565">
-<stop offset="0" style="stop-color:#444444"/>
-<stop offset="0.5455" style="stop-color:#8E8E8E"/>
-<stop offset="1" style="stop-color:#444444"/>
-</linearGradient>
-<circle cx="8.299" cy="26.05" fill="url(#SVGID_10_)" r="1.142"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -0.0747 30.1592)" gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="-2.0662" x2="-0.2302" y1="-5.3506" y2="-5.3506">
-<stop offset="0" style="stop-color:#F0F0F0"/>
-<stop offset="1" style="stop-color:#D4D4D4"/>
-</linearGradient>
-<circle cx="-1.223" cy="35.51" fill="url(#SVGID_11_)" r="0.918"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -0.0747 30.1592)" gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="7.4221" x2="7.4221" y1="4.4619" y2="-5.8369">
-<stop offset="0" style="stop-color:#444444"/>
-<stop offset="0.5455" style="stop-color:#8E8E8E"/>
-<stop offset="1" style="stop-color:#444444"/>
-</linearGradient>
-<path d="M1.533,36.182c-1.016,0-1.838-0.822-1.838-1.838v-9.578c0-0.164,0.063-0.316,0.18-0.434l2.01-2.01  c0.119-0.119,0.277-0.182,0.434-0.182c0.152,0,0.305,0.059,0.422,0.172c3.166,3.027,7.309,4.773,11.67,4.918  c0.328,0.01,0.59,0.281,0.59,0.611v6.502c0,1.016-0.824,1.838-1.836,1.838H1.533z" fill="url(#SVGID_12_)"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -0.0747 30.1592)" gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="7.4202" x2="7.4202" y1="4.1572" y2="-5.243">
-<stop offset="0" style="stop-color:#E6E6E6"/>
-<stop offset="1" style="stop-color:#7D7D7D"/>
-</linearGradient>
-<path d="M0.306,24.766v9.578c0,0.676,0.547,1.227,1.225,1.227h11.631c0.674,0,1.223-0.551,1.223-1.227  v-2.813v-2.914v-0.775c-4.672-0.154-8.908-2.061-12.07-5.086L0.306,24.766z" fill="url(#SVGID_13_)"/>
-<path d="M2.316,22.756l-2.01,2.01v0.816l2.01-2.012  c3.162,3.025,7.398,4.934,12.07,5.088v-0.041V27.84C9.715,27.688,5.478,25.781,2.316,22.756z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -0.0747 30.1592)" gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="12.3206" x2="12.3206" y1="-0.7959" y2="-2.5953">
-<stop offset="0" style="stop-color:#444444"/>
-<stop offset="0.5455" style="stop-color:#8E8E8E"/>
-<stop offset="1" style="stop-color:#444444"/>
-</linearGradient>
-<circle cx="12.246" cy="31.836" fill="url(#SVGID_14_)" r="0.918"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -0.0747 30.1592)" gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="2.5256" x2="2.5256" y1="4.7139" y2="2.9129">
-<stop offset="0" style="stop-color:#444444"/>
-<stop offset="0.5455" style="stop-color:#8E8E8E"/>
-<stop offset="1" style="stop-color:#444444"/>
-</linearGradient>
-<circle cx="2.451" cy="26.326" fill="url(#SVGID_15_)" r="0.918"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -0.0747 30.1592)" gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="24.074" x2="24.074" y1="0.0967" y2="-5.6955">
-<stop offset="0" style="stop-color:#FF931E"/>
-<stop offset="1" style="stop-color:#CC6E00"/>
-</linearGradient>
-<path d="M31,33.613V31c0-0.551-0.447-1-1-1H18c-0.551,0-1,0.449-1,1v4c0,0.551,0.449,1,1,1h11.377  c-0.043-0.156-0.07-0.32-0.07-0.49C29.304,34.531,30.047,33.727,31,33.613z" fill="url(#SVGID_16_)"/>
-</g>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_media_transfer.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,70 +1,71 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<linearGradient gradientTransform="matrix(1 0 0 1 2296.5195 1443.9805)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2266.519" x2="-2266.519" y1="-1432.3472" y2="-1395.6118">
+<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="M51.734,11.633H8.266c-0.678,0-1.225,0.549-1.225,1.225v34.285c0,0.678,0.547,1.226,1.225,1.226  h43.468c0.677,0,1.226-0.548,1.226-1.226V12.857C52.959,12.182,52.41,11.633,51.734,11.633z M12.551,45.918  c0,0.338-0.275,0.613-0.611,0.613H9.49c-0.338,0-0.613-0.275-0.613-0.613v-1.225c0-0.336,0.275-0.611,0.613-0.611h2.449  c0.336,0,0.611,0.275,0.611,0.611L12.551,45.918L12.551,45.918z M12.551,15.307c0,0.336-0.275,0.611-0.611,0.611H9.49  c-0.338,0-0.613-0.275-0.613-0.611v-1.225c0-0.336,0.275-0.613,0.613-0.613h2.449c0.336,0,0.611,0.277,0.611,0.613L12.551,15.307  L12.551,15.307z M18.061,45.918c0,0.338-0.275,0.613-0.611,0.613H15c-0.338,0-0.612-0.275-0.612-0.613v-1.225  c0-0.336,0.274-0.611,0.612-0.611h2.449c0.336,0,0.611,0.275,0.611,0.611L18.061,45.918L18.061,45.918z M18.061,15.307  c0,0.336-0.275,0.611-0.611,0.611H15c-0.338,0-0.612-0.275-0.612-0.611v-1.225c0-0.336,0.274-0.613,0.612-0.613h2.449  c0.336,0,0.611,0.277,0.611,0.613L18.061,15.307L18.061,15.307z M23.571,45.918c0,0.338-0.276,0.613-0.612,0.613H20.51  c-0.336,0-0.611-0.275-0.611-0.613v-1.225c0-0.336,0.274-0.611,0.611-0.611h2.449c0.336,0,0.612,0.275,0.612,0.611V45.918z   M23.571,15.307c0,0.336-0.276,0.611-0.612,0.611H20.51c-0.336,0-0.611-0.275-0.611-0.611v-1.225c0-0.336,0.274-0.613,0.611-0.613  h2.449c0.336,0,0.612,0.277,0.612,0.613V15.307z M29.082,45.918c0,0.338-0.276,0.613-0.613,0.613h-2.448  c-0.337,0-0.612-0.275-0.612-0.613v-1.225c0-0.336,0.275-0.611,0.612-0.611h2.448c0.337,0,0.613,0.275,0.613,0.611V45.918z   M29.082,15.307c0,0.336-0.276,0.611-0.613,0.611h-2.448c-0.337,0-0.612-0.275-0.612-0.611v-1.225c0-0.336,0.275-0.613,0.612-0.613  h2.448c0.337,0,0.613,0.277,0.613,0.613V15.307z M34.592,45.918c0,0.338-0.275,0.613-0.611,0.613h-2.448  c-0.339,0-0.613-0.275-0.613-0.613v-1.225c0-0.336,0.274-0.611,0.613-0.611h2.448c0.336,0,0.611,0.275,0.611,0.611V45.918z   M34.592,15.307c0,0.336-0.275,0.611-0.611,0.611h-2.448c-0.339,0-0.613-0.275-0.613-0.611v-1.225c0-0.336,0.274-0.613,0.613-0.613  h2.448c0.336,0,0.611,0.277,0.611,0.613V15.307z M40.102,45.918c0,0.338-0.274,0.613-0.61,0.613h-2.449  c-0.338,0-0.612-0.275-0.612-0.613v-1.225c0-0.336,0.274-0.611,0.612-0.611h2.449c0.336,0,0.61,0.275,0.61,0.611V45.918z   M40.102,15.307c0,0.336-0.274,0.611-0.61,0.611h-2.449c-0.338,0-0.612-0.275-0.612-0.611v-1.225c0-0.336,0.274-0.613,0.612-0.613  h2.449c0.336,0,0.61,0.277,0.61,0.613V15.307z M45.611,45.918c0,0.338-0.275,0.613-0.611,0.613h-2.449  c-0.337,0-0.611-0.275-0.611-0.613v-1.225c0-0.336,0.274-0.611,0.611-0.611H45c0.336,0,0.611,0.275,0.611,0.611V45.918z   M45.611,15.307c0,0.336-0.275,0.611-0.611,0.611h-2.449c-0.337,0-0.611-0.275-0.611-0.611v-1.225c0-0.336,0.274-0.613,0.611-0.613  H45c0.336,0,0.611,0.277,0.611,0.613V15.307z M51.123,45.918c0,0.338-0.277,0.613-0.613,0.613h-2.449  c-0.336,0-0.61-0.275-0.61-0.613v-1.225c0-0.336,0.274-0.611,0.61-0.611h2.449c0.336,0,0.613,0.275,0.613,0.611V45.918z   M51.123,15.307c0,0.336-0.277,0.611-0.613,0.611h-2.449c-0.336,0-0.61-0.275-0.61-0.611v-1.225c0-0.336,0.274-0.613,0.61-0.613  h2.449c0.336,0,0.613,0.277,0.613,0.613V15.307z" fill="url(#SVGID_1_)"/>
-<path d="M51.734,11.633H8.266c-0.678,0-1.225,0.549-1.225,1.225v0.611  c0-0.676,0.547-1.225,1.225-1.225h43.468c0.677,0,1.226,0.549,1.226,1.225v-0.611C52.959,12.182,52.41,11.633,51.734,11.633z" fill="#FFFFFF" fill-opacity="0.55" stroke-opacity="0.55"/>
-<path d="M8.266,48.367h43.468c0.677,0,1.226-0.547,1.226-1.225v-0.611  c0,0.676-0.549,1.225-1.226,1.225H8.266c-0.678,0-1.225-0.549-1.225-1.225v0.611C7.041,47.82,7.588,48.367,8.266,48.367z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
-<linearGradient gradientTransform="matrix(1 0 0 1 2296.5195 1443.9805)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2266.5195" x2="-2266.5195" y1="-1426.1284" y2="-1401.6362">
+<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="24.492" width="45.918" x="7.041" y="17.754"/>
-<linearGradient gradientTransform="matrix(1 0 0 1 2296.5195 1443.9805)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2266.519" x2="-2266.519" y1="-1401.7349" y2="-1426.2271">
+<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="M51.123,41.021c0,0.674-0.553,1.225-1.225,1.225H10.102c-0.673,0-1.225-0.551-1.225-1.225V18.979  c0-0.672,0.552-1.225,1.225-1.225h39.796c0.672,0,1.226,0.553,1.226,1.225L51.123,41.021L51.123,41.021z" fill="url(#SVGID_3_)"/>
-<path d="M49.898,41.021H10.102c-0.673,0-1.225,0.061-1.225-0.613l0,0  c0,0.674,0.552,1.225,1.225,1.225h39.796c0.672,0,1.226-0.551,1.226-1.225l0,0C51.123,41.082,50.57,41.021,49.898,41.021z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
-<linearGradient gradientTransform="matrix(1 0 0 1 2296.5195 1443.9805)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-2266.519" x2="-2266.519" y1="-1426.2261" y2="-1401.6362">
+<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="M49.898,18.367c0.336,0,0.61,0.275,0.61,0.611v22.043c0,0.338-0.274,0.61-0.61,0.61H10.102  c-0.337,0-0.611-0.272-0.611-0.61V18.979c0-0.336,0.274-0.611,0.611-0.611L49.898,18.367 M49.898,17.754H10.102  c-0.673,0-1.225,0.553-1.225,1.225v22.042c0,0.674,0.552,1.226,1.225,1.226h39.796c0.672,0,1.226-0.552,1.226-1.226V18.979  C51.123,18.307,50.57,17.754,49.898,17.754L49.898,17.754z" fill="url(#SVGID_4_)"/>
-<path d="M49.898,25.102v-4.898c0-0.676-0.549-1.225-1.226-1.225H11.326  c-0.676,0-1.225,0.549-1.225,1.225v7.961L49.898,25.102z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
+<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.4355" x2="17.4355" y1="11.6211" y2="23.2553">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+<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,20.996l8.392-4.184v2.635l0.379-0.072c3.278-0.629,5.699-2.189,6.479-4.178  c0.428-1.096,0.368-2.309-0.166-3.576c0.945,1.015,1.97,2.541,1.76,4.252c-0.307,2.496-3.08,4.732-8.244,6.648L17.393,22.6v2.58  L9,20.996z" fill="url(#SVGID_1__)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="15.0161" x2="15.0161" y1="25.7148" y2="21.0198">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="1" style="stop-color:#66A00E"/>
+<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.052l9.315,4.646v-2.875c1.562-0.58,2.855-1.173,3.926-1.771H8.396z" fill="url(#SVGID_2__)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="12.563" x2="12.563" y1="18.1641" y2="4.5204">
-<stop offset="0" style="stop-color:#45E8FF"/>
-<stop offset="0.5" style="stop-color:#30A4D5"/>
-<stop offset="1" style="stop-color:#1347BA"/>
+<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.782c-0.945-1.015-1.97-2.541-1.76-4.251c0.307-2.496,3.08-4.734,8.243-6.65l0.208-0.076  V4.223l8.391,4.185l-8.391,4.183V9.955l-0.379,0.072c-3.278,0.629-5.7,2.191-6.478,4.178C5.321,15.301,5.381,16.516,5.916,17.782  L5.916,17.782z" fill="url(#SVGID_3__)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="14.9829" x2="14.9829" y1="4.2354" y2="7.6023">
-<stop offset="0" style="stop-color:#45E8FF"/>
-<stop offset="1" style="stop-color:#30A4D5"/>
+<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.604,8.352l-9.315-4.645v2.875c-1.561,0.579-2.855,1.172-3.925,1.77H21.604z" fill="url(#SVGID_4__)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="12.7612" x2="12.7612" y1="4.0361" y2="13.8204">
-<stop offset="0" style="stop-color:#93E1FF"/>
-<stop offset="0.0061" style="stop-color:#93E1FF"/>
-<stop offset="1" style="stop-color:#1185BF"/>
+<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.607,4.223l8.391,4.185l-8.391,4.183v-2.248V9.955l-0.379,0.072  c-3.278,0.629-5.699,2.191-6.478,4.178c-0.429,1.098-0.369,2.313,0.167,3.581c-0.946-1.013-1.971-2.538-1.762-4.253  c0.305-2.497,3.079-4.735,8.243-6.652l0.208-0.076V6.582V4.223 M12.288,3.707v2.875C-3.124,12.301,7.182,19.33,7.182,19.33  c-3.553-4.822,0.214-8.051,5.106-8.988v2.766l9.427-4.7L12.288,3.707L12.288,3.707z" fill="url(#SVGID_5_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="17.2383" x2="17.2383" y1="14.9287" y2="25.6855">
-<stop offset="0" style="stop-color:#C5FE45"/>
-<stop offset="1" style="stop-color:#4B8B00"/>
+<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.817,10.073c3.553,4.821-0.214,8.05-5.106,8.987v-2.765l-9.426,4.7l9.426,4.701v-2.875  C33.123,17.102,22.817,10.073,22.817,10.073z M17.6,22.521L17.393,22.6v0.223v2.357L9,20.996l8.392-4.184v2.248v0.387l0.379-0.072  c3.278-0.629,5.7-2.189,6.479-4.178c0.428-1.096,0.368-2.309-0.166-3.576c0.945,1.015,1.971,2.541,1.76,4.252  C25.537,18.369,22.764,20.605,17.6,22.521z" fill="url(#SVGID_6_)"/>
+<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 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_meeting.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_meeting.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+<path d="M22.961,40.855c0.434,0.141,1.064,0.347,1.759,1.001c0.498,0.47,0.759,0.762,0.874,1.026  c0.185-0.663,0.092-0.914-0.874-1.824c-0.694-0.655-1.325-0.861-1.759-1.001c-0.671-0.218-1.113,0.419-2.117,0.597  C21.686,40.596,22.234,40.62,22.961,40.855z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
+<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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</g>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_message.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_message.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_message.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,40 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<g>
 <rect fill="none" height="60" width="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="30" x2="30" y1="14.61" y2="45.15">
-<stop offset="0" stop-color="#FEEFA7"/>
-<stop offset="0.51" stop-color="#FFC501"/>
-<stop offset="1" stop-color="#F6A800"/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_1)" points="51.425,45.609 8.571,45.609 8.571,14.387 30.352,14.999 51.425,14.387 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="30" x2="30" y1="14.46" y2="45.79">
-<stop offset="0" stop-color="#F7AC00"/>
-<stop offset="0.34" stop-color="#FFF8DB"/>
-<stop offset="1" stop-color="#FFE066"/>
+<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"/>
 </linearGradient>
-<path d="M50.953,14.861v30.272H9.042V14.861H50.953 M51.425,14.387l-21.58,0.257L8.571,14.387v31.223 h42.854V14.387L51.425,14.387z" fill="url(#SVGID_2)"/>
-<polygon fill="#FBAB13" fill-opacity="0.3" points="8.571,45.08 51.425,45.08 51.425,44.473 29.997,25.657 8.571,44.473 " stroke-opacity="0.3"/>
-<polygon fill="#F18800" fill-opacity="0.3" points="8.571,45.609 51.425,45.609 51.425,44.999 29.997,26.186 8.571,44.999 " stroke-opacity="0.3"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="30" x2="30" y1="26.6" y2="45.49">
-<stop offset="0" stop-color="#F98A00"/>
-<stop offset="0.73" stop-color="#FCBC3C"/>
-<stop offset="1" stop-color="#FFE36A"/>
+<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"/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_3)" points="51.425,45.594 29.997,26.699 8.571,45.594 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="30" x2="30" y1="26.55" y2="46.12">
-<stop offset="0" stop-color="#FFF1B5"/>
-<stop offset="1" stop-color="#FFE066"/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_4)" points="51.425,45.594 29.997,26.699 8.571,45.594 29.997,27.368 "/>
-<polygon fill="#F18800" fill-opacity="0.3" points="30.041,14.999 8.571,14.387 29.997,36.592 51.425,14.387 " stroke-opacity="0.3"/>
-<polygon fill="#C26D00" fill-opacity="0.4" points="30.002,14.999 8.571,14.387 29.997,35.424 51.425,14.387 " stroke-opacity="0.4"/>
-<polygon fill="#AB6100" fill-opacity="0.4" points="29.924,14.92 8.571,14.387 29.997,34.438 51.425,14.387 " stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="30" x2="30" y1="32.26" y2="13.17">
-<stop offset="0" stop-color="#FFDA33"/>
-<stop offset="0.25" stop-color="#FFE692"/>
-<stop offset="1" stop-color="#FFFBF8"/>
+<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"/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_5)" points="8.571,14.387 29.997,33.281 51.425,14.387 "/>
-<rect fill="none" height="59.996" width="59.996"/>
+<polygon fill="url(#SVGID_5_)" points="2,9.6 29.998,34.29 58,9.6 "/>
+<rect fill="none" height="60" width="60"/>
+</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_message_group.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,199 +1,222 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<g>
 <rect fill="none" height="60" width="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="30" x2="30" y1="14.61" y2="45.15">
-<stop offset="0" stop-color="#FEEFA7"/>
-<stop offset="0.51" stop-color="#FFC501"/>
-<stop offset="1" stop-color="#F6A800"/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_1)" points="51.425,45.609 8.571,45.609 8.571,14.387 30.352,14.999 51.425,14.387 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="30" x2="30" y1="14.46" y2="45.79">
-<stop offset="0" stop-color="#F7AC00"/>
-<stop offset="0.34" stop-color="#FFF8DB"/>
-<stop offset="1" stop-color="#FFE066"/>
+<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"/>
 </linearGradient>
-<path d="M50.953,14.861v30.272H9.042V14.861H50.953 M51.425,14.387l-21.58,0.257L8.571,14.387v31.223 h42.854V14.387L51.425,14.387z" fill="url(#SVGID_2)"/>
-<polygon fill="#FBAB13" fill-opacity="0.3" points="8.571,45.08 51.425,45.08 51.425,44.473 29.997,25.657 8.571,44.473 " stroke-opacity="0.3"/>
-<polygon fill="#F18800" fill-opacity="0.3" points="8.571,45.609 51.425,45.609 51.425,44.999 29.997,26.186 8.571,44.999 " stroke-opacity="0.3"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="30" x2="30" y1="26.6" y2="45.49">
-<stop offset="0" stop-color="#F98A00"/>
-<stop offset="0.73" stop-color="#FCBC3C"/>
-<stop offset="1" stop-color="#FFE36A"/>
+<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"/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_3)" points="51.425,45.594 29.997,26.699 8.571,45.594 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="30" x2="30" y1="26.55" y2="46.12">
-<stop offset="0" stop-color="#FFF1B5"/>
-<stop offset="1" stop-color="#FFE066"/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_4)" points="51.425,45.594 29.997,26.699 8.571,45.594 29.997,27.368 "/>
-<polygon fill="#F18800" fill-opacity="0.3" points="30.041,14.999 8.571,14.387 29.997,36.592 51.425,14.387 " stroke-opacity="0.3"/>
-<polygon fill="#C26D00" fill-opacity="0.4" points="30.002,14.999 8.571,14.387 29.997,35.424 51.425,14.387 " stroke-opacity="0.4"/>
-<polygon fill="#AB6100" fill-opacity="0.4" points="29.924,14.92 8.571,14.387 29.997,34.438 51.425,14.387 " stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="30" x2="30" y1="32.26" y2="13.17">
-<stop offset="0" stop-color="#FFDA33"/>
-<stop offset="0.25" stop-color="#FFE692"/>
-<stop offset="1" stop-color="#FFFBF8"/>
+<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"/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_5)" points="8.571,14.387 29.997,33.281 51.425,14.387 "/>
-<rect fill="none" height="59.996" width="59.996"/>
-<g transform="matrix(0.5 0 0 0.5 30 30)">
-<radialGradient cx="42.39" cy="42.29" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="11.1">
+<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 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"/>
 </radialGradient>
-<path d="M46.91,37.354c-1.044-0.453-1.012-2.678-0.582-3.35c0.076-0.118,0.145-0.234,0.216-0.352 h-8.731c0.069,0.117,0.138,0.233,0.213,0.352c0.431,0.672,0.463,2.896-0.58,3.35C36.4,37.809,42.3,41.758,42.3,41.758 S47.954,37.807,46.91,37.354z" fill="url(#SVGID_1_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="42.18" x2="42.18" y1="36.94" y2="46.09">
+<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"/>
 </linearGradient>
-<path d="M53.188,39.672c-1.098-0.572-6.541-2.477-6.644-2.598l-4.157,3.458l-4.467-3.591 c-0.126,0.185-5.504,2.07-6.748,2.73c-1.426,0.756-3.754,2.494-3.754,6.414h29.521C56.939,42.166,54.286,40.242,53.188,39.672z" fill="url(#SVGID_2_)"/>
-<polygon fill="#020202" fill-opacity="0.3" points="36.9,37.386 42.384,41.758 47.536,37.475 46.542,37.074 42.384,40.532 37.918,36.941 " stroke-opacity="0.3"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="42.22" x2="42.22" y1="42.15" y2="37.1">
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_3_)" points="42.384,41.758 36.9,37.386 36.582,37.525 42.384,42.148 47.857,37.6 47.54,37.473 "/>
-<radialGradient cx="42.93" cy="21.83" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="14.9">
+<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"/>
 </radialGradient>
-<path d="M49.42,27.128c-0.038-0.016-0.08-0.018-0.118-0.03c0-0.002,0-0.002,0-0.002 c-0.008-0.002-0.014-0.004-0.014-0.004c-0.065-0.016-0.124-0.028-0.185-0.032c-7.289-1.27-10.636-5.308-10.886-4.238 c-0.202,0.85-2.245,2.692-3.315,3.61c0.008,0.042,0.016,0.078,0.023,0.12c0,0,0.04,0.188,0.12,0.508 c-0.084,0.01-0.168,0.028-0.248,0.06c-0.682,0.29-0.896,1.404-0.478,2.496c0.418,1.09,1.306,1.741,1.99,1.456 c0.041-0.018,0.078-0.047,0.115-0.072c0.396,0.891,0.881,1.844,1.477,2.8c0.998,1.187,2.525,2.576,4.211,2.576 c2.041,0,3.291-1.118,4.146-2.242c0.022-0.048,0.045-0.094,0.068-0.13c0.636-0.994,1.152-1.992,1.57-2.92 c0.666,0.23,1.521-0.389,1.947-1.438C50.286,28.562,50.094,27.434,49.42,27.128z" fill="url(#SVGID_4_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="39.55" x2="45.84" y1="37.06" y2="30.81">
+<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"/>
 </linearGradient>
-<path d="M41.813,35.805c-1.242,0-2.494-0.578-3.416-1.453c0.974,1.026,2.287,2.024,3.715,2.024 c2.041,0,3.291-1.118,4.146-2.242c0.021-0.048,0.044-0.094,0.068-0.13c0.636-0.994,1.152-1.992,1.57-2.92 C45.578,35.141,43.854,35.805,41.813,35.805z" fill="url(#SVGID_5_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6" x1="42.05" x2="42.05" y1="17.11" y2="26.38">
+<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"/>
 </linearGradient>
-<path d="M41.908,16.966c-2.53,0-3.744,1.148-4.682,2.35c-1.528,0.234-3.947,1.634-2.238,7.764 c1.07-0.918,3.029-3.406,3.229-4.256c0.255-1.08,3.656,3.042,11.084,4.274c0.089-0.344,0.126-0.544,0.126-0.544 C50.596,21.318,48.059,17.172,41.908,16.966z" fill="url(#SVGID_6)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7" x1="45.22" x2="36.82" y1="25.98" y2="20.99">
+<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"/>
 </linearGradient>
-<path d="M38.227,22.322c0,0,3.635,4.778,11.023,4.768C49.25,27.09,45.773,26.544,38.227,22.322z" fill="url(#SVGID_7)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8" x1="36.07" x2="36.14" y1="20.02" y2="25.35">
+<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"/>
 </linearGradient>
-<path d="M37.354,19.672c0,0-3.56,0.212-2.24,6.246C35.113,25.918,34.678,21.786,37.354,19.672z" fill="url(#SVGID_8)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9" x1="43.23" x2="42.97" y1="17.9" y2="20.32">
+<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"/>
 </linearGradient>
-<path d="M43.632,20.508c-1.655-0.236-4.46-1.706-5.558-1.18c0,0,3.598-4.106,9.943,0.568 C48.018,19.896,46.506,20.916,43.632,20.508z" fill="url(#SVGID_9)"/>
-<radialGradient cx="18.03" cy="42.29" gradientUnits="userSpaceOnUse" id="SVGID_10" r="11.1">
+<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"/>
 </radialGradient>
-<path d="M22.552,37.354c-1.042-0.453-1.01-2.678-0.58-3.35c0.074-0.118,0.144-0.234,0.216-0.352 h-8.73c0.07,0.117,0.138,0.233,0.214,0.352c0.43,0.672,0.46,2.896-0.58,3.35c-1.046,0.455,4.854,4.404,4.854,4.404 S23.6,37.807,22.552,37.354z" fill="url(#SVGID_10)"/>
-<path d="M28.832,39.672c-1.098-0.572-6.542-2.477-6.644-2.598l-4.158,3.458l-4.466-3.591 c-0.126,0.185-5.504,2.07-6.75,2.73c-1.424,0.756-3.752,2.494-3.752,6.414h29.522C32.582,42.166,29.93,40.242,28.832,39.672z" fill="url(#SVGID_2_)"/>
-<polygon fill="#020202" fill-opacity="0.3" points="12.544,37.386 18.03,41.758 23.182,37.475 22.188,37.074 18.03,40.532 13.562,36.941 " stroke-opacity="0.3"/>
-<polygon fill="url(#SVGID_3_)" points="18.03,41.758 12.542,37.386 12.226,37.525 18.03,42.148 23.502,37.6 23.184,37.473 "/>
-<radialGradient cx="18.57" cy="21.83" gradientUnits="userSpaceOnUse" id="SVGID_13" r="14.9">
+<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"/>
+</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"/>
+</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"/>
 </radialGradient>
-<path d="M25.064,27.128c-0.038-0.016-0.08-0.018-0.118-0.03c0-0.002,0-0.002,0-0.002 c-0.008-0.002-0.014-0.004-0.024-0.004c-0.056-0.016-0.114-0.028-0.174-0.032c-7.29-1.27-10.634-5.308-10.886-4.238 c-0.204,0.85-2.246,2.692-3.316,3.61c0.008,0.042,0.016,0.078,0.024,0.12c0,0,0.04,0.188,0.12,0.508 c-0.086,0.01-0.17,0.028-0.248,0.06c-0.682,0.29-0.894,1.404-0.478,2.496c0.418,1.09,1.306,1.741,1.99,1.456 c0.042-0.018,0.078-0.047,0.116-0.072c0.396,0.891,0.88,1.844,1.476,2.8c0.998,1.187,2.526,2.576,4.212,2.576 c2.04,0,3.29-1.118,4.146-2.242c0.022-0.048,0.044-0.094,0.068-0.13c0.636-0.994,1.152-1.992,1.57-2.92 c0.668,0.23,1.522-0.389,1.946-1.438C25.928,28.562,25.738,27.434,25.064,27.128z" fill="url(#SVGID_13)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14" x1="15.19" x2="21.49" y1="37.06" y2="30.81">
+<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"/>
 </linearGradient>
-<path d="M17.458,35.805c-1.242,0-2.494-0.578-3.416-1.453c0.974,1.026,2.288,2.024,3.716,2.024 c2.04,0,3.29-1.118,4.146-2.242c0.022-0.048,0.044-0.094,0.068-0.13c0.636-0.994,1.152-1.992,1.57-2.92 C21.222,35.141,19.498,35.805,17.458,35.805z" fill="url(#SVGID_14)"/>
-<path d="M17.552,16.966c-2.53,0-3.744,1.148-4.684,2.35c-1.526,0.234-3.946,1.634-2.236,7.764 c1.07-0.918,3.028-3.406,3.23-4.256c0.254-1.08,3.656,3.042,11.084,4.274c0.086-0.344,0.126-0.544,0.126-0.544 C26.24,21.318,23.704,17.172,17.552,16.966z" fill="url(#SVGID_6)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16" x1="20.87" x2="12.47" y1="25.98" y2="20.99">
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M13.872,22.322c0,0,3.636,4.778,11.026,4.768C24.896,27.09,21.416,26.544,13.872,22.322z" fill="url(#SVGID_16)"/>
-<path d="M12.996,19.672c0,0-3.558,0.212-2.238,6.246C10.758,25.918,10.322,21.786,12.996,19.672z" fill="url(#SVGID_8)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18" x1="18.88" x2="18.62" y1="17.9" y2="20.32">
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M19.278,20.508c-1.656-0.236-4.46-1.706-5.56-1.18c0,0,3.6-4.106,9.946,0.568 C23.662,19.896,22.148,20.916,19.278,20.508z" fill="url(#SVGID_18)"/>
-<path d="M46.641,40.864c-1.013-0.528-4.162-1.698-6.695-2.636 l-1.422-0.53l-0.256-0.103l-0.332-0.128L37.3,37.212l-0.392,0.172c-0.002,0.002-0.006,0.002-0.008,0.005h-0.002 c-1.652,0.646-4.813,1.795-5.729,2.285c-0.357,0.19-0.772,0.442-1.192,0.774c-0.442-0.364-0.852-0.62-1.146-0.774 c-0.79-0.41-3.808-1.506-5.492-2.136l-0.156-0.062l-0.004,0.002l-0.698-0.283l-0.634,0.279c-0.622,0.243-1.386,0.535-2.206,0.846 l-0.076,0.029c-2.42,0.92-5.164,1.963-6.214,2.522C10.996,42.122,9.3,43.891,8.3,46.09h19.118h5.166h19.04 C50.055,42.818,47.355,41.234,46.641,40.864z" fill="#231F20" fill-opacity="0.15" stroke-opacity="0.15"/>
-<path d="M18.104,22.872c-1.122,0.954-1.424,2.864-0.698,4.76 c0.684,1.788,2.096,2.988,3.516,2.988h0.004c0.212,0.442,0.434,0.878,0.662,1.308h-0.066l0.542,0.896c0,0,0.142,0.23,0.308,0.506 c0.452-0.766,0.848-1.528,1.172-2.246c0.668,0.23,1.522-0.389,1.946-1.438c0.44-1.084,0.25-2.212-0.424-2.518 c-0.038-0.016-0.08-0.018-0.118-0.03c0-0.002,0-0.002,0-0.002c-0.008-0.002-0.014-0.004-0.024-0.004 c-0.056-0.016-0.114-0.028-0.174-0.032c-0.014-0.004-0.024-0.006-0.038-0.01c-0.03-0.006-0.064-0.014-0.1-0.022 c0.114,0.022,0.218,0.046,0.334,0.066c0.086-0.344,0.126-0.544,0.126-0.544c1.166-5.234-1.372-9.38-7.522-9.586 c-0.012,0-0.02,0.002-0.034,0.002C17.36,18.634,17.546,20.6,18.104,22.872z" fill="#231F20" fill-opacity="0.15" stroke-opacity="0.15"/>
-<path d="M37.227,19.316c-1.528,0.234-3.947,1.634-2.238,7.758 c-0.066,0.012-0.129,0.022-0.192,0.046c-0.683,0.29-0.896,1.404-0.478,2.496c0.418,1.09,1.306,1.741,1.99,1.456 c0.041-0.018,0.078-0.047,0.115-0.072c0.33,0.742,0.729,1.532,1.198,2.326c0.524-0.883,1.022-1.794,1.472-2.738 c1.293-0.154,2.557-1.278,3.211-2.888c0.743-1.838,0.506-3.746-0.545-4.74c0.471-2.124,0.545-4.146,0.234-5.986 c-0.03-0.002-0.057-0.006-0.086-0.006C39.378,16.966,38.164,18.116,37.227,19.316z M34.996,27.072 c0.014-0.012,0.029-0.026,0.042-0.038c0,0.01,0.004,0.016,0.006,0.026C35.029,27.062,35.012,27.07,34.996,27.072z M38.52,22.662 L38.52,22.662c-0.018-0.004-0.041-0.014-0.058-0.016C38.479,22.648,38.502,22.658,38.52,22.662z" fill="#231F20" fill-opacity="0.15" stroke-opacity="0.15"/>
-<path d="M46.37,41.386c-0.979-0.51-4.112-1.672-6.628-2.608 l-1.436-0.533l-0.248-0.1l-0.343-0.131l-0.968-0.39c-0.032-0.042-0.055-0.101-0.082-0.146c-1.7,0.655-4.62,1.726-5.494,2.193 c-0.357,0.189-0.772,0.442-1.192,0.773c-0.442-0.363-0.852-0.619-1.146-0.773c-0.79-0.41-3.808-1.506-5.492-2.136L23.256,37.5 l-1.192,0.521c-0.64,0.25-1.438,0.553-2.288,0.877c-2.404,0.914-5.13,1.951-6.148,2.49c-2.142,1.135-3.714,2.726-4.676,4.697h18.464 h5.166h18.38C49.464,43.156,47.027,41.729,46.37,41.386z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M17.958,27.42c0.596,1.56,1.788,2.608,2.962,2.608 c0.124,0,0.244-0.01,0.362-0.034c0.404,0.865,0.838,1.71,1.302,2.523h-0.018l0.136,0.225c0.31-0.566,0.6-1.126,0.838-1.658 c0.668,0.23,1.522-0.389,1.946-1.438c0.44-1.084,0.25-2.212-0.424-2.518c-0.038-0.016-0.08-0.018-0.118-0.03 c0-0.002,0-0.002,0-0.002c-0.008-0.002-0.014-0.004-0.024-0.004c-0.056-0.016-0.114-0.028-0.174-0.032 c-0.014-0.004-0.024-0.006-0.038-0.01c-0.03-0.006-0.064-0.014-0.1-0.022c0.114,0.022,0.218,0.046,0.334,0.066 c0.086-0.344,0.126-0.544,0.126-0.544c1.128-5.07-1.226-9.112-6.966-9.544c-0.16,1.694,0.052,3.728,0.672,6.114 C17.626,23.778,17.264,25.606,17.958,27.42z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M37.227,19.316c-1.528,0.234-3.947,1.634-2.238,7.758 c-0.066,0.012-0.129,0.022-0.192,0.046c-0.683,0.29-0.896,1.404-0.478,2.496c0.418,1.09,1.306,1.741,1.99,1.456 c0.041-0.018,0.078-0.047,0.115-0.072c0.248,0.557,0.536,1.139,0.858,1.729c0.51-0.879,0.993-1.783,1.43-2.714 c0.026,0.002,0.05,0.002,0.078,0.002c1.16,0,2.353-1.022,2.966-2.54c0.717-1.768,0.42-3.57-0.65-4.288 c0.049-0.212,0.072-0.332,0.072-0.332c0.467-2.086,0.534-4.07,0.221-5.862C39.221,17.144,38.098,18.202,37.227,19.316z M34.996,27.072c0.014-0.012,0.029-0.026,0.042-0.038c0,0.01,0.004,0.016,0.006,0.026C35.029,27.062,35.012,27.07,34.996,27.072z M38.52,22.662L38.52,22.662c-0.018-0.004-0.041-0.014-0.058-0.016C38.479,22.648,38.502,22.658,38.52,22.662z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
-<radialGradient cx="30.3" cy="45.73" gradientUnits="userSpaceOnUse" id="SVGID_19" r="16.23">
+<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;"/>
+<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"/>
 </radialGradient>
-<path d="M36.918,38.521c-1.527-0.664-1.477-3.914-0.848-4.897c0.109-0.17,0.207-0.342,0.313-0.515 h-12.77c0.106,0.173,0.206,0.345,0.314,0.515c0.63,0.983,0.68,4.233-0.848,4.897c-1.528,0.662,7.098,6.438,7.098,6.438 S38.445,39.184,36.918,38.521z" fill="url(#SVGID_19)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_20" x1="30" x2="30" y1="37.92" y2="51.29">
+<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"/>
 </linearGradient>
-<path d="M46.098,41.91c-1.605-0.836-9.563-3.622-9.714-3.794l-6.08,5.05l-6.532-5.246 c-0.18,0.268-8.046,3.023-9.868,3.99c-2.084,1.105-5.486,3.646-5.486,9.376H51.58C51.58,45.557,47.7,42.746,46.098,41.91z" fill="url(#SVGID_20)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_21" x1="30.06" x2="30.06" y1="37.04" y2="44.86">
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_21)" points="22.284,38.568 30.302,44.958 37.836,38.7 36.382,38.116 30.302,43.166 23.772,37.92 "/>
-<path d="M22.66,39.58c0,0-11.44,2.986-11.44,11.004c0,0-1.634,0-1.646,0 C9.574,45.654,13.418,41.82,22.66,39.58z" fill="#FF7B56"/>
-<path d="M37.189,39.395c0,0,11.44,2.987,11.44,11.004c0,0,1.636,0,1.647,0 C50.277,45.468,46.432,41.636,37.189,39.395z" fill="#FF7B56"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_22" x1="30.06" x2="30.06" y1="45.53" y2="38.15">
+<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"/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_22)" points="30.302,44.958 22.282,38.568 21.816,38.773 30.302,45.534 38.302,38.88 37.838,38.693 "/>
-<radialGradient cx="31.09" cy="15.82" gradientUnits="userSpaceOnUse" id="SVGID_23" r="21.78">
+<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"/>
 </radialGradient>
-<path d="M40.588,23.574c-0.054-0.026-0.115-0.03-0.172-0.044c0-0.002,0-0.004,0-0.004 c-0.01-0.002-0.02-0.004-0.032-0.006c-0.084-0.022-0.17-0.042-0.256-0.044c-10.66-1.856-15.55-7.76-15.918-6.198 c-0.294,1.244-3.282,3.936-4.848,5.278c0.014,0.06,0.02,0.114,0.036,0.174c0,0,0.054,0.276,0.172,0.744 c-0.124,0.014-0.246,0.04-0.364,0.09c-0.996,0.42-1.308,2.052-0.698,3.646c0.61,1.596,1.912,2.548,2.908,2.13 c0.06-0.028,0.114-0.07,0.17-0.108c0.578,1.3,1.29,2.696,2.158,4.094c1.458,1.732,3.692,3.766,6.158,3.766 c2.982,0,4.808-1.632,6.064-3.279c0.032-0.068,0.062-0.133,0.103-0.19c0.93-1.454,1.684-2.91,2.291-4.268 c0.975,0.336,2.227-0.568,2.847-2.102C41.852,25.668,41.574,24.02,40.588,23.574z" fill="url(#SVGID_23)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_24" x1="26.15" x2="35.36" y1="38.09" y2="28.95">
+<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"/>
 </linearGradient>
-<path d="M29.464,36.256c-1.816,0-3.644-0.846-4.992-2.12c1.426,1.498,3.344,2.956,5.432,2.956 c2.983,0,4.808-1.632,6.064-3.279c0.032-0.068,0.062-0.133,0.103-0.19c0.93-1.454,1.684-2.91,2.291-4.268 C34.968,35.286,32.45,36.256,29.464,36.256z" fill="url(#SVGID_24)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_25" x1="29.82" x2="29.82" y1="8.92" y2="22.47">
+<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"/>
 </linearGradient>
-<path d="M29.604,8.714c-3.694,0-5.472,1.68-6.846,3.436c-2.228,0.344-5.766,2.39-3.27,11.35 c1.566-1.34,4.428-4.978,4.722-6.222c0.372-1.576,5.344,4.452,16.206,6.248c0.126-0.502,0.186-0.796,0.186-0.796 C42.307,15.078,38.598,9.014,29.604,8.714z" fill="url(#SVGID_25)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_26" x1="34.45" x2="22.17" y1="21.89" y2="14.59">
+<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"/>
 </linearGradient>
-<path d="M24.222,16.544c0,0,5.316,6.984,16.118,6.97C40.34,23.516,35.254,22.716,24.222,16.544z" fill="url(#SVGID_26)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_27" x1="21.06" x2="21.17" y1="13.17" y2="20.98">
+<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"/>
 </linearGradient>
-<path d="M22.946,12.67c0,0-5.206,0.31-3.274,9.132C19.672,21.802,19.036,15.762,22.946,12.67z" fill="url(#SVGID_27)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_28" x1="31.54" x2="31.16" y1="10.08" y2="13.61">
+<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"/>
 </linearGradient>
-<path d="M32.128,13.892c-2.424-0.346-6.524-2.494-8.13-1.726c0,0,5.26-6,14.542,0.83 C38.54,12.996,36.328,14.49,32.128,13.892z" fill="url(#SVGID_28)"/>
-<rect fill="none" height="60" width="60"/>
+<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"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_message_home.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_message_home.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<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"/>
+</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"/>
+</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"/>
+<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"/>
+</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"/>
+</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"/>
+<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"/>
+</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 30)">
+<polygon fill="none" points="30.414,14.408 30.414,0 0.414,0 0.414,14.41 0,14.824 0.414,15.237 0.414,30 30.414,30 30.414,15.236   30.828,14.821 "/>
+<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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+<rect fill="none" height="30" width="30" x="0.414"/>
+</g>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_message_work.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_message_work.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<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"/>
+</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"/>
+</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"/>
+<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"/>
+</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"/>
+</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"/>
+<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"/>
+</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 30)">
+<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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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;"/>
+<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="665.4" x2="665.4" y1="-582.2" y2="-604.8">
+<stop offset="0" stop-color="#CCCCCC"/>
+<stop offset="1" stop-color="#949494"/>
+</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"/>
+</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>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_missed_video_call_unseen.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_missed_video_call_unseen.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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>
+<rect fill="none" height="30" width="30"/>
+<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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+<path d="M12.45,24.02c0.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.288z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2___" x1="15" x2="15" y1="1.975" y2="23.67">
+<stop offset="0" stop-color="#F2F2F2"/>
+<stop offset="0.3212" stop-color="#E6E6E6"/>
+<stop offset="1" stop-color="#666666"/>
+</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"/>
+</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"/>
+<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"/>
+<stop offset="0.6848" stop-color="#121212"/>
+<stop offset="1" stop-color="#A6A6A6"/>
+</linearGradient>
+<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"/>
+</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">
+<stop offset="0" stop-color="#1A1A1A"/>
+<stop offset="0.503" stop-color="#343434"/>
+<stop offset="0.7515" stop-color="#9E9E9E"/>
+<stop offset="1" stop-color="#CFCFCF"/>
+</linearGradient>
+<path d="M15,18.51c-1.706-0.001-3.309-0.666-4.514-1.871-1.204-1.206-1.867-2.808-1.867-4.512,0-3.517,2.862-6.378,6.382-6.378,1.706,0,3.308,0.664,4.513,1.871,1.205,1.205,1.868,2.808,1.867,4.513,0,3.51-2.86,6.37-6.38,6.37z" fill="url(#SVGID_6___)"/>
+<radialGradient cx="25.77" cy="10.27" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_7__" r="6.499">
+<stop offset="0" stop-color="#000000"/>
+<stop offset="0.5917" stop-color="#000000"/>
+<stop offset="0.627" stop-color="#050505"/>
+<stop offset="0.7652" stop-color="#121212"/>
+<stop offset="0.8876" stop-color="#171717"/>
+<stop offset="1" stop-color="#171717"/>
+</radialGradient>
+<path d="M20.74,12.14c0,3.172-2.574,5.74-5.744,5.74-3.175-0.001-5.743-2.573-5.741-5.745,0-3.171,2.573-5.742,5.745-5.74,3.17-0.009,5.74,2.562,5.74,5.74z" fill="url(#SVGID_7__)"/>
+<radialGradient cx="21.65" cy="5.066" gradientTransform="matrix(1.0143 0 0 1.0141 -9.5579 3.1299)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="10.35">
+<stop offset="0" stop-color="#242424"/>
+<stop offset="0.4303" stop-color="#242424"/>
+<stop offset="0.7818" stop-color="#000000"/>
+<stop offset="1" stop-color="#000000"/>
+</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"/>
+</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.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="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"/>
+</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"/>
+<path d="M5.772,27.36c0.007,0.13,0.017,0.32,0.03,0.64h18.44c0.012-0.316,0.022-0.508,0.028-0.639h-18.5z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M6.255,26.07h17.54c-0.348-0.383-0.846-0.627-1.407-0.627h-14.72c-0.56,0.01-1.059,0.25-1.407,0.63z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<rect fill="none" height="30" width="30"/>
+</g>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_missed_voice_call.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,57 +1,62 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5609 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="423.0967" x2="429.6527" y1="-578.646" y2="-582.908">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.6061" style="stop-color:#154EBD"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
-</linearGradient>
-<path d="M19.081,33.911c2.089-3.597,4.591-6.497,7.281-9.189c2.593-2.591,6.72-5.3,8.562-6.256l9.604-10.282  c-0.845-0.3-3.693-0.464-7.279,0.616c-3.586,1.083-11.736,6.303-16.979,11.547c-5.242,5.246-9.727,12.347-10.581,14.595  c-1.343,3.541-1.221,7.445-0.929,8.581c0,0,0.34,1.034,1.144,2.377C10.248,46.476,19.081,33.911,19.081,33.911z" fill="url(#SVGID_1_)"/>
-<path d="M31.184,20.8c1.488-1.036,2.87-1.882,3.74-2.334L44.271,8.46  c-0.132-0.058-0.209-0.088-0.209-0.088c-0.247-0.088-0.642-0.162-1.124-0.219c-0.793,0.006-1.596,0.093-2.401,0.27  C34.843,9.673,31.019,14.958,31.184,20.8z" fill="#020202" fill-opacity="0.05" stroke-opacity="0.05"/>
-<path d="M31.906,20.306c1.205-0.809,2.291-1.462,3.018-1.84l9.377-10.04  c-0.146-0.063-0.233-0.098-0.233-0.098c-0.231-0.08-0.604-0.152-1.06-0.203c-0.751,0.006-1.51,0.087-2.27,0.253  C35.275,9.576,31.636,14.695,31.906,20.306z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M44.079,8.263c-0.21-0.073-0.55-0.137-0.962-0.186c-0.681,0.006-1.369,0.08-2.06,0.231  c-5.087,1.116-8.426,5.984-7.978,11.233c0.725-0.455,1.363-0.826,1.844-1.076l9.424-10.088C44.178,8.302,44.079,8.263,44.079,8.263z  " fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="43.3906" cy="8.9175" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="18.5073">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.6061" style="stop-color:#154EBD"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+<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"/>
 </radialGradient>
-<path d="M34.924,18.466l0.929,1.55c0,0,15.101-6.784,14.084-8.038c-0.513-0.631-0.577-0.656-1.237-1.263  c-1.985-1.815-4.172-2.531-4.172-2.531c-0.186-0.063-0.481-0.12-0.845-0.161c-0.596,0.004-1.2,0.068-1.806,0.201  c-4.591,1.009-7.57,5.501-6.963,10.257C34.916,18.477,34.921,18.47,34.924,18.466z" fill="url(#SVGID_2_)"/>
-<path d="M17.483,34.106c-0.988-0.14-2.007-0.119-3.027,0.105c-2.418,0.53-4.376,2.066-5.646,4.131  c-0.367,2.35-0.25,4.407-0.05,5.18c0,0,0.34,1.034,1.144,2.377c0.29,0.482,6.54-8.264,8.556-11.107L17.483,34.106z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M18.366,34.136c-0.989-0.14-2.008-0.118-3.029,0.105c-3.313,0.727-5.775,3.332-6.76,6.623  c-0.026,1.025,0.034,1.872,0.127,2.397c0.003,0.013,0.005,0.034,0.01,0.048c0,0,0.34,1.033,1.144,2.379  c0.3,0.498,6.981-8.888,8.75-11.384L18.366,34.136z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="437.4258" cy="-571.231" gradientTransform="matrix(0.2095 0.9787 -0.9682 0.2124 -629.4526 -270.6148)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="14.6198">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.6061" style="stop-color:#154EBD"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
-</radialGradient>
-<path d="M11.202,47.738c0.616,0.74,0.646,0.954,1.295,1.524c1.194,1.055,9.301-13.612,9.301-13.612  l-2.683-1.719c-0.941-0.111-1.914-0.079-2.89,0.136c-4.777,1.048-7.806,5.868-6.87,10.832C9.749,45.686,10.349,46.71,11.202,47.738z  " fill="url(#SVGID_3_)"/>
-<path d="M49.937,11.978c-0.179-0.22-0.381-0.446-0.578-0.67l-13.944,7.959l0.438,0.749  C35.853,20.016,50.953,13.231,49.937,11.978z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="422.2881" x2="427.4786" y1="-610.9287" y2="-594.4409">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.8121" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M35.853,20.016l1.178,1.981c0.302,0.515,0.972,0.674,1.569,0.422l4.09-2.334l8.043-4.668  c0.632-0.363,0.878-1.119,0.549-1.686c0,0-0.333-0.501-1.349-1.751L35.853,20.016z" fill="url(#SVGID_4_)"/>
-<path d="M21.798,35.65l-0.725-0.472l-9.215,13.486c0.216,0.204,0.43,0.414,0.639,0.598  C13.691,50.317,21.798,35.65,21.798,35.65z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="439.6982" x2="451.5232" y1="-577.7549" y2="-564.7323">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.8121" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+<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"/>
 </linearGradient>
-<path d="M12.498,49.262c1.193,1.05,1.686,1.37,1.686,1.37c0.567,0.367,1.363,0.169,1.781-0.442l7.9-11.605  c0.419-0.614,0.307-1.411-0.26-1.777l-1.808-1.156L12.498,49.262z" fill="url(#SVGID_5_)"/>
+<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"/>
+</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"/>
+</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(0.5 0 0 0.5 0 0)">
-<rect height="60" style="fill:none;" width="60"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="161" x2="161" y1="-135.5293" y2="-158.0497">
+<g>
+<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"/>
 </linearGradient>
-<path d="M38.036,33.691V25.06h9.069L30.082,7.372L12.898,25.06h9.262v8.631  c0,14.586,12.136,18.935,23.816,18.935V39.782C42.378,39.782,38.036,38.004,38.036,33.691z" style="fill:url(#SVGID_1__);"/>
-<linearGradient gradientTransform="matrix(2 0 0 -2 -292 -262)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="161" x2="161" y1="-135.0156" y2="-143.8168">
-<stop offset="0" style="stop-color:#FFBE82"/>
+<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"/>
 </linearGradient>
-<polygon points="30.082,9.016 45.523,25.058 47.105,25.058 30.082,7.372 12.898,25.058 14.496,25.058   " style="fill:url(#SVGID_2__);"/>
+<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"/>
+</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>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_missed_voice_call_unseen.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_missed_voice_call_unseen.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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>
+<rect fill="none" height="30" width="30"/>
+<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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</linearGradient>
+<polygon fill="url(#SVGID_7_)" points="21.732,15.034 19.213,12.513 25.512,6.213 28.031,8.733 "/>
+</g>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_missed_voip_call_unseen.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_missed_voip_call_unseen.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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>
+<rect fill="none" height="30" width="30"/>
+<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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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)">
+<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"/>
+</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"/>
+</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"/>
+</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"/>
+</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>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mmc.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mmc.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mmc.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,84 +1,82 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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.5405" x2="29.5405" y1="8.1108" y2="49.8955">
-<stop offset="0" style="stop-color:#666666"/>
-<stop offset="1" style="stop-color:#000000"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.54" x2="29.54" y1="8.111" y2="49.9">
+<stop offset="0" stop-color="#666666"/>
+<stop offset="1" stop-color="#000000"/>
 </linearGradient>
-<path d="M22.913,9.039c0.511-0.425,1.472-0.771,2.136-0.771h20.479c0.664,0,1.207,0.542,1.207,1.206v39.214  c0,0.663-0.543,1.206-1.207,1.206H13.554c-0.663,0-1.207-0.543-1.207-1.206V19.003c0-0.663,0.418-1.553,0.929-1.977L22.913,9.039z" fill="url(#SVGID_1_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="29.5405" x2="29.5405" y1="7.959" y2="50.5109">
-<stop offset="0" style="stop-color:#999999"/>
-<stop offset="1" style="stop-color:#333333"/>
+<path d="M22.91,9.039c0.511-0.425,1.472-0.771,2.136-0.771h20.48c0.664,0,1.207,0.542,1.207,1.206v39.21c0,0.663-0.543,1.206-1.207,1.206h-31.98c-0.663,0-1.207-0.543-1.207-1.206v-29.69c0-0.663,0.418-1.553,0.929-1.977l9.63-7.991z" fill="url(#SVGID_1_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="29.54" x2="29.54" y1="7.959" y2="50.51">
+<stop offset="0" stop-color="#999999"/>
+<stop offset="1" stop-color="#333333"/>
 </linearGradient>
-<path d="M45.766,8.571c0.338,0,0.611,0.274,0.611,0.612v39.796c0,0.338-0.273,0.612-0.611,0.612H13.316  c-0.338,0-0.612-0.274-0.612-0.612V18.854c0-0.49,0.344-1.222,0.721-1.535l9.78-8.105c0.412-0.342,1.242-0.642,1.777-0.642H45.766   M45.766,7.959H24.982c-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.126  c0,0.673,0.551,1.225,1.225,1.225h32.449c0.673,0,1.225-0.552,1.225-1.225V9.184C46.99,8.51,46.438,7.959,45.766,7.959L45.766,7.959  z" fill="url(#SVGID_2_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="29.5405" x2="29.5405" y1="9.6499" y2="48.3682">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.2606" style="stop-color:#7B7E80"/>
-<stop offset="0.8182" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+<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"/>
 </linearGradient>
-<path d="M15.153,48.367c-0.673,0-1.224-0.551-1.224-1.225V19.787c0-0.673,0.423-1.577,0.94-2.009l8.629-7.198  c0.517-0.432,1.491-0.784,2.165-0.784h18.265c0.673,0,1.224,0.552,1.224,1.225v36.122c0,0.674-0.551,1.225-1.224,1.225H15.153z" fill="url(#SVGID_3_)"/>
-<path d="M43.929,47.755H15.153c-0.673,0-1.224-0.552-1.224-1.224v0.611c0,0.674,0.551,1.225,1.224,1.225h28.776  c0.673,0,1.224-0.551,1.224-1.225v-0.611C45.152,47.203,44.602,47.755,43.929,47.755z" fill="#808080"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="29.5405" x2="29.5405" y1="39.7959" y2="45.4597">
-<stop offset="0" style="stop-color:#242626"/>
-<stop offset="1" style="stop-color:#585C5E"/>
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_4_)" height="5.511" width="27.551" x="15.765" y="39.796"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="42.0918" x2="42.0918" y1="19.5918" y2="11.0205">
-<stop offset="0" style="stop-color:#666666"/>
-<stop offset="1" style="stop-color:#282828"/>
+<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">
+<stop offset="0" stop-color="#666666"/>
+<stop offset="1" stop-color="#282828"/>
 </linearGradient>
-<rect fill="url(#SVGID_5_)" height="8.571" width="3.674" x="40.255" y="11.021"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="42.0918" x2="42.0918" y1="11.4927" y2="19.8569">
-<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"/>
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_6_)" height="7.959" width="2.449" x="40.867" y="11.633"/>
-<rect fill="#CBCBCB" height="0.612" width="3.674" x="40.255" y="18.979"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="36.582" x2="36.582" y1="19.5918" y2="11.0205">
-<stop offset="0" style="stop-color:#666666"/>
-<stop offset="1" style="stop-color:#282828"/>
+<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"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="36.58" x2="36.58" y1="19.59" y2="11.02">
+<stop offset="0" stop-color="#666666"/>
+<stop offset="1" stop-color="#282828"/>
 </linearGradient>
-<rect fill="url(#SVGID_7_)" height="8.571" width="3.673" x="34.745" y="11.021"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="36.582" x2="36.582" y1="11.4927" y2="19.8569">
-<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"/>
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_8_)" height="7.959" width="2.449" x="35.357" y="11.633"/>
-<rect fill="#CBCBCB" height="0.612" width="3.673" x="34.745" y="18.979"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="31.0713" x2="31.0713" y1="19.5918" y2="11.0205">
-<stop offset="0" style="stop-color:#666666"/>
-<stop offset="1" style="stop-color:#282828"/>
+<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"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="31.07" x2="31.07" y1="19.59" y2="11.02">
+<stop offset="0" stop-color="#666666"/>
+<stop offset="1" stop-color="#282828"/>
 </linearGradient>
-<rect fill="url(#SVGID_9_)" height="8.571" width="3.673" x="29.235" y="11.021"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="31.0723" x2="31.0723" y1="11.4927" y2="19.8569">
-<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"/>
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_10_)" height="7.959" width="2.449" x="29.847" y="11.633"/>
-<rect fill="#CBCBCB" height="0.612" width="3.673" x="29.235" y="18.979"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="25.561" x2="25.561" y1="19.5918" y2="11.0205">
-<stop offset="0" style="stop-color:#666666"/>
-<stop offset="1" style="stop-color:#282828"/>
+<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"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="25.56" x2="25.56" y1="19.59" y2="11.02">
+<stop offset="0" stop-color="#666666"/>
+<stop offset="1" stop-color="#282828"/>
 </linearGradient>
-<rect fill="url(#SVGID_11_)" height="8.571" width="3.673" x="23.725" y="11.021"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="25.561" x2="25.561" y1="11.4927" y2="19.8569">
-<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"/>
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_12_)" height="7.959" width="2.449" x="24.337" y="11.633"/>
-<rect fill="#CBCBCB" height="0.612" width="3.673" x="23.725" y="18.979"/>
-<rect fill="#8C8C8C" height="0.613" width="27.551" x="15.765" y="44.693"/>
-<path d="M45.766,7.959H24.982c-0.674,0-1.648,0.352-2.167,0.781l-9.78,8.107c-0.4,0.332-0.743,0.947-0.878,1.52  c0,0,1.004-0.828,1.269-1.049l9.78-8.105c0.412-0.342,1.242-0.642,1.777-0.642h20.784c0.611,0,1.225,0.612,1.225,0.612  C46.99,8.51,46.438,7.959,45.766,7.959z" fill="#CCCCCC"/>
+<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"/>
+<rect fill="#8C8C8C" height="0.613" width="27.55" x="15.76" y="44.69"/>
+<path d="M45.77,7.959h-20.79c-0.674,0-1.648,0.352-2.167,0.781l-9.78,8.107c-0.4,0.332-0.743,0.947-0.878,1.52,0,0,1.004-0.828,1.269-1.049l9.78-8.105c0.412-0.342,1.242-0.642,1.777-0.642h20.78c0.611,0,1.225,0.612,1.225,0.612-0.01-0.675-0.56-1.226-1.23-1.226z" fill="#CCCCCC"/>
 <rect fill="none" height="60" width="60"/>
-</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mmc_removed.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.5405" x2="29.5405" y1="8.1108" y2="49.8955">
 <stop offset="0" style="stop-color:#666666"/>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mobile.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mobile.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mobile.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,102 +1,112 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<g>
 <rect fill="none" height="60" width="60"/>
-<rect fill="none" height="59.996" width="59.996"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="29.69" x2="29.69" y1="7.35" y2="51.92">
-<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"/>
+<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"/>
 </linearGradient>
-<path d="M44.078,49.588c0,1.353-1.096,2.449-2.449,2.449H17.754c-1.353,0-2.449-1.097-2.449-2.449 V9.795c0-1.353,1.096-2.449,2.449-2.449h23.875c1.354,0,2.449,1.097,2.449,2.449V49.588z" fill="url(#SVGID_1)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="29.69" x2="29.69" y1="7.35" y2="51.16">
-<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"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M41.629,7.346H17.754c-1.353,0-2.449,1.097-2.449,2.449v39.792 c0,0.652,0.26,1.244,0.676,1.684c-0.037-0.148-0.064-0.3-0.064-0.459v-1.225V11.02V9.795c0-1.013,0.824-1.837,1.837-1.837h23.875 c1.014,0,1.838,0.824,1.838,1.837v1.224v38.568v1.225c0,0.159-0.027,0.311-0.064,0.459c0.416-0.439,0.676-1.031,0.676-1.684V9.795 C44.078,8.443,42.982,7.346,41.629,7.346z" fill="url(#SVGID_2)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="29.69" x2="29.69" y1="10.45" y2="40.41">
-<stop offset="0" stop-color="#B6BBBD"/>
-<stop offset="1" stop-color="#F0FBFF"/>
+<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">
+<stop offset="0" style="stop-color:#6E6E6E"/>
+<stop offset="1" style="stop-color:#333333"/>
 </linearGradient>
-<rect fill="url(#SVGID_3)" fill-opacity="0.6" height="29.998" stroke-opacity="0.6" width="25.101" x="17.142" y="10.407"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="29.69" x2="29.69" y1="11.06" y2="39.8">
-<stop offset="0" stop-color="#6E6E6E"/>
-<stop offset="1" stop-color="#333333"/>
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_4)" height="28.773" width="23.875" x="17.754" y="11.02"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="29.69" x2="29.69" y1="11.67" y2="39.18">
-<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"/>
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_5)" height="27.549" width="22.651" x="18.366" y="11.632"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6" x1="29.69" x2="29.69" y1="12.11" y2="23.06">
-<stop offset="0" stop-color="#85EFFF"/>
-<stop offset="1" stop-color="#3BA1D9"/>
+<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"/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_6)" points="41.018,21.427 18.366,23.876 18.366,12.244 41.018,12.244 "/>
-<rect fill="#9FE4FF" height="0.612" width="22.651" x="18.366" y="11.632"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7" x1="29.87" x2="29.87" y1="10.44" y2="7.99">
-<stop offset="0" stop-color="#FFFFFF"/>
-<stop offset="1" stop-color="#D1D7D9"/>
+<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"/>
 </linearGradient>
-<path d="M27.163,10.407c-0.686,0-1.224-0.448-1.224-1.02V8.979c0-0.573,0.538-1.021,1.224-1.021h5.416 c0.687,0,1.225,0.448,1.225,1.021v0.408c0,0.572-0.538,1.02-1.225,1.02H27.163z" fill="url(#SVGID_7)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8" x1="29.87" x2="29.87" y1="8.32" y2="9.9">
-<stop offset="0" stop-color="#6C7375"/>
-<stop offset="1" stop-color="#BDC2C4"/>
+<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="1" style="stop-color:#FFFFFF"/>
 </linearGradient>
-<path d="M33.19,9.388c0,0.226-0.273,0.408-0.612,0.408h-5.416c-0.338,0-0.612-0.182-0.612-0.408V8.979 c0-0.226,0.274-0.409,0.612-0.409h5.416c0.339,0,0.612,0.183,0.612,0.409V9.388z" fill="url(#SVGID_8)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9" x1="29.6" x2="29.6" y1="41.04" y2="50.14">
-<stop offset="0" stop-color="#B6BBBD"/>
-<stop offset="1" stop-color="#FFFFFF"/>
+<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"/>
 </linearGradient>
-<path d="M27.384,50.2c-1.312,0-2.378-1.058-2.378-2.354v-4.475 c0-1.299,1.066-2.354,2.378-2.354h4.425c1.313,0,2.38,1.056,2.38,2.354v4.475c0,1.297-1.066,2.354-2.38,2.354H27.384z" fill="url(#SVGID_9)" fill-opacity="0.6" stroke-opacity="0.6"/>
-<path d="M27.382,49.588c-0.972,0-1.764-0.78-1.764-1.742v-4.475 c0-0.961,0.792-1.742,1.764-1.742h4.432c0.973,0,1.763,0.781,1.763,1.742v4.475c0,0.96-0.79,1.742-1.763,1.742H27.382z" fill="#020202" fill-opacity="0.5" stroke-opacity="0.5"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10" x1="29.6" x2="29.6" y1="42.21" y2="48.99">
-<stop offset="0" stop-color="#A6A8AB"/>
-<stop offset="0.7" stop-color="#58595B"/>
-<stop offset="1" stop-color="#808184"/>
+<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"/>
 </linearGradient>
-<path d="M32.965,47.846c0,0.625-0.514,1.131-1.146,1.131h-4.443c-0.632,0-1.146-0.506-1.146-1.131 v-4.475c0-0.624,0.514-1.13,1.146-1.13h4.443c0.632,0,1.146,0.506,1.146,1.13V47.846z" fill="url(#SVGID_10)"/>
-<path d="M28.679,47.752c-0.675,0-1.225-0.549-1.225-1.225V44.69 c0-0.676,0.549-1.224,1.225-1.224h1.836c0.676,0,1.225,0.548,1.225,1.224v1.837c0,0.676-0.549,1.225-1.225,1.225H28.679z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11" x1="29.6" x2="29.6" y1="44.06" y2="47.14">
-<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"/>
+<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"/>
 </linearGradient>
-<path d="M28.679,47.14c-0.337,0-0.612-0.274-0.612-0.612V44.69c0-0.336,0.275-0.612,0.612-0.612 h1.836c0.338,0,0.612,0.276,0.612,0.612v1.837c0,0.338-0.274,0.612-0.612,0.612H28.679z" fill="url(#SVGID_11)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12" x1="19.85" x2="19.85" y1="41.59" y2="48.99">
-<stop offset="0" stop-color="#B6BBBD"/>
-<stop offset="1" stop-color="#F0FBFF"/>
+<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"/>
 </linearGradient>
-<path d="M19.496,48.977c-1.297,0-2.354-1.058-2.354-2.355 v-2.638c0-1.296,1.057-2.354,2.354-2.354h0.707c1.298,0,2.354,1.059,2.354,2.355v2.638c0,1.297-1.057,2.354-2.354,2.354H19.496z" fill="url(#SVGID_12)" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13" x1="19.85" x2="19.85" y1="42.21" y2="48.37">
-<stop offset="0" stop-color="#231F20"/>
-<stop offset="1" stop-color="#6D6E70"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M19.496,48.363c-0.962,0-1.742-0.78-1.742-1.742 v-2.638c0-0.961,0.78-1.741,1.742-1.741h0.707c0.96,0,1.742,0.78,1.742,1.742v2.638c0,0.961-0.782,1.741-1.742,1.741H19.496z" fill="url(#SVGID_13)" fill-opacity="0.7" stroke-opacity="0.7"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14" x1="19.85" x2="19.85" y1="42.83" y2="47.76">
-<stop offset="0" stop-color="#C6FF45"/>
-<stop offset="0.73" stop-color="#66A00E"/>
-<stop offset="1" stop-color="#387300"/>
+<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"/>
 </linearGradient>
-<path d="M21.333,46.621c0,0.625-0.505,1.131-1.13,1.131h-0.707c-0.624,0-1.13-0.506-1.13-1.131 v-2.638c0-0.624,0.506-1.13,1.13-1.13h0.707c0.625,0,1.13,0.506,1.13,1.131V46.621z" fill="url(#SVGID_14)"/>
-<path d="M38.654,48.977c-1.299,0-2.355-1.058-2.355-2.355 v-2.638c0-1.298,1.057-2.354,2.355-2.354h0.705c1.298,0,2.355,1.057,2.355,2.354v2.638c0,1.298-1.058,2.355-2.355,2.355H38.654z" fill="url(#SVGID_12)" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M38.654,48.363c-0.962,0-1.744-0.78-1.744-1.742 v-2.638c0-0.961,0.781-1.742,1.744-1.742h0.705c0.961,0,1.743,0.78,1.743,1.742v2.638c0,0.961-0.782,1.742-1.743,1.742H38.654z" fill="url(#SVGID_13)" fill-opacity="0.7" stroke-opacity="0.7"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17" x1="39.01" x2="39.01" y1="42.83" y2="47.76">
-<stop offset="0" stop-color="#FFC142"/>
-<stop offset="0.75" stop-color="#CF4E18"/>
-<stop offset="1" stop-color="#B52100"/>
+<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"/>
 </linearGradient>
-<path d="M40.49,46.621c0,0.625-0.507,1.131-1.131,1.131h-0.705c-0.625,0-1.131-0.506-1.131-1.131 v-2.638c0-0.624,0.506-1.13,1.131-1.13h0.705c0.624,0,1.131,0.506,1.131,1.13V46.621z" fill="url(#SVGID_17)"/>
+<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>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mobile_tv.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,37 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<g>
 <rect fill="none" height="60" width="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="30" x2="30" y1="47.62" y2="44.82">
-<stop offset="0" stop-color="#404040"/>
-<stop offset="1" stop-color="#000000"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="53.1709" y2="49.6078">
+<stop offset="0" style="stop-color:#404040"/>
+<stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
-<path d="M41.592,46.527c0,0.676-0.53,1.225-1.187,1.225H19.59c-0.655,0-1.187-0.549-1.187-1.225l0,0 c0-0.676-0.039-1.837-0.039-1.837h23.264C41.629,44.69,41.592,45.852,41.592,46.527L41.592,46.527z" fill="url(#SVGID_1)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="30" x2="30" y1="10.82" y2="45.31">
-<stop offset="0" stop-color="#F2F2F2"/>
-<stop offset="0.12" stop-color="#F2F2F2"/>
-<stop offset="0.55" stop-color="#ADB2B5"/>
-<stop offset="1" stop-color="#E6E9E8"/>
+<path d="M44.73,51.777c0,0.86-0.676,1.556-1.509,1.556H16.777c-0.832,0-1.508-0.695-1.508-1.556l0,0  c0-0.858-0.048-2.332-0.048-2.332h29.556C44.777,49.445,44.73,50.919,44.73,51.777L44.73,51.777z" fill="url(#SVGID_1_)"/>
+<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"/>
 </linearGradient>
-<path d="M52.037,44.078c0,0.677-0.549,1.225-1.225,1.225H9.183c-0.677,0-1.225-0.548-1.225-1.225 V12.244c0-0.676,0.548-1.225,1.225-1.225h41.629c0.676,0,1.225,0.549,1.225,1.225V44.078z" fill="url(#SVGID_2)"/>
-<path d="M50.813,44.69H9.183c-0.677,0-1.225-0.548-1.225-1.224v0.611 c0,0.677,0.548,1.225,1.225,1.225h41.629c0.676,0,1.225-0.548,1.225-1.225v-0.611C52.037,44.143,51.488,44.69,50.813,44.69z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="30" x2="30" y1="38.36" y2="14.01">
-<stop offset="0" stop-color="#36B5FF"/>
-<stop offset="1" stop-color="#1B66D8"/>
+<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"/>
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_3)" height="25.1" width="39.181" x="10.407" y="13.468"/>
-<rect fill="#FFFFFF" height="0.611" width="39.181" x="10.407" y="37.957"/>
-<polygon fill="#FFFFFF" fill-opacity="0.2" points="11.029,26.325 48.977,21.319 48.977,14.081 11.02,14.081 " stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="30" x2="30" y1="43.99" y2="39.32">
-<stop offset="0" stop-color="#57CDEA"/>
-<stop offset="1" stop-color="#196BDE"/>
+<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"/>
 </linearGradient>
-<path d="M29.998,40.1c0.846,0,1.53,0.686,1.53,1.529c0,0.845-0.685,1.531-1.53,1.531 c-0.843,0-1.531-0.687-1.531-1.531C28.467,40.785,29.155,40.1,29.998,40.1 M29.998,39.181c-1.353,0-2.449,1.097-2.449,2.448 c0,1.354,1.097,2.449,2.449,2.449c1.354,0,2.449-1.096,2.449-2.449C32.447,40.277,31.352,39.181,29.998,39.181L29.998,39.181z" fill="url(#SVGID_4)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="30" x2="30" y1="11.73" y2="44.18">
-<stop offset="0" stop-color="#E6E9E8"/>
-<stop offset="1" stop-color="#ADB2B5"/>
+<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"/>
 </linearGradient>
-<path d="M50.2,11.632H9.795c-0.676,0-1.225,0.548-1.225,1.225v29.997c0,0.677,0.548,1.225,1.225,1.225 h17.896c-0.651-0.613-1.06-1.482-1.06-2.449c0-0.965,0.409-1.834,1.06-2.448H9.795V12.856H50.2v26.324H32.305 c0.651,0.614,1.061,1.483,1.061,2.448c0,0.967-0.409,1.836-1.061,2.449H50.2c0.677,0,1.225-0.548,1.225-1.225V12.856 C51.425,12.18,50.877,11.632,50.2,11.632z" fill="url(#SVGID_5)"/>
-<path d="M40.406,47.14H19.592c-0.552,0-1.013-0.392-1.146-0.919 c-0.024,0.1-0.042,0.2-0.042,0.307c0,0.676,0.531,1.225,1.187,1.225h20.814c0.655,0,1.187-0.549,1.187-1.225 c0-0.106-0.017-0.207-0.042-0.307C41.419,46.748,40.959,47.14,40.406,47.14z" fill="#FFFFFF" fill-opacity="0.35" stroke-opacity="0.35"/>
-<rect fill="none" height="59.996" width="59.996"/>
+<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"/>
+<rect fill="none" height="60" width="60"/>
+</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mono.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mono.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mono.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,51 +1,52 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.9995" x2="29.9995" y1="8.2051" y2="51.7959">
+<rect fill="none" height="60" width="60"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="1.5215" y2="58.4791">
 <stop offset="0" style="stop-color:#FFFFFF"/>
 <stop offset="1" style="stop-color:#D9D9D9"/>
 </linearGradient>
-<circle cx="30" cy="30.001" fill="url(#SVGID_1_)" r="21.429"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="29.9995" x2="29.9995" y1="8.938" y2="50.3561">
+<circle cx="30" cy="30.001" fill="url(#SVGID_1_)" r="28"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="29.999" x2="29.999" y1="2.4795" y2="56.5974">
 <stop offset="0" style="stop-color:#F5F5F5"/>
 <stop offset="0.7818" style="stop-color:#CCCCCC"/>
 <stop offset="1" style="stop-color:#D1D1D1"/>
 </linearGradient>
-<circle cx="30" cy="30.001" fill="url(#SVGID_2_)" r="20.513"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="29.9995" x2="29.9995" y1="46.7266" y2="12.8125">
+<circle cx="29.999" cy="30.001" fill="url(#SVGID_2_)" r="26.804"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="29.999" x2="29.999" y1="51.8564" y2="7.5413">
 <stop offset="0" style="stop-color:#FFFFFF"/>
 <stop offset="1" style="stop-color:#A8A8A8"/>
 </linearGradient>
-<circle cx="30" cy="30.001" fill="url(#SVGID_3_)" r="17.034"/>
-<radialGradient cx="29.999" cy="30.0005" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="16.1472">
+<circle cx="29.999" cy="30.001" fill="url(#SVGID_3_)" r="22.257"/>
+<radialGradient cx="29.998" cy="30.001" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="21.0991">
 <stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.3333" style="stop-color:#808080"/>
 <stop offset="1" style="stop-color:#1C1C1C"/>
 </radialGradient>
-<circle cx="29.999" cy="30.001" fill="url(#SVGID_4_)" r="16.147"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="29.9985" x2="29.9985" y1="41.3564" y2="17.3022">
+<circle cx="29.998" cy="30.001" fill="url(#SVGID_4_)" r="21.1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="29.9971" x2="29.9971" y1="44.8384" y2="13.4077">
 <stop offset="0" style="stop-color:#808080"/>
 <stop offset="1" style="stop-color:#1C1C1C"/>
 </linearGradient>
-<circle cx="29.999" cy="30.001" fill="url(#SVGID_5_)" r="12.576"/>
-<radialGradient cx="29.9375" cy="30.5498" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="12.0883">
+<circle cx="29.998" cy="30.001" fill="url(#SVGID_5_)" r="16.432"/>
+<radialGradient cx="29.918" cy="30.7183" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="15.7949">
 <stop offset="0" style="stop-color:#B4B4B4"/>
 <stop offset="1" style="stop-color:#696969"/>
 </radialGradient>
-<path d="M40.123,37.438l-4.154-3.684H24.787l-4.762,3.887c2.3,2.995,5.905,4.936,9.973,4.936  C34.158,42.577,37.835,40.55,40.123,37.438z" fill="url(#SVGID_6_)" fill-opacity="0.5" stroke-opacity="0.5"/>
-<circle cx="30" cy="32.015" fill-opacity="0.15" r="8.15" stroke-opacity="0.15"/>
-<radialGradient cx="30.0303" cy="27.8633" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="9.1766">
+<path d="M43.227,39.72l-5.428-4.813H23.188l-6.221,5.079c3.004,3.913,7.715,6.448,13.03,6.448  C35.433,46.434,40.237,43.785,43.227,39.72z" fill="url(#SVGID_6_)" fill-opacity="0.5" stroke-opacity="0.5"/>
+<circle cx="29.999" cy="32.633" fill-opacity="0.15" r="10.649" stroke-opacity="0.15"/>
+<radialGradient cx="30.0391" cy="27.208" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="11.9907">
 <stop offset="0" style="stop-color:#4D4D4D"/>
 <stop offset="1" style="stop-color:#000000"/>
 </radialGradient>
-<circle cx="30" cy="30.001" fill="url(#SVGID_7_)" r="8.15"/>
-<circle cx="30" cy="30.001" fill="none" fill-opacity="0.15" r="7.082" stroke="#EBEBEB" stroke-opacity="0.15"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="29.9995" x2="29.9995" y1="21.9878" y2="38.0213">
+<circle cx="29.999" cy="30.001" fill="url(#SVGID_7_)" r="10.649"/>
+<circle cx="30" cy="30.001" fill="none" fill-opacity="0.15" r="9.254" stroke="#EBEBEB" stroke-opacity="0.15"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="29.999" x2="29.999" y1="19.5313" y2="40.4805">
 <stop offset="0" style="stop-color:#DEDEDE"/>
 <stop offset="1" style="stop-color:#A8A8A8"/>
 </linearGradient>
-<path d="M29.998,21.851c-4.5,0-8.148,3.648-8.148,8.15c0,4.5,3.648,8.149,8.148,8.149  c4.502,0,8.151-3.649,8.151-8.149C38.149,25.499,34.5,21.851,29.998,21.851z M29.998,36.411c-3.54,0-6.408-2.87-6.408-6.41  c0-3.542,2.868-6.412,6.408-6.412c3.541,0,6.412,2.87,6.412,6.412C36.41,33.541,33.539,36.411,29.998,36.411z" fill="url(#SVGID_8_)" fill-opacity="0.15" stroke-opacity="0.15"/>
+<path d="M29.997,19.352c-5.88,0-10.647,4.768-10.647,10.649  c0,5.88,4.768,10.648,10.647,10.648c5.882,0,10.651-4.769,10.651-10.648C40.648,24.119,35.879,19.352,29.997,19.352z M29.997,38.377  c-4.626,0-8.374-3.75-8.374-8.376c0-4.628,3.748-8.378,8.374-8.378c4.627,0,8.378,3.75,8.378,8.378  C38.375,34.627,34.624,38.377,29.997,38.377z" fill="url(#SVGID_8_)" fill-opacity="0.15" stroke-opacity="0.15"/>
 <rect fill="none" height="60" width="60"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mouse.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mouse.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mouse.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,52 +1,98 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15.7866" x2="43.7869" y1="30" y2="30">
-<stop offset="0" style="stop-color:#A6AEB2"/>
-<stop offset="0.1576" style="stop-color:#9DA5A9"/>
-<stop offset="0.4485" style="stop-color:#CBD2D5"/>
-<stop offset="0.7879" style="stop-color:#949DA1"/>
-<stop offset="1" style="stop-color:#B9C1C4"/>
+<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"/>
+</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"/>
+</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"/>
+</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"/>
 </linearGradient>
-<path d="M44.594,35.93c0,7.582-6.734,13.73-14.594,13.73c-7.857,0-14.594-6.148-14.594-13.73V17.099  c0-7.583,6.586-6.73,14.594-6.73s14.594-0.853,14.594,6.73V35.93z" fill="url(#SVGID_1_)"/>
-<path d="M14.945,24.168c-0.012,0.243-0.039,0.482-0.039,0.729v0.271h30.188v-0.271c0-0.246-0.025-0.486-0.039-0.729  H14.945z" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M14.945,25.168c-0.012,0.242-0.039,0.482-0.039,0.729v0.271h30.188v-0.271  c0-0.246-0.025-0.486-0.039-0.729H14.945z" fill="#FFFFFF" fill-opacity="0.75" stroke-opacity="0.75"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30.0996" x2="44.7254" y1="17.2549" y2="17.2549">
-<stop offset="0" style="stop-color:#A6AEB2"/>
-<stop offset="0.2667" style="stop-color:#CBD2D5"/>
-<stop offset="0.8303" style="stop-color:#949DA1"/>
-<stop offset="1" style="stop-color:#B9C1C4"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M44.594,24.169v-7.07c0-7.551-6.531-6.737-14.494-6.73v13.801H44.594z" fill="url(#SVGID_2_)"/>
-<path d="M30.1,10.369v1c7.963-0.007,14.494-0.821,14.494,6.73v-1C44.594,9.548,38.063,10.362,30.1,10.369z" fill="#F2F2F2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30.0371" x2="15.4125" y1="17.2544" y2="17.2544">
-<stop offset="0" style="stop-color:#A6AEB2"/>
-<stop offset="0.2667" style="stop-color:#CBD2D5"/>
-<stop offset="0.8303" style="stop-color:#949DA1"/>
-<stop offset="1" style="stop-color:#B9C1C4"/>
+<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"/>
+</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.5" style="stop-color:#4D4D4D"/>
+<stop offset="1" style="stop-color:#737475"/>
+</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.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.5" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#C4C9CB"/>
 </linearGradient>
-<path d="M15.475,24.169v-7.07c0-7.551,6.531-6.737,14.494-6.73v13.801H15.475z" fill="url(#SVGID_3_)"/>
-<path d="M15.475,17.099v1c0-7.551,6.531-6.737,14.494-6.73v-1C22.006,10.362,15.475,9.548,15.475,17.099z" fill="#F2F2F2"/>
-<path d="M30.043,10.461c-0.242-0.013-0.482,0-0.729,0h-0.271v13.676h0.271c0.246,0,0.486,0.014,0.729,0V10.461z" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M31.043,10.461c-0.242-0.013-0.482,0-0.729,0h-0.271v13.676h0.271  c0.246,0,0.486,0.014,0.729,0V10.461z" fill="#FFFFFF" fill-opacity="0.75" stroke-opacity="0.75"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="29.9995" x2="29.9995" y1="9.9194" y2="49.9329">
-<stop offset="0" style="stop-color:#DDE3E6"/>
-<stop offset="0.6545" style="stop-color:#686D70"/>
-<stop offset="1" style="stop-color:#BEC3C6"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M30,50.16c-8.182,0-15.094-6.518-15.094-14.23V17.099c0-6.712,4.918-7.259,10.857-7.259  c0.658,0,1.336,0.007,2.027,0.014c1.443,0.015,2.977,0.015,4.42,0c0.691-0.007,1.369-0.014,2.025-0.014  c5.941,0,10.857,0.546,10.857,7.259V35.93C45.094,43.643,38.182,50.16,30,50.16L30,50.16z M25.764,10.84  c-6.678,0-9.857,0.937-9.857,6.259V35.93c0,7.172,6.455,13.23,14.094,13.23c7.641,0,14.094-6.059,14.094-13.23V17.099  c0-5.322-3.178-6.259-9.857-6.259c-0.654,0-1.328,0.007-2.016,0.014c-1.449,0.016-2.99,0.016-4.439,0  C27.092,10.847,26.42,10.84,25.764,10.84L25.764,10.84z" fill="url(#SVGID_4_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="29.6274" x2="29.6274" y1="23.189" y2="13.2515">
-<stop offset="0" style="stop-color:#9CA2A4"/>
-<stop offset="1" style="stop-color:#5B6163"/>
+<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.3212" style="stop-color:#B5B5B5"/>
+<stop offset="0.6303" style="stop-color:#5A5859"/>
+<stop offset="0.8242" style="stop-color:#898889"/>
+<stop offset="1" style="stop-color:#343232"/>
 </linearGradient>
-<polygon fill="url(#SVGID_5_)" points="32.189,23.127 31.334,23.127 27.918,23.127 27.064,23.127 27.064,22.127 27.064,14.127   27.064,13.127 27.918,13.127 31.334,13.127 32.189,13.127 32.189,14.127 32.189,22.127 32.189,23.127 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="29.6255" x2="29.6255" y1="14.127" y2="22.1684">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="0.3636" style="stop-color:#686868"/>
-<stop offset="1" style="stop-color:#000000"/>
+<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.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"/>
 </linearGradient>
-<rect fill="url(#SVGID_6_)" height="8" width="3.416" x="27.918" y="14.127"/>
+<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"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,67 +1,50 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<rect fill="none" height="60" width="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="29.87" x2="30.09" y1="8.18" y2="51.03">
-<stop offset="0" stop-color="#D1D7D9"/>
-<stop offset="0.69" stop-color="#808A8C"/>
-<stop offset="1" stop-color="#A4ACAE"/>
-</linearGradient>
-<path d="M29.889,7.958C18.055,8.02,8.511,17.661,8.571,29.495 c0.061,11.833,9.704,21.377,21.537,21.317c11.833-0.06,21.378-9.702,21.317-21.536C51.363,17.443,41.723,7.898,29.889,7.958z M30.025,34.895c-3.043,0.016-5.522-2.438-5.538-5.481c-0.014-3.043,2.438-5.522,5.481-5.539c3.042-0.016,5.523,2.439,5.539,5.482 S33.07,34.879,30.025,34.895z" fill="url(#SVGID_1)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="29.93" x2="30.02" y1="20.37" y2="38.59">
-<stop offset="0" stop-color="#FFFFFF"/>
-<stop offset="1" stop-color="#CFCFCF"/>
+<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"/>
 </linearGradient>
-<path d="M29.951,20.203c-5.072,0.026-9.163,4.158-9.136,9.23c0.026,5.071,4.157,9.161,9.229,9.135 c5.072-0.024,9.162-4.157,9.136-9.229C39.154,24.266,35.023,20.176,29.951,20.203z M30.023,34.282 c-2.705,0.014-4.909-2.168-4.923-4.872c-0.013-2.705,2.168-4.909,4.873-4.923c2.705-0.012,4.91,2.169,4.923,4.874 C34.908,32.065,32.728,34.27,30.023,34.282z" fill="url(#SVGID_2)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="50.84" x2="9.32" y1="39.88" y2="40.09">
-<stop offset="0" stop-color="#A0A7A9"/>
-<stop offset="0.5" stop-color="#FFFFFF"/>
-<stop offset="1" stop-color="#A0A7A9"/>
+<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"/>
+<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"/>
 </linearGradient>
-<path d="M30.101,49.703 C18.785,49.761,9.541,40.75,9.247,29.492c-0.002,0.147-0.01,0.295-0.008,0.446c0.059,11.464,9.4,20.713,20.867,20.657 c11.468-0.06,20.719-9.401,20.658-20.868c-0.002-0.149-0.01-0.297-0.014-0.445C50.57,40.541,41.419,49.646,30.101,49.703z" fill="url(#SVGID_3)" fill-opacity="0.3" stroke-opacity="0.3"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="25.09" x2="34.89" y1="31.65" y2="31.6">
-<stop offset="0" stop-color="#848C8E"/>
-<stop offset="0.5" stop-color="#FFFFFF"/>
-<stop offset="1" stop-color="#848C8E"/>
-</linearGradient>
-<path d="M30.023,34.282c2.705-0.013,4.885-2.217,4.873-4.922c-0.001-0.155-0.011-0.309-0.026-0.459 c-0.217,2.49-2.301,4.603-4.85,4.615c-2.55,0.013-4.654-2.078-4.897-4.565c-0.013,0.151-0.022,0.305-0.021,0.459 C25.114,32.114,27.318,34.296,30.023,34.282z" fill="url(#SVGID_4)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="30" x2="30" y1="8.88" y2="50.2">
-<stop offset="0" stop-color="#36B5FF"/>
-<stop offset="1" stop-color="#1B66D8"/>
+<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.5" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#A0A7A9"/>
 </linearGradient>
-<path d="M29.891,8.571C18.395,8.629,9.124,17.996,9.183,29.491 c0.06,11.496,9.427,20.765,20.921,20.708c11.496-0.059,20.767-9.424,20.708-20.919C50.754,17.783,41.386,8.512,29.891,8.571z M30.043,38.215c-4.877,0.025-8.851-3.908-8.875-8.785h-0.002c-0.025-4.877,3.909-8.85,8.787-8.875 c4.878-0.025,8.85,3.908,8.875,8.785h0.003C38.854,34.218,34.92,38.191,30.043,38.215z" fill="url(#SVGID_5)"/>
-<path d="M10.215,33.473C8.057,23.053,14.406,12.693,24.67,9.886 c1.672-0.457,3.401-0.693,5.133-0.701c8.607-0.044,16.546,5.571,19.313,13.654l0.21,0.617l-10.387,2.838l-0.205-0.502 c-1.441-3.524-4.975-5.879-8.794-5.859c-0.819,0.004-1.639,0.116-2.434,0.333c-4.6,1.258-7.546,5.759-6.855,10.47l0.079,0.535 l-10.385,2.841L10.215,33.473z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
-<rect fill="none" height="59.996" width="59.996"/>
-</g>
-<g transform="matrix(0.5 0 0 0.5 30 30)">
-<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"/>
+<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"/>
 </linearGradient>
-<path d="M48.631,13.079l-3.08-7.497L27.85,13.46l0.028,23.917c-2.712-1.771-6.708-2.354-10.768-1.254 c-6.405,1.725-10.542,6.951-9.247,11.665c1.3,4.718,7.543,7.142,13.944,5.415c5.412-1.461,9.159-5.324,9.138-9.451 c-0.018-4.129,0.033-15.338,0-23.445L48.631,13.079z" 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"/>
+<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"/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_2_)" points="27.878,33.26 27.857,13.46 27.85,13.46 27.872,33.258 "/>
-<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"/>
+<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"/>
 </linearGradient>
-<path d="M30.945,19.08c0.007,1.306,0.01-0.201,0.012,1.223l17.674-7.225l-0.436-1.108L30.945,19.08z" 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"/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_4_)" points="28.142,38.062 28.142,14.143 45.891,6.413 45.551,5.582 27.454,13.46 27.454,37.378 "/>
-<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"/>
-</linearGradient>
-<path d="M17.625,52.389c-4.258,0.021-7.653-1.941-8.447-4.885c-0.484-1.785,0.028-3.761,1.444-5.555 c1.55-1.964,3.944-3.454,6.747-4.191c1.187-0.317,2.386-0.477,3.573-0.484c4.258-0.021,7.651,1.943,8.45,4.885 c1.058,3.9-2.618,8.272-8.196,9.748C20.012,52.221,18.808,52.381,17.625,52.389L17.625,52.389z" fill="url(#SVGID_5_)"/>
-<rect fill="none" height="59.996" width="59.996"/>
+<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"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music_album.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music_album.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<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)">
+<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 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music_empty.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music_empty.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<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"/>
+</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="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="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"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="30.0005" x2="30.0005" y1="4.3555" y2="54.244">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#D8D8D7"/>
+</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.7818" style="stop-color:#CCCBCB"/>
+<stop offset="1" style="stop-color:#D0D0D1"/>
+</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">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#A8A7A7"/>
+</linearGradient>
+<circle cx="30" cy="29.3" fill="url(#SVGID_6_)" r="19.495"/>
+<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"/>
+</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"/>
+</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="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"/>
+<circle cx="30" cy="31.604" fill-opacity="0.15" r="9.327" stroke-opacity="0.15"/>
+<radialGradient cx="36.792" cy="68.9736" gradientTransform="matrix(0.9587 0 0 0.9587 -5.2375 -39.2709)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="10.9541">
+<stop offset="0" style="stop-color:#4D4E4E"/>
+<stop offset="1" style="stop-color:#000000"/>
+</radialGradient>
+<circle cx="30" cy="29.3" fill="url(#SVGID_10_)" r="9.327"/>
+<circle cx="30" cy="29.3" fill="none" fill-opacity="0.15" r="8.106" stroke="#EBEBEB" stroke-opacity="0.15"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="30" x2="30" y1="20.1299" y2="38.4788">
+<stop offset="0" style="stop-color:#DEDEDD"/>
+<stop offset="1" style="stop-color:#A8A7A7"/>
+</linearGradient>
+<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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+<path d="M10.249,25.854c0.273-0.042,0.547-0.063,0.82-0.063c2.673-0.021,4.546,2.377,4.524,5.092  c0,2.252-1.347,3.914-3.346,4.882l0.842,4.272c0.063,0.357,0.063,0.673,0.063,0.967c0,2.146-1.348,3.536-3.578,3.768  c-1.746,0.189-3.745-1.01-3.935-2.904c-0.126-1.263,0.736-2.566,1.957-2.715c1.115-0.126,2.125,0.863,2.167,2.021  c0.063,1.62-1.536,2.146-2.146,1.999c0.063,0.716,1.305,0.989,1.895,0.926c1.957-0.23,2.883-1.43,2.946-3.135  c0-0.463-0.043-1.011-0.169-1.537l-0.716-3.366c-0.673,0.189-1.325,0.273-1.957,0.273c-3.619,0-6.565-3.073-6.859-7.05  c-0.316-4.103,2.987-7.154,5.534-9.764c-0.379-1.557-0.61-3.072-0.61-4.671c0-1.915,0.884-5.829,2.883-6.566  c0.863-0.336,2.462,3.894,2.42,6.229c-0.042,2.946-1.389,5.766-3.451,7.807L10.249,25.854z M10.06,28.357  c-1.179,0.358-2.188,1.578-2.167,2.883c0,1.115,0.736,1.831,1.662,2.273c0.104,0.041,0.147,0.126,0.147,0.209  c0,0.127-0.147,0.232-0.295,0.211c-1.6-0.547-2.735-2.104-2.715-3.871c0-1.726,1.368-3.473,2.904-4.04l-0.632-3.178  c-2.23,1.979-4.692,4.335-4.713,7.597c0,3.281,2.777,5.303,5.786,5.176c0.484-0.021,0.947-0.105,1.41-0.252L10.06,28.357z   M12.122,12.744c-0.021-0.674-0.421-1.347-1.158-1.347c-1.768,0.357-2.398,3.388-2.44,4.902c0,0.884,0.147,1.789,0.357,2.652  C10.564,17.5,12.206,15.122,12.122,12.744z M12.122,35.154c1.263-0.674,2.125-2.041,2.063-3.556  c-0.147-1.937-1.579-3.346-3.452-3.325L12.122,35.154z" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M25.243,17.415h0.327V27.66c-0.024,1.054-1.352,1.964-2.356,1.964c-0.303,0-0.609-0.039-0.852-0.196  c-0.387-0.255-0.471-0.665-0.458-1.113c0.036-1.077,1.315-1.927,2.356-1.963c0.303-0.013,0.606,0.019,0.982,0.261V17.415z" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M33.052,16.219h0.327v10.244c-0.023,1.054-1.352,1.965-2.357,1.965c-0.302,0-0.608-0.039-0.851-0.197  c-0.388-0.254-0.471-0.664-0.458-1.112c0.036-1.078,1.314-1.928,2.357-1.964c0.302-0.012,0.605,0.02,0.981,0.262V16.219z" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M40.191,13.56h0.328v10.245c-0.025,1.054-1.352,1.964-2.357,1.964c-0.303,0-0.609-0.039-0.851-0.196  c-0.388-0.255-0.471-0.665-0.458-1.113c0.035-1.078,1.314-1.928,2.355-1.964c0.303-0.012,0.607,0.02,0.982,0.262V13.56z" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M46.692,9.718h0.327v10.245c-0.024,1.054-1.352,1.964-2.357,1.964c-0.303,0-0.608-0.039-0.85-0.196  c-0.389-0.254-0.471-0.665-0.459-1.112c0.036-1.078,1.314-1.928,2.356-1.964c0.303-0.013,0.606,0.02,0.982,0.262V9.718z" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M52.896,9.718h0.328v10.245c-0.024,1.054-1.352,1.964-2.357,1.964c-0.303,0-0.609-0.039-0.851-0.196  c-0.388-0.254-0.471-0.665-0.458-1.112c0.036-1.078,1.314-1.928,2.356-1.964c0.303-0.013,0.606,0.02,0.981,0.262V9.718z" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M57.045,16.525h0.327V26.77c-0.024,1.054-1.351,1.965-2.356,1.965c-0.303,0-0.609-0.039-0.852-0.197  c-0.387-0.254-0.471-0.664-0.458-1.112c0.036-1.078,1.315-1.928,2.356-1.964c0.303-0.012,0.607,0.02,0.982,0.262V16.525z" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M52.126,52.258c1.521-1.018,2.489-1.58,3.339-3.062c0.365-0.642,0.632-1.562,0.632-2.232  c0-0.544-0.029-0.948-0.237-1.344c-0.236-0.454-0.74-0.81-1.393-0.751c-0.434,0.04-0.958,0.198-1.176,0.436  c-0.118,0.128-0.227,0.306-0.296,0.454c-0.06,0.128,0,0.325,0.237,0.336c0.089,0,0.286-0.079,0.395-0.089  c0.514-0.059,0.939,0.355,0.939,0.8c0,0.435-0.386,0.889-0.998,0.889c-0.633,0-1.166-0.435-1.186-1.057  c-0.02-0.661,0.415-1.333,1.027-1.669c0.326-0.207,1.037-0.395,1.383-0.395c0.633,0,1.195,0.107,1.787,0.602  c0.594,0.494,0.791,0.898,0.88,1.729c0.128,1.176-0.85,2.717-1.798,3.496c-0.889,0.732-2.252,1.473-3.477,2.065L52.126,52.258z   M58.418,45.334c0.326,0,0.533,0.267,0.533,0.533c0,0.277-0.207,0.543-0.533,0.543c-0.346,0-0.543-0.266-0.543-0.543  C57.875,45.601,58.072,45.334,58.418,45.334z M58.418,47.497c0.326,0,0.533,0.267,0.533,0.534c0,0.275-0.207,0.543-0.533,0.543  c-0.346,0-0.543-0.268-0.543-0.543C57.875,47.764,58.072,47.497,58.418,47.497z" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M42.021,40.791c0,0.923-0.566,1.771-1.367,2.389c-0.779,0.615-1.807,0.984-2.709,0.984  c-0.575,0-1.108-0.185-1.479-0.493c-0.39-0.308-0.615-0.759-0.615-1.293c0-0.841,0.574-1.683,1.354-2.299  c0.78-0.637,1.765-1.047,2.587-1.047c0.719,0,1.305,0.077,1.674,0.427V23.648h0.555c0.042,0.738,0.152,1.775,1.035,2.576  c1.006,0.882,1.93,1.765,2.565,2.565c0.842,1.047,1.437,2.36,1.437,3.694c0,0.678-0.102,1.375-0.287,2.031  c0.35,0.698,0.533,1.438,0.533,2.279c0,1.438-0.416,2.621-1.011,3.607h-0.333c0.432-0.657,0.934-2.211,0.893-3.197  c-0.041-1.088-0.123-1.724-0.82-2.586c-0.801-0.985-2.861-2.016-4.012-2.816V40.791z M46.525,32.689  c-0.041-1.088-0.574-1.93-1.272-2.791c-0.801-0.985-2.081-1.821-3.231-2.479c0.042,1.479,0.994,2.991,1.877,3.791  c1.006,0.883,1.498,1.355,2.094,2.094c0.184,0.227,0.324,0.491,0.469,0.717C46.502,33.591,46.546,33.039,46.525,32.689z" fill="#FFFFFF"/>
+<path d="M9.916,25.189c0.274-0.042,0.548-0.063,0.821-0.063c2.673-0.021,4.546,2.378,4.524,5.093  c0,2.251-1.347,3.913-3.346,4.881l0.842,4.271c0.063,0.358,0.063,0.674,0.063,0.969c0,2.146-1.347,3.535-3.577,3.768  c-1.747,0.189-3.746-1.011-3.936-2.904c-0.126-1.264,0.736-2.567,1.957-2.715c1.115-0.127,2.126,0.863,2.168,2.02  c0.063,1.621-1.536,2.146-2.146,2c0.063,0.715,1.305,0.988,1.894,0.926c1.957-0.232,2.883-1.432,2.946-3.137  c0-0.463-0.042-1.01-0.168-1.535l-0.716-3.367c-0.673,0.189-1.326,0.273-1.957,0.273c-3.62,0-6.565-3.072-6.86-7.049  c-0.315-4.104,2.988-7.154,5.534-9.764c-0.378-1.558-0.609-3.073-0.609-4.672c0-1.915,0.884-5.829,2.883-6.565  c0.862-0.337,2.462,3.893,2.42,6.229c-0.043,2.946-1.389,5.766-3.451,7.808L9.916,25.189z M9.728,27.693  c-1.179,0.357-2.188,1.578-2.168,2.883c0,1.115,0.736,1.83,1.662,2.271c0.105,0.043,0.147,0.127,0.147,0.211  c0,0.127-0.147,0.232-0.295,0.211c-1.599-0.547-2.735-2.105-2.714-3.872c0-1.726,1.367-3.472,2.904-4.04L8.633,22.18  c-2.23,1.979-4.692,4.335-4.714,7.597c0,3.282,2.778,5.303,5.787,5.177c0.484-0.021,0.947-0.105,1.41-0.253L9.728,27.693z   M11.789,12.079c-0.021-0.674-0.421-1.347-1.157-1.347c-1.768,0.357-2.398,3.388-2.44,4.903c0,0.884,0.146,1.788,0.357,2.651  C10.232,16.835,11.874,14.457,11.789,12.079z M11.789,34.49c1.263-0.674,2.126-2.042,2.063-3.557  c-0.147-1.936-1.578-3.346-3.451-3.325L11.789,34.49z" fill="#FFFFFF"/>
+<path d="M24.911,16.751h0.327v10.244c-0.024,1.054-1.352,1.964-2.357,1.964c-0.303,0-0.608-0.039-0.851-0.196  c-0.388-0.254-0.471-0.665-0.458-1.112c0.036-1.078,1.314-1.928,2.356-1.964c0.303-0.012,0.606,0.02,0.982,0.262V16.751z" fill="#FFFFFF"/>
+<path d="M32.719,15.554h0.328v10.245c-0.024,1.054-1.352,1.964-2.357,1.964c-0.303,0-0.609-0.039-0.851-0.196  c-0.388-0.255-0.471-0.665-0.458-1.113c0.036-1.077,1.314-1.927,2.356-1.963c0.302-0.013,0.606,0.019,0.981,0.261V15.554z" fill="#FFFFFF"/>
+<path d="M39.859,12.895h0.327V23.14c-0.024,1.054-1.352,1.964-2.356,1.964c-0.303,0-0.609-0.039-0.852-0.196  c-0.387-0.255-0.471-0.665-0.458-1.113c0.036-1.077,1.315-1.928,2.356-1.964c0.303-0.012,0.606,0.02,0.982,0.262V12.895z" fill="#FFFFFF"/>
+<path d="M46.359,9.053h0.328v10.245c-0.024,1.054-1.352,1.965-2.357,1.965c-0.303,0-0.609-0.039-0.851-0.197  c-0.388-0.254-0.471-0.664-0.458-1.112c0.036-1.078,1.314-1.928,2.356-1.964c0.302-0.013,0.606,0.02,0.981,0.262V9.053z" fill="#FFFFFF"/>
+<path d="M52.564,9.053h0.327v10.245c-0.024,1.054-1.351,1.965-2.356,1.965c-0.303,0-0.609-0.039-0.852-0.197  c-0.387-0.254-0.471-0.664-0.458-1.112c0.036-1.078,1.315-1.928,2.356-1.964c0.303-0.013,0.607,0.02,0.982,0.262V9.053z" fill="#FFFFFF"/>
+<path d="M56.713,15.86h0.327v10.245c-0.024,1.054-1.352,1.964-2.356,1.964c-0.303,0-0.609-0.039-0.852-0.196  c-0.387-0.255-0.471-0.665-0.458-1.113c0.036-1.077,1.315-1.927,2.356-1.963c0.303-0.013,0.606,0.019,0.982,0.261V15.86z" fill="#FFFFFF"/>
+<path d="M51.793,51.594c1.521-1.018,2.49-1.581,3.339-3.063c0.366-0.643,0.632-1.561,0.632-2.232  c0-0.543-0.029-0.948-0.236-1.344c-0.236-0.453-0.74-0.81-1.393-0.75c-0.435,0.039-0.959,0.197-1.176,0.435  c-0.119,0.128-0.227,0.306-0.297,0.454c-0.059,0.129,0,0.326,0.238,0.336c0.088,0,0.285-0.079,0.395-0.089  c0.514-0.06,0.938,0.355,0.938,0.8c0,0.436-0.386,0.889-0.998,0.889c-0.632,0-1.165-0.434-1.185-1.057  c-0.02-0.662,0.414-1.333,1.027-1.67c0.326-0.207,1.037-0.395,1.383-0.395c0.632,0,1.195,0.109,1.787,0.604  c0.593,0.493,0.791,0.898,0.879,1.728c0.129,1.176-0.85,2.717-1.797,3.497c-0.889,0.73-2.252,1.472-3.477,2.064L51.793,51.594z   M58.086,44.669c0.326,0,0.533,0.267,0.533,0.534c0,0.275-0.207,0.543-0.533,0.543c-0.346,0-0.543-0.268-0.543-0.543  C57.543,44.936,57.74,44.669,58.086,44.669z M58.086,46.832c0.326,0,0.533,0.268,0.533,0.533c0,0.277-0.207,0.544-0.533,0.544  c-0.346,0-0.543-0.267-0.543-0.544C57.543,47.1,57.74,46.832,58.086,46.832z" fill="#FFFFFF"/>
+</g>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music_player.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,84 +1,89 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<g>
 <rect fill="none" height="60" width="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="29.87" x2="30.09" y1="8.18" y2="51.03">
-<stop offset="0" stop-color="#D1D7D9"/>
-<stop offset="0.69" stop-color="#808A8C"/>
-<stop offset="1" stop-color="#A4ACAE"/>
+<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.889,7.958C18.055,8.02,8.511,17.661,8.571,29.495 c0.061,11.833,9.704,21.377,21.537,21.317c11.833-0.06,21.378-9.702,21.317-21.536C51.363,17.443,41.723,7.898,29.889,7.958z M30.025,34.895c-3.043,0.016-5.522-2.438-5.538-5.481c-0.014-3.043,2.438-5.522,5.481-5.539c3.042-0.016,5.523,2.439,5.539,5.482 S33.07,34.879,30.025,34.895z" fill="url(#SVGID_1)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="29.93" x2="30.02" y1="20.37" y2="38.59">
-<stop offset="0" stop-color="#FFFFFF"/>
-<stop offset="1" stop-color="#CFCFCF"/>
+<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.951,20.203c-5.072,0.026-9.163,4.158-9.136,9.23c0.026,5.071,4.157,9.161,9.229,9.135 c5.072-0.024,9.162-4.157,9.136-9.229C39.154,24.266,35.023,20.176,29.951,20.203z M30.023,34.282 c-2.705,0.014-4.909-2.168-4.923-4.872c-0.013-2.705,2.168-4.909,4.873-4.923c2.705-0.012,4.91,2.169,4.923,4.874 C34.908,32.065,32.728,34.27,30.023,34.282z" fill="url(#SVGID_2)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="50.84" x2="9.32" y1="39.88" y2="40.09">
-<stop offset="0" stop-color="#A0A7A9"/>
-<stop offset="0.5" stop-color="#FFFFFF"/>
-<stop offset="1" stop-color="#A0A7A9"/>
+<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.101,49.703 C18.785,49.761,9.541,40.75,9.247,29.492c-0.002,0.147-0.01,0.295-0.008,0.446c0.059,11.464,9.4,20.713,20.867,20.657 c11.468-0.06,20.719-9.401,20.658-20.868c-0.002-0.149-0.01-0.297-0.014-0.445C50.57,40.541,41.419,49.646,30.101,49.703z" fill="url(#SVGID_3)" fill-opacity="0.3" stroke-opacity="0.3"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="25.09" x2="34.89" y1="31.65" y2="31.6">
-<stop offset="0" stop-color="#848C8E"/>
-<stop offset="0.5" stop-color="#FFFFFF"/>
-<stop offset="1" stop-color="#848C8E"/>
+<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="M30.023,34.282c2.705-0.013,4.885-2.217,4.873-4.922c-0.001-0.155-0.011-0.309-0.026-0.459 c-0.217,2.49-2.301,4.603-4.85,4.615c-2.55,0.013-4.654-2.078-4.897-4.565c-0.013,0.151-0.022,0.305-0.021,0.459 C25.114,32.114,27.318,34.296,30.023,34.282z" fill="url(#SVGID_4)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="30" x2="30" y1="8.88" y2="50.2">
-<stop offset="0" stop-color="#36B5FF"/>
-<stop offset="1" stop-color="#1B66D8"/>
-</linearGradient>
-<path d="M29.891,8.571C18.395,8.629,9.124,17.996,9.183,29.491 c0.06,11.496,9.427,20.765,20.921,20.708c11.496-0.059,20.767-9.424,20.708-20.919C50.754,17.783,41.386,8.512,29.891,8.571z M30.043,38.215c-4.877,0.025-8.851-3.908-8.875-8.785h-0.002c-0.025-4.877,3.909-8.85,8.787-8.875 c4.878-0.025,8.85,3.908,8.875,8.785h0.003C38.854,34.218,34.92,38.191,30.043,38.215z" fill="url(#SVGID_5)"/>
-<path d="M10.215,33.473C8.057,23.053,14.406,12.693,24.67,9.886 c1.672-0.457,3.401-0.693,5.133-0.701c8.607-0.044,16.546,5.571,19.313,13.654l0.21,0.617l-10.387,2.838l-0.205-0.502 c-1.441-3.524-4.975-5.879-8.794-5.859c-0.819,0.004-1.639,0.116-2.434,0.333c-4.6,1.258-7.546,5.759-6.855,10.47l0.079,0.535 l-10.385,2.841L10.215,33.473z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
-<g transform="matrix(0.5 0 0 0.5 30 30)">
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="8.47" y2="51.32">
-<stop offset="0" stop-color="#F2F2F2"/>
-<stop offset="0.12" stop-color="#F2F2F2"/>
-<stop offset="0.55" stop-color="#ADB2B5"/>
-<stop offset="1" stop-color="#E6E9E8"/>
+<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="M29.998,51.425c-11.816,0-21.427-9.61-21.427-21.427c0-11.814,9.611-21.427,21.427-21.427 c11.813,0,21.427,9.613,21.427,21.427C51.425,41.814,41.812,51.425,29.998,51.425L29.998,51.425z" fill="url(#SVGID_1_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="9.18" y2="51.73">
-<stop offset="0" stop-color="#DDE3E6"/>
-<stop offset="0.48" stop-color="#C9CED1"/>
-<stop offset="1" stop-color="#899396"/>
+<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>
-<path d="M50.813,29.998c0,11.498-9.322,20.814-20.814,20.814c-11.499,0-20.815-9.316-20.815-20.814 c0-11.493,9.317-20.815,20.815-20.815C41.491,9.183,50.813,18.505,50.813,29.998z" fill="url(#SVGID_2_)"/>
-<polygon fill="#6D6E70" points="22.886,17.958 41.74,28.789 22.886,39.837 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="32.38" x2="32.38" y1="39.27" y2="19.91">
-<stop offset="0" stop-color="#FFFFFF"/>
-<stop offset="1" stop-color="#F5F6F6"/>
-</linearGradient>
-<polygon fill="url(#SVGID_3_)" points="24.046,19.963 40.724,29.593 24.046,39.221 "/>
+<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 transform="matrix(0.5 0 0 0.5 0 0)">
-<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"/>
+<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="M48.631,13.079l-3.08-7.497L27.85,13.46l0.028,23.917c-2.712-1.771-6.708-2.354-10.768-1.254 c-6.405,1.725-10.542,6.951-9.247,11.665c1.3,4.718,7.543,7.142,13.944,5.415c5.412-1.461,9.159-5.324,9.138-9.451 c-0.018-4.129,0.033-15.338,0-23.445L48.631,13.079z" 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"/>
+<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="27.878,33.26 27.857,13.46 27.85,13.46 27.872,33.258 "/>
-<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"/>
+<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="M30.945,19.08c0.007,1.306,0.01-0.201,0.012,1.223l17.674-7.225l-0.436-1.108L30.945,19.08z" 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"/>
+<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="28.142,38.062 28.142,14.143 45.891,6.413 45.551,5.582 27.454,13.46 27.454,37.378 "/>
-<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"/>
+<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="M17.625,52.389c-4.258,0.021-7.653-1.941-8.447-4.885c-0.484-1.785,0.028-3.761,1.444-5.555 c1.55-1.964,3.944-3.454,6.747-4.191c1.187-0.317,2.386-0.477,3.573-0.484c4.258-0.021,7.651,1.943,8.45,4.885 c1.058,3.9-2.618,8.272-8.196,9.748C20.012,52.221,18.808,52.381,17.625,52.389L17.625,52.389z" fill="url(#SVGID_5_)"/>
-<rect fill="none" height="59.996" width="59.996"/>
+<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 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music_shop.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,121 +1,130 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<g>
 <rect fill="none" height="60" width="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="7" x2="7" y1="9.61" y2="15.05">
-<stop offset="0" stop-color="#BFBFBF"/>
-<stop offset="0.78" stop-color="#404040"/>
-<stop offset="1" stop-color="#666666"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4.2197" x2="4.2197" y1="4.7148" y2="11.4634">
+<stop offset="0" style="stop-color:#BFBFBF"/>
+<stop offset="0.7818" style="stop-color:#404040"/>
+<stop offset="1" style="stop-color:#666666"/>
 </linearGradient>
-<path d="M7.003,14.989c-1.472,0-2.67-1.198-2.67-2.67c0-1.471,1.198-2.669,2.67-2.669s2.67,1.198,2.67,2.669 C9.673,13.791,8.475,14.989,7.003,14.989L7.003,14.989z" fill="url(#SVGID_1)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="7" x2="7" y1="10.26" y2="14.4">
-<stop offset="0" stop-color="#7A7A7A"/>
-<stop offset="0.78" stop-color="#212121"/>
-<stop offset="1" stop-color="#3A3A3A"/>
+<path d="M4.221,11.382c-1.826,0-3.313-1.486-3.313-3.312c0-1.824,1.486-3.311,3.313-3.311  c1.824,0,3.311,1.486,3.311,3.311C7.531,9.896,6.045,11.382,4.221,11.382L4.221,11.382z" fill="url(#SVGID_1_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="4.2207" x2="4.2207" y1="5.5142" y2="10.6549">
+<stop offset="0" style="stop-color:#7A7A7A"/>
+<stop offset="0.7818" style="stop-color:#212121"/>
+<stop offset="1" style="stop-color:#3A3A3A"/>
 </linearGradient>
-<circle cx="7.003" cy="12.319" fill="url(#SVGID_2)" r="2.033"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="14.48" x2="49.1" y1="43.99" y2="43.99">
-<stop offset="0" stop-color="#878A8C"/>
-<stop offset="0.26" stop-color="#BDC2C4"/>
-<stop offset="0.66" stop-color="#757D80"/>
-<stop offset="1" stop-color="#959A9C"/>
+<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"/>
 </linearGradient>
-<path d="M48.13,42.719H17.573l-3.24,1.272l0,0c0,0.24,0.062,0.479,0.195,0.688 c0.234,0.362,0.637,0.582,1.07,0.582H48.13c0.701,0,1.271-0.569,1.271-1.271C49.401,43.288,48.831,42.719,48.13,42.719z" fill="url(#SVGID_3)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="15.94" x2="19" y1="39.23" y2="40.65">
-<stop offset="0" stop-color="#878A8C"/>
-<stop offset="0.26" stop-color="#BDC2C4"/>
-<stop offset="0.66" stop-color="#757D80"/>
-<stop offset="1" stop-color="#959A9C"/>
+<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"/>
 </linearGradient>
-<path d="M14.333,43.991l3.24-1.272l2.57-5.657c0.291-0.639,0.01-1.394-0.631-1.684 c-0.64-0.291-1.394-0.008-1.684,0.632l-3.389,7.455C14.363,43.632,14.333,43.812,14.333,43.991L14.333,43.991z" fill="url(#SVGID_4)"/>
-<path d="M19.218,35.289c-0.561-0.105-1.143,0.177-1.389,0.721l-0.932,2.049c0.533,1.2,1.018,1.97,1.444,2.269 c0.079,0.059,0.166,0.102,0.248,0.154l1.454-3.199C19.825,36.819,19.534,36.132,19.218,35.289z" fill-opacity="0.1"/>
-<path d="M18.558,35.341c-0.312,0.11-0.581,0.343-0.729,0.669l-0.574,1.262c0.469,1.144,1.008,2.223,1.465,2.545 c0.044,0.031,0.092,0.053,0.135,0.084l0.852-1.875C19.444,37.549,19.013,36.572,18.558,35.341z" fill-opacity="0.2"/>
-<path d="M14.528,44.68c0.234,0.362,0.637,0.582,1.07,0.582H48.13c0.701,0,1.271-0.569,1.271-1.271H14.333 C14.333,44.231,14.395,44.471,14.528,44.68z" fill-opacity="0.2"/>
-<path d="M18.512,45.262h8.528c-0.322-1.075-1.04-1.977-1.982-2.543h-4.563C19.552,43.285,18.832,44.187,18.512,45.262 z" fill-opacity="0.2"/>
-<radialGradient cx="22.45" cy="42.03" gradientUnits="userSpaceOnUse" id="SVGID_5" r="8.59">
-<stop offset="0" stop-color="#7A7A7A"/>
-<stop offset="0.78" stop-color="#212121"/>
-<stop offset="1" stop-color="#353535"/>
+<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"/>
+<path d="M18.551,36.624c-0.387,0.137-0.721,0.425-0.902,0.83l-0.713,1.565c0.582,1.418,1.25,2.756,1.816,3.156  c0.055,0.039,0.115,0.065,0.168,0.104l1.057-2.325C19.652,39.363,19.115,38.151,18.551,36.624z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M13.555,48.207c0.291,0.45,0.789,0.722,1.326,0.722h40.35c0.869,0,1.576-0.706,1.576-1.576H13.313  C13.313,47.651,13.387,47.948,13.555,48.207z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M18.494,48.929h10.578c-0.4-1.333-1.291-2.452-2.459-3.155h-5.66C19.785,46.478,18.891,47.596,18.494,48.929z  " fill-opacity="0.2" stroke-opacity="0.2"/>
+<radialGradient cx="23.3809" cy="44.9189" gradientUnits="userSpaceOnUse" id="SVGID_5_" r="10.6545">
+<stop offset="0" style="stop-color:#7A7A7A"/>
+<stop offset="0.7818" style="stop-color:#212121"/>
+<stop offset="1" style="stop-color:#353535"/>
 </radialGradient>
-<path d="M22.776,50.35c-2.104,0-3.816-1.712-3.816-3.816c0-2.104,1.712-3.814,3.816-3.814 c2.104,0,3.814,1.711,3.814,3.814C26.591,48.638,24.88,50.35,22.776,50.35L22.776,50.35z" fill="url(#SVGID_5)"/>
-<radialGradient cx="22.51" cy="42.78" gradientUnits="userSpaceOnUse" id="SVGID_6" r="7.16">
-<stop offset="0" stop-color="#7A7A7A"/>
-<stop offset="0.78" stop-color="#212121"/>
-<stop offset="1" stop-color="#353535"/>
+<path d="M23.785,55.24c-2.613,0-4.734-2.124-4.734-4.733c0-2.609,2.121-4.732,4.734-4.732  c2.607,0,4.73,2.123,4.73,4.732C28.516,53.116,26.393,55.24,23.785,55.24L23.785,55.24z" fill="url(#SVGID_5_)"/>
+<radialGradient cx="23.4492" cy="45.8501" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="8.8793">
+<stop offset="0" style="stop-color:#7A7A7A"/>
+<stop offset="0.7818" style="stop-color:#212121"/>
+<stop offset="1" style="stop-color:#353535"/>
 </radialGradient>
-<circle cx="22.776" cy="46.533" fill="url(#SVGID_6)" r="3.18"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7" x1="8.71" x2="8.71" y1="10.99" y2="13.9">
-<stop offset="0" stop-color="#D1D7D9"/>
-<stop offset="0.07" stop-color="#D1D7D9"/>
-<stop offset="0.46" stop-color="#BDC2C4"/>
-<stop offset="0.73" stop-color="#949DA1"/>
-<stop offset="0.96" stop-color="#ADB3B5"/>
-<stop offset="1" stop-color="#595C5E"/>
+<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"/>
 </linearGradient>
-<path d="M10.392,10.964H7.681c-0.748,0-1.355,0.607-1.355,1.355s0.607,1.355,1.355,1.355h1.66l1.744-2.414 C10.896,11.091,10.669,10.964,10.392,10.964z" fill="url(#SVGID_7)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8" x1="22.78" x2="22.78" y1="44.72" y2="48.48">
-<stop offset="0" stop-color="#E6E9E8"/>
-<stop offset="1" stop-color="#ADB2B5"/>
+<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"/>
 </linearGradient>
-<path d="M22.776,48.441c-1.053,0-1.908-0.856-1.908-1.908s0.855-1.907,1.908-1.907 c1.051,0,1.907,0.855,1.907,1.907S23.827,48.441,22.776,48.441L22.776,48.441z" fill="url(#SVGID_8)"/>
-<path d="M36.954,45.262h8.527c-0.322-1.075-1.039-1.977-1.982-2.543h-4.563 C37.993,43.285,37.274,44.187,36.954,45.262z" fill-opacity="0.1"/>
-<radialGradient cx="41.16" cy="42.03" gradientUnits="userSpaceOnUse" id="SVGID_9" r="8.74">
-<stop offset="0" stop-color="#7A7A7A"/>
-<stop offset="0.78" stop-color="#212121"/>
-<stop offset="1" stop-color="#353535"/>
+<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"/>
+<radialGradient cx="46.5889" cy="44.9189" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="10.8384">
+<stop offset="0" style="stop-color:#7A7A7A"/>
+<stop offset="0.7818" style="stop-color:#212121"/>
+<stop offset="1" style="stop-color:#353535"/>
+</radialGradient>
+<path d="M46.656,55.24c-2.611,0-4.732-2.124-4.732-4.733c0-2.609,2.121-4.732,4.732-4.732  c2.609,0,4.732,2.123,4.732,4.732C51.389,53.116,49.266,55.24,46.656,55.24L46.656,55.24z" fill="url(#SVGID_9_)"/>
+<radialGradient cx="46.6006" cy="45.8501" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="9.0328">
+<stop offset="0" style="stop-color:#7A7A7A"/>
+<stop offset="0.7818" style="stop-color:#212121"/>
+<stop offset="1" style="stop-color:#353535"/>
 </radialGradient>
-<path d="M41.218,50.35c-2.104,0-3.816-1.712-3.816-3.816c0-2.104,1.712-3.814,3.816-3.814 c2.104,0,3.815,1.711,3.815,3.814C45.033,48.638,43.321,50.35,41.218,50.35L41.218,50.35z" fill="url(#SVGID_9)"/>
-<radialGradient cx="41.17" cy="42.78" gradientUnits="userSpaceOnUse" id="SVGID_10" r="7.28">
-<stop offset="0" stop-color="#7A7A7A"/>
-<stop offset="0.78" stop-color="#212121"/>
-<stop offset="1" stop-color="#353535"/>
-</radialGradient>
-<circle cx="41.218" cy="46.533" fill="url(#SVGID_10)" r="3.18"/>
-<path d="M41.218,48.441c-1.053,0-1.908-0.856-1.908-1.908s0.855-1.907,1.908-1.907 c1.052,0,1.907,0.855,1.907,1.907S42.27,48.441,41.218,48.441L41.218,48.441z" fill="url(#SVGID_8)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12" x1="27.9" x2="27.9" y1="14" y2="40.12">
-<stop offset="0" stop-color="#D1D7D9"/>
-<stop offset="0.07" stop-color="#D1D7D9"/>
-<stop offset="0.46" stop-color="#BDC2C4"/>
-<stop offset="0.73" stop-color="#949DA1"/>
-<stop offset="0.96" stop-color="#ADB3B5"/>
-<stop offset="1" stop-color="#595C5E"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M13.279,16.567l-1.535-4.217c0-0.01-0.415-1.387-1.353-1.387H7.681 c-0.748,0-1.355,0.607-1.355,1.355s0.607,1.355,1.355,1.355h1.66l7.547,20.737c0,0,1.42,4.339,2.211,4.893 c0.678,0.501,1.511,0.802,2.418,0.802H44.56c2.246,0,4.066-1.82,4.066-4.066l0.858-16.943L13.279,16.567z M22.009,36.929 c-0.453,0.144-0.935-0.109-1.078-0.56l-4.696-14.877c-0.144-0.451,0.106-0.933,0.561-1.076c0.45-0.143,0.933,0.107,1.075,0.56 l4.697,14.878C22.71,36.304,22.46,36.786,22.009,36.929z M26.616,37.074c-0.452,0.144-0.934-0.107-1.077-0.56l-4.698-14.876 c-0.142-0.452,0.109-0.933,0.561-1.076c0.453-0.142,0.936,0.106,1.077,0.56l4.698,14.877C27.317,36.45,27.067,36.932,26.616,37.074z M31.305,37.224c-0.453,0.144-0.935-0.107-1.078-0.56l-4.698-14.876c-0.142-0.451,0.109-0.934,0.563-1.077 c0.451-0.143,0.934,0.107,1.075,0.561l4.698,14.876C32.005,36.599,31.755,37.08,31.305,37.224z M35.515,37.357 c-0.453,0.144-0.935-0.107-1.078-0.561l-4.695-14.876c-0.143-0.451,0.106-0.933,0.561-1.076c0.451-0.144,0.934,0.107,1.074,0.559 l4.698,14.878C36.216,36.733,35.968,37.216,35.515,37.357z M40.123,37.505c-0.453,0.143-0.935-0.109-1.077-0.561l-4.697-14.877 c-0.143-0.451,0.107-0.933,0.561-1.076c0.451-0.143,0.934,0.107,1.076,0.56l4.697,14.878C40.825,36.88,40.573,37.361,40.123,37.505z M44.653,37.653c-0.453,0.144-0.936-0.109-1.078-0.56l-4.697-14.877c-0.143-0.451,0.105-0.933,0.56-1.076 c0.452-0.143,0.934,0.107,1.077,0.56l4.697,14.878C45.354,37.027,45.103,37.51,44.653,37.653z M45.972,28.915 c-0.453,0.143-0.936-0.108-1.078-0.561l-1.883-5.926c-0.143-0.451,0.107-0.934,0.561-1.076c0.451-0.143,0.934,0.108,1.076,0.56 l1.883,5.927C46.673,28.29,46.422,28.771,45.972,28.915z" fill="url(#SVGID_12)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13" x1="27.9" x2="27.9" y1="14" y2="40.12">
-<stop offset="0" stop-color="#ECF3F5"/>
-<stop offset="0.46" stop-color="#D3D9DB"/>
-<stop offset="0.73" stop-color="#ABB5BA"/>
-<stop offset="0.96" stop-color="#ADB3B5"/>
-<stop offset="1" stop-color="#595C5E"/>
+<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"/>
 </linearGradient>
-<path d="M13.279,16.567l-1.535-4.217c0-0.01-0.415-1.387-1.353-1.387H7.681 c-0.748,0-1.355,0.607-1.355,1.355s0.607,1.355,1.355,1.355h1.66l7.547,20.737c0,0,1.42,4.339,2.211,4.893 c0.678,0.501,1.511,0.802,2.418,0.802H44.56c2.246,0,4.066-1.82,4.066-4.066l0.02-0.4c0.006-0.086,0.009-0.168,0.014-0.234 l0.035-0.713l0.215-4.236v-0.002l0.021-0.416l0.554-10.941L13.279,16.567z M47.99,36.008c0,1.924-1.539,3.463-3.431,3.463H21.517 c-0.736,0-1.441-0.234-2.038-0.677c-0.397-0.317-1.345-2.62-1.985-4.579L9.786,13.039H7.681c-0.396,0-0.72-0.323-0.72-0.72 s0.323-0.719,0.72-0.719h2.711c0.317,0,0.609,0.562,0.713,0.842v0.012l1.717,4.72l35.996,2.514L47.99,36.008z" fill="url(#SVGID_13)"/>
-<g transform="matrix(0.5 0 0 0.5 30 30)">
-<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"/>
-</linearGradient>
-<path d="M48.631,13.079l-3.08-7.497L27.85,13.46l0.028,23.917c-2.712-1.771-6.708-2.354-10.768-1.254 c-6.405,1.725-10.542,6.951-9.247,11.665c1.3,4.718,7.543,7.142,13.944,5.415c5.412-1.461,9.159-5.324,9.138-9.451 c-0.018-4.129,0.033-15.338,0-23.445L48.631,13.079z" 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"/>
+<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"/>
+</g>
+<g transform="matrix(1 0 0 1 30 30)">
+<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>
-<polygon fill="url(#SVGID_2_)" points="27.878,33.26 27.857,13.46 27.85,13.46 27.872,33.258 "/>
-<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"/>
+<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="M30.945,19.08c0.007,1.306,0.01-0.201,0.012,1.223l17.674-7.225l-0.436-1.108L30.945,19.08z" 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"/>
+<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="28.142,38.062 28.142,14.143 45.891,6.413 45.551,5.582 27.454,13.46 27.454,37.378 "/>
-<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"/>
+<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="M17.625,52.389c-4.258,0.021-7.653-1.941-8.447-4.885c-0.484-1.785,0.028-3.761,1.444-5.555 c1.55-1.964,3.944-3.454,6.747-4.191c1.187-0.317,2.386-0.477,3.573-0.484c4.258-0.021,7.651,1.943,8.45,4.885 c1.058,3.9-2.618,8.272-8.196,9.748C20.012,52.221,18.808,52.381,17.625,52.389L17.625,52.389z" fill="url(#SVGID_5_)"/>
-<rect fill="none" height="59.996" width="59.996"/>
+<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 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mycard.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mycard.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mycard.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
 <rect fill="none" height="60" width="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="30" x2="30" y1="11.32" y2="46.87">
-<stop offset="0" stop-color="#E3E3E3"/>
-<stop offset="1" stop-color="#9B9B9B"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="8.8086" y2="50.5088">
+<stop offset="0" style="stop-color:#E3E3E3"/>
+<stop offset="1" style="stop-color:#9B9B9B"/>
 </linearGradient>
-<path d="M8.571,47.14c-1.351,0-2.449-1.099-2.449-2.449v-30.61c0-1.351,1.098-2.449,2.449-2.449 h42.854c1.351,0,2.448,1.098,2.448,2.449v30.61c0,1.351-1.098,2.449-2.448,2.449H8.571z" fill="url(#SVGID_1)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="30" x2="30" y1="11.94" y2="46.27">
-<stop offset="0" stop-color="#F5F5F5"/>
-<stop offset="0.78" stop-color="#CCCCCC"/>
-<stop offset="1" stop-color="#D1D1D1"/>
+<path d="M4.871,50.82C3.289,50.82,2,49.533,2,47.948V12.052C2,10.467,3.289,9.18,4.871,9.18h50.258  c1.584,0,2.871,1.287,2.871,2.872v35.896c0,1.585-1.287,2.872-2.871,2.872H4.871z" fill="url(#SVGID_1_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30.001" x2="30.001" y1="9.5391" y2="49.8016">
+<stop offset="0" style="stop-color:#F5F5F5"/>
+<stop offset="0.7818" style="stop-color:#CCCCCC"/>
+<stop offset="1" style="stop-color:#D1D1D1"/>
 </linearGradient>
-<path d="M53.262,44.69c0,1.015-0.823,1.837-1.837,1.837H8.571c-1.014,0-1.836-0.822-1.836-1.837 v-30.61c0-1.014,0.823-1.836,1.836-1.836h42.854c1.014,0,1.837,0.822,1.837,1.836V44.69z" fill="url(#SVGID_2)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="30" x2="30" y1="12.79" y2="45.85">
-<stop offset="0" stop-color="#FFFFFF"/>
-<stop offset="1" stop-color="#DEDEDE"/>
+<path d="M57.283,47.948c0,1.189-0.965,2.154-2.154,2.154H4.871c-1.188,0-2.152-0.965-2.152-2.154V12.052  c0-1.189,0.965-2.154,2.152-2.154h50.258c1.189,0,2.154,0.965,2.154,2.154V47.948z" fill="url(#SVGID_2_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30" x2="30" y1="10.54" y2="49.3096">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#DEDEDE"/>
 </linearGradient>
-<path d="M51.425,13.468c0.338,0,0.612,0.274,0.612,0.612v30.61c0,0.338-0.274,0.612-0.612,0.612H8.571 c-0.338,0-0.612-0.274-0.612-0.612v-30.61c0-0.338,0.274-0.612,0.612-0.612H51.425 M51.425,12.856H8.571 c-0.675,0-1.225,0.549-1.225,1.224v30.61c0,0.675,0.549,1.225,1.225,1.225h42.854c0.675,0,1.225-0.55,1.225-1.225v-30.61 C52.649,13.405,52.1,12.856,51.425,12.856L51.425,12.856z" fill="url(#SVGID_3)"/>
-<rect fill="#020202" fill-opacity="0.1" height="20.203" stroke-opacity="0.1" width="18.366" x="11.02" y="20.04"/>
-<rect fill="#FFFFFF" height="20.202" width="18.366" x="11.02" y="18.815"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="20.2" x2="20.2" y1="38.48" y2="19.5">
-<stop offset="0" stop-color="#3FA8F4"/>
-<stop offset="1" stop-color="#8DC8E1"/>
+<path d="M55.129,11.334c0.396,0,0.719,0.321,0.719,0.718v35.896c0,0.396-0.322,0.718-0.719,0.718H4.871  c-0.395,0-0.717-0.321-0.717-0.718V12.052c0-0.396,0.322-0.718,0.717-0.718H55.129 M55.129,10.615H4.871  c-0.791,0-1.436,0.644-1.436,1.437v35.896c0,0.792,0.645,1.437,1.436,1.437h50.258c0.791,0,1.436-0.645,1.436-1.437V12.052  C56.564,11.259,55.92,10.615,55.129,10.615L55.129,10.615z" fill="url(#SVGID_3_)"/>
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_4)" height="18.979" width="17.142" x="11.632" y="19.428"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="12.86" x2="26.33" y1="29.18" y2="29.18">
-<stop offset="0" stop-color="#146BAF"/>
-<stop offset="1" stop-color="#013B77"/>
+<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"/>
 </linearGradient>
-<path d="M25.682,33.236c-0.398-0.207-1.947-0.768-2.775-1.079l-0.037-0.015l-0.001,0.001 c-0.008-0.003-0.016-0.006-0.023-0.009l-0.469-0.189c-0.329-0.375-0.293-1.24-0.109-1.53c0.039-0.059,0.071-0.116,0.109-0.175H22.37 c0.268-0.437,0.497-0.871,0.679-1.277c0.332,0.115,0.758-0.194,0.969-0.716c0.219-0.541,0.125-1.102-0.212-1.252 c-0.018-0.009-0.039-0.01-0.058-0.016c0,0,0,0,0,0c0.043-0.17,0.064-0.271,0.064-0.271c0.58-2.604-0.683-4.668-3.744-4.771 c-1.257,0-1.862,0.573-2.33,1.17c-0.76,0.117-1.963,0.813-1.114,3.861c-0.032,0.006-0.063,0.011-0.094,0.023 c-0.34,0.143-0.446,0.699-0.238,1.242c0.208,0.542,0.651,0.868,0.991,0.725c0.02-0.01,0.039-0.024,0.058-0.036 c0.187,0.419,0.417,0.868,0.693,1.319h-0.003c0.013,0.021,0.026,0.042,0.039,0.063c0.002,0.004,0.003,0.007,0.006,0.011 c0.001,0,0.001,0.001,0.002,0.002c0.02,0.033,0.04,0.066,0.061,0.099c0.176,0.275,0.214,1.07-0.068,1.469l-0.488,0.213 c-0.82,0.32-2.399,0.896-2.856,1.139c-0.71,0.377-1.867,1.242-1.867,3.192h14.692C27.549,34.479,26.228,33.521,25.682,33.236z M23.705,26.971c-0.018-0.004-0.036-0.009-0.054-0.011c-0.024-0.004-0.047-0.01-0.071-0.014c-0.004-0.001-0.006-0.001-0.011-0.002 C23.614,26.952,23.659,26.961,23.705,26.971z M16.628,26.966c0.006-0.006,0.014-0.014,0.021-0.02 c0.001,0.005,0.002,0.008,0.003,0.013C16.645,26.961,16.637,26.965,16.628,26.966z" fill="url(#SVGID_5)"/>
-<rect fill="#020202" fill-opacity="0.2" height="0.612" stroke-opacity="0.2" width="15.918" x="33.059" y="22.489"/>
-<rect fill="#020202" fill-opacity="0.5" height="1.071" stroke-opacity="0.5" width="15.918" x="33.059" y="23.101"/>
-<rect fill="#020202" fill-opacity="0.2" height="0.612" stroke-opacity="0.2" width="15.918" x="33.059" y="27.999"/>
-<rect fill="#020202" fill-opacity="0.5" height="1.072" stroke-opacity="0.5" width="15.918" x="33.059" y="28.61"/>
-<rect fill="#020202" fill-opacity="0.2" height="0.612" stroke-opacity="0.2" width="15.918" x="33.059" y="33.508"/>
-<rect fill="#020202" fill-opacity="0.5" height="1.071" stroke-opacity="0.5" width="15.918" x="33.059" y="34.12"/>
-<rect fill="none" height="59.996" width="59.996"/>
+<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"/>
+<rect fill="#020202" fill-opacity="0.5" height="1.256" stroke-opacity="0.5" width="18.668" x="33.59" y="22.63"/>
+<rect fill="#020202" fill-opacity="0.2" height="0.718" stroke-opacity="0.2" width="18.668" x="33.59" y="28.374"/>
+<rect fill="#020202" fill-opacity="0.5" height="1.256" stroke-opacity="0.5" width="18.668" x="33.59" y="29.092"/>
+<rect fill="#020202" fill-opacity="0.2" height="0.718" stroke-opacity="0.2" width="18.668" x="33.59" y="34.835"/>
+<rect fill="#020202" fill-opacity="0.5" height="1.257" stroke-opacity="0.5" width="18.668" x="33.59" y="35.553"/>
+<rect fill="none" height="60" width="60"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_network.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_network.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_network.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,29 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <rect fill="none" height="60" width="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30.0542" x2="30.0542" y1="8.5713" y2="30.7411">
-<stop offset="0" style="stop-color:#CCCCCC"/>
-<stop offset="1" style="stop-color:#919191"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30.05" x2="30.05" y1="8.571" y2="30.74">
+<stop offset="0" stop-color="#CCCCCC"/>
+<stop offset="1" stop-color="#919191"/>
 </linearGradient>
-<path d="M48.367,8.571H11.633v0.043l-3.131,3.131l19.045,19.045l2.507-2.507l2.507,2.507l19.046-19.045  l-3.174-3.174 M17.798,14.694h24.512L30.055,26.95L17.798,14.694z" fill="url(#SVGID_1_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30.0542" x2="30.0542" y1="9.3936" y2="29.5542">
-<stop offset="0" style="stop-color:#DBDBDB"/>
-<stop offset="0.3152" style="stop-color:#DBDBDB"/>
-<stop offset="0.6848" style="stop-color:#B3B3B3"/>
-<stop offset="1" style="stop-color:#B8B8B8"/>
+<path d="M48.37,8.571h-36.74v0.043l-3.131,3.131,19.04,19.04,2.507-2.507,2.507,2.507,19.05-19.04-3.174-3.174m-30.64,6.124h24.51l-12.25,12.26-12.26-12.26z" fill="url(#SVGID_1_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30.05" x2="30.05" y1="9.394" y2="29.55">
+<stop offset="0" stop-color="#DBDBDB"/>
+<stop offset="0.3152" stop-color="#DBDBDB"/>
+<stop offset="0.6848" stop-color="#B3B3B3"/>
+<stop offset="1" stop-color="#B8B8B8"/>
 </linearGradient>
-<polygon fill="url(#SVGID_2_)" points="9.555,11.607 11.768,9.394 48.342,9.394 50.555,11.607 32.607,29.554 30.815,27.763   44.988,13.59 15.121,13.59 29.294,27.763 27.502,29.554 "/>
-<polygon fill="#FFFFFF" fill-opacity="0.5" points="45.006,13.572 30.815,27.763 31.322,28.27 46.021,13.572 " stroke-opacity="0.5"/>
-<polygon fill="#FFFFFF" fill-opacity="0.8" points="11.768,10.408 48.342,10.408 50.047,12.114 50.555,11.607 48.342,9.394 11.768,9.394   9.555,11.607 10.062,12.114 " stroke-opacity="0.8"/>
-<polygon fill="#FFFFFF" fill-opacity="0.5" points="14.139,13.623 28.787,28.27 29.294,27.763 15.153,13.623 " stroke-opacity="0.5"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="26.939" x2="33.0605" y1="32.2148" y2="32.2148">
-<stop offset="0" style="stop-color:#B8B8B8"/>
-<stop offset="0.3697" style="stop-color:#E6E6E6"/>
-<stop offset="0.7212" style="stop-color:#919191"/>
-<stop offset="1" style="stop-color:#E6E6E6"/>
+<polygon fill="url(#SVGID_2_)" points="9.555,11.61,11.77,9.394,48.34,9.394,50.56,11.61,32.61,29.55,30.82,27.76,44.99,13.59,15.12,13.59,29.29,27.76,27.5,29.55"/>
+<polygon fill="#FFFFFF" fill-opacity="0.5" points="45.01,13.57,30.82,27.76,31.32,28.27,46.02,13.57" stroke-opacity="0.5"/>
+<polygon fill="#FFFFFF" fill-opacity="0.8" points="11.77,10.41,48.34,10.41,50.05,12.11,50.56,11.61,48.34,9.394,11.77,9.394,9.555,11.61,10.06,12.11" stroke-opacity="0.8"/>
+<polygon fill="#FFFFFF" fill-opacity="0.5" points="14.14,13.62,28.79,28.27,29.29,27.76,15.15,13.62" stroke-opacity="0.5"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="26.94" x2="33.06" y1="32.21" y2="32.21">
+<stop offset="0" stop-color="#B8B8B8"/>
+<stop offset="0.3697" stop-color="#E6E6E6"/>
+<stop offset="0.7212" stop-color="#919191"/>
+<stop offset="1" stop-color="#E6E6E6"/>
 </linearGradient>
-<path d="M33.061,50.204c0,0.677-0.547,1.225-1.224,1.225h-3.674c-0.676,0-1.224-0.548-1.224-1.225V14.225  c0-0.676,0.548-1.225,1.224-1.225h3.674c0.677,0,1.224,0.548,1.224,1.225V50.204z" fill="url(#SVGID_3_)"/>
-</g>
+<path d="M33.06,50.2c0,0.677-0.547,1.225-1.224,1.225h-3.674c-0.676,0-1.224-0.548-1.224-1.225v-35.98c0-0.676,0.548-1.225,1.224-1.225h3.674c0.677,0,1.224,0.548,1.224,1.225v35.98z" fill="url(#SVGID_3_)"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_network_off.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,38 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
 <rect fill="none" height="60" width="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30.0542" x2="30.0542" y1="8.5713" y2="30.7411">
-<stop offset="0" style="stop-color:#CCCCCC"/>
-<stop offset="1" style="stop-color:#919191"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30.05" x2="30.05" y1="8.571" y2="30.74">
+<stop offset="0" stop-color="#CCCCCC"/>
+<stop offset="1" stop-color="#919191"/>
 </linearGradient>
-<path d="M48.367,8.571H11.633v0.043l-3.131,3.131l19.045,19.045l2.507-2.507l2.507,2.507l19.046-19.045  l-3.174-3.174 M17.798,14.694h24.512L30.055,26.95L17.798,14.694z" fill="url(#SVGID_1_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30.0542" x2="30.0542" y1="9.3936" y2="29.5542">
-<stop offset="0" style="stop-color:#DBDBDB"/>
-<stop offset="0.3152" style="stop-color:#DBDBDB"/>
-<stop offset="0.6848" style="stop-color:#B3B3B3"/>
-<stop offset="1" style="stop-color:#B8B8B8"/>
+<path d="M48.37,8.571h-36.74v0.043l-3.131,3.131,19.04,19.04,2.507-2.507,2.507,2.507,19.05-19.04-3.174-3.174m-30.64,6.124h24.51l-12.25,12.26-12.26-12.26z" fill="url(#SVGID_1_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30.05" x2="30.05" y1="9.394" y2="29.55">
+<stop offset="0" stop-color="#DBDBDB"/>
+<stop offset="0.3152" stop-color="#DBDBDB"/>
+<stop offset="0.6848" stop-color="#B3B3B3"/>
+<stop offset="1" stop-color="#B8B8B8"/>
 </linearGradient>
-<polygon fill="url(#SVGID_2_)" points="9.555,11.607 11.768,9.394 48.342,9.394 50.555,11.607 32.607,29.554 30.815,27.763   44.988,13.59 15.121,13.59 29.294,27.763 27.502,29.554 "/>
-<polygon fill="#FFFFFF" fill-opacity="0.5" points="45.006,13.572 30.815,27.763 31.322,28.27 46.021,13.572 " stroke-opacity="0.5"/>
-<polygon fill="#FFFFFF" fill-opacity="0.8" points="11.768,10.408 48.342,10.408 50.047,12.114 50.555,11.607 48.342,9.394 11.768,9.394   9.555,11.607 10.062,12.114 " stroke-opacity="0.8"/>
-<polygon fill="#FFFFFF" fill-opacity="0.5" points="14.139,13.623 28.787,28.27 29.294,27.763 15.153,13.623 " stroke-opacity="0.5"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="26.939" x2="33.0605" y1="32.2148" y2="32.2148">
-<stop offset="0" style="stop-color:#B8B8B8"/>
-<stop offset="0.3697" style="stop-color:#E6E6E6"/>
-<stop offset="0.7212" style="stop-color:#919191"/>
-<stop offset="1" style="stop-color:#E6E6E6"/>
+<polygon fill="url(#SVGID_2_)" points="9.555,11.61,11.77,9.394,48.34,9.394,50.56,11.61,32.61,29.55,30.82,27.76,44.99,13.59,15.12,13.59,29.29,27.76,27.5,29.55"/>
+<polygon fill="#FFFFFF" fill-opacity="0.5" points="45.01,13.57,30.82,27.76,31.32,28.27,46.02,13.57" stroke-opacity="0.5"/>
+<polygon fill="#FFFFFF" fill-opacity="0.8" points="11.77,10.41,48.34,10.41,50.05,12.11,50.56,11.61,48.34,9.394,11.77,9.394,9.555,11.61,10.06,12.11" stroke-opacity="0.8"/>
+<polygon fill="#FFFFFF" fill-opacity="0.5" points="14.14,13.62,28.79,28.27,29.29,27.76,15.15,13.62" stroke-opacity="0.5"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="26.94" x2="33.06" y1="32.21" y2="32.21">
+<stop offset="0" stop-color="#B8B8B8"/>
+<stop offset="0.3697" stop-color="#E6E6E6"/>
+<stop offset="0.7212" stop-color="#919191"/>
+<stop offset="1" stop-color="#E6E6E6"/>
 </linearGradient>
-<path d="M33.061,50.204c0,0.677-0.547,1.225-1.224,1.225h-3.674c-0.676,0-1.224-0.548-1.224-1.225V14.225  c0-0.676,0.548-1.225,1.224-1.225h3.674c0.677,0,1.224,0.548,1.224,1.225V50.204z" fill="url(#SVGID_3_)"/>
+<path d="M33.06,50.2c0,0.677-0.547,1.225-1.224,1.225h-3.674c-0.676,0-1.224-0.548-1.224-1.225v-35.98c0-0.676,0.548-1.225,1.224-1.225h3.674c0.677,0,1.224,0.548,1.224,1.225v35.98z" fill="url(#SVGID_3_)"/>
 </g>
 <g transform="matrix(2 0 0 2 0 0)">
-<linearGradient gradientTransform="matrix(1 0 0 -1 -257 -316)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="261.2295" x2="282.7705" y1="-330.6934" y2="-330.6934">
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_1__)" points="24.702,25.229 4.229,5.254 5.299,4.158 25.771,24.133 "/>
-<rect fill="none" height="30" width="30.001"/>
+<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"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_new_message.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,69 +1,71 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
 <rect fill="none" height="60" width="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="30" x2="30" y1="14.61" y2="45.15">
-<stop offset="0" stop-color="#FEEFA7"/>
-<stop offset="0.51" stop-color="#FFC501"/>
-<stop offset="1" stop-color="#F6A800"/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_1)" points="51.425,45.609 8.571,45.609 8.571,14.387 30.352,14.999 51.425,14.387 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="30" x2="30" y1="14.46" y2="45.79">
-<stop offset="0" stop-color="#F7AC00"/>
-<stop offset="0.34" stop-color="#FFF8DB"/>
-<stop offset="1" stop-color="#FFE066"/>
+<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"/>
 </linearGradient>
-<path d="M50.953,14.861v30.272H9.042V14.861H50.953 M51.425,14.387l-21.58,0.257L8.571,14.387v31.223 h42.854V14.387L51.425,14.387z" fill="url(#SVGID_2)"/>
-<polygon fill="#FBAB13" fill-opacity="0.3" points="8.571,45.08 51.425,45.08 51.425,44.473 29.997,25.657 8.571,44.473 " stroke-opacity="0.3"/>
-<polygon fill="#F18800" fill-opacity="0.3" points="8.571,45.609 51.425,45.609 51.425,44.999 29.997,26.186 8.571,44.999 " stroke-opacity="0.3"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="30" x2="30" y1="26.6" y2="45.49">
-<stop offset="0" stop-color="#F98A00"/>
-<stop offset="0.73" stop-color="#FCBC3C"/>
-<stop offset="1" stop-color="#FFE36A"/>
+<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"/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_3)" points="51.425,45.594 29.997,26.699 8.571,45.594 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="30" x2="30" y1="26.55" y2="46.12">
-<stop offset="0" stop-color="#FFF1B5"/>
-<stop offset="1" stop-color="#FFE066"/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_4)" points="51.425,45.594 29.997,26.699 8.571,45.594 29.997,27.368 "/>
-<polygon fill="#F18800" fill-opacity="0.3" points="30.041,14.999 8.571,14.387 29.997,36.592 51.425,14.387 " stroke-opacity="0.3"/>
-<polygon fill="#C26D00" fill-opacity="0.4" points="30.002,14.999 8.571,14.387 29.997,35.424 51.425,14.387 " stroke-opacity="0.4"/>
-<polygon fill="#AB6100" fill-opacity="0.4" points="29.924,14.92 8.571,14.387 29.997,34.438 51.425,14.387 " stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="30" x2="30" y1="32.26" y2="13.17">
-<stop offset="0" stop-color="#FFDA33"/>
-<stop offset="0.25" stop-color="#FFE692"/>
-<stop offset="1" stop-color="#FFFBF8"/>
+<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"/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_5)" points="8.571,14.387 29.997,33.281 51.425,14.387 "/>
-<rect fill="none" height="59.996" width="59.996"/>
+<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)">
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="10.8037" x2="6.8329" y1="2.2246" y2="17.5564">
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_1_)" points="2.449,16.623 6.56,1.28 15.083,3.564 10.971,18.906 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="10.5269" x2="6.9976" y1="3.2676" y2="16.9434">
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_2_)" points="10.347,17.824 3.529,15.998 7.183,2.361 14.001,4.188 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="25.3379" x2="11.7716" y1="11.7349" y2="25.632">
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_3_)" points="8.636,22.363 22.361,8.636 28.6,14.875 14.875,28.601 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="24.8652" x2="12.5126" y1="12.3154" y2="24.7784">
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_4_)" points="14.875,27.353 9.883,22.363 22.361,9.884 27.354,14.875 "/>
-<rect fill="none" height="30" width="30"/>
+<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"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_new_voice_message.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_new_voice_message.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<g>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="4.39" y2="58.45">
+<stop offset="0" stop-color="#F2F2F2"/>
+<stop offset="1" stop-color="#A8A8A8"/>
+</linearGradient>
+<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"/>
+</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">
+<stop offset="0" stop-color="#F5F5F5"/>
+<stop offset="0.05" stop-color="#F5F5F5"/>
+<stop offset="0.7818" stop-color="#CCCCCC"/>
+<stop offset="1" stop-color="#D1D1D1"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</g>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_non_default.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_non_default.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<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.3818" style="stop-color:#FFFFFF"/>
+<stop offset="0.7091" style="stop-color:#686E70"/>
+<stop offset="1" style="stop-color:#A6B0B3"/>
+</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"/>
+</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"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30" x2="30" y1="15.5947" y2="6.3742">
+<stop offset="0" style="stop-color:#808080"/>
+<stop offset="1" style="stop-color:#303030"/>
+</linearGradient>
+<rect fill="url(#SVGID_3_)" height="9.412" width="32.59" x="13.705" y="6.183"/>
+<rect fill="#FFFFFF" fill-opacity="0.25" height="1.177" stroke-opacity="0.25" width="32.59" x="13.705" y="15.595"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="30.0015" x2="30.0015" y1="7.4082" y2="14.3725">
+<stop offset="0" style="stop-color:#8B8B8B"/>
+<stop offset="1" style="stop-color:#454545"/>
+</linearGradient>
+<rect fill="url(#SVGID_4_)" height="7.058" width="30.263" x="14.87" y="7.359"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="30.0005" x2="30.0005" y1="8.2974" y2="13.2402">
+<stop offset="0" style="stop-color:#525252"/>
+<stop offset="1" style="stop-color:#1C1C1C"/>
+</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"/>
+</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"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="30" x2="30" y1="28.0029" y2="18.7824">
+<stop offset="0" style="stop-color:#808080"/>
+<stop offset="1" style="stop-color:#303030"/>
+</linearGradient>
+<rect fill="url(#SVGID_7_)" height="9.412" width="32.59" x="13.705" y="18.591"/>
+<rect fill="#FFFFFF" fill-opacity="0.25" height="1.176" stroke-opacity="0.25" width="32.59" x="13.705" y="28.003"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="30.0015" x2="30.0015" y1="19.8154" y2="26.7816">
+<stop offset="0" style="stop-color:#8B8B8B"/>
+<stop offset="1" style="stop-color:#454545"/>
+</linearGradient>
+<rect fill="url(#SVGID_8_)" height="7.06" width="30.263" x="14.87" y="19.767"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="30.0005" x2="30.0005" y1="20.7056" y2="25.6484">
+<stop offset="0" style="stop-color:#525252"/>
+<stop offset="1" style="stop-color:#1C1C1C"/>
+</linearGradient>
+<rect fill="url(#SVGID_9_)" height="4.706" width="27.939" x="16.031" y="20.942"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="26.957" x2="31.9189" y1="50.5098" y2="50.5098">
+<stop offset="0" style="stop-color:#1A1A1A"/>
+<stop offset="0.3212" style="stop-color:#C7C7C7"/>
+<stop offset="0.6848" style="stop-color:#4D4D4D"/>
+<stop offset="0.8545" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#7A7A7A"/>
+</linearGradient>
+<path d="M26.939,48.367v3.674c0,0.338,0.274,0.612,0.612,0.612h3.674c0.338,0,0.612-0.274,0.612-0.612  v-3.674H26.939z" fill="url(#SVGID_10_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="26.9565" x2="31.918" y1="48.6738" y2="48.6738">
+<stop offset="0" style="stop-color:#1A1A1A"/>
+<stop offset="0.3212" style="stop-color:#C7C7C7"/>
+<stop offset="0.6848" style="stop-color:#4D4D4D"/>
+<stop offset="0.8545" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#7A7A7A"/>
+</linearGradient>
+<rect fill="url(#SVGID_11_)" height="0.612" width="4.897" x="26.938" y="48.367"/>
+<g>
+<rect fill="none" height="60" width="60"/>
+</g>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="30.0005" x2="30.0005" y1="48.9316" y2="42.9805">
+<stop offset="0" style="stop-color:#808080"/>
+<stop offset="1" style="stop-color:#303030"/>
+</linearGradient>
+<rect fill="url(#SVGID_12_)" height="6.122" width="37.996" x="11.002" y="42.857"/>
+<rect fill-opacity="0.5" height="0.612" stroke-opacity="0.5" width="37.996" x="11.002" y="42.857"/>
+<rect fill-opacity="0.2" height="0.612" stroke-opacity="0.2" width="37.996" x="11.002" y="43.47"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="12.8589" x2="12.8589" y1="48.9404" y2="44.1797">
+<stop offset="0" style="stop-color:#999999"/>
+<stop offset="1" style="stop-color:#4D4D4D"/>
+</linearGradient>
+<rect fill="url(#SVGID_13_)" height="4.897" width="2.476" x="11.621" y="44.082"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="17.8115" x2="17.8115" y1="48.9404" y2="44.1797">
+<stop offset="0" style="stop-color:#999999"/>
+<stop offset="1" style="stop-color:#4D4D4D"/>
+</linearGradient>
+<rect fill="url(#SVGID_14_)" height="4.897" width="2.476" x="16.574" y="44.082"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="22.7642" x2="22.7642" y1="48.9404" y2="44.1797">
+<stop offset="0" style="stop-color:#999999"/>
+<stop offset="1" style="stop-color:#4D4D4D"/>
+</linearGradient>
+<rect fill="url(#SVGID_15_)" height="4.897" width="2.476" x="21.526" y="44.082"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="27.7158" x2="27.7158" y1="48.9404" y2="44.1797">
+<stop offset="0" style="stop-color:#999999"/>
+<stop offset="1" style="stop-color:#4D4D4D"/>
+</linearGradient>
+<rect fill="url(#SVGID_16_)" height="4.897" width="2.476" x="26.478" y="44.082"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="32.668" x2="32.668" y1="48.9404" y2="44.1797">
+<stop offset="0" style="stop-color:#999999"/>
+<stop offset="1" style="stop-color:#4D4D4D"/>
+</linearGradient>
+<rect fill="url(#SVGID_17_)" height="4.897" width="2.477" x="31.43" y="44.082"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="37.6211" x2="37.6211" y1="48.9404" y2="44.1797">
+<stop offset="0" style="stop-color:#999999"/>
+<stop offset="1" style="stop-color:#4D4D4D"/>
+</linearGradient>
+<rect fill="url(#SVGID_18_)" height="4.897" width="2.477" x="36.383" y="44.082"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="42.5723" x2="42.5723" y1="48.9404" y2="44.1797">
+<stop offset="0" style="stop-color:#999999"/>
+<stop offset="1" style="stop-color:#4D4D4D"/>
+</linearGradient>
+<rect fill="url(#SVGID_19_)" height="4.897" width="2.477" x="41.334" y="44.082"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="47.5254" x2="47.5254" y1="48.9404" y2="44.1797">
+<stop offset="0" style="stop-color:#999999"/>
+<stop offset="1" style="stop-color:#4D4D4D"/>
+</linearGradient>
+<rect fill="url(#SVGID_20_)" height="4.897" width="2.477" x="46.287" y="44.082"/>
+<rect fill-opacity="0.5" height="0.612" stroke-opacity="0.5" width="37.996" x="11.002" y="48.367"/>
+<rect fill="#CCCCCC" fill-opacity="0.5" height="0.612" stroke-opacity="0.5" width="37.996" x="11.002" y="47.755"/>
+<rect fill-opacity="0.3" height="0.612" stroke-opacity="0.3" width="4.897" x="26.938" y="48.979"/>
+<rect fill-opacity="0.1" height="0.612" stroke-opacity="0.1" width="4.897" x="26.938" y="49.592"/>
+<rect fill-opacity="0.3" height="4.897" stroke-opacity="0.3" width="0.612" x="18.979" y="52.653"/>
+<rect fill-opacity="0.3" height="4.897" stroke-opacity="0.3" width="0.612" x="39.184" y="52.653"/>
+<rect fill-opacity="0.1" height="4.897" stroke-opacity="0.1" width="0.612" x="18.367" y="52.653"/>
+<rect fill-opacity="0.1" height="4.897" stroke-opacity="0.1" width="0.612" x="39.796" y="52.653"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="29.3872" x2="29.3872" y1="52.1279" y2="57.9301">
+<stop offset="0" style="stop-color:#1A1A1A"/>
+<stop offset="0.3212" style="stop-color:#C7C7C7"/>
+<stop offset="0.6848" style="stop-color:#4D4D4D"/>
+<stop offset="0.8545" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#7A7A7A"/>
+</linearGradient>
+<rect fill="url(#SVGID_21_)" height="6.122" width="18.367" x="20.204" y="52.041"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_22_" x1="19.8979" x2="19.8979" y1="52.1279" y2="57.9301">
+<stop offset="0" style="stop-color:#1A1A1A"/>
+<stop offset="0.3212" style="stop-color:#C7C7C7"/>
+<stop offset="0.6848" style="stop-color:#4D4D4D"/>
+<stop offset="0.8545" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#7A7A7A"/>
+</linearGradient>
+<path d="M19.592,52.653v4.897c0,0.339,0.274,0.612,0.612,0.612v-6.122  C19.866,52.041,19.592,52.314,19.592,52.653z" fill="url(#SVGID_22_)"/>
+<path d="M19.592,52.653v4.897c0,0.339,0.274,0.612,0.612,0.612v-6.122C19.866,52.041,19.592,52.314,19.592,52.653z" fill-opacity="0.3" stroke-opacity="0.3"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_23_" x1="38.877" x2="38.877" y1="52.1279" y2="57.9301">
+<stop offset="0" style="stop-color:#1A1A1A"/>
+<stop offset="0.3212" style="stop-color:#C7C7C7"/>
+<stop offset="0.6848" style="stop-color:#4D4D4D"/>
+<stop offset="0.8545" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#7A7A7A"/>
+</linearGradient>
+<path d="M38.571,52.041v6.122c0.339,0,0.612-0.273,0.612-0.612v-4.897  C39.184,52.314,38.91,52.041,38.571,52.041z" fill="url(#SVGID_23_)"/>
+<path d="M38.571,52.041v6.122c0.339,0,0.612-0.273,0.612-0.612v-4.897C39.184,52.314,38.91,52.041,38.571,52.041z" fill-opacity="0.3" stroke-opacity="0.3"/>
+</g>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_notes.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_notes.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_notes.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,95 +1,100 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<g>
 <rect fill="none" height="60" width="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="35.17" x2="16.28" y1="20.37" y2="52.34">
-<stop offset="0" stop-color="#A36F00"/>
-<stop offset="0.83" stop-color="#A36F00"/>
-<stop offset="1" stop-color="#DE9F01"/>
-</linearGradient>
-<rect fill="url(#SVGID_1)" height="39.221" width="37.956" x="10.868" y="9.775"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="29.85" x2="29.85" y1="9.46" y2="47.42">
-<stop offset="0" stop-color="#FEE47A"/>
-<stop offset="0.38" stop-color="#FFC501"/>
-<stop offset="0.78" stop-color="#F6A800"/>
-<stop offset="1" stop-color="#FCBC01"/>
+<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"/>
 </linearGradient>
-<path d="M48.824,47.731h-19.61c0,0-9.805-0.282-14.866-2.478c-3.373-1.463-3.48-3.094-3.48-3.094 V9.775h37.956V47.731z" fill="url(#SVGID_2)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="29.85" x2="29.85" y1="9.46" y2="47.42">
-<stop offset="0" stop-color="#FEF6D8"/>
-<stop offset="0.38" stop-color="#FFDF75"/>
-<stop offset="0.78" stop-color="#FFBA23"/>
-<stop offset="1" stop-color="#FCD823"/>
-</linearGradient>
-<path d="M10.868,9.775V42.16c0,0,0.036,0.498,0.633,1.19V10.407h36.691v36.691H21.947 c3.844,0.534,7.268,0.633,7.268,0.633h19.61V9.775H10.868z" fill="url(#SVGID_3)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="20.83" x2="19.77" y1="44.87" y2="47.69">
-<stop offset="0" stop-color="#FEEDA5"/>
-<stop offset="0.82" stop-color="#FFC501"/>
-<stop offset="1" stop-color="#F6A800"/>
+<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"/>
 </linearGradient>
-<path d="M30.744,47.73c0,0-11.48-0.102-15.751-5.953c0,0-3.058,3.77-4.125,0.383 C11.323,44.485,15.419,47.814,30.744,47.73z" fill="url(#SVGID_4)"/>
-<rect fill="#A36F00" fill-opacity="0.3" height="0.632" stroke-opacity="0.3" width="31.63" x="14.032" y="34.447"/>
-<rect fill="#A36F00" height="0.632" width="31.63" x="14.032" y="35.079"/>
-<rect fill="#A36F00" fill-opacity="0.3" height="0.632" stroke-opacity="0.3" width="31.63" x="14.032" y="28.753"/>
-<rect fill="#A36F00" height="0.633" width="31.63" x="14.032" y="29.386"/>
-<rect fill="#A36F00" fill-opacity="0.3" height="0.633" stroke-opacity="0.3" width="31.63" x="14.032" y="23.06"/>
-<rect fill="#A36F00" height="0.632" width="31.63" x="14.032" y="23.692"/>
-<rect fill="#A36F00" fill-opacity="0.3" height="0.633" stroke-opacity="0.3" width="31.63" x="14.032" y="17.366"/>
-<rect fill="#A36F00" height="0.633" width="31.63" x="14.032" y="17.999"/>
-<g transform="matrix(0.5 0 0 0.5 30 30)">
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="36.16" x2="43.09" y1="16.93" y2="23.85">
-<stop offset="0" stop-color="#878A8C"/>
-<stop offset="0.26" stop-color="#BDC2C4"/>
-<stop offset="0.66" stop-color="#5B6163"/>
-<stop offset="1" stop-color="#959A9C"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M48.711,11.285c-1.912-1.911-4.045-2.882-4.76-2.164L27.066,26.004l6.927,6.926l16.882-16.881 C51.594,15.331,50.623,13.198,48.711,11.285z" fill="url(#SVGID_1_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="20.14" x2="25.34" y1="34.68" y2="39.87">
-<stop offset="0" stop-color="#666666"/>
-<stop offset="0.35" stop-color="#969696"/>
-<stop offset="0.78" stop-color="#3B3B3B"/>
-<stop offset="1" stop-color="#2B2B2B"/>
+<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="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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_2_)" points="19.274,45.917 14.08,40.723 26.201,28.601 31.396,33.795 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="13.71" x2="18.9" y1="41.11" y2="46.3">
-<stop offset="0" stop-color="#B2B2B2"/>
-<stop offset="0.38" stop-color="#FFFFFF"/>
-<stop offset="0.8" stop-color="#4D4D4D"/>
-<stop offset="1" stop-color="#B2B2B2"/>
+<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">
+<stop offset="0" style="stop-color:#666666"/>
+<stop offset="0.3455" style="stop-color:#969696"/>
+<stop offset="0.7818" style="stop-color:#3B3B3B"/>
+<stop offset="1" style="stop-color:#2B2B2B"/>
 </linearGradient>
-<polygon fill="url(#SVGID_3_)" points="19.274,45.917 14.08,40.723 13.214,41.588 18.408,46.783 "/>
-<rect fill="#020202" fill-opacity="0.2" height="1.224" stroke-opacity="0.2" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 23.9652 74.9186)" width="7.346" x="23.827" y="31.884"/>
-<rect fill="#020202" fill-opacity="0.5" height="1.224" stroke-opacity="0.5" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 26.0546 74.0531)" width="7.346" x="24.692" y="31.018"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="9.75" x2="14.95" y1="45.07" y2="50.26">
-<stop offset="0" stop-color="#878A8C"/>
-<stop offset="0.26" stop-color="#E7EDF0"/>
-<stop offset="0.75" stop-color="#5B6163"/>
-<stop offset="1" stop-color="#959A9C"/>
+<polygon fill="url(#SVGID_2__)" fill-rule="evenodd" points="8.33,24.992 5.008,21.672 12.76,13.921   16.082,17.242 "/>
+<linearGradient gradientTransform="matrix(0.7071 0.7071 0.0471 -0.0471 -85.8835 1066.085)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="-674.2476" x2="-669.5498" y1="12046.2031" y2="12046.2031">
+<stop offset="0" style="stop-color:#B2B2B2"/>
+<stop offset="0.3818" style="stop-color:#FFFFFF"/>
+<stop offset="0.8" style="stop-color:#4D4D4D"/>
+<stop offset="1" style="stop-color:#B2B2B2"/>
 </linearGradient>
-<path d="M17.542,45.917l-1.731-1.731l-1.731-1.731c-1.731,1.731-3.463,1.731-3.463,1.731l-1.732,6.926 l6.927-1.731C15.812,49.379,15.812,47.648,17.542,45.917z" fill="url(#SVGID_4_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="44.39" x2="51.31" y1="8.7" y2="15.63">
-<stop offset="0" stop-color="#666666"/>
-<stop offset="0.35" stop-color="#969696"/>
-<stop offset="0.78" stop-color="#3B3B3B"/>
-<stop offset="1" stop-color="#2B2B2B"/>
+<polygon fill="url(#SVGID_3__)" fill-rule="evenodd" points="8.33,24.992 5.008,21.672 4.455,22.225   7.777,25.546 "/>
+<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"/>
+</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">
+<stop offset="0" style="stop-color:#666666"/>
+<stop offset="0.3455" style="stop-color:#969696"/>
+<stop offset="0.7818" style="stop-color:#3B3B3B"/>
+<stop offset="1" style="stop-color:#2B2B2B"/>
 </linearGradient>
-<path d="M48.711,11.285c-1.912-1.911-4.045-2.882-4.76-2.164l-0.435,0.433l6.927,6.928l0.432-0.433 C51.594,15.331,50.623,13.198,48.711,11.285z" fill="url(#SVGID_5)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6" x1="26.2" x2="33.13" y1="26.88" y2="33.81">
-<stop offset="0" stop-color="#B2B2B2"/>
-<stop offset="0.38" stop-color="#FFFFFF"/>
-<stop offset="0.8" stop-color="#4D4D4D"/>
-<stop offset="1" stop-color="#B2B2B2"/>
+<path d="M27.152,2.85c-1.223-1.223-2.586-1.844-3.043-1.385  l-0.277,0.277l4.428,4.43l0.277-0.277C28.996,5.436,28.377,4.072,27.152,2.85z" fill="url(#SVGID_5_)" fill-rule="evenodd"/>
+<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 626.7343 353.4672)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-675.0313" x2="-668.7676" y1="193.2695" y2="193.2695">
+<stop offset="0" style="stop-color:#B2B2B2"/>
+<stop offset="0.3818" style="stop-color:#FFFFFF"/>
+<stop offset="0.8" style="stop-color:#4D4D4D"/>
+<stop offset="1" style="stop-color:#B2B2B2"/>
 </linearGradient>
-<polygon fill="url(#SVGID_6)" points="32.262,34.66 25.335,27.735 27.066,26.004 33.994,32.93 "/>
-<path d="M12.009,43.846l4.142,4.143 c0.135-0.343,0.336-0.721,0.611-1.122l-3.633-3.633C12.728,43.508,12.35,43.709,12.009,43.846z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M16.762,46.866c0.214-0.309,0.459-0.626,0.78-0.949 l-1.731-1.731l-1.731-1.731c-0.323,0.32-0.64,0.567-0.951,0.779L16.762,46.866z" fill="#020202" fill-opacity="0.3" stroke-opacity="0.3"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7" x1="12.78" x2="14.51" y1="45.5" y2="47.23">
-<stop offset="0" stop-color="#666666"/>
-<stop offset="0.35" stop-color="#969696"/>
-<stop offset="0.78" stop-color="#3B3B3B"/>
-<stop offset="1" stop-color="#2B2B2B"/>
+<polygon fill="url(#SVGID_6_)" fill-rule="evenodd" points="16.635,17.795 12.205,13.367 13.313,12.26   17.742,16.688 "/>
+<path d="M3.686,23.668l2.648,2.648  c0.086-0.219,0.215-0.461,0.391-0.718l-2.322-2.322C4.145,23.452,3.904,23.58,3.686,23.668z" fill="#020202" fill-opacity="0.1" fill-rule="evenodd" stroke-opacity="0.1"/>
+<path d="M6.725,25.599c0.137-0.197,0.293-0.4,0.5-0.606  l-1.107-1.106l-1.109-1.107c-0.205,0.205-0.406,0.362-0.605,0.498L6.725,25.599z" fill="#020202" fill-opacity="0.3" fill-rule="evenodd" stroke-opacity="0.3"/>
+<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 626.7343 353.4672)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="-672.6821" x2="-671.1157" y1="207.7534" y2="207.7534">
+<stop offset="0" style="stop-color:#666666"/>
+<stop offset="0.3455" style="stop-color:#969696"/>
+<stop offset="0.7818" style="stop-color:#3B3B3B"/>
+<stop offset="1" style="stop-color:#2B2B2B"/>
 </linearGradient>
-<path d="M14.513,47.215c-0.239,0.24-0.82,0.046-1.298-0.432c-0.478-0.479-0.672-1.06-0.433-1.299 c0.239-0.24,0.82-0.046,1.298,0.433C14.558,46.395,14.752,46.977,14.513,47.215z" fill="url(#SVGID_7)"/>
-<rect fill="none" height="59.996" width="59.996"/>
+<path d="M5.287,25.822c-0.152,0.152-0.525,0.029-0.832-0.276  c-0.305-0.307-0.428-0.679-0.275-0.831s0.525-0.029,0.828,0.277C5.316,25.298,5.439,25.67,5.287,25.822z" fill="url(#SVGID_7_)" fill-rule="evenodd"/>
+<rect fill="none" fill-rule="evenodd" height="30" width="30"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_ok.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_ok.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_ok.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,19 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.9995" x2="29.9995" y1="10.0088" y2="41.9974">
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_1_)" points="52.5,18.697 46.188,12.384 23.566,35.003 13.813,25.252 7.5,31.566 23.55,47.617 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30.0005" x2="30.0005" y1="11.313" y2="41.2136">
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_2_)" points="8.651,31.566 13.813,26.402 23.566,36.154 46.188,13.533 51.351,18.697 23.55,46.466 "/>
+<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"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_online.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_online.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_online.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,95 +1,78 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
 <rect fill="none" height="60" width="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="30" x2="30" y1="51.18" y2="8.63">
-<stop offset="0" stop-color="#004E8C"/>
-<stop offset="1" stop-color="#1B66D8"/>
+<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"/>
 </linearGradient>
-<circle cx="30" cy="30" fill="url(#SVGID_1)" r="21.429"/>
-<radialGradient cx="29.7" cy="22.59" gradientUnits="userSpaceOnUse" id="SVGID_2" r="25.8">
-<stop offset="0" stop-color="#94FFFF"/>
-<stop offset="0.5" stop-color="#36B5FF"/>
-<stop offset="1" stop-color="#1B66D8"/>
+<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"/>
 </radialGradient>
-<circle cx="30" cy="30" fill="url(#SVGID_2)" r="20.88"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="30" x2="30" y1="8.94" y2="50.99">
-<stop offset="0" stop-color="#31A7F8"/>
-<stop offset="0.5" stop-color="#1E74DC"/>
-<stop offset="1" stop-color="#88D6EB"/>
+<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"/>
 </linearGradient>
-<path d="M30.001,9.121C18.468,9.121,9.119,18.471,9.119,30 c0,11.533,9.349,20.879,20.882,20.879S50.88,41.533,50.88,30C50.88,18.471,41.534,9.121,30.001,9.121z M30.001,49.051 c-10.843,0-19.663-8.818-19.663-19.658c0-10.844,8.82-19.662,19.663-19.662c10.841,0,19.66,8.818,19.66,19.662 C49.661,40.232,40.842,49.051,30.001,49.051z" fill="url(#SVGID_3)" fill-opacity="0.3"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="9.46" x2="12.78" y1="32.84" y2="32.84">
-<stop offset="0" stop-color="#58595B"/>
-<stop offset="1" stop-color="#000000"/>
+<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="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="1" style="stop-color:#000000"/>
 </linearGradient>
-<path d="M11.08,29.66c-0.223-0.295-0.725-0.295-0.946-0.295c-0.437,0-0.669,0.311-0.673,0.615 v0.021l0.001,0.031c-0.001,0.537,0.029,1.139,0.094,1.871c0.013,0.137,0.029,0.275,0.047,0.414l0.024,0.201 c0.056,0.434,0.121,0.861,0.195,1.273l0.034,0.182c0.032,0.164,0.063,0.324,0.098,0.484c0.09,0.406,0.198,0.826,0.332,1.291 c0.02,0.066,0.037,0.135,0.055,0.199c0.028,0.109,0.058,0.217,0.091,0.322l0.005,0.014l0.012,0.033 c-0.003-0.008-0.008-0.023-0.01-0.037l1.197-0.08c0.02-0.188,0.025-0.381,0.02-0.576c-0.01-0.303-0.021-0.676-0.107-0.99 l1.112-1.494l0.12-0.162v-0.203v-1.162v-0.254l-0.179-0.178L11.08,29.66z" fill="url(#SVGID_4)" fill-opacity="0.3"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="15.86" x2="50.59" y1="26.76" y2="26.76">
-<stop offset="0" stop-color="#58595B"/>
-<stop offset="1" stop-color="#000000"/>
-</linearGradient>
-<path d="M50.584,25.908c-0.015-0.078-0.029-0.135-0.043-0.191 c-0.011-0.041-0.021-0.084-0.029-0.123c-0.106-0.496-0.237-1.006-0.392-1.527l-0.018-0.057c-0.032-0.117-0.067-0.234-0.104-0.35 c-0.188-0.586-0.393-1.148-0.608-1.666c-0.027-0.064-0.057-0.125-0.084-0.188l-0.045-0.1c-0.207-0.475-0.436-0.947-0.677-1.402 l-0.03-0.059c-0.047-0.09-0.093-0.182-0.142-0.27c-0.296-0.533-0.604-1.041-0.918-1.512c-0.032-0.049-0.069-0.102-0.106-0.154 c-0.023-0.031-0.045-0.061-0.066-0.092c-0.302-0.438-0.618-0.863-0.946-1.268l-0.064-0.082c-0.044-0.055-0.088-0.111-0.134-0.166 c-0.381-0.457-0.783-0.898-1.199-1.318c-0.056-0.055-0.115-0.113-0.176-0.172l-0.049-0.047c-0.375-0.367-0.774-0.73-1.184-1.072 l-0.08-0.07c-0.041-0.037-0.083-0.072-0.125-0.105c-0.446-0.367-0.931-0.729-1.436-1.076c-0.062-0.041-0.125-0.084-0.189-0.123 l-0.076-0.051c-0.455-0.301-0.93-0.59-1.405-0.854l-0.073-0.041c-0.039-0.023-0.078-0.045-0.118-0.068 c-0.529-0.283-1.081-0.551-1.643-0.791l-0.142-0.059l-0.153-0.063c-0.148-0.061-0.297-0.113-0.443-0.166 c-0.077-0.025-0.152-0.053-0.228-0.08l-0.283-0.105l-0.254,0.162c-0.17,0.107-0.84,0.49-1.235,0.715 c-0.438-0.059-1.499-0.191-2.57-0.295c0.33-0.033,0.786-0.07,1.43-0.111l0.09-1.203l-0.047-0.014 c-0.039-0.01-0.077-0.02-0.116-0.027L34.38,9.65l-0.075-0.016c-0.655-0.131-1.271-0.227-1.882-0.291h-0.004l-0.085-0.008 c-0.698-0.072-1.409-0.107-2.112-0.107c-0.621,0-1.262,0.033-1.964,0.1c-0.108,0.01-0.214,0.021-0.321,0.033 c-0.693,0.078-1.3,0.17-1.873,0.285l-0.02,0.004l-0.015,0.002c-0.604,0.125-1.211,0.281-1.856,0.479 c-0.058,0.018-0.116,0.037-0.174,0.055l-0.13,0.043c-0.547,0.176-1.082,0.371-1.596,0.582c-0.042,0.018-0.071,0.029-0.1,0.039 l-0.078,0.031c-0.564,0.24-1.128,0.512-1.688,0.813c-0.06,0.031-0.118,0.066-0.177,0.1l-0.072,0.041 c-0.157,0.088-0.315,0.186-0.473,0.283l-0.203,0.127l-1.118,0.684l1.242,0.416c0.186,0.063,0.385,0.094,0.592,0.094 c0.67,0,1.317-0.33,1.838-0.594c0.209-0.105,0.521-0.264,0.648-0.289c0.152,0.047,0.306,0.068,0.458,0.068 c0.568,0,1.035-0.307,1.446-0.578l0.111-0.07c0.134-0.043,0.362-0.129,0.818-0.299c0.465-0.176,1.314-0.494,1.54-0.547 c0.44-0.006,0.966-0.068,1.339-0.301c0.352,0.059,0.976,0.156,1.619,0.24c-0.047,0.029-0.093,0.059-0.132,0.098 c-0.209,0.191-1.335,0.533-1.68,0.578c-0.648,0.08-0.908,0.406-1.012,0.666c-0.135,0.336-0.054,0.672,0.078,0.945 c-0.245,0.162-0.545,0.342-0.804,0.479c0.001-0.006,0.003-0.012,0.004-0.02c0.093-0.518,0.16-0.891-0.091-1.189 c-0.128-0.154-0.317-0.24-0.518-0.24c-0.296,0-0.526,0.182-0.712,0.361c-0.519,0.502-0.833,1.129-0.952,1.365l-0.022,0.043 l-0.019,0.035c-0.225,0.432-0.317,0.736-0.191,1.689c-0.057,0.039-0.22,0.102-0.446,0.102c-0.03,0-0.058-0.002-0.079-0.004 c-0.146-0.158-0.349-0.248-0.576-0.248l0,0c-0.524,0-1.238,0.59-2.123,1.754l-0.284,0.375l0.289,0.371l0.269,0.342 c-4.215,3.26-4.246,3.445-4.291,3.717c-0.008,0.025-0.045,0.139-0.095,0.293c-0.628,1.953-0.977,3.414-0.638,4.195 c0.785,1.813,1.67,3.506,2.816,3.598c0.101,0.01,0.212,0.012,0.332,0.012c1.051,0,2.753-0.316,3.571-0.484 c0.151,0.283,0.335,0.615,0.437,0.795l0.182,0.322l0.37-0.012c0,0,0.2-0.006,0.448-0.006c0.287,0,0.478,0.008,0.602,0.018 c0.447,1.307,1.3,4.318,1.142,4.943l-0.003,0.002c-1.441,2.16,0.306,4.975,1.145,6.328c0.066,0.107,0.126,0.203,0.177,0.287 c0.324,0.922,0.716,1.531,1.545,1.531c0.062,0,0.124-0.004,0.188-0.006c0.047-0.004,0.096-0.006,0.146-0.006 c0.092,0,0.157,0.012,0.225,0.035l0.076,0.027l0.08,0.008c0.155,0.012,0.306,0.033,0.453,0.055c0.255,0.035,0.519,0.07,0.788,0.07 c0.721,0,1.293-0.271,1.787-0.855c0.019-0.002,0.036-0.004,0.054-0.006c0.519-0.072,0.713-0.332,0.779-0.564 c0.039-0.039,0.09-0.086,0.131-0.125c0.204-0.188,0.447-0.41,0.615-0.674c0.076-0.045,0.161-0.096,0.258-0.152 c0.167-0.104,0.355-0.217,0.504-0.293c0.131-0.039,0.246-0.117,0.334-0.225c0.209-0.256,0.166-0.549,0.131-0.783 c-0.035-0.242-0.071-0.49,0.06-0.758c0.738-0.355,2.051-1.23,2.263-1.373L37.627,38.5c-0.014,0.117-0.048,0.432-0.101,0.629 c-0.279,0.279-0.512,0.703-0.586,0.846l-0.048,0.094l-0.015,0.104c-0.019,0.137-0.094,0.85,0.306,1.311 c0.202,0.23,0.49,0.359,0.813,0.359c0.103,0,0.21-0.014,0.319-0.039c1.027-0.232,2.85-2.701,2.998-4.064 c0.072-0.658-0.185-1.174-0.704-1.418l-0.387-0.184l-0.304,0.303l-1.125,1.125c-0.381,0.035-0.678,0.148-0.879,0.326 c0.012-0.48-0.035-0.973-0.086-1.451c-0.155-1.447-0.185-2.369,0.703-2.996l0.045-0.033l0.039-0.039 c0.32-0.326,0.675-0.611,1.051-0.914c0.88-0.705,1.79-1.436,2.332-2.758l0.022-0.057c0.174-0.451,0.437-1.131,0.081-1.65 c-0.088-0.129-0.275-0.326-0.623-0.398c0.461-0.184,0.815-0.332,0.85-0.344l0.107-0.045l0.083-0.08l1.898-1.822l0.278-0.268 l-0.122-0.367c-0.017-0.047-0.12-0.334-0.411-0.746c0.554,0.074,1.029,0.207,1.185,0.326c0.057,0.123,0.171,0.396,0.292,0.682 c2.089,4.926,2.382,5.178,2.926,5.188c0.021,0,0.037,0.002,0.051,0.004c0.043,0.002,0.083,0.004,0.119,0.004 c0.31,0,0.486-0.158,0.564-0.252c0.227-0.273,0.163-0.609,0.14-0.734l-0.009-0.043c-0.025-0.295-0.008-1.619,0.034-2.707 c0.003,0.004,0.004,0.006,0.006,0.01l1.12-0.445L50.584,25.908z M34.126,19.885c-0.087,0.004-0.182,0.01-0.282,0.012 c-0.322,0.016-0.688,0.031-1.053,0.031c-0.956,0-1.174-0.117-1.196-0.131c-0.113-0.082-0.229-0.143-0.35-0.188 c0.216-0.049,0.464-0.215,0.719-0.709c0.251,0.488,0.592,0.918,1.115,0.918c0.141,0,0.277-0.033,0.406-0.1 C33.661,19.721,33.951,19.82,34.126,19.885z M33.751,17.221c-0.072,0-0.131-0.004-0.176-0.006c0.049-0.129,0.107-0.203,0.154-0.244 c0.06,0.092,0.141,0.174,0.232,0.244C33.888,17.219,33.817,17.221,33.751,17.221z M29.948,18.5c0.327,0.641,0.569,0.916,0.762,1.037 c-0.475,0.037-0.832,0.338-1.126,0.625c-0.206-0.068-0.565-0.287-0.672-0.438c-0.063-0.09-0.138-0.166-0.221-0.232 C29.211,19.344,29.667,18.861,29.948,18.5z M28.141,18.027l-0.679-0.033l-2.278-0.111c0.278-0.229,0.542-0.443,0.696-0.57 c0.043-0.016,0.205-0.061,0.607-0.061c0.241,0,0.473,0.018,0.619,0.029L28.141,18.027z" fill="url(#SVGID_5)" fill-opacity="0.3"/>
-<radialGradient cx="30.36" cy="15.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"/>
+<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"/>
+</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"/>
 </radialGradient>
-<path d="M10.069,29.988c0,0,0,0,0,0.002c0,0.006,0.001,0.01,0.001,0.016c0,0.623,0.039,1.236,0.093,1.844 c0.018,0.199,0.047,0.398,0.069,0.6c0.053,0.416,0.116,0.828,0.19,1.236c0.041,0.215,0.081,0.434,0.127,0.646 c0.094,0.422,0.203,0.838,0.322,1.248c0.049,0.17,0.088,0.342,0.14,0.508c0.007,0.018,0.015,0.033,0.019,0.053 c0.017-0.162,0.021-0.328,0.017-0.496c-0.04-1.201-0.232-1.047-0.232-1.047l1.356-1.822v-1.162l-1.59-1.59 C10.581,30.023,10.07,29.943,10.069,29.988z" fill="url(#SVGID_6)"/>
-<path d="M22.83,11.963c0.587,0.193,1.066-0.199,1.613-0.549c0.193-0.039,2.338-0.895,2.57-0.895 c0.231,0,1.011-0.031,1.204-0.34c0,0,3.357,0.584,3.863,0.389c0.275-0.107,1.432-0.201,2.425-0.266 c-0.056-0.012-0.106-0.027-0.162-0.039c-0.054-0.012-0.106-0.02-0.161-0.031c-0.623-0.125-1.252-0.225-1.894-0.289 c0,0-0.01,0-0.016-0.002c-0.674-0.068-1.358-0.104-2.052-0.104c-0.644,0-1.277,0.037-1.906,0.098 c-0.11,0.01-0.221,0.021-0.332,0.035c-0.607,0.066-1.21,0.154-1.8,0.273c-0.01,0.004-0.021,0.004-0.031,0.006 c-0.612,0.127-1.213,0.283-1.802,0.463c-0.102,0.031-0.199,0.064-0.302,0.096c-0.522,0.17-1.038,0.357-1.544,0.564 c-0.06,0.027-0.119,0.049-0.18,0.072c-0.557,0.238-1.1,0.502-1.63,0.785c-0.08,0.043-0.156,0.088-0.235,0.133 c-0.227,0.127-0.439,0.268-0.659,0.402C20.892,13.129,22.253,11.768,22.83,11.963z" fill="url(#SVGID_6)"/>
-<radialGradient cx="30.36" cy="15.27" gradientUnits="userSpaceOnUse" id="SVGID_8" r="23.56">
-<stop offset="0" stop-color="#B2F56E"/>
-<stop offset="0.32" stop-color="#B2F56E"/>
-<stop offset="0.73" stop-color="#5CBF1B"/>
-<stop offset="1" stop-color="#227A00"/>
+<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"/>
 </radialGradient>
-<path d="M49.983,26.01c-0.021-0.102-0.049-0.197-0.069-0.297c-0.106-0.498-0.233-0.99-0.378-1.473 c-0.038-0.131-0.076-0.264-0.117-0.395c-0.176-0.549-0.372-1.09-0.592-1.617c-0.039-0.092-0.084-0.184-0.124-0.273 c-0.202-0.465-0.421-0.92-0.657-1.363c-0.055-0.107-0.109-0.217-0.166-0.32c-0.279-0.502-0.575-0.992-0.893-1.469 c-0.054-0.082-0.115-0.16-0.17-0.242c-0.291-0.422-0.596-0.832-0.916-1.229c-0.064-0.078-0.127-0.16-0.194-0.24 c-0.368-0.441-0.756-0.867-1.161-1.277c-0.069-0.07-0.143-0.139-0.215-0.207c-0.369-0.363-0.756-0.715-1.152-1.049 c-0.068-0.055-0.132-0.115-0.199-0.17c-0.448-0.365-0.914-0.715-1.395-1.043c-0.084-0.057-0.17-0.113-0.256-0.168 c-0.442-0.293-0.898-0.57-1.365-0.83c-0.064-0.033-0.124-0.072-0.188-0.107c-0.52-0.277-1.05-0.533-1.594-0.768 c-0.097-0.041-0.195-0.078-0.29-0.119c-0.212-0.088-0.432-0.156-0.646-0.236c-0.255,0.164-1.438,0.832-1.438,0.832 s-5.141-0.701-5.491-0.352c-0.351,0.352-1.721,0.711-2.034,0.75c-0.309,0.041-0.955,0.207-0.181,1.162 c-0.116,0.117-2.325,1.656-2.325,0.957c0-0.701,0.494-1.953-0.2-1.283c-0.498,0.482-0.796,1.135-0.86,1.258 c-0.162,0.313-0.263,0.461-0.145,1.357c0.118,0.895-1.43,0.891-1.534,0.658c-0.276-0.621-1.809,1.395-1.809,1.395l0.646,0.828 c0,0-4.51,3.473-4.548,3.707c-0.039,0.234-1.164,3.25-0.775,4.146c0.39,0.898,1.375,3.158,2.307,3.232 c1.221,0.102,4.186-0.559,4.186-0.559c0.08,0.197,0.638,1.191,0.638,1.191s1.452-0.049,1.534,0.109 c0.026,0.053,1.75,5.121,1.182,5.793c-1.357,2.033,0.775,5.012,1.369,6.02c0.594,1.73,0.977,0.955,1.758,1.24 c0.962,0.082,1.772,0.438,2.589-0.613c0.237-0.195,0.641-0.041,0.641-0.313c0-0.15,0.698-0.598,0.878-1.018 c0.188-0.088,0.674-0.414,1.003-0.572c0.299-0.02-0.283-0.818,0.309-1.666c0.64-0.252,2.364-1.414,2.364-1.414 c0.078-1.705-0.839-3.811,0.873-5.02c1.104-1.125,2.553-1.766,3.255-3.479c0.194-0.506,0.628-1.541-0.62-1.23 c-1.172,0.295-2.479,0.361-1.861-0.154c-0.07-0.635-0.85-0.932-1.549-1.551c-0.361-0.855-0.93-2.379-0.93-2.379l-1.24-1.885 l0.155-0.389l1.474,2.17l1.474,1.781c0.542,1.783,1.007,1.939,1.007,1.939c0.816-0.287,2.752-1.084,2.752-1.084l1.899-1.822 c0,0-0.195-0.582-0.967-1.318l-0.584-0.348c-0.126,0.357-0.802,0.49-0.802,0.49l-1.641-1.963l0.61-0.123l0.471,0.895l1.128,0.391 c0,0,0.313-0.229,0.893,0.371c0.473-0.039,2.318,0.09,2.749,0.637c0.085,0.107,2.286,5.605,2.721,5.613 c0.19,0.002,0.329,0.076,0.267-0.256c-0.078-0.156,0-3.609,0.116-4.35c0.295-0.627,0.343-0.002,1.04,1.189 C49.991,26.068,49.989,26.039,49.983,26.01z M30.61,12.688c0.154-0.459,1.047-0.615,1.047-0.615s-0.256,0.473-0.197,0.717 c0.06,0.246-0.408,0.4-0.46,0.98c-0.051,0.578-1.117,0.24-1.204,0.037C29.708,13.604,30.453,13.145,30.61,12.688z M34.434,20.488 c-0.661,0-2.645,0.195-3.19-0.193s-0.97,0.039-1.363,0.43c-0.257,0.252-1.193-0.26-1.467-0.65c-0.271-0.391-1.188-0.361-1.188-0.361 l0.208-1.111l-2.637-0.127l-1.499,0.439l-1.41,0.039l0.79-0.375l0.983-0.232c0,0,1.431-1.176,1.859-1.525 c0.363-0.297,1.811-0.131,1.811-0.131l1.589,1.146c0,0-0.353,0.898-0.508,1.09c0.582-0.037,1.27-1.098,1.27-1.098 c-1.24-1.139-1.189-1.525-1.189-1.525l1.633,1.146l0.016,0.01c0,0,0.661,1.559,0.937,1.559c0.271,0,0.619-1.072,0.619-1.072 l0.465-0.117c0.207,0.49,0.595,1.602,1.059,1.342c0.269-0.146,0.71-0.014,1.215,0.182c0.509,0.193,0.854-0.105,1.267,0.258 C35.647,21.213,34.707,20.566,34.434,20.488z M35.471,17.807c-0.681-0.26-2.984,0.586-2.47-0.795 c0.275-0.748,0.98-0.902,1.223-0.406c0.063,0.203,0.83,0.52,0.824,0.09c-0.006-0.432,0.771-0.658,0.883-0.338 C35.517,16.654,37.55,18.205,35.471,17.807z M39.81,19.117c-0.377-0.305,0.169-0.564-0.387-1.041 c-0.799-0.684-1.421-0.979-0.334-1.531c1.341-0.17,0.217,0.428,0.44,0.785c0.119,0.189,0.796,0.828,1.325,1.609 C41.294,19.59,40.185,19.42,39.81,19.117z" fill="url(#SVGID_8)"/>
-<path d="M40.351,36.871l-1.293,1.293c0,0-0.778,0-0.815,0.311c-0.017,0.133-0.063,0.709-0.192,1.006 c-0.258,0.18-0.569,0.775-0.569,0.775s-0.159,1.15,0.699,0.955S41.677,37.496,40.351,36.871z" fill="url(#SVGID_6)"/>
+<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"/>
+</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"/>
 </g>
 <g transform="matrix(1 0 0 1 30 30)">
-<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>
+<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"/>
+</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"/>
+<path d="M15.017,2.936c5.939,0,10.813,3.934,11.491,9c0.025-0.007,0.053-0.015,0.078-0.022  c-0.295-5.403-5.354-9.707-11.569-9.707c-6.23,0-11.301,4.328-11.57,9.751c0.024,0.006,0.05,0.013,0.075,0.02  C4.178,6.893,9.062,2.936,15.017,2.936z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
+<rect fill="none" height="30" width="30"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_ovi_suite.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_ovi_suite.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_ovi_suite.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,14 +1,74 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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="#44A51C" height="37.719" width="52" x="4" y="11.141"/>
-<path d="M17.378,22.469c-5.662,0-8.649,3.887-8.649,9.426c0,5.611,2.19,10.02,8.586,10.02  c5.891,0,8.623-3.99,8.623-9.893C25.938,26.385,23.252,22.469,17.378,22.469z M17.314,38.881c-3.012,0-3.148-4.285-3.148-7.092  c0-2.734,0.234-6.293,3.148-6.293c2.793,0,3.184,3.758,3.184,6.293C20.498,35.055,20.339,38.881,17.314,38.881z" fill="#FFFFFF"/>
-<path d="M33.168,41.914c2.304,0,3.116-1.152,3.665-2.83l4.954-16.355h-4.624l-3.548,14.154l-3.339-14.154h-5.479  l4.704,16.355C30.013,40.762,30.866,41.914,33.168,41.914z" fill="#FFFFFF"/>
-<path d="M46.558,15.863c-1.707,0-2.875,0.857-2.875,2.441s1.206,2.438,2.875,2.438c1.676,0,2.882-0.854,2.882-2.438  C49.439,16.752,48.167,15.863,46.558,15.863z" fill="#FFFFFF"/>
-<path d="M44.647,41.391c0.39,0.279,0.999,0.523,1.859,0.523c0.905,0,1.492-0.244,1.879-0.523  c0.746-0.523,0.746-1.41,0.746-1.893v-16.77h-5.167c0,0-0.193,0-0.355,0c-0.502,0-0.92,0.01-1.209,0.41  c-0.134,0.184-0.327,0.51-0.327,1.107c0,0.621,0.203,0.924,0.327,1.109c0.289,0.398,0.707,0.4,1.209,0.4  c0.162,0,0.302-0.002,0.302-0.002v13.748C43.911,39.98,43.911,40.867,44.647,41.391z" fill="#FFFFFF"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <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(0.5 0 0 0.5 0 0)">
+<rect fill="#44A51C" height="37.72" width="52" x="4" y="11.14"/>
+<path d="M17.38,22.47c-5.662,0-8.649,3.887-8.649,9.426,0,5.611,2.19,10.02,8.586,10.02,5.891,0,8.623-3.99,8.623-9.893,0-5.65-2.69-9.56-8.56-9.56zm-0.07,16.41c-3.012,0-3.148-4.285-3.148-7.092,0-2.734,0.234-6.293,3.148-6.293,2.793,0,3.184,3.758,3.184,6.293,0.01,3.27-0.15,7.09-3.18,7.09z" fill="#FFFFFF"/>
+<path d="M33.17,41.91c2.304,0,3.116-1.152,3.665-2.83l4.954-16.36h-4.624l-3.548,14.15-3.339-14.15h-5.479l4.704,16.36c0.51,1.68,1.37,2.83,3.67,2.83z" fill="#FFFFFF"/>
+<path d="M46.56,15.86c-1.707,0-2.875,0.857-2.875,2.441s1.206,2.438,2.875,2.438c1.676,0,2.882-0.854,2.882-2.438,0-1.55-1.27-2.44-2.88-2.44z" fill="#FFFFFF"/>
+<path d="M44.65,41.39c0.39,0.279,0.999,0.523,1.859,0.523,0.905,0,1.492-0.244,1.879-0.523,0.746-0.523,0.746-1.41,0.746-1.893v-16.77h-5.167-0.355c-0.502,0-0.92,0.01-1.209,0.41-0.134,0.184-0.327,0.51-0.327,1.107,0,0.621,0.203,0.924,0.327,1.109,0.289,0.398,0.707,0.4,1.209,0.4,0.162,0,0.302-0.002,0.302-0.002v13.75c-0.01,0.47-0.01,1.36,0.73,1.88z" fill="#FFFFFF"/>
+<rect fill="none" height="60" width="60"/>
+</g>
+<g transform="matrix(1 0 0 1 30 30)">
+<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 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_ovistore.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_ovistore.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_ovistore.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,45 +1,47 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<g>
 <rect fill="none" height="60" width="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="29.99" x2="29.99" y1="13.86" y2="51.71">
-<stop offset="0" stop-color="#36B5FF"/>
-<stop offset="1" stop-color="#1B66D8"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.9971" x2="29.9971" y1="11.1475" y2="59">
+<stop offset="0" style="stop-color:#36B5FF"/>
+<stop offset="1" style="stop-color:#1B66D8"/>
 </linearGradient>
-<polygon fill="url(#SVGID_1)" points="45.611,31.25 46.105,14.183 13.884,14.183 14.811,31.17 9.433,51.707 50.557,51.707 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="29.99" x2="29.99" y1="55.73" y2="44.11">
-<stop offset="0" stop-color="#36B5FF"/>
-<stop offset="1" stop-color="#1B66D8"/>
+<polygon fill="url(#SVGID_1_)" points="49.745,33.13 50.37,11.55 9.624,11.55 10.797,33.03 3.996,59 55.998,59 "/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="29.9971" x2="29.9971" y1="64.0889" y2="49.3909">
+<stop offset="0" style="stop-color:#36B5FF"/>
+<stop offset="1" style="stop-color:#1B66D8"/>
 </linearGradient>
-<polygon fill="url(#SVGID_2)" points="9.433,51.707 14.944,47.783 45.361,47.783 50.557,51.707 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="6.67" x2="22.21" y1="15.99" y2="58.35">
-<stop offset="0" stop-color="#5ED2FF"/>
-<stop offset="1" stop-color="#277ADF"/>
+<polygon fill="url(#SVGID_2_)" points="3.996,59 10.967,54.038 49.429,54.038 55.998,59 "/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="9.3125" x2="9.3125" y1="11.248" y2="59.7255">
+<stop offset="0" style="stop-color:#5ED2FF"/>
+<stop offset="1" style="stop-color:#277ADF"/>
 </linearGradient>
-<polygon fill="url(#SVGID_3)" points="13.884,14.183 17.839,18.266 16.34,44.039 9.433,51.707 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="53.32" x2="37.78" y1="15.99" y2="58.35">
-<stop offset="0" stop-color="#5ED2FF"/>
-<stop offset="1" stop-color="#277ADF"/>
+<polygon fill="url(#SVGID_3_)" points="9.624,11.55 14.628,16.712 12.73,49.303 3.996,59 "/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="50.6777" x2="50.6777" y1="12.5122" y2="59.2981">
+<stop offset="0" style="stop-color:#5ED2FF"/>
+<stop offset="1" style="stop-color:#277ADF"/>
 </linearGradient>
-<polygon fill="url(#SVGID_4)" points="46.105,14.183 42.142,18.266 43.641,44.039 50.557,51.707 "/>
-<polygon fill="#FFFFFF" fill-opacity="0.15" points="46.551,23.341 45.541,14.819 14.449,14.819 13,27.03 " stroke-opacity="0.15"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="29.99" x2="29.99" y1="14.61" y2="51.28">
-<stop offset="0" stop-color="#8AD4FF"/>
-<stop offset="0.77" stop-color="#2078FF"/>
-<stop offset="1" stop-color="#369EFF"/>
+<polygon fill="url(#SVGID_4_)" points="50.37,11.55 45.357,16.712 47.254,49.303 55.998,59 "/>
+<polygon fill="#FFFFFF" fill-opacity="0.15" points="50.934,23.129 49.654,12.354 10.34,12.354 8.508,27.796 " stroke-opacity="0.15"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="29.9971" x2="29.9971" y1="12.0908" y2="58.4598">
+<stop offset="0" style="stop-color:#8AD4FF"/>
+<stop offset="0.7697" style="stop-color:#2078FF"/>
+<stop offset="1" style="stop-color:#369EFF"/>
 </linearGradient>
-<path d="M44.975,15.455l4.149,34.981H10.865l4.149-34.981H44.975 M45.541,14.819H14.449l-4.3,36.251 H49.84L45.541,14.819L45.541,14.819z" fill="url(#SVGID_5)"/>
-<polygon fill="#FFFFFF" fill-opacity="0.15" points="10.148,51.07 49.84,51.07 48.746,41.845 10.748,46.023 " stroke-opacity="0.15"/>
-<path d="M40.111,41.578c-0.726,0-1.212-0.234-1.494-0.43 c-0.721-0.512-0.721-1.317-0.721-1.662v-7.686c-0.217-0.037-0.443-0.119-0.643-0.304l-2.41,7.921c-0.352,1.072-0.961,2.16-2.83,2.16 c-1.926,0-2.525-1.154-2.831-2.16l-0.976-3.366c-0.342,3.529-2.418,5.526-5.815,5.526c-3.769,0-5.846-2.372-5.846-6.68 c0-3.9,2.255-6.325,5.885-6.325c1.668,0,3.028,0.479,4.017,1.403l-0.36-1.243h4.668l1.547,6.505l1.637-6.505h4.156l-0.004,0.009 c0.093-0.006,0.18-0.006,0.257-0.006c0.097,0,0.198-0.002,0.198-0.002h0.905c-1.037-0.229-1.695-0.99-1.695-2.034 c0-1.26,0.958-2.106,2.384-2.106c1.403,0,2.383,0.866,2.383,2.106c0,1.044-0.656,1.805-1.693,2.034h1.504v10.753 c0,0.345,0,1.15-0.715,1.659C41.207,41.434,40.7,41.578,40.111,41.578L40.111,41.578z M22.393,31.673 c-0.906,0-1.276,0.917-1.276,3.167c0,2.518,0.393,3.642,1.276,3.642c0.944,0,1.295-0.987,1.295-3.642 C23.688,33.395,23.463,31.673,22.393,31.673L22.393,31.673z" fill-opacity="0.05" stroke-opacity="0.05"/>
-<path d="M40.111,41.262c-0.642,0-1.068-0.203-1.313-0.373 c-0.586-0.416-0.586-1.083-0.586-1.402V31.51c-0.289-0.006-0.617-0.05-0.853-0.368c-0.067-0.09-0.15-0.22-0.204-0.414l-2.615,8.598 c-0.332,1.009-0.865,1.937-2.528,1.937c-1.708,0-2.236-0.979-2.527-1.937l-1.622-5.599c0.051,0.396,0.077,0.813,0.077,1.25 c0,3.993-2.022,6.285-5.548,6.285c-3.618,0-5.528-2.201-5.528-6.363c0-3.706,2.134-6.008,5.567-6.008 c2.292,0,3.943,0.951,4.812,2.692l-0.733-2.532h3.995l1.788,7.52l1.894-7.52h3.48l-0.041,0.136c0.232-0.134,0.498-0.134,0.723-0.134 c0.1,0,0.208-0.001,0.208-0.001h3.46v10.436c0,0.318,0,0.985-0.582,1.399C41.079,41.136,40.635,41.262,40.111,41.262L40.111,41.262z M22.393,31.356c-1.4,0-1.593,1.674-1.593,3.483c0,1.957,0.189,3.959,1.593,3.959c1.343,0,1.613-1.516,1.613-3.959 C24.005,32.527,23.462,31.356,22.393,31.356L22.393,31.356z M40.141,28.489c-1.256,0-2.067-0.703-2.067-1.791 c0-1.087,0.812-1.79,2.067-1.79c1.217,0,2.066,0.736,2.066,1.79C42.207,27.787,41.396,28.489,40.141,28.489L40.141,28.489z" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M22.393,40.627c-3.878,0-5.212-2.663-5.212-6.045c0-3.346,1.81-5.692,5.251-5.692 c3.562,0,5.192,2.368,5.192,5.77C27.624,38.223,25.972,40.627,22.393,40.627z M22.393,30.723c-1.77,0-1.91,2.148-1.91,3.8 c0,1.688,0.082,4.276,1.91,4.276c1.829,0,1.93-2.309,1.93-4.276C24.322,32.988,24.084,30.723,22.393,30.723z M26.932,29.051h3.324 l2.03,8.537l2.147-8.537h2.807l-3.002,9.865c-0.334,1.017-0.828,1.711-2.225,1.711s-1.916-0.694-2.224-1.711L26.932,29.051z M40.141,27.855c-1.016,0-1.75-0.519-1.75-1.474c0-0.954,0.715-1.472,1.75-1.472c0.976,0,1.748,0.538,1.748,1.472 C41.89,27.336,41.155,27.855,40.141,27.855z M38.531,39.169c0,0.288,0,0.823,0.449,1.142c0.236,0.165,0.607,0.316,1.133,0.316 c0.545,0,0.9-0.149,1.137-0.316c0.451-0.319,0.451-0.854,0.451-1.142V29.051h-3.139c0,0-0.11,0.002-0.214,0.002 c-0.307,0-0.558,0.008-0.733,0.245c-0.084,0.111-0.196,0.312-0.196,0.668c0,0.375,0.113,0.56,0.196,0.671 c0.176,0.238,0.427,0.24,0.733,0.24c0.104,0,0.182,0,0.182,0L38.531,39.169L38.531,39.169z" fill="#FFFFFF"/>
-<path d="M17.204,21.681c3.578,0,4.897-3.346,6.174-6.582 c0.121-0.308,0.243-0.613,0.365-0.917h-2.025c-0.035,0.086-0.071,0.174-0.104,0.259c-1.326,3.361-2.283,5.402-4.409,5.402 c-0.522,0-0.945,0.412-0.945,0.918S16.681,21.681,17.204,21.681z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M36.379,15.099c1.277,3.236,2.596,6.582,6.174,6.582 c0.522,0,0.945-0.412,0.945-0.918s-0.423-0.918-0.945-0.918c-2.125,0-3.083-2.041-4.408-5.402c-0.033-0.085-0.069-0.173-0.104-0.259 h-2.025C36.137,14.486,36.258,14.792,36.379,15.099z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6" x1="16.64" x2="43.12" y1="13.45" y2="13.45">
-<stop offset="0" stop-color="#F4F4F4"/>
-<stop offset="0.5" stop-color="#E1E2E3"/>
-<stop offset="1" stop-color="#F4F4F4"/>
+<path d="M48.939,13.157l5.248,44.234H5.808l5.247-44.234H48.939 M49.654,12.354H10.34L4.902,58.195h50.189  L49.654,12.354L49.654,12.354z" fill="url(#SVGID_5_)"/>
+<polygon fill="#FFFFFF" fill-opacity="0.15" points="4.902,58.195 55.092,58.195 53.709,46.528 5.659,51.811 " stroke-opacity="0.15"/>
+<path d="M42.791,46.192c-0.918,0-1.534-0.296-1.89-0.545c-0.911-0.646-0.911-1.666-0.911-2.101v-9.719  c-0.273-0.046-0.563-0.15-0.813-0.383l-3.05,10.015c-0.444,1.356-1.214,2.733-3.579,2.733c-2.435,0-3.191-1.46-3.578-2.733  l-1.232-4.256c-0.434,4.462-3.059,6.989-7.354,6.989c-4.768,0-7.393-3-7.393-8.448c0-4.933,2.852-7.997,7.441-7.997  c2.109,0,3.829,0.606,5.08,1.773l-0.457-1.572h5.904l1.957,8.226l2.067-8.226h5.257l-0.005,0.011  c0.118-0.008,0.228-0.008,0.325-0.008c0.122,0,0.25-0.003,0.25-0.003h1.143c-1.311-0.291-2.142-1.252-2.142-2.572  c0-1.594,1.212-2.665,3.015-2.665c1.773,0,3.013,1.096,3.013,2.665c0,1.32-0.831,2.282-2.142,2.572h1.902v13.597  c0,0.436,0,1.455-0.904,2.099C44.176,46.008,43.535,46.192,42.791,46.192L42.791,46.192z M20.385,33.666  c-1.146,0-1.613,1.161-1.613,4.005c0,3.184,0.496,4.604,1.613,4.604c1.195,0,1.639-1.247,1.639-4.604  C22.023,35.843,21.738,33.666,20.385,33.666L20.385,33.666z" fill-opacity="0.05" stroke-opacity="0.05"/>
+<path d="M42.791,45.791c-0.812,0-1.352-0.255-1.66-0.472c-0.74-0.525-0.74-1.368-0.74-1.773V33.46  c-0.365-0.008-0.781-0.063-1.078-0.466c-0.086-0.113-0.189-0.277-0.258-0.523l-3.307,10.872c-0.42,1.276-1.096,2.448-3.199,2.448  c-2.158,0-2.828-1.236-3.193-2.448l-2.051-7.079c0.064,0.5,0.096,1.027,0.096,1.582c0,5.049-2.557,7.946-7.016,7.946  c-4.574,0-6.992-2.783-6.992-8.046c0-4.685,2.699-7.597,7.041-7.597c2.898,0,4.986,1.202,6.086,3.404l-0.927-3.201h5.053l2.259,9.51  l2.395-9.51H39.7l-0.054,0.172c0.295-0.169,0.631-0.169,0.916-0.169c0.125,0,0.263-0.002,0.263-0.002h4.374v13.196  c0,0.405,0,1.248-0.734,1.771C44.014,45.632,43.453,45.791,42.791,45.791L42.791,45.791z M20.385,33.265  c-1.771,0-2.015,2.117-2.015,4.406c0,2.475,0.239,5.006,2.015,5.006c1.698,0,2.039-1.916,2.039-5.006  C22.424,34.747,21.738,33.265,20.385,33.265L20.385,33.265z M42.828,29.641c-1.588,0-2.615-0.889-2.615-2.264  c0-1.375,1.027-2.263,2.615-2.263c1.538,0,2.613,0.931,2.613,2.263C45.441,28.752,44.414,29.641,42.828,29.641L42.828,29.641z" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M20.385,44.989c-4.905,0-6.592-3.367-6.592-7.645c0-4.229,2.289-7.196,6.641-7.196  c4.505,0,6.566,2.994,6.566,7.295C27,41.947,24.911,44.989,20.385,44.989z M20.385,32.464c-2.238,0-2.416,2.716-2.416,4.805  c0,2.135,0.104,5.408,2.416,5.408s2.439-2.918,2.439-5.408C22.824,35.329,22.523,32.464,20.385,32.464z M26.126,30.35h4.202  l2.567,10.796l2.716-10.796h3.548l-3.797,12.476c-0.421,1.285-1.046,2.163-2.813,2.163c-1.764,0-2.42-0.878-2.81-2.163L26.126,30.35  z M42.828,28.838c-1.285,0-2.213-0.656-2.213-1.864c0-1.206,0.904-1.861,2.213-1.861c1.232,0,2.21,0.68,2.21,1.861  C45.038,28.182,44.109,28.838,42.828,28.838z M40.791,43.146c0,0.364,0,1.041,0.57,1.443c0.299,0.209,0.767,0.4,1.43,0.4  c0.689,0,1.139-0.189,1.439-0.4c0.57-0.402,0.57-1.079,0.57-1.443V30.35h-3.969c0,0-0.14,0.002-0.27,0.002  c-0.389,0-0.705,0.01-0.928,0.311c-0.106,0.14-0.25,0.394-0.25,0.844c0,0.475,0.144,0.708,0.25,0.848  c0.223,0.3,0.539,0.304,0.928,0.304c0.13,0,0.229,0,0.229,0V43.146z" fill="#FFFFFF"/>
+<path d="M13.822,21.03c4.524,0,6.193-4.23,7.807-8.321c0.154-0.39,0.308-0.776,0.462-1.159h-2.562  c-0.044,0.109-0.088,0.22-0.131,0.327c-1.678,4.25-2.889,6.831-5.576,6.831c-0.659,0-1.195,0.521-1.195,1.162  S13.163,21.03,13.822,21.03z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M38.071,12.709c1.612,4.091,3.282,8.321,7.806,8.321c0.66,0,1.195-0.52,1.195-1.161s-0.535-1.162-1.195-1.162  c-2.686,0-3.898-2.581-5.574-6.831c-0.043-0.107-0.088-0.218-0.133-0.327h-2.561C37.764,11.933,37.918,12.319,38.071,12.709z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="13.1113" x2="46.5898" y1="10.6279" y2="10.6279">
+<stop offset="0" style="stop-color:#F4F4F4"/>
+<stop offset="0.5" style="stop-color:#E1E2E3"/>
+<stop offset="1" style="stop-color:#F4F4F4"/>
 </linearGradient>
-<path d="M42.197,19.231c-2.066,0-2.998-2.041-4.285-5.402c-1.365-3.558-3.418-7.99-8.036-7.99 c-4.617,0-6.668,4.432-8.032,7.99c-1.288,3.361-2.22,5.402-4.286,5.402c-0.507,0-0.918,0.412-0.918,0.918s0.412,0.918,0.918,0.918 c3.478,0,4.76-3.346,6.001-6.581c1.342-3.502,2.611-6.81,6.318-6.811c3.708,0.001,4.976,3.309,6.318,6.811 c1.24,3.235,2.522,6.581,6.001,6.581c0.507,0,0.918-0.412,0.918-0.918S42.704,19.231,42.197,19.231z" fill="url(#SVGID_6)"/>
-<rect fill="none" height="59.996" width="59.996"/>
+<path d="M45.428,17.934c-2.612,0-3.791-2.581-5.419-6.831C38.283,6.604,35.686,1,29.848,1  s-8.432,5.604-10.158,10.103c-1.627,4.25-2.805,6.831-5.418,6.831c-0.641,0-1.16,0.521-1.16,1.162s0.52,1.161,1.16,1.161  c4.398,0,6.021-4.231,7.588-8.322c1.698-4.429,3.303-8.611,7.99-8.613c4.689,0.002,6.293,4.184,7.99,8.613  c1.568,4.091,3.189,8.322,7.588,8.322c0.641,0,1.162-0.52,1.162-1.161S46.068,17.934,45.428,17.934z" fill="url(#SVGID_6_)"/>
+<rect fill="none" height="60" width="60"/>
+</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_personalization.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_personalization.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_personalization.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<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"/>
@@ -8,54 +9,54 @@
 <stop offset="0.78" stop-color="#F6A800"/>
 <stop offset="1" stop-color="#FCBA01"/>
 </radialGradient>
-<path d="M38.904,47.586c-2.769,0-5.188-1.035-7.191-3.076c-6.77-6.896-6.979-23.267-6.975-25.468 c7.495-1.505,11.217-1.801,15.086-1.801c3.624,0,6.74,0.421,13.229,1.797C52.983,21.865,51.975,47.586,38.904,47.586L38.904,47.586z " fill="url(#SVGID_1)"/>
+<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"/>
 </linearGradient>
-<path d="M49.311,18.163c0,0,0.613,5.736-0.727,8.807 l0.689,2.203c0,0,0,2.285-1.544,3.735c0,0-0.859,10.661-6.812,14.743c0,0,7.912-0.771,10.887-16.293c0,0,1.596-8.988,1.453-12.568 L49.311,18.163z" fill="url(#SVGID_2)" fill-opacity="0.5" stroke-opacity="0.5"/>
+<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"/>
 </radialGradient>
-<path d="M39.824,16.934c-3.795,0-7.498,0.261-15.391,1.856c0,0-0.541,29.102,14.471,29.102 c14.228,0,14.461-29.102,14.461-29.102C46.429,17.313,43.406,16.934,39.824,16.934z M38.904,47.279 c-2.684,0-5.029-1.004-6.974-2.984c-6.476-6.597-6.871-22.051-6.886-25.002c7.305-1.457,10.973-1.746,14.78-1.746 c3.553,0,6.619,0.409,12.917,1.737C52.621,23.087,51.367,47.279,38.904,47.279z" fill="url(#SVGID_3)"/>
+<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"/>
 </linearGradient>
-<path d="M41.432,35.783c0,0-3.164,1.717-4.564,0.686C36.867,36.469,39.371,40.031,41.432,35.783z" fill="url(#SVGID_4)"/>
+<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"/>
 </radialGradient>
-<path d="M49.697,30.154h-7.921c0,0,1.433-1.333,3.96-1.492C48.264,28.503,49.518,28.967,49.697,30.154 z" fill="url(#SVGID_5)"/>
+<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"/>
 </linearGradient>
-<path d="M45.736,29.063c1.613,0,3.045,0.429,3.961,1.091 c0.038-0.155,0.073-0.314,0.062-0.475c-0.174-2.32-1.8-3.545-4.022-3.545c-2.221,0-4.109,1.836-4.021,3.545 c0.008,0.162,0.025,0.319,0.063,0.474C42.691,29.492,44.123,29.063,45.736,29.063z" fill="url(#SVGID_6)" fill-opacity="0.8" stroke-opacity="0.8"/>
+<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"/>
 </linearGradient>
-<path d="M45.736,29.063c1.613,0,3.045,0.429,3.961,1.091c0.038-0.155,0.062-0.313,0.062-0.475 c0-1.544-1.8-2.795-4.022-2.795c-2.221,0-4.021,1.251-4.021,2.795c0,0.162,0.025,0.319,0.063,0.474 C42.691,29.492,44.123,29.063,45.736,29.063z" fill="url(#SVGID_7)"/>
-<path d="M39.094,45.725c-3.938,0-5.338-5.51-5.338-5.51H44.43 C44.43,40.215,43.029,45.725,39.094,45.725L39.094,45.725z" fill="#AB6100" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M39.094,45.052c-3.938,0-5.338-4.837-5.338-4.837H44.43 C44.43,40.215,43.029,45.052,39.094,45.052L39.094,45.052z" fill="#AB6100" fill-opacity="0.3" stroke-opacity="0.3"/>
+<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"/>
 <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"/>
 </linearGradient>
-<path d="M39.094,44.127c-3.938,0-5.338-4.224-5.338-4.224H44.43 C44.43,39.903,43.029,44.127,39.094,44.127L39.094,44.127z" fill="url(#SVGID_8)"/>
+<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"/>
 </linearGradient>
-<path d="M34.146,40.316h9.895c0,0-1.005,3.01-4.946,3.01C35.15,43.326,34.146,40.316,34.146,40.316z" fill="url(#SVGID_9)"/>
-<path d="M40.213,16.937c-0.129-0.001-0.258-0.003-0.389-0.003 c-3.795,0-7.498,0.261-15.391,1.856c0,0-0.333,17.958,6.803,25.66c0.137-0.13,0.279-0.248,0.413-0.386 C38.336,37.253,39.871,23.722,40.213,16.937z" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M24.434,18.79c0,0-0.319,17.271,6.397,25.202 c0.126-0.121,0.258-0.229,0.382-0.355c6.545-6.67,8.052-19.989,8.389-26.701C35.883,16.946,32.173,17.227,24.434,18.79z" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M24.434,18.79c0,0-0.307,16.601,6.011,24.726 c0.11-0.104,0.223-0.198,0.331-0.308c6.402-6.522,7.883-19.627,8.215-26.269C35.465,16.98,31.75,17.312,24.434,18.79z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<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"/>
@@ -64,7 +65,7 @@
 <stop offset="0.99" stop-color="#98A1A4"/>
 <stop offset="1" stop-color="#98A1A4"/>
 </radialGradient>
-<path d="M21.805,46.121c-2.904,0-5.439-1.102-7.534-3.273c-7.552-7.834-7.376-27.3-7.325-29.679 l0.192-0.041c7.558-1.608,9.588-2.041,13.609-2.041c4.453,0,8.745,0.343,17.415,2.083c0.008,2.384-0.197,21.403-8.043,29.395 C27.804,44.924,25.006,46.121,21.805,46.121L21.805,46.121z" fill="url(#SVGID_10)"/>
+<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"/>
@@ -72,88 +73,92 @@
 <stop offset="0.99" stop-color="#AAB4B8"/>
 <stop offset="1" stop-color="#AAB4B8"/>
 </radialGradient>
-<path d="M38.468,12.919c-9.088-1.835-13.351-2.139-17.72-2.139c-4.127,0-6.116,0.439-14.101,2.139 c0,0-1.221,33.507,15.159,33.507C39.092,46.427,38.468,12.919,38.468,12.919z M29.9,42.352c-2.256,2.298-4.979,3.463-8.095,3.463 c-2.818,0-5.278-1.069-7.313-3.18c-7.259-7.527-7.295-26.013-7.244-29.218c7.495-1.595,9.519-2.024,13.5-2.024 c4.392,0,8.628,0.335,17.109,2.028C37.846,16.63,37.436,34.676,29.9,42.352z" fill="url(#SVGID_11)"/>
+<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"/>
 </linearGradient>
-<path d="M34.279,12.666l-0.998,8.469l1.688,3.757 c0,0,0.281,1.327-1.755,4.562c0,0-0.277,12.192-8.179,15.75c0,0,8.539-0.847,11.75-17.875c0,0,1.322-9.31,1.168-14.05L34.279,12.666 z" fill="url(#SVGID_12)" fill-opacity="0.5" stroke-opacity="0.5"/>
+<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"/>
 </linearGradient>
-<path d="M11.016,12.666l0.459,8.469l-1.034,4.051 c0,0-0.141,1.26,1.102,4.268c0,0,0.338,12.562,7.939,15.949c0,0-8.465-0.29-11.51-18.073c0,0-1.15-9.425-0.995-14.086L11.016,12.666 z" fill="url(#SVGID_13)" fill-opacity="0.5" stroke-opacity="0.5"/>
+<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"/>
 </linearGradient>
-<path d="M22.941,22.553c-0.418,2.382,1.774,12.473-0.818,12.377c0,0,1.64,0.23,2.895-1.333 c0,0-0.992-3.404-0.908-6.658c-0.113-5.152,1.692-6.734,8.52-7.091C32.629,19.849,23.586,18.883,22.941,22.553z" fill="url(#SVGID_14)"/>
+<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">
 <stop offset="0" stop-color="#F7F7F7"/>
 <stop offset="1" stop-color="#ABABAB"/>
 </radialGradient>
-<path d="M10.51,25.504h8.901c0,0-1.609-1.498-4.451-1.676C12.12,23.648,10.712,24.171,10.51,25.504z" fill="url(#SVGID_15)"/>
+<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"/>
 </radialGradient>
-<path d="M35.18,25.504h-8.9c0,0,1.609-1.498,4.451-1.676C33.57,23.648,34.979,24.171,35.18,25.504z" fill="url(#SVGID_16)"/>
+<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">
 <stop offset="0" stop-color="#F0F0F0"/>
 <stop offset="1" stop-color="#CFCFCF"/>
 </linearGradient>
-<path d="M30.729,23.665c1.814,0,3.422,0.482,4.451,1.227 c0.043-0.173,0.07-0.352,0.07-0.533c0-1.736-2.025-3.143-4.521-3.143c-2.496,0-4.52,1.407-4.52,3.143c0,0.182,0.027,0.36,0.07,0.533 C27.307,24.147,28.916,23.665,30.729,23.665z" fill="url(#SVGID_17)" fill-opacity="0.8" stroke-opacity="0.8"/>
+<path d="M30.73,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.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.74,2.64-1.23,4.45-1.23z" fill="url(#SVGID_17)" fill-opacity="0.8" stroke-opacity="0.8"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18" x1="30.73" x2="30.73" y1="25.31" y2="21.45">
 <stop offset="0" stop-color="#333333"/>
 <stop offset="1" stop-color="#CBCBCB"/>
 </linearGradient>
-<path d="M30.729,24.277c1.814,0,3.422,0.482,4.451,1.227c0.043-0.173,0.07-0.352,0.07-0.533 c0-1.736-2.025-3.143-4.521-3.143c-2.496,0-4.52,1.407-4.52,3.143c0,0.182,0.027,0.36,0.07,0.533 C27.307,24.759,28.916,24.277,30.729,24.277z" fill="url(#SVGID_18)"/>
+<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"/>
 </radialGradient>
-<path d="M19.411,25.504H10.51c0,0,1.61-1.498,4.451-1.676C17.802,23.648,19.21,24.171,19.411,25.504z " fill="url(#SVGID_19)"/>
-<path d="M14.961,23.665c1.814,0,3.422,0.482,4.451,1.227 c0.043-0.173,0.07-0.352,0.07-0.533c0-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 C11.539,24.147,13.147,23.665,14.961,23.665z" fill="url(#SVGID_17)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M14.961,24.277c1.814,0,3.422,0.482,4.451,1.227c0.043-0.173,0.07-0.352,0.07-0.533 c0-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 C11.539,24.759,13.147,24.277,14.961,24.277z" fill="url(#SVGID_18)"/>
-<path d="M22.736,42.664c-4.516,0-6.122-6.186-6.122-6.186h12.244 C28.858,36.48,27.253,42.664,22.736,42.664L22.736,42.664z" fill-opacity="0.05" stroke-opacity="0.05"/>
-<path d="M22.736,42.051c-4.516,0-6.122-5.572-6.122-5.572h12.244 C28.858,36.48,27.253,42.051,22.736,42.051L22.736,42.051z" fill-opacity="0.1" stroke-opacity="0.1"/>
+<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"/>
+<path d="M14.96,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.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.75,2.64-1.23,4.45-1.23z" fill="url(#SVGID_18)"/>
+<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="1" stop-color="#FFFFFF"/>
 </linearGradient>
-<path d="M22.736,41.324c-4.516,0-6.122-4.844-6.122-4.844h12.244 C28.858,36.48,27.253,41.324,22.736,41.324L22.736,41.324z" fill="url(#SVGID_22)"/>
+<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)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_23" x1="22.74" x2="22.74" y1="34.55" y2="41.87">
 <stop offset="0" stop-color="#1A1A1A"/>
 <stop offset="1" stop-color="#B2B2B2"/>
 </linearGradient>
-<path d="M17.063,36.955H28.41c0,0-1.151,3.451-5.674,3.451S17.063,36.955,17.063,36.955z" fill="url(#SVGID_23)"/>
-<g transform="matrix(0.5 0 0 0.5 30 30)">
-<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"/>
+<path d="M17.06,36.96h11.35s-1.151,3.451-5.674,3.451-5.68-3.45-5.68-3.45z" fill="url(#SVGID_23)"/>
+<rect fill="none" height="60" width="60"/>
+</g>
+<g transform="matrix(1 0 0 1 30 30)">
+<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="M48.631,13.079l-3.08-7.497L27.85,13.46l0.028,23.917c-2.712-1.771-6.708-2.354-10.768-1.254 c-6.405,1.725-10.542,6.951-9.247,11.665c1.3,4.718,7.543,7.142,13.944,5.415c5.412-1.461,9.159-5.324,9.138-9.451 c-0.018-4.129,0.033-15.338,0-23.445L48.631,13.079z" 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"/>
+<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="27.878,33.26 27.857,13.46 27.85,13.46 27.872,33.258 "/>
-<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"/>
+<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="M30.945,19.08c0.007,1.306,0.01-0.201,0.012,1.223l17.674-7.225l-0.436-1.108L30.945,19.08z" 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"/>
+<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="28.142,38.062 28.142,14.143 45.891,6.413 45.551,5.582 27.454,13.46 27.454,37.378 "/>
-<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"/>
+<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="M17.625,52.389c-4.258,0.021-7.653-1.941-8.447-4.885c-0.484-1.785,0.028-3.761,1.444-5.555 c1.55-1.964,3.944-3.454,6.747-4.191c1.187-0.317,2.386-0.477,3.573-0.484c4.258-0.021,7.651,1.943,8.45,4.885 c1.058,3.9-2.618,8.272-8.196,9.748C20.012,52.221,18.808,52.381,17.625,52.389L17.625,52.389z" fill="url(#SVGID_5_)"/>
-<rect fill="none" height="59.996" width="59.996"/>
+<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 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_phone_as_modem.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_phone_as_modem.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,279 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<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"/>
+</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"/>
+</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"/>
+</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">
+<stop offset="0" style="stop-color:#6E6E6E"/>
+<stop offset="1" style="stop-color:#333333"/>
+</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"/>
+</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"/>
+</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"/>
+<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"/>
+</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"/>
+</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="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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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(0.5 0 0 0.5 30 30)">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="29.9995" x2="29.9995" y1="45.9541" y2="55.212">
+<stop offset="0" style="stop-color:#334247"/>
+<stop offset="1" style="stop-color:#446066"/>
+</linearGradient>
+<path d="M57.551,54.49c0,0.338-0.273,0.611-0.612,0.611H3.062c-0.339,0-0.612-0.273-0.612-0.611v-7.96  c0-0.338,0.273-0.612,0.612-0.612h53.877c0.339,0,0.612,0.274,0.612,0.612V54.49z" fill="url(#SVGID_1__)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="29.9995" x2="29.9995" y1="46.5615" y2="54.5859">
+<stop offset="0" style="stop-color:#334247"/>
+<stop offset="1" style="stop-color:#638B94"/>
+</linearGradient>
+<path d="M3.062,46.53v7.96h53.877v-7.96H3.062z M56.326,53.266H3.674v-6.123h52.652V53.266z" fill="url(#SVGID_2__)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="30.0005" x2="30.0005" y1="55.0654" y2="45.8075">
+<stop offset="0" style="stop-color:#334247"/>
+<stop offset="1" style="stop-color:#446066"/>
+</linearGradient>
+<path d="M56.938,45.918H3.062c-0.339,0-0.612,0.274-0.612,0.612v7.96c0,0.338,0.273,0.611,0.612,0.611h53.877  c0.339,0,0.612-0.273,0.612-0.611v-7.96C57.551,46.192,57.277,45.918,56.938,45.918z M56.938,54.49H3.062v-7.96h53.877V54.49z" fill="url(#SVGID_3__)"/>
+<g>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="36.9395" x2="43.3462" y1="26.0205" y2="26.0205">
+<stop offset="0" style="stop-color:#DBDBDB"/>
+<stop offset="0.097" style="stop-color:#DBDBDB"/>
+<stop offset="0.6848" style="stop-color:#B0B0B0"/>
+<stop offset="1" style="stop-color:#DEDEDE"/>
+</linearGradient>
+<path d="M43.47,33.674c0,0.338-0.274,0.612-0.612,0.612h-5.511c-0.338,0-0.612-0.274-0.612-0.612   l0.612-15.307c0-0.338,0.274-0.612,0.612-0.612h4.286c0.338,0,0.612,0.274,0.612,0.612L43.47,33.674z" fill="url(#SVGID_4__)"/>
+<rect fill-opacity="0.3" height="0.612" stroke-opacity="0.3" width="6.735" x="36.734" y="31.837"/>
+<rect fill-opacity="0.1" height="1.837" stroke-opacity="0.1" width="6.735" x="36.734" y="30.612"/>
+<rect fill-opacity="0.1" height="0.612" stroke-opacity="0.1" width="6.735" x="36.734" y="31.225"/>
+<path d="M42.245,17.755h-4.286c-0.338,0-0.612,0.274-0.612,0.612v0.612   c0-0.338,0.274-0.612,0.612-0.612h4.286c0.338,0,0.612,0.274,0.612,0.612v-0.612C42.857,18.029,42.583,17.755,42.245,17.755z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="37.5869" x2="42.6832" y1="12.5508" y2="12.5508">
+<stop offset="0" style="stop-color:#DBDBDB"/>
+<stop offset="0.097" style="stop-color:#DBDBDB"/>
+<stop offset="0.6848" style="stop-color:#919191"/>
+<stop offset="1" style="stop-color:#B8B8B8"/>
+</linearGradient>
+<path d="M42.245,17.755l-0.612-9.796c0-0.338-0.274-0.612-0.612-0.612h-1.837   c-0.338,0-0.612,0.274-0.612,0.612l-0.612,9.796H42.245z" fill="url(#SVGID_5__)"/>
+<path d="M41.021,7.347h-1.837c-0.338,0-0.612,0.274-0.612,0.612v0.612   c0-0.338,0.274-0.612,0.612-0.612h1.837c0.338,0,0.612,0.274,0.612,0.612V7.959C41.633,7.621,41.358,7.347,41.021,7.347z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
+<rect fill-opacity="0.3" height="0.612" stroke-opacity="0.3" width="4.286" x="37.959" y="17.143"/>
+<rect fill-opacity="0.1" height="0.612" stroke-opacity="0.1" width="4.286" x="37.959" y="16.53"/>
+<rect fill-opacity="0.1" height="1.837" stroke-opacity="0.1" width="4.286" x="37.959" y="15.918"/>
+</g>
+<rect fill="none" height="60" width="60"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6__" x1="29.9995" x2="29.9995" y1="32.5068" y2="47.3191">
+<stop offset="0" style="stop-color:#E0E2E6"/>
+<stop offset="1" style="stop-color:#555557"/>
+</linearGradient>
+<path d="M57.551,34.83c0-1.313-1.068-2.381-2.385-2.381H4.834c-1.316,0-2.385,1.067-2.385,2.381v12.313  h55.102V34.83z" fill="url(#SVGID_6__)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7__" x1="29.9995" x2="29.9995" y1="33.4209" y2="47.3077">
+<stop offset="0" style="stop-color:#EBEBEB"/>
+<stop offset="1" style="stop-color:#919191"/>
+</linearGradient>
+<path d="M57.064,34.592c0-0.676-0.548-1.225-1.226-1.225H4.161c-0.678,0-1.226,0.549-1.226,1.225v12.551  h54.129V34.592z" fill="url(#SVGID_7__)"/>
+<path d="M2.506,34.286c0.137-0.527,1.084-0.919,1.655-0.919h51.678c0.571,0,1.508,0.392,1.646,0.919  l0,0c-0.248-1.051-1.19-1.837-2.318-1.837H4.834C3.706,32.449,2.755,33.235,2.506,34.286L2.506,34.286z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
+<g>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8__" x1="13.1636" x2="13.1636" y1="43.2168" y2="35.7019">
+<stop offset="0" style="stop-color:#9F9F9F"/>
+<stop offset="1" style="stop-color:#7D7D80"/>
+</linearGradient>
+<rect fill="url(#SVGID_8__)" height="8.2" width="3.28" x="11.523" y="35.39"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9__" x1="13.1631" x2="13.1631" y1="43.043" y2="35.9365">
+<stop offset="0" style="stop-color:#C6FF45"/>
+<stop offset="0.7273" style="stop-color:#66A00E"/>
+<stop offset="1" style="stop-color:#387300"/>
+</linearGradient>
+<rect fill="url(#SVGID_9__)" height="7.106" width="2.188" x="12.069" y="35.937"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10__" x1="7.1499" x2="7.1499" y1="43.2168" y2="35.7019">
+<stop offset="0" style="stop-color:#9F9F9F"/>
+<stop offset="1" style="stop-color:#7D7D80"/>
+</linearGradient>
+<rect fill="url(#SVGID_10__)" height="8.2" width="3.28" x="5.51" y="35.39"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11__" x1="7.1499" x2="7.1499" y1="43.043" y2="35.9365">
+<stop offset="0" style="stop-color:#C6FF45"/>
+<stop offset="0.7273" style="stop-color:#66A00E"/>
+<stop offset="1" style="stop-color:#387300"/>
+</linearGradient>
+<rect fill="url(#SVGID_11__)" height="7.106" width="2.187" x="6.057" y="35.937"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12__" x1="19.1763" x2="19.1763" y1="43.2168" y2="35.7019">
+<stop offset="0" style="stop-color:#9F9F9F"/>
+<stop offset="1" style="stop-color:#7D7D80"/>
+</linearGradient>
+<rect fill="url(#SVGID_12__)" height="8.2" width="3.28" x="17.536" y="35.39"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13__" x1="19.1763" x2="19.1763" y1="43.043" y2="35.9365">
+<stop offset="0" style="stop-color:#334247"/>
+<stop offset="1" style="stop-color:#446066"/>
+</linearGradient>
+<rect fill="url(#SVGID_13__)" height="7.106" width="2.187" x="18.083" y="35.937"/>
+<rect fill="#FFFFFF" fill-opacity="0.5" height="0.547" stroke-opacity="0.5" width="2.188" x="12.069" y="35.937"/>
+<rect fill="#FFFFFF" fill-opacity="0.5" height="0.547" stroke-opacity="0.5" width="2.187" x="6.057" y="35.937"/>
+</g>
+<rect fill-opacity="0.3" height="0.612" stroke-opacity="0.3" width="55.102" x="2.449" y="47.143"/>
+<rect fill-opacity="0.1" height="0.612" stroke-opacity="0.1" width="55.102" x="2.449" y="47.755"/>
+<rect fill="#FFFFFF" fill-opacity="0.2" height="0.611" stroke-opacity="0.2" width="55.102" x="2.449" y="46.531"/>
+<rect fill-opacity="0.1" height="0.611" stroke-opacity="0.1" width="55.102" x="2.449" y="45.918"/>
+<g>
+<linearGradient gradientTransform="matrix(-0.7071 -0.7071 -0.7071 0.7071 774.9818 369.3789)" gradientUnits="userSpaceOnUse" id="SVGID_14__" x1="788.3408" x2="775.1464" y1="269.3369" y2="282.3496">
+<stop offset="0" style="stop-color:#C6FF45"/>
+<stop offset="0.7273" style="stop-color:#66A00E"/>
+<stop offset="1" style="stop-color:#387300"/>
+</linearGradient>
+<path d="M27.674,2.457l2.729,2.727c-3.561,3.56-3.559,9.354,0,12.913l-2.728,2.728   C22.611,15.76,22.611,7.521,27.674,2.457z" fill="url(#SVGID_14__)"/>
+<linearGradient gradientTransform="matrix(-0.7071 -0.7071 -0.7071 0.7071 774.9818 369.3789)" gradientUnits="userSpaceOnUse" id="SVGID_15__" x1="783.4971" x2="770.3032" y1="264.4326" y2="277.4448">
+<stop offset="0" style="stop-color:#C6FF45"/>
+<stop offset="0.7273" style="stop-color:#66A00E"/>
+<stop offset="1" style="stop-color:#387300"/>
+</linearGradient>
+<path d="M33.865,5.913l2.728,2.728c-1.655,1.654-1.655,4.345,0,5.998l-2.728,2.728   C30.707,14.21,30.707,9.072,33.865,5.913z" fill="url(#SVGID_15__)"/>
+<g>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16__" x1="27.1475" x2="27.1475" y1="20.6016" y2="-0.8683">
+<stop offset="0" style="stop-color:#AAE535"/>
+<stop offset="1" style="stop-color:#5D9C0A"/>
+</linearGradient>
+<path d="M27.676,19.979c-2.424-2.425-3.675-5.579-3.777-8.762c-0.112,3.465,1.139,6.966,3.777,9.606    l2.728-2.728c-0.143-0.144-0.27-0.294-0.4-0.444L27.676,19.979z" fill="url(#SVGID_16__)"/>
+</g>
+<g>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17__" x1="34.0488" x2="34.0488" y1="17.3809" y2="7.0927">
+<stop offset="0" style="stop-color:#AAE535"/>
+<stop offset="1" style="stop-color:#5D9C0A"/>
+</linearGradient>
+<path d="M33.865,16.521c-1.472-1.472-2.248-3.372-2.349-5.304c-0.114,2.212,0.662,4.463,2.349,6.148    l2.728-2.728c-0.146-0.144-0.261-0.306-0.38-0.465L33.865,16.521z" fill="url(#SVGID_17__)"/>
+</g>
+<g fill-opacity="0.6" stroke-opacity="0.6">
+<path d="M27.674,3.302l2.329,2.325c0.131-0.149,0.258-0.301,0.4-0.443l-2.729-2.727    c-2.639,2.64-3.888,6.141-3.775,9.605C24.001,8.879,25.251,5.726,27.674,3.302z" fill="#FFFFFF"/>
+</g>
+<g fill-opacity="0.6" stroke-opacity="0.6">
+<path d="M33.865,6.759l2.348,2.347c0.119-0.159,0.234-0.32,0.38-0.465l-2.728-2.728    c-1.687,1.687-2.463,3.938-2.349,6.149C31.617,10.131,32.394,8.23,33.865,6.759z" fill="#FFFFFF"/>
+</g>
+</g>
+<g>
+<linearGradient gradientTransform="matrix(0.7071 -0.7071 0.7071 0.7071 449.7858 369.3789)" gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="-21.0962" x2="-34.2907" y1="-540.0996" y2="-527.0869">
+<stop offset="0" style="stop-color:#C6FF45"/>
+<stop offset="0.7273" style="stop-color:#66A00E"/>
+<stop offset="1" style="stop-color:#387300"/>
+</linearGradient>
+<path d="M52.389,2.457l-2.729,2.727c3.56,3.56,3.559,9.354,0,12.913l2.727,2.728   C57.45,15.76,57.45,7.521,52.389,2.457z" fill="url(#SVGID_18_)"/>
+<linearGradient gradientTransform="matrix(0.7071 -0.7071 0.7071 0.7071 449.7858 369.3789)" gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="-25.9399" x2="-39.1338" y1="-545.0034" y2="-531.9913">
+<stop offset="0" style="stop-color:#C6FF45"/>
+<stop offset="0.7273" style="stop-color:#66A00E"/>
+<stop offset="1" style="stop-color:#387300"/>
+</linearGradient>
+<path d="M46.197,5.913L43.47,8.641c1.654,1.654,1.654,4.345,0,5.998l2.728,2.728   C49.355,14.21,49.355,9.072,46.197,5.913z" fill="url(#SVGID_19_)"/>
+<g>
+<linearGradient gradientTransform="matrix(-1 0 0 1 1224.7676 0)" gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="1171.8535" x2="1171.8535" y1="20.6016" y2="-0.8683">
+<stop offset="0" style="stop-color:#AAE535"/>
+<stop offset="1" style="stop-color:#5D9C0A"/>
+</linearGradient>
+<path d="M52.386,19.979c2.425-2.425,3.675-5.579,3.777-8.762c0.112,3.465-1.138,6.966-3.777,9.606    l-2.727-2.728c0.142-0.144,0.269-0.294,0.399-0.444L52.386,19.979z" fill="url(#SVGID_20_)"/>
+</g>
+<g>
+<linearGradient gradientTransform="matrix(-1 0 0 1 1224.7676 0)" gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="1178.7539" x2="1178.7539" y1="17.3809" y2="7.0927">
+<stop offset="0" style="stop-color:#AAE535"/>
+<stop offset="1" style="stop-color:#5D9C0A"/>
+</linearGradient>
+<path d="M46.197,16.521c1.471-1.472,2.248-3.372,2.349-5.304c0.114,2.212-0.663,4.463-2.349,6.148    l-2.728-2.728c0.145-0.144,0.261-0.306,0.379-0.465L46.197,16.521z" fill="url(#SVGID_21_)"/>
+</g>
+<g fill-opacity="0.6" stroke-opacity="0.6">
+<path d="M52.389,3.302l-2.33,2.325c-0.131-0.149-0.258-0.301-0.399-0.443l2.729-2.727    c2.638,2.64,3.887,6.141,3.774,9.605C56.061,8.879,54.811,5.726,52.389,3.302z" fill="#FFFFFF"/>
+</g>
+<g fill-opacity="0.6" stroke-opacity="0.6">
+<path d="M46.197,6.759l-2.349,2.347c-0.118-0.159-0.234-0.32-0.379-0.465l2.728-2.728    c1.686,1.687,2.463,3.938,2.349,6.149C48.445,10.131,47.668,8.23,46.197,6.759z" fill="#FFFFFF"/>
+</g>
+</g>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_22_" x1="52.6523" x2="52.6523" y1="49.124" y2="52.6441">
+<stop offset="0" style="stop-color:#334247"/>
+<stop offset="1" style="stop-color:#446066"/>
+</linearGradient>
+<path d="M50.816,52.653c-0.687,0-1.225-0.461-1.225-1.05v-1.399c0-0.589,0.538-1.05,1.225-1.05h3.674  c0.686,0,1.224,0.461,1.224,1.05v1.399c0,0.589-0.538,1.05-1.224,1.05H50.816z" fill="url(#SVGID_22_)"/>
+<path d="M55.102,51.604c0,0.241-0.273,0.438-0.611,0.438h-3.674c-0.339,0-0.612-0.196-0.612-0.438  v-1.399c0-0.241,0.273-0.438,0.612-0.438h3.674c0.338,0,0.611,0.196,0.611,0.438V51.604z" fill="#3FA9F5" fill-opacity="0.5" stroke-opacity="0.5"/>
+</g>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_phone_modem.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_phone_modem.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,212 +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"/>
-<rect fill="none" height="59.996" width="59.996"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="29.69" x2="29.69" y1="7.35" y2="51.92">
-<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"/>
-</linearGradient>
-<path d="M44.078,49.588c0,1.353-1.096,2.449-2.449,2.449H17.754c-1.353,0-2.449-1.097-2.449-2.449 V9.795c0-1.353,1.096-2.449,2.449-2.449h23.875c1.354,0,2.449,1.097,2.449,2.449V49.588z" fill="url(#SVGID_1)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="29.69" x2="29.69" y1="7.35" y2="51.16">
-<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"/>
-</linearGradient>
-<path d="M41.629,7.346H17.754c-1.353,0-2.449,1.097-2.449,2.449v39.792 c0,0.652,0.26,1.244,0.676,1.684c-0.037-0.148-0.064-0.3-0.064-0.459v-1.225V11.02V9.795c0-1.013,0.824-1.837,1.837-1.837h23.875 c1.014,0,1.838,0.824,1.838,1.837v1.224v38.568v1.225c0,0.159-0.027,0.311-0.064,0.459c0.416-0.439,0.676-1.031,0.676-1.684V9.795 C44.078,8.443,42.982,7.346,41.629,7.346z" fill="url(#SVGID_2)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="29.69" x2="29.69" y1="10.45" y2="40.41">
-<stop offset="0" stop-color="#B6BBBD"/>
-<stop offset="1" stop-color="#F0FBFF"/>
-</linearGradient>
-<rect fill="url(#SVGID_3)" fill-opacity="0.6" height="29.998" stroke-opacity="0.6" width="25.101" x="17.142" y="10.407"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="29.69" x2="29.69" y1="11.06" y2="39.8">
-<stop offset="0" stop-color="#6E6E6E"/>
-<stop offset="1" stop-color="#333333"/>
-</linearGradient>
-<rect fill="url(#SVGID_4)" height="28.773" width="23.875" x="17.754" y="11.02"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="29.69" x2="29.69" y1="11.67" y2="39.18">
-<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"/>
-</linearGradient>
-<rect fill="url(#SVGID_5)" height="27.549" width="22.651" x="18.366" y="11.632"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6" x1="29.69" x2="29.69" y1="12.11" y2="23.06">
-<stop offset="0" stop-color="#85EFFF"/>
-<stop offset="1" stop-color="#3BA1D9"/>
-</linearGradient>
-<polygon fill="url(#SVGID_6)" points="41.018,21.427 18.366,23.876 18.366,12.244 41.018,12.244 "/>
-<rect fill="#9FE4FF" height="0.612" width="22.651" x="18.366" y="11.632"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7" x1="29.87" x2="29.87" y1="10.44" y2="7.99">
-<stop offset="0" stop-color="#FFFFFF"/>
-<stop offset="1" stop-color="#D1D7D9"/>
-</linearGradient>
-<path d="M27.163,10.407c-0.686,0-1.224-0.448-1.224-1.02V8.979c0-0.573,0.538-1.021,1.224-1.021h5.416 c0.687,0,1.225,0.448,1.225,1.021v0.408c0,0.572-0.538,1.02-1.225,1.02H27.163z" fill="url(#SVGID_7)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8" x1="29.87" x2="29.87" y1="8.32" y2="9.9">
-<stop offset="0" stop-color="#6C7375"/>
-<stop offset="1" stop-color="#BDC2C4"/>
-</linearGradient>
-<path d="M33.19,9.388c0,0.226-0.273,0.408-0.612,0.408h-5.416c-0.338,0-0.612-0.182-0.612-0.408V8.979 c0-0.226,0.274-0.409,0.612-0.409h5.416c0.339,0,0.612,0.183,0.612,0.409V9.388z" fill="url(#SVGID_8)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9" x1="29.6" x2="29.6" y1="41.04" y2="50.14">
-<stop offset="0" stop-color="#B6BBBD"/>
-<stop offset="1" stop-color="#FFFFFF"/>
-</linearGradient>
-<path d="M27.384,50.2c-1.312,0-2.378-1.058-2.378-2.354v-4.475 c0-1.299,1.066-2.354,2.378-2.354h4.425c1.313,0,2.38,1.056,2.38,2.354v4.475c0,1.297-1.066,2.354-2.38,2.354H27.384z" fill="url(#SVGID_9)" fill-opacity="0.6" stroke-opacity="0.6"/>
-<path d="M27.382,49.588c-0.972,0-1.764-0.78-1.764-1.742v-4.475 c0-0.961,0.792-1.742,1.764-1.742h4.432c0.973,0,1.763,0.781,1.763,1.742v4.475c0,0.96-0.79,1.742-1.763,1.742H27.382z" fill="#020202" fill-opacity="0.5" stroke-opacity="0.5"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10" x1="29.6" x2="29.6" y1="42.21" y2="48.99">
-<stop offset="0" stop-color="#A6A8AB"/>
-<stop offset="0.7" stop-color="#58595B"/>
-<stop offset="1" stop-color="#808184"/>
-</linearGradient>
-<path d="M32.965,47.846c0,0.625-0.514,1.131-1.146,1.131h-4.443c-0.632,0-1.146-0.506-1.146-1.131 v-4.475c0-0.624,0.514-1.13,1.146-1.13h4.443c0.632,0,1.146,0.506,1.146,1.13V47.846z" fill="url(#SVGID_10)"/>
-<path d="M28.679,47.752c-0.675,0-1.225-0.549-1.225-1.225V44.69 c0-0.676,0.549-1.224,1.225-1.224h1.836c0.676,0,1.225,0.548,1.225,1.224v1.837c0,0.676-0.549,1.225-1.225,1.225H28.679z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11" x1="29.6" x2="29.6" y1="44.06" y2="47.14">
-<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"/>
-</linearGradient>
-<path d="M28.679,47.14c-0.337,0-0.612-0.274-0.612-0.612V44.69c0-0.336,0.275-0.612,0.612-0.612 h1.836c0.338,0,0.612,0.276,0.612,0.612v1.837c0,0.338-0.274,0.612-0.612,0.612H28.679z" fill="url(#SVGID_11)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12" x1="19.85" x2="19.85" y1="41.59" y2="48.99">
-<stop offset="0" stop-color="#B6BBBD"/>
-<stop offset="1" stop-color="#F0FBFF"/>
-</linearGradient>
-<path d="M19.496,48.977c-1.297,0-2.354-1.058-2.354-2.355 v-2.638c0-1.296,1.057-2.354,2.354-2.354h0.707c1.298,0,2.354,1.059,2.354,2.355v2.638c0,1.297-1.057,2.354-2.354,2.354H19.496z" fill="url(#SVGID_12)" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13" x1="19.85" x2="19.85" y1="42.21" y2="48.37">
-<stop offset="0" stop-color="#231F20"/>
-<stop offset="1" stop-color="#6D6E70"/>
-</linearGradient>
-<path d="M19.496,48.363c-0.962,0-1.742-0.78-1.742-1.742 v-2.638c0-0.961,0.78-1.741,1.742-1.741h0.707c0.96,0,1.742,0.78,1.742,1.742v2.638c0,0.961-0.782,1.741-1.742,1.741H19.496z" fill="url(#SVGID_13)" fill-opacity="0.7" stroke-opacity="0.7"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14" x1="19.85" x2="19.85" y1="42.83" y2="47.76">
-<stop offset="0" stop-color="#C6FF45"/>
-<stop offset="0.73" stop-color="#66A00E"/>
-<stop offset="1" stop-color="#387300"/>
-</linearGradient>
-<path d="M21.333,46.621c0,0.625-0.505,1.131-1.13,1.131h-0.707c-0.624,0-1.13-0.506-1.13-1.131 v-2.638c0-0.624,0.506-1.13,1.13-1.13h0.707c0.625,0,1.13,0.506,1.13,1.131V46.621z" fill="url(#SVGID_14)"/>
-<path d="M38.654,48.977c-1.299,0-2.355-1.058-2.355-2.355 v-2.638c0-1.298,1.057-2.354,2.355-2.354h0.705c1.298,0,2.355,1.057,2.355,2.354v2.638c0,1.298-1.058,2.355-2.355,2.355H38.654z" fill="url(#SVGID_12)" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M38.654,48.363c-0.962,0-1.744-0.78-1.744-1.742 v-2.638c0-0.961,0.781-1.742,1.744-1.742h0.705c0.961,0,1.743,0.78,1.743,1.742v2.638c0,0.961-0.782,1.742-1.743,1.742H38.654z" fill="url(#SVGID_13)" fill-opacity="0.7" stroke-opacity="0.7"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17" x1="39.01" x2="39.01" y1="42.83" y2="47.76">
-<stop offset="0" stop-color="#FFC142"/>
-<stop offset="0.75" stop-color="#CF4E18"/>
-<stop offset="1" stop-color="#B52100"/>
-</linearGradient>
-<path d="M40.49,46.621c0,0.625-0.507,1.131-1.131,1.131h-0.705c-0.625,0-1.131-0.506-1.131-1.131 v-2.638c0-0.624,0.506-1.13,1.131-1.13h0.705c0.624,0,1.131,0.506,1.131,1.13V46.621z" fill="url(#SVGID_17)"/>
-</g>
-<g transform="matrix(1 0 0 1 30 30)">
-<g>
-<rect fill="none" height="30" width="30"/>
-</g>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="7.1724" x2="7.1724" y1="4.4004" y2="23.8399">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
-</linearGradient>
-<path d="M5.646,14.57c-0.004,0.125-0.018,0.248-0.018,0.375c0,2.93,1.039,5.617,2.752,7.736l0.337-0.338  C6.875,20.258,5.736,17.545,5.646,14.57z" fill="url(#SVGID_1_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="9.5156" x2="9.5156" y1="6.4287" y2="21.8232">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
-</linearGradient>
-<path d="M10.332,20.73l0.33-0.33c-1.35-1.586-2.188-3.611-2.275-5.828c-0.005,0.124-0.018,0.246-0.018,0.373  C8.369,17.119,9.106,19.119,10.332,20.73z" fill="url(#SVGID_2_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="15.4995" x2="15.4995" y1="11.207" y2="17.7759">
-<stop offset="0" style="stop-color:#D6FF7A"/>
-<stop offset="1" style="stop-color:#66A00E"/>
-</linearGradient>
-<path d="M15.5,11.332c-1.749,0-3.166,1.418-3.166,3.166c0,0.129,0.022,0.252,0.038,0.377  c0.188-1.569,1.508-2.789,3.128-2.789s2.94,1.22,3.128,2.789c0.016-0.125,0.038-0.248,0.038-0.377  C18.666,12.75,17.249,11.332,15.5,11.332z" fill="url(#SVGID_3_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="7.2153" x2="7.2153" y1="5.1567" y2="24.5907">
-<stop offset="0" style="stop-color:#D6FF7A"/>
-<stop offset="1" style="stop-color:#66A00E"/>
-</linearGradient>
-<path d="M5.646,14.57c0.091-3.022,1.265-5.779,3.157-7.879l-0.341-0.34c-1.763,2.133-2.834,4.861-2.834,7.84  C5.628,14.318,5.641,14.443,5.646,14.57z" fill="url(#SVGID_4_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="6.231" x2="6.231" y1="4.4028" y2="23.8385">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
-</linearGradient>
-<path d="M5.646,14.57c-0.005-0.127-0.018-0.252-0.018-0.379c0-2.979,1.071-5.707,2.834-7.84L7.639,5.527  C5.447,7.928,4.093,11.094,4,14.57c0.093,3.428,1.414,6.554,3.551,8.939l0.829-0.828c-1.713-2.119-2.752-4.807-2.752-7.736  C5.628,14.818,5.642,14.695,5.646,14.57z" fill="url(#SVGID_5_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="6.231" x2="6.231" y1="5.1563" y2="24.5919">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
-</linearGradient>
-<path d="M5.646,14.57c-0.005-0.127-0.018-0.252-0.018-0.379c0-2.979,1.071-5.707,2.834-7.84L7.639,5.527  C5.447,7.928,4.093,11.094,4,14.57c0.093,3.428,1.414,6.554,3.551,8.939l0.829-0.828c-1.713-2.119-2.752-4.807-2.752-7.736  C5.628,14.818,5.642,14.695,5.646,14.57z" fill="url(#SVGID_6_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="9.5596" x2="9.5596" y1="7.1821" y2="22.5769">
-<stop offset="0" style="stop-color:#D6FF7A"/>
-<stop offset="1" style="stop-color:#66A00E"/>
-</linearGradient>
-<path d="M8.387,14.572c0.088-2.268,0.963-4.333,2.363-5.934l-0.336-0.335  c-1.273,1.628-2.045,3.665-2.045,5.888C8.369,14.32,8.382,14.445,8.387,14.572z" fill="url(#SVGID_7_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="8.5781" x2="8.5781" y1="6.4292" y2="21.8229">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
-</linearGradient>
-<path d="M6.742,14.571c0.09,2.67,1.113,5.104,2.757,6.991l0.833-0.832c-1.226-1.611-1.963-3.611-1.963-5.785  c0-0.127,0.013-0.249,0.018-0.373c-0.005-0.127-0.018-0.252-0.018-0.381c0-2.223,0.771-4.26,2.045-5.888L9.587,7.477  C7.891,9.377,6.832,11.852,6.742,14.571z" fill="url(#SVGID_8_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="8.5781" x2="8.5781" y1="7.1826" y2="22.5763">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
-</linearGradient>
-<path d="M6.742,14.571c0.09,2.67,1.113,5.104,2.757,6.991l0.833-0.832c-1.226-1.611-1.963-3.611-1.963-5.785  c0-0.127,0.013-0.249,0.018-0.373c-0.005-0.127-0.018-0.252-0.018-0.381c0-2.223,0.771-4.26,2.045-5.888L9.587,7.477  C7.891,9.377,6.832,11.852,6.742,14.571z" fill="url(#SVGID_9_)"/>
-<linearGradient gradientTransform="matrix(-1 0 0 1 696.3945 0)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="672.5664" x2="672.5664" y1="4.4004" y2="23.8399">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
-</linearGradient>
-<path d="M25.354,14.57c0.004,0.125,0.018,0.248,0.018,0.375c0,2.93-1.038,5.617-2.752,7.736l-0.337-0.338  C24.125,20.258,25.264,17.545,25.354,14.57z" fill="url(#SVGID_10_)"/>
-<linearGradient gradientTransform="matrix(-1 0 0 1 696.3945 0)" gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="674.9102" x2="674.9102" y1="6.4287" y2="21.8232">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
-</linearGradient>
-<path d="M20.668,20.73l-0.33-0.33c1.35-1.586,2.188-3.611,2.275-5.828c0.005,0.124,0.018,0.246,0.018,0.373  C22.631,17.119,21.894,19.119,20.668,20.73z" fill="url(#SVGID_11_)"/>
-<linearGradient gradientTransform="matrix(-1 0 0 1 696.3945 0)" gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="672.6094" x2="672.6094" y1="5.1567" y2="24.5907">
-<stop offset="0" style="stop-color:#D6FF7A"/>
-<stop offset="1" style="stop-color:#66A00E"/>
-</linearGradient>
-<path d="M25.354,14.57c-0.091-3.022-1.265-5.779-3.157-7.879l0.341-0.34c1.763,2.133,2.834,4.861,2.834,7.84  C25.372,14.318,25.359,14.443,25.354,14.57z" fill="url(#SVGID_12_)"/>
-<linearGradient gradientTransform="matrix(-1 0 0 1 696.3945 0)" gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="671.625" x2="671.625" y1="4.4028" y2="23.8385">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
-</linearGradient>
-<path d="M25.354,14.57c0.005-0.127,0.018-0.252,0.018-0.379c0-2.979-1.071-5.707-2.834-7.84l0.823-0.824  c2.191,2.4,3.546,5.566,3.639,9.043c-0.093,3.428-1.414,6.554-3.551,8.939l-0.829-0.828c1.714-2.119,2.752-4.807,2.752-7.736  C25.372,14.818,25.358,14.695,25.354,14.57z" fill="url(#SVGID_13_)"/>
-<linearGradient gradientTransform="matrix(-1 0 0 1 696.3945 0)" gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="671.625" x2="671.625" y1="5.1563" y2="24.5919">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
-</linearGradient>
-<path d="M25.354,14.57c0.005-0.127,0.018-0.252,0.018-0.379c0-2.979-1.071-5.707-2.834-7.84l0.823-0.824  c2.191,2.4,3.546,5.566,3.639,9.043c-0.093,3.428-1.414,6.554-3.551,8.939l-0.829-0.828c1.714-2.119,2.752-4.807,2.752-7.736  C25.372,14.818,25.358,14.695,25.354,14.57z" fill="url(#SVGID_14_)"/>
-<linearGradient gradientTransform="matrix(-1 0 0 1 696.3945 0)" gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="674.9541" x2="674.9541" y1="7.1821" y2="22.5769">
-<stop offset="0" style="stop-color:#D6FF7A"/>
-<stop offset="1" style="stop-color:#66A00E"/>
-</linearGradient>
-<path d="M22.613,14.572c-0.088-2.268-0.963-4.333-2.363-5.934l0.336-0.335  c1.273,1.628,2.045,3.665,2.045,5.888C22.631,14.32,22.618,14.445,22.613,14.572z" fill="url(#SVGID_15_)"/>
-<linearGradient gradientTransform="matrix(-1 0 0 1 696.3945 0)" gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="673.9727" x2="673.9727" y1="6.4292" y2="21.8229">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
-</linearGradient>
-<path d="M24.258,14.571c-0.09,2.67-1.113,5.104-2.757,6.991l-0.833-0.832  c1.226-1.611,1.963-3.611,1.963-5.785c0-0.127-0.013-0.249-0.018-0.373c0.005-0.127,0.018-0.252,0.018-0.381  c0-2.223-0.771-4.26-2.045-5.888l0.827-0.827C23.109,9.377,24.168,11.852,24.258,14.571z" fill="url(#SVGID_16_)"/>
-<linearGradient gradientTransform="matrix(-1 0 0 1 696.3945 0)" gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="673.9727" x2="673.9727" y1="7.1826" y2="22.5763">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
-</linearGradient>
-<path d="M24.258,14.571c-0.09,2.67-1.113,5.104-2.757,6.991l-0.833-0.832  c1.226-1.611,1.963-3.611,1.963-5.785c0-0.127-0.013-0.249-0.018-0.373c0.005-0.127,0.018-0.252,0.018-0.381  c0-2.223-0.771-4.26-2.045-5.888l0.827-0.827C23.109,9.377,24.168,11.852,24.258,14.571z" fill="url(#SVGID_17_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="15.4995" x2="15.4995" y1="11.207" y2="17.7765">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
-</linearGradient>
-<path d="M15.5,12.086c-1.62,0-2.94,1.22-3.128,2.789c0.188,1.569,1.508,2.79,3.128,2.79  s2.94-1.221,3.128-2.79C18.44,13.306,17.12,12.086,15.5,12.086z" fill="url(#SVGID_18_)"/>
-</g>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_phonebook.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_phonebook.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_phonebook.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,64 +1,66 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<g>
 <rect fill="none" height="60" width="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="30.61" x2="30.61" y1="8.98" y2="49.39">
-<stop offset="0" stop-color="#FFFFFF"/>
-<stop offset="1" stop-color="#CCCCCC"/>
-</linearGradient>
-<path d="M48.363,48.977c0,0.063-0.547,0.611-1.224,0.611H14.081c-0.676,0-1.224-0.548-1.224-1.225 V9.795c0-0.676,0.548-1.225,1.224-1.225H47.14c0.677,0,1.224,0.548,1.224,1.836V48.977z" fill="url(#SVGID_1)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="46.22" x2="49.44" y1="19.25" y2="19.25">
-<stop offset="0" stop-color="#808080"/>
-<stop offset="0.9" stop-color="#F0F0F0"/>
-<stop offset="0.91" stop-color="#FFFFFF"/>
-<stop offset="1" stop-color="#FFFFFF"/>
+<rect fill="none" height="60" width="60"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30.8115" x2="30.8115" y1="3.3521" y2="56.9221">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#CCCCCC"/>
 </linearGradient>
-<path d="M49.051,23.43c0.329-0.17,0.537-0.51,0.537-0.882v-6.969c0-0.37-0.208-0.712-0.537-0.881 l-2.565-0.896v10.887L49.051,23.43z" fill="url(#SVGID_2)"/>
-<polygon fill="#231F20" fill-opacity="0.35" points="46.417,22.434 48.914,23.408 46.978,24.352 46.417,24.335 " stroke-opacity="0.35"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="49.32" x2="45.95" y1="29.47" y2="29.47">
-<stop offset="0" stop-color="#AFE865"/>
-<stop offset="0.05" stop-color="#AFE865"/>
-<stop offset="0.06" stop-color="#68B339"/>
-<stop offset="1" stop-color="#136101"/>
+<path d="M54.349,56.377c0,0.085-0.727,0.813-1.622,0.813H8.898c-0.896,0-1.624-0.728-1.624-1.623V4.434  c0-0.896,0.728-1.623,1.624-1.623h43.828c0.896,0,1.622,0.728,1.622,2.437V56.377z" fill="url(#SVGID_1_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="51.5088" x2="55.7697" y1="16.9629" y2="16.9629">
+<stop offset="0" style="stop-color:#808080"/>
+<stop offset="0.897" style="stop-color:#F0F0F0"/>
+<stop offset="0.9091" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#FFFFFF"/>
 </linearGradient>
-<path d="M48.926,33.837c0.33-0.169,0.538-0.512,0.538-0.882v-6.969c0-0.37-0.208-0.712-0.538-0.881 l-2.832-1.076v10.888L48.926,33.837z" fill="url(#SVGID_3)"/>
-<polygon fill="#231F20" fill-opacity="0.35" points="45.567,32.999 48.65,34.064 46.465,34.917 45.558,34.892 " stroke-opacity="0.35"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="49.28" x2="45.76" y1="40.13" y2="40.13">
-<stop offset="0" stop-color="#B8D6E9"/>
-<stop offset="0.07" stop-color="#5CB2E9"/>
-<stop offset="1" stop-color="#005BCC"/>
+<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"/>
+<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"/>
+</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"/>
+<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"/>
 </linearGradient>
-<path d="M49.001,44.855c0.33-0.168,0.54-0.51,0.54-0.881v-7.701c0-0.369-0.21-0.712-0.54-0.881 l-3.147-1.076v11.62L49.001,44.855z" fill="url(#SVGID_4)"/>
-<rect fill="#404041" fill-opacity="0.2" height="41.017" stroke-opacity="0.2" width="14.081" x="33.059" y="8.571"/>
-<rect fill="#404041" fill-opacity="0.2" height="41.017" stroke-opacity="0.2" width="14.08" x="32.447" y="8.571"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="28.16" x2="28.16" y1="7.88" y2="49.59">
-<stop offset="0" stop-color="#B2F56E"/>
-<stop offset="0.53" stop-color="#439020"/>
-<stop offset="1" stop-color="#0D4D07"/>
+<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"/>
 </linearGradient>
-<path d="M45.915,48.977c0,0.676-0.548,1.224-1.225,1.224H11.632c-0.676,0-1.225-0.548-1.225-1.224 V9.183c0-0.676,0.549-1.225,1.225-1.225H44.69c0.677,0,1.225,0.549,1.225,1.225V48.977z" fill="url(#SVGID_5)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6" x1="30.3" x2="30.3" y1="7.75" y2="61.12">
-<stop offset="0" stop-color="#CDEDBD"/>
-<stop offset="0.99" stop-color="#139900"/>
-<stop offset="1" stop-color="#139900"/>
+<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"/>
 </linearGradient>
-<path d="M44.69,8.571c0.339,0,0.612,0.275,0.612,0.612v39.793c0,0.338-0.273,0.611-0.612,0.611H15.305 V8.571H44.69 M44.69,7.958H14.693V50.2H44.69c0.677,0,1.225-0.548,1.225-1.224V9.183C45.915,8.507,45.367,7.958,44.69,7.958 L44.69,7.958z" fill="url(#SVGID_6)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7" x1="12.55" x2="12.55" y1="7.75" y2="50.81">
-<stop offset="0" stop-color="#F2F2F2"/>
-<stop offset="1" stop-color="#A0A0A0"/>
+<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">
+<stop offset="0" style="stop-color:#F2F2F2"/>
+<stop offset="1" style="stop-color:#A0A0A0"/>
 </linearGradient>
-<path d="M11.632,7.958c-0.676,0-1.225,0.549-1.225,1.225v39.793c0,0.676,0.549,1.224,1.225,1.224 h3.061V7.958H11.632z" fill="url(#SVGID_7)"/>
-<rect fill="#737373" height="42.242" width="0.612" x="14.081" y="7.958"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8" x1="13.77" x2="13.77" y1="7.75" y2="50.81">
-<stop offset="0" stop-color="#FFFFFF"/>
-<stop offset="1" stop-color="#E6E6E6"/>
+<path d="M5.652,2C4.756,2,4.029,2.728,4.029,3.623v52.754C4.029,57.275,4.756,58,5.652,58h4.059V2H5.652z" fill="url(#SVGID_7_)"/>
+<rect fill="#737373" height="56" width="0.813" x="8.898" y="2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="8.4932" x2="8.4932" y1="1.73" y2="58.813">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#E6E6E6"/>
 </linearGradient>
-<rect fill="url(#SVGID_8)" height="42.242" width="0.612" x="13.468" y="7.958"/>
-<rect fill="none" height="59.996" width="59.996"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9" x1="30.61" x2="30.61" y1="22.55" y2="42.23">
-<stop offset="0" stop-color="#FFFFFF"/>
-<stop offset="1" stop-color="#CFCFCF"/>
+<rect fill="url(#SVGID_8_)" height="56" width="0.811" x="8.088" y="2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="30.8125" x2="30.8125" y1="21.3486" y2="47.4313">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#CFCFCF"/>
 </linearGradient>
-<path d="M37.023,34.51c-0.809-0.42-2.99-1.828-3.066-1.915l0,0c-0.455-0.521-0.437-1.671-0.209-2.171 v0c0.016-0.035,0.033-0.067,0.051-0.096c0.055-0.087,0.106-0.173,0.159-0.259l0,0c0.396-0.648,0.728-1.292,1-1.896 c0.491,0.169,1.122-0.287,1.437-1.061c0.324-0.801,0.184-1.633-0.314-1.857c-0.028-0.013-0.059-0.015-0.086-0.023V25.23 c0.064-0.253,0.092-0.402,0.092-0.402c0.861-3.861-1.012-6.923-5.55-7.074c-1.866,0-2.763,0.849-3.456,1.734 c-1.125,0.174-2.911,1.206-1.651,5.726c-0.047,0.009-0.095,0.016-0.141,0.035c-0.502,0.212-0.66,1.037-0.353,1.841 c0.309,0.805,0.965,1.287,1.468,1.075c0.031-0.013,0.058-0.036,0.085-0.054c0.277,0.623,0.616,1.288,1.026,1.957h-0.001 c0.014,0.022,0.029,0.045,0.042,0.068c0.008,0.014,0.015,0.027,0.025,0.04c0,0.001,0,0.002,0.001,0.003 c0.03,0.049,0.059,0.099,0.09,0.147c0.258,0.405,0.322,1.571-0.081,2.168c-0.094,0.137-2.477,1.526-3.395,2.014 c-1.052,0.559-2.769,1.842-2.769,4.734h18.366C39.793,36.352,37.834,34.933,37.023,34.51z M28.012,21.95 c-0.006,0-0.013-0.002-0.019-0.003C27.999,21.947,28.006,21.95,28.012,21.95z M28.086,21.966c-0.004-0.001-0.01-0.003-0.013-0.005 C28.076,21.963,28.082,21.965,28.086,21.966z M27.893,21.964c-0.005,0.003-0.012,0.004-0.017,0.007 C27.88,21.968,27.888,21.967,27.893,21.964z M27.946,21.949c-0.006,0-0.013,0-0.019,0.001C27.933,21.949,27.94,21.949,27.946,21.949 z M27.848,22.001c-0.003,0.004-0.008,0.006-0.011,0.011C27.84,22.009,27.844,22.005,27.848,22.001z M25.437,25.213 c0.01-0.009,0.021-0.019,0.031-0.028c0.001,0.007,0.002,0.012,0.005,0.019C25.46,25.206,25.448,25.211,25.437,25.213z" fill="url(#SVGID_9)"/>
-<rect fill="#DEFEAC" fill-opacity="0.5" height="0.611" stroke-opacity="0.5" width="18.366" x="21.427" y="39.244"/>
+<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"/>
+</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_photos.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_photos.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_photos.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,112 +1,114 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
-<rect fill="none" height="60" width="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="28.43" x2="28.43" y1="10.52" y2="44.97">
-<stop offset="0" stop-color="#FFFFFF"/>
-<stop offset="0.25" stop-color="#F1F2F2"/>
-<stop offset="0.61" stop-color="#D4DADE"/>
-<stop offset="0.92" stop-color="#E3E8E8"/>
-<stop offset="0.98" stop-color="#FCFFFE"/>
-<stop offset="1" stop-color="#FCFFFE"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<g>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_1)" points="49.783,43.516 8.711,45.541 7.069,11.633 48.139,9.606 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="28.43" x2="28.43" y1="10.97" y2="44.55">
-<stop offset="0" stop-color="#F2F2F2"/>
-<stop offset="0.25" stop-color="#EBECEC"/>
-<stop offset="0.61" stop-color="#ADB2B5"/>
-<stop offset="0.92" stop-color="#CCD1D1"/>
-<stop offset="0.98" stop-color="#E6E9E8"/>
-<stop offset="1" stop-color="#E6E9E8"/>
+<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"/>
 </linearGradient>
-<path d="M47.647,10.153l1.593,32.867L9.205,44.993L7.612,12.128L47.647,10.153" fill="url(#SVGID_2)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="16.47" x2="28.03" y1="5.41" y2="24.68">
-<stop offset="0" stop-color="#92D4E3"/>
-<stop offset="1" stop-color="#2671D1"/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_3)" points="47.334,36.344 10.612,38.153 9.453,14.242 46.176,12.43 "/>
-<polygon fill="#231F20" fill-opacity="0.3" points="49.592,45.303 48.484,15.883 11.174,15.883 11.174,45.303 " stroke-opacity="0.3"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="32.42" x2="32.42" y1="16.42" y2="48.05">
-<stop offset="0" stop-color="#F2F2F2"/>
-<stop offset="0.3" stop-color="#DBDCDD"/>
-<stop offset="0.61" stop-color="#ADB2B5"/>
-<stop offset="0.92" stop-color="#CCD1D1"/>
-<stop offset="0.98" stop-color="#E6E9E8"/>
-<stop offset="1" stop-color="#E6E9E8"/>
+<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"/>
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_4)" height="31.361" width="41.12" x="11.864" y="16.58"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="32.42" x2="32.42" y1="16.58" y2="48.1">
-<stop offset="0" stop-color="#FFFFFF"/>
-<stop offset="0.25" stop-color="#F1F2F2"/>
-<stop offset="0.61" stop-color="#D4DADE"/>
-<stop offset="0.92" stop-color="#E3E8E8"/>
-<stop offset="0.98" stop-color="#FCFFFE"/>
-<stop offset="1" stop-color="#FCFFFE"/>
+<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"/>
 </linearGradient>
-<path d="M52.467,17.103v30.315H12.382V17.103H52.467 M52.983,16.58h-41.12v31.361h41.12V16.58 L52.983,16.58z" fill="url(#SVGID_5)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6" x1="32.5" x2="32.5" y1="19.16" y2="45.61">
-<stop offset="0" stop-color="#B3B3B3"/>
-<stop offset="1" stop-color="#666666"/>
+<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">
+<stop offset="0" style="stop-color:#B3B3B3"/>
+<stop offset="1" style="stop-color:#666666"/>
 </linearGradient>
-<rect fill="url(#SVGID_6)" height="25.677" width="36.765" x="14.12" y="19.303"/>
-<radialGradient cx="49.72" cy="19.68" gradientUnits="userSpaceOnUse" id="SVGID_7" r="43.04">
-<stop offset="0" stop-color="#8BC53F"/>
-<stop offset="0.5" stop-color="#33773B"/>
-<stop offset="1" stop-color="#004F3C"/>
+<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"/>
 </radialGradient>
-<rect fill="url(#SVGID_7)" height="24.621" width="35.518" x="14.73" y="19.896"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8" x1="20.51" x2="58.88" y1="23.44" y2="44.96">
-<stop offset="0" stop-color="#A7FF00"/>
-<stop offset="1" stop-color="#138F00"/>
+<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"/>
 </linearGradient>
-<path d="M50.248,36.273c-0.516-0.353-1.093-0.689-1.746-0.987c-3.561-1.618-14.724-3.743-22.21-6.238 c-7.484-2.496-4.907-5.157-4.907-5.157c-0.166-0.583-0.582-1.165-1.247-0.166c-1.768,2.648,1.798,4.835,5.739,6.238 c4.908,1.747,16.263,3.627,20.711,6.57c1.506,0.998,2.703,1.963,3.66,2.855V36.273L50.248,36.273z" fill="url(#SVGID_8)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9" x1="25.93" x2="28.26" y1="30.94" y2="36.6">
-<stop offset="0" stop-color="#A7FF00"/>
-<stop offset="1" stop-color="#138F00"/>
+<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"/>
 </linearGradient>
-<path d="M23.048,36.949c0.832,0.666,3.811,1.207,6.738-1.58c1.747-1.664,1.747-4.159,1.747-4.159 s-3.16-0.915-6.072,1.081C22.549,34.287,22.217,36.285,23.048,36.949z" fill="url(#SVGID_9)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10" x1="18.44" x2="18.6" y1="26.89" y2="30.14">
-<stop offset="0" stop-color="#A7FF00"/>
-<stop offset="1" stop-color="#138F00"/>
+<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"/>
 </linearGradient>
-<path d="M15.714,29.077c0.34,0.511,1.883,1.328,3.979,0.309c1.25-0.61,1.685-1.981,1.685-1.981 s-1.578-1.055-3.525-0.466C15.904,27.527,15.373,28.565,15.714,29.077z" fill="url(#SVGID_10)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11" x1="26.58" x2="27.33" y1="25.02" y2="28.68">
-<stop offset="0" stop-color="#A7FF00"/>
-<stop offset="1" stop-color="#138F00"/>
+<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"/>
 </linearGradient>
-<path d="M29.62,24.723c-0.583-0.583-2.18-1.271-4.325,0.499c-1.281,1.057-1.296,2.917-1.296,2.917 s2.127,0.245,3.832-0.671C29.804,26.41,30.14,25.242,29.62,24.723z" fill="url(#SVGID_11)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12" x1="38.3" x2="39.97" y1="27.53" y2="36.29">
-<stop offset="0" stop-color="#A7FF00"/>
-<stop offset="1" stop-color="#138F00"/>
+<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"/>
 </linearGradient>
-<path d="M41.473,27.8c-0.503-0.65-2.162-1.206-3.992,0.583c-1.186,1.159-1.586,3.748-1.586,3.748 s2.127,0.245,3.832-0.671C41.697,30.402,42.18,28.715,41.473,27.8z" fill="url(#SVGID_12)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13" x1="41.31" x2="40.86" y1="34.06" y2="42.93">
-<stop offset="0" stop-color="#A7FF00"/>
-<stop offset="1" stop-color="#138F00"/>
+<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"/>
 </linearGradient>
-<path d="M35.967,41.893c1.057,0.708,5.652,1.753,9.375-1.213c2.221-1.77,1.413-4.894,1.413-4.894 s-4.782-1.806-8.483,0.319C34.567,38.229,34.908,41.184,35.967,41.893z" fill="url(#SVGID_13)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14" x1="48.27" x2="51.82" y1="28.61" y2="38.92">
-<stop offset="0" stop-color="#A7FF00"/>
-<stop offset="1" stop-color="#138F00"/>
+<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"/>
 </linearGradient>
-<path d="M50.248,28.26c-0.854,0.852-1.615,1.937-2.111,3.302c-0.973,2.668,1.346,4.912,1.346,4.912 s0.295-0.058,0.766-0.191V28.26z" fill="url(#SVGID_14)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15" x1="44.33" x2="41.94" y1="28.57" y2="33.24">
-<stop offset="0" stop-color="#45E8FF"/>
-<stop offset="0.13" stop-color="#45E8FF"/>
-<stop offset="0.53" stop-color="#30A4D5"/>
-<stop offset="1" stop-color="#1347BA"/>
+<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"/>
 </linearGradient>
-<path d="M41.666,33.619c0,0,1.32-6.918,2.621-4.681C45.085,30.308,42.783,33.426,41.666,33.619z" fill="url(#SVGID_15)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16" x1="38.99" x2="40.93" y1="28.52" y2="33.75">
-<stop offset="0" stop-color="#45E8FF"/>
-<stop offset="0.52" stop-color="#30A4D5"/>
-<stop offset="1" stop-color="#1347BA"/>
+<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"/>
 </linearGradient>
-<path d="M41.771,33.658c0,0-0.413-8.412-3.191-5.002C36.682,30.984,39.527,32.623,41.771,33.658z" fill="url(#SVGID_16)"/>
-<polygon fill="#FFFFFF" fill-opacity="0.3" points="52.983,24.731 52.983,16.58 11.864,16.58 11.864,29.639 " stroke-opacity="0.3"/>
-<rect fill="#FFFFFF" fill-opacity="0.05" height="1.145" stroke-opacity="0.05" width="36.765" x="14.12" y="43.836"/>
-<rect fill="#FFFFFF" fill-opacity="0.05" height="1.807" stroke-opacity="0.05" width="36.765" x="14.12" y="43.174"/>
-<rect fill="#FFFFFF" fill-opacity="0.05" height="2.469" stroke-opacity="0.05" width="36.765" x="14.12" y="42.512"/>
-<rect fill="#FFFFFF" fill-opacity="0.05" height="3.133" stroke-opacity="0.05" width="36.765" x="14.12" y="41.848"/>
-<rect fill="none" height="59.996" width="59.996"/>
+<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"/>
+<rect fill="#FFFFFF" fill-opacity="0.05" height="1.396" stroke-opacity="0.05" width="44.844" x="10.6" y="48.371"/>
+<rect fill="#FFFFFF" fill-opacity="0.05" height="2.204" stroke-opacity="0.05" width="44.844" x="10.6" y="47.563"/>
+<rect fill="#FFFFFF" fill-opacity="0.05" height="3.012" stroke-opacity="0.05" width="44.844" x="10.6" y="46.756"/>
+<rect fill="#FFFFFF" fill-opacity="0.05" height="3.82" stroke-opacity="0.05" width="44.844" x="10.6" y="45.947"/>
+<rect fill="none" height="60" width="59.999"/>
+</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_pin_code.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,31 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<linearGradient gradientTransform="matrix(1 0 0 1 16.7998 -811.9199)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="13.1997" x2="13.1997" y1="835.4805" y2="847.4325">
-<stop offset="0" style="stop-color:#96E9FA"/>
-<stop offset="0.5515" style="stop-color:#005BCC"/>
-<stop offset="1" style="stop-color:#0087D9"/>
+<rect fill="none" height="60" width="60"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="18.4185" y2="40.575">
+<stop offset="0" style="stop-color:#A8B1B3"/>
+<stop offset="0.3879" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#A2A6A8"/>
+</linearGradient>
+<rect fill="url(#SVGID_1_)" height="22.247" width="56" x="2" y="18.306"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="20.687" y2="39.4278">
+<stop offset="0" style="stop-color:#A9AAAD"/>
+<stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
-<rect fill="url(#SVGID_1_)" height="12" width="49" x="5.5" y="23.5"/>
-<linearGradient gradientTransform="matrix(1 0 0 1 16.7998 -811.9199)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="13.1997" x2="13.1997" y1="837.4648" y2="846.4293">
-<stop offset="0" style="stop-color:#005BCC"/>
-<stop offset="0.5515" style="stop-color:#0087D9"/>
-<stop offset="1" style="stop-color:#96E9FA"/>
+<rect fill="url(#SVGID_2_)" height="18.817" width="46.884" x="6.558" y="20.592"/>
+<rect fill="#231F20" fill-opacity="0.2" height="18.817" stroke-opacity="0.2" width="1.143" x="52.285" y="20.592"/>
+<rect fill="#231F20" fill-opacity="0.2" height="18.817" stroke-opacity="0.2" width="1.143" x="6.717" y="20.592"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30" x2="30" y1="18.4243" y2="41.7178">
+<stop offset="0" style="stop-color:#D2D3D3"/>
+<stop offset="1" style="stop-color:#7B7E80"/>
 </linearGradient>
-<rect fill="url(#SVGID_2_)" height="9" width="41" x="9.5" y="25.5"/>
-<rect fill="#231F20" fill-opacity="0.2" height="9" stroke-opacity="0.2" width="1" x="49.5" y="25.5"/>
-<linearGradient gradientTransform="matrix(1 0 0 1 16.7998 -811.9199)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="13.1997" x2="13.1997" y1="835.4844" y2="848.4324">
-<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:#2979C7"/>
-</linearGradient>
-<path d="M5.5,23.5v13h49v-13H5.5z M53.5,35.5h-47v-11h47V35.5z" fill="url(#SVGID_3_)"/>
-<polygon fill="#FFFFFF" points="48.5,29.718 45.867,29.718 47.184,27.438 46.316,26.938 45,29.218 43.684,26.938 42.816,27.438   44.133,29.718 41.5,29.718 41.5,30.718 44.133,30.718 42.816,33 43.684,33.5 45,31.219 46.316,33.5 47.184,33 45.867,30.718   48.5,30.718 "/>
-<polygon fill="#FFFFFF" points="38.5,29.718 35.867,29.718 37.184,27.438 36.316,26.938 35,29.218 33.684,26.938 32.816,27.438   34.133,29.718 31.5,29.718 31.5,30.718 34.133,30.718 32.816,33 33.684,33.5 35,31.219 36.316,33.5 37.184,33 35.867,30.718   38.5,30.718 "/>
-<polygon fill="#FFFFFF" points="28.5,29.718 25.866,29.718 27.184,27.438 26.316,26.938 25,29.218 23.684,26.938 22.816,27.438   24.134,29.718 21.5,29.718 21.5,30.718 24.134,30.718 22.816,33 23.684,33.5 25,31.219 26.316,33.5 27.184,33 25.868,30.718   28.5,30.718 "/>
-<polygon fill="#FFFFFF" points="18.5,29.718 15.866,29.718 17.184,27.438 16.316,26.938 15,29.218 13.684,26.938 12.816,27.438   14.134,29.718 11.5,29.718 11.5,30.718 14.134,30.718 12.816,33 13.684,33.5 15,31.219 16.316,33.5 17.184,33 15.868,30.718   18.5,30.718 "/>
+<path d="M2,18.306v23.389h56V18.306H2z M56.856,40.553H3.143V19.448h53.714V40.553z" fill="url(#SVGID_3_)"/>
+<polygon points="37.213,27.633 36.295,27.103 34.896,29.523 33.5,27.103 32.58,27.633 33.979,30.055 31.184,30.055 31.184,31.116   33.979,31.116 32.58,33.536 33.498,34.066 34.896,31.646 36.295,34.066 37.214,33.536 35.816,31.116 38.611,31.116 38.611,30.055   35.814,30.055 "/>
+<polygon points="26.602,27.633 25.684,27.103 24.285,29.523 22.889,27.103 21.969,27.633 23.367,30.055 20.57,30.055 20.57,31.116   23.367,31.116 21.969,33.536 22.887,34.066 24.285,31.646 25.684,34.066 26.603,33.536 25.204,31.116 27.999,31.116 27.999,30.055   25.203,30.055 "/>
+<polygon points="15.989,27.633 15.072,27.103 13.674,29.523 12.277,27.103 11.357,27.633 12.756,30.055 9.959,30.055 9.959,31.116   12.756,31.116 11.357,33.536 12.276,34.066 13.674,31.646 15.072,34.066 15.99,33.536 14.593,31.116 17.388,31.116 17.388,30.055   14.592,30.055 "/>
+<rect height="1.303" width="6.512" x="42.371" y="32.94"/>
+<polygon fill-opacity="0.2" points="31.691,33.056 32.851,31.048 30.531,31.048 30.531,28.684 32.851,28.684 31.691,26.674   33.738,25.495 34.896,27.502 36.057,25.494 38.102,26.675 36.943,28.684 39.262,28.684 39.262,31.048 36.943,31.048 38.104,33.057   36.056,34.235 34.896,32.228 33.738,34.235 " stroke-opacity="0.2"/>
+<polygon fill="#FFFFFF" points="38.611,29.335 35.814,29.335 37.213,26.913 36.295,26.384 34.896,28.805 33.5,26.384 32.58,26.913   33.979,29.335 31.184,29.335 31.184,30.396 33.979,30.396 32.58,32.817 33.498,33.348 34.896,30.927 36.295,33.348 37.214,32.817   35.816,30.396 38.611,30.396 "/>
+<polygon fill-opacity="0.2" points="21.08,33.056 22.238,31.048 19.92,31.048 19.92,28.684 22.239,28.684 21.08,26.675 23.127,25.495   24.285,27.502 25.445,25.495 27.49,26.675 26.331,28.684 28.65,28.684 28.65,31.048 26.332,31.048 27.492,33.057 25.445,34.235   24.285,32.228 23.125,34.236 " stroke-opacity="0.2"/>
+<polygon fill="#FFFFFF" points="27.999,29.335 25.203,29.335 26.602,26.913 25.684,26.384 24.285,28.805 22.889,26.384   21.969,26.913 23.367,29.335 20.57,29.335 20.57,30.396 23.367,30.396 21.969,32.817 22.887,33.348 24.285,30.927 25.684,33.348   26.603,32.817 25.204,30.396 27.999,30.396 "/>
+<polygon fill-opacity="0.2" points="10.469,33.056 11.627,31.048 9.309,31.048 9.309,28.684 11.627,28.684 10.469,26.675 12.516,25.495   13.674,27.502 14.834,25.494 16.879,26.675 15.72,28.684 18.039,28.684 18.039,31.048 15.721,31.048 16.881,33.056 14.834,34.235   13.674,32.228 12.515,34.235 " stroke-opacity="0.2"/>
+<polygon fill="#FFFFFF" points="17.388,29.335 14.592,29.335 15.989,26.913 15.072,26.384 13.674,28.805 12.277,26.384   11.357,26.913 12.756,29.335 9.959,29.335 9.959,30.396 12.756,30.396 11.357,32.817 12.276,33.348 13.674,30.927 15.072,33.348   15.99,32.817 14.593,30.396 17.388,30.396 "/>
+<rect fill-opacity="0.2" height="2.604" stroke-opacity="0.2" width="7.813" x="41.721" y="31.569"/>
+<rect fill="#E6E6E6" height="1.303" width="6.512" x="42.371" y="32.22"/>
+<rect fill-opacity="0.3" height="0.651" stroke-opacity="0.3" width="46.884" x="6.558" y="20.592"/>
 <rect fill="none" height="60" width="60"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_play.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_play.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_play.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,109 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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:#A6A8AB"/>
-<stop offset="1" style="stop-color:#231F20"/>
-</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:#A9AAAD"/>
-<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:#F4FCFF"/>
-<stop offset="0.6242" style="stop-color:#C9CED1"/>
-<stop offset="1" style="stop-color:#9CA4A7"/>
-</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_)"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <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:#A6A8AB"/>
-<stop offset="1" style="stop-color:#231F20"/>
-</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:#A9AAAD"/>
-<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:#BC5800"/>
-<stop offset="0.3" style="stop-color:#A23600"/>
-<stop offset="1" style="stop-color:#D07100"/>
-</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="#600909" 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="#600909" 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:#8BC53F"/>
-<stop offset="0.3758" style="stop-color:#33773B"/>
-<stop offset="0.6303" style="stop-color:#004F3C"/>
-<stop offset="1" style="stop-color:#007338"/>
-</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:#BC5800"/>
-<stop offset="0.3" style="stop-color:#A23600"/>
-<stop offset="1" style="stop-color:#D07100"/>
+<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"/>
 </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="#600909" 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:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
-</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:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
-</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:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
-</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:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
-</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:#D2FF8A"/>
-<stop offset="1" style="stop-color:#138F00"/>
+<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"/>
 </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:#D2FF8A"/>
-<stop offset="1" style="stop-color:#138F00"/>
-</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:#A7FF00"/>
-<stop offset="0.2303" style="stop-color:#D6FF61"/>
-<stop offset="1" style="stop-color:#138F00"/>
+<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"/>
 </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:#A7FF00"/>
-<stop offset="0.2303" style="stop-color:#D6FF61"/>
-<stop offset="1" style="stop-color:#138F00"/>
-</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:#C9CDCE"/>
-<stop offset="1" style="stop-color:#6E7273"/>
-</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:#E6E9E8"/>
-<stop offset="1" style="stop-color:#ADB2B5"/>
-</linearGradient>
-<path d="M2.142,1.727v55.43h55.716V1.727H2.142z M57.144,56.447H2.856V2.438h54.287V56.447z" fill="url(#SVGID_18_)"/>
+<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 "/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_playlist.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_playlist.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<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"/>
+</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">
+<stop offset="0" style="stop-color:#F5F5F5"/>
+<stop offset="1" style="stop-color:#CCCCCC"/>
+</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"/>
+</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"/>
+</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"/>
+<rect fill="#666666" height="1.71" width="42.741" x="8.628" y="37.84"/>
+<rect fill="#F5F5F5" height="0.854" width="42.741" x="8.628" y="31.856"/>
+<rect fill="#666666" height="1.711" width="42.741" x="8.628" y="30.146"/>
+<rect fill="#F5F5F5" height="0.854" width="42.741" x="8.628" y="24.162"/>
+<rect fill="#666666" height="1.71" width="42.741" x="8.628" y="22.452"/>
+<rect fill="#F5F5F5" height="0.853" width="42.741" x="8.628" y="16.47"/>
+<rect fill="#666666" height="1.71" width="42.741" x="8.628" y="14.76"/>
+<rect fill="none" height="60" width="60"/>
+</g>
+<g transform="matrix(1 0 0 1 30 30)">
+<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 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_positioning_info.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,96 +1,94 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="37.876" x2="37.876" y1="13.4941" y2="51.0732">
+<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="45.782,13.494 52.042,14.349 52.042,49.299 41.021,50.807 30,48.614 23.71,49.799 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="35.5107" x2="35.5107" y1="24.561" y2="51.0459">
+<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="41.021,23.659 41.021,50.807 30,48.614 30,39.609 "/>
-<polygon fill-opacity="0.25" points="46.513,13.603 41.021,25.208 30,41.176 24.602,49.646 22.031,50.123 44.573,13.332 " stroke-opacity="0.25"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="25.2905" x2="25.2905" y1="13.1597" y2="50.796">
+<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="42.62,15.073 40.935,24.138 30,39.996 23.75,49.805 18.369,50.807 7.962,48.848   7.962,13.597 18.063,12.842 30,14.498 41.021,12.842 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="24.1846" x2="24.1846" y1="49.2607" y2="14.1261">
+<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,14.498 30,39.996 23.75,49.805 18.369,50.807 18.369,12.885 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="43.4102" x2="43.4102" y1="23.7725" y2="13.462">
+<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="41.021,12.842 41.021,24.011 45.8,13.496 "/>
-<path d="M18.981,50.688l9.365-14.047L24.4,34.679l-5.982,8.276l-5.843,6.75l-1.866-0.345l7.668-9.03  l4.502-6.398l-4.715-2.322L7.962,29.518v-1.076l10.591,2.189l4.948,2.428l5.576-7.826l-10.873-5.426l-10.242-1.8v-1.665l10.573,1.77  l11.385,5.684l3.263-5.545l-3.185-1.119l-4.733-3.271l2.257,0.312l2.488,1.818l3.708,1.351l2.191-3.722l2.145-0.306l-2.857,4.82  l4.074,2.191l1.783-2.824l1.84-4.398l1.033,0.141l-2.891,6.246c0,0-7.08,10.974-11.021,16.867l-9.537,14.057L18.981,50.688z   M29.052,35.822l-3.994-2.027l5.49-7.721l3.67,1.782L29.052,35.822z M31.425,24.545l3.842,1.918l3.434-5.244l-4.041-2.173  L31.425,24.545L31.425,24.545z" fill="#FFFFFF" fill-opacity="0.25" stroke-opacity="0.25"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="25.8403" x2="25.8403" y1="50.4434" y2="22.9069">
+<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="M43.062,13.119l-2.018,4.835c0,0-1.09,1.722-1.693,2.671l-4.471-2.404l2.875-4.848l-1.459,0.197  l-2.49,4.074l-3.771-1.384l-2.785-2.144l-1.722-0.238l4.491,3.061l3.479,1.225l-3.488,5.93l-11.521-5.751L7.962,16.566v1.209  l10.286,1.799l11.148,5.564l-0.134,0.226l-5.687,7.983l-5.189-2.527L7.959,28.684l0.003,0.605l10.395,2.162l4.863,2.395  l-4.829,6.773l-7.426,8.794l1.38,0.259l6.046-7.004l5.936-8.28l4.414,2.175l-9.44,14.07l0.859-0.16l9.854-14.777L41.06,19.067  l2.662-5.856L43.062,13.119z M30.008,34.504l-1.031,1.586l-4.295-2.198l5.383-7.65l0.423-0.559l4.188,2.091L30.008,34.504z   M35.345,26.756l-4.24-2.117l3.467-5.896l4.453,2.394L35.345,26.756z" fill="url(#SVGID_6_)"/>
-<polygon fill="#FFFFFF" points="36.728,45.009 41.028,35.948 44.89,45.009 41.028,42.668 "/>
-<polygon fill-opacity="0.4" points="44.89,45.009 41.028,35.948 41.028,42.668 " stroke-opacity="0.4"/>
-<path d="M22.604,11.602c-0.85,0-1.542,0.679-1.542,1.514c0,0.833,0.692,1.512,1.542,1.512  c0.849,0,1.541-0.679,1.541-1.512C24.146,12.28,23.453,11.602,22.604,11.602z" fill="none"/>
+<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="M22.698,34.518l4.393-7.606l7.605-4.392l-7.605-4.392l-2.148-4.332l-4.156-0.576l-2.482,4.908L10.7,22.52  l7.606,4.392L22.698,34.518z M24.655,18.357h2.205v2.205h-2.205V18.357z M24.655,24.478h2.205v2.203h-2.205V24.478z M18.536,18.357  h2.205v2.205h-2.205V18.357z M18.536,24.478h2.205v2.203h-2.205V24.478z" fill-opacity="0.25" stroke-opacity="0.25"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="22.6978" x2="22.6978" y1="11.4844" y2="32.8172">
+<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="33.472,21.907 27.472,18.443 27.472,20.563 24.043,20.563 24.043,17.133 26.163,17.133   22.698,11.134 19.233,17.133 21.353,17.133 21.353,20.563 17.924,20.563 17.924,18.443 11.924,21.907 17.924,25.372 17.924,23.253   21.353,23.253 21.353,26.681 19.233,26.681 22.698,32.681 26.163,26.681 24.043,26.681 24.043,23.253 27.472,23.253 27.472,25.372   "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="22.6978" x2="22.6978" y1="12.479" y2="31.6981">
+<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="20.294,27.293 21.965,27.293 21.965,22.641 17.312,22.641 17.312,24.311 13.149,21.907   17.312,19.504 17.312,21.175 21.965,21.175 21.965,16.521 20.294,16.521 22.698,12.358 25.102,16.521 23.431,16.521 23.431,21.175   28.085,21.175 28.085,19.504 32.247,21.907 28.085,24.311 28.085,22.641 23.431,22.641 23.431,27.293 25.102,27.293 22.698,31.456   "/>
-<path d="M22.698,25.533c-1.662,0-3.014-1.352-3.014-3.014s1.352-3.014,3.014-3.014c1.662,0,3.014,1.352,3.014,3.014  S24.36,25.533,22.698,25.533L22.698,25.533z" fill-opacity="0.25" stroke-opacity="0.25"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="22.6982" x2="22.6982" y1="19.5371" y2="24.5098">
+<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="22.698" cy="21.977" fill="url(#SVGID_9_)" r="2.471"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="22.6982" x2="22.6982" y1="20.0732" y2="23.9531">
+<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="M22.698,23.904c-1.063,0-1.927-0.865-1.927-1.928c0-1.063,0.864-1.928,1.927-1.928  c1.063,0,1.927,0.864,1.927,1.928C24.625,23.039,23.761,23.904,22.698,23.904L22.698,23.904z" fill="url(#SVGID_10_)"/>
+<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(0.5 0 0 0.5 30 30)">
-<rect fill="none" height="60" width="60"/>
-<rect fill="none" height="59.996" width="59.996"/>
-<path d="M30.295,21.957c0.98,0,1.767-0.243,2.359-0.727 c0.592-0.485,0.888-1.15,0.888-2c0-0.825-0.306-1.487-0.915-1.982c-0.609-0.495-1.387-0.744-2.332-0.744 c-0.993,0-1.778,0.245-2.358,0.735c-0.581,0.491-0.87,1.154-0.87,1.991c0,0.849,0.296,1.515,0.888,2 C28.547,21.714,29.327,21.957,30.295,21.957z" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M30.295,21.344c0.98,0,1.767-0.242,2.359-0.727s0.888-1.15,0.888-2 c0-0.825-0.306-1.486-0.915-1.982c-0.609-0.495-1.387-0.744-2.332-0.744c-0.993,0-1.778,0.245-2.358,0.735 c-0.581,0.49-0.87,1.154-0.87,1.991c0,0.849,0.296,1.515,0.888,2C28.547,21.102,29.327,21.344,30.295,21.344z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="30" x2="30" y1="8.77" y2="51.63">
-<stop offset="0" stop-color="#E5FFB2"/>
-<stop offset="0.39" stop-color="#6AAB18"/>
-<stop offset="0.68" stop-color="#247307"/>
-<stop offset="1" stop-color="#C2FF4A"/>
+<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>
-<circle cx="29.998" cy="29.998" fill="url(#SVGID_1)" r="21.427"/>
-<radialGradient cx="30.2" cy="11.02" gradientUnits="userSpaceOnUse" id="SVGID_2" r="39.38">
-<stop offset="0" stop-color="#AFED23"/>
-<stop offset="0.81" stop-color="#358C0C"/>
-<stop offset="1" stop-color="#67AD1A"/>
-</radialGradient>
-<path d="M29.998,50.813c-11.478,0-20.815-9.337-20.815-20.814S18.521,9.183,29.998,9.183 c11.479,0,20.814,9.337,20.814,20.815S41.475,50.813,29.998,50.813L29.998,50.813z" fill="url(#SVGID_2)"/>
-<polygon fill-opacity="0.1" points="25.252,27.84 27.297,27.84 27.297,45.543 33.251,45.543 33.251,24.451 25.252,24.451 " stroke-opacity="0.1"/>
-<polygon fill-opacity="0.2" points="25.252,27.228 27.297,27.228 27.297,44.932 33.251,44.932 33.251,23.838 25.252,23.838 " stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="29.25" x2="29.25" y1="15.88" y2="44.66">
-<stop offset="0" stop-color="#F6FDFF"/>
-<stop offset="1" stop-color="#ADB3B5"/>
+<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>
-<polygon fill="url(#SVGID_3)" points="25.252,26.616 27.297,26.616 27.297,44.318 33.251,44.318 33.251,23.226 25.252,23.226 "/>
-<path d="M30.274,21.038c0.981,0,1.767-0.242,2.359-0.727s0.888-1.15,0.888-2 c0-0.825-0.306-1.486-0.915-1.982c-0.609-0.495-1.387-0.744-2.332-0.744c-0.992,0-1.778,0.245-2.357,0.735 c-0.581,0.49-0.871,1.154-0.871,1.991c0,0.849,0.296,1.515,0.888,2C28.525,20.796,29.305,21.038,30.274,21.038z" fill="url(#SVGID_3)"/>
+<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 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_presentation_player.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,128 +1,127 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<linearGradient gradientTransform="matrix(0.6122 0 0 -0.6122 -280.8977 -334.1658)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="507.834" x2="507.834" y1="-624.1836" y2="-566.7012">
+<rect fill="none" height="60" width="60"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="51.4814" y2="10.7829">
 <stop offset="0" style="stop-color:#EBEBEB"/>
 <stop offset="1" style="stop-color:#CCCCCC"/>
 </linearGradient>
-<rect height="35.668" style="fill:url(#SVGID_1_);" width="44.238" x="7.879" y="12.391"/>
-<linearGradient gradientTransform="matrix(0.6122 0 0 -0.6122 -280.8977 -334.1658)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="507.833" x2="507.833" y1="-622.9033" y2="-567.6532">
+<rect fill="url(#SVGID_1_)" height="41.251" width="51.16" x="4.42" y="10.346"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="50.5747" y2="11.4563">
 <stop offset="0" style="stop-color:#B3B3B3"/>
 <stop offset="1" style="stop-color:#808080"/>
 </linearGradient>
-<rect height="33.277" style="fill:url(#SVGID_2_);" width="40.052" x="9.972" y="13.586"/>
-<linearGradient gradientTransform="matrix(0.6122 0 0 -0.6122 -280.8977 -334.1658)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="507.834" x2="507.834" y1="-567.4033" y2="-621.909">
+<rect fill="url(#SVGID_2_)" height="38.485" width="46.32" x="6.84" y="11.729"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30" x2="30" y1="11.2798" y2="49.8705">
 <stop offset="0" style="stop-color:#F5F5F5"/>
 <stop offset="1" style="stop-color:#CCCCCC"/>
 </linearGradient>
-<rect height="32.081" style="fill:url(#SVGID_3_);" width="38.857" x="10.57" y="14.185"/>
-<linearGradient gradientTransform="matrix(0.6122 0 0 -0.6122 -280.8977 -334.1658)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="507.833" x2="507.833" y1="-619.9531" y2="-570.1484">
+<rect fill="url(#SVGID_3_)" height="37.103" width="44.938" x="7.531" y="12.42"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="30" x2="30" y1="48.4854" y2="13.2231">
 <stop offset="0" style="stop-color:#F5F5F5"/>
 <stop offset="1" style="stop-color:#CCCCCC"/>
 </linearGradient>
-<rect height="30.886" style="fill:url(#SVGID_4_);" width="37.661" x="11.167" y="14.782"/>
-<rect height="2.69" style="opacity:0.1;enable-background:new    ;" width="44.238" x="7.879" y="12.391"/>
-<rect height="1.494" style="opacity:0.2;enable-background:new    ;" width="44.238" x="7.879" y="12.391"/>
-<linearGradient gradientTransform="matrix(0.6122 0 0 -0.6122 -280.8977 -334.1658)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="507.833" x2="507.833" y1="-559.5703" y2="-566.5728">
+<rect fill="url(#SVGID_4_)" height="35.72" width="43.555" x="8.223" y="13.111"/>
+<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"/>
 </linearGradient>
-<rect height="4.213" style="fill:url(#SVGID_5_);" width="48.422" x="5.787" y="8.477"/>
-<linearGradient gradientTransform="matrix(0.6122 0 0 -0.6122 -280.8977 -334.1658)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="545.8809" x2="545.8809" y1="-559.5703" y2="-566.5728">
+<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">
 <stop offset="0" style="stop-color:#292929"/>
 <stop offset="0.3455" style="stop-color:#8C8C8C"/>
 <stop offset="0.7" style="stop-color:#171717"/>
 <stop offset="1" style="stop-color:#646464"/>
 </linearGradient>
-<rect height="4.213" style="fill:url(#SVGID_6_);" width="1.837" x="52.372" y="8.477"/>
-<linearGradient gradientTransform="matrix(0.6122 0 0 -0.6122 -280.8977 -334.1658)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="469.7852" x2="469.7852" y1="-559.5703" y2="-566.5728">
+<rect fill="url(#SVGID_6_)" height="4.873" width="2.125" x="55.875" y="5.818"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="3.0615" x2="3.0615" y1="5.7334" y2="10.6915">
 <stop offset="0" style="stop-color:#292929"/>
 <stop offset="0.3455" style="stop-color:#8C8C8C"/>
 <stop offset="0.7" style="stop-color:#171717"/>
 <stop offset="1" style="stop-color:#646464"/>
 </linearGradient>
-<rect height="4.213" style="fill:url(#SVGID_7_);" width="1.836" x="5.787" y="8.477"/>
-<linearGradient gradientTransform="matrix(0.6122 0 0 -0.6122 -280.8977 -334.1658)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="507.833" x2="507.833" y1="-627.9028" y2="-623.9033">
+<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"/>
 </linearGradient>
-<rect height="2.318" style="fill:url(#SVGID_8_);" width="47.196" x="6.399" y="47.975"/>
-<linearGradient gradientTransform="matrix(0.6122 0 0 -0.6122 -280.8977 -334.1658)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="545.3809" x2="545.3809" y1="-627.9028" y2="-623.9033">
+<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">
 <stop offset="0" style="stop-color:#292929"/>
 <stop offset="0.3455" style="stop-color:#8C8C8C"/>
 <stop offset="0.7" style="stop-color:#171717"/>
 <stop offset="1" style="stop-color:#646464"/>
 </linearGradient>
-<rect height="2.318" style="fill:url(#SVGID_9_);" width="1.224" x="52.372" y="47.975"/>
-<linearGradient gradientTransform="matrix(0.6122 0 0 -0.6122 -280.8977 -334.1658)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="470.2861" x2="470.2861" y1="-627.9028" y2="-623.9033">
+<rect fill="url(#SVGID_9_)" height="2.683" width="1.416" x="55.875" y="51.498"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="3.415" x2="3.415" y1="54.1147" y2="51.2821">
 <stop offset="0" style="stop-color:#292929"/>
 <stop offset="0.3455" style="stop-color:#8C8C8C"/>
 <stop offset="0.7" style="stop-color:#171717"/>
 <stop offset="1" style="stop-color:#646464"/>
 </linearGradient>
-<rect height="2.318" style="fill:url(#SVGID_10_);" width="1.224" x="6.399" y="47.975"/>
-<rect height="25.108" style="fill:url(#SVGID_11_);" width="5.381" x="40.707" y="17.372"/>
-<rect height="18.532" style="fill:url(#SVGID_12_);" width="5.38" x="31.741" y="23.947"/>
-<rect height="21.52" style="opacity:0.25;enable-background:new    ;" width="5.38" x="23.372" y="21.557"/>
-<linearGradient gradientTransform="matrix(0.6122 0 0 -0.6122 -280.8977 -334.1658)" gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="500.4268" x2="500.4268" y1="-579.9819" y2="-614.9882">
+<rect fill="url(#SVGID_10_)" height="2.683" width="1.416" x="2.707" y="51.498"/>
+<rect fill="url(#SVGID_11_)" height="29.037" width="6.221" x="42.387" y="16.105"/>
+<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"/>
 </linearGradient>
-<rect height="21.52" style="fill:url(#SVGID_13_);" width="5.38" x="22.774" y="20.958"/>
-<rect height="6.575" style="opacity:0.25;enable-background:new    ;" width="5.38" x="14.404" y="36.501"/>
-<linearGradient gradientTransform="matrix(0.6122 0 0 -0.6122 -280.8977 -334.1658)" gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="485.7803" x2="485.7803" y1="-604.4912" y2="-615.5575">
+<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"/>
 </linearGradient>
-<rect height="6.575" style="fill:url(#SVGID_14_);" width="5.379" x="13.808" y="35.903"/>
-<rect height="25.108" style="opacity:0.25;enable-background:new    ;" width="5.38" x="41.306" y="17.97"/>
-<rect height="25.108" style="fill:url(#SVGID_11_);" width="5.381" x="40.707" y="17.372"/>
-<rect height="18.533" style="opacity:0.25;enable-background:new    ;" width="5.381" x="32.338" y="24.545"/>
-<rect height="18.532" style="fill:url(#SVGID_12_);" width="5.38" x="31.741" y="23.947"/>
-<rect height="0.998" style="opacity:0.5;fill:#FFFFFF;enable-background:new    ;" width="5.381" x="40.707" y="17.372"/>
-<rect height="0.998" style="opacity:0.5;fill:#FFFFFF;enable-background:new    ;" width="5.38" x="31.741" y="23.947"/>
-<rect height="0.998" style="opacity:0.5;fill:#FFFFFF;enable-background:new    ;" width="5.38" x="22.774" y="20.958"/>
-<rect height="0.997" style="opacity:0.5;fill:#FFFFFF;enable-background:new    ;" width="5.379" x="13.808" y="35.903"/>
-<rect height="59.996" style="fill:none;" width="59.996"/>
+<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"/>
+<rect fill="url(#SVGID_11_)" height="29.037" width="6.221" x="42.387" y="16.105"/>
+<rect fill-opacity="0.25" height="21.432" stroke-opacity="0.25" width="6.223" x="32.707" y="24.402"/>
+<rect fill="url(#SVGID_12_)" height="21.432" width="6.223" x="32.016" y="23.711"/>
+<rect fill="#FFFFFF" fill-opacity="0.5" height="1.153" stroke-opacity="0.5" width="6.221" x="42.387" y="16.105"/>
+<rect fill="#FFFFFF" fill-opacity="0.5" height="1.153" stroke-opacity="0.5" width="6.223" x="32.016" y="23.711"/>
+<rect fill="#FFFFFF" fill-opacity="0.5" height="1.153" stroke-opacity="0.5" width="6.223" x="21.645" y="20.254"/>
+<rect fill="#FFFFFF" fill-opacity="0.5" height="1.153" stroke-opacity="0.5" width="6.221" x="11.275" y="37.538"/>
+<rect fill="none" height="60" width="60"/>
 <defs>
-<linearGradient gradientTransform="matrix(0.6122 0 0 -0.6122 -280.8977 -334.1658)" gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="529.7207" x2="529.7207" y1="-573.4609" y2="-614.4736">
+<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"/>
 </linearGradient>
 </defs>
 <defs>
-<linearGradient gradientTransform="matrix(0.6122 0 0 -0.6122 -280.8977 -334.1658)" gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="515.0742" x2="515.0742" y1="-585.1631" y2="-616.3423">
+<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"/>
 </linearGradient>
 </defs>
 </g>
-<g transform="matrix(0.5 0 0 0.5 30 30)">
-<rect fill="none" height="60" width="60"/>
-<rect fill="none" height="59.996" width="59.996"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="30" x2="30" y1="8.47" y2="51.32">
-<stop offset="0" stop-color="#F2F2F2"/>
-<stop offset="0.12" stop-color="#F2F2F2"/>
-<stop offset="0.55" stop-color="#ADB2B5"/>
-<stop offset="1" stop-color="#E6E9E8"/>
+<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="M29.998,51.425c-11.816,0-21.427-9.61-21.427-21.427c0-11.814,9.611-21.427,21.427-21.427 c11.813,0,21.427,9.613,21.427,21.427C51.425,41.814,41.812,51.425,29.998,51.425L29.998,51.425z" fill="url(#SVGID_1)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="30" x2="30" y1="9.18" y2="51.73">
-<stop offset="0" stop-color="#DDE3E6"/>
-<stop offset="0.48" stop-color="#C9CED1"/>
-<stop offset="1" stop-color="#899396"/>
+<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="M50.813,29.998c0,11.498-9.322,20.814-20.814,20.814c-11.499,0-20.815-9.316-20.815-20.814 c0-11.493,9.317-20.815,20.815-20.815C41.491,9.183,50.813,18.505,50.813,29.998z" fill="url(#SVGID_2)"/>
-<polygon fill="#6D6E70" points="22.886,17.958 41.74,28.789 22.886,39.837 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="32.38" x2="32.38" y1="39.27" y2="19.91">
-<stop offset="0" stop-color="#FFFFFF"/>
-<stop offset="1" stop-color="#F5F6F6"/>
+<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="24.046,19.963 40.724,29.593 24.046,39.221 "/>
+<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>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_profiles.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_profiles.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_profiles.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,96 +1,99 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<linearGradient gradientTransform="matrix(0.6122 0 0 -0.6122 -280.8977 -334.1658)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="491.833" x2="491.833" y1="-561.7188" y2="-600.2201">
+<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"/>
 </linearGradient>
-<path d="M11.326,27.243H29.08V9.489C19.273,9.489,11.326,17.438,11.326,27.243z" style="fill:url(#SVGID_1_);"/>
-<linearGradient gradientTransform="matrix(0.6122 0 0 -0.6122 -280.8977 -334.1658)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="491.8672" x2="491.8672" y1="-563.0117" y2="-624.3455">
+<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"/>
 </linearGradient>
-<path d="M11.979,26.631c0.603-8.815,7.672-15.884,16.488-16.488v16.488H11.979z" style="fill:url(#SVGID_2_);"/>
-<linearGradient gradientTransform="matrix(0.6122 0 0 -0.6122 -280.8977 -334.1658)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="489.833" x2="489.833" y1="-597.1865" y2="-628.6572">
+<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"/>
 </linearGradient>
-<path d="M27.893,50.506c-10.148,0-18.403-8.255-18.403-18.402v-0.575h18.978v18.978H27.893z" style="fill:url(#SVGID_3_);"/>
-<linearGradient gradientTransform="matrix(0.6122 0 0 -0.6122 -280.8977 -334.1658)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="489.8398" x2="489.8398" y1="-598.1973" y2="-627.6213">
+<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"/>
 </linearGradient>
-<path d="M27.855,49.884c-9.642-0.316-17.427-8.101-17.744-17.743h17.744V49.884z" style="fill:url(#SVGID_4_);"/>
-<linearGradient gradientTransform="matrix(0.6122 0 0 -0.6122 -280.8977 -334.1658)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="526.832" x2="526.832" y1="-561.7188" y2="-600.2201">
+<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"/>
 </linearGradient>
-<path d="M32.753,9.489v17.753h17.753C50.506,17.438,42.558,9.489,32.753,9.489z" style="fill:url(#SVGID_5_);"/>
-<linearGradient gradientTransform="matrix(0.6122 0 0 -0.6122 -280.8977 -334.1658)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="526.7988" x2="526.7988" y1="-563.0117" y2="-624.3455">
+<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"/>
 </linearGradient>
-<path d="M33.365,26.631V10.143c8.814,0.604,15.883,7.672,16.487,16.488H33.365z" style="fill:url(#SVGID_6_);"/>
-<linearGradient gradientTransform="matrix(0.6122 0 0 -0.6122 -280.8977 -334.1658)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="526.832" x2="526.832" y1="-596.5005" y2="-625.0408">
+<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"/>
 </linearGradient>
-<path d="M32.753,48.67c9.805,0,17.753-7.948,17.753-17.754H32.753V48.67z" style="fill:url(#SVGID_7_);"/>
-<linearGradient gradientTransform="matrix(0.6122 0 0 -0.6122 -280.8977 -334.1658)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="526.7988" x2="526.7988" y1="-563.0137" y2="-624.3464">
+<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"/>
 </linearGradient>
-<path d="M33.365,31.528h16.487c-0.604,8.815-7.673,15.884-16.487,16.487V31.528z" style="fill:url(#SVGID_8_);"/>
-<linearGradient gradientTransform="matrix(0.6122 0 0 -0.6122 -280.8977 -334.1658)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="491.832" x2="491.832" y1="-561.0947" y2="-610.2247">
+<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"/>
 </linearGradient>
-<path d="M29.08,9.5v17.743H11.335C11.652,17.601,19.438,9.816,29.08,9.5 M29.692,8.877  c-10.481,0-18.979,8.497-18.979,18.978h18.979V8.877L29.692,8.877z" style="fill:url(#SVGID_9_);"/>
-<linearGradient gradientTransform="matrix(0.6122 0 0 -0.6122 -280.8977 -334.1658)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="489.833" x2="489.833" y1="-596.1782" y2="-629.1787">
+<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"/>
 </linearGradient>
-<path d="M28.467,31.528v18.978c-10.465,0-18.978-8.513-18.978-18.978H28.467 M29.08,30.916H8.877  v0.612c0,10.802,8.788,19.591,19.59,19.591h0.612V30.916L29.08,30.916z" style="fill:url(#SVGID_10_);"/>
-<linearGradient gradientTransform="matrix(0.6122 0 0 -0.6122 -280.8977 -334.1658)" gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="526.833" x2="526.833" y1="-561.0947" y2="-610.2247">
+<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"/>
 </linearGradient>
-<path d="M32.753,9.5c9.642,0.316,17.427,8.101,17.743,17.743H32.753V9.5 M32.141,8.877v18.978h18.979  C51.119,17.374,42.622,8.877,32.141,8.877L32.141,8.877z" style="fill:url(#SVGID_11_);"/>
-<linearGradient gradientTransform="matrix(0.6122 0 0 -0.6122 -280.8977 -334.1658)" gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="526.833" x2="526.833" y1="-595.0107" y2="-626.533">
+<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"/>
 </linearGradient>
-<path d="M50.496,30.916c-0.316,9.643-8.102,17.427-17.743,17.744V30.916H50.496 M51.119,30.304  H32.141v18.979C42.622,49.282,51.119,40.785,51.119,30.304L51.119,30.304z" style="fill:url(#SVGID_12_);"/>
-<rect height="59.996" style="fill:none;" width="59.996"/>
+<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"/>
 </g>
-<g transform="matrix(0.5 0 0 0.5 30 30)">
-<linearGradient gradientTransform="matrix(0.6122 0 0 -0.6122 -280.8977 -334.1658)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="504.7793" x2="504.7793" y1="-565.9258" y2="-629.5759">
+<g transform="matrix(1 0 0 1 30 30)">
+<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="M48.631,13.079l-3.08-7.497L27.85,13.46l0.028,23.917c-2.712-1.771-6.708-2.354-10.768-1.254  c-6.405,1.725-10.542,6.951-9.247,11.665c1.3,4.718,7.543,7.142,13.944,5.415c5.412-1.461,9.159-5.324,9.138-9.451  c-0.018-4.129,0.033-15.338,0-23.445L48.631,13.079z" style="fill:url(#SVGID_1__);"/>
-<linearGradient gradientTransform="matrix(0.3061 0 0 0.3061 -405.6334 -533.8956)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="1416.1973" x2="1416.1973" y1="1773.6455" y2="1805.4539">
+<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 points="27.878,33.26 27.857,13.46 27.85,13.46 27.872,33.258 " style="fill:url(#SVGID_2__);"/>
-<linearGradient gradientTransform="matrix(0.3061 0 0 0.3061 -405.6334 -533.8956)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="1455.1514" x2="1455.1514" y1="1773.6406" y2="1805.4514">
+<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="M30.945,19.08c0.007,1.306,0.01-0.201,0.012,1.223l17.674-7.225l-0.436-1.108L30.945,19.08z" style="fill:url(#SVGID_3__);"/>
-<linearGradient gradientTransform="matrix(0.3061 -0.0016 0.0016 0.3061 -407.624 -533.0549)" gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="1442.0078" x2="1442.0078" y1="1788.7646" y2="1868.2584">
+<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 points="28.142,38.062 28.142,14.143 45.891,6.413 45.551,5.582 27.454,13.46 27.454,37.378   " style="fill:url(#SVGID_4__);"/>
-<linearGradient gradientTransform="matrix(0.6122 0 0 -0.6122 -280.8977 -334.1658)" gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="490.3359" x2="490.3359" y1="-607.7705" y2="-630.9368">
+<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="M17.625,52.389c-4.258,0.021-7.653-1.941-8.447-4.885c-0.484-1.785,0.028-3.761,1.444-5.555  c1.55-1.964,3.944-3.454,6.747-4.191c1.187-0.317,2.386-0.477,3.573-0.484c4.258-0.021,7.651,1.943,8.45,4.885  c1.058,3.9-2.618,8.272-8.196,9.748C20.012,52.221,18.808,52.381,17.625,52.389L17.625,52.389z" style="fill:url(#SVGID_5__);"/>
-<rect height="59.996" style="fill:none;" width="59.996"/>
+<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 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_query.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_query.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_query.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,19 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<rect height="59.996" style="fill:none;" width="59.996"/>
-<path d="M19.202,17.185v-5.032c3.047-0.702,5.935-1.053,8.674-1.053c4.04,0,7.138,0.782,9.295,2.35  c2.155,1.564,3.234,3.863,3.234,6.894c0,1.763-0.415,3.254-1.245,4.479c-0.831,1.223-6.561,6.977-7.125,7.765  c-0.565,0.787-0.847,1.72-0.847,2.799v1.079h-8.036v-1.438c0-1.747,0.382-3.222,1.143-4.429c0.762-1.207,2.093-2.7,3.992-4.48  c1.489-1.386,3.338-4.604,3.338-5.29c0-3.096-1.867-4.645-5.598-4.645C23.922,16.184,21.649,16.517,19.202,17.185z M27.131,50.2  c-1.352,0-2.516-0.479-3.491-1.438c-0.975-0.958-1.462-2.131-1.462-3.518c0-1.369,0.485-2.542,1.45-3.516  c0.967-0.978,2.134-1.465,3.503-1.465c1.37,0,2.542,0.487,3.518,1.465c0.976,0.974,1.463,2.146,1.463,3.516  c0,1.387-0.487,2.56-1.463,3.518C29.674,49.721,28.501,50.2,27.131,50.2z" style="fill:url(#SVGID_1_);"/>
-<path d="M37.171,14.118c2.091,1.518,3.159,3.73,3.224,6.628c0.004-0.134,0.011-0.267,0.011-0.403  c0-3.031-1.079-5.329-3.234-6.894c-2.157-1.567-5.256-2.35-9.295-2.35c-2.739,0-5.627,0.351-8.674,1.053v0.667  c3.047-0.702,5.935-1.053,8.674-1.053C31.915,11.769,35.014,12.55,37.171,14.118z" style="fill:#FFFFFF;"/>
-<path d="M31.605,20.979c-0.2,0.913-1.918,3.836-3.318,5.14c-1.899,1.78-3.23,3.274-3.992,4.479  c-0.761,1.208-1.143,2.683-1.143,4.43v0.667c0-1.746,0.382-3.222,1.143-4.429c0.762-1.206,2.093-2.7,3.992-4.479  c1.489-1.386,3.338-4.604,3.338-5.29C31.625,21.319,31.617,21.146,31.605,20.979z" style="fill:#FFFFFF;"/>
-<path d="M27.131,40.264c-1.369,0-2.537,0.488-3.503,1.465c-0.965,0.975-1.45,2.146-1.45,3.517  c0,0.114,0.008,0.224,0.015,0.335c0.074-1.227,0.55-2.289,1.436-3.184c0.967-0.976,2.134-1.465,3.503-1.465  c1.37,0,2.542,0.489,3.518,1.465c0.896,0.895,1.374,1.957,1.448,3.186c0.006-0.112,0.014-0.223,0.014-0.337  c0-1.37-0.486-2.542-1.463-3.517C29.674,40.751,28.501,40.264,27.131,40.264z" style="fill:#FFFFFF;"/>
-<path d="M40.405,20.343c0-3.031-1.079-5.329-3.234-6.894  c-2.157-1.567-5.256-2.35-9.295-2.35c-2.739,0-5.627,0.351-8.674,1.053v5.032c2.448-0.668,4.721-1.002,6.825-1.002  c3.731,0,5.598,1.549,5.598,4.645c0,0.552-1.207,2.757-2.455,4.316c3.574-0.051,7.045-0.384,10.371-0.973  C40.114,23.081,40.405,21.807,40.405,20.343z" style="opacity:0.2;fill:#FFFFFF;enable-background:new    ;"/>
-<defs>
-<linearGradient gradientTransform="matrix(0.6122 0 0 -0.6122 -280.8977 -334.1658)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="507.5156" x2="507.5156" y1="-562.4116" y2="-630.0721">
-<stop offset="0" style="stop-color:#FF7236"/>
-<stop offset="0.7939" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#E8522A"/>
+<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"/>
+</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"/>
 </linearGradient>
-</defs>
+<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"/>
+</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"/>
+</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"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_question_mark.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_question_mark.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="80px" height="80px" viewBox="0 0 80 80" enable-background="new 0 0 80 80" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="43" y1="6.0918" x2="43" y2="75.1871">
-	<stop  offset="0" style="stop-color:#00B9FF"/>
-	<stop  offset="0.2458" style="stop-color:#00A0EE"/>
-	<stop  offset="0.563" style="stop-color:#0087DC"/>
-	<stop  offset="0.7527" style="stop-color:#007DD5"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" d="M24.194,6.92C29.596,5.641,34.545,5,39.042,5c7.337,0,12.966,1.428,16.884,4.285
-	c3.919,2.857,5.879,7.08,5.879,12.67c0,2.123-0.344,4.066-1.031,5.83s-1.585,3.35-2.692,4.754c-1.108,1.404-3.037,3.451-5.784,6.137
-	c-2.686,2.527-4.473,4.488-5.363,5.877s-1.335,2.975-1.335,4.754v2.014H30.893v-2.668c0-2.623,0.546-5.043,1.639-7.26
-	c1.094-2.219,3.295-4.857,6.604-7.916c2.592-2.404,4.348-4.34,5.269-5.809c0.921-1.467,1.381-3.105,1.381-4.918
-	c0-2.717-0.818-4.809-2.458-6.275s-4.02-2.201-7.143-2.201c-3.247,0-7.244,0.609-11.99,1.826V6.92z M38.292,56.311
-	c2.717,0,4.964,0.875,6.745,2.625c1.779,1.748,2.67,3.98,2.67,6.697s-0.906,4.957-2.717,6.721C43.179,74.117,40.945,75,38.292,75
-	c-2.654,0-4.87-0.883-6.651-2.646c-1.779-1.764-2.669-4.004-2.669-6.721s0.875-4.949,2.622-6.697
-	C33.343,57.186,35.576,56.311,38.292,56.311z"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="43" y1="5.6294" x2="43" y2="67.664">
-	<stop  offset="0" style="stop-color:#8CE0FF"/>
-	<stop  offset="0.1167" style="stop-color:#78D6F9"/>
-	<stop  offset="0.4027" style="stop-color:#4DBFED"/>
-	<stop  offset="0.6262" style="stop-color:#33B0E5"/>
-	<stop  offset="0.7582" style="stop-color:#29ABE2"/>
-</linearGradient>
-<path fill="url(#SVGID_2_)" d="M55.926,9.285C52.008,6.428,46.379,5,39.042,5c-4.497,0-9.446,0.641-14.848,1.92v2.664
-	c5.401-1.281,10.351-1.92,14.848-1.92c7.337,0,12.966,1.428,16.884,4.285c3.611,2.633,5.539,6.443,5.822,11.396
-	c0.032-0.455,0.057-0.918,0.057-1.391C61.805,16.365,59.845,12.143,55.926,9.285z M39.136,36.141
-	c2.592-2.404,4.348-4.34,5.269-5.807c0.921-1.469,1.381-3.107,1.381-4.92c0-0.475-0.033-0.926-0.084-1.363
-	c-0.17,1.305-0.602,2.51-1.297,3.617c-0.921,1.469-2.677,3.404-5.269,5.809c-3.31,3.059-5.511,5.697-6.604,7.916
-	c-1.093,2.217-1.639,4.637-1.639,7.26v2.662c0-2.621,0.546-5.041,1.639-7.258C33.625,41.84,35.826,39.201,39.136,36.141z
-	 M38.292,56.311c-2.716,0-4.949,0.875-6.698,2.625c-1.747,1.748-2.622,3.98-2.622,6.697c0,0.457,0.035,0.896,0.084,1.326
-	c0.247-2.117,1.087-3.908,2.538-5.359c1.749-1.75,3.982-2.623,6.698-2.623c2.717,0,4.964,0.873,6.745,2.623
-	c1.477,1.451,2.332,3.242,2.582,5.359c0.052-0.43,0.088-0.869,0.088-1.326c0-2.717-0.891-4.949-2.67-6.697
-	C43.256,57.186,41.009,56.311,38.292,56.311z"/>
-<path opacity="0.3" fill="#005EC2" d="M43.327,16.475c1.466,1.313,2.271,3.129,2.427,5.439c0.008-0.166,0.031-0.324,0.031-0.496
-	c0-2.717-0.818-4.809-2.458-6.275c-1.64-1.469-4.02-2.201-7.143-2.201c-3.247,0-7.244,0.609-11.99,1.826V16.1
-	c4.746-1.217,8.743-1.826,11.99-1.826C39.308,14.273,41.688,15.008,43.327,16.475z M30.893,51.32h14.706v-1.332H30.893V51.32z
-	 M44.99,71.021c-1.812,1.764-4.045,2.646-6.698,2.646c-2.654,0-4.87-0.883-6.651-2.646c-1.633-1.619-2.506-3.643-2.642-6.061
-	c-0.012,0.221-0.027,0.441-0.027,0.672c0,2.717,0.89,4.957,2.669,6.721C33.422,74.117,35.638,75,38.292,75
-	c2.653,0,4.887-0.883,6.698-2.646c1.811-1.764,2.717-4.004,2.717-6.721c0-0.23-0.017-0.451-0.029-0.672
-	C47.541,67.379,46.651,69.402,44.99,71.021z M61.776,21.318c-0.069,1.85-0.393,3.566-1.003,5.135
-	c-0.688,1.764-1.585,3.35-2.692,4.754c-1.108,1.404-3.037,3.449-5.784,6.135c-2.686,2.529-4.473,4.49-5.363,5.879
-	s-1.335,2.975-1.335,4.754v1.332c0-1.779,0.444-3.365,1.335-4.754s2.678-3.35,5.363-5.877c2.747-2.686,4.676-4.732,5.784-6.137
-	c1.107-1.404,2.005-2.99,2.692-4.754s1.031-3.707,1.031-5.83C61.805,21.736,61.781,21.533,61.776,21.318z"/>
-<rect fill="none" width="80" height="80"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_radio.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_radio.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_radio.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,307 +1,308 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.9995" x2="29.9995" y1="15.4229" y2="47.4519">
+<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"/>
 </linearGradient>
-<path d="M52.041,46.225c0,0.676-0.549,1.225-1.225,1.225H9.184c-0.677,0-1.225-0.549-1.225-1.225V16.837  c0-0.677,0.548-1.225,1.225-1.225h41.633c0.676,0,1.225,0.548,1.225,1.225V46.225z" fill="url(#SVGID_1_)"/>
-<path d="M50.816,15.612H9.184c-0.677,0-1.225,0.548-1.225,1.225v9.49l44.082-4.848v-4.642  C52.041,16.16,51.492,15.612,50.816,15.612z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M50.816,16.225c0.337,0,0.612,0.274,0.612,0.612v29.388c0,0.337-0.275,0.612-0.612,0.612H9.184  c-0.338,0-0.612-0.275-0.612-0.612V16.837c0-0.338,0.274-0.612,0.612-0.612H50.816 M50.816,15.612H9.184  c-0.677,0-1.225,0.548-1.225,1.225v29.388c0,0.676,0.548,1.225,1.225,1.225h41.633c0.676,0,1.225-0.549,1.225-1.225V16.837  C52.041,16.16,51.492,15.612,50.816,15.612L50.816,15.612z" fill="#D83506"/>
-<path d="M50.816,46.837H9.184c-0.677,0-1.225-0.549-1.225-1.225v0.612c0,0.676,0.548,1.225,1.225,1.225h41.633  c0.676,0,1.225-0.549,1.225-1.225v-0.612C52.041,46.288,51.492,46.837,50.816,46.837z" fill="#600909"/>
-<path d="M50.816,15.612H9.184c-0.677,0-1.225,0.548-1.225,1.225v0.612  c0-0.677,0.548-1.225,1.225-1.225h41.633c0.676,0,1.225,0.547,1.225,1.225v-0.612C52.041,16.16,51.492,15.612,50.816,15.612z" fill="#FFFFFF" fill-opacity="0.6" stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="42.5508" x2="42.5508" y1="31.9482" y2="22.7159">
+<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,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"/>
 </linearGradient>
-<circle cx="42.55" cy="27.203" fill="url(#SVGID_2_)" r="5.468"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="42.5508" x2="42.5508" y1="32.9951" y2="28.7968">
+<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"/>
 </linearGradient>
-<path d="M42.551,32.67c-2.955,0-5.354-2.345-5.458-5.272c-0.003,0.066-0.011,0.128-0.011,0.194  c0,3.02,2.448,5.468,5.469,5.468c3.02,0,5.468-2.449,5.468-5.468c0-0.066-0.009-0.128-0.009-0.194  C47.904,30.325,45.504,32.67,42.551,32.67z" fill="url(#SVGID_3_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="42.5508" x2="42.5508" y1="34.0615" y2="19.981">
+<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"/>
 </linearGradient>
-<path d="M42.551,34.285c-3.883,0-7.041-3.158-7.041-7.04c0-3.883,3.158-7.041,7.041-7.041  s7.041,3.158,7.041,7.041C49.592,31.127,46.434,34.285,42.551,34.285L42.551,34.285z M42.551,21.123  c-3.377,0-6.122,2.746-6.122,6.123c0,3.375,2.745,6.122,6.122,6.122c3.376,0,6.123-2.747,6.123-6.122  C48.674,23.868,45.927,21.123,42.551,21.123L42.551,21.123z" fill="url(#SVGID_4_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="42.5508" x2="42.5508" y1="22.4209" y2="32.0317">
+<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">
 <stop offset="0" style="stop-color:#CBCBCB"/>
 <stop offset="1" style="stop-color:#4F4F4F"/>
 </linearGradient>
-<circle cx="42.551" cy="27.227" fill="url(#SVGID_5_)" r="4.805"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="42.5508" x2="42.5508" y1="22.7642" y2="31.689">
+<circle cx="45.943" cy="26.642" fill="url(#SVGID_5_)" r="6.104"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="45.9434" x2="45.9434" y1="20.9736" y2="32.3105">
 <stop offset="0" style="stop-color:#FFFFFF"/>
 <stop offset="0.2848" style="stop-color:#FFFFFF"/>
 <stop offset="0.7212" style="stop-color:#7B7B7B"/>
 <stop offset="1" style="stop-color:#A7A7A7"/>
 </linearGradient>
-<circle cx="42.551" cy="27.227" fill="url(#SVGID_6_)" r="4.462"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="42.5508" x2="42.5508" y1="23.1587" y2="31.3975">
+<circle cx="45.943" cy="26.642" fill="url(#SVGID_6_)" r="5.67"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="45.9434" x2="45.9434" y1="21.4746" y2="31.9404">
 <stop offset="0" style="stop-color:#D9D9D9"/>
 <stop offset="0.8242" style="stop-color:#636363"/>
 <stop offset="1" style="stop-color:#636363"/>
 </linearGradient>
-<path d="M46.299,25.514c0.238,0.522,0.371,1.101,0.371,1.712c0,2.273-1.844,4.119-4.119,4.119  c-2.273,0-4.118-1.846-4.118-4.119c0-2.274,1.845-4.119,4.118-4.119C44.215,23.107,45.648,24.095,46.299,25.514z" fill="url(#SVGID_7_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="42.5508" x2="42.5508" y1="26.3252" y2="24.3086">
+<path d="M50.705,24.468c0.303,0.662,0.471,1.396,0.471,2.174c0,2.889-2.342,5.233-5.232,5.233  c-2.888,0-5.232-2.345-5.232-5.233s2.345-5.232,5.232-5.232C48.058,21.409,49.879,22.663,50.705,24.468z" fill="url(#SVGID_7_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="45.9434" x2="45.9434" y1="25.4961" y2="22.9348">
 <stop offset="0" style="stop-color:#636363"/>
 <stop offset="1" style="stop-color:#323232"/>
 </linearGradient>
-<polygon fill="url(#SVGID_8_)" points="41.521,26.248 42.551,24.188 43.58,26.248 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="22.3472" x2="22.3472" y1="30.4082" y2="22.5226">
+<polygon fill="url(#SVGID_8_)" points="44.636,25.397 45.943,22.782 47.251,25.397 "/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="20.2773" x2="20.2773" y1="30.6846" y2="20.667">
 <stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.6667" style="stop-color:#515151"/>
 <stop offset="1" style="stop-color:#323232"/>
 </linearGradient>
-<rect fill="url(#SVGID_9_)" height="8.571" width="22.041" x="11.327" y="22.041"/>
-<rect fill="#D9D9D9" height="0.612" width="22.041" x="11.327" y="30.612"/>
-<polygon fill="#A6A8AB" points="31.531,26.327 31.531,28.163 29.694,28.163 29.694,26.939 29.082,26.939 29.082,28.163   27.245,28.163 27.245,26.939 26.633,26.939 26.633,28.163 24.796,28.163 24.796,26.939 24.184,26.939 24.184,28.163 22.347,28.163   22.347,26.327 21.735,26.327 21.735,28.163 19.898,28.163 19.898,26.939 19.286,26.939 19.286,28.163 17.449,28.163 17.449,26.939   16.837,26.939 16.837,28.163 15,28.163 15,26.939 14.388,26.939 14.388,28.163 13.163,28.163 13.163,26.327 12.551,26.327   12.551,28.775 13.163,28.775 14.388,28.775 15,28.775 16.837,28.775 17.449,28.775 19.286,28.775 19.898,28.775 21.735,28.775   22.347,28.775 24.184,28.775 24.796,28.775 26.633,28.775 27.245,28.775 29.082,28.775 29.694,28.775 31.531,28.775 32.143,28.775   32.143,28.163 32.143,26.327 "/>
-<rect fill="#E00000" height="8.571" width="1.224" x="22.366" y="22.041"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="13.5698" x2="13.5698" y1="37.9336" y2="40.3828">
+<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"/>
+<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"/>
 </linearGradient>
-<circle cx="13.57" cy="39.184" fill="url(#SVGID_10_)" r="1.225"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="13.5698" x2="13.5698" y1="38.3496" y2="39.9824">
+<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">
 <stop offset="0" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#383838"/>
 </linearGradient>
-<circle cx="13.57" cy="39.184" fill="url(#SVGID_11_)" r="0.817"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="17.1929" x2="17.1929" y1="37.9336" y2="40.3828">
+<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"/>
 </linearGradient>
-<circle cx="17.193" cy="39.184" fill="url(#SVGID_12_)" r="1.224"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="17.1929" x2="17.1929" y1="38.3496" y2="39.9824">
+<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">
 <stop offset="0" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#383838"/>
 </linearGradient>
-<circle cx="17.193" cy="39.184" fill="url(#SVGID_13_)" r="0.817"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="20.8667" x2="20.8667" y1="37.9336" y2="40.3828">
+<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"/>
 </linearGradient>
-<circle cx="20.866" cy="39.184" fill="url(#SVGID_14_)" r="1.224"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="20.8667" x2="20.8667" y1="38.3496" y2="39.9824">
+<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">
 <stop offset="0" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#383838"/>
 </linearGradient>
-<circle cx="20.866" cy="39.184" fill="url(#SVGID_15_)" r="0.817"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="24.54" x2="24.54" y1="37.9336" y2="40.3828">
+<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"/>
 </linearGradient>
-<circle cx="24.54" cy="39.184" fill="url(#SVGID_16_)" r="1.225"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="24.54" x2="24.54" y1="38.3496" y2="39.9824">
+<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">
 <stop offset="0" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#383838"/>
 </linearGradient>
-<circle cx="24.54" cy="39.184" fill="url(#SVGID_17_)" r="0.817"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="28.2134" x2="28.2134" y1="37.9336" y2="40.3828">
+<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"/>
 </linearGradient>
-<circle cx="28.213" cy="39.184" fill="url(#SVGID_18_)" r="1.225"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="28.2134" x2="28.2134" y1="38.3496" y2="39.9824">
+<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">
 <stop offset="0" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#383838"/>
 </linearGradient>
-<circle cx="28.214" cy="39.184" fill="url(#SVGID_19_)" r="0.817"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="31.8867" x2="31.8867" y1="37.9336" y2="40.3828">
+<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"/>
 </linearGradient>
-<circle cx="31.887" cy="39.184" fill="url(#SVGID_20_)" r="1.224"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="31.8867" x2="31.8867" y1="38.3496" y2="39.9824">
+<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">
 <stop offset="0" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#383838"/>
 </linearGradient>
-<circle cx="31.887" cy="39.184" fill="url(#SVGID_21_)" r="0.816"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_22_" x1="13.5698" x2="13.5698" y1="41.6074" y2="44.0566">
+<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"/>
 </linearGradient>
-<circle cx="13.57" cy="42.857" fill="url(#SVGID_22_)" r="1.225"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_23_" x1="13.5698" x2="13.5698" y1="42.0234" y2="43.6563">
+<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">
 <stop offset="0" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#383838"/>
 </linearGradient>
-<circle cx="13.57" cy="42.857" fill="url(#SVGID_23_)" r="0.817"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_24_" x1="17.1929" x2="17.1929" y1="41.6074" y2="44.0566">
+<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"/>
 </linearGradient>
-<circle cx="17.193" cy="42.857" fill="url(#SVGID_24_)" r="1.224"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_25_" x1="17.1929" x2="17.1929" y1="42.0234" y2="43.6563">
+<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">
 <stop offset="0" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#383838"/>
 </linearGradient>
-<circle cx="17.193" cy="42.857" fill="url(#SVGID_25_)" r="0.817"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_26_" x1="20.8667" x2="20.8667" y1="41.6074" y2="44.0566">
+<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"/>
 </linearGradient>
-<circle cx="20.866" cy="42.857" fill="url(#SVGID_26_)" r="1.224"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_27_" x1="20.8667" x2="20.8667" y1="42.0234" y2="43.6563">
+<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">
 <stop offset="0" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#383838"/>
 </linearGradient>
-<circle cx="20.866" cy="42.857" fill="url(#SVGID_27_)" r="0.817"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_28_" x1="24.54" x2="24.54" y1="41.6074" y2="44.0566">
+<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"/>
 </linearGradient>
-<circle cx="24.54" cy="42.857" fill="url(#SVGID_28_)" r="1.225"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_29_" x1="24.54" x2="24.54" y1="42.0234" y2="43.6563">
+<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">
 <stop offset="0" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#383838"/>
 </linearGradient>
-<circle cx="24.54" cy="42.857" fill="url(#SVGID_29_)" r="0.817"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_30_" x1="28.2134" x2="28.2134" y1="41.6074" y2="44.0566">
+<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"/>
 </linearGradient>
-<circle cx="28.213" cy="42.857" fill="url(#SVGID_30_)" r="1.225"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_31_" x1="28.2134" x2="28.2134" y1="42.0234" y2="43.6563">
+<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">
 <stop offset="0" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#383838"/>
 </linearGradient>
-<circle cx="28.214" cy="42.857" fill="url(#SVGID_31_)" r="0.817"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_32_" x1="31.8867" x2="31.8867" y1="41.6074" y2="44.0566">
+<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"/>
 </linearGradient>
-<circle cx="31.887" cy="42.857" fill="url(#SVGID_32_)" r="1.224"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_33_" x1="31.8867" x2="31.8867" y1="42.0234" y2="43.6563">
+<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">
 <stop offset="0" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#383838"/>
 </linearGradient>
-<circle cx="31.887" cy="42.857" fill="url(#SVGID_33_)" r="0.816"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_34_" x1="35.5098" x2="35.5098" y1="37.9336" y2="40.3828">
+<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"/>
 </linearGradient>
-<circle cx="35.51" cy="39.184" fill="url(#SVGID_34_)" r="1.225"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_35_" x1="35.5098" x2="35.5098" y1="38.3496" y2="39.9824">
+<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">
 <stop offset="0" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#383838"/>
 </linearGradient>
-<circle cx="35.51" cy="39.184" fill="url(#SVGID_35_)" r="0.817"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_36_" x1="39.1836" x2="39.1836" y1="37.9336" y2="40.3828">
+<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"/>
 </linearGradient>
-<circle cx="39.184" cy="39.184" fill="url(#SVGID_36_)" r="1.225"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_37_" x1="39.1836" x2="39.1836" y1="38.3496" y2="39.9824">
+<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">
 <stop offset="0" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#383838"/>
 </linearGradient>
-<circle cx="39.184" cy="39.184" fill="url(#SVGID_37_)" r="0.816"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_38_" x1="42.8574" x2="42.8574" y1="37.9336" y2="40.3828">
+<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"/>
 </linearGradient>
-<circle cx="42.857" cy="39.184" fill="url(#SVGID_38_)" r="1.225"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_39_" x1="42.8574" x2="42.8574" y1="38.3496" y2="39.9824">
+<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">
 <stop offset="0" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#383838"/>
 </linearGradient>
-<circle cx="42.857" cy="39.184" fill="url(#SVGID_39_)" r="0.816"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_40_" x1="46.5313" x2="46.5313" y1="37.9336" y2="40.3828">
+<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"/>
 </linearGradient>
-<circle cx="46.531" cy="39.184" fill="url(#SVGID_40_)" r="1.224"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_41_" x1="46.5313" x2="46.5313" y1="38.3496" y2="39.9824">
+<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">
 <stop offset="0" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#383838"/>
 </linearGradient>
-<circle cx="46.531" cy="39.184" fill="url(#SVGID_41_)" r="0.817"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_42_" x1="35.5098" x2="35.5098" y1="41.6074" y2="44.0566">
+<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"/>
 </linearGradient>
-<circle cx="35.51" cy="42.857" fill="url(#SVGID_42_)" r="1.225"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_43_" x1="35.5098" x2="35.5098" y1="42.0234" y2="43.6563">
+<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">
 <stop offset="0" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#383838"/>
 </linearGradient>
-<circle cx="35.51" cy="42.857" fill="url(#SVGID_43_)" r="0.817"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_44_" x1="39.1836" x2="39.1836" y1="41.6074" y2="44.0566">
+<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"/>
 </linearGradient>
-<circle cx="39.184" cy="42.857" fill="url(#SVGID_44_)" r="1.225"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_45_" x1="39.1836" x2="39.1836" y1="42.0234" y2="43.6563">
+<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">
 <stop offset="0" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#383838"/>
 </linearGradient>
-<circle cx="39.184" cy="42.857" fill="url(#SVGID_45_)" r="0.816"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_46_" x1="42.8574" x2="42.8574" y1="41.6074" y2="44.0566">
+<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"/>
 </linearGradient>
-<circle cx="42.857" cy="42.857" fill="url(#SVGID_46_)" r="1.225"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_47_" x1="42.8574" x2="42.8574" y1="42.0234" y2="43.6563">
+<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">
 <stop offset="0" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#383838"/>
 </linearGradient>
-<circle cx="42.857" cy="42.857" fill="url(#SVGID_47_)" r="0.816"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_48_" x1="46.5313" x2="46.5313" y1="41.6074" y2="44.0566">
+<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"/>
 </linearGradient>
-<circle cx="46.531" cy="42.857" fill="url(#SVGID_48_)" r="1.224"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_49_" x1="46.5313" x2="46.5313" y1="42.0234" y2="43.6563">
+<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">
 <stop offset="0" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#383838"/>
 </linearGradient>
-<circle cx="46.531" cy="42.857" fill="url(#SVGID_49_)" r="0.817"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_50_" x1="45.6123" x2="45.6123" y1="15.3745" y2="11.2014">
+<path d="M52.037,46.499c0,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,45.462,52.037,45.926,52.037,46.499z" fill="url(#SVGID_49_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_50_" x1="49.833" x2="49.833" y1="11.5854" y2="6.285">
 <stop offset="0" style="stop-color:#CBCBCB"/>
 <stop offset="0.1576" style="stop-color:#808080"/>
 <stop offset="0.6545" style="stop-color:#E5E5E5"/>
 <stop offset="1" style="stop-color:#4F4F4F"/>
 </linearGradient>
-<rect fill="url(#SVGID_50_)" height="4.286" width="5.51" x="42.857" y="11.327"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_51_" x1="35.8164" x2="35.8164" y1="14.252" y2="11.8675">
+<rect fill="url(#SVGID_50_)" height="5.443" width="6.999" x="46.333" y="6.444"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_51_" x1="37.3877" x2="37.3877" y1="10.1592" y2="7.1295">
 <stop offset="0" style="stop-color:#CBCBCB"/>
 <stop offset="0.1576" style="stop-color:#808080"/>
 <stop offset="0.6545" style="stop-color:#E5E5E5"/>
 <stop offset="1" style="stop-color:#4F4F4F"/>
 </linearGradient>
-<rect fill="url(#SVGID_51_)" height="2.449" width="14.082" x="28.775" y="11.939"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_52_" x1="21.4282" x2="21.4282" y1="13.7075" y2="12.5151">
+<rect fill="url(#SVGID_51_)" height="3.111" width="17.89" x="28.443" y="7.221"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_52_" x1="19.1104" x2="19.1104" y1="9.4683" y2="7.9534">
 <stop offset="0" style="stop-color:#CBCBCB"/>
 <stop offset="0.1576" style="stop-color:#808080"/>
 <stop offset="0.6545" style="stop-color:#E5E5E5"/>
 <stop offset="1" style="stop-color:#4F4F4F"/>
 </linearGradient>
-<rect fill="url(#SVGID_52_)" height="1.225" width="14.694" x="14.082" y="12.551"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_53_" x1="13.1636" x2="13.1636" y1="14.252" y2="11.8675">
+<rect fill="url(#SVGID_52_)" height="1.556" width="18.666" x="9.777" y="7.999"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_53_" x1="8.6104" x2="8.6104" y1="10.1592" y2="7.1295">
 <stop offset="0" style="stop-color:#CBCBCB"/>
 <stop offset="0.1576" style="stop-color:#808080"/>
 <stop offset="0.6545" style="stop-color:#E5E5E5"/>
 <stop offset="1" style="stop-color:#4F4F4F"/>
 </linearGradient>
-<rect fill="url(#SVGID_53_)" height="2.449" width="1.836" x="12.245" y="11.939"/>
-<path d="M45.612,15.306c-1.013,0-1.837-0.825-1.837-1.837c0-1.013,0.824-1.836,1.837-1.836  c1.012,0,1.837,0.824,1.837,1.836C47.449,14.481,46.624,15.306,45.612,15.306L45.612,15.306z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<circle cx="45.612" cy="13.469" fill-opacity="0.2" r="1.53" stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_54_" x1="45.6123" x2="45.6123" y1="12.5771" y2="14.3623">
+<rect fill="url(#SVGID_53_)" height="3.111" width="2.334" x="7.443" y="7.221"/>
+<path d="M49.832,11.498c-1.285,0-2.333-1.047-2.333-2.332c0-1.288,1.048-2.334,2.333-2.334s2.334,1.046,2.334,2.334  C52.166,10.451,51.117,11.498,49.832,11.498L49.832,11.498z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<circle cx="49.833" cy="9.166" fill-opacity="0.2" r="1.944" stroke-opacity="0.2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_54_" x1="49.8311" x2="49.8311" y1="8.0317" y2="10.2999">
 <stop offset="0" style="stop-color:#E5E5E5"/>
 <stop offset="0.7576" style="stop-color:#A7A7A7"/>
 <stop offset="1" style="stop-color:#CBCBCB"/>
 </linearGradient>
-<circle cx="45.612" cy="13.469" fill="url(#SVGID_54_)" r="1.225"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_55_" x1="45.6123" x2="45.6123" y1="12.2832" y2="14.6557">
+<circle cx="49.831" cy="9.166" fill="url(#SVGID_54_)" r="1.556"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_55_" x1="49.8311" x2="49.8311" y1="7.6592" y2="10.6737">
 <stop offset="0" style="stop-color:#FFFFFF"/>
 <stop offset="0.2848" style="stop-color:#FFFFFF"/>
 <stop offset="0.7212" style="stop-color:#7B7B7B"/>
 <stop offset="1" style="stop-color:#A7A7A7"/>
 </linearGradient>
-<path d="M45.612,12.551c0.506,0,0.919,0.412,0.919,0.918c0,0.506-0.413,0.918-0.919,0.918  c-0.507,0-0.919-0.413-0.919-0.918C44.693,12.962,45.105,12.551,45.612,12.551 M45.612,12.245c-0.677,0-1.225,0.547-1.225,1.224  c0,0.676,0.548,1.225,1.225,1.225c0.676,0,1.225-0.549,1.225-1.225C46.837,12.792,46.288,12.245,45.612,12.245L45.612,12.245z" fill="url(#SVGID_55_)"/>
+<path d="M49.832,7.999C50.475,7.999,51,8.521,51,9.166c0,0.643-0.525,1.166-1.168,1.166  s-1.166-0.523-1.166-1.166C48.666,8.521,49.189,7.999,49.832,7.999 M49.832,7.61c-0.859,0-1.557,0.694-1.557,1.556  c0,0.858,0.697,1.556,1.557,1.556c0.857,0,1.555-0.697,1.555-1.556C51.387,8.305,50.689,7.61,49.832,7.61L49.832,7.61z" fill="url(#SVGID_55_)"/>
 <rect fill="none" height="60" width="60"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_realplayer.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_realplayer.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_realplayer.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,18 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<linearGradient gradientTransform="matrix(1 0 0 1 96.52 -718.0195)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-66.5205" x2="-66.5205" y1="738.21" y2="803.1038">
+<rect fill="none" height="60" width="60"/>
+<linearGradient gradientTransform="matrix(1 0 0 1 2188 -2893)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2158.0015" x2="-2158.0015" y1="2911.3418" y2="2988.4666">
 <stop offset="0" style="stop-color:#3686FF"/>
 <stop offset="1" style="stop-color:#051F7D"/>
 </linearGradient>
-<path d="M29.992,12.668c-10.705,0-23.552,4.988-23.552,13.135c0,9.598,18.009,13.66,22.746,13.501  c1.63-0.053,0.67,1.003,0.282,1.654c-1.247,2.1-2.668,4.76-2.993,5.281c-0.31,0.498-0.068,1.375,0.64,1  c0,0,18.407-10.852,22.132-13.553c4.709-3.717,4.303-7.943,4.303-7.943C53.551,17.706,40.699,12.668,29.992,12.668z" fill="url(#SVGID_1_)"/>
-<path d="M33.088,38.646c-1.41,0.826-1.713,0.333-1.362-0.204c0.181-0.27,0.7-1.168,1.294-2.309  c0.335-0.642-0.005-0.723-0.215-0.727c-11.431,0-20.408-4.223-20.408-9.287c0-5.885,9.736-9.27,17.514-9.315v0.003  c7.786,0,17.706,3.374,17.672,9.273c-0.024,4.197-6.236,8.019-6.236,8.019C41.302,34.125,33.088,38.646,33.088,38.646" fill="#FFFFFF"/>
-<linearGradient gradientTransform="matrix(1 0 0 1 96.52 -718.0195)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-65.1899" x2="-65.1899" y1="723.1855" y2="767.8912">
+<path d="M29.989,9.401c-12.723,0-27.991,5.928-27.991,15.61c0,11.406,21.403,16.235,27.033,16.047  c1.939-0.063,0.797,1.191,0.338,1.966c-1.484,2.496-3.174,5.655-3.559,6.277c-0.367,0.592-0.082,1.634,0.76,1.188  c0,0,21.877-12.897,26.304-16.107c5.597-4.42,5.114-9.44,5.114-9.44C57.988,15.388,42.713,9.401,29.989,9.401z" fill="url(#SVGID_1_)"/>
+<path d="M33.668,40.274c-1.676,0.981-2.034,0.396-1.618-0.241c0.214-0.32,0.832-1.389,1.536-2.744  c0.399-0.764-0.004-0.859-0.254-0.866c-13.586,0-24.254-5.016-24.254-11.035c0-6.994,11.57-11.017,20.814-11.07v0.002  c9.253,0,21.043,4.012,21.004,11.021c-0.031,4.989-7.414,9.531-7.414,9.531C43.431,34.902,33.668,40.274,33.668,40.274" fill="#FFFFFF"/>
+<linearGradient gradientTransform="matrix(1 0 0 1 2188 -2893)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2156.4209" x2="-2156.4209" y1="2893.4824" y2="2946.6184">
 <stop offset="0" style="stop-color:#3686FF"/>
 <stop offset="1" style="stop-color:#051F7D"/>
 </linearGradient>
-<path d="M38.562,20.49c-0.514-0.128-1.061-0.173-2.001-0.173c-2.682,0.079-4.383,2.062-4.383,2.062  l0.487-1.783h-5.498L24.099,31.99h5.673l1.285-4.759c0.659-2.397,1.866-3.185,4.27-3.185c0.414,0,0.842,0.029,1.263,0.093  L38.562,20.49z" fill="url(#SVGID_2_)"/>
+<path d="M40.174,18.697c-0.61-0.152-1.26-0.206-2.379-0.206c-3.188,0.093-5.209,2.449-5.209,2.449l0.58-2.12  h-6.534l-3.647,13.545h6.742l1.529-5.656c0.782-2.851,2.217-3.786,5.074-3.786c0.49,0,1,0.034,1.5,0.111L40.174,18.697z" fill="url(#SVGID_2_)"/>
 <rect fill="none" height="60" width="60"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_received_voice_call.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,62 +1,62 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5609 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="423.0967" x2="429.6527" y1="-578.646" y2="-582.908">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.6061" style="stop-color:#154EBD"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
-</linearGradient>
-<path d="M19.081,33.911c2.089-3.597,4.591-6.497,7.281-9.189c2.593-2.591,6.72-5.3,8.562-6.256l9.604-10.282  c-0.845-0.3-3.693-0.464-7.279,0.616c-3.586,1.083-11.736,6.303-16.979,11.547c-5.242,5.246-9.727,12.347-10.581,14.595  c-1.343,3.541-1.221,7.445-0.929,8.581c0,0,0.34,1.034,1.144,2.377C10.248,46.476,19.081,33.911,19.081,33.911z" fill="url(#SVGID_1_)"/>
-<path d="M31.184,20.8c1.488-1.036,2.87-1.882,3.74-2.334L44.271,8.46  c-0.132-0.058-0.209-0.088-0.209-0.088c-0.247-0.088-0.642-0.162-1.124-0.219c-0.793,0.006-1.596,0.093-2.401,0.27  C34.843,9.673,31.019,14.958,31.184,20.8z" fill="#020202" fill-opacity="0.05" stroke-opacity="0.05"/>
-<path d="M31.906,20.306c1.205-0.809,2.291-1.462,3.018-1.84l9.377-10.04  c-0.146-0.063-0.233-0.098-0.233-0.098c-0.231-0.08-0.604-0.152-1.06-0.203c-0.751,0.006-1.51,0.087-2.27,0.253  C35.275,9.576,31.636,14.695,31.906,20.306z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M44.079,8.263c-0.21-0.073-0.55-0.137-0.962-0.186c-0.681,0.006-1.369,0.08-2.06,0.231  c-5.087,1.116-8.426,5.984-7.978,11.233c0.725-0.455,1.363-0.826,1.844-1.076l9.424-10.088C44.178,8.302,44.079,8.263,44.079,8.263z  " fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="43.3906" cy="8.9175" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="18.5073">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.6061" style="stop-color:#154EBD"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+<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"/>
 </radialGradient>
-<path d="M34.924,18.466l0.929,1.55c0,0,15.101-6.784,14.084-8.038c-0.513-0.631-0.577-0.656-1.237-1.263  c-1.985-1.815-4.172-2.531-4.172-2.531c-0.186-0.063-0.481-0.12-0.845-0.161c-0.596,0.004-1.2,0.068-1.806,0.201  c-4.591,1.009-7.57,5.501-6.963,10.257C34.916,18.477,34.921,18.47,34.924,18.466z" fill="url(#SVGID_2_)"/>
-<path d="M17.483,34.106c-0.988-0.14-2.007-0.119-3.027,0.105c-2.418,0.53-4.376,2.066-5.646,4.131  c-0.367,2.35-0.25,4.407-0.05,5.18c0,0,0.34,1.034,1.144,2.377c0.29,0.482,6.54-8.264,8.556-11.107L17.483,34.106z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M18.366,34.136c-0.989-0.14-2.008-0.118-3.029,0.105c-3.313,0.727-5.775,3.332-6.76,6.623  c-0.026,1.025,0.034,1.872,0.127,2.397c0.003,0.013,0.005,0.034,0.01,0.048c0,0,0.34,1.033,1.144,2.379  c0.3,0.498,6.981-8.888,8.75-11.384L18.366,34.136z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="437.4258" cy="-571.231" gradientTransform="matrix(0.2095 0.9787 -0.9682 0.2124 -629.4526 -270.6148)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="14.6198">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.6061" style="stop-color:#154EBD"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
-</radialGradient>
-<path d="M11.202,47.738c0.616,0.74,0.646,0.954,1.295,1.524c1.194,1.055,9.301-13.612,9.301-13.612  l-2.683-1.719c-0.941-0.111-1.914-0.079-2.89,0.136c-4.777,1.048-7.806,5.868-6.87,10.832C9.749,45.686,10.349,46.71,11.202,47.738z  " fill="url(#SVGID_3_)"/>
-<path d="M49.937,11.978c-0.179-0.22-0.381-0.446-0.578-0.67l-13.944,7.959l0.438,0.749  C35.853,20.016,50.953,13.231,49.937,11.978z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="422.2881" x2="427.4786" y1="-610.9287" y2="-594.4409">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.8121" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M35.853,20.016l1.178,1.981c0.302,0.515,0.972,0.674,1.569,0.422l4.09-2.334l8.043-4.668  c0.632-0.363,0.878-1.119,0.549-1.686c0,0-0.333-0.501-1.349-1.751L35.853,20.016z" fill="url(#SVGID_4_)"/>
-<path d="M21.798,35.65l-0.725-0.472l-9.215,13.486c0.216,0.204,0.43,0.414,0.639,0.598  C13.691,50.317,21.798,35.65,21.798,35.65z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="439.6982" x2="451.5232" y1="-577.7549" y2="-564.7323">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.8121" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+<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"/>
 </linearGradient>
-<path d="M12.498,49.262c1.193,1.05,1.686,1.37,1.686,1.37c0.567,0.367,1.363,0.169,1.781-0.442l7.9-11.605  c0.419-0.614,0.307-1.411-0.26-1.777l-1.808-1.156L12.498,49.262z" fill="url(#SVGID_5_)"/>
+<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"/>
+</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"/>
+</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(0.5 0 0 0.5 0 0)">
-<linearGradient gradientTransform="matrix(2 2.000000e-004 2.000000e-004 -2 -296.7427 -320.1567)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="163.4102" x2="163.4102" y1="-163.2197" y2="-186.3052">
+<g>
+<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"/>
 </linearGradient>
-<polygon points="9.296,31.454 29.884,52.941 50.794,31.428 39.525,31.424 39.518,6.834 20.332,6.832   20.332,31.452 " style="fill:url(#SVGID_1__);"/>
-<line style="fill:none;" x1="39.518" x2="20.332" y1="6.842" y2="6.84"/>
-<polygon points="20.332,6.34 39.52,6.342 39.518,7.342 20.332,7.34 " style="fill:#E7FFB9;"/>
-<polygon points="39.225,31.464 51.01,31.466 50.118,32.466 39.225,32.466 " style="fill:#E7FFB9;"/>
-<polygon points="8.642,31.452 20.314,31.452 20.314,32.452 9.696,32.452 " style="fill:#E7FFB9;"/>
-<linearGradient gradientTransform="matrix(2 2.000000e-004 2.000000e-004 -2 -296.7427 -320.1567)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="172.5811" x2="153.7493" y1="-181.3276" y2="-181.3276">
+<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 "/>
+<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"/>
 </linearGradient>
-<polygon points="50.145,31.426 29.884,52.225 9.85,31.4 8.458,31.402 29.882,53.66 51.542,31.426 " style="fill:url(#SVGID_2__);"/>
-<rect height="60" style="fill:none;" width="60"/>
+<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>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_reset.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_reset.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_reset.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,109 +1,105 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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:#A6A8AB"/>
-<stop offset="1" style="stop-color:#231F20"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="0.3882" y2="59.65">
+<stop offset="0" stop-color="#A6A8AB"/>
+<stop offset="1" stop-color="#231F20"/>
 </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:#A9AAAD"/>
-<stop offset="1" style="stop-color:#000000"/>
+<path d="M0,60v-59.69h60v59.69h-60zm50.25-5.68l-20.25-20.15-20.25,20.15h40.49zm4.04-4.02v-40.29l-20.25,20.14,20.25,20.15zm-48.58,0l20.25-20.15-20.25-20.14v40.29zm24.29-24.17l20.25-20.14h-40.5l20.25,20.14z" fill="url(#SVGID_1_)" fill-opacity="0.2" stroke-opacity="0.2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="1.097" y2="58.95">
+<stop offset="0" stop-color="#A9AAAD"/>
+<stop offset="1" 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:#F4FCFF"/>
-<stop offset="0.6242" style="stop-color:#C9CED1"/>
-<stop offset="1" style="stop-color:#9CA4A7"/>
+<path d="M0.714,59.29v-58.27h58.57v58.27m-7.32-4.26l-21.97-21.86-21.97,21.86h43.94zm3.03-3.02v-43.72l-21.97,21.86,21.97,21.86zm-50,0l21.97-21.86-21.97-21.86v43.72zm25-24.87l21.97-21.86h-43.94l21.97,21.86z" fill="url(#SVGID_2_)" fill-opacity="0.4" stroke-opacity="0.4"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30" x2="30" y1="1.095" y2="57.53">
+<stop offset="0" stop-color="#F4FCFF"/>
+<stop offset="0.6242" stop-color="#C9CED1"/>
+<stop offset="1" stop-color="#9CA4A7"/>
 </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:#A6A8AB"/>
-<stop offset="1" style="stop-color:#231F20"/>
+<path d="M1.428,1.017v56.85h57.14v-56.85h-57.14zm26.55,28.42l-23.7,23.58v-47.15l23.7,23.57zm-21.68-25.58h47.39l-23.7,23.57-23.7-23.57zm23.7,27.59l23.7,23.57h-47.4l23.7-23.57zm2.02-2.01l23.7-23.57v47.15l-23.7-23.58z" fill="url(#SVGID_3_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="30" x2="30" y1="4.57" y2="53.6">
+<stop offset="0" stop-color="#A6A8AB"/>
+<stop offset="1" stop-color="#231F20"/>
 </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:#A9AAAD"/>
-<stop offset="1" style="stop-color:#000000"/>
+<path d="M20,53.6c-1.924,0-3.583-1.555-3.698-3.462l-1.13-17.86h-0.17c-1.576,0-2.856-1.276-2.856-2.843v-4.264c0-1.567,1.281-2.842,2.856-2.842h12.5v-3.604c-0.361,0.029-0.728,0.043-1.099,0.043-2.795,0-5.822-0.82-8.524-2.312-4.18-2.304-7.19-6.002-7.856-9.653l-0.214-1.197,1.147-0.402c1.227-0.43,2.592-0.647,4.056-0.647,2.797,0,5.831,0.823,8.541,2.317,2.809,1.548,5.054,3.648,6.45,6.008,1.396-2.36,3.642-4.461,6.45-6.009,2.709-1.494,5.743-2.317,8.54-2.317,1.464,0,2.829,0.218,4.056,0.647l1.149,0.402-0.217,1.192c-0.666,3.65-3.676,7.349-7.855,9.654-2.703,1.49-5.73,2.31-8.523,2.31-0.372,0-0.738-0.014-1.1-0.043v3.604h12.5c1.575,0,2.855,1.275,2.855,2.842v4.264c0,1.567-1.28,2.843-2.855,2.843h-0.17l-1.132,17.86c-0.115,1.907-1.773,3.462-3.698,3.462h-20z" fill="url(#SVGID_4_)" fill-opacity="0.2" stroke-opacity="0.2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="30" x2="30" y1="5.281" y2="52.9">
+<stop offset="0" stop-color="#A9AAAD"/>
+<stop offset="1" 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:#BC5800"/>
-<stop offset="0.3" style="stop-color:#A23600"/>
-<stop offset="1" style="stop-color:#D07100"/>
+<path d="M33.6,18.06h0.002c2.675,0,5.578-0.788,8.177-2.221,3.998-2.204,6.871-5.714,7.499-9.159l0.107-0.596-0.58-0.197c-1.151-0.403-2.437-0.607-3.819-0.607-2.678,0-5.589,0.791-8.194,2.228-3.18,1.751-5.6,4.251-6.8,6.931-1.199-2.687-3.617-5.185-6.795-6.936-2.607-1.438-5.518-2.228-8.195-2.228-1.383,0-2.668,0.204-3.819,0.607l-0.573,0.201,0.107,0.596c0.628,3.445,3.501,6.955,7.499,9.159,2.599,1.433,5.503,2.221,8.178,2.221,0.622,0,1.229-0.042,1.813-0.125v5.106h-13.21c-1.182,0-2.143,0.957-2.143,2.132v4.264c0,1.176,0.961,2.131,2.143,2.131h0.843l1.17,18.53c0.094,1.54,1.434,2.796,2.986,2.796h20c1.553,0,2.893-1.256,2.986-2.796l1.171-18.53h0.844c1.181,0,2.143-0.955,2.143-2.131v-4.264c0-1.175-0.962-2.132-2.143-2.132h-13.22v-5.11c0.585,0.08,1.195,0.12,1.815,0.12z" fill="url(#SVGID_5_)" fill-opacity="0.4" stroke-opacity="0.4"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="43.37" x2="16.62" y1="39.75" y2="39.75">
+<stop offset="0" stop-color="#BC5800"/>
+<stop offset="0.3" stop-color="#A23600"/>
+<stop offset="1" stop-color="#D07100"/>
 </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="#600909" 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="#600909" 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:#8BC53F"/>
-<stop offset="0.3758" style="stop-color:#33773B"/>
-<stop offset="0.6303" style="stop-color:#004F3C"/>
-<stop offset="1" style="stop-color:#007338"/>
+<path d="M43.57,28.02h-27.14l1.299,21.32c0.072,1.17,1.094,2.129,2.273,2.129h20c1.18,0,2.201-0.959,2.273-2.129l1.3-21.32z" fill="url(#SVGID_6_)"/>
+<path d="M40.27,50.76h-20.54c-0.795,0-1.515-0.419-1.939-1.04,0.242,0.992,1.162,1.752,2.211,1.752h20c1.05,0,1.97-0.76,2.212-1.752-0.42,0.62-1.14,1.04-1.94,1.04z" fill="#600909" fill-opacity="0.7" stroke-opacity="0.7"/>
+<path d="M30,30.86c6.11,0,10.08,0.573,13.37,1.227l0.205-3.359h-27.15l0.205,3.359c3.29-0.65,7.26-1.23,13.37-1.23z" fill="#600909" fill-opacity="0.4" stroke-opacity="0.4"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="28.87" x2="31.01" y1="21.27" y2="21.27">
+<stop offset="0" stop-color="#8BC53F"/>
+<stop offset="0.3758" stop-color="#33773B"/>
+<stop offset="0.6303" stop-color="#004F3C"/>
+<stop offset="1" stop-color="#007338"/>
 </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:#BC5800"/>
-<stop offset="0.3" style="stop-color:#A23600"/>
-<stop offset="1" style="stop-color:#D07100"/>
+<rect fill="url(#SVGID_7_)" height="9.238" width="2.142" x="28.93" y="16.65"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="46.43" x2="13.57" y1="26.6" y2="26.6">
+<stop offset="0" stop-color="#BC5800"/>
+<stop offset="0.3" stop-color="#A23600"/>
+<stop offset="1" stop-color="#D07100"/>
 </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="#600909" 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:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
+<path d="M46.43,28.73c0,0.781-0.645,1.42-1.429,1.42h-30c-0.785,0-1.429-0.639-1.429-1.42v-4.264c0-0.782,0.644-1.421,1.429-1.421h30c0.784,0,1.429,0.64,1.429,1.421v4.262z" fill="url(#SVGID_8_)"/>
+<path d="M45,29.44h-30c-0.785,0-1.429-0.64-1.429-1.42v0.71c0,0.781,0.644,1.42,1.429,1.42h30c0.784,0,1.429-0.639,1.429-1.42v-0.71c0,0.78-0.65,1.42-1.43,1.42z" fill="#600909" fill-opacity="0.7" stroke-opacity="0.7"/>
+<path d="M45,23.05h-30c-0.785,0-1.429,0.64-1.429,1.421v0.71c0-0.781,0.644-1.421,1.429-1.421h30c0.784,0,1.429,0.64,1.429,1.421v-0.71c0-0.78-0.65-1.42-1.43-1.42z" fill="#FFFFFF" fill-opacity="0.6" stroke-opacity="0.6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="10.42" x2="30.04" y1="5.904" y2="16.9">
+<stop offset="0" stop-color="#A7FF00"/>
+<stop offset="1" stop-color="#138F00"/>
 </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:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
+<path d="M22.86,8.13c-3.974-2.19-8.299-2.669-11.43-1.572,0.57,3.138,3.167,6.474,7.142,8.665,3.973,2.19,8.299,2.669,11.43,1.572-0.57-3.13-3.17-6.47-7.14-8.66z" fill="url(#SVGID_9_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="42.12" x2="39.54" y1="18.21" y2="12.26">
+<stop offset="0" stop-color="#A7FF00"/>
+<stop offset="1" stop-color="#138F00"/>
 </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:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
+<path d="M37.14,8.13c3.974-2.19,8.299-2.669,11.43-1.572-0.569,3.138-3.167,6.474-7.142,8.665-3.973,2.19-8.299,2.669-11.43,1.572,0.57-3.13,3.17-6.47,7.14-8.66z" fill="url(#SVGID_10_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="18.88" x2="20.66" y1="18.17" y2="11.88">
+<stop offset="0" stop-color="#A7FF00"/>
+<stop offset="1" stop-color="#138F00"/>
 </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:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
+<path d="M18.57,15.22c3.973,2.19,8.299,2.669,11.43,1.572,0,0-7.308-3.236-9.777-4.551-3.304-1.759-8.794-5.685-8.794-5.685,0.57,3.141,3.17,6.475,7.14,8.665z" fill="url(#SVGID_11_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="48.8" x2="29.48" y1="4.137" y2="15.73">
+<stop offset="0" stop-color="#A7FF00"/>
+<stop offset="1" stop-color="#138F00"/>
 </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:#D2FF8A"/>
-<stop offset="1" style="stop-color:#138F00"/>
+<path d="M37.14,8.13c-3.975,2.19-6.57,5.527-7.142,8.665,0,0,6.843-2.558,9.867-4.285,3.393-1.937,8.704-5.952,8.704-5.952-3.13-1.107-7.45-0.628-11.43,1.562z" fill="url(#SVGID_12_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="20.71" x2="20.71" y1="6.366" y2="15.88">
+<stop offset="0" stop-color="#D2FF8A"/>
+<stop offset="1" stop-color="#138F00"/>
 </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:#D2FF8A"/>
-<stop offset="1" style="stop-color:#138F00"/>
+<path d="M22.86,8.13c-3.974-2.19-8.299-2.669-11.43-1.572,3.953-0.562,7.701,0.2,11.08,2.193,3.334,1.965,5.657,4.691,7.488,8.043-0.57-3.13-3.17-6.47-7.14-8.66z" fill="url(#SVGID_13_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="39.29" x2="39.29" y1="6.069" y2="16.06">
+<stop offset="0" stop-color="#D2FF8A"/>
+<stop offset="1" stop-color="#138F00"/>
 </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:#A7FF00"/>
-<stop offset="0.2303" style="stop-color:#D6FF61"/>
-<stop offset="1" style="stop-color:#138F00"/>
+<path d="M37.49,8.751c5.281-3.037,11.08-2.193,11.08-2.193-3.13-1.097-7.45-0.618-11.43,1.572-3.975,2.19-6.57,5.527-7.142,8.665,0-0.01,1.95-4.86,7.49-8.049z" fill="url(#SVGID_14_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="18.88" x2="20.66" y1="18.17" y2="11.88">
+<stop offset="0" stop-color="#A7FF00"/>
+<stop offset="0.2303" stop-color="#D6FF61"/>
+<stop offset="1" stop-color="#138F00"/>
 </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:#A7FF00"/>
-<stop offset="0.2303" style="stop-color:#D6FF61"/>
-<stop offset="1" style="stop-color:#138F00"/>
+<path d="M18.92,14.6c-5.35-2.86-7.487-8.042-7.487-8.042,0.57,3.138,3.167,6.474,7.142,8.665,3.973,2.19,8.299,2.669,11.43,1.572,0,0-5,1.06-11.08-2.19z" fill="url(#SVGID_15_)" fill-opacity="0.6" stroke-opacity="0.6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="40.85" x2="39.69" y1="17.8" y2="13.28">
+<stop offset="0" stop-color="#A7FF00"/>
+<stop offset="0.2303" stop-color="#D6FF61"/>
+<stop offset="1" stop-color="#138F00"/>
 </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:#C9CDCE"/>
-<stop offset="1" style="stop-color:#6E7273"/>
+<path d="M41.08,14.6c-3.312,1.95-6.667,2.734-11.08,2.194,3.131,1.097,7.457,0.618,11.43-1.572,3.975-2.19,6.572-5.527,7.142-8.665-1.26,3.228-3.26,5.555-7.49,8.045z" fill="url(#SVGID_16_)" fill-opacity="0.6" stroke-opacity="0.6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="30" x2="30" y1="1.095" y2="57.53">
+<stop offset="0" stop-color="#C9CDCE"/>
+<stop offset="1" stop-color="#6E7273"/>
 </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:#E6E9E8"/>
-<stop offset="1" style="stop-color:#ADB2B5"/>
+<path d="M1.428,1.017v56.85h57.14v-56.85h-57.14zm56.43,56.14h-55.72v-55.43h55.72v55.43z" fill="url(#SVGID_17_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="30" x2="30" y1="1.806" y2="57.12">
+<stop offset="0" stop-color="#E6E9E8"/>
+<stop offset="1" stop-color="#ADB2B5"/>
 </linearGradient>
-<path d="M2.142,1.727v55.43h55.716V1.727H2.142z M57.144,56.447H2.856V2.438h54.287V56.447z" fill="url(#SVGID_18_)"/>
-</g>
+<path d="M2.142,1.727v55.43h55.72v-55.43h-55.72zm55,54.72h-54.28v-54.01h54.29v54.01z" fill="url(#SVGID_18_)"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_ring_tone.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,134 +1,143 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
 <rect fill="none" height="60" width="60"/>
-<rect fill="none" height="59.996" width="59.996"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="29.69" x2="29.69" y1="7.35" y2="51.92">
-<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"/>
+<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"/>
 </linearGradient>
-<path d="M44.078,49.588c0,1.353-1.096,2.449-2.449,2.449H17.754c-1.353,0-2.449-1.097-2.449-2.449 V9.795c0-1.353,1.096-2.449,2.449-2.449h23.875c1.354,0,2.449,1.097,2.449,2.449V49.588z" fill="url(#SVGID_1)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="29.69" x2="29.69" y1="7.35" y2="51.16">
-<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"/>
+<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"/>
 </linearGradient>
-<path d="M41.629,7.346H17.754c-1.353,0-2.449,1.097-2.449,2.449v39.792 c0,0.652,0.26,1.244,0.676,1.684c-0.037-0.148-0.064-0.3-0.064-0.459v-1.225V11.02V9.795c0-1.013,0.824-1.837,1.837-1.837h23.875 c1.014,0,1.838,0.824,1.838,1.837v1.224v38.568v1.225c0,0.159-0.027,0.311-0.064,0.459c0.416-0.439,0.676-1.031,0.676-1.684V9.795 C44.078,8.443,42.982,7.346,41.629,7.346z" fill="url(#SVGID_2)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="29.69" x2="29.69" y1="10.45" y2="40.41">
-<stop offset="0" stop-color="#B6BBBD"/>
-<stop offset="1" stop-color="#F0FBFF"/>
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_3)" fill-opacity="0.6" height="29.998" stroke-opacity="0.6" width="25.101" x="17.142" y="10.407"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="29.69" x2="29.69" y1="11.06" y2="39.8">
-<stop offset="0" stop-color="#6E6E6E"/>
-<stop offset="1" stop-color="#333333"/>
+<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">
+<stop offset="0" style="stop-color:#6E6E6E"/>
+<stop offset="1" style="stop-color:#333333"/>
 </linearGradient>
-<rect fill="url(#SVGID_4)" height="28.773" width="23.875" x="17.754" y="11.02"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="29.69" x2="29.69" y1="11.67" y2="39.18">
-<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"/>
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_5)" height="27.549" width="22.651" x="18.366" y="11.632"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6" x1="29.69" x2="29.69" y1="12.11" y2="23.06">
-<stop offset="0" stop-color="#85EFFF"/>
-<stop offset="1" stop-color="#3BA1D9"/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_6)" points="41.018,21.427 18.366,23.876 18.366,12.244 41.018,12.244 "/>
-<rect fill="#9FE4FF" height="0.612" width="22.651" x="18.366" y="11.632"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7" x1="29.87" x2="29.87" y1="10.44" y2="7.99">
-<stop offset="0" stop-color="#FFFFFF"/>
-<stop offset="1" stop-color="#D1D7D9"/>
+<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"/>
+<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"/>
 </linearGradient>
-<path d="M27.163,10.407c-0.686,0-1.224-0.448-1.224-1.02V8.979c0-0.573,0.538-1.021,1.224-1.021h5.416 c0.687,0,1.225,0.448,1.225,1.021v0.408c0,0.572-0.538,1.02-1.225,1.02H27.163z" fill="url(#SVGID_7)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8" x1="29.87" x2="29.87" y1="8.32" y2="9.9">
-<stop offset="0" stop-color="#6C7375"/>
-<stop offset="1" stop-color="#BDC2C4"/>
+<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"/>
 </linearGradient>
-<path d="M33.19,9.388c0,0.226-0.273,0.408-0.612,0.408h-5.416c-0.338,0-0.612-0.182-0.612-0.408V8.979 c0-0.226,0.274-0.409,0.612-0.409h5.416c0.339,0,0.612,0.183,0.612,0.409V9.388z" fill="url(#SVGID_8)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9" x1="29.6" x2="29.6" y1="41.04" y2="50.14">
-<stop offset="0" stop-color="#B6BBBD"/>
-<stop offset="1" stop-color="#FFFFFF"/>
+<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="1" style="stop-color:#FFFFFF"/>
 </linearGradient>
-<path d="M27.384,50.2c-1.312,0-2.378-1.058-2.378-2.354v-4.475 c0-1.299,1.066-2.354,2.378-2.354h4.425c1.313,0,2.38,1.056,2.38,2.354v4.475c0,1.297-1.066,2.354-2.38,2.354H27.384z" fill="url(#SVGID_9)" fill-opacity="0.6" stroke-opacity="0.6"/>
-<path d="M27.382,49.588c-0.972,0-1.764-0.78-1.764-1.742v-4.475 c0-0.961,0.792-1.742,1.764-1.742h4.432c0.973,0,1.763,0.781,1.763,1.742v4.475c0,0.96-0.79,1.742-1.763,1.742H27.382z" fill="#020202" fill-opacity="0.5" stroke-opacity="0.5"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10" x1="29.6" x2="29.6" y1="42.21" y2="48.99">
-<stop offset="0" stop-color="#A6A8AB"/>
-<stop offset="0.7" stop-color="#58595B"/>
-<stop offset="1" stop-color="#808184"/>
+<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"/>
 </linearGradient>
-<path d="M32.965,47.846c0,0.625-0.514,1.131-1.146,1.131h-4.443c-0.632,0-1.146-0.506-1.146-1.131 v-4.475c0-0.624,0.514-1.13,1.146-1.13h4.443c0.632,0,1.146,0.506,1.146,1.13V47.846z" fill="url(#SVGID_10)"/>
-<path d="M28.679,47.752c-0.675,0-1.225-0.549-1.225-1.225V44.69 c0-0.676,0.549-1.224,1.225-1.224h1.836c0.676,0,1.225,0.548,1.225,1.224v1.837c0,0.676-0.549,1.225-1.225,1.225H28.679z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11" x1="29.6" x2="29.6" y1="44.06" y2="47.14">
-<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"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M28.679,47.14c-0.337,0-0.612-0.274-0.612-0.612V44.69c0-0.336,0.275-0.612,0.612-0.612 h1.836c0.338,0,0.612,0.276,0.612,0.612v1.837c0,0.338-0.274,0.612-0.612,0.612H28.679z" fill="url(#SVGID_11)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12" x1="19.85" x2="19.85" y1="41.59" y2="48.99">
-<stop offset="0" stop-color="#B6BBBD"/>
-<stop offset="1" stop-color="#F0FBFF"/>
+<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"/>
 </linearGradient>
-<path d="M19.496,48.977c-1.297,0-2.354-1.058-2.354-2.355 v-2.638c0-1.296,1.057-2.354,2.354-2.354h0.707c1.298,0,2.354,1.059,2.354,2.355v2.638c0,1.297-1.057,2.354-2.354,2.354H19.496z" fill="url(#SVGID_12)" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13" x1="19.85" x2="19.85" y1="42.21" y2="48.37">
-<stop offset="0" stop-color="#231F20"/>
-<stop offset="1" stop-color="#6D6E70"/>
+<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"/>
 </linearGradient>
-<path d="M19.496,48.363c-0.962,0-1.742-0.78-1.742-1.742 v-2.638c0-0.961,0.78-1.741,1.742-1.741h0.707c0.96,0,1.742,0.78,1.742,1.742v2.638c0,0.961-0.782,1.741-1.742,1.741H19.496z" fill="url(#SVGID_13)" fill-opacity="0.7" stroke-opacity="0.7"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14" x1="19.85" x2="19.85" y1="42.83" y2="47.76">
-<stop offset="0" stop-color="#C6FF45"/>
-<stop offset="0.73" stop-color="#66A00E"/>
-<stop offset="1" stop-color="#387300"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M21.333,46.621c0,0.625-0.505,1.131-1.13,1.131h-0.707c-0.624,0-1.13-0.506-1.13-1.131 v-2.638c0-0.624,0.506-1.13,1.13-1.13h0.707c0.625,0,1.13,0.506,1.13,1.131V46.621z" fill="url(#SVGID_14)"/>
-<path d="M38.654,48.977c-1.299,0-2.355-1.058-2.355-2.355 v-2.638c0-1.298,1.057-2.354,2.355-2.354h0.705c1.298,0,2.355,1.057,2.355,2.354v2.638c0,1.298-1.058,2.355-2.355,2.355H38.654z" fill="url(#SVGID_12)" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M38.654,48.363c-0.962,0-1.744-0.78-1.744-1.742 v-2.638c0-0.961,0.781-1.742,1.744-1.742h0.705c0.961,0,1.743,0.78,1.743,1.742v2.638c0,0.961-0.782,1.742-1.743,1.742H38.654z" fill="url(#SVGID_13)" fill-opacity="0.7" stroke-opacity="0.7"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17" x1="39.01" x2="39.01" y1="42.83" y2="47.76">
-<stop offset="0" stop-color="#FFC142"/>
-<stop offset="0.75" stop-color="#CF4E18"/>
-<stop offset="1" stop-color="#B52100"/>
+<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"/>
 </linearGradient>
-<path d="M40.49,46.621c0,0.625-0.507,1.131-1.131,1.131h-0.705c-0.625,0-1.131-0.506-1.131-1.131 v-2.638c0-0.624,0.506-1.13,1.131-1.13h0.705c0.624,0,1.131,0.506,1.131,1.13V46.621z" fill="url(#SVGID_17)"/>
-</g>
-<g transform="matrix(0.5 0 0 0.5 30 30)">
+<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"/>
-<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"/>
+</g>
+<g transform="matrix(1 0 0 1 30 30)">
+<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="M48.631,13.079l-3.08-7.497L27.85,13.46l0.028,23.917c-2.712-1.771-6.708-2.354-10.768-1.254 c-6.405,1.725-10.542,6.951-9.247,11.665c1.3,4.718,7.543,7.142,13.944,5.415c5.412-1.461,9.159-5.324,9.138-9.451 c-0.018-4.129,0.033-15.338,0-23.445L48.631,13.079z" 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"/>
+<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="27.878,33.26 27.857,13.46 27.85,13.46 27.872,33.258 "/>
-<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"/>
+<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="M30.945,19.08c0.007,1.306,0.01-0.201,0.012,1.223l17.674-7.225l-0.436-1.108L30.945,19.08z" 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"/>
+<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="28.142,38.062 28.142,14.143 45.891,6.413 45.551,5.582 27.454,13.46 27.454,37.378 "/>
-<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"/>
+<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="M17.625,52.389c-4.258,0.021-7.653-1.941-8.447-4.885c-0.484-1.785,0.028-3.761,1.444-5.555 c1.55-1.964,3.944-3.454,6.747-4.191c1.187-0.317,2.386-0.477,3.573-0.484c4.258-0.021,7.651,1.943,8.45,4.885 c1.058,3.9-2.618,8.272-8.196,9.748C20.012,52.221,18.808,52.381,17.625,52.389L17.625,52.389z" fill="url(#SVGID_5_)"/>
-<rect fill="none" height="59.996" width="59.996"/>
+<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 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_sat.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_sat.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_sat.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,74 +1,112 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<g>
 <rect fill="none" height="60" width="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="30" x2="30" y1="8.53" y2="50.71">
-<stop offset="0" stop-color="#A0A3A6"/>
-<stop offset="0.82" stop-color="#474B4D"/>
-<stop offset="1" stop-color="#7B7E80"/>
+<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"/>
 </linearGradient>
-<path d="M14.126,50.774c-1.029,0-1.865-0.835-1.865-1.865V10.397c0-1.028,0.836-1.864,1.865-1.864 h23.233c0.842,0,1.967,0.467,2.563,1.061l6.752,6.751c0.595,0.596,1.061,1.721,1.061,2.563v30.001c0,1.03-0.836,1.865-1.865,1.865 L14.126,50.774L14.126,50.774z" fill="url(#SVGID_1)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="30" x2="30" y1="9.15" y2="50.09">
-<stop offset="0" stop-color="#E6E9E8"/>
-<stop offset="1" stop-color="#ADB2B5"/>
+<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">
+<stop offset="0" style="stop-color:#F5F5F5"/>
+<stop offset="0.7818" style="stop-color:#CCCCCC"/>
+<stop offset="1" style="stop-color:#D1D1D1"/>
+</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"/>
+</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">
+<stop offset="0" style="stop-color:#666666"/>
+<stop offset="1" style="stop-color:#282828"/>
 </linearGradient>
-<path d="M39.482,10.035c-0.483-0.483-1.439-0.88-2.123-0.88H14.126c-0.684,0-1.244,0.561-1.244,1.243 v38.511c0,0.684,0.56,1.244,1.244,1.244h31.743c0.685,0,1.244-0.561,1.244-1.244v-30c0-0.684-0.396-1.639-0.879-2.123L39.482,10.035 z" fill="url(#SVGID_2)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="30" x2="30" y1="9.26" y2="50.26">
-<stop offset="0" stop-color="#F5F5F5"/>
-<stop offset="0.78" stop-color="#CCCCCC"/>
-<stop offset="1" stop-color="#D1D1D1"/>
+<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"/>
 </linearGradient>
-<path d="M37.359,9.776c0.516,0,1.317,0.332,1.684,0.697l6.751,6.75 c0.365,0.366,0.697,1.167,0.697,1.684v30.001c0,0.344-0.278,0.622-0.622,0.622H14.126c-0.344,0-0.622-0.278-0.622-0.622V10.397 c0-0.342,0.278-0.622,0.622-0.622L37.359,9.776 M37.359,9.154H14.126c-0.684,0-1.244,0.561-1.244,1.243v38.511 c0,0.684,0.56,1.244,1.244,1.244h31.743c0.685,0,1.244-0.561,1.244-1.244v-30c0-0.684-0.396-1.639-0.879-2.123l-6.752-6.75 C38.999,9.552,38.043,9.154,37.359,9.154L37.359,9.154z" fill="url(#SVGID_3)"/>
-<rect fill="#E6E7E8" height="0.612" width="22.941" x="16.24" y="45.59"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="28.02" x2="28.02" y1="45.58" y2="25.53">
-<stop offset="0" stop-color="#666666"/>
-<stop offset="1" stop-color="#282828"/>
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_4)" height="20.202" width="23.553" x="16.24" y="25.45"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="19.61" x2="19.61" y1="26.43" y2="44.18">
-<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"/>
+<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"/>
+</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"/>
 </linearGradient>
-<rect fill="url(#SVGID_5)" height="5.51" width="4.285" x="17.464" y="38.855"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6" x1="30.14" x2="30.14" y1="26.62" y2="43.94">
-<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"/>
+<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"/>
+</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"/>
+</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"/>
+</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"/>
 </linearGradient>
-<rect fill="url(#SVGID_6)" height="5.509" width="3.963" x="28.161" y="26.612"/>
-<rect fill="url(#SVGID_6)" height="5.509" width="3.963" x="22.974" y="26.612"/>
-<rect fill="url(#SVGID_6)" height="5.509" width="5.188" x="33.348" y="26.612"/>
-<rect fill="url(#SVGID_5)" height="5.51" width="3.963" x="28.161" y="38.855"/>
-<rect fill="url(#SVGID_5)" height="5.51" width="3.963" x="22.974" y="38.855"/>
-<polygon fill="url(#SVGID_6)" points="21.683,33.346 21.683,26.612 17.464,26.612 17.464,37.631 38.535,37.631 38.535,33.346 "/>
-<rect fill="url(#SVGID_5)" height="5.51" width="5.188" x="33.348" y="38.855"/>
-<g transform="matrix(0.5 0 0 0.5 30 30)">
-<rect fill="none" height="59.996" width="59.996"/>
-<path d="M30.295,21.957c0.98,0,1.767-0.243,2.359-0.727 c0.592-0.485,0.888-1.15,0.888-2c0-0.825-0.306-1.487-0.915-1.982c-0.609-0.495-1.387-0.744-2.332-0.744 c-0.993,0-1.778,0.245-2.358,0.735c-0.581,0.491-0.87,1.154-0.87,1.991c0,0.849,0.296,1.515,0.888,2 C28.547,21.714,29.327,21.957,30.295,21.957z" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M30.295,21.344c0.98,0,1.767-0.242,2.359-0.727s0.888-1.15,0.888-2 c0-0.825-0.306-1.486-0.915-1.982c-0.609-0.495-1.387-0.744-2.332-0.744c-0.993,0-1.778,0.245-2.358,0.735 c-0.581,0.49-0.87,1.154-0.87,1.991c0,0.849,0.296,1.515,0.888,2C28.547,21.102,29.327,21.344,30.295,21.344z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="8.77" y2="51.63">
-<stop offset="0" stop-color="#E5FFB2"/>
-<stop offset="0.39" stop-color="#6AAB18"/>
-<stop offset="0.68" stop-color="#247307"/>
-<stop offset="1" stop-color="#C2FF4A"/>
+<rect fill="url(#SVGID_12_)" height="7.305" width="6.877" x="34.439" y="42.197"/>
+<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,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>
-<circle cx="29.998" cy="29.998" fill="url(#SVGID_1_)" r="21.427"/>
-<radialGradient cx="30.2" cy="11.02" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="39.38">
-<stop offset="0" stop-color="#AFED23"/>
-<stop offset="0.81" stop-color="#358C0C"/>
-<stop offset="1" stop-color="#67AD1A"/>
-</radialGradient>
-<path d="M29.998,50.813c-11.478,0-20.815-9.337-20.815-20.814S18.521,9.183,29.998,9.183 c11.479,0,20.814,9.337,20.814,20.815S41.475,50.813,29.998,50.813L29.998,50.813z" fill="url(#SVGID_2_)"/>
-<polygon fill-opacity="0.1" points="25.252,27.84 27.297,27.84 27.297,45.543 33.251,45.543 33.251,24.451 25.252,24.451 " stroke-opacity="0.1"/>
-<polygon fill-opacity="0.2" points="25.252,27.228 27.297,27.228 27.297,44.932 33.251,44.932 33.251,23.838 25.252,23.838 " stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="29.25" x2="29.25" y1="15.88" y2="44.66">
-<stop offset="0" stop-color="#F6FDFF"/>
-<stop offset="1" stop-color="#ADB3B5"/>
+<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>
-<polygon fill="url(#SVGID_3_)" points="25.252,26.616 27.297,26.616 27.297,44.318 33.251,44.318 33.251,23.226 25.252,23.226 "/>
-<path d="M30.274,21.038c0.981,0,1.767-0.242,2.359-0.727s0.888-1.15,0.888-2 c0-0.825-0.306-1.486-0.915-1.982c-0.609-0.495-1.387-0.744-2.332-0.744c-0.992,0-1.778,0.245-2.357,0.735 c-0.581,0.49-0.871,1.154-0.871,1.991c0,0.849,0.296,1.515,0.888,2C28.525,20.796,29.305,21.038,30.274,21.038z" fill="url(#SVGID_3_)"/>
+<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 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_sat_text.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_sat_text.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<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"/>
+</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">
+<stop offset="0" style="stop-color:#F5F5F5"/>
+<stop offset="0.7818" style="stop-color:#CCCCCC"/>
+<stop offset="1" style="stop-color:#D1D1D1"/>
+</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"/>
+</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">
+<stop offset="0" style="stop-color:#666666"/>
+<stop offset="1" style="stop-color:#282828"/>
+</linearGradient>
+<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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</g>
+<g transform="matrix(0.5 0 0 0.5 30 30)">
+<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"/>
+</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"/>
+</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"/>
+<path d="M30.39,19.892c1.281,0,2.31-0.316,3.083-0.949c0.773-0.632,1.159-1.504,1.159-2.612  c0-1.08-0.399-1.942-1.196-2.591s-1.813-0.973-3.046-0.973c-1.297,0-2.323,0.319-3.081,0.96c-0.76,0.642-1.138,1.509-1.138,2.604  c0,1.108,0.388,1.98,1.161,2.612C28.105,19.575,29.124,19.892,30.39,19.892z" fill-opacity="0.1" stroke-opacity="0.1"/>
+<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"/>
+</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"/>
+</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>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_search.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_search.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_search.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,58 +1,60 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<g>
 <rect fill="none" height="60" width="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="18.65" x2="22.93" y1="35.62" y2="39.9">
-<stop offset="0" stop-color="#292929"/>
-<stop offset="0.35" stop-color="#8C8C8C"/>
-<stop offset="0.7" stop-color="#171717"/>
-<stop offset="1" stop-color="#646464"/>
+<linearGradient gradientTransform="matrix(-0.7071 -0.7071 -0.4471 0.4471 4918.8623 1940.7473)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4811.7705" x2="4804.6846" y1="3354.4326" y2="3354.4326">
+<stop offset="0" style="stop-color:#292929"/>
+<stop offset="0.3455" style="stop-color:#8C8C8C"/>
+<stop offset="0.7" style="stop-color:#171717"/>
+<stop offset="1" style="stop-color:#646464"/>
 </linearGradient>
-<polygon fill="url(#SVGID_1)" points="19.528,43.371 15.252,39.096 22.01,32.338 26.287,36.613 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="17.34" x2="11.19" y1="47.76" y2="41.61">
-<stop offset="0" stop-color="#B3B3B3"/>
-<stop offset="0.38" stop-color="#969696"/>
-<stop offset="0.75" stop-color="#FFFFFF"/>
-<stop offset="1" stop-color="#D5D5D5"/>
+<polygon fill="url(#SVGID_1_)" points="17.729,47.067 12.72,42.057 20.639,34.138 25.649,39.148 "/>
+<linearGradient gradientTransform="matrix(-1 0 0 1 4302.3848 0)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="4287.2246" x2="4294.4331" y1="52.2168" y2="45.0081">
+<stop offset="0" style="stop-color:#B3B3B3"/>
+<stop offset="0.3758" style="stop-color:#969696"/>
+<stop offset="0.7515" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#D5D5D5"/>
 </linearGradient>
-<path d="M6.589,45.98c-0.643,0.644-0.643,1.695,0,2.338l3.898,3.897c0.643,0.644,1.695,0.644,2.338,0 l8.964-8.964c0.643-0.644,0.643-1.695,0-2.338l-3.898-3.898c-0.643-0.643-1.695-0.642-2.338,0.001L6.589,45.98z" fill="url(#SVGID_2)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="11.18" x2="17.42" y1="41.32" y2="47.56">
-<stop offset="0" stop-color="#E0E4E6"/>
-<stop offset="0.33" stop-color="#B0B6B8"/>
-<stop offset="0.33" stop-color="#9FA6A8"/>
-<stop offset="0.68" stop-color="#6A7173"/>
-<stop offset="1" stop-color="#ADB3B5"/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_3)" points="13.765,51.275 7.529,45.039 14.517,38.052 20.753,44.289 "/>
-<path d="M35.673,24.764c-6.744,0-12.936-1.631-17.829-4.356 c1.4-8.628,8.883-15.217,17.906-15.217c8.996,0,16.459,6.547,17.895,15.134C48.73,23.098,42.482,24.764,35.673,24.764z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="35.76" x2="35.76" y1="36.05" y2="10.05">
-<stop offset="0" stop-color="#B2F56E"/>
-<stop offset="0.47" stop-color="#40AD00"/>
-<stop offset="1" stop-color="#074D00"/>
+<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"/>
 </linearGradient>
-<circle cx="35.75" cy="23.054" fill="url(#SVGID_4)" fill-opacity="0.7" r="12.998" stroke-opacity="0.7"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="35.75" x2="35.75" y1="41.29" y2="4.88">
-<stop offset="0" stop-color="#BEC7CC"/>
-<stop offset="0.19" stop-color="#9AA4A6"/>
-<stop offset="0.7" stop-color="#D4D9DB"/>
-<stop offset="0.9" stop-color="#ECF3F5"/>
-<stop offset="1" stop-color="#ECF3F5"/>
+<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"/>
 </linearGradient>
-<path d="M35.75,4.917c-10.015,0-18.136,8.122-18.136,18.138s8.122,18.137,18.136,18.137 c10.018,0,18.139-8.121,18.139-18.137S45.768,4.917,35.75,4.917z M35.75,36.732c-7.177,0-13.711-6.5-13.711-13.678 S28.573,9.183,35.75,9.183c7.18,0,13.838,6.693,13.838,13.871S42.93,36.732,35.75,36.732z" fill="url(#SVGID_5)"/>
-<radialGradient cx="35.95" cy="8.79" gradientUnits="userSpaceOnUse" id="SVGID_6" r="31.29">
-<stop offset="0" stop-color="#E5EBED"/>
-<stop offset="0.58" stop-color="#C4CCCE"/>
-<stop offset="0.85" stop-color="#8D9699"/>
-<stop offset="0.98" stop-color="#CAD2D4"/>
-<stop offset="1" stop-color="#CAD2D4"/>
-</radialGradient>
-<path d="M35.75,5.824c-9.514,0-17.229,7.716-17.229,17.231c0,9.516,7.716,17.23,17.229,17.23 c9.518,0,17.231-7.715,17.231-17.23S45.268,5.824,35.75,5.824z M35.75,36.732c-7.177,0-13.711-6.5-13.711-13.678 S28.573,9.183,35.75,9.183c7.18,0,13.838,6.693,13.838,13.871S42.93,36.732,35.75,36.732z" fill="url(#SVGID_6)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7" x1="35.75" x2="35.75" y1="37.01" y2="9.61">
-<stop offset="0" stop-color="#E5EBED"/>
-<stop offset="1" stop-color="#515759"/>
+<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"/>
 </linearGradient>
-<path d="M35.75,9.149c-7.678,0-13.904,6.226-13.904,13.905c0,7.68,6.226,13.906,13.904,13.906 c7.681,0,13.906-6.226,13.906-13.906C49.656,15.375,43.431,9.149,35.75,9.149z M35.75,36.054c-7.177,0-12.998-5.821-12.998-12.999 c0-7.178,5.82-12.998,12.998-12.998c7.18,0,12.999,5.82,12.999,12.998C48.749,30.233,42.93,36.054,35.75,36.054z" fill="url(#SVGID_7)"/>
-<path d="M35.676,24.434c-4.299,0-8.361-0.692-11.989-1.915 c0.282-6.427,5.568-11.556,12.065-11.556c6.48,0,11.756,5.101,12.062,11.505C44.148,23.722,40.032,24.434,35.676,24.434z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M35.664,11.86c6.004,0,10.982,4.293,12.088,9.973 c-0.616-6.101-5.738-10.87-12.002-10.87c-5.637,0-10.356,3.863-11.692,9.083C25.763,15.276,30.31,11.86,35.664,11.86z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<rect fill="none" height="59.996" width="59.996"/>
+<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"/>
+</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"/>
+<path d="M36.642,10.138c7.035,0,12.868,5.031,14.165,11.688c-0.722-7.15-6.722-12.74-14.063-12.74  c-6.607,0-12.139,4.527-13.705,10.646C25.038,14.141,30.366,10.138,36.642,10.138z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<rect fill="none" height="60" width="60"/>
+</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_security.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_security.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_security.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,40 +1,44 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.7368" x2="45.6876" y1="17.7749" y2="17.7749">
+<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 39.9805)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-89.6592" x2="-54.9037" y1="24.0742" y2="24.0742">
 <stop offset="0" style="stop-color:#8C8C8C"/>
-<stop offset="0.5333" style="stop-color:#B3B3B3"/>
+<stop offset="0.5333" style="stop-color:#CCCCCC"/>
 <stop offset="1" style="stop-color:#8F8F8F"/>
 </linearGradient>
-<path d="M30.21,6.162c-8.604,0-15.586,6.919-15.708,15.497v5.764h5.313v-5.764  c0.121-5.635,4.731-10.182,10.394-10.182s10.274,4.547,10.395,10.182v7.729h5.313v-7.729C45.797,13.081,38.816,6.162,30.21,6.162z" fill="url(#SVGID_1_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="15.7046" x2="44.7195" y1="18.2661" y2="18.2661">
+<path d="M30.236,2.865c-9.661,0-17.502,7.771-17.638,17.402v6.473h5.966v-6.473  C18.7,13.94,23.877,8.835,30.236,8.835c6.357,0,11.535,5.105,11.672,11.433v8.679h5.967v-8.679  C47.738,10.636,39.9,2.865,30.236,2.865z" fill="url(#SVGID_1_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 39.9805)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-88.5723" x2="-55.9912" y1="23.5225" y2="23.5225">
 <stop offset="0" style="stop-color:#CCCCCC"/>
 <stop offset="0.5152" style="stop-color:#FFFFFF"/>
 <stop offset="1" style="stop-color:#CCCCCC"/>
 </linearGradient>
-<path d="M41.588,28.405v-6.746c-0.133-6.168-5.234-11.164-11.377-11.164c-6.142,0-11.244,4.996-11.377,11.145  v7.748h-3.348v-7.729c0.113-7.998,6.718-14.515,14.725-14.515c8.008,0,14.612,6.517,14.725,14.529v6.731H41.588z" fill="url(#SVGID_2_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="16.3081" x2="44.1175" y1="18.2661" y2="18.2661">
-<stop offset="0" style="stop-color:#B4B4B4"/>
-<stop offset="0.5" style="stop-color:#E6E6E6"/>
-<stop offset="1" style="stop-color:#BEBEBE"/>
+<path d="M43.012,27.843v-7.575c-0.148-6.926-5.878-12.536-12.775-12.536c-6.896,0-12.625,5.61-12.774,12.515  v8.7h-3.76v-8.679c0.127-8.98,7.544-16.299,16.534-16.299c8.992,0,16.408,7.318,16.535,16.315v7.559H43.012z" fill="url(#SVGID_2_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 39.9805)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-87.8945" x2="-56.6681" y1="23.5225" y2="23.5225">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="0.5" style="stop-color:#B3B3B3"/>
+<stop offset="1" style="stop-color:#FFFFFF"/>
 </linearGradient>
-<path d="M16.098,28.775v-7.116c0.108-7.662,6.439-13.902,14.113-13.902c7.674,0,14.004,6.247,14.114,13.925  v6.111h-2.125v-6.134c-0.139-6.5-5.518-11.776-11.989-11.776S18.361,15.15,18.222,21.627v7.148H16.098z" fill="url(#SVGID_3_)"/>
-<g>
-<rect fill="none" height="60" width="60"/>
-</g>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="10.4082" x2="49.5918" y1="40.7148" y2="40.7148">
+<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"/>
 </linearGradient>
-<path d="M49.592,53.266c0,0.676-0.549,1.225-1.225,1.225H11.633c-0.676,0-1.225-0.549-1.225-1.225V28.163  c0-0.676,0.548-1.225,1.225-1.225h36.734c0.676,0,1.225,0.549,1.225,1.225V53.266z" fill="url(#SVGID_4_)"/>
-<path d="M48.367,26.938H11.633c-0.676,0-1.225,0.549-1.225,1.225v1.225  c0-0.676,0.548-1.225,1.225-1.225h36.734c0.676,0,1.225,0.549,1.225,1.225v-1.225C49.592,27.487,49.043,26.938,48.367,26.938z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<rect fill="#EE8F11" fill-opacity="0.5" height="4.285" stroke-opacity="0.5" width="39.184" x="10.408" y="32.449"/>
-<rect fill-opacity="0.25" height="0.612" stroke-opacity="0.25" width="39.184" x="10.408" y="32.449"/>
-<path d="M48.367,54.49H11.633c-0.676,0-1.225-0.549-1.225-1.225v-1.225c0,0.676,0.548,1.225,1.225,1.225h36.734  c0.676,0,1.225-0.549,1.225-1.225v1.225C49.592,53.941,49.043,54.49,48.367,54.49z" fill-opacity="0.25" stroke-opacity="0.25"/>
-<rect fill="#FEE38E" fill-opacity="0.25" height="0.612" stroke-opacity="0.25" width="39.184" x="10.408" y="36.734"/>
+<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-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"/>
+<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"/>
+</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"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_server_locked.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_server_locked.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,200 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<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.3818" style="stop-color:#FFFFFF"/>
+<stop offset="0.7091" style="stop-color:#686E70"/>
+<stop offset="1" style="stop-color:#A6B0B3"/>
+</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"/>
+</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"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30" x2="30" y1="15.5947" y2="6.3742">
+<stop offset="0" style="stop-color:#808080"/>
+<stop offset="1" style="stop-color:#303030"/>
+</linearGradient>
+<rect fill="url(#SVGID_3_)" height="9.412" width="32.59" x="13.705" y="6.183"/>
+<rect fill="#FFFFFF" fill-opacity="0.25" height="1.177" stroke-opacity="0.25" width="32.59" x="13.705" y="15.595"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="30.0015" x2="30.0015" y1="7.4082" y2="14.3725">
+<stop offset="0" style="stop-color:#8B8B8B"/>
+<stop offset="1" style="stop-color:#454545"/>
+</linearGradient>
+<rect fill="url(#SVGID_4_)" height="7.058" width="30.263" x="14.87" y="7.359"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="30.0005" x2="30.0005" y1="8.2974" y2="13.2402">
+<stop offset="0" style="stop-color:#525252"/>
+<stop offset="1" style="stop-color:#1C1C1C"/>
+</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"/>
+</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"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="30" x2="30" y1="28.0029" y2="18.7824">
+<stop offset="0" style="stop-color:#808080"/>
+<stop offset="1" style="stop-color:#303030"/>
+</linearGradient>
+<rect fill="url(#SVGID_7_)" height="9.412" width="32.59" x="13.705" y="18.591"/>
+<rect fill="#FFFFFF" fill-opacity="0.25" height="1.176" stroke-opacity="0.25" width="32.59" x="13.705" y="28.003"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="30.0015" x2="30.0015" y1="19.8154" y2="26.7816">
+<stop offset="0" style="stop-color:#8B8B8B"/>
+<stop offset="1" style="stop-color:#454545"/>
+</linearGradient>
+<rect fill="url(#SVGID_8_)" height="7.06" width="30.263" x="14.87" y="19.767"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="30.0005" x2="30.0005" y1="20.7056" y2="25.6484">
+<stop offset="0" style="stop-color:#525252"/>
+<stop offset="1" style="stop-color:#1C1C1C"/>
+</linearGradient>
+<rect fill="url(#SVGID_9_)" height="4.706" width="27.939" x="16.031" y="20.942"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="26.957" x2="31.9189" y1="50.5098" y2="50.5098">
+<stop offset="0" style="stop-color:#1A1A1A"/>
+<stop offset="0.3212" style="stop-color:#C7C7C7"/>
+<stop offset="0.6848" style="stop-color:#4D4D4D"/>
+<stop offset="0.8545" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#7A7A7A"/>
+</linearGradient>
+<path d="M26.939,48.367v3.674c0,0.338,0.274,0.612,0.612,0.612h3.674c0.338,0,0.612-0.274,0.612-0.612  v-3.674H26.939z" fill="url(#SVGID_10_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="26.9565" x2="31.918" y1="48.6738" y2="48.6738">
+<stop offset="0" style="stop-color:#1A1A1A"/>
+<stop offset="0.3212" style="stop-color:#C7C7C7"/>
+<stop offset="0.6848" style="stop-color:#4D4D4D"/>
+<stop offset="0.8545" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#7A7A7A"/>
+</linearGradient>
+<rect fill="url(#SVGID_11_)" height="0.612" width="4.897" x="26.938" y="48.367"/>
+<g>
+<rect fill="none" height="60" width="60"/>
+</g>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="30.0005" x2="30.0005" y1="48.9316" y2="42.9805">
+<stop offset="0" style="stop-color:#808080"/>
+<stop offset="1" style="stop-color:#303030"/>
+</linearGradient>
+<rect fill="url(#SVGID_12_)" height="6.122" width="37.996" x="11.002" y="42.857"/>
+<rect fill-opacity="0.5" height="0.612" stroke-opacity="0.5" width="37.996" x="11.002" y="42.857"/>
+<rect fill-opacity="0.2" height="0.612" stroke-opacity="0.2" width="37.996" x="11.002" y="43.47"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="12.8589" x2="12.8589" y1="48.9404" y2="44.1797">
+<stop offset="0" style="stop-color:#999999"/>
+<stop offset="1" style="stop-color:#4D4D4D"/>
+</linearGradient>
+<rect fill="url(#SVGID_13_)" height="4.897" width="2.476" x="11.621" y="44.082"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="17.8115" x2="17.8115" y1="48.9404" y2="44.1797">
+<stop offset="0" style="stop-color:#999999"/>
+<stop offset="1" style="stop-color:#4D4D4D"/>
+</linearGradient>
+<rect fill="url(#SVGID_14_)" height="4.897" width="2.476" x="16.574" y="44.082"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="22.7642" x2="22.7642" y1="48.9404" y2="44.1797">
+<stop offset="0" style="stop-color:#999999"/>
+<stop offset="1" style="stop-color:#4D4D4D"/>
+</linearGradient>
+<rect fill="url(#SVGID_15_)" height="4.897" width="2.476" x="21.526" y="44.082"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="27.7158" x2="27.7158" y1="48.9404" y2="44.1797">
+<stop offset="0" style="stop-color:#999999"/>
+<stop offset="1" style="stop-color:#4D4D4D"/>
+</linearGradient>
+<rect fill="url(#SVGID_16_)" height="4.897" width="2.476" x="26.478" y="44.082"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="32.668" x2="32.668" y1="48.9404" y2="44.1797">
+<stop offset="0" style="stop-color:#999999"/>
+<stop offset="1" style="stop-color:#4D4D4D"/>
+</linearGradient>
+<rect fill="url(#SVGID_17_)" height="4.897" width="2.477" x="31.43" y="44.082"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="37.6211" x2="37.6211" y1="48.9404" y2="44.1797">
+<stop offset="0" style="stop-color:#999999"/>
+<stop offset="1" style="stop-color:#4D4D4D"/>
+</linearGradient>
+<rect fill="url(#SVGID_18_)" height="4.897" width="2.477" x="36.383" y="44.082"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="42.5723" x2="42.5723" y1="48.9404" y2="44.1797">
+<stop offset="0" style="stop-color:#999999"/>
+<stop offset="1" style="stop-color:#4D4D4D"/>
+</linearGradient>
+<rect fill="url(#SVGID_19_)" height="4.897" width="2.477" x="41.334" y="44.082"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="47.5254" x2="47.5254" y1="48.9404" y2="44.1797">
+<stop offset="0" style="stop-color:#999999"/>
+<stop offset="1" style="stop-color:#4D4D4D"/>
+</linearGradient>
+<rect fill="url(#SVGID_20_)" height="4.897" width="2.477" x="46.287" y="44.082"/>
+<rect fill-opacity="0.5" height="0.612" stroke-opacity="0.5" width="37.996" x="11.002" y="48.367"/>
+<rect fill="#CCCCCC" fill-opacity="0.5" height="0.612" stroke-opacity="0.5" width="37.996" x="11.002" y="47.755"/>
+<rect fill-opacity="0.3" height="0.612" stroke-opacity="0.3" width="4.897" x="26.938" y="48.979"/>
+<rect fill-opacity="0.1" height="0.612" stroke-opacity="0.1" width="4.897" x="26.938" y="49.592"/>
+<rect fill-opacity="0.3" height="4.897" stroke-opacity="0.3" width="0.612" x="18.979" y="52.653"/>
+<rect fill-opacity="0.3" height="4.897" stroke-opacity="0.3" width="0.612" x="39.184" y="52.653"/>
+<rect fill-opacity="0.1" height="4.897" stroke-opacity="0.1" width="0.612" x="18.367" y="52.653"/>
+<rect fill-opacity="0.1" height="4.897" stroke-opacity="0.1" width="0.612" x="39.796" y="52.653"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="29.3872" x2="29.3872" y1="52.1279" y2="57.9301">
+<stop offset="0" style="stop-color:#1A1A1A"/>
+<stop offset="0.3212" style="stop-color:#C7C7C7"/>
+<stop offset="0.6848" style="stop-color:#4D4D4D"/>
+<stop offset="0.8545" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#7A7A7A"/>
+</linearGradient>
+<rect fill="url(#SVGID_21_)" height="6.122" width="18.367" x="20.204" y="52.041"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_22_" x1="19.8979" x2="19.8979" y1="52.1279" y2="57.9301">
+<stop offset="0" style="stop-color:#1A1A1A"/>
+<stop offset="0.3212" style="stop-color:#C7C7C7"/>
+<stop offset="0.6848" style="stop-color:#4D4D4D"/>
+<stop offset="0.8545" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#7A7A7A"/>
+</linearGradient>
+<path d="M19.592,52.653v4.897c0,0.339,0.274,0.612,0.612,0.612v-6.122  C19.866,52.041,19.592,52.314,19.592,52.653z" fill="url(#SVGID_22_)"/>
+<path d="M19.592,52.653v4.897c0,0.339,0.274,0.612,0.612,0.612v-6.122C19.866,52.041,19.592,52.314,19.592,52.653z" fill-opacity="0.3" stroke-opacity="0.3"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_23_" x1="38.877" x2="38.877" y1="52.1279" y2="57.9301">
+<stop offset="0" style="stop-color:#1A1A1A"/>
+<stop offset="0.3212" style="stop-color:#C7C7C7"/>
+<stop offset="0.6848" style="stop-color:#4D4D4D"/>
+<stop offset="0.8545" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#7A7A7A"/>
+</linearGradient>
+<path d="M38.571,52.041v6.122c0.339,0,0.612-0.273,0.612-0.612v-4.897  C39.184,52.314,38.91,52.041,38.571,52.041z" fill="url(#SVGID_23_)"/>
+<path d="M38.571,52.041v6.122c0.339,0,0.612-0.273,0.612-0.612v-4.897C39.184,52.314,38.91,52.041,38.571,52.041z" fill-opacity="0.3" stroke-opacity="0.3"/>
+</g>
+<g transform="matrix(1 0 0 1 30 30)">
+<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">
+<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"/>
+</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"/>
+</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"/>
+</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__)"/>
+</g>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_settings.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_settings.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_settings.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,91 +1,159 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="35.7021" x2="40.6006" y1="20.668" y2="14.6214">
-<stop offset="0" style="stop-color:#9E9E9E"/>
-<stop offset="0.3576" style="stop-color:#666666"/>
-<stop offset="0.697" style="stop-color:#9E9E9E"/>
-<stop offset="1" style="stop-color:#9E9E9E"/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_1_)" points="41.555,25.63 29.846,15.093 34.875,9.501 46.584,20.04 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="38.2773" x2="30.2417" y1="9.4087" y2="18.6688">
+<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.697" style="stop-color:#999B9D"/>
-<stop offset="1" style="stop-color:#A1A3A5"/>
+<stop offset="0.1455" style="stop-color:#D7DDDE"/>
+<stop offset="0.3212" style="stop-color:#FFFFFF"/>
+<stop offset="0.7333" style="stop-color:#8E9699"/>
+<stop offset="1" style="stop-color:#D5E2E6"/>
+</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"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="13.6074" x2="13.6074" y1="11.021" y2="48.3899">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#000000"/>
+</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"/>
 </linearGradient>
-<path d="M35.41,19.697c-0.878,0.979-2.386,1.055-3.364,0.178l-3.362-3.03c-0.98-0.879-1.059-2.386-0.18-3.363  l4.928-5.477c0.882-0.976,2.387-1.059,3.365-0.176l3.363,3.029c0.978,0.878,1.059,2.382,0.177,3.365L35.41,19.697z" fill="url(#SVGID_2_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="37.6455" x2="30.9261" y1="10.1367" y2="17.88">
-<stop offset="0" style="stop-color:#E6E7E7"/>
-<stop offset="0.1455" style="stop-color:#E6E7E7"/>
-<stop offset="0.6061" style="stop-color:#A6A8A9"/>
-<stop offset="1" style="stop-color:#D4D5D6"/>
+<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"/>
 </linearGradient>
-<path d="M33.641,19.484c-0.343,0-0.672-0.125-0.928-0.354l-3.36-3.027c-0.275-0.248-0.438-0.586-0.457-0.954  c-0.021-0.369,0.104-0.723,0.352-0.998l4.928-5.477c0.263-0.29,0.638-0.457,1.03-0.457c0.341,0,0.668,0.126,0.922,0.355l3.364,3.029  c0.566,0.509,0.611,1.385,0.102,1.954l-4.926,5.472C34.402,19.322,34.038,19.484,33.641,19.484L33.641,19.484z" fill="url(#SVGID_3_)"/>
-<linearGradient gradientTransform="matrix(0.7433 0.669 -0.669 0.7433 4218.2832 -295.1886)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-2895.0591" x2="-2888.9287" y1="3048.2993" y2="3048.2993">
-<stop offset="0" style="stop-color:#E5E5E5"/>
-<stop offset="0.6" style="stop-color:#B2B2B2"/>
-<stop offset="1" style="stop-color:#F1F1F1"/>
+<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">
+<stop offset="0" style="stop-color:#666666"/>
+<stop offset="1" style="stop-color:#000000"/>
+</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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_4_)" points="41.062,27.351 36.546,23.293 17.641,44.384 22.155,48.446 "/>
-<polygon fill="#1A1A1A" fill-opacity="0.5" points="41.087,27.349 36.57,23.291 35.036,24.982 39.551,29.041 " stroke-opacity="0.5"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="22.9233" x2="30.0399" y1="36.0415" y2="42.7754">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.3818" style="stop-color:#CCCCCC"/>
-<stop offset="1" style="stop-color:#4D4D4D"/>
+<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"/>
 </linearGradient>
-<path d="M38.501,33.13c0.387-0.432,0.351-1.096-0.081-1.483l-5.684-5.115  c-0.431-0.389-1.096-0.351-1.482,0.079L14.263,45.494c-0.39,0.429-0.352,1.096,0.075,1.483l5.688,5.114  c0.429,0.385,1.093,0.355,1.481-0.078L38.501,33.13z" fill="url(#SVGID_5_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="23.5879" x2="29.3344" y1="36.6714" y2="42.109">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.3818" style="stop-color:#7A7A7A"/>
-<stop offset="0.7091" style="stop-color:#1A1A1A"/>
-<stop offset="1" style="stop-color:#4D4D4D"/>
+<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"/>
+</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">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
-<path d="M20.728,51.361c-0.02,0-0.03-0.01-0.034-0.014l-5.687-5.113l16.99-18.955l5.754,5.111L20.764,51.343  L20.728,51.361z" fill="url(#SVGID_6_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="51.4463" x2="43.4107" y1="20.8364" y2="30.0965">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.697" style="stop-color:#999B9D"/>
-<stop offset="1" style="stop-color:#A1A3A5"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M51.39,37.954c-0.332-4.472-3.603-8.419-5.072-9.741c-0.803-0.721-1.401-1.07-1.427-1.086  l-0.204-0.119l-3.36,1.368l-6.3-5.671c0,0,6.102-6.842,6.974-7.749c0.874-0.906,1.709-0.532,2.193-0.098  c2.011,1.802,5.313,4.758,5.432,4.868C57.657,27.207,51.39,37.954,51.39,37.954z" fill="url(#SVGID_7_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="50.4434" x2="44.0808" y1="21.3555" y2="28.6875">
-<stop offset="0" style="stop-color:#E6E7E7"/>
-<stop offset="0.1455" style="stop-color:#E6E7E7"/>
-<stop offset="0.6061" style="stop-color:#A6A8A9"/>
-<stop offset="1" style="stop-color:#D4D5D6"/>
+<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">
+<stop offset="0" style="stop-color:#666666"/>
+<stop offset="1" style="stop-color:#000000"/>
+</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"/>
 </linearGradient>
-<path d="M51.729,34.746c-1.14-3.348-3.422-6.088-4.742-7.276c-0.783-0.703-1.403-1.095-1.575-1.197  l-0.646-0.376l-3.235,1.316l-5.094-4.586c1.603-1.794,5.605-6.271,6.285-6.977c0.09-0.093,0.263-0.25,0.408-0.25  c0.106,0,0.255,0.076,0.397,0.204c0,0,5.309,4.756,5.417,4.855C54.01,25.176,52.95,31.281,51.729,34.746L51.729,34.746z" fill="url(#SVGID_8_)"/>
-<path d="M31.737,28.671l-0.421-0.353l-0.192,0.185l-0.813-0.846l-6.373,7.084l0.318,0.33l-0.129,0.124  l0.329,0.435c1.769,2.336,3.649,4.821,5.39,7.117l8.022-8.914C35.865,32.146,33.744,30.361,31.737,28.671z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="24.561" x2="12.9283" y1="17.8447" y2="30.2936">
-<stop offset="0" style="stop-color:#FAFAFA"/>
-<stop offset="0.7515" style="stop-color:#A6A8A9"/>
-<stop offset="1" style="stop-color:#BBBDBE"/>
+<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"/>
 </linearGradient>
-<path d="M6.284,20.353c0,0-0.317,6.246,4.916,9.559c0,0,2.531,1.449,6.532,0.626c0,0,2.521-0.481,4.076,1.109  l4.737,4.921l5.923-5.784l-4.737-4.923c0,0-2.081-2.13-2.554-4.27c0,0-0.811-6.412-2.248-8.127c0,0-3.417-5.897-12.539-1.856  l6.474,4.17l1.243,2.18l-2.641,5.912l-2.028,0.469L6.284,20.353z" fill="url(#SVGID_9_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="24.293" x2="13.795" y1="18.6533" y2="29.8878">
-<stop offset="0" style="stop-color:#E6E7E7"/>
-<stop offset="0.6061" style="stop-color:#999999"/>
-<stop offset="1" style="stop-color:#D4D5D6"/>
+<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"/>
 </linearGradient>
-<path d="M22.529,30.954c-1.2-1.228-2.788-1.484-3.909-1.484c-0.606,0-1.029,0.077-1.075,0.086  c-0.764,0.157-1.513,0.235-2.24,0.235c-2.237,0-3.6-0.742-3.613-0.75c-3.036-1.922-3.987-5-4.282-6.916l5.879,3.275l2.889-0.668  l3.051-6.829l-1.616-2.833l-5.024-3.236c1.318-0.426,2.561-0.641,3.711-0.641c4.061,0,5.702,2.666,5.771,2.779l0.04,0.068  l0.055,0.067c0.908,1.084,1.723,5.244,2.022,7.611c0.544,2.481,2.737,4.747,2.831,4.843l4.043,4.201l-4.492,4.388L22.529,30.954z" fill="url(#SVGID_10_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="41.1973" x2="32.322" y1="36.8784" y2="45.8162">
-<stop offset="0" style="stop-color:#FF4C00"/>
-<stop offset="0.7939" style="stop-color:#821212"/>
-<stop offset="1" style="stop-color:#E8522A"/>
+<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">
+<stop offset="0" style="stop-color:#999999"/>
+<stop offset="1" style="stop-color:#000000"/>
+</linearGradient>
+<path d="M36.982,45.179c-1.034,0-1.877-0.842-1.877-1.876V16.091  c0-1.035,0.843-1.876,1.877-1.876h10.322c1.035,0,1.876,0.841,1.876,1.876v27.212c0,1.034-0.841,1.876-1.876,1.876H36.982z" fill="url(#SVGID_17_)" fill-opacity="0.1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="42.1426" x2="42.1426" y1="14.5083" y2="44.5696">
+<stop offset="0" style="stop-color:#999999"/>
+<stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
-<path d="M37.255,50.886c2.249,2.352,5.735,2.033,8.38-0.498c2.643-2.525,2.98-5.986,0.728-8.342  c-0.14-0.146-15.02-12.906-15.02-12.906l-6.398,6.121C24.944,35.261,37.105,50.731,37.255,50.886z M39.589,48.169  c-0.828-0.863-0.561-2.845,0.307-3.674c0.865-0.827,2.691-0.674,3.521,0.191c0.826,0.866,0.634,2.654-0.229,3.482  C42.319,49,40.418,49.037,39.589,48.169z" fill="url(#SVGID_11_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="40.5557" x2="32.9953" y1="37.5757" y2="45.1361">
-<stop offset="0" style="stop-color:#FF7236"/>
-<stop offset="0.7939" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#E8522A"/>
+<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"/>
 </linearGradient>
-<path d="M40.927,51.481c-1.125,0-2.145-0.444-2.949-1.286c-0.282-0.338-8.061-10.228-11.687-14.839  l5.089-4.866c4.435,3.803,13.942,11.961,14.297,12.285c0.859,0.9,1.273,2.05,1.162,3.289c-0.114,1.264-0.787,2.543-1.895,3.602  C43.72,50.836,42.294,51.481,40.927,51.481L40.927,51.481z M41.468,42.951c-0.904,0-1.708,0.292-2.264,0.822  c-0.663,0.635-1.091,1.708-1.114,2.802c-0.021,0.931,0.256,1.743,0.777,2.287c0.573,0.6,1.479,0.944,2.483,0.944  c0.999,0,1.92-0.334,2.527-0.914c1.3-1.248,1.429-3.672,0.262-4.895C43.512,43.341,42.513,42.951,41.468,42.951L41.468,42.951z" fill="url(#SVGID_12_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="38.9873" x2="44.0268" y1="48.606" y2="44.2384">
+<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"/>
+</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"/>
+<path d="M47.305,43.303H36.982c-0.258,0-0.469-0.21-0.469-0.47v0.47c0,0.258,0.211,0.468,0.469,0.468h10.322  c0.259,0,0.469-0.21,0.469-0.468v-0.47C47.773,43.093,47.563,43.303,47.305,43.303z" fill-opacity="0.3"/>
+<path d="M36.982,41.427c-0.259,0-0.469-0.212-0.469-0.47V19.376c0-0.26,0.21-0.471,0.469-0.471  h10.322c0.259,0,0.469,0.211,0.469,0.471v21.581c0,0.258-0.21,0.47-0.469,0.47H36.982z" fill="#FFFFFF" fill-opacity="0.3"/>
+<path d="M36.514,30.165v10.792c0,0.258,0.21,0.47,0.469,0.47h10.322  c0.259,0,0.469-0.212,0.469-0.47V30.165H36.514z" fill="#FFFFFF" fill-opacity="0.4"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="42.1436" x2="42.1436" y1="22.582" y2="19.8827">
 <stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.5455" style="stop-color:#999B9D"/>
-<stop offset="1" style="stop-color:#999B9D"/>
+<stop offset="1" style="stop-color:#808080"/>
 </linearGradient>
-<path d="M44.95,46.428c0.021-0.899-0.312-1.753-0.932-2.403c-1.285-1.34-3.422-1.389-4.762-0.106  c-0.651,0.624-1.022,1.462-1.041,2.362c-0.021,0.9,0.312,1.752,0.935,2.402c1.282,1.344,3.419,1.393,4.765,0.105  C44.563,48.165,44.932,47.328,44.95,46.428 M43.75,46.402c-0.011,0.557-0.234,1.105-0.668,1.52  c-0.866,0.829-2.235,0.799-3.063-0.068c-0.413-0.432-0.613-0.99-0.602-1.547c0.012-0.553,0.237-1.102,0.669-1.516  c0.865-0.828,2.235-0.801,3.064,0.066C43.563,45.291,43.761,45.849,43.75,46.402L43.75,46.402z" fill="url(#SVGID_13_)"/>
+<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"/>
+<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>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_sim.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_sim.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<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"/>
+</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">
+<stop offset="0" style="stop-color:#F5F5F5"/>
+<stop offset="0.7818" style="stop-color:#CCCCCC"/>
+<stop offset="1" style="stop-color:#D1D1D1"/>
+</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"/>
+</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">
+<stop offset="0" style="stop-color:#666666"/>
+<stop offset="1" style="stop-color:#282828"/>
+</linearGradient>
+<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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</g>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_sisx.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_sisx.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<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"/>
+</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"/>
+<path d="M27.492,4.153c3.78,0,7.692,2.989,7.918,6.729c0.012-0.125,0.021-0.251,0.021-0.382  c0-3.896-4.045-7.064-7.938-7.064c-3.895,0-7.937,3.168-7.937,7.064c0,0.131,0.01,0.257,0.021,0.382  C19.8,7.143,23.71,4.153,27.492,4.153z" fill="#FFFFFF"/>
+<path d="M30.682,43.609v0.717c1.883-1.107,3.873-2.295,3.873-4.523c0-0.113-0.014-0.225-0.021-0.336  C34.321,41.452,32.454,42.566,30.682,43.609z" fill="#FFFFFF"/>
+<path d="M9.003,30.055c2.591,0,3.974,2.286,5.185,4.378h1.453v-0.718h-1.453c-1.211-2.092-2.594-4.378-5.185-4.378  C5.136,29.337,2,33.348,2,37.217c0,0.119,0.012,0.238,0.018,0.358C2.204,33.822,5.256,30.055,9.003,30.055z" fill="#FFFFFF"/>
+<path d="M51.065,18.041H31.027v0.718h20.038c1.445,0,2.628,1.182,2.628,2.625v-0.718  C53.693,19.224,52.51,18.041,51.065,18.041z" fill="#FFFFFF"/>
+<path d="M20.612,39.467c-0.007,0.111-0.021,0.223-0.021,0.336c0,2.229,1.993,3.422,3.882,4.525V43.61  C22.695,42.572,20.827,41.454,20.612,39.467z" fill="#FFFFFF"/>
+<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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+<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"/>
+</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>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_social_media.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,46 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <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"/>
 </linearGradient>
-<circle cx="29.998" cy="28.985" fill="url(#SVGID_1)" r="21.427"/>
+<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"/>
 </radialGradient>
-<path d="M50.877,28.985c0,11.531-9.346,20.876-20.878,20.876s-20.88-9.345-20.88-20.876 c0-11.529,9.349-20.878,20.88-20.878S50.877,17.456,50.877,28.985z" fill="url(#SVGID_2)"/>
+<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"/>
 </linearGradient>
-<path d="M29.999,8.107c-11.532,0-20.88,9.349-20.88,20.878 c0,11.531,9.349,20.876,20.88,20.876s20.878-9.345,20.878-20.876C50.877,17.456,41.531,8.107,29.999,8.107z M29.999,48.033 c-10.842,0-19.662-8.817-19.662-19.656c0-10.842,8.82-19.661,19.662-19.661c10.84,0,19.658,8.819,19.658,19.661 C49.657,39.216,40.839,48.033,29.999,48.033z" fill="url(#SVGID_3)" fill-opacity="0.3" stroke-opacity="0.3"/>
+<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="1" stop-color="#000000"/>
 </linearGradient>
-<path d="M11.08,28.644c-0.222-0.295-0.725-0.295-0.946-0.295 c-0.437,0-0.669,0.311-0.673,0.616v0.021l0,0.031c0,0.537,0.03,1.14,0.094,1.871c0.013,0.139,0.03,0.276,0.047,0.414l0.024,0.201 c0.055,0.434,0.121,0.861,0.195,1.274l0.035,0.183c0.032,0.162,0.063,0.323,0.097,0.483c0.089,0.405,0.198,0.827,0.332,1.29 c0.019,0.066,0.037,0.135,0.054,0.199c0.029,0.109,0.058,0.217,0.091,0.322l0.005,0.014l0.012,0.033 c-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.575c-0.01-0.303-0.021-0.676-0.108-0.991 l1.112-1.493l0.121-0.162V31.76v-1.162v-0.253L12.6,30.167L11.08,28.644z" fill="url(#SVGID_4)" fill-opacity="0.3" stroke-opacity="0.3"/>
+<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="1" stop-color="#000000"/>
 </linearGradient>
-<path d="M50.58,24.893c-0.015-0.079-0.029-0.135-0.043-0.191 c-0.012-0.042-0.021-0.084-0.029-0.125c-0.105-0.495-0.236-1.006-0.391-1.525L50.1,22.994c-0.033-0.117-0.067-0.234-0.105-0.349 c-0.188-0.587-0.393-1.148-0.607-1.666c-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.402 l-0.03-0.059c-0.046-0.089-0.092-0.181-0.141-0.269c-0.295-0.532-0.603-1.04-0.918-1.511c-0.032-0.049-0.069-0.102-0.106-0.154 c-0.023-0.031-0.045-0.062-0.066-0.092c-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 c-0.381-0.456-0.783-0.898-1.199-1.316c-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.074 l-0.081-0.069c-0.041-0.037-0.082-0.073-0.125-0.106c-0.446-0.367-0.93-0.728-1.435-1.075c-0.063-0.042-0.126-0.083-0.19-0.124 l-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 c-0.528-0.283-1.081-0.55-1.643-0.792L38.28,9.842l-0.153-0.063c-0.148-0.062-0.297-0.114-0.444-0.166 c-0.076-0.026-0.152-0.053-0.228-0.08l-0.282-0.105l-0.254,0.162c-0.171,0.108-0.841,0.491-1.236,0.715 c-0.438-0.059-1.499-0.192-2.569-0.295c0.33-0.032,0.786-0.069,1.429-0.111l0.091-1.204l-0.048-0.012 c-0.038-0.011-0.077-0.02-0.116-0.029l-0.091-0.018l-0.075-0.014c-0.654-0.132-1.271-0.227-1.882-0.291l-0.004-0.001L32.332,8.32 c-0.698-0.07-1.409-0.106-2.113-0.106c-0.62,0-1.262,0.032-1.963,0.101c-0.109,0.01-0.214,0.021-0.321,0.032 c-0.693,0.078-1.299,0.169-1.873,0.286l-0.02,0.003l-0.014,0.002c-0.603,0.125-1.211,0.281-1.856,0.477 c-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.582c-0.042,0.018-0.071,0.029-0.099,0.039 l-0.078,0.031c-0.564,0.241-1.128,0.512-1.688,0.812c-0.061,0.031-0.119,0.066-0.177,0.1l-0.072,0.042 c-0.157,0.087-0.316,0.186-0.472,0.283l-0.204,0.127l-1.118,0.684l1.242,0.416c0.186,0.062,0.385,0.093,0.592,0.093 c0.669,0,1.317-0.329,1.837-0.593c0.209-0.105,0.521-0.264,0.648-0.288c0.152,0.045,0.306,0.068,0.458,0.068 c0.569,0,1.035-0.306,1.447-0.578l0.111-0.071c0.133-0.043,0.362-0.128,0.818-0.299c0.465-0.174,1.314-0.493,1.541-0.547 c0.44-0.005,0.966-0.068,1.339-0.3c0.352,0.058,0.976,0.157,1.619,0.241c-0.046,0.029-0.092,0.059-0.132,0.097 c-0.209,0.192-1.335,0.533-1.679,0.577c-0.648,0.082-0.908,0.408-1.012,0.666c-0.135,0.336-0.053,0.672,0.078,0.946 c-0.245,0.162-0.545,0.342-0.804,0.478c0.001-0.006,0.002-0.012,0.003-0.019c0.093-0.517,0.161-0.89-0.09-1.189 c-0.128-0.153-0.318-0.241-0.519-0.241c-0.295,0-0.525,0.183-0.711,0.362c-0.519,0.502-0.833,1.129-0.953,1.365l-0.022,0.044 l-0.018,0.035c-0.225,0.431-0.318,0.737-0.192,1.688c-0.056,0.04-0.219,0.102-0.446,0.102c-0.03,0-0.058-0.003-0.079-0.004 c-0.146-0.158-0.348-0.247-0.575-0.247c0,0,0,0,0,0c-0.523,0-1.237,0.589-2.124,1.754l-0.284,0.374l0.29,0.37l0.269,0.344 c-4.215,3.258-4.247,3.443-4.292,3.716c-0.007,0.024-0.044,0.138-0.094,0.293c-0.628,1.952-0.977,3.412-0.637,4.195 c0.785,1.813,1.669,3.504,2.816,3.598c0.101,0.009,0.212,0.012,0.332,0.012c1.05,0,2.753-0.318,3.571-0.485 c0.152,0.283,0.335,0.615,0.437,0.795l0.182,0.322l0.37-0.012c0.004,0,0.2-0.006,0.447-0.006c0.287,0,0.479,0.008,0.602,0.016 c0.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.328c0.066,0.107,0.126,0.203,0.177,0.287 c0.324,0.922,0.716,1.531,1.545,1.531c0.062,0,0.124-0.004,0.188-0.007c0.046-0.003,0.095-0.005,0.146-0.005 c0.092,0,0.158,0.011,0.226,0.035l0.076,0.027l0.08,0.008c0.155,0.012,0.306,0.034,0.453,0.055c0.255,0.035,0.519,0.071,0.789,0.071 c0.721,0,1.293-0.272,1.787-0.856c0.018-0.002,0.036-0.003,0.054-0.006c0.519-0.071,0.712-0.331,0.778-0.564 c0.039-0.038,0.09-0.086,0.131-0.124c0.205-0.188,0.447-0.411,0.615-0.675c0.076-0.044,0.162-0.096,0.258-0.152 c0.167-0.104,0.355-0.217,0.504-0.293c0.131-0.04,0.246-0.116,0.334-0.225c0.209-0.257,0.166-0.548,0.131-0.783 c-0.035-0.242-0.07-0.49,0.061-0.758c0.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 c-0.278,0.28-0.512,0.703-0.586,0.846l-0.048,0.094l-0.015,0.104c-0.018,0.138-0.094,0.851,0.307,1.311 c0.201,0.23,0.49,0.359,0.813,0.359c0.102,0,0.209-0.014,0.318-0.039c1.027-0.232,2.85-2.702,2.998-4.065 c0.072-0.656-0.186-1.173-0.704-1.417l-0.387-0.183l-0.304,0.302l-1.125,1.126c-0.381,0.034-0.678,0.147-0.879,0.325 c0.012-0.479-0.036-0.973-0.087-1.451c-0.155-1.445-0.185-2.369,0.703-2.996l0.045-0.032l0.038-0.04 c0.32-0.326,0.676-0.61,1.052-0.912c0.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 c-0.09-0.128-0.275-0.326-0.625-0.396c0.461-0.186,0.816-0.333,0.852-0.345l0.106-0.044l0.083-0.08l1.899-1.822l0.278-0.269 l-0.122-0.366c-0.017-0.047-0.12-0.335-0.411-0.748c0.554,0.075,1.029,0.208,1.185,0.326c0.057,0.125,0.171,0.397,0.292,0.683 c2.088,4.924,2.383,5.177,2.926,5.186c0.021,0,0.037,0.002,0.051,0.003c0.043,0.003,0.083,0.005,0.119,0.005 c0.309,0,0.486-0.158,0.564-0.252c0.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 c0.003,0.002,0.004,0.006,0.007,0.01l1.119-0.445L50.58,24.893z M34.123,18.871c-0.086,0.003-0.181,0.008-0.281,0.012 c-0.322,0.014-0.689,0.031-1.054,0.031c-0.956,0-1.173-0.118-1.195-0.132c-0.114-0.082-0.23-0.143-0.351-0.188 c0.217-0.048,0.465-0.214,0.72-0.708c0.25,0.487,0.592,0.917,1.114,0.917c0.141,0,0.277-0.034,0.406-0.101 C33.658,18.706,33.949,18.806,34.123,18.871z M33.748,16.207c-0.072,0-0.131-0.003-0.176-0.007c0.049-0.128,0.108-0.202,0.154-0.244 c0.061,0.093,0.141,0.175,0.232,0.245C33.885,16.204,33.814,16.207,33.748,16.207z M29.946,17.485 c0.327,0.641,0.569,0.917,0.762,1.037c-0.475,0.039-0.833,0.34-1.126,0.625c-0.206-0.068-0.565-0.286-0.672-0.438 c-0.063-0.089-0.138-0.166-0.22-0.232C29.208,18.329,29.665,17.847,29.946,17.485z M28.139,17.012l-0.678-0.034l-2.279-0.111 c0.278-0.228,0.542-0.444,0.697-0.57c0.042-0.014,0.205-0.06,0.606-0.06c0.242,0,0.473,0.017,0.62,0.029L28.139,17.012z" fill="url(#SVGID_5)" fill-opacity="0.3" stroke-opacity="0.3"/>
+<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"/>
 </radialGradient>
-<path d="M10.069,28.973C10.069,28.973,10.069,28.973,10.069,28.973c0,0.008,0,0.012,0,0.018 c0,0.622,0.039,1.237,0.093,1.843c0.017,0.199,0.046,0.398,0.069,0.599c0.053,0.417,0.116,0.829,0.19,1.237 c0.042,0.217,0.082,0.434,0.127,0.646c0.093,0.422,0.203,0.838,0.321,1.248c0.05,0.17,0.089,0.343,0.14,0.508 c0.007,0.018,0.014,0.034,0.018,0.053c0.017-0.162,0.021-0.327,0.017-0.497c-0.04-1.199-0.233-1.045-0.233-1.045l1.357-1.823v-1.162 l-1.589-1.59C10.581,29.008,10.069,28.928,10.069,28.973z" fill="url(#SVGID_6)"/>
-<path d="M22.828,10.949c0.587,0.192,1.066-0.2,1.613-0.548c0.193-0.04,2.338-0.896,2.57-0.896 c0.231,0,1.01-0.03,1.204-0.34c0,0,3.357,0.583,3.862,0.389c0.277-0.108,1.434-0.2,2.426-0.265 c-0.057-0.012-0.107-0.029-0.162-0.041c-0.055-0.011-0.106-0.019-0.162-0.03c-0.623-0.125-1.252-0.226-1.894-0.29 c-0.005,0-0.01,0-0.015-0.002c-0.674-0.068-1.359-0.104-2.053-0.104c-0.643,0-1.277,0.039-1.906,0.098 c-0.11,0.011-0.22,0.023-0.331,0.035c-0.608,0.066-1.21,0.155-1.8,0.273c-0.01,0.004-0.021,0.005-0.031,0.006 c-0.613,0.126-1.213,0.283-1.802,0.464c-0.102,0.03-0.199,0.064-0.301,0.096c-0.523,0.168-1.038,0.356-1.544,0.564 c-0.06,0.026-0.12,0.047-0.18,0.071c-0.556,0.238-1.099,0.501-1.629,0.784c-0.08,0.043-0.157,0.089-0.235,0.134 c-0.227,0.125-0.44,0.267-0.66,0.401C20.89,12.115,22.251,10.754,22.828,10.949z" fill="url(#SVGID_6)"/>
-<path d="M49.98,24.995c-0.021-0.102-0.049-0.197-0.07-0.296c-0.105-0.499-0.233-0.99-0.377-1.473 c-0.039-0.13-0.076-0.265-0.117-0.395c-0.176-0.548-0.372-1.09-0.592-1.617c-0.039-0.093-0.084-0.184-0.123-0.275 c-0.203-0.464-0.422-0.918-0.658-1.363c-0.055-0.106-0.109-0.215-0.166-0.319c-0.279-0.502-0.574-0.993-0.892-1.468 c-0.054-0.083-0.115-0.162-0.171-0.242c-0.291-0.422-0.596-0.831-0.916-1.228c-0.063-0.079-0.126-0.161-0.193-0.241 c-0.368-0.443-0.756-0.868-1.16-1.277c-0.07-0.071-0.143-0.141-0.215-0.208c-0.371-0.364-0.756-0.714-1.153-1.047 c-0.067-0.056-0.132-0.116-0.198-0.171c-0.448-0.366-0.915-0.714-1.395-1.042c-0.084-0.058-0.17-0.113-0.256-0.167 c-0.442-0.294-0.898-0.572-1.365-0.83c-0.064-0.035-0.124-0.073-0.188-0.108c-0.52-0.278-1.049-0.533-1.594-0.768 c-0.097-0.041-0.195-0.079-0.29-0.12c-0.212-0.087-0.432-0.156-0.646-0.235c-0.255,0.163-1.438,0.832-1.438,0.832 s-5.141-0.702-5.492-0.353c-0.351,0.353-1.721,0.71-2.033,0.751c-0.31,0.039-0.956,0.206-0.181,1.161 c-0.116,0.118-2.325,1.657-2.325,0.957c0-0.701,0.494-1.953-0.2-1.282c-0.498,0.482-0.796,1.135-0.86,1.257 c-0.163,0.313-0.263,0.462-0.145,1.357s-1.43,0.891-1.534,0.659c-0.277-0.622-1.809,1.394-1.809,1.394l0.647,0.828 c0,0-4.509,3.474-4.548,3.707c-0.039,0.234-1.164,3.25-0.775,4.146c0.389,0.898,1.375,3.158,2.307,3.233 c1.221,0.1,4.185-0.559,4.185-0.559c0.08,0.196,0.637,1.189,0.637,1.189s1.453-0.047,1.534,0.11c0.027,0.053,1.75,5.121,1.182,5.793 c-1.357,2.032,0.775,5.011,1.369,6.018c0.595,1.731,0.977,0.957,1.758,1.239c0.961,0.084,1.773,0.439,2.589-0.611 c0.237-0.195,0.641-0.041,0.641-0.313c0-0.152,0.697-0.598,0.877-1.018c0.189-0.089,0.675-0.415,1.004-0.572 c0.299-0.02-0.283-0.82,0.309-1.666c0.639-0.252,2.364-1.415,2.364-1.415c0.077-1.704-0.839-3.812,0.873-5.02 c1.104-1.125,2.552-1.765,3.253-3.478c0.195-0.505,0.629-1.542-0.619-1.231c-1.172,0.295-2.479,0.362-1.861-0.154 c-0.07-0.634-0.85-0.931-1.549-1.551c-0.361-0.854-0.93-2.378-0.93-2.378l-1.24-1.884l0.156-0.389l1.473,2.17l1.475,1.782 c0.541,1.783,1.006,1.939,1.006,1.939c0.816-0.289,2.752-1.085,2.752-1.085l1.899-1.823c0,0-0.195-0.581-0.967-1.316l-0.584-0.349 c-0.126,0.357-0.802,0.492-0.802,0.492l-1.641-1.963l0.61-0.123l0.471,0.896l1.128,0.39c0,0,0.313-0.229,0.893,0.371 c0.473-0.04,2.318,0.089,2.749,0.636c0.085,0.109,2.286,5.606,2.72,5.614c0.191,0.001,0.329,0.077,0.268-0.256 c-0.078-0.157,0-3.609,0.115-4.349c0.295-0.627,0.344-0.002,1.039,1.188C49.987,25.052,49.984,25.023,49.98,24.995z M30.608,11.672 c0.153-0.459,1.046-0.615,1.046-0.615s-0.256,0.472-0.196,0.716c0.06,0.246-0.407,0.401-0.46,0.982 c-0.051,0.577-1.117,0.239-1.205,0.036C29.706,12.589,30.451,12.13,30.608,11.672z M34.431,19.474c-0.661,0-2.644,0.196-3.189-0.193 c-0.547-0.389-0.97,0.039-1.363,0.429c-0.258,0.253-1.193-0.259-1.467-0.649c-0.272-0.39-1.188-0.361-1.188-0.361l0.208-1.11 l-2.637-0.128l-1.499,0.439l-1.411,0.041l0.79-0.376l0.984-0.232c0,0,1.431-1.175,1.858-1.525c0.364-0.296,1.81-0.129,1.81-0.129 l1.589,1.146c0,0-0.353,0.898-0.508,1.09c0.583-0.039,1.269-1.099,1.269-1.099c-1.239-1.138-1.189-1.524-1.189-1.524l1.633,1.146 l0.015,0.01c0,0,0.662,1.558,0.937,1.558c0.271,0,0.619-1.073,0.619-1.073l0.466-0.117c0.207,0.492,0.594,1.602,1.059,1.343 c0.268-0.147,0.709-0.013,1.213,0.18c0.51,0.195,0.854-0.104,1.268,0.258C35.646,20.198,34.705,19.551,34.431,19.474z M35.469,16.792c-0.682-0.259-2.984,0.586-2.469-0.796c0.274-0.746,0.98-0.902,1.221-0.405c0.063,0.203,0.83,0.519,0.825,0.089 c-0.006-0.43,0.771-0.659,0.883-0.338C35.514,15.64,37.547,17.19,35.469,16.792z M39.807,18.102 c-0.377-0.304,0.169-0.564-0.387-1.04c-0.799-0.684-1.421-0.979-0.334-1.532c1.34-0.168,0.217,0.428,0.439,0.785 c0.119,0.19,0.797,0.828,1.326,1.61C41.291,18.574,40.182,18.405,39.807,18.102z" fill="url(#SVGID_6)"/>
-<path d="M40.348,35.855l-1.293,1.291c0,0-0.778,0-0.814,0.311c-0.018,0.133-0.063,0.709-0.192,1.008 c-0.259,0.18-0.569,0.775-0.569,0.775s-0.159,1.149,0.699,0.953C39.035,40,41.674,36.48,40.348,35.855z" fill="url(#SVGID_6)"/>
-<rect fill="none" height="59.996" width="59.996"/>
-<rect fill-opacity="0.4" height="24.999" stroke-opacity="0.4" transform="matrix(0.8133 -0.5819 0.5819 0.8133 -15.5607 18.7982)" width="3.674" x="19.673" y="21.145"/>
+<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)"/>
+<path d="M49.98,25c-0.021-0.102-0.049-0.197-0.07-0.296-0.105-0.499-0.233-0.99-0.377-1.473-0.039-0.13-0.076-0.265-0.117-0.395-0.176-0.548-0.372-1.09-0.592-1.617-0.039-0.093-0.084-0.184-0.123-0.275-0.203-0.464-0.422-0.918-0.658-1.363-0.055-0.106-0.109-0.215-0.166-0.319-0.279-0.502-0.574-0.993-0.892-1.468-0.054-0.083-0.115-0.162-0.171-0.242-0.291-0.422-0.596-0.831-0.916-1.228-0.063-0.079-0.126-0.161-0.193-0.241-0.368-0.443-0.756-0.868-1.16-1.277-0.07-0.071-0.143-0.141-0.215-0.208-0.371-0.364-0.756-0.714-1.153-1.047-0.067-0.056-0.132-0.116-0.198-0.171-0.448-0.366-0.915-0.714-1.395-1.042-0.084-0.058-0.17-0.113-0.256-0.167-0.442-0.294-0.898-0.572-1.365-0.83-0.064-0.035-0.124-0.073-0.188-0.108-0.52-0.278-1.049-0.533-1.594-0.768-0.097-0.041-0.195-0.079-0.29-0.12-0.212-0.087-0.432-0.156-0.646-0.235-0.255,0.163-1.438,0.832-1.438,0.832s-5.141-0.702-5.492-0.353c-0.351,0.353-1.721,0.71-2.033,0.751-0.31,0.039-0.956,0.206-0.181,1.161-0.116,0.118-2.325,1.657-2.325,0.957,0-0.701,0.494-1.953-0.2-1.282-0.498,0.482-0.796,1.135-0.86,1.257-0.163,0.313-0.263,0.462-0.145,1.357s-1.43,0.891-1.534,0.659c-0.277-0.622-1.809,1.394-1.809,1.394l0.647,0.828s-4.509,3.474-4.548,3.707c-0.039,0.234-1.164,3.25-0.775,4.146,0.389,0.898,1.375,3.158,2.307,3.233,1.221,0.1,4.185-0.559,4.185-0.559,0.08,0.196,0.637,1.189,0.637,1.189s1.453-0.047,1.534,0.11c0.027,0.053,1.75,5.121,1.182,5.793-1.357,2.032,0.775,5.011,1.369,6.018,0.595,1.731,0.977,0.957,1.758,1.239,0.961,0.084,1.773,0.439,2.589-0.611,0.237-0.195,0.641-0.041,0.641-0.313,0-0.152,0.697-0.598,0.877-1.018,0.189-0.089,0.675-0.415,1.004-0.572,0.299-0.02-0.283-0.82,0.309-1.666,0.639-0.252,2.364-1.415,2.364-1.415,0.077-1.704-0.839-3.812,0.873-5.02,1.104-1.125,2.552-1.765,3.253-3.478,0.195-0.505,0.629-1.542-0.619-1.231-1.172,0.295-2.479,0.362-1.861-0.154-0.07-0.634-0.85-0.931-1.549-1.551-0.361-0.854-0.93-2.378-0.93-2.378l-1.24-1.884,0.156-0.389,1.473,2.17,1.475,1.782c0.541,1.783,1.006,1.939,1.006,1.939,0.816-0.289,2.752-1.085,2.752-1.085l1.899-1.823s-0.195-0.581-0.967-1.316l-0.584-0.349c-0.126,0.357-0.802,0.492-0.802,0.492l-1.641-1.963,0.61-0.123,0.471,0.896,1.128,0.39s0.313-0.229,0.893,0.371c0.473-0.04,2.318,0.089,2.749,0.636,0.085,0.109,2.286,5.606,2.72,5.614,0.191,0.001,0.329,0.077,0.268-0.256-0.078-0.157,0-3.609,0.115-4.349,0.295-0.627,0.344-0.002,1.039,1.188-0.01-0.04-0.02-0.07-0.02-0.09zm-19.37-13.33c0.153-0.459,1.046-0.615,1.046-0.615s-0.256,0.472-0.196,0.716c0.06,0.246-0.407,0.401-0.46,0.982-0.051,0.577-1.117,0.239-1.205,0.036-0.09-0.21,0.65-0.67,0.81-1.13zm3.82,7.8c-0.661,0-2.644,0.196-3.189-0.193-0.547-0.389-0.97,0.039-1.363,0.429-0.258,0.253-1.193-0.259-1.467-0.649-0.272-0.39-1.188-0.361-1.188-0.361l0.208-1.11-2.637-0.128-1.499,0.439-1.411,0.041,0.79-0.376,0.984-0.232s1.431-1.175,1.858-1.525c0.364-0.296,1.81-0.129,1.81-0.129l1.589,1.146s-0.353,0.898-0.508,1.09c0.583-0.039,1.269-1.099,1.269-1.099-1.239-1.138-1.189-1.524-1.189-1.524l1.633,1.146,0.015,0.01s0.662,1.558,0.937,1.558c0.271,0,0.619-1.073,0.619-1.073l0.466-0.117c0.207,0.492,0.594,1.602,1.059,1.343,0.268-0.147,0.709-0.013,1.213,0.18,0.51,0.195,0.854-0.104,1.268,0.258-0.04,1.6-0.99,0.95-1.26,0.87zm1.04-2.68c-0.682-0.259-2.984,0.586-2.469-0.796,0.274-0.746,0.98-0.902,1.221-0.405,0.063,0.203,0.83,0.519,0.825,0.089-0.006-0.43,0.771-0.659,0.883-0.338-0.41,0.31,1.63,1.86-0.45,1.46zm4.34,1.31c-0.377-0.304,0.169-0.564-0.387-1.04-0.799-0.684-1.421-0.979-0.334-1.532,1.34-0.168,0.217,0.428,0.439,0.785,0.119,0.19,0.797,0.828,1.326,1.61,0.43,0.64-0.68,0.47-1.05,0.17z" fill="url(#SVGID_6)"/>
+<path d="M40.35,35.86l-1.293,1.291-0.814,0.311c-0.018,0.133-0.063,0.709-0.192,1.008-0.259,0.18-0.569,0.775-0.569,0.775s-0.159,1.149,0.699,0.953c0.85-0.19,3.48-3.71,2.16-4.33z" fill="url(#SVGID_6)"/>
+<rect fill="none" height="60" width="60"/>
+<rect fill-opacity="0.4" height="25" stroke-opacity="0.4" transform="matrix(0.8133 -0.5819 0.5819 0.8133 -15.5607 18.7982)" width="3.674" x="19.67" y="21.14"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10" x1="22.2" x2="20.47" y1="32.54" y2="33.77">
 <stop offset="0" stop-color="#999999"/>
 <stop offset="0.27" stop-color="#FFFFFF"/>
@@ -48,8 +48,8 @@
 <stop offset="0.82" stop-color="#666666"/>
 <stop offset="1" stop-color="#B3B3B3"/>
 </linearGradient>
-<polygon fill="url(#SVGID_10)" points="27.434,43.408 13.595,24.078 15.586,22.653 29.425,41.983 "/>
-<rect fill-opacity="0.4" height="3.673" stroke-opacity="0.4" transform="matrix(0.5821 -0.8131 0.8131 0.5821 -11.1119 45.664)" width="24.998" x="26.369" y="31.806"/>
+<polygon fill="url(#SVGID_10)" points="27.43,43.41,13.6,24.08,15.59,22.65,29.42,41.98"/>
+<rect fill-opacity="0.4" height="3.673" stroke-opacity="0.4" transform="matrix(0.5821 -0.8131 0.8131 0.5821 -11.1119 45.664)" width="25" x="26.37" y="31.81"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11" x1="38.02" x2="39.86" y1="32.42" y2="33.75">
 <stop offset="0" stop-color="#999999"/>
 <stop offset="0.27" stop-color="#FFFFFF"/>
@@ -57,8 +57,8 @@
 <stop offset="0.82" stop-color="#666666"/>
 <stop offset="1" stop-color="#B3B3B3"/>
 </linearGradient>
-<polygon fill="url(#SVGID_11)" points="32.944,43.408 46.783,24.078 44.791,22.653 30.953,41.983 "/>
-<rect fill-opacity="0.4" height="3.673" stroke-opacity="0.4" width="33.134" x="12.89" y="17.697"/>
+<polygon fill="url(#SVGID_11)" points="32.94,43.41,46.78,24.08,44.79,22.65,30.95,41.98"/>
+<rect fill-opacity="0.4" height="3.673" stroke-opacity="0.4" width="33.13" x="12.89" y="17.7"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12" x1="29.46" x2="29.46" y1="17.65" y2="20.41">
 <stop offset="0" stop-color="#999999"/>
 <stop offset="0.27" stop-color="#FFFFFF"/>
@@ -66,198 +66,198 @@
 <stop offset="0.82" stop-color="#666666"/>
 <stop offset="1" stop-color="#B3B3B3"/>
 </linearGradient>
-<polygon fill="url(#SVGID_12)" points="45.412,20.146 13.502,20.146 13.502,17.697 45.412,17.697 "/>
+<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"/>
 </linearGradient>
-<path d="M35.363,45.609l-0.757-0.28l-0.134-0.055l-0.16-0.062 l-0.428-0.172c-0.199-0.361-0.211-1.13-0.064-1.471l-0.262-0.146l0.283,0.101c0.043-0.067,0.084-0.136,0.126-0.208l0.043-0.069 c0.319-0.522,0.617-1.071,0.885-1.634c0.669-0.076,1.322-0.654,1.659-1.489c0.387-0.95,0.262-1.936-0.283-2.444 c0.493-2.213,0.152-4.221-0.959-5.652c-1.123-1.449-2.96-2.258-5.325-2.335c-2.061,0-3.124,0.913-3.877,1.834 c-0.559,0.129-1.289,0.453-1.808,1.257c-0.7,1.084-0.787,2.715-0.259,4.851c-0.583,0.487-0.74,1.474-0.365,2.456 c0.353,0.922,1.079,1.539,1.808,1.539c0.005,0,0.007,0,0.013,0c0.114,0.242,0.234,0.479,0.357,0.711h-0.039l0.277,0.453 c0,0,0.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 c-1.251,0.477-2.672,1.017-3.214,1.305c-0.548,0.291-1.022,0.639-1.431,1.033c2.953,1.533,6.304,2.406,9.861,2.406 c3.646,0,7.078-0.914,10.083-2.52c-0.555-0.522-1.066-0.816-1.269-0.923C38.29,46.697,36.668,46.096,35.363,45.609z" fill="url(#SVGID_13)" fill-opacity="0.2" stroke-opacity="0.2"/>
+<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="1" stop-color="#000000"/>
 </linearGradient>
-<path d="M35.26,45.89l-0.766-0.284l-0.129-0.052l-0.164-0.063 l-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 c0.041-0.066,0.084-0.134,0.121-0.201l0.045-0.069c0.344-0.563,0.662-1.157,0.947-1.769c0.016,0.001,0.029,0.001,0.045,0.001 c0.599,0,1.213-0.526,1.531-1.312c0.37-0.914,0.217-1.848-0.339-2.216c0.026-0.114,0.039-0.177,0.039-0.177 c0.474-2.127,0.153-4.049-0.903-5.41c-1.066-1.377-2.824-2.144-5.089-2.219c-1.961,0-2.952,0.856-3.712,1.805 c-0.537,0.104-1.234,0.394-1.722,1.15c-0.675,1.044-0.731,2.663-0.171,4.814c-0.597,0.337-0.785,1.283-0.425,2.224 c0.309,0.804,0.923,1.347,1.529,1.347c0.064,0,0.13-0.007,0.191-0.02c0.213,0.455,0.441,0.9,0.684,1.326H26.35l0.362,0.592 c0,0,0.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 c-1.246,0.474-2.66,1.012-3.187,1.292c-0.489,0.259-0.921,0.564-1.293,0.912c2.885,1.445,6.138,2.264,9.584,2.264 c3.533,0,6.863-0.86,9.801-2.376c-0.495-0.449-0.942-0.707-1.126-0.802C38.17,46.971,36.555,46.371,35.26,45.89z" fill="url(#SVGID_14)" fill-opacity="0.4" stroke-opacity="0.4"/>
+<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"/>
 </radialGradient>
-<path d="M33.777,45.442c-0.79-0.343-0.766-2.028-0.439-2.538c0.057-0.089,0.109-0.178,0.164-0.268 h-6.62c0.054,0.09,0.106,0.179,0.163,0.268c0.327,0.51,0.352,2.195-0.439,2.538c-0.792,0.345,3.68,3.339,3.68,3.339 S34.57,45.787,33.777,45.442z" fill="url(#SVGID_15)"/>
+<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"/>
 </linearGradient>
-<path d="M38.536,47.2c-0.832-0.434-4.959-1.878-5.036-1.968l-3.151,2.619l-3.386-2.721 c-0.094,0.139-4.171,1.568-5.116,2.069c-1.08,0.573-2.844,1.892-2.844,4.86H41.38C41.38,49.092,39.367,47.633,38.536,47.2z" fill="url(#SVGID_16)"/>
+<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">
 <stop offset="0" stop-color="#FAFAFA"/>
 <stop offset="0.78" stop-color="#CCCCCC"/>
 <stop offset="1" stop-color="#D1D1D1"/>
 </linearGradient>
-<polygon fill="url(#SVGID_17)" points="26.19,45.467 30.349,48.781 34.254,45.535 33.5,45.232 30.349,47.852 26.963,45.131 "/>
+<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"/>
 </linearGradient>
-<path d="M26.387,45.992c0,0-5.931,1.549-5.931,5.703c0,0-0.848,0-0.854,0 C19.602,49.141,21.595,47.152,26.387,45.992z" fill="url(#SVGID_18)"/>
+<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"/>
 </linearGradient>
-<path d="M33.918,45.896c0,0,5.932,1.549,5.932,5.704c0,0,0.848,0,0.854,0 C40.704,49.044,38.709,47.057,33.918,45.896z" fill="url(#SVGID_19)"/>
-<polygon fill="#020202" fill-opacity="0.3" points="30.349,48.781 26.19,45.467 25.949,45.572 30.349,49.078 34.496,45.63 34.254,45.533 " stroke-opacity="0.3"/>
+<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"/>
 </radialGradient>
-<path d="M35.681,37.694c-0.028-0.014-0.062-0.016-0.089-0.024l0,0 c-0.006-0.002-0.011-0.004-0.016-0.004c-0.045-0.013-0.088-0.021-0.133-0.025c-5.527-0.961-8.062-4.021-8.253-3.211 c-0.152,0.645-1.702,2.039-2.513,2.736c0.006,0.031,0.01,0.059,0.017,0.09c0,0,0.03,0.143,0.089,0.385 c-0.063,0.008-0.126,0.021-0.188,0.047c-0.517,0.217-0.679,1.063-0.362,1.891c0.316,0.827,0.991,1.322,1.508,1.104 c0.032-0.014,0.059-0.036,0.089-0.056c0.3,0.676,0.668,1.397,1.119,2.123c0.755,0.898,1.914,1.951,3.192,1.951 c1.547,0,2.493-0.846,3.144-1.698c0.016-0.036,0.033-0.069,0.053-0.099c0.482-0.753,0.873-1.51,1.188-2.213 c0.505,0.175,1.153-0.294,1.476-1.089C36.336,38.779,36.193,37.925,35.681,37.694z" fill="url(#SVGID_20)"/>
+<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"/>
 </linearGradient>
-<path d="M29.915,44.27c-0.942,0-1.892-0.439-2.589-1.1c0.74,0.776,1.733,1.531,2.817,1.531 c1.546,0,2.493-0.846,3.144-1.698c0.015-0.036,0.031-0.069,0.053-0.099c0.48-0.753,0.873-1.51,1.188-2.213 C32.768,43.766,31.461,44.27,29.915,44.27z" fill="url(#SVGID_21)"/>
+<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"/>
 </linearGradient>
-<path d="M29.987,29.99c-1.917,0-2.837,0.872-3.549,1.782c-1.158,0.178-2.991,1.238-1.696,5.884 c0.812-0.695,2.295-2.581,2.447-3.226c0.192-0.819,2.771,2.307,8.402,3.238c0.064-0.26,0.095-0.413,0.095-0.413 C36.572,33.289,34.649,30.146,29.987,29.99z" fill="url(#SVGID_22)"/>
+<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"/>
 </linearGradient>
-<path d="M27.198,34.05c0,0,2.756,3.62,8.355,3.614C35.553,37.664,32.916,37.25,27.198,34.05z" fill="url(#SVGID_23)"/>
+<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"/>
 </linearGradient>
-<path d="M26.534,32.041c0,0-2.699,0.161-1.697,4.734C24.837,36.775,24.507,33.644,26.534,32.041z" fill="url(#SVGID_24)"/>
+<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"/>
 </linearGradient>
-<path d="M31.295,32.674c-1.257-0.179-3.381-1.292-4.215-0.895c0,0,2.726-3.11,7.539,0.432 C34.619,32.211,33.471,32.984,31.295,32.674z" fill="url(#SVGID_25)"/>
-<rect fill="none" height="29.998" width="29.997" x="15.192" y="26.325"/>
+<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"/>
 </linearGradient>
-<path d="M8.773,26.072h13.092v-0.487 c0-2.907-2.152-4.174-2.584-4.4c-0.426-0.222-1.75-0.714-2.816-1.11l-0.617-0.229l-0.11-0.044l-0.131-0.05l-0.35-0.14 c-0.162-0.295-0.171-0.922-0.052-1.201l-0.213-0.119l0.23,0.082c0.035-0.056,0.067-0.111,0.103-0.169l0.036-0.057 c0.261-0.427,0.503-0.875,0.723-1.334c0.545-0.062,1.08-0.534,1.355-1.215c0.315-0.775,0.213-1.58-0.231-1.996 c0.149-0.672,0.204-1.319,0.168-1.928C12.782,15.03,9.577,20.167,8.773,26.072z" fill="url(#SVGID_26)" fill-opacity="0.2" stroke-opacity="0.2"/>
+<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="1" stop-color="#000000"/>
 </linearGradient>
-<path d="M8.804,25.828h12.817v-0.243 c0-2.767-2.043-3.971-2.453-4.184c-0.413-0.214-1.73-0.704-2.788-1.097l-0.625-0.232l-0.104-0.042l-0.135-0.051l-0.422-0.169 c-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.05c0.034-0.055,0.068-0.109,0.099-0.165 l0.036-0.057c0.281-0.459,0.542-0.944,0.773-1.443c0.013,0,0.025,0,0.038,0c0.488,0,0.99-0.43,1.25-1.071 c0.302-0.746,0.177-1.508-0.277-1.809c0.021-0.092,0.033-0.144,0.033-0.144c0.132-0.592,0.182-1.162,0.166-1.704 C12.73,15.16,9.646,20.129,8.804,25.828z" fill="url(#SVGID_27)" fill-opacity="0.4" stroke-opacity="0.4"/>
+<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"/>
 </radialGradient>
-<path d="M15.171,19.939c-0.646-0.281-0.625-1.656-0.359-2.073c0.047-0.072,0.089-0.145,0.134-0.218 H9.542c0.043,0.073,0.087,0.146,0.133,0.218c0.266,0.417,0.287,1.792-0.359,2.073s3.003,2.725,3.003,2.725 S15.818,20.22,15.171,19.939z" fill="url(#SVGID_28)"/>
+<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"/>
 </linearGradient>
-<path d="M19.056,21.374c-0.68-0.354-4.047-1.533-4.111-1.606l-2.573,2.138l-2.764-2.221 c-0.077,0.113-3.406,1.28-4.176,1.689c-0.881,0.469-2.321,1.543-2.321,3.967h18.266C21.377,22.917,19.734,21.727,19.056,21.374z" fill="url(#SVGID_29)"/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_30)" points="8.978,19.959 12.372,22.664 15.56,20.015 14.945,19.768 12.372,21.905 9.608,19.685 "/>
-<path d="M9.138,20.388c0,0-4.842,1.264-4.842,4.655c0,0-0.692,0-0.697,0 C3.599,22.958,5.227,21.336,9.138,20.388z" fill="#FF7B56"/>
-<path d="M15.287,20.309c0,0,4.842,1.265,4.842,4.657c0,0,0.692,0,0.697,0 C20.826,22.879,19.197,21.257,15.287,20.309z" fill="#FF7B56"/>
+<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"/>
 <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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_31)" points="12.372,22.664 8.978,19.959 8.78,20.045 12.372,22.907 15.758,20.092 15.561,20.013 "/>
+<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"/>
 </radialGradient>
-<path d="M16.724,13.614c-0.023-0.012-0.049-0.013-0.072-0.021l0,0 c-0.005-0.001-0.009-0.002-0.013-0.003c-0.036-0.01-0.071-0.018-0.108-0.02c-4.511-0.784-6.582-3.283-6.737-2.621 c-0.124,0.526-1.39,1.665-2.051,2.232c0.005,0.026,0.008,0.048,0.013,0.074c0,0,0.024,0.116,0.074,0.315 c-0.052,0.006-0.104,0.016-0.154,0.038c-0.422,0.178-0.553,0.869-0.295,1.543c0.258,0.675,0.809,1.08,1.231,0.902 c0.026-0.012,0.048-0.03,0.072-0.045c0.244,0.551,0.546,1.141,0.914,1.733c0.617,0.733,1.563,1.593,2.605,1.593 c1.263,0,2.035-0.69,2.567-1.387c0.012-0.029,0.026-0.056,0.042-0.08c0.394-0.615,0.713-1.232,0.971-1.807 c0.413,0.143,0.941-0.241,1.204-0.889C17.26,14.5,17.143,13.802,16.724,13.614z" fill="url(#SVGID_32)"/>
+<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"/>
 </linearGradient>
-<path d="M12.018,18.981c-0.769,0-1.543-0.358-2.114-0.898c0.604,0.634,1.416,1.251,2.299,1.251 c1.263,0,2.035-0.69,2.567-1.387c0.012-0.029,0.026-0.057,0.042-0.081c0.394-0.615,0.713-1.232,0.971-1.806 C14.348,18.57,13.28,18.981,12.018,18.981z" fill="url(#SVGID_33)"/>
+<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"/>
 </linearGradient>
-<path d="M12.077,7.325c-1.564,0-2.316,0.71-2.897,1.455c-0.944,0.145-2.44,1.011-1.383,4.803 c0.663-0.568,1.874-2.107,1.998-2.633c0.158-0.669,2.262,1.883,6.859,2.644c0.053-0.213,0.078-0.338,0.078-0.338 C17.453,10.018,15.882,7.452,12.077,7.325z" fill="url(#SVGID_34)"/>
+<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"/>
 </linearGradient>
-<path d="M9.799,10.64c0,0,2.25,2.954,6.821,2.949C16.62,13.589,14.467,13.251,9.799,10.64z" fill="url(#SVGID_35)"/>
+<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"/>
 </linearGradient>
-<path d="M9.258,8.999c0,0-2.203,0.132-1.386,3.865C7.872,12.864,7.604,10.307,9.258,8.999z" fill="url(#SVGID_36)"/>
+<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"/>
 </linearGradient>
-<path d="M13.145,9.516c-1.025-0.146-2.76-1.055-3.44-0.73c0,0,2.225-2.539,6.154,0.352 C15.858,9.138,14.921,9.77,13.145,9.516z" fill="url(#SVGID_37)"/>
-<rect fill="none" height="24.488" width="24.488" y="4.333"/>
-<path d="M51.07,26.072H37.979v-0.487 c0-2.907,2.152-4.174,2.584-4.4c0.425-0.222,1.75-0.714,2.815-1.11l0.617-0.229l0.109-0.044l0.132-0.05l0.35-0.14 c0.162-0.295,0.171-0.922,0.051-1.201l0.214-0.119l-0.23,0.082c-0.034-0.056-0.067-0.111-0.103-0.169l-0.035-0.057 c-0.262-0.427-0.504-0.875-0.724-1.334c-0.545-0.062-1.079-0.534-1.354-1.215c-0.315-0.775-0.213-1.58,0.23-1.996 c-0.148-0.672-0.203-1.319-0.167-1.928C47.061,15.03,50.266,20.167,51.07,26.072z" fill="url(#SVGID_26)" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M51.039,25.828H38.222v-0.243 c0-2.767,2.042-3.971,2.453-4.184c0.413-0.214,1.729-0.704,2.788-1.097l0.625-0.232l0.104-0.042l0.136-0.051l0.421-0.169 c0.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.05c-0.034-0.055-0.067-0.109-0.099-0.165 l-0.037-0.057c-0.28-0.459-0.541-0.944-0.773-1.443c-0.012,0-0.024,0-0.037,0c-0.488,0-0.99-0.43-1.25-1.071 c-0.302-0.746-0.176-1.508,0.277-1.809c-0.021-0.092-0.033-0.144-0.033-0.144c-0.132-0.592-0.182-1.162-0.166-1.704 C47.111,15.16,50.197,20.129,51.039,25.828z" fill="url(#SVGID_27)" fill-opacity="0.4" stroke-opacity="0.4"/>
+<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"/>
 </radialGradient>
-<path d="M50.679,19.939c-0.646-0.281-0.624-1.656-0.358-2.073c0.046-0.072,0.089-0.145,0.133-0.218 H45.05c0.044,0.073,0.087,0.146,0.133,0.218c0.267,0.417,0.287,1.792-0.358,2.073c-0.646,0.281,3.003,2.725,3.003,2.725 S51.326,20.22,50.679,19.939z" fill="url(#SVGID_40)"/>
-<path d="M54.563,21.374c-0.68-0.354-4.048-1.533-4.11-1.606l-2.574,2.138l-2.764-2.221 c-0.076,0.113-3.405,1.28-4.176,1.689c-0.881,0.469-2.32,1.543-2.32,3.967h18.266C56.885,22.917,55.242,21.727,54.563,21.374z" fill="url(#SVGID_29)"/>
-<polygon fill="url(#SVGID_30)" points="44.485,19.959 47.879,22.664 51.067,20.015 50.453,19.768 47.879,21.905 45.115,19.685 "/>
-<path d="M44.646,20.388c0,0-4.842,1.264-4.842,4.655c0,0-0.693,0-0.697,0 C39.107,22.958,40.734,21.336,44.646,20.388z" fill="#FF7B56"/>
-<path d="M50.795,20.309c0,0,4.842,1.265,4.842,4.657c0,0,0.691,0,0.697,0 C56.334,22.879,54.705,21.257,50.795,20.309z" fill="#FF7B56"/>
-<polygon fill="url(#SVGID_31)" points="47.879,22.664 44.485,19.959 44.287,20.045 47.879,22.907 51.266,20.092 51.068,20.013 "/>
+<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"/>
+<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"/>
 </radialGradient>
-<path d="M52.231,13.614c-0.022-0.012-0.049-0.013-0.071-0.021l0,0 c-0.005-0.001-0.01-0.002-0.014-0.003c-0.035-0.01-0.07-0.018-0.108-0.02c-4.511-0.784-6.581-3.283-6.736-2.621 c-0.124,0.526-1.39,1.665-2.052,2.232c0.006,0.026,0.009,0.048,0.014,0.074c0,0,0.023,0.116,0.073,0.315 c-0.052,0.006-0.104,0.016-0.153,0.038c-0.422,0.178-0.554,0.869-0.295,1.543c0.258,0.675,0.809,1.08,1.23,0.902 c0.025-0.012,0.048-0.03,0.072-0.045c0.244,0.551,0.546,1.141,0.914,1.733c0.617,0.733,1.563,1.593,2.605,1.593 c1.263,0,2.035-0.69,2.566-1.387c0.012-0.029,0.026-0.056,0.042-0.08c0.394-0.615,0.712-1.232,0.971-1.807 c0.413,0.143,0.94-0.241,1.204-0.889C52.768,14.5,52.65,13.802,52.231,13.614z" fill="url(#SVGID_44)"/>
+<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"/>
 </linearGradient>
-<path d="M47.525,18.981c-0.769,0-1.543-0.358-2.113-0.898c0.604,0.634,1.416,1.251,2.299,1.251 c1.264,0,2.035-0.69,2.567-1.387c0.013-0.029,0.026-0.057,0.042-0.081c0.393-0.615,0.712-1.232,0.971-1.806 C49.855,18.57,48.788,18.981,47.525,18.981z" fill="url(#SVGID_45)"/>
-<path d="M47.584,7.325c-1.563,0-2.315,0.71-2.896,1.455c-0.944,0.145-2.441,1.011-1.383,4.803 c0.662-0.568,1.873-2.107,1.998-2.633c0.156-0.669,2.261,1.883,6.857,2.644c0.054-0.213,0.078-0.338,0.078-0.338 C52.96,10.018,51.391,7.452,47.584,7.325z" fill="url(#SVGID_34)"/>
+<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"/>
 </linearGradient>
-<path d="M45.307,10.64c0,0,2.25,2.954,6.822,2.949C52.127,13.589,49.975,13.251,45.307,10.64z" fill="url(#SVGID_47)"/>
+<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"/>
 </linearGradient>
-<path d="M44.766,8.999c0,0-2.203,0.132-1.386,3.865C43.38,12.864,43.111,10.307,44.766,8.999z" fill="url(#SVGID_48)"/>
+<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"/>
 </linearGradient>
-<path d="M48.652,9.516c-1.025-0.146-2.761-1.055-3.439-0.73c0,0,2.225-2.539,6.153,0.352 C51.365,9.138,50.429,9.77,48.652,9.516z" fill="url(#SVGID_49)"/>
-<rect fill="none" height="24.488" width="24.488" x="35.508" y="4.333"/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_speaker.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_speaker.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_speaker.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,96 +1,97 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.9995" x2="29.9995" y1="6.4688" y2="53.4602">
+<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"/>
 </linearGradient>
-<path d="M48.875,51.531c0,1.105-0.896,2-2,2h-33.75c-1.104,0-2-0.895-2-2V8.469c0-1.104,0.896-2,2-2h33.75  c1.104,0,2,0.896,2,2V51.531z" fill="url(#SVGID_1_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="29.9995" x2="29.9995" y1="7.4688" y2="52.4632">
+<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"/>
 </linearGradient>
-<path d="M13.125,52.531c-0.552,0-1-0.449-1-1V8.469c0-0.551,0.448-1,1-1h33.75c0.552,0,1,0.449,1,1v43.063  c0,0.551-0.448,1-1,1H13.125z" fill="url(#SVGID_2_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="29.9995" x2="29.9995" y1="8.4688" y2="51.4663">
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_3_)" height="43.063" width="33.75" x="13.125" y="8.469"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="30.0005" x2="30.0005" y1="39.6572" y2="11.1355">
+<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"/>
 </linearGradient>
-<circle cx="30" cy="25.548" fill="url(#SVGID_4_)" r="14.304"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="29.9995" x2="29.9995" y1="12.2061" y2="38.814">
+<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"/>
 </linearGradient>
-<path d="M29.999,38.852c-7.335,0-13.303-5.967-13.303-13.303c0-7.336,5.968-13.304,13.303-13.304  c7.336,0,13.305,5.968,13.305,13.304C43.304,32.885,37.335,38.852,29.999,38.852L29.999,38.852z" fill="url(#SVGID_5_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="29.9976" x2="29.9976" y1="13.5479" y2="37.4181">
+<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="1" style="stop-color:#FFFFFF"/>
 </linearGradient>
-<path d="M29.999,37.549c-6.617,0-12.001-5.383-12.001-12c0-6.617,5.384-12,12.001-12  c6.616,0,11.999,5.383,11.999,12C41.998,32.166,36.615,37.549,29.999,37.549L29.999,37.549z" fill="url(#SVGID_6_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="29.9995" x2="29.9995" y1="33.8838" y2="17.1018">
+<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_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="29.998" x2="29.998" y1="34.6191" y2="14.6512">
 <stop offset="0" style="stop-color:#CBCBCB"/>
 <stop offset="1" style="stop-color:#4D4D4D"/>
 </linearGradient>
-<circle cx="29.999" cy="25.548" fill="url(#SVGID_7_)" r="8.568"/>
-<path d="M36.896,30.615l-2.83-2.509h-7.617l-3.245,2.647c1.567,2.042,4.023,3.364,6.796,3.364  C32.832,34.117,35.337,32.736,36.896,30.615z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
-<circle cx="29.999" cy="26.921" fill-opacity="0.15" r="5.553" stroke-opacity="0.15"/>
-<radialGradient cx="63.9912" cy="85.5537" gradientTransform="matrix(0.5638 0 0 0.5638 -6.0589 -24.1419)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="11.0894">
+<circle cx="29.998" cy="24.702" fill="url(#SVGID_7_)" r="10.195"/>
+<path d="M38.205,30.732l-3.368-2.985h-9.063l-3.861,3.148c1.865,2.429,4.787,4.002,8.086,4.002  C33.369,34.897,36.35,33.255,38.205,30.732z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
+<circle cx="29.998" cy="26.336" fill-opacity="0.15" r="6.607" stroke-opacity="0.15"/>
+<radialGradient cx="313.3594" cy="-573.2905" gradientTransform="matrix(0.5638 0 0 0.5638 -146.6494 346.192)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="13.1949">
 <stop offset="0" style="stop-color:#737373"/>
 <stop offset="1" style="stop-color:#000000"/>
 </radialGradient>
-<circle cx="29.999" cy="25.548" fill="url(#SVGID_8_)" r="5.553"/>
-<path d="M29.999,30.373c-2.661,0-4.826-2.164-4.826-4.824s2.165-4.826,4.826-4.826  c2.66,0,4.824,2.166,4.824,4.826S32.659,30.373,29.999,30.373L29.999,30.373z M29.999,21.646c-2.153,0-3.903,1.75-3.903,3.903  c0,2.151,1.75,3.902,3.903,3.902c2.151,0,3.901-1.751,3.901-3.902C33.9,23.396,32.15,21.646,29.999,21.646L29.999,21.646z" fill="#EBEBEB" fill-opacity="0.2" stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="43.25" x2="43.25" y1="50.9102" y2="47.2434">
+<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"/>
 </linearGradient>
-<circle cx="43.25" cy="49.09" fill="url(#SVGID_9_)" r="2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="43.25" x2="43.25" y1="50" y2="48.1666">
+<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">
 <stop offset="0" style="stop-color:#4D4D4D"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
-<path d="M43.25,50.09c-0.552,0-1-0.449-1-1s0.448-1,1-1s1,0.449,1,1S43.802,50.09,43.25,50.09L43.25,50.09z" fill="url(#SVGID_10_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="16.333" x2="16.333" y1="50.9102" y2="47.2434">
+<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"/>
 </linearGradient>
-<circle cx="16.333" cy="49.09" fill="url(#SVGID_11_)" r="2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="16.333" x2="16.333" y1="50" y2="48.1666">
+<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">
 <stop offset="0" style="stop-color:#4D4D4D"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
-<path d="M16.333,50.09c-0.552,0-1-0.449-1-1s0.448-1,1-1s1,0.449,1,1S16.885,50.09,16.333,50.09  L16.333,50.09z" fill="url(#SVGID_12_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="43.25" x2="43.25" y1="13.1606" y2="9.4938">
+<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"/>
 </linearGradient>
-<circle cx="43.25" cy="11.34" fill="url(#SVGID_13_)" r="2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="43.25" x2="43.25" y1="12.25" y2="10.4166">
+<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">
 <stop offset="0" style="stop-color:#4D4D4D"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
-<path d="M43.25,12.34c-0.552,0-1-0.449-1-1s0.448-1,1-1s1,0.449,1,1S43.802,12.34,43.25,12.34L43.25,12.34z" fill="url(#SVGID_14_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="16.333" x2="16.333" y1="13.1606" y2="9.4938">
+<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"/>
 </linearGradient>
-<circle cx="16.333" cy="11.34" fill="url(#SVGID_15_)" r="2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="16.333" x2="16.333" y1="12.25" y2="10.4166">
+<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">
 <stop offset="0" style="stop-color:#4D4D4D"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
-<path d="M16.333,12.34c-0.552,0-1-0.449-1-1s0.448-1,1-1s1,0.449,1,1S16.885,12.34,16.333,12.34  L16.333,12.34z" fill="url(#SVGID_16_)"/>
+<path d="M13.737,8.986c-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,8.453,14.394,8.986,13.737,8.986L13.737,8.986z" fill="url(#SVGID_16_)"/>
 <rect fill="none" height="60" width="60"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_stereo.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_stereo.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_stereo.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,92 +1,93 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30.3501" x2="30.3501" y1="5.3462" y2="33.3866">
+<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="1" style="stop-color:#F2F2F2"/>
 </linearGradient>
-<path d="M48.715,34.427c-0.031-1.344-0.027-2.737-0.023-4.156c0.023-7.337,3.584-21.509-17.949-21.509  c-21.535,0-18.771,9.968-18.875,22.51c-0.01,1.073-0.02,2.13-0.043,3.155l-3.998-0.09c0.023-1.008,0.031-2.045,0.041-3.099  C7.971,18.798,5.15,4.762,30.742,4.762c25.59,0,21.975,17.747,21.949,25.521c-0.004,1.385-0.008,2.744,0.021,4.055L48.715,34.427  L48.715,34.427z" fill="url(#SVGID_1_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30.354" x2="30.354" y1="5.8262" y2="32.9112">
+<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"/>
 </linearGradient>
-<path d="M49.197,33.411c-0.012-1.025-0.01-2.076-0.006-3.14c0.003-0.845,0.049-1.782,0.099-2.78  c0.234-4.701,0.525-10.551-3.289-14.56c-2.948-3.099-8.082-4.67-15.259-4.67c-7.991,0-13.275,1.422-16.156,4.348  c-3.427,3.481-3.344,8.755-3.248,14.861c0.02,1.244,0.04,2.513,0.029,3.796l-0.031,2.649l-3.001-0.067l0.009-0.498  c0.012-0.691,0.018-1.396,0.023-2.107c0.01-1.229-0.007-2.457-0.024-3.675c-0.093-6.616-0.181-12.865,4.021-17.127  c3.437-3.485,9.448-5.18,18.378-5.18c8.076,0,13.944,1.857,17.441,5.52c4.65,4.871,4.329,11.823,4.095,16.899  c-0.044,0.947-0.085,1.823-0.087,2.6l-0.001,0.461c-0.002,0.884-0.004,1.757,0.007,2.612l0.006,0.495l-3,0.067L49.197,33.411z" fill="url(#SVGID_2_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="19.7285" x2="19.7285" y1="29.2803" y2="54.2808">
+<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">
 <stop offset="0" style="stop-color:#7B7B7B"/>
 <stop offset="0.1455" style="stop-color:#565656"/>
 <stop offset="0.3091" style="stop-color:#8C8C8C"/>
 <stop offset="0.6848" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#646464"/>
 </linearGradient>
-<path d="M22.854,51.28c0,1.65-1.35,3-3,3h-3.25v-25h3.25c1.65,0,3,1.35,3,3V51.28z" fill="url(#SVGID_3_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="9.6865" x2="9.6865" y1="32.8848" y2="50.6758">
+<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.3697" style="stop-color:#F2F2F2"/>
 <stop offset="0.7576" style="stop-color:#949DA1"/>
 <stop offset="1" style="stop-color:#D3D6D7"/>
 </linearGradient>
-<rect fill="url(#SVGID_4_)" height="17.791" width="5.834" x="6.77" y="32.885"/>
-<rect fill="#FFFFFF" fill-opacity="0.35" height="17.791" stroke-opacity="0.35" width="1" x="6.77" y="32.885"/>
-<rect fill-opacity="0.5" height="25" stroke-opacity="0.5" width="2" x="16.604" y="29.28"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="15.6035" x2="15.6035" y1="28.3223" y2="55.2388">
+<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"/>
+<rect fill-opacity="0.5" height="27.736" stroke-opacity="0.5" width="2.219" x="15.137" y="29.201"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="14.0273" x2="14.0273" y1="28.1387" y2="58">
 <stop offset="0" style="stop-color:#7E7E7E"/>
 <stop offset="0.1394" style="stop-color:#000000"/>
 <stop offset="0.2727" style="stop-color:#555555"/>
 <stop offset="0.6909" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#707070"/>
 </linearGradient>
-<polygon fill="url(#SVGID_5_)" points="14.604,28.322 13.604,41.219 14.604,55.238 17.604,55.238 17.604,28.322 "/>
-<rect fill="#FFFFFF" fill-opacity="0.15" height="26.916" stroke-opacity="0.15" width="1" x="16.604" y="28.322"/>
-<rect fill-opacity="0.5" height="17.791" stroke-opacity="0.5" width="1.25" x="11.354" y="32.885"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="13.4785" x2="13.4785" y1="28.3223" y2="55.2388">
+<polygon fill="url(#SVGID_5_)" points="12.918,28.139 11.809,42.446 12.918,58 16.246,58 16.246,28.139 "/>
+<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.2848" style="stop-color:#F2F2F2"/>
 <stop offset="0.6485" style="stop-color:#949DA1"/>
 <stop offset="1" style="stop-color:#F2F2F2"/>
 </linearGradient>
-<polygon fill="url(#SVGID_6_)" points="12.354,30.322 12.354,53.238 14.604,55.238 14.604,28.322 "/>
-<linearGradient gradientTransform="matrix(-1 0 0 1 362.084 0)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="321.8145" x2="321.8145" y1="29.2803" y2="54.2808">
+<polygon fill="url(#SVGID_6_)" points="10.422,30.357 10.422,55.781 12.918,58 12.918,28.139 "/>
+<linearGradient gradientTransform="matrix(-1 0 0 1 -43.916 0)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="-85.3086" x2="-85.3086" y1="29.2012" y2="56.9375">
 <stop offset="0" style="stop-color:#7B7B7B"/>
 <stop offset="0.1455" style="stop-color:#565656"/>
 <stop offset="0.3091" style="stop-color:#8C8C8C"/>
 <stop offset="0.6848" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#646464"/>
 </linearGradient>
-<path d="M37.145,51.28c0,1.65,1.35,3,3,3h3.25v-25h-3.25c-1.65,0-3,1.35-3,3V51.28z" fill="url(#SVGID_7_)"/>
-<linearGradient gradientTransform="matrix(-1 0 0 1 362.084 0)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="311.7715" x2="311.7715" y1="32.8848" y2="50.6758">
+<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.3697" style="stop-color:#F2F2F2"/>
 <stop offset="0.7576" style="stop-color:#949DA1"/>
 <stop offset="1" style="stop-color:#D3D6D7"/>
 </linearGradient>
-<rect fill="url(#SVGID_8_)" height="17.791" width="5.832" x="47.396" y="32.885"/>
-<rect fill="#FFFFFF" fill-opacity="0.35" height="17.791" stroke-opacity="0.35" width="1" x="52.229" y="32.885"/>
-<rect fill-opacity="0.5" height="25" stroke-opacity="0.5" width="1.998" x="41.396" y="29.28"/>
-<linearGradient gradientTransform="matrix(-1 0 0 1 362.084 0)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="317.6875" x2="317.6875" y1="28.3223" y2="55.2388">
+<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"/>
+<rect fill-opacity="0.5" height="27.736" stroke-opacity="0.5" width="2.217" x="42.643" y="29.201"/>
+<linearGradient gradientTransform="matrix(-1 0 0 1 -43.916 0)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="-89.8867" x2="-89.8867" y1="28.1387" y2="58">
 <stop offset="0" style="stop-color:#7E7E7E"/>
 <stop offset="0.1394" style="stop-color:#000000"/>
 <stop offset="0.2727" style="stop-color:#555555"/>
 <stop offset="0.6909" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#707070"/>
 </linearGradient>
-<polygon fill="url(#SVGID_9_)" points="45.396,28.322 46.396,41.219 45.396,55.238 42.396,55.238 42.396,28.322 "/>
-<rect fill="#FFFFFF" fill-opacity="0.15" height="26.916" stroke-opacity="0.15" width="1" x="42.396" y="28.322"/>
-<rect fill-opacity="0.5" height="17.791" stroke-opacity="0.5" width="1.25" x="47.396" y="32.885"/>
-<linearGradient gradientTransform="matrix(-1 0 0 1 362.084 0)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="315.5625" x2="315.5625" y1="28.3223" y2="55.2388">
+<polygon fill="url(#SVGID_9_)" points="47.08,28.139 48.189,42.446 47.08,58 43.752,58 43.752,28.139 "/>
+<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.2848" style="stop-color:#F2F2F2"/>
 <stop offset="0.6485" style="stop-color:#949DA1"/>
 <stop offset="1" style="stop-color:#F2F2F2"/>
 </linearGradient>
-<polygon fill="url(#SVGID_10_)" points="47.646,30.322 47.646,53.238 45.396,55.238 45.396,28.322 "/>
+<polygon fill="url(#SVGID_10_)" points="49.576,30.357 49.576,55.781 47.08,58 47.08,28.139 "/>
 <rect fill="none" height="60" width="60"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_subscribed.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_subscribed.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,109 +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 gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.9995" x2="29.9995" y1="0.3882" y2="59.6489">
-<stop offset="0" style="stop-color:#A6A8AB"/>
-<stop offset="1" style="stop-color:#231F20"/>
-</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:#A9AAAD"/>
-<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:#F4FCFF"/>
-<stop offset="0.6242" style="stop-color:#C9CED1"/>
-<stop offset="1" style="stop-color:#9CA4A7"/>
-</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:#A6A8AB"/>
-<stop offset="1" style="stop-color:#231F20"/>
-</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:#A9AAAD"/>
-<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:#BC5800"/>
-<stop offset="0.3" style="stop-color:#A23600"/>
-<stop offset="1" style="stop-color:#D07100"/>
-</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="#600909" 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="#600909" 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:#8BC53F"/>
-<stop offset="0.3758" style="stop-color:#33773B"/>
-<stop offset="0.6303" style="stop-color:#004F3C"/>
-<stop offset="1" style="stop-color:#007338"/>
-</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:#BC5800"/>
-<stop offset="0.3" style="stop-color:#A23600"/>
-<stop offset="1" style="stop-color:#D07100"/>
-</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="#600909" 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:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
-</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:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
-</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:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
-</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:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
-</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:#D2FF8A"/>
-<stop offset="1" style="stop-color:#138F00"/>
-</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:#D2FF8A"/>
-<stop offset="1" style="stop-color:#138F00"/>
-</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:#A7FF00"/>
-<stop offset="0.2303" style="stop-color:#D6FF61"/>
-<stop offset="1" style="stop-color:#138F00"/>
-</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:#A7FF00"/>
-<stop offset="0.2303" style="stop-color:#D6FF61"/>
-<stop offset="1" style="stop-color:#138F00"/>
-</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:#C9CDCE"/>
-<stop offset="1" style="stop-color:#6E7273"/>
-</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:#E6E9E8"/>
-<stop offset="1" style="stop-color:#ADB2B5"/>
-</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 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_tasks.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_tasks.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_tasks.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,95 +1,96 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<g>
 <rect fill="none" height="60" width="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="30" x2="30" y1="9.28" y2="52.75">
-<stop offset="0" stop-color="#D49757"/>
-<stop offset="0.72" stop-color="#702200"/>
-<stop offset="1" stop-color="#8A4117"/>
+<rect fill="none" height="60" width="60"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -257 2114.0029)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="286.999" x2="286.999" y1="2109.4985" y2="2056.0034">
+<stop offset="0" style="stop-color:#D49757"/>
+<stop offset="1" style="stop-color:#702200"/>
 </linearGradient>
-<path d="M12.55,52.748c-1.013,0-1.837-0.824-1.837-1.836V11.119c0-1.012,0.824-1.836,1.837-1.836 h34.895c1.014,0,1.837,0.824,1.837,1.836v39.793c0,1.012-0.823,1.836-1.837,1.836H12.55z" fill="url(#SVGID_1)"/>
-<path d="M47.445,9.282H12.55c-1.013,0-1.837,0.824-1.837,1.836v0.612 c0-1.013,0.824-1.836,1.837-1.836h34.895c1.014,0,1.837,0.824,1.837,1.836v-0.612C49.282,10.106,48.459,9.282,47.445,9.282z" fill="#FFFFFF" fill-opacity="0.6" stroke-opacity="0.6"/>
-<path d="M47.445,52.137H12.55c-1.013,0-1.837-0.824-1.837-1.837v0.612 c0,1.012,0.824,1.836,1.837,1.836h34.895c1.014,0,1.837-0.824,1.837-1.836V50.3C49.282,51.313,48.459,52.137,47.445,52.137z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="30" x2="30" y1="12.24" y2="50.43">
-<stop offset="0" stop-color="#707173"/>
-<stop offset="1" stop-color="#000000"/>
+<path d="M8.526,58c-1.246,0-2.261-1.013-2.261-2.26V6.765c0-1.248,1.015-2.261,2.261-2.261h42.947  c1.247,0,2.262,1.013,2.262,2.261V55.74c0,1.247-1.015,2.26-2.262,2.26H8.526z" fill="url(#SVGID_1_)"/>
+<path d="M51.473,4.504H8.526c-1.246,0-2.261,1.013-2.261,2.261v0.753  c0-1.248,1.015-2.261,2.261-2.261h42.947c1.247,0,2.262,1.013,2.262,2.261V6.765C53.735,5.518,52.72,4.504,51.473,4.504z" 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.753  c0,1.247,1.015,2.26,2.261,2.26h42.947c1.247,0,2.262-1.013,2.262-2.26v-0.753C53.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 2114.0029)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="287" x2="287" y1="2105.8599" y2="2058.8542">
+<stop offset="0" style="stop-color:#707173"/>
+<stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
-<rect fill="url(#SVGID_2)" fill-opacity="0.3" height="37.957" stroke-opacity="0.3" width="33.672" x="13.162" y="12.343"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="30" x2="30" y1="12.86" y2="49.81">
-<stop offset="0" stop-color="#707173"/>
-<stop offset="1" stop-color="#000000"/>
+<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 2114.0029)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="287" x2="287" y1="2105.1021" y2="2059.6138">
+<stop offset="0" style="stop-color:#707173"/>
+<stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
-<rect fill="url(#SVGID_3)" fill-opacity="0.6" height="36.732" stroke-opacity="0.6" width="32.446" x="13.774" y="12.956"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="45.76" x2="14.3" y1="31.02" y2="31.02">
-<stop offset="0" stop-color="#737373"/>
-<stop offset="1" stop-color="#FFFFFF"/>
+<rect fill="url(#SVGID_3_)" fill-opacity="0.6" height="45.209" stroke-opacity="0.6" width="39.934" x="10.033" y="9.024"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -257 2114.0029)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="306.4023" x2="267.6852" y1="2082.7524" y2="2082.7524">
+<stop offset="0" style="stop-color:#737373"/>
+<stop offset="1" style="stop-color:#FFFFFF"/>
 </linearGradient>
-<rect fill="url(#SVGID_4)" height="34.896" width="31.223" x="14.387" y="13.567"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="45.65" x2="14.46" y1="30.4" y2="30.4">
-<stop offset="0" stop-color="#8A8C8E"/>
-<stop offset="1" stop-color="#4A4A4A"/>
+<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 2114.0029)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="306.2607" x2="267.8748" y1="2083.5054" y2="2083.5054">
+<stop offset="0" style="stop-color:#8A8C8E"/>
+<stop offset="1" style="stop-color:#4A4A4A"/>
 </linearGradient>
-<rect fill="url(#SVGID_5)" height="34.895" width="31.223" x="14.387" y="12.956"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6" x1="14.46" x2="45.76" y1="30.1" y2="30.1">
-<stop offset="0" stop-color="#737373"/>
-<stop offset="1" stop-color="#FFFFFF"/>
+<rect fill="url(#SVGID_5_)" height="42.948" width="38.427" x="10.787" y="9.024"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -257 2114.0029)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="267.8789" x2="306.4008" y1="2083.8804" y2="2083.8804">
+<stop offset="0" style="stop-color:#737373"/>
+<stop offset="1" style="stop-color:#FFFFFF"/>
 </linearGradient>
-<rect fill="url(#SVGID_6)" height="34.283" width="31.223" x="14.387" y="12.956"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7" x1="21.88" x2="17.02" y1="37.91" y2="42.77">
-<stop offset="0" stop-color="#737373"/>
-<stop offset="1" stop-color="#FFFFFF"/>
+<rect fill="url(#SVGID_6_)" height="42.195" width="38.427" x="10.787" y="9.024"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -257 2114.0029)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="277.0107" x2="271.0243" y1="2074.269" y2="2068.2825">
+<stop offset="0" style="stop-color:#737373"/>
+<stop offset="1" style="stop-color:#FFFFFF"/>
 </linearGradient>
-<rect fill="url(#SVGID_7)" height="33.671" width="31.223" x="14.387" y="12.956"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8" x1="30" x2="30" y1="26.05" y2="39.75">
-<stop offset="0" stop-color="#FFFFFF"/>
-<stop offset="0.25" stop-color="#FFFFFF"/>
-<stop offset="1" stop-color="#E1E1E1"/>
+<rect fill="url(#SVGID_7_)" height="41.441" width="38.427" x="10.787" y="9.024"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -257 2114.0029)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="286.999" x2="286.999" y1="2088.8618" y2="2072.0024">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="0.25" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#E1E1E1"/>
 </linearGradient>
-<path d="M14.387,34.994c0,0.674,0.389,1.615,0.866,2.09l8.064,8.064 c0.476,0.476,1.416,0.865,2.09,0.865h20.203V12.956H14.387V34.994z" fill="url(#SVGID_8)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9" x1="30" x2="30" y1="13.17" y2="46.09">
-<stop offset="0" stop-color="#F0F0F2"/>
-<stop offset="1" stop-color="#B3B5B8"/>
+<path d="M10.787,36.149c0,0.83,0.478,1.987,1.064,2.573l9.925,9.925c0.586,0.585,1.743,1.064,2.573,1.064  h24.864V9.024H10.787V36.149z" fill="url(#SVGID_8_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -257 2114.0029)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="286.999" x2="286.999" y1="2104.7153" y2="2064.199">
+<stop offset="0" style="stop-color:#F0F0F2"/>
+<stop offset="1" style="stop-color:#B3B5B8"/>
 </linearGradient>
-<path d="M44.996,13.567v31.835h-19.59c-0.508,0-1.298-0.326-1.657-0.687l-8.064-8.063 c-0.36-0.359-0.686-1.149-0.686-1.658V13.567H44.996 M45.609,12.956H14.387v22.039c0,0.674,0.389,1.615,0.866,2.09l8.064,8.064 c0.476,0.476,1.416,0.865,2.09,0.865h20.203V12.956L45.609,12.956z" fill="url(#SVGID_9)"/>
-<polygon fill="#929497" points="26.631,24.333 43.16,24.333 43.16,23.109 26.631,23.109 "/>
-<polygon fill="#929497" points="26.631,31.564 43.16,31.564 43.16,30.341 26.631,30.341 "/>
-<polygon fill="#929497" points="19.284,38.57 43.16,38.57 43.16,37.957 43.16,37.346 19.284,37.346 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10" x1="23.89" x2="19.35" y1="36.84" y2="41.38">
-<stop offset="0" stop-color="#FFFFFF"/>
-<stop offset="0.3" stop-color="#FFFFFF"/>
-<stop offset="0.56" stop-color="#E6E6E6"/>
-<stop offset="0.75" stop-color="#BCBCBC"/>
-<stop offset="1" stop-color="#8E8E8E"/>
+<path d="M48.46,9.778v39.181H24.349c-0.626,0-1.599-0.401-2.04-0.845l-9.925-9.924  c-0.443-0.441-0.845-1.413-0.845-2.04V9.778H48.46 M49.213,9.024H10.787v27.125c0,0.83,0.478,1.987,1.064,2.573l9.925,9.925  c0.586,0.585,1.743,1.064,2.573,1.064h24.864V9.024L49.213,9.024z" 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.929 46.199,31.929 46.199,30.422 25.856,30.422 "/>
+<polygon fill="#929497" points="16.815,40.549 46.199,40.549 46.199,39.796 46.199,39.042 16.815,39.042 "/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -257 2114.0029)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="279.4805" x2="273.8942" y1="2075.5806" y2="2069.9941">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="0.297" style="stop-color:#FFFFFF"/>
+<stop offset="0.5576" style="stop-color:#E6E6E6"/>
+<stop offset="0.7515" style="stop-color:#BCBCBC"/>
+<stop offset="1" style="stop-color:#8E8E8E"/>
 </linearGradient>
-<path d="M15.516,37.348c-0.253-0.282-0.728-0.564-1.052-1.773c0,0,0.536,2.482,7.882,0.033 c0,10.407,3.061,10.407,3.061,10.407c-0.675,0-1.614-0.39-2.09-0.866L15.516,37.348z" fill="url(#SVGID_10)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11" x1="30" x2="30" y1="11.66" y2="14.65">
-<stop offset="0" stop-color="#707173"/>
-<stop offset="1" stop-color="#000000"/>
+<path d="M12.177,39.046c-0.314-0.347-0.896-0.695-1.297-2.184c0,0,0.66,3.055,9.701,0.041  c0,12.809,3.768,12.809,3.768,12.809c-0.831,0-1.987-0.479-2.573-1.064L12.177,39.046z" fill="url(#SVGID_10_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -257 2114.0029)" gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="287.001" x2="287.001" y1="2106.5767" y2="2102.8931">
+<stop offset="0" style="stop-color:#707173"/>
+<stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
-<path d="M40.775,11.347 c-0.088-0.285-0.416-0.518-0.731-0.518H35.38c-0.315,0-0.633-0.237-0.704-0.523l-0.153-0.608h-9.049l-0.153,0.608 c-0.071,0.289-0.389,0.523-0.704,0.523h-4.664c-0.316,0-0.646,0.233-0.731,0.518l-0.832,2.73c-0.088,0.285,0.101,0.518,0.417,0.518 h22.388c0.315,0,0.502-0.233,0.416-0.518L40.775,11.347z" fill="url(#SVGID_11)" fill-opacity="0.15" stroke-opacity="0.15"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12" x1="30" x2="30" y1="12.27" y2="15.26">
-<stop offset="0" stop-color="#707173"/>
-<stop offset="1" stop-color="#000000"/>
+<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.292-0.866-0.645l-0.189-0.749H24.433l-0.191,0.749c-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.36c-0.108,0.35,0.123,0.637,0.512,0.637h27.554c0.388,0,0.619-0.288,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 2114.0029)" gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="287.001" x2="287.001" y1="2105.8237" y2="2102.1401">
+<stop offset="0" style="stop-color:#707173"/>
+<stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
-<path d="M40.775,11.959c-0.088-0.285-0.416-0.518-0.731-0.518 H35.38c-0.315,0-0.633-0.237-0.704-0.523l-0.153-0.608h-9.049l-0.153,0.608c-0.071,0.289-0.389,0.523-0.704,0.523h-4.664 c-0.316,0-0.646,0.233-0.731,0.518l-0.832,2.729c-0.088,0.285,0.101,0.518,0.417,0.518h22.388c0.315,0,0.502-0.233,0.416-0.518 L40.775,11.959z" fill="url(#SVGID_12)" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M42.041,15.819H17.955l-0.179,0.635 c-0.092,0.324,0.105,0.589,0.438,0.589h23.567c0.332,0,0.529-0.266,0.438-0.589L42.041,15.819z" fill="#6D6E70" fill-opacity="0.5" stroke-opacity="0.5"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13" x1="30" x2="30" y1="7.66" y2="16.03">
-<stop offset="0" stop-color="#747577"/>
-<stop offset="1" stop-color="#D5D7D9"/>
+<path d="M43.265,7.799c-0.107-0.35-0.512-0.637-0.9-0.637h-5.741  c-0.388,0-0.779-0.291-0.866-0.644l-0.189-0.749H24.433l-0.191,0.749c-0.088,0.354-0.477,0.644-0.865,0.644h-5.741  c-0.388,0-0.793,0.287-0.9,0.637l-1.024,3.36c-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.799z" fill="url(#SVGID_12_)" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M44.822,12.549H15.178l-0.218,0.781  c-0.114,0.399,0.128,0.726,0.538,0.726h29.005c0.409,0,0.651-0.327,0.539-0.726L44.822,12.549z" fill="#6D6E70" fill-opacity="0.5" stroke-opacity="0.5"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -257 2114.0029)" gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="286.999" x2="286.999" y1="2111.5005" y2="2101.1914">
+<stop offset="0" style="stop-color:#747577"/>
+<stop offset="1" style="stop-color:#D5D7D9"/>
 </linearGradient>
-<path d="M41.344,12.734c-0.092-0.324-0.439-0.588-0.771-0.588h-4.91 c-0.332,0-0.666-0.269-0.742-0.597l-1.731-3.706c-0.075-0.328-0.41-0.597-0.743-0.597h-4.897c-0.333,0-0.666,0.269-0.741,0.597 l-1.732,3.706c-0.077,0.327-0.411,0.597-0.743,0.597h-4.91c-0.332,0-0.679,0.265-0.771,0.588l-0.876,3.107 c-0.092,0.324,0.105,0.59,0.438,0.59h23.567c0.332,0,0.529-0.266,0.438-0.59L41.344,12.734z" fill="url(#SVGID_13)"/>
-<path d="M27.383,7.861h5.226c0.256,0,0.596,0.146,0.746,0.353c0,0-0.23-0.966-0.913-0.966h-4.894 c-0.679,0-0.908,0.966-0.908,0.966C26.791,8.006,27.127,7.861,27.383,7.861z" fill="#FFFFFF"/>
-<path d="M35.166,12.161c0.08,0.328,0.432,0.597,0.779,0.597h5.155c0.089,0,0.177,0.017,0.263,0.046 l-0.02-0.07c-0.092-0.324-0.439-0.588-0.771-0.588h-4.91c-0.217,0-0.424-0.119-0.57-0.287L35.166,12.161z" fill="#FFFFFF"/>
-<path d="M18.895,12.758h5.154c0.349,0,0.7-0.269,0.779-0.597l0.073-0.302 c-0.146,0.167-0.354,0.287-0.57,0.287h-4.91c-0.333,0-0.678,0.265-0.771,0.588l-0.02,0.07 C18.717,12.775,18.806,12.758,18.895,12.758z" fill="#FFFFFF"/>
-<rect fill="none" height="59.996" width="59.996"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14" x1="21" x2="21" y1="20.02" y2="25.94">
-<stop offset="0" stop-color="#83C61D"/>
-<stop offset="1" stop-color="#358C0C"/>
+<path d="M43.964,8.753c-0.113-0.399-0.541-0.725-0.949-0.725h-6.043c-0.409,0-0.819-0.331-0.913-0.734  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.734-0.913,0.734h-6.043c-0.41,0-0.836,0.326-0.949,0.725l-1.078,3.824c-0.113,0.399,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.754h6.431c0.316,0,0.734,0.179,0.919,0.434c0,0-0.284-1.188-1.125-1.188h-6.022  c-0.835,0-1.118,1.188-1.118,1.188C26.053,2.934,26.467,2.754,26.783,2.754z" fill="#FFFFFF"/>
+<path d="M36.361,8.047c0.099,0.404,0.53,0.734,0.959,0.734h6.346c0.108,0,0.216,0.021,0.322,0.058l-0.024-0.086  c-0.113-0.399-0.541-0.725-0.949-0.725h-6.043c-0.266,0-0.521-0.147-0.702-0.354L36.361,8.047z" fill="#FFFFFF"/>
+<path d="M16.334,8.782h6.345c0.429,0,0.861-0.331,0.96-0.734l0.089-0.373c-0.179,0.207-0.435,0.354-0.702,0.354  h-6.043c-0.408,0-0.834,0.326-0.948,0.725l-0.024,0.086C16.117,8.802,16.227,8.782,16.334,8.782z" fill="#FFFFFF"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="18.9233" x2="18.9233" y1="17.7236" y2="25.0068">
+<stop offset="0" style="stop-color:#83C61D"/>
+<stop offset="1" style="stop-color:#358C0C"/>
 </linearGradient>
-<polygon fill="url(#SVGID_14)" points="25.161,21.63 23.993,20.462 19.808,24.647 18.003,22.843 16.835,24.011 19.805,26.98 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15" x1="21" x2="21" y1="27.25" y2="33.17">
-<stop offset="0" stop-color="#83C61D"/>
-<stop offset="1" stop-color="#358C0C"/>
+<polygon fill="url(#SVGID_14_)" points="24.046,19.701 22.61,18.264 17.46,23.414 15.238,21.194 13.801,22.631 17.454,26.286 "/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="18.9233" x2="18.9233" y1="26.6226" y2="33.9071">
+<stop offset="0" style="stop-color:#83C61D"/>
+<stop offset="1" style="stop-color:#358C0C"/>
 </linearGradient>
-<polygon fill="url(#SVGID_15)" points="25.161,28.862 23.993,27.693 19.808,31.879 18.003,30.075 16.835,31.242 19.805,34.213 "/>
+<polygon fill="url(#SVGID_15_)" points="24.046,28.602 22.61,27.164 17.46,32.314 15.238,30.095 13.801,31.532 17.454,35.187 "/>
+</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_text.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_text.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<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"/>
+</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">
+<stop offset="0" style="stop-color:#F5F5F5"/>
+<stop offset="1" style="stop-color:#CCCCCC"/>
+</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"/>
+</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"/>
+</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"/>
+<rect fill="#666666" height="1.71" width="42.741" x="8.628" y="37.84"/>
+<rect fill="#F5F5F5" height="0.854" width="42.741" x="8.628" y="31.856"/>
+<rect fill="#666666" height="1.711" width="42.741" x="8.628" y="30.146"/>
+<rect fill="#F5F5F5" height="0.854" width="42.741" x="8.628" y="24.162"/>
+<rect fill="#666666" height="1.71" width="42.741" x="8.628" y="22.452"/>
+<rect fill="#F5F5F5" height="0.853" width="42.741" x="8.628" y="16.47"/>
+<rect fill="#666666" height="1.71" width="42.741" x="8.628" y="14.76"/>
+<rect fill="none" height="60" width="60"/>
+</g>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_tip.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_tip.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<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"/>
+</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"/>
+</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">
+<stop offset="0" style="stop-color:#E2E2E2"/>
+<stop offset="0.3" style="stop-color:#969696"/>
+<stop offset="0.6727" style="stop-color:#F2F2F2"/>
+<stop offset="1" style="stop-color:#B3B3B3"/>
+</linearGradient>
+<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"/>
+</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"/>
+<rect fill-opacity="0.25" height="2.205" stroke-opacity="0.25" width="24.077" x="17.962" y="51.939"/>
+<rect fill="none" height="60" width="60"/>
+</g>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_todo_alarm.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,83 +1,148 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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"/>
-<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_)"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <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"/>
-<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_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"/>
+<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"/>
+</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="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="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"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -257 1649.9688)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="306.4023" x2="267.6852" y1="1618.7178" y2="1618.7178">
+<stop offset="0" style="stop-color:#737373"/>
+<stop offset="1" style="stop-color:#FFFFFF"/>
+</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="1" style="stop-color:#4A4A4A"/>
 </linearGradient>
-</defs>
-<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"/>
+<rect fill="url(#SVGID_5_)" height="42.947" width="38.427" x="10.787" y="9.025"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -257 1649.9688)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="267.8789" x2="306.4008" y1="1619.8457" y2="1619.8457">
+<stop offset="0" style="stop-color:#737373"/>
+<stop offset="1" style="stop-color:#FFFFFF"/>
+</linearGradient>
+<rect fill="url(#SVGID_6_)" height="42.194" width="38.427" x="10.787" y="9.025"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -257 1649.9688)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="277.0107" x2="271.0243" y1="1610.2334" y2="1604.2468">
+<stop offset="0" style="stop-color:#737373"/>
+<stop offset="1" style="stop-color:#FFFFFF"/>
+</linearGradient>
+<rect fill="url(#SVGID_7_)" height="41.441" width="38.427" x="10.787" y="9.025"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -257 1649.9688)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="286.999" x2="286.999" y1="1624.8262" y2="1607.9667">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="0.25" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#E1E1E1"/>
 </linearGradient>
-</defs>
-</g>
-<rect fill="url(#SVGID_4_)" height="3.738" width="16.875" x="6.563" y="13.137"/>
-<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"/>
-<defs>
-<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"/>
+<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"/>
+</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 "/>
+<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"/>
+<stop offset="0.5576" style="stop-color:#E6E6E6"/>
+<stop offset="0.7515" style="stop-color:#BCBCBC"/>
+<stop offset="1" style="stop-color:#8E8E8E"/>
+</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="1" style="stop-color:#000000"/>
 </linearGradient>
-</defs>
-<defs>
-<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"/>
+<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="1" style="stop-color:#000000"/>
 </linearGradient>
-</defs>
-<defs>
-<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"/>
+<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"/>
+<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"/>
 </linearGradient>
-</defs>
-</g>
+<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"/>
 </g>
-<g transform="matrix(0.5 0 0 0.5 15 15)">
-<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"/>
-<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"/>
-<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"/>
-<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"/>
+<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"/>
+</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"/>
+</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"/>
 </linearGradient>
-<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__)"/>
-</g>
-<rect fill="url(#SVGID_4_)" height="3.738" width="16.875" x="6.563" y="13.137"/>
-<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>
+<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"/>
+<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"/>
+</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"/>
+</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"/>
+<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"/>
+<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"/>
+<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"/>
+</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"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_tone.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_tone.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_tone.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,34 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <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"/>
 </linearGradient>
-<path d="M48.631,13.079l-3.08-7.497L27.85,13.46l0.028,23.917c-2.712-1.771-6.708-2.354-10.768-1.254 c-6.405,1.725-10.542,6.951-9.247,11.665c1.3,4.718,7.543,7.142,13.944,5.415c5.412-1.461,9.159-5.324,9.138-9.451 c-0.018-4.129,0.033-15.338,0-23.445L48.631,13.079z" fill="url(#SVGID_1)"/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_2)" points="27.878,33.26 27.857,13.46 27.85,13.46 27.872,33.258 "/>
+<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"/>
 </linearGradient>
-<path d="M30.945,19.08c0.007,1.306,0.01-0.201,0.012,1.223l17.674-7.225l-0.436-1.108L30.945,19.08z" fill="url(#SVGID_3)"/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_4)" points="28.142,38.062 28.142,14.143 45.891,6.413 45.551,5.582 27.454,13.46 27.454,37.378 "/>
+<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"/>
 </linearGradient>
-<path d="M17.625,52.389c-4.258,0.021-7.653-1.941-8.447-4.885c-0.484-1.785,0.028-3.761,1.444-5.555 c1.55-1.964,3.944-3.454,6.747-4.191c1.187-0.317,2.386-0.477,3.573-0.484c4.258-0.021,7.651,1.943,8.45,4.885 c1.058,3.9-2.618,8.272-8.196,9.748C20.012,52.221,18.808,52.381,17.625,52.389L17.625,52.389z" fill="url(#SVGID_5)"/>
-<rect fill="none" height="59.996" width="59.996"/>
-</g>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_tone_off.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,43 +1,45 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <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"/>
 </linearGradient>
-<path d="M48.631,13.079l-3.08-7.497L27.85,13.46l0.028,23.917c-2.712-1.771-6.708-2.354-10.768-1.254 c-6.405,1.725-10.542,6.951-9.247,11.665c1.3,4.718,7.543,7.142,13.944,5.415c5.412-1.461,9.159-5.324,9.138-9.451 c-0.018-4.129,0.033-15.338,0-23.445L48.631,13.079z" fill="url(#SVGID_1)"/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_2)" points="27.878,33.26 27.857,13.46 27.85,13.46 27.872,33.258 "/>
+<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"/>
 </linearGradient>
-<path d="M30.945,19.08c0.007,1.306,0.01-0.201,0.012,1.223l17.674-7.225l-0.436-1.108L30.945,19.08z" fill="url(#SVGID_3)"/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_4)" points="28.142,38.062 28.142,14.143 45.891,6.413 45.551,5.582 27.454,13.46 27.454,37.378 "/>
+<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"/>
 </linearGradient>
-<path d="M17.625,52.389c-4.258,0.021-7.653-1.941-8.447-4.885c-0.484-1.785,0.028-3.761,1.444-5.555 c1.55-1.964,3.944-3.454,6.747-4.191c1.187-0.317,2.386-0.477,3.573-0.484c4.258-0.021,7.651,1.943,8.45,4.885 c1.058,3.9-2.618,8.272-8.196,9.748C20.012,52.221,18.808,52.381,17.625,52.389L17.625,52.389z" fill="url(#SVGID_5)"/>
-<rect fill="none" height="59.996" width="59.996"/>
+<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"/>
 </g>
 <g transform="matrix(2 0 0 2 0 0)">
-<linearGradient gradientTransform="matrix(1 0 0 -1 -257 -316)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="261.2295" x2="282.7705" y1="-330.6934" y2="-330.6934">
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_1_)" points="24.702,25.229 4.229,5.254 5.299,4.158 25.771,24.133 "/>
-<rect fill="none" height="30" width="30.001"/>
+<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"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_tv_out.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,149 +1,184 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
 <rect fill="none" height="60" width="60"/>
-<rect fill="none" height="59.996" width="59.996"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="29.69" x2="29.69" y1="7.35" y2="51.92">
-<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"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M44.078,49.588c0,1.353-1.096,2.449-2.449,2.449H17.754c-1.353,0-2.449-1.097-2.449-2.449 V9.795c0-1.353,1.096-2.449,2.449-2.449h23.875c1.354,0,2.449,1.097,2.449,2.449V49.588z" fill="url(#SVGID_1)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="29.69" x2="29.69" y1="7.35" y2="51.16">
-<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"/>
+<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"/>
+</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">
+<stop offset="0" style="stop-color:#6E6E6E"/>
+<stop offset="1" style="stop-color:#333333"/>
 </linearGradient>
-<path d="M41.629,7.346H17.754c-1.353,0-2.449,1.097-2.449,2.449v39.792 c0,0.652,0.26,1.244,0.676,1.684c-0.037-0.148-0.064-0.3-0.064-0.459v-1.225V11.02V9.795c0-1.013,0.824-1.837,1.837-1.837h23.875 c1.014,0,1.838,0.824,1.838,1.837v1.224v38.568v1.225c0,0.159-0.027,0.311-0.064,0.459c0.416-0.439,0.676-1.031,0.676-1.684V9.795 C44.078,8.443,42.982,7.346,41.629,7.346z" fill="url(#SVGID_2)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="29.69" x2="29.69" y1="10.45" y2="40.41">
-<stop offset="0" stop-color="#B6BBBD"/>
-<stop offset="1" stop-color="#F0FBFF"/>
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_3)" fill-opacity="0.6" height="29.998" stroke-opacity="0.6" width="25.101" x="17.142" y="10.407"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="29.69" x2="29.69" y1="11.06" y2="39.8">
-<stop offset="0" stop-color="#6E6E6E"/>
-<stop offset="1" stop-color="#333333"/>
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_4)" height="28.773" width="23.875" x="17.754" y="11.02"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="29.69" x2="29.69" y1="11.67" y2="39.18">
-<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"/>
+<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"/>
+<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"/>
+</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"/>
 </linearGradient>
-<rect fill="url(#SVGID_5)" height="27.549" width="22.651" x="18.366" y="11.632"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6" x1="29.69" x2="29.69" y1="12.11" y2="23.06">
-<stop offset="0" stop-color="#85EFFF"/>
-<stop offset="1" stop-color="#3BA1D9"/>
+<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="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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_6)" points="41.018,21.427 18.366,23.876 18.366,12.244 41.018,12.244 "/>
-<rect fill="#9FE4FF" height="0.612" width="22.651" x="18.366" y="11.632"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7" x1="29.87" x2="29.87" y1="10.44" y2="7.99">
-<stop offset="0" stop-color="#FFFFFF"/>
-<stop offset="1" stop-color="#D1D7D9"/>
-</linearGradient>
-<path d="M27.163,10.407c-0.686,0-1.224-0.448-1.224-1.02V8.979c0-0.573,0.538-1.021,1.224-1.021h5.416 c0.687,0,1.225,0.448,1.225,1.021v0.408c0,0.572-0.538,1.02-1.225,1.02H27.163z" fill="url(#SVGID_7)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8" x1="29.87" x2="29.87" y1="8.32" y2="9.9">
-<stop offset="0" stop-color="#6C7375"/>
-<stop offset="1" stop-color="#BDC2C4"/>
+<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"/>
 </linearGradient>
-<path d="M33.19,9.388c0,0.226-0.273,0.408-0.612,0.408h-5.416c-0.338,0-0.612-0.182-0.612-0.408V8.979 c0-0.226,0.274-0.409,0.612-0.409h5.416c0.339,0,0.612,0.183,0.612,0.409V9.388z" fill="url(#SVGID_8)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9" x1="29.6" x2="29.6" y1="41.04" y2="50.14">
-<stop offset="0" stop-color="#B6BBBD"/>
-<stop offset="1" stop-color="#FFFFFF"/>
+<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"/>
 </linearGradient>
-<path d="M27.384,50.2c-1.312,0-2.378-1.058-2.378-2.354v-4.475 c0-1.299,1.066-2.354,2.378-2.354h4.425c1.313,0,2.38,1.056,2.38,2.354v4.475c0,1.297-1.066,2.354-2.38,2.354H27.384z" fill="url(#SVGID_9)" fill-opacity="0.6" stroke-opacity="0.6"/>
-<path d="M27.382,49.588c-0.972,0-1.764-0.78-1.764-1.742v-4.475 c0-0.961,0.792-1.742,1.764-1.742h4.432c0.973,0,1.763,0.781,1.763,1.742v4.475c0,0.96-0.79,1.742-1.763,1.742H27.382z" fill="#020202" fill-opacity="0.5" stroke-opacity="0.5"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10" x1="29.6" x2="29.6" y1="42.21" y2="48.99">
-<stop offset="0" stop-color="#A6A8AB"/>
-<stop offset="0.7" stop-color="#58595B"/>
-<stop offset="1" stop-color="#808184"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M32.965,47.846c0,0.625-0.514,1.131-1.146,1.131h-4.443c-0.632,0-1.146-0.506-1.146-1.131 v-4.475c0-0.624,0.514-1.13,1.146-1.13h4.443c0.632,0,1.146,0.506,1.146,1.13V47.846z" fill="url(#SVGID_10)"/>
-<path d="M28.679,47.752c-0.675,0-1.225-0.549-1.225-1.225V44.69 c0-0.676,0.549-1.224,1.225-1.224h1.836c0.676,0,1.225,0.548,1.225,1.224v1.837c0,0.676-0.549,1.225-1.225,1.225H28.679z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11" x1="29.6" x2="29.6" y1="44.06" y2="47.14">
-<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"/>
-</linearGradient>
-<path d="M28.679,47.14c-0.337,0-0.612-0.274-0.612-0.612V44.69c0-0.336,0.275-0.612,0.612-0.612 h1.836c0.338,0,0.612,0.276,0.612,0.612v1.837c0,0.338-0.274,0.612-0.612,0.612H28.679z" fill="url(#SVGID_11)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12" x1="19.85" x2="19.85" y1="41.59" y2="48.99">
-<stop offset="0" stop-color="#B6BBBD"/>
-<stop offset="1" stop-color="#F0FBFF"/>
+<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"/>
 </linearGradient>
-<path d="M19.496,48.977c-1.297,0-2.354-1.058-2.354-2.355 v-2.638c0-1.296,1.057-2.354,2.354-2.354h0.707c1.298,0,2.354,1.059,2.354,2.355v2.638c0,1.297-1.057,2.354-2.354,2.354H19.496z" fill="url(#SVGID_12)" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13" x1="19.85" x2="19.85" y1="42.21" y2="48.37">
-<stop offset="0" stop-color="#231F20"/>
-<stop offset="1" stop-color="#6D6E70"/>
+<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"/>
 </linearGradient>
-<path d="M19.496,48.363c-0.962,0-1.742-0.78-1.742-1.742 v-2.638c0-0.961,0.78-1.741,1.742-1.741h0.707c0.96,0,1.742,0.78,1.742,1.742v2.638c0,0.961-0.782,1.741-1.742,1.741H19.496z" fill="url(#SVGID_13)" fill-opacity="0.7" stroke-opacity="0.7"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14" x1="19.85" x2="19.85" y1="42.83" y2="47.76">
-<stop offset="0" stop-color="#C6FF45"/>
-<stop offset="0.73" stop-color="#66A00E"/>
-<stop offset="1" stop-color="#387300"/>
+<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"/>
 </linearGradient>
-<path d="M21.333,46.621c0,0.625-0.505,1.131-1.13,1.131h-0.707c-0.624,0-1.13-0.506-1.13-1.131 v-2.638c0-0.624,0.506-1.13,1.13-1.13h0.707c0.625,0,1.13,0.506,1.13,1.131V46.621z" fill="url(#SVGID_14)"/>
-<path d="M38.654,48.977c-1.299,0-2.355-1.058-2.355-2.355 v-2.638c0-1.298,1.057-2.354,2.355-2.354h0.705c1.298,0,2.355,1.057,2.355,2.354v2.638c0,1.298-1.058,2.355-2.355,2.355H38.654z" fill="url(#SVGID_12)" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M38.654,48.363c-0.962,0-1.744-0.78-1.744-1.742 v-2.638c0-0.961,0.781-1.742,1.744-1.742h0.705c0.961,0,1.743,0.78,1.743,1.742v2.638c0,0.961-0.782,1.742-1.743,1.742H38.654z" fill="url(#SVGID_13)" fill-opacity="0.7" stroke-opacity="0.7"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17" x1="39.01" x2="39.01" y1="42.83" y2="47.76">
-<stop offset="0" stop-color="#FFC142"/>
-<stop offset="0.75" stop-color="#CF4E18"/>
-<stop offset="1" stop-color="#B52100"/>
-</linearGradient>
-<path d="M40.49,46.621c0,0.625-0.507,1.131-1.131,1.131h-0.705c-0.625,0-1.131-0.506-1.131-1.131 v-2.638c0-0.624,0.506-1.13,1.131-1.13h0.705c0.624,0,1.131,0.506,1.131,1.13V46.621z" fill="url(#SVGID_17)"/>
+<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)">
-<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"/>
+<g transform="matrix(-1 0 0 1 60 30)">
+<polygon fill="none" points="8.019,0 0,0 0,30 18.231,30 18.84,30.224 18.975,30 30,30 30,0 21.98,0 "/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="6.5635" x2="23.4365" y1="15.1118" y2="15.1118">
+<stop offset="0" style="stop-color:#000000"/>
+<stop offset="0.2727" style="stop-color:#333333"/>
+<stop offset="1" style="stop-color:#000000"/>
 </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"/>
+<path d="M18.064,29.938c-4.937-1.812-6.404-6.104-6.839-8.368h-0.037l-0.033-0.295h-0.363  c-0.829,0-1.512-0.64-1.581-1.452L8.62,17.166H8.15c-0.875,0-1.587-0.712-1.587-1.586V7.359c0-0.83,0.642-1.514,1.455-1.58V0H21.98  v5.779c0.814,0.066,1.456,0.75,1.456,1.58v8.221c0,0.874-0.712,1.586-1.588,1.586H21.38l-0.592,2.657  c-0.069,0.812-0.751,1.452-1.579,1.452c0.416,0.971,1.1,1.979,2.214,2.472l1.037,0.459l-3.62,6.018L18.064,29.938z" fill="url(#SVGID_1__)" fill-opacity="0.35" stroke-opacity="0.35"/>
+<radialGradient cx="22.252" cy="19.7871" gradientUnits="userSpaceOnUse" id="SVGID_2__" r="9.5452">
+<stop offset="0" style="stop-color:#101010"/>
+<stop offset="0.4727" style="stop-color:#858585"/>
+<stop offset="0.8" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#4D4D4D"/>
+</radialGradient>
+<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"/>
+</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"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="9.0313" x2="20.9688" y1="17.0469" y2="17.0469">
+<stop offset="0" style="stop-color:#4D4D4D"/>
+<stop offset="0.2" style="stop-color:#7A7A7A"/>
+<stop offset="0.8" style="stop-color:#1A1A1A"/>
+<stop offset="1" style="stop-color:#4D4D4D"/>
 </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"/>
+<path d="M19.794,19.688c0,0.324-0.263,0.588-0.586,0.588h-8.416c-0.324,0-0.587-0.264-0.587-0.588  l-1.174-5.281c0-0.326,0.263-0.588,0.587-0.588h10.764c0.324,0,0.587,0.262,0.587,0.588L19.794,19.688z" fill="url(#SVGID_4__)"/>
+<path d="M20.382,14.111H9.618c-0.266,0-0.486,0.178-0.56,0.418l0.495,2.225h10.893l0.494-2.225  C20.868,14.289,20.646,14.111,20.382,14.111z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M9.618,17.047h10.764l0.514-2.316c-0.096-0.189-0.286-0.324-0.514-0.324H9.618  c-0.229,0-0.418,0.135-0.516,0.324L9.618,17.047z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M20.382,13.818H9.618c-0.324,0-0.587,0.262-0.587,0.588l0.456,2.053h11.025l0.456-2.053  C20.969,14.08,20.706,13.818,20.382,13.818z" fill-opacity="0.5" stroke-opacity="0.5"/>
+<rect fill-opacity="0.35" height="0.393" stroke-opacity="0.35" width="11.962" x="9.019" y="6.479"/>
+<rect fill-opacity="0.15" height="0.391" stroke-opacity="0.15" width="11.962" x="9.019" y="6.088"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="7.5635" x2="22.4365" y1="11.4697" y2="11.4697">
+<stop offset="0" style="stop-color:#4D4D4D"/>
+<stop offset="0.2" style="stop-color:#595959"/>
+<stop offset="0.8" style="stop-color:#1A1A1A"/>
+<stop offset="1" style="stop-color:#4D4D4D"/>
 </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"/>
+<path d="M22.437,15.58c0,0.324-0.264,0.586-0.588,0.586H8.15c-0.324,0-0.587-0.262-0.587-0.586V7.359  c0-0.324,0.263-0.586,0.587-0.586h13.698c0.324,0,0.588,0.262,0.588,0.586V15.58z" fill="url(#SVGID_5__)"/>
+<path d="M21.849,15.873H8.15c-0.324,0-0.587-0.264-0.587-0.588v0.295c0,0.324,0.263,0.586,0.587,0.586h13.698  c0.324,0,0.588-0.262,0.588-0.586v-0.295C22.437,15.609,22.173,15.873,21.849,15.873z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M21.849,15.58H8.15c-0.324,0-0.587-0.264-0.587-0.588v0.293c0,0.324,0.263,0.588,0.587,0.588h13.698  c0.324,0,0.588-0.264,0.588-0.588v-0.293C22.437,15.316,22.173,15.58,21.849,15.58z" fill-opacity="0.15" stroke-opacity="0.15"/>
+<path d="M21.849,6.773H8.15c-0.324,0-0.587,0.262-0.587,0.586v0.293c0-0.322,0.263-0.586,0.587-0.586  h13.698c0.324,0,0.588,0.264,0.588,0.586V7.359C22.437,7.035,22.173,6.773,21.849,6.773z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M21.849,7.066H8.15c-0.324,0-0.587,0.264-0.587,0.586v0.295c0-0.324,0.263-0.588,0.587-0.588  h13.698c0.324,0,0.588,0.264,0.588,0.588V7.652C22.437,7.33,22.173,7.066,21.849,7.066z" fill="#FFFFFF" fill-opacity="0.25" stroke-opacity="0.25"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6__" x1="7.5635" x2="22.4365" y1="8.4355" y2="8.4355">
+<stop offset="0" style="stop-color:#000000"/>
+<stop offset="0.2727" style="stop-color:#333333"/>
+<stop offset="1" style="stop-color:#000000"/>
 </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>
+<rect fill="url(#SVGID_6__)" height="0.586" width="14.873" x="7.563" y="8.143"/>
+<rect fill="#FFFFFF" fill-opacity="0.25" height="0.295" stroke-opacity="0.25" width="14.873" x="7.563" y="8.729"/>
+<rect fill="#FFFFFF" fill-opacity="0.25" height="0.293" stroke-opacity="0.25" width="14.873" x="7.563" y="10.197"/>
+<rect fill="#FFFFFF" fill-opacity="0.25" height="0.295" stroke-opacity="0.25" width="14.873" x="7.563" y="11.664"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7__" x1="7.5635" x2="22.4365" y1="9.9033" y2="9.9033">
+<stop offset="0" style="stop-color:#000000"/>
+<stop offset="0.2727" style="stop-color:#333333"/>
+<stop offset="1" style="stop-color:#000000"/>
+</linearGradient>
+<rect fill="url(#SVGID_7__)" height="0.588" width="14.873" x="7.563" y="9.609"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8__" x1="7.5635" x2="22.4365" y1="11.3711" y2="11.3711">
+<stop offset="0" style="stop-color:#000000"/>
+<stop offset="0.2727" style="stop-color:#333333"/>
+<stop offset="1" style="stop-color:#000000"/>
+</linearGradient>
+<rect fill="url(#SVGID_8__)" height="0.586" width="14.873" x="7.563" y="11.078"/>
+<rect fill="none" height="30" width="30"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_unsubscribed.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_unsubscribed.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,109 +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 gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.9995" x2="29.9995" y1="0.3882" y2="59.6489">
-<stop offset="0" style="stop-color:#A6A8AB"/>
-<stop offset="1" style="stop-color:#231F20"/>
-</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:#A9AAAD"/>
-<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:#F4FCFF"/>
-<stop offset="0.6242" style="stop-color:#C9CED1"/>
-<stop offset="1" style="stop-color:#9CA4A7"/>
-</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:#A6A8AB"/>
-<stop offset="1" style="stop-color:#231F20"/>
-</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:#A9AAAD"/>
-<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:#BC5800"/>
-<stop offset="0.3" style="stop-color:#A23600"/>
-<stop offset="1" style="stop-color:#D07100"/>
-</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="#600909" 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="#600909" 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:#8BC53F"/>
-<stop offset="0.3758" style="stop-color:#33773B"/>
-<stop offset="0.6303" style="stop-color:#004F3C"/>
-<stop offset="1" style="stop-color:#007338"/>
-</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:#BC5800"/>
-<stop offset="0.3" style="stop-color:#A23600"/>
-<stop offset="1" style="stop-color:#D07100"/>
-</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="#600909" 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:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
-</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:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
-</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:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
-</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:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
-</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:#D2FF8A"/>
-<stop offset="1" style="stop-color:#138F00"/>
-</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:#D2FF8A"/>
-<stop offset="1" style="stop-color:#138F00"/>
-</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:#A7FF00"/>
-<stop offset="0.2303" style="stop-color:#D6FF61"/>
-<stop offset="1" style="stop-color:#138F00"/>
-</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:#A7FF00"/>
-<stop offset="0.2303" style="stop-color:#D6FF61"/>
-<stop offset="1" style="stop-color:#138F00"/>
-</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:#C9CDCE"/>
-<stop offset="1" style="stop-color:#6E7273"/>
-</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:#E6E9E8"/>
-<stop offset="1" style="stop-color:#ADB2B5"/>
-</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 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_url_address.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_url_address.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<g>
+<rect fill="none" height="60" width="60"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.999" x2="29.999" y1="2.0776" y2="57.6216">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="0.4667" style="stop-color:#E6E6E6"/>
+<stop offset="0.9576" style="stop-color:#C2C2C2"/>
+<stop offset="1" style="stop-color:#C2C2C2"/>
+</linearGradient>
+<path d="M53.428,41.199c0,1.027-0.582,2.461-1.297,3.188L40.027,56.681C39.314,57.407,37.904,58,36.891,58  H6.57V2h46.857V41.199z" fill="url(#SVGID_1_)"/>
+<linearGradient gradientTransform="matrix(-1 0 0 -1 5045.8477 1885.916)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="5015.8486" x2="5015.8486" y1="1883.5537" y2="1827.7893">
+<stop offset="0" style="stop-color:#F0F0F2"/>
+<stop offset="1" style="stop-color:#B3B5B8"/>
+</linearGradient>
+<path d="M7.49,2.932h45.02v38.268c0,0.775-0.49,1.979-1.031,2.527l-12.1,12.293  c-0.541,0.549-1.725,1.047-2.488,1.047H7.49V2.932 M6.57,2v56h30.32c1.014,0,2.424-0.593,3.137-1.319l12.104-12.294  c0.715-0.727,1.297-2.16,1.297-3.188V2H6.57L6.57,2z" fill="url(#SVGID_2_)"/>
+<linearGradient gradientTransform="matrix(-1 0 0 -1 5045.8477 1885.916)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="5006.7441" x2="4999.812" y1="1841.873" y2="1834.9412">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="0.297" style="stop-color:#FFFFFF"/>
+<stop offset="0.5576" style="stop-color:#E6E6E6"/>
+<stop offset="0.7515" style="stop-color:#BCBCBC"/>
+<stop offset="1" style="stop-color:#8E8E8E"/>
+</linearGradient>
+<path d="M51.736,44.787c0.379-0.43,1.09-0.859,1.576-2.705c0,0-0.803,3.783-11.83,0.052  C41.482,58,36.891,58,36.891,58c1.014,0,2.424-0.593,3.137-1.319L51.736,44.787z" fill="url(#SVGID_3_)"/>
+<ellipse cx="30" cy="28.558" fill-opacity="0.2" rx="15.107" ry="15.347" stroke-opacity="0.2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="30" x2="30" y1="42.5859" y2="12.1111">
+<stop offset="0" style="stop-color:#004E8C"/>
+<stop offset="1" style="stop-color:#1B66D8"/>
+</linearGradient>
+<ellipse cx="30" cy="27.416" fill="url(#SVGID_4_)" rx="15.107" ry="15.346"/>
+<radialGradient cx="-11.9336" cy="13.8384" gradientTransform="matrix(0.9797 0 0 0.9952 41.476 8.3351)" gradientUnits="userSpaceOnUse" id="SVGID_5_" r="18.5643">
+<stop offset="0" style="stop-color:#94FFFF"/>
+<stop offset="0.5" style="stop-color:#36B5FF"/>
+<stop offset="1" style="stop-color:#1B66D8"/>
+</radialGradient>
+<ellipse cx="30" cy="27.416" fill="url(#SVGID_5_)" rx="14.721" ry="14.953"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="30" x2="30" y1="12.3306" y2="42.445">
+<stop offset="0" style="stop-color:#31A7F8"/>
+<stop offset="0.497" style="stop-color:#1E74DC"/>
+<stop offset="1" style="stop-color:#88D6EB"/>
+</linearGradient>
+<path d="M30,12.462c-8.129,0-14.721,6.696-14.721,14.954c0,8.26,6.592,14.953,14.721,14.953  c8.131,0,14.721-6.693,14.721-14.953C44.721,19.158,38.131,12.462,30,12.462z M30,41.061c-7.645,0-13.863-6.316-13.863-14.08  c0-7.766,6.219-14.081,13.863-14.081s13.861,6.315,13.861,14.081C43.861,34.744,37.645,41.061,30,41.061z" fill="url(#SVGID_6_)" fill-opacity="0.3" stroke-opacity="0.3"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="15.5195" x2="17.8594" y1="29.4512" y2="29.4512">
+<stop offset="0" style="stop-color:#58595B"/>
+<stop offset="1" style="stop-color:#000000"/>
+</linearGradient>
+<path d="M16.66,27.172c-0.156-0.211-0.51-0.211-0.666-0.211c-0.307,0-0.473,0.223-0.475,0.441  v0.016v0.021c0,0.385,0.021,0.816,0.066,1.34c0.01,0.098,0.02,0.198,0.033,0.297l0.018,0.144c0.039,0.312,0.086,0.617,0.139,0.913  l0.023,0.129c0.023,0.119,0.045,0.232,0.068,0.348c0.064,0.291,0.141,0.592,0.236,0.924c0.012,0.049,0.025,0.098,0.035,0.143  c0.021,0.078,0.039,0.156,0.064,0.231l0.004,0.011l0.008,0.023c0-0.006-0.006-0.018-0.006-0.026l0.844-0.058  c0.014-0.135,0.02-0.273,0.014-0.414c-0.006-0.216-0.016-0.482-0.076-0.709l0.785-1.069l0.084-0.116v-0.145v-0.833v-0.183  l-0.127-0.127L16.66,27.172z" fill="url(#SVGID_7_)" fill-opacity="0.3" stroke-opacity="0.3"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="20.0322" x2="44.5176" y1="25.0957" y2="25.0957">
+<stop offset="0" style="stop-color:#58595B"/>
+<stop offset="1" style="stop-color:#000000"/>
+</linearGradient>
+<path d="M44.512,24.485c-0.01-0.056-0.021-0.099-0.031-0.138  c-0.008-0.029-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.169-0.072-0.251  c-0.133-0.42-0.277-0.822-0.43-1.193c-0.02-0.045-0.041-0.09-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.381-0.424-0.746-0.648-1.082c-0.021-0.035-0.047-0.072-0.072-0.111  c-0.02-0.021-0.031-0.042-0.047-0.065c-0.213-0.313-0.438-0.618-0.668-0.907l-0.047-0.059c-0.031-0.039-0.061-0.08-0.094-0.12  c-0.268-0.325-0.551-0.644-0.844-0.942c-0.041-0.039-0.084-0.081-0.125-0.125L40.4,16.791c-0.264-0.264-0.545-0.521-0.834-0.768  l-0.057-0.051c-0.027-0.026-0.059-0.051-0.088-0.074c-0.314-0.264-0.656-0.522-1.014-0.771c-0.041-0.029-0.086-0.061-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.395-1.158-0.566l-0.1-0.041L35.73,13.66c-0.105-0.045-0.209-0.081-0.313-0.119  c-0.055-0.02-0.107-0.037-0.158-0.057l-0.201-0.076l-0.182,0.116c-0.117,0.075-0.59,0.351-0.869,0.511  c-0.309-0.041-1.057-0.137-1.811-0.211c0.23-0.023,0.555-0.05,1.006-0.08l0.064-0.861l-0.033-0.01  c-0.027-0.006-0.055-0.013-0.082-0.02l-0.064-0.012l-0.053-0.012c-0.461-0.094-0.896-0.162-1.326-0.209h-0.004l-0.061-0.006  c-0.492-0.051-0.992-0.076-1.488-0.076c-0.438,0-0.891,0.024-1.385,0.072c-0.078,0.007-0.148,0.015-0.227,0.023  c-0.488,0.055-0.916,0.121-1.32,0.205l-0.016,0.002h-0.008c-0.426,0.092-0.854,0.203-1.311,0.344  c-0.039,0.014-0.08,0.026-0.121,0.039l-0.092,0.031c-0.387,0.125-0.766,0.266-1.125,0.416c-0.027,0.014-0.051,0.021-0.07,0.027  l-0.055,0.023c-0.398,0.172-0.797,0.367-1.191,0.582c-0.041,0.021-0.082,0.047-0.125,0.071l-0.051,0.028  c-0.109,0.064-0.221,0.135-0.33,0.203l-0.143,0.092l-0.791,0.49l0.875,0.297c0.131,0.045,0.271,0.066,0.42,0.066  c0.471,0,0.928-0.236,1.295-0.424c0.146-0.076,0.365-0.189,0.457-0.207c0.107,0.032,0.215,0.049,0.322,0.049  c0.4,0,0.729-0.221,1.02-0.415l0.076-0.05c0.098-0.031,0.258-0.092,0.578-0.213c0.33-0.127,0.928-0.354,1.088-0.393  c0.311-0.004,0.68-0.049,0.943-0.215c0.248,0.041,0.688,0.111,1.143,0.172c-0.033,0.021-0.066,0.041-0.096,0.07  c-0.146,0.137-0.939,0.381-1.184,0.414c-0.457,0.057-0.639,0.291-0.713,0.475c-0.094,0.242-0.039,0.484,0.057,0.68  c-0.174,0.114-0.385,0.244-0.566,0.342c0-0.004,0.002-0.009,0.002-0.014c0.064-0.371,0.113-0.639-0.064-0.852  c-0.09-0.111-0.225-0.172-0.365-0.172c-0.209,0-0.371,0.13-0.502,0.258c-0.365,0.359-0.588,0.809-0.672,0.977l-0.016,0.031  l-0.014,0.025c-0.156,0.311-0.223,0.527-0.135,1.211c-0.039,0.027-0.154,0.072-0.314,0.072c-0.02,0-0.039-0.002-0.055-0.002  c-0.104-0.114-0.246-0.18-0.406-0.18l0,0c-0.369,0-0.873,0.424-1.496,1.258l-0.199,0.268l0.203,0.266l0.188,0.246  c-2.973,2.334-2.994,2.467-3.023,2.66c-0.008,0.02-0.033,0.1-0.068,0.211c-0.443,1.398-0.688,2.445-0.449,3.004  c0.553,1.299,1.178,2.512,1.986,2.578c0.07,0.006,0.148,0.008,0.234,0.008c0.738,0,1.939-0.229,2.518-0.348  c0.105,0.204,0.236,0.441,0.307,0.57l0.129,0.23l0.26-0.008c0,0,0.141-0.006,0.316-0.006c0.203,0,0.338,0.008,0.424,0.014  c0.314,0.938,0.918,3.094,0.805,3.539l-0.002,0.002c-1.014,1.549,0.215,3.563,0.807,4.533c0.049,0.076,0.09,0.145,0.125,0.205  c0.229,0.66,0.506,1.098,1.09,1.098c0.043,0,0.09-0.004,0.131-0.005c0.033-0.003,0.07-0.005,0.104-0.005  c0.066,0,0.111,0.01,0.16,0.027l0.055,0.02l0.055,0.004c0.109,0.009,0.215,0.023,0.32,0.039c0.178,0.025,0.365,0.051,0.557,0.051  c0.508,0,0.908-0.195,1.258-0.613c0.014,0,0.025-0.002,0.037-0.004c0.367-0.051,0.504-0.238,0.549-0.404  c0.029-0.028,0.064-0.063,0.094-0.09c0.146-0.134,0.316-0.293,0.436-0.482c0.051-0.031,0.113-0.068,0.182-0.109  c0.117-0.073,0.25-0.154,0.354-0.209c0.092-0.028,0.174-0.084,0.234-0.161c0.148-0.183,0.119-0.394,0.094-0.562  c-0.025-0.173-0.051-0.35,0.043-0.541c0.52-0.256,1.445-0.882,1.594-0.984v0.012c-0.008,0.083-0.033,0.309-0.07,0.45  c-0.197,0.2-0.359,0.503-0.414,0.606l-0.031,0.066l-0.012,0.074c-0.012,0.098-0.066,0.607,0.215,0.938  c0.143,0.166,0.346,0.258,0.574,0.258c0.07,0,0.146-0.01,0.223-0.027c0.727-0.168,2.01-1.936,2.113-2.91  c0.053-0.473-0.129-0.842-0.494-1.018l-0.273-0.131l-0.217,0.217l-0.791,0.805c-0.268,0.025-0.479,0.107-0.619,0.234  c0.008-0.344-0.025-0.695-0.061-1.039c-0.109-1.037-0.129-1.695,0.496-2.146l0.031-0.023l0.029-0.027  c0.223-0.234,0.475-0.438,0.74-0.654c0.619-0.506,1.26-1.029,1.643-1.975l0.016-0.041c0.123-0.323,0.309-0.811,0.059-1.183  c-0.063-0.091-0.193-0.233-0.441-0.286c0.326-0.131,0.576-0.236,0.6-0.245l0.076-0.032l0.059-0.059l1.34-1.303l0.195-0.192  l-0.086-0.263c-0.012-0.034-0.086-0.24-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.527,1.678,3.708,2.063,3.715c0.014,0,0.025,0.001,0.035,0.004c0.029,0,0.059,0.002,0.082,0.002  c0.221,0,0.344-0.114,0.398-0.182c0.16-0.195,0.117-0.436,0.1-0.525l-0.006-0.029c-0.018-0.213-0.006-1.162,0.023-1.94  c0.002,0.003,0.004,0.005,0.004,0.007l0.791-0.319L44.512,24.485z M32.908,20.172c-0.061,0.001-0.129,0.006-0.199,0.006  c-0.227,0.014-0.486,0.023-0.742,0.023c-0.672,0-0.826-0.083-0.842-0.094c-0.082-0.057-0.162-0.102-0.248-0.133  c0.154-0.035,0.328-0.156,0.508-0.508c0.176,0.348,0.416,0.656,0.785,0.656c0.1,0,0.195-0.023,0.287-0.07  C32.582,20.055,32.785,20.125,32.908,20.172z M32.645,18.264c-0.053,0-0.094-0.002-0.125-0.005c0.033-0.091,0.076-0.146,0.107-0.175  c0.043,0.066,0.104,0.125,0.166,0.175C32.74,18.262,32.691,18.264,32.645,18.264z M29.963,19.178  c0.23,0.461,0.402,0.658,0.539,0.745c-0.334,0.026-0.586,0.242-0.797,0.448c-0.145-0.053-0.396-0.206-0.473-0.314  c-0.043-0.064-0.096-0.119-0.156-0.168C29.443,19.783,29.766,19.438,29.963,19.178z M28.689,18.842l-0.48-0.025l-1.605-0.078  c0.197-0.164,0.385-0.318,0.492-0.409c0.031-0.013,0.145-0.044,0.428-0.044c0.17,0,0.332,0.013,0.438,0.021L28.689,18.842z" fill="url(#SVGID_8_)" fill-opacity="0.3" stroke-opacity="0.3"/>
+<radialGradient cx="-11.4893" cy="8.5776" gradientTransform="matrix(0.9797 0 0 0.9952 41.476 8.3351)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="16.9394">
+<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"/>
+</radialGradient>
+<path d="M15.949,27.407c0,0,0,0,0,0.003c0,0.002,0,0.006,0,0.01c0,0.445,0.029,0.886,0.064,1.32  c0.014,0.144,0.033,0.285,0.049,0.43c0.037,0.297,0.084,0.594,0.135,0.886c0.031,0.153,0.059,0.31,0.09,0.464  c0.066,0.301,0.145,0.6,0.229,0.893c0.035,0.121,0.061,0.245,0.096,0.363c0.008,0.012,0.012,0.025,0.014,0.038  c0.012-0.116,0.016-0.234,0.012-0.354c-0.027-0.861-0.164-0.75-0.164-0.75l0.955-1.305v-0.833l-1.119-1.138  C16.309,27.434,15.949,27.376,15.949,27.407z" fill="url(#SVGID_9_)"/>
+<radialGradient cx="-11.459" cy="8.5776" gradientTransform="matrix(0.9797 0 0 0.9952 41.476 8.3351)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="16.9575">
+<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"/>
+</radialGradient>
+<path d="M24.947,14.498c0.412,0.139,0.75-0.143,1.135-0.395c0.137-0.027,1.648-0.641,1.813-0.641  s0.713-0.021,0.85-0.243c0,0,2.365,0.419,2.723,0.278c0.193-0.076,1.01-0.143,1.709-0.189c-0.037-0.008-0.076-0.02-0.113-0.029  c-0.039-0.008-0.074-0.013-0.113-0.021c-0.439-0.091-0.885-0.161-1.336-0.208c0,0-0.006,0-0.01-0.002  c-0.477-0.048-0.957-0.074-1.447-0.074c-0.453,0-0.902,0.027-1.346,0.07c-0.076,0.008-0.152,0.016-0.232,0.026  c-0.428,0.047-0.854,0.11-1.27,0.195c-0.008,0.003-0.016,0.003-0.021,0.005c-0.432,0.09-0.855,0.203-1.271,0.33  c-0.072,0.023-0.141,0.047-0.209,0.068c-0.371,0.123-0.734,0.258-1.092,0.406c-0.041,0.019-0.084,0.034-0.125,0.051  c-0.393,0.171-0.775,0.359-1.15,0.563c-0.055,0.03-0.109,0.064-0.164,0.096c-0.162,0.09-0.311,0.189-0.467,0.287  C23.58,15.334,24.537,14.357,24.947,14.498z" fill="url(#SVGID_10_)"/>
+<radialGradient cx="-11.458" cy="8.5742" gradientTransform="matrix(0.9797 0 0 0.9952 41.476 8.3351)" gradientUnits="userSpaceOnUse" id="SVGID_11_" r="16.9562">
+<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"/>
+</radialGradient>
+<path d="M44.09,24.559c-0.016-0.073-0.037-0.143-0.053-0.214c-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.064-0.061-0.131-0.09-0.195  c-0.143-0.334-0.297-0.658-0.463-0.977c-0.037-0.078-0.078-0.156-0.117-0.23c-0.197-0.359-0.406-0.709-0.627-1.051  c-0.041-0.06-0.084-0.114-0.121-0.174c-0.205-0.303-0.42-0.596-0.648-0.881c-0.043-0.055-0.088-0.113-0.135-0.172  c-0.262-0.314-0.533-0.619-0.82-0.914c-0.047-0.051-0.098-0.099-0.15-0.148c-0.26-0.26-0.535-0.512-0.813-0.75  c-0.047-0.041-0.092-0.083-0.141-0.123c-0.316-0.262-0.645-0.512-0.982-0.746c-0.061-0.041-0.119-0.081-0.182-0.12  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.198-0.74-0.383-1.123-0.55  c-0.07-0.029-0.139-0.055-0.205-0.086c-0.15-0.063-0.303-0.111-0.455-0.17c-0.182,0.118-1.016,0.598-1.016,0.598  s-3.623-0.503-3.869-0.252c-0.25,0.252-1.213,0.508-1.434,0.537c-0.219,0.029-0.674,0.148-0.129,0.832  c-0.082,0.084-1.643,1.186-1.643,0.686c0-0.502,0.352-1.4-0.139-0.92c-0.35,0.346-0.563,0.813-0.605,0.902  c-0.115,0.223-0.186,0.328-0.104,0.97c0.084,0.642-1.006,0.64-1.08,0.474c-0.197-0.445-1.275,0.998-1.275,0.998l0.455,0.594  c0,0-3.18,2.486-3.205,2.654c-0.029,0.168-0.822,2.328-0.547,2.971c0.273,0.643,0.969,2.262,1.625,2.313  c0.861,0.072,2.951-0.398,2.951-0.398c0.055,0.143,0.451,0.854,0.451,0.854s1.021-0.035,1.08,0.078  c0.018,0.037,1.234,3.668,0.832,4.148c-0.957,1.457,0.547,3.59,0.965,4.313c0.42,1.238,0.688,0.684,1.24,0.889  c0.678,0.057,1.25,0.313,1.826-0.44c0.166-0.14,0.451-0.028,0.451-0.224c0-0.107,0.494-0.428,0.619-0.729  c0.133-0.063,0.475-0.296,0.707-0.409c0.211-0.014-0.201-0.586,0.217-1.192c0.451-0.181,1.666-1.013,1.666-1.013  c0.057-1.223-0.592-2.729,0.617-3.596c0.777-0.806,1.799-1.266,2.295-2.492c0.139-0.361,0.441-1.104-0.438-0.881  c-0.826,0.211-1.75,0.26-1.313-0.109c-0.051-0.456-0.6-0.668-1.092-1.111c-0.254-0.613-0.654-1.704-0.654-1.704l-0.875-1.349  l0.107-0.279l1.041,1.555l1.037,1.275c0.383,1.277,0.711,1.389,0.711,1.389c0.574-0.205,1.939-0.775,1.939-0.775l1.342-1.307  c0,0-0.139-0.418-0.684-0.943l-0.41-0.25c-0.09,0.258-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.456c0.061,0.078,1.611,4.016,1.918,4.021  c0.137,0.001,0.232,0.055,0.189-0.185c-0.055-0.109,0-2.584,0.08-3.115c0.209-0.447,0.242,0,0.734,0.854  C44.094,24.6,44.094,24.579,44.09,24.559z M30.432,15.017c0.105-0.329,0.738-0.44,0.738-0.44s-0.184,0.339-0.141,0.514  c0.041,0.177-0.289,0.286-0.324,0.701c-0.037,0.416-0.789,0.171-0.85,0.025C29.793,15.672,30.318,15.344,30.432,15.017z   M33.125,20.603c-0.467,0-1.863,0.141-2.248-0.138c-0.385-0.279-0.686,0.028-0.961,0.309c-0.182,0.18-0.842-0.187-1.035-0.467  c-0.191-0.279-0.838-0.259-0.838-0.259l0.146-0.796l-1.859-0.09l-1.057,0.314l-0.992,0.027l0.557-0.269l0.693-0.167  c0,0,1.008-0.841,1.309-1.092c0.258-0.213,1.277-0.094,1.277-0.094l1.121,0.821c0,0-0.25,0.644-0.359,0.78  c0.412-0.027,0.896-0.785,0.896-0.785c-0.873-0.816-0.84-1.094-0.84-1.094l1.152,0.822l0.01,0.006c0,0,0.467,1.117,0.662,1.117  c0.189,0,0.436-0.769,0.436-0.769l0.326-0.083c0.146,0.352,0.42,1.146,0.748,0.961c0.189-0.105,0.5-0.011,0.855,0.129  c0.359,0.139,0.602-0.074,0.895,0.186C33.982,21.123,33.318,20.66,33.125,20.603z M33.855,18.684  c-0.479-0.188-2.102,0.418-1.74-0.57c0.193-0.535,0.691-0.646,0.863-0.292c0.043,0.147,0.586,0.374,0.582,0.065  s0.543-0.471,0.621-0.242C33.889,17.857,35.322,18.967,33.855,18.684z M36.918,19.621c-0.268-0.219,0.117-0.404-0.275-0.745  c-0.563-0.491-1.002-0.702-0.234-1.097c0.945-0.122,0.152,0.307,0.309,0.563c0.084,0.136,0.563,0.592,0.938,1.152  C37.963,19.959,37.182,19.84,36.918,19.621z" fill="url(#SVGID_11_)"/>
+<radialGradient cx="-11.4609" cy="8.5801" gradientTransform="matrix(0.9797 0 0 0.9952 41.476 8.3351)" gradientUnits="userSpaceOnUse" id="SVGID_12_" r="16.9527">
+<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"/>
+</radialGradient>
+<path d="M37.297,32.337l-0.91,0.925c0,0-0.549,0-0.576,0.224c-0.012,0.095-0.045,0.508-0.135,0.72  c-0.182,0.129-0.402,0.557-0.402,0.557s-0.113,0.822,0.492,0.682C36.373,35.306,38.232,32.785,37.297,32.337z" fill="url(#SVGID_12_)"/>
+<rect fill="none" height="60" width="60"/>
+</g>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_url_address_home.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_url_address_home.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<g>
+<rect fill="none" height="60" width="60"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.999" x2="29.999" y1="2.0776" y2="57.6216">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="0.4667" style="stop-color:#E6E6E6"/>
+<stop offset="0.9576" style="stop-color:#C2C2C2"/>
+<stop offset="1" style="stop-color:#C2C2C2"/>
+</linearGradient>
+<path d="M53.428,41.199c0,1.027-0.582,2.461-1.297,3.188L40.027,56.681C39.314,57.407,37.904,58,36.891,58  H6.57V2h46.857V41.199z" fill="url(#SVGID_1_)"/>
+<linearGradient gradientTransform="matrix(-1 0 0 -1 5045.8477 1885.916)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="5015.8486" x2="5015.8486" y1="1883.5537" y2="1827.7893">
+<stop offset="0" style="stop-color:#F0F0F2"/>
+<stop offset="1" style="stop-color:#B3B5B8"/>
+</linearGradient>
+<path d="M7.49,2.932h45.02v38.268c0,0.775-0.49,1.979-1.031,2.527l-12.1,12.293  c-0.541,0.549-1.725,1.047-2.488,1.047H7.49V2.932 M6.57,2v56h30.32c1.014,0,2.424-0.593,3.137-1.319l12.104-12.294  c0.715-0.727,1.297-2.16,1.297-3.188V2H6.57L6.57,2z" fill="url(#SVGID_2_)"/>
+<linearGradient gradientTransform="matrix(-1 0 0 -1 5045.8477 1885.916)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="5006.7441" x2="4999.812" y1="1841.873" y2="1834.9412">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="0.297" style="stop-color:#FFFFFF"/>
+<stop offset="0.5576" style="stop-color:#E6E6E6"/>
+<stop offset="0.7515" style="stop-color:#BCBCBC"/>
+<stop offset="1" style="stop-color:#8E8E8E"/>
+</linearGradient>
+<path d="M51.736,44.787c0.379-0.43,1.09-0.859,1.576-2.705c0,0-0.803,3.783-11.83,0.052  C41.482,58,36.891,58,36.891,58c1.014,0,2.424-0.593,3.137-1.319L51.736,44.787z" fill="url(#SVGID_3_)"/>
+<ellipse cx="30" cy="28.558" fill-opacity="0.2" rx="15.107" ry="15.347" stroke-opacity="0.2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="30" x2="30" y1="42.5859" y2="12.1111">
+<stop offset="0" style="stop-color:#004E8C"/>
+<stop offset="1" style="stop-color:#1B66D8"/>
+</linearGradient>
+<ellipse cx="30" cy="27.416" fill="url(#SVGID_4_)" rx="15.107" ry="15.346"/>
+<radialGradient cx="-11.9336" cy="13.8384" gradientTransform="matrix(0.9797 0 0 0.9952 41.476 8.3351)" gradientUnits="userSpaceOnUse" id="SVGID_5_" r="18.5643">
+<stop offset="0" style="stop-color:#94FFFF"/>
+<stop offset="0.5" style="stop-color:#36B5FF"/>
+<stop offset="1" style="stop-color:#1B66D8"/>
+</radialGradient>
+<ellipse cx="30" cy="27.416" fill="url(#SVGID_5_)" rx="14.721" ry="14.953"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="30" x2="30" y1="12.3306" y2="42.445">
+<stop offset="0" style="stop-color:#31A7F8"/>
+<stop offset="0.497" style="stop-color:#1E74DC"/>
+<stop offset="1" style="stop-color:#88D6EB"/>
+</linearGradient>
+<path d="M30,12.462c-8.129,0-14.721,6.696-14.721,14.954c0,8.26,6.592,14.953,14.721,14.953  c8.131,0,14.721-6.693,14.721-14.953C44.721,19.158,38.131,12.462,30,12.462z M30,41.061c-7.645,0-13.863-6.316-13.863-14.08  c0-7.766,6.219-14.081,13.863-14.081s13.861,6.315,13.861,14.081C43.861,34.744,37.645,41.061,30,41.061z" fill="url(#SVGID_6_)" fill-opacity="0.3" stroke-opacity="0.3"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="15.5195" x2="17.8594" y1="29.4512" y2="29.4512">
+<stop offset="0" style="stop-color:#58595B"/>
+<stop offset="1" style="stop-color:#000000"/>
+</linearGradient>
+<path d="M16.66,27.172c-0.156-0.211-0.51-0.211-0.666-0.211c-0.307,0-0.473,0.223-0.475,0.441  v0.016v0.021c0,0.385,0.021,0.816,0.066,1.34c0.01,0.098,0.02,0.198,0.033,0.297l0.018,0.144c0.039,0.312,0.086,0.617,0.139,0.913  l0.023,0.129c0.023,0.119,0.045,0.232,0.068,0.348c0.064,0.291,0.141,0.592,0.236,0.924c0.012,0.049,0.025,0.098,0.035,0.143  c0.021,0.078,0.039,0.156,0.064,0.231l0.004,0.011l0.008,0.023c0-0.006-0.006-0.018-0.006-0.026l0.844-0.058  c0.014-0.135,0.02-0.273,0.014-0.414c-0.006-0.216-0.016-0.482-0.076-0.709l0.785-1.069l0.084-0.116v-0.145v-0.833v-0.183  l-0.127-0.127L16.66,27.172z" fill="url(#SVGID_7_)" fill-opacity="0.3" stroke-opacity="0.3"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="20.0322" x2="44.5176" y1="25.0957" y2="25.0957">
+<stop offset="0" style="stop-color:#58595B"/>
+<stop offset="1" style="stop-color:#000000"/>
+</linearGradient>
+<path d="M44.512,24.485c-0.01-0.056-0.021-0.099-0.031-0.138  c-0.008-0.029-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.169-0.072-0.251  c-0.133-0.42-0.277-0.822-0.43-1.193c-0.02-0.045-0.041-0.09-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.381-0.424-0.746-0.648-1.082c-0.021-0.035-0.047-0.072-0.072-0.111  c-0.02-0.021-0.031-0.042-0.047-0.065c-0.213-0.313-0.438-0.618-0.668-0.907l-0.047-0.059c-0.031-0.039-0.061-0.08-0.094-0.12  c-0.268-0.325-0.551-0.644-0.844-0.942c-0.041-0.039-0.084-0.081-0.125-0.125L40.4,16.791c-0.264-0.264-0.545-0.521-0.834-0.768  l-0.057-0.051c-0.027-0.026-0.059-0.051-0.088-0.074c-0.314-0.264-0.656-0.522-1.014-0.771c-0.041-0.029-0.086-0.061-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.395-1.158-0.566l-0.1-0.041L35.73,13.66c-0.105-0.045-0.209-0.081-0.313-0.119  c-0.055-0.02-0.107-0.037-0.158-0.057l-0.201-0.076l-0.182,0.116c-0.117,0.075-0.59,0.351-0.869,0.511  c-0.309-0.041-1.057-0.137-1.811-0.211c0.23-0.023,0.555-0.05,1.006-0.08l0.064-0.861l-0.033-0.01  c-0.027-0.006-0.055-0.013-0.082-0.02l-0.064-0.012l-0.053-0.012c-0.461-0.094-0.896-0.162-1.326-0.209h-0.004l-0.061-0.006  c-0.492-0.051-0.992-0.076-1.488-0.076c-0.438,0-0.891,0.024-1.385,0.072c-0.078,0.007-0.148,0.015-0.227,0.023  c-0.488,0.055-0.916,0.121-1.32,0.205l-0.016,0.002h-0.008c-0.426,0.092-0.854,0.203-1.311,0.344  c-0.039,0.014-0.08,0.026-0.121,0.039l-0.092,0.031c-0.387,0.125-0.766,0.266-1.125,0.416c-0.027,0.014-0.051,0.021-0.07,0.027  l-0.055,0.023c-0.398,0.172-0.797,0.367-1.191,0.582c-0.041,0.021-0.082,0.047-0.125,0.071l-0.051,0.028  c-0.109,0.064-0.221,0.135-0.33,0.203l-0.143,0.092l-0.791,0.49l0.875,0.297c0.131,0.045,0.271,0.066,0.42,0.066  c0.471,0,0.928-0.236,1.295-0.424c0.146-0.076,0.365-0.189,0.457-0.207c0.107,0.032,0.215,0.049,0.322,0.049  c0.4,0,0.729-0.221,1.02-0.415l0.076-0.05c0.098-0.031,0.258-0.092,0.578-0.213c0.33-0.127,0.928-0.354,1.088-0.393  c0.311-0.004,0.68-0.049,0.943-0.215c0.248,0.041,0.688,0.111,1.143,0.172c-0.033,0.021-0.066,0.041-0.096,0.07  c-0.146,0.137-0.939,0.381-1.184,0.414c-0.457,0.057-0.639,0.291-0.713,0.475c-0.094,0.242-0.039,0.484,0.057,0.68  c-0.174,0.114-0.385,0.244-0.566,0.342c0-0.004,0.002-0.009,0.002-0.014c0.064-0.371,0.113-0.639-0.064-0.852  c-0.09-0.111-0.225-0.172-0.365-0.172c-0.209,0-0.371,0.13-0.502,0.258c-0.365,0.359-0.588,0.809-0.672,0.977l-0.016,0.031  l-0.014,0.025c-0.156,0.311-0.223,0.527-0.135,1.211c-0.039,0.027-0.154,0.072-0.314,0.072c-0.02,0-0.039-0.002-0.055-0.002  c-0.104-0.114-0.246-0.18-0.406-0.18l0,0c-0.369,0-0.873,0.424-1.496,1.258l-0.199,0.268l0.203,0.266l0.188,0.246  c-2.973,2.334-2.994,2.467-3.023,2.66c-0.008,0.02-0.033,0.1-0.068,0.211c-0.443,1.398-0.688,2.445-0.449,3.004  c0.553,1.299,1.178,2.512,1.986,2.578c0.07,0.006,0.148,0.008,0.234,0.008c0.738,0,1.939-0.229,2.518-0.348  c0.105,0.204,0.236,0.441,0.307,0.57l0.129,0.23l0.26-0.008c0,0,0.141-0.006,0.316-0.006c0.203,0,0.338,0.008,0.424,0.014  c0.314,0.938,0.918,3.094,0.805,3.539l-0.002,0.002c-1.014,1.549,0.215,3.563,0.807,4.533c0.049,0.076,0.09,0.145,0.125,0.205  c0.229,0.66,0.506,1.098,1.09,1.098c0.043,0,0.09-0.004,0.131-0.005c0.033-0.003,0.07-0.005,0.104-0.005  c0.066,0,0.111,0.01,0.16,0.027l0.055,0.02l0.055,0.004c0.109,0.009,0.215,0.023,0.32,0.039c0.178,0.025,0.365,0.051,0.557,0.051  c0.508,0,0.908-0.195,1.258-0.613c0.014,0,0.025-0.002,0.037-0.004c0.367-0.051,0.504-0.238,0.549-0.404  c0.029-0.028,0.064-0.063,0.094-0.09c0.146-0.134,0.316-0.293,0.436-0.482c0.051-0.031,0.113-0.068,0.182-0.109  c0.117-0.073,0.25-0.154,0.354-0.209c0.092-0.028,0.174-0.084,0.234-0.161c0.148-0.183,0.119-0.394,0.094-0.562  c-0.025-0.173-0.051-0.35,0.043-0.541c0.52-0.256,1.445-0.882,1.594-0.984v0.012c-0.008,0.083-0.033,0.309-0.07,0.45  c-0.197,0.2-0.359,0.503-0.414,0.606l-0.031,0.066l-0.012,0.074c-0.012,0.098-0.066,0.607,0.215,0.938  c0.143,0.166,0.346,0.258,0.574,0.258c0.07,0,0.146-0.01,0.223-0.027c0.727-0.168,2.01-1.936,2.113-2.91  c0.053-0.473-0.129-0.842-0.494-1.018l-0.273-0.131l-0.217,0.217l-0.791,0.805c-0.268,0.025-0.479,0.107-0.619,0.234  c0.008-0.344-0.025-0.695-0.061-1.039c-0.109-1.037-0.129-1.695,0.496-2.146l0.031-0.023l0.029-0.027  c0.223-0.234,0.475-0.438,0.74-0.654c0.619-0.506,1.26-1.029,1.643-1.975l0.016-0.041c0.123-0.323,0.309-0.811,0.059-1.183  c-0.063-0.091-0.193-0.233-0.441-0.286c0.326-0.131,0.576-0.236,0.6-0.245l0.076-0.032l0.059-0.059l1.34-1.303l0.195-0.192  l-0.086-0.263c-0.012-0.034-0.086-0.24-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.527,1.678,3.708,2.063,3.715c0.014,0,0.025,0.001,0.035,0.004c0.029,0,0.059,0.002,0.082,0.002  c0.221,0,0.344-0.114,0.398-0.182c0.16-0.195,0.117-0.436,0.1-0.525l-0.006-0.029c-0.018-0.213-0.006-1.162,0.023-1.94  c0.002,0.003,0.004,0.005,0.004,0.007l0.791-0.319L44.512,24.485z M32.908,20.172c-0.061,0.001-0.129,0.006-0.199,0.006  c-0.227,0.014-0.486,0.023-0.742,0.023c-0.672,0-0.826-0.083-0.842-0.094c-0.082-0.057-0.162-0.102-0.248-0.133  c0.154-0.035,0.328-0.156,0.508-0.508c0.176,0.348,0.416,0.656,0.785,0.656c0.1,0,0.195-0.023,0.287-0.07  C32.582,20.055,32.785,20.125,32.908,20.172z M32.645,18.264c-0.053,0-0.094-0.002-0.125-0.005c0.033-0.091,0.076-0.146,0.107-0.175  c0.043,0.066,0.104,0.125,0.166,0.175C32.74,18.262,32.691,18.264,32.645,18.264z M29.963,19.178  c0.23,0.461,0.402,0.658,0.539,0.745c-0.334,0.026-0.586,0.242-0.797,0.448c-0.145-0.053-0.396-0.206-0.473-0.314  c-0.043-0.064-0.096-0.119-0.156-0.168C29.443,19.783,29.766,19.438,29.963,19.178z M28.689,18.842l-0.48-0.025l-1.605-0.078  c0.197-0.164,0.385-0.318,0.492-0.409c0.031-0.013,0.145-0.044,0.428-0.044c0.17,0,0.332,0.013,0.438,0.021L28.689,18.842z" fill="url(#SVGID_8_)" fill-opacity="0.3" stroke-opacity="0.3"/>
+<radialGradient cx="-11.4893" cy="8.5776" gradientTransform="matrix(0.9797 0 0 0.9952 41.476 8.3351)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="16.9394">
+<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"/>
+</radialGradient>
+<path d="M15.949,27.407c0,0,0,0,0,0.003c0,0.002,0,0.006,0,0.01c0,0.445,0.029,0.886,0.064,1.32  c0.014,0.144,0.033,0.285,0.049,0.43c0.037,0.297,0.084,0.594,0.135,0.886c0.031,0.153,0.059,0.31,0.09,0.464  c0.066,0.301,0.145,0.6,0.229,0.893c0.035,0.121,0.061,0.245,0.096,0.363c0.008,0.012,0.012,0.025,0.014,0.038  c0.012-0.116,0.016-0.234,0.012-0.354c-0.027-0.861-0.164-0.75-0.164-0.75l0.955-1.305v-0.833l-1.119-1.138  C16.309,27.434,15.949,27.376,15.949,27.407z" fill="url(#SVGID_9_)"/>
+<radialGradient cx="-11.459" cy="8.5776" gradientTransform="matrix(0.9797 0 0 0.9952 41.476 8.3351)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="16.9575">
+<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"/>
+</radialGradient>
+<path d="M24.947,14.498c0.412,0.139,0.75-0.143,1.135-0.395c0.137-0.027,1.648-0.641,1.813-0.641  s0.713-0.021,0.85-0.243c0,0,2.365,0.419,2.723,0.278c0.193-0.076,1.01-0.143,1.709-0.189c-0.037-0.008-0.076-0.02-0.113-0.029  c-0.039-0.008-0.074-0.013-0.113-0.021c-0.439-0.091-0.885-0.161-1.336-0.208c0,0-0.006,0-0.01-0.002  c-0.477-0.048-0.957-0.074-1.447-0.074c-0.453,0-0.902,0.027-1.346,0.07c-0.076,0.008-0.152,0.016-0.232,0.026  c-0.428,0.047-0.854,0.11-1.27,0.195c-0.008,0.003-0.016,0.003-0.021,0.005c-0.432,0.09-0.855,0.203-1.271,0.33  c-0.072,0.023-0.141,0.047-0.209,0.068c-0.371,0.123-0.734,0.258-1.092,0.406c-0.041,0.019-0.084,0.034-0.125,0.051  c-0.393,0.171-0.775,0.359-1.15,0.563c-0.055,0.03-0.109,0.064-0.164,0.096c-0.162,0.09-0.311,0.189-0.467,0.287  C23.58,15.334,24.537,14.357,24.947,14.498z" fill="url(#SVGID_10_)"/>
+<radialGradient cx="-11.458" cy="8.5742" gradientTransform="matrix(0.9797 0 0 0.9952 41.476 8.3351)" gradientUnits="userSpaceOnUse" id="SVGID_11_" r="16.9562">
+<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"/>
+</radialGradient>
+<path d="M44.09,24.559c-0.016-0.073-0.037-0.143-0.053-0.214c-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.064-0.061-0.131-0.09-0.195  c-0.143-0.334-0.297-0.658-0.463-0.977c-0.037-0.078-0.078-0.156-0.117-0.23c-0.197-0.359-0.406-0.709-0.627-1.051  c-0.041-0.06-0.084-0.114-0.121-0.174c-0.205-0.303-0.42-0.596-0.648-0.881c-0.043-0.055-0.088-0.113-0.135-0.172  c-0.262-0.314-0.533-0.619-0.82-0.914c-0.047-0.051-0.098-0.099-0.15-0.148c-0.26-0.26-0.535-0.512-0.813-0.75  c-0.047-0.041-0.092-0.083-0.141-0.123c-0.316-0.262-0.645-0.512-0.982-0.746c-0.061-0.041-0.119-0.081-0.182-0.12  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.198-0.74-0.383-1.123-0.55  c-0.07-0.029-0.139-0.055-0.205-0.086c-0.15-0.063-0.303-0.111-0.455-0.17c-0.182,0.118-1.016,0.598-1.016,0.598  s-3.623-0.503-3.869-0.252c-0.25,0.252-1.213,0.508-1.434,0.537c-0.219,0.029-0.674,0.148-0.129,0.832  c-0.082,0.084-1.643,1.186-1.643,0.686c0-0.502,0.352-1.4-0.139-0.92c-0.35,0.346-0.563,0.813-0.605,0.902  c-0.115,0.223-0.186,0.328-0.104,0.97c0.084,0.642-1.006,0.64-1.08,0.474c-0.197-0.445-1.275,0.998-1.275,0.998l0.455,0.594  c0,0-3.18,2.486-3.205,2.654c-0.029,0.168-0.822,2.328-0.547,2.971c0.273,0.643,0.969,2.262,1.625,2.313  c0.861,0.072,2.951-0.398,2.951-0.398c0.055,0.143,0.451,0.854,0.451,0.854s1.021-0.035,1.08,0.078  c0.018,0.037,1.234,3.668,0.832,4.148c-0.957,1.457,0.547,3.59,0.965,4.313c0.42,1.238,0.688,0.684,1.24,0.889  c0.678,0.057,1.25,0.313,1.826-0.44c0.166-0.14,0.451-0.028,0.451-0.224c0-0.107,0.494-0.428,0.619-0.729  c0.133-0.063,0.475-0.296,0.707-0.409c0.211-0.014-0.201-0.586,0.217-1.192c0.451-0.181,1.666-1.013,1.666-1.013  c0.057-1.223-0.592-2.729,0.617-3.596c0.777-0.806,1.799-1.266,2.295-2.492c0.139-0.361,0.441-1.104-0.438-0.881  c-0.826,0.211-1.75,0.26-1.313-0.109c-0.051-0.456-0.6-0.668-1.092-1.111c-0.254-0.613-0.654-1.704-0.654-1.704l-0.875-1.349  l0.107-0.279l1.041,1.555l1.037,1.275c0.383,1.277,0.711,1.389,0.711,1.389c0.574-0.205,1.939-0.775,1.939-0.775l1.342-1.307  c0,0-0.139-0.418-0.684-0.943l-0.41-0.25c-0.09,0.258-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.456c0.061,0.078,1.611,4.016,1.918,4.021  c0.137,0.001,0.232,0.055,0.189-0.185c-0.055-0.109,0-2.584,0.08-3.115c0.209-0.447,0.242,0,0.734,0.854  C44.094,24.6,44.094,24.579,44.09,24.559z M30.432,15.017c0.105-0.329,0.738-0.44,0.738-0.44s-0.184,0.339-0.141,0.514  c0.041,0.177-0.289,0.286-0.324,0.701c-0.037,0.416-0.789,0.171-0.85,0.025C29.793,15.672,30.318,15.344,30.432,15.017z   M33.125,20.603c-0.467,0-1.863,0.141-2.248-0.138c-0.385-0.279-0.686,0.028-0.961,0.309c-0.182,0.18-0.842-0.187-1.035-0.467  c-0.191-0.279-0.838-0.259-0.838-0.259l0.146-0.796l-1.859-0.09l-1.057,0.314l-0.992,0.027l0.557-0.269l0.693-0.167  c0,0,1.008-0.841,1.309-1.092c0.258-0.213,1.277-0.094,1.277-0.094l1.121,0.821c0,0-0.25,0.644-0.359,0.78  c0.412-0.027,0.896-0.785,0.896-0.785c-0.873-0.816-0.84-1.094-0.84-1.094l1.152,0.822l0.01,0.006c0,0,0.467,1.117,0.662,1.117  c0.189,0,0.436-0.769,0.436-0.769l0.326-0.083c0.146,0.352,0.42,1.146,0.748,0.961c0.189-0.105,0.5-0.011,0.855,0.129  c0.359,0.139,0.602-0.074,0.895,0.186C33.982,21.123,33.318,20.66,33.125,20.603z M33.855,18.684  c-0.479-0.188-2.102,0.418-1.74-0.57c0.193-0.535,0.691-0.646,0.863-0.292c0.043,0.147,0.586,0.374,0.582,0.065  s0.543-0.471,0.621-0.242C33.889,17.857,35.322,18.967,33.855,18.684z M36.918,19.621c-0.268-0.219,0.117-0.404-0.275-0.745  c-0.563-0.491-1.002-0.702-0.234-1.097c0.945-0.122,0.152,0.307,0.309,0.563c0.084,0.136,0.563,0.592,0.938,1.152  C37.963,19.959,37.182,19.84,36.918,19.621z" fill="url(#SVGID_11_)"/>
+<radialGradient cx="-11.4609" cy="8.5801" gradientTransform="matrix(0.9797 0 0 0.9952 41.476 8.3351)" gradientUnits="userSpaceOnUse" id="SVGID_12_" r="16.9527">
+<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"/>
+</radialGradient>
+<path d="M37.297,32.337l-0.91,0.925c0,0-0.549,0-0.576,0.224c-0.012,0.095-0.045,0.508-0.135,0.72  c-0.182,0.129-0.402,0.557-0.402,0.557s-0.113,0.822,0.492,0.682C36.373,35.306,38.232,32.785,37.297,32.337z" fill="url(#SVGID_12_)"/>
+<rect fill="none" height="60" width="60"/>
+</g>
+<g transform="matrix(1 0 0 1 30 30)">
+<polygon fill="none" points="30.414,14.408 30.414,0 0.414,0 0.414,14.41 0,14.824 0.414,15.237 0.414,30 30.414,30 30.414,15.236   30.828,14.821 "/>
+<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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+<rect fill="none" height="30" width="30" x="0.414"/>
+</g>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_url_address_work.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_url_address_work.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<g>
+<rect fill="none" height="60" width="60"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.999" x2="29.999" y1="2.0776" y2="57.6216">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="0.4667" style="stop-color:#E6E6E6"/>
+<stop offset="0.9576" style="stop-color:#C2C2C2"/>
+<stop offset="1" style="stop-color:#C2C2C2"/>
+</linearGradient>
+<path d="M53.428,41.199c0,1.027-0.582,2.461-1.297,3.188L40.027,56.681C39.314,57.407,37.904,58,36.891,58  H6.57V2h46.857V41.199z" fill="url(#SVGID_1_)"/>
+<linearGradient gradientTransform="matrix(-1 0 0 -1 5045.8477 1885.916)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="5015.8486" x2="5015.8486" y1="1883.5537" y2="1827.7893">
+<stop offset="0" style="stop-color:#F0F0F2"/>
+<stop offset="1" style="stop-color:#B3B5B8"/>
+</linearGradient>
+<path d="M7.49,2.932h45.02v38.268c0,0.775-0.49,1.979-1.031,2.527l-12.1,12.293  c-0.541,0.549-1.725,1.047-2.488,1.047H7.49V2.932 M6.57,2v56h30.32c1.014,0,2.424-0.593,3.137-1.319l12.104-12.294  c0.715-0.727,1.297-2.16,1.297-3.188V2H6.57L6.57,2z" fill="url(#SVGID_2_)"/>
+<linearGradient gradientTransform="matrix(-1 0 0 -1 5045.8477 1885.916)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="5006.7441" x2="4999.812" y1="1841.873" y2="1834.9412">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="0.297" style="stop-color:#FFFFFF"/>
+<stop offset="0.5576" style="stop-color:#E6E6E6"/>
+<stop offset="0.7515" style="stop-color:#BCBCBC"/>
+<stop offset="1" style="stop-color:#8E8E8E"/>
+</linearGradient>
+<path d="M51.736,44.787c0.379-0.43,1.09-0.859,1.576-2.705c0,0-0.803,3.783-11.83,0.052  C41.482,58,36.891,58,36.891,58c1.014,0,2.424-0.593,3.137-1.319L51.736,44.787z" fill="url(#SVGID_3_)"/>
+<ellipse cx="30" cy="28.558" fill-opacity="0.2" rx="15.107" ry="15.347" stroke-opacity="0.2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="30" x2="30" y1="42.5859" y2="12.1111">
+<stop offset="0" style="stop-color:#004E8C"/>
+<stop offset="1" style="stop-color:#1B66D8"/>
+</linearGradient>
+<ellipse cx="30" cy="27.416" fill="url(#SVGID_4_)" rx="15.107" ry="15.346"/>
+<radialGradient cx="-11.9336" cy="13.8384" gradientTransform="matrix(0.9797 0 0 0.9952 41.476 8.3351)" gradientUnits="userSpaceOnUse" id="SVGID_5_" r="18.5643">
+<stop offset="0" style="stop-color:#94FFFF"/>
+<stop offset="0.5" style="stop-color:#36B5FF"/>
+<stop offset="1" style="stop-color:#1B66D8"/>
+</radialGradient>
+<ellipse cx="30" cy="27.416" fill="url(#SVGID_5_)" rx="14.721" ry="14.953"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="30" x2="30" y1="12.3306" y2="42.445">
+<stop offset="0" style="stop-color:#31A7F8"/>
+<stop offset="0.497" style="stop-color:#1E74DC"/>
+<stop offset="1" style="stop-color:#88D6EB"/>
+</linearGradient>
+<path d="M30,12.462c-8.129,0-14.721,6.696-14.721,14.954c0,8.26,6.592,14.953,14.721,14.953  c8.131,0,14.721-6.693,14.721-14.953C44.721,19.158,38.131,12.462,30,12.462z M30,41.061c-7.645,0-13.863-6.316-13.863-14.08  c0-7.766,6.219-14.081,13.863-14.081s13.861,6.315,13.861,14.081C43.861,34.744,37.645,41.061,30,41.061z" fill="url(#SVGID_6_)" fill-opacity="0.3" stroke-opacity="0.3"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="15.5195" x2="17.8594" y1="29.4512" y2="29.4512">
+<stop offset="0" style="stop-color:#58595B"/>
+<stop offset="1" style="stop-color:#000000"/>
+</linearGradient>
+<path d="M16.66,27.172c-0.156-0.211-0.51-0.211-0.666-0.211c-0.307,0-0.473,0.223-0.475,0.441  v0.016v0.021c0,0.385,0.021,0.816,0.066,1.34c0.01,0.098,0.02,0.198,0.033,0.297l0.018,0.144c0.039,0.312,0.086,0.617,0.139,0.913  l0.023,0.129c0.023,0.119,0.045,0.232,0.068,0.348c0.064,0.291,0.141,0.592,0.236,0.924c0.012,0.049,0.025,0.098,0.035,0.143  c0.021,0.078,0.039,0.156,0.064,0.231l0.004,0.011l0.008,0.023c0-0.006-0.006-0.018-0.006-0.026l0.844-0.058  c0.014-0.135,0.02-0.273,0.014-0.414c-0.006-0.216-0.016-0.482-0.076-0.709l0.785-1.069l0.084-0.116v-0.145v-0.833v-0.183  l-0.127-0.127L16.66,27.172z" fill="url(#SVGID_7_)" fill-opacity="0.3" stroke-opacity="0.3"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="20.0322" x2="44.5176" y1="25.0957" y2="25.0957">
+<stop offset="0" style="stop-color:#58595B"/>
+<stop offset="1" style="stop-color:#000000"/>
+</linearGradient>
+<path d="M44.512,24.485c-0.01-0.056-0.021-0.099-0.031-0.138  c-0.008-0.029-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.169-0.072-0.251  c-0.133-0.42-0.277-0.822-0.43-1.193c-0.02-0.045-0.041-0.09-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.381-0.424-0.746-0.648-1.082c-0.021-0.035-0.047-0.072-0.072-0.111  c-0.02-0.021-0.031-0.042-0.047-0.065c-0.213-0.313-0.438-0.618-0.668-0.907l-0.047-0.059c-0.031-0.039-0.061-0.08-0.094-0.12  c-0.268-0.325-0.551-0.644-0.844-0.942c-0.041-0.039-0.084-0.081-0.125-0.125L40.4,16.791c-0.264-0.264-0.545-0.521-0.834-0.768  l-0.057-0.051c-0.027-0.026-0.059-0.051-0.088-0.074c-0.314-0.264-0.656-0.522-1.014-0.771c-0.041-0.029-0.086-0.061-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.395-1.158-0.566l-0.1-0.041L35.73,13.66c-0.105-0.045-0.209-0.081-0.313-0.119  c-0.055-0.02-0.107-0.037-0.158-0.057l-0.201-0.076l-0.182,0.116c-0.117,0.075-0.59,0.351-0.869,0.511  c-0.309-0.041-1.057-0.137-1.811-0.211c0.23-0.023,0.555-0.05,1.006-0.08l0.064-0.861l-0.033-0.01  c-0.027-0.006-0.055-0.013-0.082-0.02l-0.064-0.012l-0.053-0.012c-0.461-0.094-0.896-0.162-1.326-0.209h-0.004l-0.061-0.006  c-0.492-0.051-0.992-0.076-1.488-0.076c-0.438,0-0.891,0.024-1.385,0.072c-0.078,0.007-0.148,0.015-0.227,0.023  c-0.488,0.055-0.916,0.121-1.32,0.205l-0.016,0.002h-0.008c-0.426,0.092-0.854,0.203-1.311,0.344  c-0.039,0.014-0.08,0.026-0.121,0.039l-0.092,0.031c-0.387,0.125-0.766,0.266-1.125,0.416c-0.027,0.014-0.051,0.021-0.07,0.027  l-0.055,0.023c-0.398,0.172-0.797,0.367-1.191,0.582c-0.041,0.021-0.082,0.047-0.125,0.071l-0.051,0.028  c-0.109,0.064-0.221,0.135-0.33,0.203l-0.143,0.092l-0.791,0.49l0.875,0.297c0.131,0.045,0.271,0.066,0.42,0.066  c0.471,0,0.928-0.236,1.295-0.424c0.146-0.076,0.365-0.189,0.457-0.207c0.107,0.032,0.215,0.049,0.322,0.049  c0.4,0,0.729-0.221,1.02-0.415l0.076-0.05c0.098-0.031,0.258-0.092,0.578-0.213c0.33-0.127,0.928-0.354,1.088-0.393  c0.311-0.004,0.68-0.049,0.943-0.215c0.248,0.041,0.688,0.111,1.143,0.172c-0.033,0.021-0.066,0.041-0.096,0.07  c-0.146,0.137-0.939,0.381-1.184,0.414c-0.457,0.057-0.639,0.291-0.713,0.475c-0.094,0.242-0.039,0.484,0.057,0.68  c-0.174,0.114-0.385,0.244-0.566,0.342c0-0.004,0.002-0.009,0.002-0.014c0.064-0.371,0.113-0.639-0.064-0.852  c-0.09-0.111-0.225-0.172-0.365-0.172c-0.209,0-0.371,0.13-0.502,0.258c-0.365,0.359-0.588,0.809-0.672,0.977l-0.016,0.031  l-0.014,0.025c-0.156,0.311-0.223,0.527-0.135,1.211c-0.039,0.027-0.154,0.072-0.314,0.072c-0.02,0-0.039-0.002-0.055-0.002  c-0.104-0.114-0.246-0.18-0.406-0.18l0,0c-0.369,0-0.873,0.424-1.496,1.258l-0.199,0.268l0.203,0.266l0.188,0.246  c-2.973,2.334-2.994,2.467-3.023,2.66c-0.008,0.02-0.033,0.1-0.068,0.211c-0.443,1.398-0.688,2.445-0.449,3.004  c0.553,1.299,1.178,2.512,1.986,2.578c0.07,0.006,0.148,0.008,0.234,0.008c0.738,0,1.939-0.229,2.518-0.348  c0.105,0.204,0.236,0.441,0.307,0.57l0.129,0.23l0.26-0.008c0,0,0.141-0.006,0.316-0.006c0.203,0,0.338,0.008,0.424,0.014  c0.314,0.938,0.918,3.094,0.805,3.539l-0.002,0.002c-1.014,1.549,0.215,3.563,0.807,4.533c0.049,0.076,0.09,0.145,0.125,0.205  c0.229,0.66,0.506,1.098,1.09,1.098c0.043,0,0.09-0.004,0.131-0.005c0.033-0.003,0.07-0.005,0.104-0.005  c0.066,0,0.111,0.01,0.16,0.027l0.055,0.02l0.055,0.004c0.109,0.009,0.215,0.023,0.32,0.039c0.178,0.025,0.365,0.051,0.557,0.051  c0.508,0,0.908-0.195,1.258-0.613c0.014,0,0.025-0.002,0.037-0.004c0.367-0.051,0.504-0.238,0.549-0.404  c0.029-0.028,0.064-0.063,0.094-0.09c0.146-0.134,0.316-0.293,0.436-0.482c0.051-0.031,0.113-0.068,0.182-0.109  c0.117-0.073,0.25-0.154,0.354-0.209c0.092-0.028,0.174-0.084,0.234-0.161c0.148-0.183,0.119-0.394,0.094-0.562  c-0.025-0.173-0.051-0.35,0.043-0.541c0.52-0.256,1.445-0.882,1.594-0.984v0.012c-0.008,0.083-0.033,0.309-0.07,0.45  c-0.197,0.2-0.359,0.503-0.414,0.606l-0.031,0.066l-0.012,0.074c-0.012,0.098-0.066,0.607,0.215,0.938  c0.143,0.166,0.346,0.258,0.574,0.258c0.07,0,0.146-0.01,0.223-0.027c0.727-0.168,2.01-1.936,2.113-2.91  c0.053-0.473-0.129-0.842-0.494-1.018l-0.273-0.131l-0.217,0.217l-0.791,0.805c-0.268,0.025-0.479,0.107-0.619,0.234  c0.008-0.344-0.025-0.695-0.061-1.039c-0.109-1.037-0.129-1.695,0.496-2.146l0.031-0.023l0.029-0.027  c0.223-0.234,0.475-0.438,0.74-0.654c0.619-0.506,1.26-1.029,1.643-1.975l0.016-0.041c0.123-0.323,0.309-0.811,0.059-1.183  c-0.063-0.091-0.193-0.233-0.441-0.286c0.326-0.131,0.576-0.236,0.6-0.245l0.076-0.032l0.059-0.059l1.34-1.303l0.195-0.192  l-0.086-0.263c-0.012-0.034-0.086-0.24-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.527,1.678,3.708,2.063,3.715c0.014,0,0.025,0.001,0.035,0.004c0.029,0,0.059,0.002,0.082,0.002  c0.221,0,0.344-0.114,0.398-0.182c0.16-0.195,0.117-0.436,0.1-0.525l-0.006-0.029c-0.018-0.213-0.006-1.162,0.023-1.94  c0.002,0.003,0.004,0.005,0.004,0.007l0.791-0.319L44.512,24.485z M32.908,20.172c-0.061,0.001-0.129,0.006-0.199,0.006  c-0.227,0.014-0.486,0.023-0.742,0.023c-0.672,0-0.826-0.083-0.842-0.094c-0.082-0.057-0.162-0.102-0.248-0.133  c0.154-0.035,0.328-0.156,0.508-0.508c0.176,0.348,0.416,0.656,0.785,0.656c0.1,0,0.195-0.023,0.287-0.07  C32.582,20.055,32.785,20.125,32.908,20.172z M32.645,18.264c-0.053,0-0.094-0.002-0.125-0.005c0.033-0.091,0.076-0.146,0.107-0.175  c0.043,0.066,0.104,0.125,0.166,0.175C32.74,18.262,32.691,18.264,32.645,18.264z M29.963,19.178  c0.23,0.461,0.402,0.658,0.539,0.745c-0.334,0.026-0.586,0.242-0.797,0.448c-0.145-0.053-0.396-0.206-0.473-0.314  c-0.043-0.064-0.096-0.119-0.156-0.168C29.443,19.783,29.766,19.438,29.963,19.178z M28.689,18.842l-0.48-0.025l-1.605-0.078  c0.197-0.164,0.385-0.318,0.492-0.409c0.031-0.013,0.145-0.044,0.428-0.044c0.17,0,0.332,0.013,0.438,0.021L28.689,18.842z" fill="url(#SVGID_8_)" fill-opacity="0.3" stroke-opacity="0.3"/>
+<radialGradient cx="-11.4893" cy="8.5776" gradientTransform="matrix(0.9797 0 0 0.9952 41.476 8.3351)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="16.9394">
+<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"/>
+</radialGradient>
+<path d="M15.949,27.407c0,0,0,0,0,0.003c0,0.002,0,0.006,0,0.01c0,0.445,0.029,0.886,0.064,1.32  c0.014,0.144,0.033,0.285,0.049,0.43c0.037,0.297,0.084,0.594,0.135,0.886c0.031,0.153,0.059,0.31,0.09,0.464  c0.066,0.301,0.145,0.6,0.229,0.893c0.035,0.121,0.061,0.245,0.096,0.363c0.008,0.012,0.012,0.025,0.014,0.038  c0.012-0.116,0.016-0.234,0.012-0.354c-0.027-0.861-0.164-0.75-0.164-0.75l0.955-1.305v-0.833l-1.119-1.138  C16.309,27.434,15.949,27.376,15.949,27.407z" fill="url(#SVGID_9_)"/>
+<radialGradient cx="-11.459" cy="8.5776" gradientTransform="matrix(0.9797 0 0 0.9952 41.476 8.3351)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="16.9575">
+<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"/>
+</radialGradient>
+<path d="M24.947,14.498c0.412,0.139,0.75-0.143,1.135-0.395c0.137-0.027,1.648-0.641,1.813-0.641  s0.713-0.021,0.85-0.243c0,0,2.365,0.419,2.723,0.278c0.193-0.076,1.01-0.143,1.709-0.189c-0.037-0.008-0.076-0.02-0.113-0.029  c-0.039-0.008-0.074-0.013-0.113-0.021c-0.439-0.091-0.885-0.161-1.336-0.208c0,0-0.006,0-0.01-0.002  c-0.477-0.048-0.957-0.074-1.447-0.074c-0.453,0-0.902,0.027-1.346,0.07c-0.076,0.008-0.152,0.016-0.232,0.026  c-0.428,0.047-0.854,0.11-1.27,0.195c-0.008,0.003-0.016,0.003-0.021,0.005c-0.432,0.09-0.855,0.203-1.271,0.33  c-0.072,0.023-0.141,0.047-0.209,0.068c-0.371,0.123-0.734,0.258-1.092,0.406c-0.041,0.019-0.084,0.034-0.125,0.051  c-0.393,0.171-0.775,0.359-1.15,0.563c-0.055,0.03-0.109,0.064-0.164,0.096c-0.162,0.09-0.311,0.189-0.467,0.287  C23.58,15.334,24.537,14.357,24.947,14.498z" fill="url(#SVGID_10_)"/>
+<radialGradient cx="-11.458" cy="8.5742" gradientTransform="matrix(0.9797 0 0 0.9952 41.476 8.3351)" gradientUnits="userSpaceOnUse" id="SVGID_11_" r="16.9562">
+<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"/>
+</radialGradient>
+<path d="M44.09,24.559c-0.016-0.073-0.037-0.143-0.053-0.214c-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.064-0.061-0.131-0.09-0.195  c-0.143-0.334-0.297-0.658-0.463-0.977c-0.037-0.078-0.078-0.156-0.117-0.23c-0.197-0.359-0.406-0.709-0.627-1.051  c-0.041-0.06-0.084-0.114-0.121-0.174c-0.205-0.303-0.42-0.596-0.648-0.881c-0.043-0.055-0.088-0.113-0.135-0.172  c-0.262-0.314-0.533-0.619-0.82-0.914c-0.047-0.051-0.098-0.099-0.15-0.148c-0.26-0.26-0.535-0.512-0.813-0.75  c-0.047-0.041-0.092-0.083-0.141-0.123c-0.316-0.262-0.645-0.512-0.982-0.746c-0.061-0.041-0.119-0.081-0.182-0.12  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.198-0.74-0.383-1.123-0.55  c-0.07-0.029-0.139-0.055-0.205-0.086c-0.15-0.063-0.303-0.111-0.455-0.17c-0.182,0.118-1.016,0.598-1.016,0.598  s-3.623-0.503-3.869-0.252c-0.25,0.252-1.213,0.508-1.434,0.537c-0.219,0.029-0.674,0.148-0.129,0.832  c-0.082,0.084-1.643,1.186-1.643,0.686c0-0.502,0.352-1.4-0.139-0.92c-0.35,0.346-0.563,0.813-0.605,0.902  c-0.115,0.223-0.186,0.328-0.104,0.97c0.084,0.642-1.006,0.64-1.08,0.474c-0.197-0.445-1.275,0.998-1.275,0.998l0.455,0.594  c0,0-3.18,2.486-3.205,2.654c-0.029,0.168-0.822,2.328-0.547,2.971c0.273,0.643,0.969,2.262,1.625,2.313  c0.861,0.072,2.951-0.398,2.951-0.398c0.055,0.143,0.451,0.854,0.451,0.854s1.021-0.035,1.08,0.078  c0.018,0.037,1.234,3.668,0.832,4.148c-0.957,1.457,0.547,3.59,0.965,4.313c0.42,1.238,0.688,0.684,1.24,0.889  c0.678,0.057,1.25,0.313,1.826-0.44c0.166-0.14,0.451-0.028,0.451-0.224c0-0.107,0.494-0.428,0.619-0.729  c0.133-0.063,0.475-0.296,0.707-0.409c0.211-0.014-0.201-0.586,0.217-1.192c0.451-0.181,1.666-1.013,1.666-1.013  c0.057-1.223-0.592-2.729,0.617-3.596c0.777-0.806,1.799-1.266,2.295-2.492c0.139-0.361,0.441-1.104-0.438-0.881  c-0.826,0.211-1.75,0.26-1.313-0.109c-0.051-0.456-0.6-0.668-1.092-1.111c-0.254-0.613-0.654-1.704-0.654-1.704l-0.875-1.349  l0.107-0.279l1.041,1.555l1.037,1.275c0.383,1.277,0.711,1.389,0.711,1.389c0.574-0.205,1.939-0.775,1.939-0.775l1.342-1.307  c0,0-0.139-0.418-0.684-0.943l-0.41-0.25c-0.09,0.258-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.456c0.061,0.078,1.611,4.016,1.918,4.021  c0.137,0.001,0.232,0.055,0.189-0.185c-0.055-0.109,0-2.584,0.08-3.115c0.209-0.447,0.242,0,0.734,0.854  C44.094,24.6,44.094,24.579,44.09,24.559z M30.432,15.017c0.105-0.329,0.738-0.44,0.738-0.44s-0.184,0.339-0.141,0.514  c0.041,0.177-0.289,0.286-0.324,0.701c-0.037,0.416-0.789,0.171-0.85,0.025C29.793,15.672,30.318,15.344,30.432,15.017z   M33.125,20.603c-0.467,0-1.863,0.141-2.248-0.138c-0.385-0.279-0.686,0.028-0.961,0.309c-0.182,0.18-0.842-0.187-1.035-0.467  c-0.191-0.279-0.838-0.259-0.838-0.259l0.146-0.796l-1.859-0.09l-1.057,0.314l-0.992,0.027l0.557-0.269l0.693-0.167  c0,0,1.008-0.841,1.309-1.092c0.258-0.213,1.277-0.094,1.277-0.094l1.121,0.821c0,0-0.25,0.644-0.359,0.78  c0.412-0.027,0.896-0.785,0.896-0.785c-0.873-0.816-0.84-1.094-0.84-1.094l1.152,0.822l0.01,0.006c0,0,0.467,1.117,0.662,1.117  c0.189,0,0.436-0.769,0.436-0.769l0.326-0.083c0.146,0.352,0.42,1.146,0.748,0.961c0.189-0.105,0.5-0.011,0.855,0.129  c0.359,0.139,0.602-0.074,0.895,0.186C33.982,21.123,33.318,20.66,33.125,20.603z M33.855,18.684  c-0.479-0.188-2.102,0.418-1.74-0.57c0.193-0.535,0.691-0.646,0.863-0.292c0.043,0.147,0.586,0.374,0.582,0.065  s0.543-0.471,0.621-0.242C33.889,17.857,35.322,18.967,33.855,18.684z M36.918,19.621c-0.268-0.219,0.117-0.404-0.275-0.745  c-0.563-0.491-1.002-0.702-0.234-1.097c0.945-0.122,0.152,0.307,0.309,0.563c0.084,0.136,0.563,0.592,0.938,1.152  C37.963,19.959,37.182,19.84,36.918,19.621z" fill="url(#SVGID_11_)"/>
+<radialGradient cx="-11.4609" cy="8.5801" gradientTransform="matrix(0.9797 0 0 0.9952 41.476 8.3351)" gradientUnits="userSpaceOnUse" id="SVGID_12_" r="16.9527">
+<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"/>
+</radialGradient>
+<path d="M37.297,32.337l-0.91,0.925c0,0-0.549,0-0.576,0.224c-0.012,0.095-0.045,0.508-0.135,0.72  c-0.182,0.129-0.402,0.557-0.402,0.557s-0.113,0.822,0.492,0.682C36.373,35.306,38.232,32.785,37.297,32.337z" fill="url(#SVGID_12_)"/>
+<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"/>
+<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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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;"/>
+<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="665.4" x2="665.4" y1="-582.2" y2="-604.8">
+<stop offset="0" stop-color="#CCCCCC"/>
+<stop offset="1" stop-color="#949494"/>
+</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"/>
+</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>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_usb.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_usb.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<g>
+<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="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"/>
+</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.3697" style="stop-color:#FFFFFF"/>
+<stop offset="0.8061" style="stop-color:#AFB5B7"/>
+<stop offset="1" style="stop-color:#E0E4E5"/>
+</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"/>
+</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>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_usb_memory.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,55 +1,63 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.9995" x2="29.9995" y1="6.2495" y2="12.682">
-<stop offset="0" style="stop-color:#2D9BD2"/>
-<stop offset="0.9697" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#1347BA"/>
+<rect fill="none" height="60" width="60"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="23.2222" y2="0.7603">
+<stop offset="0" style="stop-color:#F2F2F2"/>
+<stop offset="0.1576" style="stop-color:#E6E6E6"/>
+<stop offset="1" style="stop-color:#B3B3B3"/>
 </linearGradient>
-<rect fill="url(#SVGID_1_)" height="8.065" width="29.367" x="15.316" y="6.125"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="29.9995" x2="29.9995" y1="53.541" y2="32.249">
-<stop offset="0" style="stop-color:#E6E6E6"/>
+<rect fill="url(#SVGID_1_)" height="22.462" width="28.305" x="15.848" y="1"/>
+<linearGradient gradientTransform="matrix(-1 0 0 -1 -3087.1172 11754.375)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-3117.1167" x2="-3117.1167" y1="11752.4258" y2="11731.4102">
+<stop offset="0" style="stop-color:#F2F2F2"/>
+<stop offset="0.1576" style="stop-color:#E6E6E6"/>
 <stop offset="1" style="stop-color:#B3B3B3"/>
 </linearGradient>
-<rect fill="url(#SVGID_2_)" height="21.292" width="27.21" x="16.395" y="32.477"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="29.9995" x2="29.9995" y1="32.6045" y2="53.8965">
+<rect fill="url(#SVGID_2_)" height="21.016" width="26.859" x="16.57" y="1.724"/>
+<linearGradient gradientTransform="matrix(-1 0 0 -1 -3087.1172 11754.375)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-3117.1177" x2="-3117.1177" y1="11731.7617" y2="11752.7773">
 <stop offset="0" style="stop-color:#E6E6E6"/>
-<stop offset="0.6667" style="stop-color:#CBCBCB"/>
-<stop offset="1" style="stop-color:#ECECEC"/>
+<stop offset="1" style="stop-color:#FFFFFF"/>
 </linearGradient>
-<path d="M42.939,33.142v19.962H17.06V33.142H42.939 M43.604,32.477h-27.21v21.292h27.21V32.477L43.604,32.477  z" fill="url(#SVGID_3_)"/>
-<rect fill="#231F20" fill-opacity="0.4" height="0.647" stroke-opacity="0.4" width="27.21" x="16.395" y="33.558"/>
-<rect fill="#231F20" fill-opacity="0.4" height="0.646" stroke-opacity="0.4" width="29.371" x="15.314" y="10.867"/>
-<rect fill="#231F20" fill-opacity="0.15" height="0.646" stroke-opacity="0.15" width="29.371" x="15.314" y="10.202"/>
-<rect fill="#47DAFA" height="0.646" width="29.371" x="15.314" y="6.128"/>
-<rect fill="#231F20" fill-opacity="0.15" height="0.647" stroke-opacity="0.15" width="27.21" x="16.395" y="34.223"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="29.9995" x2="29.9995" y1="11.5117" y2="33.1808">
-<stop offset="0" style="stop-color:#8E8E8E"/>
-<stop offset="1" style="stop-color:#444444"/>
+<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"/>
+<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"/>
+<stop offset="1" style="stop-color:#8B8B8B"/>
+</linearGradient>
+<path d="M29.939,59c-15.299,0-19.092-11.501-19.092-13.139V23.695c0-1.121,0.912-2.034,2.035-2.034h34.232  c1.123,0,2.037,0.913,2.037,2.034v22.166C49.152,47.583,45.57,59,29.939,59L29.939,59z" fill="url(#SVGID_4_)"/>
+<linearGradient gradientTransform="matrix(-1 0 0 -1 -3087.1172 11754.375)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="-3117.1167" x2="-3117.1167" y1="11731.9902" y2="11696.6816">
+<stop offset="0" style="stop-color:#EBEBEB"/>
+<stop offset="0.7455" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#8B8B8B"/>
 </linearGradient>
-<path d="M48.67,32.21c0,0.73-0.598,1.33-1.33,1.33H12.66c-0.732,0-1.33-0.6-1.33-1.33V12.842  c0-0.731,0.598-1.33,1.33-1.33h34.68c0.732,0,1.33,0.599,1.33,1.33V32.21z" fill="url(#SVGID_4_)"/>
-<path d="M30.291,22.986c6.33,0,12.482-0.328,18.379-0.94v-9.204c0-0.731-0.598-1.33-1.33-1.33H12.66  c-0.732,0-1.33,0.599-1.33,1.33v9.145C17.404,22.637,23.752,22.986,30.291,22.986z" fill="#FFFFFF" fill-opacity="0.15" stroke-opacity="0.15"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="29.9995" x2="29.9995" y1="11.5762" y2="33.3542">
-<stop offset="0" style="stop-color:#CCCCCC"/>
-<stop offset="1" style="stop-color:#292929"/>
+<path d="M11.57,23.695c0-0.722,0.592-1.311,1.313-1.311h34.232c0.725,0,1.314,0.589,1.314,1.311v22.166  c0,2.077-4.049,12.417-18.49,12.417C15.5,58.278,11.57,47.61,11.57,45.861V23.695z" fill="url(#SVGID_5_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="30" x2="30" y1="23.4189" y2="57.8808">
+<stop offset="0" style="stop-color:#8E8E8E"/>
+<stop offset="1" style="stop-color:#0A0A0A"/>
 </linearGradient>
-<path d="M47.34,12.177c0.367,0,0.666,0.298,0.666,0.665V32.21c0,0.365-0.299,0.665-0.666,0.665H12.66  c-0.367,0-0.666-0.3-0.666-0.665V12.842c0-0.367,0.299-0.665,0.666-0.665H47.34 M47.34,11.512H12.66c-0.732,0-1.33,0.599-1.33,1.33  V32.21c0,0.73,0.598,1.33,1.33,1.33h34.68c0.732,0,1.33-0.6,1.33-1.33V12.842C48.67,12.11,48.072,11.512,47.34,11.512L47.34,11.512z  " fill="url(#SVGID_5_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="23.7388" x2="23.7388" y1="44.1855" y2="38.2006">
+<path d="M29.939,57.62c-13.973,0-17.713-10.361-17.713-11.759V23.695c0-0.362,0.293-0.655,0.656-0.655h34.232  c0.363,0,0.658,0.293,0.658,0.655v22.166C47.773,47.327,44.23,57.62,29.939,57.62L29.939,57.62z" fill="url(#SVGID_6_)"/>
+<path d="M30.943,40.104c6.248,0,12.32-0.324,18.143-0.928V24.351c0-0.721-0.592-1.311-1.313-1.311  H13.539c-0.723,0-1.313,0.59-1.313,1.311v14.767C18.223,39.759,24.49,40.104,30.943,40.104z" fill="#FFFFFF" fill-opacity="0.15" stroke-opacity="0.15"/>
+<rect fill="#FFFFFF" height="5.468" width="5.471" x="33.445" y="12.966"/>
+<rect fill="#FFFFFF" height="5.468" width="5.471" x="21.084" y="12.966"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="36.1807" x2="36.1807" y1="17.499" y2="12.0196">
 <stop offset="0" style="stop-color:#8E8E8E"/>
-<stop offset="1" style="stop-color:#444444"/>
+<stop offset="1" style="stop-color:#0A0A0A"/>
 </linearGradient>
-<rect fill="url(#SVGID_6_)" height="5.541" width="5.54" x="20.969" y="37.813"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="36.2617" x2="36.2617" y1="44.1855" y2="38.2006">
+<rect fill="url(#SVGID_7_)" height="5.469" width="5.471" x="33.445" y="12.002"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="23.8193" x2="23.8193" y1="17.3184" y2="12.0085">
 <stop offset="0" style="stop-color:#8E8E8E"/>
-<stop offset="1" style="stop-color:#444444"/>
+<stop offset="1" style="stop-color:#0A0A0A"/>
 </linearGradient>
-<rect fill="url(#SVGID_7_)" height="5.541" width="5.54" x="33.491" y="37.813"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="29.8833" x2="29.8833" y1="14.4839" y2="31.0274">
-<stop offset="0" style="stop-color:#E6E6E6"/>
-<stop offset="1" style="stop-color:#B3B3B3"/>
+<rect fill="url(#SVGID_8_)" height="5.469" width="5.471" x="21.084" y="12.002"/>
+<linearGradient gradientTransform="matrix(-1 0 0 -1 -3087.1172 11754.375)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="-3117.2319" x2="-3117.2319" y1="11726.4707" y2="11705.0322">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="0.297" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#D9D9D9"/>
 </linearGradient>
-<path d="M25.575,26.055c0,0.619,0.503,1.122,1.122,1.122s1.122-0.503,1.122-1.122  c0-0.521-0.358-0.956-0.842-1.082c0.152-0.803,0.78-3.395,2.524-3.492v6.601h-1.301l1.821,3.152l1.819-3.152h-1.301V18.9  c1.476,0.352,2.048,2.587,2.209,3.397c-0.463,0.139-0.803,0.563-0.803,1.07c0,0.619,0.503,1.121,1.121,1.121  c0.621,0,1.123-0.502,1.123-1.121c0-0.493-0.319-0.906-0.762-1.058c-0.139-0.793-0.795-3.743-2.889-4.085v-1.347  c0.5-0.205,0.853-0.695,0.853-1.269c0-0.758-0.614-1.373-1.372-1.373c-0.757,0-1.371,0.615-1.371,1.373  c0,0.573,0.352,1.063,0.852,1.269v3.936c-2.421,0.094-3.098,3.524-3.207,4.197C25.875,25.173,25.575,25.577,25.575,26.055z" fill="url(#SVGID_8_)"/>
+<path d="M35.699,34.294c0-0.804-0.652-1.453-1.455-1.453s-1.455,0.649-1.455,1.453  c0,0.676,0.465,1.239,1.09,1.402c-0.195,1.042-1.01,4.4-3.27,4.526V31.67h1.686l-2.359-4.087l-2.359,4.087h1.686v11.897  c-1.912-0.455-2.654-3.352-2.863-4.404c0.6-0.179,1.041-0.729,1.041-1.387c0-0.801-0.65-1.456-1.453-1.456  c-0.805,0-1.455,0.655-1.455,1.456c0,0.639,0.414,1.176,0.988,1.371c0.178,1.027,1.029,4.852,3.742,5.295v1.745  c-0.646,0.267-1.105,0.902-1.105,1.644c0,0.982,0.797,1.777,1.779,1.777s1.777-0.795,1.777-1.777c0-0.741-0.457-1.377-1.104-1.644  v-5.102c3.137-0.122,4.016-4.567,4.156-5.439C35.311,35.438,35.699,34.913,35.699,34.294z" fill="url(#SVGID_9_)"/>
 <rect fill="none" height="60" width="60"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_vcard.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_vcard.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,109 +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 gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.9995" x2="29.9995" y1="0.3882" y2="59.6489">
-<stop offset="0" style="stop-color:#A6A8AB"/>
-<stop offset="1" style="stop-color:#231F20"/>
-</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:#A9AAAD"/>
-<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:#F4FCFF"/>
-<stop offset="0.6242" style="stop-color:#C9CED1"/>
-<stop offset="1" style="stop-color:#9CA4A7"/>
-</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:#A6A8AB"/>
-<stop offset="1" style="stop-color:#231F20"/>
-</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:#A9AAAD"/>
-<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:#BC5800"/>
-<stop offset="0.3" style="stop-color:#A23600"/>
-<stop offset="1" style="stop-color:#D07100"/>
-</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="#600909" 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="#600909" 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:#8BC53F"/>
-<stop offset="0.3758" style="stop-color:#33773B"/>
-<stop offset="0.6303" style="stop-color:#004F3C"/>
-<stop offset="1" style="stop-color:#007338"/>
-</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:#BC5800"/>
-<stop offset="0.3" style="stop-color:#A23600"/>
-<stop offset="1" style="stop-color:#D07100"/>
-</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="#600909" 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:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
-</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:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
-</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:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
-</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:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
-</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:#D2FF8A"/>
-<stop offset="1" style="stop-color:#138F00"/>
-</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:#D2FF8A"/>
-<stop offset="1" style="stop-color:#138F00"/>
-</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:#A7FF00"/>
-<stop offset="0.2303" style="stop-color:#D6FF61"/>
-<stop offset="1" style="stop-color:#138F00"/>
-</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:#A7FF00"/>
-<stop offset="0.2303" style="stop-color:#D6FF61"/>
-<stop offset="1" style="stop-color:#138F00"/>
-</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:#C9CDCE"/>
-<stop offset="1" style="stop-color:#6E7273"/>
-</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:#E6E9E8"/>
-<stop offset="1" style="stop-color:#ADB2B5"/>
-</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 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_call.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,137 +1,135 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5609 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="423.0967" x2="429.6527" y1="-578.646" y2="-582.908">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.6061" style="stop-color:#154EBD"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
-</linearGradient>
-<path d="M19.081,33.911c2.089-3.597,4.591-6.497,7.281-9.189c2.593-2.591,6.72-5.3,8.562-6.256l9.604-10.282  c-0.845-0.3-3.693-0.464-7.279,0.616c-3.586,1.083-11.736,6.303-16.979,11.547c-5.242,5.246-9.727,12.347-10.581,14.595  c-1.343,3.541-1.221,7.445-0.929,8.581c0,0,0.34,1.034,1.144,2.377C10.248,46.476,19.081,33.911,19.081,33.911z" fill="url(#SVGID_1_)"/>
-<path d="M31.184,20.8c1.488-1.036,2.87-1.882,3.74-2.334L44.271,8.46  c-0.132-0.058-0.209-0.088-0.209-0.088c-0.247-0.088-0.642-0.162-1.124-0.219c-0.793,0.006-1.596,0.093-2.401,0.27  C34.843,9.673,31.019,14.958,31.184,20.8z" fill="#020202" fill-opacity="0.05" stroke-opacity="0.05"/>
-<path d="M31.906,20.306c1.205-0.809,2.291-1.462,3.018-1.84l9.377-10.04  c-0.146-0.063-0.233-0.098-0.233-0.098c-0.231-0.08-0.604-0.152-1.06-0.203c-0.751,0.006-1.51,0.087-2.27,0.253  C35.275,9.576,31.636,14.695,31.906,20.306z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M44.079,8.263c-0.21-0.073-0.55-0.137-0.962-0.186c-0.681,0.006-1.369,0.08-2.06,0.231  c-5.087,1.116-8.426,5.984-7.978,11.233c0.725-0.455,1.363-0.826,1.844-1.076l9.424-10.088C44.178,8.302,44.079,8.263,44.079,8.263z  " fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="43.3906" cy="8.9175" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="18.5073">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.6061" style="stop-color:#154EBD"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+<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"/>
 </radialGradient>
-<path d="M34.924,18.466l0.929,1.55c0,0,15.101-6.784,14.084-8.038c-0.513-0.631-0.577-0.656-1.237-1.263  c-1.985-1.815-4.172-2.531-4.172-2.531c-0.186-0.063-0.481-0.12-0.845-0.161c-0.596,0.004-1.2,0.068-1.806,0.201  c-4.591,1.009-7.57,5.501-6.963,10.257C34.916,18.477,34.921,18.47,34.924,18.466z" fill="url(#SVGID_2_)"/>
-<path d="M17.483,34.106c-0.988-0.14-2.007-0.119-3.027,0.105c-2.418,0.53-4.376,2.066-5.646,4.131  c-0.367,2.35-0.25,4.407-0.05,5.18c0,0,0.34,1.034,1.144,2.377c0.29,0.482,6.54-8.264,8.556-11.107L17.483,34.106z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M18.366,34.136c-0.989-0.14-2.008-0.118-3.029,0.105c-3.313,0.727-5.775,3.332-6.76,6.623  c-0.026,1.025,0.034,1.872,0.127,2.397c0.003,0.013,0.005,0.034,0.01,0.048c0,0,0.34,1.033,1.144,2.379  c0.3,0.498,6.981-8.888,8.75-11.384L18.366,34.136z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="437.4258" cy="-571.231" gradientTransform="matrix(0.2095 0.9787 -0.9682 0.2124 -629.4526 -270.6148)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="14.6198">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.6061" style="stop-color:#154EBD"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
-</radialGradient>
-<path d="M11.202,47.738c0.616,0.74,0.646,0.954,1.295,1.524c1.194,1.055,9.301-13.612,9.301-13.612  l-2.683-1.719c-0.941-0.111-1.914-0.079-2.89,0.136c-4.777,1.048-7.806,5.868-6.87,10.832C9.749,45.686,10.349,46.71,11.202,47.738z  " fill="url(#SVGID_3_)"/>
-<path d="M49.937,11.978c-0.179-0.22-0.381-0.446-0.578-0.67l-13.944,7.959l0.438,0.749  C35.853,20.016,50.953,13.231,49.937,11.978z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="422.2881" x2="427.4786" y1="-610.9287" y2="-594.4409">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.8121" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M35.853,20.016l1.178,1.981c0.302,0.515,0.972,0.674,1.569,0.422l4.09-2.334l8.043-4.668  c0.632-0.363,0.878-1.119,0.549-1.686c0,0-0.333-0.501-1.349-1.751L35.853,20.016z" fill="url(#SVGID_4_)"/>
-<path d="M21.798,35.65l-0.725-0.472l-9.215,13.486c0.216,0.204,0.43,0.414,0.639,0.598  C13.691,50.317,21.798,35.65,21.798,35.65z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="439.6982" x2="451.5232" y1="-577.7549" y2="-564.7323">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.8121" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+<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"/>
 </linearGradient>
-<path d="M12.498,49.262c1.193,1.05,1.686,1.37,1.686,1.37c0.567,0.367,1.363,0.169,1.781-0.442l7.9-11.605  c0.419-0.614,0.307-1.411-0.26-1.777l-1.808-1.156L12.498,49.262z" fill="url(#SVGID_5_)"/>
+<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"/>
+</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"/>
+</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.3789" x2="17.6203" y1="23.6504" y2="23.6504">
-<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"/>
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_1__)" height="7.853" width="5.105" x="12.447" y="19.724"/>
-<path d="M12.447,24.655c0.82,0.199,1.673,0.315,2.553,0.315c0.881,0,1.732-0.116,2.553-0.315v-4.294  h-5.105V24.655z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M12.447,24.018c0.82,0.199,1.673,0.315,2.553,0.315c0.881,0,1.732-0.116,2.553-0.315v-4.294  h-5.105V24.018z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="14.9995" x2="14.9995" y1="1.9746" y2="23.6704">
-<stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="0.3212" style="stop-color:#E6E6E6"/>
-<stop offset="1" style="stop-color:#666666"/>
+<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"/>
+<path d="M12.45,24.02c0.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.288z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="15" x2="15" y1="1.975" y2="23.67">
+<stop offset="0" stop-color="#F2F2F2"/>
+<stop offset="0.3212" stop-color="#E6E6E6"/>
+<stop offset="1" stop-color="#666666"/>
 </linearGradient>
-<path d="M15,23.695c-5.98,0-10.848-4.867-10.848-10.848S9.02,2,15,2c5.982,0,10.848,4.866,10.848,10.847  S20.982,23.695,15,23.695L15,23.695z" fill="url(#SVGID_2__)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="14.9995" x2="14.9995" y1="2.6143" y2="23.0332">
-<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:#7C8487"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
+<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"/>
 </linearGradient>
-<circle cx="15" cy="12.847" fill="url(#SVGID_3__)" r="10.209"/>
-<path d="M15,21.989c-5.315,0-9.657-4.23-9.843-9.5c-0.004,0.116-0.009,0.231-0.009,0.349  c0,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.349C24.658,17.759,20.315,21.989,15,21.989z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M23.295,12.413c0,4.704-3.715,9.346-8.299,9.345c-4.58-0.003-8.292-4.646-8.291-9.35  c0.002-4.706,3.718-8.517,8.298-8.517C19.584,3.894,23.298,7.707,23.295,12.413z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M14.996,21.066c-2.387-0.002-4.63-0.932-6.315-2.619c-1.688-1.688-2.615-3.932-2.614-6.318  c0-4.923,4.009-8.929,8.935-8.929c2.387,0,4.632,0.931,6.317,2.618c1.688,1.688,2.616,3.933,2.615,6.318  c-0.002,4.924-4.01,8.93-8.934,8.93H14.996z" fill="#231F20" fill-opacity="0.2" stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="14.9995" x2="14.9995" y1="3.7212" y2="20.3517">
-<stop offset="0" style="stop-color:#CFCFCF"/>
-<stop offset="0.1091" style="stop-color:#CFCFCF"/>
-<stop offset="0.6848" style="stop-color:#121212"/>
-<stop offset="1" style="stop-color:#A6A6A6"/>
+<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"/>
+<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"/>
+<stop offset="0.6848" stop-color="#121212"/>
+<stop offset="1" stop-color="#A6A6A6"/>
 </linearGradient>
-<path d="M14.996,20.428c-2.216-0.002-4.298-0.864-5.864-2.432c-1.567-1.566-2.428-3.65-2.427-5.866  c0-4.573,3.723-8.293,8.296-8.293c2.218,0.001,4.3,0.864,5.866,2.432c1.566,1.568,2.43,3.651,2.428,5.867  c-0.001,4.573-3.723,8.292-8.295,8.292H14.996z" fill="url(#SVGID_4__)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="14.9995" x2="14.9995" y1="4.3682" y2="19.7187">
-<stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="1" style="stop-color:#606769"/>
+<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"/>
 </linearGradient>
-<circle cx="15" cy="12.133" fill="url(#SVGID_5__)" r="7.657"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="14.9995" x2="14.9995" y1="5.7715" y2="18.454">
-<stop offset="0" style="stop-color:#1A1A1A"/>
-<stop offset="0.503" style="stop-color:#343434"/>
-<stop offset="0.7515" style="stop-color:#9E9E9E"/>
-<stop offset="1" style="stop-color:#CFCFCF"/>
+<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">
+<stop offset="0" stop-color="#1A1A1A"/>
+<stop offset="0.503" stop-color="#343434"/>
+<stop offset="0.7515" stop-color="#9E9E9E"/>
+<stop offset="1" stop-color="#CFCFCF"/>
 </linearGradient>
-<path d="M15,18.514c-1.706-0.001-3.309-0.666-4.514-1.871c-1.204-1.206-1.867-2.808-1.867-4.512  c0-3.517,2.862-6.378,6.382-6.378c1.706,0,3.308,0.664,4.513,1.871c1.205,1.205,1.868,2.808,1.867,4.513  C21.381,15.652,18.519,18.514,15,18.514L15,18.514z" fill="url(#SVGID_6_)"/>
-<radialGradient cx="25.7734" cy="10.2729" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="6.4991">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="0.5917" style="stop-color:#000000"/>
-<stop offset="0.627" style="stop-color:#050505"/>
-<stop offset="0.7652" style="stop-color:#121212"/>
-<stop offset="0.8876" style="stop-color:#171717"/>
-<stop offset="1" style="stop-color:#171717"/>
+<path d="M15,18.51c-1.706-0.001-3.309-0.666-4.514-1.871-1.204-1.206-1.867-2.808-1.867-4.512,0-3.517,2.862-6.378,6.382-6.378,1.706,0,3.308,0.664,4.513,1.871,1.205,1.205,1.868,2.808,1.867,4.513,0,3.51-2.86,6.37-6.38,6.37z" fill="url(#SVGID_6__)"/>
+<radialGradient cx="25.77" cy="10.27" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="6.499">
+<stop offset="0" stop-color="#000000"/>
+<stop offset="0.5917" stop-color="#000000"/>
+<stop offset="0.627" stop-color="#050505"/>
+<stop offset="0.7652" stop-color="#121212"/>
+<stop offset="0.8876" stop-color="#171717"/>
+<stop offset="1" stop-color="#171717"/>
 </radialGradient>
-<path d="M20.743,12.135c0,3.172-2.574,5.74-5.744,5.74c-3.175-0.001-5.743-2.573-5.741-5.745  c0-3.171,2.573-5.742,5.745-5.74C18.173,6.391,20.744,8.962,20.743,12.135z" fill="url(#SVGID_7_)"/>
-<radialGradient cx="21.6543" cy="5.0659" gradientTransform="matrix(1.0143 0 0 1.0141 -9.5579 3.1299)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="10.3515">
-<stop offset="0" style="stop-color:#242424"/>
-<stop offset="0.4303" style="stop-color:#242424"/>
-<stop offset="0.7818" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
+<path d="M20.74,12.14c0,3.172-2.574,5.74-5.744,5.74-3.175-0.001-5.743-2.573-5.741-5.745,0-3.171,2.573-5.742,5.745-5.74,3.17-0.009,5.74,2.562,5.74,5.74z" fill="url(#SVGID_7_)"/>
+<radialGradient cx="21.65" cy="5.066" gradientTransform="matrix(1.0143 0 0 1.0141 -9.5579 3.1299)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="10.35">
+<stop offset="0" stop-color="#242424"/>
+<stop offset="0.4303" stop-color="#242424"/>
+<stop offset="0.7818" stop-color="#000000"/>
+<stop offset="1" stop-color="#000000"/>
 </radialGradient>
-<circle cx="15" cy="12.133" fill="url(#SVGID_8_)" r="4.712"/>
-<radialGradient cx="23.9639" cy="3.5498" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="11.3574">
-<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"/>
+<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"/>
 </radialGradient>
-<path d="M19.211,12.133c0,2.326-1.886,4.21-4.212,4.21c-2.326-0.002-4.213-1.888-4.213-4.212  c0.004-2.327,1.89-4.21,4.213-4.21C17.328,7.923,19.214,9.808,19.211,12.133z" fill="url(#SVGID_9_)"/>
-<radialGradient cx="25.1709" cy="13.2505" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="4.6113">
-<stop offset="0" style="stop-color:#48630C"/>
-<stop offset="0.7879" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
+<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.7879" stop-color="#000000"/>
+<stop offset="1" stop-color="#000000"/>
 </radialGradient>
-<path d="M19.211,12.133c0,2.326-1.886,4.21-4.212,4.21c-2.326-0.002-4.213-1.888-4.213-4.212  c0,0,1.444,2.569,4.213,2.569C17.767,14.701,19.211,12.133,19.211,12.133z" fill="url(#SVGID_10_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="14.979" x2="14.979" y1="7.0654" y2="12.0939">
-<stop offset="0" style="stop-color:#F8FBFF"/>
-<stop offset="1" style="stop-color:#808080"/>
+<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="1" stop-color="#808080"/>
 </linearGradient>
-<path d="M14.979,12.069c1.828,0,3.549-0.277,5.067-0.765  c-0.431-2.41-2.532-4.239-5.067-4.239c-2.532,0-4.632,1.83-5.065,4.239C11.431,11.792,13.153,12.069,14.979,12.069z" fill="url(#SVGID_11_)" fill-opacity="0.35" stroke-opacity="0.35"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="5.7617" x2="24.2852" y1="26.7236" y2="26.7236">
-<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"/>
+<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"/>
 </linearGradient>
-<path d="M24.245,28c0.025-0.635,0.04-0.508,0.04-0.639v-0.035c0-1.037-0.852-1.879-1.901-1.879H7.662  c-1.05,0-1.9,0.842-1.9,1.879v0.035c0,0.131,0.014,0.004,0.04,0.639H24.245z" fill="url(#SVGID_12_)"/>
-<path d="M5.879,26.7h18.29c-0.084-0.234-0.212-0.444-0.377-0.626H6.256  C6.092,26.256,5.963,26.466,5.879,26.7z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M5.772,27.361C5.779,27.492,5.789,27.684,5.802,28h18.443  c0.012-0.316,0.022-0.508,0.028-0.639H5.772z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M6.255,26.074h17.536c-0.348-0.383-0.846-0.627-1.407-0.627H7.662  C7.102,25.447,6.603,25.691,6.255,26.074z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<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"/>
+<path d="M5.772,27.36c0.007,0.13,0.017,0.32,0.03,0.64h18.44c0.012-0.316,0.022-0.508,0.028-0.639h-18.5z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M6.255,26.07h17.54c-0.348-0.383-0.846-0.627-1.407-0.627h-14.72c-0.56,0.01-1.059,0.25-1.407,0.63z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
 <rect fill="none" height="30" width="30"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_call_active.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,138 +1,126 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5609 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="423.0967" x2="429.6524" y1="-578.646" y2="-582.9078">
+<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.1333" style="stop-color:#A7E722"/>
-<stop offset="0.6303" style="stop-color:#428C0F"/>
-<stop offset="1" style="stop-color:#5CA617"/>
-</linearGradient>
-<path d="M19.081,33.91c2.089-3.595,4.591-6.496,7.281-9.188c2.593-2.591,6.72-5.3,8.562-6.256l9.604-10.282  c-0.845-0.3-3.693-0.464-7.279,0.616c-3.586,1.083-11.736,6.303-16.979,11.547c-5.242,5.246-9.727,12.347-10.581,14.595  c-1.343,3.541-1.221,7.445-0.929,8.58c0,0,0.34,1.035,1.144,2.377C10.248,46.475,19.081,33.91,19.081,33.91z" fill="url(#SVGID_1_)"/>
-<path d="M31.184,20.8c1.488-1.036,2.87-1.882,3.74-2.334L44.271,8.46  c-0.132-0.058-0.209-0.088-0.209-0.088c-0.247-0.088-0.642-0.162-1.124-0.219c-0.793,0.006-1.596,0.093-2.401,0.27  C34.843,9.673,31.019,14.958,31.184,20.8z" fill="#020202" fill-opacity="0.05" stroke-opacity="0.05"/>
-<path d="M31.906,20.306c1.205-0.809,2.291-1.462,3.018-1.84l9.377-10.04  c-0.146-0.063-0.233-0.098-0.233-0.098c-0.231-0.08-0.604-0.152-1.06-0.203c-0.751,0.006-1.51,0.087-2.27,0.253  C35.275,9.576,31.636,14.695,31.906,20.306z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M44.079,8.263c-0.21-0.073-0.55-0.137-0.962-0.186c-0.681,0.006-1.369,0.08-2.06,0.231  c-5.087,1.116-8.426,5.984-7.978,11.233c0.725-0.455,1.363-0.826,1.844-1.076l9.424-10.088C44.178,8.302,44.079,8.263,44.079,8.263z  " fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="40.9697" cy="9.21" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="12.2872">
-<stop offset="0" style="stop-color:#A7E722"/>
-<stop offset="0.6242" style="stop-color:#428C0F"/>
+<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"/>
 </radialGradient>
-<path d="M34.924,18.466l0.929,1.55c0,0,15.101-6.784,14.084-8.038c-0.513-0.631-0.577-0.656-1.237-1.263  c-1.985-1.815-4.172-2.531-4.172-2.531c-0.186-0.063-0.481-0.12-0.845-0.161c-0.596,0.004-1.2,0.068-1.806,0.201  c-4.591,1.009-7.57,5.501-6.963,10.257C34.916,18.477,34.921,18.47,34.924,18.466z" fill="url(#SVGID_2_)"/>
-<path d="M17.483,34.105c-0.988-0.139-2.007-0.119-3.027,0.105c-2.418,0.531-4.376,2.066-5.646,4.131  c-0.367,2.35-0.25,4.408-0.05,5.18c0,0,0.34,1.035,1.144,2.377c0.29,0.482,6.54-8.264,8.556-11.107L17.483,34.105z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M18.366,34.135c-0.989-0.139-2.008-0.117-3.029,0.105c-3.313,0.727-5.775,3.332-6.76,6.623  c-0.026,1.025,0.034,1.873,0.127,2.398c0.003,0.012,0.005,0.033,0.01,0.047c0,0,0.34,1.033,1.144,2.379  c0.3,0.498,6.981-8.887,8.75-11.383L18.366,34.135z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="437.4258" cy="-571.231" gradientTransform="matrix(0.2095 0.9787 -0.9682 0.2124 -629.4526 -270.6148)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="14.6187">
-<stop offset="0" style="stop-color:#A7E722"/>
-<stop offset="0.6242" style="stop-color:#428C0F"/>
-<stop offset="1" style="stop-color:#5CA617"/>
-</radialGradient>
-<path d="M11.202,47.738c0.616,0.74,0.646,0.953,1.295,1.523c1.194,1.055,9.301-13.611,9.301-13.611  l-2.683-1.719c-0.941-0.111-1.914-0.08-2.89,0.135c-4.777,1.049-7.806,5.869-6.87,10.832C9.749,45.686,10.349,46.709,11.202,47.738z  " fill="url(#SVGID_3_)"/>
-<path d="M49.937,11.978c-0.179-0.22-0.381-0.446-0.578-0.67l-13.944,7.959l0.438,0.749  C35.853,20.016,50.953,13.231,49.937,11.978z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="422.2881" x2="427.4786" y1="-610.9287" y2="-594.4409">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.6788" style="stop-color:#387300"/>
-<stop offset="1" style="stop-color:#66A00E"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M35.853,20.016l1.178,1.981c0.302,0.515,0.972,0.674,1.569,0.422l4.09-2.334l8.043-4.668  c0.632-0.363,0.878-1.119,0.549-1.686c0,0-0.333-0.501-1.349-1.751L35.853,20.016z" fill="url(#SVGID_4_)"/>
-<path d="M21.798,35.65l-0.725-0.473l-9.215,13.486c0.216,0.205,0.43,0.414,0.639,0.598  C13.691,50.316,21.798,35.65,21.798,35.65z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="439.6982" x2="451.5232" y1="-577.7549" y2="-564.7323">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.6788" style="stop-color:#387300"/>
-<stop offset="1" style="stop-color:#66A00E"/>
+<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"/>
+<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"/>
 </linearGradient>
-<path d="M12.498,49.262c1.193,1.049,1.686,1.369,1.686,1.369c0.567,0.367,1.363,0.17,1.781-0.441l7.9-11.605  c0.419-0.615,0.307-1.412-0.26-1.777l-1.808-1.156L12.498,49.262z" fill="url(#SVGID_5_)"/>
+<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.3789" x2="17.6203" y1="23.6504" y2="23.6504">
-<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"/>
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_1__)" height="7.853" width="5.105" x="12.447" y="19.724"/>
-<path d="M12.447,24.655c0.82,0.199,1.673,0.315,2.553,0.315c0.881,0,1.732-0.116,2.553-0.315v-4.294  h-5.105V24.655z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M12.447,24.018c0.82,0.199,1.673,0.315,2.553,0.315c0.881,0,1.732-0.116,2.553-0.315v-4.294  h-5.105V24.018z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="14.9995" x2="14.9995" y1="1.9746" y2="23.6704">
-<stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="0.3212" style="stop-color:#E6E6E6"/>
-<stop offset="1" style="stop-color:#666666"/>
+<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"/>
+<path d="M12.45,24.02c0.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.288z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="15" x2="15" y1="1.975" y2="23.67">
+<stop offset="0" stop-color="#F2F2F2"/>
+<stop offset="0.3212" stop-color="#E6E6E6"/>
+<stop offset="1" stop-color="#666666"/>
 </linearGradient>
-<path d="M15,23.695c-5.98,0-10.848-4.867-10.848-10.848S9.02,2,15,2c5.982,0,10.848,4.866,10.848,10.847  S20.982,23.695,15,23.695L15,23.695z" fill="url(#SVGID_2__)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="14.9995" x2="14.9995" y1="2.6143" y2="23.0332">
-<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:#7C8487"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
+<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"/>
 </linearGradient>
-<circle cx="15" cy="12.847" fill="url(#SVGID_3__)" r="10.209"/>
-<path d="M15,21.989c-5.315,0-9.657-4.23-9.843-9.5c-0.004,0.116-0.009,0.231-0.009,0.349  c0,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.349C24.658,17.759,20.315,21.989,15,21.989z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M23.295,12.413c0,4.704-3.715,9.346-8.299,9.345c-4.58-0.003-8.292-4.646-8.291-9.35  c0.002-4.706,3.718-8.517,8.298-8.517C19.584,3.894,23.298,7.707,23.295,12.413z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M14.996,21.066c-2.387-0.002-4.63-0.932-6.315-2.619c-1.688-1.688-2.615-3.932-2.614-6.318  c0-4.923,4.009-8.929,8.935-8.929c2.387,0,4.632,0.931,6.317,2.618c1.688,1.688,2.616,3.933,2.615,6.318  c-0.002,4.924-4.01,8.93-8.934,8.93H14.996z" fill="#231F20" fill-opacity="0.2" stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="14.9995" x2="14.9995" y1="3.7212" y2="20.3517">
-<stop offset="0" style="stop-color:#CFCFCF"/>
-<stop offset="0.1091" style="stop-color:#CFCFCF"/>
-<stop offset="0.6848" style="stop-color:#121212"/>
-<stop offset="1" style="stop-color:#A6A6A6"/>
+<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"/>
+<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"/>
+<stop offset="0.6848" stop-color="#121212"/>
+<stop offset="1" stop-color="#A6A6A6"/>
 </linearGradient>
-<path d="M14.996,20.428c-2.216-0.002-4.298-0.864-5.864-2.432c-1.567-1.566-2.428-3.65-2.427-5.866  c0-4.573,3.723-8.293,8.296-8.293c2.218,0.001,4.3,0.864,5.866,2.432c1.566,1.568,2.43,3.651,2.428,5.867  c-0.001,4.573-3.723,8.292-8.295,8.292H14.996z" fill="url(#SVGID_4__)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="14.9995" x2="14.9995" y1="4.3682" y2="19.7187">
-<stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="1" style="stop-color:#606769"/>
+<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"/>
 </linearGradient>
-<circle cx="15" cy="12.133" fill="url(#SVGID_5__)" r="7.657"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="14.9995" x2="14.9995" y1="5.7715" y2="18.454">
-<stop offset="0" style="stop-color:#1A1A1A"/>
-<stop offset="0.503" style="stop-color:#343434"/>
-<stop offset="0.7515" style="stop-color:#9E9E9E"/>
-<stop offset="1" style="stop-color:#CFCFCF"/>
+<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">
+<stop offset="0" stop-color="#1A1A1A"/>
+<stop offset="0.503" stop-color="#343434"/>
+<stop offset="0.7515" stop-color="#9E9E9E"/>
+<stop offset="1" stop-color="#CFCFCF"/>
 </linearGradient>
-<path d="M15,18.514c-1.706-0.001-3.309-0.666-4.514-1.871c-1.204-1.206-1.867-2.808-1.867-4.512  c0-3.517,2.862-6.378,6.382-6.378c1.706,0,3.308,0.664,4.513,1.871c1.205,1.205,1.868,2.808,1.867,4.513  C21.381,15.652,18.519,18.514,15,18.514L15,18.514z" fill="url(#SVGID_6_)"/>
-<radialGradient cx="25.7734" cy="10.2729" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="6.4991">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="0.5917" style="stop-color:#000000"/>
-<stop offset="0.627" style="stop-color:#050505"/>
-<stop offset="0.7652" style="stop-color:#121212"/>
-<stop offset="0.8876" style="stop-color:#171717"/>
-<stop offset="1" style="stop-color:#171717"/>
+<path d="M15,18.51c-1.706-0.001-3.309-0.666-4.514-1.871-1.204-1.206-1.867-2.808-1.867-4.512,0-3.517,2.862-6.378,6.382-6.378,1.706,0,3.308,0.664,4.513,1.871,1.205,1.205,1.868,2.808,1.867,4.513,0,3.51-2.86,6.37-6.38,6.37z" fill="url(#SVGID_6_)"/>
+<radialGradient cx="25.77" cy="10.27" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="6.499">
+<stop offset="0" stop-color="#000000"/>
+<stop offset="0.5917" stop-color="#000000"/>
+<stop offset="0.627" stop-color="#050505"/>
+<stop offset="0.7652" stop-color="#121212"/>
+<stop offset="0.8876" stop-color="#171717"/>
+<stop offset="1" stop-color="#171717"/>
 </radialGradient>
-<path d="M20.743,12.135c0,3.172-2.574,5.74-5.744,5.74c-3.175-0.001-5.743-2.573-5.741-5.745  c0-3.171,2.573-5.742,5.745-5.74C18.173,6.391,20.744,8.962,20.743,12.135z" fill="url(#SVGID_7_)"/>
-<radialGradient cx="21.6543" cy="5.0659" gradientTransform="matrix(1.0143 0 0 1.0141 -9.5579 3.1299)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="10.3515">
-<stop offset="0" style="stop-color:#242424"/>
-<stop offset="0.4303" style="stop-color:#242424"/>
-<stop offset="0.7818" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
+<path d="M20.74,12.14c0,3.172-2.574,5.74-5.744,5.74-3.175-0.001-5.743-2.573-5.741-5.745,0-3.171,2.573-5.742,5.745-5.74,3.17-0.009,5.74,2.562,5.74,5.74z" fill="url(#SVGID_7_)"/>
+<radialGradient cx="21.65" cy="5.066" gradientTransform="matrix(1.0143 0 0 1.0141 -9.5579 3.1299)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="10.35">
+<stop offset="0" stop-color="#242424"/>
+<stop offset="0.4303" stop-color="#242424"/>
+<stop offset="0.7818" stop-color="#000000"/>
+<stop offset="1" stop-color="#000000"/>
 </radialGradient>
-<circle cx="15" cy="12.133" fill="url(#SVGID_8_)" r="4.712"/>
-<radialGradient cx="23.9639" cy="3.5498" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="11.3574">
-<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"/>
+<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"/>
 </radialGradient>
-<path d="M19.211,12.133c0,2.326-1.886,4.21-4.212,4.21c-2.326-0.002-4.213-1.888-4.213-4.212  c0.004-2.327,1.89-4.21,4.213-4.21C17.328,7.923,19.214,9.808,19.211,12.133z" fill="url(#SVGID_9_)"/>
-<radialGradient cx="25.1709" cy="13.2505" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="4.6113">
-<stop offset="0" style="stop-color:#48630C"/>
-<stop offset="0.7879" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
+<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.7879" stop-color="#000000"/>
+<stop offset="1" stop-color="#000000"/>
 </radialGradient>
-<path d="M19.211,12.133c0,2.326-1.886,4.21-4.212,4.21c-2.326-0.002-4.213-1.888-4.213-4.212  c0,0,1.444,2.569,4.213,2.569C17.767,14.701,19.211,12.133,19.211,12.133z" fill="url(#SVGID_10_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="14.979" x2="14.979" y1="7.0654" y2="12.0939">
-<stop offset="0" style="stop-color:#F8FBFF"/>
-<stop offset="1" style="stop-color:#808080"/>
+<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="1" stop-color="#808080"/>
 </linearGradient>
-<path d="M14.979,12.069c1.828,0,3.549-0.277,5.067-0.765  c-0.431-2.41-2.532-4.239-5.067-4.239c-2.532,0-4.632,1.83-5.065,4.239C11.431,11.792,13.153,12.069,14.979,12.069z" fill="url(#SVGID_11_)" fill-opacity="0.35" stroke-opacity="0.35"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="5.7617" x2="24.2852" y1="26.7236" y2="26.7236">
-<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"/>
+<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"/>
 </linearGradient>
-<path d="M24.245,28c0.025-0.635,0.04-0.508,0.04-0.639v-0.035c0-1.037-0.852-1.879-1.901-1.879H7.662  c-1.05,0-1.9,0.842-1.9,1.879v0.035c0,0.131,0.014,0.004,0.04,0.639H24.245z" fill="url(#SVGID_12_)"/>
-<path d="M5.879,26.7h18.29c-0.084-0.234-0.212-0.444-0.377-0.626H6.256  C6.092,26.256,5.963,26.466,5.879,26.7z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M5.772,27.361C5.779,27.492,5.789,27.684,5.802,28h18.443  c0.012-0.316,0.022-0.508,0.028-0.639H5.772z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M6.255,26.074h17.536c-0.348-0.383-0.846-0.627-1.407-0.627H7.662  C7.102,25.447,6.603,25.691,6.255,26.074z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<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"/>
+<path d="M5.772,27.36c0.007,0.13,0.017,0.32,0.03,0.64h18.44c0.012-0.316,0.022-0.508,0.028-0.639h-18.5z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M6.255,26.07h17.54c-0.348-0.383-0.846-0.627-1.407-0.627h-14.72c-0.56,0.01-1.059,0.25-1.407,0.63z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
 <rect fill="none" height="30" width="30"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_call_end.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_call_end.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<g>
+<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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+<path d="M12.45,24.02c0.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.288z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="15" x2="15" y1="1.975" y2="23.67">
+<stop offset="0" stop-color="#F2F2F2"/>
+<stop offset="0.3212" stop-color="#E6E6E6"/>
+<stop offset="1" stop-color="#666666"/>
+</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"/>
+</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"/>
+<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"/>
+<stop offset="0.6848" stop-color="#121212"/>
+<stop offset="1" stop-color="#A6A6A6"/>
+</linearGradient>
+<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"/>
+</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">
+<stop offset="0" stop-color="#1A1A1A"/>
+<stop offset="0.503" stop-color="#343434"/>
+<stop offset="0.7515" stop-color="#9E9E9E"/>
+<stop offset="1" stop-color="#CFCFCF"/>
+</linearGradient>
+<path d="M15,18.51c-1.706-0.001-3.309-0.666-4.514-1.871-1.204-1.206-1.867-2.808-1.867-4.512,0-3.517,2.862-6.378,6.382-6.378,1.706,0,3.308,0.664,4.513,1.871,1.205,1.205,1.868,2.808,1.867,4.513,0,3.51-2.86,6.37-6.38,6.37z" fill="url(#SVGID_6__)"/>
+<radialGradient cx="25.77" cy="10.27" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="6.499">
+<stop offset="0" stop-color="#000000"/>
+<stop offset="0.5917" stop-color="#000000"/>
+<stop offset="0.627" stop-color="#050505"/>
+<stop offset="0.7652" stop-color="#121212"/>
+<stop offset="0.8876" stop-color="#171717"/>
+<stop offset="1" stop-color="#171717"/>
+</radialGradient>
+<path d="M20.74,12.14c0,3.172-2.574,5.74-5.744,5.74-3.175-0.001-5.743-2.573-5.741-5.745,0-3.171,2.573-5.742,5.745-5.74,3.17-0.009,5.74,2.562,5.74,5.74z" fill="url(#SVGID_7_)"/>
+<radialGradient cx="21.65" cy="5.066" gradientTransform="matrix(1.0143 0 0 1.0141 -9.5579 3.1299)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="10.35">
+<stop offset="0" stop-color="#242424"/>
+<stop offset="0.4303" stop-color="#242424"/>
+<stop offset="0.7818" stop-color="#000000"/>
+<stop offset="1" stop-color="#000000"/>
+</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"/>
+</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.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="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"/>
+</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"/>
+<path d="M5.772,27.36c0.007,0.13,0.017,0.32,0.03,0.64h18.44c0.012-0.316,0.022-0.508,0.028-0.639h-18.5z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M6.255,26.07h17.54c-0.348-0.383-0.846-0.627-1.407-0.627h-14.72c-0.56,0.01-1.059,0.25-1.407,0.63z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<rect fill="none" height="30" width="30"/>
+</g>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_call_waiting.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,137 +1,134 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="20.3613" x2="26.6141" y1="20.2744" y2="26.4485">
-<stop offset="0" style="stop-color:#FEE16E"/>
-<stop offset="0.5939" style="stop-color:#D96900"/>
-<stop offset="1" style="stop-color:#FED43A"/>
-</linearGradient>
-<path d="M19.081,33.911c2.089-3.597,4.591-6.497,7.281-9.189c2.593-2.591,6.72-5.3,8.562-6.256l9.604-10.282  c-0.845-0.3-3.693-0.464-7.279,0.616c-3.586,1.083-11.736,6.303-16.979,11.547c-5.242,5.246-9.727,12.347-10.581,14.595  c-1.343,3.541-1.221,7.445-0.929,8.581c0,0,0.34,1.034,1.144,2.377C10.248,46.476,19.081,33.911,19.081,33.911z" fill="url(#SVGID_1_)"/>
-<path d="M31.184,20.8c1.488-1.036,2.87-1.882,3.74-2.334L44.271,8.46  c-0.132-0.058-0.209-0.088-0.209-0.088c-0.247-0.088-0.642-0.162-1.124-0.219c-0.793,0.006-1.596,0.093-2.401,0.27  C34.843,9.673,31.019,14.958,31.184,20.8z" fill="#020202" fill-opacity="0.05" stroke-opacity="0.05"/>
-<path d="M31.906,20.306c1.205-0.809,2.291-1.462,3.018-1.84l9.377-10.04  c-0.146-0.063-0.233-0.098-0.233-0.098c-0.231-0.08-0.604-0.152-1.06-0.203c-0.751,0.006-1.51,0.087-2.27,0.253  C35.275,9.576,31.636,14.695,31.906,20.306z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M44.079,8.263c-0.21-0.073-0.55-0.137-0.962-0.186c-0.681,0.006-1.369,0.08-2.06,0.231  c-5.087,1.116-8.426,5.984-7.978,11.233c0.725-0.455,1.363-0.826,1.844-1.076l9.424-10.088C44.178,8.302,44.079,8.263,44.079,8.263z  " fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="43.6406" cy="10.1128" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="13.348">
-<stop offset="0" style="stop-color:#FEE16E"/>
-<stop offset="0.6061" style="stop-color:#F1830A"/>
-<stop offset="1" style="stop-color:#FED43A"/>
+<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"/>
 </radialGradient>
-<path d="M34.924,18.466l0.929,1.55c0,0,15.101-6.784,14.084-8.038c-0.513-0.631-0.577-0.656-1.237-1.263  c-1.985-1.815-4.172-2.531-4.172-2.531c-0.186-0.063-0.481-0.12-0.845-0.161c-0.596,0.004-1.2,0.068-1.806,0.201  c-4.591,1.009-7.57,5.501-6.963,10.257C34.916,18.477,34.921,18.47,34.924,18.466z" fill="url(#SVGID_2_)"/>
-<path d="M17.483,34.106c-0.988-0.14-2.007-0.119-3.027,0.105c-2.418,0.53-4.376,2.066-5.646,4.131  c-0.367,2.35-0.25,4.407-0.05,5.18c0,0,0.34,1.034,1.144,2.377c0.29,0.482,6.54-8.264,8.556-11.107L17.483,34.106z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M18.366,34.136c-0.989-0.14-2.008-0.118-3.029,0.105c-3.313,0.727-5.775,3.332-6.76,6.623  c-0.026,1.025,0.034,1.872,0.127,2.397c0.003,0.013,0.005,0.034,0.01,0.048c0,0,0.34,1.033,1.144,2.379  c0.3,0.498,6.981-8.888,8.75-11.384L18.366,34.136z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="437.4258" cy="-571.231" gradientTransform="matrix(0.2095 0.9787 -0.9682 0.2124 -629.4526 -270.6148)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="14.6198">
-<stop offset="0" style="stop-color:#FEE16E"/>
-<stop offset="0.6061" style="stop-color:#F1830A"/>
-<stop offset="1" style="stop-color:#FED43A"/>
-</radialGradient>
-<path d="M11.202,47.738c0.616,0.74,0.646,0.954,1.295,1.524c1.194,1.055,9.301-13.612,9.301-13.612  l-2.683-1.719c-0.941-0.111-1.914-0.079-2.89,0.136c-4.777,1.048-7.806,5.868-6.87,10.832C9.749,45.686,10.349,46.71,11.202,47.738z  " fill="url(#SVGID_3_)"/>
-<path d="M49.937,11.978c-0.179-0.22-0.381-0.446-0.578-0.67l-13.944,7.959l0.438,0.749  C35.853,20.016,50.953,13.231,49.937,11.978z" fill="#020202" fill-opacity="0.5" stroke-opacity="0.5"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="422.2881" x2="427.4786" y1="-610.9287" y2="-594.4409">
-<stop offset="0" style="stop-color:#FEE16E"/>
-<stop offset="0.7576" style="stop-color:#D96900"/>
-<stop offset="1" style="stop-color:#FED43A"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M35.853,20.016l1.178,1.981c0.302,0.515,0.972,0.674,1.569,0.422l4.09-2.334l8.043-4.668  c0.632-0.363,0.878-1.119,0.549-1.686c0,0-0.333-0.501-1.349-1.751L35.853,20.016z" fill="url(#SVGID_4_)"/>
-<path d="M21.798,35.65l-0.725-0.472l-9.215,13.486c0.216,0.204,0.43,0.414,0.639,0.598  C13.691,50.317,21.798,35.65,21.798,35.65z" fill="#020202" fill-opacity="0.5" stroke-opacity="0.5"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="439.6982" x2="451.5232" y1="-577.7549" y2="-564.7323">
-<stop offset="0" style="stop-color:#FEE16E"/>
-<stop offset="0.7576" style="stop-color:#D96900"/>
-<stop offset="1" style="stop-color:#FED43A"/>
+<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"/>
 </linearGradient>
-<path d="M12.498,49.262c1.193,1.05,1.686,1.37,1.686,1.37c0.567,0.367,1.363,0.169,1.781-0.442l7.9-11.605  c0.419-0.614,0.307-1.411-0.26-1.777l-1.808-1.156L12.498,49.262z" fill="url(#SVGID_5_)"/>
+<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"/>
+</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"/>
+</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.3789" x2="17.6203" y1="23.6504" y2="23.6504">
-<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"/>
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_1__)" height="7.853" width="5.105" x="12.447" y="19.724"/>
-<path d="M12.447,24.655c0.82,0.199,1.673,0.315,2.553,0.315c0.881,0,1.732-0.116,2.553-0.315v-4.294  h-5.105V24.655z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M12.447,24.018c0.82,0.199,1.673,0.315,2.553,0.315c0.881,0,1.732-0.116,2.553-0.315v-4.294  h-5.105V24.018z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="14.9995" x2="14.9995" y1="1.9746" y2="23.6704">
-<stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="0.3212" style="stop-color:#E6E6E6"/>
-<stop offset="1" style="stop-color:#666666"/>
+<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"/>
+<path d="M12.45,24.02c0.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.288z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="15" x2="15" y1="1.975" y2="23.67">
+<stop offset="0" stop-color="#F2F2F2"/>
+<stop offset="0.3212" stop-color="#E6E6E6"/>
+<stop offset="1" stop-color="#666666"/>
 </linearGradient>
-<path d="M15,23.695c-5.98,0-10.848-4.867-10.848-10.848S9.02,2,15,2c5.982,0,10.848,4.866,10.848,10.847  S20.982,23.695,15,23.695L15,23.695z" fill="url(#SVGID_2__)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="14.9995" x2="14.9995" y1="2.6143" y2="23.0332">
-<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:#7C8487"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
+<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"/>
 </linearGradient>
-<circle cx="15" cy="12.847" fill="url(#SVGID_3__)" r="10.209"/>
-<path d="M15,21.989c-5.315,0-9.657-4.23-9.843-9.5c-0.004,0.116-0.009,0.231-0.009,0.349  c0,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.349C24.658,17.759,20.315,21.989,15,21.989z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M23.295,12.413c0,4.704-3.715,9.346-8.299,9.345c-4.58-0.003-8.292-4.646-8.291-9.35  c0.002-4.706,3.718-8.517,8.298-8.517C19.584,3.894,23.298,7.707,23.295,12.413z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M14.996,21.066c-2.387-0.002-4.63-0.932-6.315-2.619c-1.688-1.688-2.615-3.932-2.614-6.318  c0-4.923,4.009-8.929,8.935-8.929c2.387,0,4.632,0.931,6.317,2.618c1.688,1.688,2.616,3.933,2.615,6.318  c-0.002,4.924-4.01,8.93-8.934,8.93H14.996z" fill="#231F20" fill-opacity="0.2" stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="14.9995" x2="14.9995" y1="3.7212" y2="20.3517">
-<stop offset="0" style="stop-color:#CFCFCF"/>
-<stop offset="0.1091" style="stop-color:#CFCFCF"/>
-<stop offset="0.6848" style="stop-color:#121212"/>
-<stop offset="1" style="stop-color:#A6A6A6"/>
+<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"/>
+<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"/>
+<stop offset="0.6848" stop-color="#121212"/>
+<stop offset="1" stop-color="#A6A6A6"/>
 </linearGradient>
-<path d="M14.996,20.428c-2.216-0.002-4.298-0.864-5.864-2.432c-1.567-1.566-2.428-3.65-2.427-5.866  c0-4.573,3.723-8.293,8.296-8.293c2.218,0.001,4.3,0.864,5.866,2.432c1.566,1.568,2.43,3.651,2.428,5.867  c-0.001,4.573-3.723,8.292-8.295,8.292H14.996z" fill="url(#SVGID_4__)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="14.9995" x2="14.9995" y1="4.3682" y2="19.7187">
-<stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="1" style="stop-color:#606769"/>
+<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"/>
 </linearGradient>
-<circle cx="15" cy="12.133" fill="url(#SVGID_5__)" r="7.657"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="14.9995" x2="14.9995" y1="5.7715" y2="18.454">
-<stop offset="0" style="stop-color:#1A1A1A"/>
-<stop offset="0.503" style="stop-color:#343434"/>
-<stop offset="0.7515" style="stop-color:#9E9E9E"/>
-<stop offset="1" style="stop-color:#CFCFCF"/>
+<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">
+<stop offset="0" stop-color="#1A1A1A"/>
+<stop offset="0.503" stop-color="#343434"/>
+<stop offset="0.7515" stop-color="#9E9E9E"/>
+<stop offset="1" stop-color="#CFCFCF"/>
 </linearGradient>
-<path d="M15,18.514c-1.706-0.001-3.309-0.666-4.514-1.871c-1.204-1.206-1.867-2.808-1.867-4.512  c0-3.517,2.862-6.378,6.382-6.378c1.706,0,3.308,0.664,4.513,1.871c1.205,1.205,1.868,2.808,1.867,4.513  C21.381,15.652,18.519,18.514,15,18.514L15,18.514z" fill="url(#SVGID_6_)"/>
-<radialGradient cx="25.7734" cy="10.2729" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="6.4991">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="0.5917" style="stop-color:#000000"/>
-<stop offset="0.627" style="stop-color:#050505"/>
-<stop offset="0.7652" style="stop-color:#121212"/>
-<stop offset="0.8876" style="stop-color:#171717"/>
-<stop offset="1" style="stop-color:#171717"/>
+<path d="M15,18.51c-1.706-0.001-3.309-0.666-4.514-1.871-1.204-1.206-1.867-2.808-1.867-4.512,0-3.517,2.862-6.378,6.382-6.378,1.706,0,3.308,0.664,4.513,1.871,1.205,1.205,1.868,2.808,1.867,4.513,0,3.51-2.86,6.37-6.38,6.37z" fill="url(#SVGID_6__)"/>
+<radialGradient cx="25.77" cy="10.27" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="6.499">
+<stop offset="0" stop-color="#000000"/>
+<stop offset="0.5917" stop-color="#000000"/>
+<stop offset="0.627" stop-color="#050505"/>
+<stop offset="0.7652" stop-color="#121212"/>
+<stop offset="0.8876" stop-color="#171717"/>
+<stop offset="1" stop-color="#171717"/>
 </radialGradient>
-<path d="M20.743,12.135c0,3.172-2.574,5.74-5.744,5.74c-3.175-0.001-5.743-2.573-5.741-5.745  c0-3.171,2.573-5.742,5.745-5.74C18.173,6.391,20.744,8.962,20.743,12.135z" fill="url(#SVGID_7_)"/>
-<radialGradient cx="21.6543" cy="5.0659" gradientTransform="matrix(1.0143 0 0 1.0141 -9.5579 3.1299)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="10.3515">
-<stop offset="0" style="stop-color:#242424"/>
-<stop offset="0.4303" style="stop-color:#242424"/>
-<stop offset="0.7818" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
+<path d="M20.74,12.14c0,3.172-2.574,5.74-5.744,5.74-3.175-0.001-5.743-2.573-5.741-5.745,0-3.171,2.573-5.742,5.745-5.74,3.17-0.009,5.74,2.562,5.74,5.74z" fill="url(#SVGID_7_)"/>
+<radialGradient cx="21.65" cy="5.066" gradientTransform="matrix(1.0143 0 0 1.0141 -9.5579 3.1299)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="10.35">
+<stop offset="0" stop-color="#242424"/>
+<stop offset="0.4303" stop-color="#242424"/>
+<stop offset="0.7818" stop-color="#000000"/>
+<stop offset="1" stop-color="#000000"/>
 </radialGradient>
-<circle cx="15" cy="12.133" fill="url(#SVGID_8_)" r="4.712"/>
-<radialGradient cx="23.9639" cy="3.5498" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="11.3574">
-<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"/>
+<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"/>
 </radialGradient>
-<path d="M19.211,12.133c0,2.326-1.886,4.21-4.212,4.21c-2.326-0.002-4.213-1.888-4.213-4.212  c0.004-2.327,1.89-4.21,4.213-4.21C17.328,7.923,19.214,9.808,19.211,12.133z" fill="url(#SVGID_9_)"/>
-<radialGradient cx="25.1709" cy="13.2505" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="4.6113">
-<stop offset="0" style="stop-color:#48630C"/>
-<stop offset="0.7879" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
+<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.7879" stop-color="#000000"/>
+<stop offset="1" stop-color="#000000"/>
 </radialGradient>
-<path d="M19.211,12.133c0,2.326-1.886,4.21-4.212,4.21c-2.326-0.002-4.213-1.888-4.213-4.212  c0,0,1.444,2.569,4.213,2.569C17.767,14.701,19.211,12.133,19.211,12.133z" fill="url(#SVGID_10_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="14.979" x2="14.979" y1="7.0654" y2="12.0939">
-<stop offset="0" style="stop-color:#F8FBFF"/>
-<stop offset="1" style="stop-color:#808080"/>
+<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="1" stop-color="#808080"/>
 </linearGradient>
-<path d="M14.979,12.069c1.828,0,3.549-0.277,5.067-0.765  c-0.431-2.41-2.532-4.239-5.067-4.239c-2.532,0-4.632,1.83-5.065,4.239C11.431,11.792,13.153,12.069,14.979,12.069z" fill="url(#SVGID_11_)" fill-opacity="0.35" stroke-opacity="0.35"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="5.7617" x2="24.2852" y1="26.7236" y2="26.7236">
-<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"/>
+<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"/>
 </linearGradient>
-<path d="M24.245,28c0.025-0.635,0.04-0.508,0.04-0.639v-0.035c0-1.037-0.852-1.879-1.901-1.879H7.662  c-1.05,0-1.9,0.842-1.9,1.879v0.035c0,0.131,0.014,0.004,0.04,0.639H24.245z" fill="url(#SVGID_12_)"/>
-<path d="M5.879,26.7h18.29c-0.084-0.234-0.212-0.444-0.377-0.626H6.256  C6.092,26.256,5.963,26.466,5.879,26.7z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M5.772,27.361C5.779,27.492,5.789,27.684,5.802,28h18.443  c0.012-0.316,0.022-0.508,0.028-0.639H5.772z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M6.255,26.074h17.536c-0.348-0.383-0.846-0.627-1.407-0.627H7.662  C7.102,25.447,6.603,25.691,6.255,26.074z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<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"/>
+<path d="M5.772,27.36c0.007,0.13,0.017,0.32,0.03,0.64h18.44c0.012-0.316,0.022-0.508,0.028-0.639h-18.5z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M6.255,26.07h17.54c-0.348-0.383-0.846-0.627-1.407-0.627h-14.72c-0.56,0.01-1.059,0.25-1.407,0.63z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
 <rect fill="none" height="30" width="30"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_capture.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,79 +1,149 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<linearGradient gradientTransform="matrix(1 0 0 1 2296.5195 1443.9805)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2266.519" x2="-2266.519" y1="-1432.3472" y2="-1395.6118">
+<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="M51.734,11.633H8.266c-0.678,0-1.225,0.549-1.225,1.225v34.285c0,0.678,0.547,1.226,1.225,1.226  h43.468c0.677,0,1.226-0.548,1.226-1.226V12.857C52.959,12.182,52.41,11.633,51.734,11.633z M12.551,45.918  c0,0.338-0.275,0.613-0.611,0.613H9.49c-0.338,0-0.613-0.275-0.613-0.613v-1.225c0-0.336,0.275-0.611,0.613-0.611h2.449  c0.336,0,0.611,0.275,0.611,0.611L12.551,45.918L12.551,45.918z M12.551,15.307c0,0.336-0.275,0.611-0.611,0.611H9.49  c-0.338,0-0.613-0.275-0.613-0.611v-1.225c0-0.336,0.275-0.613,0.613-0.613h2.449c0.336,0,0.611,0.277,0.611,0.613L12.551,15.307  L12.551,15.307z M18.061,45.918c0,0.338-0.275,0.613-0.611,0.613H15c-0.338,0-0.612-0.275-0.612-0.613v-1.225  c0-0.336,0.274-0.611,0.612-0.611h2.449c0.336,0,0.611,0.275,0.611,0.611L18.061,45.918L18.061,45.918z M18.061,15.307  c0,0.336-0.275,0.611-0.611,0.611H15c-0.338,0-0.612-0.275-0.612-0.611v-1.225c0-0.336,0.274-0.613,0.612-0.613h2.449  c0.336,0,0.611,0.277,0.611,0.613L18.061,15.307L18.061,15.307z M23.571,45.918c0,0.338-0.276,0.613-0.612,0.613H20.51  c-0.336,0-0.611-0.275-0.611-0.613v-1.225c0-0.336,0.274-0.611,0.611-0.611h2.449c0.336,0,0.612,0.275,0.612,0.611V45.918z   M23.571,15.307c0,0.336-0.276,0.611-0.612,0.611H20.51c-0.336,0-0.611-0.275-0.611-0.611v-1.225c0-0.336,0.274-0.613,0.611-0.613  h2.449c0.336,0,0.612,0.277,0.612,0.613V15.307z M29.082,45.918c0,0.338-0.276,0.613-0.613,0.613h-2.448  c-0.337,0-0.612-0.275-0.612-0.613v-1.225c0-0.336,0.275-0.611,0.612-0.611h2.448c0.337,0,0.613,0.275,0.613,0.611V45.918z   M29.082,15.307c0,0.336-0.276,0.611-0.613,0.611h-2.448c-0.337,0-0.612-0.275-0.612-0.611v-1.225c0-0.336,0.275-0.613,0.612-0.613  h2.448c0.337,0,0.613,0.277,0.613,0.613V15.307z M34.592,45.918c0,0.338-0.275,0.613-0.611,0.613h-2.448  c-0.339,0-0.613-0.275-0.613-0.613v-1.225c0-0.336,0.274-0.611,0.613-0.611h2.448c0.336,0,0.611,0.275,0.611,0.611V45.918z   M34.592,15.307c0,0.336-0.275,0.611-0.611,0.611h-2.448c-0.339,0-0.613-0.275-0.613-0.611v-1.225c0-0.336,0.274-0.613,0.613-0.613  h2.448c0.336,0,0.611,0.277,0.611,0.613V15.307z M40.102,45.918c0,0.338-0.274,0.613-0.61,0.613h-2.449  c-0.338,0-0.612-0.275-0.612-0.613v-1.225c0-0.336,0.274-0.611,0.612-0.611h2.449c0.336,0,0.61,0.275,0.61,0.611V45.918z   M40.102,15.307c0,0.336-0.274,0.611-0.61,0.611h-2.449c-0.338,0-0.612-0.275-0.612-0.611v-1.225c0-0.336,0.274-0.613,0.612-0.613  h2.449c0.336,0,0.61,0.277,0.61,0.613V15.307z M45.611,45.918c0,0.338-0.275,0.613-0.611,0.613h-2.449  c-0.337,0-0.611-0.275-0.611-0.613v-1.225c0-0.336,0.274-0.611,0.611-0.611H45c0.336,0,0.611,0.275,0.611,0.611V45.918z   M45.611,15.307c0,0.336-0.275,0.611-0.611,0.611h-2.449c-0.337,0-0.611-0.275-0.611-0.611v-1.225c0-0.336,0.274-0.613,0.611-0.613  H45c0.336,0,0.611,0.277,0.611,0.613V15.307z M51.123,45.918c0,0.338-0.277,0.613-0.613,0.613h-2.449  c-0.336,0-0.61-0.275-0.61-0.613v-1.225c0-0.336,0.274-0.611,0.61-0.611h2.449c0.336,0,0.613,0.275,0.613,0.611V45.918z   M51.123,15.307c0,0.336-0.277,0.611-0.613,0.611h-2.449c-0.336,0-0.61-0.275-0.61-0.611v-1.225c0-0.336,0.274-0.613,0.61-0.613  h2.449c0.336,0,0.613,0.277,0.613,0.613V15.307z" fill="url(#SVGID_1_)"/>
-<path d="M51.734,11.633H8.266c-0.678,0-1.225,0.549-1.225,1.225v0.611  c0-0.676,0.547-1.225,1.225-1.225h43.468c0.677,0,1.226,0.549,1.226,1.225v-0.611C52.959,12.182,52.41,11.633,51.734,11.633z" fill="#FFFFFF" fill-opacity="0.55" stroke-opacity="0.55"/>
-<path d="M8.266,48.367h43.468c0.677,0,1.226-0.547,1.226-1.225v-0.611  c0,0.676-0.549,1.225-1.226,1.225H8.266c-0.678,0-1.225-0.549-1.225-1.225v0.611C7.041,47.82,7.588,48.367,8.266,48.367z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
-<linearGradient gradientTransform="matrix(1 0 0 1 2296.5195 1443.9805)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2266.5195" x2="-2266.5195" y1="-1426.1284" y2="-1401.6362">
+<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="24.492" width="45.918" x="7.041" y="17.754"/>
-<linearGradient gradientTransform="matrix(1 0 0 1 2296.5195 1443.9805)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2266.519" x2="-2266.519" y1="-1401.7349" y2="-1426.2271">
+<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="M51.123,41.021c0,0.674-0.553,1.225-1.225,1.225H10.102c-0.673,0-1.225-0.551-1.225-1.225V18.979  c0-0.672,0.552-1.225,1.225-1.225h39.796c0.672,0,1.226,0.553,1.226,1.225L51.123,41.021L51.123,41.021z" fill="url(#SVGID_3_)"/>
-<path d="M49.898,41.021H10.102c-0.673,0-1.225,0.061-1.225-0.613l0,0  c0,0.674,0.552,1.225,1.225,1.225h39.796c0.672,0,1.226-0.551,1.226-1.225l0,0C51.123,41.082,50.57,41.021,49.898,41.021z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
-<linearGradient gradientTransform="matrix(1 0 0 1 2296.5195 1443.9805)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-2266.519" x2="-2266.519" y1="-1426.2261" y2="-1401.6362">
+<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="M49.898,18.367c0.336,0,0.61,0.275,0.61,0.611v22.043c0,0.338-0.274,0.61-0.61,0.61H10.102  c-0.337,0-0.611-0.272-0.611-0.61V18.979c0-0.336,0.274-0.611,0.611-0.611L49.898,18.367 M49.898,17.754H10.102  c-0.673,0-1.225,0.553-1.225,1.225v22.042c0,0.674,0.552,1.226,1.225,1.226h39.796c0.672,0,1.226-0.552,1.226-1.226V18.979  C51.123,18.307,50.57,17.754,49.898,17.754L49.898,17.754z" fill="url(#SVGID_4_)"/>
-<path d="M49.898,25.102v-4.898c0-0.676-0.549-1.225-1.226-1.225H11.326  c-0.676,0-1.225,0.549-1.225,1.225v7.961L49.898,25.102z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
+<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)">
-<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"/>
+<polygon fill="none" points="30,22.402 30,12.467 30,0 0,0 0,30 30,30 "/>
+<path d="M2.609,27.517c-1.533,0-2.604-1.071-2.604-2.604L0,10.432c0-4.383,3.566-7.949,7.951-7.949  c4.386,0.002,7.953,3.571,7.951,7.956v0.398c0.064-0.008,0.13-0.012,0.195-0.012h12.262c0.904,0,1.641,0.736,1.641,1.642v9.936  c0,0.905-0.736,1.642-1.641,1.642H16.098c-0.067,0-0.135-0.005-0.2-0.013l-0.001,0.882c0,1.386-1.217,2.604-2.604,2.604H2.609z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="7.9512" x2="7.9512" y1="3.3208" y2="26.41">
+<stop offset="0" style="stop-color:#F2F2F2"/>
+<stop offset="0.3212" style="stop-color:#E6E6E6"/>
+<stop offset="1" style="stop-color:#666666"/>
+</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"/>
 </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"/>
+<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"/>
+<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"/>
+<stop offset="0.6848" style="stop-color:#121212"/>
+<stop offset="1" style="stop-color:#A6A6A6"/>
 </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"/>
+<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"/>
+</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">
+<stop offset="0" style="stop-color:#1A1A1A"/>
+<stop offset="0.503" style="stop-color:#343434"/>
+<stop offset="0.7515" style="stop-color:#9E9E9E"/>
+<stop offset="1" style="stop-color:#CFCFCF"/>
 </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"/>
+<circle cx="7.952" cy="10.464" fill="url(#SVGID_5_)" r="4.659"/>
+<radialGradient cx="148.6523" cy="-52.0352" gradientTransform="matrix(0.9568 3.000000e-004 -3.000000e-004 0.9568 -133.8237 60.5787)" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="5.2276">
+<stop offset="0" style="stop-color:#000000"/>
+<stop offset="0.5917" style="stop-color:#000000"/>
+<stop offset="0.627" style="stop-color:#050505"/>
+<stop offset="0.7652" style="stop-color:#121212"/>
+<stop offset="0.8876" style="stop-color:#171717"/>
+<stop offset="1" style="stop-color:#171717"/>
+</radialGradient>
+<circle cx="7.952" cy="10.464" fill="url(#SVGID_6_)" r="4.358"/>
+<radialGradient cx="145.7949" cy="-41.3301" gradientTransform="matrix(0.9651 0 0 0.965 -134.7423 47.3895)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="8.3282">
+<stop offset="0" style="stop-color:#242424"/>
+<stop offset="0.4303" style="stop-color:#242424"/>
+<stop offset="0.7818" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#000000"/>
+</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"/>
+</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.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="1" style="stop-color:#808080"/>
 </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>
+<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"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="22.2285" x2="22.2285" y1="11.7466" y2="22.9921">
+<stop offset="0" style="stop-color:#F2F2F2"/>
+<stop offset="0.3212" style="stop-color:#E6E6E6"/>
+<stop offset="1" style="stop-color:#666666"/>
+</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"/>
+</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="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_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="14.9092" x2="13.975" y1="17.4341" y2="17.4341">
+<stop offset="0" style="stop-color:#5F5F5F"/>
+<stop offset="1" style="stop-color:#000000"/>
+</linearGradient>
+<rect fill="url(#SVGID_14_)" height="6.651" width="0.961" x="13.941" y="14.108"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="15.4912" x2="14.3045" y1="17.4346" y2="17.4346">
+<stop offset="0" style="stop-color:#CFCFCF"/>
+<stop offset="0.1091" style="stop-color:#CFCFCF"/>
+<stop offset="0.6848" style="stop-color:#121212"/>
+<stop offset="1" style="stop-color:#A6A6A6"/>
+</linearGradient>
+<rect fill="url(#SVGID_15_)" height="6.01" width="1.221" x="14.262" y="14.43"/>
+<rect fill-opacity="0.25" height="6.01" stroke-opacity="0.25" width="0.346" x="15.137" y="14.43"/>
+<rect fill="none" height="30" width="30"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_collection.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,109 +1,105 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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:#A6A8AB"/>
-<stop offset="1" style="stop-color:#231F20"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="0.3882" y2="59.65">
+<stop offset="0" stop-color="#A6A8AB"/>
+<stop offset="1" stop-color="#231F20"/>
 </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:#A9AAAD"/>
-<stop offset="1" style="stop-color:#000000"/>
+<path d="M0,60v-59.69h60v59.69h-60zm50.25-5.68l-20.25-20.15-20.25,20.15h40.49zm4.04-4.02v-40.29l-20.25,20.14,20.25,20.15zm-48.58,0l20.25-20.15-20.25-20.14v40.29zm24.29-24.17l20.25-20.14h-40.5l20.25,20.14z" fill="url(#SVGID_1_)" fill-opacity="0.2" stroke-opacity="0.2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="1.097" y2="58.95">
+<stop offset="0" stop-color="#A9AAAD"/>
+<stop offset="1" 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:#F4FCFF"/>
-<stop offset="0.6242" style="stop-color:#C9CED1"/>
-<stop offset="1" style="stop-color:#9CA4A7"/>
+<path d="M0.714,59.29v-58.27h58.57v58.27m-7.32-4.26l-21.97-21.86-21.97,21.86h43.94zm3.03-3.02v-43.72l-21.97,21.86,21.97,21.86zm-50,0l21.97-21.86-21.97-21.86v43.72zm25-24.87l21.97-21.86h-43.94l21.97,21.86z" fill="url(#SVGID_2_)" fill-opacity="0.4" stroke-opacity="0.4"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30" x2="30" y1="1.095" y2="57.53">
+<stop offset="0" stop-color="#F4FCFF"/>
+<stop offset="0.6242" stop-color="#C9CED1"/>
+<stop offset="1" stop-color="#9CA4A7"/>
 </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:#A6A8AB"/>
-<stop offset="1" style="stop-color:#231F20"/>
+<path d="M1.428,1.017v56.85h57.14v-56.85h-57.14zm26.55,28.42l-23.7,23.58v-47.15l23.7,23.57zm-21.68-25.58h47.39l-23.7,23.57-23.7-23.57zm23.7,27.59l23.7,23.57h-47.4l23.7-23.57zm2.02-2.01l23.7-23.57v47.15l-23.7-23.58z" fill="url(#SVGID_3_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="30" x2="30" y1="4.57" y2="53.6">
+<stop offset="0" stop-color="#A6A8AB"/>
+<stop offset="1" stop-color="#231F20"/>
 </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:#A9AAAD"/>
-<stop offset="1" style="stop-color:#000000"/>
+<path d="M20,53.6c-1.924,0-3.583-1.555-3.698-3.462l-1.13-17.86h-0.17c-1.576,0-2.856-1.276-2.856-2.843v-4.264c0-1.567,1.281-2.842,2.856-2.842h12.5v-3.604c-0.361,0.029-0.728,0.043-1.099,0.043-2.795,0-5.822-0.82-8.524-2.312-4.18-2.304-7.19-6.002-7.856-9.653l-0.214-1.197,1.147-0.402c1.227-0.43,2.592-0.647,4.056-0.647,2.797,0,5.831,0.823,8.541,2.317,2.809,1.548,5.054,3.648,6.45,6.008,1.396-2.36,3.642-4.461,6.45-6.009,2.709-1.494,5.743-2.317,8.54-2.317,1.464,0,2.829,0.218,4.056,0.647l1.149,0.402-0.217,1.192c-0.666,3.65-3.676,7.349-7.855,9.654-2.703,1.49-5.73,2.31-8.523,2.31-0.372,0-0.738-0.014-1.1-0.043v3.604h12.5c1.575,0,2.855,1.275,2.855,2.842v4.264c0,1.567-1.28,2.843-2.855,2.843h-0.17l-1.132,17.86c-0.115,1.907-1.773,3.462-3.698,3.462h-20z" fill="url(#SVGID_4_)" fill-opacity="0.2" stroke-opacity="0.2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="30" x2="30" y1="5.281" y2="52.9">
+<stop offset="0" stop-color="#A9AAAD"/>
+<stop offset="1" 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:#BC5800"/>
-<stop offset="0.3" style="stop-color:#A23600"/>
-<stop offset="1" style="stop-color:#D07100"/>
+<path d="M33.6,18.06h0.002c2.675,0,5.578-0.788,8.177-2.221,3.998-2.204,6.871-5.714,7.499-9.159l0.107-0.596-0.58-0.197c-1.151-0.403-2.437-0.607-3.819-0.607-2.678,0-5.589,0.791-8.194,2.228-3.18,1.751-5.6,4.251-6.8,6.931-1.199-2.687-3.617-5.185-6.795-6.936-2.607-1.438-5.518-2.228-8.195-2.228-1.383,0-2.668,0.204-3.819,0.607l-0.573,0.201,0.107,0.596c0.628,3.445,3.501,6.955,7.499,9.159,2.599,1.433,5.503,2.221,8.178,2.221,0.622,0,1.229-0.042,1.813-0.125v5.106h-13.21c-1.182,0-2.143,0.957-2.143,2.132v4.264c0,1.176,0.961,2.131,2.143,2.131h0.843l1.17,18.53c0.094,1.54,1.434,2.796,2.986,2.796h20c1.553,0,2.893-1.256,2.986-2.796l1.171-18.53h0.844c1.181,0,2.143-0.955,2.143-2.131v-4.264c0-1.175-0.962-2.132-2.143-2.132h-13.22v-5.11c0.585,0.08,1.195,0.12,1.815,0.12z" fill="url(#SVGID_5_)" fill-opacity="0.4" stroke-opacity="0.4"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="43.37" x2="16.62" y1="39.75" y2="39.75">
+<stop offset="0" stop-color="#BC5800"/>
+<stop offset="0.3" stop-color="#A23600"/>
+<stop offset="1" stop-color="#D07100"/>
 </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="#600909" 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="#600909" 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:#8BC53F"/>
-<stop offset="0.3758" style="stop-color:#33773B"/>
-<stop offset="0.6303" style="stop-color:#004F3C"/>
-<stop offset="1" style="stop-color:#007338"/>
+<path d="M43.57,28.02h-27.14l1.299,21.32c0.072,1.17,1.094,2.129,2.273,2.129h20c1.18,0,2.201-0.959,2.273-2.129l1.3-21.32z" fill="url(#SVGID_6_)"/>
+<path d="M40.27,50.76h-20.54c-0.795,0-1.515-0.419-1.939-1.04,0.242,0.992,1.162,1.752,2.211,1.752h20c1.05,0,1.97-0.76,2.212-1.752-0.42,0.62-1.14,1.04-1.94,1.04z" fill="#600909" fill-opacity="0.7" stroke-opacity="0.7"/>
+<path d="M30,30.86c6.11,0,10.08,0.573,13.37,1.227l0.205-3.359h-27.15l0.205,3.359c3.29-0.65,7.26-1.23,13.37-1.23z" fill="#600909" fill-opacity="0.4" stroke-opacity="0.4"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="28.87" x2="31.01" y1="21.27" y2="21.27">
+<stop offset="0" stop-color="#8BC53F"/>
+<stop offset="0.3758" stop-color="#33773B"/>
+<stop offset="0.6303" stop-color="#004F3C"/>
+<stop offset="1" stop-color="#007338"/>
 </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:#BC5800"/>
-<stop offset="0.3" style="stop-color:#A23600"/>
-<stop offset="1" style="stop-color:#D07100"/>
+<rect fill="url(#SVGID_7_)" height="9.238" width="2.142" x="28.93" y="16.65"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="46.43" x2="13.57" y1="26.6" y2="26.6">
+<stop offset="0" stop-color="#BC5800"/>
+<stop offset="0.3" stop-color="#A23600"/>
+<stop offset="1" stop-color="#D07100"/>
 </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="#600909" 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:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
+<path d="M46.43,28.73c0,0.781-0.645,1.42-1.429,1.42h-30c-0.785,0-1.429-0.639-1.429-1.42v-4.264c0-0.782,0.644-1.421,1.429-1.421h30c0.784,0,1.429,0.64,1.429,1.421v4.262z" fill="url(#SVGID_8_)"/>
+<path d="M45,29.44h-30c-0.785,0-1.429-0.64-1.429-1.42v0.71c0,0.781,0.644,1.42,1.429,1.42h30c0.784,0,1.429-0.639,1.429-1.42v-0.71c0,0.78-0.65,1.42-1.43,1.42z" fill="#600909" fill-opacity="0.7" stroke-opacity="0.7"/>
+<path d="M45,23.05h-30c-0.785,0-1.429,0.64-1.429,1.421v0.71c0-0.781,0.644-1.421,1.429-1.421h30c0.784,0,1.429,0.64,1.429,1.421v-0.71c0-0.78-0.65-1.42-1.43-1.42z" fill="#FFFFFF" fill-opacity="0.6" stroke-opacity="0.6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="10.42" x2="30.04" y1="5.904" y2="16.9">
+<stop offset="0" stop-color="#A7FF00"/>
+<stop offset="1" stop-color="#138F00"/>
 </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:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
+<path d="M22.86,8.13c-3.974-2.19-8.299-2.669-11.43-1.572,0.57,3.138,3.167,6.474,7.142,8.665,3.973,2.19,8.299,2.669,11.43,1.572-0.57-3.13-3.17-6.47-7.14-8.66z" fill="url(#SVGID_9_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="42.12" x2="39.54" y1="18.21" y2="12.26">
+<stop offset="0" stop-color="#A7FF00"/>
+<stop offset="1" stop-color="#138F00"/>
 </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:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
+<path d="M37.14,8.13c3.974-2.19,8.299-2.669,11.43-1.572-0.569,3.138-3.167,6.474-7.142,8.665-3.973,2.19-8.299,2.669-11.43,1.572,0.57-3.13,3.17-6.47,7.14-8.66z" fill="url(#SVGID_10_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="18.88" x2="20.66" y1="18.17" y2="11.88">
+<stop offset="0" stop-color="#A7FF00"/>
+<stop offset="1" stop-color="#138F00"/>
 </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:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
+<path d="M18.57,15.22c3.973,2.19,8.299,2.669,11.43,1.572,0,0-7.308-3.236-9.777-4.551-3.304-1.759-8.794-5.685-8.794-5.685,0.57,3.141,3.17,6.475,7.14,8.665z" fill="url(#SVGID_11_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="48.8" x2="29.48" y1="4.137" y2="15.73">
+<stop offset="0" stop-color="#A7FF00"/>
+<stop offset="1" stop-color="#138F00"/>
 </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:#D2FF8A"/>
-<stop offset="1" style="stop-color:#138F00"/>
+<path d="M37.14,8.13c-3.975,2.19-6.57,5.527-7.142,8.665,0,0,6.843-2.558,9.867-4.285,3.393-1.937,8.704-5.952,8.704-5.952-3.13-1.107-7.45-0.628-11.43,1.562z" fill="url(#SVGID_12_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="20.71" x2="20.71" y1="6.366" y2="15.88">
+<stop offset="0" stop-color="#D2FF8A"/>
+<stop offset="1" stop-color="#138F00"/>
 </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:#D2FF8A"/>
-<stop offset="1" style="stop-color:#138F00"/>
+<path d="M22.86,8.13c-3.974-2.19-8.299-2.669-11.43-1.572,3.953-0.562,7.701,0.2,11.08,2.193,3.334,1.965,5.657,4.691,7.488,8.043-0.57-3.13-3.17-6.47-7.14-8.66z" fill="url(#SVGID_13_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="39.29" x2="39.29" y1="6.069" y2="16.06">
+<stop offset="0" stop-color="#D2FF8A"/>
+<stop offset="1" stop-color="#138F00"/>
 </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:#A7FF00"/>
-<stop offset="0.2303" style="stop-color:#D6FF61"/>
-<stop offset="1" style="stop-color:#138F00"/>
+<path d="M37.49,8.751c5.281-3.037,11.08-2.193,11.08-2.193-3.13-1.097-7.45-0.618-11.43,1.572-3.975,2.19-6.57,5.527-7.142,8.665,0-0.01,1.95-4.86,7.49-8.049z" fill="url(#SVGID_14_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="18.88" x2="20.66" y1="18.17" y2="11.88">
+<stop offset="0" stop-color="#A7FF00"/>
+<stop offset="0.2303" stop-color="#D6FF61"/>
+<stop offset="1" stop-color="#138F00"/>
 </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:#A7FF00"/>
-<stop offset="0.2303" style="stop-color:#D6FF61"/>
-<stop offset="1" style="stop-color:#138F00"/>
+<path d="M18.92,14.6c-5.35-2.86-7.487-8.042-7.487-8.042,0.57,3.138,3.167,6.474,7.142,8.665,3.973,2.19,8.299,2.669,11.43,1.572,0,0-5,1.06-11.08-2.19z" fill="url(#SVGID_15_)" fill-opacity="0.6" stroke-opacity="0.6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="40.85" x2="39.69" y1="17.8" y2="13.28">
+<stop offset="0" stop-color="#A7FF00"/>
+<stop offset="0.2303" stop-color="#D6FF61"/>
+<stop offset="1" stop-color="#138F00"/>
 </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:#C9CDCE"/>
-<stop offset="1" style="stop-color:#6E7273"/>
+<path d="M41.08,14.6c-3.312,1.95-6.667,2.734-11.08,2.194,3.131,1.097,7.457,0.618,11.43-1.572,3.975-2.19,6.572-5.527,7.142-8.665-1.26,3.228-3.26,5.555-7.49,8.045z" fill="url(#SVGID_16_)" fill-opacity="0.6" stroke-opacity="0.6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="30" x2="30" y1="1.095" y2="57.53">
+<stop offset="0" stop-color="#C9CDCE"/>
+<stop offset="1" stop-color="#6E7273"/>
 </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:#E6E9E8"/>
-<stop offset="1" style="stop-color:#ADB2B5"/>
+<path d="M1.428,1.017v56.85h57.14v-56.85h-57.14zm56.43,56.14h-55.72v-55.43h55.72v55.43z" fill="url(#SVGID_17_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="30" x2="30" y1="1.806" y2="57.12">
+<stop offset="0" stop-color="#E6E9E8"/>
+<stop offset="1" stop-color="#ADB2B5"/>
 </linearGradient>
-<path d="M2.142,1.727v55.43h55.716V1.727H2.142z M57.144,56.447H2.856V2.438h54.287V56.447z" fill="url(#SVGID_18_)"/>
-</g>
+<path d="M2.142,1.727v55.43h55.72v-55.43h-55.72zm55,54.72h-54.28v-54.01h54.29v54.01z" fill="url(#SVGID_18_)"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_dialled_call.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,156 +1,155 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5609 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="423.0967" x2="429.6527" y1="-578.646" y2="-582.908">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.6061" style="stop-color:#154EBD"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
-</linearGradient>
-<path d="M19.081,33.911c2.089-3.597,4.591-6.497,7.281-9.189c2.593-2.591,6.72-5.3,8.562-6.256l9.604-10.282  c-0.845-0.3-3.693-0.464-7.279,0.616c-3.586,1.083-11.736,6.303-16.979,11.547c-5.242,5.246-9.727,12.347-10.581,14.595  c-1.343,3.541-1.221,7.445-0.929,8.581c0,0,0.34,1.034,1.144,2.377C10.248,46.476,19.081,33.911,19.081,33.911z" fill="url(#SVGID_1_)"/>
-<path d="M31.184,20.8c1.488-1.036,2.87-1.882,3.74-2.334L44.271,8.46  c-0.132-0.058-0.209-0.088-0.209-0.088c-0.247-0.088-0.642-0.162-1.124-0.219c-0.793,0.006-1.596,0.093-2.401,0.27  C34.843,9.673,31.019,14.958,31.184,20.8z" fill="#020202" fill-opacity="0.05" stroke-opacity="0.05"/>
-<path d="M31.906,20.306c1.205-0.809,2.291-1.462,3.018-1.84l9.377-10.04  c-0.146-0.063-0.233-0.098-0.233-0.098c-0.231-0.08-0.604-0.152-1.06-0.203c-0.751,0.006-1.51,0.087-2.27,0.253  C35.275,9.576,31.636,14.695,31.906,20.306z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M44.079,8.263c-0.21-0.073-0.55-0.137-0.962-0.186c-0.681,0.006-1.369,0.08-2.06,0.231  c-5.087,1.116-8.426,5.984-7.978,11.233c0.725-0.455,1.363-0.826,1.844-1.076l9.424-10.088C44.178,8.302,44.079,8.263,44.079,8.263z  " fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="43.3906" cy="8.9175" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="18.5073">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.6061" style="stop-color:#154EBD"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+<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"/>
 </radialGradient>
-<path d="M34.924,18.466l0.929,1.55c0,0,15.101-6.784,14.084-8.038c-0.513-0.631-0.577-0.656-1.237-1.263  c-1.985-1.815-4.172-2.531-4.172-2.531c-0.186-0.063-0.481-0.12-0.845-0.161c-0.596,0.004-1.2,0.068-1.806,0.201  c-4.591,1.009-7.57,5.501-6.963,10.257C34.916,18.477,34.921,18.47,34.924,18.466z" fill="url(#SVGID_2_)"/>
-<path d="M17.483,34.106c-0.988-0.14-2.007-0.119-3.027,0.105c-2.418,0.53-4.376,2.066-5.646,4.131  c-0.367,2.35-0.25,4.407-0.05,5.18c0,0,0.34,1.034,1.144,2.377c0.29,0.482,6.54-8.264,8.556-11.107L17.483,34.106z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M18.366,34.136c-0.989-0.14-2.008-0.118-3.029,0.105c-3.313,0.727-5.775,3.332-6.76,6.623  c-0.026,1.025,0.034,1.872,0.127,2.397c0.003,0.013,0.005,0.034,0.01,0.048c0,0,0.34,1.033,1.144,2.379  c0.3,0.498,6.981-8.888,8.75-11.384L18.366,34.136z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="437.4258" cy="-571.231" gradientTransform="matrix(0.2095 0.9787 -0.9682 0.2124 -629.4526 -270.6148)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="14.6198">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.6061" style="stop-color:#154EBD"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
-</radialGradient>
-<path d="M11.202,47.738c0.616,0.74,0.646,0.954,1.295,1.524c1.194,1.055,9.301-13.612,9.301-13.612  l-2.683-1.719c-0.941-0.111-1.914-0.079-2.89,0.136c-4.777,1.048-7.806,5.868-6.87,10.832C9.749,45.686,10.349,46.71,11.202,47.738z  " fill="url(#SVGID_3_)"/>
-<path d="M49.937,11.978c-0.179-0.22-0.381-0.446-0.578-0.67l-13.944,7.959l0.438,0.749  C35.853,20.016,50.953,13.231,49.937,11.978z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="422.2881" x2="427.4786" y1="-610.9287" y2="-594.4409">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.8121" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M35.853,20.016l1.178,1.981c0.302,0.515,0.972,0.674,1.569,0.422l4.09-2.334l8.043-4.668  c0.632-0.363,0.878-1.119,0.549-1.686c0,0-0.333-0.501-1.349-1.751L35.853,20.016z" fill="url(#SVGID_4_)"/>
-<path d="M21.798,35.65l-0.725-0.472l-9.215,13.486c0.216,0.204,0.43,0.414,0.639,0.598  C13.691,50.317,21.798,35.65,21.798,35.65z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="439.6982" x2="451.5232" y1="-577.7549" y2="-564.7323">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.8121" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+<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"/>
 </linearGradient>
-<path d="M12.498,49.262c1.193,1.05,1.686,1.37,1.686,1.37c0.567,0.367,1.363,0.169,1.781-0.442l7.9-11.605  c0.419-0.614,0.307-1.411-0.26-1.777l-1.808-1.156L12.498,49.262z" fill="url(#SVGID_5_)"/>
+<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"/>
+</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"/>
+</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(0.5 0 0 0.5 0 0)">
-<rect fill="none" height="60" width="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="29.96" x2="29.95" y1="3.99" y2="53.51">
-<stop offset="0" stop-color="#45E8FF"/>
-<stop offset="0.15" stop-color="#45E8FF"/>
-<stop offset="0.56" stop-color="#30A4D5"/>
-<stop offset="1" stop-color="#1347BA"/>
+<g>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_1)" points="50.762,28.576 30.054,7.056 9.146,28.576 20.414,28.576 20.42,53.164 39.73,53.168 39.727,28.576 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="30" x2="30" y1="6.47" y2="29.15">
-<stop offset="0" stop-color="#B3FCFF"/>
-<stop offset="0.42" stop-color="#B3FCFF"/>
-<stop offset="1" stop-color="#5FBAD8"/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_2)" points="9.794,28.572 30.052,7.776 50.208,28.576 51.602,28.576 30.054,6.34 8.398,28.572 "/>
-<line fill="none" x1="20.42" x2="39.73" y1="53.156" y2="53.16"/>
-<polygon fill="#33AEDB" points="39.734,53.66 20.42,53.656 20.42,52.656 39.732,52.66 "/>
-<rect fill="none" height="60" width="60"/>
+<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 "/>
+<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.3789" x2="17.6203" y1="23.6504" y2="23.6504">
-<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"/>
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_1__)" height="7.853" width="5.105" x="12.447" y="19.724"/>
-<path d="M12.447,24.655c0.82,0.199,1.673,0.315,2.553,0.315c0.881,0,1.732-0.116,2.553-0.315v-4.294  h-5.105V24.655z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M12.447,24.018c0.82,0.199,1.673,0.315,2.553,0.315c0.881,0,1.732-0.116,2.553-0.315v-4.294  h-5.105V24.018z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="14.9995" x2="14.9995" y1="1.9746" y2="23.6704">
-<stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="0.3212" style="stop-color:#E6E6E6"/>
-<stop offset="1" style="stop-color:#666666"/>
+<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"/>
+<path d="M12.45,24.02c0.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.288z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2___" x1="15" x2="15" y1="1.975" y2="23.67">
+<stop offset="0" stop-color="#F2F2F2"/>
+<stop offset="0.3212" stop-color="#E6E6E6"/>
+<stop offset="1" stop-color="#666666"/>
 </linearGradient>
-<path d="M15,23.695c-5.98,0-10.848-4.867-10.848-10.848S9.02,2,15,2c5.982,0,10.848,4.866,10.848,10.847  S20.982,23.695,15,23.695L15,23.695z" fill="url(#SVGID_2__)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="14.9995" x2="14.9995" y1="2.6143" y2="23.0332">
-<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:#7C8487"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
+<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"/>
 </linearGradient>
-<circle cx="15" cy="12.847" fill="url(#SVGID_3__)" r="10.209"/>
-<path d="M15,21.989c-5.315,0-9.657-4.23-9.843-9.5c-0.004,0.116-0.009,0.231-0.009,0.349  c0,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.349C24.658,17.759,20.315,21.989,15,21.989z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M23.295,12.413c0,4.704-3.715,9.346-8.299,9.345c-4.58-0.003-8.292-4.646-8.291-9.35  c0.002-4.706,3.718-8.517,8.298-8.517C19.584,3.894,23.298,7.707,23.295,12.413z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M14.996,21.066c-2.387-0.002-4.63-0.932-6.315-2.619c-1.688-1.688-2.615-3.932-2.614-6.318  c0-4.923,4.009-8.929,8.935-8.929c2.387,0,4.632,0.931,6.317,2.618c1.688,1.688,2.616,3.933,2.615,6.318  c-0.002,4.924-4.01,8.93-8.934,8.93H14.996z" fill="#231F20" fill-opacity="0.2" stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="14.9995" x2="14.9995" y1="3.7212" y2="20.3517">
-<stop offset="0" style="stop-color:#CFCFCF"/>
-<stop offset="0.1091" style="stop-color:#CFCFCF"/>
-<stop offset="0.6848" style="stop-color:#121212"/>
-<stop offset="1" style="stop-color:#A6A6A6"/>
+<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"/>
+<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"/>
+<stop offset="0.6848" stop-color="#121212"/>
+<stop offset="1" stop-color="#A6A6A6"/>
 </linearGradient>
-<path d="M14.996,20.428c-2.216-0.002-4.298-0.864-5.864-2.432c-1.567-1.566-2.428-3.65-2.427-5.866  c0-4.573,3.723-8.293,8.296-8.293c2.218,0.001,4.3,0.864,5.866,2.432c1.566,1.568,2.43,3.651,2.428,5.867  c-0.001,4.573-3.723,8.292-8.295,8.292H14.996z" fill="url(#SVGID_4__)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="14.9995" x2="14.9995" y1="4.3682" y2="19.7187">
-<stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="1" style="stop-color:#606769"/>
+<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"/>
 </linearGradient>
-<circle cx="15" cy="12.133" fill="url(#SVGID_5__)" r="7.657"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="14.9995" x2="14.9995" y1="5.7715" y2="18.454">
-<stop offset="0" style="stop-color:#1A1A1A"/>
-<stop offset="0.503" style="stop-color:#343434"/>
-<stop offset="0.7515" style="stop-color:#9E9E9E"/>
-<stop offset="1" style="stop-color:#CFCFCF"/>
+<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">
+<stop offset="0" stop-color="#1A1A1A"/>
+<stop offset="0.503" stop-color="#343434"/>
+<stop offset="0.7515" stop-color="#9E9E9E"/>
+<stop offset="1" stop-color="#CFCFCF"/>
 </linearGradient>
-<path d="M15,18.514c-1.706-0.001-3.309-0.666-4.514-1.871c-1.204-1.206-1.867-2.808-1.867-4.512  c0-3.517,2.862-6.378,6.382-6.378c1.706,0,3.308,0.664,4.513,1.871c1.205,1.205,1.868,2.808,1.867,4.513  C21.381,15.652,18.519,18.514,15,18.514L15,18.514z" fill="url(#SVGID_6_)"/>
-<radialGradient cx="25.7734" cy="10.2729" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="6.4991">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="0.5917" style="stop-color:#000000"/>
-<stop offset="0.627" style="stop-color:#050505"/>
-<stop offset="0.7652" style="stop-color:#121212"/>
-<stop offset="0.8876" style="stop-color:#171717"/>
-<stop offset="1" style="stop-color:#171717"/>
+<path d="M15,18.51c-1.706-0.001-3.309-0.666-4.514-1.871-1.204-1.206-1.867-2.808-1.867-4.512,0-3.517,2.862-6.378,6.382-6.378,1.706,0,3.308,0.664,4.513,1.871,1.205,1.205,1.868,2.808,1.867,4.513,0,3.51-2.86,6.37-6.38,6.37z" fill="url(#SVGID_6__)"/>
+<radialGradient cx="25.77" cy="10.27" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="6.499">
+<stop offset="0" stop-color="#000000"/>
+<stop offset="0.5917" stop-color="#000000"/>
+<stop offset="0.627" stop-color="#050505"/>
+<stop offset="0.7652" stop-color="#121212"/>
+<stop offset="0.8876" stop-color="#171717"/>
+<stop offset="1" stop-color="#171717"/>
 </radialGradient>
-<path d="M20.743,12.135c0,3.172-2.574,5.74-5.744,5.74c-3.175-0.001-5.743-2.573-5.741-5.745  c0-3.171,2.573-5.742,5.745-5.74C18.173,6.391,20.744,8.962,20.743,12.135z" fill="url(#SVGID_7_)"/>
-<radialGradient cx="21.6543" cy="5.0659" gradientTransform="matrix(1.0143 0 0 1.0141 -9.5579 3.1299)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="10.3515">
-<stop offset="0" style="stop-color:#242424"/>
-<stop offset="0.4303" style="stop-color:#242424"/>
-<stop offset="0.7818" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
+<path d="M20.74,12.14c0,3.172-2.574,5.74-5.744,5.74-3.175-0.001-5.743-2.573-5.741-5.745,0-3.171,2.573-5.742,5.745-5.74,3.17-0.009,5.74,2.562,5.74,5.74z" fill="url(#SVGID_7_)"/>
+<radialGradient cx="21.65" cy="5.066" gradientTransform="matrix(1.0143 0 0 1.0141 -9.5579 3.1299)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="10.35">
+<stop offset="0" stop-color="#242424"/>
+<stop offset="0.4303" stop-color="#242424"/>
+<stop offset="0.7818" stop-color="#000000"/>
+<stop offset="1" stop-color="#000000"/>
 </radialGradient>
-<circle cx="15" cy="12.133" fill="url(#SVGID_8_)" r="4.712"/>
-<radialGradient cx="23.9639" cy="3.5498" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="11.3574">
-<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"/>
+<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"/>
 </radialGradient>
-<path d="M19.211,12.133c0,2.326-1.886,4.21-4.212,4.21c-2.326-0.002-4.213-1.888-4.213-4.212  c0.004-2.327,1.89-4.21,4.213-4.21C17.328,7.923,19.214,9.808,19.211,12.133z" fill="url(#SVGID_9_)"/>
-<radialGradient cx="25.1709" cy="13.2505" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="4.6113">
-<stop offset="0" style="stop-color:#48630C"/>
-<stop offset="0.7879" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
+<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.7879" stop-color="#000000"/>
+<stop offset="1" stop-color="#000000"/>
 </radialGradient>
-<path d="M19.211,12.133c0,2.326-1.886,4.21-4.212,4.21c-2.326-0.002-4.213-1.888-4.213-4.212  c0,0,1.444,2.569,4.213,2.569C17.767,14.701,19.211,12.133,19.211,12.133z" fill="url(#SVGID_10_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="14.979" x2="14.979" y1="7.0654" y2="12.0939">
-<stop offset="0" style="stop-color:#F8FBFF"/>
-<stop offset="1" style="stop-color:#808080"/>
+<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="1" stop-color="#808080"/>
 </linearGradient>
-<path d="M14.979,12.069c1.828,0,3.549-0.277,5.067-0.765  c-0.431-2.41-2.532-4.239-5.067-4.239c-2.532,0-4.632,1.83-5.065,4.239C11.431,11.792,13.153,12.069,14.979,12.069z" fill="url(#SVGID_11_)" fill-opacity="0.35" stroke-opacity="0.35"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="5.7617" x2="24.2852" y1="26.7236" y2="26.7236">
-<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"/>
+<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"/>
 </linearGradient>
-<path d="M24.245,28c0.025-0.635,0.04-0.508,0.04-0.639v-0.035c0-1.037-0.852-1.879-1.901-1.879H7.662  c-1.05,0-1.9,0.842-1.9,1.879v0.035c0,0.131,0.014,0.004,0.04,0.639H24.245z" fill="url(#SVGID_12_)"/>
-<path d="M5.879,26.7h18.29c-0.084-0.234-0.212-0.444-0.377-0.626H6.256  C6.092,26.256,5.963,26.466,5.879,26.7z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M5.772,27.361C5.779,27.492,5.789,27.684,5.802,28h18.443  c0.012-0.316,0.022-0.508,0.028-0.639H5.772z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M6.255,26.074h17.536c-0.348-0.383-0.846-0.627-1.407-0.627H7.662  C7.102,25.447,6.603,25.691,6.255,26.074z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<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"/>
+<path d="M5.772,27.36c0.007,0.13,0.017,0.32,0.03,0.64h18.44c0.012-0.316,0.022-0.508,0.028-0.639h-18.5z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M6.255,26.07h17.54c-0.348-0.383-0.846-0.627-1.407-0.627h-14.72c-0.56,0.01-1.059,0.25-1.407,0.63z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
 <rect fill="none" height="30" width="30"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_download.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,53 +1,55 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<linearGradient gradientTransform="matrix(1 0 0 1 2296.5195 1443.9805)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2266.519" x2="-2266.519" y1="-1432.3472" y2="-1395.6118">
+<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="M51.734,11.633H8.266c-0.678,0-1.225,0.549-1.225,1.225v34.285c0,0.678,0.547,1.226,1.225,1.226  h43.468c0.677,0,1.226-0.548,1.226-1.226V12.857C52.959,12.182,52.41,11.633,51.734,11.633z M12.551,45.918  c0,0.338-0.275,0.613-0.611,0.613H9.49c-0.338,0-0.613-0.275-0.613-0.613v-1.225c0-0.336,0.275-0.611,0.613-0.611h2.449  c0.336,0,0.611,0.275,0.611,0.611L12.551,45.918L12.551,45.918z M12.551,15.307c0,0.336-0.275,0.611-0.611,0.611H9.49  c-0.338,0-0.613-0.275-0.613-0.611v-1.225c0-0.336,0.275-0.613,0.613-0.613h2.449c0.336,0,0.611,0.277,0.611,0.613L12.551,15.307  L12.551,15.307z M18.061,45.918c0,0.338-0.275,0.613-0.611,0.613H15c-0.338,0-0.612-0.275-0.612-0.613v-1.225  c0-0.336,0.274-0.611,0.612-0.611h2.449c0.336,0,0.611,0.275,0.611,0.611L18.061,45.918L18.061,45.918z M18.061,15.307  c0,0.336-0.275,0.611-0.611,0.611H15c-0.338,0-0.612-0.275-0.612-0.611v-1.225c0-0.336,0.274-0.613,0.612-0.613h2.449  c0.336,0,0.611,0.277,0.611,0.613L18.061,15.307L18.061,15.307z M23.571,45.918c0,0.338-0.276,0.613-0.612,0.613H20.51  c-0.336,0-0.611-0.275-0.611-0.613v-1.225c0-0.336,0.274-0.611,0.611-0.611h2.449c0.336,0,0.612,0.275,0.612,0.611V45.918z   M23.571,15.307c0,0.336-0.276,0.611-0.612,0.611H20.51c-0.336,0-0.611-0.275-0.611-0.611v-1.225c0-0.336,0.274-0.613,0.611-0.613  h2.449c0.336,0,0.612,0.277,0.612,0.613V15.307z M29.082,45.918c0,0.338-0.276,0.613-0.613,0.613h-2.448  c-0.337,0-0.612-0.275-0.612-0.613v-1.225c0-0.336,0.275-0.611,0.612-0.611h2.448c0.337,0,0.613,0.275,0.613,0.611V45.918z   M29.082,15.307c0,0.336-0.276,0.611-0.613,0.611h-2.448c-0.337,0-0.612-0.275-0.612-0.611v-1.225c0-0.336,0.275-0.613,0.612-0.613  h2.448c0.337,0,0.613,0.277,0.613,0.613V15.307z M34.592,45.918c0,0.338-0.275,0.613-0.611,0.613h-2.448  c-0.339,0-0.613-0.275-0.613-0.613v-1.225c0-0.336,0.274-0.611,0.613-0.611h2.448c0.336,0,0.611,0.275,0.611,0.611V45.918z   M34.592,15.307c0,0.336-0.275,0.611-0.611,0.611h-2.448c-0.339,0-0.613-0.275-0.613-0.611v-1.225c0-0.336,0.274-0.613,0.613-0.613  h2.448c0.336,0,0.611,0.277,0.611,0.613V15.307z M40.102,45.918c0,0.338-0.274,0.613-0.61,0.613h-2.449  c-0.338,0-0.612-0.275-0.612-0.613v-1.225c0-0.336,0.274-0.611,0.612-0.611h2.449c0.336,0,0.61,0.275,0.61,0.611V45.918z   M40.102,15.307c0,0.336-0.274,0.611-0.61,0.611h-2.449c-0.338,0-0.612-0.275-0.612-0.611v-1.225c0-0.336,0.274-0.613,0.612-0.613  h2.449c0.336,0,0.61,0.277,0.61,0.613V15.307z M45.611,45.918c0,0.338-0.275,0.613-0.611,0.613h-2.449  c-0.337,0-0.611-0.275-0.611-0.613v-1.225c0-0.336,0.274-0.611,0.611-0.611H45c0.336,0,0.611,0.275,0.611,0.611V45.918z   M45.611,15.307c0,0.336-0.275,0.611-0.611,0.611h-2.449c-0.337,0-0.611-0.275-0.611-0.611v-1.225c0-0.336,0.274-0.613,0.611-0.613  H45c0.336,0,0.611,0.277,0.611,0.613V15.307z M51.123,45.918c0,0.338-0.277,0.613-0.613,0.613h-2.449  c-0.336,0-0.61-0.275-0.61-0.613v-1.225c0-0.336,0.274-0.611,0.61-0.611h2.449c0.336,0,0.613,0.275,0.613,0.611V45.918z   M51.123,15.307c0,0.336-0.277,0.611-0.613,0.611h-2.449c-0.336,0-0.61-0.275-0.61-0.611v-1.225c0-0.336,0.274-0.613,0.61-0.613  h2.449c0.336,0,0.613,0.277,0.613,0.613V15.307z" fill="url(#SVGID_1_)"/>
-<path d="M51.734,11.633H8.266c-0.678,0-1.225,0.549-1.225,1.225v0.611  c0-0.676,0.547-1.225,1.225-1.225h43.468c0.677,0,1.226,0.549,1.226,1.225v-0.611C52.959,12.182,52.41,11.633,51.734,11.633z" fill="#FFFFFF" fill-opacity="0.55" stroke-opacity="0.55"/>
-<path d="M8.266,48.367h43.468c0.677,0,1.226-0.547,1.226-1.225v-0.611  c0,0.676-0.549,1.225-1.226,1.225H8.266c-0.678,0-1.225-0.549-1.225-1.225v0.611C7.041,47.82,7.588,48.367,8.266,48.367z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
-<linearGradient gradientTransform="matrix(1 0 0 1 2296.5195 1443.9805)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2266.5195" x2="-2266.5195" y1="-1426.1284" y2="-1401.6362">
+<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="24.492" width="45.918" x="7.041" y="17.754"/>
-<linearGradient gradientTransform="matrix(1 0 0 1 2296.5195 1443.9805)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2266.519" x2="-2266.519" y1="-1401.7349" y2="-1426.2271">
+<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="M51.123,41.021c0,0.674-0.553,1.225-1.225,1.225H10.102c-0.673,0-1.225-0.551-1.225-1.225V18.979  c0-0.672,0.552-1.225,1.225-1.225h39.796c0.672,0,1.226,0.553,1.226,1.225L51.123,41.021L51.123,41.021z" fill="url(#SVGID_3_)"/>
-<path d="M49.898,41.021H10.102c-0.673,0-1.225,0.061-1.225-0.613l0,0  c0,0.674,0.552,1.225,1.225,1.225h39.796c0.672,0,1.226-0.551,1.226-1.225l0,0C51.123,41.082,50.57,41.021,49.898,41.021z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
-<linearGradient gradientTransform="matrix(1 0 0 1 2296.5195 1443.9805)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-2266.519" x2="-2266.519" y1="-1426.2261" y2="-1401.6362">
+<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="M49.898,18.367c0.336,0,0.61,0.275,0.61,0.611v22.043c0,0.338-0.274,0.61-0.61,0.61H10.102  c-0.337,0-0.611-0.272-0.611-0.61V18.979c0-0.336,0.274-0.611,0.611-0.611L49.898,18.367 M49.898,17.754H10.102  c-0.673,0-1.225,0.553-1.225,1.225v22.042c0,0.674,0.552,1.226,1.225,1.226h39.796c0.672,0,1.226-0.552,1.226-1.226V18.979  C51.123,18.307,50.57,17.754,49.898,17.754L49.898,17.754z" fill="url(#SVGID_4_)"/>
-<path d="M49.898,25.102v-4.898c0-0.676-0.549-1.225-1.226-1.225H11.326  c-0.676,0-1.225,0.549-1.225,1.225v7.961L49.898,25.102z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
+<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(0.5 0 0 0.5 30 30)">
-<rect fill="none" height="60" width="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="30.05" x2="30.04" y1="5.29" y2="53.46">
-<stop offset="0" stop-color="#C6FF45"/>
-<stop offset="0.73" stop-color="#66A00E"/>
-<stop offset="1" stop-color="#387300"/>
+<g transform="matrix(1 0 0 1 30 30)">
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_1)" points="9.296,32.451 29.883,53.938 50.791,32.426 39.523,32.422 39.515,5.833 20.331,5.831 20.331,32.449 "/>
-<line fill="none" x1="39.515" x2="20.331" y1="5.841" y2="5.84"/>
-<polygon fill="#E7FFB9" points="20.331,5.34 39.516,5.341 39.515,6.34 20.331,6.339 "/>
-<polygon fill="#E7FFB9" points="39.221,32.462 51.006,32.465 50.113,33.464 39.221,33.464 "/>
-<polygon fill="#E7FFB9" points="8.643,32.449 20.313,32.449 20.313,33.449 9.695,33.449 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="48.38" x2="10.72" y1="43.53" y2="43.53">
-<stop offset="0" stop-color="#AAE535"/>
-<stop offset="1" stop-color="#5D9C0A"/>
+<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 "/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_2)" points="50.141,32.424 29.883,53.221 9.849,32.397 8.458,32.4 29.881,54.655 51.54,32.424 "/>
-<rect fill="none" height="59.996" width="59.996"/>
+<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>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_missed_call.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,151 +1,155 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5609 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="423.0967" x2="429.6527" y1="-578.646" y2="-582.908">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.6061" style="stop-color:#154EBD"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
-</linearGradient>
-<path d="M19.081,33.911c2.089-3.597,4.591-6.497,7.281-9.189c2.593-2.591,6.72-5.3,8.562-6.256l9.604-10.282  c-0.845-0.3-3.693-0.464-7.279,0.616c-3.586,1.083-11.736,6.303-16.979,11.547c-5.242,5.246-9.727,12.347-10.581,14.595  c-1.343,3.541-1.221,7.445-0.929,8.581c0,0,0.34,1.034,1.144,2.377C10.248,46.476,19.081,33.911,19.081,33.911z" fill="url(#SVGID_1_)"/>
-<path d="M31.184,20.8c1.488-1.036,2.87-1.882,3.74-2.334L44.271,8.46  c-0.132-0.058-0.209-0.088-0.209-0.088c-0.247-0.088-0.642-0.162-1.124-0.219c-0.793,0.006-1.596,0.093-2.401,0.27  C34.843,9.673,31.019,14.958,31.184,20.8z" fill="#020202" fill-opacity="0.05" stroke-opacity="0.05"/>
-<path d="M31.906,20.306c1.205-0.809,2.291-1.462,3.018-1.84l9.377-10.04  c-0.146-0.063-0.233-0.098-0.233-0.098c-0.231-0.08-0.604-0.152-1.06-0.203c-0.751,0.006-1.51,0.087-2.27,0.253  C35.275,9.576,31.636,14.695,31.906,20.306z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M44.079,8.263c-0.21-0.073-0.55-0.137-0.962-0.186c-0.681,0.006-1.369,0.08-2.06,0.231  c-5.087,1.116-8.426,5.984-7.978,11.233c0.725-0.455,1.363-0.826,1.844-1.076l9.424-10.088C44.178,8.302,44.079,8.263,44.079,8.263z  " fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="43.3906" cy="8.9175" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="18.5073">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.6061" style="stop-color:#154EBD"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+<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"/>
 </radialGradient>
-<path d="M34.924,18.466l0.929,1.55c0,0,15.101-6.784,14.084-8.038c-0.513-0.631-0.577-0.656-1.237-1.263  c-1.985-1.815-4.172-2.531-4.172-2.531c-0.186-0.063-0.481-0.12-0.845-0.161c-0.596,0.004-1.2,0.068-1.806,0.201  c-4.591,1.009-7.57,5.501-6.963,10.257C34.916,18.477,34.921,18.47,34.924,18.466z" fill="url(#SVGID_2_)"/>
-<path d="M17.483,34.106c-0.988-0.14-2.007-0.119-3.027,0.105c-2.418,0.53-4.376,2.066-5.646,4.131  c-0.367,2.35-0.25,4.407-0.05,5.18c0,0,0.34,1.034,1.144,2.377c0.29,0.482,6.54-8.264,8.556-11.107L17.483,34.106z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M18.366,34.136c-0.989-0.14-2.008-0.118-3.029,0.105c-3.313,0.727-5.775,3.332-6.76,6.623  c-0.026,1.025,0.034,1.872,0.127,2.397c0.003,0.013,0.005,0.034,0.01,0.048c0,0,0.34,1.033,1.144,2.379  c0.3,0.498,6.981-8.888,8.75-11.384L18.366,34.136z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="437.4258" cy="-571.231" gradientTransform="matrix(0.2095 0.9787 -0.9682 0.2124 -629.4526 -270.6148)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="14.6198">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.6061" style="stop-color:#154EBD"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
-</radialGradient>
-<path d="M11.202,47.738c0.616,0.74,0.646,0.954,1.295,1.524c1.194,1.055,9.301-13.612,9.301-13.612  l-2.683-1.719c-0.941-0.111-1.914-0.079-2.89,0.136c-4.777,1.048-7.806,5.868-6.87,10.832C9.749,45.686,10.349,46.71,11.202,47.738z  " fill="url(#SVGID_3_)"/>
-<path d="M49.937,11.978c-0.179-0.22-0.381-0.446-0.578-0.67l-13.944,7.959l0.438,0.749  C35.853,20.016,50.953,13.231,49.937,11.978z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="422.2881" x2="427.4786" y1="-610.9287" y2="-594.4409">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.8121" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M35.853,20.016l1.178,1.981c0.302,0.515,0.972,0.674,1.569,0.422l4.09-2.334l8.043-4.668  c0.632-0.363,0.878-1.119,0.549-1.686c0,0-0.333-0.501-1.349-1.751L35.853,20.016z" fill="url(#SVGID_4_)"/>
-<path d="M21.798,35.65l-0.725-0.472l-9.215,13.486c0.216,0.204,0.43,0.414,0.639,0.598  C13.691,50.317,21.798,35.65,21.798,35.65z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="439.6982" x2="451.5232" y1="-577.7549" y2="-564.7323">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.8121" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+<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"/>
 </linearGradient>
-<path d="M12.498,49.262c1.193,1.05,1.686,1.37,1.686,1.37c0.567,0.367,1.363,0.169,1.781-0.442l7.9-11.605  c0.419-0.614,0.307-1.411-0.26-1.777l-1.808-1.156L12.498,49.262z" fill="url(#SVGID_5_)"/>
+<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"/>
+</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"/>
+</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(0.5 0 0 0.5 0 0)">
-<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="9.06" y2="54.1">
-<stop offset="0" stop-color="#FF7042"/>
-<stop offset="1" stop-color="#991B23"/>
+<g>
+<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"/>
 </linearGradient>
-<path d="M38.036,33.691V25.06h9.069L30.082,7.372L12.898,25.06h9.262v8.631 c0,14.586,12.136,18.935,23.816,18.935V39.782C42.378,39.782,38.036,38.004,38.036,33.691z" fill="url(#SVGID_1)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="30" x2="30" y1="8.03" y2="25.63">
-<stop offset="0" stop-color="#FFBE82"/>
-<stop offset="1" stop-color="#991B23"/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_2)" points="30.082,9.016 45.523,25.058 47.105,25.058 30.082,7.372 12.898,25.058 14.496,25.058 "/>
+<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"/>
+</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.3789" x2="17.6203" y1="23.6504" y2="23.6504">
-<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"/>
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_1__)" height="7.853" width="5.105" x="12.447" y="19.724"/>
-<path d="M12.447,24.655c0.82,0.199,1.673,0.315,2.553,0.315c0.881,0,1.732-0.116,2.553-0.315v-4.294  h-5.105V24.655z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M12.447,24.018c0.82,0.199,1.673,0.315,2.553,0.315c0.881,0,1.732-0.116,2.553-0.315v-4.294  h-5.105V24.018z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="14.9995" x2="14.9995" y1="1.9746" y2="23.6704">
-<stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="0.3212" style="stop-color:#E6E6E6"/>
-<stop offset="1" style="stop-color:#666666"/>
+<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"/>
+<path d="M12.45,24.02c0.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.288z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2___" x1="15" x2="15" y1="1.975" y2="23.67">
+<stop offset="0" stop-color="#F2F2F2"/>
+<stop offset="0.3212" stop-color="#E6E6E6"/>
+<stop offset="1" stop-color="#666666"/>
 </linearGradient>
-<path d="M15,23.695c-5.98,0-10.848-4.867-10.848-10.848S9.02,2,15,2c5.982,0,10.848,4.866,10.848,10.847  S20.982,23.695,15,23.695L15,23.695z" fill="url(#SVGID_2__)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="14.9995" x2="14.9995" y1="2.6143" y2="23.0332">
-<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:#7C8487"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
+<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"/>
 </linearGradient>
-<circle cx="15" cy="12.847" fill="url(#SVGID_3__)" r="10.209"/>
-<path d="M15,21.989c-5.315,0-9.657-4.23-9.843-9.5c-0.004,0.116-0.009,0.231-0.009,0.349  c0,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.349C24.658,17.759,20.315,21.989,15,21.989z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M23.295,12.413c0,4.704-3.715,9.346-8.299,9.345c-4.58-0.003-8.292-4.646-8.291-9.35  c0.002-4.706,3.718-8.517,8.298-8.517C19.584,3.894,23.298,7.707,23.295,12.413z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M14.996,21.066c-2.387-0.002-4.63-0.932-6.315-2.619c-1.688-1.688-2.615-3.932-2.614-6.318  c0-4.923,4.009-8.929,8.935-8.929c2.387,0,4.632,0.931,6.317,2.618c1.688,1.688,2.616,3.933,2.615,6.318  c-0.002,4.924-4.01,8.93-8.934,8.93H14.996z" fill="#231F20" fill-opacity="0.2" stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="14.9995" x2="14.9995" y1="3.7212" y2="20.3517">
-<stop offset="0" style="stop-color:#CFCFCF"/>
-<stop offset="0.1091" style="stop-color:#CFCFCF"/>
-<stop offset="0.6848" style="stop-color:#121212"/>
-<stop offset="1" style="stop-color:#A6A6A6"/>
+<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"/>
+<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"/>
+<stop offset="0.6848" stop-color="#121212"/>
+<stop offset="1" stop-color="#A6A6A6"/>
 </linearGradient>
-<path d="M14.996,20.428c-2.216-0.002-4.298-0.864-5.864-2.432c-1.567-1.566-2.428-3.65-2.427-5.866  c0-4.573,3.723-8.293,8.296-8.293c2.218,0.001,4.3,0.864,5.866,2.432c1.566,1.568,2.43,3.651,2.428,5.867  c-0.001,4.573-3.723,8.292-8.295,8.292H14.996z" fill="url(#SVGID_4__)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="14.9995" x2="14.9995" y1="4.3682" y2="19.7187">
-<stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="1" style="stop-color:#606769"/>
+<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"/>
 </linearGradient>
-<circle cx="15" cy="12.133" fill="url(#SVGID_5__)" r="7.657"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="14.9995" x2="14.9995" y1="5.7715" y2="18.454">
-<stop offset="0" style="stop-color:#1A1A1A"/>
-<stop offset="0.503" style="stop-color:#343434"/>
-<stop offset="0.7515" style="stop-color:#9E9E9E"/>
-<stop offset="1" style="stop-color:#CFCFCF"/>
+<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">
+<stop offset="0" stop-color="#1A1A1A"/>
+<stop offset="0.503" stop-color="#343434"/>
+<stop offset="0.7515" stop-color="#9E9E9E"/>
+<stop offset="1" stop-color="#CFCFCF"/>
 </linearGradient>
-<path d="M15,18.514c-1.706-0.001-3.309-0.666-4.514-1.871c-1.204-1.206-1.867-2.808-1.867-4.512  c0-3.517,2.862-6.378,6.382-6.378c1.706,0,3.308,0.664,4.513,1.871c1.205,1.205,1.868,2.808,1.867,4.513  C21.381,15.652,18.519,18.514,15,18.514L15,18.514z" fill="url(#SVGID_6_)"/>
-<radialGradient cx="25.7734" cy="10.2729" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="6.4991">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="0.5917" style="stop-color:#000000"/>
-<stop offset="0.627" style="stop-color:#050505"/>
-<stop offset="0.7652" style="stop-color:#121212"/>
-<stop offset="0.8876" style="stop-color:#171717"/>
-<stop offset="1" style="stop-color:#171717"/>
+<path d="M15,18.51c-1.706-0.001-3.309-0.666-4.514-1.871-1.204-1.206-1.867-2.808-1.867-4.512,0-3.517,2.862-6.378,6.382-6.378,1.706,0,3.308,0.664,4.513,1.871,1.205,1.205,1.868,2.808,1.867,4.513,0,3.51-2.86,6.37-6.38,6.37z" fill="url(#SVGID_6__)"/>
+<radialGradient cx="25.77" cy="10.27" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="6.499">
+<stop offset="0" stop-color="#000000"/>
+<stop offset="0.5917" stop-color="#000000"/>
+<stop offset="0.627" stop-color="#050505"/>
+<stop offset="0.7652" stop-color="#121212"/>
+<stop offset="0.8876" stop-color="#171717"/>
+<stop offset="1" stop-color="#171717"/>
 </radialGradient>
-<path d="M20.743,12.135c0,3.172-2.574,5.74-5.744,5.74c-3.175-0.001-5.743-2.573-5.741-5.745  c0-3.171,2.573-5.742,5.745-5.74C18.173,6.391,20.744,8.962,20.743,12.135z" fill="url(#SVGID_7_)"/>
-<radialGradient cx="21.6543" cy="5.0659" gradientTransform="matrix(1.0143 0 0 1.0141 -9.5579 3.1299)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="10.3515">
-<stop offset="0" style="stop-color:#242424"/>
-<stop offset="0.4303" style="stop-color:#242424"/>
-<stop offset="0.7818" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
+<path d="M20.74,12.14c0,3.172-2.574,5.74-5.744,5.74-3.175-0.001-5.743-2.573-5.741-5.745,0-3.171,2.573-5.742,5.745-5.74,3.17-0.009,5.74,2.562,5.74,5.74z" fill="url(#SVGID_7_)"/>
+<radialGradient cx="21.65" cy="5.066" gradientTransform="matrix(1.0143 0 0 1.0141 -9.5579 3.1299)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="10.35">
+<stop offset="0" stop-color="#242424"/>
+<stop offset="0.4303" stop-color="#242424"/>
+<stop offset="0.7818" stop-color="#000000"/>
+<stop offset="1" stop-color="#000000"/>
 </radialGradient>
-<circle cx="15" cy="12.133" fill="url(#SVGID_8_)" r="4.712"/>
-<radialGradient cx="23.9639" cy="3.5498" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="11.3574">
-<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"/>
+<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"/>
 </radialGradient>
-<path d="M19.211,12.133c0,2.326-1.886,4.21-4.212,4.21c-2.326-0.002-4.213-1.888-4.213-4.212  c0.004-2.327,1.89-4.21,4.213-4.21C17.328,7.923,19.214,9.808,19.211,12.133z" fill="url(#SVGID_9_)"/>
-<radialGradient cx="25.1709" cy="13.2505" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="4.6113">
-<stop offset="0" style="stop-color:#48630C"/>
-<stop offset="0.7879" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
+<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.7879" stop-color="#000000"/>
+<stop offset="1" stop-color="#000000"/>
 </radialGradient>
-<path d="M19.211,12.133c0,2.326-1.886,4.21-4.212,4.21c-2.326-0.002-4.213-1.888-4.213-4.212  c0,0,1.444,2.569,4.213,2.569C17.767,14.701,19.211,12.133,19.211,12.133z" fill="url(#SVGID_10_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="14.979" x2="14.979" y1="7.0654" y2="12.0939">
-<stop offset="0" style="stop-color:#F8FBFF"/>
-<stop offset="1" style="stop-color:#808080"/>
+<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="1" stop-color="#808080"/>
 </linearGradient>
-<path d="M14.979,12.069c1.828,0,3.549-0.277,5.067-0.765  c-0.431-2.41-2.532-4.239-5.067-4.239c-2.532,0-4.632,1.83-5.065,4.239C11.431,11.792,13.153,12.069,14.979,12.069z" fill="url(#SVGID_11_)" fill-opacity="0.35" stroke-opacity="0.35"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="5.7617" x2="24.2852" y1="26.7236" y2="26.7236">
-<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"/>
+<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"/>
 </linearGradient>
-<path d="M24.245,28c0.025-0.635,0.04-0.508,0.04-0.639v-0.035c0-1.037-0.852-1.879-1.901-1.879H7.662  c-1.05,0-1.9,0.842-1.9,1.879v0.035c0,0.131,0.014,0.004,0.04,0.639H24.245z" fill="url(#SVGID_12_)"/>
-<path d="M5.879,26.7h18.29c-0.084-0.234-0.212-0.444-0.377-0.626H6.256  C6.092,26.256,5.963,26.466,5.879,26.7z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M5.772,27.361C5.779,27.492,5.789,27.684,5.802,28h18.443  c0.012-0.316,0.022-0.508,0.028-0.639H5.772z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M6.255,26.074h17.536c-0.348-0.383-0.846-0.627-1.407-0.627H7.662  C7.102,25.447,6.603,25.691,6.255,26.074z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<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"/>
+<path d="M5.772,27.36c0.007,0.13,0.017,0.32,0.03,0.64h18.44c0.012-0.316,0.022-0.508,0.028-0.639h-18.5z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M6.255,26.07h17.54c-0.348-0.383-0.846-0.627-1.407-0.627h-14.72c-0.56,0.01-1.059,0.25-1.407,0.63z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
 <rect fill="none" height="30" width="30"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_player.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,57 +1,56 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<linearGradient gradientTransform="matrix(1 0 0 1 2296.5195 1443.9805)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2266.519" x2="-2266.519" y1="-1432.3472" y2="-1395.6118">
+<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="M51.734,11.633H8.266c-0.678,0-1.225,0.549-1.225,1.225v34.285c0,0.678,0.547,1.226,1.225,1.226  h43.468c0.677,0,1.226-0.548,1.226-1.226V12.857C52.959,12.182,52.41,11.633,51.734,11.633z M12.551,45.918  c0,0.338-0.275,0.613-0.611,0.613H9.49c-0.338,0-0.613-0.275-0.613-0.613v-1.225c0-0.336,0.275-0.611,0.613-0.611h2.449  c0.336,0,0.611,0.275,0.611,0.611L12.551,45.918L12.551,45.918z M12.551,15.307c0,0.336-0.275,0.611-0.611,0.611H9.49  c-0.338,0-0.613-0.275-0.613-0.611v-1.225c0-0.336,0.275-0.613,0.613-0.613h2.449c0.336,0,0.611,0.277,0.611,0.613L12.551,15.307  L12.551,15.307z M18.061,45.918c0,0.338-0.275,0.613-0.611,0.613H15c-0.338,0-0.612-0.275-0.612-0.613v-1.225  c0-0.336,0.274-0.611,0.612-0.611h2.449c0.336,0,0.611,0.275,0.611,0.611L18.061,45.918L18.061,45.918z M18.061,15.307  c0,0.336-0.275,0.611-0.611,0.611H15c-0.338,0-0.612-0.275-0.612-0.611v-1.225c0-0.336,0.274-0.613,0.612-0.613h2.449  c0.336,0,0.611,0.277,0.611,0.613L18.061,15.307L18.061,15.307z M23.571,45.918c0,0.338-0.276,0.613-0.612,0.613H20.51  c-0.336,0-0.611-0.275-0.611-0.613v-1.225c0-0.336,0.274-0.611,0.611-0.611h2.449c0.336,0,0.612,0.275,0.612,0.611V45.918z   M23.571,15.307c0,0.336-0.276,0.611-0.612,0.611H20.51c-0.336,0-0.611-0.275-0.611-0.611v-1.225c0-0.336,0.274-0.613,0.611-0.613  h2.449c0.336,0,0.612,0.277,0.612,0.613V15.307z M29.082,45.918c0,0.338-0.276,0.613-0.613,0.613h-2.448  c-0.337,0-0.612-0.275-0.612-0.613v-1.225c0-0.336,0.275-0.611,0.612-0.611h2.448c0.337,0,0.613,0.275,0.613,0.611V45.918z   M29.082,15.307c0,0.336-0.276,0.611-0.613,0.611h-2.448c-0.337,0-0.612-0.275-0.612-0.611v-1.225c0-0.336,0.275-0.613,0.612-0.613  h2.448c0.337,0,0.613,0.277,0.613,0.613V15.307z M34.592,45.918c0,0.338-0.275,0.613-0.611,0.613h-2.448  c-0.339,0-0.613-0.275-0.613-0.613v-1.225c0-0.336,0.274-0.611,0.613-0.611h2.448c0.336,0,0.611,0.275,0.611,0.611V45.918z   M34.592,15.307c0,0.336-0.275,0.611-0.611,0.611h-2.448c-0.339,0-0.613-0.275-0.613-0.611v-1.225c0-0.336,0.274-0.613,0.613-0.613  h2.448c0.336,0,0.611,0.277,0.611,0.613V15.307z M40.102,45.918c0,0.338-0.274,0.613-0.61,0.613h-2.449  c-0.338,0-0.612-0.275-0.612-0.613v-1.225c0-0.336,0.274-0.611,0.612-0.611h2.449c0.336,0,0.61,0.275,0.61,0.611V45.918z   M40.102,15.307c0,0.336-0.274,0.611-0.61,0.611h-2.449c-0.338,0-0.612-0.275-0.612-0.611v-1.225c0-0.336,0.274-0.613,0.612-0.613  h2.449c0.336,0,0.61,0.277,0.61,0.613V15.307z M45.611,45.918c0,0.338-0.275,0.613-0.611,0.613h-2.449  c-0.337,0-0.611-0.275-0.611-0.613v-1.225c0-0.336,0.274-0.611,0.611-0.611H45c0.336,0,0.611,0.275,0.611,0.611V45.918z   M45.611,15.307c0,0.336-0.275,0.611-0.611,0.611h-2.449c-0.337,0-0.611-0.275-0.611-0.611v-1.225c0-0.336,0.274-0.613,0.611-0.613  H45c0.336,0,0.611,0.277,0.611,0.613V15.307z M51.123,45.918c0,0.338-0.277,0.613-0.613,0.613h-2.449  c-0.336,0-0.61-0.275-0.61-0.613v-1.225c0-0.336,0.274-0.611,0.61-0.611h2.449c0.336,0,0.613,0.275,0.613,0.611V45.918z   M51.123,15.307c0,0.336-0.277,0.611-0.613,0.611h-2.449c-0.336,0-0.61-0.275-0.61-0.611v-1.225c0-0.336,0.274-0.613,0.61-0.613  h2.449c0.336,0,0.613,0.277,0.613,0.613V15.307z" fill="url(#SVGID_1_)"/>
-<path d="M51.734,11.633H8.266c-0.678,0-1.225,0.549-1.225,1.225v0.611  c0-0.676,0.547-1.225,1.225-1.225h43.468c0.677,0,1.226,0.549,1.226,1.225v-0.611C52.959,12.182,52.41,11.633,51.734,11.633z" fill="#FFFFFF" fill-opacity="0.55" stroke-opacity="0.55"/>
-<path d="M8.266,48.367h43.468c0.677,0,1.226-0.547,1.226-1.225v-0.611  c0,0.676-0.549,1.225-1.226,1.225H8.266c-0.678,0-1.225-0.549-1.225-1.225v0.611C7.041,47.82,7.588,48.367,8.266,48.367z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
-<linearGradient gradientTransform="matrix(1 0 0 1 2296.5195 1443.9805)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2266.5195" x2="-2266.5195" y1="-1426.1284" y2="-1401.6362">
+<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="24.492" width="45.918" x="7.041" y="17.754"/>
-<linearGradient gradientTransform="matrix(1 0 0 1 2296.5195 1443.9805)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2266.519" x2="-2266.519" y1="-1401.7349" y2="-1426.2271">
+<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="M51.123,41.021c0,0.674-0.553,1.225-1.225,1.225H10.102c-0.673,0-1.225-0.551-1.225-1.225V18.979  c0-0.672,0.552-1.225,1.225-1.225h39.796c0.672,0,1.226,0.553,1.226,1.225L51.123,41.021L51.123,41.021z" fill="url(#SVGID_3_)"/>
-<path d="M49.898,41.021H10.102c-0.673,0-1.225,0.061-1.225-0.613l0,0  c0,0.674,0.552,1.225,1.225,1.225h39.796c0.672,0,1.226-0.551,1.226-1.225l0,0C51.123,41.082,50.57,41.021,49.898,41.021z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
-<linearGradient gradientTransform="matrix(1 0 0 1 2296.5195 1443.9805)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-2266.519" x2="-2266.519" y1="-1426.2261" y2="-1401.6362">
+<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="M49.898,18.367c0.336,0,0.61,0.275,0.61,0.611v22.043c0,0.338-0.274,0.61-0.61,0.61H10.102  c-0.337,0-0.611-0.272-0.611-0.61V18.979c0-0.336,0.274-0.611,0.611-0.611L49.898,18.367 M49.898,17.754H10.102  c-0.673,0-1.225,0.553-1.225,1.225v22.042c0,0.674,0.552,1.226,1.225,1.226h39.796c0.672,0,1.226-0.552,1.226-1.226V18.979  C51.123,18.307,50.57,17.754,49.898,17.754L49.898,17.754z" fill="url(#SVGID_4_)"/>
-<path d="M49.898,25.102v-4.898c0-0.676-0.549-1.225-1.226-1.225H11.326  c-0.676,0-1.225,0.549-1.225,1.225v7.961L49.898,25.102z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
+<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(0.5 0 0 0.5 30 30)">
-<rect fill="none" height="60" width="60"/>
-<rect fill="none" height="59.996" width="59.996"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="30" x2="30" y1="8.47" y2="51.32">
-<stop offset="0" stop-color="#F2F2F2"/>
-<stop offset="0.12" stop-color="#F2F2F2"/>
-<stop offset="0.55" stop-color="#ADB2B5"/>
-<stop offset="1" stop-color="#E6E9E8"/>
+<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="M29.998,51.425c-11.816,0-21.427-9.61-21.427-21.427c0-11.814,9.611-21.427,21.427-21.427 c11.813,0,21.427,9.613,21.427,21.427C51.425,41.814,41.812,51.425,29.998,51.425L29.998,51.425z" fill="url(#SVGID_1)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="30" x2="30" y1="9.18" y2="51.73">
-<stop offset="0" stop-color="#DDE3E6"/>
-<stop offset="0.48" stop-color="#C9CED1"/>
-<stop offset="1" stop-color="#899396"/>
+<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="M50.813,29.998c0,11.498-9.322,20.814-20.814,20.814c-11.499,0-20.815-9.316-20.815-20.814 c0-11.493,9.317-20.815,20.815-20.815C41.491,9.183,50.813,18.505,50.813,29.998z" fill="url(#SVGID_2)"/>
-<polygon fill="#6D6E70" points="22.886,17.958 41.74,28.789 22.886,39.837 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="32.38" x2="32.38" y1="39.27" y2="19.91">
-<stop offset="0" stop-color="#FFFFFF"/>
-<stop offset="1" stop-color="#F5F6F6"/>
+<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="24.046,19.963 40.724,29.593 24.046,39.221 "/>
+<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>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_podcast.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,54 +1,56 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<linearGradient gradientTransform="matrix(1 0 0 1 2296.5195 1443.9805)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2266.519" x2="-2266.519" y1="-1432.3472" y2="-1395.6118">
+<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="M51.734,11.633H8.266c-0.678,0-1.225,0.549-1.225,1.225v34.285c0,0.678,0.547,1.226,1.225,1.226  h43.468c0.677,0,1.226-0.548,1.226-1.226V12.857C52.959,12.182,52.41,11.633,51.734,11.633z M12.551,45.918  c0,0.338-0.275,0.613-0.611,0.613H9.49c-0.338,0-0.613-0.275-0.613-0.613v-1.225c0-0.336,0.275-0.611,0.613-0.611h2.449  c0.336,0,0.611,0.275,0.611,0.611L12.551,45.918L12.551,45.918z M12.551,15.307c0,0.336-0.275,0.611-0.611,0.611H9.49  c-0.338,0-0.613-0.275-0.613-0.611v-1.225c0-0.336,0.275-0.613,0.613-0.613h2.449c0.336,0,0.611,0.277,0.611,0.613L12.551,15.307  L12.551,15.307z M18.061,45.918c0,0.338-0.275,0.613-0.611,0.613H15c-0.338,0-0.612-0.275-0.612-0.613v-1.225  c0-0.336,0.274-0.611,0.612-0.611h2.449c0.336,0,0.611,0.275,0.611,0.611L18.061,45.918L18.061,45.918z M18.061,15.307  c0,0.336-0.275,0.611-0.611,0.611H15c-0.338,0-0.612-0.275-0.612-0.611v-1.225c0-0.336,0.274-0.613,0.612-0.613h2.449  c0.336,0,0.611,0.277,0.611,0.613L18.061,15.307L18.061,15.307z M23.571,45.918c0,0.338-0.276,0.613-0.612,0.613H20.51  c-0.336,0-0.611-0.275-0.611-0.613v-1.225c0-0.336,0.274-0.611,0.611-0.611h2.449c0.336,0,0.612,0.275,0.612,0.611V45.918z   M23.571,15.307c0,0.336-0.276,0.611-0.612,0.611H20.51c-0.336,0-0.611-0.275-0.611-0.611v-1.225c0-0.336,0.274-0.613,0.611-0.613  h2.449c0.336,0,0.612,0.277,0.612,0.613V15.307z M29.082,45.918c0,0.338-0.276,0.613-0.613,0.613h-2.448  c-0.337,0-0.612-0.275-0.612-0.613v-1.225c0-0.336,0.275-0.611,0.612-0.611h2.448c0.337,0,0.613,0.275,0.613,0.611V45.918z   M29.082,15.307c0,0.336-0.276,0.611-0.613,0.611h-2.448c-0.337,0-0.612-0.275-0.612-0.611v-1.225c0-0.336,0.275-0.613,0.612-0.613  h2.448c0.337,0,0.613,0.277,0.613,0.613V15.307z M34.592,45.918c0,0.338-0.275,0.613-0.611,0.613h-2.448  c-0.339,0-0.613-0.275-0.613-0.613v-1.225c0-0.336,0.274-0.611,0.613-0.611h2.448c0.336,0,0.611,0.275,0.611,0.611V45.918z   M34.592,15.307c0,0.336-0.275,0.611-0.611,0.611h-2.448c-0.339,0-0.613-0.275-0.613-0.611v-1.225c0-0.336,0.274-0.613,0.613-0.613  h2.448c0.336,0,0.611,0.277,0.611,0.613V15.307z M40.102,45.918c0,0.338-0.274,0.613-0.61,0.613h-2.449  c-0.338,0-0.612-0.275-0.612-0.613v-1.225c0-0.336,0.274-0.611,0.612-0.611h2.449c0.336,0,0.61,0.275,0.61,0.611V45.918z   M40.102,15.307c0,0.336-0.274,0.611-0.61,0.611h-2.449c-0.338,0-0.612-0.275-0.612-0.611v-1.225c0-0.336,0.274-0.613,0.612-0.613  h2.449c0.336,0,0.61,0.277,0.61,0.613V15.307z M45.611,45.918c0,0.338-0.275,0.613-0.611,0.613h-2.449  c-0.337,0-0.611-0.275-0.611-0.613v-1.225c0-0.336,0.274-0.611,0.611-0.611H45c0.336,0,0.611,0.275,0.611,0.611V45.918z   M45.611,15.307c0,0.336-0.275,0.611-0.611,0.611h-2.449c-0.337,0-0.611-0.275-0.611-0.611v-1.225c0-0.336,0.274-0.613,0.611-0.613  H45c0.336,0,0.611,0.277,0.611,0.613V15.307z M51.123,45.918c0,0.338-0.277,0.613-0.613,0.613h-2.449  c-0.336,0-0.61-0.275-0.61-0.613v-1.225c0-0.336,0.274-0.611,0.61-0.611h2.449c0.336,0,0.613,0.275,0.613,0.611V45.918z   M51.123,15.307c0,0.336-0.277,0.611-0.613,0.611h-2.449c-0.336,0-0.61-0.275-0.61-0.611v-1.225c0-0.336,0.274-0.613,0.61-0.613  h2.449c0.336,0,0.613,0.277,0.613,0.613V15.307z" fill="url(#SVGID_1_)"/>
-<path d="M51.734,11.633H8.266c-0.678,0-1.225,0.549-1.225,1.225v0.611  c0-0.676,0.547-1.225,1.225-1.225h43.468c0.677,0,1.226,0.549,1.226,1.225v-0.611C52.959,12.182,52.41,11.633,51.734,11.633z" fill="#FFFFFF" fill-opacity="0.55" stroke-opacity="0.55"/>
-<path d="M8.266,48.367h43.468c0.677,0,1.226-0.547,1.226-1.225v-0.611  c0,0.676-0.549,1.225-1.226,1.225H8.266c-0.678,0-1.225-0.549-1.225-1.225v0.611C7.041,47.82,7.588,48.367,8.266,48.367z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
-<linearGradient gradientTransform="matrix(1 0 0 1 2296.5195 1443.9805)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2266.5195" x2="-2266.5195" y1="-1426.1284" y2="-1401.6362">
+<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="24.492" width="45.918" x="7.041" y="17.754"/>
-<linearGradient gradientTransform="matrix(1 0 0 1 2296.5195 1443.9805)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2266.519" x2="-2266.519" y1="-1401.7349" y2="-1426.2271">
+<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="M51.123,41.021c0,0.674-0.553,1.225-1.225,1.225H10.102c-0.673,0-1.225-0.551-1.225-1.225V18.979  c0-0.672,0.552-1.225,1.225-1.225h39.796c0.672,0,1.226,0.553,1.226,1.225L51.123,41.021L51.123,41.021z" fill="url(#SVGID_3_)"/>
-<path d="M49.898,41.021H10.102c-0.673,0-1.225,0.061-1.225-0.613l0,0  c0,0.674,0.552,1.225,1.225,1.225h39.796c0.672,0,1.226-0.551,1.226-1.225l0,0C51.123,41.082,50.57,41.021,49.898,41.021z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
-<linearGradient gradientTransform="matrix(1 0 0 1 2296.5195 1443.9805)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-2266.519" x2="-2266.519" y1="-1426.2261" y2="-1401.6362">
+<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="M49.898,18.367c0.336,0,0.61,0.275,0.61,0.611v22.043c0,0.338-0.274,0.61-0.61,0.61H10.102  c-0.337,0-0.611-0.272-0.611-0.61V18.979c0-0.336,0.274-0.611,0.611-0.611L49.898,18.367 M49.898,17.754H10.102  c-0.673,0-1.225,0.553-1.225,1.225v22.042c0,0.674,0.552,1.226,1.225,1.226h39.796c0.672,0,1.226-0.552,1.226-1.226V18.979  C51.123,18.307,50.57,17.754,49.898,17.754L49.898,17.754z" fill="url(#SVGID_4_)"/>
-<path d="M49.898,25.102v-4.898c0-0.676-0.549-1.225-1.226-1.225H11.326  c-0.676,0-1.225,0.549-1.225,1.225v7.961L49.898,25.102z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
+<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(0.5 0 0 0.5 30 30)">
-<rect fill="none" height="60" width="60"/>
-<rect fill="none" height="59.996" width="59.996"/>
-<path d="M51.311,47.291c0,2.219-1.801,4.02-4.021,4.02H12.707c-2.222,0-4.021-1.801-4.021-4.02V12.707 c0-2.221,1.799-4.022,4.021-4.022h34.582c2.221,0,4.021,1.801,4.021,4.022V47.291z" fill="#F7B388"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="10.55" x2="48.97" y1="10.55" y2="48.97">
-<stop offset="0" stop-color="#DF4F20"/>
-<stop offset="0.5" stop-color="#F48228"/>
-<stop offset="1" stop-color="#CF3A21"/>
+<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="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"/>
+<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"/>
 </linearGradient>
-<path d="M12.707,50.086c-1.542,0-2.797-1.254-2.797-2.795V12.707c0-1.543,1.255-2.798,2.797-2.798 h34.582c1.543,0,2.797,1.255,2.797,2.798v34.584c0,1.541-1.254,2.795-2.797,2.795H12.707z" fill="url(#SVGID_1)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="30" x2="30" y1="8.36" y2="51.47">
-<stop offset="0" stop-color="#C5422B"/>
-<stop offset="0.5" stop-color="#F48228"/>
-<stop offset="1" stop-color="#AD1B00"/>
+<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"/>
 </linearGradient>
-<path d="M47.381,9.251c1.854,0,3.363,1.509,3.363,3.363v34.769c0,1.853-1.509,3.361-3.363,3.361 H12.614c-1.853,0-3.362-1.509-3.362-3.361V12.614c0-1.854,1.509-3.363,3.362-3.363H47.381 M47.381,8.571H12.614 c-2.232,0-4.042,1.81-4.042,4.043v34.769c0,2.23,1.809,4.042,4.042,4.042h34.767c2.234,0,4.044-1.812,4.044-4.042V12.614 C51.425,10.381,49.615,8.571,47.381,8.571L47.381,8.571z" fill="url(#SVGID_2)"/>
-<circle cx="19.476" cy="40.52" fill="#FFFFFF" r="4.132"/>
-<path d="M39.143,44.193h5.51c0-15.907-12.942-28.85-28.85-28.85v5.51 C28.672,20.854,39.143,31.323,39.143,44.193z" fill="#FFFFFF"/>
-<path d="M29.118,44.193h5.51c0-10.381-8.445-18.825-18.825-18.825v5.51 C23.145,30.878,29.118,36.851,29.118,44.193z" fill="#FFFFFF"/>
+<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"/>
+<path d="M20.547,23.614h3.345c0-9.651-7.854-17.506-17.505-17.506v3.344C14.196,9.453,20.547,15.805,20.547,23.614z" fill="#FFFFFF"/>
+<path d="M14.466,23.614h3.343c0-6.299-5.124-11.424-11.422-11.424v3.345C10.842,15.535,14.466,19.158,14.466,23.614z  " fill="#FFFFFF"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_received_call.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,156 +1,155 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5609 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="423.0967" x2="429.6527" y1="-578.646" y2="-582.908">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.6061" style="stop-color:#154EBD"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
-</linearGradient>
-<path d="M19.081,33.911c2.089-3.597,4.591-6.497,7.281-9.189c2.593-2.591,6.72-5.3,8.562-6.256l9.604-10.282  c-0.845-0.3-3.693-0.464-7.279,0.616c-3.586,1.083-11.736,6.303-16.979,11.547c-5.242,5.246-9.727,12.347-10.581,14.595  c-1.343,3.541-1.221,7.445-0.929,8.581c0,0,0.34,1.034,1.144,2.377C10.248,46.476,19.081,33.911,19.081,33.911z" fill="url(#SVGID_1_)"/>
-<path d="M31.184,20.8c1.488-1.036,2.87-1.882,3.74-2.334L44.271,8.46  c-0.132-0.058-0.209-0.088-0.209-0.088c-0.247-0.088-0.642-0.162-1.124-0.219c-0.793,0.006-1.596,0.093-2.401,0.27  C34.843,9.673,31.019,14.958,31.184,20.8z" fill="#020202" fill-opacity="0.05" stroke-opacity="0.05"/>
-<path d="M31.906,20.306c1.205-0.809,2.291-1.462,3.018-1.84l9.377-10.04  c-0.146-0.063-0.233-0.098-0.233-0.098c-0.231-0.08-0.604-0.152-1.06-0.203c-0.751,0.006-1.51,0.087-2.27,0.253  C35.275,9.576,31.636,14.695,31.906,20.306z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M44.079,8.263c-0.21-0.073-0.55-0.137-0.962-0.186c-0.681,0.006-1.369,0.08-2.06,0.231  c-5.087,1.116-8.426,5.984-7.978,11.233c0.725-0.455,1.363-0.826,1.844-1.076l9.424-10.088C44.178,8.302,44.079,8.263,44.079,8.263z  " fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="43.3906" cy="8.9175" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="18.5073">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.6061" style="stop-color:#154EBD"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+<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"/>
 </radialGradient>
-<path d="M34.924,18.466l0.929,1.55c0,0,15.101-6.784,14.084-8.038c-0.513-0.631-0.577-0.656-1.237-1.263  c-1.985-1.815-4.172-2.531-4.172-2.531c-0.186-0.063-0.481-0.12-0.845-0.161c-0.596,0.004-1.2,0.068-1.806,0.201  c-4.591,1.009-7.57,5.501-6.963,10.257C34.916,18.477,34.921,18.47,34.924,18.466z" fill="url(#SVGID_2_)"/>
-<path d="M17.483,34.106c-0.988-0.14-2.007-0.119-3.027,0.105c-2.418,0.53-4.376,2.066-5.646,4.131  c-0.367,2.35-0.25,4.407-0.05,5.18c0,0,0.34,1.034,1.144,2.377c0.29,0.482,6.54-8.264,8.556-11.107L17.483,34.106z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M18.366,34.136c-0.989-0.14-2.008-0.118-3.029,0.105c-3.313,0.727-5.775,3.332-6.76,6.623  c-0.026,1.025,0.034,1.872,0.127,2.397c0.003,0.013,0.005,0.034,0.01,0.048c0,0,0.34,1.033,1.144,2.379  c0.3,0.498,6.981-8.888,8.75-11.384L18.366,34.136z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="437.4258" cy="-571.231" gradientTransform="matrix(0.2095 0.9787 -0.9682 0.2124 -629.4526 -270.6148)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="14.6198">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.6061" style="stop-color:#154EBD"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
-</radialGradient>
-<path d="M11.202,47.738c0.616,0.74,0.646,0.954,1.295,1.524c1.194,1.055,9.301-13.612,9.301-13.612  l-2.683-1.719c-0.941-0.111-1.914-0.079-2.89,0.136c-4.777,1.048-7.806,5.868-6.87,10.832C9.749,45.686,10.349,46.71,11.202,47.738z  " fill="url(#SVGID_3_)"/>
-<path d="M49.937,11.978c-0.179-0.22-0.381-0.446-0.578-0.67l-13.944,7.959l0.438,0.749  C35.853,20.016,50.953,13.231,49.937,11.978z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="422.2881" x2="427.4786" y1="-610.9287" y2="-594.4409">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.8121" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M35.853,20.016l1.178,1.981c0.302,0.515,0.972,0.674,1.569,0.422l4.09-2.334l8.043-4.668  c0.632-0.363,0.878-1.119,0.549-1.686c0,0-0.333-0.501-1.349-1.751L35.853,20.016z" fill="url(#SVGID_4_)"/>
-<path d="M21.798,35.65l-0.725-0.472l-9.215,13.486c0.216,0.204,0.43,0.414,0.639,0.598  C13.691,50.317,21.798,35.65,21.798,35.65z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="439.6982" x2="451.5232" y1="-577.7549" y2="-564.7323">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.8121" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+<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"/>
 </linearGradient>
-<path d="M12.498,49.262c1.193,1.05,1.686,1.37,1.686,1.37c0.567,0.367,1.363,0.169,1.781-0.442l7.9-11.605  c0.419-0.614,0.307-1.411-0.26-1.777l-1.808-1.156L12.498,49.262z" fill="url(#SVGID_5_)"/>
+<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"/>
+</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"/>
+</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(0.5 0 0 0.5 0 0)">
-<rect fill="none" height="60" width="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="30.05" x2="30.04" y1="6.32" y2="52.49">
-<stop offset="0" stop-color="#C6FF45"/>
-<stop offset="0.73" stop-color="#66A00E"/>
-<stop offset="1" stop-color="#387300"/>
+<g>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_1)" points="9.296,31.454 29.884,52.941 50.794,31.428 39.525,31.424 39.518,6.834 20.332,6.832 20.332,31.452 "/>
-<line fill="none" x1="39.518" x2="20.332" y1="6.842" y2="6.84"/>
-<polygon fill="#E7FFB9" points="20.332,6.34 39.52,6.342 39.518,7.342 20.332,7.34 "/>
-<polygon fill="#E7FFB9" points="39.225,31.464 51.01,31.466 50.118,32.466 39.225,32.466 "/>
-<polygon fill="#E7FFB9" points="8.642,31.452 20.314,31.452 20.314,32.452 9.696,32.452 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="48.38" x2="10.72" y1="42.53" y2="42.53">
-<stop offset="0" stop-color="#AAE535"/>
-<stop offset="1" stop-color="#5D9C0A"/>
+<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 "/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_2)" points="50.145,31.426 29.884,52.225 9.85,31.4 8.458,31.402 29.882,53.66 51.542,31.426 "/>
-<rect fill="none" height="60" width="60"/>
+<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.3789" x2="17.6203" y1="23.6504" y2="23.6504">
-<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"/>
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_1__)" height="7.853" width="5.105" x="12.447" y="19.724"/>
-<path d="M12.447,24.655c0.82,0.199,1.673,0.315,2.553,0.315c0.881,0,1.732-0.116,2.553-0.315v-4.294  h-5.105V24.655z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M12.447,24.018c0.82,0.199,1.673,0.315,2.553,0.315c0.881,0,1.732-0.116,2.553-0.315v-4.294  h-5.105V24.018z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="14.9995" x2="14.9995" y1="1.9746" y2="23.6704">
-<stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="0.3212" style="stop-color:#E6E6E6"/>
-<stop offset="1" style="stop-color:#666666"/>
+<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"/>
+<path d="M12.45,24.02c0.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.288z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2___" x1="15" x2="15" y1="1.975" y2="23.67">
+<stop offset="0" stop-color="#F2F2F2"/>
+<stop offset="0.3212" stop-color="#E6E6E6"/>
+<stop offset="1" stop-color="#666666"/>
 </linearGradient>
-<path d="M15,23.695c-5.98,0-10.848-4.867-10.848-10.848S9.02,2,15,2c5.982,0,10.848,4.866,10.848,10.847  S20.982,23.695,15,23.695L15,23.695z" fill="url(#SVGID_2__)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="14.9995" x2="14.9995" y1="2.6143" y2="23.0332">
-<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:#7C8487"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
+<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"/>
 </linearGradient>
-<circle cx="15" cy="12.847" fill="url(#SVGID_3__)" r="10.209"/>
-<path d="M15,21.989c-5.315,0-9.657-4.23-9.843-9.5c-0.004,0.116-0.009,0.231-0.009,0.349  c0,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.349C24.658,17.759,20.315,21.989,15,21.989z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M23.295,12.413c0,4.704-3.715,9.346-8.299,9.345c-4.58-0.003-8.292-4.646-8.291-9.35  c0.002-4.706,3.718-8.517,8.298-8.517C19.584,3.894,23.298,7.707,23.295,12.413z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M14.996,21.066c-2.387-0.002-4.63-0.932-6.315-2.619c-1.688-1.688-2.615-3.932-2.614-6.318  c0-4.923,4.009-8.929,8.935-8.929c2.387,0,4.632,0.931,6.317,2.618c1.688,1.688,2.616,3.933,2.615,6.318  c-0.002,4.924-4.01,8.93-8.934,8.93H14.996z" fill="#231F20" fill-opacity="0.2" stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="14.9995" x2="14.9995" y1="3.7212" y2="20.3517">
-<stop offset="0" style="stop-color:#CFCFCF"/>
-<stop offset="0.1091" style="stop-color:#CFCFCF"/>
-<stop offset="0.6848" style="stop-color:#121212"/>
-<stop offset="1" style="stop-color:#A6A6A6"/>
+<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"/>
+<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"/>
+<stop offset="0.6848" stop-color="#121212"/>
+<stop offset="1" stop-color="#A6A6A6"/>
 </linearGradient>
-<path d="M14.996,20.428c-2.216-0.002-4.298-0.864-5.864-2.432c-1.567-1.566-2.428-3.65-2.427-5.866  c0-4.573,3.723-8.293,8.296-8.293c2.218,0.001,4.3,0.864,5.866,2.432c1.566,1.568,2.43,3.651,2.428,5.867  c-0.001,4.573-3.723,8.292-8.295,8.292H14.996z" fill="url(#SVGID_4__)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="14.9995" x2="14.9995" y1="4.3682" y2="19.7187">
-<stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="1" style="stop-color:#606769"/>
+<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"/>
 </linearGradient>
-<circle cx="15" cy="12.133" fill="url(#SVGID_5__)" r="7.657"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="14.9995" x2="14.9995" y1="5.7715" y2="18.454">
-<stop offset="0" style="stop-color:#1A1A1A"/>
-<stop offset="0.503" style="stop-color:#343434"/>
-<stop offset="0.7515" style="stop-color:#9E9E9E"/>
-<stop offset="1" style="stop-color:#CFCFCF"/>
+<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">
+<stop offset="0" stop-color="#1A1A1A"/>
+<stop offset="0.503" stop-color="#343434"/>
+<stop offset="0.7515" stop-color="#9E9E9E"/>
+<stop offset="1" stop-color="#CFCFCF"/>
 </linearGradient>
-<path d="M15,18.514c-1.706-0.001-3.309-0.666-4.514-1.871c-1.204-1.206-1.867-2.808-1.867-4.512  c0-3.517,2.862-6.378,6.382-6.378c1.706,0,3.308,0.664,4.513,1.871c1.205,1.205,1.868,2.808,1.867,4.513  C21.381,15.652,18.519,18.514,15,18.514L15,18.514z" fill="url(#SVGID_6_)"/>
-<radialGradient cx="25.7734" cy="10.2729" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="6.4991">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="0.5917" style="stop-color:#000000"/>
-<stop offset="0.627" style="stop-color:#050505"/>
-<stop offset="0.7652" style="stop-color:#121212"/>
-<stop offset="0.8876" style="stop-color:#171717"/>
-<stop offset="1" style="stop-color:#171717"/>
+<path d="M15,18.51c-1.706-0.001-3.309-0.666-4.514-1.871-1.204-1.206-1.867-2.808-1.867-4.512,0-3.517,2.862-6.378,6.382-6.378,1.706,0,3.308,0.664,4.513,1.871,1.205,1.205,1.868,2.808,1.867,4.513,0,3.51-2.86,6.37-6.38,6.37z" fill="url(#SVGID_6__)"/>
+<radialGradient cx="25.77" cy="10.27" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="6.499">
+<stop offset="0" stop-color="#000000"/>
+<stop offset="0.5917" stop-color="#000000"/>
+<stop offset="0.627" stop-color="#050505"/>
+<stop offset="0.7652" stop-color="#121212"/>
+<stop offset="0.8876" stop-color="#171717"/>
+<stop offset="1" stop-color="#171717"/>
 </radialGradient>
-<path d="M20.743,12.135c0,3.172-2.574,5.74-5.744,5.74c-3.175-0.001-5.743-2.573-5.741-5.745  c0-3.171,2.573-5.742,5.745-5.74C18.173,6.391,20.744,8.962,20.743,12.135z" fill="url(#SVGID_7_)"/>
-<radialGradient cx="21.6543" cy="5.0659" gradientTransform="matrix(1.0143 0 0 1.0141 -9.5579 3.1299)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="10.3515">
-<stop offset="0" style="stop-color:#242424"/>
-<stop offset="0.4303" style="stop-color:#242424"/>
-<stop offset="0.7818" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
+<path d="M20.74,12.14c0,3.172-2.574,5.74-5.744,5.74-3.175-0.001-5.743-2.573-5.741-5.745,0-3.171,2.573-5.742,5.745-5.74,3.17-0.009,5.74,2.562,5.74,5.74z" fill="url(#SVGID_7_)"/>
+<radialGradient cx="21.65" cy="5.066" gradientTransform="matrix(1.0143 0 0 1.0141 -9.5579 3.1299)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="10.35">
+<stop offset="0" stop-color="#242424"/>
+<stop offset="0.4303" stop-color="#242424"/>
+<stop offset="0.7818" stop-color="#000000"/>
+<stop offset="1" stop-color="#000000"/>
 </radialGradient>
-<circle cx="15" cy="12.133" fill="url(#SVGID_8_)" r="4.712"/>
-<radialGradient cx="23.9639" cy="3.5498" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="11.3574">
-<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"/>
+<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"/>
 </radialGradient>
-<path d="M19.211,12.133c0,2.326-1.886,4.21-4.212,4.21c-2.326-0.002-4.213-1.888-4.213-4.212  c0.004-2.327,1.89-4.21,4.213-4.21C17.328,7.923,19.214,9.808,19.211,12.133z" fill="url(#SVGID_9_)"/>
-<radialGradient cx="25.1709" cy="13.2505" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="4.6113">
-<stop offset="0" style="stop-color:#48630C"/>
-<stop offset="0.7879" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
+<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.7879" stop-color="#000000"/>
+<stop offset="1" stop-color="#000000"/>
 </radialGradient>
-<path d="M19.211,12.133c0,2.326-1.886,4.21-4.212,4.21c-2.326-0.002-4.213-1.888-4.213-4.212  c0,0,1.444,2.569,4.213,2.569C17.767,14.701,19.211,12.133,19.211,12.133z" fill="url(#SVGID_10_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="14.979" x2="14.979" y1="7.0654" y2="12.0939">
-<stop offset="0" style="stop-color:#F8FBFF"/>
-<stop offset="1" style="stop-color:#808080"/>
+<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="1" stop-color="#808080"/>
 </linearGradient>
-<path d="M14.979,12.069c1.828,0,3.549-0.277,5.067-0.765  c-0.431-2.41-2.532-4.239-5.067-4.239c-2.532,0-4.632,1.83-5.065,4.239C11.431,11.792,13.153,12.069,14.979,12.069z" fill="url(#SVGID_11_)" fill-opacity="0.35" stroke-opacity="0.35"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="5.7617" x2="24.2852" y1="26.7236" y2="26.7236">
-<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"/>
+<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"/>
 </linearGradient>
-<path d="M24.245,28c0.025-0.635,0.04-0.508,0.04-0.639v-0.035c0-1.037-0.852-1.879-1.901-1.879H7.662  c-1.05,0-1.9,0.842-1.9,1.879v0.035c0,0.131,0.014,0.004,0.04,0.639H24.245z" fill="url(#SVGID_12_)"/>
-<path d="M5.879,26.7h18.29c-0.084-0.234-0.212-0.444-0.377-0.626H6.256  C6.092,26.256,5.963,26.466,5.879,26.7z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M5.772,27.361C5.779,27.492,5.789,27.684,5.802,28h18.443  c0.012-0.316,0.022-0.508,0.028-0.639H5.772z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M6.255,26.074h17.536c-0.348-0.383-0.846-0.627-1.407-0.627H7.662  C7.102,25.447,6.603,25.691,6.255,26.074z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<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"/>
+<path d="M5.772,27.36c0.007,0.13,0.017,0.32,0.03,0.64h18.44c0.012-0.316,0.022-0.508,0.028-0.639h-18.5z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M6.255,26.07h17.54c-0.348-0.383-0.846-0.627-1.407-0.627h-14.72c-0.56,0.01-1.059,0.25-1.407,0.63z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
 <rect fill="none" height="30" width="30"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_recent.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,79 +1,100 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<linearGradient gradientTransform="matrix(1 0 0 1 2296.5195 1443.9805)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2266.519" x2="-2266.519" y1="-1432.3472" y2="-1395.6118">
+<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="M51.734,11.633H8.266c-0.678,0-1.225,0.549-1.225,1.225v34.285c0,0.678,0.547,1.226,1.225,1.226  h43.468c0.677,0,1.226-0.548,1.226-1.226V12.857C52.959,12.182,52.41,11.633,51.734,11.633z M12.551,45.918  c0,0.338-0.275,0.613-0.611,0.613H9.49c-0.338,0-0.613-0.275-0.613-0.613v-1.225c0-0.336,0.275-0.611,0.613-0.611h2.449  c0.336,0,0.611,0.275,0.611,0.611L12.551,45.918L12.551,45.918z M12.551,15.307c0,0.336-0.275,0.611-0.611,0.611H9.49  c-0.338,0-0.613-0.275-0.613-0.611v-1.225c0-0.336,0.275-0.613,0.613-0.613h2.449c0.336,0,0.611,0.277,0.611,0.613L12.551,15.307  L12.551,15.307z M18.061,45.918c0,0.338-0.275,0.613-0.611,0.613H15c-0.338,0-0.612-0.275-0.612-0.613v-1.225  c0-0.336,0.274-0.611,0.612-0.611h2.449c0.336,0,0.611,0.275,0.611,0.611L18.061,45.918L18.061,45.918z M18.061,15.307  c0,0.336-0.275,0.611-0.611,0.611H15c-0.338,0-0.612-0.275-0.612-0.611v-1.225c0-0.336,0.274-0.613,0.612-0.613h2.449  c0.336,0,0.611,0.277,0.611,0.613L18.061,15.307L18.061,15.307z M23.571,45.918c0,0.338-0.276,0.613-0.612,0.613H20.51  c-0.336,0-0.611-0.275-0.611-0.613v-1.225c0-0.336,0.274-0.611,0.611-0.611h2.449c0.336,0,0.612,0.275,0.612,0.611V45.918z   M23.571,15.307c0,0.336-0.276,0.611-0.612,0.611H20.51c-0.336,0-0.611-0.275-0.611-0.611v-1.225c0-0.336,0.274-0.613,0.611-0.613  h2.449c0.336,0,0.612,0.277,0.612,0.613V15.307z M29.082,45.918c0,0.338-0.276,0.613-0.613,0.613h-2.448  c-0.337,0-0.612-0.275-0.612-0.613v-1.225c0-0.336,0.275-0.611,0.612-0.611h2.448c0.337,0,0.613,0.275,0.613,0.611V45.918z   M29.082,15.307c0,0.336-0.276,0.611-0.613,0.611h-2.448c-0.337,0-0.612-0.275-0.612-0.611v-1.225c0-0.336,0.275-0.613,0.612-0.613  h2.448c0.337,0,0.613,0.277,0.613,0.613V15.307z M34.592,45.918c0,0.338-0.275,0.613-0.611,0.613h-2.448  c-0.339,0-0.613-0.275-0.613-0.613v-1.225c0-0.336,0.274-0.611,0.613-0.611h2.448c0.336,0,0.611,0.275,0.611,0.611V45.918z   M34.592,15.307c0,0.336-0.275,0.611-0.611,0.611h-2.448c-0.339,0-0.613-0.275-0.613-0.611v-1.225c0-0.336,0.274-0.613,0.613-0.613  h2.448c0.336,0,0.611,0.277,0.611,0.613V15.307z M40.102,45.918c0,0.338-0.274,0.613-0.61,0.613h-2.449  c-0.338,0-0.612-0.275-0.612-0.613v-1.225c0-0.336,0.274-0.611,0.612-0.611h2.449c0.336,0,0.61,0.275,0.61,0.611V45.918z   M40.102,15.307c0,0.336-0.274,0.611-0.61,0.611h-2.449c-0.338,0-0.612-0.275-0.612-0.611v-1.225c0-0.336,0.274-0.613,0.612-0.613  h2.449c0.336,0,0.61,0.277,0.61,0.613V15.307z M45.611,45.918c0,0.338-0.275,0.613-0.611,0.613h-2.449  c-0.337,0-0.611-0.275-0.611-0.613v-1.225c0-0.336,0.274-0.611,0.611-0.611H45c0.336,0,0.611,0.275,0.611,0.611V45.918z   M45.611,15.307c0,0.336-0.275,0.611-0.611,0.611h-2.449c-0.337,0-0.611-0.275-0.611-0.611v-1.225c0-0.336,0.274-0.613,0.611-0.613  H45c0.336,0,0.611,0.277,0.611,0.613V15.307z M51.123,45.918c0,0.338-0.277,0.613-0.613,0.613h-2.449  c-0.336,0-0.61-0.275-0.61-0.613v-1.225c0-0.336,0.274-0.611,0.61-0.611h2.449c0.336,0,0.613,0.275,0.613,0.611V45.918z   M51.123,15.307c0,0.336-0.277,0.611-0.613,0.611h-2.449c-0.336,0-0.61-0.275-0.61-0.611v-1.225c0-0.336,0.274-0.613,0.61-0.613  h2.449c0.336,0,0.613,0.277,0.613,0.613V15.307z" fill="url(#SVGID_1_)"/>
-<path d="M51.734,11.633H8.266c-0.678,0-1.225,0.549-1.225,1.225v0.611  c0-0.676,0.547-1.225,1.225-1.225h43.468c0.677,0,1.226,0.549,1.226,1.225v-0.611C52.959,12.182,52.41,11.633,51.734,11.633z" fill="#FFFFFF" fill-opacity="0.55" stroke-opacity="0.55"/>
-<path d="M8.266,48.367h43.468c0.677,0,1.226-0.547,1.226-1.225v-0.611  c0,0.676-0.549,1.225-1.226,1.225H8.266c-0.678,0-1.225-0.549-1.225-1.225v0.611C7.041,47.82,7.588,48.367,8.266,48.367z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
-<linearGradient gradientTransform="matrix(1 0 0 1 2296.5195 1443.9805)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2266.5195" x2="-2266.5195" y1="-1426.1284" y2="-1401.6362">
+<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="24.492" width="45.918" x="7.041" y="17.754"/>
-<linearGradient gradientTransform="matrix(1 0 0 1 2296.5195 1443.9805)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2266.519" x2="-2266.519" y1="-1401.7349" y2="-1426.2271">
+<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="M51.123,41.021c0,0.674-0.553,1.225-1.225,1.225H10.102c-0.673,0-1.225-0.551-1.225-1.225V18.979  c0-0.672,0.552-1.225,1.225-1.225h39.796c0.672,0,1.226,0.553,1.226,1.225L51.123,41.021L51.123,41.021z" fill="url(#SVGID_3_)"/>
-<path d="M49.898,41.021H10.102c-0.673,0-1.225,0.061-1.225-0.613l0,0  c0,0.674,0.552,1.225,1.225,1.225h39.796c0.672,0,1.226-0.551,1.226-1.225l0,0C51.123,41.082,50.57,41.021,49.898,41.021z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
-<linearGradient gradientTransform="matrix(1 0 0 1 2296.5195 1443.9805)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-2266.519" x2="-2266.519" y1="-1426.2261" y2="-1401.6362">
+<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="M49.898,18.367c0.336,0,0.61,0.275,0.61,0.611v22.043c0,0.338-0.274,0.61-0.61,0.61H10.102  c-0.337,0-0.611-0.272-0.611-0.61V18.979c0-0.336,0.274-0.611,0.611-0.611L49.898,18.367 M49.898,17.754H10.102  c-0.673,0-1.225,0.553-1.225,1.225v22.042c0,0.674,0.552,1.226,1.225,1.226h39.796c0.672,0,1.226-0.552,1.226-1.226V18.979  C51.123,18.307,50.57,17.754,49.898,17.754L49.898,17.754z" fill="url(#SVGID_4_)"/>
-<path d="M49.898,25.102v-4.898c0-0.676-0.549-1.225-1.226-1.225H11.326  c-0.676,0-1.225,0.549-1.225,1.225v7.961L49.898,25.102z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
+<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)">
-<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"/>
+<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"/>
+</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"/>
 </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"/>
+<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"/>
+<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"/>
 </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"/>
+<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"/>
+</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"/>
 </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"/>
+<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"/>
+<rect fill="#404041" height="2.335" width="0.777" x="14.611" y="4.396"/>
+<rect fill="#404041" height="2.333" width="0.777" x="14.611" y="23.842"/>
+<rect fill="#404041" height="0.779" width="2.333" x="23.556" y="14.896"/>
+<rect fill="#404041" height="0.779" width="2.332" x="4.111" y="14.896"/>
+<rect fill="#404041" height="1.88" transform="matrix(0.4993 0.8664 -0.8664 0.4993 20.7592 -15.0708)" width="0.628" x="23.106" y="9.486"/>
+<rect fill="#404041" height="1.88" transform="matrix(0.4968 0.8679 -0.8679 0.4968 20.7962 4.4286)" width="0.629" x="6.265" y="19.208"/>
+<rect fill="#404041" height="1.882" transform="matrix(0.8671 0.4981 -0.4981 0.8671 6.0604 -8.9813)" width="0.627" x="19.548" y="5.926"/>
+<rect fill="#404041" height="1.884" transform="matrix(0.8674 0.4977 -0.4977 0.8674 13.1416 -1.9014)" width="0.626" x="9.825" y="22.763"/>
+<rect fill="#404041" height="1.882" transform="matrix(0.8675 -0.4975 0.4975 0.8675 -2.0724 5.954)" width="0.628" x="9.825" y="5.926"/>
+<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"/>
+<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"/>
 </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>
+<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"/>
+</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"/>
+</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"/>
+<rect fill="none" height="30" width="30"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_service.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,67 +1,66 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<linearGradient gradientTransform="matrix(1 0 0 1 2296.5195 1443.9805)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2266.519" x2="-2266.519" y1="-1432.3472" y2="-1395.6118">
+<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="M51.734,11.633H8.266c-0.678,0-1.225,0.549-1.225,1.225v34.285c0,0.678,0.547,1.226,1.225,1.226  h43.468c0.677,0,1.226-0.548,1.226-1.226V12.857C52.959,12.182,52.41,11.633,51.734,11.633z M12.551,45.918  c0,0.338-0.275,0.613-0.611,0.613H9.49c-0.338,0-0.613-0.275-0.613-0.613v-1.225c0-0.336,0.275-0.611,0.613-0.611h2.449  c0.336,0,0.611,0.275,0.611,0.611L12.551,45.918L12.551,45.918z M12.551,15.307c0,0.336-0.275,0.611-0.611,0.611H9.49  c-0.338,0-0.613-0.275-0.613-0.611v-1.225c0-0.336,0.275-0.613,0.613-0.613h2.449c0.336,0,0.611,0.277,0.611,0.613L12.551,15.307  L12.551,15.307z M18.061,45.918c0,0.338-0.275,0.613-0.611,0.613H15c-0.338,0-0.612-0.275-0.612-0.613v-1.225  c0-0.336,0.274-0.611,0.612-0.611h2.449c0.336,0,0.611,0.275,0.611,0.611L18.061,45.918L18.061,45.918z M18.061,15.307  c0,0.336-0.275,0.611-0.611,0.611H15c-0.338,0-0.612-0.275-0.612-0.611v-1.225c0-0.336,0.274-0.613,0.612-0.613h2.449  c0.336,0,0.611,0.277,0.611,0.613L18.061,15.307L18.061,15.307z M23.571,45.918c0,0.338-0.276,0.613-0.612,0.613H20.51  c-0.336,0-0.611-0.275-0.611-0.613v-1.225c0-0.336,0.274-0.611,0.611-0.611h2.449c0.336,0,0.612,0.275,0.612,0.611V45.918z   M23.571,15.307c0,0.336-0.276,0.611-0.612,0.611H20.51c-0.336,0-0.611-0.275-0.611-0.611v-1.225c0-0.336,0.274-0.613,0.611-0.613  h2.449c0.336,0,0.612,0.277,0.612,0.613V15.307z M29.082,45.918c0,0.338-0.276,0.613-0.613,0.613h-2.448  c-0.337,0-0.612-0.275-0.612-0.613v-1.225c0-0.336,0.275-0.611,0.612-0.611h2.448c0.337,0,0.613,0.275,0.613,0.611V45.918z   M29.082,15.307c0,0.336-0.276,0.611-0.613,0.611h-2.448c-0.337,0-0.612-0.275-0.612-0.611v-1.225c0-0.336,0.275-0.613,0.612-0.613  h2.448c0.337,0,0.613,0.277,0.613,0.613V15.307z M34.592,45.918c0,0.338-0.275,0.613-0.611,0.613h-2.448  c-0.339,0-0.613-0.275-0.613-0.613v-1.225c0-0.336,0.274-0.611,0.613-0.611h2.448c0.336,0,0.611,0.275,0.611,0.611V45.918z   M34.592,15.307c0,0.336-0.275,0.611-0.611,0.611h-2.448c-0.339,0-0.613-0.275-0.613-0.611v-1.225c0-0.336,0.274-0.613,0.613-0.613  h2.448c0.336,0,0.611,0.277,0.611,0.613V15.307z M40.102,45.918c0,0.338-0.274,0.613-0.61,0.613h-2.449  c-0.338,0-0.612-0.275-0.612-0.613v-1.225c0-0.336,0.274-0.611,0.612-0.611h2.449c0.336,0,0.61,0.275,0.61,0.611V45.918z   M40.102,15.307c0,0.336-0.274,0.611-0.61,0.611h-2.449c-0.338,0-0.612-0.275-0.612-0.611v-1.225c0-0.336,0.274-0.613,0.612-0.613  h2.449c0.336,0,0.61,0.277,0.61,0.613V15.307z M45.611,45.918c0,0.338-0.275,0.613-0.611,0.613h-2.449  c-0.337,0-0.611-0.275-0.611-0.613v-1.225c0-0.336,0.274-0.611,0.611-0.611H45c0.336,0,0.611,0.275,0.611,0.611V45.918z   M45.611,15.307c0,0.336-0.275,0.611-0.611,0.611h-2.449c-0.337,0-0.611-0.275-0.611-0.611v-1.225c0-0.336,0.274-0.613,0.611-0.613  H45c0.336,0,0.611,0.277,0.611,0.613V15.307z M51.123,45.918c0,0.338-0.277,0.613-0.613,0.613h-2.449  c-0.336,0-0.61-0.275-0.61-0.613v-1.225c0-0.336,0.274-0.611,0.61-0.611h2.449c0.336,0,0.613,0.275,0.613,0.611V45.918z   M51.123,15.307c0,0.336-0.277,0.611-0.613,0.611h-2.449c-0.336,0-0.61-0.275-0.61-0.611v-1.225c0-0.336,0.274-0.613,0.61-0.613  h2.449c0.336,0,0.613,0.277,0.613,0.613V15.307z" fill="url(#SVGID_1_)"/>
-<path d="M51.734,11.633H8.266c-0.678,0-1.225,0.549-1.225,1.225v0.611  c0-0.676,0.547-1.225,1.225-1.225h43.468c0.677,0,1.226,0.549,1.226,1.225v-0.611C52.959,12.182,52.41,11.633,51.734,11.633z" fill="#FFFFFF" fill-opacity="0.55" stroke-opacity="0.55"/>
-<path d="M8.266,48.367h43.468c0.677,0,1.226-0.547,1.226-1.225v-0.611  c0,0.676-0.549,1.225-1.226,1.225H8.266c-0.678,0-1.225-0.549-1.225-1.225v0.611C7.041,47.82,7.588,48.367,8.266,48.367z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
-<linearGradient gradientTransform="matrix(1 0 0 1 2296.5195 1443.9805)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2266.5195" x2="-2266.5195" y1="-1426.1284" y2="-1401.6362">
+<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="24.492" width="45.918" x="7.041" y="17.754"/>
-<linearGradient gradientTransform="matrix(1 0 0 1 2296.5195 1443.9805)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2266.519" x2="-2266.519" y1="-1401.7349" y2="-1426.2271">
+<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="M51.123,41.021c0,0.674-0.553,1.225-1.225,1.225H10.102c-0.673,0-1.225-0.551-1.225-1.225V18.979  c0-0.672,0.552-1.225,1.225-1.225h39.796c0.672,0,1.226,0.553,1.226,1.225L51.123,41.021L51.123,41.021z" fill="url(#SVGID_3_)"/>
-<path d="M49.898,41.021H10.102c-0.673,0-1.225,0.061-1.225-0.613l0,0  c0,0.674,0.552,1.225,1.225,1.225h39.796c0.672,0,1.226-0.551,1.226-1.225l0,0C51.123,41.082,50.57,41.021,49.898,41.021z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
-<linearGradient gradientTransform="matrix(1 0 0 1 2296.5195 1443.9805)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-2266.519" x2="-2266.519" y1="-1426.2261" y2="-1401.6362">
+<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="M49.898,18.367c0.336,0,0.61,0.275,0.61,0.611v22.043c0,0.338-0.274,0.61-0.61,0.61H10.102  c-0.337,0-0.611-0.272-0.611-0.61V18.979c0-0.336,0.274-0.611,0.611-0.611L49.898,18.367 M49.898,17.754H10.102  c-0.673,0-1.225,0.553-1.225,1.225v22.042c0,0.674,0.552,1.226,1.225,1.226h39.796c0.672,0,1.226-0.552,1.226-1.226V18.979  C51.123,18.307,50.57,17.754,49.898,17.754L49.898,17.754z" fill="url(#SVGID_4_)"/>
-<path d="M49.898,25.102v-4.898c0-0.676-0.549-1.225-1.226-1.225H11.326  c-0.676,0-1.225,0.549-1.225,1.225v7.961L49.898,25.102z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
+<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(0.5 0 0 0.5 30 30)">
-<path d="M30,54.705C16.376,54.705,5.294,43.623,5.294,30  C5.294,16.376,16.376,5.294,30,5.294c13.623,0,24.705,11.083,24.705,24.706C54.705,43.623,43.623,54.705,30,54.705L30,54.705z" style="opacity:0.6;enable-background:new    ;"/>
-<radialGradient cx="2.7217" cy="-242.9165" gradientTransform="matrix(0.618 0 0 -0.618 28.3176 -128.0637)" gradientUnits="userSpaceOnUse" id="SVGID_1__" r="48.9069">
+<g transform="matrix(1 0 0 1 30 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"/>
 </radialGradient>
-<circle cx="30" cy="30" r="22.941" style="fill:url(#SVGID_1__);"/>
-<path d="M52.122,28.744c-0.509-8.961-6.312-16.677-14.788-19.661l-1.032,0.169  l-5.995-1.147l-7.474,4.456l-0.281,1.878h-4.336l1.714,2.914l-4.643,3.787l-1.082,4.675l3.834,6.795l3.914-0.799l1.429,1.229  l1.117,0.111l0.738,2.883l-0.974,2.527l3.552,9.086h3.623l3.592-2.9v-1.185l0.947-1.47l0.783-0.4  c-0.199,0.303-0.512,0.998-0.512,0.998c-0.033,0.236,0.51,4.862,2.104,4.5c1.211-0.273,5.533-8.303,5.615-9.066  c0.164-1.51-0.658-2.134-1.162-2.37l-0.562-0.265l-2.58,2.587c-0.276,0.021-0.526,0.067-0.751,0.134v-2.147l2.802-2.737l1.426-4.595  l2.173-1.769l-0.477-0.866l1.639-1.578l-0.916-1.669l0.697,0.084l4.082,9.138l0.836-0.666c-0.025-0.447-0.074-0.887-0.125-1.329  L52.122,28.744z M30.275,18.466l-0.341-0.911h2.049l0.997,2.243h-1.484v-1.333H30.275z M37.035,22.983l1.637,2.388l0.111,0.286  l-1.677-1.013l-0.401-1.445L37.035,22.983z M39.496,27.155l0.494,0.494l-0.639,0.143l-0.145-0.177L39.496,27.155z M26.695,11.093  l1.041,1.611l-1.183,0.362l-0.462-0.263L26.695,11.093z" style="opacity:0.3;enable-background:new    ;"/>
-<path d="M30,7.059C17.331,7.059,7.059,17.331,7.059,30  c0,12.674,10.272,22.941,22.941,22.941c12.674,0,22.941-10.268,22.941-22.941C52.941,17.331,42.674,7.059,30,7.059z M30,51.176  C18.323,51.176,8.823,41.677,8.823,30c0-11.677,9.5-21.177,21.177-21.177c11.677,0,21.176,9.5,21.176,21.177  C51.176,41.677,41.677,51.176,30,51.176z" style="opacity:0.3;fill:url(#SVGID_2__);enable-background:new    ;"/>
-<radialGradient cx="182.1514" cy="-162.9028" gradientTransform="matrix(1.7647 0 0 -1.7647 -290.1173 -274.2362)" gradientUnits="userSpaceOnUse" id="SVGID_3__" r="15.4155">
+<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"/>
+</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"/>
 </radialGradient>
-<path d="M42.431,36.555l-2.388,2.391c0,0-1.443,0-1.511,0.572c-0.032,0.246-0.111,1.313-0.354,1.863  c-0.48,0.332-1.054,1.434-1.054,1.434s-0.298,2.129,1.296,1.768C40.004,44.224,44.883,37.707,42.431,36.555z" style="fill:url(#SVGID_3__);"/>
-<radialGradient cx="182.1514" cy="-162.9023" gradientTransform="matrix(1.7647 0 0 -1.7647 -290.1173 -274.2362)" gradientUnits="userSpaceOnUse" id="SVGID_4__" r="17.8322">
+<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"/>
 </radialGradient>
-<path d="M37.041,9.916c-0.392,0.148-0.66,0.25-0.66,0.25L30.48,9.037l-2.894,1.811l1.523,2.356  l-2.663,0.819l-1.435-0.819l0.504-1.431l-1.871,1.295l-0.333,2.255h-3.554l1.314,2.238l-4.996,4.073l-0.94,4.066l1.855,3.591  L18.104,30l3.914-0.799l1.43,1.228l1.299,0.127l1.414,5.53l-0.941,2.446l2.079,4.595l0.585,1.908h3.623l2.048-1.108l1.543-1.793  v-2.169l2.936-1.498v-3.213l1.16-2.208l2.59-2.329l0.619-2.7l-3.387,0.755l-0.891-1.085l0.633-1.013l-2.404-1.454l-1.025-3.687  l1.776-1.158l1.636,2.388l0.613,1.572l1.228,1.229l1.435,0.75l1.594-0.258l1.77-1.703l-1.246-2.273l-1.568,0.409L41.146,20.8  l1.349-0.94l4.23,0.512v1.505l3.681,7.585l0.837-0.669C50.746,20.045,44.965,12.704,37.041,9.916z M35.119,20.169l-1.932,0.512  h-2.573v-1.333h-2.46l-1.946,0.514l-2.966-0.821l-0.821-1.535l4.096-0.921h4.098L30,14.945h2.049l1.14,2.561l1.933,0.678v1.985  H35.119z M39.523,16.79l-3.482-0.616v-1.228l1.741-0.41l0.512-0.614l1.229,1.023L39.523,16.79L39.523,16.79z" style="fill:url(#SVGID_4__);"/>
-<rect height="60" style="fill:none;" width="60"/>
-<defs>
-<linearGradient gradientTransform="matrix(1.7647 0 0 -1.7647 -290.1173 -274.2362)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="181.4004" x2="181.4004" y1="-159.4634" y2="-185.5335">
-<stop offset="0" style="stop-color:#31A7F8"/>
-<stop offset="0.497" style="stop-color:#1E74DC"/>
-<stop offset="1" style="stop-color:#C8E4EB"/>
-</linearGradient>
-</defs>
+<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>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_tv.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,79 +1,71 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<linearGradient gradientTransform="matrix(1 0 0 1 2296.5195 1443.9805)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2266.519" x2="-2266.519" y1="-1432.3472" y2="-1395.6118">
+<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="M51.734,11.633H8.266c-0.678,0-1.225,0.549-1.225,1.225v34.285c0,0.678,0.547,1.226,1.225,1.226  h43.468c0.677,0,1.226-0.548,1.226-1.226V12.857C52.959,12.182,52.41,11.633,51.734,11.633z M12.551,45.918  c0,0.338-0.275,0.613-0.611,0.613H9.49c-0.338,0-0.613-0.275-0.613-0.613v-1.225c0-0.336,0.275-0.611,0.613-0.611h2.449  c0.336,0,0.611,0.275,0.611,0.611L12.551,45.918L12.551,45.918z M12.551,15.307c0,0.336-0.275,0.611-0.611,0.611H9.49  c-0.338,0-0.613-0.275-0.613-0.611v-1.225c0-0.336,0.275-0.613,0.613-0.613h2.449c0.336,0,0.611,0.277,0.611,0.613L12.551,15.307  L12.551,15.307z M18.061,45.918c0,0.338-0.275,0.613-0.611,0.613H15c-0.338,0-0.612-0.275-0.612-0.613v-1.225  c0-0.336,0.274-0.611,0.612-0.611h2.449c0.336,0,0.611,0.275,0.611,0.611L18.061,45.918L18.061,45.918z M18.061,15.307  c0,0.336-0.275,0.611-0.611,0.611H15c-0.338,0-0.612-0.275-0.612-0.611v-1.225c0-0.336,0.274-0.613,0.612-0.613h2.449  c0.336,0,0.611,0.277,0.611,0.613L18.061,15.307L18.061,15.307z M23.571,45.918c0,0.338-0.276,0.613-0.612,0.613H20.51  c-0.336,0-0.611-0.275-0.611-0.613v-1.225c0-0.336,0.274-0.611,0.611-0.611h2.449c0.336,0,0.612,0.275,0.612,0.611V45.918z   M23.571,15.307c0,0.336-0.276,0.611-0.612,0.611H20.51c-0.336,0-0.611-0.275-0.611-0.611v-1.225c0-0.336,0.274-0.613,0.611-0.613  h2.449c0.336,0,0.612,0.277,0.612,0.613V15.307z M29.082,45.918c0,0.338-0.276,0.613-0.613,0.613h-2.448  c-0.337,0-0.612-0.275-0.612-0.613v-1.225c0-0.336,0.275-0.611,0.612-0.611h2.448c0.337,0,0.613,0.275,0.613,0.611V45.918z   M29.082,15.307c0,0.336-0.276,0.611-0.613,0.611h-2.448c-0.337,0-0.612-0.275-0.612-0.611v-1.225c0-0.336,0.275-0.613,0.612-0.613  h2.448c0.337,0,0.613,0.277,0.613,0.613V15.307z M34.592,45.918c0,0.338-0.275,0.613-0.611,0.613h-2.448  c-0.339,0-0.613-0.275-0.613-0.613v-1.225c0-0.336,0.274-0.611,0.613-0.611h2.448c0.336,0,0.611,0.275,0.611,0.611V45.918z   M34.592,15.307c0,0.336-0.275,0.611-0.611,0.611h-2.448c-0.339,0-0.613-0.275-0.613-0.611v-1.225c0-0.336,0.274-0.613,0.613-0.613  h2.448c0.336,0,0.611,0.277,0.611,0.613V15.307z M40.102,45.918c0,0.338-0.274,0.613-0.61,0.613h-2.449  c-0.338,0-0.612-0.275-0.612-0.613v-1.225c0-0.336,0.274-0.611,0.612-0.611h2.449c0.336,0,0.61,0.275,0.61,0.611V45.918z   M40.102,15.307c0,0.336-0.274,0.611-0.61,0.611h-2.449c-0.338,0-0.612-0.275-0.612-0.611v-1.225c0-0.336,0.274-0.613,0.612-0.613  h2.449c0.336,0,0.61,0.277,0.61,0.613V15.307z M45.611,45.918c0,0.338-0.275,0.613-0.611,0.613h-2.449  c-0.337,0-0.611-0.275-0.611-0.613v-1.225c0-0.336,0.274-0.611,0.611-0.611H45c0.336,0,0.611,0.275,0.611,0.611V45.918z   M45.611,15.307c0,0.336-0.275,0.611-0.611,0.611h-2.449c-0.337,0-0.611-0.275-0.611-0.611v-1.225c0-0.336,0.274-0.613,0.611-0.613  H45c0.336,0,0.611,0.277,0.611,0.613V15.307z M51.123,45.918c0,0.338-0.277,0.613-0.613,0.613h-2.449  c-0.336,0-0.61-0.275-0.61-0.613v-1.225c0-0.336,0.274-0.611,0.61-0.611h2.449c0.336,0,0.613,0.275,0.613,0.611V45.918z   M51.123,15.307c0,0.336-0.277,0.611-0.613,0.611h-2.449c-0.336,0-0.61-0.275-0.61-0.611v-1.225c0-0.336,0.274-0.613,0.61-0.613  h2.449c0.336,0,0.613,0.277,0.613,0.613V15.307z" fill="url(#SVGID_1_)"/>
-<path d="M51.734,11.633H8.266c-0.678,0-1.225,0.549-1.225,1.225v0.611  c0-0.676,0.547-1.225,1.225-1.225h43.468c0.677,0,1.226,0.549,1.226,1.225v-0.611C52.959,12.182,52.41,11.633,51.734,11.633z" fill="#FFFFFF" fill-opacity="0.55" stroke-opacity="0.55"/>
-<path d="M8.266,48.367h43.468c0.677,0,1.226-0.547,1.226-1.225v-0.611  c0,0.676-0.549,1.225-1.226,1.225H8.266c-0.678,0-1.225-0.549-1.225-1.225v0.611C7.041,47.82,7.588,48.367,8.266,48.367z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
-<linearGradient gradientTransform="matrix(1 0 0 1 2296.5195 1443.9805)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2266.5195" x2="-2266.5195" y1="-1426.1284" y2="-1401.6362">
+<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="24.492" width="45.918" x="7.041" y="17.754"/>
-<linearGradient gradientTransform="matrix(1 0 0 1 2296.5195 1443.9805)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2266.519" x2="-2266.519" y1="-1401.7349" y2="-1426.2271">
+<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="M51.123,41.021c0,0.674-0.553,1.225-1.225,1.225H10.102c-0.673,0-1.225-0.551-1.225-1.225V18.979  c0-0.672,0.552-1.225,1.225-1.225h39.796c0.672,0,1.226,0.553,1.226,1.225L51.123,41.021L51.123,41.021z" fill="url(#SVGID_3_)"/>
-<path d="M49.898,41.021H10.102c-0.673,0-1.225,0.061-1.225-0.613l0,0  c0,0.674,0.552,1.225,1.225,1.225h39.796c0.672,0,1.226-0.551,1.226-1.225l0,0C51.123,41.082,50.57,41.021,49.898,41.021z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
-<linearGradient gradientTransform="matrix(1 0 0 1 2296.5195 1443.9805)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-2266.519" x2="-2266.519" y1="-1426.2261" y2="-1401.6362">
+<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="M49.898,18.367c0.336,0,0.61,0.275,0.61,0.611v22.043c0,0.338-0.274,0.61-0.61,0.61H10.102  c-0.337,0-0.611-0.272-0.611-0.61V18.979c0-0.336,0.274-0.611,0.611-0.611L49.898,18.367 M49.898,17.754H10.102  c-0.673,0-1.225,0.553-1.225,1.225v22.042c0,0.674,0.552,1.226,1.225,1.226h39.796c0.672,0,1.226-0.552,1.226-1.226V18.979  C51.123,18.307,50.57,17.754,49.898,17.754L49.898,17.754z" fill="url(#SVGID_4_)"/>
-<path d="M49.898,25.102v-4.898c0-0.676-0.549-1.225-1.226-1.225H11.326  c-0.676,0-1.225,0.549-1.225,1.225v7.961L49.898,25.102z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
+<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)">
-<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"/>
+<polygon fill="none" points="0,4.111 0,24.333 0,30 30,30 30,24.333 30,4.111 30,0 0,0 "/>
+<path d="M8.389,27.667c-0.893,0-1.633-0.681-1.74-1.557H1.777C0.797,26.11,0,25.313,0,24.333V4.111  c0-0.98,0.797-1.777,1.777-1.777h26.444c0.98,0,1.778,0.797,1.778,1.777v20.222c0,0.98-0.798,1.777-1.778,1.777h-4.87  c-0.108,0.876-0.848,1.557-1.74,1.557H8.389z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="15" x2="15" y1="26.5859" y2="24.8039">
+<stop offset="0" style="stop-color:#404040"/>
+<stop offset="1" style="stop-color:#000000"/>
 </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"/>
+<path d="M22.365,25.889c0,0.431-0.338,0.778-0.754,0.778H8.389c-0.416,0-0.754-0.348-0.754-0.778l0,0  c0-0.43-0.023-1.166-0.023-1.166h14.777C22.389,24.723,22.365,25.459,22.365,25.889L22.365,25.889z" fill="url(#SVGID_1__)"/>
+<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"/>
 </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"/>
+<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"/>
+<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"/>
 </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>
+<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"/>
+</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"/>
+</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"/>
+<rect fill="none" height="30" width="30"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voice_call.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,44 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5609 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="423.0967" x2="429.6527" y1="-578.646" y2="-582.908">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.6061" style="stop-color:#154EBD"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
-</linearGradient>
-<path d="M19.081,33.911c2.089-3.597,4.591-6.497,7.281-9.189c2.593-2.591,6.72-5.3,8.562-6.256l9.604-10.282  c-0.845-0.3-3.693-0.464-7.279,0.616c-3.586,1.083-11.736,6.303-16.979,11.547c-5.242,5.246-9.727,12.347-10.581,14.595  c-1.343,3.541-1.221,7.445-0.929,8.581c0,0,0.34,1.034,1.144,2.377C10.248,46.476,19.081,33.911,19.081,33.911z" fill="url(#SVGID_1_)"/>
-<path d="M31.184,20.8c1.488-1.036,2.87-1.882,3.74-2.334L44.271,8.46  c-0.132-0.058-0.209-0.088-0.209-0.088c-0.247-0.088-0.642-0.162-1.124-0.219c-0.793,0.006-1.596,0.093-2.401,0.27  C34.843,9.673,31.019,14.958,31.184,20.8z" fill="#020202" fill-opacity="0.05" stroke-opacity="0.05"/>
-<path d="M31.906,20.306c1.205-0.809,2.291-1.462,3.018-1.84l9.377-10.04  c-0.146-0.063-0.233-0.098-0.233-0.098c-0.231-0.08-0.604-0.152-1.06-0.203c-0.751,0.006-1.51,0.087-2.27,0.253  C35.275,9.576,31.636,14.695,31.906,20.306z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M44.079,8.263c-0.21-0.073-0.55-0.137-0.962-0.186c-0.681,0.006-1.369,0.08-2.06,0.231  c-5.087,1.116-8.426,5.984-7.978,11.233c0.725-0.455,1.363-0.826,1.844-1.076l9.424-10.088C44.178,8.302,44.079,8.263,44.079,8.263z  " fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="43.3906" cy="8.9175" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="18.5073">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.6061" style="stop-color:#154EBD"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+<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"/>
 </radialGradient>
-<path d="M34.924,18.466l0.929,1.55c0,0,15.101-6.784,14.084-8.038c-0.513-0.631-0.577-0.656-1.237-1.263  c-1.985-1.815-4.172-2.531-4.172-2.531c-0.186-0.063-0.481-0.12-0.845-0.161c-0.596,0.004-1.2,0.068-1.806,0.201  c-4.591,1.009-7.57,5.501-6.963,10.257C34.916,18.477,34.921,18.47,34.924,18.466z" fill="url(#SVGID_2_)"/>
-<path d="M17.483,34.106c-0.988-0.14-2.007-0.119-3.027,0.105c-2.418,0.53-4.376,2.066-5.646,4.131  c-0.367,2.35-0.25,4.407-0.05,5.18c0,0,0.34,1.034,1.144,2.377c0.29,0.482,6.54-8.264,8.556-11.107L17.483,34.106z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M18.366,34.136c-0.989-0.14-2.008-0.118-3.029,0.105c-3.313,0.727-5.775,3.332-6.76,6.623  c-0.026,1.025,0.034,1.872,0.127,2.397c0.003,0.013,0.005,0.034,0.01,0.048c0,0,0.34,1.033,1.144,2.379  c0.3,0.498,6.981-8.888,8.75-11.384L18.366,34.136z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="437.4258" cy="-571.231" gradientTransform="matrix(0.2095 0.9787 -0.9682 0.2124 -629.4526 -270.6148)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="14.6198">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.6061" style="stop-color:#154EBD"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
-</radialGradient>
-<path d="M11.202,47.738c0.616,0.74,0.646,0.954,1.295,1.524c1.194,1.055,9.301-13.612,9.301-13.612  l-2.683-1.719c-0.941-0.111-1.914-0.079-2.89,0.136c-4.777,1.048-7.806,5.868-6.87,10.832C9.749,45.686,10.349,46.71,11.202,47.738z  " fill="url(#SVGID_3_)"/>
-<path d="M49.937,11.978c-0.179-0.22-0.381-0.446-0.578-0.67l-13.944,7.959l0.438,0.749  C35.853,20.016,50.953,13.231,49.937,11.978z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="422.2881" x2="427.4786" y1="-610.9287" y2="-594.4409">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.8121" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M35.853,20.016l1.178,1.981c0.302,0.515,0.972,0.674,1.569,0.422l4.09-2.334l8.043-4.668  c0.632-0.363,0.878-1.119,0.549-1.686c0,0-0.333-0.501-1.349-1.751L35.853,20.016z" fill="url(#SVGID_4_)"/>
-<path d="M21.798,35.65l-0.725-0.472l-9.215,13.486c0.216,0.204,0.43,0.414,0.639,0.598  C13.691,50.317,21.798,35.65,21.798,35.65z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="439.6982" x2="451.5232" y1="-577.7549" y2="-564.7323">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.8121" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+<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"/>
 </linearGradient>
-<path d="M12.498,49.262c1.193,1.05,1.686,1.37,1.686,1.37c0.567,0.367,1.363,0.169,1.781-0.442l7.9-11.605  c0.419-0.614,0.307-1.411-0.26-1.777l-1.808-1.156L12.498,49.262z" fill="url(#SVGID_5_)"/>
+<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"/>
+</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"/>
+</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>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voice_message_unseen.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voice_message_unseen.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +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 gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="4.3896" y2="58.4526">
-<stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="1" style="stop-color:#A8A8A8"/>
-</linearGradient>
-<path d="M17.365,1c0,0,6.154,1.286,10.782,5.642C14.534,7.592,3.785,18.927,3.785,32.783  C3.785,47.262,15.522,59,30,59c14.477,0,26.215-11.928,26.215-26.217C56.215,18.495,43.11,1,17.365,1z" fill="url(#SVGID_1_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="36.7905" x2="36.7905" y1="5.0522" y2="31.4634">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#CDD3D5"/>
-</linearGradient>
-<path d="M56.149,32.729l0.066,0.055C56.215,18.495,43.11,1,17.365,1C17.365,1,54.065,3.018,56.149,32.729z" fill="url(#SVGID_2_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30" x2="30" y1="9.0278" y2="57.8288">
-<stop offset="0" style="stop-color:#F5F5F5"/>
-<stop offset="0.05" style="stop-color:#F5F5F5"/>
-<stop offset="0.7818" style="stop-color:#CCCCCC"/>
-<stop offset="1" style="stop-color:#D1D1D1"/>
-</linearGradient>
-<path d="M54.524,33.182c0,13.545-10.98,24.525-24.523,24.525c-13.545,0-24.524-10.98-24.524-24.525  C5.477,19.64,16.456,8.659,30,8.659C43.543,8.659,54.524,19.64,54.524,33.182z" fill="url(#SVGID_3_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="29.9985" x2="29.9985" y1="24.8247" y2="40.683">
-<stop offset="0" style="stop-color:#FF7236"/>
-<stop offset="1" style="stop-color:#D11414"/>
-</linearGradient>
-<path d="M40.383,24.825c-4.26,0-7.725,3.465-7.725,7.72c0,1.766,0.602,3.385,1.598,4.686h-8.513  c0.998-1.301,1.598-2.92,1.598-4.686c0-4.255-3.465-7.72-7.724-7.72c-4.26,0-7.726,3.465-7.726,7.72  c0,4.262,3.466,7.727,7.726,7.727h20.766c4.26,0,7.723-3.465,7.723-7.727C48.106,28.29,44.643,24.825,40.383,24.825z M14.933,32.545  c0-2.58,2.101-4.681,4.685-4.681c2.583,0,4.685,2.102,4.685,4.681c0,2.584-2.102,4.686-4.685,4.686  C17.034,37.23,14.933,35.129,14.933,32.545z M40.383,37.23c-2.584,0-4.686-2.102-4.686-4.686c0-2.58,2.102-4.681,4.686-4.681  c2.583,0,4.684,2.102,4.684,4.681C45.067,35.129,42.966,37.23,40.383,37.23z" fill="url(#SVGID_4_)"/>
-<rect fill="none" height="60" width="60"/>
-</g>
-<g transform="matrix(1 0 0 1 30 0)">
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="10.8037" x2="6.8329" y1="2.2246" y2="17.5564">
-<stop offset="0" style="stop-color:#FFA959"/>
-<stop offset="0.703" style="stop-color:#CA3522"/>
-<stop offset="1" style="stop-color:#F08849"/>
-</linearGradient>
-<polygon fill="url(#SVGID_1__)" points="2.449,16.623 6.56,1.28 15.083,3.564 10.971,18.906 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="10.5269" x2="6.9976" y1="3.2676" y2="16.9434">
-<stop offset="0" style="stop-color:#FF7236"/>
-<stop offset="0.7939" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#E8522A"/>
-</linearGradient>
-<polygon fill="url(#SVGID_2__)" points="10.347,17.824 3.529,15.998 7.183,2.361 14.001,4.188 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="25.3379" x2="11.7716" y1="11.7349" y2="25.632">
-<stop offset="0" style="stop-color:#FFA959"/>
-<stop offset="0.703" style="stop-color:#CA3522"/>
-<stop offset="1" style="stop-color:#F08849"/>
-</linearGradient>
-<polygon fill="url(#SVGID_3__)" points="8.636,22.363 22.361,8.636 28.6,14.875 14.875,28.601 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="24.8652" x2="12.5126" y1="12.3154" y2="24.7784">
-<stop offset="0" style="stop-color:#FF7236"/>
-<stop offset="0.7939" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#E8522A"/>
-</linearGradient>
-<polygon fill="url(#SVGID_4__)" points="14.875,27.353 9.883,22.363 22.361,9.884 27.354,14.875 "/>
-<rect fill="none" height="30" width="30"/>
-</g>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voice_recorder.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,132 +1,252 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
 <rect fill="none" height="60" width="60"/>
-<path d="M45.756,20.456L45.756,20.456c1.752-3.447,1.191-7.768-1.692-10.65 c-2.882-2.882-7.203-3.443-10.649-1.692c0,0,0,0,0,0c-0.002,0.001-0.002,0.001-0.004,0.002c-0.84,0.427-1.629,0.987-2.333,1.69 l-8.224,8.225c-0.238-0.238-0.627-0.238-0.866,0l-0.433,0.433c0,0,0,0,0-0.001l-1.731,1.732c-0.238,0.238-0.238,0.627,0,0.866 l-3.896,3.896c-3.585,3.586-3.585,9.401,0,12.987c2.313,2.312,5.55,3.124,8.52,2.456c0.143-0.033,0.285-0.065,0.426-0.104 c0.119-0.034,0.239-0.069,0.357-0.108c0.032-0.011,0.065-0.019,0.098-0.029v3.061c-0.707,0.068-1.224,0.319-1.224,1.104v4.27h-4.298 c-0.132,0-0.26,0.016-0.384,0.042c-0.021,0.004-0.039,0.013-0.061,0.018c-0.105,0.026-0.206,0.059-0.302,0.102 c-0.01,0.004-0.018,0.01-0.027,0.014c-0.619,0.289-1.05,0.906-1.05,1.627v0.402c0,0.065,0.003,0.131,0.011,0.265 c0.006,0.122,0.015,0.3,0.027,0.592h0h18.288h0.001c0.025-0.608,0.039-0.73,0.039-0.856v-0.402c0-0.721-0.432-1.338-1.051-1.626 c-0.01-0.005-0.018-0.011-0.027-0.015c-0.096-0.043-0.197-0.074-0.301-0.101c-0.021-0.005-0.041-0.014-0.061-0.019 c-0.125-0.025-0.253-0.041-0.385-0.041h-4.298l-0.001-4.27c0-0.785-0.517-1.036-1.223-1.104v-5.362l3.809-3.809 c0.239,0.237,0.628,0.237,0.867,0l2.164-2.164c0.237-0.238,0.237-0.628,0-0.866c0,0,8.499-8.524,8.632-8.675c0,0,0,0,0-0.001 c0.514-0.584,0.943-1.215,1.283-1.882C45.754,20.458,45.756,20.457,45.756,20.456z" fill-opacity="0.1" stroke-opacity="0.1"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="30.23" x2="43.21" y1="10.69" y2="23.68">
-<stop offset="0" stop-color="#A8B1B3"/>
-<stop offset="0.38" stop-color="#FFFFFF"/>
-<stop offset="0.71" stop-color="#686E70"/>
-<stop offset="1" stop-color="#A6B0B3"/>
+<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.3818" style="stop-color:#FFFFFF"/>
+<stop offset="0.7091" style="stop-color:#686E70"/>
+<stop offset="1" style="stop-color:#A6B0B3"/>
+</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"/>
+<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,11.821-4.509,16.33,0c4.51,4.511,4.508,11.821,0,16.329l1.632-1.633C52.198,17.202,52.199,9.893,47.688,5.382z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
+<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="267.0962" x2="290.1899" y1="493.0283" y2="493.0283">
+<stop offset="0" style="stop-color:#4D4D4D"/>
+<stop offset="0.3818" style="stop-color:#7A7A7A"/>
+<stop offset="0.7091" style="stop-color:#1A1A1A"/>
+<stop offset="1" style="stop-color:#4D4D4D"/>
+</linearGradient>
+<path d="M21.019,15.725l-8.709,8.707c-4.51,4.51-4.51,11.821,0,16.33c4.508,4.51,11.821,4.51,16.33,0  l8.708-8.709L21.019,15.725z" fill="url(#SVGID_2_)"/>
+<path d="M16.664,36.407c-4.51-4.509-8.318-8.01-3.81-12.52l-0.544,0.544c-4.51,4.51-4.51,11.821,0,16.33  c4.508,4.51,11.821,4.51,16.33,0l0.543-0.545C24.674,44.728,21.173,40.916,16.664,36.407z" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M15.031,38.04c-4.508-4.508-6.685-9.643-2.177-14.152l-0.544,0.544c-4.51,4.51-4.51,11.821,0,16.33  c4.508,4.51,11.821,4.51,16.33,0l0.543-0.545C24.674,44.728,19.541,42.55,15.031,38.04z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M13.398,39.674C8.889,35.164,7.8,28.941,12.31,24.432l0,0c-4.51,4.51-4.51,11.821,0,16.33  c4.508,4.51,11.821,4.51,16.33,0l0,0C24.131,45.271,17.909,44.183,13.398,39.674z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="266.3257" x2="290.9585" y1="483.7915" y2="483.7915">
+<stop offset="0" style="stop-color:#4D4D4D"/>
+<stop offset="0.3818" style="stop-color:#7A7A7A"/>
+<stop offset="0.7091" style="stop-color:#1A1A1A"/>
+<stop offset="1" style="stop-color:#4D4D4D"/>
 </linearGradient>
-<path d="M44.064,9.805c-3.584-3.586-9.4-3.586-12.986,0l-8.225,8.225L35.84,31.017l8.225-8.226 C47.65,19.205,47.651,13.391,44.064,9.805z" fill="url(#SVGID_1)"/>
-<path d="M44.064,9.805c-3.584-3.586-9.4-3.586-12.986,0l-1.299,1.298 c3.586-3.586,7.669-1.854,11.256,1.731c3.586,3.587,5.316,7.669,1.73,11.255l1.299-1.298C47.65,19.205,47.651,13.391,44.064,9.805z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M44.064,9.805c-3.584-3.586-9.4-3.586-12.986,0l-1.299,1.298 c3.586-3.586,9.401-3.586,12.986,0c3.587,3.587,3.586,9.4,0,12.986l1.299-1.298C47.65,19.205,47.651,13.391,44.064,9.805z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="16.16" x2="29.14" y1="24.76" y2="37.75">
-<stop offset="0" stop-color="#4D4D4D"/>
-<stop offset="0.38" stop-color="#7A7A7A"/>
-<stop offset="0.71" stop-color="#1A1A1A"/>
-<stop offset="1" stop-color="#4D4D4D"/>
-</linearGradient>
-<path d="M22.854,18.03l-6.927,6.926c-3.585,3.586-3.585,9.402,0,12.988 c3.586,3.586,9.4,3.586,12.987,0l6.926-6.926L22.854,18.03z" fill="url(#SVGID_2)"/>
-<path d="M19.39,34.479c-3.585-3.585-6.617-6.369-3.03-9.956l-0.433,0.433 c-3.585,3.586-3.585,9.401,0,12.987c3.586,3.587,9.4,3.587,12.987,0l0.433-0.433C25.76,41.096,22.977,38.066,19.39,34.479z" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M18.092,35.777c-3.586-3.585-5.318-7.668-1.732-11.255l-0.433,0.433 c-3.585,3.586-3.585,9.401,0,12.987c3.586,3.587,9.4,3.587,12.987,0l0.433-0.433C25.76,41.096,21.678,39.365,18.092,35.777z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M16.793,37.076c-3.586-3.585-4.452-8.534-0.867-12.121l0,0 c-3.585,3.586-3.585,9.401,0,12.987c3.586,3.587,9.4,3.587,12.987,0l0,0C25.327,41.529,20.379,40.664,16.793,37.076z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="20.92" x2="34.77" y1="19.14" y2="32.99">
-<stop offset="0" stop-color="#4D4D4D"/>
-<stop offset="0.38" stop-color="#7A7A7A"/>
-<stop offset="0.71" stop-color="#1A1A1A"/>
-<stop offset="1" stop-color="#4D4D4D"/>
+<path d="M34.626,35.862c-0.301,0.3-0.79,0.3-1.09,0L17.208,19.534c-0.299-0.3-0.299-0.789,0-1.089  l2.721-2.721c0.301-0.3,0.791-0.3,1.09,0l16.328,16.328c0.3,0.3,0.3,0.79,0,1.089L34.626,35.862z" fill="url(#SVGID_3_)"/>
+<path d="M37.347,32.053L21.019,15.725c-0.3-0.3-0.79-0.3-1.09,0l-0.544,0.544  c0.301-0.299,0.79-0.299,1.09,0l16.328,16.328c0.3,0.3,0.3,0.79,0,1.089l0.544-0.544C37.647,32.843,37.647,32.353,37.347,32.053z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
+<rect fill-opacity="0.1" height="0.77" stroke-opacity="0.1" transform="matrix(0.7071 0.7071 -0.7071 0.7071 27.5824 -8.4675)" width="23.093" x="12.465" y="28.674"/>
+<rect fill="#FFFFFF" fill-opacity="0.2" height="0.771" stroke-opacity="0.2" transform="matrix(0.7071 0.7071 -0.7071 0.7071 25.326 -13.911)" width="23.091" x="17.909" y="23.23"/>
+<rect fill-opacity="0.2" height="0.769" stroke-opacity="0.2" transform="matrix(0.7071 0.7071 -0.7071 0.7071 27.3549 -9.0122)" width="23.091" x="13.01" y="28.13"/>
+<rect fill-opacity="0.4" height="0.769" stroke-opacity="0.4" transform="matrix(0.7071 0.7071 -0.7071 0.7071 27.131 -9.5558)" width="23.092" x="13.554" y="27.586"/>
+<path d="M22.652,15.179c0.301-0.299,0.301-0.786,0-1.087l-1.089,1.087C21.864,15.481,22.351,15.48,22.652,15.179z" fill="#FFFFFF"/>
+<path d="M27.005,10.824c0.301-0.3,0.301-0.787,0-1.088l-1.087,1.088C26.217,11.126,26.705,11.125,27.005,10.824z" fill="#FFFFFF"/>
+<path d="M31.361,6.471c0.291-0.291,0.293-0.753,0.021-1.055c-0.19,0.167-0.384,0.329-0.566,0.511l-0.544,0.544  C30.571,6.771,31.059,6.771,31.361,6.471z" fill="#FFFFFF"/>
+<circle cx="27.006" cy="15.181" fill="#FFFFFF" r="0.769"/>
+<circle cx="31.359" cy="10.825" fill="#FFFFFF" r="0.77"/>
+<circle cx="35.715" cy="6.471" fill="#FFFFFF" r="0.77"/>
+<circle cx="27.549" cy="20.078" fill="#FFFFFF" r="0.769"/>
+<circle cx="31.905" cy="15.724" fill="#FFFFFF" r="0.77"/>
+<circle cx="36.26" cy="11.369" fill="#FFFFFF" r="0.769"/>
+<path d="M37.891,30.42c-0.299,0.301-0.299,0.788,0,1.089l1.089-1.089C38.68,30.119,38.193,30.119,37.891,30.42z" fill="#FFFFFF"/>
+<path d="M42.246,26.065c-0.301,0.301-0.301,0.788,0,1.089l1.088-1.089C43.033,25.765,42.547,25.766,42.246,26.065z" fill="#FFFFFF"/>
+<path d="M47.657,21.689c-0.302-0.272-0.766-0.27-1.057,0.021c-0.301,0.3-0.301,0.788,0,1.088l0.544-0.544  C47.326,22.073,47.49,21.881,47.657,21.689z" fill="#FFFFFF"/>
+<circle cx="37.892" cy="26.065" fill="#FFFFFF" r="0.77"/>
+<circle cx="42.246" cy="21.71" fill="#FFFFFF" r="0.77"/>
+<circle cx="46.6" cy="17.357" fill="#FFFFFF" r="0.77"/>
+<circle cx="32.992" cy="25.521" fill="#FFFFFF" r="0.769"/>
+<circle cx="37.347" cy="21.167" fill="#FFFFFF" r="0.77"/>
+<circle cx="41.702" cy="16.813" fill="#FFFFFF" r="0.769"/>
+<circle cx="32.448" cy="20.622" fill="#FFFFFF" r="0.77"/>
+<circle cx="36.803" cy="16.269" fill="#FFFFFF" r="0.769"/>
+<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.7152" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
-<path d="M33.676,34.047c-0.239,0.237-0.627,0.237-0.867,0L19.823,21.06 c-0.238-0.238-0.238-0.627,0-0.866l2.164-2.164c0.239-0.238,0.628-0.238,0.866,0L35.84,31.017c0.238,0.238,0.238,0.628,0,0.866 L33.676,34.047z" fill="url(#SVGID_3)"/>
-<path d="M35.84,31.017L22.854,18.03c-0.238-0.238-0.627-0.238-0.866,0 l-0.433,0.433c0.239-0.238,0.627-0.238,0.866,0l12.987,12.986c0.238,0.238,0.238,0.627,0,0.865l0.433-0.432 C36.078,31.645,36.078,31.255,35.84,31.017z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
-<rect fill-opacity="0.1" height="0.611" stroke-opacity="0.1" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 22.8299 66.726)" width="18.365" x="16.052" y="28.329"/>
-<rect fill="#FFFFFF" fill-opacity="0.2" height="0.613" stroke-opacity="0.2" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 33.2816 62.3972)" width="18.366" x="20.38" y="24"/>
-<rect fill-opacity="0.2" height="0.613" stroke-opacity="0.2" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 23.8754 66.2943)" width="18.365" x="16.485" y="27.896"/>
-<rect fill-opacity="0.4" height="0.613" stroke-opacity="0.4" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 24.9208 65.8606)" width="18.365" x="16.918" y="27.463"/>
-<path d="M24.152,17.597c0.239-0.239,0.239-0.626,0-0.866l-0.866,0.866 C23.525,17.836,23.913,17.836,24.152,17.597z" fill="#FFFFFF"/>
-<path d="M27.614,14.133c0.24-0.239,0.24-0.625,0-0.866l-0.865,0.866 C26.988,14.373,27.376,14.373,27.614,14.133z" fill="#FFFFFF"/>
-<path d="M31.078,10.671c0.231-0.231,0.234-0.6,0.018-0.839c-0.152,0.133-0.307,0.262-0.451,0.406 l-0.433,0.433C30.451,10.909,30.838,10.909,31.078,10.671z" fill="#FFFFFF"/>
-<circle cx="27.614" cy="17.597" fill="#FFFFFF" r="0.612"/>
-<circle cx="31.078" cy="14.133" fill="#FFFFFF" r="0.612"/>
-<circle cx="34.541" cy="10.671" fill="#FFFFFF" r="0.612"/>
-<circle cx="28.047" cy="21.492" fill="#FFFFFF" r="0.612"/>
-<circle cx="31.511" cy="18.03" fill="#FFFFFF" r="0.612"/>
-<circle cx="34.975" cy="14.566" fill="#FFFFFF" r="0.612"/>
-<path d="M36.273,29.718c-0.24,0.24-0.24,0.626,0,0.866l0.865-0.866 C36.898,29.479,36.512,29.479,36.273,29.718z" fill="#FFFFFF"/>
-<path d="M39.735,26.255c-0.239,0.239-0.239,0.626,0,0.866l0.866-0.866 C40.362,26.015,39.975,26.016,39.735,26.255z" fill="#FFFFFF"/>
-<path d="M44.039,22.774c-0.24-0.217-0.608-0.215-0.84,0.017c-0.24,0.239-0.24,0.626,0,0.866l0.432-0.433 C43.775,23.079,43.906,22.926,44.039,22.774z" fill="#FFFFFF"/>
-<circle cx="36.273" cy="26.255" fill="#FFFFFF" r="0.612"/>
-<circle cx="39.735" cy="22.792" fill="#FFFFFF" r="0.612"/>
-<circle cx="43.199" cy="19.328" fill="#FFFFFF" r="0.612"/>
-<circle cx="32.376" cy="25.821" fill="#FFFFFF" r="0.612"/>
-<circle cx="35.84" cy="22.358" fill="#FFFFFF" r="0.612"/>
-<circle cx="39.303" cy="18.896" fill="#FFFFFF" r="0.612"/>
-<circle cx="31.943" cy="21.925" fill="#FFFFFF" r="0.612"/>
-<circle cx="35.407" cy="18.463" fill="#FFFFFF" r="0.612"/>
-<circle cx="38.869" cy="15" fill="#FFFFFF" r="0.612"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="33.64" x2="23.87" y1="7.71" y2="17.49">
-<stop offset="0" stop-color="#4D4D4D"/>
-<stop offset="0.2" stop-color="#504E4E"/>
-<stop offset="0.72" stop-color="#000000"/>
-<stop offset="1" stop-color="#000000"/>
+<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.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.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.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.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.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.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.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.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.7152" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
-<path d="M24.585,17.164c0.239-0.239,0.239-0.626,0-0.866l-0.866,0.866 C23.958,17.404,24.346,17.403,24.585,17.164z" fill="url(#SVGID_4)"/>
-<path d="M28.047,13.7c0.239-0.238,0.239-0.626,0-0.865L27.182,13.7 C27.421,13.94,27.809,13.94,28.047,13.7z" fill="url(#SVGID_4)"/>
-<path d="M31.511,10.238c0.231-0.231,0.234-0.599,0.018-0.839c-0.151,0.133-0.306,0.262-0.45,0.407 l-0.434,0.433C30.884,10.477,31.271,10.477,31.511,10.238z" fill="url(#SVGID_4)"/>
-<circle cx="28.047" cy="17.164" fill="url(#SVGID_4)" r="0.612"/>
-<circle cx="31.511" cy="13.7" fill="url(#SVGID_4)" r="0.612"/>
-<circle cx="34.975" cy="10.238" fill="url(#SVGID_4)" r="0.612"/>
-<circle cx="28.48" cy="21.06" fill="url(#SVGID_4)" r="0.612"/>
-<circle cx="31.943" cy="17.597" fill="url(#SVGID_4)" r="0.612"/>
-<circle cx="35.407" cy="14.133" fill="url(#SVGID_4)" r="0.612"/>
-<path d="M36.705,29.285c-0.238,0.239-0.238,0.626,0,0.866l0.866-0.866 C37.332,29.045,36.945,29.046,36.705,29.285z" fill="url(#SVGID_4)"/>
-<path d="M40.168,25.822c-0.239,0.239-0.239,0.626,0,0.866l0.866-0.866 C40.795,25.582,40.408,25.583,40.168,25.822z" fill="url(#SVGID_4)"/>
-<path d="M44.473,22.342c-0.241-0.217-0.609-0.215-0.842,0.017c-0.238,0.239-0.238,0.626,0,0.865 l0.434-0.433C44.209,22.646,44.34,22.493,44.473,22.342z" fill="url(#SVGID_4)"/>
-<circle cx="36.705" cy="25.821" fill="url(#SVGID_4)" r="0.612"/>
-<circle cx="40.168" cy="22.358" fill="url(#SVGID_4)" r="0.612"/>
-<circle cx="43.631" cy="18.896" fill="url(#SVGID_4)" r="0.612"/>
-<circle cx="32.809" cy="25.389" fill="url(#SVGID_4)" r="0.612"/>
-<circle cx="36.273" cy="21.925" fill="url(#SVGID_4)" r="0.612"/>
-<circle cx="39.735" cy="18.463" fill="url(#SVGID_4)" r="0.612"/>
-<circle cx="32.376" cy="21.492" fill="url(#SVGID_4)" r="0.612"/>
-<circle cx="35.84" cy="18.03" fill="url(#SVGID_4)" r="0.612"/>
-<circle cx="39.303" cy="14.566" fill="url(#SVGID_4)" r="0.612"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_25" x1="30.48" x2="23.8" y1="46.86" y2="46.86">
-<stop offset="0" stop-color="#4D4D4D"/>
-<stop offset="0.25" stop-color="#1A1A1A"/>
-<stop offset="0.62" stop-color="#7A7A7A"/>
-<stop offset="1" stop-color="#4D4D4D"/>
+<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.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.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.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.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.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.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.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.7152" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
-<path d="M30.225,48.788c-0.001,0.966-0.778,1.75-1.738,1.75H25.84c-0.959,0-1.737-0.784-1.737-1.749 v-4.468c0-0.966,0.778-1.13,1.737-1.13l2.646,0.001c0.96-0.001,1.737,0.163,1.737,1.129L30.225,48.788z" fill="url(#SVGID_25)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_26" x1="17.98" x2="36.35" y1="50.12" y2="50.12">
-<stop offset="0" stop-color="#4D4D4D"/>
-<stop offset="0.38" stop-color="#999999"/>
-<stop offset="0.75" stop-color="#1A1A1A"/>
-<stop offset="1" stop-color="#4D4D4D"/>
+<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.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.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.7152" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#000000"/>
+</linearGradient>
+<circle cx="41.702" cy="11.369" fill="url(#SVGID_24_)" r="0.769"/>
+<linearGradient gradientTransform="matrix(1 0 0 1 -374.1758 -502.9102)" gradientUnits="userSpaceOnUse" id="SVGID_25_" x1="404.7837" x2="396.38" y1="554.8911" y2="554.8911">
+<stop offset="0" style="stop-color:#4D4D4D"/>
+<stop offset="0.2545" style="stop-color:#1A1A1A"/>
+<stop offset="0.6182" style="stop-color:#7A7A7A"/>
+<stop offset="1" style="stop-color:#4D4D4D"/>
 </linearGradient>
-<path d="M36.309,51.652c0.025-0.609,0.039-0.73,0.039-0.856v-0.401c0-0.996-0.816-1.803-1.824-1.803 H19.805c-1.007,0-1.824,0.807-1.824,1.803v0.401c0,0.126,0.013,0.247,0.039,0.856H36.309z" fill="url(#SVGID_26)"/>
-<path d="M18.093,49.793h18.142c-0.08-0.225-0.203-0.427-0.361-0.602 H18.455C18.297,49.366,18.174,49.568,18.093,49.793z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M17.991,51.051c0.006,0.123,0.016,0.304,0.028,0.602h18.289 c0.013-0.298,0.021-0.479,0.028-0.602H17.991z" fill-opacity="0.35" stroke-opacity="0.35"/>
-<path d="M18.455,49.191h17.418c-0.333-0.366-0.811-0.6-1.35-0.6 H19.805C19.267,48.591,18.788,48.825,18.455,49.191z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M29.995,44.564v-0.243c0-0.966-0.72-1.13-1.607-1.129l-2.449-0.001 c-0.887,0-1.607,0.164-1.607,1.13v0.243c0.312,0.572,0.911,0.965,1.607,0.965h2.449C29.084,45.529,29.683,45.137,29.995,44.564z" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M29.613,43.693V43.46c-0.295-0.211-0.73-0.268-1.225-0.268l-2.449-0.001 c-0.494,0-0.93,0.058-1.224,0.269v0.233c0,0.676,0.549,1.225,1.224,1.225h2.449C29.063,44.918,29.613,44.369,29.613,43.693z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M28.914,37.943l1.312-1.312V25.939c0-0.237-0.049-0.461-0.13-0.668 l-1.038-1.038c-0.208-0.082-0.432-0.13-0.668-0.13H25.94c-1.012,0-1.836,0.824-1.836,1.836v14.535 C25.865,40.147,27.55,39.306,28.914,37.943z" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M28.914,37.943l0.7-0.699V25.939c0-0.676-0.55-1.224-1.224-1.224H25.94 c-0.675,0-1.224,0.548-1.224,1.224v14.393C26.253,39.936,27.709,39.146,28.914,37.943z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_27" x1="27.16" x2="27.16" y1="25.51" y2="44.04">
-<stop offset="0" stop-color="#4D4D4D"/>
-<stop offset="0.38" stop-color="#7A7A7A"/>
-<stop offset="0.71" stop-color="#1A1A1A"/>
-<stop offset="1" stop-color="#4D4D4D"/>
+<path d="M30.288,54.397c-0.001,1.216-0.979,2.203-2.185,2.203h-3.328c-1.207,0-2.185-0.987-2.185-2.2v-5.618  c0-1.215,0.978-1.42,2.185-1.42h3.327c1.207,0,2.184,0.205,2.184,1.42L30.288,54.397z" fill="url(#SVGID_25_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_26_" x1="14.8921" x2="37.9844" y1="56.0747" y2="56.0747">
+<stop offset="0" style="stop-color:#4D4D4D"/>
+<stop offset="0.3818" style="stop-color:#999999"/>
+<stop offset="0.7515" style="stop-color:#1A1A1A"/>
+<stop offset="1" style="stop-color:#4D4D4D"/>
 </linearGradient>
-<path d="M29,43.693c0,0.338-0.273,0.612-0.612,0.612h-2.449c-0.338,0-0.612-0.274-0.612-0.612V25.939 c0-0.338,0.274-0.612,0.612-0.612h2.449c0.339,0,0.612,0.274,0.612,0.612V43.693z" fill="url(#SVGID_27)"/>
-<path d="M27.164,28.778c-1.688,0-3.061-1.374-3.061-3.061 c0-1.688,1.373-3.061,3.061-3.061c1.687,0,3.061,1.373,3.061,3.061C30.225,27.404,28.851,28.778,27.164,28.778L27.164,28.778z" fill-opacity="0.35" stroke-opacity="0.35"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_28" x1="27.16" x2="27.16" y1="23.31" y2="28.1">
-<stop offset="0" stop-color="#9D9B9C"/>
-<stop offset="0.15" stop-color="#D6D4D4"/>
-<stop offset="0.7" stop-color="#555557"/>
-<stop offset="0.99" stop-color="#575757"/>
-<stop offset="1" stop-color="#575757"/>
+<path d="M37.937,58c0.032-0.767,0.048-0.92,0.048-1.078v-0.506c0-1.251-1.026-2.267-2.292-2.267H17.186  c-1.266,0-2.293,1.016-2.293,2.267v0.506c0,0.158,0.019,0.312,0.049,1.078H37.937z" fill="url(#SVGID_26_)"/>
+<path d="M15.032,55.661h22.811c-0.101-0.282-0.255-0.537-0.453-0.755H15.488  C15.29,55.124,15.135,55.379,15.032,55.661z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M14.904,57.243c0.009,0.154,0.02,0.381,0.035,0.757h22.997c0.017-0.376,0.028-0.603,0.037-0.757H14.904z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M15.488,54.906H37.39c-0.42-0.462-1.021-0.757-1.698-0.757H17.186  C16.509,54.149,15.908,54.444,15.488,54.906z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M30,49.086v-0.304c0-1.215-0.906-1.42-2.022-1.42h-3.079c-1.115,0-2.02,0.205-2.02,1.42v0.304  c0.391,0.721,1.147,1.216,2.02,1.216h3.079C28.854,50.302,29.606,49.807,30,49.086z" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M29.518,47.992v-0.294c-0.371-0.265-0.918-0.336-1.54-0.336h-3.079c-0.62,0-1.169,0.071-1.539,0.336v0.294  c0,0.85,0.69,1.54,1.539,1.54h3.079C28.827,49.532,29.518,48.842,29.518,47.992z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M28.64,40.762l1.648-1.649V25.67c0-0.298-0.062-0.58-0.164-0.84l-1.305-1.307  c-0.261-0.104-0.542-0.163-0.841-0.163h-3.079c-1.273,0-2.309,1.036-2.309,2.31v18.275C24.807,43.534,26.924,42.476,28.64,40.762z" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M28.64,40.762l0.878-0.879V25.67c0-0.85-0.691-1.54-1.54-1.54h-3.079c-0.849,0-1.539,0.69-1.539,1.54v18.097  C25.293,43.269,27.125,42.275,28.64,40.762z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_27_" x1="26.4395" x2="26.4395" y1="25.1289" y2="48.4234">
+<stop offset="0" style="stop-color:#4D4D4D"/>
+<stop offset="0.3818" style="stop-color:#7A7A7A"/>
+<stop offset="0.7091" style="stop-color:#1A1A1A"/>
+<stop offset="1" style="stop-color:#4D4D4D"/>
 </linearGradient>
-<circle cx="27.164" cy="25.717" fill="url(#SVGID_28)" r="2.449"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_29" x1="27.16" x2="27.16" y1="24.52" y2="26.91">
-<stop offset="0" stop-color="#646464"/>
-<stop offset="1" stop-color="#EBEBEB"/>
+<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.9879" style="stop-color:#575757"/>
+<stop offset="1" style="stop-color:#575757"/>
 </linearGradient>
-<path d="M27.164,26.941c-0.676,0-1.225-0.549-1.225-1.224s0.549-1.225,1.225-1.225 c0.674,0,1.224,0.549,1.224,1.225S27.838,26.941,27.164,26.941L27.164,26.941z" fill="url(#SVGID_29)"/>
-<rect fill-opacity="0.2" height="0.612" stroke-opacity="0.2" width="6.122" x="24.103" y="47.979"/>
-<rect fill-opacity="0.1" height="0.611" stroke-opacity="0.1" width="6.122" x="24.103" y="47.367"/>
-<rect fill="none" height="59.996" width="59.996"/>
+<circle cx="26.439" cy="25.39" fill="url(#SVGID_28_)" r="3.079"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_29_" x1="26.4385" x2="26.4385" y1="23.8794" y2="26.8862">
+<stop offset="0" style="stop-color:#646464"/>
+<stop offset="1" style="stop-color:#EBEBEB"/>
+</linearGradient>
+<path d="M26.439,26.93c-0.851,0-1.541-0.691-1.541-1.54c0-0.85,0.69-1.54,1.541-1.54  c0.847,0,1.539,0.69,1.539,1.54C27.978,26.238,27.287,26.93,26.439,26.93L26.439,26.93z" fill="url(#SVGID_29_)"/>
+<rect fill-opacity="0.2" height="0.769" stroke-opacity="0.2" width="7.697" x="22.59" y="53.381"/>
+<rect fill-opacity="0.1" height="0.77" stroke-opacity="0.1" width="7.697" x="22.59" y="52.611"/>
+<rect fill="none" height="60" width="60"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,77 +1,73 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5609 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="423.0967" x2="429.6527" y1="-578.646" y2="-582.908">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.6061" style="stop-color:#154EBD"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
-</linearGradient>
-<path d="M19.081,33.911c2.089-3.597,4.591-6.497,7.281-9.189c2.593-2.591,6.72-5.3,8.562-6.256l9.604-10.282  c-0.845-0.3-3.693-0.464-7.279,0.616c-3.586,1.083-11.736,6.303-16.979,11.547c-5.242,5.246-9.727,12.347-10.581,14.595  c-1.343,3.541-1.221,7.445-0.929,8.581c0,0,0.34,1.034,1.144,2.377C10.248,46.476,19.081,33.911,19.081,33.911z" fill="url(#SVGID_1_)"/>
-<path d="M31.184,20.8c1.488-1.036,2.87-1.882,3.74-2.334L44.271,8.46  c-0.132-0.058-0.209-0.088-0.209-0.088c-0.247-0.088-0.642-0.162-1.124-0.219c-0.793,0.006-1.596,0.093-2.401,0.27  C34.843,9.673,31.019,14.958,31.184,20.8z" fill="#020202" fill-opacity="0.05" stroke-opacity="0.05"/>
-<path d="M31.906,20.306c1.205-0.809,2.291-1.462,3.018-1.84l9.377-10.04  c-0.146-0.063-0.233-0.098-0.233-0.098c-0.231-0.08-0.604-0.152-1.06-0.203c-0.751,0.006-1.51,0.087-2.27,0.253  C35.275,9.576,31.636,14.695,31.906,20.306z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M44.079,8.263c-0.21-0.073-0.55-0.137-0.962-0.186c-0.681,0.006-1.369,0.08-2.06,0.231  c-5.087,1.116-8.426,5.984-7.978,11.233c0.725-0.455,1.363-0.826,1.844-1.076l9.424-10.088C44.178,8.302,44.079,8.263,44.079,8.263z  " fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="43.3906" cy="8.9175" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="18.5073">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.6061" style="stop-color:#154EBD"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+<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"/>
 </radialGradient>
-<path d="M34.924,18.466l0.929,1.55c0,0,15.101-6.784,14.084-8.038c-0.513-0.631-0.577-0.656-1.237-1.263  c-1.985-1.815-4.172-2.531-4.172-2.531c-0.186-0.063-0.481-0.12-0.845-0.161c-0.596,0.004-1.2,0.068-1.806,0.201  c-4.591,1.009-7.57,5.501-6.963,10.257C34.916,18.477,34.921,18.47,34.924,18.466z" fill="url(#SVGID_2_)"/>
-<path d="M17.483,34.106c-0.988-0.14-2.007-0.119-3.027,0.105c-2.418,0.53-4.376,2.066-5.646,4.131  c-0.367,2.35-0.25,4.407-0.05,5.18c0,0,0.34,1.034,1.144,2.377c0.29,0.482,6.54-8.264,8.556-11.107L17.483,34.106z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M18.366,34.136c-0.989-0.14-2.008-0.118-3.029,0.105c-3.313,0.727-5.775,3.332-6.76,6.623  c-0.026,1.025,0.034,1.872,0.127,2.397c0.003,0.013,0.005,0.034,0.01,0.048c0,0,0.34,1.033,1.144,2.379  c0.3,0.498,6.981-8.888,8.75-11.384L18.366,34.136z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="437.4258" cy="-571.231" gradientTransform="matrix(0.2095 0.9787 -0.9682 0.2124 -629.4526 -270.6148)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="14.6198">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.6061" style="stop-color:#154EBD"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
-</radialGradient>
-<path d="M11.202,47.738c0.616,0.74,0.646,0.954,1.295,1.524c1.194,1.055,9.301-13.612,9.301-13.612  l-2.683-1.719c-0.941-0.111-1.914-0.079-2.89,0.136c-4.777,1.048-7.806,5.868-6.87,10.832C9.749,45.686,10.349,46.71,11.202,47.738z  " fill="url(#SVGID_3_)"/>
-<path d="M49.937,11.978c-0.179-0.22-0.381-0.446-0.578-0.67l-13.944,7.959l0.438,0.749  C35.853,20.016,50.953,13.231,49.937,11.978z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="422.2881" x2="427.4786" y1="-610.9287" y2="-594.4409">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.8121" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M35.853,20.016l1.178,1.981c0.302,0.515,0.972,0.674,1.569,0.422l4.09-2.334l8.043-4.668  c0.632-0.363,0.878-1.119,0.549-1.686c0,0-0.333-0.501-1.349-1.751L35.853,20.016z" fill="url(#SVGID_4_)"/>
-<path d="M21.798,35.65l-0.725-0.472l-9.215,13.486c0.216,0.204,0.43,0.414,0.639,0.598  C13.691,50.317,21.798,35.65,21.798,35.65z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="439.6982" x2="451.5232" y1="-577.7549" y2="-564.7323">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.8121" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+<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"/>
 </linearGradient>
-<path d="M12.498,49.262c1.193,1.05,1.686,1.37,1.686,1.37c0.567,0.367,1.363,0.169,1.781-0.442l7.9-11.605  c0.419-0.614,0.307-1.411-0.26-1.777l-1.808-1.156L12.498,49.262z" fill="url(#SVGID_5_)"/>
+<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"/>
+</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"/>
+</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(0.5 0 0 0.5 30 30)">
-<path d="M30,54.705C16.376,54.705,5.294,43.623,5.294,30  C5.294,16.376,16.376,5.294,30,5.294c13.623,0,24.705,11.083,24.705,24.706C54.705,43.623,43.623,54.705,30,54.705L30,54.705z" style="opacity:0.6;enable-background:new    ;"/>
-<radialGradient cx="2.7217" cy="-242.9165" gradientTransform="matrix(0.618 0 0 -0.618 28.3176 -128.0637)" gradientUnits="userSpaceOnUse" id="SVGID_1__" r="48.9069">
+<g transform="matrix(1 0 0 1 30 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"/>
 </radialGradient>
-<circle cx="30" cy="30" r="22.941" style="fill:url(#SVGID_1__);"/>
-<path d="M52.122,28.744c-0.509-8.961-6.312-16.677-14.788-19.661l-1.032,0.169  l-5.995-1.147l-7.474,4.456l-0.281,1.878h-4.336l1.714,2.914l-4.643,3.787l-1.082,4.675l3.834,6.795l3.914-0.799l1.429,1.229  l1.117,0.111l0.738,2.883l-0.974,2.527l3.552,9.086h3.623l3.592-2.9v-1.185l0.947-1.47l0.783-0.4  c-0.199,0.303-0.512,0.998-0.512,0.998c-0.033,0.236,0.51,4.862,2.104,4.5c1.211-0.273,5.533-8.303,5.615-9.066  c0.164-1.51-0.658-2.134-1.162-2.37l-0.562-0.265l-2.58,2.587c-0.276,0.021-0.526,0.067-0.751,0.134v-2.147l2.802-2.737l1.426-4.595  l2.173-1.769l-0.477-0.866l1.639-1.578l-0.916-1.669l0.697,0.084l4.082,9.138l0.836-0.666c-0.025-0.447-0.074-0.887-0.125-1.329  L52.122,28.744z M30.275,18.466l-0.341-0.911h2.049l0.997,2.243h-1.484v-1.333H30.275z M37.035,22.983l1.637,2.388l0.111,0.286  l-1.677-1.013l-0.401-1.445L37.035,22.983z M39.496,27.155l0.494,0.494l-0.639,0.143l-0.145-0.177L39.496,27.155z M26.695,11.093  l1.041,1.611l-1.183,0.362l-0.462-0.263L26.695,11.093z" style="opacity:0.3;enable-background:new    ;"/>
-<path d="M30,7.059C17.331,7.059,7.059,17.331,7.059,30  c0,12.674,10.272,22.941,22.941,22.941c12.674,0,22.941-10.268,22.941-22.941C52.941,17.331,42.674,7.059,30,7.059z M30,51.176  C18.323,51.176,8.823,41.677,8.823,30c0-11.677,9.5-21.177,21.177-21.177c11.677,0,21.176,9.5,21.176,21.177  C51.176,41.677,41.677,51.176,30,51.176z" style="opacity:0.3;fill:url(#SVGID_2__);enable-background:new    ;"/>
-<radialGradient cx="182.1514" cy="-162.9028" gradientTransform="matrix(1.7647 0 0 -1.7647 -290.1173 -274.2362)" gradientUnits="userSpaceOnUse" id="SVGID_3__" r="15.4155">
+<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"/>
+</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"/>
 </radialGradient>
-<path d="M42.431,36.555l-2.388,2.391c0,0-1.443,0-1.511,0.572c-0.032,0.246-0.111,1.313-0.354,1.863  c-0.48,0.332-1.054,1.434-1.054,1.434s-0.298,2.129,1.296,1.768C40.004,44.224,44.883,37.707,42.431,36.555z" style="fill:url(#SVGID_3__);"/>
-<radialGradient cx="182.1514" cy="-162.9023" gradientTransform="matrix(1.7647 0 0 -1.7647 -290.1173 -274.2362)" gradientUnits="userSpaceOnUse" id="SVGID_4__" r="17.8322">
+<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"/>
 </radialGradient>
-<path d="M37.041,9.916c-0.392,0.148-0.66,0.25-0.66,0.25L30.48,9.037l-2.894,1.811l1.523,2.356  l-2.663,0.819l-1.435-0.819l0.504-1.431l-1.871,1.295l-0.333,2.255h-3.554l1.314,2.238l-4.996,4.073l-0.94,4.066l1.855,3.591  L18.104,30l3.914-0.799l1.43,1.228l1.299,0.127l1.414,5.53l-0.941,2.446l2.079,4.595l0.585,1.908h3.623l2.048-1.108l1.543-1.793  v-2.169l2.936-1.498v-3.213l1.16-2.208l2.59-2.329l0.619-2.7l-3.387,0.755l-0.891-1.085l0.633-1.013l-2.404-1.454l-1.025-3.687  l1.776-1.158l1.636,2.388l0.613,1.572l1.228,1.229l1.435,0.75l1.594-0.258l1.77-1.703l-1.246-2.273l-1.568,0.409L41.146,20.8  l1.349-0.94l4.23,0.512v1.505l3.681,7.585l0.837-0.669C50.746,20.045,44.965,12.704,37.041,9.916z M35.119,20.169l-1.932,0.512  h-2.573v-1.333h-2.46l-1.946,0.514l-2.966-0.821l-0.821-1.535l4.096-0.921h4.098L30,14.945h2.049l1.14,2.561l1.933,0.678v1.985  H35.119z M39.523,16.79l-3.482-0.616v-1.228l1.741-0.41l0.512-0.614l1.229,1.023L39.523,16.79L39.523,16.79z" style="fill:url(#SVGID_4__);"/>
-<rect height="60" style="fill:none;" width="60"/>
-<defs>
-<linearGradient gradientTransform="matrix(1.7647 0 0 -1.7647 -290.1173 -274.2362)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="181.4004" x2="181.4004" y1="-159.4634" y2="-185.5335">
-<stop offset="0" style="stop-color:#31A7F8"/>
-<stop offset="0.497" style="stop-color:#1E74DC"/>
-<stop offset="1" style="stop-color:#C8E4EB"/>
-</linearGradient>
-</defs>
+<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>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_call_active.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,78 +1,64 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5609 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="423.0967" x2="429.6524" y1="-578.646" y2="-582.9078">
+<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.1333" style="stop-color:#A7E722"/>
-<stop offset="0.6303" style="stop-color:#428C0F"/>
-<stop offset="1" style="stop-color:#5CA617"/>
-</linearGradient>
-<path d="M19.081,33.91c2.089-3.595,4.591-6.496,7.281-9.188c2.593-2.591,6.72-5.3,8.562-6.256l9.604-10.282  c-0.845-0.3-3.693-0.464-7.279,0.616c-3.586,1.083-11.736,6.303-16.979,11.547c-5.242,5.246-9.727,12.347-10.581,14.595  c-1.343,3.541-1.221,7.445-0.929,8.58c0,0,0.34,1.035,1.144,2.377C10.248,46.475,19.081,33.91,19.081,33.91z" fill="url(#SVGID_1_)"/>
-<path d="M31.184,20.8c1.488-1.036,2.87-1.882,3.74-2.334L44.271,8.46  c-0.132-0.058-0.209-0.088-0.209-0.088c-0.247-0.088-0.642-0.162-1.124-0.219c-0.793,0.006-1.596,0.093-2.401,0.27  C34.843,9.673,31.019,14.958,31.184,20.8z" fill="#020202" fill-opacity="0.05" stroke-opacity="0.05"/>
-<path d="M31.906,20.306c1.205-0.809,2.291-1.462,3.018-1.84l9.377-10.04  c-0.146-0.063-0.233-0.098-0.233-0.098c-0.231-0.08-0.604-0.152-1.06-0.203c-0.751,0.006-1.51,0.087-2.27,0.253  C35.275,9.576,31.636,14.695,31.906,20.306z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M44.079,8.263c-0.21-0.073-0.55-0.137-0.962-0.186c-0.681,0.006-1.369,0.08-2.06,0.231  c-5.087,1.116-8.426,5.984-7.978,11.233c0.725-0.455,1.363-0.826,1.844-1.076l9.424-10.088C44.178,8.302,44.079,8.263,44.079,8.263z  " fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="40.9697" cy="9.21" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="12.2872">
-<stop offset="0" style="stop-color:#A7E722"/>
-<stop offset="0.6242" style="stop-color:#428C0F"/>
+<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"/>
 </radialGradient>
-<path d="M34.924,18.466l0.929,1.55c0,0,15.101-6.784,14.084-8.038c-0.513-0.631-0.577-0.656-1.237-1.263  c-1.985-1.815-4.172-2.531-4.172-2.531c-0.186-0.063-0.481-0.12-0.845-0.161c-0.596,0.004-1.2,0.068-1.806,0.201  c-4.591,1.009-7.57,5.501-6.963,10.257C34.916,18.477,34.921,18.47,34.924,18.466z" fill="url(#SVGID_2_)"/>
-<path d="M17.483,34.105c-0.988-0.139-2.007-0.119-3.027,0.105c-2.418,0.531-4.376,2.066-5.646,4.131  c-0.367,2.35-0.25,4.408-0.05,5.18c0,0,0.34,1.035,1.144,2.377c0.29,0.482,6.54-8.264,8.556-11.107L17.483,34.105z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M18.366,34.135c-0.989-0.139-2.008-0.117-3.029,0.105c-3.313,0.727-5.775,3.332-6.76,6.623  c-0.026,1.025,0.034,1.873,0.127,2.398c0.003,0.012,0.005,0.033,0.01,0.047c0,0,0.34,1.033,1.144,2.379  c0.3,0.498,6.981-8.887,8.75-11.383L18.366,34.135z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="437.4258" cy="-571.231" gradientTransform="matrix(0.2095 0.9787 -0.9682 0.2124 -629.4526 -270.6148)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="14.6187">
-<stop offset="0" style="stop-color:#A7E722"/>
-<stop offset="0.6242" style="stop-color:#428C0F"/>
-<stop offset="1" style="stop-color:#5CA617"/>
-</radialGradient>
-<path d="M11.202,47.738c0.616,0.74,0.646,0.953,1.295,1.523c1.194,1.055,9.301-13.611,9.301-13.611  l-2.683-1.719c-0.941-0.111-1.914-0.08-2.89,0.135c-4.777,1.049-7.806,5.869-6.87,10.832C9.749,45.686,10.349,46.709,11.202,47.738z  " fill="url(#SVGID_3_)"/>
-<path d="M49.937,11.978c-0.179-0.22-0.381-0.446-0.578-0.67l-13.944,7.959l0.438,0.749  C35.853,20.016,50.953,13.231,49.937,11.978z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="422.2881" x2="427.4786" y1="-610.9287" y2="-594.4409">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.6788" style="stop-color:#387300"/>
-<stop offset="1" style="stop-color:#66A00E"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M35.853,20.016l1.178,1.981c0.302,0.515,0.972,0.674,1.569,0.422l4.09-2.334l8.043-4.668  c0.632-0.363,0.878-1.119,0.549-1.686c0,0-0.333-0.501-1.349-1.751L35.853,20.016z" fill="url(#SVGID_4_)"/>
-<path d="M21.798,35.65l-0.725-0.473l-9.215,13.486c0.216,0.205,0.43,0.414,0.639,0.598  C13.691,50.316,21.798,35.65,21.798,35.65z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="439.6982" x2="451.5232" y1="-577.7549" y2="-564.7323">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.6788" style="stop-color:#387300"/>
-<stop offset="1" style="stop-color:#66A00E"/>
+<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"/>
+<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"/>
 </linearGradient>
-<path d="M12.498,49.262c1.193,1.049,1.686,1.369,1.686,1.369c0.567,0.367,1.363,0.17,1.781-0.441l7.9-11.605  c0.419-0.615,0.307-1.412-0.26-1.777l-1.808-1.156L12.498,49.262z" fill="url(#SVGID_5_)"/>
+<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(0.5 0 0 0.5 30 30)">
-<path d="M30,54.705C16.376,54.705,5.294,43.623,5.294,30  C5.294,16.376,16.376,5.294,30,5.294c13.623,0,24.705,11.083,24.705,24.706C54.705,43.623,43.623,54.705,30,54.705L30,54.705z" style="opacity:0.6;enable-background:new    ;"/>
-<radialGradient cx="2.7217" cy="-242.9165" gradientTransform="matrix(0.618 0 0 -0.618 28.3176 -128.0637)" gradientUnits="userSpaceOnUse" id="SVGID_1__" r="48.9069">
+<g transform="matrix(1 0 0 1 30 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"/>
 </radialGradient>
-<circle cx="30" cy="30" r="22.941" style="fill:url(#SVGID_1__);"/>
-<path d="M52.122,28.744c-0.509-8.961-6.312-16.677-14.788-19.661l-1.032,0.169  l-5.995-1.147l-7.474,4.456l-0.281,1.878h-4.336l1.714,2.914l-4.643,3.787l-1.082,4.675l3.834,6.795l3.914-0.799l1.429,1.229  l1.117,0.111l0.738,2.883l-0.974,2.527l3.552,9.086h3.623l3.592-2.9v-1.185l0.947-1.47l0.783-0.4  c-0.199,0.303-0.512,0.998-0.512,0.998c-0.033,0.236,0.51,4.862,2.104,4.5c1.211-0.273,5.533-8.303,5.615-9.066  c0.164-1.51-0.658-2.134-1.162-2.37l-0.562-0.265l-2.58,2.587c-0.276,0.021-0.526,0.067-0.751,0.134v-2.147l2.802-2.737l1.426-4.595  l2.173-1.769l-0.477-0.866l1.639-1.578l-0.916-1.669l0.697,0.084l4.082,9.138l0.836-0.666c-0.025-0.447-0.074-0.887-0.125-1.329  L52.122,28.744z M30.275,18.466l-0.341-0.911h2.049l0.997,2.243h-1.484v-1.333H30.275z M37.035,22.983l1.637,2.388l0.111,0.286  l-1.677-1.013l-0.401-1.445L37.035,22.983z M39.496,27.155l0.494,0.494l-0.639,0.143l-0.145-0.177L39.496,27.155z M26.695,11.093  l1.041,1.611l-1.183,0.362l-0.462-0.263L26.695,11.093z" style="opacity:0.3;enable-background:new    ;"/>
-<path d="M30,7.059C17.331,7.059,7.059,17.331,7.059,30  c0,12.674,10.272,22.941,22.941,22.941c12.674,0,22.941-10.268,22.941-22.941C52.941,17.331,42.674,7.059,30,7.059z M30,51.176  C18.323,51.176,8.823,41.677,8.823,30c0-11.677,9.5-21.177,21.177-21.177c11.677,0,21.176,9.5,21.176,21.177  C51.176,41.677,41.677,51.176,30,51.176z" style="opacity:0.3;fill:url(#SVGID_2__);enable-background:new    ;"/>
-<radialGradient cx="182.1514" cy="-162.9028" gradientTransform="matrix(1.7647 0 0 -1.7647 -290.1173 -274.2362)" gradientUnits="userSpaceOnUse" id="SVGID_3__" r="15.4155">
+<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"/>
+</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"/>
 </radialGradient>
-<path d="M42.431,36.555l-2.388,2.391c0,0-1.443,0-1.511,0.572c-0.032,0.246-0.111,1.313-0.354,1.863  c-0.48,0.332-1.054,1.434-1.054,1.434s-0.298,2.129,1.296,1.768C40.004,44.224,44.883,37.707,42.431,36.555z" style="fill:url(#SVGID_3__);"/>
-<radialGradient cx="182.1514" cy="-162.9023" gradientTransform="matrix(1.7647 0 0 -1.7647 -290.1173 -274.2362)" gradientUnits="userSpaceOnUse" id="SVGID_4__" r="17.8322">
+<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"/>
 </radialGradient>
-<path d="M37.041,9.916c-0.392,0.148-0.66,0.25-0.66,0.25L30.48,9.037l-2.894,1.811l1.523,2.356  l-2.663,0.819l-1.435-0.819l0.504-1.431l-1.871,1.295l-0.333,2.255h-3.554l1.314,2.238l-4.996,4.073l-0.94,4.066l1.855,3.591  L18.104,30l3.914-0.799l1.43,1.228l1.299,0.127l1.414,5.53l-0.941,2.446l2.079,4.595l0.585,1.908h3.623l2.048-1.108l1.543-1.793  v-2.169l2.936-1.498v-3.213l1.16-2.208l2.59-2.329l0.619-2.7l-3.387,0.755l-0.891-1.085l0.633-1.013l-2.404-1.454l-1.025-3.687  l1.776-1.158l1.636,2.388l0.613,1.572l1.228,1.229l1.435,0.75l1.594-0.258l1.77-1.703l-1.246-2.273l-1.568,0.409L41.146,20.8  l1.349-0.94l4.23,0.512v1.505l3.681,7.585l0.837-0.669C50.746,20.045,44.965,12.704,37.041,9.916z M35.119,20.169l-1.932,0.512  h-2.573v-1.333h-2.46l-1.946,0.514l-2.966-0.821l-0.821-1.535l4.096-0.921h4.098L30,14.945h2.049l1.14,2.561l1.933,0.678v1.985  H35.119z M39.523,16.79l-3.482-0.616v-1.228l1.741-0.41l0.512-0.614l1.229,1.023L39.523,16.79L39.523,16.79z" style="fill:url(#SVGID_4__);"/>
-<rect height="60" style="fill:none;" width="60"/>
-<defs>
-<linearGradient gradientTransform="matrix(1.7647 0 0 -1.7647 -290.1173 -274.2362)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="181.4004" x2="181.4004" y1="-159.4634" y2="-185.5335">
-<stop offset="0" style="stop-color:#31A7F8"/>
-<stop offset="0.497" style="stop-color:#1E74DC"/>
-<stop offset="1" style="stop-color:#C8E4EB"/>
-</linearGradient>
-</defs>
+<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>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_call_end.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_call_end.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<g>
+<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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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)">
+<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"/>
+</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"/>
+</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"/>
+</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"/>
+</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>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_call_hold.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_call_hold.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</g>
+<g transform="matrix(1 0 0 1 30 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"/>
+</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"/>
+</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"/>
+</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"/>
+</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>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_call_waiting.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,77 +1,72 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="20.3613" x2="26.6141" y1="20.2744" y2="26.4485">
-<stop offset="0" style="stop-color:#FEE16E"/>
-<stop offset="0.5939" style="stop-color:#D96900"/>
-<stop offset="1" style="stop-color:#FED43A"/>
-</linearGradient>
-<path d="M19.081,33.911c2.089-3.597,4.591-6.497,7.281-9.189c2.593-2.591,6.72-5.3,8.562-6.256l9.604-10.282  c-0.845-0.3-3.693-0.464-7.279,0.616c-3.586,1.083-11.736,6.303-16.979,11.547c-5.242,5.246-9.727,12.347-10.581,14.595  c-1.343,3.541-1.221,7.445-0.929,8.581c0,0,0.34,1.034,1.144,2.377C10.248,46.476,19.081,33.911,19.081,33.911z" fill="url(#SVGID_1_)"/>
-<path d="M31.184,20.8c1.488-1.036,2.87-1.882,3.74-2.334L44.271,8.46  c-0.132-0.058-0.209-0.088-0.209-0.088c-0.247-0.088-0.642-0.162-1.124-0.219c-0.793,0.006-1.596,0.093-2.401,0.27  C34.843,9.673,31.019,14.958,31.184,20.8z" fill="#020202" fill-opacity="0.05" stroke-opacity="0.05"/>
-<path d="M31.906,20.306c1.205-0.809,2.291-1.462,3.018-1.84l9.377-10.04  c-0.146-0.063-0.233-0.098-0.233-0.098c-0.231-0.08-0.604-0.152-1.06-0.203c-0.751,0.006-1.51,0.087-2.27,0.253  C35.275,9.576,31.636,14.695,31.906,20.306z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M44.079,8.263c-0.21-0.073-0.55-0.137-0.962-0.186c-0.681,0.006-1.369,0.08-2.06,0.231  c-5.087,1.116-8.426,5.984-7.978,11.233c0.725-0.455,1.363-0.826,1.844-1.076l9.424-10.088C44.178,8.302,44.079,8.263,44.079,8.263z  " fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="43.6406" cy="10.1128" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="13.348">
-<stop offset="0" style="stop-color:#FEE16E"/>
-<stop offset="0.6061" style="stop-color:#F1830A"/>
-<stop offset="1" style="stop-color:#FED43A"/>
+<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"/>
 </radialGradient>
-<path d="M34.924,18.466l0.929,1.55c0,0,15.101-6.784,14.084-8.038c-0.513-0.631-0.577-0.656-1.237-1.263  c-1.985-1.815-4.172-2.531-4.172-2.531c-0.186-0.063-0.481-0.12-0.845-0.161c-0.596,0.004-1.2,0.068-1.806,0.201  c-4.591,1.009-7.57,5.501-6.963,10.257C34.916,18.477,34.921,18.47,34.924,18.466z" fill="url(#SVGID_2_)"/>
-<path d="M17.483,34.106c-0.988-0.14-2.007-0.119-3.027,0.105c-2.418,0.53-4.376,2.066-5.646,4.131  c-0.367,2.35-0.25,4.407-0.05,5.18c0,0,0.34,1.034,1.144,2.377c0.29,0.482,6.54-8.264,8.556-11.107L17.483,34.106z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M18.366,34.136c-0.989-0.14-2.008-0.118-3.029,0.105c-3.313,0.727-5.775,3.332-6.76,6.623  c-0.026,1.025,0.034,1.872,0.127,2.397c0.003,0.013,0.005,0.034,0.01,0.048c0,0,0.34,1.033,1.144,2.379  c0.3,0.498,6.981-8.888,8.75-11.384L18.366,34.136z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="437.4258" cy="-571.231" gradientTransform="matrix(0.2095 0.9787 -0.9682 0.2124 -629.4526 -270.6148)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="14.6198">
-<stop offset="0" style="stop-color:#FEE16E"/>
-<stop offset="0.6061" style="stop-color:#F1830A"/>
-<stop offset="1" style="stop-color:#FED43A"/>
-</radialGradient>
-<path d="M11.202,47.738c0.616,0.74,0.646,0.954,1.295,1.524c1.194,1.055,9.301-13.612,9.301-13.612  l-2.683-1.719c-0.941-0.111-1.914-0.079-2.89,0.136c-4.777,1.048-7.806,5.868-6.87,10.832C9.749,45.686,10.349,46.71,11.202,47.738z  " fill="url(#SVGID_3_)"/>
-<path d="M49.937,11.978c-0.179-0.22-0.381-0.446-0.578-0.67l-13.944,7.959l0.438,0.749  C35.853,20.016,50.953,13.231,49.937,11.978z" fill="#020202" fill-opacity="0.5" stroke-opacity="0.5"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="422.2881" x2="427.4786" y1="-610.9287" y2="-594.4409">
-<stop offset="0" style="stop-color:#FEE16E"/>
-<stop offset="0.7576" style="stop-color:#D96900"/>
-<stop offset="1" style="stop-color:#FED43A"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M35.853,20.016l1.178,1.981c0.302,0.515,0.972,0.674,1.569,0.422l4.09-2.334l8.043-4.668  c0.632-0.363,0.878-1.119,0.549-1.686c0,0-0.333-0.501-1.349-1.751L35.853,20.016z" fill="url(#SVGID_4_)"/>
-<path d="M21.798,35.65l-0.725-0.472l-9.215,13.486c0.216,0.204,0.43,0.414,0.639,0.598  C13.691,50.317,21.798,35.65,21.798,35.65z" fill="#020202" fill-opacity="0.5" stroke-opacity="0.5"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="439.6982" x2="451.5232" y1="-577.7549" y2="-564.7323">
-<stop offset="0" style="stop-color:#FEE16E"/>
-<stop offset="0.7576" style="stop-color:#D96900"/>
-<stop offset="1" style="stop-color:#FED43A"/>
+<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"/>
 </linearGradient>
-<path d="M12.498,49.262c1.193,1.05,1.686,1.37,1.686,1.37c0.567,0.367,1.363,0.169,1.781-0.442l7.9-11.605  c0.419-0.614,0.307-1.411-0.26-1.777l-1.808-1.156L12.498,49.262z" fill="url(#SVGID_5_)"/>
+<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"/>
+</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"/>
+</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(0.5 0 0 0.5 30 30)">
-<path d="M30,54.705C16.376,54.705,5.294,43.623,5.294,30  C5.294,16.376,16.376,5.294,30,5.294c13.623,0,24.705,11.083,24.705,24.706C54.705,43.623,43.623,54.705,30,54.705L30,54.705z" style="opacity:0.6;enable-background:new    ;"/>
-<radialGradient cx="2.7217" cy="-242.9165" gradientTransform="matrix(0.618 0 0 -0.618 28.3176 -128.0637)" gradientUnits="userSpaceOnUse" id="SVGID_1__" r="48.9069">
+<g transform="matrix(1 0 0 1 30 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"/>
 </radialGradient>
-<circle cx="30" cy="30" r="22.941" style="fill:url(#SVGID_1__);"/>
-<path d="M52.122,28.744c-0.509-8.961-6.312-16.677-14.788-19.661l-1.032,0.169  l-5.995-1.147l-7.474,4.456l-0.281,1.878h-4.336l1.714,2.914l-4.643,3.787l-1.082,4.675l3.834,6.795l3.914-0.799l1.429,1.229  l1.117,0.111l0.738,2.883l-0.974,2.527l3.552,9.086h3.623l3.592-2.9v-1.185l0.947-1.47l0.783-0.4  c-0.199,0.303-0.512,0.998-0.512,0.998c-0.033,0.236,0.51,4.862,2.104,4.5c1.211-0.273,5.533-8.303,5.615-9.066  c0.164-1.51-0.658-2.134-1.162-2.37l-0.562-0.265l-2.58,2.587c-0.276,0.021-0.526,0.067-0.751,0.134v-2.147l2.802-2.737l1.426-4.595  l2.173-1.769l-0.477-0.866l1.639-1.578l-0.916-1.669l0.697,0.084l4.082,9.138l0.836-0.666c-0.025-0.447-0.074-0.887-0.125-1.329  L52.122,28.744z M30.275,18.466l-0.341-0.911h2.049l0.997,2.243h-1.484v-1.333H30.275z M37.035,22.983l1.637,2.388l0.111,0.286  l-1.677-1.013l-0.401-1.445L37.035,22.983z M39.496,27.155l0.494,0.494l-0.639,0.143l-0.145-0.177L39.496,27.155z M26.695,11.093  l1.041,1.611l-1.183,0.362l-0.462-0.263L26.695,11.093z" style="opacity:0.3;enable-background:new    ;"/>
-<path d="M30,7.059C17.331,7.059,7.059,17.331,7.059,30  c0,12.674,10.272,22.941,22.941,22.941c12.674,0,22.941-10.268,22.941-22.941C52.941,17.331,42.674,7.059,30,7.059z M30,51.176  C18.323,51.176,8.823,41.677,8.823,30c0-11.677,9.5-21.177,21.177-21.177c11.677,0,21.176,9.5,21.176,21.177  C51.176,41.677,41.677,51.176,30,51.176z" style="opacity:0.3;fill:url(#SVGID_2__);enable-background:new    ;"/>
-<radialGradient cx="182.1514" cy="-162.9028" gradientTransform="matrix(1.7647 0 0 -1.7647 -290.1173 -274.2362)" gradientUnits="userSpaceOnUse" id="SVGID_3__" r="15.4155">
+<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"/>
+</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"/>
 </radialGradient>
-<path d="M42.431,36.555l-2.388,2.391c0,0-1.443,0-1.511,0.572c-0.032,0.246-0.111,1.313-0.354,1.863  c-0.48,0.332-1.054,1.434-1.054,1.434s-0.298,2.129,1.296,1.768C40.004,44.224,44.883,37.707,42.431,36.555z" style="fill:url(#SVGID_3__);"/>
-<radialGradient cx="182.1514" cy="-162.9023" gradientTransform="matrix(1.7647 0 0 -1.7647 -290.1173 -274.2362)" gradientUnits="userSpaceOnUse" id="SVGID_4__" r="17.8322">
+<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"/>
 </radialGradient>
-<path d="M37.041,9.916c-0.392,0.148-0.66,0.25-0.66,0.25L30.48,9.037l-2.894,1.811l1.523,2.356  l-2.663,0.819l-1.435-0.819l0.504-1.431l-1.871,1.295l-0.333,2.255h-3.554l1.314,2.238l-4.996,4.073l-0.94,4.066l1.855,3.591  L18.104,30l3.914-0.799l1.43,1.228l1.299,0.127l1.414,5.53l-0.941,2.446l2.079,4.595l0.585,1.908h3.623l2.048-1.108l1.543-1.793  v-2.169l2.936-1.498v-3.213l1.16-2.208l2.59-2.329l0.619-2.7l-3.387,0.755l-0.891-1.085l0.633-1.013l-2.404-1.454l-1.025-3.687  l1.776-1.158l1.636,2.388l0.613,1.572l1.228,1.229l1.435,0.75l1.594-0.258l1.77-1.703l-1.246-2.273l-1.568,0.409L41.146,20.8  l1.349-0.94l4.23,0.512v1.505l3.681,7.585l0.837-0.669C50.746,20.045,44.965,12.704,37.041,9.916z M35.119,20.169l-1.932,0.512  h-2.573v-1.333h-2.46l-1.946,0.514l-2.966-0.821l-0.821-1.535l4.096-0.921h4.098L30,14.945h2.049l1.14,2.561l1.933,0.678v1.985  H35.119z M39.523,16.79l-3.482-0.616v-1.228l1.741-0.41l0.512-0.614l1.229,1.023L39.523,16.79L39.523,16.79z" style="fill:url(#SVGID_4__);"/>
-<rect height="60" style="fill:none;" width="60"/>
-<defs>
-<linearGradient gradientTransform="matrix(1.7647 0 0 -1.7647 -290.1173 -274.2362)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="181.4004" x2="181.4004" y1="-159.4634" y2="-185.5335">
-<stop offset="0" style="stop-color:#31A7F8"/>
-<stop offset="0.497" style="stop-color:#1E74DC"/>
-<stop offset="1" style="stop-color:#C8E4EB"/>
-</linearGradient>
-</defs>
+<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>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_dialled_call.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,96 +1,93 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5609 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="423.0967" x2="429.6527" y1="-578.646" y2="-582.908">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.6061" style="stop-color:#154EBD"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
-</linearGradient>
-<path d="M19.081,33.911c2.089-3.597,4.591-6.497,7.281-9.189c2.593-2.591,6.72-5.3,8.562-6.256l9.604-10.282  c-0.845-0.3-3.693-0.464-7.279,0.616c-3.586,1.083-11.736,6.303-16.979,11.547c-5.242,5.246-9.727,12.347-10.581,14.595  c-1.343,3.541-1.221,7.445-0.929,8.581c0,0,0.34,1.034,1.144,2.377C10.248,46.476,19.081,33.911,19.081,33.911z" fill="url(#SVGID_1_)"/>
-<path d="M31.184,20.8c1.488-1.036,2.87-1.882,3.74-2.334L44.271,8.46  c-0.132-0.058-0.209-0.088-0.209-0.088c-0.247-0.088-0.642-0.162-1.124-0.219c-0.793,0.006-1.596,0.093-2.401,0.27  C34.843,9.673,31.019,14.958,31.184,20.8z" fill="#020202" fill-opacity="0.05" stroke-opacity="0.05"/>
-<path d="M31.906,20.306c1.205-0.809,2.291-1.462,3.018-1.84l9.377-10.04  c-0.146-0.063-0.233-0.098-0.233-0.098c-0.231-0.08-0.604-0.152-1.06-0.203c-0.751,0.006-1.51,0.087-2.27,0.253  C35.275,9.576,31.636,14.695,31.906,20.306z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M44.079,8.263c-0.21-0.073-0.55-0.137-0.962-0.186c-0.681,0.006-1.369,0.08-2.06,0.231  c-5.087,1.116-8.426,5.984-7.978,11.233c0.725-0.455,1.363-0.826,1.844-1.076l9.424-10.088C44.178,8.302,44.079,8.263,44.079,8.263z  " fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="43.3906" cy="8.9175" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="18.5073">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.6061" style="stop-color:#154EBD"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+<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"/>
 </radialGradient>
-<path d="M34.924,18.466l0.929,1.55c0,0,15.101-6.784,14.084-8.038c-0.513-0.631-0.577-0.656-1.237-1.263  c-1.985-1.815-4.172-2.531-4.172-2.531c-0.186-0.063-0.481-0.12-0.845-0.161c-0.596,0.004-1.2,0.068-1.806,0.201  c-4.591,1.009-7.57,5.501-6.963,10.257C34.916,18.477,34.921,18.47,34.924,18.466z" fill="url(#SVGID_2_)"/>
-<path d="M17.483,34.106c-0.988-0.14-2.007-0.119-3.027,0.105c-2.418,0.53-4.376,2.066-5.646,4.131  c-0.367,2.35-0.25,4.407-0.05,5.18c0,0,0.34,1.034,1.144,2.377c0.29,0.482,6.54-8.264,8.556-11.107L17.483,34.106z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M18.366,34.136c-0.989-0.14-2.008-0.118-3.029,0.105c-3.313,0.727-5.775,3.332-6.76,6.623  c-0.026,1.025,0.034,1.872,0.127,2.397c0.003,0.013,0.005,0.034,0.01,0.048c0,0,0.34,1.033,1.144,2.379  c0.3,0.498,6.981-8.888,8.75-11.384L18.366,34.136z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="437.4258" cy="-571.231" gradientTransform="matrix(0.2095 0.9787 -0.9682 0.2124 -629.4526 -270.6148)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="14.6198">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.6061" style="stop-color:#154EBD"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
-</radialGradient>
-<path d="M11.202,47.738c0.616,0.74,0.646,0.954,1.295,1.524c1.194,1.055,9.301-13.612,9.301-13.612  l-2.683-1.719c-0.941-0.111-1.914-0.079-2.89,0.136c-4.777,1.048-7.806,5.868-6.87,10.832C9.749,45.686,10.349,46.71,11.202,47.738z  " fill="url(#SVGID_3_)"/>
-<path d="M49.937,11.978c-0.179-0.22-0.381-0.446-0.578-0.67l-13.944,7.959l0.438,0.749  C35.853,20.016,50.953,13.231,49.937,11.978z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="422.2881" x2="427.4786" y1="-610.9287" y2="-594.4409">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.8121" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M35.853,20.016l1.178,1.981c0.302,0.515,0.972,0.674,1.569,0.422l4.09-2.334l8.043-4.668  c0.632-0.363,0.878-1.119,0.549-1.686c0,0-0.333-0.501-1.349-1.751L35.853,20.016z" fill="url(#SVGID_4_)"/>
-<path d="M21.798,35.65l-0.725-0.472l-9.215,13.486c0.216,0.204,0.43,0.414,0.639,0.598  C13.691,50.317,21.798,35.65,21.798,35.65z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="439.6982" x2="451.5232" y1="-577.7549" y2="-564.7323">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.8121" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+<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"/>
 </linearGradient>
-<path d="M12.498,49.262c1.193,1.05,1.686,1.37,1.686,1.37c0.567,0.367,1.363,0.169,1.781-0.442l7.9-11.605  c0.419-0.614,0.307-1.411-0.26-1.777l-1.808-1.156L12.498,49.262z" fill="url(#SVGID_5_)"/>
+<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"/>
+</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"/>
+</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(0.5 0 0 0.5 30 30)">
-<path d="M30,54.705C16.376,54.705,5.294,43.623,5.294,30  C5.294,16.376,16.376,5.294,30,5.294c13.623,0,24.705,11.083,24.705,24.706C54.705,43.623,43.623,54.705,30,54.705L30,54.705z" style="opacity:0.6;enable-background:new    ;"/>
-<radialGradient cx="2.7217" cy="-242.9165" gradientTransform="matrix(0.618 0 0 -0.618 28.3176 -128.0637)" gradientUnits="userSpaceOnUse" id="SVGID_1__" r="48.9069">
+<g transform="matrix(1 0 0 1 30 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"/>
 </radialGradient>
-<circle cx="30" cy="30" r="22.941" style="fill:url(#SVGID_1__);"/>
-<path d="M52.122,28.744c-0.509-8.961-6.312-16.677-14.788-19.661l-1.032,0.169  l-5.995-1.147l-7.474,4.456l-0.281,1.878h-4.336l1.714,2.914l-4.643,3.787l-1.082,4.675l3.834,6.795l3.914-0.799l1.429,1.229  l1.117,0.111l0.738,2.883l-0.974,2.527l3.552,9.086h3.623l3.592-2.9v-1.185l0.947-1.47l0.783-0.4  c-0.199,0.303-0.512,0.998-0.512,0.998c-0.033,0.236,0.51,4.862,2.104,4.5c1.211-0.273,5.533-8.303,5.615-9.066  c0.164-1.51-0.658-2.134-1.162-2.37l-0.562-0.265l-2.58,2.587c-0.276,0.021-0.526,0.067-0.751,0.134v-2.147l2.802-2.737l1.426-4.595  l2.173-1.769l-0.477-0.866l1.639-1.578l-0.916-1.669l0.697,0.084l4.082,9.138l0.836-0.666c-0.025-0.447-0.074-0.887-0.125-1.329  L52.122,28.744z M30.275,18.466l-0.341-0.911h2.049l0.997,2.243h-1.484v-1.333H30.275z M37.035,22.983l1.637,2.388l0.111,0.286  l-1.677-1.013l-0.401-1.445L37.035,22.983z M39.496,27.155l0.494,0.494l-0.639,0.143l-0.145-0.177L39.496,27.155z M26.695,11.093  l1.041,1.611l-1.183,0.362l-0.462-0.263L26.695,11.093z" style="opacity:0.3;enable-background:new    ;"/>
-<path d="M30,7.059C17.331,7.059,7.059,17.331,7.059,30  c0,12.674,10.272,22.941,22.941,22.941c12.674,0,22.941-10.268,22.941-22.941C52.941,17.331,42.674,7.059,30,7.059z M30,51.176  C18.323,51.176,8.823,41.677,8.823,30c0-11.677,9.5-21.177,21.177-21.177c11.677,0,21.176,9.5,21.176,21.177  C51.176,41.677,41.677,51.176,30,51.176z" style="opacity:0.3;fill:url(#SVGID_2__);enable-background:new    ;"/>
-<radialGradient cx="182.1514" cy="-162.9028" gradientTransform="matrix(1.7647 0 0 -1.7647 -290.1173 -274.2362)" gradientUnits="userSpaceOnUse" id="SVGID_3__" r="15.4155">
+<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"/>
+</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"/>
 </radialGradient>
-<path d="M42.431,36.555l-2.388,2.391c0,0-1.443,0-1.511,0.572c-0.032,0.246-0.111,1.313-0.354,1.863  c-0.48,0.332-1.054,1.434-1.054,1.434s-0.298,2.129,1.296,1.768C40.004,44.224,44.883,37.707,42.431,36.555z" style="fill:url(#SVGID_3__);"/>
-<radialGradient cx="182.1514" cy="-162.9023" gradientTransform="matrix(1.7647 0 0 -1.7647 -290.1173 -274.2362)" gradientUnits="userSpaceOnUse" id="SVGID_4__" r="17.8322">
+<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"/>
 </radialGradient>
-<path d="M37.041,9.916c-0.392,0.148-0.66,0.25-0.66,0.25L30.48,9.037l-2.894,1.811l1.523,2.356  l-2.663,0.819l-1.435-0.819l0.504-1.431l-1.871,1.295l-0.333,2.255h-3.554l1.314,2.238l-4.996,4.073l-0.94,4.066l1.855,3.591  L18.104,30l3.914-0.799l1.43,1.228l1.299,0.127l1.414,5.53l-0.941,2.446l2.079,4.595l0.585,1.908h3.623l2.048-1.108l1.543-1.793  v-2.169l2.936-1.498v-3.213l1.16-2.208l2.59-2.329l0.619-2.7l-3.387,0.755l-0.891-1.085l0.633-1.013l-2.404-1.454l-1.025-3.687  l1.776-1.158l1.636,2.388l0.613,1.572l1.228,1.229l1.435,0.75l1.594-0.258l1.77-1.703l-1.246-2.273l-1.568,0.409L41.146,20.8  l1.349-0.94l4.23,0.512v1.505l3.681,7.585l0.837-0.669C50.746,20.045,44.965,12.704,37.041,9.916z M35.119,20.169l-1.932,0.512  h-2.573v-1.333h-2.46l-1.946,0.514l-2.966-0.821l-0.821-1.535l4.096-0.921h4.098L30,14.945h2.049l1.14,2.561l1.933,0.678v1.985  H35.119z M39.523,16.79l-3.482-0.616v-1.228l1.741-0.41l0.512-0.614l1.229,1.023L39.523,16.79L39.523,16.79z" style="fill:url(#SVGID_4__);"/>
-<rect height="60" style="fill:none;" width="60"/>
-<defs>
-<linearGradient gradientTransform="matrix(1.7647 0 0 -1.7647 -290.1173 -274.2362)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="181.4004" x2="181.4004" y1="-159.4634" y2="-185.5335">
-<stop offset="0" style="stop-color:#31A7F8"/>
-<stop offset="0.497" style="stop-color:#1E74DC"/>
-<stop offset="1" style="stop-color:#C8E4EB"/>
-</linearGradient>
-</defs>
+<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>
-<g transform="matrix(0.5 0 0 0.5 0 0)">
-<rect fill="none" height="60" width="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="29.96" x2="29.95" y1="3.99" y2="53.51">
-<stop offset="0" stop-color="#45E8FF"/>
-<stop offset="0.15" stop-color="#45E8FF"/>
-<stop offset="0.56" stop-color="#30A4D5"/>
-<stop offset="1" stop-color="#1347BA"/>
+<g>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_1)" points="50.762,28.576 30.054,7.056 9.146,28.576 20.414,28.576 20.42,53.164 39.73,53.168 39.727,28.576 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="30" x2="30" y1="6.47" y2="29.15">
-<stop offset="0" stop-color="#B3FCFF"/>
-<stop offset="0.42" stop-color="#B3FCFF"/>
-<stop offset="1" stop-color="#5FBAD8"/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_2)" points="9.794,28.572 30.052,7.776 50.208,28.576 51.602,28.576 30.054,6.34 8.398,28.572 "/>
-<line fill="none" x1="20.42" x2="39.73" y1="53.156" y2="53.16"/>
-<polygon fill="#33AEDB" points="39.734,53.66 20.42,53.656 20.42,52.656 39.732,52.66 "/>
-<rect fill="none" height="60" width="60"/>
+<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 "/>
+<rect fill="none" height="30" width="30" x="0.152" y="0.436"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_missed_call.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,91 +1,93 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5609 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="423.0967" x2="429.6527" y1="-578.646" y2="-582.908">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.6061" style="stop-color:#154EBD"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
-</linearGradient>
-<path d="M19.081,33.911c2.089-3.597,4.591-6.497,7.281-9.189c2.593-2.591,6.72-5.3,8.562-6.256l9.604-10.282  c-0.845-0.3-3.693-0.464-7.279,0.616c-3.586,1.083-11.736,6.303-16.979,11.547c-5.242,5.246-9.727,12.347-10.581,14.595  c-1.343,3.541-1.221,7.445-0.929,8.581c0,0,0.34,1.034,1.144,2.377C10.248,46.476,19.081,33.911,19.081,33.911z" fill="url(#SVGID_1_)"/>
-<path d="M31.184,20.8c1.488-1.036,2.87-1.882,3.74-2.334L44.271,8.46  c-0.132-0.058-0.209-0.088-0.209-0.088c-0.247-0.088-0.642-0.162-1.124-0.219c-0.793,0.006-1.596,0.093-2.401,0.27  C34.843,9.673,31.019,14.958,31.184,20.8z" fill="#020202" fill-opacity="0.05" stroke-opacity="0.05"/>
-<path d="M31.906,20.306c1.205-0.809,2.291-1.462,3.018-1.84l9.377-10.04  c-0.146-0.063-0.233-0.098-0.233-0.098c-0.231-0.08-0.604-0.152-1.06-0.203c-0.751,0.006-1.51,0.087-2.27,0.253  C35.275,9.576,31.636,14.695,31.906,20.306z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M44.079,8.263c-0.21-0.073-0.55-0.137-0.962-0.186c-0.681,0.006-1.369,0.08-2.06,0.231  c-5.087,1.116-8.426,5.984-7.978,11.233c0.725-0.455,1.363-0.826,1.844-1.076l9.424-10.088C44.178,8.302,44.079,8.263,44.079,8.263z  " fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="43.3906" cy="8.9175" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="18.5073">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.6061" style="stop-color:#154EBD"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+<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"/>
 </radialGradient>
-<path d="M34.924,18.466l0.929,1.55c0,0,15.101-6.784,14.084-8.038c-0.513-0.631-0.577-0.656-1.237-1.263  c-1.985-1.815-4.172-2.531-4.172-2.531c-0.186-0.063-0.481-0.12-0.845-0.161c-0.596,0.004-1.2,0.068-1.806,0.201  c-4.591,1.009-7.57,5.501-6.963,10.257C34.916,18.477,34.921,18.47,34.924,18.466z" fill="url(#SVGID_2_)"/>
-<path d="M17.483,34.106c-0.988-0.14-2.007-0.119-3.027,0.105c-2.418,0.53-4.376,2.066-5.646,4.131  c-0.367,2.35-0.25,4.407-0.05,5.18c0,0,0.34,1.034,1.144,2.377c0.29,0.482,6.54-8.264,8.556-11.107L17.483,34.106z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M18.366,34.136c-0.989-0.14-2.008-0.118-3.029,0.105c-3.313,0.727-5.775,3.332-6.76,6.623  c-0.026,1.025,0.034,1.872,0.127,2.397c0.003,0.013,0.005,0.034,0.01,0.048c0,0,0.34,1.033,1.144,2.379  c0.3,0.498,6.981-8.888,8.75-11.384L18.366,34.136z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="437.4258" cy="-571.231" gradientTransform="matrix(0.2095 0.9787 -0.9682 0.2124 -629.4526 -270.6148)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="14.6198">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.6061" style="stop-color:#154EBD"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
-</radialGradient>
-<path d="M11.202,47.738c0.616,0.74,0.646,0.954,1.295,1.524c1.194,1.055,9.301-13.612,9.301-13.612  l-2.683-1.719c-0.941-0.111-1.914-0.079-2.89,0.136c-4.777,1.048-7.806,5.868-6.87,10.832C9.749,45.686,10.349,46.71,11.202,47.738z  " fill="url(#SVGID_3_)"/>
-<path d="M49.937,11.978c-0.179-0.22-0.381-0.446-0.578-0.67l-13.944,7.959l0.438,0.749  C35.853,20.016,50.953,13.231,49.937,11.978z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="422.2881" x2="427.4786" y1="-610.9287" y2="-594.4409">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.8121" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M35.853,20.016l1.178,1.981c0.302,0.515,0.972,0.674,1.569,0.422l4.09-2.334l8.043-4.668  c0.632-0.363,0.878-1.119,0.549-1.686c0,0-0.333-0.501-1.349-1.751L35.853,20.016z" fill="url(#SVGID_4_)"/>
-<path d="M21.798,35.65l-0.725-0.472l-9.215,13.486c0.216,0.204,0.43,0.414,0.639,0.598  C13.691,50.317,21.798,35.65,21.798,35.65z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="439.6982" x2="451.5232" y1="-577.7549" y2="-564.7323">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.8121" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+<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"/>
 </linearGradient>
-<path d="M12.498,49.262c1.193,1.05,1.686,1.37,1.686,1.37c0.567,0.367,1.363,0.169,1.781-0.442l7.9-11.605  c0.419-0.614,0.307-1.411-0.26-1.777l-1.808-1.156L12.498,49.262z" fill="url(#SVGID_5_)"/>
+<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"/>
+</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"/>
+</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(0.5 0 0 0.5 30 30)">
-<path d="M30,54.705C16.376,54.705,5.294,43.623,5.294,30  C5.294,16.376,16.376,5.294,30,5.294c13.623,0,24.705,11.083,24.705,24.706C54.705,43.623,43.623,54.705,30,54.705L30,54.705z" style="opacity:0.6;enable-background:new    ;"/>
-<radialGradient cx="2.7217" cy="-242.9165" gradientTransform="matrix(0.618 0 0 -0.618 28.3176 -128.0637)" gradientUnits="userSpaceOnUse" id="SVGID_1__" r="48.9069">
+<g transform="matrix(1 0 0 1 30 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"/>
 </radialGradient>
-<circle cx="30" cy="30" r="22.941" style="fill:url(#SVGID_1__);"/>
-<path d="M52.122,28.744c-0.509-8.961-6.312-16.677-14.788-19.661l-1.032,0.169  l-5.995-1.147l-7.474,4.456l-0.281,1.878h-4.336l1.714,2.914l-4.643,3.787l-1.082,4.675l3.834,6.795l3.914-0.799l1.429,1.229  l1.117,0.111l0.738,2.883l-0.974,2.527l3.552,9.086h3.623l3.592-2.9v-1.185l0.947-1.47l0.783-0.4  c-0.199,0.303-0.512,0.998-0.512,0.998c-0.033,0.236,0.51,4.862,2.104,4.5c1.211-0.273,5.533-8.303,5.615-9.066  c0.164-1.51-0.658-2.134-1.162-2.37l-0.562-0.265l-2.58,2.587c-0.276,0.021-0.526,0.067-0.751,0.134v-2.147l2.802-2.737l1.426-4.595  l2.173-1.769l-0.477-0.866l1.639-1.578l-0.916-1.669l0.697,0.084l4.082,9.138l0.836-0.666c-0.025-0.447-0.074-0.887-0.125-1.329  L52.122,28.744z M30.275,18.466l-0.341-0.911h2.049l0.997,2.243h-1.484v-1.333H30.275z M37.035,22.983l1.637,2.388l0.111,0.286  l-1.677-1.013l-0.401-1.445L37.035,22.983z M39.496,27.155l0.494,0.494l-0.639,0.143l-0.145-0.177L39.496,27.155z M26.695,11.093  l1.041,1.611l-1.183,0.362l-0.462-0.263L26.695,11.093z" style="opacity:0.3;enable-background:new    ;"/>
-<path d="M30,7.059C17.331,7.059,7.059,17.331,7.059,30  c0,12.674,10.272,22.941,22.941,22.941c12.674,0,22.941-10.268,22.941-22.941C52.941,17.331,42.674,7.059,30,7.059z M30,51.176  C18.323,51.176,8.823,41.677,8.823,30c0-11.677,9.5-21.177,21.177-21.177c11.677,0,21.176,9.5,21.176,21.177  C51.176,41.677,41.677,51.176,30,51.176z" style="opacity:0.3;fill:url(#SVGID_2__);enable-background:new    ;"/>
-<radialGradient cx="182.1514" cy="-162.9028" gradientTransform="matrix(1.7647 0 0 -1.7647 -290.1173 -274.2362)" gradientUnits="userSpaceOnUse" id="SVGID_3__" r="15.4155">
+<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"/>
+</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"/>
 </radialGradient>
-<path d="M42.431,36.555l-2.388,2.391c0,0-1.443,0-1.511,0.572c-0.032,0.246-0.111,1.313-0.354,1.863  c-0.48,0.332-1.054,1.434-1.054,1.434s-0.298,2.129,1.296,1.768C40.004,44.224,44.883,37.707,42.431,36.555z" style="fill:url(#SVGID_3__);"/>
-<radialGradient cx="182.1514" cy="-162.9023" gradientTransform="matrix(1.7647 0 0 -1.7647 -290.1173 -274.2362)" gradientUnits="userSpaceOnUse" id="SVGID_4__" r="17.8322">
+<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"/>
 </radialGradient>
-<path d="M37.041,9.916c-0.392,0.148-0.66,0.25-0.66,0.25L30.48,9.037l-2.894,1.811l1.523,2.356  l-2.663,0.819l-1.435-0.819l0.504-1.431l-1.871,1.295l-0.333,2.255h-3.554l1.314,2.238l-4.996,4.073l-0.94,4.066l1.855,3.591  L18.104,30l3.914-0.799l1.43,1.228l1.299,0.127l1.414,5.53l-0.941,2.446l2.079,4.595l0.585,1.908h3.623l2.048-1.108l1.543-1.793  v-2.169l2.936-1.498v-3.213l1.16-2.208l2.59-2.329l0.619-2.7l-3.387,0.755l-0.891-1.085l0.633-1.013l-2.404-1.454l-1.025-3.687  l1.776-1.158l1.636,2.388l0.613,1.572l1.228,1.229l1.435,0.75l1.594-0.258l1.77-1.703l-1.246-2.273l-1.568,0.409L41.146,20.8  l1.349-0.94l4.23,0.512v1.505l3.681,7.585l0.837-0.669C50.746,20.045,44.965,12.704,37.041,9.916z M35.119,20.169l-1.932,0.512  h-2.573v-1.333h-2.46l-1.946,0.514l-2.966-0.821l-0.821-1.535l4.096-0.921h4.098L30,14.945h2.049l1.14,2.561l1.933,0.678v1.985  H35.119z M39.523,16.79l-3.482-0.616v-1.228l1.741-0.41l0.512-0.614l1.229,1.023L39.523,16.79L39.523,16.79z" style="fill:url(#SVGID_4__);"/>
-<rect height="60" style="fill:none;" width="60"/>
-<defs>
-<linearGradient gradientTransform="matrix(1.7647 0 0 -1.7647 -290.1173 -274.2362)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="181.4004" x2="181.4004" y1="-159.4634" y2="-185.5335">
-<stop offset="0" style="stop-color:#31A7F8"/>
-<stop offset="0.497" style="stop-color:#1E74DC"/>
-<stop offset="1" style="stop-color:#C8E4EB"/>
-</linearGradient>
-</defs>
+<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>
-<g transform="matrix(0.5 0 0 0.5 0 0)">
-<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="9.06" y2="54.1">
-<stop offset="0" stop-color="#FF7042"/>
-<stop offset="1" stop-color="#991B23"/>
+<g>
+<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"/>
 </linearGradient>
-<path d="M38.036,33.691V25.06h9.069L30.082,7.372L12.898,25.06h9.262v8.631 c0,14.586,12.136,18.935,23.816,18.935V39.782C42.378,39.782,38.036,38.004,38.036,33.691z" fill="url(#SVGID_1)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="30" x2="30" y1="8.03" y2="25.63">
-<stop offset="0" stop-color="#FFBE82"/>
-<stop offset="1" stop-color="#991B23"/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_2)" points="30.082,9.016 45.523,25.058 47.105,25.058 30.082,7.372 12.898,25.058 14.496,25.058 "/>
+<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"/>
+</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>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_received_call.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,96 +1,93 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5609 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="423.0967" x2="429.6527" y1="-578.646" y2="-582.908">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.6061" style="stop-color:#154EBD"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
-</linearGradient>
-<path d="M19.081,33.911c2.089-3.597,4.591-6.497,7.281-9.189c2.593-2.591,6.72-5.3,8.562-6.256l9.604-10.282  c-0.845-0.3-3.693-0.464-7.279,0.616c-3.586,1.083-11.736,6.303-16.979,11.547c-5.242,5.246-9.727,12.347-10.581,14.595  c-1.343,3.541-1.221,7.445-0.929,8.581c0,0,0.34,1.034,1.144,2.377C10.248,46.476,19.081,33.911,19.081,33.911z" fill="url(#SVGID_1_)"/>
-<path d="M31.184,20.8c1.488-1.036,2.87-1.882,3.74-2.334L44.271,8.46  c-0.132-0.058-0.209-0.088-0.209-0.088c-0.247-0.088-0.642-0.162-1.124-0.219c-0.793,0.006-1.596,0.093-2.401,0.27  C34.843,9.673,31.019,14.958,31.184,20.8z" fill="#020202" fill-opacity="0.05" stroke-opacity="0.05"/>
-<path d="M31.906,20.306c1.205-0.809,2.291-1.462,3.018-1.84l9.377-10.04  c-0.146-0.063-0.233-0.098-0.233-0.098c-0.231-0.08-0.604-0.152-1.06-0.203c-0.751,0.006-1.51,0.087-2.27,0.253  C35.275,9.576,31.636,14.695,31.906,20.306z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M44.079,8.263c-0.21-0.073-0.55-0.137-0.962-0.186c-0.681,0.006-1.369,0.08-2.06,0.231  c-5.087,1.116-8.426,5.984-7.978,11.233c0.725-0.455,1.363-0.826,1.844-1.076l9.424-10.088C44.178,8.302,44.079,8.263,44.079,8.263z  " fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="43.3906" cy="8.9175" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="18.5073">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.6061" style="stop-color:#154EBD"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+<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"/>
 </radialGradient>
-<path d="M34.924,18.466l0.929,1.55c0,0,15.101-6.784,14.084-8.038c-0.513-0.631-0.577-0.656-1.237-1.263  c-1.985-1.815-4.172-2.531-4.172-2.531c-0.186-0.063-0.481-0.12-0.845-0.161c-0.596,0.004-1.2,0.068-1.806,0.201  c-4.591,1.009-7.57,5.501-6.963,10.257C34.916,18.477,34.921,18.47,34.924,18.466z" fill="url(#SVGID_2_)"/>
-<path d="M17.483,34.106c-0.988-0.14-2.007-0.119-3.027,0.105c-2.418,0.53-4.376,2.066-5.646,4.131  c-0.367,2.35-0.25,4.407-0.05,5.18c0,0,0.34,1.034,1.144,2.377c0.29,0.482,6.54-8.264,8.556-11.107L17.483,34.106z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M18.366,34.136c-0.989-0.14-2.008-0.118-3.029,0.105c-3.313,0.727-5.775,3.332-6.76,6.623  c-0.026,1.025,0.034,1.872,0.127,2.397c0.003,0.013,0.005,0.034,0.01,0.048c0,0,0.34,1.033,1.144,2.379  c0.3,0.498,6.981-8.888,8.75-11.384L18.366,34.136z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="437.4258" cy="-571.231" gradientTransform="matrix(0.2095 0.9787 -0.9682 0.2124 -629.4526 -270.6148)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="14.6198">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.6061" style="stop-color:#154EBD"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
-</radialGradient>
-<path d="M11.202,47.738c0.616,0.74,0.646,0.954,1.295,1.524c1.194,1.055,9.301-13.612,9.301-13.612  l-2.683-1.719c-0.941-0.111-1.914-0.079-2.89,0.136c-4.777,1.048-7.806,5.868-6.87,10.832C9.749,45.686,10.349,46.71,11.202,47.738z  " fill="url(#SVGID_3_)"/>
-<path d="M49.937,11.978c-0.179-0.22-0.381-0.446-0.578-0.67l-13.944,7.959l0.438,0.749  C35.853,20.016,50.953,13.231,49.937,11.978z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="422.2881" x2="427.4786" y1="-610.9287" y2="-594.4409">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.8121" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M35.853,20.016l1.178,1.981c0.302,0.515,0.972,0.674,1.569,0.422l4.09-2.334l8.043-4.668  c0.632-0.363,0.878-1.119,0.549-1.686c0,0-0.333-0.501-1.349-1.751L35.853,20.016z" fill="url(#SVGID_4_)"/>
-<path d="M21.798,35.65l-0.725-0.472l-9.215,13.486c0.216,0.204,0.43,0.414,0.639,0.598  C13.691,50.317,21.798,35.65,21.798,35.65z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="439.6982" x2="451.5232" y1="-577.7549" y2="-564.7323">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.8121" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+<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"/>
 </linearGradient>
-<path d="M12.498,49.262c1.193,1.05,1.686,1.37,1.686,1.37c0.567,0.367,1.363,0.169,1.781-0.442l7.9-11.605  c0.419-0.614,0.307-1.411-0.26-1.777l-1.808-1.156L12.498,49.262z" fill="url(#SVGID_5_)"/>
+<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"/>
+</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"/>
+</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(0.5 0 0 0.5 30 30)">
-<path d="M30,54.705C16.376,54.705,5.294,43.623,5.294,30  C5.294,16.376,16.376,5.294,30,5.294c13.623,0,24.705,11.083,24.705,24.706C54.705,43.623,43.623,54.705,30,54.705L30,54.705z" style="opacity:0.6;enable-background:new    ;"/>
-<radialGradient cx="2.7217" cy="-242.9165" gradientTransform="matrix(0.618 0 0 -0.618 28.3176 -128.0637)" gradientUnits="userSpaceOnUse" id="SVGID_1__" r="48.9069">
+<g transform="matrix(1 0 0 1 30 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"/>
 </radialGradient>
-<circle cx="30" cy="30" r="22.941" style="fill:url(#SVGID_1__);"/>
-<path d="M52.122,28.744c-0.509-8.961-6.312-16.677-14.788-19.661l-1.032,0.169  l-5.995-1.147l-7.474,4.456l-0.281,1.878h-4.336l1.714,2.914l-4.643,3.787l-1.082,4.675l3.834,6.795l3.914-0.799l1.429,1.229  l1.117,0.111l0.738,2.883l-0.974,2.527l3.552,9.086h3.623l3.592-2.9v-1.185l0.947-1.47l0.783-0.4  c-0.199,0.303-0.512,0.998-0.512,0.998c-0.033,0.236,0.51,4.862,2.104,4.5c1.211-0.273,5.533-8.303,5.615-9.066  c0.164-1.51-0.658-2.134-1.162-2.37l-0.562-0.265l-2.58,2.587c-0.276,0.021-0.526,0.067-0.751,0.134v-2.147l2.802-2.737l1.426-4.595  l2.173-1.769l-0.477-0.866l1.639-1.578l-0.916-1.669l0.697,0.084l4.082,9.138l0.836-0.666c-0.025-0.447-0.074-0.887-0.125-1.329  L52.122,28.744z M30.275,18.466l-0.341-0.911h2.049l0.997,2.243h-1.484v-1.333H30.275z M37.035,22.983l1.637,2.388l0.111,0.286  l-1.677-1.013l-0.401-1.445L37.035,22.983z M39.496,27.155l0.494,0.494l-0.639,0.143l-0.145-0.177L39.496,27.155z M26.695,11.093  l1.041,1.611l-1.183,0.362l-0.462-0.263L26.695,11.093z" style="opacity:0.3;enable-background:new    ;"/>
-<path d="M30,7.059C17.331,7.059,7.059,17.331,7.059,30  c0,12.674,10.272,22.941,22.941,22.941c12.674,0,22.941-10.268,22.941-22.941C52.941,17.331,42.674,7.059,30,7.059z M30,51.176  C18.323,51.176,8.823,41.677,8.823,30c0-11.677,9.5-21.177,21.177-21.177c11.677,0,21.176,9.5,21.176,21.177  C51.176,41.677,41.677,51.176,30,51.176z" style="opacity:0.3;fill:url(#SVGID_2__);enable-background:new    ;"/>
-<radialGradient cx="182.1514" cy="-162.9028" gradientTransform="matrix(1.7647 0 0 -1.7647 -290.1173 -274.2362)" gradientUnits="userSpaceOnUse" id="SVGID_3__" r="15.4155">
+<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"/>
+</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"/>
 </radialGradient>
-<path d="M42.431,36.555l-2.388,2.391c0,0-1.443,0-1.511,0.572c-0.032,0.246-0.111,1.313-0.354,1.863  c-0.48,0.332-1.054,1.434-1.054,1.434s-0.298,2.129,1.296,1.768C40.004,44.224,44.883,37.707,42.431,36.555z" style="fill:url(#SVGID_3__);"/>
-<radialGradient cx="182.1514" cy="-162.9023" gradientTransform="matrix(1.7647 0 0 -1.7647 -290.1173 -274.2362)" gradientUnits="userSpaceOnUse" id="SVGID_4__" r="17.8322">
+<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"/>
 </radialGradient>
-<path d="M37.041,9.916c-0.392,0.148-0.66,0.25-0.66,0.25L30.48,9.037l-2.894,1.811l1.523,2.356  l-2.663,0.819l-1.435-0.819l0.504-1.431l-1.871,1.295l-0.333,2.255h-3.554l1.314,2.238l-4.996,4.073l-0.94,4.066l1.855,3.591  L18.104,30l3.914-0.799l1.43,1.228l1.299,0.127l1.414,5.53l-0.941,2.446l2.079,4.595l0.585,1.908h3.623l2.048-1.108l1.543-1.793  v-2.169l2.936-1.498v-3.213l1.16-2.208l2.59-2.329l0.619-2.7l-3.387,0.755l-0.891-1.085l0.633-1.013l-2.404-1.454l-1.025-3.687  l1.776-1.158l1.636,2.388l0.613,1.572l1.228,1.229l1.435,0.75l1.594-0.258l1.77-1.703l-1.246-2.273l-1.568,0.409L41.146,20.8  l1.349-0.94l4.23,0.512v1.505l3.681,7.585l0.837-0.669C50.746,20.045,44.965,12.704,37.041,9.916z M35.119,20.169l-1.932,0.512  h-2.573v-1.333h-2.46l-1.946,0.514l-2.966-0.821l-0.821-1.535l4.096-0.921h4.098L30,14.945h2.049l1.14,2.561l1.933,0.678v1.985  H35.119z M39.523,16.79l-3.482-0.616v-1.228l1.741-0.41l0.512-0.614l1.229,1.023L39.523,16.79L39.523,16.79z" style="fill:url(#SVGID_4__);"/>
-<rect height="60" style="fill:none;" width="60"/>
-<defs>
-<linearGradient gradientTransform="matrix(1.7647 0 0 -1.7647 -290.1173 -274.2362)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="181.4004" x2="181.4004" y1="-159.4634" y2="-185.5335">
-<stop offset="0" style="stop-color:#31A7F8"/>
-<stop offset="0.497" style="stop-color:#1E74DC"/>
-<stop offset="1" style="stop-color:#C8E4EB"/>
-</linearGradient>
-</defs>
+<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>
-<g transform="matrix(0.5 0 0 0.5 0 0)">
-<rect fill="none" height="60" width="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="30.05" x2="30.04" y1="5.29" y2="53.46">
-<stop offset="0" stop-color="#C6FF45"/>
-<stop offset="0.73" stop-color="#66A00E"/>
-<stop offset="1" stop-color="#387300"/>
+<g>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_1)" points="9.296,32.451 29.883,53.938 50.791,32.426 39.523,32.422 39.515,5.833 20.331,5.831 20.331,32.449 "/>
-<line fill="none" x1="39.515" x2="20.331" y1="5.841" y2="5.84"/>
-<polygon fill="#E7FFB9" points="20.331,5.34 39.516,5.341 39.515,6.34 20.331,6.339 "/>
-<polygon fill="#E7FFB9" points="39.221,32.462 51.006,32.465 50.113,33.464 39.221,33.464 "/>
-<polygon fill="#E7FFB9" points="8.643,32.449 20.313,32.449 20.313,33.449 9.695,33.449 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="48.38" x2="10.72" y1="43.53" y2="43.53">
-<stop offset="0" stop-color="#AAE535"/>
-<stop offset="1" stop-color="#5D9C0A"/>
+<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 "/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_2)" points="50.141,32.424 29.883,53.221 9.849,32.397 8.458,32.4 29.881,54.655 51.54,32.424 "/>
-<rect fill="none" height="59.996" width="59.996"/>
+<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>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_waiting_call.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,44 +1,41 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="20.3613" x2="26.6141" y1="20.2744" y2="26.4485">
-<stop offset="0" style="stop-color:#FEE16E"/>
-<stop offset="0.5939" style="stop-color:#D96900"/>
-<stop offset="1" style="stop-color:#FED43A"/>
-</linearGradient>
-<path d="M19.081,33.911c2.089-3.597,4.591-6.497,7.281-9.189c2.593-2.591,6.72-5.3,8.562-6.256l9.604-10.282  c-0.845-0.3-3.693-0.464-7.279,0.616c-3.586,1.083-11.736,6.303-16.979,11.547c-5.242,5.246-9.727,12.347-10.581,14.595  c-1.343,3.541-1.221,7.445-0.929,8.581c0,0,0.34,1.034,1.144,2.377C10.248,46.476,19.081,33.911,19.081,33.911z" fill="url(#SVGID_1_)"/>
-<path d="M31.184,20.8c1.488-1.036,2.87-1.882,3.74-2.334L44.271,8.46  c-0.132-0.058-0.209-0.088-0.209-0.088c-0.247-0.088-0.642-0.162-1.124-0.219c-0.793,0.006-1.596,0.093-2.401,0.27  C34.843,9.673,31.019,14.958,31.184,20.8z" fill="#020202" fill-opacity="0.05" stroke-opacity="0.05"/>
-<path d="M31.906,20.306c1.205-0.809,2.291-1.462,3.018-1.84l9.377-10.04  c-0.146-0.063-0.233-0.098-0.233-0.098c-0.231-0.08-0.604-0.152-1.06-0.203c-0.751,0.006-1.51,0.087-2.27,0.253  C35.275,9.576,31.636,14.695,31.906,20.306z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M44.079,8.263c-0.21-0.073-0.55-0.137-0.962-0.186c-0.681,0.006-1.369,0.08-2.06,0.231  c-5.087,1.116-8.426,5.984-7.978,11.233c0.725-0.455,1.363-0.826,1.844-1.076l9.424-10.088C44.178,8.302,44.079,8.263,44.079,8.263z  " fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="43.6406" cy="10.1128" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="13.348">
-<stop offset="0" style="stop-color:#FEE16E"/>
-<stop offset="0.6061" style="stop-color:#F1830A"/>
-<stop offset="1" style="stop-color:#FED43A"/>
+<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"/>
 </radialGradient>
-<path d="M34.924,18.466l0.929,1.55c0,0,15.101-6.784,14.084-8.038c-0.513-0.631-0.577-0.656-1.237-1.263  c-1.985-1.815-4.172-2.531-4.172-2.531c-0.186-0.063-0.481-0.12-0.845-0.161c-0.596,0.004-1.2,0.068-1.806,0.201  c-4.591,1.009-7.57,5.501-6.963,10.257C34.916,18.477,34.921,18.47,34.924,18.466z" fill="url(#SVGID_2_)"/>
-<path d="M17.483,34.106c-0.988-0.14-2.007-0.119-3.027,0.105c-2.418,0.53-4.376,2.066-5.646,4.131  c-0.367,2.35-0.25,4.407-0.05,5.18c0,0,0.34,1.034,1.144,2.377c0.29,0.482,6.54-8.264,8.556-11.107L17.483,34.106z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M18.366,34.136c-0.989-0.14-2.008-0.118-3.029,0.105c-3.313,0.727-5.775,3.332-6.76,6.623  c-0.026,1.025,0.034,1.872,0.127,2.397c0.003,0.013,0.005,0.034,0.01,0.048c0,0,0.34,1.033,1.144,2.379  c0.3,0.498,6.981-8.888,8.75-11.384L18.366,34.136z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="437.4258" cy="-571.231" gradientTransform="matrix(0.2095 0.9787 -0.9682 0.2124 -629.4526 -270.6148)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="14.6198">
-<stop offset="0" style="stop-color:#FEE16E"/>
-<stop offset="0.6061" style="stop-color:#F1830A"/>
-<stop offset="1" style="stop-color:#FED43A"/>
-</radialGradient>
-<path d="M11.202,47.738c0.616,0.74,0.646,0.954,1.295,1.524c1.194,1.055,9.301-13.612,9.301-13.612  l-2.683-1.719c-0.941-0.111-1.914-0.079-2.89,0.136c-4.777,1.048-7.806,5.868-6.87,10.832C9.749,45.686,10.349,46.71,11.202,47.738z  " fill="url(#SVGID_3_)"/>
-<path d="M49.937,11.978c-0.179-0.22-0.381-0.446-0.578-0.67l-13.944,7.959l0.438,0.749  C35.853,20.016,50.953,13.231,49.937,11.978z" fill="#020202" fill-opacity="0.5" stroke-opacity="0.5"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="422.2881" x2="427.4786" y1="-610.9287" y2="-594.4409">
-<stop offset="0" style="stop-color:#FEE16E"/>
-<stop offset="0.7576" style="stop-color:#D96900"/>
-<stop offset="1" style="stop-color:#FED43A"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M35.853,20.016l1.178,1.981c0.302,0.515,0.972,0.674,1.569,0.422l4.09-2.334l8.043-4.668  c0.632-0.363,0.878-1.119,0.549-1.686c0,0-0.333-0.501-1.349-1.751L35.853,20.016z" fill="url(#SVGID_4_)"/>
-<path d="M21.798,35.65l-0.725-0.472l-9.215,13.486c0.216,0.204,0.43,0.414,0.639,0.598  C13.691,50.317,21.798,35.65,21.798,35.65z" fill="#020202" fill-opacity="0.5" stroke-opacity="0.5"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="439.6982" x2="451.5232" y1="-577.7549" y2="-564.7323">
-<stop offset="0" style="stop-color:#FEE16E"/>
-<stop offset="0.7576" style="stop-color:#D96900"/>
-<stop offset="1" style="stop-color:#FED43A"/>
+<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"/>
 </linearGradient>
-<path d="M12.498,49.262c1.193,1.05,1.686,1.37,1.686,1.37c0.567,0.367,1.363,0.169,1.781-0.442l7.9-11.605  c0.419-0.614,0.307-1.411-0.26-1.777l-1.808-1.156L12.498,49.262z" fill="url(#SVGID_5_)"/>
+<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"/>
+</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"/>
+</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>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_warning.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_warning.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<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"/>
+</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"/>
+</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"/>
+<circle cx="29.815" cy="46.689" fill-opacity="0.1" r="3.242" stroke-opacity="0.1"/>
+<rect fill-opacity="0.2" height="18.612" stroke-opacity="0.2" width="5.91" x="26.86" y="21.511"/>
+<circle cx="29.815" cy="46.08" fill-opacity="0.2" r="3.242" stroke-opacity="0.2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="29.8145" x2="29.8145" y1="20.8052" y2="48.7668">
+<stop offset="0" style="stop-color:#666666"/>
+<stop offset="1" style="stop-color:#000000"/>
+</linearGradient>
+<rect fill="url(#SVGID_3_)" height="18.612" width="5.91" x="26.86" y="20.902"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="29.8145" x2="29.8145" y1="42.1816" y2="48.7683">
+<stop offset="0" style="stop-color:#666666"/>
+<stop offset="1" style="stop-color:#000000"/>
+</linearGradient>
+<circle cx="29.815" cy="45.475" fill="url(#SVGID_4_)" r="3.242"/>
+<rect fill="none" height="60" width="60"/>
+</g>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_web_feeds.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,21 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<g>
 <rect fill="none" height="60" width="60"/>
-<path d="M51.316,47.294c0,2.219-1.801,4.02-4.023,4.02H12.708c-2.223,0-4.021-1.801-4.021-4.02V12.708 c0-2.222,1.799-4.022,4.021-4.022h34.585c2.223,0,4.023,1.801,4.023,4.022V47.294z" fill="#F7B388"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="10.55" x2="48.98" y1="10.55" y2="48.97">
-<stop offset="0" stop-color="#DF4F20"/>
-<stop offset="0.5" stop-color="#F48228"/>
-<stop offset="1" stop-color="#CF3A21"/>
+<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"/>
+<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"/>
 </linearGradient>
-<path d="M12.708,50.091c-1.542,0-2.797-1.256-2.797-2.797V12.708c0-1.544,1.255-2.799,2.797-2.799h34.585 c1.543,0,2.799,1.255,2.799,2.799v34.586c0,1.541-1.256,2.797-2.799,2.797H12.708z" fill="url(#SVGID_1)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="30" x2="30" y1="8.36" y2="51.47">
-<stop offset="0" stop-color="#C5422B"/>
-<stop offset="0.5" stop-color="#F48228"/>
-<stop offset="1" stop-color="#AD1B00"/>
+<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"/>
 </linearGradient>
-<path d="M47.385,9.252c1.855,0,3.363,1.509,3.363,3.362v34.772c0,1.854-1.508,3.361-3.363,3.361H12.614 c-1.854,0-3.362-1.508-3.362-3.361V12.614c0-1.854,1.509-3.362,3.362-3.362H47.385 M47.385,8.571H12.614 c-2.232,0-4.041,1.811-4.041,4.043v34.772c0,2.23,1.809,4.043,4.041,4.043h34.771c2.234,0,4.045-1.813,4.045-4.043V12.614 C51.43,10.382,49.619,8.571,47.385,8.571L47.385,8.571z" fill="url(#SVGID_2)"/>
-<circle cx="19.478" cy="40.523" fill="#FFFFFF" r="4.133"/>
-<path d="M39.146,44.197h5.51c0-15.91-12.943-28.852-28.853-28.852v5.51C28.675,20.854,39.146,31.326,39.146,44.197z" fill="#FFFFFF"/>
-<path d="M29.121,44.197h5.51c0-10.383-8.446-18.826-18.827-18.826v5.51C23.146,30.88,29.121,36.853,29.121,44.197z" fill="#FFFFFF"/>
+<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"/>
+<path d="M41.524,47.889h6.942c0-20.047-16.309-36.354-36.355-36.354v6.942C28.33,18.476,41.524,31.671,41.524,47.889  z" fill="#FFFFFF"/>
+<path d="M28.892,47.889h6.943c0-13.082-10.642-23.721-23.722-23.721v6.942  C21.364,31.108,28.892,38.636,28.892,47.889z" fill="#FFFFFF"/>
+</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_widget.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_widget.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</g>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_wlan.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_wlan.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_wlan.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,54 +1,73 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
 <rect fill="none" height="60" width="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="24.43" x2="35.83" y1="31.4" y2="31.4">
-<stop offset="0" stop-color="#DBDBDB"/>
-<stop offset="0.1" stop-color="#DBDBDB"/>
-<stop offset="0.68" stop-color="#919191"/>
-<stop offset="1" stop-color="#B8B8B8"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="22.8379" x2="37.5014" y1="31.7412" y2="31.7412">
+<stop offset="0" style="stop-color:#DBDBDB"/>
+<stop offset="0.097" style="stop-color:#DBDBDB"/>
+<stop offset="0.6848" style="stop-color:#919191"/>
+<stop offset="1" style="stop-color:#B8B8B8"/>
+</linearGradient>
+<path d="M37.109,51.521H22.957l3.86-36.345c0-1.776,1.44-3.216,3.216-3.216l0,0  c1.776,0,3.216,1.439,3.216,3.216L37.109,51.521z" fill="url(#SVGID_1_)"/>
+<polygon fill-opacity="0.2" points="23.212,48.949 36.854,48.949 36.726,47.662 23.34,47.662 " stroke-opacity="0.2"/>
+<polygon fill-opacity="0.1" points="23.34,47.662 36.726,47.662 36.599,46.375 23.467,46.375 " stroke-opacity="0.1"/>
+<polygon fill-opacity="0.3" points="23.083,50.235 36.982,50.235 36.854,48.949 23.212,48.949 " stroke-opacity="0.3"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="11.4971" x2="48.7082" y1="54.1401" y2="54.1401">
+<stop offset="0" style="stop-color:#F2F2F2"/>
+<stop offset="1" style="stop-color:#919191"/>
 </linearGradient>
-<path d="M35.525,46.779h-11l3-28.25c0-1.381,1.119-2.5,2.5-2.5l0,0c1.381,0,2.5,1.119,2.5,2.5 L35.525,46.779z" fill="url(#SVGID_1)"/>
-<polygon fill-opacity="0.2" points="24.724,44.779 35.327,44.779 35.228,43.779 24.823,43.779 "/>
-<polygon fill-opacity="0.1" points="24.823,43.779 35.228,43.779 35.129,42.779 24.922,42.779 "/>
-<polygon fill-opacity="0.3" points="24.624,45.779 35.427,45.779 35.327,44.779 24.724,44.779 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="15.62" x2="44.54" y1="48.81" y2="48.81">
-<stop offset="0" stop-color="#F2F2F2"/>
-<stop offset="1" stop-color="#919191"/>
+<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"/>
 </linearGradient>
-<path d="M44.525,51.814v-3c0-1.657-1.344-3-3-3h-23c-1.656,0-3,1.343-3,3v3H44.525z" fill="url(#SVGID_2)"/>
-<path d="M41.525,45.814h-23c-1.656,0-3,1.343-3,3v1c0-1.657,1.344-3,3-3h23c1.656,0,3,1.343,3,3v-1 C44.525,47.157,43.182,45.814,41.525,45.814z" fill="#FFFFFF" fill-opacity="0.5"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="13.24" x2="13.39" y1="8.21" y2="30.15">
-<stop offset="0" stop-color="#C6FF45"/>
-<stop offset="0.73" stop-color="#66A00E"/>
-<stop offset="1" stop-color="#387300"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M13.918,8.287l3.23,3.228c-4.215,4.214-4.213,11.071,0,15.285l-3.229,3.229 C7.926,24.033,7.926,14.281,13.918,8.287z" fill="url(#SVGID_3)"/>
-<path d="M21.246,12.379l3.229,3.228c-1.959,1.958-1.959,5.144,0,7.101l-3.229,3.229 C17.508,22.199,17.508,16.117,21.246,12.379z" fill="url(#SVGID_3)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="13.29" x2="13.29" y1="29.77" y2="4.35">
-<stop offset="0" stop-color="#AAE535"/>
-<stop offset="1" stop-color="#5D9C0A"/>
+<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"/>
 </linearGradient>
-<path d="M13.92,29.029c-2.87-2.871-4.351-6.604-4.472-10.372c-0.133,4.102,1.348,8.246,4.472,11.372 l3.229-3.229c-0.169-0.169-0.319-0.349-0.475-0.525L13.92,29.029z" fill="url(#SVGID_5)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6" x1="21.46" x2="21.46" y1="25.95" y2="13.77">
-<stop offset="0" stop-color="#AAE535"/>
-<stop offset="1" stop-color="#5D9C0A"/>
+<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"/>
 </linearGradient>
-<path d="M21.246,24.936c-1.742-1.741-2.661-3.992-2.78-6.278c-0.136,2.619,0.784,5.283,2.78,7.278 l3.229-3.229c-0.171-0.171-0.309-0.362-0.449-0.55L21.246,24.936z" fill="url(#SVGID_6)"/>
-<path d="M13.918,9.287l2.756,2.753c0.155-0.177,0.306-0.356,0.475-0.525l-3.23-3.228 c-3.123,3.124-4.603,7.269-4.47,11.37C9.569,15.889,11.049,12.157,13.918,9.287z" fill="#FFFFFF" fill-opacity="0.6"/>
-<path d="M21.246,13.379l2.779,2.778c0.141-0.188,0.278-0.379,0.449-0.551l-3.229-3.228 c-1.996,1.996-2.916,4.66-2.78,7.278C18.585,17.372,19.504,15.121,21.246,13.379z" fill="#FFFFFF" fill-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7" x1="46.76" x2="46.61" y1="8.21" y2="30.15">
-<stop offset="0" stop-color="#C6FF45"/>
-<stop offset="0.73" stop-color="#66A00E"/>
-<stop offset="1" stop-color="#387300"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M46.082,8.287l-3.23,3.228c4.215,4.214,4.213,11.071,0,15.285l3.229,3.229 C52.074,24.033,52.074,14.281,46.082,8.287z" fill="url(#SVGID_7)"/>
-<path d="M38.754,12.379l-3.229,3.228c1.959,1.958,1.959,5.144,0,7.101l3.229,3.229 C42.492,22.199,42.492,16.117,38.754,12.379z" fill="url(#SVGID_7)"/>
-<path d="M46.08,29.029c2.87-2.871,4.351-6.604,4.472-10.372c0.133,4.102-1.348,8.246-4.472,11.372 L42.852,26.8c0.169-0.169,0.319-0.349,0.475-0.525L46.08,29.029z" fill="url(#SVGID_5)"/>
-<path d="M38.754,24.936c1.742-1.741,2.661-3.992,2.78-6.278c0.136,2.619-0.784,5.283-2.78,7.278 l-3.229-3.229c0.171-0.171,0.309-0.362,0.449-0.55L38.754,24.936z" fill="url(#SVGID_6)"/>
-<path d="M46.082,9.287l-2.756,2.753c-0.155-0.177-0.306-0.356-0.475-0.525l3.23-3.228 c3.123,3.124,4.603,7.269,4.47,11.37C50.431,15.889,48.951,12.157,46.082,9.287z" fill="#FFFFFF" fill-opacity="0.6"/>
-<path d="M38.754,13.379l-2.779,2.778c-0.141-0.188-0.278-0.379-0.449-0.551l3.229-3.228 c1.996,1.996,2.916,4.66,2.78,7.278C41.415,17.372,40.496,15.121,38.754,13.379z" fill="#FFFFFF" fill-opacity="0.6"/>
-<rect fill-opacity="0.1" height="1" width="29" x="15.525" y="50.814"/>
+<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"/>
+</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"/>
+<path d="M41.262,8.551l-3.576,3.574c-0.181-0.242-0.358-0.487-0.578-0.709l4.153-4.152  c2.568,2.568,3.752,5.996,3.577,9.364C44.686,13.688,43.504,10.792,41.262,8.551z" fill="#FFFFFF"/>
+<rect fill-opacity="0.1" height="1.287" stroke-opacity="0.1" width="37.31" x="11.378" y="56.713"/>
+<rect fill="none" height="60" width="60"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_wlan_off.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,63 +1,84 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
 <g>
 <rect fill="none" height="60" width="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="24.43" x2="35.83" y1="31.4" y2="31.4">
-<stop offset="0" stop-color="#DBDBDB"/>
-<stop offset="0.1" stop-color="#DBDBDB"/>
-<stop offset="0.68" stop-color="#919191"/>
-<stop offset="1" stop-color="#B8B8B8"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="22.8379" x2="37.5014" y1="31.7412" y2="31.7412">
+<stop offset="0" style="stop-color:#DBDBDB"/>
+<stop offset="0.097" style="stop-color:#DBDBDB"/>
+<stop offset="0.6848" style="stop-color:#919191"/>
+<stop offset="1" style="stop-color:#B8B8B8"/>
+</linearGradient>
+<path d="M37.109,51.521H22.957l3.86-36.345c0-1.776,1.44-3.216,3.216-3.216l0,0  c1.776,0,3.216,1.439,3.216,3.216L37.109,51.521z" fill="url(#SVGID_1_)"/>
+<polygon fill-opacity="0.2" points="23.212,48.949 36.854,48.949 36.726,47.662 23.34,47.662 " stroke-opacity="0.2"/>
+<polygon fill-opacity="0.1" points="23.34,47.662 36.726,47.662 36.599,46.375 23.467,46.375 " stroke-opacity="0.1"/>
+<polygon fill-opacity="0.3" points="23.083,50.235 36.982,50.235 36.854,48.949 23.212,48.949 " stroke-opacity="0.3"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="11.4971" x2="48.7082" y1="54.1401" y2="54.1401">
+<stop offset="0" style="stop-color:#F2F2F2"/>
+<stop offset="1" style="stop-color:#919191"/>
 </linearGradient>
-<path d="M35.525,46.779h-11l3-28.25c0-1.381,1.119-2.5,2.5-2.5l0,0c1.381,0,2.5,1.119,2.5,2.5 L35.525,46.779z" fill="url(#SVGID_1)"/>
-<polygon fill-opacity="0.2" points="24.724,44.779 35.327,44.779 35.228,43.779 24.823,43.779 "/>
-<polygon fill-opacity="0.1" points="24.823,43.779 35.228,43.779 35.129,42.779 24.922,42.779 "/>
-<polygon fill-opacity="0.3" points="24.624,45.779 35.427,45.779 35.327,44.779 24.724,44.779 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="15.62" x2="44.54" y1="48.81" y2="48.81">
-<stop offset="0" stop-color="#F2F2F2"/>
-<stop offset="1" stop-color="#919191"/>
+<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"/>
 </linearGradient>
-<path d="M44.525,51.814v-3c0-1.657-1.344-3-3-3h-23c-1.656,0-3,1.343-3,3v3H44.525z" fill="url(#SVGID_2)"/>
-<path d="M41.525,45.814h-23c-1.656,0-3,1.343-3,3v1c0-1.657,1.344-3,3-3h23c1.656,0,3,1.343,3,3v-1 C44.525,47.157,43.182,45.814,41.525,45.814z" fill="#FFFFFF" fill-opacity="0.5"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="13.24" x2="13.39" y1="8.21" y2="30.15">
-<stop offset="0" stop-color="#C6FF45"/>
-<stop offset="0.73" stop-color="#66A00E"/>
-<stop offset="1" stop-color="#387300"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M13.918,8.287l3.23,3.228c-4.215,4.214-4.213,11.071,0,15.285l-3.229,3.229 C7.926,24.033,7.926,14.281,13.918,8.287z" fill="url(#SVGID_3)"/>
-<path d="M21.246,12.379l3.229,3.228c-1.959,1.958-1.959,5.144,0,7.101l-3.229,3.229 C17.508,22.199,17.508,16.117,21.246,12.379z" fill="url(#SVGID_3)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="13.29" x2="13.29" y1="29.77" y2="4.35">
-<stop offset="0" stop-color="#AAE535"/>
-<stop offset="1" stop-color="#5D9C0A"/>
+<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"/>
 </linearGradient>
-<path d="M13.92,29.029c-2.87-2.871-4.351-6.604-4.472-10.372c-0.133,4.102,1.348,8.246,4.472,11.372 l3.229-3.229c-0.169-0.169-0.319-0.349-0.475-0.525L13.92,29.029z" fill="url(#SVGID_5)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6" x1="21.46" x2="21.46" y1="25.95" y2="13.77">
-<stop offset="0" stop-color="#AAE535"/>
-<stop offset="1" stop-color="#5D9C0A"/>
+<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"/>
 </linearGradient>
-<path d="M21.246,24.936c-1.742-1.741-2.661-3.992-2.78-6.278c-0.136,2.619,0.784,5.283,2.78,7.278 l3.229-3.229c-0.171-0.171-0.309-0.362-0.449-0.55L21.246,24.936z" fill="url(#SVGID_6)"/>
-<path d="M13.918,9.287l2.756,2.753c0.155-0.177,0.306-0.356,0.475-0.525l-3.23-3.228 c-3.123,3.124-4.603,7.269-4.47,11.37C9.569,15.889,11.049,12.157,13.918,9.287z" fill="#FFFFFF" fill-opacity="0.6"/>
-<path d="M21.246,13.379l2.779,2.778c0.141-0.188,0.278-0.379,0.449-0.551l-3.229-3.228 c-1.996,1.996-2.916,4.66-2.78,7.278C18.585,17.372,19.504,15.121,21.246,13.379z" fill="#FFFFFF" fill-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7" x1="46.76" x2="46.61" y1="8.21" y2="30.15">
-<stop offset="0" stop-color="#C6FF45"/>
-<stop offset="0.73" stop-color="#66A00E"/>
-<stop offset="1" stop-color="#387300"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M46.082,8.287l-3.23,3.228c4.215,4.214,4.213,11.071,0,15.285l3.229,3.229 C52.074,24.033,52.074,14.281,46.082,8.287z" fill="url(#SVGID_7)"/>
-<path d="M38.754,12.379l-3.229,3.228c1.959,1.958,1.959,5.144,0,7.101l3.229,3.229 C42.492,22.199,42.492,16.117,38.754,12.379z" fill="url(#SVGID_7)"/>
-<path d="M46.08,29.029c2.87-2.871,4.351-6.604,4.472-10.372c0.133,4.102-1.348,8.246-4.472,11.372 L42.852,26.8c0.169-0.169,0.319-0.349,0.475-0.525L46.08,29.029z" fill="url(#SVGID_5)"/>
-<path d="M38.754,24.936c1.742-1.741,2.661-3.992,2.78-6.278c0.136,2.619-0.784,5.283-2.78,7.278 l-3.229-3.229c0.171-0.171,0.309-0.362,0.449-0.55L38.754,24.936z" fill="url(#SVGID_6)"/>
-<path d="M46.082,9.287l-2.756,2.753c-0.155-0.177-0.306-0.356-0.475-0.525l3.23-3.228 c3.123,3.124,4.603,7.269,4.47,11.37C50.431,15.889,48.951,12.157,46.082,9.287z" fill="#FFFFFF" fill-opacity="0.6"/>
-<path d="M38.754,13.379l-2.779,2.778c-0.141-0.188-0.278-0.379-0.449-0.551l3.229-3.228 c1.996,1.996,2.916,4.66,2.78,7.278C41.415,17.372,40.496,15.121,38.754,13.379z" fill="#FFFFFF" fill-opacity="0.6"/>
-<rect fill-opacity="0.1" height="1" width="29" x="15.525" y="50.814"/>
+<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"/>
+</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"/>
+<path d="M41.262,8.551l-3.576,3.574c-0.181-0.242-0.358-0.487-0.578-0.709l4.153-4.152  c2.568,2.568,3.752,5.996,3.577,9.364C44.686,13.688,43.504,10.792,41.262,8.551z" fill="#FFFFFF"/>
+<rect fill-opacity="0.1" height="1.287" stroke-opacity="0.1" width="37.31" x="11.378" y="56.713"/>
+<rect fill="none" height="60" width="60"/>
 </g>
 <g transform="matrix(2 0 0 2 0 0)">
-<linearGradient gradientTransform="matrix(1 0 0 -1 -257 -316)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="261.2295" x2="282.7705" y1="-330.6934" y2="-330.6934">
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_1_)" points="24.702,25.229 4.229,5.254 5.299,4.158 25.771,24.133 "/>
-<rect fill="none" height="30" width="30.001"/>
+<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"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_zipmgr.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_zipmgr.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_zipmgr.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,143 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<g>
+<rect fill="none" height="60" width="60"/>
 <rect fill="none" height="60" width="60"/>
-<rect fill="none" height="59.996" width="59.996"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="37.96" x2="35.51" y1="41.94" y2="41.94">
-<stop offset="0" stop-color="#959A9C"/>
-<stop offset="0.34" stop-color="#5B6163"/>
-<stop offset="0.74" stop-color="#BDC2C4"/>
-<stop offset="1" stop-color="#878A8C"/>
+<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"/>
 </linearGradient>
-<path d="M35.508,50.676c0,0.752,0.548,1.361,1.225,1.361l0,0c0.676,0,1.225-0.608,1.225-1.361v-17.48 c0-0.751-0.549-1.361-1.225-1.361l0,0c-0.677,0-1.225,0.61-1.225,1.361V50.676z" fill="url(#SVGID_1)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="39.18" x2="34.28" y1="46.83" y2="46.83">
-<stop offset="0" stop-color="#B7BDBF"/>
-<stop offset="0.3" stop-color="#8D9699"/>
-<stop offset="0.73" stop-color="#E5EBED"/>
-<stop offset="1" stop-color="#B4BDBF"/>
+<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"/>
 </linearGradient>
-<path d="M34.283,47.14c0,0.339,0.273,0.612,0.612,0.612h3.673c0.339,0,0.612-0.273,0.612-0.612v-0.612 c0-0.339-0.273-0.612-0.612-0.612h-3.673c-0.339,0-0.612,0.273-0.612,0.612V47.14z" fill="url(#SVGID_2)"/>
-<path d="M34.896,45.915h3.673c0.339,0,0.612,0.273,0.612,0.612v0.612 c0-0.339-0.273-0.612-0.612-0.612h-3.673c-0.339,0-0.612,0.273-0.612,0.612v-0.612C34.283,46.188,34.557,45.915,34.896,45.915z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
-<rect fill-opacity="0.2" height="0.611" stroke-opacity="0.2" width="2.449" x="35.508" y="47.752"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="39.18" x2="34.28" y1="43.77" y2="43.77">
-<stop offset="0" stop-color="#B7BDBF"/>
-<stop offset="0.3" stop-color="#8D9699"/>
-<stop offset="0.73" stop-color="#E5EBED"/>
-<stop offset="1" stop-color="#B4BDBF"/>
+<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"/>
 </linearGradient>
-<path d="M34.283,44.078c0,0.339,0.273,0.612,0.612,0.612h3.673c0.339,0,0.612-0.273,0.612-0.612 v-0.611c0-0.34-0.273-0.613-0.612-0.613h-3.673c-0.339,0-0.612,0.273-0.612,0.613V44.078z" fill="url(#SVGID_3)"/>
-<path d="M34.896,42.854h3.673c0.339,0,0.612,0.273,0.612,0.613v0.611 c0-0.338-0.273-0.611-0.612-0.611h-3.673c-0.339,0-0.612,0.273-0.612,0.611v-0.611C34.283,43.127,34.557,42.854,34.896,42.854z" fill-opacity="0.3" stroke-opacity="0.3"/>
-<rect fill-opacity="0.2" height="0.612" stroke-opacity="0.2" width="2.449" x="35.508" y="44.69"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="39.18" x2="34.28" y1="38.26" y2="38.26">
-<stop offset="0" stop-color="#B7BDBF"/>
-<stop offset="0.3" stop-color="#8D9699"/>
-<stop offset="0.73" stop-color="#E5EBED"/>
-<stop offset="1" stop-color="#B4BDBF"/>
+<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"/>
 </linearGradient>
-<path d="M34.283,38.568c0,0.339,0.273,0.612,0.612,0.612h3.673c0.339,0,0.612-0.273,0.612-0.612 v-0.611c0-0.34-0.273-0.613-0.612-0.613h-3.673c-0.339,0-0.612,0.273-0.612,0.613V38.568z" fill="url(#SVGID_4)"/>
-<path d="M34.896,37.344h3.673c0.339,0,0.612,0.273,0.612,0.613v0.611 c0-0.338-0.273-0.611-0.612-0.611h-3.673c-0.339,0-0.612,0.273-0.612,0.611v-0.611C34.283,37.617,34.557,37.344,34.896,37.344z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
-<rect fill-opacity="0.2" height="0.612" stroke-opacity="0.2" width="2.449" x="35.508" y="39.181"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="39.18" x2="34.28" y1="35.2" y2="35.2">
-<stop offset="0" stop-color="#B7BDBF"/>
-<stop offset="0.3" stop-color="#8D9699"/>
-<stop offset="0.73" stop-color="#E5EBED"/>
-<stop offset="1" stop-color="#B4BDBF"/>
+<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"/>
 </linearGradient>
-<path d="M34.283,35.508c0,0.338,0.273,0.611,0.612,0.611h3.673c0.339,0,0.612-0.273,0.612-0.611 v-0.612c0-0.339-0.273-0.612-0.612-0.612h-3.673c-0.339,0-0.612,0.273-0.612,0.612V35.508z" fill="url(#SVGID_5)"/>
-<path d="M34.896,35.508h3.673c0.339,0,0.612-0.273,0.612-0.612v0.612 c0,0.338-0.273,0.611-0.612,0.611h-3.673c-0.339,0-0.612-0.273-0.612-0.611v-0.612C34.283,35.233,34.557,35.508,34.896,35.508z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M34.896,44.078h3.673c0.339,0,0.612-0.273,0.612-0.611v0.611 c0,0.339-0.273,0.612-0.612,0.612h-3.673c-0.339,0-0.612-0.273-0.612-0.612v-0.611C34.283,43.805,34.557,44.078,34.896,44.078z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M34.896,47.14h3.673c0.339,0,0.612-0.274,0.612-0.612v0.612 c0,0.339-0.273,0.612-0.612,0.612h-3.673c-0.339,0-0.612-0.273-0.612-0.612v-0.612C34.283,46.865,34.557,47.14,34.896,47.14z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M34.896,34.283h3.673c0.339,0,0.612,0.273,0.612,0.612v0.612 c0-0.339-0.273-0.612-0.612-0.612h-3.673c-0.339,0-0.612,0.273-0.612,0.612v-0.612C34.283,34.557,34.557,34.283,34.896,34.283z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
-<rect fill-opacity="0.2" height="0.613" stroke-opacity="0.2" width="2.449" x="35.508" y="36.119"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6" x1="44.08" x2="29.39" y1="32.14" y2="32.14">
-<stop offset="0" stop-color="#959A9C"/>
-<stop offset="0.34" stop-color="#5B6163"/>
-<stop offset="0.74" stop-color="#BDC2C4"/>
-<stop offset="1" stop-color="#878A8C"/>
+<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"/>
+<path d="M35.916,46.958h4.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,46.605,35.479,46.958,35.916,46.958z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M35.916,50.901h4.73c0.438,0,0.789-0.352,0.789-0.789v0.789c0,0.437-0.352,0.789-0.789,0.789h-4.73  c-0.438,0-0.789-0.353-0.789-0.789v-0.789C35.127,50.549,35.479,50.901,35.916,50.901z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<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"/>
 </linearGradient>
-<path d="M44.078,31.834c0,0.677-0.549,1.225-1.225,1.225H30.609c-0.676,0-1.224-0.548-1.224-1.225 v-0.611h14.692V31.834z" fill="url(#SVGID_6)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7" x1="49.59" x2="23.88" y1="28.47" y2="28.47">
-<stop offset="0" stop-color="#67AD1A"/>
-<stop offset="0.26" stop-color="#358C0C"/>
-<stop offset="1" stop-color="#AFED23"/>
+<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"/>
 </linearGradient>
-<path d="M23.876,29.998c0,0.676,0.548,1.225,1.224,1.225h23.263c0.676,0,1.225-0.549,1.225-1.225 v-3.061c0-0.676-0.549-1.225-1.225-1.225H25.1c-0.676,0-1.224,0.548-1.224,1.225V29.998z" fill="url(#SVGID_7)"/>
-<path d="M25.1,30.609h23.263c0.676,0,1.225-0.547,1.225-1.224v0.612 c0,0.676-0.549,1.225-1.225,1.225H25.1c-0.676,0-1.224-0.549-1.224-1.225v-0.612C23.876,30.062,24.423,30.609,25.1,30.609z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M25.1,25.712h23.263c0.676,0,1.225,0.548,1.225,1.225v0.612 c0-0.676-0.549-1.224-1.225-1.224H25.1c-0.676,0-1.224,0.548-1.224,1.224v-0.612C23.876,26.261,24.423,25.712,25.1,25.712z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8" x1="49.59" x2="23.88" y1="22.96" y2="22.96">
-<stop offset="0" stop-color="#FFC501"/>
-<stop offset="0.25" stop-color="#F6A800"/>
-<stop offset="1" stop-color="#FEEFA7"/>
+<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"/>
 </linearGradient>
-<path d="M23.876,24.488c0,0.677,0.548,1.225,1.224,1.225h23.263c0.676,0,1.225-0.548,1.225-1.225 v-3.061c0-0.676-0.549-1.224-1.225-1.224H25.1c-0.676,0-1.224,0.548-1.224,1.224V24.488z" fill="url(#SVGID_8)"/>
-<path d="M25.1,25.1h23.263c0.676,0,1.225-0.548,1.225-1.224v0.612 c0,0.677-0.549,1.225-1.225,1.225H25.1c-0.676,0-1.224-0.548-1.224-1.225v-0.612C23.876,24.552,24.423,25.1,25.1,25.1z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M25.1,20.203h23.263c0.676,0,1.225,0.548,1.225,1.224v0.612 c0-0.676-0.549-1.224-1.225-1.224H25.1c-0.676,0-1.224,0.548-1.224,1.224v-0.612C23.876,20.751,24.423,20.203,25.1,20.203z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9" x1="49.59" x2="23.88" y1="17.45" y2="17.45">
-<stop offset="0" stop-color="#E8522A"/>
-<stop offset="0.21" stop-color="#BA1212"/>
-<stop offset="1" stop-color="#FF7236"/>
+<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"/>
 </linearGradient>
-<path d="M23.876,18.978c0,0.677,0.548,1.225,1.224,1.225h23.263c0.676,0,1.225-0.548,1.225-1.225 v-3.061c0-0.676-0.549-1.224-1.225-1.224H25.1c-0.676,0-1.224,0.548-1.224,1.224V18.978z" fill="url(#SVGID_9)"/>
-<path d="M25.1,19.59h23.263c0.676,0,1.225-0.548,1.225-1.224v0.612 c0,0.677-0.549,1.225-1.225,1.225H25.1c-0.676,0-1.224-0.548-1.224-1.225v-0.612C23.876,19.042,24.423,19.59,25.1,19.59z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M25.1,14.693h23.263c0.676,0,1.225,0.548,1.225,1.224v0.612 c0-0.676-0.549-1.224-1.225-1.224H25.1c-0.676,0-1.224,0.548-1.224,1.224v-0.612C23.876,15.241,24.423,14.693,25.1,14.693z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10" x1="43.47" x2="29.81" y1="50.81" y2="50.81">
-<stop offset="0" stop-color="#959A9C"/>
-<stop offset="0.34" stop-color="#5B6163"/>
-<stop offset="0.74" stop-color="#BDC2C4"/>
-<stop offset="1" stop-color="#878A8C"/>
+<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"/>
 </linearGradient>
-<path d="M29.998,51.425c0,0.677,0.548,1.225,1.225,1.225h11.02c0.676,0,1.225-0.548,1.225-1.225V50.2 c0-0.676-0.549-1.224-1.225-1.224h-11.02c-0.678,0-1.225,0.548-1.225,1.224V51.425z" fill="url(#SVGID_10)"/>
-<path d="M31.223,52.037h11.02c0.676,0,1.225-0.548,1.225-1.225v0.612 c0,0.677-0.549,1.225-1.225,1.225h-11.02c-0.678,0-1.225-0.548-1.225-1.225v-0.612C29.998,51.489,30.545,52.037,31.223,52.037z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M31.223,48.977h11.02c0.676,0,1.225,0.548,1.225,1.224v0.612 c0-0.676-0.549-1.225-1.225-1.225h-11.02c-0.678,0-1.225,0.549-1.225,1.225V50.2C29.998,49.524,30.545,48.977,31.223,48.977z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11" x1="28.16" x2="28.16" y1="37.75" y2="42.65">
-<stop offset="0" stop-color="#B6B6B6"/>
-<stop offset="0.47" stop-color="#949D9D"/>
-<stop offset="0.89" stop-color="#464B4D"/>
-<stop offset="1" stop-color="#676D6E"/>
+<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"/>
 </linearGradient>
-<path d="M11.02,41.629c0,0.678,0.548,1.225,1.225,1.225h31.834c0.676,0,1.225-0.547,1.225-1.225 v-2.448c0-0.676-0.549-1.224-1.225-1.224H12.244C11.567,37.957,11.02,41.629,11.02,41.629z" fill="url(#SVGID_11)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12" x1="28.16" x2="28.16" y1="37.75" y2="42.65">
-<stop offset="0" stop-color="#E0E0E0"/>
-<stop offset="0.47" stop-color="#ABB5B5"/>
-<stop offset="0.89" stop-color="#464B4D"/>
-<stop offset="1" stop-color="#676D6E"/>
+<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"/>
 </linearGradient>
-<path d="M11.02,41.629c0,0.678,0.548,1.225,1.225,1.225h31.834c0.676,0,1.225-0.547,1.225-1.225 v-2.448c0-0.676-0.549-1.224-1.225-1.224H12.244C11.567,37.957,11.02,41.629,11.02,41.629z M11.632,39.181 c0-0.337,0.273-0.612,0.612-0.612h31.834c0.338,0,0.612,0.275,0.612,0.612v2.448c0,0.338-0.274,0.613-0.612,0.613H12.244 c-0.339,0-0.612-0.275-0.612-0.613V39.181z" fill="url(#SVGID_12)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13" x1="29.39" x2="29.39" y1="9.18" y2="14.08">
-<stop offset="0" stop-color="#D9D9D9"/>
-<stop offset="0.47" stop-color="#AFBABA"/>
-<stop offset="0.89" stop-color="#646B6E"/>
-<stop offset="1" stop-color="#757C7D"/>
+<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"/>
 </linearGradient>
-<path d="M12.244,14.081h34.283c0.676,0,1.225-0.548,1.225-1.224v-2.449 c0-0.676-0.549-1.224-1.225-1.224H12.244c-0.677,0-1.225,0.548-1.225,1.224C11.02,10.407,11.567,14.081,12.244,14.081z" fill="url(#SVGID_13)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14" x1="29.39" x2="29.39" y1="9.18" y2="14.08">
-<stop offset="0" stop-color="#F5F5F5"/>
-<stop offset="0.47" stop-color="#D0DEDE"/>
-<stop offset="0.89" stop-color="#646B6E"/>
-<stop offset="1" stop-color="#757C7D"/>
+<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"/>
 </linearGradient>
-<path d="M11.02,10.407c0,0,0.548,3.673,1.225,3.673h34.283c0.676,0,1.225-0.548,1.225-1.224v-2.449 c0-0.676-0.549-1.224-1.225-1.224H12.244C11.567,9.183,11.02,9.731,11.02,10.407z M11.632,10.407c0-0.337,0.273-0.612,0.612-0.612 h34.283c0.338,0,0.612,0.275,0.612,0.612v2.449c0,0.337-0.274,0.612-0.612,0.612H12.244C11.905,13.468,11.632,10.407,11.632,10.407z " fill="url(#SVGID_14)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15" x1="15.61" x2="15.61" y1="9.18" y2="42.87">
-<stop offset="0" stop-color="#DAE0E3"/>
-<stop offset="0.53" stop-color="#8C9A9B"/>
-<stop offset="1" stop-color="#292F36"/>
+<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"/>
 </linearGradient>
-<path d="M11.501,9.44l8.701,4.641v23.876l-8.701,4.64c-0.292-0.224-0.482-0.571-0.482-0.968V10.407 C11.02,10.012,11.21,9.664,11.501,9.44z" fill="url(#SVGID_15)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16" x1="11.63" x2="11.63" y1="9.35" y2="42.67">
-<stop offset="0" stop-color="#EBF2F5"/>
-<stop offset="0.25" stop-color="#C8D0D2"/>
-<stop offset="0.53" stop-color="#A1B1B3"/>
-<stop offset="1" stop-color="#292F36"/>
+<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"/>
 </linearGradient>
-<path d="M11.501,9.44l0.743,0.396v32.366l-0.743,0.395c-0.292-0.223-0.482-0.57-0.482-0.967V10.407 C11.02,10.012,11.21,9.664,11.501,9.44z" fill="url(#SVGID_16)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17" x1="18.67" x2="18.67" y1="8.98" y2="43.11">
-<stop offset="0" stop-color="#B5BABD"/>
-<stop offset="0.53" stop-color="#758182"/>
-<stop offset="1" stop-color="#292F36"/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_17)" points="17.142,12.448 20.203,14.081 20.203,37.957 17.142,39.588 "/>
-<path d="M20.203,37.957l-8.701,4.64c-0.263-0.202-0.437-0.508-0.469-0.856 C11.078,41.857,20.203,37.957,20.203,37.957z" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M11.032,10.297c0.033-0.349,0.206-0.655,0.469-0.857 l8.701,4.641C20.203,14.081,11.078,10.18,11.032,10.297z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
-<rect fill-opacity="0.2" height="0.611" stroke-opacity="0.2" width="14.692" x="29.386" y="31.223"/>
-<rect fill-opacity="0.2" height="0.612" stroke-opacity="0.2" width="2.449" x="35.508" y="33.059"/>
+<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"/>
+<path d="M5.172,3.436c0.041-0.449,0.266-0.844,0.604-1.104L16.986,8.31  C16.986,8.31,5.232,3.284,5.172,3.436z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
+<rect fill-opacity="0.2" height="0.789" stroke-opacity="0.2" width="18.93" x="28.816" y="30.395"/>
+<rect fill-opacity="0.2" height="0.788" stroke-opacity="0.2" width="3.154" x="36.705" y="32.76"/>
+</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_0_3mp.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_0_3mp.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
+<rect fill="none" height="30" width="30" x="0.002"/>
+</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"/>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_12mp.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_12mp.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_12mp.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,24 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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"/>
-<rect fill="none" height="30" width="30"/>
-<rect height="2.25" width="2.25" x="10.875" y="14.625"/>
-<rect height="2.25" width="2.25" x="6.375" y="10.125"/>
-<rect height="2.25" width="2.25" x="8.625" y="12.375"/>
-<rect height="2.25" width="2.25" x="6.375" y="14.625"/>
-<rect height="2.25" width="2.25" x="13.125" y="7.875"/>
-<rect height="2.25" width="2.25" x="8.625" y="7.875"/>
-<rect height="2.25" width="2.25" x="13.125" y="12.375"/>
-<rect height="2.25" width="2.25" x="10.875" y="10.125"/>
-<rect height="2.25" width="2.25" x="15.375" y="14.625"/>
-<rect height="2.25" width="2.25" x="15.375" y="10.125"/>
-<polygon points="8.635,18.432 10.875,17.727 10.875,16.875 8.625,16.875 "/>
-<path d="M14.287,25.43v0.82H9.76v-0.82h1.609v-5.722L9.76,20.076v-0.82l2.261-0.711h0.743v6.885H14.287z"/>
-<path d="M14.53,19.125v-1.113l0.788-0.247c0.019-0.007,0.039-0.011,0.057-0.017v-0.873h-2.25v0.545h0.764v1.705H14.53z"/>
-<path d="M13.889,23.25h1.089c0.173-0.29,0.361-0.564,0.579-0.799c0.303-0.329,0.682-0.684,1.127-1.06 c0.563-0.474,0.682-0.659,0.687-0.669c0.034-0.059,0.047-0.102,0.047-0.123c0-0.023-0.001-0.045-0.003-0.063 c-0.031-0.003-0.074-0.006-0.133-0.006c-0.215,0-0.603,0.047-1.232,0.275l-0.187,0.067h-0.487v0.501h-1.486V23.25z"/>
-<path d="M19.998,25.358v0.892h-4.574v-0.559c0-0.533,0.092-1.006,0.278-1.421c0.185-0.413,0.411-0.766,0.681-1.059 c0.271-0.292,0.612-0.612,1.025-0.961c0.496-0.416,0.809-0.739,0.939-0.968c0.13-0.23,0.195-0.457,0.195-0.684 c0-0.395-0.106-0.693-0.316-0.895c-0.21-0.199-0.525-0.298-0.945-0.298c-0.444,0-0.984,0.114-1.616,0.343h-0.011v-0.913 c0.664-0.208,1.311-0.312,1.938-0.312c0.776,0,1.367,0.17,1.77,0.51s0.605,0.842,0.605,1.504c0,0.374-0.091,0.74-0.272,1.101 c-0.181,0.36-0.608,0.823-1.282,1.388c-0.375,0.318-0.67,0.582-0.882,0.794c-0.21,0.212-0.39,0.446-0.534,0.7 c-0.146,0.256-0.227,0.535-0.238,0.838L19.998,25.358L19.998,25.358z"/>
-<path d="M17.625,16.875V17.4c1.029,0.006,1.859,0.264,2.463,0.775c0.087,0.073,0.176,0.162,0.266,0.262v-0.955h1.396V3.75H2.25v19.5 h7.994v-1.875H9.133l-0.499,0.114v-0.114H8.625v-2.25h-2.25v2.25h-2.25v-2.25h2.25v-2.25h-2.25v-2.25h2.25v-2.25h-2.25v-2.25h2.25 v-2.25h-2.25v-2.25h2.25v2.25h2.25v-2.25h2.25v2.25h2.25v-2.25h2.25v2.25h2.25v-2.25h2.25v2.25h-2.25v2.25h2.25v2.25h-2.25v2.25 h2.25v2.25H17.625z"/>
-<path d="M20.354,22.674c-0.144,0.184-0.318,0.375-0.521,0.576h0.521V22.674z"/>
-<path d="M27.75,18.607v7.643h-1.395v-5.291l-1.441,2.748h-0.588l-1.447-2.748v5.291h-1.399v-7.643h1.179l1.965,3.736l1.963-3.736 H27.75z"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
+<rect fill="none" height="30" width="30" x="0.001"/>
+</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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_1_3mp.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,24 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<rect height="2.25" width="2.25" x="8.625" y="7.875"/>
-<rect height="2.25" width="2.25" x="6.375" y="14.625"/>
-<rect height="2.25" width="2.25" x="6.375" y="10.125"/>
-<rect height="2.25" width="2.25" x="13.125" y="7.875"/>
-<rect height="2.25" width="2.25" x="10.875" y="10.125"/>
-<rect height="2.25" width="2.25" x="10.875" y="14.625"/>
-<rect height="2.25" width="2.25" x="8.625" y="12.375"/>
-<rect height="2.25" width="2.25" x="13.125" y="12.375"/>
-<rect height="2.25" width="2.25" x="15.375" y="10.125"/>
-<rect height="2.25" width="2.25" x="15.375" y="14.625"/>
-<path d="M11.831,25.348v0.82H7.304v-0.82h1.609v-5.722l-1.609,0.369v-0.821l2.261-0.712h0.743v6.886H11.831z"/>
-<path d="M13.641,26.25c-0.226,0-0.418-0.08-0.579-0.24c-0.161-0.161-0.241-0.354-0.241-0.575c0-0.227,0.08-0.417,0.238-0.575 c0.159-0.156,0.354-0.234,0.582-0.234c0.226,0,0.418,0.078,0.577,0.234c0.159,0.158,0.238,0.349,0.238,0.575 c0,0.226-0.08,0.419-0.238,0.577C14.059,26.172,13.866,26.25,13.641,26.25z"/>
-<path d="M16.117,21.697c1.004,0,1.633-0.103,1.881-0.307c0.25-0.204,0.375-0.518,0.375-0.944c0-0.372-0.101-0.651-0.3-0.841 c-0.2-0.188-0.497-0.281-0.895-0.281c-0.349,0-0.838,0.086-1.471,0.263h-0.011v-0.904c0.642-0.161,1.224-0.241,1.742-0.241 c0.783,0,1.371,0.158,1.766,0.473c0.393,0.313,0.588,0.785,0.588,1.416c0,0.434-0.117,0.807-0.354,1.118 c-0.234,0.313-0.575,0.535-1.016,0.665c0.48,0.085,0.846,0.287,1.102,0.604c0.254,0.316,0.382,0.711,0.382,1.188 c0,0.783-0.229,1.367-0.685,1.761c-0.457,0.39-1.143,0.585-2.055,0.585c-0.547,0-1.107-0.08-1.681-0.24v-0.893h0.012 c0.671,0.168,1.199,0.252,1.583,0.252c0.465,0,0.814-0.117,1.047-0.354c0.234-0.234,0.352-0.584,0.352-1.052 c0-0.503-0.141-0.862-0.42-1.081c-0.28-0.219-0.928-0.328-1.943-0.328V21.697z"/>
-<polygon points="14.572,17.804 15.375,17.604 15.375,16.875 13.125,16.875 13.125,19.125 14.572,19.125 "/>
-<polygon points="9.392,17.337 10.875,17.337 10.875,16.875 8.625,16.875 8.625,17.578 "/>
-<polygon points="13.125,21.375 13.125,19.125 11.433,19.125 11.433,23.25 14.992,23.25 14.992,21.375 "/>
-<path d="M7.789,21.038l-1.414,0.323v0.014H6.319l-0.141,0.032v-0.032H4.125v-2.25h2.054V18.35l0.196-0.062v-1.413h-2.25v-2.25h2.25 v-2.25h-2.25v-2.25h2.25v-2.25h-2.25v-2.25h2.25v2.25h2.25v-2.25h2.25v2.25h2.25v-2.25h2.25v2.25h2.25v-2.25h2.25v2.25h-2.25v2.25 h2.25v2.25h-2.25v2.25h2.25v2.25h-2.25v0.453c0.951,0.029,1.723,0.262,2.281,0.707c0.147,0.117,0.303,0.273,0.449,0.467v-1.104 h1.395V3.75H2.25v19.5h5.539V21.038z"/>
-<path d="M27.75,18.523v7.645h-1.395v-5.293l-1.439,2.748h-0.59l-1.447-2.748v5.293H21.48v-7.645h1.179l1.964,3.737l1.963-3.737 H27.75z"/>
+</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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_3mp.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_3mp.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_3mp.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,21 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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"/>
-<rect fill="none" height="30" width="30"/>
-<rect height="2.25" width="2.25" x="8.624" y="7.875"/>
-<rect height="2.25" width="2.25" x="6.374" y="14.625"/>
-<rect height="2.25" width="2.25" x="8.624" y="16.875"/>
-<rect height="2.25" width="2.25" x="6.374" y="10.125"/>
-<rect height="2.25" width="2.251" x="13.124" y="7.875"/>
-<rect height="2.25" width="2.25" x="10.874" y="10.125"/>
-<rect height="2.25" width="2.25" x="10.874" y="14.625"/>
-<rect height="2.25" width="2.25" x="8.624" y="12.375"/>
-<rect height="2.25" width="2.251" x="13.124" y="12.375"/>
-<rect height="2.25" width="2.25" x="15.375" y="10.125"/>
-<rect height="2.25" width="2.25" x="15.375" y="14.625"/>
-<polygon points="14.572,17.804 15.375,17.604 15.375,16.875 13.124,16.875 13.124,19.125 14.572,19.125 "/>
-<path d="M14.991,21.375h-1.867v-2.25h-2.25v2.25h-2.25v-2.25h-2.25v2.25h-2.25v-2.25h2.25v-2.25h-2.25v-2.25h2.25v-2.25h-2.25v-2.25 h2.25v-2.25h-2.25v-2.25h2.25v2.25h2.25v-2.25h2.25v2.25h2.25v-2.25h2.251v2.25h2.25v-2.25h2.25v2.25h-2.25v2.25h2.25v2.25h-2.25 v2.25h2.25v2.25h-2.25v0.453c0.951,0.029,1.721,0.264,2.281,0.707c0.147,0.117,0.303,0.273,0.448,0.467v-1.104h1.396V3.75H2.249 v19.5h12.742V21.375z"/>
-<path d="M16.116,21.697c1.005,0,1.632-0.103,1.882-0.307s0.374-0.518,0.374-0.944c0-0.372-0.1-0.651-0.3-0.841 c-0.199-0.188-0.498-0.281-0.894-0.281c-0.349,0-0.837,0.086-1.472,0.264h-0.012v-0.905c0.644-0.161,1.225-0.241,1.744-0.241 c0.781,0,1.371,0.158,1.764,0.473c0.393,0.313,0.59,0.785,0.59,1.416c0,0.434-0.118,0.807-0.354,1.118 c-0.235,0.313-0.574,0.535-1.016,0.665c0.479,0.085,0.845,0.289,1.101,0.605c0.255,0.315,0.383,0.709,0.383,1.186 c0,0.783-0.229,1.367-0.686,1.762c-0.455,0.389-1.141,0.584-2.053,0.584c-0.547,0-1.107-0.08-1.681-0.24v-0.893H15.5 c0.672,0.168,1.197,0.252,1.581,0.252c0.465,0,0.814-0.117,1.049-0.354c0.234-0.234,0.352-0.584,0.352-1.052 c0-0.503-0.141-0.862-0.42-1.081c-0.281-0.219-0.93-0.328-1.944-0.328V21.697z"/>
-<path d="M27.75,18.523v7.645h-1.395v-5.294l-1.441,2.751h-0.588l-1.447-2.748v5.291h-1.399v-7.645h1.179l1.965,3.737l1.963-3.737 H27.75z"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
+<rect fill="none" height="30" width="30" x="0.003"/>
+</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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_9mp.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_9mp.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_9mp.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,21 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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"/>
-<rect fill="none" height="30" width="30"/>
-<rect height="2.25" width="2.25" x="8.625" y="7.875"/>
-<rect height="2.25" width="2.25" x="6.375" y="14.625"/>
-<rect height="2.25" width="2.25" x="8.625" y="16.875"/>
-<rect height="2.25" width="2.25" x="6.375" y="10.125"/>
-<rect height="2.25" width="2.25" x="13.125" y="7.875"/>
-<rect height="2.25" width="2.25" x="10.875" y="10.125"/>
-<rect height="2.25" width="2.25" x="10.875" y="14.625"/>
-<rect height="2.25" width="2.25" x="8.625" y="12.375"/>
-<rect height="2.25" width="2.25" x="13.125" y="12.375"/>
-<rect height="2.25" width="2.25" x="15.375" y="10.125"/>
-<rect height="2.25" width="2.25" x="15.375" y="14.625"/>
-<path d="M15.876,26.127v-0.882c0.317,0.081,0.67,0.123,1.056,0.123c0.567,0,0.995-0.177,1.282-0.53 c0.287-0.355,0.456-0.933,0.508-1.736c-0.353,0.322-0.802,0.482-1.349,0.482c-0.656,0-1.156-0.211-1.5-0.636 c-0.344-0.423-0.515-1.023-0.515-1.799c0-0.854,0.204-1.519,0.613-1.995c0.408-0.475,0.999-0.712,1.771-0.712 c0.803,0,1.41,0.281,1.82,0.843c0.41,0.563,0.615,1.517,0.615,2.863c0,1.324-0.259,2.338-0.774,3.043 c-0.514,0.705-1.279,1.059-2.291,1.059C16.746,26.25,16.334,26.209,15.876,26.127z M17.711,22.723c0.336,0,0.592-0.123,0.771-0.372 c0.18-0.247,0.27-0.599,0.27-1.053c0-0.667-0.084-1.168-0.252-1.503c-0.167-0.334-0.418-0.502-0.748-0.502 c-0.326,0-0.572,0.125-0.741,0.374c-0.169,0.25-0.253,0.743-0.253,1.482c0,0.56,0.078,0.963,0.238,1.208 C17.154,22.601,17.393,22.723,17.711,22.723z"/>
-<path d="M15.118,18.422c0.074-0.085,0.162-0.173,0.257-0.262v-1.285h-2.25v2.25h1.543C14.794,18.871,14.937,18.631,15.118,18.422z"/>
-<path d="M14.248,21.375h-1.123v-2.25h-2.25v2.25h-2.25v-2.25h-2.25v2.25h-2.25v-2.25h2.25v-2.25h-2.25v-2.25h2.25v-2.25h-2.25v-2.25 h2.25v-2.25h-2.25v-2.25h2.25v2.25h2.25v-2.25h2.25v2.25h2.25v-2.25h2.25v2.25h2.25v-2.25h2.25v2.25h-2.25v2.25h2.25v2.25h-2.25 v2.25h2.25v2.25h-2.25v0.448c0.041-0.001,0.076-0.007,0.117-0.007c1.351,0,2.153,0.602,2.612,1.16v-1.078h1.396V3.75H2.25v19.5 h12.484C14.438,22.734,14.276,22.104,14.248,21.375z"/>
-<path d="M27.75,18.523v7.645h-1.395v-5.291l-1.44,2.748h-0.589l-1.447-2.748v5.291H21.48v-7.645h1.179l1.964,3.737l1.963-3.737 H27.75z"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
+<rect fill="none" height="30" width="30" x="0.002"/>
+</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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_accented_characters.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <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.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.001h1c0.088,0.04,0.368-1.64,0.73-3.089c0.087-0.021,0.183-0.029,0.268-0.054 V19.441z"/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_activitystream.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_activitystream.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_activitystream.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <rect fill="none" height="30" width="30"/>
-<path d="M10.372,17.177c-0.731-0.662-1.288-1.417-1.714-2.314c-1.002-2.12-0.705-5.979-0.611-6.944 c0.072-2.494,2.419-4.848,4.767-5.638C11.827,1.015,10.188,0,8.936,0H7.722C5.807,0,3.38,2.367,3.38,4.388 c0,0-0.29,4.066,0.575,6.022c0.475,1.067,0.918,1.963,1.889,2.645c0.003,0.14,0.012,0.733,0.003,0.87 C5.729,15.909,0,18.276,0,18.276V24h4v-1.927l0.407-0.536c0.296-0.391,0.623-0.597,1.705-1.277 C8.353,18.849,9.781,17.814,10.372,17.177z"/>
-<path d="M19.518,14.012c0.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.972c0.467,0.982,1.139,1.708,2.092,2.334c0.003,0.128,0.01,0.794,0.002,0.921 c-0.006,0.087-0.037,0.179-0.068,0.271h3.143c0.659-1.187,1.783-2.071,3.138-2.391C19.055,14.799,19.305,14.43,19.518,14.012z"/>
-<path d="M21.938,7.903c0.108,0.996,0.446,4.888-0.639,7.017c-0.015,0.028-0.035,0.052-0.05,0.08h3.439 c-0.311-0.36-0.514-0.724-0.534-1.075c-0.009-0.146,0-0.75,0.003-0.896c0.947-0.685,1.361-1.57,1.861-2.618 c0.926-1.938,0.587-6.022,0.587-6.022C26.606,2.367,24.183,0,22.269,0h-1.214c-1.253,0-2.889,1.016-3.874,2.282 C19.521,3.073,21.859,5.417,21.938,7.903z"/>
-<path d="M15,24.816l-2.916-6.596C10.631,20.049,6.253,22.413,6,22.746V28h9.09C15.036,27.711,15,27.415,15,27.11V24.816z"/>
-<path d="M27.111,17h-7.223C18.294,17,17,18.294,17,19.89v7.221c0,1.596,1.294,2.89,2.889,2.89h7.223C28.706,30,30,28.706,30,27.11 V19.89C30,18.294,28.706,17,27.111,17z M19.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.36S20.559,28.555,19.807,28.555z M25.102,28.555H23.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.428C25.113,28.396,25.105,28.475,25.102,28.555z M28.543,28.555H26.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.864C28.555,28.391,28.544,28.473,28.543,28.555z"/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_account.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_account.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_account.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,7 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<path d="M15.001,23.5c0-0.104,0.012-0.206,0.016-0.31c-0.782,0.541-1.489,0.36-1.489,0.36c-1.205,0-1.423-0.781-1.423-1.039  c0-0.254-1.205-2.225-1.205-2.885c0-0.656,0.365-1.459,0.365-1.459c0.072-0.949-0.949-3.501-0.949-3.501H9.256l-0.365-0.806  c-3.432,0.729-3.577-0.146-4.089-1.096C4.291,11.816,4.876,9.262,5.204,8.86c0.21-0.257,1.328-1.063,2.109-1.614l7.999,2.552  L16.711,7l-5.6-1.398L7.989,6.776c0.058-0.04,0.1-0.068,0.1-0.068L7.76,6.233C7.54,5.76,8.965,5.103,8.965,5.103  c0.548,0.365,0.912,0,0.912,0l0.146-0.365L9.877,4.19l0.677-0.842C11.642,2.996,12.798,2.8,14.001,2.8  c1.259,0,2.465,0.22,3.596,0.604L16.801,4.2l1.399,1.4l1.325-1.326c2.934,1.677,5.043,4.64,5.545,8.119  c-0.584-1.177-1.066-2.545-1.066-2.545l-1.787-0.327L20.607,8.9l0.914,1.239l0.656-0.291c0,0,0.803,0.768,0.766,1.021  c-0.033,0.257-1.236,1.424-1.236,1.424l-1.059,0.376l-1.39-1.144l-1.057-0.873l0.654,1.566l0.876,0.914c0,0,1.533-0.219,1.752-0.036  c0.223,0.182-0.291,1.571-0.291,1.571l-0.961,0.987C21.238,15.234,22.342,15,23.5,15c1.576,0,3.047,0.438,4.313,1.188  C27.926,15.474,28,14.746,28,14c0-7.731-6.268-14-13.999-14c-7.732,0-14,6.269-14,14c0,7.732,6.268,14,14,14  c0.746,0,1.474-0.075,2.188-0.188C15.439,26.547,15.001,25.075,15.001,23.5z M4.841,20.422c-0.775-1.102-1.351-2.348-1.689-3.689  l1.636-0.322l1.4,2.8L4.841,20.422z"/>
-<path d="M23.5,17c-3.59,0-6.499,2.91-6.499,6.5S19.91,30,23.5,30s6.5-2.91,6.5-6.5S27.09,17,23.5,17z M28,25h-3v3h-3v-3h-2.999v-3  H22v-3h3v3h3V25z"/>
+</g>
+<polygon points="9.49,8.148 17.801,10.801 19.199,8 13.601,6.601 "/>
+<path d="M26.276,13.787c-0.674-1.237-1.272-2.938-1.272-2.938l-1.788-0.328L21.608,9.9l0.913,1.239l0.656-0.291  c0,0,0.804,0.767,0.766,1.021c-0.023,0.18-0.61,0.795-0.967,1.155C24.143,13.082,25.256,13.344,26.276,13.787z"/>
+<path d="M11.898,20.631c0-0.656,0.365-1.461,0.365-1.461c0.072-0.948-0.95-3.501-0.95-3.501h-1.058l-0.367-0.806  c-3.43,0.729-3.575-0.146-4.088-1.096c-0.51-0.95,0.075-3.503,0.403-3.906c0.328-0.4,2.885-2.153,2.885-2.153L8.76,7.233  C8.538,6.758,9.964,6.102,9.964,6.102c0.548,0.367,0.912,0,0.912,0l0.146-0.366l-0.146-0.546l1.132-1.405l1.082-0.25  c0.624-0.103,1.259-0.171,1.911-0.171c1.384,0,2.705,0.255,3.936,0.7l-1.136,1.136l1.398,1.401l1.401-1.401l-0.772-0.771  c3.694,1.698,6.348,5.271,6.739,9.499c0.886,0.422,1.694,0.975,2.404,1.637C28.979,15.376,29,15.19,29,15c0-7.733-6.267-14-14-14  S1,7.267,1,15s6.267,14,14,14c0.19,0,0.376-0.021,0.564-0.028c-1.408-1.509-2.334-3.47-2.522-5.644  C12.803,22.758,11.898,21.202,11.898,20.631z M5.199,22l-1.398-4.199l1.986-0.393l1.401,2.801L5.199,22z"/>
+<path d="M19.979,13.35c0.332-0.091,0.67-0.163,1.016-0.219l-0.736-0.605l-1.06-0.874l0.656,1.569L19.979,13.35z"/>
+<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 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_field.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_field.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_field.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<rect height="7" width="25.999" x="0.001"/>
-<polygon points="12.403,15 2.007,15 2.007,12 24.006,12 24.006,13.738 25.178,13.905 26.006,14.733 26.006,10 0.007,10 0.007,17   12.689,17 "/>
-<polygon points="25.648,17.205 24.234,15.791 14.335,14.377 15.749,24.275 17.163,25.691 "/>
-<polygon points="20.967,23.307 27.658,30 30,30 30,27.744 23.264,21.008 "/>
-<polygon points="24.678,19.594 30,24.916 30,21.559 26.357,17.916 "/>
-<polygon points="17.872,26.4 21.471,30 24.83,30 19.551,24.721 "/>
+</g>
+<rect height="7" width="26" x="2" y="2"/>
+<path d="M28,13.828V11h-3.656c0.512,0,1.023,0.195,1.414,0.586L28,13.828z"/>
+<path d="M18.515,16H4v-3h17.515l1.414-1.414C23.319,11.195,23.831,11,24.344,11H2v7h14.515L18.515,16z"/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_homescreen.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_homescreen.svg	Mon Apr 19 14:02:13 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="M24,1H12c-1.65,0-3,1.35-3,3v1l2,1.5V3h14v18H11v-3.5L9,19v7c0,1.65,1.35,3,3,3h12c1.65,0,3-1.35,3-3V4  C27,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,2S19.105,27,18,27z M25,26  h-3v-2h3V26z"/>
-<polygon points="15,12 7,6 7,9 2,9 2,15 7,15 7,18 "/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_calendar.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,10 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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.372,24.001h-6.886V23.04c0-0.785,0.195-1.549,0.587-2.287c0.391-0.739,1.139-1.571,2.247-2.494  c0.587-0.493,0.986-0.899,1.205-1.221c0.218-0.317,0.326-0.681,0.326-1.08c0-1.039-0.563-1.561-1.686-1.561  c-0.625,0-1.395,0.168-2.307,0.498V13.41c1-0.297,1.975-0.447,2.922-0.447c1.162,0,2.043,0.246,2.645,0.736  c0.6,0.492,0.9,1.215,0.9,2.172c0,0.459-0.074,0.879-0.223,1.26c-0.15,0.381-0.369,0.738-0.66,1.074  c-0.291,0.334-0.721,0.74-1.293,1.219c-0.629,0.527-1.088,0.941-1.377,1.242c-0.287,0.299-0.515,0.605-0.676,0.914  c-0.164,0.311-0.273,0.793-0.304,1.123h4.563L23.372,24.001z"/>
-<path d="M15.768,24h-5.601v-1.283h1.711v-7.832L9.999,15.3v-1.285l2.943-0.986h1.248v9.688h1.576V24H15.768z"/>
-<path d="M23.999,4V2h-3v2h-8V2h-3v2H8.882c0.156,0.594,0.344,1.483,0.445,2.611h5.828L14.868,7h12.131v2H13.39l-1.479,2h15.088v16H6  v-7.998l-0.09,0.121L3,15.185V30h26.999V4H23.999z"/>
-<polygon points="0.629,8.612 5.91,15.757 11.19,8.611 "/>
-<path d="M0,0v3.011C0.892,3.063,3.342,3.333,3.969,4.99C3.975,5.006,4.452,6.552,4.4,8.715h2.999c0.055-2.725-0.578-4.66-0.613-4.76  C5.466,0.471,1.323,0.042,0,0z"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_contact.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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="M0,0v30h30V0H0z M28.235,26.986l-6.012-6.012l-0.454,2.042l5.218,5.219H2.626l5.535-5.534l-0.454-2.042   l-5.942,5.941V3.013l9.352,9.352h2.119v-0.377l-2.467-2.467c-0.202-0.056-0.401-0.12-0.594-0.202   C7.701,8.271,7.043,6.555,6.869,5.621L3.013,1.765h23.589l-3.413,3.413c-0.041,0.684-0.408,2.89-3.363,4.141   c-0.348,0.147-0.714,0.25-1.093,0.315l-1.968,1.968v0.763h1.732l9.738-9.738V26.986z" fill-opacity="0.5" stroke-opacity="0.5"/>
-<g>
-<rect height="3.519" width="17.646" x="6.177" y="13.246"/>
-<polygon points="9.706,25.588 20.294,25.588 22.059,17.647 7.941,17.647   "/>
-<path d="M10.519,8.506c1.35,0.571,2.732,0.287,3.599-0.017v3.875h1.766V8.489c0.866,0.304,2.249,0.588,3.599,0.017    c2.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.01    c-0.032-0.31-0.328-1.98-2.973-3.101c-2.925-1.238-4.335,0.06-4.335,0.06S7.593,7.268,10.519,8.506z"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
+<rect fill="none" height="30" width="30"/>
 </g>
-</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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_favourites.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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" x="0"/>
-<polygon points="0.629,9.256 5.91,16.402 11.191,9.256 "/>
-<polygon points="30.001,11.607 18.531,11.607 15.008,0.645 12.876,7.256 15.156,7.256 7.764,17.26 9.299,18.377 5.717,29.354   15.006,22.539 24.282,29.355 20.708,18.377 "/>
-<path d="M0,0.645v3.01c0.893,0.053,3.342,0.322,3.969,1.979C3.975,5.648,4.453,7.195,4.4,9.357h2.998  c0.055-2.725-0.578-4.66-0.613-4.76C5.467,1.115,1.324,0.686,0,0.645z"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
+<rect fill="none" height="30" width="30"/>
+</g>
+<path d="M30,12h-9.704L17.008,2l-0.856,2.596C16.691,5.789,17,7.107,17,8.5c0,4.222-2.77,7.805-6.586,9.038l1.266,0.945L8,29  l9.006-6.633L26,29l-3.672-10.517L30,12z"/>
+<path d="M15,8.5C15,4.364,11.636,1,7.5,1S0,4.364,0,8.5S3.364,16,7.5,16S15,12.636,15,8.5z M2,8.5c0-1.521,0.62-2.898,1.621-3.896  C5.353,4.878,6.706,6.257,6.945,8H4l3.983,5.976C7.824,13.989,7.663,14,7.5,14C4.467,14,2,11.532,2,8.5z M8.018,13.974L12,8H8.973  C8.788,5.948,7.568,4.19,5.838,3.258C6.363,3.091,6.921,3,7.5,3C10.533,3,13,5.468,13,8.5C13,11.357,10.809,13.712,8.018,13.974z"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_groups.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_groups.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_groups.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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.628,19.176c0.728-0.658,1.287-1.414,1.713-2.314c1.019-2.149,0.688-6.161,0.611-6.944  c-0.072-2.531-2.425-4.857-4.767-5.639C18.175,3.014,19.813,2,21.063,2h1.215c1.914,0,4.343,2.367,4.343,4.387  c0,0,0.289,4.066-0.576,6.023c-0.476,1.066-0.918,1.963-1.89,2.645c-0.002,0.139-0.012,0.732-0.004,0.869  c0.119,1.984,5.849,4.352,5.849,4.352V26h-4v-1.76c0-0.109-0.035-0.215-0.103-0.303l-0.307-0.4c-0.297-0.395-0.623-0.6-1.703-1.277  C21.65,20.852,20.218,19.814,19.628,19.176z"/>
-<path d="M17.915,20.221L15,26.816l-2.915-6.596C10.631,22.049,6.253,24.412,6,24.746V30h9h8.999v-5.254  C23.747,24.412,19.368,22.049,17.915,20.221z"/>
-<polygon points="0.629,8.611 5.91,15.758 11.191,8.611 "/>
-<path d="M8.656,3.244C8.674,3.293,9.125,4.6,9.316,6.611h0.131c0.904-1.074,2.132-1.922,3.366-2.334C11.825,3.014,10.187,2,8.936,2  h-0.9C8.268,2.381,8.482,2.787,8.656,3.244z"/>
-<path d="M8.658,16.861c-0.141-0.299-0.254-0.633-0.347-0.988l-2.401,3.25l-1.16-1.57C3.057,19.008,0,20.275,0,20.275V26h4v-1.76  c0-0.109,0.036-0.215,0.103-0.303l0.306-0.4c0.297-0.395,0.623-0.6,1.703-1.277c2.236-1.408,3.67-2.445,4.261-3.084  C9.646,18.518,9.084,17.762,8.658,16.861z"/>
-<path d="M19.939,10.033C19.939,8.176,17.471,6,15.59,6h-1.191c-0.614,0-1.29,0.234-1.923,0.611h2.68l-5.178,7.008  c0.061,0.898,0.199,1.779,0.486,2.387c0.467,0.982,1.139,1.707,2.092,2.334c0.003,0.127,0.01,0.793,0.002,0.92  c-0.006,0.088-0.036,0.18-0.068,0.271h5.021c0.003,0.008,0.009,0.016,0.011,0.021c-0.035-0.1-0.072-0.198-0.078-0.293  c-0.01-0.135-0.002-0.782,0-0.92c0.931-0.629,1.582-1.364,2.072-2.328C20.425,14.229,19.939,10.033,19.939,10.033z"/>
-<path d="M0,0v3.01c0.893,0.053,3.342,0.322,3.969,1.979C3.975,5.004,4.453,6.551,4.4,8.713h2.998c0.055-2.725-0.578-4.66-0.613-4.76  C5.467,0.471,1.324,0.041,0,0z"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
+<rect fill="none" height="30" width="30"/>
+</g>
+<path d="M24.155,15.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,4.367,24.183,2,22.269,2h-1.214c-1.252,0-2.888,1.014-3.872,2.279c2.331,0.78,4.674,3.089,4.756,5.625  c0.119,1.085,0.433,4.913-0.639,7.016c-0.443,0.869-0.993,1.603-1.683,2.243c0.58,0.635,2.017,1.678,4.27,3.099  c1.084,0.683,1.412,0.889,1.708,1.28l0.304,0.402C25.965,24.031,26,24.137,26,24.246V26h4v-5.72  C30,20.28,24.273,17.909,24.155,15.925z"/>
+<path d="M17.916,20.221L15,26.816l-2.915-6.596C10.631,22.049,6.253,24.413,6,24.746V30h18v-5.25  C23.747,24.416,19.369,22.05,17.916,20.221z"/>
+<path d="M19.518,16.012c0.908-1.782,0.423-5.978,0.423-5.978c0-1.439-1.482-3.064-3.023-3.727C16.966,6.699,17,7.096,17,7.5  c0,4.112-2.632,7.612-6.295,8.932c0.45,0.768,1.045,1.379,1.852,1.908c0.003,0.128,0.01,0.794,0.002,0.921  c-0.006,0.087-0.036,0.179-0.068,0.271h5.021c-0.031-0.093-0.062-0.185-0.067-0.271c-0.009-0.135-0.001-0.784,0.001-0.921  C18.375,17.712,19.027,16.975,19.518,16.012z"/>
+<path d="M10.372,19.177c-0.711-0.645-1.262-1.385-1.685-2.259C8.298,16.967,7.903,17,7.5,17c-0.691,0-1.365-0.079-2.015-0.22  C4.217,18.53,0,20.276,0,20.276V26h4v-1.759c0-0.109,0.036-0.216,0.103-0.303l0.306-0.401c0.297-0.394,0.623-0.599,1.703-1.277  C8.348,20.852,9.781,19.814,10.372,19.177z"/>
+<path d="M7.5,15c4.136,0,7.5-3.364,7.5-7.5S11.636,0,7.5,0S0,3.364,0,7.5S3.364,15,7.5,15z M13,7.5c0,2.857-2.191,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 M3.621,3.604  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.5  C2,5.979,2.62,4.602,3.621,3.604z"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_homescreen.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_homescreen.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<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"/>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_phonebook.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_phonebook.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_phonebook.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,12 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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="M0,0v30h30V0H0z M28.235,26.986l-6.012-6.012l-0.454,2.042l5.218,5.219H2.626l5.535-5.534l-0.454-2.042   l-5.942,5.941V3.013l9.352,9.352h2.119v-0.377l-2.467-2.467c-0.202-0.056-0.401-0.12-0.594-0.202   C7.701,8.271,7.043,6.555,6.869,5.621L3.013,1.765h23.589l-3.413,3.413c-0.041,0.684-0.408,2.89-3.363,4.141   c-0.348,0.147-0.714,0.25-1.093,0.315l-1.968,1.968v0.763h1.732l9.738-9.738V26.986z" fill-opacity="0.5" stroke-opacity="0.5"/>
-<g>
-<rect height="3.519" width="17.646" x="6.177" y="13.246"/>
-<polygon points="9.706,25.588 20.294,25.588 22.059,17.647 7.941,17.647   "/>
-<path d="M10.519,8.506c1.35,0.571,2.732,0.287,3.599-0.017v3.875h1.766V8.489c0.866,0.304,2.249,0.588,3.599,0.017    c2.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.01    c-0.032-0.31-0.328-1.98-2.973-3.101c-2.925-1.238-4.335,0.06-4.335,0.06S7.593,7.268,10.519,8.506z"/>
-</g>
-</g>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" 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 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_video_collection.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,12 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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="M0,0v30h30V0H0z M28.235,26.986l-6.012-6.012l-0.454,2.042l5.218,5.219H2.626l5.535-5.534l-0.454-2.042   l-5.942,5.941V3.013l9.352,9.352h2.119v-0.377l-2.467-2.467c-0.202-0.056-0.401-0.12-0.594-0.202   C7.701,8.271,7.043,6.555,6.869,5.621L3.013,1.765h23.589l-3.413,3.413c-0.041,0.684-0.408,2.89-3.363,4.141   c-0.348,0.147-0.714,0.25-1.093,0.315l-1.968,1.968v0.763h1.732l9.738-9.738V26.986z" fill-opacity="0.5" stroke-opacity="0.5"/>
-<g>
-<rect height="3.519" width="17.646" x="6.177" y="13.246"/>
-<polygon points="9.706,25.588 20.294,25.588 22.059,17.647 7.941,17.647   "/>
-<path d="M10.519,8.506c1.35,0.571,2.732,0.287,3.599-0.017v3.875h1.766V8.489c0.866,0.304,2.249,0.588,3.599,0.017    c2.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.01    c-0.032-0.31-0.328-1.98-2.973-3.101c-2.925-1.238-4.335,0.06-4.335,0.06S7.593,7.268,10.519,8.506z"/>
-</g>
-</g>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" 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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_addcity.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_addcity.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_addcity.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,10 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <rect fill="none" height="30" width="30"/>
 <rect height="3" width="4" x="5" y="5"/>
 <rect height="3" width="4" x="5" y="10"/>
 <rect height="3" width="4" x="5" y="15"/>
-<path d="M15,23.5c0-3.244,1.828-6.067,4.508-7.5H18v-2h6v1.025c1.064,0.063,2.076,0.317,3,0.737V11H17V0H0v26h15.377  C15.133,25.209,15,24.37,15,23.5z M14,5h-3v3h3v2h-3v3h3v2h-3v3h3v5H3V3h11V5z"/>
-<path d="M23.5,17c-3.59,0-6.5,2.91-6.5,6.5s2.91,6.5,6.5,6.5s6.5-2.91,6.5-6.5S27.09,17,23.5,17z M28,25h-3v3h-3v-3h-3v-3h3v-3h3v3  h3V25z"/>
+<path d="M13.025,23H3V3h11v2h-3v3h3v2h-3v3h3v2h-3v3h3v0.283c0.877-1.76,2.274-3.215,4-4.146V14h0.283c1.272-0.634,2.701-1,4.217-1  c1.627,0,3.16,0.412,4.5,1.137V11H17V0H0v26h13.677C13.304,25.063,13.08,24.055,13.025,23z"/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_alarm.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_alarm.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_alarm.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <rect fill="none" height="30" width="30"/>
-<path d="M23.086,4.084l0.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.708L23.086,4.084z"/>
-<path d="M25.209,4.791c-3.891-3.89-10.254-3.89-14.143,0L6.823,9.034C4.91,8.349,4.187,8.842,3.309,9.72l-1.436,1.435l16.969,16.972  l1.438-1.438c0.879-0.877,1.371-1.602,0.686-3.514l4.244-4.244C29.098,15.043,29.098,8.681,25.209,4.791z"/>
-<path d="M12.466,23.867c-1.675,0.432-3.569-0.033-4.935-1.396c-1.363-1.365-1.83-3.262-1.399-4.938L12.466,23.867z"/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_alarm_inactive.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,10 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<rect fill="none" height="30" width="30"/>
+<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" transform="matrix(0.7071 0.7071 -0.7071 0.7071 22.4997 -9.3199)" width="8.999" x="18" y="20.999"/>
+<rect height="3" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -9.3199 22.4997)" width="8.999" x="18" y="21"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_alarm_new.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,9 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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="M22.212,3.211l0.707-0.707c0.776-0.777,2.052-0.777,2.828,0c0.776,0.777,0.776,2.051,0,2.828L25.04,6.039L22.212,3.211z"/>
-<path d="M11.591,22.994c-1.674,0.432-3.569-0.033-4.933-1.396c-1.364-1.365-1.83-3.262-1.4-4.938L11.591,22.994z"/>
-<path d="M13,22c0-4.963,4.038-9,8.999-9c1.694,0,3.274,0.479,4.629,1.295c1.233-3.516,0.504-7.578-2.295-10.377  c-3.89-3.891-10.252-3.891-14.142,0L5.949,8.16C4.036,7.475,3.313,7.969,2.436,8.846L1,10.281l12.016,12.016  C13.012,22.197,13,22.1,13,22z"/>
-<path d="M15,22c0,3.865,3.132,7,6.999,7c3.865,0,7-3.135,7-7s-3.135-7-7-7C18.132,15,15,18.135,15,22z M16.75,23.75v-3.5h3.499v-3.5  h3.5v3.5h3.5v3.5h-3.5v3.5h-3.5v-3.5H16.75z"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" 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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_alarm_snooze.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_alarm_snooze.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_alarm_snooze.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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="M22.212,3.211l0.707-0.707c0.779-0.777,2.054-0.777,2.83,0c0.776,0.777,0.776,2.051,0,2.828l-0.707,0.707L22.212,3.211z"/>
-<path d="M18.896,29v-1.805l6.233-9.879h-5.823V15.3h9.551v1.771l-6.271,9.914h6.41V29H18.896z"/>
-<path d="M9.701,21.104L5.259,16.66c-0.431,1.676,0.036,3.572,1.399,4.938c0.865,0.863,1.943,1.365,3.043,1.508V21.104z"/>
-<path d="M24.335,3.918c-3.892-3.891-10.253-3.891-14.142,0L5.95,8.16C4.037,7.475,3.313,7.969,2.436,8.846L1,10.281l8.729,8.729  H16.8h0.509v-5.709h9.664C27.743,10.035,26.869,6.451,24.335,3.918z"/>
-<path d="M11.463,29v-1.053l3.637-5.762h-3.398V21.01h5.571v1.031l-3.657,5.783h3.739V29H11.463z"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" 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 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_alpha_mode.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <rect fill="none" height="30" width="30"/>
-<path d="M8.898,13h2.273L7.953,1.352H5.422L2.063,13h1.953l0.688-2.563h3.523L8.898,13z M5.008,9.125l1.469-5.789l1.43,5.789H5.008z "/>
-<path d="M18.961,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.333,13,18.31,12.727,18.961,12.18z M14.563,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.461h-1.055V2.664 z M14.563,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.563z"/>
-<path d="M25.953,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.125,2.57,25.953,2.57z"/>
-<polygon points="17,18 21,18 21,22.934 12,22.934 12,18.934 5,23.967 12,29 12,25.934 24,25.934 24,16 17,16 "/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_app_exit.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <rect fill="none" height="30" width="30"/>
 <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 "/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_applications_all.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,10 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<path d="M16.5,27H27V16.5H16.5V27z M18.75,18.75h6v6h-6V18.75z"/>
-<path d="M16.5,4.5V15H27V4.5H16.5z M24.75,12.75h-6v-6h6V12.75z"/>
-<path d="M4.5,27H15V16.5H4.5V27z M6.75,18.75h6v6h-6V18.75z"/>
-<rect height="12" width="12" x="3" y="3"/>
+</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>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_applications_collections.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<polygon points="6.75,2.25 6.75,4.5 25.5,4.5 25.5,23.25 27.75,23.25 27.75,2.25 "/>
-<path d="M3,6v21h21V6H3z M21.75,24.75H5.25V8.25h16.5V24.75z"/>
-<rect height="6" width="6" x="6.75" y="9.75"/>
-<path d="M14.25,9.75v6h6v-6H14.25z M18.75,14.25h-3v-3h3V14.25z"/>
-<path d="M14.25,17.25v6h6v-6H14.25z M18.75,21.75h-3v-3h3V21.75z"/>
-<path d="M6.75,17.25v6h6v-6H6.75z M11.25,21.75h-3v-3h3V21.75z"/>
+</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>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_arrow_down.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_arrow_down.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
+<rect fill="none" height="30" width="30"/>
+</g>
+<polygon points="2,5 15,27 28,5 "/>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_arrow_up.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_arrow_up.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
+<rect fill="none" height="30" width="30"/>
+</g>
+<polygon points="2,25 15,3 28,25 "/>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_artists.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_artists.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
+<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"/>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_aspect_ratio_natural.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M2,3v24h26V3H2z M25,24H5V6h20V24z"/>
+<path d="M2,3v24h26v-24h-26zm23,21h-20v-18h20v18z"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_aspect_ratio_stretched.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M2,3v24h26V3H2z M25,24H5V6h20V24z"/>
-<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 "/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_aspect_ratio_zoom.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M25,22.28V24h-4.914c-0.518,0.064-1.04,0.109-1.57,0.109l0,0c-0.535,0-1.061-0.044-1.582-0.109h-4.455l-3,3H28v-7.275  c-0.213,0.248-0.428,0.496-0.662,0.729C26.627,21.166,25.838,21.768,25,22.28z"/>
-<path d="M5,6h2.348c0.539-1.081,1.244-2.093,2.107-3H2v18.752l3-3.001V6z"/>
-<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.525"/>
-<path d="M10.722,21.515l1.499-1.498c4.112,3.081,9.965,2.763,13.703-0.977c4.102-4.101,4.102-10.749,0-14.849  c-4.1-4.102-10.748-4.102-14.849,0c-3.739,3.738-4.058,9.591-0.977,13.703L8.6,19.394l-0.707-0.707l-4.949,4.95l3.535,3.535  l4.95-4.95L10.722,21.515z M13.197,6.313c2.924-2.925,7.682-2.924,10.605,0s2.925,7.682,0,10.605c-2.924,2.925-7.683,2.924-10.605,0  C10.273,13.995,10.271,9.236,13.197,6.313z"/>
-<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="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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_attach.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_attach.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_attach.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,6 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<path d="M20.625,2.813h-6.563c-1.033,0-1.875,0.844-1.875,1.875v13.594c0,1.813,1.468,3.281,3.281,3.281 c1.811,0,3.281-1.469,3.281-3.281V7.5h-1.875v10.781c0,0.775-0.632,1.406-1.406,1.406c-0.776,0-1.406-0.631-1.406-1.406V4.688h6.563 v16.308l-2.878,4.317H13.19l-2.878-4.317V10.313H8.438v11.25l3.75,5.625h6.563l3.75-5.625V4.688 C22.5,3.656,21.656,2.813,20.625,2.813z"/>
+</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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_audio.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_audio.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_audio.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M10,3v17.44C9.249,20.161,8.401,20,7.5,20C4.463,20,2,21.791,2,24s2.463,4,5.5,4s5.5-1.791,5.5-4V9h11v9.44  C23.249,18.161,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-4V3H10z"/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_autoflash.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_autoflash.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_autoflash.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<rect fill="none" height="30" width="30"/>
-<polygon points="23.234,20.628 26.234,10.879 18.547,10.879 20.857,3.375 16.354,3.375 13.352,13.13 21.039,13.13 18.732,20.628 15.368,20.628 20.996,26.625 26.625,20.628 "/>
-<path d="M12.988,26.625l-0.945-3.604H7.088l-0.967,3.604H3.375l4.724-16.38h3.56l4.527,16.38H12.988z M11.593,21.176l-2.011-8.141 l-2.065,8.141H11.593z"/>
+</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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_automatic.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_automatic.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_automatic.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M17.282,20.824h2.273L16.337,9.176h-2.532l-3.359,11.648h1.953l0.688-2.563h3.524L17.282,20.824z M13.391,16.949  l1.469-5.789l1.431,5.789H13.391z"/>
-<path d="M1,3v24h28V3H1z M26.001,24H4V6h22V24z"/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_back.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_back.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_back.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,7 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<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>
+<polygon points="11,8 11,3 1,10 11,17 11,12 25,12 25,22 17,22 17,26 29,26 29,8 "/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_backspace1.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_backspace1.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_backspace1.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <rect fill="none" height="30" width="30"/>
-<polygon points="28,13 10,13 10,9 1,15 10,21 10,17 28,17 "/>
+<polygon points="28,13,10,13,10,9,1,15,10,21,10,17,28,17"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_backspace2.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_backspace2.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_backspace2.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <rect fill="none" height="30" width="30"/>
-<path d="M12,5L0,15l12,10h18V5H12z M27,22H13.086l-8.4-7l8.4-7H27V22z"/>
-<polygon points="15.808,20.314 19.344,16.779 22.879,20.314 25,18.192 21.465,14.657 25,11.122 22.879,9 19.344,12.535 15.808,9 13.687,11.122 17.222,14.657 13.687,18.192 "/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bluetooth.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bluetooth.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bluetooth.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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.558 -0.138 31 31" width="31px" 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.175,9.955L13.348,1.12v10.093l-3.79-3.787L7.825,9.164c0,0,3.918,3.921,5.522,5.52v0.633  c-1.604,1.596-5.522,5.52-5.522,5.52l1.732,1.731l3.79-3.781V28.88l8.827-8.835c0,0-3.84-3.84-5.046-5.043  C18.335,13.785,22.175,9.955,22.175,9.955z M18.709,20.045c-0.627,0.625-1.768,1.77-2.847,2.846v-5.685  C16.941,18.285,18.128,19.463,18.709,20.045z M15.87,12.792V7.11c1.071,1.078,2.212,2.219,2.839,2.845  C18.128,10.531,16.941,11.719,15.87,12.792z"/>
-<rect fill="none" height="30" width="30"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" 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>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bluetooth_headset.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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="M0,0v30h30V0H0z M28.235,26.986l-6.012-6.012l-0.454,2.042l5.218,5.219H2.626l5.535-5.534l-0.454-2.042   l-5.942,5.941V3.013l9.352,9.352h2.119v-0.377l-2.467-2.467c-0.202-0.056-0.401-0.12-0.594-0.202   C7.701,8.271,7.043,6.555,6.869,5.621L3.013,1.765h23.589l-3.413,3.413c-0.041,0.684-0.408,2.89-3.363,4.141   c-0.348,0.147-0.714,0.25-1.093,0.315l-1.968,1.968v0.763h1.732l9.738-9.738V26.986z" fill-opacity="0.5" stroke-opacity="0.5"/>
-<g>
-<rect height="3.519" width="17.646" x="6.177" y="13.246"/>
-<polygon points="9.706,25.588 20.294,25.588 22.059,17.647 7.941,17.647   "/>
-<path d="M10.519,8.506c1.35,0.571,2.732,0.287,3.599-0.017v3.875h1.766V8.489c0.866,0.304,2.249,0.588,3.599,0.017    c2.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.01    c-0.032-0.31-0.328-1.98-2.973-3.101c-2.925-1.238-4.335,0.06-4.335,0.06S7.593,7.268,10.519,8.506z"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
+<rect fill="none" height="30" width="30"/>
 </g>
-</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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bluetooth_off.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bluetooth_off.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="31px" version="1.1" viewBox="0 0 31 31" width="31px" x="0px" 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>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bold.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bold.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bold.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <rect fill="none" height="30" width="30"/>
-<path d="M15.08,27c2.705,0,4.755-0.568,6.148-1.706c1.396-1.138,2.093-2.823,2.093-5.055c0-1.696-0.392-3.015-1.175-3.96 c-0.783-0.944-1.947-1.589-3.493-1.931c2.792-0.967,4.186-2.812,4.186-5.538c0-1.48-0.336-2.664-1.005-3.549 c-0.672-0.885-1.542-1.484-2.609-1.795C18.158,3.156,16.776,3,15.08,3H6.678v24H15.08z M12.117,13.028V6.107h1.981 c1.319,0,2.199,0.286,2.639,0.861c0.44,0.574,0.66,1.371,0.66,2.391c0,1.179-0.246,2.087-0.74,2.72 c-0.493,0.633-1.502,0.949-3.026,0.949H12.117z M12.117,23.893v-7.838h1.578c0.924,0,1.661,0.105,2.214,0.321 c0.552,0.215,0.998,0.598,1.337,1.15c0.337,0.552,0.507,1.372,0.507,2.454c0,1.321-0.264,2.303-0.79,2.947 c-0.523,0.644-1.594,0.965-3.203,0.965H12.117z"/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bt_add_new.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,9 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M15.166,21.834c0.282-1.417,0.919-2.708,1.813-3.777l-4.518-4.172L18,9l-8-8  v10.282L5.563,6.986L4,8.549l5.543,5.336L4,19.286l1.563,1.562L10,16.554V27L15.166,21.834z M15,19l-3,2.498v-4.944L15,19z   M11.986,6.464L15,9l-3.014,2.41V6.464z" fill-rule="evenodd"/>
-<path d="M23.5,17c-3.59,0-6.5,2.91-6.5,6.5s2.91,6.5,6.5,6.5s6.5-2.91,6.5-6.5S27.09,17,23.5,17z M28,25h-3v3h-3v-3h-3v-3h3v-3h3v3  h3V25z"/>
+<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 "/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bt_pair.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <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="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"/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bt_show_all.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M6,1v10.282L1.563,6.986L0,8.549l5.543,5.336L0,19.286l1.563,1.562L6,16.554V27  l8-8l-5.539-5.115L14,9L6,1z M10.332,19.025l-2.473,2.473v-4.944L10.332,19.025z M7.859,11.282V6.336l2.473,2.473L7.859,11.282z" fill-rule="evenodd"/>
-<path d="M16.477,19.025L12,23.828v0.2c2.021-1.99,4.326-3.278,6.747-3.775L20,19  l-5.539-5.115L20,9l-8-8v3.172l4.477,4.637l-4.961,5.049l0.028,0.027l-0.065,0.063L16.477,19.025z" fill-rule="evenodd"/>
-<path d="M22.477,19.025l-0.941,1.01c0.983,0.048,1.953,0.225,2.903,0.526L26,19  l-5.539-5.115L26,9l-8-8v3.172l4.477,4.637l-4.961,5.049l0.027,0.027l-0.065,0.063L22.477,19.025z" fill-rule="evenodd"/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bt_show_pair.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bt_unpair.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,11 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <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="M17.272,22.122l4.949-4.949L25.05,20l0.377-0.377l-2.966-2.738L28,12l-8-8v10.282  l-4.438-4.296L14,11.549l5.543,5.336L14,22.286l1.563,1.562l1.746-1.689L17.272,22.122z M22.004,9.336l2.473,2.473l-2.473,2.474  V9.336z" fill-rule="evenodd"/>
-<rect height="3" transform="matrix(-0.7072 -0.7071 0.7071 -0.7072 25.1225 60.3055)" width="11" x="19.55" y="23.45"/>
-<rect height="3" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -10.3047 25.0207)" width="11" x="19.55" y="23.449"/>
+<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 "/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bullet.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bullet.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bullet.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <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"/>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_call.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_call.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_call.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <rect fill="none" height="30" width="30"/>
-<path d="M28.578,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 c-0.001-0.001,0-0.003-0.001-0.004c-1.119,0.582-3.617,2.223-5.187,3.79c-1.632,1.635-3.149,3.394-4.417,5.576 c0,0-0.006,0.008-0.008,0.01c0.009,0.002,0.018,0.002,0.027,0.003l2.725,1.743c0.344,0.222,0.412,0.706,0.158,1.078L7.486,28.62 c-0.254,0.37-0.736,0.491-1.081,0.268c0,0-0.298-0.194-1.021-0.83c-0.001,0-0.002,0-0.003,0c-0.394-0.347-0.411-0.476-0.785-0.925 c-0.319-0.385-0.573-0.765-0.783-1.114c-0.001-0.001-0.004,0-0.005-0.002c-0.043-0.071-0.081-0.139-0.119-0.207 c-0.005-0.009-0.01-0.018-0.015-0.024c-0.391-0.698-0.56-1.211-0.56-1.211c-0.178-0.688-0.252-3.057,0.563-5.205 c0.52-1.364,3.24-5.672,6.42-8.854c3.181-3.182,8.125-6.349,10.3-7.005c2.176-0.656,3.903-0.556,4.417-0.374 c0,0,1.326,0.434,2.53,1.536c0.401,0.367,0.439,0.382,0.751,0.765c0.002,0.003,0,0.006,0.002,0.008 c-0.002-0.002-0.002-0.004-0.004-0.005c0.615,0.757,0.818,1.062,0.818,1.062C29.111,6.844,28.961,7.304,28.578,7.523z"/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_call_diverted.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_call_diverted.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
+<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 "/>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_call_diverted_saved.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_call_diverted_saved.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +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>
-<path d="M0,0v30h30V0H0z M28.235,26.986l-6.012-6.012l-0.454,2.042l5.218,5.219H2.626l5.535-5.534l-0.454-2.042   l-5.942,5.941V3.013l9.352,9.352h2.119v-0.377l-2.467-2.467c-0.202-0.056-0.401-0.12-0.594-0.202   C7.701,8.271,7.043,6.555,6.869,5.621L3.013,1.765h23.589l-3.413,3.413c-0.041,0.684-0.408,2.89-3.363,4.141   c-0.348,0.147-0.714,0.25-1.093,0.315l-1.968,1.968v0.763h1.732l9.738-9.738V26.986z" fill-opacity="0.5" stroke-opacity="0.5"/>
-<g>
-<rect height="3.519" width="17.646" x="6.177" y="13.246"/>
-<polygon points="9.706,25.588 20.294,25.588 22.059,17.647 7.941,17.647   "/>
-<path d="M10.519,8.506c1.35,0.571,2.732,0.287,3.599-0.017v3.875h1.766V8.489c0.866,0.304,2.249,0.588,3.599,0.017    c2.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.01    c-0.032-0.31-0.328-1.98-2.973-3.101c-2.925-1.238-4.335,0.06-4.335,0.06S7.593,7.268,10.519,8.506z"/>
-</g>
-</g>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_call_diverted_unsaved.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_call_diverted_unsaved.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +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>
-<path d="M0,0v30h30V0H0z M28.235,26.986l-6.012-6.012l-0.454,2.042l5.218,5.219H2.626l5.535-5.534l-0.454-2.042   l-5.942,5.941V3.013l9.352,9.352h2.119v-0.377l-2.467-2.467c-0.202-0.056-0.401-0.12-0.594-0.202   C7.701,8.271,7.043,6.555,6.869,5.621L3.013,1.765h23.589l-3.413,3.413c-0.041,0.684-0.408,2.89-3.363,4.141   c-0.348,0.147-0.714,0.25-1.093,0.315l-1.968,1.968v0.763h1.732l9.738-9.738V26.986z" fill-opacity="0.5" stroke-opacity="0.5"/>
-<g>
-<rect height="3.519" width="17.646" x="6.177" y="13.246"/>
-<polygon points="9.706,25.588 20.294,25.588 22.059,17.647 7.941,17.647   "/>
-<path d="M10.519,8.506c1.35,0.571,2.732,0.287,3.599-0.017v3.875h1.766V8.489c0.866,0.304,2.249,0.588,3.599,0.017    c2.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.01    c-0.032-0.31-0.328-1.98-2.973-3.101c-2.925-1.238-4.335,0.06-4.335,0.06S7.593,7.268,10.519,8.506z"/>
-</g>
-</g>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_camcoder_off.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_camcoder_off.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_camcoder_off.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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="M0,0v30h30V0H0z M28.235,26.986l-6.012-6.012l-0.454,2.042l5.218,5.219H2.626l5.535-5.534l-0.454-2.042   l-5.942,5.941V3.013l9.352,9.352h2.119v-0.377l-2.467-2.467c-0.202-0.056-0.401-0.12-0.594-0.202   C7.701,8.271,7.043,6.555,6.869,5.621L3.013,1.765h23.589l-3.413,3.413c-0.041,0.684-0.408,2.89-3.363,4.141   c-0.348,0.147-0.714,0.25-1.093,0.315l-1.968,1.968v0.763h1.732l9.738-9.738V26.986z" fill-opacity="0.5" stroke-opacity="0.5"/>
-<g>
-<rect height="3.519" width="17.646" x="6.177" y="13.246"/>
-<polygon points="9.706,25.588 20.294,25.588 22.059,17.647 7.941,17.647   "/>
-<path d="M10.519,8.506c1.35,0.571,2.732,0.287,3.599-0.017v3.875h1.766V8.489c0.866,0.304,2.249,0.588,3.599,0.017    c2.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.01    c-0.032-0.31-0.328-1.98-2.973-3.101c-2.925-1.238-4.335,0.06-4.335,0.06S7.593,7.268,10.519,8.506z"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
+<rect fill="none" height="30" width="30"/>
 </g>
-</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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_camcorder.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_camcorder.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_camcorder.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,10 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <rect fill="none" height="30" width="30"/>
-<polygon points="29.25,11.355 29.25,13.71 27.211,12.533 25.172,11.355 27.211,10.178 29.25,9 "/>
-<path d="M5.445,6.75v16.5h21V6.75H5.445z M24.195,21h-16.5V9h16.5V21z"/>
-<polygon points="4.32,8.812 0.75,6.75 0.75,13.358 0.75,19.966 4.32,17.904 "/>
-<rect height="1.125" width="13.5" x="9.107" y="11.355"/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_camera.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_camera.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_camera.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,10 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <rect fill="none" height="30" width="30"/>
-<path d="M2.25,6.938v18.75h25.5V6.938H2.25z M25.5,23.438h-21V9.188h21V23.438z"/>
-<circle cx="7.369" cy="11.917" r="1.62"/>
-<path d="M15.206,21.58c-2.904,0-5.267-2.363-5.267-5.268c0-2.905,2.363-5.267,5.267-5.267c2.905,0,5.268,2.362,5.268,5.267 C20.474,19.217,18.111,21.58,15.206,21.58L15.206,21.58z M15.206,13.295c-1.664,0-3.017,1.354-3.017,3.017 c0,1.664,1.354,3.018,3.017,3.018s3.018-1.354,3.018-3.018C18.224,14.649,16.871,13.295,15.206,13.295L15.206,13.295z"/>
-<rect height="1.5" width="4.5" x="19.725" y="4.313"/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_capture.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_capture.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_capture.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,10 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <rect fill="none" height="30" width="30"/>
-<circle cx="6.375" cy="15.47" r="1.62"/>
-<polygon points="23.512,11.576 22.451,12.741 24.507,12.741 24.507,26.991 3.507,26.991 3.507,12.741 17.597,12.741 17.8,10.491 1.257,10.491 1.257,29.241 26.757,29.241 26.757,11.87 "/>
-<path d="M17.062,18.662l0.274-3.028c-0.875-0.647-1.954-1.035-3.123-1.035c-2.905,0-5.268,2.362-5.268,5.268 c0,2.904,2.363,5.267,5.268,5.267s5.267-2.362,5.267-5.267c0-1.071-0.323-2.067-0.875-2.9L17.062,18.662z M14.213,22.884 c-1.665,0-3.018-1.354-3.018-3.017c0-1.664,1.354-3.018,3.018-3.018s3.017,1.354,3.017,3.018 C17.23,21.53,15.877,22.884,14.213,22.884z"/>
-<polygon points="24.407,6.597 28.742,10.543 22.903,10.016 18.957,14.351 19.484,8.514 15.15,4.566 20.988,5.093 24.936,0.758 "/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_change_cam_mode.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,15 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <rect fill="none" height="30" width="30"/>
-</g>
 <circle cx="4.665" cy="8.688" r="1"/>
-<rect height="2" width="3.999" x="12.997" y="2"/>
-<path d="M11.999,16v12h14.999V16H11.999z M24.998,26H13.999v-8h10.999V26z"/>
-<polygon points="29,19.367 29,21.078 27.517,20.223 26.037,19.367 27.517,18.512 29,17.656 "/>
-<path d="M7.396,14.336l3.281,1.894c0.109-0.018,0.216-0.033,0.322-0.059V15h2.078c0.763-0.777,1.236-1.84,1.236-3.014  c0-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.415V14.336z M10,9.674  c1.275,0,2.313,1.039,2.313,2.313c0,1.275-1.038,2.313-2.313,2.313s-2.313-1.038-2.313-2.313C7.688,10.713,8.725,9.674,10,9.674z"/>
-<polygon points="7.396,16.986 3,16.986 3,6.986 17,6.986 17,15 19,15 19,4.986 1,4.986 1,18.986 7.396,18.986 "/>
-<polygon points="10.989,17.566 8.396,16.068 8.396,20.869 8.396,25.672 10.989,24.172 "/>
-<rect height="1" width="8.999" x="14.997" y="19.012"/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_ciphering_off.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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="M0,0v30h30V0H0z M28.235,26.986l-6.012-6.012l-0.454,2.042l5.218,5.219H2.626l5.535-5.534l-0.454-2.042   l-5.942,5.941V3.013l9.352,9.352h2.119v-0.377l-2.467-2.467c-0.202-0.056-0.401-0.12-0.594-0.202   C7.701,8.271,7.043,6.555,6.869,5.621L3.013,1.765h23.589l-3.413,3.413c-0.041,0.684-0.408,2.89-3.363,4.141   c-0.348,0.147-0.714,0.25-1.093,0.315l-1.968,1.968v0.763h1.732l9.738-9.738V26.986z" fill-opacity="0.5" stroke-opacity="0.5"/>
-<g>
-<rect height="3.519" width="17.646" x="6.177" y="13.246"/>
-<polygon points="9.706,25.588 20.294,25.588 22.059,17.647 7.941,17.647   "/>
-<path d="M10.519,8.506c1.35,0.571,2.732,0.287,3.599-0.017v3.875h1.766V8.489c0.866,0.304,2.249,0.588,3.599,0.017    c2.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.01    c-0.032-0.31-0.328-1.98-2.973-3.101c-2.925-1.238-4.335,0.06-4.335,0.06S7.593,7.268,10.519,8.506z"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
+<rect fill="none" height="30" width="30"/>
 </g>
-</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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_close_up.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <rect fill="none" height="30" width="30"/>
-<path d="M20.459,2.445l-2.465,6.77L15,1l-2.994,8.215l-2.465-6.77C7.659,4.012,6.459,6.371,6.459,9.012  c0,4.717,3.825,8.541,8.542,8.541s8.541-3.824,8.541-8.541C23.541,6.369,22.344,4.01,20.459,2.445z"/>
-<path d="M5.016,25.119c3.401,1.809,7.383,0.973,8.887-1.869L1.578,16.701C0.07,19.543,1.612,23.309,5.016,25.119z"/>
-<path d="M24.984,25.119c-3.402,1.809-7.385,0.973-8.889-1.869l12.326-6.549C29.928,19.543,28.389,23.309,24.984,25.119z"/>
-<rect height="11.945" width="3" x="13.5" y="17.055"/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_collapse.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_collapse.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_collapse.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,7 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<path d="M22.5,7.5v15h-15v-15H22.5 M23.438,5.625H6.563c-0.516,0-0.938,0.422-0.938,0.938v16.875c0,0.516,0.422,0.938,0.938,0.938 h16.875c0.516,0,0.938-0.422,0.938-0.938V6.563C24.375,6.047,23.953,5.625,23.438,5.625L23.438,5.625z"/>
-<polygon points="20.625,14.063 15.938,14.063 15.938,9.375 14.063,9.375 14.063,14.063 9.375,14.063 9.375,15.938 14.063,15.938 14.063,20.625 15.938,20.625 15.938,15.938 20.625,15.938 "/>
+</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>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_communication.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_communication.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_communication.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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="4.286,4 0,4 0,9.515 "/>
-<path d="M14,23H4.459l6.825-7.251l3.681,3.22c1.068-2.121,2.946-3.764,5.231-4.516L27,8.5v6.449c1.165,0.582,2.188,1.402,3,2.406V4  h-7.618l-4.169,3h7.464L15,16.342l-4.407-3.856l-1.667,1.199l1.229,1.075L3,22.361v-0.443l-3-1.285V26h14.525  C14.191,25.06,14,24.053,14,23z"/>
-<path d="M19.676,3.479l-5.662,3.269c-0.278,0.117-0.591,0.042-0.732-0.196l-0.983-1.648c-0.002,0.001-0.003,0.006-0.005,0.007  c0-0.001,0-0.003,0-0.004c-0.86,0.447-2.783,1.709-3.99,2.916c-1.255,1.257-2.422,2.609-3.397,4.289c0,0-0.005,0.007-0.006,0.007  c0.007,0.001,0.014,0.001,0.021,0.002l2.097,1.343c0.263,0.169,0.317,0.542,0.122,0.827L3.45,19.708  c-0.195,0.283-0.566,0.378-0.831,0.205c0,0-0.228-0.148-0.786-0.638c0,0-0.001,0-0.002,0c-0.302-0.266-0.315-0.365-0.604-0.712  c-0.245-0.295-0.44-0.588-0.602-0.857c-0.001-0.001-0.004,0-0.005-0.002C0.589,17.65,0.56,17.599,0.53,17.546  c-0.004-0.007-0.009-0.015-0.011-0.019c-0.301-0.537-0.43-0.932-0.43-0.932c-0.138-0.53-0.195-2.351,0.432-4.005  C0.921,11.542,3.014,8.229,5.46,5.78c2.445-2.448,6.249-4.884,7.924-5.389c1.673-0.505,3.002-0.427,3.396-0.286  c0,0,1.021,0.333,1.946,1.18c0.308,0.283,0.338,0.295,0.578,0.589c0.001,0.002,0,0.005,0.001,0.006  c-0.001-0.001-0.001-0.003-0.003-0.004c0.473,0.583,0.629,0.817,0.629,0.817C20.086,2.958,19.97,3.312,19.676,3.479z"/>
-<path d="M30,22.989c0,1.123-0.227,2.094-0.677,2.914c-0.547,1.011-1.339,1.519-2.374,1.519c-1.007,0-1.733-0.508-2.187-1.519  c-0.547,0.592-1.252,0.889-2.117,0.889c-1.016,0-1.828-0.39-2.441-1.164c-0.568-0.719-0.854-1.592-0.854-2.628  c0-1.042,0.285-1.911,0.854-2.612c0.605-0.755,1.421-1.13,2.441-1.13c0.761,0,1.359,0.206,1.797,0.62v-0.456h1.476v5.097  c0,0.988,0.343,1.484,1.031,1.484c0.562,0,0.993-0.389,1.297-1.163c0.223-0.577,0.335-1.191,0.335-1.851  c0-1.521-0.55-2.821-1.644-3.903c-1.094-1.083-2.406-1.622-3.938-1.622c-1.539,0-2.847,0.536-3.922,1.61  c-1.075,1.075-1.614,2.379-1.614,3.915c0,1.535,0.539,2.846,1.621,3.925C20.164,28,21.469,28.539,23,28.539V30  c-1.93,0-3.581-0.687-4.946-2.058C16.685,26.567,16,24.915,16,22.989c0-1.919,0.687-3.563,2.058-4.935C19.43,16.687,21.075,16,23,16  c1.93,0,3.579,0.683,4.948,2.051C29.315,19.415,30,21.063,30,22.989z M24.353,22.934c0-1.489-0.568-2.235-1.707-2.235  c-0.57,0-1.012,0.254-1.32,0.762c-0.268,0.43-0.399,0.941-0.399,1.54c0,1.566,0.573,2.349,1.719,2.349  C23.784,25.349,24.353,24.544,24.353,22.934z"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" 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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_conference.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_conference.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_conference.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,12 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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="M0,0v30h30V0H0z M28.235,26.986l-6.012-6.012l-0.454,2.042l5.218,5.219H2.626l5.535-5.534l-0.454-2.042   l-5.942,5.941V3.013l9.352,9.352h2.119v-0.377l-2.467-2.467c-0.202-0.056-0.401-0.12-0.594-0.202   C7.701,8.271,7.043,6.555,6.869,5.621L3.013,1.765h23.589l-3.413,3.413c-0.041,0.684-0.408,2.89-3.363,4.141   c-0.348,0.147-0.714,0.25-1.093,0.315l-1.968,1.968v0.763h1.732l9.738-9.738V26.986z" fill-opacity="0.5" stroke-opacity="0.5"/>
-<g>
-<rect height="3.519" width="17.646" x="6.177" y="13.246"/>
-<polygon points="9.706,25.588 20.294,25.588 22.059,17.647 7.941,17.647   "/>
-<path d="M10.519,8.506c1.35,0.571,2.732,0.287,3.599-0.017v3.875h1.766V8.489c0.866,0.304,2.249,0.588,3.599,0.017    c2.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.01    c-0.032-0.31-0.328-1.98-2.973-3.101c-2.925-1.238-4.335,0.06-4.335,0.06S7.593,7.268,10.519,8.506z"/>
-</g>
-</g>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" 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 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_contact_all.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,16 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<rect height="2" width="2" x="5" y="6"/>
-<rect height="2" width="2" x="5" y="11"/>
-<rect height="2" width="2" x="5" y="16"/>
-<rect height="2" width="2" x="5" y="21"/>
-<path d="M14.041,21H8.059v2h2.916c0.254-0.184,0.603-0.404,1.137-0.74C12.846,21.798,13.482,21.381,14.041,21z"/>
-<path d="M8.059,18h7.27c-0.252-0.354-0.477-0.729-0.67-1.138c-0.125-0.264-0.229-0.554-0.316-0.862H8.059V18z"/>
-<path d="M8.059,11v2h5.885c-0.023-0.741-0.004-1.437,0.025-2H8.059z"/>
-<path d="M8.059,6v2h6.486c0.354-0.734,0.87-1.414,1.486-2H8.059z"/>
-<path d="M3,3h18v1h0.591C22.363,4,23.197,4.233,24,4.629V0H0v29h10v-3H3V3z"/>
-<path d="M20.399,6c-1.88,0-4.354,2.176-4.354,4.034c0,0-0.431,4.175,0.419,5.972c0.467,0.982,1.139,1.708,2.092,2.334 c0.003,0.128,0.01,0.794,0.002,0.921c-0.006,0.087-0.037,0.179-0.068,0.271h5.021c-0.031-0.093-0.063-0.185-0.068-0.271 c-0.009-0.135-0.001-0.784,0.001-0.921c0.931-0.628,1.583-1.365,2.073-2.328c0.908-1.782,0.423-5.978,0.423-5.978 c0-1.858-2.47-4.034-4.35-4.034H20.399z"/>
-<path d="M23.916,20.221L21,26.816l-2.916-6.596c-1.453,1.828-5.831,4.192-6.084,4.525V30h18v-5.25 C29.747,24.416,25.369,22.05,23.916,20.221z"/>
+</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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_contacts.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_contacts.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_contacts.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,7 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<path d="M18.574,15.615c0.667-0.795,1.278-1.984,1.278-3.39c0-1.405-0.659-3.788-2.976-3.788c-2.315,0-2.974,2.535-2.974,3.788 c0,1.253,0.428,2.505,1.278,3.39c1.673,1.749-2.697,2.335-3.272,3.42c-0.284,0.538-1.136,2.527-0.304,2.527 c1.127,0,9.412,0,10.543,0c0.82,0-0.019-1.989-0.302-2.526C21.273,17.95,17.07,17.414,18.574,15.615z"/>
-<path d="M26.25,2.813H6.563c-0.516,0-0.938,0.422-0.938,0.938v2.813H4.688c-1.034,0-1.875,0.841-1.875,1.875 s0.841,1.875,1.875,1.875h0.938v2.813H4.688c-1.034,0-1.875,0.841-1.875,1.875s0.841,1.875,1.875,1.875h0.938v2.813H4.688 c-1.034,0-1.875,0.841-1.875,1.875s0.841,1.875,1.875,1.875h0.938v2.813c0,0.516,0.422,0.938,0.938,0.938H26.25 c0.515,0,0.938-0.422,0.938-0.938V3.75C27.188,3.234,26.765,2.813,26.25,2.813z M4.688,9.375c-0.516,0-0.938-0.422-0.938-0.938 S4.172,7.5,4.688,7.5H7.5c0.516,0,0.938,0.422,0.938,0.938S8.016,9.375,7.5,9.375H4.688z M4.688,15.938 c-0.516,0-0.938-0.422-0.938-0.938s0.422-0.938,0.938-0.938H7.5c0.516,0,0.938,0.422,0.938,0.938S8.016,15.938,7.5,15.938H4.688z M4.688,22.5c-0.516,0-0.938-0.422-0.938-0.938s0.422-0.938,0.938-0.938H7.5c0.516,0,0.938,0.422,0.938,0.938S8.016,22.5,7.5,22.5 H4.688z M25.313,25.313H7.5v-1.875c1.034,0,1.875-0.841,1.875-1.875S8.534,19.688,7.5,19.688v-2.813 c1.034,0,1.875-0.841,1.875-1.875S8.534,13.125,7.5,13.125v-2.813c1.034,0,1.875-0.841,1.875-1.875S8.534,6.563,7.5,6.563V4.688 h17.813V25.313z"/>
+</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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_continuous_capture.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,9 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<path d="M2.25,3.751v15.75H21V3.751H2.25z M18.75,17.251H4.5V6.001h14.25V17.251z"/>
-<polygon points="22.125,7.125 22.125,20.625 5.625,20.625 5.625,22.875 24.375,22.875 24.375,7.125 "/>
-<polygon points="25.5,10.5 25.5,24 9,24 9,26.25 27.75,26.25 27.75,10.5 "/>
+</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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_contrast.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_contrast.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_contrast.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,7 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<rect fill="none" height="30" width="30"/>
-<path d="M15,3.75C8.787,3.75,3.75,8.788,3.75,15c0,6.214,5.037,11.25,11.25,11.25S26.25,21.214,26.25,15 C26.25,8.788,21.213,3.75,15,3.75z M15,24c-4.971,0-9-4.029-9-9c0-4.97,4.029-9,9-9V24z"/>
+</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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_countdown_timer.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_countdown_timer.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_countdown_timer.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<rect fill="none" height="30" width="30"/>
-<path d="M15,3.75c-1.838,0-3.568,0.45-5.101,1.231l1.692,1.692C12.643,6.242,13.793,6,15,6c4.971,0,9,4.03,9,9c0,4.971-4.029,9-9,9 c-4.971,0-9-4.029-9-9c0-1.286,0.274-2.506,0.76-3.612L5.076,9.704C4.232,11.283,3.75,13.084,3.75,15 c0,6.214,5.036,11.25,11.25,11.25c6.213,0,11.25-5.036,11.25-11.25C26.25,8.788,21.213,3.75,15,3.75z"/>
-<rect height="12" transform="matrix(-0.707 0.7072 -0.7072 -0.707 25.9067 10.5241)" width="3.751" x="8.898" y="4.629"/>
+</g>
+<path d="M15,2c-1.942,0-3.779,0.438-5.434,1.202l2.306,2.306C12.857,5.183,13.907,5,15,5c5.514,0,10,4.486,10,10s-4.486,10-10,10  S5,20.514,5,15c0-1.093,0.183-2.143,0.508-3.127L3.201,9.566C2.438,11.221,2,13.058,2,15c0,7.18,5.82,13,13,13s13-5.82,13-13  S22.18,2,15,2z"/>
+<rect height="13" transform="matrix(0.707 -0.7072 0.7072 0.707 -4.2932 10.3659)" width="5" x="7.864" y="3.864"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_create_email.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,14 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<path d="M16.832,10.037c-0.672,0-1.192,0.299-1.556,0.897c-0.315,0.506-0.47,1.109-0.47,1.815c0,0.251,0.015,0.482,0.041,0.7 l1.191-0.17l-0.279,1.95c0.293,0.186,0.645,0.289,1.074,0.289c1.343,0,2.014-0.948,2.014-2.846 C18.845,10.916,18.174,10.037,16.832,10.037z"/>
-<path d="M12.949,12.75c0-1.228,0.336-2.253,1.006-3.078c0.714-0.89,1.675-1.332,2.878-1.332c0.896,0,1.603,0.242,2.117,0.73V8.534 h1.739v6.006c0,1.165,0.402,1.75,1.215,1.75c0.662,0,1.171-0.457,1.529-1.371c0.262-0.68,0.393-1.404,0.393-2.181 c0-1.794-0.646-3.326-1.936-4.601c-1.289-1.277-2.836-1.912-4.641-1.912c-1.813,0-3.354,0.632-4.622,1.898 c-1.268,1.268-1.903,2.804-1.903,4.615c0,0.444,0.039,0.872,0.116,1.284l2.188-0.313C12.979,13.402,12.949,13.085,12.949,12.75z"/>
-<path d="M17.25,1.5C11.036,1.5,6,6.538,6,12.75c0,0.662,0.068,1.307,0.179,1.938l2.956-0.422C9.048,13.773,9,13.265,9,12.738 c0-2.263,0.809-4.201,2.425-5.816C13.042,5.309,14.982,4.5,17.25,4.5c2.273,0,4.219,0.804,5.831,2.417 c1.612,1.608,2.419,3.55,2.419,5.821c0,1.323-0.266,2.468-0.798,3.434c-0.645,1.191-1.578,1.791-2.798,1.791 c-1.185,0-2.042-0.6-2.576-1.791c-0.645,0.697-1.477,1.047-2.495,1.047c-0.482,0-0.922-0.078-1.327-0.227l-0.282,1.979 c0.634,0.203,1.308,0.307,2.026,0.307V21c-0.799,0-1.555-0.105-2.272-0.305l-0.423,2.967C15.419,23.874,16.318,24,17.25,24 c6.214,0,11.25-5.037,11.25-11.25C28.5,6.538,23.464,1.5,17.25,1.5z"/>
-<polygon points="8.681,15.848 3.112,16.643 4.703,20.355 8.947,24.598 12.659,26.188 13.454,20.621 "/>
-<polygon points="13.587,19.691 14.25,15.052 9.61,15.715 "/>
-<polygon points="10.349,28.5 11.599,27.25 9.478,26.188 7.166,28.5 "/>
-<polygon points="3.643,21.416 0.75,24.309 0.75,28.5 5.045,28.5 7.886,25.658 "/>
-<polygon points="0.75,22.188 3.112,19.826 2.052,17.703 0.75,19.006 "/>
+</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>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_create_event.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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"/>
-<rect height="2" width="2" x="6" y="6"/>
-<rect height="2" width="8.94" x="9.059" y="6"/>
-<polygon points="25.646,17.205 24.232,15.791 14.334,14.377 15.748,24.275 17.162,25.691 "/>
-<polygon points="20.966,23.307 27.657,30 29.999,30 29.999,27.744 23.264,21.008 "/>
-<polygon points="24.677,19.594 29.999,24.916 29.999,21.559 26.355,17.916 "/>
-<polygon points="15.924,27.283 15.042,26.4 15.043,26.4 13.862,25.219 13.831,25 3,25 3,3 20.999,3 20.999,13.309 23.999,13.738   23.999,0 0,0 0,28 16.641,28 "/>
-<polygon points="17.87,26.4 21.471,30 24.829,30 19.55,24.721 "/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_create_group.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_create_group.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_create_group.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,10 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<path d="M10.372,17.177c-0.731-0.662-1.288-1.417-1.714-2.314c-1.002-2.12-0.705-5.979-0.611-6.944 c0.072-2.494,2.42-4.848,4.768-5.638C11.827,1.015,10.188,0,8.936,0H7.722C5.807,0,3.38,2.367,3.38,4.388 c0,0-0.29,4.066,0.575,6.022c0.475,1.067,0.918,1.963,1.889,2.645c0.003,0.14,0.012,0.733,0.003,0.87 C5.729,15.909,0,18.276,0,18.276V24h4v-1.927l0.407-0.536c0.296-0.391,0.623-0.597,1.704-1.277 C8.354,18.849,9.781,17.814,10.372,17.177z"/>
-<path d="M10.046,8.034c0,0-0.431,4.175,0.419,5.972c0.467,0.982,1.139,1.708,2.092,2.334c0.003,0.128,0.01,0.794,0.002,0.921 c-0.006,0.087-0.037,0.179-0.068,0.271h5.021c-0.031-0.093-0.063-0.185-0.068-0.271c-0.009-0.135-0.001-0.784,0.001-0.921 c0.931-0.628,1.583-1.365,2.073-2.328c0.908-1.782,0.423-5.978,0.423-5.978c0-1.858-2.47-4.034-4.35-4.034h-1.191 C12.52,4,10.046,6.176,10.046,8.034z"/>
-<path d="M15,24.816l-2.916-6.596C10.631,20.049,6.253,22.413,6,22.746V28h10.303c-0.631-1.004-1.055-2.146-1.219-3.373L15,24.816z"/>
-<path d="M21.938,7.903c0.108,0.996,0.446,4.888-0.639,7.017c-0.082,0.161-0.19,0.299-0.28,0.451C21.805,15.131,22.637,15,23.5,15 c0.438,0,0.863,0.044,1.282,0.107c-0.364-0.396-0.604-0.796-0.627-1.183c-0.009-0.146,0-0.75,0.003-0.896 c0.947-0.685,1.361-1.57,1.861-2.618c0.926-1.938,0.587-6.022,0.587-6.022C26.606,2.367,24.183,0,22.269,0h-1.214 c-1.253,0-2.889,1.016-3.874,2.282C19.521,3.073,21.859,5.417,21.938,7.903z"/>
-<path d="M23.5,17c-3.59,0-6.5,2.91-6.5,6.5s2.91,6.5,6.5,6.5s6.5-2.91,6.5-6.5S27.09,17,23.5,17z M28,25h-3v3h-3v-3h-3v-3h3v-3h3v3 h3V25z"/>
+</g>
+<path d="M10.372,17.177c-0.732-0.662-1.289-1.417-1.714-2.314c-1.002-2.12-0.705-5.979-0.611-6.944  c0.072-2.494,2.419-4.848,4.768-5.638C11.827,1.015,10.188,0,8.936,0H7.722C5.807,0,3.38,2.367,3.38,4.388  c0,0-0.29,4.066,0.575,6.022c0.475,1.067,0.918,1.963,1.889,2.645c0.003,0.14,0.012,0.733,0.003,0.87  C5.729,15.909,0,18.276,0,18.276V24h4v-1.927l0.407-0.536c0.296-0.391,0.623-0.597,1.705-1.277  C8.353,18.849,9.781,17.814,10.372,17.177z"/>
+<path d="M13.179,20.696l-1.094-2.476C10.631,20.049,6.253,22.413,6,22.746V28h8.769C13.66,26.446,13,24.551,13,22.5  C13,21.883,13.065,21.281,13.179,20.696z"/>
+<path d="M10.046,8.034c0,0-0.43,4.175,0.419,5.972c0.466,0.982,1.139,1.708,2.092,2.334c0.002,0.128,0.01,0.794,0.001,0.921  c-0.005,0.087-0.037,0.179-0.068,0.271h1.921c1.206-1.953,3.094-3.442,5.334-4.122c0.585-1.979,0.194-5.376,0.194-5.376  c0-1.858-2.47-4.034-4.35-4.034h-1.191C12.52,4,10.046,6.176,10.046,8.034z"/>
+<path d="M21.938,7.903c0.081,0.743,0.289,3.097-0.061,5.128C22.084,13.018,22.29,13,22.5,13c0.566,0,1.117,0.059,1.656,0.154  c0-0.049,0.001-0.101,0.002-0.126c0.947-0.685,1.361-1.57,1.861-2.618c0.926-1.938,0.587-6.022,0.587-6.022  C26.606,2.367,24.183,0,22.269,0h-1.214c-1.253,0-2.889,1.016-3.874,2.282C19.521,3.073,21.859,5.417,21.938,7.903z"/>
+<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 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_create_message.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,12 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<path d="M3,4.5v8.648l0.175-0.174l2.075-0.297V8.555l4.049,3.544l1.958-0.28L5.464,6.75h20.571l-6.463,5.655l-0.338,0.297 l-3.07,2.687l-0.326,2.277l4.424-3.871l5.988,6.361v0.094H15.47l-0.322,2.25H28.5v-18H3z M26.25,18.516l-5.141-5.462l5.141-4.499 V18.516z"/>
-<polygon points="9.431,13.598 3.862,14.393 5.453,18.105 9.697,22.348 13.409,23.938 14.204,18.371 "/>
-<polygon points="14.337,17.441 15,12.802 10.36,13.465 "/>
-<polygon points="10.349,27 12.349,25 10.228,23.938 7.166,27 "/>
-<polygon points="4.393,19.166 0.75,22.809 0.75,27 5.045,27 8.636,23.408 "/>
-<polygon points="0.75,20.688 3.862,17.576 2.802,15.454 0.75,17.506 "/>
+</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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_day_light_saving_time.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <rect fill="none" height="30" width="30"/>
-<path d="M14.954,8.815c0.002,0,0.003,0,0.005,0c3.328,0,6.036,2.705,6.042,6.031h1.5c-0.006-4.152-3.387-7.531-7.542-7.531  c-0.002,0-0.003,0-0.005,0V8.815z"/>
-<polygon points="21.782,14.739 24.104,14.739 22.943,16.752 21.781,18.762 20.62,16.752 19.459,14.739 "/>
-<path d="M15,1C7.268,1,1,7.268,1,15c0,7.73,6.268,14,14,14c7.731,0,14-6.27,14-14C29,7.268,22.731,1,15,1z M15,26  C8.925,26,4,21.075,4,15C4,8.924,8.925,4,15,4s11,4.924,11,11C26,21.075,21.075,26,15,26z"/>
-<rect height="9" width="2" x="14.044" 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.503" y="6.888"/>
-<circle cx="15.032" cy="15.014" r="1"/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_delete.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_delete.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_delete.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<rect height="12.188" width="1.875" x="14.063" y="11.25"/>
-<rect height="12.188" width="1.875" x="17.813" y="11.25"/>
-<rect height="12.188" width="1.875" x="10.313" y="11.25"/>
-<path d="M19.688,4.688V3.75c0-0.516-0.422-0.938-0.938-0.938h-7.5c-0.516,0-0.938,0.422-0.938,0.938v0.938H4.688v5.625h1.875v16.875 h16.875V10.313h1.875V4.688H19.688z M11.25,3.75h7.5v0.938h-7.5V3.75z M8.438,25.313V9.375h13.125v15.938H8.438z M23.438,8.438 H6.563V6.563h16.875V8.438z"/>
+</g>
+<path d="M19,4V1h-8v3H5v3h20V4H19z M13,3h4v1h-4V3z"/>
+<path d="M6,29h18V8H6V29z M19,11h2v14h-2V11z M14,11h2v14h-2V11z M9,11h2v14H9V11z"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_details.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_details.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_details.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,13 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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.36,23.759c2.87,2.869,7.363,3.113,10.52,0.749l1.149,1.15L23.487,26.2l3.8,3.8L30,27.287l-3.799-3.8l-0.543,0.542  l-1.15-1.149c2.364-3.156,2.12-7.649-0.75-10.519c-3.147-3.148-8.251-3.148-11.397,0C9.213,15.508,9.213,20.61,12.36,23.759z   M13.989,13.989c2.244-2.244,5.896-2.244,8.141,0c2.246,2.244,2.243,5.898,0,8.141c-2.242,2.243-5.896,2.244-8.141,0  S11.745,16.233,13.989,13.989z"/>
-<polygon points="16.909,16.909 16.909,13.838 19.211,13.838 19.211,16.909 22.281,16.909 22.281,19.211 19.211,19.211   19.211,22.281 16.909,22.281 16.909,19.211 13.838,19.211 13.838,16.909 "/>
-<rect height="2" width="2" x="5" y="6"/>
-<rect height="2" width="9.941" x="8.059" y="6"/>
-<rect height="2" width="2" x="5" y="11"/>
-<path d="M10.864,11H8.059v2h1.29C9.771,12.271,10.278,11.598,10.864,11z"/>
-<rect height="2" width="2" x="5" y="16"/>
-<path d="M11.896,26H3V3h18v5.436c1.077,0.327,2.085,0.846,3,1.52V0H0v29h17.031c-0.279-0.327-0.525-0.683-0.753-1.049  C14.679,27.668,13.184,27.002,11.896,26z"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<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 "/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_dialer.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_dialer.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_dialer.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,12 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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="M0,0v30h30V0H0z M28.235,26.986l-6.012-6.012l-0.454,2.042l5.218,5.219H2.626l5.535-5.534l-0.454-2.042   l-5.942,5.941V3.013l9.352,9.352h2.119v-0.377l-2.467-2.467c-0.202-0.056-0.401-0.12-0.594-0.202   C7.701,8.271,7.043,6.555,6.869,5.621L3.013,1.765h23.589l-3.413,3.413c-0.041,0.684-0.408,2.89-3.363,4.141   c-0.348,0.147-0.714,0.25-1.093,0.315l-1.968,1.968v0.763h1.732l9.738-9.738V26.986z" fill-opacity="0.5" stroke-opacity="0.5"/>
-<g>
-<rect height="3.519" width="17.646" x="6.177" y="13.246"/>
-<polygon points="9.706,25.588 20.294,25.588 22.059,17.647 7.941,17.647   "/>
-<path d="M10.519,8.506c1.35,0.571,2.732,0.287,3.599-0.017v3.875h1.766V8.489c0.866,0.304,2.249,0.588,3.599,0.017    c2.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.01    c-0.032-0.31-0.328-1.98-2.973-3.101c-2.925-1.238-4.335,0.06-4.335,0.06S7.593,7.268,10.519,8.506z"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
+<rect fill="none" height="30" width="30"/>
 </g>
-</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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_disconnect.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_disconnect.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_disconnect.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,8 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<rect height="30.404" transform="matrix(-0.7066 0.7076 -0.7076 -0.7066 35.9314 14.8663)" width="1.4" x="14.184" y="-0.32"/>
-<polygon points="12.465,10.578 20.24,18.337 29,13.378 19.338,13.378 19.338,6.957 "/>
-<polygon points="17.743,19.751 9.904,11.927 1,16.619 11.927,16.619 11.927,23.043 "/>
+</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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_drop.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_drop.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +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>
-<path d="M0,0v30h30V0H0z M28.235,26.986l-6.012-6.012l-0.454,2.042l5.218,5.219H2.626l5.535-5.534l-0.454-2.042   l-5.942,5.941V3.013l9.352,9.352h2.119v-0.377l-2.467-2.467c-0.202-0.056-0.401-0.12-0.594-0.202   C7.701,8.271,7.043,6.555,6.869,5.621L3.013,1.765h23.589l-3.413,3.413c-0.041,0.684-0.408,2.89-3.363,4.141   c-0.348,0.147-0.714,0.25-1.093,0.315l-1.968,1.968v0.763h1.732l9.738-9.738V26.986z" fill-opacity="0.5" stroke-opacity="0.5"/>
-<g>
-<rect height="3.519" width="17.646" x="6.177" y="13.246"/>
-<polygon points="9.706,25.588 20.294,25.588 22.059,17.647 7.941,17.647   "/>
-<path d="M10.519,8.506c1.35,0.571,2.732,0.287,3.599-0.017v3.875h1.766V8.489c0.866,0.304,2.249,0.588,3.599,0.017    c2.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.01    c-0.032-0.31-0.328-1.98-2.973-3.101c-2.925-1.238-4.335,0.06-4.335,0.06S7.593,7.268,10.519,8.506z"/>
-</g>
-</g>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_drop_call.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M7.129,14.841c-0.006-0.09,0-0.523,0-0.614c0.621-0.419,1.057-0.91,1.383-1.552c0.605-1.188,0.281-3.985,0.281-3.985  C8.793,7.45,7.146,6,5.895,6H5.1C3.846,6,2.197,7.45,2.197,8.689c0,0-0.287,2.783,0.279,3.981c0.311,0.654,0.76,1.139,1.395,1.556  c0.002,0.085,0.007,0.529,0.002,0.614C3.795,16.056,0.2,18.233,0,18.497V22h11.5v-3.5C11.299,18.235,7.205,16.056,7.129,14.841z"/>
-<path d="M11.019,12.166l2.82-2.818c-0.124-0.181-0.2-0.352-0.21-0.507c-0.006-0.09,0-0.523,0-0.614  c0.621-0.419,1.057-0.91,1.383-1.552c0.605-1.188,0.281-3.985,0.281-3.985C15.293,1.45,13.646,0,12.395,0H11.6  c-1.254,0-2.902,1.45-2.902,2.689c0,0-0.118,1.153-0.052,2.294c1.202,0.875,2.088,2.216,2.145,3.568  c0.098,0.898,0.291,3.486-0.496,5.031c-0.215,0.422-0.468,0.806-0.762,1.156c0.403,0.321,1.018,0.747,1.815,1.261h3.505  L11.019,12.166z"/>
-<path d="M24.261,17.111c0.001-0.137,0.002-0.266,0.003-0.314c0.814-0.549,1.385-1.194,1.814-2.037  c0.795-1.559,0.369-5.229,0.369-5.229c0-1.626-2.16-3.53-3.805-3.53H21.6c-1.645,0-3.81,1.904-3.81,3.53c0,0-0.043,0.425-0.071,1.04  L24.261,17.111z"/>
-<path d="M30,22.851v-0.444c-0.079-0.104-0.616-0.434-1.328-0.884L30,22.851z"/>
-<path d="M18.411,19.559c-1.64,1.318-3.989,2.618-4.161,2.844V27h11.603L18.411,19.559z"/>
-<rect height="20.977" 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="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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_edit.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_edit.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_edit.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <rect fill="none" height="30" width="30"/>
 <rect fill="none" height="30" width="30"/>
-<rect height="18.749" transform="matrix(-0.707 -0.7072 0.7072 -0.707 20.7598 33.8275)" width="6" x="14.387" y="3.239"/>
-<polygon points="7.045,16.591 4.924,15.53 18.182,2.272 20.303,3.332 "/>
-<polygon points="14.47,25.076 13.409,22.955 26.668,9.697 27.729,11.818 "/>
-<polygon points="7.84,26.933 13.409,26.137 11.818,22.424 7.576,18.182 3.862,16.591 3.067,22.16 "/>
-<polygon points="2.935,23.088 2.272,27.729 6.913,27.065 "/>
+<rect height="18.75" transform="matrix(-0.707 -0.7072 0.7072 -0.707 20.7598 33.8275)" width="6" x="14.39" y="3.239"/>
+<polygon points="7.045,16.59,4.924,15.53,18.18,2.272,20.3,3.332"/>
+<polygon points="14.47,25.08,13.41,22.96,26.67,9.697,27.73,11.82"/>
+<polygon points="7.84,26.93,13.41,26.14,11.82,22.42,7.576,18.18,3.862,16.59,3.067,22.16"/>
+<polygon points="2.935,23.09,2.272,27.73,6.913,27.06"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_egprs.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_egprs.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_egprs.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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.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 "/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" 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"/>
 <rect fill="none" height="30" width="30"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_egprs_attach.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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.813 9.653,24.813 8.141,22.379 5.279,22.379 9.481,29.105 11.523,27.824 10.817,26.684 "/>
-<polygon points="10.492,22.377 12.008,24.813 16.133,24.813 14.618,22.377 "/>
-<polygon points="16.971,22.377 18.484,24.813 22.627,24.813 21.115,22.377 "/>
-<polygon points="23.467,22.377 24.721,24.395 24.721,22.377 "/>
-<polygon points="23.467,22.377 24.721,24.395 24.721,22.377 "/>
-<polygon points="20.299,17.359 21.813,19.795 24.719,19.795 20.518,13.068 18.453,14.359 20.322,17.359 "/>
-<polygon points="19.461,19.795 17.949,17.359 13.86,17.363 15.373,19.795 "/>
-<polygon points="13.021,19.795 11.512,17.363 7.38,17.363 8.891,19.797 "/>
-<polygon points="5.279,17.764 5.279,19.797 6.541,19.797 "/>
-<polygon points="5.279,17.764 5.279,19.797 6.541,19.797 "/>
-<polygon points="20.334,3.264 20.334,0.895 9.633,0.895 9.633,11.509 20.334,11.509 20.334,9.141 11.93,9.141 11.93,7.354   18.338,7.354 18.338,5.051 11.93,5.051 11.93,3.264 "/>
-<polygon points="20.334,3.264 20.334,0.895 9.633,0.895 9.633,11.509 20.334,11.509 20.334,9.141 11.93,9.141 11.93,7.354   18.338,7.354 18.338,5.051 11.93,5.051 11.93,3.264 "/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" 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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_egprs_context.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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.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.361 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" 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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_egprs_multipdp.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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.521,13.034 18.455,14.325 20.324,17.328 17.271,17.328 14.59,13.034 12.523,14.325 14.394,17.328 5.279,17.328   5.279,19.762 24.722,19.76 "/>
-<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.344 "/>
-<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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" 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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_egprs_suspended.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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.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.701 18.53,19.701 20.564,17.268 "/>
-<polygon points="5.279,19.699 5.279,17.268 14.804,17.268 12.753,19.701 "/>
-<polygon points="21.421,14.546 21.5,14.607 21.448,14.667 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" 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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_end_all_call.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_end_all_call.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +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>
-<path d="M0,0v30h30V0H0z M28.235,26.986l-6.012-6.012l-0.454,2.042l5.218,5.219H2.626l5.535-5.534l-0.454-2.042   l-5.942,5.941V3.013l9.352,9.352h2.119v-0.377l-2.467-2.467c-0.202-0.056-0.401-0.12-0.594-0.202   C7.701,8.271,7.043,6.555,6.869,5.621L3.013,1.765h23.589l-3.413,3.413c-0.041,0.684-0.408,2.89-3.363,4.141   c-0.348,0.147-0.714,0.25-1.093,0.315l-1.968,1.968v0.763h1.732l9.738-9.738V26.986z" fill-opacity="0.5" stroke-opacity="0.5"/>
-<g>
-<rect height="3.519" width="17.646" x="6.177" y="13.246"/>
-<polygon points="9.706,25.588 20.294,25.588 22.059,17.647 7.941,17.647   "/>
-<path d="M10.519,8.506c1.35,0.571,2.732,0.287,3.599-0.017v3.875h1.766V8.489c0.866,0.304,2.249,0.588,3.599,0.017    c2.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.01    c-0.032-0.31-0.328-1.98-2.973-3.101c-2.925-1.238-4.335,0.06-4.335,0.06S7.593,7.268,10.519,8.506z"/>
-</g>
-</g>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_end_call.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <rect fill="none" height="30" width="30"/>
-<path d="M28.908,18.236l-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 c0.001-0.001,0.002-0.002,0.002-0.003c-1.125-0.355-3.859-0.922-5.933-0.923c-2.159,0.001-4.325,0.161-6.604,0.766 c0,0-0.009,0.002-0.012,0.002c0.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.486 c-0.412,0.076-0.811-0.162-0.891-0.537c0,0-0.068-0.325-0.126-1.224c-0.001,0-0.001,0-0.001-0.002 c-0.031-0.489,0.042-0.586,0.092-1.13c0.043-0.466,0.126-0.885,0.219-1.254c0-0.001-0.003-0.003-0.002-0.005 c0.019-0.074,0.039-0.145,0.059-0.216c0.002-0.009,0.005-0.018,0.006-0.025c0.203-0.72,0.43-1.17,0.43-1.17 c0.338-0.572,1.855-2.187,3.813-3.068C5.867,9.05,10.514,8.001,14.718,8c4.205-0.001,9.565,1.174,11.438,2.178 s2.946,2.212,3.165,2.671c0,0,0.59,1.164,0.658,2.688c0.023,0.509,0.037,0.543-0.01,1.002c0,0.003-0.003,0.004-0.003,0.007 c0-0.003,0-0.004,0-0.007c-0.094,0.907-0.161,1.243-0.161,1.243C29.71,18.14,29.308,18.344,28.908,18.236z"/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_enter.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_enter.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_enter.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <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 "/>
+<polygon points="24,8,24,16,10,16,10,12,1,18,10,24,10,20,28,20,28,8"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_exit.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_exit.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_exit.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,7 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<rect fill="none" height="30" width="30"/>
-<polygon points="24.922,7.731 22.27,5.079 15.375,11.974 8.481,5.079 5.829,7.731 12.724,14.626 5.829,21.52 8.481,24.172 15.375,17.277 22.27,24.172 24.921,21.52 18.026,14.625 "/>
+</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 "/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_expand.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_expand.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_expand.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,7 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<path d="M22.5,7.5v15h-15v-15H22.5 M23.438,5.625H6.563c-0.516,0-0.938,0.422-0.938,0.938v16.875c0,0.516,0.422,0.938,0.938,0.938 h16.875c0.516,0,0.938-0.422,0.938-0.938V6.563C24.375,6.047,23.953,5.625,23.438,5.625L23.438,5.625z"/>
-<rect height="1.875" width="11.25" x="9.375" y="14.063"/>
+</g>
+<path d="M2,2v26h26v-26h-26zm23,23h-20v-20h20v20z"/>
+<rect height="4" width="14" x="8" y="13"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_exposure.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_exposure.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_exposure.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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"/>
-<rect fill="none" height="30" width="30" x="0.042" y="-0.021"/>
-<path d="M3.792,3.729v22.5h22.5v-22.5H3.792z M22.918,20.236h-7.5l-0.001-2.25h7.5V20.236z M6.042,23.979v-18h18L6.042,23.979z"/>
-<rect height="2.25" width="7.5" x="7.167" y="9.734"/>
-<rect height="7.5" width="2.25" x="9.792" y="7.109"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" 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>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_face_tracking.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,16 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<rect height="7.5" width="1.5" x="2.25" y="3.75"/>
-<rect height="1.5" width="9" x="2.25" y="3.75"/>
-<rect height="7.5" width="1.5" x="26.25" y="3.75"/>
-<rect height="1.5" width="9" x="18.75" y="3.75"/>
-<rect height="7.5" width="1.5" x="26.25" y="18.75"/>
-<rect height="1.5" width="9" x="18.75" y="24.75"/>
-<rect height="7.5" width="1.5" x="2.25" y="18.75"/>
-<rect height="1.5" width="9" x="2.25" y="24.75"/>
-<path d="M8.006,22.347L8,23.553h14l-0.006-1.206c0,0-4.371-2.604-4.809-4.052c-0.02-0.061-0.041-0.121-0.045-0.179v-0.738  c0.002-0.023,0.002-0.058,0.002-0.072c0.818-0.552,1.393-1.201,1.824-2.049c0.799-1.568,0.371-5.261,0.371-5.261  c0-1.635-2.172-3.55-3.827-3.55h-1.049c-1.654,0-3.831,1.915-3.831,3.55c0,0-0.38,3.675,0.368,5.256  c0.411,0.864,1.002,1.503,1.841,2.054c0.003,0.113,0.009,0.699,0.002,0.811c-0.005,0.077-0.032,0.157-0.061,0.239h0.018  C12.26,19.814,8.006,22.347,8.006,22.347z"/>
+<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>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_face_tracking_off.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_face_tracking_off.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" 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>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_failed.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_failed.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +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">
-<rect fill="none" height="30" width="30"/>
-<rect fill="none" height="30" width="30"/>
-<path d="M15,3.75C8.788,3.75,3.75,8.787,3.75,15S8.788,26.25,15,26.25c6.213,0,11.25-5.037,11.25-11.25S21.213,3.75,15,3.75z M15,7.5c1.486,0,2.869,0.439,4.035,1.188L8.688,19.035C7.939,17.869,7.5,16.486,7.5,15C7.5,10.864,10.864,7.5,15,7.5z M15,22.5 c-1.291,0-2.506-0.328-3.568-0.905l10.163-10.163C22.172,12.494,22.5,13.709,22.5,15C22.5,19.137,19.135,22.5,15,22.5z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_favourites.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_favourites.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_favourites.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <rect fill="none" height="30" width="30"/>
-<polygon points="15.006,22.539 5.718,29.354 9.3,18.377 0,11.607 11.473,11.607 15.009,0.645 18.531,11.607 30,11.607 20.709,18.377 24.281,29.355 "/>
+<polygon points="15.01,22.54,5.718,29.35,9.3,18.38,0,11.61,11.47,11.61,15.01,0.645,18.53,11.61,30,11.61,20.71,18.38,24.28,29.36"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_favourites_remove.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,9 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M20.633,15.509L28,10H17.296L14.008,0l-3.3,10H0l8.68,6.483L5,27l9.006-6.633l1.289,0.95  C16.014,18.617,18.027,16.446,20.633,15.509z"/>
-<path d="M23.5,17c-3.59,0-6.5,2.91-6.5,6.5s2.91,6.5,6.5,6.5s6.5-2.91,6.5-6.5S27.09,17,23.5,17z M28,25h-9v-3h9V25z"/>
+<g fill-opacity="0.5" stroke-opacity="0.5">
+<rect fill="none" height="30" width="30"/>
+</g>
+<path d="M22.5,13c0.458,0,0.904,0.044,1.346,0.106L28,10H17.296L14.008,0l-3.3,10H0l8.68,6.483L5,27l8.128-5.986  C13.846,16.48,17.769,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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_filter.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_filter.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_filter.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M26,2H4l9,13.91V29l4-3V15.909L26,2z M21.676,5l-1.941,3h-9.47L8.323,5H21.676z" fill-rule="evenodd"/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_flash.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_flash.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_flash.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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.211,20.567 21.178,10.923 13.573,10.923 15.857,3.5 11.405,3.5 8.436,13.151 16.039,13.151 13.758,20.567   10.429,20.567 15.997,26.5 21.564,20.567 "/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" 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"/>
 <rect fill="none" height="30" width="30"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_flash_charging.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <rect fill="none" height="30" width="30"/>
-<rect fill="none" height="30" width="30" y="0.032"/>
-<polygon points="23.234,20.66 26.234,10.912 23.607,10.912 21.732,10.912 18.547,10.912 20.855,3.407 16.354,3.407 13.352,13.163 14.601,13.163 17.854,13.163 21.039,13.163 18.732,20.66 15.368,20.66 20.997,26.657 26.625,20.66 "/>
-<path d="M3.375,13.157v13.5h9v-13.5H3.375z M10.875,25.157h-6v-10.5h6V25.157z"/>
-<rect height="1.5" width="4.5" x="5.625" y="10.532"/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_flash_off.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,11 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<polygon points="13.661,10.548 15.869,3.375 11.366,3.375 10.217,7.104 "/>
-<polygon points="19.539,16.427 21.246,10.879 18.62,10.879 16.744,10.879 13.993,10.879 "/>
-<polygon points="14.632,17.74 13.744,20.628 10.38,20.628 16.008,26.625 19.643,22.752 "/>
-<polygon points="8.754,11.862 8.362,13.131 9.613,13.131 10.021,13.131 "/>
-<rect height="33.237" transform="matrix(-0.7059 0.7083 -0.7083 -0.7059 36.214 14.9596)" width="1.4" x="14.301" y="-1.62"/>
+</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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_folder.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_folder.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_folder.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<rect fill="none" height="30" width="30"/>
-<path d="M2.25,10.5v15h25.5v-15H2.25z M25.5,23.25h-21v-10.5h21V23.25z"/>
-<polygon points="26.25,6.75 12.75,6.75 12.75,4.5 2.25,4.5 2.25,9 26.25,9 "/>
+</g>
+<path d="M14,6v-3h-12v22h26v-19h-14zm11,16h-20v-16h6v3h14v13z"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_forward.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_forward.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_forward.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<rect fill="none" height="30" width="30"/>
-<path d="M12.456,19.5l2.572,2.25H28.5v-18H3v13.5h2.25v-4.056V7.805l5.141,4.498l-2.781,2.955l0.847,0.741l2.781-2.955l4.513,3.95 l4.513-3.949l5.987,6.361V19.5H12.456z M26.036,6l-6.661,5.828l-0.141,0.124L15.75,15l-3.484-3.048l-0.141-0.124L5.464,6H26.036z M26.25,17.766l-5.141-5.462l5.141-4.499V17.766z"/>
-<polygon points="0.75,18.75 6.75,18.75 6.75,16.5 12.75,21.75 6.75,27 6.75,24.75 0.75,24.75 "/>
+</g>
+<polygon points="5,26,16,15,5,4"/>
+<polygon points="27,15,16,4,16,15,16,26"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_forward_email.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <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.434c0-2.825,0.818-5.033,2.454-6.624s3.762-2.386,6.378-2.386  c2.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.827  c0.158-0.74,0.262-1.54,0.262-2.448c0-3.427-0.909-6.093-2.728-7.998S18.863,3,15.5,3c-3.372,0-6.157,1.019-8.354,3.056  s-3.295,4.842-3.295,8.415c0,3.746,1.068,6.629,3.206,8.647c2.072,1.957,4.843,2.957,8.298,3.017C15.133,25.813,15,25.422,15,25z"/>
-<path d="M11.275,10.232c-1.321,1.386-1.982,3.295-1.982,5.729c0,1.567,0.374,2.805,1.121,3.712s1.668,1.36,2.762,1.36  c0.696,0,1.301-0.146,1.824-0.423V19c0-0.205,0.04-0.398,0.097-0.584c-0.274,0.314-0.593,0.484-0.964,0.484  c-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.006  c-0.195,1.513-0.44,2.6-0.729,3.307C15.927,17.236,16.435,17,17,17h2.416c-0.013-0.217-0.02-0.451-0.02-0.711  c0-1.668,0.319-4.38,0.957-8.135h-3.787C14.36,8.154,12.597,8.847,11.275,10.232z"/>
-<polygon points="30,22 22,16 22,19 17,19 17,25 22,25 22,28 "/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_forward_msg.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<rect fill="none" height="30" width="30"/>
-<path d="M12.456,19.5l2.572,2.25H28.5v-18H3v13.5h2.25v-4.056V7.805l5.141,4.498l-2.781,2.955l0.847,0.741l2.781-2.955l4.513,3.95 l4.513-3.949l5.987,6.361V19.5H12.456z M26.036,6l-6.661,5.828l-0.141,0.124L15.75,15l-3.484-3.048l-0.141-0.124L5.464,6H26.036z M26.25,17.766l-5.141-5.462l5.141-4.499V17.766z"/>
-<polygon points="0.75,18.75 6.75,18.75 6.75,16.5 12.75,21.75 6.75,27 6.75,24.75 0.75,24.75 "/>
+</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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_genres.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_genres.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_genres.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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.181,10.201c0.559,0,0.954,0.538,1.188,0.989l0.728,1.406l-1.15,1.151l1.159,1.401c0.223,0.27,0.445,0.515,0.681,0.75  c0.296,0.297,0.625,0.552,0.969,0.77c-1.075,0.782-2.249,1.651-3.119,2.521c-1.016,1.015-1.342,2.373-1.657,3.687  c-0.337,1.404-0.656,2.73-1.724,3.799c-0.231,0.231-0.386,0.251-0.523,0.251c-1.333,0-3.588-2.265-4.55-3.231L5.976,23.49  L5.77,23.284c-0.966-0.961-3.227-3.213-3.229-4.546c0-0.139,0.019-0.294,0.249-0.524c1.069-1.067,2.397-1.387,3.802-1.724  c1.313-0.315,2.668-0.641,3.683-1.652c0.942-0.942,1.294-1.738,1.577-2.379c0.243-0.552,0.42-0.95,1.1-1.631  C13.35,10.43,13.798,10.201,14.181,10.201 M27.865,1.779l-5.897,2.418c0,0,0.26,0.99-0.418,1.669l-4.405,4.405  c-0.736-1.422-1.833-2.07-2.964-2.07c-0.918,0-1.857,0.427-2.644,1.213c-1.79,1.79-1.242,2.575-2.677,4.009  c-1.437,1.434-4.917,0.813-7.483,3.376c-2.566,2.568,1.433,6.354,3.185,8.105c1.347,1.348,3.896,4.022,6.169,4.022  c0.685,0,1.344-0.243,1.938-0.837c2.565-2.565,1.941-6.048,3.38-7.483c1.433-1.434,4.124-3.1,4.9-3.874  c0.359-0.358,0.688-0.977,0.091-0.995c-0.632-0.019-2.012-0.424-2.84-1.252c-0.204-0.204-0.386-0.407-0.554-0.61l6.291-6.293  c0.849-0.842,2.048-0.861,2.157-0.861c0.005,0,0.008,0,0.008,0l3.549-4.117L27.865,1.779L27.865,1.779z"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" 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>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_geotag.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_geotag.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_geotag.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <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.375h16C23,13.83,19.417,9.633,15,9.633z"/>
-<rect height="14.25" width="2" x="14.021" y="13.771"/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_geotag_off.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_geotag_off.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<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"/>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_go.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_go.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_go.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<polygon points="27,15 15,6 15,11 4,11 4,19 15,19 15,24 "/>
+<polygon points="27,15,15,6,15,11,4,11,4,19,15,19,15,24"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_gps.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_gps.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_gps.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <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="19.279,16.922 20.93,15.271 13.858,8.201 10.146,8.731 7.494,6.079 6.08,7.493 8.731,10.146 8.201,13.857   15.272,20.929 16.922,19.279 17.394,24.464 20.222,21.636 23.051,24.464 24.465,23.05 21.637,20.222 24.465,17.394 "/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_group.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_group.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_group.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,10 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<path d="M5.25,22.244l0.152-0.201c0.153-0.202,0.412-0.369,1.374-0.975c2.512-1.582,4.035-2.71,4.657-3.449l0.487-0.578 l-0.581-0.483c-0.763-0.632-1.335-1.345-1.703-2.117c-0.683-1.444-0.77-4.494-0.638-6.665c0.028-1.708,1.641-3.412,3.371-4.247 C11.51,2.78,10.42,2.25,9.542,2.25H8.45c-1.724,0-3.908,2.04-3.908,3.781c0,0-0.261,3.505,0.518,5.19 c0.427,0.919,0.826,1.691,1.7,2.278c0.002,0.12,0.011,0.631,0.003,0.75C6.655,15.959,1.5,18,1.5,18v4.932h3.75V22.244z"/>
-<path d="M23.239,14.25c-0.008-0.126,0-0.646,0.003-0.773c0.854-0.588,1.226-1.353,1.675-2.255c0.833-1.671,0.528-5.19,0.528-5.19 c0-1.741-2.18-3.781-3.903-3.781h-1.093c-0.878,0-1.967,0.531-2.824,1.281c1.73,0.832,3.344,2.525,3.374,4.204 c0.156,2.224,0.077,5.285-0.656,6.726c-0.386,0.755-0.958,1.454-1.702,2.078l-0.569,0.477l0.472,0.574 c0.607,0.738,2.137,1.877,4.678,3.48c0.964,0.607,1.223,0.774,1.377,0.978l0.152,0.2v0.684h3.75v-4.929 C28.5,18.003,23.346,15.959,23.239,14.25z"/>
-<path d="M12.967,15.898l0.332,0.218l0.009,0.489c0.003,0.147,0.007,0.336-0.001,0.453c-0.004,0.074-0.02,0.148-0.036,0.224h3.459 c-0.016-0.075-0.031-0.149-0.036-0.223c-0.009-0.123-0.005-0.319-0.001-0.475l0.008-0.487l0.325-0.219 c0.919-0.621,1.585-1.327,1.979-2.1c0.666-1.307,0.584-4.731,0.494-5.995c0-1.32-2.338-3.284-3.909-3.284h-1.191 c-1.568,0-3.899,1.964-3.901,3.331c-0.077,1.208-0.135,4.637,0.494,5.967C11.359,14.573,12.025,15.28,12.967,15.898z"/>
-<path d="M22.422,22.339c-1.969-1.241-3.803-2.456-4.843-3.604L15,24.566l-2.579-5.83c-1.041,1.146-2.875,2.36-4.845,3.602 c-0.295,0.185-0.617,0.388-0.827,0.526V27h16.5v-4.132C23.04,22.729,22.717,22.525,22.422,22.339z"/>
+</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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hd.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hd.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hd.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <rect fill="none" height="30" width="30"/>
-<rect fill="none" height="30" width="29.999" x="0.001"/>
-<path d="M2.25,5.625v18.75h25.5V5.625H2.25z M25.5,22.125h-21V7.875h21V22.125z"/>
-<path d="M14.175,11.178v7.644H12.76v-3.717h-2.184v3.717h-1.41v-7.644h1.41v3.055h2.184v-3.055H14.175z"/>
-<path d="M15.688,11.178h2.174c0.998,0,1.743,0.296,2.234,0.887c0.492,0.591,0.738,1.524,0.738,2.799c0,1.394-0.26,2.403-0.775,3.024 c-0.519,0.622-1.303,0.934-2.352,0.934h-2.021L15.688,11.178L15.688,11.178z M17.096,12.049v5.89h0.642 c0.534,0,0.939-0.214,1.218-0.643c0.277-0.429,0.418-1.219,0.418-2.371c0-1.021-0.137-1.757-0.41-2.204 c-0.273-0.448-0.689-0.672-1.246-0.672H17.096z"/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_help_all.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_help_all.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
+<rect fill="none" height="30" width="30"/>
+</g>
+<path d="M17.479,20.006c-0.683,0-1.26,0.239-1.735,0.726c-0.478,0.483-0.714,1.071-0.714,1.764c0,0.693,0.236,1.286,0.714,1.771  C16.22,24.757,16.797,25,17.479,25c0.674,0,1.249-0.243,1.729-0.733c0.483-0.485,0.721-1.078,0.721-1.771  c0-0.692-0.235-1.28-0.711-1.764C18.74,20.245,18.163,20.006,17.479,20.006z"/>
+<path d="M23.146,2.437C21.915,1.479,20.128,1,17.791,1C16.385,1,14.788,1.248,13,1.741V3.34c0.692,0.158,1.332,0.37,1.915,0.641  c0.793-0.152,1.524-0.238,2.178-0.238c1.179,0,2.063,0.265,2.65,0.788c0.591,0.524,0.884,1.313,0.884,2.364  c0,0.504-0.12,1.02-0.363,1.545c-0.189,0.409-0.627,0.974-1.295,1.682C18.979,10.306,19,10.479,19,10.674  c0,1.055-0.233,2.135-0.694,3.209c-0.457,1.045-1.35,2.23-2.795,3.724v0.114h3.938v-1.433c0-0.643,0.168-1.205,0.498-1.696  c0.329-0.487,0.987-1.226,1.97-2.213c1.343-1.368,2.191-2.461,2.552-3.284C24.822,8.268,25,7.46,25,6.674  C25,4.804,24.382,3.393,23.146,2.437z"/>
+<path d="M5,8.452V5.741C6.788,5.248,8.385,5,9.791,5c2.337,0,4.124,0.479,5.355,1.437C16.382,7.393,17,8.804,17,10.674  c0,0.786-0.178,1.594-0.532,2.421c-0.36,0.823-1.209,1.916-2.552,3.284c-0.982,0.987-1.641,1.726-1.97,2.213  c-0.33,0.491-0.498,1.054-0.498,1.696v1.433H7.511v-1.653c0-1.062,0.233-1.982,0.698-2.76c0.464-0.776,1.183-1.634,2.155-2.567  c1.024-1.01,1.657-1.778,1.899-2.301c0.243-0.525,0.363-1.041,0.363-1.545c0-1.052-0.293-1.84-0.884-2.364  c-0.588-0.523-1.472-0.788-2.65-0.788C7.944,7.742,6.582,7.979,5,8.452z M9.479,29c-0.683,0-1.26-0.243-1.735-0.733  c-0.478-0.485-0.714-1.078-0.714-1.771c0-0.692,0.236-1.28,0.714-1.764c0.476-0.486,1.053-0.726,1.735-0.726  c0.684,0,1.261,0.239,1.738,0.726c0.476,0.483,0.711,1.071,0.711,1.764c0,0.693-0.237,1.286-0.721,1.771  C10.729,28.757,10.153,29,9.479,29z"/>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_history.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_history.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_history.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,15 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<rect height="2" width="2" x="5" y="6"/>
-<rect height="2" width="9.941" x="8.059" y="6"/>
-<rect height="2" width="2" x="5" y="11"/>
-<rect height="2" width="9.941" x="8.059" y="11"/>
-<rect height="2" width="2" x="5" y="16"/>
-<rect height="2" width="2" x="5" y="21"/>
-<path d="M3,26V3h18v12.376C21.791,15.133,22.63,15,23.5,15c0.169,0,0.334,0.016,0.5,0.025V0H0v29h17.031 c-0.74-0.868-1.311-1.884-1.654-3H3z"/>
-<path d="M8.059,23h6.967c0.041-0.691,0.154-1.362,0.352-2H8.059V23z"/>
-<path d="M18,17.031V16H8.059v2h8.973C17.328,17.651,17.651,17.327,18,17.031z"/>
-<path d="M23.5,17c-3.59,0-6.5,2.91-6.5,6.5s2.91,6.5,6.5,6.5s6.5-2.91,6.5-6.5S27.09,17,23.5,17z M28,25h-4h-2v-2v-4h2v4h4V25z"/>
+</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 "/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hold_call.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <rect fill="none" height="30" width="30"/>
-<path d="M28.908,10.028l-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 c0.001,0.001,0.002,0.002,0.002,0.003c-1.125,0.355-3.859,0.922-5.933,0.923c-2.159-0.001-4.325-0.161-6.604-0.766 c0,0-0.009-0.002-0.012-0.002c0.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.486 c-0.412-0.076-0.811,0.162-0.891,0.537c0,0-0.068,0.325-0.126,1.224c-0.001,0-0.001,0-0.001,0.002 c-0.031,0.489,0.042,0.586,0.092,1.13c0.043,0.466,0.126,0.885,0.219,1.254c0,0.001-0.003,0.003-0.002,0.005 c0.019,0.074,0.039,0.145,0.059,0.216c0.002,0.009,0.005,0.018,0.006,0.025c0.203,0.72,0.43,1.17,0.43,1.17 c0.338,0.572,1.855,2.187,3.813,3.068c1.244,0.559,5.891,1.607,10.095,1.608c4.205,0.001,9.565-1.174,11.438-2.178 s2.946-2.212,3.165-2.671c0,0,0.59-1.164,0.658-2.688c0.023-0.509,0.037-0.543-0.01-1.002c0-0.003-0.003-0.004-0.003-0.007 c0,0.003,0,0.004,0,0.007c-0.094-0.907-0.161-1.243-0.161-1.243C29.71,10.125,29.308,9.921,28.908,10.028z"/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_home.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_home.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_home.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M29,13.999L15,1L1,13.999l3,3V29h22V16.999L29,13.999z M22.539,14H7.461L15,7L22.539,14z M23,26h-5v-7h-6v7H7V16h16V26z"/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hsdpa.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hsdpa.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hsdpa.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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.343,17.211v2.332h1.691v2.277c-0.228,0.082-0.528,0.148-1.005,0.148c-1.754,0-2.802-1.453-2.802-3.889  c0-1.189,0.382-5.021,4.613-3.446l0.46,0.289l0.536-2.296c0,0-0.991-0.788-2.648-0.788c-2.989,0-5.13,2.537-5.005,6.31  c0.188,5.582,3.314,6.182,4.773,6.182c1.977,0,3.043-0.787,3.043-0.787v-6.332H25.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.584  c-1.121,0.139-3.352-0.305-3.352-0.305l0.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.922,1.144-2.201,1.144-3.72c0-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.435h1.295  c0.33,0,2.188,0.4,2.015,2.369c-0.331,3.822-3.281,1.695-3.613,1.373l-0.562-0.559L1,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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" 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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hsdpa_attach.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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.262 5.341,22.262 9.513,28.939 11.54,27.668 "/>
-<polygon points="10.517,22.26 12.021,24.678 16.116,24.678 14.613,22.26 "/>
-<polygon points="16.948,22.26 18.453,24.678 22.565,24.678 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.697 "/>
-<polygon points="5.341,17.682 5.341,19.697 6.594,19.697 "/>
-<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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" 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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hsdpa_context.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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.722,22.217 5.481,22.219 9.64,28.875 11.683,27.6 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="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"/>
-<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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" 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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hsdpa_icon.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hsdpa_icon.svg	Mon Apr 19 14:02:13 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">
-<path d="M21.217,16.33v1.4h1.017V19.1c-0.137,0.049-0.317,0.09-0.604,0.09c-1.055,0-1.685-0.875-1.685-2.338  c0-0.715,0.229-3.019,2.773-2.071l0.276,0.173l0.322-1.38c0,0-0.596-0.474-1.592-0.474c-1.797,0-3.084,1.525-3.009,3.793  c0.113,3.355,1.992,3.717,2.869,3.717c1.188,0,1.829-0.475,1.829-0.475V16.33H21.217z"/>
-<path d="M13.605,9.56h3.786v2.039h-2.331v1.765c0,0,2.963-0.55,2.783,3.848c0,0,0.092,3.074-2.239,3.357  c-0.674,0.082-2.015-0.184-2.015-0.184l0.016-2.066c0,0,2.852,0.914,2.852-1.322c0-2.393-2.852-1.578-2.852-1.578V9.56z"/>
-<rect height="1.578" width="1.289" x="11.33" y="18.93"/>
-<path d="M10.109,14.493c0.437-0.555,0.688-1.323,0.688-2.236c0-0.774-0.251-2.865-2.03-2.865c-1.226,0-1.963,1.091-1.963,1.091  l0.454,2c0,0,0.684-0.949,1.35-0.949c0.327,0,0.721,0.16,0.721,0.933c0,0.917-0.728,1.118-1.004,1.118H7.548v2.065h0.778  c0.198,0,1.314,0.24,1.211,1.424c-0.199,2.297-1.973,1.018-2.172,0.824l-0.338-0.336l-0.443,2.021c0,0,0.658,0.98,1.94,0.98  c1.712,0,2.5-1.799,2.5-3.469C11.024,15.983,10.676,15.037,10.109,14.493z"/>
-<rect fill="none" height="30" width="30"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hsdpa_multipdp.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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.471,13.062 18.42,14.343 20.276,17.324 17.245,17.324 14.584,13.062 12.532,14.343 14.389,17.324 5.341,17.324   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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" 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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hsdpa_suspended.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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.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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" 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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_img_quality.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,11 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <rect fill="none" height="30" width="30"/>
-<rect height="3.375" width="3.375" x="24.375" y="13.313"/>
-<rect height="3.375" width="3.375" x="19.688" y="7.781"/>
-<rect height="3.375" width="3.375" x="19.688" y="18.844"/>
-<rect height="3.375" width="3.375" x="19.688" y="13.313"/>
-<polygon points="18.375,5.625 18.375,2.25 15,2.25 2.25,15 15,27.75 18.375,27.75 18.375,24.375 15,24.375 15,22.219 18.375,22.219 18.375,18.844 15,18.844 15,16.688 18.375,16.688 18.375,13.313 15,13.313 15,11.156 18.375,11.156 18.375,7.781 15,7.781 15,5.625 "/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_info.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_info.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_info.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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.002,1.702c-7.182,0-13,5.818-13,13s5.818,13,13,13s13-5.818,13-13S22.184,1.702,15.002,1.702z M15.002,5.374  c1.576,0,2.854,1.204,2.854,2.688s-1.277,2.688-2.854,2.688s-2.854-1.203-2.854-2.688S13.426,5.374,15.002,5.374z M19.115,23.406  h-8.229v-1.443h1.123v-7.612h-1.123v-1.444h7.107v9.057h1.121V23.406z"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" 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>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_input_down.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_input_down.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="10" height="10" viewBox="0 0 10 10">
-<rect fill="none" height="10" width="10"/>
-<polygon points="0,1 5,9 10,1 "/>
-</svg>
\ No newline at end of file
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_iso.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_iso.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_iso.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,9 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<path d="M2.854,21.552V20.04h1.081V9.959H2.854V8.447h4.588v1.512H6.36V20.04h1.081v1.512H2.854z"/>
-<path d="M11.581,21.693c-0.955,0-1.895-0.12-2.821-0.36v-1.564c1.014,0.275,1.913,0.413,2.699,0.413 c0.744,0,1.326-0.167,1.744-0.501c0.418-0.333,0.628-0.809,0.628-1.423c0-0.58-0.172-1.036-0.518-1.367 c-0.346-0.33-0.987-0.764-1.924-1.297c-1.025-0.573-1.717-1.152-2.075-1.735c-0.358-0.583-0.536-1.247-0.536-1.99 c0-1.184,0.396-2.073,1.191-2.668s1.829-0.892,3.107-0.892c0.925,0,1.778,0.088,2.557,0.264v1.529 c-0.826-0.188-1.594-0.281-2.302-0.281c-0.645,0-1.16,0.152-1.547,0.457c-0.387,0.304-0.58,0.727-0.58,1.266 c0,0.521,0.168,0.939,0.505,1.252s0.913,0.696,1.727,1.146c1.125,0.627,1.878,1.234,2.259,1.819 c0.381,0.586,0.571,1.245,0.571,1.979c0,1.318-0.391,2.307-1.173,2.966S13.14,21.693,11.581,21.693z"/>
-<path d="M22.357,21.693c-1.582,0-2.773-0.554-3.574-1.662c-0.8-1.107-1.199-2.844-1.199-5.211c0-2.227,0.399-3.868,1.199-4.926 c0.801-1.058,1.991-1.586,3.574-1.586c1.594,0,2.79,0.544,3.59,1.631c0.799,1.086,1.199,2.714,1.199,4.882 c0,2.361-0.4,4.097-1.203,5.207C25.141,21.139,23.944,21.693,22.357,21.693z M22.357,20.182c0.732,0,1.29-0.383,1.674-1.147 c0.383-0.765,0.576-2.17,0.576-4.214c0-1.852-0.191-3.147-0.572-3.889s-0.94-1.112-1.678-1.112c-0.733,0-1.291,0.354-1.675,1.059 c-0.384,0.706-0.575,2.02-0.575,3.942c0,1.893,0.189,3.26,0.57,4.1C21.059,19.761,21.618,20.182,22.357,20.182z"/>
+</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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_italic.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_italic.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_italic.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <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 "/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_join_call.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <rect fill="none" height="30" width="30"/>
-<path d="M10.213,8.109c0.054,0.038,0.102,0.08,0.158,0.117c0.002,0.085,0.007,0.529,0.002,0.614 c-0.004,0.053-0.023,0.109-0.042,0.166c0.089,1.067,0.151,3.104-0.483,4.349c-0.273,0.539-0.615,1.011-1.033,1.424 c0.305,0.294,0.856,0.707,1.623,1.221h6.824c-0.354-0.427-0.67-0.879-0.912-1.389c-0.469-0.993-0.623-2.394-0.651-3.634 c-1.034-0.719-2.032-1.543-2.069-2.137c-0.006-0.09,0-0.523,0-0.614c0.621-0.419,1.057-0.91,1.383-1.552 c0.605-1.188,0.281-3.985,0.281-3.985C15.293,1.45,13.646,0,12.395,0H11.6c-1.254,0-2.902,1.45-2.902,2.689 c0,0-0.172,1.68,0.018,2.992C9.477,6.346,10.033,7.214,10.213,8.109z"/>
-<path d="M19.987,15.797c0.003,0.112,0.009,0.695,0.001,0.807c-0.005,0.076-0.032,0.158-0.061,0.24c0-0.001,0.002-0.002,0.002-0.003 h4.393c-0.027-0.081-0.055-0.162-0.06-0.237c-0.007-0.118-0.001-0.687,0.001-0.807c0.814-0.549,1.385-1.194,1.814-2.037 c0.795-1.559,0.369-5.229,0.369-5.229c0-1.626-2.16-3.53-3.805-3.53H21.6c-1.645,0-3.81,1.904-3.81,3.53 c0,0-0.376,3.652,0.367,5.225C18.564,14.615,19.153,15.25,19.987,15.797z"/>
-<path d="M24.677,17.443l-2.552,5.771l-2.551-5.771c-0.549,0.688-1.57,1.464-2.574,2.146V26h13v-4.594 C29.778,21.114,25.947,19.043,24.677,17.443z"/>
-<path d="M7.129,14.841c-0.006-0.09,0-0.523,0-0.614c0.621-0.419,1.057-0.91,1.383-1.552c0.605-1.188,0.281-3.985,0.281-3.985 C8.793,7.45,7.146,6,5.895,6H5.1C3.846,6,2.197,7.45,2.197,8.689c0,0-0.287,2.783,0.279,3.981c0.311,0.654,0.76,1.139,1.395,1.556 c0.002,0.085,0.007,0.529,0.002,0.614C3.811,15.82,1.139,17.425,0,18.148V22h1.454l7.665-5.078 C8.115,16.217,7.166,15.42,7.129,14.841z"/>
-<polygon points="11,18.075 2,23.537 11,29 11,26 15,26 15,21 11,21 "/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_join_conference.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_join_conference.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +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>
-<path d="M0,0v30h30V0H0z M28.235,26.986l-6.012-6.012l-0.454,2.042l5.218,5.219H2.626l5.535-5.534l-0.454-2.042   l-5.942,5.941V3.013l9.352,9.352h2.119v-0.377l-2.467-2.467c-0.202-0.056-0.401-0.12-0.594-0.202   C7.701,8.271,7.043,6.555,6.869,5.621L3.013,1.765h23.589l-3.413,3.413c-0.041,0.684-0.408,2.89-3.363,4.141   c-0.348,0.147-0.714,0.25-1.093,0.315l-1.968,1.968v0.763h1.732l9.738-9.738V26.986z" fill-opacity="0.5" stroke-opacity="0.5"/>
-<g>
-<rect height="3.519" width="17.646" x="6.177" y="13.246"/>
-<polygon points="9.706,25.588 20.294,25.588 22.059,17.647 7.941,17.647   "/>
-<path d="M10.519,8.506c1.35,0.571,2.732,0.287,3.599-0.017v3.875h1.766V8.489c0.866,0.304,2.249,0.588,3.599,0.017    c2.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.01    c-0.032-0.31-0.328-1.98-2.973-3.101c-2.925-1.238-4.335,0.06-4.335,0.06S7.593,7.268,10.519,8.506z"/>
-</g>
-</g>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_landscape.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_landscape.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_landscape.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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.002 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <g fill-opacity="0.5" stroke-opacity="0.5">
-<rect fill="none" height="30" width="29.998"/>
+<rect fill="none" height="30" width="30" x="0.002"/>
 </g>
-<path d="M28.994,28C28.996,27.929,29,27.86,29,27.789c0-6.719-2.422-12.164-5.41-12.164c-1.65,0-3.125,1.667-4.117,4.286  C17.91,12.875,14.576,8,10.703,8C5.469,8,1.215,16.881,1,28H28.994z"/>
+<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.5l0,0c0-1.381,1.119-2.5,2.5-2.5h6  C27.881,3.938,29,5.057,29,6.438L29,6.438z"/>
+<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>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_lap.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_lap.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_lap.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,15 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<rect height="5.5" width="1.5" x="19.16" y="14.187"/>
-<path d="M20,10.999c-4.971,0-9,4.03-9,9c0,4.971,4.029,9,9,9s9-4.029,9-9C29,15.029,24.971,10.999,20,10.999z M20,26.749 c-3.729,0-6.75-3.022-6.75-6.75c0-3.729,3.021-6.75,6.75-6.75s6.75,3.021,6.75,6.75C26.75,23.727,23.729,26.749,20,26.749z"/>
-<path d="M10.66,10.096V7.187h-1.5v5.5h0.371C9.604,11.688,10.013,10.784,10.66,10.096z"/>
-<path d="M5.189,3.677C4.769,3.41,4.278,3.249,3.744,3.249C2.228,3.249,1,4.479,1,5.993c0,0.424,0.098,0.823,0.27,1.182 C2.256,5.701,3.607,4.496,5.189,3.677z"/>
-<path d="M8.543,2.612C9.021,2.546,9.504,2.499,10,2.499c0.436,0,0.867,0.036,1.297,0.091V2.375h1.377V1.687 c0-0.38-0.309-0.688-0.689-0.688h-4.13c-0.379,0-0.687,0.308-0.687,0.688v0.688h1.376V2.612z"/>
-<path d="M16.256,3.249c-0.539,0-1.034,0.165-1.457,0.436c1.078,0.557,2.067,1.288,2.905,2.194l0.573,0.62h0.67 C18.979,6.335,19,6.167,19,5.993C19,4.479,17.771,3.249,16.256,3.249z"/>
-<path d="M9.5,19.999c0-0.093,0.013-0.183,0.015-0.274c-3.501-0.25-6.265-3.162-6.265-6.726c0-3.729,3.022-6.75,6.75-6.75 c2.316,0,4.357,1.167,5.574,2.944c0.03,0.015,0.063,0.026,0.094,0.042V8.687c0-0.74,0.371-1.393,0.935-1.789 C14.959,5.119,12.613,3.999,10,3.999c-4.971,0-9,4.03-9,9c0,4.867,3.866,8.822,8.693,8.984C9.57,21.34,9.5,20.678,9.5,19.999z"/>
-<path d="M15.189,10.677c-0.42-0.267-0.912-0.428-1.445-0.428c-1.516,0-2.744,1.229-2.744,2.744c0,0.424,0.098,0.823,0.27,1.182 C12.256,12.701,13.607,11.496,15.189,10.677z"/>
-<path d="M18.543,9.612C19.021,9.546,19.504,9.499,20,9.499c0.439,0,0.871,0.036,1.297,0.089V9.375h1.377V8.687 c0-0.38-0.309-0.688-0.689-0.688h-4.131c-0.379,0-0.686,0.308-0.686,0.688v0.688h1.375V9.612z"/>
-<path d="M28.729,14.174C28.902,13.816,29,13.417,29,12.993c0-1.515-1.229-2.744-2.744-2.744c-0.534,0-1.025,0.161-1.445,0.428 C26.393,11.496,27.744,12.701,28.729,14.174z"/>
+</g>
+<rect height="6" width="2" x="20" y="15"/>
+<path d="M19.5,10.115C19.991,10.047,20.49,10,21,10s1.009,0.047,1.5,0.115V9.634H24V8.75C24,8.334,23.664,8,23.249,8h-4.5  C18.334,8,18,8.334,18,8.75v0.884h1.5V10.115z"/>
+<path d="M21,12c-4.971,0-9,4.029-9,9c0,4.972,4.029,9,9,9s9-4.028,9-9C30,16.029,25.971,12,21,12z M21,28c-3.866,0-7-3.134-7-7  s3.134-7,7-7s7,3.134,7,7S24.866,28,21,28z"/>
+<path d="M29.697,14.291C29.886,13.898,30,13.464,30,13c0-1.656-1.344-3-3-3c-0.766,0-1.457,0.296-1.987,0.769  C26.877,11.502,28.49,12.729,29.697,14.291z"/>
+<path d="M16.987,10.769C16.457,10.296,15.766,10,15,10c-1.656,0-3,1.344-3,3c0,0.464,0.114,0.898,0.303,1.291  C13.51,12.729,15.123,11.502,16.987,10.769z"/>
+<path d="M7.5,2.115C7.991,2.047,8.49,2,9,2s1.009,0.047,1.5,0.115V1.634H12V0.75C12,0.334,11.664,0,11.249,0h-4.5  C6.334,0,6,0.334,6,0.75v0.884h1.5V2.115z"/>
+<path d="M17.697,6.291C17.886,5.898,18,5.464,18,5c0-1.656-1.344-3-3-3c-0.766,0-1.457,0.296-1.987,0.769  C14.877,3.502,16.49,4.729,17.697,6.291z"/>
+<path d="M4.987,2.769C4.457,2.296,3.766,2,3,2C1.344,2,0,3.344,0,5c0,0.464,0.114,0.898,0.303,1.291  C1.51,4.729,3.123,3.502,4.987,2.769z"/>
+<path d="M10,21c0-0.368,0.025-0.73,0.063-1.089C9.715,19.964,9.362,20,9,20c-3.866,0-7-3.134-7-7s3.134-7,7-7  c1.958,0,3.727,0.806,4.996,2.102C14.32,8.035,14.656,8,15,8c0.365,0,0.724,0.054,1.076,0.133c0.037-0.164,0.092-0.32,0.157-0.472  C14.594,5.444,11.969,4,9,4c-4.971,0-9,4.029-9,9c0,4.972,4.029,9,9,9c0.355,0,0.703-0.025,1.047-0.066  C10.021,21.625,10,21.315,10,21z"/>
+<rect height="6" width="2" x="8" y="7"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_last_result.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,12 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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="M0,0v30h30V0H0z M28.235,26.986l-6.012-6.012l-0.454,2.042l5.218,5.219H2.626l5.535-5.534l-0.454-2.042   l-5.942,5.941V3.013l9.352,9.352h2.119v-0.377l-2.467-2.467c-0.202-0.056-0.401-0.12-0.594-0.202   C7.701,8.271,7.043,6.555,6.869,5.621L3.013,1.765h23.589l-3.413,3.413c-0.041,0.684-0.408,2.89-3.363,4.141   c-0.348,0.147-0.714,0.25-1.093,0.315l-1.968,1.968v0.763h1.732l9.738-9.738V26.986z" fill-opacity="0.5" stroke-opacity="0.5"/>
-<g>
-<rect height="3.519" width="17.646" x="6.177" y="13.246"/>
-<polygon points="9.706,25.588 20.294,25.588 22.059,17.647 7.941,17.647   "/>
-<path d="M10.519,8.506c1.35,0.571,2.732,0.287,3.599-0.017v3.875h1.766V8.489c0.866,0.304,2.249,0.588,3.599,0.017    c2.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.01    c-0.032-0.31-0.328-1.98-2.973-3.101c-2.925-1.238-4.335,0.06-4.335,0.06S7.593,7.268,10.519,8.506z"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
+<rect fill="none" height="30" width="30"/>
 </g>
-</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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_light.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_light.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_light.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,13 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <rect fill="none" height="30" width="30"/>
-<rect fill="none" height="30.001" width="30" y="-0.001"/>
-<rect height="3.75" width="1.5" x="14.377" y="1.687"/>
-<rect height="1.5" width="3.75" x="2.25" y="12.343"/>
-<rect height="3.751" transform="matrix(-0.7073 0.7069 -0.7069 -0.7073 16.5283 4.8865)" width="1.5" x="6.502" y="3.99"/>
-<rect height="1.5" width="3.75" x="24" y="12.343"/>
-<rect height="3.75" transform="matrix(0.7071 0.7071 -0.7071 0.7071 10.8098 -14.3667)" width="1.5" x="21.997" y="3.99"/>
-<path d="M15.122,7.312c-4.483,0-7.494,2.858-7.494,7.111c0,1.482,1.441,4.204,4.283,8.091l0.674,0.922h5.083l0.676-0.922 c2.842-3.888,4.283-6.609,4.283-8.091C22.627,10.17,19.615,7.312,15.122,7.312z M16.527,21.186h-2.8c0,0-3.85-5.265-3.85-6.763 c0-3.249,2.35-4.863,5.25-4.861c2.9-0.002,5.25,1.612,5.25,4.861C20.377,15.921,16.527,21.186,16.527,21.186z"/>
-<rect height="3.75" width="5.25" x="12.502" y="24.561"/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_light_off.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <rect fill="none" height="30" width="30"/>
 <rect fill="none" height="30" width="30"/>
-<rect height="3.75" width="5.25" x="12.328" y="21.75"/>
-<path d="M11.131,8.065c0.958-0.876,2.313-1.317,3.822-1.315c2.901-0.002,5.25,1.612,5.25,4.861c0,0.715-0.877,2.285-1.793,3.734 l1.641,1.641c1.595-2.465,2.402-4.267,2.402-5.375c0-4.252-3.012-7.111-7.506-7.111c-2.239,0-4.111,0.713-5.424,1.958L11.131,8.065z "/>
-<path d="M15.218,18.375h-1.666c0,0-1.937-2.652-3.063-4.727l-2.979-2.981c-0.035,0.308-0.058,0.621-0.058,0.944 c0,1.482,1.441,4.205,4.283,8.093l0.674,0.922h5.057L15.218,18.375z"/>
-<rect height="33.236" transform="matrix(-0.7062 0.708 -0.708 -0.7062 36.1343 15.0037)" width="1.4" x="14.254" y="-1.62"/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_location.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_location.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_location.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <rect fill="none" height="30" width="30"/>
-<path d="M24.637,2.317c-1.588,1.121-4.315,2.698-5.496,2.698c0,0-0.002,0-0.004,0c-0.271-0.031-0.67-0.292-1.092-0.568  c-0.836-0.548-1.982-1.299-3.654-1.31c-0.963,0-2.313,0.739-3.456,1.504l5.146,13.324c0.676-1.401,1.627-3.068,2.503-3.689  c0.306-0.218,1.161-0.649,1.849-0.995c0.693-0.351,1.294-0.653,1.648-0.878c2.91-1.868,3.971-8.409,4.082-9.149L26.5,1L24.637,2.317  z"/>
-<polygon points="8.435,3.566 3.5,5.465 4.802,8.84 5.583,8.539 12.577,26.664 15.881,29 16.738,25.069 "/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_location_collection.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <rect fill="none" height="30" width="30"/>
-<path d="M17.592,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  c-0.479-0.314-1.133-0.742-2.09-0.749c-0.551,0-1.32,0.422-1.975,0.859L12.7,19.16c0.387-0.801,0.93-1.753,1.432-2.108  c0.176-0.124,0.664-0.371,1.057-0.568c0.396-0.2,0.738-0.373,0.942-0.502c1.664-1.067,2.27-4.806,2.332-5.228l0.193-1.287  L17.592,10.22z"/>
-<polygon points="8.333,10.933 5.513,12.019 6.257,13.946 6.704,13.774 10.7,24.132 12.589,25.467 13.077,23.221 "/>
-<polygon points="5.999,1 5.999,4 26,4 26,24 29,24 29,1 "/>
-<path d="M1,29h23V6H1V29z M4,9h17v17H4V9z"/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_log.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_log.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_log.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,12 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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="M0,0v30h30V0H0z M28.235,26.986l-6.012-6.012l-0.454,2.042l5.218,5.219H2.626l5.535-5.534l-0.454-2.042   l-5.942,5.941V3.013l9.352,9.352h2.119v-0.377l-2.467-2.467c-0.202-0.056-0.401-0.12-0.594-0.202   C7.701,8.271,7.043,6.555,6.869,5.621L3.013,1.765h23.589l-3.413,3.413c-0.041,0.684-0.408,2.89-3.363,4.141   c-0.348,0.147-0.714,0.25-1.093,0.315l-1.968,1.968v0.763h1.732l9.738-9.738V26.986z" fill-opacity="0.5" stroke-opacity="0.5"/>
-<g>
-<rect height="3.519" width="17.646" x="6.177" y="13.246"/>
-<polygon points="9.706,25.588 20.294,25.588 22.059,17.647 7.941,17.647   "/>
-<path d="M10.519,8.506c1.35,0.571,2.732,0.287,3.599-0.017v3.875h1.766V8.489c0.866,0.304,2.249,0.588,3.599,0.017    c2.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.01    c-0.032-0.31-0.328-1.98-2.973-3.101c-2.925-1.238-4.335,0.06-4.335,0.06S7.593,7.268,10.519,8.506z"/>
-</g>
-</g>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" 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 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_low_light.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <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="M14.995,6.215c-5.001,0-8.495,3.297-8.495,8.019c0,0.694,0,2.538,4.627,8.769l0.898,1.213h5.951l0.898-1.213  c4.625-6.23,4.625-8.074,4.625-8.769C23.5,9.512,20.006,6.215,14.995,6.215z M16.467,21.215h-2.931c0,0-4.036-5.435-4.036-6.981  c0-3.355,2.463-5.021,5.5-5.019c3.037-0.002,5.5,1.663,5.5,5.019C20.5,15.781,16.467,21.215,16.467,21.215z"/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_lsk_horizontal.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M19,10H1v4h18c3.309,0,6,2.691,6,6h4C29,14.486,24.514,10,19,10z"/>
+<path d="M19,10h-18v4h18c3.309,0,6,2.691,6,6h4c0-5.51-4.49-10-10-10z"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_lsk_vertical.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M10,11v18h4V11c0-3.309,2.691-6,6-6V1C14.486,1,10,5.486,10,11z"/>
+<path d="M10,11v18h4v-18c0-3.309,2.691-6,6-6v-4c-5.51,0-10,4.486-10,10z"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_memory_in_use.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,9 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<path d="M18.953,3H5.625v24h18.75V8.422L18.953,3z M22.125,24.75H7.875V5.25h10.146l4.104,4.104V24.75z"/>
-<rect height="1.5" width="12.75" x="8.625" y="22.5"/>
-<polygon points="17.707,6.004 17.707,8.25 16.207,8.25 16.207,6 14.666,6 14.666,8.25 13.166,8.25 13.166,6 11.625,6 11.625,8.25 10.125,8.25 10.125,6 8.625,6 8.625,15 21.375,15 21.375,9.672 "/>
+</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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_merge.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_merge.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
+<rect fill="none" height="30" width="30"/>
+</g>
+<path d="M29,17l-8-6v4h-4v-0.025C12.5,14.738,8.827,11.364,8.13,7H4.089c0.346,3.111,1.762,5.895,3.858,8H1v4h20v4L29,17z"/>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_mic_mute.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <rect fill="none" height="30" width="30"/>
-<path d="M12.393,8.243l4.364-4.364c1.17-1.17,3.073-1.17,4.242,0L23.121,6c1.169,1.17,1.169,3.073,0,4.243l-4.363,4.363l1.414,1.414 l4.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.364L12.393,8.243z"/>
-<path d="M17,12.5c0-1.93-1.57-3.5-3.5-3.5c-0.109,0-0.212,0.021-0.318,0.032l3.786,3.785C16.979,12.712,17,12.608,17,12.5z"/>
-<path d="M20,26h-5v-4.808l1.023-1.022L6.83,10.977l-1.387,1.388c-0.791,0.791-1.245,1.782-1.396,2.81l-0.019,0.019l0.016,0.016 c-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.016l0.019-0.019 c0.059-0.009,0.117-0.007,0.175-0.017V26H7c-0.553,0-1,0.447-1,1v2h6h3h6v-2C21,26.447,20.553,26,20,26z"/>
-<rect height="35.826" transform="matrix(0.7066 -0.7076 0.7076 0.7066 -6.1479 14.8607)" width="1.867" x="13.912" y="-3.069"/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_mic_unmute.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <rect fill="none" height="30" width="30"/>
-<path d="M24.557,4.586l-2.121-2.121c-1.953-1.953-5.119-1.953-7.071,0l-4.95,4.95L9,6L6.879,8.121l1.414,1.415l-2.828,2.828 c-0.791,0.791-1.245,1.782-1.396,2.81l-0.019,0.019l0.016,0.016c-0.209,1.499,0.245,3.074,1.398,4.228l2.121,2.121 c1.153,1.153,2.728,1.607,4.227,1.398l0.016,0.016l0.019-0.019c0.059-0.009,0.117-0.007,0.175-0.017V26h-5c-0.553,0-1,0.447-1,1v2h6 h3h6v-2c0-0.553-0.447-1-1-1h-5v-4.808l2.464-2.464l1.414,1.414l2.121-2.121l-1.414-1.414l4.95-4.95 C26.51,9.704,26.51,6.539,24.557,4.586z M13.521,14.5c-1.104,0-2-0.896-2-2s0.896-2,2-2s2,0.896,2,2S14.626,14.5,13.521,14.5z M23.143,10.243l-4.95,4.95l-1.419-1.42c0.155-0.396,0.248-0.823,0.248-1.273c0-1.93-1.57-3.5-3.5-3.5 c-0.45,0-0.878,0.093-1.273,0.248l-0.42-0.419l4.95-4.95c1.17-1.17,3.073-1.17,4.242,0L23.143,6 C24.312,7.17,24.312,9.073,23.143,10.243z"/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_minus.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_minus.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_minus.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,7 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <rect fill="none" height="30" width="30"/>
-<rect fill="none" height="30" width="30"/>
-<rect height="5.25" width="22.5" x="3.75" y="12.375"/>
+<rect height="4" width="22" x="4" y="13"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_missed_call_unseen.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,12 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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="M0,0v30h30V0H0z M28.235,26.986l-6.012-6.012l-0.454,2.042l5.218,5.219H2.626l5.535-5.534l-0.454-2.042   l-5.942,5.941V3.013l9.352,9.352h2.119v-0.377l-2.467-2.467c-0.202-0.056-0.401-0.12-0.594-0.202   C7.701,8.271,7.043,6.555,6.869,5.621L3.013,1.765h23.589l-3.413,3.413c-0.041,0.684-0.408,2.89-3.363,4.141   c-0.348,0.147-0.714,0.25-1.093,0.315l-1.968,1.968v0.763h1.732l9.738-9.738V26.986z" fill-opacity="0.5" stroke-opacity="0.5"/>
-<g>
-<rect height="3.519" width="17.646" x="6.177" y="13.246"/>
-<polygon points="9.706,25.588 20.294,25.588 22.059,17.647 7.941,17.647   "/>
-<path d="M10.519,8.506c1.35,0.571,2.732,0.287,3.599-0.017v3.875h1.766V8.489c0.866,0.304,2.249,0.588,3.599,0.017    c2.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.01    c-0.032-0.31-0.328-1.98-2.973-3.101c-2.925-1.238-4.335,0.06-4.335,0.06S7.593,7.268,10.519,8.506z"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
+<rect fill="none" height="30" width="30"/>
 </g>
-</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>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_mobile.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_mobile.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_mobile.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,6 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<path d="M22.5,2.813h-15c-0.517,0-0.938,0.422-0.938,0.938v22.5c0,0.516,0.421,0.938,0.938,0.938h15 c0.515,0,0.938-0.422,0.938-0.938V3.75C23.438,3.234,23.015,2.813,22.5,2.813z M10.313,24.375H9.375 c-0.517,0-0.938-0.422-0.938-0.938S8.858,22.5,9.375,22.5h0.938c0.515,0,0.938,0.422,0.938,0.938S10.827,24.375,10.313,24.375z M16.875,24.375c0,0.516-0.423,0.938-0.938,0.938h-1.875c-0.517,0-0.938-0.422-0.938-0.938V22.5c0-0.516,0.421-0.938,0.938-0.938 h1.875c0.515,0,0.938,0.422,0.938,0.938V24.375z M20.625,24.375h-0.938c-0.517,0-0.938-0.422-0.938-0.938s0.421-0.938,0.938-0.938 h0.938c0.515,0,0.938,0.422,0.938,0.938S21.14,24.375,20.625,24.375z M21.563,19.688H8.438v-15h13.125V19.688z"/>
+</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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_mono_recognize_song.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_mono_recognize_song.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" 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 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_more.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_more.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_more.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" 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"/>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_music_albums.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_music_albums.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
+<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"/>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_mute.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_mute.svg	Mon Apr 19 14:02:13 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="40px" version="1.1" viewBox="0 0 40 40" 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="40" width="40"/>
-<rect height="12" width="7" x="6.483" y="15.48"/>
-<polygon points="26.483,18.679 26.483,7.48 19.393,11.588 "/>
-<polygon points="14.483,14.976 14.483,28.481 26.483,35.481 26.483,26.975 "/>
-<rect height="44.313" transform="matrix(0.7061 -0.7082 0.7082 0.7061 -6.8584 21.7822)" width="1.867" x="21.876" y="-3.004"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_mute_mic.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_mute_mic.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +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>
-<path d="M0,0v30h30V0H0z M28.235,26.986l-6.012-6.012l-0.454,2.042l5.218,5.219H2.626l5.535-5.534l-0.454-2.042   l-5.942,5.941V3.013l9.352,9.352h2.119v-0.377l-2.467-2.467c-0.202-0.056-0.401-0.12-0.594-0.202   C7.701,8.271,7.043,6.555,6.869,5.621L3.013,1.765h23.589l-3.413,3.413c-0.041,0.684-0.408,2.89-3.363,4.141   c-0.348,0.147-0.714,0.25-1.093,0.315l-1.968,1.968v0.763h1.732l9.738-9.738V26.986z" fill-opacity="0.5" stroke-opacity="0.5"/>
-<g>
-<rect height="3.519" width="17.646" x="6.177" y="13.246"/>
-<polygon points="9.706,25.588 20.294,25.588 22.059,17.647 7.941,17.647   "/>
-<path d="M10.519,8.506c1.35,0.571,2.732,0.287,3.599-0.017v3.875h1.766V8.489c0.866,0.304,2.249,0.588,3.599,0.017    c2.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.01    c-0.032-0.31-0.328-1.98-2.973-3.101c-2.925-1.238-4.335,0.06-4.335,0.06S7.593,7.268,10.519,8.506z"/>
-</g>
-</g>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_new_email.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_new_email.svg	Mon Apr 19 14:02:13 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="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"/>
-<rect fill="none" height="30" width="30"/>
-<rect height="2.711" transform="matrix(-0.903 0.4297 -0.4297 -0.903 54.0456 -0.1785)" width="4.712" x="24.687" y="4.657"/>
-<rect height="2.711" transform="matrix(-0.3905 0.9206 -0.9206 -0.3905 34.7238 -17.5392)" width="4.711" x="20.812" y="1.369"/>
-<path d="M24.788,10.249l-0.038-0.079v9.846l-5.141-5.462l5.103-4.465l-0.671-1.407l-5.969,5.223l-0.34,0.297L14.25,17.25 l-3.484-3.048l-0.339-0.297L3.964,8.25h19.872l-0.628-1.32L21.014,6H1.5v18H27V9.196L24.788,10.249z M3.75,10.055l5.141,4.498 L3.75,20.016V10.055z M24.75,21.75h-21v-0.094l5.987-6.361l4.513,3.949l4.513-3.949l5.987,6.361V21.75z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_new_event.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <rect fill="none" height="30" width="30"/>
-<polygon points="18.882,18 21.132,1 8.867,1 11.117,18 "/>
-<path d="M15,19c-2.756,0-5,2.243-5,5c0,2.756,2.244,5,5,5s4.999-2.244,4.999-5  C19.999,21.243,17.755,19,15,19z"/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_new_message.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_new_message.svg	Mon Apr 19 14:02:13 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="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"/>
-<rect fill="none" height="30" width="30"/>
-<rect height="2.711" transform="matrix(-0.903 0.4297 -0.4297 -0.903 54.0456 -0.1785)" width="4.712" x="24.687" y="4.657"/>
-<rect height="2.711" transform="matrix(-0.3905 0.9206 -0.9206 -0.3905 34.7238 -17.5392)" width="4.711" x="20.812" y="1.369"/>
-<path d="M24.788,10.249l-0.038-0.079v9.846l-5.141-5.462l5.103-4.465l-0.671-1.407l-5.969,5.223l-0.34,0.297L14.25,17.25 l-3.484-3.048l-0.339-0.297L3.964,8.25h19.872l-0.628-1.32L21.014,6H1.5v18H27V9.196L24.788,10.249z M3.75,10.055l5.141,4.498 L3.75,20.016V10.055z M24.75,21.75h-21v-0.094l5.987-6.361l4.513,3.949l4.513-3.949l5.987,6.361V21.75z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_next.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_next.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_next.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,10 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <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 "/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_night.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_night.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_night.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" 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.184C22.346,2.299,20.834,2,19.25,2c-7.18,0-13,5.82-13,13s5.821,13,13,13  c1.584,0,3.096-0.297,4.5-0.816C18.792,25.352,15.25,20.596,15.25,15z"/>
+<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>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_night_portrait.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <rect fill="none" height="30" width="30"/>
-</g>
-<path d="M22.443,18.262c-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.176,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-4h2v4h8  v-4h2v4H29v-5.25C28.699,23.354,22.559,20.084,22.443,18.262z"/>
-<path d="M6.143,8.5c0-3.229,2.023-5.971,4.857-7.029C10.197,1.174,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.473,6.143,11.729,6.143,8.5z"/>
+<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>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_notes_all.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,13 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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"/>
-<rect height="2" width="2" x="9" y="13"/>
-<rect height="2" width="8.94" x="12.059" y="13"/>
-<rect height="2" width="2" x="9" y="8"/>
-<rect height="2" width="8.94" x="12.059" y="8"/>
-<rect height="5" width="9.999" x="10"/>
-<polygon points="23.999,21 26.999,21 26.999,2 21.999,2 21.999,5 23.999,5 "/>
-<polygon points="17.999,27 6,27 6,5 8,5 8,2 3,2 3,30 17.999,30 "/>
-<polygon points="19.999,30 19.999,23 26.999,23 "/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
+<rect fill="none" height="30" width="30"/>
+</g>
+<polygon points="19,29 27,21 19,21 "/>
+<rect height="2" width="2" x="9" y="14"/>
+<rect height="2" width="8.999" x="12" y="14"/>
+<rect height="2" width="2" x="9" y="9"/>
+<rect height="2" width="8.999" x="12" y="9"/>
+<polygon points="22,2 22,5 24,5 24,20 27,20 27,2 "/>
+<polygon points="6,5 8,5 8,2 3,2 3,29 18,29 18,26 6,26 "/>
+<rect height="5" width="10" x="10"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_notes_collections.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,14 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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"/>
-<rect height="4" width="6.999" x="14"/>
-<polygon points="24.999,17 27.999,17 27.999,1 22.999,1 22.999,4 24.999,4 "/>
-<polygon points="19.999,22 10,22 10,4 12,4 12,1 7,1 7,25 19.999,25 "/>
-<polygon points="21.999,25 21.999,19 27.999,19 "/>
-<rect height="2" width="5.999" x="16.043" y="12"/>
-<rect height="2" width="2" x="12.959" y="12"/>
-<rect height="2" width="5.999" x="16.043" y="7"/>
-<rect height="2" width="2" x="12.959" y="7"/>
-<polygon points="15,27 5,27 5,6 2,6 2,30 15,30 "/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
+<rect fill="none" height="30" width="30"/>
+</g>
+<polygon points="6,1 6,4 26,4 26,16 29,16 29,1 "/>
+<polygon points="17,29 24,22 17,22 "/>
+<polygon points="26,20 29,17 26,17 "/>
+<polygon points="1,29 16,29 16,26 4,26 4,9 21,9 21,21 24,21 24,6 1,6 "/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_offline.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_offline.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_offline.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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.558 -0.66 31 31" width="31px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<polygon fill="none" points="20.334,5.243 13.773,5.243 13.773,12.502 20.334,7.079 "/>
-<polygon fill="none" points="4.18,5.243 4.18,7.042 10.592,12.456 10.592,5.243 "/>
-<path d="M1.001,2.062v6.456l9.591,8.098v10.943h3.182V16.625l9.744-8.048V2.062H1.001z M4.18,7.042V5.243h6.412v7.213L4.18,7.042z   M13.773,5.243h6.561v1.835l-6.561,5.424V5.243z"/>
-<polygon points="29,17.904 26.87,15.773 22.919,19.725 18.968,15.773 16.835,17.902 20.787,21.855 16.835,25.806 18.968,27.938   22.919,23.987 26.87,27.938 29,25.806 25.049,21.855 "/>
-<rect fill="none" height="30" width="30"/>
-<rect fill="none" height="30" width="30"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" 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>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_ok.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_ok.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="40px" height="40px" viewBox="0 0 40 40" enable-background="new 0 0 40 40" xml:space="preserve">
-<defs>
-</defs>
-<path d="M38.428,9.245L21.166,33.889c-0.125,0.18-0.304,0.292-0.46,0.439c-0.054,0.057-0.063,0.128-0.12,0.179
-	c-0.068,0.072-0.163,0.092-0.234,0.156c-0.063,0.048-0.128,0.092-0.194,0.13c-1.695,1.328-4.119,1.277-5.68-0.28L2.266,22.3
-	c-1.688-1.69-1.688-4.423,0-6.108c1.685-1.688,4.418-1.688,6.104,0l10.271,10.266L33.235,5.613c1.006-1.436,2.98-1.782,4.416-0.776
-	C39.081,5.838,39.429,7.81,38.428,9.245z"/>
-<rect fill="none" width="40" height="40"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_one.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_one.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
+<rect fill="none" height="30" width="30"/>
+</g>
+<path d="M22,22.813V25H10.01v-2.188H14V7l-4,1V6l6-2h2v18.813H22z"/>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_online_support.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_online_support.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" 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>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_options_menu.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 "/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<polygon points="28.5,7,15,25,1.5,7"/>
 <rect fill="none" height="30" width="30"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_organize.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_organize.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_organize.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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.029 8.526,20 8.526,17 12,17 "/>
-<polygon points="18,17 21.474,17 21.474,20 29,14.971 21.474,10 21.474,13 18,13 "/>
-<polygon points="17,12 17,8.526 20,8.526 14.971,1 10,8.526 13,8.526 13,12 "/>
-<polygon points="13,18 13,21.474 10,21.474 15.029,29 20,21.474 17,21.474 17,18 "/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" 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">
 <rect fill="none" height="30" width="30"/>
 </g>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_outbox.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_outbox.svg	Mon Apr 19 14:02:13 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="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"/>
-<rect fill="none" height="30" width="30"/>
-<polygon points="23.25,18 23.25,21 6.75,21 6.75,18 4.5,18 4.5,24.75 5.25,24.75 6.75,24.75 23.25,24.75 24.75,24.75 25.5,24.75 25.5,18 "/>
-<polygon points="12,17.25 18,17.25 18,11.25 21,11.25 15,3.75 9,11.25 12,11.25 "/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_ovistore.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_ovistore.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_ovistore.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,10 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<path d="M14.432,21.776c-0.238,0-0.414,0.115-0.552,0.364c-0.157,0.286-0.238,0.716-0.238,1.279c0,1.648,0.595,1.648,0.79,1.648 c0.239,0,0.413-0.115,0.547-0.365c0.154-0.285,0.232-0.717,0.232-1.283c0-0.565-0.078-0.996-0.232-1.281 C14.845,21.892,14.671,21.776,14.432,21.776z"/>
-<path d="M22.97,21.777c-0.056,0-0.226,0-0.405,0.291c-0.109,0.179-0.176,0.4-0.201,0.66h1.164c-0.022-0.262-0.086-0.486-0.188-0.668 C23.178,21.777,23.021,21.777,22.97,21.777z"/>
-<path d="M19.864,4.5C19.086,2.302,17.203,0.75,15,0.75c-2.203,0-4.085,1.552-4.864,3.75H2.25v24h25.5v-24H19.864z M23.328,6 c0.792,0,1.422,0.437,1.422,1.196c0,0.776-0.598,1.196-1.422,1.196c-0.825,0-1.422-0.42-1.422-1.196S22.487,6,23.328,6z M21.434,9.565c0.143-0.194,0.348-0.201,0.596-0.201c0.083,0,0.174,0,0.174,0h2.547v8.216c0,0.234,0,0.67-0.365,0.927 c-0.19,0.137-0.482,0.26-0.924,0.26c-0.426,0-0.729-0.124-0.919-0.26c-0.364-0.257-0.364-0.692-0.364-0.927v-6.732 c0,0-0.064,0-0.147,0c-0.249,0-0.452-0.001-0.597-0.196c-0.066-0.09-0.159-0.241-0.159-0.544 C21.273,9.818,21.367,9.655,21.434,9.565z M18.721,9.364H21l-2.44,8.013c-0.27,0.826-0.672,1.391-1.806,1.391 c-1.135,0-1.554-0.564-1.807-1.391l-2.321-8.013h2.699l1.649,6.936L18.721,9.364z M15,2.25c1.385,0,2.593,0.907,3.242,2.25h-6.484 C12.407,3.157,13.616,2.25,15,2.25z M8.765,9.235c2.893,0,4.217,1.922,4.217,4.686c0,2.892-1.342,4.846-4.25,4.846 c-3.151,0-4.233-2.165-4.233-4.912C4.5,11.141,5.97,9.235,8.765,9.235z M7.626,25.893C7.271,26.18,6.759,26.32,6.059,26.32 c-0.384,0-0.704-0.027-0.953-0.078c-0.242-0.049-0.452-0.113-0.625-0.189l-0.134-0.059v-1.387l0.335,0.188 c0.15,0.085,0.34,0.16,0.565,0.224c0.226,0.063,0.472,0.096,0.73,0.096c0.196,0,0.339-0.04,0.426-0.116 c0.08-0.069,0.119-0.182,0.119-0.345c0-0.077-0.014-0.144-0.041-0.208c-0.026-0.055-0.074-0.116-0.144-0.177 c-0.054-0.046-0.19-0.138-0.519-0.305c-0.437-0.214-0.733-0.399-0.905-0.567c-0.176-0.17-0.3-0.357-0.366-0.553 c-0.062-0.186-0.094-0.406-0.094-0.653c0-0.524,0.189-0.94,0.564-1.237c0.356-0.285,0.819-0.43,1.374-0.43 c0.33,0,0.62,0.026,0.861,0.078c0.244,0.055,0.448,0.118,0.623,0.195l0.133,0.061v1.377l-0.333-0.184 c-0.153-0.085-0.344-0.161-0.565-0.227c-0.214-0.065-0.409-0.1-0.581-0.1c-0.158,0-0.274,0.037-0.351,0.109 c-0.075,0.07-0.109,0.16-0.109,0.281c0,0.064,0.012,0.115,0.035,0.149c0.037,0.054,0.083,0.104,0.138,0.148 c0.025,0.02,0.132,0.093,0.475,0.267c0.406,0.203,0.692,0.371,0.873,0.516c0.201,0.161,0.351,0.353,0.446,0.569 c0.094,0.214,0.14,0.475,0.14,0.798C8.174,25.15,7.99,25.598,7.626,25.893z M11.946,26.084l-0.144,0.056 c-0.109,0.042-0.25,0.083-0.422,0.12c-0.165,0.039-0.38,0.058-0.656,0.058c-0.564,0-0.993-0.172-1.275-0.509 c-0.272-0.327-0.41-0.793-0.41-1.385v-2.559H8.346v-1.269H9.04v-0.605l1.655-0.862v1.468h1.175v1.269h-1.174v2.448 c0,0.416,0.06,0.582,0.095,0.646c0.017,0.027,0.06,0.104,0.258,0.104c0.102,0,0.203-0.015,0.299-0.044 c0.103-0.027,0.192-0.061,0.273-0.101l0.325-0.163V26.084z M16.229,25.568c-0.442,0.498-1.048,0.75-1.798,0.75 c-0.75,0-1.356-0.252-1.803-0.75c-0.441-0.491-0.664-1.214-0.664-2.146c0-0.926,0.218-1.646,0.649-2.14 c0.438-0.505,1.05-0.761,1.818-0.761c0.762,0,1.371,0.26,1.81,0.772c0.43,0.501,0.648,1.218,0.648,2.128 C16.891,24.354,16.668,25.077,16.229,25.568z M20.57,21.959l-0.279-0.069c-0.107-0.027-0.212-0.04-0.32-0.04 c-0.334,0-0.555,0.084-0.658,0.25c-0.086,0.141-0.19,0.438-0.19,1.064v3.084h-1.655v-4.443c0-0.233-0.009-0.559-0.025-0.975 l-0.008-0.234h1.585c0,0,0.033,0.237,0.036,0.258c0.031-0.027,0.062-0.054,0.094-0.079c0.215-0.168,0.467-0.254,0.748-0.254 c0.178,0,0.351,0.024,0.513,0.071l0.161,0.047V21.959z M25.201,23.992h-2.851c0.024,0.324,0.106,0.577,0.242,0.755 c0.156,0.203,0.38,0.303,0.685,0.303c0.315,0,0.588-0.021,0.813-0.065c0.223-0.046,0.42-0.107,0.585-0.182l0.318-0.146v1.331 l-0.132,0.061c-0.203,0.092-0.439,0.16-0.706,0.203c-0.263,0.045-0.638,0.068-1.109,0.068c-0.779,0-1.382-0.254-1.79-0.754 c-0.396-0.487-0.598-1.197-0.598-2.111c0-0.902,0.193-1.62,0.575-2.132c0.397-0.532,0.981-0.802,1.736-0.802 c0.77,0,1.345,0.254,1.707,0.754c0.348,0.475,0.524,1.189,0.524,2.123V23.992L25.201,23.992z"/>
-<path d="M8.733,17.281c1.486,0,1.567-1.875,1.567-3.475c0-1.243-0.194-3.085-1.567-3.085c-1.438,0-1.551,1.745-1.551,3.085 C7.182,15.18,7.247,17.281,8.733,17.281z"/>
+</g>
+<path d="M14.54,22.262c-0.276,0-0.479,0.133-0.639,0.418c-0.175,0.316-0.265,0.792-0.265,1.413c0,1.836,0.68,1.836,0.903,1.836  c0.278,0,0.479-0.134,0.635-0.421c0.171-0.316,0.257-0.792,0.257-1.415c0-0.622-0.086-1.099-0.257-1.415  C15.021,22.394,14.818,22.262,14.54,22.262z"/>
+<path d="M23.822,22.263c-0.183,0-0.339,0.11-0.479,0.336c-0.13,0.212-0.207,0.476-0.229,0.786h1.362  c-0.021-0.313-0.094-0.578-0.215-0.793C24.074,22.263,23.885,22.263,23.822,22.263z"/>
+<path d="M8.616,10.402c-1.563,0-1.686,1.897-1.686,3.354c0,1.493,0.069,3.776,1.686,3.776c1.614,0,1.703-2.038,1.703-3.776  C10.319,12.404,10.109,10.402,8.616,10.402z"/>
+<path d="M21.452,4C20.397,1.653,17.91,0,15,0S9.603,1.653,8.548,4H2v25h26V4H21.452z M24.5,5.399c0.836,0,1.5,0.475,1.5,1.3  C26,7.543,25.37,8,24.5,8S23,7.543,23,6.7C23,5.856,23.613,5.399,24.5,5.399z M22.574,9.173c0.154-0.211,0.377-0.218,0.647-0.218  c0.09,0,0.188,0,0.188,0L26,9v8.711c0,0.255,0,0.728-0.397,1.008C25.396,18.867,25.079,19,24.598,19c-0.463,0-0.612-0.18-0.82-0.326  c-0.395-0.279-0.395-0.753-0.395-1.008v-7.098c0,0-0.071,0-0.161,0c-0.271,0-0.493-0.001-0.647-0.212  c-0.073-0.098-0.174-0.262-0.174-0.592C22.4,9.448,22.501,9.271,22.574,9.173z M15,1.625c1.813,0,3.377,0.96,4.249,2.375h-8.498  C11.623,2.585,13.188,1.625,15,1.625z M7.36,26.744c-0.371,0.301-0.935,0.455-1.676,0.455c-0.413,0-0.758-0.029-1.026-0.084  c-0.26-0.055-0.486-0.123-0.67-0.203l-0.12-0.053v-1.4l0.298,0.166c0.167,0.094,0.378,0.177,0.625,0.246  c0.25,0.07,0.521,0.105,0.806,0.105c0.223,0,0.389-0.045,0.492-0.137c0.098-0.086,0.145-0.219,0.145-0.409  c0-0.089-0.016-0.168-0.048-0.243c-0.03-0.066-0.087-0.139-0.168-0.209c-0.06-0.051-0.21-0.152-0.574-0.337  c-0.469-0.23-0.788-0.43-0.972-0.608c-0.188-0.183-0.319-0.379-0.387-0.585c-0.067-0.194-0.101-0.429-0.101-0.696  c0-0.555,0.201-0.996,0.598-1.309c0.379-0.305,0.872-0.459,1.466-0.459c0.356,0,0.667,0.029,0.926,0.085  c0.263,0.058,0.482,0.126,0.668,0.208l0.12,0.053v1.392l-0.296-0.161c-0.174-0.094-0.384-0.178-0.625-0.249  c-0.238-0.073-0.454-0.108-0.645-0.108c-0.184,0-0.319,0.041-0.411,0.129c-0.092,0.086-0.134,0.193-0.134,0.338  c0,0.078,0.015,0.143,0.044,0.188c0.042,0.061,0.095,0.119,0.159,0.172c0.072,0.055,0.248,0.154,0.524,0.295  c0.438,0.219,0.747,0.4,0.942,0.557c0.212,0.17,0.371,0.371,0.471,0.6c0.1,0.226,0.148,0.504,0.148,0.851  C7.94,25.957,7.745,26.432,7.36,26.744z M11.795,26.958l-0.129,0.05c-0.117,0.044-0.268,0.088-0.453,0.128  c-0.178,0.042-0.403,0.062-0.703,0.062c-0.598,0-1.053-0.18-1.351-0.537c-0.289-0.347-0.436-0.843-0.436-1.475v-2.827H7.969v-1.291  h0.754v-0.675l1.71-0.893v1.567h1.277v1.291h-1.276v2.705c0,0.438,0.06,0.636,0.11,0.724c0.033,0.059,0.103,0.137,0.319,0.137  c0.114,0,0.228-0.017,0.338-0.049c0.119-0.032,0.22-0.07,0.304-0.113l0.289-0.143V26.958z M8.491,19C5.147,19,4,16.729,4,13.847  C4,11,5.559,9,8.525,9C11.594,9,13,11.017,13,13.916C12.998,16.95,11.576,19,8.491,19z M16.461,26.398  c-0.473,0.531-1.119,0.801-1.921,0.801c-0.8,0-1.448-0.27-1.927-0.801c-0.471-0.526-0.71-1.302-0.71-2.305  c0-0.995,0.234-1.768,0.695-2.297c0.469-0.538,1.122-0.812,1.942-0.812c0.813,0,1.465,0.278,1.934,0.825  c0.461,0.536,0.694,1.305,0.694,2.283C17.168,25.097,16.93,25.872,16.461,26.398z M15.383,17.523L12.859,9h2.934l1.793,7.375  L19.484,9h2.477l-2.652,8.523C19.016,18.4,18.578,19,17.346,19C16.112,19,15.656,18.4,15.383,17.523z M21.17,22.447l-0.25-0.063  c-0.121-0.029-0.238-0.045-0.359-0.045c-0.383,0-0.629,0.097-0.752,0.295c-0.098,0.156-0.213,0.488-0.213,1.179v3.309h-1.71v-4.786  c0-0.252-0.011-0.607-0.028-1.061l-0.008-0.208h1.64c0,0,0.038,0.28,0.045,0.332c0.05-0.054,0.104-0.103,0.161-0.147  c0.227-0.176,0.49-0.267,0.785-0.267c0.189,0,0.373,0.026,0.545,0.076l0.145,0.042V22.447z M26.203,24.67h-3.102  c0.022,0.383,0.115,0.683,0.275,0.893c0.179,0.232,0.434,0.346,0.779,0.346c0.344,0,0.644-0.024,0.893-0.072  c0.245-0.051,0.463-0.117,0.645-0.201l0.283-0.129v1.35l-0.116,0.053c-0.216,0.099-0.47,0.172-0.756,0.219  c-0.284,0.049-0.688,0.073-1.2,0.073c-0.833,0-1.477-0.271-1.911-0.803c-0.425-0.521-0.64-1.284-0.64-2.267  c0-0.972,0.207-1.742,0.617-2.292c0.423-0.566,1.046-0.854,1.852-0.854c0.821,0,1.434,0.271,1.818,0.802  c0.373,0.509,0.563,1.277,0.563,2.281V24.67z"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_pause.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_pause.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_pause.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<rect fill="none" height="30" width="30"/>
-<rect height="22.5" width="5.25" x="7.087" y="3.75"/>
-<rect height="22.5" width="5.25" x="17.663" y="3.75"/>
+</g>
+<rect height="22" width="4" x="7" y="4"/>
+<rect height="22" width="4" x="19" y="4"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_pd.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_pd.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +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 width="12" height="15" viewBox="0 0 12 15">
-<path d="M2.969,1.969v2.029l3.016,2.546v3.44h1V6.548l3.063-2.531V1.969H2.969z M3.969,3.534V2.969h2.016v2.267L3.969,3.534z M6.984,2.969h2.063v0.577L6.984,5.251V2.969z"/>
-</svg>
\ No newline at end of file
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_pd_attach.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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.334 -0.66 31 31" width="31px" 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.739 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.759 19.027,3.154 "/>
-<path d="M8.787,0.971v3.785l5.08,4.292v5.93h2.186V9.056l5.16-4.266V0.971H8.787z M16.053,6.222V3.154h2.975v0.604L16.053,6.222z   M13.867,6.188l-2.901-2.449V3.154h2.899v3.034H13.867z"/>
-<polygon points="16.968,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.13,24.736 14.616,22.301 "/>
-<polygon points="23.467,22.301 24.721,24.32 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.608 "/>
-<polygon points="20.301,17.285 21.813,19.719 24.719,19.719 20.519,12.993 18.452,14.284 20.321,17.285 "/>
-<polygon points="19.46,19.719 17.948,17.285 13.86,17.288 15.374,19.719 "/>
-<polygon points="5.279,17.689 5.279,19.721 6.543,19.721 "/>
-<polygon points="13.022,19.719 11.511,17.288 7.378,17.288 8.893,19.721 "/>
-<rect fill="none" height="30" width="30"/>
-<rect fill="none" height="30" width="30"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" 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>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_pd_context.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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.771 -0.66 31 31" width="31px" 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.304 9.48,29.029 11.545,27.741 9.673,24.737 9.685,24.737 9.682,24.737 24.721,24.737 "/>
-<polygon points="20.52,12.993 18.452,14.285 20.321,17.286 5.279,17.288 5.279,19.721 24.72,19.72 "/>
-<polygon fill="none" points="10.967,3.74 13.868,6.188 13.868,3.155 10.967,3.155 "/>
-<polygon fill="none" points="16.053,3.155 16.053,6.223 19.028,3.76 19.028,3.155 "/>
-<path d="M8.787,0.971v3.785l5.081,4.293v5.93h2.185V9.056l5.16-4.266V0.971H8.787z M16.053,6.223V3.155h2.976V3.76L16.053,6.223z   M13.868,6.188L10.967,3.74V3.155h2.898v3.033H13.868z"/>
-<rect fill="none" height="30" width="30"/>
-<rect fill="none" height="30" width="30"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" 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>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_pd_multipdp.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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.144 -0.66 31 31" width="31px" 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.74 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.97v3.786l5.082,4.293v5.93h2.186V9.056l5.16-4.267V0.97H8.786z M16.054,6.223V3.154h2.976V3.76L16.054,6.223z   M13.868,6.188L10.967,3.74V3.154h2.898v3.033H13.868z"/>
-<polygon points="20.52,13.085 18.452,14.376 20.322,17.38 5.278,17.38 5.278,19.814 24.721,19.812 "/>
-<polygon points="9.48,29.03 11.545,27.742 9.676,24.738 12.727,24.738 15.409,29.03 17.475,27.742 15.605,24.738 24.721,24.738   24.721,22.302 5.278,22.304 "/>
-<rect fill="none" height="30" width="30"/>
-<rect fill="none" height="30" width="30"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" 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>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_pd_offline.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_pd_offline.svg	Mon Apr 19 14:02:13 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">
-<polygon fill="none" points="17.795,9.888 14.357,9.888 14.357,13.691 17.795,10.85 "/>
-<polygon fill="none" points="9.331,9.888 9.331,10.83 12.69,13.667 12.69,9.888 "/>
-<path d="M7.665,8.221v3.383l5.025,4.243v5.733h1.667v-5.729l5.105-4.217V8.221H7.665z M9.331,10.83V9.888h3.359v3.779L9.331,10.83z   M14.357,9.888h3.438v0.962l-3.438,2.842V9.888z"/>
-<polygon points="22.336,16.521 21.22,15.405 19.149,17.476 17.079,15.405 15.962,16.521 18.032,18.592 15.962,20.662 17.079,21.779   19.149,19.709 21.22,21.779 22.336,20.662 20.266,18.592 "/>
-<rect fill="none" height="30" width="30"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_pd_suspended.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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.874 -0.66 31 31" width="31px" 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.71 16.132,6.158 16.132,3.125 19.034,3.125 "/>
-<polygon fill="none" points="13.947,3.125 13.947,6.193 10.971,3.729 10.971,3.125 "/>
-<path d="M21.214,0.94v3.786l-5.082,4.293v5.931h-2.185V9.026L8.786,4.758V0.94H21.214z M13.947,6.193V3.125h-2.977v0.605  L13.947,6.193z M16.132,6.158l2.897-2.448V3.125h-2.897V6.158z"/>
-<polygon points="24.721,22.299 24.721,24.733 20.316,24.733 20.318,24.733 14.341,24.733 16.373,22.299 "/>
-<polygon points="5.279,22.299 10.579,22.299 8.525,24.733 5.279,24.733 "/>
-<polygon points="24.721,17.281 24.721,19.716 18.53,19.716 20.564,17.281 "/>
-<polygon points="5.279,19.716 5.279,17.281 14.801,17.281 12.753,19.716 "/>
-<polygon points="21.421,14.559 21.497,14.62 21.448,14.681 10.378,27.869 9.38,29.059 7.514,27.495 8.936,25.801 19.631,13.056 "/>
-<rect fill="none" height="30" width="30"/>
-<rect fill="none" height="30" width="30"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" 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>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_person_activitystream.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,8 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<path d="M11.189,0H9.799C7.605,0,4.375,2.538,4.375,4.707c0,0-0.332,5.294,0.658,7.392c0.544,1.145,1.503,2.076,2.615,2.806 c0.002,0.148,0.014,0.419,0.004,0.566c-0.007,0.102-0.043,0.209-0.08,0.317h5.857c-0.037-0.108-0.072-0.216-0.079-0.317 c-0.011-0.157,0-0.437,0.003-0.596c1.086-0.732,2.027-1.654,2.6-2.776c1.061-2.08,0.672-7.392,0.672-7.392 C16.625,2.538,13.383,0,11.189,0z"/>
-<path d="M15.377,18.012c-0.592-0.482-1.112-0.966-1.474-1.421L10.5,24.286l-3.401-7.694C5.402,18.725,0.295,21.482,0,21.87V28h15.09 C15.036,27.711,15,27.415,15,27.11V19.89C15,19.225,15.136,18.591,15.377,18.012z"/>
-<path d="M27.111,17h-7.223C18.294,17,17,18.294,17,19.89v7.221c0,1.596,1.294,2.89,2.889,2.89h7.223C28.706,30,30,28.706,30,27.11 V19.89C30,18.294,28.706,17,27.111,17z M19.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.36S20.559,28.555,19.807,28.555z M25.102,28.555H23.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.428C25.113,28.396,25.105,28.475,25.102,28.555z M28.543,28.555H26.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.864C28.555,28.391,28.544,28.473,28.543,28.555z"/>
+</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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_person_history.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_person_history.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_person_history.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,8 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<path d="M16.625,4.707C16.625,2.538,13.383,0,11.189,0H9.799C7.605,0,4.375,2.538,4.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.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 C17.014,10.019,16.625,4.707,16.625,4.707z"/>
-<path d="M13.903,16.591L10.5,24.286l-3.401-7.694C5.402,18.725,0.295,21.482,0,21.87V28h15.303C14.482,26.693,14,25.153,14,23.5 c0-1.947,0.665-3.738,1.771-5.174C15.016,17.74,14.344,17.145,13.903,16.591z"/>
-<path d="M22.5,17c-3.59,0-6.5,2.91-6.5,6.5s2.91,6.5,6.5,6.5s6.5-2.91,6.5-6.5S26.09,17,22.5,17z M27,25h-4h-2v-2v-4h2v4h4V25z"/>
+</g>
+<path d="M8.649,14.904c0.002,0.148,0.013,0.419,0.003,0.566C8.646,15.572,8.609,15.68,8.572,16h5.857  c-0.037-0.32-0.073-0.428-0.079-0.529c-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.274,20.275L11.5,24.286l-3.401-7.694C6.402,18.725,1.294,21.482,1,21.87V28h13.769C13.66,26.446,13,24.551,13,22.5  C13,21.732,13.102,20.99,13.274,20.275z"/>
+<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,24 27,24 27,22 "/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_photo_albums.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 40 40" width="40px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<rect fill="none" fill-opacity="0.5" height="40" stroke-opacity="0.5" width="40"/>
-<path d="M3,6v3H1v2h2v3H1v2h2v3H1v2h2v3H1v2h2v3H1v2h2v3h36V6H3z M33,28H9V12h24V28z"/>
-<path d="M31,20.972c-1.245-2.754-3.199-4.6-5.769-4.6c-3.22,0-5.935,2.892-6.804,6.851c-0.846-1.979-2.322-3.297-4.01-3.297  c-1.501,0-2.547,1.044-3.418,2.67V26h20V20.972z"/>
-<circle cx="16" cy="16" r="2"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<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 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_photos.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_photos.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_photos.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<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.009"/>
-<path d="M2.25,5.634v18.75h25.5V5.634H2.25z M25.5,22.134h-21V7.884h21V22.134z"/>
-<path d="M24.75,16.355c-1.215-2.753-3.119-4.599-5.625-4.599c-3.14,0-5.786,2.891-6.633,6.851c-0.825-1.98-2.265-3.298-3.91-3.298 c-1.464,0-2.484,1.044-3.332,2.671v3.403h19.5V16.355z"/>
-<circle cx="9.75" cy="10.884" r="2.25"/>
+</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 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_play.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_play.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_play.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,7 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<rect fill="none" height="30" width="30"/>
-<polygon points="5.257,15 5.257,3.75 15,9.375 24.743,15 15,20.625 5.257,26.25 "/>
+</g>
+<polygon points="5,15,5,3,15.39,9,25.78,15,15.39,21,5,27"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_play_history.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,12 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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="M0,0v30h30V0H0z M28.235,26.986l-6.012-6.012l-0.454,2.042l5.218,5.219H2.626l5.535-5.534l-0.454-2.042   l-5.942,5.941V3.013l9.352,9.352h2.119v-0.377l-2.467-2.467c-0.202-0.056-0.401-0.12-0.594-0.202   C7.701,8.271,7.043,6.555,6.869,5.621L3.013,1.765h23.589l-3.413,3.413c-0.041,0.684-0.408,2.89-3.363,4.141   c-0.348,0.147-0.714,0.25-1.093,0.315l-1.968,1.968v0.763h1.732l9.738-9.738V26.986z" fill-opacity="0.5" stroke-opacity="0.5"/>
-<g>
-<rect height="3.519" width="17.646" x="6.177" y="13.246"/>
-<polygon points="9.706,25.588 20.294,25.588 22.059,17.647 7.941,17.647   "/>
-<path d="M10.519,8.506c1.35,0.571,2.732,0.287,3.599-0.017v3.875h1.766V8.489c0.866,0.304,2.249,0.588,3.599,0.017    c2.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.01    c-0.032-0.31-0.328-1.98-2.973-3.101c-2.925-1.238-4.335,0.06-4.335,0.06S7.593,7.268,10.519,8.506z"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
+<rect fill="none" height="30" width="30"/>
 </g>
-</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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_playlist.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_playlist.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_playlist.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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="2" x="5" y="6"/>
-<rect height="2" width="9.941" x="8.059" y="6"/>
-<rect height="2" width="2" x="5" y="11"/>
-<rect height="2" width="9.941" x="8.059" y="11"/>
-<rect height="2" width="2" x="5" y="16"/>
-<rect height="2" width="9.941" x="8.059" y="16"/>
-<rect height="2" width="2" x="5" y="21"/>
-<path d="M13.452,21H8.059v2h3.632C12.116,22.237,12.718,21.56,13.452,21z"/>
-<path d="M10.997,26H3V3h15.627V2.348L20.984,3H21v0.004l3,0.831V0H0v29h12.124C11.468,28.12,11.065,27.098,10.997,26z"/>
-<path d="M29.977,7.563l-9.35-2.587v6.897v9.813c-0.654-0.213-1.372-0.331-2.126-0.331c-3.051,0-5.524,1.931-5.524,4.31  c0,2.381,2.474,4.312,5.524,4.312c3.053,0,5.525-1.931,5.525-4.312V12.813l5.95,1.646V7.563z"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_plus.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_plus.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_plus.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <rect fill="none" height="30" width="30"/>
-<rect fill="none" height="30" width="29.999" x="0.001"/>
-<rect height="5.25" width="22.501" x="3.75" y="12.375"/>
-<rect height="22.5" width="5.251" x="12.375" y="3.75"/>
+<rect height="4" width="22" x="4" y="13"/>
+<rect height="22" width="4" x="13" y="4"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_podcast.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_podcast.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_podcast.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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.802,8.537l-1.735-1.735c-1.598-1.598-4.188-1.598-5.784,0l-4.05,4.05L6.075,9.693L4.34,11.43l1.157,1.157L3.184,14.9  c-0.646,0.647-1.019,1.458-1.142,2.299l-0.015,0.015l0.013,0.014c-0.171,1.226,0.2,2.515,1.144,3.457l1.735,1.735  c0.943,0.944,2.231,1.315,3.457,1.145l0.014,0.013l0.015-0.016c0.048-0.007,0.096-0.005,0.144-0.013v2.506H4.457  c-0.451,0-0.818,0.366-0.818,0.818v1.636h4.909h2.454h4.908v-1.636c0-0.452-0.366-0.818-0.818-0.818h-4.09v-3.933l2.016-2.016  l1.156,1.156l1.735-1.734l-1.157-1.157l4.05-4.049C20.399,12.725,20.399,10.135,18.802,8.537z M9.774,16.647  c-0.903,0-1.636-0.732-1.636-1.636c0-0.904,0.732-1.636,1.636-1.636c0.904,0,1.636,0.731,1.636,1.636  C11.41,15.915,10.679,16.647,9.774,16.647z M17.645,13.166l-4.049,4.049l-1.161-1.162c0.127-0.323,0.203-0.673,0.203-1.041  c0-1.579-1.284-2.863-2.863-2.863c-0.368,0-0.718,0.076-1.042,0.203L8.39,12.009l4.049-4.05c0.957-0.957,2.514-0.957,3.471,0  l1.735,1.734C18.601,10.651,18.601,12.208,17.645,13.166z"/>
-<path d="M22.21,1.066l-1.09,1.739c4.889,3.068,6.369,9.545,3.302,14.435l1.738,1.09C29.831,12.48,28.061,4.737,22.21,1.066z"/>
-<path d="M20.027,4.544l-1.091,1.738c2.972,1.867,3.874,5.803,2.007,8.773l1.739,1.094C25.15,12.216,23.96,7.012,20.027,4.544z"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" 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"/>
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_portrait.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_portrait.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_portrait.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <rect fill="none" height="30" width="30"/>
-</g>
-<path d="M17.85,16.471c-0.012-0.158,0-0.438,0.002-0.596c1.086-0.732,2.027-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.435-4.707h-1.391c-2.193,0-5.423,2.537-5.423,4.707c0,0-0.332,5.293,0.658,7.391  c0.545,1.145,1.503,2.076,2.615,2.807c0.002,0.148,0.014,0.418,0.004,0.566c-0.137,2.127-7.301,5.938-7.65,6.398V29H7.5v-5h2v5  h10.999v-5h2v5h3v-6.125C25.148,22.412,17.984,18.598,17.85,16.471z"/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_predictive_text_off.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,10 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<polygon points="1.727,28.24 6.904,27.761 2.204,23.061 "/>
-<rect height="6.001" transform="matrix(-0.7071 0.7071 -0.7071 -0.7071 39.8787 6.1506)" width="19.932" x="8.7" y="8.334"/>
-<polygon points="28.589,8.481 14.431,22.64 15.861,25.452 30,11.313 "/>
-<polygon points="21.518,1.411 18.687,0 4.548,14.139 7.36,15.568 "/>
-<polygon points="7.68,17.272 3.133,15.553 2.341,21.832 8.135,27.625 14.412,26.833 12.694,22.285 "/>
+</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 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_predictive_text_on.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,12 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <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"/>
-<polygon points="1.727,28.24 6.904,27.761 2.204,23.061 "/>
-<rect height="6.001" transform="matrix(-0.7071 0.7071 -0.7071 -0.7071 39.8787 6.1506)" width="19.932" x="8.7" y="8.334"/>
-<polygon points="28.589,8.481 14.431,22.64 15.861,25.452 30,11.313 "/>
-<polygon points="21.518,1.411 18.687,0 4.548,14.139 7.36,15.568 "/>
-<polygon points="7.68,17.272 3.133,15.553 2.341,21.832 8.135,27.625 14.412,26.833 12.694,22.285 "/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_presentation.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_presentation.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_presentation.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M29,7V3H1v4h1v16H1v4h28v-4h-1V7H29z M26,23H4V7h22V23z"/>
-<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 "/>
+<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 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_previous.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_previous.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_previous.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,10 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <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 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_private.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_private.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +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>
-<path d="M0,0v30h30V0H0z M28.235,26.986l-6.012-6.012l-0.454,2.042l5.218,5.219H2.626l5.535-5.534l-0.454-2.042   l-5.942,5.941V3.013l9.352,9.352h2.119v-0.377l-2.467-2.467c-0.202-0.056-0.401-0.12-0.594-0.202   C7.701,8.271,7.043,6.555,6.869,5.621L3.013,1.765h23.589l-3.413,3.413c-0.041,0.684-0.408,2.89-3.363,4.141   c-0.348,0.147-0.714,0.25-1.093,0.315l-1.968,1.968v0.763h1.732l9.738-9.738V26.986z" fill-opacity="0.5" stroke-opacity="0.5"/>
-<g>
-<rect height="3.519" width="17.646" x="6.177" y="13.246"/>
-<polygon points="9.706,25.588 20.294,25.588 22.059,17.647 7.941,17.647   "/>
-<path d="M10.519,8.506c1.35,0.571,2.732,0.287,3.599-0.017v3.875h1.766V8.489c0.866,0.304,2.249,0.588,3.599,0.017    c2.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.01    c-0.032-0.31-0.328-1.98-2.973-3.101c-2.925-1.238-4.335,0.06-4.335,0.06S7.593,7.268,10.519,8.506z"/>
-</g>
-</g>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_private_call.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M7.129,15.841c-0.006-0.09,0-0.523,0-0.614c0.621-0.419,1.057-0.91,1.383-1.552c0.605-1.188,0.281-3.985,0.281-3.985  C8.793,8.45,7.146,7,5.895,7H5.1C3.846,7,2.197,8.45,2.197,9.689c0,0-0.287,2.783,0.279,3.981c0.311,0.654,0.76,1.139,1.395,1.556  c0.002,0.085,0.007,0.529,0.002,0.614C3.795,17.056,0.2,19.233,0,19.497V23h11.5v-3.5C11.299,19.235,7.205,17.056,7.129,15.841z"/>
-<path d="M16.35,16.611c-0.603-1.273-0.687-3.219-0.65-4.633c-1.034-0.719-2.033-1.543-2.07-2.138c-0.006-0.09,0-0.523,0-0.614  c0.621-0.419,1.057-0.91,1.383-1.552c0.605-1.188,0.281-3.985,0.281-3.985C15.293,2.45,13.646,1,12.395,1H11.6  c-1.254,0-2.902,1.45-2.902,2.689c0,0-0.118,1.153-0.052,2.294c1.202,0.875,2.088,2.216,2.145,3.568  c0.098,0.898,0.291,3.486-0.496,5.031c-0.215,0.422-0.468,0.806-0.762,1.156c0.403,0.321,1.018,0.747,1.815,1.261h5.229  C16.504,16.868,16.415,16.749,16.35,16.611z"/>
-<path d="M26.447,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  c0.361,0.764,0.877,1.345,1.569,1.85l6.752-6.752C26.461,10.651,26.447,10.53,26.447,10.53z"/>
-<path d="M24.263,18.604c-0.007-0.118-0.001-0.687,0.001-0.807c0.814-0.549,1.385-1.194,1.814-2.037  c0.297-0.583,0.424-1.461,0.466-2.332L14.25,25.722V28h1.386l8.84-8.84C24.355,18.964,24.273,18.775,24.263,18.604z"/>
-<path d="M23.765,7.263C23.385,7.104,23.001,7,22.643,7H21.6c-1.645,0-3.81,1.904-3.81,3.53c0,0-0.14,1.365-0.079,2.785L23.765,7.263  z"/>
-<path d="M25.771,20.505L18.276,28h3.665l5.967-5.968C27.198,21.57,26.427,21.039,25.771,20.505z"/>
-<path d="M30,23.406c-0.042-0.055-0.223-0.179-0.479-0.346L24.581,28h3.665L30,26.246V23.406z"/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_qcif.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_qcif.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_qcif.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,11 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <rect fill="none" height="30" width="30"/>
-<path d="M2.251,5.625v18.75H27.75V5.625H2.251z M25.5,22.125H4.501V7.875H25.5V22.125z"/>
-<path d="M7.495,18.805c-0.67-0.171-1.175-0.57-1.517-1.197s-0.513-1.537-0.513-2.731c0-1.298,0.233-2.256,0.701-2.874 c0.466-0.617,1.161-0.925,2.083-0.925c0.926,0,1.624,0.309,2.092,0.928c0.468,0.619,0.703,1.576,0.703,2.871 c0,1.197-0.18,2.124-0.541,2.785c-0.361,0.659-0.902,1.05-1.623,1.173c0.062,0.287,0.159,0.504,0.292,0.652 c0.133,0.146,0.41,0.219,0.83,0.219v0.811H9.664c-0.632,0-1.112-0.127-1.44-0.381S7.652,19.438,7.495,18.805z M8.249,18.004 c0.427,0,0.753-0.223,0.977-0.668c0.224-0.447,0.336-1.266,0.336-2.459c0-1.079-0.111-1.835-0.333-2.268 C9.006,12.176,8.68,11.96,8.249,11.96c-0.427,0-0.753,0.209-0.977,0.628c-0.224,0.417-0.336,1.181-0.336,2.288 c0,1.043,0.109,1.826,0.329,2.347C7.483,17.744,7.811,18.004,8.249,18.004z"/>
-<path d="M14.949,18.887c-0.974,0-1.706-0.309-2.197-0.93c-0.49-0.62-0.735-1.641-0.735-3.059c0-1.271,0.247-2.225,0.741-2.863 c0.494-0.638,1.234-0.956,2.221-0.956c0.404,0,0.809,0.055,1.216,0.164v0.897c-0.404-0.119-0.765-0.179-1.082-0.179 c-0.544,0-0.95,0.242-1.22,0.725c-0.27,0.484-0.405,1.208-0.405,2.171c0,1.122,0.14,1.926,0.418,2.416 c0.277,0.487,0.695,0.732,1.253,0.732c0.324,0,0.669-0.051,1.036-0.154v0.872C15.788,18.832,15.374,18.887,14.949,18.887z"/>
-<path d="M16.811,18.805v-0.883h0.63v-5.88h-0.63V11.16h2.676v0.882h-0.631v5.88h0.631v0.883H16.811z"/>
-<path d="M20.609,18.805V11.16h3.927v0.882H22.02v2.414h1.963v0.892H22.02v3.455h-1.41V18.805z"/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_radio_collections.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <rect fill="none" height="30" width="30"/>
-<path d="M15.465,20.807l-1.366-1.366c0.058-0.056,0.121-0.104,0.179-0.162c1.753-1.754,1.753-4.611-0.004-6.368  c-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.154c2.509,2.51,2.513,6.591,0.007,9.097  C15.585,20.702,15.523,20.752,15.465,20.807z M17.898,23.239l-1.367-1.366c0.061-0.056,0.125-0.106,0.184-0.164  c3.094-3.095,3.092-8.133-0.008-11.231c-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  c3.852,3.853,3.857,10.113,0.01,13.96C18.023,23.132,17.957,23.183,17.898,23.239z"/>
-<polygon points="5,0 5,3 27,3 27,25 30,25 30,0 "/>
-<path d="M0,30h25V5H0V30z M3,8h19v19H3V8z"/>
-<path d="M8.082,16.927v4.336c-0.374-0.152-0.787-0.244-1.228-0.244c-1.582,0-2.864,1.098-2.864,2.454  c0,1.355,1.282,2.454,2.864,2.454c1.581,0,2.863-1.099,2.863-2.454v-6.001l3.272,1.092v-3.272l-4.908-1.636V16.927z"/>
+<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>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_radio_stations.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,16 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M9,26c-2.066,0-3.92-0.775-5.202-2H0v3h30v-3H14.179C12.899,25.22,11.061,26,9,26z"/>
-<path d="M2.947,17H0v3h2C2,18.906,2.349,17.884,2.947,17z"/>
-<rect height="3" width="2" x="28" y="17"/>
-<path d="M21,12v-2h-5v3h1.147C18.254,12.371,19.576,12,21,12z"/>
-<rect height="3" width="9" y="10"/>
-<rect height="3" width="2" x="28" y="10"/>
-<rect height="3" width="9" y="3"/>
-<rect height="3" width="2" x="28" y="3"/>
-<path d="M4,20c0,2.208,2.237,4,5,4s5-1.792,5-4V8h9v6.337C22.387,14.123,21.712,14,21,14c-2.763,0-5,1.79-5,4c0,2.208,2.237,4,5,4  s5-1.792,5-4V2H11v14.337C10.387,16.123,9.712,16,9,16C6.237,16,4,17.79,4,20z"/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_recentlog.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_recentlog.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_recentlog.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,12 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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="M0,0v30h30V0H0z M28.235,26.986l-6.012-6.012l-0.454,2.042l5.218,5.219H2.626l5.535-5.534l-0.454-2.042   l-5.942,5.941V3.013l9.352,9.352h2.119v-0.377l-2.467-2.467c-0.202-0.056-0.401-0.12-0.594-0.202   C7.701,8.271,7.043,6.555,6.869,5.621L3.013,1.765h23.589l-3.413,3.413c-0.041,0.684-0.408,2.89-3.363,4.141   c-0.348,0.147-0.714,0.25-1.093,0.315l-1.968,1.968v0.763h1.732l9.738-9.738V26.986z" fill-opacity="0.5" stroke-opacity="0.5"/>
-<g>
-<rect height="3.519" width="17.646" x="6.177" y="13.246"/>
-<polygon points="9.706,25.588 20.294,25.588 22.059,17.647 7.941,17.647   "/>
-<path d="M10.519,8.506c1.35,0.571,2.732,0.287,3.599-0.017v3.875h1.766V8.489c0.866,0.304,2.249,0.588,3.599,0.017    c2.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.01    c-0.032-0.31-0.328-1.98-2.973-3.101c-2.925-1.238-4.335,0.06-4.335,0.06S7.593,7.268,10.519,8.506z"/>
-</g>
-</g>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" 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 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_redeye.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_redeye.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_redeye.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <rect fill="none" height="30" width="30"/>
-<path d="M23.234,20.628l3-9.749h-7.688l2.311-7.504h-4.504l-2.41,7.829c2.212,0.25,3.905,1.019,5.175,1.927h1.92l-0.404,1.314 c1.26,1.331,1.789,2.579,1.834,2.69l0.182,0.449l-0.631,1.377c-0.824,1.797-2.607,3.087-4.543,3.915l3.52,3.749l5.629-5.997H23.234z "/>
-<path d="M12.4,12.235c-2.763,0-7.288,1.523-8.597,4.385l-0.428,0.937l0.428,0.936c1.309,2.861,5.834,4.387,8.599,4.387 c2.76,0,7.283-1.524,8.595-4.385l0.428-0.938C21.426,17.557,19.276,12.235,12.4,12.235z M12.401,20.629 c-2.324,0-5.777-1.379-6.552-3.072c0.775-1.694,4.229-3.071,6.551-3.071c2.32,0,5.775,1.377,6.551,3.071 C18.175,19.25,14.72,20.629,12.401,20.629z"/>
-<circle cx="12.4" cy="17.557" r="3"/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_refresh.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_refresh.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_refresh.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <rect fill="none" height="30" width="30"/>
-<path d="M8,15c0-1.931,0.799-3.666,2.069-4.932l3.517,3.518l1.061-10.253L4.394,4.394l3.539,3.538C6.122,9.741,5,12.239,5,15 c0,5.021,3.705,9.166,8.528,9.88l0.309-2.984C10.53,21.338,8,18.462,8,15z"/>
-<path d="M16.414,16.414l-1.061,10.253l10.253-1.061l-3.538-3.539C23.878,20.259,25,17.762,25,15c0-5.021-3.705-9.166-8.528-9.88 l-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"/>
+<path d="M8,15c0-1.931,0.799-3.666,2.069-4.932l3.517,3.518,1.061-10.25-10.26,1.054,3.539,3.538c-1.811,1.809-2.933,4.308-2.933,7.068,0,5.021,3.705,9.166,8.528,9.88l0.309-2.984c-3.31-0.56-5.84-3.44-5.84-6.9z"/>
+<path d="M16.41,16.41l-1.061,10.25,10.25-1.061-3.538-3.539c1.82-1.8,2.94-4.3,2.94-7.06,0-5.021-3.705-9.166-8.528-9.88l-0.309,2.984c3.31,0.557,5.84,3.436,5.84,6.896,0,1.93-0.793,3.673-2.061,4.939l-3.53-3.53z"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_reject.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_reject.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +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>
-<path d="M0,0v30h30V0H0z M28.235,26.986l-6.012-6.012l-0.454,2.042l5.218,5.219H2.626l5.535-5.534l-0.454-2.042   l-5.942,5.941V3.013l9.352,9.352h2.119v-0.377l-2.467-2.467c-0.202-0.056-0.401-0.12-0.594-0.202   C7.701,8.271,7.043,6.555,6.869,5.621L3.013,1.765h23.589l-3.413,3.413c-0.041,0.684-0.408,2.89-3.363,4.141   c-0.348,0.147-0.714,0.25-1.093,0.315l-1.968,1.968v0.763h1.732l9.738-9.738V26.986z" fill-opacity="0.5" stroke-opacity="0.5"/>
-<g>
-<rect height="3.519" width="17.646" x="6.177" y="13.246"/>
-<polygon points="9.706,25.588 20.294,25.588 22.059,17.647 7.941,17.647   "/>
-<path d="M10.519,8.506c1.35,0.571,2.732,0.287,3.599-0.017v3.875h1.766V8.489c0.866,0.304,2.249,0.588,3.599,0.017    c2.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.01    c-0.032-0.31-0.328-1.98-2.973-3.101c-2.925-1.238-4.335,0.06-4.335,0.06S7.593,7.268,10.519,8.506z"/>
-</g>
-</g>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_reject_call.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <rect fill="none" height="30" width="30"/>
-<path d="M15.691,11.542c1.257-0.96,2.563-1.786,3.289-2.164c0.001,0.001,0,0.003,0.001,0.004c0.001-0.001,0.005-0.006,0.007-0.008 l1.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.022c0,0-0.203-0.305-0.818-1.062 c0.002,0.001,0.002,0.003,0.004,0.005c-0.002-0.002,0-0.005-0.002-0.008c-0.312-0.383-0.35-0.397-0.751-0.765 c-1.204-1.103-2.53-1.536-2.53-1.536c-0.514-0.182-2.241-0.282-4.417,0.374c-1.677,0.506-4.996,2.505-7.888,4.851L15.691,11.542z"/>
-<path d="M9.396,18.757c-0.01-0.001-0.019-0.001-0.027-0.003c0.002-0.002,0.008-0.01,0.008-0.01c0.652-1.125,1.375-2.136,2.143-3.077 l-3.205-3.205c-2.367,2.794-4.219,5.808-4.637,6.907c-0.814,2.148-0.74,4.517-0.563,5.205c0,0,0.169,0.513,0.56,1.211 c0.005,0.007,0.01,0.016,0.015,0.024c0.038,0.068,0.076,0.136,0.119,0.207c0.001,0.002,0.004,0.001,0.005,0.002 c0.21,0.35,0.464,0.729,0.783,1.114c0.374,0.449,0.392,0.578,0.785,0.925c0.001,0,0.002,0,0.003,0 c0.723,0.636,1.021,0.83,1.021,0.83c0.345,0.224,0.827,0.103,1.08-0.268l4.794-7.042c0.254-0.372,0.186-0.856-0.158-1.078 L9.396,18.757z"/>
-<rect height="35.826" transform="matrix(0.7066 -0.7076 0.7076 0.7066 -6.0774 14.6889)" width="1.867" x="13.74" y="-3.24"/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_remove_from_collection.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,12 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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="M0,0v30h30V0H0z M28.235,26.986l-6.012-6.012l-0.454,2.042l5.218,5.219H2.626l5.535-5.534l-0.454-2.042   l-5.942,5.941V3.013l9.352,9.352h2.119v-0.377l-2.467-2.467c-0.202-0.056-0.401-0.12-0.594-0.202   C7.701,8.271,7.043,6.555,6.869,5.621L3.013,1.765h23.589l-3.413,3.413c-0.041,0.684-0.408,2.89-3.363,4.141   c-0.348,0.147-0.714,0.25-1.093,0.315l-1.968,1.968v0.763h1.732l9.738-9.738V26.986z" fill-opacity="0.5" stroke-opacity="0.5"/>
-<g>
-<rect height="3.519" width="17.646" x="6.177" y="13.246"/>
-<polygon points="9.706,25.588 20.294,25.588 22.059,17.647 7.941,17.647   "/>
-<path d="M10.519,8.506c1.35,0.571,2.732,0.287,3.599-0.017v3.875h1.766V8.489c0.866,0.304,2.249,0.588,3.599,0.017    c2.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.01    c-0.032-0.31-0.328-1.98-2.973-3.101c-2.925-1.238-4.335,0.06-4.335,0.06S7.593,7.268,10.519,8.506z"/>
-</g>
-</g>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" 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 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_remove_from_video_collection.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_remove_from_video_collection.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" 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>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_repeat.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_repeat.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_repeat.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,7 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<path d="M22.955,8.349L20.303,11c2.925,2.924,2.925,7.683,0,10.607c-2.924,2.926-7.682,2.924-10.607,0 c-2.924-2.924-2.924-7.682,0-10.607l3.713,3.713L15.796,2.25L3.333,4.637l3.712,3.712c-4.394,4.394-4.394,11.515,0,15.91 c4.394,4.394,11.515,4.394,15.91,0S27.349,12.743,22.955,8.349z"/>
-<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 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_repeat_exception.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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="M0,0v30h30V0H0z M28.235,26.986l-6.012-6.012l-0.454,2.042l5.218,5.219H2.626l5.535-5.534l-0.454-2.042   l-5.942,5.941V3.013l9.352,9.352h2.119v-0.377l-2.467-2.467c-0.202-0.056-0.401-0.12-0.594-0.202   C7.701,8.271,7.043,6.555,6.869,5.621L3.013,1.765h23.589l-3.413,3.413c-0.041,0.684-0.408,2.89-3.363,4.141   c-0.348,0.147-0.714,0.25-1.093,0.315l-1.968,1.968v0.763h1.732l9.738-9.738V26.986z" fill-opacity="0.5" stroke-opacity="0.5"/>
-<g>
-<rect height="3.519" width="17.646" x="6.177" y="13.246"/>
-<polygon points="9.706,25.588 20.294,25.588 22.059,17.647 7.941,17.647   "/>
-<path d="M10.519,8.506c1.35,0.571,2.732,0.287,3.599-0.017v3.875h1.766V8.489c0.866,0.304,2.249,0.588,3.599,0.017    c2.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.01    c-0.032-0.31-0.328-1.98-2.973-3.101c-2.925-1.238-4.335,0.06-4.335,0.06S7.593,7.268,10.519,8.506z"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
+<rect fill="none" height="30" width="30"/>
 </g>
-</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 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_replace_call.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <rect fill="none" height="30" width="30"/>
-<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.142c-0.001,0.002-0.004,0.007-0.006,0.008 c0-0.001,0-0.003,0-0.004c-1.121,0.582-3.618,2.223-5.188,3.79c-1.632,1.635-3.15,3.394-4.417,5.576c0,0-0.006,0.008-0.008,0.01 c0.009,0.002,0.018,0.002,0.027,0.003l2.725,1.743c0.344,0.222,0.412,0.706,0.158,1.078L6.485,27.62 c-0.253,0.37-0.735,0.491-1.08,0.268c0,0-0.298-0.194-1.021-0.83c-0.001,0-0.002,0-0.003,0c-0.394-0.347-0.411-0.476-0.785-0.925 c-0.319-0.385-0.573-0.765-0.783-1.114c-0.001-0.001-0.004,0-0.005-0.002c-0.043-0.071-0.081-0.139-0.119-0.207 c-0.005-0.009-0.01-0.018-0.015-0.024c-0.391-0.698-0.56-1.211-0.56-1.211c-0.178-0.688-0.252-3.057,0.563-5.205 c0.52-1.364,3.24-5.672,6.42-8.854c3.181-3.182,8.124-6.349,10.3-7.005s3.903-0.556,4.416-0.374c0,0,1.326,0.434,2.531,1.536 c0.401,0.367,0.439,0.382,0.75,0.765c0.002,0.003,0.002,0.006,0.003,0.008c-0.001-0.002-0.003-0.004-0.005-0.005 c0.616,0.757,0.818,1.062,0.818,1.062C28.11,5.844,27.962,6.304,27.578,6.523z"/>
-<path d="M24.001,11L18,19h1.963h2v2.522V25H20v-5h-0.037H16v4v1l0,0c0,3,2.775,5,5.5,5s5.5-2,5.5-5v-6h3L24.001,11z"/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_reply.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_reply.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_reply.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<rect fill="none" height="30" width="30"/>
-<path d="M3.75,19.5v-0.094l5.987-6.361l4.513,3.949l4.513-3.949L21.544,16l0.847-0.741l-2.78-2.955l5.14-4.499v5.389v4.056H27V3.75 H1.5v18h13.472l2.572-2.25H3.75z M24.536,6l-6.661,5.828l-0.141,0.124L14.25,15l-3.484-3.048l-0.141-0.124L3.964,6H24.536z M3.75,7.805l5.141,4.498L3.75,17.766V7.805z"/>
-<polygon points="29.25,18.75 23.25,18.75 23.25,16.5 17.25,21.75 23.25,27 23.25,24.75 29.25,24.75 "/>
+</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 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_reply_all.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,9 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<path d="M15.723,21.75H2.25v-0.141l5.237-5.565L12,19.994l4.513-3.95l2.587,2.749l0.848-0.74l-2.587-2.75l4.39-3.842v5.013 L24,14.506V9.493V7.5H0v1.993v12.866V24h18.294L15.723,21.75z M21.428,9.75l-5.803,5.078l-0.141,0.124L12,18l-3.484-3.048 l-0.141-0.124L2.572,9.75H21.428z M2.25,11.461l4.391,3.842L2.25,19.968V11.461z"/>
-<polygon points="25.5,13.194 25.5,17.25 27.75,17.25 27.75,3.75 3.75,3.75 3.75,6 25.5,6 "/>
-<polygon points="30,18.75 24,18.75 24,16.5 18,21.75 24,27 24,24.75 30,24.75 "/>
+</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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_reply_all_email.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M14.481,10.677c-1.992,0-3.585,0.628-4.777,1.885c-1.193,1.258-1.79,2.989-1.79,5.197c0,1.423,0.337,2.545,1.012,3.367  c0.675,0.824,1.506,1.234,2.494,1.234c0.758,0,1.401-0.181,1.932-0.545c0.531-0.364,1.019-0.972,1.463-1.823  c0.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.651c0-1.515,0.288-3.975,0.864-7.381H14.481z   M14.234,16.258c-0.197,1.538-0.448,2.618-0.753,3.238c-0.304,0.62-0.704,0.93-1.197,0.93c-0.552,0-0.931-0.223-1.136-0.669  c-0.206-0.447-0.309-1.154-0.309-2.121c0-1.539,0.301-2.759,0.901-3.66s1.328-1.353,2.185-1.353h0.766L14.234,16.258z"/>
-<path d="M16.19,24.643c-0.816,0.148-1.612,0.225-2.388,0.225c-5.465,0-8.197-2.861-8.197-8.584c0-2.563,0.738-4.566,2.216-6.01  c1.477-1.443,3.396-2.165,5.759-2.165c2.239,0,3.965,0.685,5.18,2.053c1.214,1.369,1.82,3.311,1.82,5.824  c0,0.029-0.003,0.054-0.003,0.082L22.8,14.4c0.037-0.028,0.081-0.041,0.12-0.066c-0.23-2.387-1.02-4.306-2.383-5.741  C18.896,6.863,16.556,6,13.519,6c-3.045,0-5.56,0.923-7.543,2.772C3.992,10.62,3,13.165,3,16.407c0,3.398,0.965,6.015,2.896,7.846  C7.825,26.085,10.42,27,13.679,27c0.766,0,1.644-0.088,2.636-0.266c0.764-0.138,1.433-0.301,2.013-0.489L16.19,24.643z"/>
-<path d="M17.58,4.108c2.239,0,3.965,0.685,5.18,2.053c1.214,1.369,1.82,3.311,1.82,5.824c0,0.037-0.004,0.068-0.004,0.104  c0.164,0.672,0.267,1.391,0.335,2.133C25.578,14.564,26,15.249,26,16v0.071c0.654-1.065,1-2.46,1-4.223  c0-3.108-0.821-5.527-2.463-7.256C22.896,2.863,20.556,2,17.519,2c-2.769,0-5.094,0.771-6.984,2.3C11.481,4.108,12.473,4,13.519,4  c0.92,0,1.79,0.073,2.61,0.215C16.594,4.148,17.075,4.108,17.58,4.108z"/>
-<polygon points="29,19 24,19 24,16 16,22 24,28 24,25 29,25 "/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_reply_email.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <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.469c0.021,0.074,0.051,0.138,0.075,0.209l2.4-1.801  c-0.007-0.173-0.015-0.344-0.015-0.541c0-1.668,0.319-4.38,0.957-8.135h-3.787c-2.206,0-3.97,0.692-5.291,2.078  s-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  C14.463,20.721,14.611,20.542,14.8,20.4z M13.023,18.162c-0.228-0.492-0.342-1.271-0.342-2.338c0-1.695,0.333-3.04,0.998-4.033  s1.472-1.49,2.42-1.49h0.848l-0.506,4.006c-0.219,1.695-0.497,2.885-0.834,3.568S14.828,18.9,14.281,18.9  C13.671,18.9,13.251,18.654,13.023,18.162z"/>
-<path d="M15.018,23.764c-5.419-0.321-8.133-3.461-8.133-9.43c0-2.825,0.818-5.033,2.454-6.624s3.762-2.386,6.378-2.386  c2.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.084c0.47-0.131,0.977-0.104,1.429,0.121  c0.632,0.316,1.032,0.943,1.085,1.641c0.101-0.618,0.169-1.271,0.169-1.996c0-3.427-0.909-6.093-2.728-7.998S19.012,3,15.648,3  c-3.372,0-6.157,1.019-8.354,3.056S4,10.897,4,14.471c0,3.746,1.068,6.629,3.206,8.647s5.011,3.028,8.62,3.028  c0.632,0,1.356-0.072,2.127-0.182L15.018,23.764z"/>
-<polygon points="29,19 24,19 24,16 16,22 24,28 24,25 29,25 "/>
+<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 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_reset.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_reset.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_reset.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <rect fill="none" height="30" width="30"/>
-<polygon points="18.076,4.464 18.076,7.929 12.076,4.464 18.076,1 "/>
-<path d="M14.166,3.446v2C21.242,5.446,27,11.204,27,18.279h2C29,10.101,22.346,3.446,14.166,3.446z"/>
-<rect height="6" width="2" x="10.379" y="12.25"/>
-<path d="M11.5,8C5.701,8,1,12.702,1,18.5C1,24.299,5.701,29,11.5,29S22,24.299,22,18.5C22,12.702,17.299,8,11.5,8z M11.5,26.5 c-4.419,0-8-3.582-8-8c0-4.417,3.581-8,8-8c4.418,0,8,3.583,8,8C19.5,22.918,15.918,26.5,11.5,26.5z"/>
+<rect height="6" width="2" x="10" y="12.5"/>
+<path d="M11,8C4.925,8,0,12.926,0,19c0,6.076,4.925,11,11,11s11-4.924,11-11C22,12.926,17.075,8,11,8z M11,27c-4.419,0-8-3.582-8-8  s3.581-8,8-8c4.418,0,8,3.582,8,8S15.418,27,11,27z"/>
+<path d="M30,13h-2c0-4.502-3.662-8.166-8.166-8.166c-0.094,0-0.188,0.002-0.279,0.004L19.48,2.84  c0.117-0.004,0.234-0.006,0.354-0.006C25.439,2.834,30,7.395,30,13L30,13z"/>
+<polygon points="20,4 20,8 17.001,6 14,4 17.001,2.002 20,0 "/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_restore_settings.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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.001 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="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.262-0.002l0.566-0.564  c0.625-0.625,0.625-1.639,0-2.264L5.247,4.742C4.407,5.143,3.616,5.682,2.921,6.375z"/>
-<path d="M25.083,21.602l-8.201-8.202c0.402-2.591-0.383-5.333-2.375-7.325C11.192,2.76,5.8,2.76,2.485,6.074  c-3.314,3.314-3.313,8.707,0,12.021c1.993,1.992,4.734,2.777,7.326,2.374l8.202,8.202c1.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.878-4.443,0.507-6.088-1.139c-2.144-2.143-2.144-5.633,0-7.777s5.634-2.145,7.778,0c1.645,1.645,2.016,4.076,1.139,6.088  l8.821,8.822C22.97,23.73,22.97,24.742,22.345,25.367z"/>
-<rect height="2" transform="matrix(-0.7071 0.7071 -0.7071 -0.7071 20.3101 20.3709)" width="9.825" x="1.024" y="13.392"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<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"/>
-<path d="M29.999,12.557h-2c0-4.502-3.662-8.166-8.166-8.166c-0.094,0-0.188,0.002-0.279,0.004l-0.074-1.998  c0.117-0.004,0.234-0.006,0.354-0.006C25.438,2.391,29.999,6.951,29.999,12.557L29.999,12.557z"/>
-<polygon points="19.845,3.404 19.845,6.811 16.897,5.107 13.948,3.404 16.897,1.703 19.845,0 "/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_rewind.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_rewind.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_rewind.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,12 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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="M0,0v30h30V0H0z M28.235,26.986l-6.012-6.012l-0.454,2.042l5.218,5.219H2.626l5.535-5.534l-0.454-2.042   l-5.942,5.941V3.013l9.352,9.352h2.119v-0.377l-2.467-2.467c-0.202-0.056-0.401-0.12-0.594-0.202   C7.701,8.271,7.043,6.555,6.869,5.621L3.013,1.765h23.589l-3.413,3.413c-0.041,0.684-0.408,2.89-3.363,4.141   c-0.348,0.147-0.714,0.25-1.093,0.315l-1.968,1.968v0.763h1.732l9.738-9.738V26.986z" fill-opacity="0.5" stroke-opacity="0.5"/>
-<g>
-<rect height="3.519" width="17.646" x="6.177" y="13.246"/>
-<polygon points="9.706,25.588 20.294,25.588 22.059,17.647 7.941,17.647   "/>
-<path d="M10.519,8.506c1.35,0.571,2.732,0.287,3.599-0.017v3.875h1.766V8.489c0.866,0.304,2.249,0.588,3.599,0.017    c2.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.01    c-0.032-0.31-0.328-1.98-2.973-3.101c-2.925-1.238-4.335,0.06-4.335,0.06S7.593,7.268,10.519,8.506z"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
+<rect fill="none" height="30" width="30"/>
 </g>
-</g>
+<polygon points="14,15,25,26,25,4"/>
+<polygon points="3,15,14,26,14,15,14,4"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_rsk_horizontal.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <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-4H11C5.486,10,1,14.486,1,20z"/>
+<path d="M1,20h4c0-3.309,2.691-6,6-6h18v-4h-18c-5.514,0-10,4.49-10,10z"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_rsk_vertical.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <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-6V1h-4v18C10,24.514,14.486,29,20,29z"/>
+<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 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_search.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_search.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_search.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <rect fill="none" height="30" width="30"/>
 <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.645,4.355c-3.809-3.807-9.981-3.807-13.789,0C8.41,7.802,8.093,13.18,10.885,16.994l-1.681,1.68l-0.53-0.531 l-4.773,4.773l3.182,3.183l4.773-4.772l-0.53-0.531l1.681-1.681c3.814,2.791,9.193,2.475,12.638-0.972 C29.453,14.336,29.451,8.162,25.645,4.355z M23.523,16.022c-2.633,2.631-6.916,2.632-9.546,0C12.703,14.748,12,13.052,12,11.25 c0-1.804,0.703-3.499,1.977-4.774c2.63-2.631,6.914-2.631,9.546,0C26.154,9.109,26.154,13.391,23.523,16.022z"/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_search_stop.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_search_stop.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g>
+<g fill-opacity="0.5" stroke-opacity="0.5">
+<rect fill="none" height="30" width="30" x="0" y="0.006"/>
+</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>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_seek_next.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_seek_next.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" 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">
+<rect fill="none" height="30" width="30"/>
+</g>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_seek_previous.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_seek_previous.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" 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">
+<rect fill="none" height="30" width="30"/>
+</g>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_send.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_send.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_send.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,9 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" 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">
 <rect fill="none" height="30" width="30"/>
-<polygon points="0.938,12.188 1.406,14.063 4.688,14.063 4.688,12.188 "/>
-<polygon points="1.875,15.938 2.344,17.813 4.688,17.813 4.688,15.938 "/>
-<polygon points="0,8.438 0.469,10.313 4.688,10.313 4.688,8.438 "/>
-<path d="M29.063,6.563h-22.5c-0.517,0-0.938,0.422-0.938,0.938v15.938c0,0.516,0.421,0.938,0.938,0.938h22.5 c0.515,0,0.938-0.422,0.938-0.938V7.5C30,6.984,29.577,6.563,29.063,6.563z M17.813,17.949l3.231-1.866l6.419,6.417h-19.3 l6.418-6.418L17.813,17.949z M21.885,15.598l6.24-3.604v9.844L21.885,15.598z M7.5,8.438h20.625v1.391l-10.313,5.955L7.5,9.829 V8.438z M13.74,15.598l-6.24,6.24v-9.844L13.74,15.598z"/>
+</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 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_settings.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_settings.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_settings.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <rect fill="none" height="30" width="30"/>
-<path d="M22.488,21.781c-0.146-0.146-0.423-0.106-0.619,0.089c-0.195,0.195-0.234,0.472-0.088,0.618l1.592,1.591 c0.146,0.146,0.423,0.107,0.618-0.088s0.235-0.473,0.089-0.619L22.488,21.781z"/>
-<path d="M27.881,20.102l-9.029-9.028c0.489-2.928-0.385-6.041-2.639-8.295c-3.704-3.704-9.73-3.704-13.436,0 c-3.703,3.704-3.703,9.73,0,13.435c2.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.707 C29.83,25.224,29.83,22.052,27.881,20.102z M3.967,6.089l4.114,4.113l-3.505,3.505C2.724,11.543,2.51,8.453,3.967,6.089z M25.759,25.052l-0.707,0.707c-0.78,0.781-2.048,0.781-2.829,0L11.955,15.49c-1.9,0.773-4.089,0.629-5.867-0.467l5.529-5.528 c0.781-0.78,0.781-2.047,0-2.828L8.104,3.154c2.092-0.456,4.365,0.122,5.988,1.745C16,6.808,16.47,9.616,15.505,11.969 l10.254,10.255C26.54,23.004,26.54,24.271,25.759,25.052z"/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_shake_warning.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,11 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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"/>
-<rect fill="none" height="30" width="30"/>
-<path d="M26.25,18.652L26.25,18.652l1.5-0.002v0.002c0,5.018-4.642,9.098-10.346,9.098v-1.5C22.281,26.25,26.25,22.842,26.25,18.652 z"/>
-<path d="M23.549,18.65h1.5c0,3.723-3.431,6.749-7.645,6.749v-1.5C20.792,23.899,23.549,21.545,23.549,18.65z"/>
-<path d="M3.75,18.652L3.75,18.652l-1.5-0.002v0.002c0,5.018,4.641,9.098,10.346,9.098v-1.5C7.718,26.25,3.75,22.842,3.75,18.652z"/>
-<path d="M6.451,18.65h-1.5c0,3.723,3.43,6.749,7.646,6.749v-1.5C9.208,23.899,6.451,21.545,6.451,18.65z"/>
-<path d="M20.136,5.585c-0.149,0-0.294,0.014-0.437,0.041c-0.201-1.088-1.168-1.917-2.326-1.917c-0.188,0-0.371,0.021-0.547,0.063 C16.491,2.884,15.624,2.25,14.61,2.25c-1.014,0-1.881,0.634-2.216,1.522c-0.175-0.042-0.359-0.063-0.546-0.063 c-1.304,0-2.364,1.047-2.364,2.334v3.953c-0.215-0.109-0.442-0.193-0.68-0.253C8.584,9.686,8.36,9.659,8.138,9.659 c-0.56,0-1.059,0.178-1.439,0.511c-0.703,0.61-0.896,1.642-0.489,2.632L9.87,21.75h10.894l1.736-6.341v-7.49 C22.5,6.632,21.439,5.585,20.136,5.585z M20.998,15.207l-1.381,5.043h-8.741c-1.858-4.545-3.277-8.015-3.28-8.02 c-0.116-0.285-0.172-0.704,0.086-0.928c0.192-0.169,0.511-0.167,0.749-0.107c0.489,0.124,0.862,0.425,1.126,0.815 c0.249,0.367,0.685,1.744,0.925,2.584l0.5-0.095V6.043c0-0.46,0.387-0.834,0.863-0.834c0.478,0,0.864,0.374,0.864,0.834v6.662h1.036 V4.583c0.001-0.461,0.388-0.833,0.863-0.833c0.478,0,0.863,0.372,0.863,0.833v8.121h1.037V6.043c0-0.46,0.387-0.834,0.862-0.834 c0.478,0,0.862,0.374,0.862,0.834v6.662h1.037V7.918c0-0.461,0.388-0.833,0.863-0.833c0.478,0,0.862,0.371,0.862,0.833 L20.998,15.207L20.998,15.207z"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0.006 0 30 30" width="30px" x="0px" 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>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_share.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_share.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_share.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,11 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<circle cx="21.75" cy="21.75" r="4.5"/>
-<circle cx="8.25" cy="15" r="4.5"/>
-<circle cx="21.75" cy="8.25" r="4.5"/>
-<path d="M13.567,16.82c-0.165,0.479-0.388,0.931-0.669,1.342l3.534,1.768c0.166-0.479,0.389-0.932,0.67-1.342L13.567,16.82z"/>
-<path d="M16.433,10.07l-3.534,1.767c0.281,0.411,0.505,0.863,0.67,1.342l3.533-1.767C16.82,11.001,16.598,10.549,16.433,10.07z"/>
+</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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_share_photo.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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="M0,0v30h30V0H0z M28.235,26.986l-6.012-6.012l-0.454,2.042l5.218,5.219H2.626l5.535-5.534l-0.454-2.042   l-5.942,5.941V3.013l9.352,9.352h2.119v-0.377l-2.467-2.467c-0.202-0.056-0.401-0.12-0.594-0.202   C7.701,8.271,7.043,6.555,6.869,5.621L3.013,1.765h23.589l-3.413,3.413c-0.041,0.684-0.408,2.89-3.363,4.141   c-0.348,0.147-0.714,0.25-1.093,0.315l-1.968,1.968v0.763h1.732l9.738-9.738V26.986z" fill-opacity="0.5" stroke-opacity="0.5"/>
-<g>
-<rect height="3.519" width="17.646" x="6.177" y="13.246"/>
-<polygon points="9.706,25.588 20.294,25.588 22.059,17.647 7.941,17.647   "/>
-<path d="M10.519,8.506c1.35,0.571,2.732,0.287,3.599-0.017v3.875h1.766V8.489c0.866,0.304,2.249,0.588,3.599,0.017    c2.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.01    c-0.032-0.31-0.328-1.98-2.973-3.101c-2.925-1.238-4.335,0.06-4.335,0.06S7.593,7.268,10.519,8.506z"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
+<rect fill="none" height="30" width="30"/>
 </g>
-</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 "/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_share_photo_off.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,12 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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="M0,0v30h30V0H0z M28.235,26.986l-6.012-6.012l-0.454,2.042l5.218,5.219H2.626l5.535-5.534l-0.454-2.042   l-5.942,5.941V3.013l9.352,9.352h2.119v-0.377l-2.467-2.467c-0.202-0.056-0.401-0.12-0.594-0.202   C7.701,8.271,7.043,6.555,6.869,5.621L3.013,1.765h23.589l-3.413,3.413c-0.041,0.684-0.408,2.89-3.363,4.141   c-0.348,0.147-0.714,0.25-1.093,0.315l-1.968,1.968v0.763h1.732l9.738-9.738V26.986z" fill-opacity="0.5" stroke-opacity="0.5"/>
-<g>
-<rect height="3.519" width="17.646" x="6.177" y="13.246"/>
-<polygon points="9.706,25.588 20.294,25.588 22.059,17.647 7.941,17.647   "/>
-<path d="M10.519,8.506c1.35,0.571,2.732,0.287,3.599-0.017v3.875h1.766V8.489c0.866,0.304,2.249,0.588,3.599,0.017    c2.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.01    c-0.032-0.31-0.328-1.98-2.973-3.101c-2.925-1.238-4.335,0.06-4.335,0.06S7.593,7.268,10.519,8.506z"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
+<rect fill="none" height="30" width="30"/>
 </g>
-</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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sharpness.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sharpness.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" 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>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_shift.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_shift.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_shift.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <rect fill="none" height="30" width="30"/>
-<path d="M15,2L2,19h7v9h12v-9h7L15,2z M18,16v9h-6v-9H8.07L15,6.938L21.93,16H18z"/>
+<path d="M15,2l-13,17h7v9h12v-9h7l-13-17zm3,14v9h-6v-9h-3.93l6.93-9.062,6.93,9.062h-3.93z"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_show_view.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,11 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<rect height="2" width="2" x="7" y="11"/>
-<rect height="2" width="8.941" x="10.059" y="11"/>
-<rect height="2" width="2" x="7" y="6"/>
-<rect height="2" width="8.941" x="10.059" y="6"/>
-<polygon points="4,25 4,3 22,3 22,11.299 25,15.049 25,0 1,0 1,28 9.839,28 7.438,25 "/>
-<path d="M22,13.6l-5,6.875V17h-6v5.5H8l6,7.5l3.92-4.899V30H26v-5.5h3.928L22,13.6z M24,22.5V28h-4.08v-5.399L20,22.5h-0.08H18 l4-5.5l4,5.5H24z"/>
+</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 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_shuffle.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_shuffle.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_shuffle.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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.272,13.923 20.272,22.374 8.237,22.374 8.237,19.059 0.5,24.029 8.237,29 8.237,25.687 23.711,25.687   23.711,13.923 "/>
-<polygon points="9.728,16.077 9.728,7.626 21.763,7.626 21.763,10.941 29.5,5.971 21.763,1 21.763,4.313 6.289,4.313 6.289,16.077   "/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" 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">
 <rect fill="none" height="30" width="30"/>
 </g>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_shuffle_off.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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.775,7.626 21.263,7.626 21.263,10.941 29,5.971 21.263,1 21.263,4.313 8.463,4.313 "/>
-<polygon points="5.789,9.937 5.789,16.077 9.228,16.077 9.228,13.375 "/>
-<polygon points="23.211,19.061 23.211,13.923 19.772,13.923 19.772,15.622 "/>
-<polygon points="18.228,22.374 7.737,22.374 7.737,19.059 0,24.029 7.737,29 7.737,25.687 21.54,25.687 "/>
-<rect height="39.401" transform="matrix(0.7066 -0.7076 0.7076 0.7066 -6.2267 15.051)" width="1.867" x="14.102" y="-4.667"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" 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"/>
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_smiley.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_smiley.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_smiley.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,9 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<path d="M15,0C6.729,0,0,6.729,0,15s6.729,15,15,15s15-6.729,15-15S23.271,0,15,0z M15,27C8.383,27,3,21.617,3,15S8.383,3,15,3 s12,5.383,12,12S21.617,27,15,27z"/>
-<path d="M5,15.985C5.462,21.387,9.76,25,15,25c5.239,0,9.538-3.613,10-9.015H5z M22.309,19.519H7.691l-0.914-1.827h16.445 L22.309,19.519z"/>
-<ellipse cx="9.5" cy="11.5" rx="1.5" ry="2.5"/>
-<ellipse cx="20.5" cy="11.5" rx="1.5" ry="2.5"/>
+</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>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_songs_all.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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.261,19.395c0.291,0,0.582,0.014,0.869,0.042V2.29l8.262,2.275V3.137L12.826,0.5v7.031v10.004  c-0.669-0.218-1.403-0.339-2.174-0.339C7.53,17.196,5,19.164,5,21.591c0,1.09,0.513,2.083,1.355,2.851  C6.759,21.604,9.7,19.395,13.261,19.395z"/>
-<path d="M25,6.652l-9.565-2.637v7.03V21.05c-0.669-0.217-1.403-0.338-2.174-0.338c-3.122,0-5.652,1.968-5.652,4.394  c0,2.427,2.53,4.395,5.652,4.395c3.123,0,5.652-1.968,5.652-4.395V12.005L25,13.683V6.652z"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <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 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sort.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sort.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sort.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,11 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<rect height="3" width="15.748" x="4.502" y="9"/>
-<rect height="3" width="20.248" x="4.5" y="3"/>
-<rect height="3" width="11.248" x="4.502" y="15"/>
-<rect height="3" width="6.749" x="4.502" y="21"/>
-<polygon points="24,21.75 24,15.75 18,15.75 18,21.75 15.75,21.75 21,27.75 26.25,21.75 "/>
+</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 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_space.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_space.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_space.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <rect fill="none" height="30" width="30"/>
-<path d="M28.5,18.473h-27v-6.944h3.301v3.563h20.396v-3.563H28.5V18.473z"/>
+<path d="M28.5,18.47h-27v-6.944h3.301v3.563h20.4v-3.563h3.3v6.943z"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_space_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_space_c.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_space_c.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <rect fill="none" height="30" width="30"/>
 <rect fill="none" height="30" width="30" y="0"/>
-<polygon points="30,21.467 30,17.924 0,17.924 0,21.467 "/>
+<polygon points="30,21.47,30,17.92,0,17.92,0,21.47"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_space_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_space_l.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_space_l.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <rect fill="none" height="30" width="30"/>
-<polygon points="5.043,8.533 5.043,17.922 28.5,17.922 28.5,21.465 1.5,21.465 1.5,8.533 "/>
+<polygon points="5.043,8.533,5.043,17.92,28.5,17.92,28.5,21.46,1.5,21.46,1.5,8.533"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_space_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_space_r.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_space_r.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <rect fill="none" height="30" width="30"/>
-<polygon points="24.957,8.533 24.957,17.922 1.5,17.922 1.5,21.465 28.5,21.465 28.5,8.533 "/>
+<polygon points="24.96,8.533,24.96,17.92,1.5,17.92,1.5,21.46,28.5,21.46,28.5,8.533"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_speaker.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_speaker.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_speaker.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,9 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<path d="M10.235,9H3v12h7.297l9.953,5.806V3.199L10.235,9z M9,18.75H5.25v-7.5H9V18.75z M18,22.889l-6-3.5v-8.811l6-3.476V22.889z"/>
-<path d="M22.5,15.337c0,1.847-0.252,3.633-0.714,5.331l1.292,0.94C23.676,19.622,24,17.518,24,15.337 c0-2.429-0.404-4.764-1.141-6.946l-1.27,0.924C22.182,11.218,22.5,13.241,22.5,15.337z"/>
-<path d="M27,15.324c0,2.847-0.486,5.579-1.371,8.125l1.269,0.924c1.036-2.822,1.603-5.869,1.603-9.049 c0-3.426-0.664-6.696-1.857-9.697l-1.254,0.911C26.427,9.269,27,12.229,27,15.324z"/>
+</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 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_speaker_off.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,10 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <rect fill="none" height="30" width="30"/>
-<rect height="9" width="5.25" x="4.862" y="11.61"/>
-<polygon points="19.862,14.009 19.862,5.61 14.545,8.691 "/>
-<polygon points="10.862,11.232 10.862,21.361 19.862,26.611 19.862,20.231 "/>
-<rect height="33.236" transform="matrix(-0.7061 0.7082 -0.7082 -0.7061 39.3599 12.3905)" width="1.4" x="16.408" y="-2.254"/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_special_characters_itut.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <rect fill="none" height="30" width="30"/>
-<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"/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_special_characters_qwerty.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <rect fill="none" height="30" width="30"/>
-<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"/>
-<polygon points="4.013,13.543 5.54,13.543 5.383,10.671 7.798,12.239 8.545,10.929 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.929 1.746,12.239 4.162,10.671 "/>
-<path d="M19.55,13.352c0.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.498L16.08,8.844 c0.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.785S16.442,3,15.475,3 c-1.041,0-1.852,0.238-2.433,0.715c-0.581,0.476-0.872,1.159-0.872,2.05c0,0.808,0.443,1.79,1.328,2.946 c-0.891,0.51-1.529,1.051-1.917,1.623C11.193,10.907,11,11.584,11,12.363c0,1.052,0.338,1.867,1.013,2.445s1.646,0.867,2.913,0.867 c1.234,0,2.283-0.346,3.146-1.037l0.697,0.904h2.482L19.55,13.352z M14.557,4.652c0.208-0.21,0.52-0.315,0.934-0.315 c0.35,0,0.629,0.103,0.839,0.308c0.21,0.204,0.315,0.465,0.315,0.779c0,0.848-0.487,1.597-1.461,2.25 c-0.359-0.471-0.605-0.851-0.738-1.142c-0.133-0.29-0.199-0.602-0.199-0.934C14.246,5.178,14.35,4.862,14.557,4.652z M15.3,14.248 c-0.548,0-1.025-0.182-1.432-0.544c-0.407-0.362-0.61-0.884-0.61-1.564c0-0.907,0.382-1.666,1.146-2.274l2.822,3.686 C16.667,14.016,16.024,14.248,15.3,14.248z"/>
-<polygon points="26.643,11.841 26.883,3.166 24.484,3.166 24.733,11.841 "/>
-<path d="M26.617,13.426c-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.93 s0.128,0.677,0.386,0.935c0.257,0.257,0.565,0.386,0.925,0.386c0.365,0,0.676-0.129,0.93-0.386C26.872,15.032,27,14.721,27,14.355 S26.872,13.681,26.617,13.426z"/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_split.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_split.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_split.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <rect fill="none" height="30" width="30"/>
-<path d="M13.058,4.016c0.604-0.082,1.214-0.139,1.833-0.139c0.621,0,1.232,0.057,1.838,0.139v-1.18h1.835V1.918 C18.563,1.41,18.152,1,17.645,1h-5.506c-0.507,0-0.916,0.41-0.916,0.918v0.918h1.835V4.016z"/>
-<path d="M26.355,9.729C26.76,9.14,27,8.428,27,7.659C27,5.639,25.361,4,23.341,4c-0.915,0-1.742,0.349-2.384,0.904 C23.165,5.996,25.031,7.668,26.355,9.729z"/>
-<path d="M9.042,4.904C8.4,4.349,7.573,4,6.658,4C4.638,4,3,5.639,3,7.659c0,0.769,0.239,1.48,0.644,2.069 C4.968,7.668,6.834,5.997,9.042,4.904z"/>
-<path d="M15,5C8.372,5,3,10.373,3,17c0,6.628,5.372,12,12,12c6.627,0,12-5.372,12-12C27,10.373,21.627,5,15,5z M6,17 c0-4.971,4.029-9,9-9s9,4.029,9,9h-8.811l-2.888,8.588C8.649,24.441,6,21.03,6,17z"/>
+<path d="M12.934,4.151C13.57,4.063,14.215,4,14.875,4c0.588,0,1.162,0.048,1.729,0.118V3h1.836V1.918C18.439,1.411,18.027,1,17.52,1  h-5.505c-0.506,0-0.916,0.41-0.916,0.918V3h1.836V4.151z"/>
+<path d="M9.789,5.017C9.16,4.4,8.318,4,7.367,4c-1.932,0-3.5,1.566-3.5,3.5c0,0.561,0.139,1.086,0.375,1.554  C5.717,7.285,7.619,5.891,9.789,5.017z"/>
+<path d="M25.795,9.096c0.252-0.479,0.408-1.016,0.408-1.596c0-1.934-1.568-3.5-3.5-3.5c-0.961,0-1.807,0.409-2.438,1.037  C22.43,5.919,24.328,7.321,25.795,9.096z"/>
+<path d="M15,6C8.371,6,3,11.374,3,18c0,6.629,5.371,12,12,12c6.627,0,12-5.371,12-12C27,11.374,21.627,6,15,6z M15,18  c0,0-4.004,8-4.004,8.063C8.035,24.59,6,21.533,6,18c0-4.971,4.029-9,9-9c4.971,0,9,4.029,9,9H15z"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sport.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sport.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sport.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,14 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <rect fill="none" height="30" width="30"/>
-</g>
-<path d="M10.59,11.188c-0.307,0-0.617-0.094-0.881-0.289C9.057,10.42,8.924,9.512,9.41,8.87l1.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.482,10.987,11.039,11.188,10.59,11.188  L10.59,11.188z"/>
-<path d="M27.617,18.032h-4.74l-1.639-5.9l-4.373-3.822l-4.449-0.002c-0.801,0.009-1.094-0.622-1.121-1.396  c-0.027-0.771,0.584-1.42,1.371-1.448l5.238,0.01l5.859,5.121l1.287,4.639h2.566c0.785,0,1.424,0.625,1.424,1.398  S28.402,18.032,27.617,18.032L27.617,18.032z"/>
-<path d="M3.416,28.625c-0.682,0-1.357-0.287-1.826-0.842c-0.838-0.99-0.701-2.461,0.307-3.285l6.414-5.24l1.332-2.273  c0.654-1.117,2.105-1.5,3.24-0.857s1.525,2.068,0.873,3.186l-1.758,2.996l-7.066,5.777C4.488,28.448,3.951,28.625,3.416,28.625  L3.416,28.625z"/>
-<path d="M11.596,28.983c-0.609-0.045-1.207-0.32-1.635-0.816c-0.848-0.984-0.729-2.457,0.268-3.289l5.467-4.563  c0.998-0.832,2.496-0.711,3.344,0.271c0.852,0.984,0.729,2.457-0.268,3.289l-5.467,4.563C12.813,28.848,12.195,29.028,11.596,28.983  L11.596,28.983z"/>
-<path d="M10.342,20.213l-0.574-3.217c-0.297-1.66,0.633-3.42,2.766-5.23c0.646-0.549,2.512-2.383,3.533-3.41l2.326-2.329  l4.746,4.571l-2.326,2.332c-0.291,0.291-2.871,2.871-3.938,3.777c-0.143,0.121-0.262,0.229-0.357,0.32l0.369,2.055L10.342,20.213  L10.342,20.213z"/>
-<path d="M17.637,24.02c-0.707,0-1.41-0.299-1.896-0.879l-4.164-4.963c-0.863-1.027-0.715-2.549,0.332-3.398  c1.045-0.848,2.594-0.705,3.459,0.326l4.164,4.961c0.863,1.029,0.717,2.551-0.332,3.4C18.742,23.838,18.189,24.02,17.637,24.02  L17.637,24.02z"/>
-<circle cx="25.041" cy="4.989" r="4"/>
+<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>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_stabilization.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_stabilization.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_stabilization.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,14 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <rect fill="none" height="30" width="30"/>
-<rect height="12" width="1.5" x="2.25" y="13.781"/>
-<rect height="1.5" width="7.5" x="2.25" y="24.281"/>
-<rect height="12" width="1.5" x="26.25" y="13.781"/>
-<rect height="1.5" width="7.5" x="20.25" y="24.281"/>
-<path d="M6,6.094v13.5h18v-13.5H6z M22.5,18.094h-15v-10.5h15V18.094z"/>
-<circle cx="9.612" cy="9.74" r="1.143"/>
-<path d="M15.145,16.594c2.068,0,3.75-1.683,3.75-3.75c0-2.068-1.682-3.75-3.75-3.75c-2.066,0-3.75,1.682-3.75,3.75 C11.395,14.911,13.079,16.594,15.145,16.594z M15.145,10.594c1.241,0,2.25,1.009,2.25,2.25c0,1.239-1.01,2.25-2.25,2.25 s-2.25-1.011-2.25-2.25C12.895,11.603,13.904,10.594,15.145,10.594z"/>
-<rect height="1.125" width="3" x="18.75" y="4.219"/>
+<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 "/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_stabilization_off.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,17 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <rect fill="none" height="30" width="30"/>
-<rect fill="none" height="30.001" width="30"/>
-<path d="M8.482,11.339c-0.004,0.04-0.012,0.078-0.012,0.118c0,0.631,0.512,1.143,1.143,1.143c0.041,0,0.078-0.008,0.118-0.012 L8.482,11.339z"/>
-<polygon points="27.75,24.385 27.75,15.498 26.25,15.498 26.25,22.885 "/>
-<rect height="11.999" width="1.5" x="2.25" y="15.498"/>
-<rect height="1.5" width="7.5" x="2.25" y="25.997"/>
-<polygon points="23.141,25.997 20.25,25.997 20.25,27.497 24.641,27.497 "/>
-<path d="M15.776,12.412c0.73,0.215,1.302,0.787,1.517,1.518l1.492,1.492c0.066-0.278,0.109-0.563,0.109-0.86 c0-2.068-1.682-3.75-3.749-3.75c-0.297,0-0.583,0.044-0.861,0.109L15.776,12.412z"/>
-<path d="M11.423,14.281c-0.008,0.094-0.029,0.184-0.029,0.28c0,2.068,1.683,3.749,3.751,3.749c0.096,0,0.185-0.021,0.279-0.027 L11.423,14.281z"/>
-<polygon points="12.675,9.311 22.5,9.311 22.5,19.135 24,20.635 24,7.811 11.175,7.811 "/>
-<polygon points="16.953,19.81 7.5,19.81 7.5,10.358 6,8.858 6,21.31 18.453,21.31 "/>
-<rect height="33.233" transform="matrix(-0.7064 0.7078 -0.7078 -0.7064 36.0346 14.5449)" width="1.401" x="14.3" y="-1.871"/>
-<rect height="1.125" width="3" x="18.75" y="5.936"/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_start.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_start.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_start.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <rect fill="none" height="30" width="30"/>
-<polygon points="4.608,15 4.608,3 15,9 25.393,15 15,21 4.608,27 "/>
+<polygon points="4.608,15,4.608,3,15,9,25.39,15,15,21,4.608,27"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_station_scan.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_station_scan.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<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 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_stop.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_stop.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_stop.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,7 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <rect fill="none" height="30" width="30"/>
-<rect fill="none" height="30" width="30"/>
-<rect height="22.5" width="22.5" x="3.75" y="3.75"/>
+<rect height="24" width="24" x="3" y="3"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_stop_search.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_stop_search.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +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.006 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.006"/>
-</g>
-<rect height="2" transform="matrix(0.7071 0.7071 -0.7071 0.7071 19.728 5.1928)" width="4.999" x="1.096" y="25.41"/>
-<path d="M16.858,20.643l2.646-2.646c-1.92,0-3.841-0.731-5.302-2.193c-2.924-2.923-2.926-7.682,0-10.605  c2.924-2.925,7.682-2.924,10.605,0s2.925,7.682,0,10.605c-0.72,0.72-1.551,1.26-2.438,1.626l1.679,1.678l2.828-2.828l0.806,0.805  c3.327-4.123,3.078-10.177-0.754-14.007c-4.1-4.102-10.748-4.102-14.849,0c-3.739,3.738-4.058,9.591-0.977,13.703l-1.499,1.499  l-0.707-0.707l-4.949,4.95l3.535,3.535l4.95-4.95l-0.707-0.707l1.499-1.498C14.335,19.732,15.572,20.307,16.858,20.643z"/>
-<polygon points="29,21.228 26.878,19.106 24.05,21.935 21.222,19.107 19.101,21.229 21.928,24.057 19.101,26.884 21.222,29.006   24.05,26.178 26.878,29.006 29,26.885 26.171,24.057 "/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_stopwatch.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_stopwatch.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_stopwatch.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <rect fill="none" height="30" width="30"/>
-<rect height="10" width="2" x="13.88" y="9.25"/>
-<rect height="2" width="9.999" x="12.126" y="16"/>
-<path d="M13.059,4.015c0.604-0.082,1.214-0.138,1.833-0.138c0.621,0,1.231,0.057,1.837,0.139V2.835h1.836V1.917 c0-0.508-0.41-0.917-0.918-0.917H12.14c-0.507,0-0.916,0.409-0.916,0.917v0.918h1.835V4.015z"/>
-<path d="M15.001,5C8.373,5,3,10.372,3,17c0,6.627,5.373,12,12,12C21.627,29,27,23.627,27,17C27,10.372,21.627,5,15.001,5z M15.001,26c-4.971,0-9-4.029-9-9s4.03-9,9-9C19.971,8,24,12.029,24,17S19.971,26,15.001,26z"/>
-<path d="M26.355,9.728C26.762,9.139,27,8.427,27,7.658C27,5.638,25.361,4,23.342,4c-0.916,0-1.742,0.348-2.385,0.903 C23.166,5.996,25.031,7.667,26.355,9.728z"/>
-<path d="M9.043,4.904C8.401,4.348,7.574,4,6.659,4C4.638,4,3,5.638,3,7.658c0,0.769,0.239,1.48,0.644,2.069 C4.969,7.668,6.835,5.996,9.043,4.904z"/>
+<path d="M12.934,4.15C13.57,4.063,14.215,4,14.876,4c0.587,0,1.161,0.047,1.729,0.117V3h1.834V1.918C18.439,1.41,18.027,1,17.521,1  h-5.506c-0.507,0-0.916,0.41-0.916,0.918V3h1.835V4.15z"/>
+<path d="M9.789,5.016C9.16,4.398,8.318,4,7.368,4c-1.933,0-3.5,1.566-3.5,3.5c0,0.561,0.139,1.086,0.374,1.553  C5.717,7.283,7.62,5.891,9.789,5.016z"/>
+<path d="M25.795,9.096c0.253-0.479,0.408-1.016,0.408-1.596c0-1.934-1.567-3.5-3.5-3.5c-0.961,0-1.807,0.408-2.438,1.037  C22.43,5.918,24.328,7.32,25.795,9.096z"/>
+<path d="M15,6C8.372,6,3,11.373,3,18c0,6.629,5.372,12,12,12c6.627,0,12-5.371,12-12C27,11.373,21.627,6,15,6z M15,27  c-4.971,0-9-4.029-9-9c0-4.971,4.029-9,9-9c4.971,0,9,4.029,9,9C24,22.971,19.971,27,15,27z"/>
+<rect height="10" width="2" x="14" y="10"/>
+<rect height="2" width="10" x="12" y="17"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_store.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_store.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_store.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <rect fill="none" height="30" width="30"/>
-<path d="M29,10V7H6V5V4c0-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,1h0h1h3.5h14H26 c0.553,0,1-0.447,1-1v-1c0-0.553-0.447-1-1-1H6v-2h17.237h3.04H27v-2h-0.394l0.986-6H29z M14,10h2v6h-2V10z M12,16h-2v-6h2V16z M18,10h2v6h-2V10z M6,10h2v6H6V10z M23.566,16H22v-6h2.553L23.566,16z"/>
+<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"/>
 <circle cx="8.5" cy="25.5" r="2.5"/>
 <circle cx="22.5" cy="25.5" r="2.5"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_swap.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_swap.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +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>
-<path d="M0,0v30h30V0H0z M28.235,26.986l-6.012-6.012l-0.454,2.042l5.218,5.219H2.626l5.535-5.534l-0.454-2.042   l-5.942,5.941V3.013l9.352,9.352h2.119v-0.377l-2.467-2.467c-0.202-0.056-0.401-0.12-0.594-0.202   C7.701,8.271,7.043,6.555,6.869,5.621L3.013,1.765h23.589l-3.413,3.413c-0.041,0.684-0.408,2.89-3.363,4.141   c-0.348,0.147-0.714,0.25-1.093,0.315l-1.968,1.968v0.763h1.732l9.738-9.738V26.986z" fill-opacity="0.5" stroke-opacity="0.5"/>
-<g>
-<rect height="3.519" width="17.646" x="6.177" y="13.246"/>
-<polygon points="9.706,25.588 20.294,25.588 22.059,17.647 7.941,17.647   "/>
-<path d="M10.519,8.506c1.35,0.571,2.732,0.287,3.599-0.017v3.875h1.766V8.489c0.866,0.304,2.249,0.588,3.599,0.017    c2.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.01    c-0.032-0.31-0.328-1.98-2.973-3.101c-2.925-1.238-4.335,0.06-4.335,0.06S7.593,7.268,10.519,8.506z"/>
-</g>
-</g>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sym_itut.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <rect fill="none" height="30" width="30"/>
-<path d="M4.427,12.812c-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 c0.366-0.287,0.854-0.432,1.464-0.432c0.672,0,1.398,0.089,2.18,0.266V7.74C5.769,7.574,4.962,7.49,4.085,7.49 c-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.64 c0.888,0.504,1.496,0.912,1.822,1.225c0.327,0.313,0.491,0.743,0.491,1.29c0,0.582-0.198,1.029-0.595,1.346 c-0.396,0.314-0.947,0.473-1.652,0.473c-0.742,0-1.594-0.13-2.554-0.391v1.479c0.877,0.227,1.768,0.34,2.672,0.34 c1.475,0,2.583-0.312,3.322-0.934c0.741-0.623,1.111-1.557,1.111-2.802c0-0.691-0.181-1.314-0.54-1.868 C6.204,13.977,5.491,13.403,4.427,12.812z"/>
-<path d="M11.923,17.875L10,10.297H7.663l2.612,9.297h1.174c-0.233,0.725-0.471,1.206-0.712,1.443 c-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 c0.793,0,1.433-0.202,1.918-0.605c0.485-0.404,0.855-1.041,1.11-1.91l2.937-10.01h-1.996L11.923,17.875z"/>
-<path d="M29.257,10.943c-0.496-0.525-1.241-0.788-2.233-0.788c-1.171,0-2.075,0.459-2.714,1.378 c-0.433-0.919-1.295-1.378-2.587-1.378c-1.23,0-2.174,0.528-2.828,1.585l-0.391-1.443h-1.315V20h2.255v-5.902 c0-0.769,0.147-1.386,0.44-1.851c0.295-0.465,0.719-0.697,1.273-0.697c0.438,0,0.767,0.155,0.985,0.465 c0.22,0.31,0.329,0.772,0.329,1.386V20h2.246v-5.902c0-0.774,0.15-1.393,0.449-1.854c0.3-0.462,0.729-0.693,1.29-0.693 c0.433,0,0.754,0.14,0.966,0.419c0.21,0.279,0.314,0.757,0.314,1.432V20H30v-6.699C30,12.256,29.753,11.47,29.257,10.943z"/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sym_qwerty.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <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.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"/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_tab_active.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,12 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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="M0,0v30h30V0H0z M28.235,26.986l-6.012-6.012l-0.454,2.042l5.218,5.219H2.626l5.535-5.534l-0.454-2.042   l-5.942,5.941V3.013l9.352,9.352h2.119v-0.377l-2.467-2.467c-0.202-0.056-0.401-0.12-0.594-0.202   C7.701,8.271,7.043,6.555,6.869,5.621L3.013,1.765h23.589l-3.413,3.413c-0.041,0.684-0.408,2.89-3.363,4.141   c-0.348,0.147-0.714,0.25-1.093,0.315l-1.968,1.968v0.763h1.732l9.738-9.738V26.986z" fill-opacity="0.5" stroke-opacity="0.5"/>
-<g>
-<rect height="3.519" width="17.646" x="6.177" y="13.246"/>
-<polygon points="9.706,25.588 20.294,25.588 22.059,17.647 7.941,17.647   "/>
-<path d="M10.519,8.506c1.35,0.571,2.732,0.287,3.599-0.017v3.875h1.766V8.489c0.866,0.304,2.249,0.588,3.599,0.017    c2.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.01    c-0.032-0.31-0.328-1.98-2.973-3.101c-2.925-1.238-4.335,0.06-4.335,0.06S7.593,7.268,10.519,8.506z"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
+<rect fill="none" height="30" width="30"/>
 </g>
-</g>
+<circle cx="15" cy="15" r="13"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_tab_passive.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,12 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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="M0,0v30h30V0H0z M28.235,26.986l-6.012-6.012l-0.454,2.042l5.218,5.219H2.626l5.535-5.534l-0.454-2.042   l-5.942,5.941V3.013l9.352,9.352h2.119v-0.377l-2.467-2.467c-0.202-0.056-0.401-0.12-0.594-0.202   C7.701,8.271,7.043,6.555,6.869,5.621L3.013,1.765h23.589l-3.413,3.413c-0.041,0.684-0.408,2.89-3.363,4.141   c-0.348,0.147-0.714,0.25-1.093,0.315l-1.968,1.968v0.763h1.732l9.738-9.738V26.986z" fill-opacity="0.5" stroke-opacity="0.5"/>
-<g>
-<rect height="3.519" width="17.646" x="6.177" y="13.246"/>
-<polygon points="9.706,25.588 20.294,25.588 22.059,17.647 7.941,17.647   "/>
-<path d="M10.519,8.506c1.35,0.571,2.732,0.287,3.599-0.017v3.875h1.766V8.489c0.866,0.304,2.249,0.588,3.599,0.017    c2.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.01    c-0.032-0.31-0.328-1.98-2.973-3.101c-2.925-1.238-4.335,0.06-4.335,0.06S7.593,7.268,10.519,8.506z"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
+<rect fill="none" height="30" width="30"/>
 </g>
-</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>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_tag.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_tag.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_tag.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,12 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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="M0,0v30h30V0H0z M28.235,26.986l-6.012-6.012l-0.454,2.042l5.218,5.219H2.626l5.535-5.534l-0.454-2.042   l-5.942,5.941V3.013l9.352,9.352h2.119v-0.377l-2.467-2.467c-0.202-0.056-0.401-0.12-0.594-0.202   C7.701,8.271,7.043,6.555,6.869,5.621L3.013,1.765h23.589l-3.413,3.413c-0.041,0.684-0.408,2.89-3.363,4.141   c-0.348,0.147-0.714,0.25-1.093,0.315l-1.968,1.968v0.763h1.732l9.738-9.738V26.986z" fill-opacity="0.5" stroke-opacity="0.5"/>
-<g>
-<rect height="3.519" width="17.646" x="6.177" y="13.246"/>
-<polygon points="9.706,25.588 20.294,25.588 22.059,17.647 7.941,17.647   "/>
-<path d="M10.519,8.506c1.35,0.571,2.732,0.287,3.599-0.017v3.875h1.766V8.489c0.866,0.304,2.249,0.588,3.599,0.017    c2.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.01    c-0.032-0.31-0.328-1.98-2.973-3.101c-2.925-1.238-4.335,0.06-4.335,0.06S7.593,7.268,10.519,8.506z"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
+<rect fill="none" height="30" width="30"/>
 </g>
-</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 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_text_align_center.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <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"/>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_text_align_justify.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <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"/>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_text_align_left.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <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"/>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_text_align_right.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <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"/>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_tick.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_tick.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_tick.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,7 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<rect fill="none" height="30" width="30"/>
-<polygon points="27.75,7.389 25.099,4.737 11.165,18.672 4.901,12.407 2.25,15.059 11.19,24 "/>
+</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 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_tip.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_tip.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
+<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 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_two.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_two.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_two.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <rect fill="none" height="30" width="30"/>
-<path d="M13.498,22.69c0.035-0.788,0.244-1.511,0.625-2.169c0.381-0.659,0.85-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.658-0.593,3.071-0.89,4.237-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.709,0.756-1.305,1.671-1.789,2.741S10,22.174,10,23.553V25h12v-2.31H13.498z"/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_uma.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_uma.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_uma.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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.558 -0.857 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="M23.349,19.388V12.27h-7.115v5.185H13.86V12.27H6.744v7.118h5.186l-0.015,2.394l-5.197,0.031L6.75,28.88l7.065-0.029  l0.014-5.162h2.404v5.186h7.115v-7.116h-5.186v-2.371H23.349z M16.26,21.759h-0.026v0.027h-2.401v-2.398h0.028v-0.032h2.373v0.027  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.305 "/>
-<rect fill="none" height="30" width="30"/>
-<rect fill="none" height="30" width="30"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" 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>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_uma_attach.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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.334 -0.857 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="M16.288,10.937V7.222h-3.712v2.707h-1.238V7.222H7.623v3.715h2.708l-0.012,1.25L7.61,12.204l0.013,3.687l3.69-0.014  l0.007-2.694h1.256v2.707h3.712v-3.715h-2.707v-1.237H16.288z M12.591,12.174h-0.015v0.018H11.32v-1.254h0.018v-0.015h1.238v0.015  h0.015V12.174z"/>
-<polygon points="11.97,2.87 17.889,8.77 18.581,8.074 11.931,1.404 5.28,8.056 6.05,8.807 "/>
-<polygon points="17.505,22.329 18.913,24.598 22.773,24.598 21.365,22.329 "/>
-<polygon points="11.471,22.329 12.877,24.598 16.725,24.598 15.312,22.329 "/>
-<polygon points="23.556,22.329 24.722,24.208 24.722,22.329 "/>
-<polygon points="10.684,24.598 10.688,24.598 9.28,22.329 6.614,22.329 10.529,28.596 12.435,27.403 11.773,26.34 "/>
-<polygon points="20.604,17.657 22.013,19.924 24.722,19.924 20.81,13.659 18.882,14.86 20.626,17.657 "/>
-<polygon points="19.824,19.924 18.413,17.657 14.607,17.657 16.016,19.924 "/>
-<polygon points="6.614,18.033 6.614,19.924 7.787,19.924 "/>
-<polygon points="13.825,19.924 12.419,17.657 8.569,17.657 9.978,19.924 "/>
-<rect fill="none" height="30" width="30"/>
-<rect fill="none" height="30" width="30"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" 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>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_uma_context.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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.771 -0.857 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="M16.243,11.011v-3.7h-3.696v2.695h-1.234V7.311H7.614v3.7h2.696L10.3,12.256l-2.7,0.016l0.015,3.672l3.675-0.014  l0.007-2.683h1.251v2.696h3.697v-3.7h-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.16 11.904,1.516 5.279,8.142 6.045,8.89 "/>
-<polygon points="24.721,22.242 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.588 6.685,17.59 6.685,19.848 24.721,19.846 "/>
-<rect fill="none" height="30" width="30"/>
-<rect fill="none" height="30" width="30"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" 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>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_uma_multipdp.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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.144 -0.857 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="M16.243,11.011v-3.7h-3.696v2.695h-1.234V7.311H7.614v3.7h2.696L10.3,12.256l-2.7,0.016l0.015,3.672l3.674-0.014  l0.008-2.683h1.251v2.696h3.697v-3.7h-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.16 11.904,1.516 5.279,8.142 6.046,8.89 "/>
-<polygon points="24.721,22.242 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.588 6.685,17.59 6.685,19.848 24.721,19.846 "/>
-<polygon points="10.556,28.477 12.474,27.279 10.739,24.49 13.57,24.49 16.057,28.477 17.97,27.279 16.238,24.49 24.694,24.49   24.694,22.232 6.659,22.232 "/>
-<rect fill="none" height="30" width="30"/>
-<rect fill="none" height="30" width="30"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" 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>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_uma_suspended.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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.874 -0.857 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="M16.286,10.967V7.253h-3.71v2.706h-1.24V7.253H7.623v3.714h2.708l-0.011,1.251l-2.712,0.016l0.015,3.687l3.688-0.014  l0.009-2.694h1.256v2.707h3.712v-3.715h-2.709v-1.237H16.286z M12.589,12.205h-0.013v0.017H11.32v-1.254h0.016v-0.014h1.24v0.014  h0.013V12.205z"/>
-<polygon points="11.968,2.9 17.887,8.8 18.582,8.104 11.931,1.434 5.278,8.086 6.048,8.837 "/>
-<polygon points="24.72,22.266 24.72,24.533 20.62,24.533 20.62,24.533 15.057,24.533 16.946,22.266 "/>
-<polygon points="6.614,22.266 11.55,22.266 9.636,24.533 6.614,24.533 "/>
-<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.66   "/>
-<rect fill="none" height="30" width="30"/>
-<rect fill="none" height="30" width="30"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" 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>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_unblock.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_unblock.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_unblock.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,9 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<polygon points="29.728,21.949 27.605,19.828 24.777,22.656 21.949,19.829 19.828,21.95 22.656,24.777 19.828,27.605 21.949,29.728   24.777,26.899 27.605,29.728 29.728,27.606 26.898,24.778 "/>
-<path d="M17,27.605l2.828-2.828l-1.357-1.356c-1.07,0.442-2.242,0.69-3.471,0.69  c-1.225,0-2.391-0.246-3.458-0.686L21.729,8.878c1.475,1.619,2.383,3.764,2.383,6.122c0,1.229-0.248,2.4-0.691,3.472l1.357,1.356  L27.605,17l0.194,0.194C27.922,16.479,28,15.749,28,15c0-7.169-5.832-13-13-13S2,7.831,2,15s5.832,13,13,13  c0.75,0,1.479-0.078,2.194-0.2L17,27.605z 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.122  C6.797,19.503,5.889,17.358,5.889,15z" fill-rule="evenodd"/>
+<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>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_underline.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_underline.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_underline.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <rect fill="none" height="30" width="30"/>
-<path d="M15.037,22.656c2.177,0,3.83-0.579,4.964-1.736c1.134-1.156,1.7-2.857,1.7-5.104V3h-3.163v13.066 c0,1.6-0.278,2.74-0.831,3.428c-0.554,0.686-1.454,1.029-2.7,1.029c-1.234,0-2.136-0.35-2.699-1.045 c-0.564-0.696-0.846-1.834-0.846-3.412V3H8.299v12.729c0,2.354,0.551,4.096,1.648,5.229S12.743,22.656,15.037,22.656z M6.035,25.044V27h17.93v-1.956H6.035z"/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_unhold.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_unhold.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +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>
-<path d="M0,0v30h30V0H0z M28.235,26.986l-6.012-6.012l-0.454,2.042l5.218,5.219H2.626l5.535-5.534l-0.454-2.042   l-5.942,5.941V3.013l9.352,9.352h2.119v-0.377l-2.467-2.467c-0.202-0.056-0.401-0.12-0.594-0.202   C7.701,8.271,7.043,6.555,6.869,5.621L3.013,1.765h23.589l-3.413,3.413c-0.041,0.684-0.408,2.89-3.363,4.141   c-0.348,0.147-0.714,0.25-1.093,0.315l-1.968,1.968v0.763h1.732l9.738-9.738V26.986z" fill-opacity="0.5" stroke-opacity="0.5"/>
-<g>
-<rect height="3.519" width="17.646" x="6.177" y="13.246"/>
-<polygon points="9.706,25.588 20.294,25.588 22.059,17.647 7.941,17.647   "/>
-<path d="M10.519,8.506c1.35,0.571,2.732,0.287,3.599-0.017v3.875h1.766V8.489c0.866,0.304,2.249,0.588,3.599,0.017    c2.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.01    c-0.032-0.31-0.328-1.98-2.973-3.101c-2.925-1.238-4.335,0.06-4.335,0.06S7.593,7.268,10.519,8.506z"/>
-</g>
-</g>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_unknown.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_unknown.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_unknown.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,10 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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.558 -0.209 31 31" width="31px" 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="M17.881,25.666c0,1.77-1.438,3.214-3.217,3.214c-1.777,0-3.219-1.444-3.219-3.214c0-1.774,1.441-3.219,3.219-3.219  C16.443,22.447,17.881,23.892,17.881,25.666z"/>
-<g>
-<path d="M15.234,1.119c-2.402,0-4.121,0.74-5.256,2.264C8.904,4.825,8.234,6.739,7.996,9.076l3.965,0.684   c0.166-1.252,0.459-2.168,0.891-2.779c0.584-0.822,1.375-1.254,2.297-1.254c1.088,0,1.691,0.492,2.006,0.906   c0.408,0.532,0.617,1.258,0.617,2.153c0,0.916-0.451,1.893-1.338,2.899c-1.395,1.62-2.301,2.756-2.684,3.371   c-0.371,0.595-0.652,1.258-0.832,1.969c-0.191,0.721-0.289,1.693-0.291,2.887h3.85c0.049-0.78,0.184-1.439,0.4-2.001   c0.295-0.745,0.932-1.647,1.953-2.776c1.297-1.428,2.166-2.637,2.572-3.592c0.4-0.939,0.604-1.93,0.604-2.933   c0-2.497-0.764-4.43-2.33-5.911C18.553,1.635,17.1,1.119,15.234,1.119z"/>
-</g>
-<rect fill="none" height="30" width="30"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" 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>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_unmute.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_unmute.svg	Mon Apr 19 14:02:13 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="40px" version="1.1" viewBox="0 0 40 40" width="40px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<rect fill="none" fill-opacity="0.5" height="40" stroke-opacity="0.5" width="40"/>
-<path d="M13.647,12H4v16h9.729L27,35.741V4.265L13.647,12z M12,25H7V15h5V25z M24,30.518l-8-4.666V14.104l8-4.634V30.518z"/>
-<path d="M30,20.449c0,2.462-0.335,4.844-0.952,7.109l1.723,1.253C31.567,26.163,32,23.357,32,20.449c0-3.239-0.539-6.352-1.52-9.261  l-1.694,1.232C29.575,14.957,30,17.654,30,20.449z"/>
-<path d="M36,20.432c0,3.796-0.649,7.439-1.829,10.834l1.692,1.231C37.245,28.735,38,24.672,38,20.432  c0-4.568-0.885-8.928-2.477-12.929l-1.671,1.215C35.236,12.358,36,16.305,36,20.432z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_update_existing.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_update_existing.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
+<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"/>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_user_defined.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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.002 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <g fill-opacity="0.5" stroke-opacity="0.5">
-<rect fill="none" height="30" width="29.998"/>
+<rect fill="none" height="30" width="30" x="0.002"/>
 </g>
-<path d="M0.998,3v24h28V3H0.998z M25.998,24h-22V6h22V24z"/>
-<path d="M19.775,9.176v11.648H17.65v-8.062l-2.195,4.187h-0.898l-2.203-4.187v8.062h-2.133V9.176h1.797l2.992,5.695l2.992-5.695  H19.775z"/>
+<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 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_vga.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_vga.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_vga.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,10 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <rect fill="none" height="30" width="30"/>
-<rect fill="none" height="30.001" width="30"/>
-<path d="M2.25,5.624v18.751h25.5V5.624H2.25z M25.5,22.125h-21V7.874h21V22.125z"/>
-<path d="M8.086,18.822l-2.03-7.646h1.471l1.482,6.163l1.522-6.163h1.256L9.67,18.822H8.086L8.086,18.822z"/>
-<path d="M14.899,18.904c-0.855,0-1.499-0.31-1.933-0.926c-0.434-0.617-0.651-1.641-0.651-3.075c0-1.237,0.269-2.181,0.808-2.833 c0.538-0.65,1.333-0.977,2.386-0.977c0.541,0,1.047,0.067,1.523,0.2v0.872c-0.424-0.127-0.897-0.19-1.422-0.19 c-0.597,0-1.051,0.254-1.36,0.761c-0.31,0.509-0.464,1.22-0.464,2.136c0,1.205,0.113,2.036,0.338,2.485s0.554,0.673,0.985,0.673 c0.273,0,0.49-0.097,0.651-0.29c0.16-0.193,0.24-0.449,0.24-0.766v-1.432h-1.01v-0.86h2.394v4.14H16.59l-0.211-0.683 c-0.142,0.238-0.35,0.424-0.617,0.563C15.491,18.836,15.203,18.904,14.899,18.904z"/>
-<path d="M22.452,18.822l-0.441-1.682h-2.312l-0.451,1.682h-1.281l2.203-7.645h1.662l2.11,7.645H22.452z M21.801,16.279l-0.939-3.8 l-0.963,3.8H21.801z"/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_vga_wide.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_vga_wide.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
+<rect fill="none" height="30" width="30" x="0.002"/>
+</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 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_video.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_video.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_video.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M2,6h2v2H2v3h4v8H2v3h2v2H2v3h26v-3h-2v-2h2v-3h-4v-8h4V8h-2V6h2V3H2V6z M6,6h3v2H6V6z M14,8h-3V6h3V8z M16,6h3v2h-3V6z   M6,22h3v2H6V22z M14,24h-3v-2h3V24z M16,22h3v2h-3V22z M24,24h-3v-2h3V24z M21,19H9v-8h12V19z M24,8h-3V6h3V8z"/>
+<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 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_video_call.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <rect fill="none" height="30" width="30"/>
-<path d="M10.794,10.168c1.569-1.567,4.066-3.208,5.188-3.79c0,0.001,0,0.003,0,0.004c0.002-0.001,0.005-0.006,0.006-0.008 l1.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.022c0,0-0.202-0.305-0.818-1.062 c0.002,0.001,0.004,0.003,0.005,0.005c-0.001-0.002-0.001-0.005-0.003-0.008c-0.311-0.383-0.349-0.397-0.75-0.765 c-1.205-1.103-2.531-1.536-2.531-1.536c-0.513-0.182-2.24-0.282-4.416,0.374s-7.119,3.823-10.3,7.005 c-3.18,3.183-5.9,7.49-6.42,8.854c-0.814,2.148-0.74,4.517-0.563,5.205c0,0,0.169,0.513,0.56,1.211 c0.005,0.007,0.01,0.016,0.015,0.024c0.038,0.068,0.076,0.136,0.119,0.207c0.001,0.002,0.004,0.001,0.005,0.002 c0.21,0.35,0.464,0.729,0.783,1.114c0.374,0.449,0.392,0.578,0.785,0.925c0.001,0,0.002,0,0.003,0 c0.723,0.636,1.021,0.83,1.021,0.83c0.345,0.224,0.827,0.103,1.08-0.268l4.794-7.042c0.254-0.372,0.186-0.856-0.158-1.078 l-2.725-1.743c-0.01-0.001-0.019-0.001-0.027-0.003c0.002-0.002,0.008-0.01,0.008-0.01C7.644,13.562,9.162,11.803,10.794,10.168z"/>
+<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.738c0-4.419-3.581-8-8-8s-8,3.581-8,8c0,3.727,2.551,6.849,6,7.738V27h-3 c-1.1,0-2,0.9-2,2v1h14v-1C29,27.9,28.1,27,27,27z M17,18c0-2.757,2.243-5,5-5s5,2.243,5,5s-2.243,5-5,5S17,20.757,17,18z"/>
+<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>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_video_collection.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<polygon points="26,4 12,4 12,2 2,2 2,4 2,5 2,6 26,6 "/>
-<polygon points="5,11 25,11 25,12 28,12 28,8 2,8 2,25 9,25 9,22 5,22 "/>
-<path d="M30,16v-2H11v2h1v2h-1v2h3v4h-3v2h1v2h-1v2h19v-2h-1v-2h1v-2h-3v-4h3v-2h-1v-2H30z M19,18v-2h3v2H19z M14,16h3v2h-3V16z   M22,26v2h-3v-2H22z M14,26h3v2h-3V26z M27,28h-3v-2h3V28z M24,24h-7v-4h7V24z M27,18h-3v-2h3V18z"/>
+<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 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_video_services.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <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-3H9v-8h12v3.13c0.49-0.078,0.988-0.13,1.5-0.13s1.01,0.052,1.5,0.13V10h4V7h-2V5h2  V2H2v3h2v2H2v3h4v8H2v3h2v2H2v3h11.674c-0.371-0.937-0.594-1.945-0.648-3H11v-2H13.13z M21,5h3v2h-3V5z M16,5h3v2h-3V5z M11,5h3v2  h-3V5z M6,5h3v2H6V5z M9,23H6v-2h3V23z"/>
-<polygon points="19.6,18.894 23.974,20.289 24.711,18.815 21.764,18.079 "/>
-<path d="M22.5,15c-4.143,0-7.5,3.357-7.5,7.5s3.357,7.5,7.5,7.5s7.5-3.357,7.5-7.5S26.643,15,22.5,15z M26.459,20.468l0.346-0.152  c0,0,0.422,0.403,0.403,0.537c-0.019,0.135-0.653,0.749-0.653,0.749L26,21.8l-0.732-0.603l-0.557-0.46l0.346,0.826l0.461,0.48  c0,0,0.807-0.115,0.922-0.02s-0.152,0.827-0.152,0.827l-1.346,1.383l-0.135,1.383c-0.75,0.386-0.826,0.979-0.826,0.979  s-0.191-0.036-0.691,0.521c-0.5,0.556-1.039,0.41-1.039,0.41c-0.633,0-0.748-0.41-0.748-0.546c0-0.134-0.635-1.172-0.635-1.519  c0-0.345,0.192-0.769,0.192-0.769c0.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  c-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  c0.288,0.192,0.48,0,0.48,0l0.076-0.193l-0.051-0.188C21.016,17.155,21.74,17,22.5,17c0.55,0,1.08,0.083,1.581,0.234l-0.108,0.107  l0.737,0.737l0.412-0.412c1.061,0.577,1.907,1.495,2.401,2.604l-0.699-0.129l-0.846-0.326L26.459,20.468z M17.209,23.985L18,24l1,1  l-0.97,0.692C17.664,25.182,17.384,24.605,17.209,23.985z M25.875,26.715L26,25l1.209,0.326c-0.334,0.555-0.76,1.048-1.262,1.453  L25.875,26.715z"/>
+<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 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_video_to_voice.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_video_to_voice.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +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>
-<path d="M0,0v30h30V0H0z M28.235,26.986l-6.012-6.012l-0.454,2.042l5.218,5.219H2.626l5.535-5.534l-0.454-2.042   l-5.942,5.941V3.013l9.352,9.352h2.119v-0.377l-2.467-2.467c-0.202-0.056-0.401-0.12-0.594-0.202   C7.701,8.271,7.043,6.555,6.869,5.621L3.013,1.765h23.589l-3.413,3.413c-0.041,0.684-0.408,2.89-3.363,4.141   c-0.348,0.147-0.714,0.25-1.093,0.315l-1.968,1.968v0.763h1.732l9.738-9.738V26.986z" fill-opacity="0.5" stroke-opacity="0.5"/>
-<g>
-<rect height="3.519" width="17.646" x="6.177" y="13.246"/>
-<polygon points="9.706,25.588 20.294,25.588 22.059,17.647 7.941,17.647   "/>
-<path d="M10.519,8.506c1.35,0.571,2.732,0.287,3.599-0.017v3.875h1.766V8.489c0.866,0.304,2.249,0.588,3.599,0.017    c2.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.01    c-0.032-0.31-0.328-1.98-2.973-3.101c-2.925-1.238-4.335,0.06-4.335,0.06S7.593,7.268,10.519,8.506z"/>
-</g>
-</g>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_virtual_input.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <rect fill="none" height="30" width="30"/>
-<path d="M0,4v20h30V4H0z M18,7h3v3h-3V7z M13,7h3v3h-3V7z M13,11.999h3v3h-3V11.999z M8,7h3v3H8V7z M8,11.999h3v3H8V11.999z M6,20H3 v-3h3V20z M6,14.999H3v-3h3V14.999z M6,10H3V7h3V10z M21,20H8v-3h13V20z M26,20h-3v-3h3V20z M26,14.999h-8v-3h5V7h3V14.999z"/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_voice_mailbox.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <rect fill="none" height="30" width="30"/>
-<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.307,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"/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_voice_to_video.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_voice_to_video.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +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>
-<path d="M0,0v30h30V0H0z M28.235,26.986l-6.012-6.012l-0.454,2.042l5.218,5.219H2.626l5.535-5.534l-0.454-2.042   l-5.942,5.941V3.013l9.352,9.352h2.119v-0.377l-2.467-2.467c-0.202-0.056-0.401-0.12-0.594-0.202   C7.701,8.271,7.043,6.555,6.869,5.621L3.013,1.765h23.589l-3.413,3.413c-0.041,0.684-0.408,2.89-3.363,4.141   c-0.348,0.147-0.714,0.25-1.093,0.315l-1.968,1.968v0.763h1.732l9.738-9.738V26.986z" fill-opacity="0.5" stroke-opacity="0.5"/>
-<g>
-<rect height="3.519" width="17.646" x="6.177" y="13.246"/>
-<polygon points="9.706,25.588 20.294,25.588 22.059,17.647 7.941,17.647   "/>
-<path d="M10.519,8.506c1.35,0.571,2.732,0.287,3.599-0.017v3.875h1.766V8.489c0.866,0.304,2.249,0.588,3.599,0.017    c2.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.01    c-0.032-0.31-0.328-1.98-2.973-3.101c-2.925-1.238-4.335,0.06-4.335,0.06S7.593,7.268,10.519,8.506z"/>
-</g>
-</g>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_vol_down.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,8 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<rect fill="none" height="30" width="30"/>
-<path d="M21.359,8.391l-1.27,0.924c0.592,1.903,0.91,3.926,0.91,6.022c0,1.847-0.252,3.633-0.714,5.331l1.292,0.94 c0.598-1.986,0.922-4.091,0.922-6.271C22.5,12.908,22.096,10.573,21.359,8.391z"/>
-<path d="M9,12.75H8.25V10.5H3v9h5.25v-2.25H9v3l9,5.25v-21L9,9.713V12.75z M15,15.75H6v-1.5h9V15.75z"/>
+</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 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_vol_up.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,9 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<path d="M20.09,9.316c0.592,1.902,0.91,3.925,0.91,6.021c0,1.847-0.252,3.633-0.714,5.331l1.292,0.94 c0.598-1.986,0.922-4.091,0.922-6.271c0-2.429-0.404-4.764-1.141-6.946L20.09,9.316z"/>
-<path d="M25.143,5.627l-1.254,0.911c1.038,2.73,1.611,5.69,1.611,8.786c0,2.847-0.486,5.579-1.371,8.125l1.269,0.924 C26.434,21.551,27,18.504,27,15.324C27,11.897,26.336,8.628,25.143,5.627z"/>
-<path d="M10.231,9H8.25v1.5H3v9h5.25V21h2.036L18,25.5v-21L10.231,9z M15,15.75h-3.75v3.75h-1.5v-3.75H6v-1.5h3.75V10.5h1.5v3.75H15 V15.75z"/>
+</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 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wcdma.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wcdma.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wcdma.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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.558 -0.801 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="M10.031,14.485c1.288-0.899,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.378  L1.601,7.859L2.705,10.8l0.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.122,3.499,2.559c0.01,0.628-0.218,1.229-0.629,1.651  c-0.52,0.525-1.304,0.79-2.344,0.79c-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.208,4.598,1.208c4.543,0,6.611-2.881,6.611-5.556C12.663,16.896,11.645,15.323,10.031,14.485z"/>
-<path d="M22.079,13.834v3.132h3.396V20.8c-0.385,0.114-1.056,0.244-2.204,0.244c-3.634,0-5.795-2.28-5.795-6.094  c0-3.742,2.323-6.068,6.065-6.068c1.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.843-4.517-0.843c-2.907,0-5.382,0.921-7.152,2.659c-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.415,6.769,2.415c2.713,0,4.846-0.742,5.441-0.969L29,23.085v-9.251H22.079z"/>
-<rect fill="none" height="30" width="30"/>
-<rect fill="none" height="30" width="30"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" 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>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wcdma_attach.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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.334 -0.801 31 31" width="31px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<polygon points="9.648,24.738 9.653,24.738 8.139,22.304 5.279,22.304 9.48,29.03 11.525,27.749 10.818,26.61 "/>
-<polygon points="10.491,22.302 12.008,24.738 16.132,24.738 14.617,22.302 "/>
-<polygon points="16.97,22.302 18.488,24.738 22.631,24.738 21.117,22.302 "/>
-<polygon points="23.469,22.302 24.721,24.32 24.721,22.302 "/>
-<polygon points="20.303,17.285 21.814,19.719 24.721,19.719 20.52,12.992 18.453,14.283 20.325,17.285 "/>
-<polygon points="19.462,19.719 17.95,17.285 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.939c0.667-0.515,1.049-1.233,1.049-2.08c0-0.721-0.281-1.381-0.789-1.862c-0.56-0.529-1.357-0.805-2.313-0.805  c-1.163,0-2.172,0.429-2.685,0.792L6.903,2.206l0.697,1.863l0.526-0.376c0.333-0.234,0.93-0.507,1.531-0.507  c0.501,0,1.095,0.151,1.095,0.872c0,0.852-1.106,1.04-1.532,1.04H8.038v1.919h1.187c0.305,0,1.838,0.064,1.852,1.327  c0.002,0.153-0.025,0.539-0.323,0.841c-0.271,0.269-0.686,0.41-1.235,0.41c-0.744,0-1.456-0.308-1.756-0.487L7.24,8.791  l-0.674,1.883l0.33,0.215c0.486,0.322,1.475,0.699,2.635,0.699c2.619,0,3.813-1.674,3.813-3.227  C13.344,7.323,12.806,6.441,11.949,5.939z"/>
-<path d="M19.336,5.54v1.979h1.9v1.939c-0.251,0.066-0.59,0.124-1.121,0.124c-1.964,0-3.137-1.236-3.137-3.304  c0-1.015,0.307-1.854,0.888-2.426c0.573-0.565,1.404-0.864,2.401-0.864c0.76,0,1.354,0.114,1.874,0.356l0.518,0.246l0.604-1.95  l-0.391-0.187c-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.869  c0.976,0.93,2.239,1.386,3.868,1.386c1.538,0,2.753-0.421,3.087-0.55l0.318-0.125V5.54H19.336z"/>
-<rect fill="none" height="30" width="30"/>
-<rect fill="none" height="30" width="30"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" 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>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wcdma_context.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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.771 -0.801 31 31" width="31px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<polygon points="24.722,22.302 5.279,22.304 9.48,29.031 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.282 20.326,17.286 5.279,17.287 5.279,19.721 24.722,19.72 "/>
-<path d="M11.948,5.938c0.667-0.515,1.048-1.233,1.048-2.08c0-0.721-0.28-1.381-0.786-1.862C11.65,1.467,10.85,1.19,9.896,1.19  c-1.161,0-2.173,0.429-2.685,0.792L6.904,2.204l0.697,1.863L8.128,3.69c0.332-0.234,0.93-0.507,1.528-0.507  c0.501,0,1.096,0.151,1.096,0.872c0,0.852-1.104,1.039-1.531,1.039H8.039v1.919h1.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.269-0.684,0.41-1.233,0.41c-0.747,0-1.458-0.308-1.758-0.487L7.238,8.79l-0.672,1.883  l0.328,0.215c0.489,0.322,1.477,0.699,2.638,0.699c2.619,0,3.811-1.673,3.811-3.227C13.343,7.322,12.807,6.439,11.948,5.938z"/>
-<path d="M19.335,5.538v1.979h1.902v1.939c-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.426c0.573-0.565,1.404-0.863,2.403-0.863c0.761,0,1.355,0.113,1.872,0.355l0.518,0.246l0.606-1.95  l-0.391-0.187c-0.457-0.225-1.412-0.483-2.577-0.483c-3.354,0-5.604,2.157-5.604,5.364c0,1.56,0.536,2.97,1.468,3.869  c0.974,0.93,2.237,1.386,3.869,1.386c1.535,0,2.75-0.421,3.084-0.55l0.321-0.125V5.538H19.335z"/>
-<rect fill="none" height="30" width="30"/>
-<rect fill="none" height="30" width="30"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" 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>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wcdma_multipdp.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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.144 -0.801 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="M11.944,5.983c0.667-0.515,1.05-1.232,1.05-2.078c0-0.722-0.281-1.381-0.787-1.863c-0.555-0.529-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.506,1.53-0.506  c0.499,0,1.097,0.152,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.54-0.32,0.843c-0.27,0.269-0.686,0.41-1.236,0.41c-0.745,0-1.456-0.309-1.755-0.488L7.236,8.835L6.565,10.72  l0.328,0.214c0.487,0.322,1.475,0.699,2.637,0.699c2.618,0,3.812-1.673,3.812-3.226C13.346,7.369,12.807,6.487,11.944,5.983z"/>
-<path d="M19.337,5.585v1.978h1.899v1.939c-0.249,0.067-0.592,0.125-1.123,0.125c-1.967,0-3.137-1.237-3.137-3.305  c0-1.013,0.305-1.853,0.886-2.426c0.573-0.565,1.404-0.864,2.403-0.864c0.76,0,1.354,0.115,1.872,0.357l0.52,0.246l0.604-1.951  l-0.386-0.187c-0.46-0.225-1.411-0.483-2.582-0.483c-3.352,0-5.602,2.157-5.602,5.363c0,1.56,0.534,2.97,1.466,3.87  c0.977,0.931,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.041 18.451,14.328 20.324,17.332 17.27,17.332 14.589,13.041 12.522,14.328 14.391,17.332 5.278,17.334   5.278,19.769 24.721,19.766 "/>
-<polygon points="9.479,28.985 11.543,27.695 9.679,24.69 12.725,24.69 15.408,28.985 17.473,27.695 15.604,24.69 24.721,24.69   24.721,22.256 5.278,22.256 "/>
-<rect fill="none" height="30" width="30"/>
-<rect fill="none" height="30" width="30"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" 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>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wcdma_suspended.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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.874 -0.801 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="M11.944,5.939c0.667-0.517,1.05-1.235,1.05-2.081c0-0.721-0.281-1.38-0.787-1.862c-0.559-0.527-1.358-0.805-2.314-0.805  c-1.162,0-2.173,0.427-2.684,0.793L6.9,2.206L7.6,4.068l0.526-0.375c0.331-0.234,0.928-0.507,1.529-0.507  c0.499,0,1.096,0.151,1.096,0.871c0,0.852-1.107,1.038-1.533,1.038H8.036v1.921h1.187c0.304,0,1.837,0.063,1.849,1.325  c0.004,0.155-0.023,0.541-0.32,0.844c-0.272,0.269-0.687,0.41-1.236,0.41c-0.745,0-1.456-0.308-1.755-0.489L7.236,8.791  l-0.675,1.882l0.332,0.215c0.486,0.322,1.475,0.698,2.637,0.698c2.618,0,3.812-1.671,3.812-3.227  C13.342,7.323,12.804,6.442,11.944,5.939z"/>
-<path d="M19.334,5.539v1.978h1.899v1.939c-0.25,0.066-0.589,0.125-1.12,0.125c-1.967,0-3.137-1.235-3.137-3.305  c0-1.014,0.305-1.853,0.886-2.424c0.573-0.568,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.224-1.412-0.483-2.578-0.483c-3.352,0-5.602,2.157-5.602,5.364c0,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.421,3.086-0.55l0.32-0.123V5.539H19.334z"/>
-<polygon points="24.721,22.27 24.721,24.704 20.316,24.704 20.32,24.704 14.344,24.704 16.376,22.27 "/>
-<polygon points="5.278,22.266 10.58,22.266 8.523,24.704 5.278,24.704 "/>
-<polygon points="24.721,17.253 24.721,19.688 18.529,19.688 20.566,17.253 "/>
-<polygon points="5.278,19.683 5.278,17.253 14.805,17.253 12.752,19.688 "/>
-<polygon points="21.424,14.529 21.499,14.591 21.447,14.65 10.381,27.84 9.382,29.032 7.518,27.465 8.937,25.769 19.63,13.027 "/>
-<rect fill="none" height="30" width="30"/>
-<rect fill="none" height="30" width="30"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" 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>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_white_balance.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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"/>
-<rect fill="none" height="30" width="29.999" x="0.001"/>
-<path d="M8.39,14.734c-3.313,0-6,2.686-6,5.998c0,3.314,2.687,6,6,6c3.314,0,6.001-2.686,6.001-6 C14.391,17.42,11.704,14.734,8.39,14.734z M8.39,24.484c-2.071,0-3.75-1.678-3.75-3.75s1.679-3.75,3.75-3.75 c2.072,0,3.75,1.678,3.75,3.75C12.14,22.805,10.461,24.484,8.39,24.484z"/>
-<path d="M21.61,14.734c-3.313,0-6,2.686-6,5.998c0,3.314,2.688,6,6,6c3.313,0,6-2.686,6-6C27.61,17.42,24.924,14.734,21.61,14.734z"/>
-<path d="M15.001,3.266c-3.313,0-6,2.687-6,6s2.687,6,6,6s6-2.687,6-6S18.314,3.266,15.001,3.266z M15.001,13.016 c-2.072,0-3.75-1.678-3.75-3.75c0-2.072,1.678-3.75,3.75-3.75V13.016z"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" 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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_white_balance_cloudy.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_white_balance_cloudy.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" 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"/>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_white_balance_fluorescent.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_white_balance_fluorescent.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<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 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_white_balance_incandescent.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_white_balance_incandescent.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<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 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_white_balance_sunny.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_white_balance_sunny.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<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"/>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wimax.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wimax.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wimax.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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.558 -0.016 31 31" width="31px" 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.895 4.511,13.895 4.719,20.633 7.95,13.895 10.757,13.895 10.757,20.633 13.771,13.895 17.493,13.895   11.878,24.422 8.582,24.422 8.512,17.875 5.564,24.422 2.194,24.422 "/>
-<path d="M22.984,12.443c0-1.118-1.226-2.021-2.735-2.021c-1.511,0-2.738,0.903-2.738,2.021c0,0.598,0.354,1.133,0.912,1.504v10.475  h3.649V13.947C22.633,13.576,22.984,13.041,22.984,12.443z"/>
-<path d="M13.177,13.51c0,0,1.931-3.965,7.089-3.965c5.156,0,7.053,3.895,7.053,3.895s-0.947-5.053-7.157-5.053  C13.946,8.387,13.177,13.51,13.177,13.51z"/>
-<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.839-6.736  C12.932,5.579,11.072,12.387,11.072,12.387z"/>
-<rect fill="none" height="30" width="30"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" 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>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wimax_attach.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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.334 -0.016 31 31" width="31px" 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.277,7.184 7.396,11.02 9.236,7.184 10.834,7.184 10.834,11.02 12.551,7.184 14.671,7.184   11.473,13.178 9.597,13.178 9.556,9.45 7.878,13.178 5.96,13.178 "/>
-<path d="M17.796,6.356c0-0.636-0.696-1.149-1.557-1.149s-1.559,0.514-1.559,1.149c0,0.341,0.201,0.646,0.52,0.856v5.965h2.076V7.213  C17.596,7.002,17.796,6.697,17.796,6.356z"/>
-<path d="M12.213,6.965c0,0,1.099-2.258,4.036-2.258c2.935,0,4.016,2.217,4.016,2.217s-0.539-2.877-4.076-2.877  C12.65,4.047,12.213,6.965,12.213,6.965z"/>
-<path d="M11.015,6.325c0,0,1.278-3.077,5.234-3.077c3.954,0,4.973,3.036,4.973,3.036s-0.918-3.835-5.033-3.835  S11.015,6.325,11.015,6.325z"/>
-<polygon points="9.648,23.26 9.652,23.26 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.26 16.132,23.26 14.617,20.822 "/>
-<polygon points="16.97,20.822 18.487,23.26 22.63,23.26 21.116,20.822 "/>
-<polygon points="23.469,20.822 24.721,22.842 24.721,20.822 "/>
-<polygon points="20.301,15.807 21.814,18.24 24.721,18.24 20.52,11.514 18.452,12.805 20.324,15.807 "/>
-<polygon points="19.462,18.24 17.949,15.807 13.861,15.809 15.374,18.24 "/>
-<polygon points="13.022,18.24 11.513,15.809 7.378,15.809 8.892,18.242 "/>
-<polygon points="5.279,16.21 5.279,18.242 6.539,18.242 "/>
-<rect fill="none" height="30" width="30"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" 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>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wimax_context.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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.771 -0.016 31 31" width="31px" 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.451 7.879,13.178 5.961,13.178 "/>
-<path d="M17.797,6.357c0-0.637-0.696-1.15-1.557-1.15s-1.559,0.514-1.559,1.15c0,0.34,0.201,0.646,0.52,0.855v5.965h2.076V7.213  C17.597,7.003,17.797,6.697,17.797,6.357z"/>
-<path d="M12.214,6.965c0,0,1.099-2.258,4.036-2.258c2.935,0,4.017,2.218,4.017,2.218s-0.54-2.878-4.076-2.878  C12.651,4.047,12.214,6.965,12.214,6.965z"/>
-<path d="M11.015,6.326c0,0,1.279-3.078,5.235-3.078c3.954,0,4.974,3.037,4.974,3.037s-0.919-3.836-5.033-3.836  C12.074,2.449,11.015,6.326,11.015,6.326z"/>
-<polygon points="24.722,20.823 5.279,20.826 9.48,27.553 11.544,26.264 9.672,23.26 9.684,23.26 9.684,23.26 24.722,23.26 "/>
-<polygon points="20.521,11.516 18.452,12.803 20.326,15.808 5.279,15.809 5.279,18.242 24.722,18.242 "/>
-<rect fill="none" height="30" width="30"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" 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>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wimax_multipdp.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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.144 -0.016 31 31" width="31px" 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.207 7.277,7.207 7.396,11.043 9.236,7.207 10.834,7.207 10.834,11.043 12.551,7.207 14.671,7.207   11.473,13.201 9.597,13.201 9.556,9.473 7.878,13.201 5.96,13.201 "/>
-<path d="M17.796,6.38c0-0.637-0.696-1.15-1.557-1.15s-1.559,0.514-1.559,1.15c0,0.341,0.201,0.646,0.52,0.856v5.965h2.076V7.236  C17.596,7.025,17.796,6.721,17.796,6.38z"/>
-<path d="M12.213,6.988c0,0,1.099-2.259,4.036-2.259c2.935,0,4.017,2.218,4.017,2.218s-0.54-2.878-4.076-2.878  C12.65,4.069,12.213,6.988,12.213,6.988z"/>
-<path d="M11.014,6.348c0,0,1.279-3.077,5.235-3.077c3.954,0,4.974,3.036,4.974,3.036s-0.919-3.835-5.033-3.835  C12.073,2.472,11.014,6.348,11.014,6.348z"/>
-<polygon points="20.52,11.584 18.451,12.871 20.324,15.875 5.278,15.878 5.278,18.313 24.721,18.31 "/>
-<polygon points="9.479,27.529 11.543,26.238 9.679,23.234 12.725,23.234 15.408,27.529 17.473,26.238 15.604,23.234 24.721,23.234   24.721,20.8 5.278,20.8 "/>
-<rect fill="none" height="30" width="30"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" 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>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wimax_suspended.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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.874 -0.016 31 31" width="31px" 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.191 7.278,7.191 7.396,11.027 9.237,7.191 10.835,7.191 10.835,11.027 12.552,7.191 14.672,7.191   11.474,13.186 9.598,13.186 9.557,9.458 7.879,13.186 5.961,13.186 "/>
-<path d="M17.797,6.364c0-0.637-0.696-1.15-1.557-1.15s-1.559,0.514-1.559,1.15c0,0.341,0.201,0.646,0.52,0.856v5.965h2.076V7.221  C17.597,7.01,17.797,6.705,17.797,6.364z"/>
-<path d="M12.214,6.973c0,0,1.099-2.258,4.036-2.258c2.935,0,4.017,2.217,4.017,2.217s-0.54-2.877-4.076-2.877  C12.651,4.055,12.214,6.973,12.214,6.973z"/>
-<path d="M11.015,6.333c0,0,1.279-3.077,5.235-3.077c3.954,0,4.974,3.036,4.974,3.036s-0.919-3.836-5.033-3.836  C12.074,2.456,11.015,6.333,11.015,6.333z"/>
-<polygon points="24.722,20.781 24.722,23.215 20.317,23.215 20.321,23.215 14.345,23.215 16.377,20.781 "/>
-<polygon points="5.279,20.777 10.581,20.777 8.524,23.215 5.279,23.215 "/>
-<polygon points="24.722,15.766 24.722,18.199 18.53,18.199 20.567,15.766 "/>
-<polygon points="5.279,18.195 5.279,15.766 14.806,15.766 12.753,18.199 "/>
-<polygon points="21.425,13.041 21.5,13.104 21.448,13.162 10.382,26.352 9.383,27.545 7.519,25.978 8.938,24.28 19.631,11.539 "/>
-<rect fill="none" height="30" width="30"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" 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>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wlan.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wlan.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wlan.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 height="30" style="fill:none;" width="30"/>
-<path d="M18.227,21.399l-2.349-9.384c1.031-0.366,1.775-1.323,1.775-2.477c0-1.469-1.188-2.656-2.655-2.656  s-2.655,1.186-2.655,2.656c0,1.153,0.741,2.107,1.769,2.477l-2.345,9.384H8.355v2.654H21.63v-2.654H18.227z"/>
-<path d="M6,9.54c0,2.967,1.627,5.158,1.676,5.232c0.267-0.181,0.721-0.494,0.99-0.674c-0.052-0.071-1.474-2.087-1.474-4.558  c0-2.675,1.422-4.486,1.474-4.561C8.397,4.795,7.945,4.482,7.681,4.301C7.629,4.375,6,6.66,6,9.54z"/>
-<path d="M9.169,9.54c0,1.972,1.073,3.372,1.125,3.443c0.269-0.18,0.721-0.494,0.99-0.675c-0.057-0.077-0.921-1.374-0.921-2.769  c0-1.553,0.864-2.698,0.919-2.771c-0.267-0.18-0.724-0.491-0.988-0.68C10.243,6.171,9.169,7.528,9.169,9.54z"/>
-<path d="M24,9.535c0-2.969-1.629-5.159-1.682-5.234c-0.264,0.181-0.72,0.494-0.983,0.674c0.047,0.071,1.472,2.088,1.472,4.56  c0,2.673-1.425,4.484-1.472,4.558c0.264,0.185,0.72,0.498,0.983,0.679C22.365,14.702,24,12.415,24,9.535z"/>
-<path d="M20.826,9.535c0-1.974-1.072-3.373-1.125-3.445c-0.264,0.18-0.721,0.494-0.99,0.675c0.057,0.08,0.923,1.378,0.923,2.77  c0,1.553-0.866,2.697-0.921,2.769c0.268,0.18,0.718,0.493,0.986,0.679C19.752,12.905,20.826,11.544,20.826,9.535z"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wlan_icon.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wlan_icon.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +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">
-<rect fill="none" height="30" width="30"/>
-<path d="M17.984,20.859l-2.171-8.682c0.953-0.338,1.642-1.224,1.642-2.291c0-1.359-1.1-2.457-2.457-2.457s-2.456,1.097-2.456,2.457  c0,1.067,0.686,1.95,1.636,2.291l-2.169,8.682H8.852v2.456h12.282v-2.456H17.984z"/>
-<path d="M6.674,9.887c0,2.745,1.505,4.772,1.55,4.841c0.247-0.167,0.667-0.457,0.916-0.624c-0.048-0.066-1.364-1.931-1.364-4.217  c0-2.475,1.316-4.15,1.364-4.219C8.891,5.497,8.473,5.207,8.229,5.04C8.181,5.108,6.674,7.222,6.674,9.887z"/>
-<path d="M9.605,9.887c0,1.824,0.993,3.12,1.041,3.186c0.249-0.167,0.667-0.457,0.916-0.624c-0.053-0.072-0.852-1.272-0.852-2.562  c0-1.437,0.799-2.496,0.85-2.563c-0.247-0.167-0.67-0.454-0.914-0.629C10.599,6.77,9.605,8.026,9.605,9.887z"/>
-<path d="M23.327,9.882c0-2.747-1.507-4.773-1.555-4.842c-0.244,0.167-0.667,0.457-0.911,0.623c0.043,0.066,1.362,1.932,1.362,4.219  c0,2.473-1.319,4.149-1.362,4.217c0.244,0.171,0.667,0.461,0.911,0.628C21.815,14.662,23.327,12.547,23.327,9.882z"/>
-<path d="M20.391,9.882c0-1.826-0.993-3.121-1.041-3.187c-0.244,0.167-0.666,0.457-0.917,0.624c0.054,0.074,0.854,1.275,0.854,2.563  c0,1.437-0.801,2.495-0.852,2.562c0.248,0.167,0.665,0.456,0.912,0.628C19.397,13,20.391,11.741,20.391,9.882z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wlan_offline.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,27 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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>
-<rect height="30" style="fill:none;" width="30"/>
-<g>
-<path d="M16.136,13.045l-0.258-1.03c1.031-0.366,1.775-1.323,1.775-2.477c0-1.469-1.188-2.656-2.655-2.656    c-1.382,0-2.503,1.056-2.63,2.407L16.136,13.045z"/>
-<polygon points="18.616,21.399 18.227,21.399 18.098,20.883 13.132,15.935 11.767,21.399 8.355,21.399 8.355,24.054     21.279,24.054   "/>
-<path d="M8.413,5.349c0.141-0.223,0.24-0.351,0.253-0.369C8.397,4.795,7.945,4.482,7.681,4.301    C7.673,4.312,7.622,4.388,7.554,4.493L8.413,5.349z"/>
-<path d="M6.045,8.871C6.026,9.092,6,9.311,6,9.54c0,2.967,1.627,5.158,1.676,5.232c0.267-0.181,0.721-0.494,0.99-0.674    c-0.049-0.066-1.267-1.82-1.439-4.05L6.045,8.871z"/>
-<path d="M10.764,7.692c0.234-0.54,0.488-0.884,0.518-0.922c-0.267-0.18-0.724-0.491-0.988-0.68    c-0.021,0.033-0.213,0.288-0.432,0.703L10.764,7.692z"/>
-<path d="M22.318,4.301c-0.264,0.181-0.72,0.494-0.983,0.674c0.047,0.071,1.472,2.088,1.472,4.56c0,2.673-1.425,4.484-1.472,4.558    c0.264,0.185,0.72,0.498,0.983,0.679C22.365,14.702,24,12.415,24,9.535C24,6.566,22.371,4.375,22.318,4.301z"/>
-<path d="M18.713,12.304c0.268,0.18,0.718,0.493,0.986,0.679c0.053-0.078,1.127-1.438,1.127-3.448c0-1.974-1.072-3.373-1.125-3.445    c-0.264,0.18-0.721,0.494-0.99,0.675c0.057,0.08,0.923,1.378,0.923,2.77C19.634,11.087,18.768,12.231,18.713,12.304z"/>
-</g>
-<rect height="33.238" transform="matrix(0.7057 -0.7085 0.7085 0.7057 -6.2107 15.042)" width="1.4" x="14.301" y="-1.622"/>
-</g>
-<g style="display:none;">
-<g style="display:inline;">
-<rect height="30" style="fill:none;" width="30"/>
-<rect height="30" style="fill:none;" width="30"/>
-<polygon points="13.661,10.548 15.869,3.375 11.366,3.375 10.217,7.104   "/>
-<polygon points="19.539,16.428 21.246,10.879 18.62,10.879 16.744,10.879 13.993,10.879   "/>
-<polygon points="14.632,17.74 13.744,20.628 10.38,20.628 16.008,26.625 19.643,22.752   "/>
-<polygon points="8.754,11.861 8.361,13.131 9.613,13.131 10.021,13.131   "/>
-</g>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<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 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_work.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_work.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_work.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M19,13V2H2v26h16h1h10V13H19z M5,25V5h11v2h-3v3h3v2h-3v3h3v2h-3v3h3v5H5z M26,22h-6v-2h6V22z M26,18h-6v-2h6V18z"/>
+<path d="M19,13v-11h-17v26h27v-15h-10zm-14,12v-20h11v2h-3v3h3v2h-3v3h3v2h-3v3h3v5h-11zm21-3h-6v-2h6v2zm0-4h-6v-2h6v2z"/>
 <rect height="3" width="4" x="7" y="7"/>
 <rect height="3" width="4" x="7" y="12"/>
 <rect height="3" width="4" x="7" y="17"/>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_world_clock.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <rect fill="none" height="30" width="30"/>
-<path d="M15,1C7.268,1,1,7.268,1,15s6.268,14,14,14c7.733,0,14-6.268,14-14S22.733,1,15,1z M5.84,21.422 c-0.775-1.102-1.351-2.348-1.689-3.689l1.636-0.323l1.4,2.8L5.84,21.422z M22.114,23.643l-0.701-0.635l1.398-2.799l1.885,0.371 C24.022,21.748,23.151,22.789,22.114,23.643z M23.216,10.521L21.608,9.9l0.914,1.239l0.656-0.291c0,0,0.803,0.768,0.766,1.021 c-0.035,0.257-1.238,1.424-1.238,1.424l-1.057,0.376l-1.391-1.144L19.2,11.652l0.656,1.567l0.877,0.914c0,0,1.533-0.219,1.752-0.037 c0.221,0.182-0.291,1.572-0.291,1.572l-2.557,2.626l-0.256,2.627c-1.424,0.732-1.569,1.859-1.569,1.859s-0.364-0.068-1.313,0.99 s-1.973,0.781-1.973,0.781c-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.501-0.949-3.501h-1.059l-0.365-0.806c-3.432,0.73-3.577-0.146-4.089-1.096 c-0.511-0.949,0.074-3.504,0.402-3.905c0.21-0.257,1.328-1.063,2.109-1.614l7.998,2.552L17.71,8l-5.6-1.399L8.988,7.776 c0.058-0.04,0.1-0.068,0.1-0.068L8.759,7.233C8.539,6.76,9.964,6.102,9.964,6.102c0.548,0.366,0.912,0,0.912,0l0.146-0.365 L10.876,5.19l0.677-0.842C12.641,3.996,13.797,3.8,15,3.8c1.259,0,2.465,0.219,3.595,0.604L17.8,5.2l1.399,1.4l1.326-1.326 c2.934,1.677,5.043,4.64,5.546,8.119c-0.585-1.176-1.067-2.545-1.067-2.545L23.216,10.521z"/>
+<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>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_zoom.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_zoom.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_zoom.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,10 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <rect fill="none" height="30" width="30"/>
-</g>
-<path d="M25.809,4.191c-4.1-4.102-10.748-4.102-14.849,0C7.221,7.93,6.903,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"/>
+<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 "/>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_zoom_in.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M25.924,4.191c-4.1-4.102-10.748-4.102-14.849,0c-3.739,3.738-4.057,9.591-0.977,13.703L8.6,19.394l-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  C30.025,14.939,30.025,8.291,25.924,4.191z M23.803,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.728,13.994,23.803,16.918z"/>
-<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.525"/>
-<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 "/>
+<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 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_zoom_out.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M25.924,4.191c-4.1-4.102-10.748-4.102-14.849,0c-3.739,3.738-4.057,9.591-0.977,13.703L8.6,19.394l-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  C30.025,14.939,30.025,8.291,25.924,4.191z M23.803,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.728,13.994,23.803,16.918z"/>
-<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.525"/>
+<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 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_add.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_add.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_add.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,15 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <g>
-<polygon points="11.471,25.59 11.471,18.53 4.412,18.53 4.412,11.471   11.471,11.471 11.471,4.412 18.53,4.412 18.53,11.471 25.59,11.471 25.59,18.53 18.53,18.53 18.53,25.59 " style="opacity:0.6;enable-background:new    ;"/>
-<polygon points="24.707,12.354 17.648,12.354 17.648,5.294 12.354,5.294 12.354,12.354 5.294,12.354   5.294,17.648 12.354,17.648 12.354,24.707 17.648,24.707 17.648,17.648 24.707,17.648 " style="fill:url(#SVGID_1_);"/>
-<rect height="0.882" style="opacity:0.4;fill:#FFFFFF;enable-background:new    ;" width="5.295" x="12.354" y="5.294"/>
-<rect height="0.882" style="opacity:0.4;fill:#FFFFFF;enable-background:new    ;" width="7.059" x="5.294" y="12.354"/>
-<rect height="0.882" style="opacity:0.4;fill:#FFFFFF;enable-background:new    ;" width="7.059" x="17.648" y="12.354"/>
-<rect height="30.002" style="fill:none;" width="30.002"/>
+<rect fill="none" height="30" width="30"/>
+<polygon fill-opacity="0.6" points="11,29 11,19 1,19 1,11 11,11 11,1 19,1 19,11 29,11 29,19 19,19 19,29 "/>
+<polygon fill="url(#SVGID_1_)" points="28,12 18,12 18,2 12,2 12,12 2,12 2,18 12,18 12,28 18,28 18,18 28,18 "/>
+<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="6" x="12" y="2"/>
+<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="10" x="2" y="12"/>
+<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 gradientTransform="matrix(0.8824 0 0 -0.8824 -284.8232 -348.3516)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="339.7813" x2="339.7813" y1="-400.7783" y2="-422.7778">
+<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>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_allday.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_allday.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g>
+<rect fill="none" height="30" width="30"/>
+<path d="M22,4c0-1.104-0.896-2-2-2c-1.103,0-2,0.896-2,2h-6c0-1.104-0.896-2-2-2C8.897,2,8,2.896,8,4H3v24h24V4H22z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="10.3691" y2="27.0025">
+<stop offset="0" style="stop-color:#F9F9F9"/>
+<stop offset="1" style="stop-color:#B5B5B5"/>
+</linearGradient>
+<rect fill="url(#SVGID_1_)" height="22" width="22" x="4" y="5"/>
+<polygon fill="#FFFFFF" points="21,22 21,27 26,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"/>
+</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"/>
+</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"/>
+</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="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="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_)"/>
+<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="22" x="4" y="11"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="15.0005" x2="15.0005" y1="23.834" y2="13.7479">
+<stop offset="0" style="stop-color:#303030"/>
+<stop offset="1" style="stop-color:#000000"/>
+</linearGradient>
+<path d="M18.019,22.906V24h-6.036v-1.094h2.146v-7.629l-2.146,0.492v-1.094l3.015-0.95h0.991v9.181H18.019z" fill="url(#SVGID_7_)"/>
+</g>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_anniversary.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_anniversary.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g>
+<rect fill="none" height="30" width="30"/>
+<rect fill-opacity="0.6" height="7" stroke-opacity="0.6" width="6" x="4.5" y="10"/>
+<rect fill-opacity="0.6" height="7" stroke-opacity="0.6" width="6" x="12" y="10"/>
+<rect fill-opacity="0.6" height="7" stroke-opacity="0.6" width="6" x="19.5" y="10"/>
+<path d="M11,6.375c0-3.11-2.807-5.11-2.927-5.194C7.901,1.061,7.701,1,7.5,1  S7.099,1.061,6.927,1.181C6.807,1.265,4,3.265,4,6.375C4,8.543,5.406,10,7.5,10S11,8.543,11,6.375z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M18.5,6.375c0-3.11-2.807-5.11-2.927-5.194C15.401,1.061,15.201,1,15,1  s-0.401,0.061-0.573,0.181C14.307,1.265,11.5,3.265,11.5,6.375C11.5,8.543,12.906,10,15,10C17.094,10,18.5,8.543,18.5,6.375z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M26,6.375c0-3.11-2.807-5.11-2.927-5.194C22.9,1.061,22.701,1,22.5,1  s-0.4,0.061-0.573,0.181C21.807,1.265,19,3.265,19,6.375C19,8.543,20.406,10,22.5,10S26,8.543,26,6.375z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -66 -46)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="71.5" x2="75.5" y1="-59.5" y2="-59.5">
+<stop offset="0" style="stop-color:#F5F5F5"/>
+<stop offset="0.7818" style="stop-color:#CCCCCC"/>
+<stop offset="1" style="stop-color:#D1D1D1"/>
+</linearGradient>
+<rect fill="url(#SVGID_1_)" height="5" width="4" x="5.5" y="11"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -66 -46)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="79" x2="83" y1="-59.5" y2="-59.5">
+<stop offset="0" style="stop-color:#F5F5F5"/>
+<stop offset="0.7818" style="stop-color:#CCCCCC"/>
+<stop offset="1" style="stop-color:#D1D1D1"/>
+</linearGradient>
+<rect fill="url(#SVGID_2_)" height="5" width="4" x="13" y="11"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -66 -46)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="86.5" x2="90.5" y1="-59.5" y2="-59.5">
+<stop offset="0" style="stop-color:#F5F5F5"/>
+<stop offset="0.7818" style="stop-color:#CCCCCC"/>
+<stop offset="1" style="stop-color:#D1D1D1"/>
+</linearGradient>
+<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"/>
+</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"/>
+</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"/>
+</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"/>
+</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>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_assistant.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_assistant.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_assistant.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,60 +1,71 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g>
 <rect fill="none" height="30" width="30"/>
-<path d="M25.797,13.179c-0.25-0.286-0.539-0.511-0.844-0.697C24.486,7.173,20.203,3,15,3s-9.486,4.173-9.953,9.481 c-0.305,0.187-0.593,0.411-0.843,0.697c-0.877,1.004-1.308,2.482-1.183,4.056C3.195,19.422,4.428,21.2,6,21.78V22 c0,2.206,1.795,4,4,4h2.535c0.808,0.464,1.617,0.708,2.41,0.708c1.979,0,3.598-0.875,4.953-2.675l0.066-0.094l0.047-0.106 c0.461-0.729,0.893-1.52,1.293-2.351c0.406,0.308,0.896,0.482,1.441,0.512l0.172,0.005c2.064,0,3.849-2.093,4.061-4.764 C27.104,15.661,26.674,14.183,25.797,13.179z" fill-opacity="0.6"/>
-<radialGradient cx="11.55" cy="13.52" gradientUnits="userSpaceOnUse" id="SVGID_1" r="15.08">
-<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"/>
+<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"/>
 </radialGradient>
-<path d="M22.263,16.321c-0.038-0.018-0.079-0.021-0.118-0.033v-0.002c-0.006-0.001-0.013-0.003-0.021-0.004 c-0.057-0.015-0.115-0.028-0.175-0.032c-7.302-1.288-10.651-5.388-10.904-4.302c-0.2,0.863-2.247,2.731-3.319,3.664 c0.009,0.041,0.015,0.079,0.022,0.12c0,0,0.038,0.192,0.12,0.518c-0.086,0.009-0.17,0.026-0.25,0.063 c-0.682,0.29-0.896,1.426-0.478,2.531c0.419,1.108,1.31,1.771,1.991,1.48c0.043-0.019,0.078-0.05,0.116-0.074 c0.397,0.903,0.884,1.872,1.479,2.843c0.999,1.203,2.529,2.615,4.219,2.615c2.043,0,3.294-1.134,4.154-2.276 c0.021-0.048,0.044-0.094,0.066-0.133c0.639-1.009,1.154-2.021,1.573-2.965c0.667,0.235,1.524-0.393,1.948-1.459 C23.129,17.773,22.938,16.63,22.263,16.321z" fill="url(#SVGID_1)"/>
-<path d="M18.954,23.612C18.73,22.143,17.275,21,15.5,21c-1.289,0-2.406,0.607-3.014,1.5h-2.093 c0.112,0.198,0.212,0.394,0.333,0.593c0.999,1.203,2.529,2.615,4.219,2.615C16.879,25.708,18.1,24.69,18.954,23.612z" fill-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="14.89" x2="14.89" y1="6.14" y2="15.56">
-<stop offset="0" stop-color="#8A5D3B"/>
-<stop offset="0.38" stop-color="#632F00"/>
-<stop offset="1" stop-color="#361700"/>
+<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"/>
 </linearGradient>
-<path d="M14.739,6c-2.53,0-3.749,1.168-4.688,2.387c-1.529,0.239-3.952,1.66-2.24,7.883 c1.071-0.933,3.033-3.458,3.233-4.321c0.255-1.097,3.662,3.091,11.101,4.338c0.088-0.348,0.128-0.554,0.128-0.554 C23.441,10.42,20.898,6.208,14.739,6z" fill="url(#SVGID_2)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="15" x2="15" y1="14.07" y2="4.24">
-<stop offset="0" stop-color="#838487"/>
-<stop offset="0.47" stop-color="#BDBEC3"/>
-<stop offset="1" 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.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"/>
 </linearGradient>
-<path d="M7.714,14c-0.013-0.185-0.026-0.367-0.026-0.556c0-4.288,3.28-7.777,7.313-7.777 s7.313,3.489,7.313,7.777c0,0.188-0.014,0.371-0.026,0.556h1.687C23.983,13.815,24,13.633,24,13.444C24,8.228,19.971,4,15,4 s-9,4.228-9,9.444C6,13.633,6.017,13.815,6.027,14H7.714z" fill="url(#SVGID_3)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="10.5" x2="10.5" y1="24.91" y2="19.97">
-<stop offset="0" stop-color="#969696"/>
-<stop offset="1" stop-color="#464646"/>
+<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">
+<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"/>
 </linearGradient>
-<path d="M14,23.5h-4c-0.827,0-1.5-0.673-1.5-1.5v-2H7v2c0,1.65,1.35,3,3,3h4V23.5z" fill="url(#SVGID_4)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="10.5" x2="10.5" y1="20.25" y2="23.94">
-<stop offset="0" stop-color="#838487"/>
-<stop offset="0.47" stop-color="#BDBEC3"/>
-<stop offset="1" stop-color="#E4E6EB"/>
+<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"/>
 </linearGradient>
-<path d="M8.5,22v-1v-1H7v1c0,1.65,1.35,3,3,3h4v-0.5h-4C9.173,23.5,8.5,22.827,8.5,22z" fill="url(#SVGID_5)"/>
-<path d="M23.973,13.998C23.697,9.042,19.792,5.111,15,5.111s-8.697,3.931-8.973,8.887c0,0.001,0,0.001,0,0.002h1.687 c-0.013-0.185-0.026-0.367-0.026-0.556c0-4.288,3.28-7.777,7.313-7.777s7.313,3.489,7.313,7.777c0,0.188-0.014,0.371-0.026,0.556 h1.687C23.973,13.999,23.973,13.999,23.973,13.998z" fill-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6" x1="15.5" x2="15.5" y1="21.95" y2="25.46">
-<stop offset="0" stop-color="#4EDEFF"/>
-<stop offset="0.76" stop-color="#0487BF"/>
-<stop offset="1" stop-color="#059FE0"/>
+<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">
+<stop offset="0" style="stop-color:#7A7A7A"/>
+<stop offset="1" style="stop-color:#212121"/>
 </linearGradient>
-<ellipse cx="15.5" cy="23.999" fill="url(#SVGID_6)" rx="2.5" ry="2.001"/>
-<path d="M15.5,23c1.164,0,2.133,0.639,2.412,1.499c0.052-0.16,0.088-0.326,0.088-0.5 C18,22.895,16.881,22,15.5,22S13,22.895,13,23.999c0,0.174,0.036,0.34,0.088,0.5C13.367,23.639,14.336,23,15.5,23z" fill="#FFFFFF" fill-opacity="0.3"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7" x1="6.5" x2="6.5" y1="13.17" y2="21.05">
-<stop offset="0" stop-color="#7A7A7A"/>
-<stop offset="1" stop-color="#212121"/>
+<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"/>
 </linearGradient>
-<path d="M4.018,17.155c0.175,2.208,1.598,3.929,3.179,3.841c1.58-0.086,1.938-1.902,1.762-4.11 c-0.174-2.207-0.818-3.969-2.4-3.883C4.979,13.09,3.842,14.948,4.018,17.155z" fill="url(#SVGID_7)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8" x1="5.88" x2="5.88" y1="13.21" y2="21.04">
-<stop offset="0" stop-color="#4EDEFF"/>
-<stop offset="0.76" stop-color="#0487BF"/>
-<stop offset="1" stop-color="#059FE0"/>
+<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">
+<stop offset="0" style="stop-color:#7A7A7A"/>
+<stop offset="1" style="stop-color:#212121"/>
 </linearGradient>
-<path d="M7.75,17.667c0-1.873-0.547-3.525-1.389-4.625c-1.474,0.228-2.512,2.001-2.343,4.113 C4.19,19.327,5.57,21.018,7.12,20.99C7.517,20.038,7.75,18.896,7.75,17.667z" fill="url(#SVGID_8)"/>
-<path d="M4.054,17.393c0.201-1.595,1.103-2.821,2.307-3.007c0.76,0.993,1.256,2.447,1.35,4.097 c0.023-0.268,0.039-0.538,0.039-0.815c0-1.873-0.547-3.525-1.389-4.625c-1.474,0.228-2.512,2.001-2.343,4.113 C4.025,17.237,4.044,17.313,4.054,17.393z" fill="#FFFFFF" fill-opacity="0.3"/>
-<path d="M25.982,17.155c-0.176,2.208-1.599,3.929-3.18,3.841c-1.58-0.086-1.938-1.902-1.762-4.11 c0.174-2.207,0.818-3.969,2.4-3.883C25.021,13.09,26.158,14.948,25.982,17.155z" fill="url(#SVGID_7)"/>
-<path d="M22.25,17.667c0-1.873,0.547-3.525,1.389-4.625c1.474,0.228,2.512,2.001,2.344,4.113 c-0.173,2.172-1.553,3.862-3.103,3.835C22.483,20.038,22.25,18.896,22.25,17.667z" fill="url(#SVGID_8)"/>
-<path d="M25.945,17.393c-0.201-1.595-1.102-2.821-2.307-3.007c-0.76,0.993-1.256,2.447-1.35,4.097 c-0.023-0.268-0.039-0.538-0.039-0.815c0-1.873,0.547-3.525,1.389-4.625c1.474,0.228,2.512,2.001,2.344,4.113 C25.975,17.237,25.956,17.313,25.945,17.393z" fill="#FFFFFF" fill-opacity="0.3"/>
+<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"/>
+</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"/>
+</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_attachment.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_attachment.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_attachment.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,14 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <g>
-<rect height="30" style="fill:none;" width="30"/>
-</g>
-<path d="M9.811,28.125l-4.186-6.278V9.375h3.75v11.336l2.442,3.664h5.427  l2.443-3.664V5.625h-5.625v12.656c0,0.258,0.21,0.469,0.469,0.469S15,18.539,15,18.281V6.563h3.75v11.719  c0,2.326-1.893,4.219-4.219,4.219s-4.219-1.893-4.219-4.219V4.688c0-1.551,1.262-2.813,2.813-2.813h7.5  c1.551,0,2.813,1.262,2.813,2.813v17.159l-4.186,6.278H9.811z" style="opacity:0.6;enable-background:new    ;"/>
-<path d="M20.625,2.813h-7.5c-1.032,0-1.875,0.844-1.875,1.875v13.594c0,1.813,1.469,3.281,3.281,3.281  c1.813,0,3.281-1.469,3.281-3.281V7.5h-1.875v10.781c0,0.775-0.631,1.406-1.406,1.406s-1.406-0.631-1.406-1.406V4.688h7.5v16.308  l-2.878,4.317h-6.432l-2.878-4.317V10.313H6.563v11.25l3.75,5.625h8.438l3.75-5.625V4.688C22.5,3.656,21.657,2.813,20.625,2.813z" style="fill:url(#SVGID_1_);"/>
+<rect fill="none" height="30" width="30"/>
+<path d="M10.465,29L6,22.303V9h4v12.092L12.605,25h5.789L21,21.092V5h-6v13.5c0,0.275,0.224,0.5,0.5,0.5  s0.5-0.225,0.5-0.5V6h4v12.5c0,2.481-2.019,4.5-4.5,4.5S11,20.981,11,18.5V4c0-1.654,1.346-3,3-3h8c1.654,0,3,1.346,3,3v18.303  L20.535,29H10.465z" fill-opacity="0.6"/>
+<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 gradientTransform="matrix(0.9375 0 0 -0.9375 -284.4375 -346.3125)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="318.9004" x2="318.9004" y1="-398.3994" y2="-372.3994">
+<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.6545" style="stop-color:#D9D9D9"/>
 <stop offset="1" style="stop-color:#AEB2B3"/>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_authorised.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_authorised.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_authorised.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,46 +1,45 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g>
+<polygon fill="none" points="0,0 0,30 4.358,30 25.643,30 30,30 30,0 "/>
 <g>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="7.3687" x2="22.844" y1="8.8872" y2="8.8872">
+<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">
 <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.106,3.081c-4.303,0-7.794,3.46-7.854,7.749v2.881h2.657V10.83  c0.061-2.818,2.366-5.092,5.198-5.092c2.83,0,5.136,2.273,5.197,5.092v3.863h2.656V10.83C22.898,6.541,19.408,3.081,15.106,3.081z" fill="url(#SVGID_1_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="7.8525" x2="22.3591" y1="9.1328" y2="9.1328">
+<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"/>
 </linearGradient>
-<path d="M20.793,14.203V10.83c-0.066-3.084-2.617-5.582-5.687-5.582c-3.072,0-5.623,2.498-5.689,5.572v3.873  H7.743V10.83c0.057-4,3.359-7.258,7.363-7.258c4.003,0,7.304,3.258,7.361,7.265v3.366H20.793z" fill="url(#SVGID_2_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="8.1538" x2="22.0585" y1="9.1333" y2="9.1333">
-<stop offset="0" style="stop-color:#B4B4B4"/>
-<stop offset="0.5" style="stop-color:#E6E6E6"/>
-<stop offset="1" style="stop-color:#BEBEBE"/>
+<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"/>
 </linearGradient>
-<path d="M8.049,14.388V10.83c0.054-3.832,3.22-6.951,7.057-6.951c3.835,0,7.001,3.123,7.056,6.962v3.056H21.1  V10.83c-0.07-3.25-2.76-5.889-5.994-5.889c-3.236,0-5.925,2.634-5.995,5.872v3.574H8.049z" fill="url(#SVGID_3_)"/>
-<g>
-<rect fill="none" height="30" width="30"/>
-</g>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="5.2041" x2="24.7949" y1="20.3574" y2="20.3574">
+<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"/>
 </linearGradient>
-<path d="M24.795,26.633c0,0.338-0.273,0.612-0.611,0.612H5.816c-0.338,0-0.612-0.274-0.612-0.612V14.082  c0-0.338,0.274-0.613,0.612-0.613h18.367c0.338,0,0.611,0.275,0.611,0.613V26.633z" fill="url(#SVGID_4_)"/>
-<path d="M24.184,13.469H5.816c-0.338,0-0.612,0.275-0.612,0.613v0.611  c0-0.338,0.274-0.611,0.612-0.611h18.367c0.338,0,0.611,0.273,0.611,0.611v-0.611C24.795,13.744,24.521,13.469,24.184,13.469z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<rect fill="#EE8F11" fill-opacity="0.5" height="2.143" stroke-opacity="0.5" width="19.591" x="5.204" y="16.225"/>
-<rect fill-opacity="0.25" height="0.307" stroke-opacity="0.25" width="19.591" x="5.204" y="16.225"/>
-<path d="M24.184,27.245H5.816c-0.338,0-0.612-0.274-0.612-0.612v-0.612c0,0.338,0.274,0.612,0.612,0.612h18.367  c0.338,0,0.611-0.274,0.611-0.612v0.612C24.795,26.971,24.521,27.245,24.184,27.245z" fill-opacity="0.25" stroke-opacity="0.25"/>
-<rect fill="#FEE38E" fill-opacity="0.25" height="0.307" stroke-opacity="0.25" width="19.591" x="5.204" y="18.367"/>
-<polygon fill="#FFFFFF" fill-opacity="0.5" points="14.136,22.697 13.031,23.826 11.748,22.516 13.765,20.449 11.748,18.381   13.033,17.07 14.136,18.199 14.136,14.263 18.252,18.478 16.326,20.449 18.252,22.421 14.136,26.634 " stroke-opacity="0.5"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="15.0005" x2="15.0005" y1="24.9639" y2="16.0469">
-<stop offset="0" style="stop-color:#69686A"/>
-<stop offset="1" style="stop-color:#231F20"/>
+<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.553,18.478l-2.917-2.987v3.936l-1.604-1.641l-0.585,0.597l2.016,2.067l-2.016,2.065l0.584,0.597  l1.605-1.64v3.935l2.917-2.985l-1.926-1.972L17.553,18.478z M16.389,18.483l-0.932,0.952l-0.001-1.905L16.389,18.483z   M16.389,22.415l-0.933,0.951l0.001-1.905L16.389,22.415z" fill="url(#SVGID_5_)"/>
+<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>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_blocked.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_blocked.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_blocked.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,18 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 transform="matrix(1 0 0 1 0 -0.001)">
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="6.9238" y2="23.4291">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<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"/>
 </linearGradient>
-<path d="M15,3.502c-6.352,0-11.5,5.147-11.5,11.499c0,6.352,5.148,11.5,11.5,11.5s11.5-5.148,11.5-11.5  C26.5,8.649,21.352,3.502,15,3.502z" fill="url(#SVGID_1_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="3.502" y2="26.4209">
+<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"/>
 </linearGradient>
-<path d="M15,3.502c-6.352,0-11.5,5.147-11.5,11.499c0,6.352,5.148,11.5,11.5,11.5s11.5-5.148,11.5-11.5  C26.5,8.649,21.352,3.502,15,3.502z M15,6.502c1.619,0,3.129,0.463,4.418,1.252L7.753,19.421c-0.79-1.289-1.253-2.799-1.253-4.42  C6.5,10.315,10.313,6.502,15,6.502z M15,23.501c-1.619,0-3.128-0.463-4.418-1.252l11.665-11.667  c0.789,1.289,1.253,2.799,1.253,4.418C23.5,19.688,19.687,23.501,15,23.501z" fill="url(#SVGID_2_)"/>
+<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"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_bluetooth_offline.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,9 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <g>
+<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="42.1641" cy="5.1909" gradientTransform="matrix(0.9686 0 0 1 -26.3024 0)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="23.5175">
+<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"/>
@@ -14,14 +15,14 @@
 <rect fill="none" fill-rule="evenodd" height="30" width="30"/>
 </g>
 <g>
-<rect height="34.268" style="opacity:0.6;enable-background:new    ;" transform="matrix(0.7073 -0.707 0.707 0.7073 -6.2126 14.9968)" width="3.169" x="13.418" y="-2.134"/>
-<polygon points="25.996,26.987 3.015,4.005 4.006,3.014 26.987,25.996 " style="fill:url(#SVGID_1__);"/>
-<rect height="30.002" style="fill:none;" width="30.002"/>
+<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.7832" x2="339.7832" y1="-397.2993" y2="-425.2942">
-<stop offset="0" style="stop-color:#DE8029"/>
-<stop offset="0.2606" style="stop-color:#DE4E29"/>
-<stop offset="1" style="stop-color:#D82E09"/>
+<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>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_bt_low_battery.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,18 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <g>
+<rect fill="none" height="30" width="30"/>
+<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.2002" x2="22.7998" y1="16.2998" y2="16.2998">
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_1_)" height="23.4" width="15.6" x="7.2" y="4.6"/>
+<rect fill="url(#SVGID_1_)" height="23.4" width="15.6" x="7.199" y="4.6"/>
 </g>
 <g>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="9.5" x2="20.5" y1="16.2988" y2="16.2988">
-<stop offset="0" style="stop-color:#E6E6E6"/>
+<stop offset="0" style="stop-color:#EFEFEF"/>
+<stop offset="0.5636" style="stop-color:#FFFFFF"/>
 <stop offset="1" style="stop-color:#FFFFFF"/>
 </linearGradient>
 <rect fill="url(#SVGID_2_)" height="18" width="11" x="9.5" y="7.299"/>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_bt_signal_high.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,33 +1,37 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <g>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="15.8965" y2="26.0222">
+<rect fill="none" height="30" width="30"/>
+<rect fill-opacity="0.35" height="12" stroke-opacity="0.35" width="8" x="1" y="15"/>
+<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"/>
 </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.4004" y2="24.8015">
+<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"/>
 </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.9595">
+<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"/>
 </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.7505" y2="24.7829">
+<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"/>
 </linearGradient>
 <rect fill="url(#SVGID_4_)" height="14" width="4" x="13" y="11"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="25.0005" x2="25.0005" y1="4" y2="25.7519">
+<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"/>
 </linearGradient>
 <rect fill="url(#SVGID_5_)" height="22" width="6" x="22" y="4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="25.0005" x2="25.0005" y1="5" y2="24.7745">
+<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"/>
 </linearGradient>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_bt_signal_low.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,8 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <g>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="16" y2="26.1378">
+<rect fill="none" height="30" width="30"/>
+<rect fill-opacity="0.35" height="12" stroke-opacity="0.35" width="8" x="1" y="15"/>
+<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"/>
 </linearGradient>
@@ -12,12 +16,12 @@
 <stop offset="1" style="stop-color:#D82E09"/>
 </linearGradient>
 <rect fill="url(#SVGID_2_)" height="8" width="4" x="3" y="17"/>
-<linearGradient gradientTransform="matrix(-1 0 0 1 11669.1875 0)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="11654.1875" x2="11654.1875" y1="4" y2="26">
+<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">
 <stop offset="0" style="stop-color:#E6E6E6"/>
 <stop offset="1" style="stop-color:#6F6F6F"/>
 </linearGradient>
 <rect fill="url(#SVGID_3_)" height="16" width="6" x="12" y="10"/>
-<linearGradient gradientTransform="matrix(-1 0 0 1 11669.1875 0)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="11654.1875" x2="11654.1875" y1="5.75" y2="25">
+<linearGradient gradientTransform="matrix(-1 0 0 1 11700.957 0)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="11685.957" x2="11685.957" y1="5.75" y2="25">
 <stop offset="0" style="stop-color:#C4C4C4"/>
 <stop offset="1" style="stop-color:#4F4F4F"/>
 </linearGradient>
@@ -25,12 +29,12 @@
 <polygon fill="#FFFFFF" fill-opacity="0.3" points="12,12.389 12,10 14.39,10 " stroke-opacity="0.3"/>
 <polygon fill="#FFFFFF" fill-opacity="0.3" points="18,17.703 12,23.703 12,18.047 18,12.047 " stroke-opacity="0.3"/>
 <polygon fill="#FFFFFF" fill-opacity="0.3" points="18,23.359 18,26 15.36,26 " stroke-opacity="0.3"/>
-<linearGradient gradientTransform="matrix(-1 0 0 1 11689.1875 0)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="11664.1875" x2="11664.1875" y1="4" y2="26">
+<linearGradient gradientTransform="matrix(-1 0 0 1 11720.957 0)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="11695.957" x2="11695.957" y1="4" y2="26">
 <stop offset="0" style="stop-color:#E6E6E6"/>
 <stop offset="1" style="stop-color:#6F6F6F"/>
 </linearGradient>
 <rect fill="url(#SVGID_5_)" height="22" width="6" x="22" y="4"/>
-<linearGradient gradientTransform="matrix(-1 0 0 1 11689.1875 0)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="11664.1875" x2="11664.1875" y1="5" y2="25">
+<linearGradient gradientTransform="matrix(-1 0 0 1 11720.957 0)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="11695.957" x2="11695.957" y1="5" y2="25">
 <stop offset="0" style="stop-color:#C4C4C4"/>
 <stop offset="1" style="stop-color:#4F4F4F"/>
 </linearGradient>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_bt_signal_medium.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,33 +1,37 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <g>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="9.7495" y2="25.5003">
+<rect fill="none" height="30" width="30"/>
+<rect fill-opacity="0.35" height="12" stroke-opacity="0.35" width="8" x="1" y="15"/>
+<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"/>
 </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.0005" y2="24.6005">
+<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"/>
 </linearGradient>
 <rect fill="url(#SVGID_2_)" height="8" width="4" x="3" y="17"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="14.9995" x2="14.9995" y1="9.917" y2="26.0039">
+<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"/>
 </linearGradient>
 <rect fill="url(#SVGID_3_)" height="16" width="6" x="12" y="10"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="14.9995" x2="14.9995" y1="10.7813" y2="24.563">
+<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"/>
 </linearGradient>
 <rect fill="url(#SVGID_4_)" height="14" width="4" x="13" y="11"/>
-<linearGradient gradientTransform="matrix(-1 0 0 1 11225.3008 0)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="11200.3008" x2="11200.3008" y1="4" y2="25.7514">
+<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">
 <stop offset="0" style="stop-color:#E6E6E6"/>
 <stop offset="1" style="stop-color:#6F6F6F"/>
 </linearGradient>
 <rect fill="url(#SVGID_5_)" height="22" width="6" x="22" y="4"/>
-<linearGradient gradientTransform="matrix(-1 0 0 1 11225.3008 0)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="11200.3008" x2="11200.3008" y1="5" y2="24.774">
+<linearGradient gradientTransform="matrix(-1 0 0 1 11381.0703 0)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="11356.0703" x2="11356.0703" y1="5" y2="24.774">
 <stop offset="0" style="stop-color:#C4C4C4"/>
 <stop offset="1" style="stop-color:#4F4F4F"/>
 </linearGradient>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_business_card.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_business_card.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g>
+<rect fill="none" height="30" width="30"/>
+<rect fill-opacity="0.6" height="22" width="28" x="1" y="4"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="3.9473" y2="24.6524">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#C8C8C8"/>
+</linearGradient>
+<rect fill="url(#SVGID_1_)" height="20" width="26" x="2" y="5"/>
+<rect fill="#FFFFFF" height="1" width="26" x="2" y="5"/>
+<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"/>
+</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"/>
+</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"/>
+<rect fill="#020202" fill-opacity="0.5" height="2" stroke-opacity="0.5" width="7" x="19" y="13"/>
+<rect fill="none" height="30" width="30"/>
+</g>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_calendar.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_calendar.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_calendar.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,38 +1,52 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g>
 <rect fill="none" height="30" width="30"/>
-<path d="M21.178,5.294c0-0.974-0.791-1.765-1.766-1.765 c-0.974,0-1.764,0.791-1.764,1.765h-5.295c0-0.974-0.792-1.765-1.765-1.765S8.824,4.32,8.824,5.294H4.412v21.178H25.59V5.294H21.178 z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="15" x2="15" y1="10.91" y2="25.59">
-<stop offset="0" stop-color="#F9F9F9"/>
-<stop offset="1" stop-color="#B5B5B5"/>
+<path d="M22,4c0-1.104-0.896-2-2-2s-2,0.896-2,2h-6c0-1.104-0.897-2-2-2S8,2.896,8,4H2v24h26V4H22z" fill-opacity="0.6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="10.3691" y2="27.0025">
+<stop offset="0" style="stop-color:#F9F9F9"/>
+<stop offset="1" style="stop-color:#B5B5B5"/>
+</linearGradient>
+<rect fill="url(#SVGID_1_)" height="22" width="24" x="3" y="5"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="11.2095" x2="11.2095" y1="23.834" y2="13.7479">
+<stop offset="0" style="stop-color:#303030"/>
+<stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
-<rect fill="url(#SVGID_1)" height="19.413" width="19.413" x="5.294" y="6.177"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="11.66" x2="11.66" y1="22.8" y2="13.9">
-<stop offset="0" stop-color="#303030"/>
-<stop offset="1" stop-color="#000000"/>
+<path d="M14.228,22.906V24H8.191v-1.094h2.146v-7.629L8.191,15.77v-1.094l3.015-0.95h0.991v9.181H14.228z" fill="url(#SVGID_2_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="18.7939" x2="18.7939" y1="23.834" y2="13.7479">
+<stop offset="0" style="stop-color:#303030"/>
+<stop offset="1" style="stop-color:#000000"/>
+</linearGradient>
+<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="22,22 22,27 27,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"/>
 </linearGradient>
-<path d="M14.319,21.977v0.966H8.993v-0.966h1.894v-6.731L8.993,15.68v-0.966l2.661-0.838h0.875v8.101 H14.319z" fill="url(#SVGID_2)"/>
-<path d="M21.039,21.893v1.05h-5.381v-0.657c0-0.627,0.108-1.186,0.326-1.672 c0.217-0.486,0.484-0.9,0.802-1.246c0.316-0.343,0.72-0.719,1.206-1.13c0.582-0.491,0.951-0.87,1.104-1.14 c0.152-0.271,0.229-0.537,0.229-0.803c0-0.467-0.123-0.817-0.371-1.052c-0.246-0.235-0.618-0.352-1.112-0.352 c-0.523,0-1.156,0.135-1.9,0.404H15.93v-1.074c0.78-0.244,1.54-0.368,2.279-0.368c0.914,0,1.606,0.201,2.081,0.601 c0.475,0.4,0.712,0.989,0.712,1.77c0,0.438-0.105,0.869-0.319,1.294c-0.214,0.424-0.716,0.969-1.508,1.633 c-0.443,0.373-0.788,0.684-1.038,0.935s-0.459,0.524-0.631,0.824c-0.17,0.3-0.264,0.628-0.279,0.985h3.813V21.893z" fill="url(#SVGID_2)"/>
-<polygon fill="#FFFFFF" points="20.295,21.178 20.295,25.59 24.707,21.178 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="15" x2="15" y1="6.18" y2="11.47">
-<stop offset="0" stop-color="#FF7042"/>
-<stop offset="1" stop-color="#991B23"/>
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_4)" height="5.294" width="19.413" x="5.294" y="6.177"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="10.59" x2="10.59" y1="7.06" y2="10.59">
-<stop offset="0" stop-color="#4A050A"/>
-<stop offset="1" stop-color="#B00F25"/>
+<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"/>
 </linearGradient>
-<circle cx="10.589" cy="8.824" fill="url(#SVGID_5)" r="1.765"/>
-<circle cx="19.412" cy="8.824" fill="url(#SVGID_5)" r="1.765"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="0.882" stroke-opacity="0.4" width="19.413" x="5.294" y="6.177"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7" x1="10.59" x2="10.59" y1="4.41" y2="9.71">
-<stop offset="0" stop-color="#FFFCFE"/>
-<stop offset="1" stop-color="#8C8C8C"/>
+<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="1" style="stop-color:#8C8C8C"/>
 </linearGradient>
-<path d="M11.471,8.824c0,0.485-0.397,0.882-0.882,0.882l0,0c-0.485,0-0.882-0.397-0.882-0.882v-3.53 c0-0.485,0.397-0.882,0.882-0.882l0,0c0.485,0,0.882,0.397,0.882,0.882V8.824z" fill="url(#SVGID_7)"/>
-<path d="M20.295,8.824c0,0.485-0.396,0.882-0.883,0.882l0,0c-0.484,0-0.882-0.397-0.882-0.882v-3.53 c0-0.485,0.397-0.882,0.882-0.882l0,0c0.486,0,0.883,0.397,0.883,0.882V8.824z" fill="url(#SVGID_7)"/>
-<rect fill-opacity="0.2" height="0.882" stroke-opacity="0.2" width="19.413" x="5.294" y="11.471"/>
-<rect fill="none" height="30.002" width="30.002"/>
+<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="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_)"/>
+<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="24" x="3" y="11"/>
+<rect fill="none" height="30" width="30"/>
+</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_car.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_car.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_car.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,27 +1,79 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g>
 <rect fill="none" height="30" width="30"/>
-<path d="M22.493,24c-2.313,0-4.223-1.753-4.472-4h-6.057c-0.249,2.247-2.159,4-4.472,4s-4.223-1.753-4.472-4H1v-6.205 l4.379-1.031l1.022-5.639l16.206-1.19l0.4,2.704l0.628,4.098L29,13.76V20h-2.035C26.716,22.247,24.806,24,22.493,24L22.493,24z" fill-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="15" x2="15" y1="6.79" y2="19.99">
-<stop offset="0" stop-color="#DE8029"/>
-<stop offset="0.26" stop-color="#DE4E29"/>
-<stop offset="1" stop-color="#D82E09"/>
+<path d="M27.606,11.991l-1.636-5.233C25.588,5.226,23.461,3,21,3H9C6.539,3,4.412,5.226,4.045,6.702l-1.652,5.291  C1.547,12.727,1,13.795,1,15v6c0,0.883,0.391,1.67,1,2.22V25c0,1.103,1.01,2,2.25,2h2.5C7.99,27,9,26.103,9,25v-1h12v1  c0,1.103,1.01,2,2.25,2h2.5c1.24,0,2.25-0.897,2.25-2v-1.78c0.609-0.55,1-1.337,1-2.22v-6C29,13.795,28.453,12.725,27.606,11.991z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5.5" x2="5.5" y1="22" y2="26">
+<stop offset="0" style="stop-color:#000000"/>
+<stop offset="0.6848" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#646464"/>
+</linearGradient>
+<path d="M3,22v3c0,0.55,0.563,1,1.25,1h2.5C7.438,26,8,25.55,8,25v-3H3z" fill="url(#SVGID_1_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="24.5" x2="24.5" y1="22" y2="26">
+<stop offset="0" style="stop-color:#000000"/>
+<stop offset="0.6848" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#646464"/>
+</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"/>
+</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">
+<stop offset="0" style="stop-color:#4D4D4D"/>
+<stop offset="1" style="stop-color:#000000"/>
+</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"/>
+</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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_1)" points="22.755,13.586 22.708,13.284 21.453,11.635 22.019,8.785 21.754,7 7.247,8.065 6.246,13.586 2,14.586 2,19 28,19 28,14.586 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="10.51" x2="10.51" y1="8.09" y2="17.27">
-<stop offset="0" stop-color="#FFFFFF"/>
-<stop offset="1" stop-color="#4F4F4F"/>
+<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"/>
+</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"/>
+</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"/>
+</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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_2)" points="8.352,9.614 7.687,13.284 13.34,13.284 13.34,9.225 "/>
-<polygon fill="url(#SVGID_2)" points="22.019,8.785 15.247,9.108 15.247,13.253 22.708,13.284 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="7.49" x2="7.49" y1="13.08" y2="22.78">
-<stop offset="0" stop-color="#808080"/>
-<stop offset="0.5" stop-color="#636363"/>
-<stop offset="1" stop-color="#1C1C1C"/>
+<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"/>
+</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"/>
 </linearGradient>
-<circle cx="7.493" cy="19.5" fill="url(#SVGID_4)" r="3.5"/>
-<circle cx="7.493" cy="19.5" fill="#A3A3A3" r="1.5"/>
-<circle cx="22.493" cy="19.5" fill="url(#SVGID_4)" r="3.5"/>
-<circle cx="22.493" cy="19.5" fill="#A3A3A3" r="1.5"/>
+<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"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="15.0005" x2="15.0005" y1="23" y2="21">
+<stop offset="0" style="stop-color:#565656"/>
+<stop offset="1" style="stop-color:#212121"/>
+</linearGradient>
+<path d="M22,21H8c-1.1,0-2,0.9-2,2h18C24,21.9,23.1,21,22,21z" fill="url(#SVGID_13_)"/>
+<rect fill="none" height="30" width="30"/>
+</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_charger.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_charger.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g>
+<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.4" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#686E70"/>
+</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">
+<stop offset="0" style="stop-color:#4D4D4D"/>
+<stop offset="0.4" style="stop-color:#7A7A7A"/>
+<stop offset="1" style="stop-color:#1A1A1A"/>
+</linearGradient>
+<rect fill="url(#SVGID_2_)" height="5" width="3" x="8" y="7"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="19" x2="22" y1="10" y2="10">
+<stop offset="0" style="stop-color:#323232"/>
+<stop offset="0.4" style="stop-color:#787878"/>
+<stop offset="1" style="stop-color:#323232"/>
+</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.4" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#686E70"/>
+</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">
+<stop offset="0" style="stop-color:#4D4D4D"/>
+<stop offset="0.4" style="stop-color:#7A7A7A"/>
+<stop offset="1" style="stop-color:#1A1A1A"/>
+</linearGradient>
+<rect fill="url(#SVGID_5_)" height="5" width="3" x="19" y="7"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="13" x2="17" y1="24.5" y2="24.5">
+<stop offset="0" style="stop-color:#4D4D4D"/>
+<stop offset="0.4" style="stop-color:#7A7A7A"/>
+<stop offset="1" style="stop-color:#1A1A1A"/>
+</linearGradient>
+<rect fill="url(#SVGID_6_)" height="7" width="4" x="13" y="21"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="11" x2="19" y1="23.5" y2="23.5">
+<stop offset="0" style="stop-color:#4D4D4D"/>
+<stop offset="0.4" style="stop-color:#7A7A7A"/>
+<stop offset="1" style="stop-color:#1A1A1A"/>
+</linearGradient>
+<rect fill="url(#SVGID_7_)" height="3" width="8" x="11" y="22"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="14.9995" x2="14.9995" y1="11" y2="23.0005">
+<stop offset="0" style="stop-color:#C8C8C8"/>
+<stop offset="0.8" style="stop-color:#383838"/>
+<stop offset="1" style="stop-color:#121212"/>
+</linearGradient>
+<path d="M5,11v6c0,3.3,2.7,6,6,6h8c3.3,0,6-2.7,6-6v-6H5z" fill="url(#SVGID_8_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="14.9995" x2="14.9995" y1="12" y2="22.0005">
+<stop offset="0" style="stop-color:#8C8C8C"/>
+<stop offset="0.5" style="stop-color:#636363"/>
+<stop offset="1" style="stop-color:#1C1C1C"/>
+</linearGradient>
+<path d="M11,22c-2.757,0-5-2.243-5-5v-5h18v5c0,2.757-2.243,5-5,5H11z" fill="url(#SVGID_9_)"/>
+<rect fill="none" height="30" width="30"/>
+</g>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_collapse.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_collapse.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_collapse.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,18 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <rect fill-opacity="0.6" height="30" stroke-opacity="0.6" width="30"/>
 <rect fill="url(#SVGID_1_)" height="28" width="28" x="1" y="1"/>
-<polygon fill-opacity="0.2" points="24,13.879 17.99,13.879 17.99,8 13.99,8 13.99,13.879 8,13.879 8,17.879 13.99,17.879 13.99,24   17.99,24 17.99,17.879 24,17.879 " stroke-opacity="0.2"/>
+<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.879 16.99,12.879 16.99,7 12.99,7 12.99,12.879 7,12.879 7,16.879 12.99,16.879 12.99,23   16.99,23 16.99,16.879 23,16.879 "/>
+<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="14.9995" x2="14.9995" y1="1.1748" y2="29.1753">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+<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>
 </defs>
-</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_company_details.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,28 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <g>
-<rect fill-opacity="0.6" height="21" stroke-opacity="0.6" width="14" x="14" y="8"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="21" x2="21" y1="9.2114" y2="27.8131">
+<rect fill="none" height="30" width="30"/>
+<rect fill-opacity="0.6" height="21" stroke-opacity="0.6" width="15" x="14" y="8"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="21.5" x2="21.5" y1="9.2114" y2="27.8131">
 <stop offset="0" style="stop-color:#FFFFFF"/>
 <stop offset="1" style="stop-color:#787878"/>
 </linearGradient>
-<rect fill="url(#SVGID_1_)" height="19" width="12" x="15" y="9"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="23" x2="23" y1="14" y2="11">
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_2_)" height="3" width="8" x="19" y="11"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="23" x2="23" y1="19" y2="16">
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_3_)" height="3" width="8" x="19" y="16"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="23" x2="23" y1="24" y2="21">
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_4_)" height="3" width="8" x="19" y="21"/>
+<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"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="10.4995" x2="10.4995" y1="2.2896" y2="27.7443">
 <stop offset="0" style="stop-color:#FFFFFF"/>
@@ -83,6 +84,5 @@
 </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"/>
-<rect fill="none" height="30" width="30"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_connected.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_connected.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g>
+<rect fill="none" height="30" width="30"/>
+<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"/>
+<polygon fill-opacity="0.2" points="23.172,9 13.979,18.192 9.736,13.95 6.908,16.778 13.979,23.85 26,11.829 " stroke-opacity="0.2"/>
+<polygon fill="#FFFFFF" points="21.717,7.575 12.525,16.768 8.282,12.525 5.454,15.354 12.525,22.425 24.546,10.404 "/>
+<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"/>
+</linearGradient>
+</defs>
+</g>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_connection.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_connection.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_connection.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,34 +1,37 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <g>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="11.3525" x2="11.3525" y1="16.041" y2="26.3361">
+<rect fill="none" height="30" width="30" x="0.002"/>
+<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"/>
 </linearGradient>
-<path d="M20.93,20.279c0,0.277-0.223,0.508-0.497,0.508h-7.751c-0.271,0-0.496,0.229-0.496,0.508v4.592  c0,0.279-0.163,0.35-0.359,0.156l-9.935-9.746c-0.198-0.193-0.135-0.352,0.138-0.352h18.403c0.272,0,0.497,0.229,0.497,0.508V20.279  z" fill="url(#SVGID_1_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="11.9546" x2="11.9546" y1="16.958" y2="24.3341">
+<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"/>
 </linearGradient>
-<path d="M3.98,16.945H19.93v2.842h-7.248c-0.824,0-1.496,0.676-1.496,1.508v2.719L3.98,16.945z" fill="url(#SVGID_2_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="18.6484" x2="18.6484" y1="3.875" y2="14.2085">
+<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"/>
 </linearGradient>
-<path d="M9.072,9.721c0-0.279,0.223-0.508,0.496-0.508h7.752c0.272,0,0.495-0.229,0.495-0.508l0.001-4.592  c0-0.281,0.162-0.35,0.359-0.156l9.934,9.744c0.198,0.193,0.135,0.352-0.138,0.352H9.568c-0.272,0-0.496-0.229-0.496-0.506V9.721z" fill="url(#SVGID_3_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="18.0469" x2="18.0469" y1="5.959" y2="13.0835">
+<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"/>
 </linearGradient>
-<path d="M10.072,13.053v-2.84h7.248c0.824,0,1.495-0.678,1.495-1.508l0.001-2.719l7.204,7.066H10.072z" fill="url(#SVGID_4_)"/>
-<rect fill="none" height="30" width="30"/>
+<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"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_contacts.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_contacts.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_contacts.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,39 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g>
 <rect fill="none" height="30" width="30"/>
-<path d="M4,1v5C2.897,6,2,6.897,2,8s0.897,2,2,2v1c-1.103,0-2,0.897-2,2s0.897,2,2,2v1c-1.103,0-2,0.897-2,2 s0.897,2,2,2v1c-1.103,0-2,0.897-2,2s0.897,2,2,2v4h24V1H4z" fill-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="18" x2="18" y1="2" y2="28">
-<stop offset="0" stop-color="#A0F800"/>
-<stop offset="1" stop-color="#319E00"/>
+<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.725,1.289-2.725,2.391 c0,0-0.098,2.688,0.389,3.753c0.266,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.58,2.914-3.751,3.148V23h10v-2.992C22.713,19.772,19.2,17.938,19.134,16.857z" fill-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="7" x2="7" y1="2" y2="28">
-<stop offset="0" stop-color="#FFFFFF"/>
-<stop offset="1" stop-color="#A5A5A5"/>
+<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" stop-color="#ABABAB"/>
-<stop offset="1" stop-color="#4F4F4F"/>
+<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" stop-color="#ABABAB"/>
-<stop offset="1" stop-color="#4F4F4F"/>
+<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" stop-color="#ABABAB"/>
-<stop offset="1" stop-color="#4F4F4F"/>
+<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" stop-color="#ABABAB"/>
-<stop offset="1" stop-color="#4F4F4F"/>
+<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.725,1.289-2.725,2.391 c0,0-0.098,2.688,0.389,3.753c0.266,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.58,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" width="22" x="5" y="2"/>
+<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 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_corrupted.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_corrupted.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_corrupted.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,49 +1,57 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <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"/>
+<rect fill="none" height="30" width="30"/>
+<polygon fill-opacity="0.6" points="29,2 14.405,2 12,8.615 20.064,16.679 14.838,28 29,28 "/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="20.7363" x2="20.7363" y1="27" y2="3.4999">
+<stop offset="0" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#666666"/>
 </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"/>
+<polygon fill="url(#SVGID_1_)" points="28,3 15.514,3 13.473,8.615 21.537,16.679 16.772,27 28,27 "/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="19.9287" x2="19.9287" y1="21.125" y2="9.0729">
+<stop offset="0" style="stop-color:#36B5FF"/>
+<stop offset="1" style="stop-color:#1B66D8"/>
 </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"/>
+<polygon fill="url(#SVGID_2_)" points="26,9 13.858,9 21.537,16.679 19.542,21 26,21 "/>
+<polygon fill="#F1F1F2" points="17,7 17,5 14.787,5 14.06,7 "/>
+<rect fill="#F1F1F2" height="2" width="3" x="19" y="5"/>
+<rect fill="#F1F1F2" height="2" width="2" x="24" y="5"/>
+<polygon fill="#F1F1F2" points="14,23 14,25 14.392,25 15.314,23 "/>
+<rect fill="#F1F1F2" height="2" width="3" x="19" y="23"/>
+<rect fill="#F1F1F2" height="2" width="2" x="24" y="23"/>
+<polygon fill="#FFFFFF" fill-opacity="0.3" points="28,4 28,3 15.514,3 15.15,4 " stroke-opacity="0.3"/>
+<polygon fill="#FFFFFF" fill-opacity="0.1" points="28,26 17.234,26 16.772,27 28,27 " stroke-opacity="0.1"/>
+<polygon fill="#FFFFFF" fill-opacity="0.3" points="26,20 20.004,20 19.542,21 26,21 " stroke-opacity="0.3"/>
+<polygon fill="#00006B" fill-opacity="0.2" points="26,9 13.858,9 14.858,10 26,10 " stroke-opacity="0.2"/>
+<polygon fill-opacity="0.1" points="17,6 17,5 14.787,5 14.423,6 " stroke-opacity="0.1"/>
+<rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="3" x="19" y="5"/>
+<rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="2" x="24" y="5"/>
+<polygon fill-opacity="0.6" points="9,9.385 11.686,2 1,2 1,28 12.007,28 16.936,17.321 "/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="9.4683" x2="9.4683" y1="27" y2="3.4999">
+<stop offset="0" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#666666"/>
 </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"/>
+<polygon fill="url(#SVGID_3_)" points="9,9.385 11.321,3 2,3 2,27 12.469,27 16.936,17.321 "/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="10.4683" x2="10.4683" y1="21.125" y2="9.0729">
+<stop offset="0" style="stop-color:#36B5FF"/>
+<stop offset="1" style="stop-color:#1B66D8"/>
 </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>
+<polygon fill="url(#SVGID_4_)" points="9,9.385 9.14,9 4,9 4,21 15.238,21 16.936,17.321 "/>
+<rect fill="#F1F1F2" height="2" width="2" x="4" y="5"/>
+<polygon fill="#F1F1F2" points="8,5 8,7 9.867,7 10.595,5 "/>
+<rect fill="#F1F1F2" height="2" width="2" x="4" y="23"/>
+<rect fill="#F1F1F2" height="2" width="3" x="8" y="23"/>
+<polygon fill="#FFFFFF" fill-opacity="0.3" points="2,3 2,4 10.958,4 11.321,3 " stroke-opacity="0.3"/>
+<polygon fill="#FFFFFF" fill-opacity="0.1" points="2,26 2,27 12.469,27 12.93,26 " stroke-opacity="0.1"/>
+<polygon fill="#FFFFFF" fill-opacity="0.3" points="4,20 4,21 15.238,21 15.699,20 " stroke-opacity="0.3"/>
+<polygon fill="#00006B" fill-opacity="0.2" points="9.14,9 4,9 4,10 9.614,10 9,9.385 " stroke-opacity="0.2"/>
+<rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="2" x="4" y="5"/>
+<polygon fill-opacity="0.1" points="8,5 8,6 10.23,6 10.595,5 " stroke-opacity="0.1"/>
+<rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="2" x="4" y="23"/>
+<rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="3" x="8" y="23"/>
+<polygon fill-opacity="0.1" points="13,23 13,24 13.854,24 14.314,23 " stroke-opacity="0.1"/>
+<rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="3" x="19" y="23"/>
+<rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="2" x="24" y="23"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_day.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_day.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g>
+<rect fill="none" height="30" width="30"/>
+<path d="M22,4c0-1.104-0.896-2-2-2c-1.103,0-2,0.896-2,2h-6c0-1.104-0.896-2-2-2C8.897,2,8,2.896,8,4H3v24h24V4H22z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="10.3691" y2="27.0025">
+<stop offset="0" style="stop-color:#F9F9F9"/>
+<stop offset="1" style="stop-color:#B5B5B5"/>
+</linearGradient>
+<rect fill="url(#SVGID_1_)" height="22" width="22" x="4" y="5"/>
+<polygon fill="#FFFFFF" points="21,22 21,27 26,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"/>
+</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"/>
+</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"/>
+</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="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="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_)"/>
+<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="22" x="4" y="11"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="15.0005" x2="15.0005" y1="23.834" y2="13.7479">
+<stop offset="0" style="stop-color:#303030"/>
+<stop offset="1" style="stop-color:#000000"/>
+</linearGradient>
+<path d="M18.019,22.906V24h-6.036v-1.094h2.146v-7.629l-2.146,0.492v-1.094l3.015-0.95h0.991v9.181H18.019z" fill="url(#SVGID_7_)"/>
+</g>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_disconnected.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_disconnected.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g>
+<rect fill="none" height="30" width="30" x="0"/>
+<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.01,0,12.709,5.555,12.975,12.5C27.981,15.332,28,15.169,28,15c0-7.18-5.82-13-13-13  C7.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"/>
+<polygon fill="#F0F0F0" points="21.717,7.576 12.525,16.768 8.283,12.525 5.455,15.354 12.525,22.425 24.547,10.404 "/>
+<rect fill-opacity="0.5" height="3" stroke-opacity="0.5" transform="matrix(0.7071 0.7071 -0.7071 0.7071 16.5104 -10.5666)" width="1" x="20.51" y="13.147"/>
+<rect fill-opacity="0.5" height="2" stroke-opacity="0.5" transform="matrix(0.7071 0.7071 -0.7071 0.7071 15.1925 -13.7483)" width="1" x="23.692" y="10.465"/>
+<rect fill-opacity="0.5" height="3" stroke-opacity="0.5" transform="matrix(0.7071 0.7071 -0.7071 0.7071 12.0966 -11.2234)" width="1" x="19.096" y="7.49"/>
+<rect fill-opacity="0.5" height="3" stroke-opacity="0.5" transform="matrix(0.7071 0.7071 -0.7071 0.7071 17.975 -7.0313)" width="1" x="16.975" y="16.682"/>
+<rect fill-opacity="0.5" height="3" stroke-opacity="0.5" transform="matrix(0.7071 0.7071 -0.7071 0.7071 13.5609 -7.6881)" width="1" x="15.561" y="11.025"/>
+<rect fill-opacity="0.5" height="3" stroke-opacity="0.5" transform="matrix(0.7071 0.7071 -0.7071 0.7071 19.4396 -3.4957)" width="1" x="13.44" y="20.218"/>
+<rect fill-opacity="0.5" height="2" stroke-opacity="0.5" transform="matrix(0.7074 0.7069 -0.7069 0.7074 14.8717 -4.507)" width="1" x="12.379" y="14.707"/>
+<rect fill-opacity="0.5" height="1.001" stroke-opacity="0.5" transform="matrix(0.7071 0.7071 -0.7071 0.7071 12.6318 -13.9304)" width="3" x="21.632" y="7.782"/>
+<rect fill-opacity="0.5" height="1" stroke-opacity="0.5" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 2.9036 43.2242)" width="3" x="8.904" y="20.511"/>
+<rect fill-opacity="0.5" height="1.001" stroke-opacity="0.5" transform="matrix(-0.7069 -0.7073 0.7073 -0.7069 -0.6353 34.686)" width="3" x="5.368" y="16.974"/>
+<rect fill-opacity="0.5" height="1" stroke-opacity="0.5" transform="matrix(0.7071 0.7071 -0.7071 0.7071 12.1969 -2.981)" width="3" x="8.197" y="12.732"/>
+<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"/>
+</linearGradient>
+</defs>
+</g>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_draft.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_draft.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g>
+<rect fill="none" height="30" width="30"/>
+<polygon fill="url(#SVGID_1_)" points="4,2 4,28 20,28 26,22 26,2 "/>
+<polygon fill="#FFFFFF" points="26,22 20,22 20,28 "/>
+<rect fill-opacity="0.5" height="1.5" stroke-opacity="0.5" width="16" x="7" y="6.5"/>
+<rect fill-opacity="0.5" height="1.5" stroke-opacity="0.5" width="16" x="7" y="10.5"/>
+<rect fill-opacity="0.5" height="1.5" stroke-opacity="0.5" width="11" x="7" y="14.5"/>
+<g>
+<rect height="1" width="2" x="7" y="28"/>
+<rect height="1" width="2" x="5" y="1"/>
+<rect height="1" width="2" x="3" y="28"/>
+<rect height="1" width="2" x="11" y="28"/>
+<rect height="1" width="2" x="9" y="1"/>
+<rect height="1" width="2" x="13" y="1"/>
+<rect height="2" width="1" x="3" y="25"/>
+<rect height="2" width="1" x="3" y="1"/>
+<rect height="2" width="1" x="3" y="9"/>
+<rect height="2" width="1" x="3" y="21"/>
+<rect height="2" width="1" x="3" y="17"/>
+<rect height="2" width="1" x="3" y="13"/>
+<rect height="1" width="2" x="21" y="1"/>
+<rect height="2" width="1" x="26" y="15.143"/>
+<rect height="2" width="1" x="26" y="19.143"/>
+<rect height="2" width="1" x="26" y="7.143"/>
+<rect height="1" width="2" x="15" y="28"/>
+<rect height="2" width="1" x="26" y="11.143"/>
+<rect height="2" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 26.9375 57.7243)" width="1" x="24.924" y="22.283"/>
+<polygon points="19,28 19,29 20.414,29 20.828,28.586 20.242,28  "/>
+<rect height="2" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 20.1098 60.5524)" width="1" x="22.096" y="25.111"/>
+<rect height="1" width="2" x="17" y="1"/>
+<rect height="1" width="2" x="25" y="1"/>
+<rect height="2" width="1" x="3" y="5"/>
+<rect height="2" width="1" x="26" y="3"/>
+</g>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="2" y2="28.0005">
+<stop offset="0" style="stop-color:#F9F9F9"/>
+<stop offset="1" style="stop-color:#B5B5B5"/>
+</linearGradient>
+</defs>
+</g>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_email.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_email.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_email.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <g>
-<path d="M15.001,27.354c-6.813,0-12.354-5.542-12.354-12.354  c0-6.813,5.542-12.354,12.354-12.354c6.812,0,12.354,5.542,12.354,12.354C27.354,21.813,21.813,27.354,15.001,27.354L15.001,27.354z  " style="opacity:0.6;enable-background:new    ;"/>
-<circle cx="15.001" cy="15.001" r="11.471" style="fill:url(#SVGID_1_);"/>
-<path d="M23.604,17.037c0,1.379-0.277,2.572-0.83,3.581  c-0.673,1.242-1.646,1.866-2.92,1.866c-1.236,0-2.129-0.624-2.687-1.866c-0.673,0.728-1.539,1.091-2.601,1.091  c-1.248,0-2.247-0.478-3.001-1.43c-0.699-0.883-1.049-1.955-1.049-3.229c0-1.279,0.35-2.349,1.049-3.21  c0.745-0.928,1.746-1.389,3.001-1.389c0.934,0,1.67,0.253,2.208,0.761v-0.56h1.813v6.263c0,1.216,0.422,1.825,1.268,1.825  c0.689,0,1.222-0.478,1.594-1.43c0.274-0.709,0.412-1.464,0.412-2.273c0-1.871-0.676-3.468-2.02-4.798  c-1.344-1.332-2.958-1.994-4.839-1.994c-1.892,0-3.498,0.659-4.819,1.98c-1.322,1.322-1.986,2.923-1.986,4.813  c0,1.887,0.663,3.496,1.993,4.823c1.326,1.335,2.931,1.998,4.813,1.998v1.795c-2.372,0-4.4-0.844-6.08-2.528  c-1.682-1.689-2.523-3.721-2.523-6.088c0-2.358,0.843-4.38,2.529-6.065c1.686-1.682,3.708-2.525,6.074-2.525  c2.373,0,4.4,0.838,6.082,2.52C22.762,12.644,23.604,14.668,23.604,17.037z M16.664,16.968c0-1.83-0.699-2.748-2.098-2.748  c-0.701,0-1.244,0.313-1.623,0.937c-0.33,0.528-0.491,1.158-0.491,1.894c0,1.925,0.704,2.888,2.112,2.888  C15.965,19.938,16.664,18.947,16.664,16.968z" style="opacity:0.2;enable-background:new    ;"/>
-<path d="M23.604,14.988c0,1.379-0.277,2.574-0.83,3.583c-0.673,1.24-1.646,1.865-2.92,1.865  c-1.236,0-2.129-0.625-2.687-1.865c-0.673,0.725-1.539,1.09-2.601,1.09c-1.248,0-2.247-0.479-3.001-1.43  c-0.699-0.885-1.049-1.957-1.049-3.229c0-1.281,0.35-2.35,1.049-3.21c0.745-0.928,1.746-1.389,3.001-1.389  c0.934,0,1.67,0.253,2.208,0.761v-0.56h1.813v6.264c0,1.214,0.422,1.822,1.268,1.822c0.689,0,1.222-0.476,1.594-1.428  c0.274-0.709,0.412-1.464,0.412-2.274c0-1.871-0.676-3.468-2.02-4.797c-1.344-1.332-2.958-1.994-4.839-1.994  c-1.892,0-3.498,0.659-4.819,1.979c-1.322,1.322-1.986,2.923-1.986,4.813c0,1.887,0.663,3.497,1.993,4.823  c1.326,1.336,2.931,1.998,4.813,1.998v1.795c-2.372,0-4.4-0.843-6.08-2.527c-1.682-1.691-2.523-3.721-2.523-6.088  c0-2.358,0.843-4.38,2.529-6.065c1.685-1.682,3.707-2.525,6.073-2.525c2.372,0,4.399,0.838,6.081,2.52  C22.762,10.595,23.604,12.619,23.604,14.988z M16.664,14.919c0-1.831-0.699-2.748-2.098-2.748c-0.701,0-1.244,0.313-1.623,0.937  c-0.33,0.528-0.491,1.157-0.491,1.894c0,1.925,0.704,2.886,2.112,2.886C15.965,17.887,16.664,16.898,16.664,14.919z" style="fill:#FFFFFF;"/>
-<rect height="30.002" style="fill:none;" width="30.002"/>
+<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"/>
+<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"/>
+<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.7822" x2="339.7822" y1="-398.7178" y2="-425.0826">
+<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>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_expand.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_expand.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_expand.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,18 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <rect fill-opacity="0.6" height="30" stroke-opacity="0.6" width="30"/>
 <rect fill="url(#SVGID_1_)" height="28" width="28" x="1" y="1"/>
 <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-opacity="0.2" points="23.99,14 7.99,14 7.99,18 23.99,18 " stroke-opacity="0.2"/>
-<polygon fill="#FFFFFF" points="23,13 7,13 7,17 23,17 "/>
+<polygon fill-opacity="0.2" points="23.99,14,7.99,14,7.99,18,23.99,18" stroke-opacity="0.2"/>
+<polygon fill="#FFFFFF" points="23,13,7,13,7,17,23,17"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="1" y2="29.1892">
-<stop offset="0" style="stop-color:#F7992E"/>
-<stop offset="1" style="stop-color:#D82E09"/>
+<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"/>
 </linearGradient>
 </defs>
-</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_fail.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_fail.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_fail.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <g>
 <rect fill="none" height="30" width="30"/>
-<path d="M15.001,27.354c-6.813,0-12.354-5.542-12.354-12.354 c0-6.813,5.541-12.354,12.354-12.354c6.812,0,12.354,5.542,12.354,12.354C27.354,21.813,21.813,27.354,15.001,27.354L15.001,27.354z " fill-opacity="0.6" stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="15" x2="15" y1="5.95" y2="56.25">
-<stop offset="0" stop-color="#FFFFFF"/>
-<stop offset="1" stop-color="#4F4F4F"/>
+<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>
-<circle cx="15" cy="15" fill="url(#SVGID_1)" r="8.824"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="15" x2="15" y1="3.53" y2="26.43">
-<stop offset="0" stop-color="#FF4D00"/>
-<stop offset="1" stop-color="#800000"/>
+<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"/>
 </linearGradient>
-<path d="M15.001,3.53C8.665,3.53,3.53,8.665,3.53,15.001c0,6.335,5.135,11.472,11.471,11.472 c6.335,0,11.472-5.137,11.472-11.472C26.473,8.665,21.336,3.53,15.001,3.53z M15.001,7.059c1.579,0,3.044,0.466,4.281,1.259 L8.319,19.282c-0.794-1.236-1.26-2.704-1.26-4.281C7.059,10.613,10.614,7.059,15.001,7.059z M15.001,22.942 c-1.702,0-3.274-0.539-4.567-1.452L21.49,10.434c0.913,1.292,1.452,2.865,1.452,4.567C22.942,19.387,19.387,22.942,15.001,22.942z" fill="url(#SVGID_2)"/>
-<path d="M15.001,4.412c6.187,0,11.216,4.901,11.449,11.03 c0.005-0.148,0.022-0.292,0.022-0.441c0-6.336-5.137-11.471-11.472-11.471C8.665,3.53,3.53,8.665,3.53,15.001 c0,0.149,0.017,0.293,0.022,0.441C3.786,9.313,8.814,4.412,15.001,4.412z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<rect fill="none" height="30.002" width="30.002"/>
+<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 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_family.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_family.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_family.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,35 +1,38 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g>
 <rect fill="none" height="30" width="30"/>
-<path d="M29.813,21.146c-0.169-0.236-0.379-0.377-1.244-0.93c-2.185-1.396-3.446-2.377-3.757-2.9 c0.68-0.59,1.246-1.32,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.545,1.627,2.145 c-0.295,0.471-1.26,1.248-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.611-1.813,1.707-4.353,3.268 c-0.967,0.594-1.201,0.742-1.38,0.982L0,20.963V27h30v-5.594L29.813,21.146z" fill-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="9" x2="9" y1="4.04" y2="26.26">
-<stop offset="0" stop-color="#4EDEFF"/>
-<stop offset="1" stop-color="#048CC6"/>
+<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"/>
 </linearGradient>
-<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.238,0.004,0.355 C6.896,18.045,1.274,20.928,1,21.295V26h16v-4.701C16.725,20.93,11.104,18.045,10.998,16.348z" fill="url(#SVGID_1)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="9" x2="9" y1="4.04" y2="26.18">
-<stop offset="0" stop-color="#4EDEFF"/>
-<stop offset="0.72" stop-color="#19A3D6"/>
-<stop offset="1" stop-color="#57CDFF"/>
+<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"/>
 </linearGradient>
-<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.238,0.004,0.355 C6.896,18.045,1.274,20.928,1,21.295V26h16v-4.701C16.725,20.93,11.104,18.045,10.998,16.348z M16.111,25.107H1.889V21.75 c0.188-0.121,0.441-0.275,0.676-0.42c2.75-1.689,5.225-3.336,5.324-4.926c0.007-0.119,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.206-0.01,0.335-0.002,0.462c0.1,1.59,2.574,3.238,5.324,4.928c0.234,0.146,0.488,0.299,0.676,0.42V25.107z" fill="url(#SVGID_2)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="22" x2="22" y1="6.38" y2="25.93">
-<stop offset="0" stop-color="#DE8029"/>
-<stop offset="0.26" stop-color="#DE4E29"/>
-<stop offset="1" stop-color="#D82E09"/>
+<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"/>
 </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.125c0.003,0.107,0.01,0.217,0.004,0.322 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 gradientUnits="userSpaceOnUse" id="SVGID_4" x1="22" x2="22" y1="6.04" y2="29.62">
-<stop offset="0" stop-color="#DE8029"/>
-<stop offset="0.26" stop-color="#DE4E29"/>
-<stop offset="1" stop-color="#D86D56"/>
+<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"/>
 </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.125c0.003,0.107,0.01,0.217,0.004,0.322 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.234,0.551-0.355c2.984-1.904,4.617-3.193,4.699-4.551c0.006-0.115,0.004-0.223,0-0.332l-0.016-0.465 l-0.375-0.338c-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.461c-0.006,0.186-0.01,0.309-0.002,0.43c0.082,1.357,1.715,2.646,4.698,4.553c0.189,0.121,0.393,0.25,0.552,0.355V25.092z " fill="url(#SVGID_4)"/>
-<path d="M7.972,27L8,25.973c0.074-2.631,1.977-3.814,3.234-4.596l0.156-0.098l1.674-0.842 c-0.006-0.008-0.012-0.018-0.018-0.025c-0.166-0.232-0.371-0.523-0.547-0.863c-0.744-1.441-0.995-2.395-0.995-3.776 c0-2.632,2.001-4.772,4.462-4.772h0.102c2.445,0.019,4.43,2.152,4.43,4.772c0,1.382-0.252,2.335-0.995,3.776 c-0.177,0.34-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.059 c1.303,0.777,3.271,1.951,3.342,4.441L24.028,27H7.972z" fill-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="16" x2="16" y1="25.9" y2="4.01">
-<stop offset="0" stop-color="#FFFFFF"/>
-<stop offset="1" stop-color="#FCBA63"/>
+<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">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#FCBA63"/>
 </linearGradient>
-<path d="M23,26c-0.062-2.188-2.088-3.121-3.289-3.873l-1.715-1.043c-0.707-0.488,0.129-1.049,0.618-1.994 c0.724-1.402,0.884-2.182,0.884-3.317c0-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.317 c0.488,0.947,1.324,1.506,0.617,1.994l-2.085,1.043C10.72,22.879,9.062,23.813,9,26H23z" fill="url(#SVGID_5)"/>
+<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_)"/>
+<rect fill="none" height="30" width="30"/>
+</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_favorite.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_favorite.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_favorite.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,14 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g>
 <rect fill="none" height="30" width="30"/>
-<polygon fill-opacity="0.6" points="15.006,22.895 5.718,29.71 9.3,18.732 0,11.963 11.473,11.963 15.009,1 18.531,11.963 30,11.963 20.709,18.732 24.281,29.711 "/>
-<path d="M17.823,12.963l-2.816-8.716l-2.827,8.716H3.001l7.444,5.387l-2.863,8.723l7.425-5.416l7.413,5.416 l-2.855-8.723l7.437-5.387H17.823z" fill="url(#SVGID_1)"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="12.906,13.963 15.005,7.493 17.096,13.963 25.621,13.963 27.001,12.963 17.823,12.963 15.007,4.247 12.18,12.963 3.001,12.963 4.383,13.963 "/>
+<polygon fill-opacity="0.6" points="15.006,22.895 5.718,29.71 9.3,18.732 0,11.963 11.473,11.963 15.009,1 18.531,11.963 30,11.963   20.709,18.732 24.281,29.711 " stroke-opacity="0.6"/>
+<path d="M17.823,12.963l-2.816-8.717l-2.827,8.717H3.001l7.444,5.387l-2.862,8.723l7.424-5.416l7.413,5.416  l-2.855-8.723l7.437-5.387H17.823z" fill="url(#SVGID_1_)"/>
+<polygon fill="#FFFFFF" fill-opacity="0.4" points="12.907,13.963 15.005,7.493 17.096,13.963 25.621,13.963 27.001,12.963   17.823,12.963 15.007,4.246 12.18,12.963 3.001,12.963 4.383,13.963 " stroke-opacity="0.4"/>
+<rect fill="none" height="30" width="30"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="15" x2="15" y1="4.25" y2="27.07">
-<stop offset="0" stop-color="#FECF5E"/>
-<stop offset="1" stop-color="#FF9E01"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15.0005" x2="15.0005" y1="4.2461" y2="27.0728">
+<stop offset="0" style="stop-color:#FECF5E"/>
+<stop offset="1" style="stop-color:#FF9E01"/>
 </linearGradient>
 </defs>
+</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_fax.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_fax.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_fax.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,58 +1,89 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 fill-opacity="0.6" points="5,20 5,1 20.414,1 27,7.586 27,20 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="16" x2="16" y1="1.95" y2="18.95">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<path d="M26,8v-2h-1.586l-5-5h-14.41v5h-1v2c-1.654,0-3,1.346-3,3v8c0,1.654,1.346,3,3,3v3h1v4h20v-4h1v-3c1.654,0,3-1.346,3-3v-8c0-1.654-1.35-3-3-3z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="7" y2="10">
+<stop offset="0" stop-color="#808080"/>
+<stop offset="1" stop-color="#636363"/>
+</linearGradient>
+<rect fill="url(#SVGID_1_)" height="3" width="20" x="5" y="7"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="15" x2="15" y1="21" y2="24">
+<stop offset="0" stop-color="#808080"/>
+<stop offset="1" stop-color="#636363"/>
+</linearGradient>
+<rect fill="url(#SVGID_2_)" height="3" width="20" x="5" y="21"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="15" x2="15" y1="2.002" y2="28.06">
 <stop offset="0" stop-color="#EDEDED"/>
 <stop offset="1" stop-color="#BDBDBD"/>
 </linearGradient>
-<polygon fill="url(#SVGID_1)" points="26,8 26,19 6,19 6,2 20,2 "/>
-<rect height="1.5" width="2" x="9" y="5"/>
-<rect height="1.5" width="11" x="12" y="5"/>
-<path d="M26,11H10.857C10.41,9.279,8.858,8,7,8c-1.915,0-3.517,1.354-3.906,3.155C1.884,11.542,1,12.664,1,14v12 c0,1.654,1.346,3,3,3h22c1.654,0,3-1.346,3-3V14C29,12.346,27.654,11,26,11z" fill-opacity="0.6"/>
-<rect height="1.5" width="2" x="9" y="8.5"/>
-<rect height="1.5" width="11" x="12" y="8.5"/>
-<polygon fill="#FFFFFF" points="20,8 26,8 20,2 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="15" x2="15" y1="12.15" y2="28.01">
+<rect fill="url(#SVGID_3_)" height="10" width="18" x="6" y="18"/>
+<rect fill-opacity="0.5" height="1.5" stroke-opacity="0.5" width="2" x="8" y="23.5"/>
+<rect fill-opacity="0.5" height="1.5" stroke-opacity="0.5" width="11" x="11" y="23.5"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="15" x2="15" y1="2" y2="28.07">
+<stop offset="0" stop-color="#EDEDED"/>
+<stop offset="1" stop-color="#BDBDBD"/>
+</linearGradient>
+<polygon fill="url(#SVGID_4_)" points="24,7,24,19,6,19,6,2,19,2"/>
+<rect fill-opacity="0.5" height="1.5" stroke-opacity="0.5" width="2" x="8" y="5"/>
+<rect fill-opacity="0.5" height="1.5" stroke-opacity="0.5" width="11" x="11" y="5"/>
+<polygon fill="#FFFFFF" points="19,7,24,7,19,2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="15" x2="15" y1="9.115" y2="21.01">
 <stop offset="0" stop-color="#E6E6E6"/>
 <stop offset="1" stop-color="#626262"/>
 </linearGradient>
-<path d="M28,26c0,1.1-0.9,2-2,2H4c-1.1,0-2-0.9-2-2V14c0-1.1,0.9-2,2-2h22c1.1,0,2,0.9,2,2V26z" fill="url(#SVGID_2)"/>
-<path d="M26,12H4c-1.1,0-2,0.9-2,2v1c0-1.1,0.9-2,2-2h22c1.1,0,2,0.9,2,2v-1C28,12.9,27.1,12,26,12z" fill="#FFFFFF" fill-opacity="0.4"/>
-<path d="M7,27c2.206,0,4-1.794,4-4V12H3v11C3,25.206,4.794,27,7,27z" fill-opacity="0.1"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="7" x2="7" y1="9.16" y2="26.01">
-<stop offset="0" stop-color="#A0A7A8"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M10,23c0,1.65-1.35,3-3,3l0,0c-1.65,0-3-1.35-3-3V12c0-1.65,1.35-3,3-3l0,0c1.65,0,3,1.35,3,3V23z" fill="url(#SVGID_3)"/>
-<path d="M7,9c-1.65,0-3,1.35-3,3v1c0-1.65,1.35-3,3-3s3,1.35,3,3v-1C10,10.35,8.65,9,7,9z" fill="#FFFFFF" fill-opacity="0.3"/>
-<path d="M9,15v10.217c0.609-0.55,1-1.337,1-2.217V13L9,15z" fill-opacity="0.3"/>
-<path d="M5,25.217V15l-1-2v10C4,23.88,4.391,24.667,5,25.217z" fill-opacity="0.3"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="15.5" x2="15.5" y1="18" y2="27.98">
+<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"/>
+</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"/>
+</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"/>
 </linearGradient>
-<rect fill="url(#SVGID_4)" height="2" width="3" x="14" y="18"/>
-<rect fill="url(#SVGID_4)" height="2" width="3" x="18" y="18"/>
-<rect fill="url(#SVGID_4)" height="2" width="3" x="22" y="18"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7" x1="15.5" x2="15.5" y1="17" y2="26.98">
+<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"/>
+</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"/>
+</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"/>
 </linearGradient>
-<rect fill="url(#SVGID_7)" height="2" width="3" x="14" y="21"/>
-<rect fill="url(#SVGID_7)" height="2" width="3" x="18" y="21"/>
-<rect fill="url(#SVGID_7)" height="2" width="3" x="22" y="21"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10" x1="15.5" x2="15.5" y1="16" y2="25.98">
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_10)" height="2" width="3" x="14" y="24"/>
-<rect fill="url(#SVGID_10)" height="2" width="3" x="18" y="24"/>
-<rect fill="url(#SVGID_10)" height="2" width="3" x="22" y="24"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13" x1="19.5" x2="19.5" y1="14.19" y2="17.06">
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_13)" height="3" width="11" x="14" y="14"/>
+<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"/>
+<rect fill-opacity="0.4" height="1" stroke-opacity="0.4" width="20" x="5" y="21"/>
+<rect fill="none" height="30" width="30"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_fax_home.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,69 +1,100 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 fill-opacity="0.6" points="5,20 5,1 20.414,1 27,7.586 27,20 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="16" x2="16" y1="1.95" y2="18.95">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<path d="M26,8v-2h-1.586l-5-5h-14.41v5h-1v2c-1.654,0-3,1.346-3,3v8c0,1.654,1.346,3,3,3v3h1v4h20v-4h1v-3c1.654,0,3-1.346,3-3v-8c0-1.654-1.35-3-3-3z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="7" y2="10">
+<stop offset="0" stop-color="#808080"/>
+<stop offset="1" stop-color="#636363"/>
+</linearGradient>
+<rect fill="url(#SVGID_1_)" height="3" width="20" x="5" y="7"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="15" x2="15" y1="21" y2="24">
+<stop offset="0" stop-color="#808080"/>
+<stop offset="1" stop-color="#636363"/>
+</linearGradient>
+<rect fill="url(#SVGID_2_)" height="3" width="20" x="5" y="21"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="15" x2="15" y1="2.002" y2="28.06">
 <stop offset="0" stop-color="#EDEDED"/>
 <stop offset="1" stop-color="#BDBDBD"/>
 </linearGradient>
-<polygon fill="url(#SVGID_1)" points="26,8 26,19 6,19 6,2 20,2 "/>
-<rect height="1.5" width="2" x="9" y="5"/>
-<rect height="1.5" width="11" x="12" y="5"/>
-<path d="M26,11H10.857C10.41,9.279,8.858,8,7,8c-1.915,0-3.518,1.354-3.906,3.155C1.884,11.542,1,12.664,1,14v12 c0,1.654,1.346,3,3,3h22c1.654,0,3-1.346,3-3V14C29,12.346,27.654,11,26,11z" fill-opacity="0.6"/>
-<rect height="1.5" width="2" x="9" y="8.5"/>
-<rect height="1.5" width="11" x="12" y="8.5"/>
-<polygon fill="#FFFFFF" points="20,8 26,8 20,2 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="15" x2="15" y1="12.15" y2="28.01">
+<rect fill="url(#SVGID_3_)" height="10" width="18" x="6" y="18"/>
+<rect fill-opacity="0.5" height="1.5" stroke-opacity="0.5" width="2" x="8" y="23.5"/>
+<rect fill-opacity="0.5" height="1.5" stroke-opacity="0.5" width="11" x="11" y="23.5"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="15" x2="15" y1="2" y2="28.07">
+<stop offset="0" stop-color="#EDEDED"/>
+<stop offset="1" stop-color="#BDBDBD"/>
+</linearGradient>
+<polygon fill="url(#SVGID_4_)" points="24,7,24,19,6,19,6,2,19,2"/>
+<rect fill-opacity="0.5" height="1.5" stroke-opacity="0.5" width="2" x="8" y="5"/>
+<rect fill-opacity="0.5" height="1.5" stroke-opacity="0.5" width="11" x="11" y="5"/>
+<polygon fill="#FFFFFF" points="19,7,24,7,19,2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="15" x2="15" y1="9.115" y2="21.01">
 <stop offset="0" stop-color="#E6E6E6"/>
 <stop offset="1" stop-color="#626262"/>
 </linearGradient>
-<path d="M28,26c0,1.1-0.9,2-2,2H4c-1.1,0-2-0.9-2-2V14c0-1.1,0.9-2,2-2h22c1.1,0,2,0.9,2,2V26z" fill="url(#SVGID_2)"/>
-<path d="M26,12H4c-1.1,0-2,0.9-2,2v1c0-1.1,0.9-2,2-2h22c1.1,0,2,0.9,2,2v-1C28,12.9,27.1,12,26,12z" fill="#FFFFFF" fill-opacity="0.4"/>
-<path d="M7,27c2.205,0,4-1.794,4-4V12H3v11C3,25.206,4.795,27,7,27z" fill-opacity="0.1"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="7" x2="7" y1="9.16" y2="26.01">
-<stop offset="0" stop-color="#A0A7A8"/>
+<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"/>
 </linearGradient>
-<path d="M10,23c0,1.65-1.35,3-3,3l0,0c-1.65,0-3-1.35-3-3V12c0-1.65,1.35-3,3-3l0,0c1.65,0,3,1.35,3,3V23z" fill="url(#SVGID_3)"/>
-<path d="M7,9c-1.65,0-3,1.35-3,3v1c0-1.65,1.35-3,3-3s3,1.35,3,3v-1C10,10.35,8.65,9,7,9z" fill="#FFFFFF" fill-opacity="0.3"/>
-<path d="M9,15v10.217c0.609-0.55,1-1.337,1-2.217V13L9,15z" fill-opacity="0.3"/>
-<path d="M5,25.217V15l-1-2v10C4,23.88,4.391,24.667,5,25.217z" fill-opacity="0.3"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="15.5" x2="15.5" y1="18" y2="27.98">
+<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"/>
+</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"/>
 </linearGradient>
-<rect fill="url(#SVGID_4)" height="2" width="3" x="14" y="18"/>
-<rect fill="url(#SVGID_4)" height="2" width="3" x="18" y="18"/>
-<rect fill="url(#SVGID_4)" height="2" width="3" x="22" y="18"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7" x1="15.5" x2="15.5" y1="17" y2="26.98">
+<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"/>
+</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"/>
 </linearGradient>
-<rect fill="url(#SVGID_7)" height="2" width="3" x="14" y="21"/>
-<rect fill="url(#SVGID_7)" height="2" width="3" x="18" y="21"/>
-<rect fill="url(#SVGID_7)" height="2" width="3" x="22" y="21"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10" x1="15.5" x2="15.5" y1="16" y2="25.98">
+<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"/>
+</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"/>
+</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"/>
 </linearGradient>
-<rect fill="url(#SVGID_10)" height="2" width="3" x="14" y="24"/>
-<rect fill="url(#SVGID_10)" height="2" width="3" x="18" y="24"/>
-<rect fill="url(#SVGID_10)" height="2" width="3" x="22" y="24"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13" x1="19.5" x2="19.5" y1="14.19" y2="17.06">
+<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"/>
+</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"/>
 </linearGradient>
-<rect fill="url(#SVGID_13)" height="3" width="11" x="14" y="14"/>
-<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"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14" x1="22" x2="22" y1="14.97" y2="29.16">
+<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"/>
+<rect fill-opacity="0.4" height="1" stroke-opacity="0.4" width="20" x="5" y="21"/>
+<rect fill="none" height="30" width="30"/>
+<path d="M22,30c-4.411,0-8-3.589-8-8s3.589-8,8-8,8,3.589,8,8-3.59,8-8,8z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="22" x2="22" y1="14.97" y2="29.16">
 <stop offset="0" stop-color="#4EDEFF"/>
 <stop offset="1" stop-color="#048CC6"/>
 </linearGradient>
-<circle cx="22" cy="22" fill="url(#SVGID_14)" 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 "/>
-<polygon fill-opacity="0.2" points="21.999,20.857 18,25.098 18,27 21,27 21,24 23,24 23,27 26,27 26,25.097 "/>
-<path d="M22,16c3.697,0,6.717,2.869,6.975,6.5C28.986,22.334,29,22.169,29,22c0-3.865-3.134-7-7-7 s-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"/>
-<polygon fill="#FFFFFF" points="26.34,23 21.999,18.4 17.66,23 17,22.3 21.999,17 27,22.3 26.34,23 "/>
-<polygon fill="#FFFFFF" points="21.999,19.857 18,24.098 18,26 21,26 21,23 23,23 23,26 26,26 26,24.097 "/>
+<circle cx="22" cy="22" fill="url(#SVGID_16_)" r="7"/>
+<polygon fill-opacity="0.2" points="26.34,24,22,19.4,17.66,24,17,23.3,22,18,27,23.3,26.34,24" stroke-opacity="0.2"/>
+<polygon fill-opacity="0.2" points="22,20.86,18,25.1,18,27,21,27,21,24,23,24,23,27,26,27,26,25.1" stroke-opacity="0.2"/>
+<path d="M22,16c3.697,0,6.717,2.869,6.975,6.5,0.01-0.17,0.02-0.33,0.02-0.5,0-3.865-3.134-7-7-7s-7,3.135-7,7c0,0.169,0.014,0.334,0.025,0.5,0.26-3.63,3.28-6.5,6.98-6.5z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<polygon fill="#FFFFFF" points="26.34,23,22,18.4,17.66,23,17,22.3,22,17,27,22.3,26.34,23"/>
+<polygon fill="#FFFFFF" points="22,19.86,18,24.1,18,26,21,26,21,23,23,23,23,26,26,26,26,24.1"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_fax_work.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,68 +1,99 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 fill-opacity="0.6" points="5,20 5,1 20.414,1 27,7.586 27,20 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="16" x2="16" y1="1.95" y2="18.95">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<path d="M26,8v-2h-1.586l-5-5h-14.41v5h-1v2c-1.654,0-3,1.346-3,3v8c0,1.654,1.346,3,3,3v3h1v4h20v-4h1v-3c1.654,0,3-1.346,3-3v-8c0-1.654-1.35-3-3-3z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="7" y2="10">
+<stop offset="0" stop-color="#808080"/>
+<stop offset="1" stop-color="#636363"/>
+</linearGradient>
+<rect fill="url(#SVGID_1_)" height="3" width="20" x="5" y="7"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="15" x2="15" y1="21" y2="24">
+<stop offset="0" stop-color="#808080"/>
+<stop offset="1" stop-color="#636363"/>
+</linearGradient>
+<rect fill="url(#SVGID_2_)" height="3" width="20" x="5" y="21"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="15" x2="15" y1="2.002" y2="28.06">
 <stop offset="0" stop-color="#EDEDED"/>
 <stop offset="1" stop-color="#BDBDBD"/>
 </linearGradient>
-<polygon fill="url(#SVGID_1)" points="26,8 26,19 6,19 6,2 20,2 "/>
-<rect height="1.5" width="2" x="9" y="5"/>
-<rect height="1.5" width="11" x="12" y="5"/>
-<path d="M26,11H10.857C10.41,9.279,8.858,8,7,8c-1.915,0-3.518,1.354-3.906,3.155C1.884,11.542,1,12.664,1,14v12 c0,1.654,1.346,3,3,3h22c1.654,0,3-1.346,3-3V14C29,12.346,27.654,11,26,11z" fill-opacity="0.6"/>
-<rect height="1.5" width="2" x="9" y="8.5"/>
-<rect height="1.5" width="11" x="12" y="8.5"/>
-<polygon fill="#FFFFFF" points="20,8 26,8 20,2 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="15" x2="15" y1="12.15" y2="28.01">
+<rect fill="url(#SVGID_3_)" height="10" width="18" x="6" y="18"/>
+<rect fill-opacity="0.5" height="1.5" stroke-opacity="0.5" width="2" x="8" y="23.5"/>
+<rect fill-opacity="0.5" height="1.5" stroke-opacity="0.5" width="11" x="11" y="23.5"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="15" x2="15" y1="2" y2="28.07">
+<stop offset="0" stop-color="#EDEDED"/>
+<stop offset="1" stop-color="#BDBDBD"/>
+</linearGradient>
+<polygon fill="url(#SVGID_4_)" points="24,7,24,19,6,19,6,2,19,2"/>
+<rect fill-opacity="0.5" height="1.5" stroke-opacity="0.5" width="2" x="8" y="5"/>
+<rect fill-opacity="0.5" height="1.5" stroke-opacity="0.5" width="11" x="11" y="5"/>
+<polygon fill="#FFFFFF" points="19,7,24,7,19,2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="15" x2="15" y1="9.115" y2="21.01">
 <stop offset="0" stop-color="#E6E6E6"/>
 <stop offset="1" stop-color="#626262"/>
 </linearGradient>
-<path d="M28,26c0,1.1-0.9,2-2,2H4c-1.1,0-2-0.9-2-2V14c0-1.1,0.9-2,2-2h22c1.1,0,2,0.9,2,2V26z" fill="url(#SVGID_2)"/>
-<path d="M26,12H4c-1.1,0-2,0.9-2,2v1c0-1.1,0.9-2,2-2h22c1.1,0,2,0.9,2,2v-1C28,12.9,27.1,12,26,12z" fill="#FFFFFF" fill-opacity="0.4"/>
-<path d="M7,27c2.205,0,4-1.794,4-4V12H3v11C3,25.206,4.795,27,7,27z" fill-opacity="0.1"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="7" x2="7" y1="9.16" y2="26.01">
-<stop offset="0" stop-color="#A0A7A8"/>
+<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"/>
 </linearGradient>
-<path d="M10,23c0,1.65-1.35,3-3,3l0,0c-1.65,0-3-1.35-3-3V12c0-1.65,1.35-3,3-3l0,0c1.65,0,3,1.35,3,3V23z" fill="url(#SVGID_3)"/>
-<path d="M7,9c-1.65,0-3,1.35-3,3v1c0-1.65,1.35-3,3-3s3,1.35,3,3v-1C10,10.35,8.65,9,7,9z" fill="#FFFFFF" fill-opacity="0.3"/>
-<path d="M9,15v10.217c0.609-0.55,1-1.337,1-2.217V13L9,15z" fill-opacity="0.3"/>
-<path d="M5,25.217V15l-1-2v10C4,23.88,4.391,24.667,5,25.217z" fill-opacity="0.3"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="15.5" x2="15.5" y1="18" y2="27.98">
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_4)" height="2" width="3" x="14" y="18"/>
-<rect fill="url(#SVGID_4)" height="2" width="3" x="18" y="18"/>
-<rect fill="url(#SVGID_4)" height="2" width="3" x="22" y="18"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7" x1="15.5" x2="15.5" y1="17" y2="26.98">
+<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"/>
+</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"/>
+</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"/>
+</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"/>
 </linearGradient>
-<rect fill="url(#SVGID_7)" height="2" width="3" x="14" y="21"/>
-<rect fill="url(#SVGID_7)" height="2" width="3" x="18" y="21"/>
-<rect fill="url(#SVGID_7)" height="2" width="3" x="22" y="21"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10" x1="15.5" x2="15.5" y1="16" y2="25.98">
+<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"/>
+</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"/>
+</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"/>
 </linearGradient>
-<rect fill="url(#SVGID_10)" height="2" width="3" x="14" y="24"/>
-<rect fill="url(#SVGID_10)" height="2" width="3" x="18" y="24"/>
-<rect fill="url(#SVGID_10)" height="2" width="3" x="22" y="24"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13" x1="19.5" x2="19.5" y1="14.19" y2="17.06">
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_13)" height="3" width="11" x="14" y="14"/>
-<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"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14" x1="22" x2="22" y1="14.97" y2="29.16">
+<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"/>
+<rect fill-opacity="0.4" height="1" stroke-opacity="0.4" width="20" x="5" y="21"/>
+<rect fill="none" height="30" width="30"/>
+<path d="M22,30c-4.411,0-8-3.589-8-8s3.589-8,8-8,8,3.589,8,8-3.59,8-8,8z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="22" x2="22" y1="14.97" y2="29.16">
 <stop offset="0" stop-color="#4EDEFF"/>
 <stop offset="1" stop-color="#048CC6"/>
 </linearGradient>
-<circle cx="22" cy="22" fill="url(#SVGID_14)" r="7"/>
-<path d="M23,21v-2h-5v8h4h1h3v-6H23z M22,25h-3v-1h3V25z M22,23h-3v-1h3V23z M19,21v-1h3v1H19z M25,25h-2v-1h2V25z M25,23h-2v-1h2V23z" fill-opacity="0.2"/>
-<path d="M22,16c3.697,0,6.717,2.869,6.975,6.5C28.986,22.334,29,22.169,29,22c0-3.865-3.134-7-7-7 s-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"/>
-<path d="M23,20v-2h-5v8h4h1h3v-6H23z M22,24h-3v-1h3V24z M22,22h-3v-1h3V22z M19,20v-1h3v1H19z M25,24h-2v-1h2V24z M25,22h-2v-1h2V22z" fill="#FFFFFF"/>
-<rect fill-opacity="0.3" height="6" width="1" x="23" y="20"/>
+<circle cx="22" cy="22" fill="url(#SVGID_16_)" r="7"/>
+<path d="M23,21v-2h-5v8h8v-6h-3zm-1,4h-3v-1h3v1zm0-2h-3v-1h3v1zm-3-2v-1h3v1h-3zm6,4h-2v-1h2v1zm0-2h-2v-1h2v1z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M22,16c3.697,0,6.717,2.869,6.975,6.5,0.01-0.17,0.02-0.33,0.02-0.5,0-3.865-3.134-7-7-7s-7,3.135-7,7c0,0.169,0.014,0.334,0.025,0.5,0.26-3.63,3.28-6.5,6.98-6.5z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M23,20v-2h-5v8h8v-6h-3zm-1,4h-3v-1h3v1zm0-2h-3v-1h3v1zm-3-2v-1h3v1h-3zm6,4h-2v-1h2v1zm0-2h-2v-1h2v1z" fill="#FFFFFF"/>
+<rect fill-opacity="0.3" height="6" stroke-opacity="0.3" width="1" x="23" y="20"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_flash.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_flash.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<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"/>
+</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"/>
+</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"/>
+<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="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_)"/>
+<path d="M13.201,14.323L13.201,14.323c-1.146,3.284-2.076,4.846-4.512,4.846v2.69c4.125,0,5.691-2.909,6.743-5.779  c0.142,0,3.413,0,3.413,0v-2.693c0,0-2.079,0-2.375,0c1.023-2.216,2.127-3.176,3.876-3.176v-2.69  C16.094,7.521,14.377,10.959,13.201,14.323z" fill="#FFFFFF"/>
+<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="#FFFFFF" fill-opacity="0.3"/>
+<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.8708" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#FFFFFF"/>
+</linearGradient>
+</defs>
+</g>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_folder.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_folder.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<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 "/>
+<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"/>
+<rect fill="#FFFFFF" fill-opacity="0.6" height="1" stroke-opacity="0.6" width="26" x="2" y="10"/>
+<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"/>
+</linearGradient>
+</defs>
+</g>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_follow_up.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,30 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <g>
 <rect fill="none" height="30" width="30"/>
-<rect fill="none" height="30" width="30"/>
-<path d="M24.955,7.031h-5.033c-0.84,0-1.506-0.412-2.352-0.934 c-1.068-0.661-2.281-1.41-4.094-1.41h-3.164V1.875H3.75v3.75h0.938v22.5h4.688v-9.844h4.102c1.281,0,2.168,0.549,3.107,1.13 c0.967,0.597,1.965,1.214,3.338,1.214h5.033l-3.398-6.797L24.955,7.031z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="23.18" x2="9.34" y1="12.65" y2="12.65">
-<stop offset="0" stop-color="#DE8029"/>
-<stop offset="0.26" stop-color="#DE4E29"/>
-<stop offset="1" stop-color="#D82E09"/>
+<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"/>
 </linearGradient>
-<path d="M20.508,13.828l2.93,5.859c0,0-2.344,0-3.516,0c-2.344,0-3.516-2.344-6.445-2.344 c-0.586,0-4.102,0-4.102,0V5.625c0,0,3.516,0,4.102,0c2.93,0,4.102,2.344,6.445,2.344c1.172,0,3.516,0,3.516,0L20.508,13.828z" fill="url(#SVGID_1)"/>
-<path d="M20.273,14.297l2.695,5.391c0.285,0,0.469,0,0.469,0 l-2.93-5.859L20.273,14.297z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M19.922,8.906c0.847,0,2.303,0,3.047,0l0.469-0.938 c0,0-2.344,0-3.516,0c-2.344,0-3.516-2.344-6.445-2.344c-0.586,0-4.102,0-4.102,0v0.938c0,0,3.516,0,4.102,0 C16.406,6.563,17.578,8.906,19.922,8.906z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="8.44" x2="5.66" y1="15.94" y2="15.94">
-<stop offset="0" stop-color="#8C8E8F"/>
-<stop offset="0.65" stop-color="#D9D9D9"/>
-<stop offset="1" stop-color="#AEB2B3"/>
+<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.6545" style="stop-color:#D9D9D9"/>
+<stop offset="1" style="stop-color:#AEB2B3"/>
 </linearGradient>
-<rect fill="url(#SVGID_2)" height="22.5" width="2.813" x="5.625" y="4.688"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="9.34" x2="4.73" y1="3.75" y2="3.75">
-<stop offset="0" stop-color="#4F4F4F"/>
-<stop offset="0.59" stop-color="#BFBFBF"/>
-<stop offset="1" stop-color="#6B6B6B"/>
+<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">
+<stop offset="0" style="stop-color:#4F4F4F"/>
+<stop offset="0.589" style="stop-color:#BFBFBF"/>
+<stop offset="1" style="stop-color:#6B6B6B"/>
 </linearGradient>
-<rect fill="url(#SVGID_3)" height="1.875" width="4.688" x="4.688" y="2.813"/>
-<rect fill-opacity="0.2" height="0.938" stroke-opacity="0.2" width="2.813" x="5.625" y="4.688"/>
+<rect fill="url(#SVGID_3_)" height="2" width="5" x="5" y="2"/>
+<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="3" x="6" y="4"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_forward.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_forward.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_forward.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,13 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <g>
-<polygon points="14.849,19.688 1.724,19.688 1.724,10.313 14.849,10.313   14.849,3.624 28.502,15 14.849,26.377 " style="opacity:0.6;enable-background:new    ;"/>
-<polygon points="15.787,18.75 2.662,18.75 2.662,11.25 15.787,11.25 15.787,5.625 27.037,15   15.787,24.375 " style="fill:url(#SVGID_1_);"/>
-<polygon points="15.787,6.689 15.787,5.625 27.037,15 26.398,15.531   " style="opacity:0.5;fill:#FFFFFF;enable-background:new    ;"/>
-<rect height="1.064" style="opacity:0.5;fill:#FFFFFF;enable-background:new    ;" width="13.125" x="2.662" y="11.25"/>
+<rect fill="none" height="30" width="30"/>
+<polygon fill-opacity="0.6" points="15,20 1,20 1,10 15,10 15,2.865 29.563,15 15,27.135 "/>
+<polygon fill="url(#SVGID_1_)" points="16,19 2,19 2,11 16,11 16,5 28,15 16,25 "/>
+<polygon fill="#FFFFFF" fill-opacity="0.5" points="16,6.135 16,5 28,15 27.319,15.567 " stroke-opacity="0.5"/>
+<rect fill="#FFFFFF" fill-opacity="0.5" height="1.135" stroke-opacity="0.5" width="14" x="2" y="11"/>
+<rect fill="none" height="30" width="30"/>
 <defs>
-<linearGradient gradientTransform="matrix(-0.9375 0 0 -0.9375 259.4639 -342.6895)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="260.9219" x2="260.9219" y1="-371.4199" y2="-391.7959">
+<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"/>
 </linearGradient>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_gprs.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_gprs.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_gprs.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,17 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <g>
-<path d="M15.001,27.354c-6.813,0-12.354-5.542-12.354-12.354  c0-6.813,5.541-12.354,12.354-12.354c6.812,0,12.354,5.541,12.354,12.354C27.354,21.813,21.813,27.354,15.001,27.354L15.001,27.354z  " style="opacity:0.6;enable-background:new    ;"/>
-<circle cx="15.001" cy="15.001" r="11.471" style="fill:url(#SVGID_1_);"/>
-<path d="M15.001,4.412c6.187,0,11.216,4.901,11.449,11.03  c0.005-0.148,0.022-0.293,0.022-0.441c0-6.336-5.137-11.471-11.472-11.471C8.665,3.53,3.53,8.665,3.53,15.001  c0,0.148,0.017,0.293,0.022,0.441C3.786,9.313,8.814,4.412,15.001,4.412z" style="opacity:0.4;fill:#FFFFFF;enable-background:new    ;"/>
-<polygon points="24.564,14.56 8.342,14.56 8.342,11.913 19.637,11.913   18.508,10.209 20.715,8.748 " style="opacity:0.2;enable-background:new    ;"/>
-<polygon points="7.46,16.324 23.683,16.324 23.683,18.972 12.389,18.972   13.517,20.673 11.31,22.136 " style="opacity:0.2;enable-background:new    ;"/>
-<polygon points="23.683,13.677 7.46,13.677 7.46,11.03 18.754,11.03 17.626,9.327 19.833,7.866 " style="fill:#FFFFFF;"/>
-<polygon points="6.578,15.442 22.801,15.442 22.801,18.09 11.506,18.09 12.634,19.791 10.427,21.254 " style="fill:#FFFFFF;"/>
-<rect height="30.002" style="fill:none;" width="30.002"/>
+<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 "/>
+<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.7822" x2="339.7822" y1="-399.0518" y2="-428.7852">
+<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>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_hs_offline.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_hs_offline.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<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>
+<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 "/>
+<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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+<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 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_hs_widget.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,26 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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"/>
-<rect fill-opacity="0.6" height="28" width="28" x="1" y="1"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="15" x2="15" y1="2" y2="28">
-<stop offset="0" stop-color="#4EDEFF"/>
-<stop offset="1" stop-color="#048CC6"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g>
+<path d="M4.63,28.028c-0.878,0-1.593-0.714-1.593-1.592v-8.962c0-0.878,0.714-1.593,1.593-1.593h8.962  c0.878,0,1.592,0.715,1.592,1.593v8.962c0,0.877-0.714,1.592-1.592,1.592H4.63z" fill-opacity="0.6"/>
+<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"/>
+</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"/>
 </linearGradient>
-<rect fill="url(#SVGID_1)" height="26" width="26" x="2" y="2"/>
-<polygon fill-opacity="0.2" points="20.904,17.24 25.244,16.488 23.202,20.391 25.26,24.286 20.916,23.55 17.848,26.71 17.206,22.352 13.252,20.41 17.199,18.453 17.824,14.092 "/>
-<circle cx="8" cy="9" fill-opacity="0.2" r="4"/>
-<circle cx="21.5" cy="8.5" fill-opacity="0.2" r="2.5"/>
-<rect fill-opacity="0.2" height="10" width="6" x="5" y="17"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="19.26" x2="19.26" y1="25.38" y2="13">
-<stop offset="0" stop-color="#FEAB0E"/>
-<stop offset="0.31" stop-color="#FEAB0E"/>
-<stop offset="0.79" stop-color="#FFDA33"/>
-<stop offset="1" stop-color="#FFE377"/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_2)" points="20.904,16.24 25.244,15.488 23.202,19.391 25.26,23.286 20.916,22.55 17.848,25.71 17.206,21.352 13.252,19.41 17.199,17.453 17.824,13.092 "/>
-<circle cx="8" cy="8" fill="#FFFFFF" r="4"/>
-<circle cx="21.5" cy="7.5" fill="#FFFFFF" r="2.5"/>
-<rect fill="#FFFFFF" height="10" width="6" x="5" y="16"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" width="26" x="2" y="2"/>
+<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"/>
+</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"/>
+</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"/>
+</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_html.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_html.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_html.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,49 +1,47 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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="3,29 3,1 27,1 27,22.414 20.414,29 " stroke-opacity="0.6"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 214.52 -8.0195)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-199.52" x2="-199.52" y1="-10.0195" y2="-36.0195">
-<stop offset="0" style="stop-color:#F9F9F9"/>
-<stop offset="1" style="stop-color:#B5B5B5"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<polygon fill-opacity="0.6" points="3,29,3,1,27,1,27,22.41,20.41,29" stroke-opacity="0.6"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 214.52 -8.0195)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-199.5" x2="-199.5" y1="-10.02" y2="-36.02">
+<stop offset="0" stop-color="#F9F9F9"/>
+<stop offset="1" stop-color="#B5B5B5"/>
 </linearGradient>
-<polygon fill="url(#SVGID_1_)" points="4,2 4,28 20,28 26,22 26,2 "/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 214.52 -8.0195)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-194.6021" x2="-191.5005" y1="-29.936" y2="-33.0376">
-<stop offset="0" style="stop-color:#F9F9F9"/>
-<stop offset="1" style="stop-color:#DCDCDC"/>
+<polygon fill="url(#SVGID_1_)" points="4,2,4,28,20,28,26,22,26,2"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 214.52 -8.0195)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-194.6" x2="-191.5" y1="-29.94" y2="-33.04">
+<stop offset="0" stop-color="#F9F9F9"/>
+<stop offset="1" stop-color="#DCDCDC"/>
 </linearGradient>
-<polygon fill="url(#SVGID_2_)" points="26,22 20,22 20,28 "/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 214.52 -8.0195)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-199.52" x2="-199.52" y1="-5.646" y2="-15.0209">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+<polygon fill="url(#SVGID_2_)" points="26,22,20,22,20,28"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 214.52 -8.0195)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-199.5" x2="-199.5" y1="-5.646" y2="-15.02">
+<stop offset="0" stop-color="#4EDEFF"/>
+<stop offset="1" stop-color="#048CC6"/>
 </linearGradient>
 <rect fill="url(#SVGID_3_)" 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"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 214.52 -8.0195)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-207.52" x2="-207.52" y1="-19.0195" y2="-28.0879">
-<stop offset="0" style="stop-color:#646464"/>
-<stop offset="1" style="stop-color:#3C3C3C"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 214.52 -8.0195)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-207.5" x2="-207.5" y1="-19.02" y2="-28.09">
+<stop offset="0" stop-color="#646464"/>
+<stop offset="1" stop-color="#3C3C3C"/>
 </linearGradient>
-<polygon fill="url(#SVGID_4_)" points="9,18.502 6.332,15.5 9,12.498 9,11 5,15.5 9,20 "/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 214.52 -8.0195)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="-191.52" x2="-191.52" y1="-19.0195" y2="-28.0879">
-<stop offset="0" style="stop-color:#646464"/>
-<stop offset="1" style="stop-color:#3C3C3C"/>
+<polygon fill="url(#SVGID_4_)" points="9,18.5,6.332,15.5,9,12.5,9,11,5,15.5,9,20"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 214.52 -8.0195)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="-191.5" x2="-191.5" y1="-19.02" y2="-28.09">
+<stop offset="0" stop-color="#646464"/>
+<stop offset="1" stop-color="#3C3C3C"/>
 </linearGradient>
-<polygon fill="url(#SVGID_5_)" points="21,18.502 23.668,15.5 21,12.498 21,11 25,15.5 21,20 "/>
+<polygon fill="url(#SVGID_5_)" points="21,18.5,23.67,15.5,21,12.5,21,11,25,15.5,21,20"/>
 <rect fill="none" height="30" width="30"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="11.6978" x2="11.6978" y1="19.5166" y2="14.9374">
-<stop offset="0" style="stop-color:#646464"/>
-<stop offset="1" style="stop-color:#3C3C3C"/>
-</linearGradient>
-<rect fill="url(#SVGID_6_)" height="1.049" width="1.049" x="11.173" y="14.919"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="14.9888" x2="14.9888" y1="19.5166" y2="14.9374">
-<stop offset="0" style="stop-color:#646464"/>
-<stop offset="1" style="stop-color:#3C3C3C"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="11.7" x2="11.7" y1="19.52" y2="14.94">
+<stop offset="0" stop-color="#646464"/>
+<stop offset="1" stop-color="#3C3C3C"/>
 </linearGradient>
-<rect fill="url(#SVGID_7_)" height="1.049" width="1.049" x="14.464" y="14.919"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="18.2793" x2="18.2793" y1="19.5166" y2="14.9374">
-<stop offset="0" style="stop-color:#646464"/>
-<stop offset="1" style="stop-color:#3C3C3C"/>
+<rect fill="url(#SVGID_6_)" height="1.049" width="1.049" x="11.17" y="14.92"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="14.99" x2="14.99" y1="19.52" y2="14.94">
+<stop offset="0" stop-color="#646464"/>
+<stop offset="1" stop-color="#3C3C3C"/>
 </linearGradient>
-<rect fill="url(#SVGID_8_)" height="1.049" width="1.05" x="17.754" y="14.919"/>
-</g>
+<rect fill="url(#SVGID_7_)" height="1.049" width="1.049" x="14.46" y="14.92"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="18.28" x2="18.28" y1="19.52" y2="14.94">
+<stop offset="0" stop-color="#646464"/>
+<stop offset="1" stop-color="#3C3C3C"/>
+</linearGradient>
+<rect fill="url(#SVGID_8_)" height="1.049" width="1.05" x="17.75" y="14.92"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_im.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_im.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<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"/>
+<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="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"/>
+<rect fill="#FFFFFF" height="1.084" width="13" x="8.5" y="12.688"/>
+<rect fill-opacity="0.2" height="0.541" stroke-opacity="0.2" width="13" x="8.5" y="13.771"/>
+<rect fill="#FFFFFF" height="1.084" width="13" x="8.5" y="16.688"/>
+<rect fill-opacity="0.2" height="0.541" stroke-opacity="0.2" width="13" x="8.5" y="17.771"/>
+<rect fill="none" height="30" width="30"/>
+<defs>
+<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"/>
+</linearGradient>
+</defs>
+</g>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_image.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_image.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_image.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,55 +1,53 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <rect fill-opacity="0.6" height="24" stroke-opacity="0.6" width="30" y="3"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="4" y2="26.0005">
-<stop offset="0" style="stop-color:#DFDFDF"/>
-<stop offset="1" style="stop-color:#B5B5B5"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="4" y2="26">
+<stop offset="0" stop-color="#DFDFDF"/>
+<stop offset="1" stop-color="#B5B5B5"/>
 </linearGradient>
 <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.7925" x2="22.6119" y1="4.7925" y2="22.6119">
-<stop offset="0" style="stop-color:#7EBA3E"/>
-<stop offset="1" style="stop-color:#33773B"/>
+<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"/>
 </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.9941" x2="32.6463" y1="10.3887" y2="24.211">
-<stop offset="0" style="stop-color:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
+<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"/>
 </linearGradient>
-<path d="M27,18.734c-0.327-0.234-0.694-0.459-1.109-0.658c-2.262-1.08-9.354-2.498-14.109-4.163  c-4.755-1.665-3.118-3.442-3.118-3.442c-0.106-0.389-0.37-0.777-0.792-0.111c-1.122,1.768,1.143,3.228,3.646,4.163  c3.118,1.166,10.332,2.419,13.158,4.385c0.956,0.665,1.717,1.31,2.324,1.905V18.734z" fill="url(#SVGID_3_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="9.4702" x2="23.2827" y1="14.5" y2="27.5">
-<stop offset="0" style="stop-color:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
+<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"/>
 </linearGradient>
-<path d="M9.721,19.187c0.528,0.444,2.42,0.806,4.28-1.056c1.109-1.109,1.109-2.774,1.109-2.774  s-2.008-0.611-3.857,0.721C9.404,17.41,9.193,18.742,9.721,19.187z" fill="url(#SVGID_4_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="8.7988" x2="22.6113" y1="15.2119" y2="28.2119">
-<stop offset="0" style="stop-color:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
+<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"/>
 </linearGradient>
-<path d="M5.061,13.933c0.216,0.342,1.197,0.887,2.528,0.207c0.794-0.407,1.071-1.322,1.071-1.322  s-1.002-0.704-2.24-0.312C5.182,12.899,4.845,13.591,5.061,13.933z" fill="url(#SVGID_5_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="11.875" x2="25.6931" y1="11.9438" y2="24.9491">
-<stop offset="0" style="stop-color:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
+<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"/>
 </linearGradient>
-<path d="M13.896,11.027c-0.37-0.389-1.385-0.848-2.748,0.333c-0.814,0.705-0.824,1.946-0.824,1.946  s1.352,0.163,2.435-0.447C14.013,12.153,14.226,11.374,13.896,11.027z" fill="url(#SVGID_6_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="14.2427" x2="28.0604" y1="9.4248" y2="22.4297">
-<stop offset="0" style="stop-color:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
-</linearGradient>
-<path d="M21.426,13.081c-0.32-0.434-1.374-0.805-2.537,0.389c-0.754,0.773-1.008,2.501-1.008,2.501  s1.352,0.163,2.436-0.448C21.568,14.817,21.875,13.691,21.426,13.081z" fill="url(#SVGID_7_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="12.082" x2="25.8945" y1="11.7251" y2="24.7251">
-<stop offset="0" style="stop-color:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
+<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"/>
 </linearGradient>
-<path d="M17.928,22.484c0.671,0.473,3.591,1.17,5.955-0.809c1.411-1.182,0.898-3.266,0.898-3.266  s-3.038-1.205-5.391,0.213C17.039,20.04,17.255,22.012,17.928,22.484z" fill="url(#SVGID_8_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="16.7793" x2="30.5881" y1="6.7383" y2="19.7348">
-<stop offset="0" style="stop-color:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
+<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"/>
 </linearGradient>
-<path d="M27,13.388c-0.542,0.568-1.025,1.292-1.342,2.203c-0.617,1.781,0.855,3.279,0.855,3.279  S26.701,18.831,27,18.74V13.388z" fill="url(#SVGID_9_)"/>
+<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"/>
+</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"/>
-</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_internet.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_internet.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_internet.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,36 +1,37 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g>
 <rect fill="none" height="30" width="30"/>
-<path d="M15.001,27.188c-6.721,0-12.188-5.467-12.188-12.187 c0-6.721,5.467-12.188,12.188-12.188c6.72,0,12.187,5.467,12.187,12.188C27.188,21.721,21.721,27.188,15.001,27.188L15.001,27.188z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<radialGradient cx="14.83" cy="11" gradientUnits="userSpaceOnUse" id="SVGID_1" r="13.9">
-<stop offset="0" stop-color="#94FFFF"/>
-<stop offset="0.5" stop-color="#36B5FF"/>
-<stop offset="1" stop-color="#1B66D8"/>
+<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"/>
 </radialGradient>
-<circle cx="15" cy="15.001" fill="url(#SVGID_1)" r="11.25"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="3.75" x2="6.33" y1="16.28" y2="16.28">
-<stop offset="0" stop-color="#58595B"/>
-<stop offset="1" stop-color="#000000"/>
+<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"/>
+</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"/>
+</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"/>
 </linearGradient>
-<path d="M4.318,18.518l2.013-1.711v-1.326L5.2,14.35 l-0.207-0.219l-0.312-0.044c0,0-0.266-0.037-0.385-0.037l-0.499,0.003c-0.026,0.313-0.048,0.628-0.048,0.948 C3.75,16.23,3.955,17.409,4.318,18.518z" fill="url(#SVGID_2)" fill-opacity="0.3" stroke-opacity="0.3"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="6.77" x2="26.1" y1="13.53" y2="13.53">
-<stop offset="0" stop-color="#58595B"/>
-<stop offset="1" stop-color="#000000"/>
-</linearGradient>
-<path d="M18.123,4.199C18.063,4.235,18,4.271,17.939,4.304 c-0.102-0.013-0.229-0.028-0.364-0.045l0.017-0.198c-0.037-0.008-1.751-0.311-2.591-0.311c-2.647,0-5.077,0.92-6.999,2.452 l1.206,0.401C9.37,6.658,9.542,6.686,9.72,6.686c0.506,0,0.946-0.223,1.266-0.387c0.045-0.021,0.088-0.045,0.127-0.064 c0.061,0.007,0.122,0.011,0.184,0.011c-0.076,0.155-0.134,0.299-0.161,0.456c-0.244,0.001-0.732,0.034-1.607,1.186L9.092,8.461 l0.213,0.273c-1.978,1.538-1.993,1.63-2.043,1.939l-0.047,0.15c-0.399,1.244-0.579,2.083-0.32,2.683 c0.467,1.073,1.047,2.222,2.026,2.302c0.069,0.006,0.146,0.009,0.229,0.009c0.463,0,1.111-0.099,1.604-0.188 c0.015,0.028,0.298,0.541,0.298,0.541l0.672-0.02c0.197,0.637,0.432,1.508,0.457,1.883c-0.819,1.457,0.241,3.164,0.702,3.909 l0.06,0.099c0.142,0.398,0.484,1.17,1.386,1.17c0,0,0.89,0.102,1.055,0.102c0.491,0,0.918-0.174,1.272-0.513 c0.328-0.094,0.531-0.288,0.646-0.508c0.094-0.087,0.209-0.196,0.314-0.331c0.01-0.006,0.384-0.116,0.384-0.116l0.259-0.319 c0.024-0.03,0.035-0.062,0.057-0.092c0.031,0.051,0.051,0.104,0.094,0.152c0.226,0.26,0.545,0.403,0.897,0.403 c0.1,0,0.204-0.013,0.306-0.034c0.869-0.197,1.984-1.789,2.087-2.721c0.067-0.609-0.212-1.138-0.725-1.381l-0.597-0.28l-0.578,0.579 c-0.043-0.514-0.01-0.69,0.147-0.801c0,0,0.465-0.411,0.642-0.553c0.484-0.389,1.086-0.873,1.453-1.77 c0.094-0.24,0.269-0.692,0.13-1.146l0.908-0.872c0.97,2.266,1.224,2.648,1.909,2.66l0.596-0.015l0.281-0.338 c0.139-0.166,0.285-0.453,0.209-0.882c-0.011-0.189,0-0.747,0.018-1.239C25.395,8.882,22.252,5.391,18.123,4.199z" fill="url(#SVGID_3)" fill-opacity="0.3" stroke-opacity="0.3"/>
-<radialGradient cx="14.88" cy="11.02" gradientUnits="userSpaceOnUse" id="SVGID_4" r="10.52">
-<stop offset="0" stop-color="#7AF200"/>
-<stop offset="0.32" stop-color="#7AF200"/>
-<stop offset="1" stop-color="#1CAD0F"/>
-</radialGradient>
-<path d="M4.262,14.994L4.262,14.994c0,0.005,0.001,0.007,0.001,0.01c0,0.334,0.021,0.666,0.05,0.994 c0.01,0.106,0.025,0.215,0.038,0.322c0.028,0.224,0.062,0.447,0.102,0.666c0.022,0.117,0.044,0.234,0.068,0.35 c0.051,0.227,0.143,0.143,0.143,0.143l0.73-0.982v-0.627l-0.856-0.856C4.539,15.013,4.263,14.97,4.262,14.994z" fill="url(#SVGID_4)"/>
-<radialGradient cx="14.88" cy="9.73" gradientUnits="userSpaceOnUse" id="SVGID_5" r="11.72">
-<stop offset="0" stop-color="#7AF200"/>
-<stop offset="0.32" stop-color="#7AF200"/>
-<stop offset="1" stop-color="#1CAD0F"/>
-</radialGradient>
-<path d="M11.138,5.282c0.316,0.103,0.575-0.108,0.869-0.295c0.104-0.021,1.261-0.482,1.386-0.482 c0.125,0,0.545-0.017,0.649-0.183c0,0,1.809,0.314,2.081,0.21c0.147-0.059,0.771-0.108,1.306-0.143 c-0.029-0.007-0.058-0.016-0.087-0.022c-0.028-0.005-0.058-0.01-0.087-0.016c-0.336-0.067-0.676-0.122-1.021-0.157 c-0.002,0-0.004,0-0.008-0.001c-0.363-0.037-0.731-0.056-1.105-0.056c-0.346,0-0.688,0.02-1.027,0.053 c-0.059,0.006-0.119,0.013-0.178,0.02c-0.328,0.036-0.652,0.083-0.97,0.147c-0.005,0.002-0.012,0.003-0.017,0.003 c-0.332,0.068-0.654,0.153-0.971,0.25c-0.055,0.016-0.107,0.034-0.161,0.051c-0.282,0.09-0.561,0.191-0.833,0.304 c-0.031,0.014-0.064,0.025-0.096,0.039c-0.3,0.128-0.593,0.27-0.878,0.423C9.944,5.448,9.903,5.473,9.861,5.498 C9.738,5.565,9.624,5.641,9.504,5.713C10.093,5.91,10.827,5.176,11.138,5.282z" fill="url(#SVGID_5)"/>
-<path d="M21.547,10.445l0.615,0.263c0,0,0.113,0.102,0.426,0.425c0.254-0.021,0.723,0.283,0.953,0.577 c0.047,0.059,1.232,3.022,1.466,3.026c0.103,0,0.509-0.616,0.568-1.376c0.036-0.458-0.244-1.399-0.255-1.431 c-0.966-3.241-3.412-5.841-6.557-7.018c-0.234,0.138-0.637,0.365-0.637,0.365s-2.769-0.378-2.957-0.189 c-0.189,0.189-0.927,0.382-1.096,0.405c-0.167,0.021-0.515,0.111-0.098,0.625c-0.063,0.064-1.253,0.893-1.253,0.516 c0-0.378,0.266-1.052-0.107-0.691c-0.269,0.26-0.429,0.611-0.463,0.678c-0.088,0.169-0.141,0.25-0.079,0.731 c0.065,0.481-0.767,0.478-0.824,0.354c-0.149-0.336-0.974,0.751-0.974,0.751L10.623,8.9c0,0-2.43,1.873-2.451,1.998 c-0.021,0.126-0.626,1.751-0.417,2.235c0.211,0.484,0.742,1.701,1.243,1.742c0.657,0.054,2.255-0.301,2.255-0.301 c0.043,0.106,0.343,0.642,0.343,0.642s0.783-0.025,0.827,0.059c0.015,0.028,0.943,2.758,0.637,3.122 c-0.73,1.096,0.418,2.7,0.738,3.242c0.32,0.934,0.527,0.516,0.948,0.669c0.519,0.046,0.955,0.236,1.396-0.329 c0.127-0.105,0.344-0.022,0.344-0.17c0-0.082,0.375-0.322,0.473-0.548c0.102-0.048,0.363-0.224,0.541-0.309 c0.16-0.011-0.153-0.441,0.166-0.897c0.344-0.137,1.273-0.763,1.273-0.763c0.042-0.918-0.451-2.054,0.471-2.706 c0.596-0.605,1.375-0.95,1.753-1.873c0.104-0.272,0.337-0.831-0.333-0.664c-0.631,0.16-1.336,0.195-1.002-0.083 c-0.039-0.341-0.459-0.501-0.836-0.836c-0.194-0.459-0.501-1.281-0.501-1.281l-0.669-1.016l1.12-0.257l0.454,0.762l0.879,0.923 c0.293,0.96,0.461,1.27,0.461,1.27c0.439-0.155,0.784-0.318,0.784-0.318l1.022-0.981c0,0-0.105-0.313-0.521-0.709l-0.746,0.076 l-0.883-1.057l0.329-0.066L21.547,10.445z M15.33,5.672c0.083-0.249,0.564-0.332,0.564-0.332s0.305,0.276,0.336,0.408 c0.032,0.132-0.381,0.356-0.41,0.668c-0.027,0.312-0.883-0.032-0.93-0.141C14.843,6.165,15.245,5.918,15.33,5.672z M17.39,9.875 c-0.356,0-2.39,0.731-2.39,0.731l-1.495-1.148l-1.629,0.426l-0.762-0.391l-0.484-0.444l0.956-0.328c0,0,0.771-0.634,1-0.822 c0.196-0.16,0.976-0.069,0.976-0.069l0.625-0.209l1.418,0.056l-0.529,0.566l0.745,0.508l0.345-0.309 c0.111,0.264,1.225,0.821,1.225,0.821S17.85,9.205,18.073,9.4C18.043,10.266,17.537,9.917,17.39,9.875z M18.203,8.477L16.436,7.5 l0.186-0.507l0.996,0.234l1.133-0.02L18.203,8.477z M19.473,8.594c0,0-0.16-0.546,0.425-0.844c0.723-0.091,0.923,0.395,0.923,0.395 l0.938,0.938l-0.254,0.605L19.473,8.594z" fill="url(#SVGID_5)"/>
-<path d="M20.577,18.703l-0.696,0.695c0,0-0.42,0-0.439,0.168c-0.01,0.071-0.033,0.382-0.104,0.542 c-0.139,0.098-0.307,0.417-0.307,0.417s-0.086,0.62,0.377,0.516C19.869,20.936,21.291,19.039,20.577,18.703z" fill="url(#SVGID_5)"/>
+</defs>
+</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_intranet.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_intranet.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_intranet.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,34 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <g>
-<path d="M13.236,27.354v-1.917c-0.655-0.111-1.298-0.283-1.923-0.519l-0.96,1.663  l-3.058-1.765l0.96-1.663c-0.512-0.425-0.983-0.896-1.408-1.408l-1.663,0.96l-1.765-3.058l1.663-0.959  c-0.234-0.627-0.408-1.27-0.519-1.924H2.647v-3.53h1.917c0.111-0.654,0.284-1.297,0.518-1.923l-1.662-0.96l1.765-3.058l1.664,0.96  c0.424-0.513,0.896-0.983,1.407-1.407L7.296,5.184l3.057-1.765l0.959,1.663c0.625-0.235,1.269-0.408,1.923-0.518V2.647h3.53v1.917  c0.654,0.11,1.298,0.283,1.924,0.518l0.96-1.663l3.058,1.765l-0.961,1.664c0.513,0.424,0.983,0.896,1.409,1.408l1.663-0.96  l1.764,3.057l-1.663,0.959c0.235,0.626,0.407,1.269,0.519,1.923h1.917v3.53h-1.917c-0.111,0.654-0.283,1.297-0.519,1.924l1.663,0.96  l-1.765,3.058l-1.663-0.961c-0.425,0.514-0.896,0.983-1.408,1.409l0.96,1.663l-3.058,1.765l-0.959-1.664  c-0.626,0.235-1.27,0.407-1.924,0.519v1.917H13.236z" style="opacity:0.6;enable-background:new    ;"/>
-<path d="M26.473,15.883v-1.765h-1.811c-0.102-1.128-0.401-2.198-0.857-3.182l1.57-0.906l-0.883-1.528  l-1.567,0.904c-0.64-0.902-1.427-1.69-2.331-2.33L21.5,5.507l-1.529-0.882l-0.906,1.57c-0.983-0.454-2.053-0.753-3.182-0.855V3.53  h-1.765v1.81C12.99,5.441,11.92,5.74,10.937,6.195l-0.906-1.57L8.502,5.508l0.904,1.569c-0.902,0.639-1.69,1.427-2.33,2.33  L5.508,8.501l-0.882,1.528l1.571,0.906C5.74,11.92,5.441,12.99,5.338,14.118H3.53v1.765h1.809c0.103,1.129,0.402,2.198,0.857,3.182  l-1.571,0.906L5.507,21.5l1.57-0.904c0.64,0.902,1.427,1.69,2.331,2.33l-0.905,1.568l1.528,0.883l0.906-1.57  c0.984,0.456,2.053,0.754,3.182,0.856v1.81h1.765v-1.811c1.129-0.102,2.198-0.4,3.182-0.855l0.906,1.569l1.529-0.882l-0.904-1.569  c0.902-0.64,1.69-1.427,2.33-2.331l1.568,0.906l0.882-1.529l-1.569-0.906c0.455-0.983,0.754-2.053,0.856-3.182H26.473z" style="fill:#FFFFFF;"/>
-<radialGradient cx="482.8145" cy="-901.5898" gradientTransform="matrix(0.309 0 0 -0.309 -134.1975 -266.6604)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="37.6191">
+<rect fill="none" height="30" width="30"/>
+<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"/>
 </radialGradient>
-<circle cx="15.001" cy="15" r="8.824" style="fill:url(#SVGID_1_);"/>
-<path d="M23.51,14.517c-0.195-3.446-2.427-6.415-5.688-7.56l-0.397,0.063  l-2.304-0.442l-2.875,1.714l-0.108,0.724h-1.668l0.658,1.121l-1.785,1.456l-0.417,1.799l1.476,2.613l1.505-0.308l0.55,0.472  l0.429,0.043l0.282,1.11l-0.374,0.972l1.369,3.494h1.393l1.381-1.114v-0.455l0.363-0.567l0.303-0.154  c-0.077,0.117-0.197,0.385-0.197,0.385c-0.012,0.092,0.197,1.87,0.81,1.732c0.465-0.105,2.128-3.195,2.159-3.488  c0.063-0.58-0.252-0.82-0.447-0.911l-0.216-0.102l-0.993,0.995c-0.105,0.008-0.201,0.025-0.289,0.051v-0.826l1.078-1.052  l0.549-1.767l0.836-0.68L20.707,13.5l0.631-0.606l-0.352-0.643l0.27,0.032l1.568,3.515l0.321-0.258  c-0.01-0.172-0.028-0.341-0.049-0.509L23.51,14.517z M15.106,10.565l-0.13-0.35h0.79l0.383,0.862h-0.57v-0.511L15.106,10.565  L15.106,10.565z M17.707,12.302l0.629,0.919l0.043,0.109l-0.645-0.39l-0.155-0.555L17.707,12.302z M18.652,13.907l0.191,0.19  l-0.246,0.056l-0.055-0.069L18.652,13.907z M13.729,7.729l0.4,0.62l-0.455,0.139l-0.177-0.101L13.729,7.729z" style="opacity:0.3;enable-background:new    ;"/>
-<path d="M15.001,6.177c-4.872,0-8.824,3.951-8.824,8.824  c0,4.874,3.952,8.823,8.824,8.823c4.875,0,8.823-3.949,8.823-8.823C23.824,10.128,19.876,6.177,15.001,6.177z M15.001,23.146  c-4.492,0-8.145-3.654-8.145-8.146c0-4.492,3.653-8.146,8.145-8.146c4.491,0,8.145,3.654,8.145,8.146  C23.146,19.492,19.492,23.146,15.001,23.146z" style="opacity:0.3;fill:url(#SVGID_2_);enable-background:new    ;"/>
-<radialGradient cx="340.3594" cy="-404.4678" gradientTransform="matrix(0.8824 0 0 -0.8824 -284.8232 -348.3516)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="11.8606">
+<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"/>
 </radialGradient>
-<path d="M19.781,17.521l-0.918,0.921c0,0-0.555,0-0.581,0.219c-0.013,0.095-0.043,0.505-0.136,0.718  c-0.185,0.127-0.404,0.551-0.404,0.551s-0.114,0.818,0.497,0.68C18.85,20.471,20.725,17.965,19.781,17.521z" style="fill:url(#SVGID_3_);"/>
-<radialGradient cx="340.3604" cy="-404.4697" gradientTransform="matrix(0.8824 0 0 -0.8824 -284.8232 -348.3516)" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="13.7169">
+<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"/>
 </radialGradient>
-<path d="M17.708,7.275c-0.149,0.057-0.253,0.095-0.253,0.095l-2.27-0.432l-1.113,0.696l0.586,0.906  l-1.024,0.313l-0.551-0.313l0.195-0.55L12.559,8.49l-0.13,0.865h-1.367l0.507,0.86l-1.922,1.567l-0.362,1.563l0.712,1.382  l0.428,0.274l1.506-0.307l0.548,0.472l0.5,0.048l0.544,2.126l-0.362,0.94l0.797,1.769l0.226,0.734h1.394l0.789-0.427l0.593-0.689  v-0.834l1.128-0.575v-1.237l0.447-0.849l0.996-0.896l0.238-1.039l-1.304,0.291l-0.341-0.419l0.242-0.389l-0.926-0.56l-0.393-1.417  l0.682-0.445l0.63,0.917l0.236,0.607l0.472,0.472l0.552,0.289l0.613-0.099l0.681-0.655l-0.479-0.875l-0.604,0.158l-0.544-0.648  l0.519-0.362l1.627,0.197v0.578l1.415,2.917l0.322-0.257C22.98,11.171,20.757,8.349,17.708,7.275z M16.971,11.22l-0.745,0.197  h-0.989v-0.513h-0.944l-0.75,0.199l-1.143-0.316l-0.313-0.589l1.575-0.355h1.575L15.001,9.21h0.788l0.438,0.986l0.744,0.259V11.22  L16.971,11.22z M18.664,9.92l-1.339-0.238V9.209l0.669-0.159l0.196-0.235l0.474,0.393V9.92z" style="fill:url(#SVGID_4_);"/>
-<rect height="30.002" style="fill:none;" width="30.002"/>
+<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 gradientTransform="matrix(0.8824 0 0 -0.8824 -284.8232 -348.3516)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="339.7813" x2="339.7813" y1="-401.8247" y2="-421.8779">
+<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"/>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_java.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_java.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<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">
+<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="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="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"/>
+<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>
+<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"/>
+<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="10" x="18" y="26"/>
+<rect fill="none" height="30" width="30"/>
+</g>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_landline.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_landline.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_landline.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,47 +1,73 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g>
 <rect fill="none" height="30" width="30"/>
-<path d="M25,7H11.858c-0.447-1.721-2-3-3.858-3C6.085,4,4.483,5.354,4.094,7.155C2.884,7.542,2,8.664,2,10v13 c0,1.654,1.346,3,3,3h20c1.654,0,3-1.346,3-3V10C28,8.346,26.654,7,25,7z" fill-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="15" x2="15" y1="8.16" y2="25.01">
-<stop offset="0" stop-color="#E6E6E6"/>
-<stop offset="1" stop-color="#626262"/>
+<path d="M25,7H11.858c-0.447-1.721-2-3-3.858-3C6.085,4,4.483,5.354,4.094,7.155C2.884,7.542,2,8.664,2,10v13  c0,1.654,1.346,3,3,3h20c1.654,0,3-1.346,3-3V10C28,8.346,26.654,7,25,7z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="8.1636" y2="25.0077">
+<stop offset="0" style="stop-color:#E6E6E6"/>
+<stop offset="1" style="stop-color:#626262"/>
+</linearGradient>
+<path d="M27,23c0,1.1-0.9,2-2,2H5c-1.1,0-2-0.9-2-2V10c0-1.1,0.9-2,2-2h20c1.1,0,2,0.9,2,2V23z" fill="url(#SVGID_1_)"/>
+<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"/>
 </linearGradient>
-<path d="M27,23c0,1.1-0.9,2-2,2H5c-1.1,0-2-0.9-2-2V10c0-1.1,0.9-2,2-2h20c1.1,0,2,0.9,2,2V23z" fill="url(#SVGID_1)"/>
-<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"/>
-<path d="M8,24c2.206,0,4-1.794,4-4V8H4v12C4,22.206,5.794,24,8,24z" fill-opacity="0.1"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="8" x2="8" y1="5.17" y2="23.01">
-<stop offset="0" stop-color="#A0A7A8"/>
-<stop offset="1" stop-color="#252629"/>
+<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"/>
 </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"/>
-<path d="M10,11v11.217c0.609-0.55,1-1.337,1-2.217V9L10,11z" fill-opacity="0.3"/>
-<path d="M6,22.217V11L5,9v11C5,20.88,5.391,21.667,6,22.217z" fill-opacity="0.3"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="14.5" x2="14.5" y1="14" y2="23.98">
-<stop offset="0" stop-color="#696D6F"/>
-<stop offset="1" stop-color="#252629"/>
+<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"/>
+</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"/>
 </linearGradient>
-<rect fill="url(#SVGID_3)" height="2" width="3" x="13" y="14"/>
-<rect fill="url(#SVGID_3)" height="2" width="3" x="17" y="14"/>
-<rect fill="url(#SVGID_3)" height="2" width="3" x="21" y="14"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6" x1="14.5" x2="14.5" y1="13" y2="22.98">
-<stop offset="0" stop-color="#696D6F"/>
-<stop offset="1" stop-color="#252629"/>
+<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"/>
+</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"/>
+</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"/>
 </linearGradient>
-<rect fill="url(#SVGID_6)" height="2" width="3" x="13" y="17"/>
-<rect fill="url(#SVGID_6)" height="2" width="3" x="17" y="17"/>
-<rect fill="url(#SVGID_6)" height="2" width="3" x="21" y="17"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9" x1="14.5" x2="14.5" y1="12" y2="21.98">
-<stop offset="0" stop-color="#696D6F"/>
-<stop offset="1" stop-color="#252629"/>
+<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"/>
+</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"/>
 </linearGradient>
-<rect fill="url(#SVGID_9)" height="2" width="3" x="13" y="20"/>
-<rect fill="url(#SVGID_9)" height="2" width="3" x="17" y="20"/>
-<rect fill="url(#SVGID_9)" height="2" width="3" x="21" y="20"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12" x1="18.5" x2="18.5" y1="10.19" y2="13.06">
-<stop offset="0" stop-color="#30BCE8"/>
-<stop offset="1" stop-color="#048CC6"/>
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_12)" height="3" width="11" x="13" y="10"/>
+<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"/>
+</linearGradient>
+<rect fill="url(#SVGID_12_)" height="3" width="11" x="13" y="10"/>
+</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_landline_home.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <rect fill="none" height="30" width="30"/>
-<path d="M25,7H11.857C11.41,5.279,9.858,4,8,4C6.085,4,4.482,5.354,4.094,7.155C2.884,7.542,2,8.664,2,10v13 c0,1.654,1.346,3,3,3h20c1.654,0,3-1.346,3-3V10C28,8.346,26.654,7,25,7z" fill-opacity="0.6"/>
+<path d="M25,7h-13.14c-0.447-1.721-1.999-3-3.857-3-1.915,0-3.518,1.354-3.906,3.155-1.21,0.387-2.094,1.509-2.094,2.845v13c0,1.654,1.346,3,3,3h20c1.654,0,3-1.346,3-3v-13c0-1.654-1.35-3-3-3z" fill-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="15" x2="15" y1="8.16" y2="25.01">
 <stop offset="0" stop-color="#E6E6E6"/>
 <stop offset="1" stop-color="#626262"/>
 </linearGradient>
-<path d="M27,23c0,1.1-0.9,2-2,2H5c-1.1,0-2-0.9-2-2V10c0-1.1,0.9-2,2-2h20c1.1,0,2,0.9,2,2V23z" fill="url(#SVGID_1)"/>
-<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"/>
-<path d="M8,24c2.205,0,4-1.794,4-4V8H4v12C4,22.206,5.795,24,8,24z" fill-opacity="0.1"/>
+<path d="M27,23c0,1.1-0.9,2-2,2h-20c-1.1,0-2-0.9-2-2v-13c0-1.1,0.9-2,2-2h20c1.1,0,2,0.9,2,2v13z" fill="url(#SVGID_1)"/>
+<path d="M25,8h-20c-1.1,0-2,0.9-2,2v1c0-1.1,0.9-2,2-2h20c1.1,0,2,0.9,2,2v-1c0-1.1-0.9-2-2-2z" fill="#FFFFFF" fill-opacity="0.4"/>
+<path d="M8,24c2.205,0,4-1.794,4-4v-12h-8v12c0,2.21,1.795,4,4,4z" fill-opacity="0.1"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="8" x2="8" y1="5.17" y2="23.01">
 <stop offset="0" stop-color="#A0A7A8"/>
 <stop offset="1" stop-color="#252629"/>
 </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"/>
-<path d="M10,11v11.217c0.609-0.55,1-1.337,1-2.217V9L10,11z" fill-opacity="0.3"/>
-<path d="M6,22.217V11L5,9v11C5,20.88,5.391,21.667,6,22.217z" fill-opacity="0.3"/>
+<path d="M11,20c0,1.65-1.35,3-3,3s-3-1.35-3-3v-12c0-1.65,1.35-3,3-3s3,1.35,3,3v12z" fill="url(#SVGID_2)"/>
+<path d="M8,5c-1.65,0-3,1.35-3,3v1c0-1.65,1.35-3,3-3s3,1.35,3,3v-1c0-1.65-1.35-3-3-3z" fill="#FFFFFF" fill-opacity="0.3"/>
+<path d="M10,11v11.22c0.609-0.55,1-1.337,1-2.217v-11l-1,2z" fill-opacity="0.3"/>
+<path d="M6,22.22v-11.22l-1-2v11c0,0.88,0.391,1.67,1,2.22z" fill-opacity="0.3"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="14.5" x2="14.5" y1="14" y2="23.98">
 <stop offset="0" stop-color="#696D6F"/>
 <stop offset="1" stop-color="#252629"/>
@@ -44,15 +44,15 @@
 <stop offset="1" stop-color="#048CC6"/>
 </linearGradient>
 <rect fill="url(#SVGID_12)" height="3" width="11" x="13" y="10"/>
-<path d="M21,30c-4.411,0-8-3.589-8-8s3.589-8,8-8s8,3.589,8,8S25.411,30,21,30L21,30z" fill-opacity="0.6"/>
+<path d="M21,30c-4.411,0-8-3.589-8-8s3.589-8,8-8,8,3.589,8,8-3.59,8-8,8z" fill-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13" x1="21" x2="21" y1="14.97" y2="29.16">
 <stop offset="0" stop-color="#4EDEFF"/>
 <stop offset="1" stop-color="#048CC6"/>
 </linearGradient>
 <circle cx="21" cy="22" fill="url(#SVGID_13)" r="7"/>
-<polygon fill-opacity="0.2" points="25.34,24 20.999,19.4 16.66,24 16,23.3 20.999,18 26,23.3 25.34,24 "/>
-<polygon fill-opacity="0.2" points="20.999,20.857 17,25.098 17,27 20,27 20,24 22,24 22,27 25,27 25,25.097 "/>
-<path d="M21,16c3.697,0,6.717,2.869,6.975,6.5C27.986,22.334,28,22.169,28,22c0-3.865-3.134-7-7-7 s-7,3.135-7,7c0,0.169,0.014,0.334,0.025,0.5C14.283,18.869,17.303,16,21,16z" fill="#FFFFFF" fill-opacity="0.4"/>
-<polygon fill="#FFFFFF" points="25.34,23 20.999,18.4 16.66,23 16,22.3 20.999,17 26,22.3 25.34,23 "/>
-<polygon fill="#FFFFFF" points="20.999,19.857 17,24.098 17,26 20,26 20,23 22,23 22,26 25,26 25,24.097 "/>
+<polygon fill-opacity="0.2" points="25.34,24,21,19.4,16.66,24,16,23.3,21,18,26,23.3,25.34,24"/>
+<polygon fill-opacity="0.2" points="21,20.86,17,25.1,17,27,20,27,20,24,22,24,22,27,25,27,25,25.1"/>
+<path d="M21,16c3.697,0,6.717,2.869,6.975,6.5,0.01-0.17,0.02-0.33,0.02-0.5,0-3.865-3.134-7-7-7s-7,3.135-7,7c0,0.169,0.014,0.334,0.025,0.5,0.26-3.63,3.28-6.5,6.98-6.5z" fill="#FFFFFF" fill-opacity="0.4"/>
+<polygon fill="#FFFFFF" points="25.34,23,21,18.4,16.66,23,16,22.3,21,17,26,22.3,25.34,23"/>
+<polygon fill="#FFFFFF" points="21,19.86,17,24.1,17,26,20,26,20,23,22,23,22,26,25,26,25,24.1"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_landline_work.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <rect fill="none" height="30" width="30"/>
-<path d="M25,7H11.857C11.41,5.279,9.858,4,8,4C6.085,4,4.482,5.354,4.094,7.155C2.884,7.542,2,8.664,2,10v13 c0,1.654,1.346,3,3,3h20c1.654,0,3-1.346,3-3V10C28,8.346,26.654,7,25,7z" fill-opacity="0.6"/>
+<path d="M25,7h-13.14c-0.447-1.721-1.999-3-3.857-3-1.915,0-3.518,1.354-3.906,3.155-1.21,0.387-2.094,1.509-2.094,2.845v13c0,1.654,1.346,3,3,3h20c1.654,0,3-1.346,3-3v-13c0-1.654-1.35-3-3-3z" fill-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="15" x2="15" y1="8.16" y2="25.01">
 <stop offset="0" stop-color="#E6E6E6"/>
 <stop offset="1" stop-color="#626262"/>
 </linearGradient>
-<path d="M27,23c0,1.1-0.9,2-2,2H5c-1.1,0-2-0.9-2-2V10c0-1.1,0.9-2,2-2h20c1.1,0,2,0.9,2,2V23z" fill="url(#SVGID_1)"/>
-<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"/>
-<path d="M8,24c2.205,0,4-1.794,4-4V8H4v12C4,22.206,5.795,24,8,24z" fill-opacity="0.1"/>
+<path d="M27,23c0,1.1-0.9,2-2,2h-20c-1.1,0-2-0.9-2-2v-13c0-1.1,0.9-2,2-2h20c1.1,0,2,0.9,2,2v13z" fill="url(#SVGID_1)"/>
+<path d="M25,8h-20c-1.1,0-2,0.9-2,2v1c0-1.1,0.9-2,2-2h20c1.1,0,2,0.9,2,2v-1c0-1.1-0.9-2-2-2z" fill="#FFFFFF" fill-opacity="0.4"/>
+<path d="M8,24c2.205,0,4-1.794,4-4v-12h-8v12c0,2.21,1.795,4,4,4z" fill-opacity="0.1"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="8" x2="8" y1="5.17" y2="23.01">
 <stop offset="0" stop-color="#A0A7A8"/>
 <stop offset="1" stop-color="#252629"/>
 </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"/>
-<path d="M10,11v11.217c0.609-0.55,1-1.337,1-2.217V9L10,11z" fill-opacity="0.3"/>
-<path d="M6,22.217V11L5,9v11C5,20.88,5.391,21.667,6,22.217z" fill-opacity="0.3"/>
+<path d="M11,20c0,1.65-1.35,3-3,3s-3-1.35-3-3v-12c0-1.65,1.35-3,3-3s3,1.35,3,3v12z" fill="url(#SVGID_2)"/>
+<path d="M8,5c-1.65,0-3,1.35-3,3v1c0-1.65,1.35-3,3-3s3,1.35,3,3v-1c0-1.65-1.35-3-3-3z" fill="#FFFFFF" fill-opacity="0.3"/>
+<path d="M10,11v11.22c0.609-0.55,1-1.337,1-2.217v-11l-1,2z" fill-opacity="0.3"/>
+<path d="M6,22.22v-11.22l-1-2v11c0,0.88,0.391,1.67,1,2.22z" fill-opacity="0.3"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="14.5" x2="14.5" y1="14" y2="23.98">
 <stop offset="0" stop-color="#696D6F"/>
 <stop offset="1" stop-color="#252629"/>
@@ -44,14 +44,14 @@
 <stop offset="1" stop-color="#048CC6"/>
 </linearGradient>
 <rect fill="url(#SVGID_12)" height="3" width="11" x="13" y="10"/>
-<path d="M21,30c-4.411,0-8-3.589-8-8s3.589-8,8-8s8,3.589,8,8S25.411,30,21,30L21,30z" fill-opacity="0.6"/>
+<path d="M21,30c-4.411,0-8-3.589-8-8s3.589-8,8-8,8,3.589,8,8-3.59,8-8,8z" fill-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13" x1="21" x2="21" y1="14.97" y2="29.16">
 <stop offset="0" stop-color="#4EDEFF"/>
 <stop offset="1" stop-color="#048CC6"/>
 </linearGradient>
 <circle cx="21" cy="22" fill="url(#SVGID_13)" r="7"/>
-<path d="M22,21v-2h-5v8h4h1h3v-6H22z M21,25h-3v-1h3V25z M21,23h-3v-1h3V23z M18,21v-1h3v1H18z M24,25h-2v-1h2V25z M24,23h-2v-1h2V23z" fill-opacity="0.2"/>
-<path d="M21,16c3.697,0,6.717,2.869,6.975,6.5C27.986,22.334,28,22.169,28,22c0-3.865-3.134-7-7-7 s-7,3.135-7,7c0,0.169,0.014,0.334,0.025,0.5C14.283,18.869,17.303,16,21,16z" fill="#FFFFFF" fill-opacity="0.4"/>
-<path d="M22,20v-2h-5v8h4h1h3v-6H22z M21,24h-3v-1h3V24z M21,22h-3v-1h3V22z M18,20v-1h3v1H18z M24,24h-2v-1h2V24z M24,22h-2v-1h2V22z" fill="#FFFFFF"/>
+<path d="M22,21v-2h-5v8h8v-6h-3zm-1,4h-3v-1h3v1zm0-2h-3v-1h3v1zm-3-2v-1h3v1h-3zm6,4h-2v-1h2v1zm0-2h-2v-1h2v1z" fill-opacity="0.2"/>
+<path d="M21,16c3.697,0,6.717,2.869,6.975,6.5,0.01-0.17,0.02-0.33,0.02-0.5,0-3.865-3.134-7-7-7s-7,3.135-7,7c0,0.169,0.014,0.334,0.025,0.5,0.26-3.63,3.28-6.5,6.98-6.5z" fill="#FFFFFF" fill-opacity="0.4"/>
+<path d="M22,20v-2h-5v8h8v-6h-3zm-1,4h-3v-1h3v1zm0-2h-3v-1h3v1zm-3-2v-1h3v1h-3zm6,4h-2v-1h2v1zm0-2h-2v-1h2v1z" fill="#FFFFFF"/>
 <rect fill-opacity="0.3" height="6" width="1" x="22" y="20"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_link.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_link.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_link.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,22 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<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"/>
-<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"/>
-<path d="M13,16c0,0.553-0.447,1-1,1H6c-0.552,0-1-0.447-1-1l0,0c0-0.553,0.448-1,1-1h6C12.553,15,13,15.447,13,16 L13,16z" fill-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"/>
-<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"/>
-<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"/>
-<path d="M12,15c0,0.553-0.447,1-1,1H5c-0.552,0-1-0.447-1-1l0,0c0-0.553,0.448-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="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"/>
+<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="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"/>
+<rect fill="none" height="30" width="30"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="15" x2="15" y1="2.27" y2="32.01">
-<stop offset="0" stop-color="#4EDEFF"/>
-<stop offset="1" stop-color="#048CC6"/>
+<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>
 </defs>
+</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_location.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_location.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_location.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,25 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <g>
 <rect fill="none" height="30" width="30"/>
+<g fill-opacity="0.5" stroke-opacity="0.5">
+<rect fill="none" height="30" width="30"/>
+</g>
 <ellipse cx="15.37" cy="27.279" fill="#333333" fill-opacity="0.2" rx="7.052" ry="2.721" stroke-opacity="0.2"/>
-<path d="M18.615,27.279c0,0.689-1.455,1.251-3.246,1.251  c-1.79,0-3.244-0.562-3.244-1.251c0-0.694,1.454-1.254,3.244-1.254C17.16,26.025,18.615,26.585,18.615,27.279z" fill="#333333" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M24.592,1.347c-1.578,1.114-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.546-1.984-1.296-3.656-1.308c-1.232,0-3.102,1.206-4.354,2.13L9.262,2.276L3.5,4.491  l1.32,3.416l0.777-0.299l6.963,18.039L15.896,28l0.865-3.973l-1.743-4.51l0.313-0.802c0.641-1.651,2.09-4.583,3.254-5.409  c0.305-0.216,1.156-0.645,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.134L26.5,0L24.592,1.347z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<linearGradient gradientTransform="matrix(0.9331 -0.3596 0.3596 0.9331 -245.5647 -1823.3584)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-420.5444" x2="-423.0273" y1="1808.7793" y2="1808.7793">
+<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.65" style="stop-color:#D9D9D9"/>
 <stop offset="1" style="stop-color:#AEB2B3"/>
 </linearGradient>
-<polygon fill="url(#SVGID_1_)" points="6.169,6.32 8.51,5.417 15.725,24.105 15.24,26.318 13.383,25.006 "/>
-<linearGradient gradientTransform="matrix(0.9331 -0.3596 0.3596 0.9331 -245.5647 -1823.3584)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-419.7524" x2="-423.8632" y1="1796.9854" y2="1796.9854">
+<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">
 <stop offset="0" style="stop-color:#4F4F4F"/>
 <stop offset="0.59" style="stop-color:#BFBFBF"/>
 <stop offset="1" style="stop-color:#6B6B6B"/>
 </linearGradient>
-<polygon fill="url(#SVGID_2_)" points="4.79,5.062 8.689,3.562 9.291,5.121 5.393,6.619 "/>
-<rect fill-opacity="0.2" height="0.835" stroke-opacity="0.2" transform="matrix(0.933 -0.36 0.36 0.933 -1.7506 3.1158)" width="2.508" x="6.236" y="5.84"/>
-<path d="M9.59,5.897c0,0,3.352-2.754,4.811-2.742c2.279,0.016,3.373,1.72,4.609,1.864  c1.805,0.213,6.158-2.859,6.158-2.859s-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.861-3.609,5.861L9.59,5.897z" fill="#33A02C"/>
-<path d="M14.746,4.046c2.279,0.02,3.373,1.723,4.607,1.869  c1.396,0.161,4.317-1.64,5.565-2.461c0.164-0.773,0.244-1.293,0.244-1.293s-4.354,3.072-6.158,2.859  c-1.233-0.145-2.328-1.849-4.607-1.864C12.939,3.143,9.59,5.897,9.59,5.897l0.346,0.895C9.936,6.792,13.285,4.038,14.746,4.046z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<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="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 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_meeting.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_meeting.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g>
+<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"/>
+</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"/>
+</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"/>
+</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"/>
+<path d="M23.934,19.385l0.943-0.418l-1.469-9.598c-0.012,0-0.561-0.002-1.092-0.006L23.934,19.385z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<linearGradient gradientTransform="matrix(0.9869 -0.1613 0.1613 0.9869 -176.9958 -51.6826)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="189.8135" x2="189.8135" y1="90.9219" y2="103.5013">
+<stop offset="0" style="stop-color:#F9F9F9"/>
+<stop offset="0.1669" style="stop-color:#EEEEEE"/>
+<stop offset="0.7665" style="stop-color:#C5C5C5"/>
+<stop offset="1" style="stop-color:#B5B5B5"/>
+</linearGradient>
+<polygon fill="url(#SVGID_4_)" points="28.863,18.926 24.967,19.572 23.057,7.729 26.953,7.084 "/>
+<polygon fill="#FFFFFF" fill-opacity="0.4" points="25.953,8.084 27.732,19.113 28.863,18.926 26.953,7.084 23.057,7.729 23.188,8.541   " stroke-opacity="0.4"/>
+<path d="M7.75,8.953c-0.254,0.039-0.482,0.076-0.654,0.1L6.391,9.025l-1.074,7.865l0.521,0.492  c0.135,0.119,0.301,0.271,0.482,0.436L7.75,8.953z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<linearGradient gradientTransform="matrix(-0.9869 -0.1613 -0.1613 0.9869 -641.6711 -51.6826)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="-647.7456" x2="-647.7456" y1="-46.2344" y2="-33.6554">
+<stop offset="0" style="stop-color:#F9F9F9"/>
+<stop offset="1" style="stop-color:#B5B5B5"/>
+</linearGradient>
+<polygon fill="url(#SVGID_5_)" points="1.137,18.926 5.033,19.572 6.945,7.729 3.047,7.084 "/>
+<polygon fill="#FFFFFF" fill-opacity="0.4" points="3.047,7.084 2.863,8.219 5.945,8.729 4.217,19.436 5.033,19.572 6.945,7.729 " stroke-opacity="0.4"/>
+</g>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_message.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_message.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_message.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,27 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g>
 <rect fill="none" height="30" width="30"/>
-<rect fill-opacity="0.6" height="17.647" stroke-opacity="0.6" width="24.708" x="2.647" y="6.177"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="15" x2="15" y1="7.09" y2="22.98">
-<stop offset="0" stop-color="#FEAB0E"/>
-<stop offset="0.31" stop-color="#FEAB0E"/>
-<stop offset="0.79" stop-color="#FFDA33"/>
-<stop offset="1" stop-color="#FFE377"/>
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_1)" height="15.883" width="22.943" x="3.53" y="7.059"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="15.001,12.912 3.742,22.942 4.773,22.942 15.001,14.583 25.229,22.942 26.26,22.942 " stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="15" x2="15" y1="7.06" y2="22.94">
-<stop offset="0" stop-color="#C9700B"/>
-<stop offset="0.27" stop-color="#C9700B"/>
-<stop offset="0.72" stop-color="#E8AC22"/>
-<stop offset="1" stop-color="#E8AC22"/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_2)" fill-opacity="0.5" points="26.473,7.059 15.122,7.896 3.53,7.059 3.53,7.201 11.35,15.431 3.53,22.891 3.53,22.942 3.742,22.942 11.761,15.797 15.001,18.853 18.241,15.797 26.26,22.942 26.473,22.942 26.473,22.891 18.674,15.431 26.473,7.201 " stroke-opacity="0.5"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="15" x2="15" y1="7.14" y2="17.02">
-<stop offset="0" stop-color="#FFF278"/>
-<stop offset="1" stop-color="#FFFCDA"/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_3)" points="3.642,7.059 15.001,17.18 26.359,7.059 "/>
-<rect fill="none" height="30.002" width="30.002"/>
+<polygon fill="url(#SVGID_3_)" points="2.127,6 15,17.47 27.873,6 "/>
+<rect fill="none" height="30" width="30"/>
+</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_minus.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_minus.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="none" width="30" height="30"/>
-<path fill="#009CEF" d="M28.5,25.5c0,1.655-1.342,3-3,3h-21c-1.656,0-3-1.345-3-3v-21c0-1.656,1.344-3,3-3h21c1.658,0,3,1.344,3,3
-	V25.5z"/>
-<polygon fill="#FFFFFF" points="24,12.75 6,12.75 6,17.25 24,17.25 "/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_missed_call.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,15 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g>
 <rect fill="none" height="30" width="30"/>
-<path d="M18,29c-6.065,0-11-4.935-11-11v-3H0L11,0.333L22,15h-8v3c0,2.206,1.794,4,4,4c2.206,0,4-1.794,4-4v-1h7v1 C29,24.065,24.065,29,18,29L18,29z" fill-opacity="0.6"/>
-<path d="M23,18c0,2.757-2.243,5-5,5s-5-2.243-5-5v-4h7L11,2L2,14h6v4c0,5.5,4.5,10,10,10s10-4.5,10-10H23z" fill="url(#SVGID_1)"/>
-<path d="M13,18v1c0,2.757,2.243,5,5,5s5-2.243,5-5h4.949C27.982,18.671,28,18.338,28,18h-5 c0,2.757-2.243,5-5,5S13,20.757,13,18z" fill="#FFFFFF" fill-opacity="0.4"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="11,3 19.25,14 20,14 11,2 2,14 2.75,14 "/>
+<path d="M18,29c-6.065,0-11-4.935-11-11v-3H0L11,0.333L22,15h-8v3c0,2.206,1.795,4,4,4s4-1.794,4-4v-1h7v1  C29,24.065,24.065,29,18,29L18,29z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M23,18c0,2.757-2.243,5-5,5s-5-2.243-5-5v-4h7L11,2L2,14h6v4c0,5.5,4.5,10,10,10s10-4.5,10-10H23z" fill="url(#SVGID_1_)"/>
+<path d="M13,18v1c0,2.757,2.243,5,5,5s5-2.243,5-5h4.949C27.982,18.671,28,18.338,28,18h-5  c0,2.757-2.243,5-5,5S13,20.757,13,18z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<polygon fill="#FFFFFF" fill-opacity="0.4" points="11,3 19.25,14 20,14 11,2 2,14 2.75,14 " stroke-opacity="0.4"/>
+<rect fill="none" height="30" width="30"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="15" x2="15" y1="2" y2="28">
-<stop offset="0" stop-color="#FF4D00"/>
-<stop offset="1" stop-color="#800000"/>
+<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"/>
 </linearGradient>
 </defs>
+</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_mms.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_mms.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_mms.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,72 +1,66 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <rect fill-opacity="0.6" height="24" stroke-opacity="0.6" width="30" y="3"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="4" y2="26.0005">
-<stop offset="0" style="stop-color:#DFDFDF"/>
-<stop offset="1" style="stop-color:#B5B5B5"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="4" y2="26">
+<stop offset="0" stop-color="#DFDFDF"/>
+<stop offset="1" stop-color="#B5B5B5"/>
 </linearGradient>
 <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.7925" x2="22.6119" y1="4.7925" y2="22.6119">
-<stop offset="0" style="stop-color:#7EBA3E"/>
-<stop offset="1" style="stop-color:#33773B"/>
+<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"/>
 </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.9941" x2="32.6463" y1="10.3887" y2="24.211">
-<stop offset="0" style="stop-color:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
+<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"/>
 </linearGradient>
-<path d="M27,18.734c-0.327-0.234-0.694-0.459-1.109-0.658c-2.262-1.08-9.354-2.498-14.109-4.163  c-4.755-1.665-3.118-3.442-3.118-3.442c-0.106-0.389-0.37-0.777-0.792-0.111c-1.122,1.768,1.143,3.228,3.646,4.163  c3.118,1.166,10.332,2.419,13.158,4.385c0.956,0.665,1.717,1.31,2.324,1.905V18.734z" fill="url(#SVGID_3_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="9.4702" x2="23.2827" y1="14.5" y2="27.5">
-<stop offset="0" style="stop-color:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
+<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"/>
 </linearGradient>
-<path d="M9.721,19.187c0.528,0.444,2.42,0.806,4.28-1.056c1.109-1.109,1.109-2.774,1.109-2.774  s-2.008-0.611-3.857,0.721C9.404,17.41,9.193,18.742,9.721,19.187z" fill="url(#SVGID_4_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="8.7988" x2="22.6113" y1="15.2119" y2="28.2119">
-<stop offset="0" style="stop-color:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
+<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"/>
 </linearGradient>
-<path d="M5.061,13.933c0.216,0.342,1.197,0.887,2.528,0.207c0.794-0.407,1.071-1.322,1.071-1.322  s-1.002-0.704-2.24-0.312C5.182,12.899,4.845,13.591,5.061,13.933z" fill="url(#SVGID_5_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="11.875" x2="25.6931" y1="11.9438" y2="24.9491">
-<stop offset="0" style="stop-color:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
+<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"/>
 </linearGradient>
-<path d="M13.896,11.027c-0.37-0.389-1.385-0.848-2.748,0.333c-0.814,0.705-0.824,1.946-0.824,1.946  s1.352,0.163,2.435-0.447C14.013,12.153,14.226,11.374,13.896,11.027z" fill="url(#SVGID_6_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="14.2427" x2="28.0604" y1="9.4248" y2="22.4297">
-<stop offset="0" style="stop-color:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
+<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"/>
 </linearGradient>
-<path d="M21.426,13.081c-0.32-0.434-1.374-0.805-2.537,0.389c-0.754,0.773-1.008,2.501-1.008,2.501  s1.352,0.163,2.436-0.448C21.568,14.817,21.875,13.691,21.426,13.081z" fill="url(#SVGID_7_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="12.082" x2="25.8945" y1="11.7251" y2="24.7251">
-<stop offset="0" style="stop-color:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
+<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"/>
 </linearGradient>
-<path d="M17.928,22.484c0.671,0.473,3.591,1.17,5.955-0.809c1.411-1.182,0.898-3.266,0.898-3.266  s-3.038-1.205-5.391,0.213C17.039,20.04,17.255,22.012,17.928,22.484z" fill="url(#SVGID_8_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="16.7793" x2="30.5881" y1="6.7383" y2="19.7348">
-<stop offset="0" style="stop-color:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
+<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"/>
 </linearGradient>
-<path d="M27,13.388c-0.542,0.568-1.025,1.292-1.342,2.203c-0.617,1.781,0.855,3.279,0.855,3.279  S26.701,18.831,27,18.74V13.388z" fill="url(#SVGID_9_)"/>
+<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"/>
-</g>
-<g>
-<g>
-<path d="M20.958,28.678c-1.825,0-3.309-1.187-3.309-2.646s1.483-2.647,3.309-2.647   c0.224,0,0.445,0.018,0.661,0.053v-7.245l5.735,1.537v4.111l-3.089-0.828v5.02C24.266,27.491,22.783,28.678,20.958,28.678   L20.958,28.678z" style="opacity:0.6;enable-background:new    ;"/>
-<linearGradient gradientTransform="matrix(0.8824 0 0 0.8824 -252.2905 -982.9092)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="311.4141" x2="311.4141" y1="1130.9385" y2="1148.0792">
-<stop offset="0" style="stop-color:#DE8029"/>
-<stop offset="0.2606" style="stop-color:#DE4E29"/>
-<stop offset="1" style="stop-color:#D82E09"/>
+<path d="M20.96,28.68c-1.825,0-3.309-1.187-3.309-2.646s1.483-2.647,3.309-2.647c0.224,0,0.445,0.018,0.661,0.053v-7.245l5.735,1.537v4.111l-3.089-0.828v5.02c0,1.47-1.49,2.66-3.31,2.66z" fill-opacity="0.6" stroke-opacity="0.6" style="enable-background:new;"/>
+<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"/>
 </linearGradient>
-<path d="M22.061,16.767v7.229c-0.34-0.109-0.712-0.17-1.103-0.17c-1.584,0-2.868,0.987-2.868,2.206   s1.284,2.206,2.868,2.206c1.583,0,2.867-0.988,2.867-2.206v-5.595l3.088,0.828v-3.198L22.061,16.767z" style="fill:url(#SVGID_1__);"/>
-<path d="M20.958,27.796c-1.487,0-2.709-0.871-2.854-1.985   c-0.009,0.072-0.014,0.146-0.014,0.221c0,1.219,1.283,2.206,2.867,2.206c1.583,0,2.867-0.988,2.867-2.206V25.59   C23.825,26.809,22.541,27.796,20.958,27.796z" style="opacity:0.2;enable-background:new    ;"/>
-<polygon points="23.825,20.437 26.913,21.265 26.913,20.823 23.825,19.995  " style="opacity:0.2;enable-background:new    ;"/>
-<path d="M20.958,24.266c0.391,0,0.763,0.062,1.103,0.171v-0.441   c-0.339-0.109-0.712-0.17-1.103-0.17c-1.584,0-2.867,0.987-2.867,2.206c0,0.074,0.005,0.147,0.014,0.22   C18.249,25.137,19.471,24.266,20.958,24.266z" style="opacity:0.4;fill:#FFFFFF;enable-background:new    ;"/>
-<polygon points="22.061,16.767 22.061,17.208 26.913,18.508    26.913,18.066  " style="opacity:0.4;fill:#FFFFFF;enable-background:new    ;"/>
-<rect height="15" style="fill:none;" width="15" x="15.002" y="15.002"/>
-</g>
-<rect height="30.002" style="fill:none;" width="30.002"/>
-</g>
+<path d="M22.06,16.77v7.229c-0.34-0.109-0.712-0.17-1.103-0.17-1.584,0-2.868,0.987-2.868,2.206s1.284,2.206,2.868,2.206c1.583,0,2.867-0.988,2.867-2.206v-5.595l3.088,0.828v-3.198l-4.86-1.3z" fill="url(#SVGID_1__)"/>
+<path d="M20.96,27.8c-1.487,0-2.709-0.871-2.854-1.985-0.009,0.072-0.014,0.146-0.014,0.221,0,1.219,1.283,2.206,2.867,2.206,1.583,0,2.867-0.988,2.867-2.206v-0.45c-0.02,1.22-1.3,2.21-2.88,2.21z" fill-opacity="0.2" stroke-opacity="0.2" style="enable-background:new;"/>
+<polygon fill-opacity="0.2" points="23.82,20.44,26.91,21.26,26.91,20.82,23.82,20" stroke-opacity="0.2" style="enable-background:new;"/>
+<path d="M20.96,24.27c0.391,0,0.763,0.062,1.103,0.171v-0.441c-0.339-0.109-0.712-0.17-1.103-0.17-1.584,0-2.867,0.987-2.867,2.206,0,0.074,0.005,0.147,0.014,0.22,0.15-1.12,1.37-1.99,2.86-1.99z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4" style="enable-background:new;"/>
+<polygon fill="#FFFFFF" fill-opacity="0.4" points="22.06,16.77,22.06,17.21,26.91,18.51,26.91,18.07" stroke-opacity="0.4" style="enable-background:new;"/>
+<rect fill="none" height="15" width="15" x="15" y="15"/>
+<rect fill="none" height="30" width="30"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_mobile.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_mobile.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_mobile.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,44 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g>
 <rect fill="none" height="30" width="30"/>
-<path d="M7.963,30C6.328,30,5,28.671,5,27.038V2.962C5,1.328,6.328,0,7.963,0h14.074C23.672,0,25,1.328,25,2.962 v24.076C25,28.671,23.672,30,22.037,30H7.963z" fill-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="15" x2="15" y1="-5.6" y2="28.94">
-<stop offset="0" stop-color="#FFFFFF"/>
-<stop offset="1" stop-color="#9B9D9E"/>
+<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"/>
 </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 gradientUnits="userSpaceOnUse" id="SVGID_2" x1="15" x2="15" y1="21.78" y2="28.08">
-<stop offset="0" stop-color="#A6A8AB"/>
-<stop offset="0.7" stop-color="#58595B"/>
-<stop offset="1" stop-color="#808184"/>
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_2)" height="4" width="4" x="13" y="24"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="15" x2="15" y1="23.89" y2="27.04">
-<stop offset="0" stop-color="#F0F0F0"/>
-<stop offset="1" stop-color="#9B9D9E"/>
+<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"/>
 </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.962v1C6,2.878,6.879,2,7.963,2h14.074 C23.121,2,24,2.878,24,3.962v-1C24,1.878,23.121,1,22.037,1z" fill="#FFFFFF" fill-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="15" x2="15" y1="22.94" y2="3.12">
-<stop offset="0" stop-color="#DADADB"/>
-<stop offset="1" stop-color="#9B9D9E"/>
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_4)" height="20.032" width="16" x="7" y="3"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="15" x2="15" y1="4" y2="22">
-<stop offset="0" stop-color="#3BC8EB"/>
-<stop offset="1" stop-color="#1347BA"/>
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_5)" height="18.032" width="14" x="8" y="4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6" x1="9" x2="9" y1="25" y2="26.98">
-<stop offset="0" stop-color="#1CAB00"/>
-<stop offset="1" stop-color="#1F6300"/>
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_6)" height="2" width="4" x="7" y="25"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7" x1="21" x2="21" y1="25" y2="27">
-<stop offset="0" stop-color="#E63B00"/>
-<stop offset="1" stop-color="#8C0000"/>
+<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"/>
 </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 "/>
+<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"/>
+</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_mobile_home.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <rect fill="none" height="30" width="30"/>
-<path d="M6.963,30C5.328,30,4,28.671,4,27.038V2.962C4,1.328,5.328,0,6.963,0h14.074C22.672,0,24,1.328,24,2.962 v24.076C24,28.671,22.672,30,21.037,30H6.963z" fill-opacity="0.6"/>
+<path d="M6.963,30c-1.635,0-2.963-1.33-2.963-2.96v-24.08c0-1.634,1.328-2.962,2.963-2.962h14.07c1.63,0,2.96,1.328,2.96,2.962v24.08c0,1.63-1.33,2.96-2.96,2.96h-14.08z" fill-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="14" x2="14" y1="-5.6" y2="28.94">
 <stop offset="0" stop-color="#FFFFFF"/>
 <stop offset="1" stop-color="#9B9D9E"/>
 </linearGradient>
-<path d="M23,27.038C23,28.121,22.121,29,21.037,29H6.963C5.879,29,5,28.121,5,27.038V2.962 C5,1.878,5.879,1,6.963,1h14.074C22.121,1,23,1.878,23,2.962V27.038z" fill="url(#SVGID_1)"/>
+<path d="M23,27.04c0,1.08-0.88,1.96-1.96,1.96h-14.08c-1.084,0-1.963-0.88-1.963-1.96v-24.08c0-1.084,0.879-1.962,1.963-1.962h14.07c1.08,0,1.96,0.878,1.96,1.962v24.08z" fill="url(#SVGID_1)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="14" x2="14" y1="21.78" y2="28.08">
 <stop offset="0" stop-color="#A6A8AB"/>
 <stop offset="0.7" stop-color="#58595B"/>
@@ -19,17 +19,17 @@
 <stop offset="1" stop-color="#9B9D9E"/>
 </linearGradient>
 <rect fill="url(#SVGID_3)" height="2" width="2" x="13" y="25"/>
-<path d="M21.037,1H6.963C5.879,1,5,1.878,5,2.962v1C5,2.878,5.879,2,6.963,2h14.074 C22.121,2,23,2.878,23,3.962v-1C23,1.878,22.121,1,21.037,1z" fill="#FFFFFF" fill-opacity="0.2"/>
+<path d="M21.04,1h-14.08c-1.084,0-1.963,0.878-1.963,1.962v1c0-1.084,0.879-1.962,1.963-1.962h14.07c1.08,0,1.96,0.878,1.96,1.962v-1c0-1.084-0.88-1.962-1.96-1.962z" fill="#FFFFFF" fill-opacity="0.2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="14" x2="14" y1="22.94" y2="3.12">
 <stop offset="0" stop-color="#DADADB"/>
 <stop offset="1" stop-color="#9B9D9E"/>
 </linearGradient>
-<rect fill="url(#SVGID_4)" height="20.032" width="16" x="6" y="3"/>
+<rect fill="url(#SVGID_4)" height="20.03" width="16" x="6" y="3"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="14" x2="14" y1="4" y2="22">
 <stop offset="0" stop-color="#3BC8EB"/>
 <stop offset="1" stop-color="#1347BA"/>
 </linearGradient>
-<rect fill="url(#SVGID_5)" height="18.032" width="14" x="7" y="4"/>
+<rect fill="url(#SVGID_5)" height="18.03" width="14" x="7" y="4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6" x1="8" x2="8" y1="25" y2="26.98">
 <stop offset="0" stop-color="#1CAB00"/>
 <stop offset="1" stop-color="#1F6300"/>
@@ -40,16 +40,16 @@
 <stop offset="1" stop-color="#8C0000"/>
 </linearGradient>
 <rect fill="url(#SVGID_7)" height="2" width="4" x="18" y="25"/>
-<polygon fill="#FFFFFF" fill-opacity="0.2" points="21,10.13 21,4 7,4 7,11.269 "/>
-<path d="M21,30c-4.411,0-8-3.589-8-8s3.589-8,8-8s8,3.589,8,8S25.411,30,21,30L21,30z" fill-opacity="0.6"/>
+<polygon fill="#FFFFFF" fill-opacity="0.2" points="21,10.13,21,4,7,4,7,11.27"/>
+<path d="M21,30c-4.411,0-8-3.589-8-8s3.589-8,8-8,8,3.589,8,8-3.59,8-8,8z" fill-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8" x1="21" x2="21" y1="14.97" y2="29.16">
 <stop offset="0" stop-color="#4EDEFF"/>
 <stop offset="1" stop-color="#048CC6"/>
 </linearGradient>
 <circle cx="21" cy="22" fill="url(#SVGID_8)" r="7"/>
-<polygon fill-opacity="0.2" points="25.34,24 20.999,19.4 16.66,24 16,23.3 20.999,18 26,23.3 25.34,24 "/>
-<polygon fill-opacity="0.2" points="20.999,20.857 17,25.098 17,27 20,27 20,24 22,24 22,27 25,27 25,25.097 "/>
-<path d="M21,16c3.697,0,6.717,2.869,6.975,6.5C27.986,22.334,28,22.169,28,22c0-3.865-3.134-7-7-7 s-7,3.135-7,7c0,0.169,0.014,0.334,0.025,0.5C14.283,18.869,17.303,16,21,16z" fill="#FFFFFF" fill-opacity="0.4"/>
-<polygon fill="#FFFFFF" points="25.34,23 20.999,18.4 16.66,23 16,22.3 20.999,17 26,22.3 25.34,23 "/>
-<polygon fill="#FFFFFF" points="20.999,19.857 17,24.098 17,26 20,26 20,23 22,23 22,26 25,26 25,24.097 "/>
+<polygon fill-opacity="0.2" points="25.34,24,21,19.4,16.66,24,16,23.3,21,18,26,23.3,25.34,24"/>
+<polygon fill-opacity="0.2" points="21,20.86,17,25.1,17,27,20,27,20,24,22,24,22,27,25,27,25,25.1"/>
+<path d="M21,16c3.697,0,6.717,2.869,6.975,6.5,0.01-0.17,0.02-0.33,0.02-0.5,0-3.865-3.134-7-7-7s-7,3.135-7,7c0,0.169,0.014,0.334,0.025,0.5,0.26-3.63,3.28-6.5,6.98-6.5z" fill="#FFFFFF" fill-opacity="0.4"/>
+<polygon fill="#FFFFFF" points="25.34,23,21,18.4,16.66,23,16,22.3,21,17,26,22.3,25.34,23"/>
+<polygon fill="#FFFFFF" points="21,19.86,17,24.1,17,26,20,26,20,23,22,23,22,26,25,26,25,24.1"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_mobile_work.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <rect fill="none" height="30" width="30"/>
-<path d="M6.963,30C5.328,30,4,28.671,4,27.038V2.962C4,1.328,5.328,0,6.963,0h14.074C22.672,0,24,1.328,24,2.962 v24.076C24,28.671,22.672,30,21.037,30H6.963z" fill-opacity="0.6"/>
+<path d="M6.963,30c-1.635,0-2.963-1.33-2.963-2.96v-24.08c0-1.634,1.328-2.962,2.963-2.962h14.07c1.63,0,2.96,1.328,2.96,2.962v24.08c0,1.63-1.33,2.96-2.96,2.96h-14.08z" fill-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="14" x2="14" y1="-5.6" y2="28.94">
 <stop offset="0" stop-color="#FFFFFF"/>
 <stop offset="1" stop-color="#9B9D9E"/>
 </linearGradient>
-<path d="M23,27.038C23,28.121,22.121,29,21.037,29H6.963C5.879,29,5,28.121,5,27.038V2.962 C5,1.878,5.879,1,6.963,1h14.074C22.121,1,23,1.878,23,2.962V27.038z" fill="url(#SVGID_1)"/>
+<path d="M23,27.04c0,1.08-0.88,1.96-1.96,1.96h-14.08c-1.084,0-1.963-0.88-1.963-1.96v-24.08c0-1.084,0.879-1.962,1.963-1.962h14.07c1.08,0,1.96,0.878,1.96,1.962v24.08z" fill="url(#SVGID_1)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="14" x2="14" y1="21.78" y2="28.08">
 <stop offset="0" stop-color="#A6A8AB"/>
 <stop offset="0.7" stop-color="#58595B"/>
@@ -19,17 +19,17 @@
 <stop offset="1" stop-color="#9B9D9E"/>
 </linearGradient>
 <rect fill="url(#SVGID_3)" height="2" width="2" x="13" y="25"/>
-<path d="M21.037,1H6.963C5.879,1,5,1.878,5,2.962v1C5,2.878,5.879,2,6.963,2h14.074 C22.121,2,23,2.878,23,3.962v-1C23,1.878,22.121,1,21.037,1z" fill="#FFFFFF" fill-opacity="0.2"/>
+<path d="M21.04,1h-14.08c-1.084,0-1.963,0.878-1.963,1.962v1c0-1.084,0.879-1.962,1.963-1.962h14.07c1.08,0,1.96,0.878,1.96,1.962v-1c0-1.084-0.88-1.962-1.96-1.962z" fill="#FFFFFF" fill-opacity="0.2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="14" x2="14" y1="22.94" y2="3.12">
 <stop offset="0" stop-color="#DADADB"/>
 <stop offset="1" stop-color="#9B9D9E"/>
 </linearGradient>
-<rect fill="url(#SVGID_4)" height="20.032" width="16" x="6" y="3"/>
+<rect fill="url(#SVGID_4)" height="20.03" width="16" x="6" y="3"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="14" x2="14" y1="4" y2="22">
 <stop offset="0" stop-color="#3BC8EB"/>
 <stop offset="1" stop-color="#1347BA"/>
 </linearGradient>
-<rect fill="url(#SVGID_5)" height="18.032" width="14" x="7" y="4"/>
+<rect fill="url(#SVGID_5)" height="18.03" width="14" x="7" y="4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6" x1="8" x2="8" y1="25" y2="26.98">
 <stop offset="0" stop-color="#1CAB00"/>
 <stop offset="1" stop-color="#1F6300"/>
@@ -40,15 +40,15 @@
 <stop offset="1" stop-color="#8C0000"/>
 </linearGradient>
 <rect fill="url(#SVGID_7)" height="2" width="4" x="18" y="25"/>
-<polygon fill="#FFFFFF" fill-opacity="0.2" points="21,10.13 21,4 7,4 7,11.269 "/>
-<path d="M21,30c-4.411,0-8-3.589-8-8s3.589-8,8-8s8,3.589,8,8S25.411,30,21,30L21,30z" fill-opacity="0.6"/>
+<polygon fill="#FFFFFF" fill-opacity="0.2" points="21,10.13,21,4,7,4,7,11.27"/>
+<path d="M21,30c-4.411,0-8-3.589-8-8s3.589-8,8-8,8,3.589,8,8-3.59,8-8,8z" fill-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8" x1="21" x2="21" y1="14.97" y2="29.16">
 <stop offset="0" stop-color="#4EDEFF"/>
 <stop offset="1" stop-color="#048CC6"/>
 </linearGradient>
 <circle cx="21" cy="22" fill="url(#SVGID_8)" r="7"/>
-<path d="M22,21v-2h-5v8h4h1h3v-6H22z M21,25h-3v-1h3V25z M21,23h-3v-1h3V23z M18,21v-1h3v1H18z M24,25h-2v-1h2V25z M24,23h-2v-1h2V23z" fill-opacity="0.2"/>
-<path d="M21,16c3.697,0,6.717,2.869,6.975,6.5C27.986,22.334,28,22.169,28,22c0-3.865-3.134-7-7-7 s-7,3.135-7,7c0,0.169,0.014,0.334,0.025,0.5C14.283,18.869,17.303,16,21,16z" fill="#FFFFFF" fill-opacity="0.4"/>
-<path d="M22,20v-2h-5v8h4h1h3v-6H22z M21,24h-3v-1h3V24z M21,22h-3v-1h3V22z M18,20v-1h3v1H18z M24,24h-2v-1h2V24z M24,22h-2v-1h2V22z" fill="#FFFFFF"/>
+<path d="M22,21v-2h-5v8h8v-6h-3zm-1,4h-3v-1h3v1zm0-2h-3v-1h3v1zm-3-2v-1h3v1h-3zm6,4h-2v-1h2v1zm0-2h-2v-1h2v1z" fill-opacity="0.2"/>
+<path d="M21,16c3.697,0,6.717,2.869,6.975,6.5,0.01-0.17,0.02-0.33,0.02-0.5,0-3.865-3.134-7-7-7s-7,3.135-7,7c0,0.169,0.014,0.334,0.025,0.5,0.26-3.63,3.28-6.5,6.98-6.5z" fill="#FFFFFF" fill-opacity="0.4"/>
+<path d="M22,20v-2h-5v8h8v-6h-3zm-1,4h-3v-1h3v1zm0-2h-3v-1h3v1zm-3-2v-1h3v1h-3zm6,4h-2v-1h2v1zm0-2h-2v-1h2v1z" fill="#FFFFFF"/>
 <rect fill-opacity="0.3" height="6" width="1" x="22" y="20"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ms_doc.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,12 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <rect fill="none" height="30" width="30"/>
-<rect height="27" width="21.599" x="4.201" y="1.5"/>
+<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"/>
-<path d="M6.9,4.2c0,2.267,0,19.332,0,21.6c2.149,0,14.051,0,16.199,0c0-2.241,0-21.6,0-21.6S8.962,4.2,6.9,4.2z" fill="#FFFFFF"/>
+<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.143,10.69v1.209l1.11-0.083l-2.952,4.246l0.271-3.326v-0.838h0.793V10.69H8.25v1.209h0.791v0.805 l-0.83,8.861h1.041l4.059-5.508l-0.339,5.508h1.034l6.841-9.666h0.87V10.69H18.143z M11.56,15.961l0.258-4.063h2.623L11.56,15.961z" fill="#0A50A1"/>
-</g>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ms_pdf.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <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"/>
-<path d="M6.901,4.199c0,2.268,0,19.332,0,21.601c2.149,0,14.051,0,16.199,0c0-2.242,0-21.601,0-21.601 S8.962,4.199,6.901,4.199z" fill="#FFFFFF"/>
+<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.967,17.67c-0.629-1.442-1.301-3.105-1.503-3.802c0,0,1.54-6.305-0.319-6.305 c-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.781c0.854,0.855,2.521-0.056,4.005-3.224 c0.261-0.259,2.221-0.506,2.502-0.225c0.988,1.67,2.624,4.454,3.679,3.404C21.552,20.265,18.344,17.67,16.967,17.67z M10.481,21.217 c-0.454-0.454-0.309-1.569,2.651-2.479C12.092,20.813,10.938,21.673,10.481,21.217z M15.021,8.292c1.065,0,0.202,3.646,0.022,4.391 C15.042,12.683,13.831,8.292,15.021,8.292z M19.741,21.164c-0.487,0.487-1.961-2.063-2.296-2.614 C18.958,19.022,20.228,20.677,19.741,21.164z" 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="#FF0000"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ms_ppt.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,15 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <rect fill="none" height="30" width="30"/>
-<rect height="27.001" width="21.6" x="4.2" y="1.5"/>
-<rect fill="#F96D11" height="24.301" width="18.9" x="5.55" y="2.85"/>
+<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="#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.325" cy="18.376" fill="#FAA513" r="4.725"/>
-<path d="M20.4,18.368c-0.006-3.349-2.729-6.067-6.075-6.067v6.067H20.4z" fill="#F96D11"/>
-</g>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ms_rtf.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ms_rtf.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ms_rtf.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,14 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <rect fill="none" height="30" width="30"/>
 <rect height="27" width="21.6" x="4.2" y="1.5"/>
-<path d="M5.55,2.85c0,2.309,0,21.992,0,24.301c2.216,0,16.686,0,18.9,0c0-2.281,0-24.301,0-24.301S7.688,2.85,5.55,2.85z"/>
-<path d="M6.9,4.2c0,0,0,19.332,0,21.6c2.148,0,14.051,0,16.199,0c0-2.241,0-21.6,0-21.6H6.9z" fill="#FFFFFF"/>
+<path d="M5.55,2.85v24.3h18.9v-24.3s-16.76,0-18.9,0z"/>
+<path d="M6.9,4.2v21.6h16.2v-21.6h-16.2z" fill="#FFFFFF"/>
 <rect fill="#F6F6F5" height="18.9" width="13.5" x="8.25" y="5.55"/>
-<path d="M10.579,12.884c0.371-0.77,0.937-1.065,1.758-1.065c0.074,0,0.159,0,0.245,0.011v1.01c-0.14-0.008-0.266-0.008-0.396-0.008 c-0.938,0-1.375,0.425-1.375,1.408v3.688H9.703v-6.056h0.619L10.579,12.884z"/>
-<path d="M16.472,17.818c-0.424,0.117-0.872,0.192-1.311,0.192c-0.96,0-1.364-0.438-1.364-1.384v-4.01h-0.735v-0.746h0.745 l0.438-1.45h0.661v1.45h1.47v0.746h-1.47v3.817c0,0.489,0.085,0.811,0.65,0.811c0.309,0,0.617-0.075,0.915-0.149V17.818z"/>
-<path d="M20.3,10.526c-0.267-0.084-0.543-0.158-0.82-0.158c-0.746,0-0.788,0.468-0.788,1.503h1.107v0.746h-1.107v5.311h-1.108 v-5.313h-0.736v-0.744h0.736c0-1.334,0.201-2.271,1.695-2.271c0.352,0,0.694,0.041,1.022,0.128L20.3,10.526L20.3,10.526z"/>
-</g>
+<path d="M10.58,12.88c0.371-0.77,0.937-1.065,1.758-1.065,0.074,0,0.159,0,0.245,0.011v1.01c-0.14-0.008-0.266-0.008-0.396-0.008-0.938,0-1.375,0.425-1.375,1.408v3.688h-1.097v-6.056h0.619l0.26,1.01z"/>
+<path d="M16.47,17.82c-0.424,0.117-0.872,0.192-1.311,0.192-0.96,0-1.364-0.438-1.364-1.384v-4.01h-0.735v-0.746h0.745l0.438-1.45h0.661v1.45h1.47v0.746h-1.47v3.817c0,0.489,0.085,0.811,0.65,0.811,0.309,0,0.617-0.075,0.915-0.149v0.718z"/>
+<path d="M20.3,10.53c-0.267-0.084-0.543-0.158-0.82-0.158-0.746,0-0.788,0.468-0.788,1.503h1.107v0.746h-1.107v5.311h-1.108v-5.313h-0.736v-0.744h0.736c0-1.334,0.201-2.271,1.695-2.271,0.352,0,0.694,0.041,1.022,0.128v0.793z"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ms_xls.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,15 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <rect fill="none" height="30" width="30"/>
-<rect height="27" width="21.602" x="4.199" y="1.5"/>
-<rect fill="#33A02C" height="24.301" width="18.9" x="5.549" y="2.85"/>
+<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="#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.716,10.897 13.146,21.75 8.659,21.75 16.819,10.897 "/>
-<path d="M17.495,12.247c-0.581,0.77-4.178,5.553-6.132,8.153c0.541,0,0.85,0,1.13,0 c0.581-0.735,4.366-5.531,6.438-8.153C18.224,12.247,17.834,12.247,17.495,12.247z" fill="#33A02C"/>
-<polygon points="8.25,10.061 16.002,21.75 21.308,21.75 13.146,10.061 "/>
-<path d="M10.765,11.412c1.756,2.649,5.378,8.108,5.962,8.989c0.471,0,0.997,0,1.992,0 c-1.865-2.672-5.686-8.145-6.276-8.989C12.031,11.412,11.603,11.412,10.765,11.412z" fill="#33A02C"/>
-</g>
+<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"/>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_new_chat.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,40 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <g>
-<path d="M6.303,28c-0.457,0-1.23-0.326-1.23-1.552v-4.097  C1.842,20.145,0,16.986,0,13.628C0,7.216,6.729,2,15,2c8.271,0,15,5.216,15,11.628c0,6.411-6.729,11.628-15,11.628  c-1.668,0-3.305-0.211-4.873-0.627l-2.625,2.762C7.125,27.789,6.709,28,6.303,28L6.303,28z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -76 -96)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="91" x2="91" y1="-99.166" y2="-122.8481">
+<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"/>
 </linearGradient>
-<path d="M6.303,27c-0.141,0-0.23-0.216-0.23-0.552v-4.636L5.99,21.761C2.818,19.732,1,16.77,1,13.628  C1,7.769,7.28,3,15,3c7.719,0,14,4.769,14,10.628c0,5.861-6.281,10.628-14,10.628c-1.742,0-3.447-0.242-5.068-0.721l-0.113-0.033  l-3.041,3.199C6.6,26.889,6.422,27,6.303,27L6.303,27z" fill="url(#SVGID_1_)"/>
-<path d="M15,4c7.496,0,13.619,4.501,13.967,10.128  c0.01-0.167,0.033-0.331,0.033-0.5C29,7.769,22.719,3,15,3C7.28,3,1,7.769,1,13.628c0,0.161,0.025,0.319,0.035,0.48  C1.396,8.491,7.512,4,15,4z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
-<rect fill="#FFFFFF" height="1.083" width="13" x="8.5" y="8.688"/>
-<rect fill-opacity="0.2" height="0.542" stroke-opacity="0.2" width="13" x="8.5" y="9.771"/>
-<rect fill="#FFFFFF" height="1.083" width="13" x="8.5" y="12.688"/>
-<rect fill-opacity="0.2" height="0.542" stroke-opacity="0.2" width="13" x="8.5" y="13.771"/>
+<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="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"/>
+<rect fill="#FFFFFF" height="1.084" width="13" x="8.5" y="12.688"/>
+<rect fill-opacity="0.2" height="0.541" stroke-opacity="0.2" width="13" x="8.5" y="13.771"/>
 <rect fill="#FFFFFF" height="1.084" width="13" x="8.5" y="16.688"/>
 <rect fill-opacity="0.2" height="0.541" stroke-opacity="0.2" width="13" x="8.5" y="17.771"/>
 <rect fill="none" height="30" width="30"/>
 </g>
 <g>
-<g>
-<rect height="15" style="fill:none;" width="15" x="15"/>
-<rect height="4.412" style="opacity:0.6;enable-background:new    ;" transform="matrix(-0.2587 0.9659 -0.9659 -0.2587 29.2728 -12.3701)" width="7.941" x="15.412" y="2.841"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 90.98 116.5195)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-70.1851" x2="-73.1451" y1="114.9482" y2="107.6632">
-<stop offset="0" style="stop-color:#DE8029"/>
-<stop offset="0.26" style="stop-color:#DE4E29"/>
-<stop offset="1" style="stop-color:#D82E09"/>
+<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"/>
 </linearGradient>
-<polygon points="20.174,8.913 16.765,8 18.592,1.181 22.001,2.094  " style="fill:url(#SVGID_1__);"/>
-<rect height="4.411" style="opacity:0.6;enable-background:new    ;" transform="matrix(-0.7072 0.7071 -0.7071 -0.7072 48.0833 -1.2961)" width="9.707" x="19.457" y="7.104"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 90.98 116.5195)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-63.0112" x2="-70.6762" y1="110.0527" y2="104.0977">
-<stop offset="0" style="stop-color:#DE8029"/>
-<stop offset="0.26" style="stop-color:#DE4E29"/>
-<stop offset="1" style="stop-color:#D82E09"/>
+<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"/>
 </linearGradient>
-<polygon points="22.438,13.677 19.941,11.182 26.182,4.942 28.677,7.438  " style="fill:url(#SVGID_2_);"/>
-</g>
-<rect height="30.002" style="fill:none;" width="30.002"/>
+<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"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_new_email_event.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,37 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <g>
-<path d="M15.001,27.354c-6.813,0-12.354-5.542-12.354-12.354  c0-6.813,5.542-12.354,12.354-12.354c6.812,0,12.354,5.542,12.354,12.354C27.354,21.813,21.813,27.354,15.001,27.354L15.001,27.354z  " style="opacity:0.6;enable-background:new    ;"/>
-<circle cx="15.001" cy="15.001" r="11.471" style="fill:url(#SVGID_1_);"/>
-<path d="M23.604,17.037c0,1.379-0.277,2.572-0.83,3.581  c-0.673,1.242-1.646,1.866-2.92,1.866c-1.236,0-2.129-0.624-2.687-1.866c-0.673,0.728-1.539,1.091-2.601,1.091  c-1.248,0-2.247-0.478-3.001-1.43c-0.699-0.883-1.049-1.955-1.049-3.229c0-1.279,0.35-2.349,1.049-3.21  c0.745-0.928,1.746-1.389,3.001-1.389c0.934,0,1.67,0.253,2.208,0.761v-0.56h1.813v6.263c0,1.216,0.422,1.825,1.268,1.825  c0.689,0,1.222-0.478,1.594-1.43c0.274-0.709,0.412-1.464,0.412-2.273c0-1.871-0.676-3.468-2.02-4.798  c-1.344-1.332-2.958-1.994-4.839-1.994c-1.892,0-3.498,0.659-4.819,1.98c-1.322,1.322-1.986,2.923-1.986,4.813  c0,1.887,0.663,3.496,1.993,4.823c1.326,1.335,2.931,1.998,4.813,1.998v1.795c-2.372,0-4.4-0.844-6.08-2.528  c-1.682-1.689-2.523-3.721-2.523-6.088c0-2.358,0.843-4.38,2.529-6.065c1.686-1.682,3.708-2.525,6.074-2.525  c2.373,0,4.4,0.838,6.082,2.52C22.762,12.644,23.604,14.668,23.604,17.037z M16.664,16.968c0-1.83-0.699-2.748-2.098-2.748  c-0.701,0-1.244,0.313-1.623,0.937c-0.33,0.528-0.491,1.158-0.491,1.894c0,1.925,0.704,2.888,2.112,2.888  C15.965,19.938,16.664,18.947,16.664,16.968z" style="opacity:0.2;enable-background:new    ;"/>
-<path d="M23.604,14.988c0,1.379-0.277,2.574-0.83,3.583c-0.673,1.24-1.646,1.865-2.92,1.865  c-1.236,0-2.129-0.625-2.687-1.865c-0.673,0.725-1.539,1.09-2.601,1.09c-1.248,0-2.247-0.479-3.001-1.43  c-0.699-0.885-1.049-1.957-1.049-3.229c0-1.281,0.35-2.35,1.049-3.21c0.745-0.928,1.746-1.389,3.001-1.389  c0.934,0,1.67,0.253,2.208,0.761v-0.56h1.813v6.264c0,1.214,0.422,1.822,1.268,1.822c0.689,0,1.222-0.476,1.594-1.428  c0.274-0.709,0.412-1.464,0.412-2.274c0-1.871-0.676-3.468-2.02-4.797c-1.344-1.332-2.958-1.994-4.839-1.994  c-1.892,0-3.498,0.659-4.819,1.979c-1.322,1.322-1.986,2.923-1.986,4.813c0,1.887,0.663,3.497,1.993,4.823  c1.326,1.336,2.931,1.998,4.813,1.998v1.795c-2.372,0-4.4-0.843-6.08-2.527c-1.682-1.691-2.523-3.721-2.523-6.088  c0-2.358,0.843-4.38,2.529-6.065c1.685-1.682,3.707-2.525,6.073-2.525c2.372,0,4.399,0.838,6.081,2.52  C22.762,10.595,23.604,12.619,23.604,14.988z M16.664,14.919c0-1.831-0.699-2.748-2.098-2.748c-0.701,0-1.244,0.313-1.623,0.937  c-0.33,0.528-0.491,1.157-0.491,1.894c0,1.925,0.704,2.886,2.112,2.886C15.965,17.887,16.664,16.898,16.664,14.919z" style="fill:#FFFFFF;"/>
-<rect height="30.002" style="fill:none;" width="30.002"/>
-<defs>
-<linearGradient gradientTransform="matrix(0.8824 0 0 -0.8824 -284.8232 -348.3516)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="339.7822" x2="339.7822" y1="-398.7178" y2="-425.0826">
+<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"/>
 </linearGradient>
-</defs>
+<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"/>
+<rect fill="none" height="30" width="30"/>
 </g>
 <g>
-<g>
-<rect height="15" style="fill:none;" width="15" x="15"/>
-<rect height="4.412" style="opacity:0.6;enable-background:new    ;" transform="matrix(-0.2587 0.9659 -0.9659 -0.2587 29.2728 -12.3701)" width="7.941" x="15.412" y="2.841"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 90.98 116.5195)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-70.1851" x2="-73.1451" y1="114.9482" y2="107.6632">
-<stop offset="0" style="stop-color:#DE8029"/>
-<stop offset="0.26" style="stop-color:#DE4E29"/>
-<stop offset="1" style="stop-color:#D82E09"/>
+<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"/>
 </linearGradient>
-<polygon points="20.174,8.913 16.765,8 18.592,1.181 22.001,2.094  " style="fill:url(#SVGID_1__);"/>
-<rect height="4.411" style="opacity:0.6;enable-background:new    ;" transform="matrix(-0.7072 0.7071 -0.7071 -0.7072 48.0833 -1.2961)" width="9.707" x="19.457" y="7.104"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 90.98 116.5195)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-63.0112" x2="-70.6762" y1="110.0527" y2="104.0977">
-<stop offset="0" style="stop-color:#DE8029"/>
-<stop offset="0.26" style="stop-color:#DE4E29"/>
-<stop offset="1" style="stop-color:#D82E09"/>
+<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"/>
 </linearGradient>
-<polygon points="22.438,13.677 19.941,11.182 26.182,4.942 28.677,7.438  " style="fill:url(#SVGID_2_);"/>
-</g>
-<rect height="30.002" style="fill:none;" width="30.002"/>
+<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"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_new_event.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g>
 <rect fill="none" height="30" width="30"/>
-<rect fill-opacity="0.6" height="8.824" stroke-opacity="0.6" transform="matrix(0.2588 -0.9659 0.9659 0.2588 -3.2518 15.9472)" width="15.883" x="0.824" y="5.681"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="11.58" x2="5.66" y1="3.14" y2="17.71">
-<stop offset="0" stop-color="#DE8029"/>
-<stop offset="0.26" stop-color="#DE4E29"/>
-<stop offset="1" stop-color="#D82E09"/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_1)" points="10.348,17.825 3.53,15.999 7.184,2.361 14.002,4.188 "/>
-<rect fill-opacity="0.6" height="8.823" stroke-opacity="0.6" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -7.7121 18.6197)" width="19.412" x="8.914" y="14.208"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="25.92" x2="10.59" y1="12.91" y2="24.82">
-<stop offset="0" stop-color="#DE8029"/>
-<stop offset="0.26" stop-color="#DE4E29"/>
-<stop offset="1" stop-color="#D82E09"/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_2)" points="14.875,27.354 9.884,22.363 22.363,9.884 27.354,14.875 "/>
-<rect fill="none" height="30.002" width="30.002"/>
+<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"/>
+</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_new_message.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_new_message.svg	Mon Apr 19 14:02:13 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>
-<rect fill="none" height="30" width="30"/>
-<rect fill-opacity="0.6" height="17.647" stroke-opacity="0.6" width="24.708" x="2.647" y="6.177"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="15" x2="15" y1="7.09" y2="22.98">
-<stop offset="0" stop-color="#FEAB0E"/>
-<stop offset="0.31" stop-color="#FEAB0E"/>
-<stop offset="0.79" stop-color="#FFDA33"/>
-<stop offset="1" stop-color="#FFE377"/>
-</linearGradient>
-<rect fill="url(#SVGID_1)" height="15.883" width="22.943" x="3.53" y="7.059"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="15.001,12.912 3.742,22.942 4.773,22.942 15.001,14.583 25.229,22.942 26.26,22.942 " stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="15" x2="15" y1="7.06" y2="22.94">
-<stop offset="0" stop-color="#C9700B"/>
-<stop offset="0.27" stop-color="#C9700B"/>
-<stop offset="0.72" stop-color="#E8AC22"/>
-<stop offset="1" stop-color="#E8AC22"/>
-</linearGradient>
-<polygon fill="url(#SVGID_2)" fill-opacity="0.5" points="26.473,7.059 15.122,7.896 3.53,7.059 3.53,7.201 11.35,15.431 3.53,22.891 3.53,22.942 3.742,22.942 11.761,15.797 15.001,18.853 18.241,15.797 26.26,22.942 26.473,22.942 26.473,22.891 18.674,15.431 26.473,7.201 " stroke-opacity="0.5"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="15" x2="15" y1="7.14" y2="17.02">
-<stop offset="0" stop-color="#FFF278"/>
-<stop offset="1" stop-color="#FFFCDA"/>
-</linearGradient>
-<polygon fill="url(#SVGID_3)" points="3.642,7.059 15.001,17.18 26.359,7.059 "/>
-<rect fill="none" height="30.002" width="30.002"/>
-</g>
-<g>
-<g>
-<rect height="15" style="fill:none;" width="15" x="15"/>
-<rect height="4.412" style="opacity:0.6;enable-background:new    ;" transform="matrix(-0.2587 0.9659 -0.9659 -0.2587 29.2728 -12.3701)" width="7.941" x="15.412" y="2.841"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 90.98 116.5195)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-70.1851" x2="-73.1451" y1="114.9482" y2="107.6632">
-<stop offset="0" style="stop-color:#DE8029"/>
-<stop offset="0.26" style="stop-color:#DE4E29"/>
-<stop offset="1" style="stop-color:#D82E09"/>
-</linearGradient>
-<polygon points="20.174,8.913 16.765,8 18.592,1.181 22.001,2.094  " style="fill:url(#SVGID_1_);"/>
-<rect height="4.411" style="opacity:0.6;enable-background:new    ;" transform="matrix(-0.7072 0.7071 -0.7071 -0.7072 48.0833 -1.2961)" width="9.707" x="19.457" y="7.104"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 90.98 116.5195)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-63.0112" x2="-70.6762" y1="110.0527" y2="104.0977">
-<stop offset="0" style="stop-color:#DE8029"/>
-<stop offset="0.26" style="stop-color:#DE4E29"/>
-<stop offset="1" style="stop-color:#D82E09"/>
-</linearGradient>
-<polygon points="22.438,13.677 19.941,11.182 26.182,4.942 28.677,7.438  " style="fill:url(#SVGID_2_);"/>
-</g>
-<rect height="30.002" style="fill:none;" width="30.002"/>
-</g>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_new_tip.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_new_tip.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g>
+<rect fill="none" height="30" width="30"/>
+<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"/>
+</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"/>
+</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.4" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#686E70"/>
+</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"/>
+<rect fill-opacity="0.25" height="0.927" stroke-opacity="0.25" width="12.002" x="8.998" y="24.491"/>
+<path d="M6.23,9.388C8.414,10.377,11.529,11,15,11c3.475,0,6.592-0.624,8.775-1.615  c-0.779-3.471-3.676-6.199-8.771-6.199C9.908,3.186,7.008,5.914,6.23,9.388z" fill="#FFFFFF" fill-opacity="0.6" stroke-opacity="0.6"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="21" x2="9.1644" y1="24.75" y2="24.75">
+<stop offset="0" style="stop-color:#969696"/>
+<stop offset="0.6242" style="stop-color:#F2F2F2"/>
+<stop offset="1" style="stop-color:#B3B3B3"/>
+</linearGradient>
+</defs>
+</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"/>
+</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"/>
+</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"/>
+</g>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_nfc_offline.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,24 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g>
 <rect fill="none" height="30" width="30"/>
-<path d="M19.504,29c-1.203,0-2.192-0.547-2.674-1.015c-0.225-0.218-4.875-4.538-6.402-5.958l-0.627-0.583 C7.857,19.894,6.709,17.527,6.709,15c0-4.572,3.72-8.292,8.291-8.292c4.572,0,8.291,3.72,8.291,8.292 c0,3.096-1.771,5.946-4.492,7.357l1.079,0.985c0.216,0.206,0.865,0.699,1.468,0.699h1.211c0.818,0,1.486-0.667,1.486-1.487V7.444 c0-0.82-0.668-1.487-1.486-1.487H7.445c-0.82,0-1.487,0.667-1.487,1.487v11.803c0,0.593,0.331,0.995,0.527,1.183 c0.208,0.199,5.013,4.608,6.822,6.269L15.816,29H4.477C2.56,29,1,27.44,1,25.523V4.477C1,2.56,2.56,1,4.477,1h21.047 C27.44,1,29,2.56,29,4.477v21.047C29,27.44,27.44,29,25.523,29H19.504z M15,12.371c-1.449,0-2.628,1.18-2.628,2.629 s1.179,2.628,2.628,2.628s2.629-1.179,2.629-2.628S16.449,12.371,15,12.371L15,12.371z" fill-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="15" x2="15" y1="2" y2="28">
-<stop offset="0" stop-color="#A0F800"/>
-<stop offset="1" stop-color="#319E00"/>
+<path d="M19.504,29c-1.203,0-2.192-0.547-2.674-1.015c-0.225-0.218-4.875-4.538-6.402-5.958l-0.627-0.583  C7.857,19.894,6.709,17.527,6.709,15c0-4.572,3.72-8.292,8.291-8.292c4.572,0,8.291,3.72,8.291,8.292  c0,3.096-1.771,5.946-4.492,7.357l1.079,0.985c0.216,0.206,0.865,0.699,1.468,0.699h1.211c0.818,0,1.486-0.667,1.486-1.487V7.444  c0-0.82-0.668-1.487-1.486-1.487H7.445c-0.82,0-1.487,0.667-1.487,1.487v11.803c0,0.593,0.331,0.995,0.527,1.183  c0.208,0.199,5.013,4.608,6.822,6.269L15.816,29H4.477C2.56,29,1,27.44,1,25.523V4.477C1,2.56,2.56,1,4.477,1h21.047  C27.44,1,29,2.56,29,4.477v21.047C29,27.44,27.44,29,25.523,29H19.504z M15,12.371c-1.449,0-2.628,1.18-2.628,2.629  s1.179,2.628,2.628,2.628s2.629-1.179,2.629-2.628S16.449,12.371,15,12.371L15,12.371z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M19.504,28c-0.969,0-1.717-0.479-1.977-0.731c-0.281-0.272-6.77-6.299-7.045-6.556  C8.711,19.297,7.709,17.222,7.709,15c0-4.021,3.271-7.292,7.291-7.292c4.021,0,7.291,3.271,7.291,7.292  c0,2.994-1.887,5.729-4.695,6.804l-0.624,0.239l2.231,2.038c0.031,0.029,0.998,0.961,2.143,0.961h1.211  c1.371,0,2.486-1.116,2.486-2.487V7.444c0-1.371-1.115-2.487-2.486-2.487H7.445c-1.371,0-2.487,1.116-2.487,2.487v11.803  c0,0.966,0.524,1.609,0.838,1.907c0.233,0.224,5.935,5.453,7.452,6.846H4.477C3.111,28,2,26.89,2,25.523V4.477  C2,3.11,3.111,2,4.477,2h21.047C26.889,2,28,3.11,28,4.477v21.047C28,26.89,26.889,28,25.523,28H19.504z M15,11.371  c-2,0-3.628,1.628-3.628,3.629S13,18.628,15,18.628s3.629-1.627,3.629-3.628S17,11.371,15,11.371L15,11.371z" fill="url(#SVGID_1_)"/>
+<path d="M19.504,28c-0.969,0-1.717-0.479-1.977-0.731c-0.281-0.272-6.77-6.299-7.045-6.556  C8.711,19.297,7.709,17.222,7.709,15c0-4.021,3.271-7.292,7.291-7.292c4.021,0,7.291,3.271,7.291,7.292  c0,2.994-1.887,5.729-4.695,6.804l-0.624,0.239l2.231,2.038c0.031,0.029,0.998,0.961,2.143,0.961h1.211  c1.371,0,2.486-1.116,2.486-2.487V7.444c0-1.371-1.115-2.487-2.486-2.487H7.445c-1.371,0-2.487,1.116-2.487,2.487v11.803  c0,0.966,0.524,1.609,0.838,1.907c0.233,0.224,5.935,5.453,7.452,6.846H4.477C3.111,28,2,26.89,2,25.523V4.477  C2,3.11,3.111,2,4.477,2h21.047C26.889,2,28,3.11,28,4.477v21.047C28,26.89,26.889,28,25.523,28H19.504z M15,11.371  c-2,0-3.628,1.628-3.628,3.629S13,18.628,15,18.628s3.629-1.627,3.629-3.628S17,11.371,15,11.371L15,11.371z" fill="url(#SVGID_1_)"/>
+<path d="M22.261,15.394c0.007-0.132,0.03-0.261,0.03-0.394c0-4.021-3.271-7.292-7.291-7.292  c-4.02,0-7.291,3.271-7.291,7.292c0,0.159,0.018,0.315,0.027,0.474C8.008,11.698,11.158,8.708,15,8.708  C18.816,8.708,21.951,11.656,22.261,15.394z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M15,19.628c2,0,3.629-1.627,3.629-3.628c0-0.171-0.027-0.335-0.051-0.5  c-0.246,1.763-1.749,3.128-3.578,3.128s-3.331-1.365-3.577-3.128c-0.023,0.165-0.051,0.329-0.051,0.5  C11.372,18.001,13,19.628,15,19.628z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M4.958,19.247v1c0,0.966,0.524,1.609,0.838,1.907C5.99,22.34,9.95,25.975,12.158,28h1.09  c-1.518-1.393-7.219-6.622-7.452-6.846C5.482,20.856,4.958,20.213,4.958,19.247z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M25.523,2H4.477C3.111,2,2,3.11,2,4.477v1C2,4.11,3.111,3,4.477,3h21.047  C26.889,3,28,4.11,28,5.477v-1C28,3.11,26.889,2,25.523,2z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M21.346,26.042h1.211c1.371,0,2.486-1.116,2.486-2.487v-1c0,1.371-1.115,2.487-2.486,2.487  h-1.211c-1.145,0-2.111-0.932-2.143-0.961l-1.47-1.343c-0.048,0.02-0.089,0.047-0.138,0.065l-0.624,0.239l2.231,2.038  C19.234,25.11,20.201,26.042,21.346,26.042z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<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"/>
 </linearGradient>
-<path d="M19.504,28c-0.969,0-1.717-0.479-1.977-0.731c-0.281-0.272-6.77-6.299-7.045-6.556 C8.711,19.297,7.709,17.222,7.709,15c0-4.021,3.271-7.292,7.291-7.292c4.021,0,7.291,3.271,7.291,7.292 c0,2.994-1.887,5.729-4.695,6.804l-0.624,0.239l2.231,2.038c0.031,0.029,0.998,0.961,2.143,0.961h1.211 c1.371,0,2.486-1.116,2.486-2.487V7.444c0-1.371-1.115-2.487-2.486-2.487H7.445c-1.371,0-2.487,1.116-2.487,2.487v11.803 c0,0.966,0.524,1.609,0.838,1.907c0.233,0.224,5.935,5.453,7.452,6.846H4.477C3.111,28,2,26.89,2,25.523V4.477 C2,3.11,3.111,2,4.477,2h21.047C26.889,2,28,3.11,28,4.477v21.047C28,26.89,26.889,28,25.523,28H19.504z M15,11.371 c-2,0-3.628,1.628-3.628,3.629S13,18.628,15,18.628s3.629-1.627,3.629-3.628S17,11.371,15,11.371L15,11.371z" fill="url(#SVGID_1)"/>
-<path d="M22.261,15.394c0.007-0.132,0.03-0.261,0.03-0.394c0-4.021-3.271-7.292-7.291-7.292 c-4.02,0-7.291,3.271-7.291,7.292c0,0.159,0.018,0.315,0.027,0.474C8.008,11.698,11.158,8.708,15,8.708 C18.816,8.708,21.951,11.656,22.261,15.394z" fill="#FFFFFF" fill-opacity="0.4"/>
-<path d="M15,19.628c2,0,3.629-1.627,3.629-3.628c0-0.171-0.027-0.335-0.051-0.5 c-0.246,1.763-1.749,3.128-3.578,3.128s-3.331-1.365-3.577-3.128c-0.023,0.165-0.051,0.329-0.051,0.5 C11.372,18.001,13,19.628,15,19.628z" fill="#FFFFFF" fill-opacity="0.4"/>
-<path d="M4.958,19.247v1c0,0.966,0.524,1.609,0.838,1.907C5.99,22.34,9.95,25.975,12.158,28h1.09 c-1.518-1.393-7.219-6.622-7.452-6.846C5.482,20.856,4.958,20.213,4.958,19.247z" fill="#FFFFFF" fill-opacity="0.4"/>
-<path d="M25.523,2H4.477C3.111,2,2,3.11,2,4.477v1C2,4.11,3.111,3,4.477,3h21.047 C26.889,3,28,4.11,28,5.477v-1C28,3.11,26.889,2,25.523,2z" fill="#FFFFFF" fill-opacity="0.4"/>
-<path d="M21.346,26.042h1.211c1.371,0,2.486-1.116,2.486-2.487v-1c0,1.371-1.115,2.487-2.486,2.487 h-1.211c-1.145,0-2.111-0.932-2.143-0.961l-1.47-1.343c-0.048,0.02-0.089,0.047-0.138,0.065l-0.624,0.239l2.231,2.038 C19.234,25.11,20.201,26.042,21.346,26.042z" fill="#FFFFFF" fill-opacity="0.4"/>
-<rect fill-opacity="0.6" height="34.268" stroke-opacity="0.6" transform="matrix(0.7073 -0.707 0.707 0.7073 -6.2126 14.9968)" width="3.169" x="13.418" y="-2.134"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="2.23" y2="26.93">
+</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="#DE8029"/>
-<stop offset="0.26" stop-color="#DE4E29"/>
+<stop offset="0.2606" stop-color="#DE4E29"/>
 <stop offset="1" stop-color="#D82E09"/>
 </linearGradient>
-<polygon fill="url(#SVGID_1_)" points="25.996,26.987 3.015,4.005 4.006,3.014 26.987,25.996 "/>
-<rect fill="none" height="30.002" width="30.002"/>
+</defs>
+</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_note.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_note.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_note.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <g>
 <rect fill="none" height="30" width="30"/>
-<polygon fill-opacity="0.6" points="3.75,26.25 3.75,3.75 26.25,3.75 26.25,20.076 20.076,26.25 " stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="15" x2="15" y1="4.69" y2="25.31">
-<stop offset="0" stop-color="#FFD338"/>
-<stop offset="1" stop-color="#F6A800"/>
+<polygon fill-opacity="0.6" points="2,28 2,2 28,2 28,21.414 21.414,28 "/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="3" y2="27.0005">
+<stop offset="0" style="stop-color:#FFD338"/>
+<stop offset="1" style="stop-color:#F6A800"/>
 </linearGradient>
-<polygon fill="url(#SVGID_1)" points="4.688,4.688 4.688,25.313 19.688,25.313 25.313,19.688 25.313,4.688 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="19.65" x2="22.46" y1="19.65" y2="22.46">
-<stop offset="0" stop-color="#FEFFD9"/>
-<stop offset="1" stop-color="#FFCF01"/>
+<polygon fill="url(#SVGID_1_)" points="3,3 3,27 21,27 27,21 27,3 "/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="20.959" x2="23.9587" y1="20.959" y2="23.9587">
+<stop offset="0" style="stop-color:#FEFFD9"/>
+<stop offset="1" style="stop-color:#FFCF01"/>
 </linearGradient>
-<polygon fill="url(#SVGID_2)" points="25.313,19.688 19.688,19.688 19.688,25.313 "/>
-<rect fill-opacity="0.5" height="1.406" stroke-opacity="0.5" width="16.875" x="6.563" y="8.906"/>
-<rect fill-opacity="0.5" height="1.406" stroke-opacity="0.5" width="16.875" x="6.563" y="12.656"/>
-<rect fill-opacity="0.5" height="1.406" stroke-opacity="0.5" width="11.25" x="6.563" y="16.406"/>
+<polygon fill="url(#SVGID_2_)" points="27,21 21,21 21,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"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_offline.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_offline.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_offline.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <g>
-<path d="M15.001,25.59c-5.839,0-10.589-4.75-10.589-10.589  S9.162,4.412,15.001,4.412S25.59,9.162,25.59,15.001S20.84,25.59,15.001,25.59L15.001,25.59z" style="opacity:0.6;enable-background:new    ;"/>
-<radialGradient cx="339.7822" cy="-408.5767" gradientTransform="matrix(0.8824 0 0 -0.8824 -284.8232 -348.3516)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="13.3344">
+<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.0723" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="16.3651">
 <stop offset="0" style="stop-color:#DCDCDC"/>
 <stop offset="1" style="stop-color:#787878"/>
 </radialGradient>
-<path d="M15.001,24.707c-5.352,0-9.707-4.354-9.707-9.706c0-5.352,4.354-9.707,9.707-9.707  c5.352,0,9.706,4.354,9.706,9.707C24.707,20.354,20.353,24.707,15.001,24.707L15.001,24.707z" style="fill:url(#SVGID_1_);"/>
-<path d="M15.001,5.294c-5.352,0-9.707,4.354-9.707,9.707  c0,5.353,4.354,9.706,9.707,9.706c5.352,0,9.706-4.354,9.706-9.706C24.707,9.649,20.353,5.294,15.001,5.294z M15.001,22.942  c-4.866,0-8.824-3.075-8.824-7.941c0-4.866,3.958-8.824,8.824-8.824c4.865,0,8.823,3.958,8.823,8.824  C23.824,19.867,19.866,22.942,15.001,22.942z" style="opacity:0.3;fill:url(#SVGID_2_);enable-background:new    ;"/>
-<path d="M15.001,18.53c-3.893,0-7.06-2.573-7.06-5.735  c0-3.163,3.167-5.736,7.06-5.736c3.892,0,7.06,2.573,7.06,5.736C22.061,15.957,18.893,18.53,15.001,18.53L15.001,18.53z" style="opacity:0.2;fill:#FFFFFF;enable-background:new    ;"/>
-<rect height="30.002" style="fill:none;" width="30.002"/>
+<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.3" stroke-opacity="0.3"/>
+<path d="M15,19.909c-5.414,0-9.818-3.579-9.818-7.978S9.586,3.955,15,3.955  c5.414,0,9.818,3.578,9.818,7.977S20.414,19.909,15,19.909L15,19.909z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
 <defs>
-<linearGradient gradientTransform="matrix(0.8824 0 0 -0.8824 -284.8232 -348.3516)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="339.7822" x2="339.7822" y1="-422.7778" y2="-400.7778">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="15.0005" x2="15.0005" y1="28.5" y2="1.5005">
 <stop offset="0" style="stop-color:#FFFFFF"/>
 <stop offset="1" style="stop-color:#B4B4B4"/>
 </linearGradient>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_online.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_online.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_online.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,19 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <g>
-<path d="M15.001,25.59c-5.839,0-10.589-4.75-10.589-10.589  S9.162,4.412,15.001,4.412S25.59,9.162,25.59,15.001S20.84,25.59,15.001,25.59L15.001,25.59z" style="opacity:0.6;enable-background:new    ;"/>
-<radialGradient cx="339.7822" cy="-408.9106" gradientTransform="matrix(0.8824 0 0 -0.8824 -284.8232 -348.3516)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="15.9502">
+<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"/>
 </radialGradient>
-<path d="M15.001,24.707c-5.352,0-9.707-4.354-9.707-9.706c0-5.352,4.354-9.707,9.707-9.707  c5.352,0,9.706,4.354,9.706,9.707C24.707,20.354,20.353,24.707,15.001,24.707L15.001,24.707z" style="fill:url(#SVGID_1_);"/>
-<path d="M15.001,5.294c-5.352,0-9.707,4.354-9.707,9.707  c0,5.353,4.354,9.706,9.707,9.706c5.352,0,9.706-4.354,9.706-9.706C24.707,9.649,20.353,5.294,15.001,5.294z M15.001,22.942  c-4.866,0-8.824-3.075-8.824-7.941c0-4.866,3.958-8.824,8.824-8.824c4.865,0,8.823,3.958,8.823,8.824  C23.824,19.867,19.866,22.942,15.001,22.942z" style="opacity:0.4;fill:url(#SVGID_2_);enable-background:new    ;"/>
-<path d="M15.001,18.53c-3.893,0-7.06-2.573-7.06-5.735  c0-3.163,3.167-5.736,7.06-5.736c3.892,0,7.06,2.573,7.06,5.736C22.061,15.957,18.893,18.53,15.001,18.53L15.001,18.53z" style="opacity:0.2;fill:#FFFFFF;enable-background:new    ;"/>
-<rect height="30.002" style="fill:none;" width="30.002"/>
+<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"/>
+<path d="M15,19.909c-5.414,0-9.818-3.579-9.818-7.978S9.586,3.955,15,3.955  c5.414,0,9.818,3.578,9.818,7.977S20.414,19.909,15,19.909L15,19.909z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
+<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_2_" x1="339.7822" x2="339.7822" y1="-422.7778" y2="-400.7778">
+<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"/>
 </linearGradient>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_operator.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_operator.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_operator.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,27 +1,41 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g>
 <rect fill="none" height="30" width="30"/>
-<polygon fill-opacity="0.6" points="4.412,27.354 4.412,2.647 18.896,2.647 25.59,9.341 25.59,27.354 " stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="15" x2="15" y1="3.53" y2="26.47">
-<stop offset="0" stop-color="#FFFFFF"/>
-<stop offset="1" stop-color="#B1B1B1"/>
+<polygon fill-opacity="0.6" points="3,29 3,1 19.414,1 27,8.586 27,29 "/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="2" y2="28.0005">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#B1B1B1"/>
+</linearGradient>
+<polygon fill="url(#SVGID_1_)" points="26,9 26,28 4,28 4,2 19,2 "/>
+<polygon fill="#FFFFFF" points="19,2 4,2 4,3 18.586,3 26,10.484 26,9 "/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="15.0005" x2="15.0005" y1="25" y2="12.0005">
+<stop offset="0" style="stop-color:#666666"/>
+<stop offset="1" style="stop-color:#282828"/>
+</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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_1)" points="24.707,9.707 24.707,26.473 5.294,26.473 5.294,3.53 18.53,3.53 "/>
-<polygon fill="#FFFFFF" points="18.53,3.53 5.294,3.53 5.294,4.412 18.165,4.412 24.707,11.016 24.707,9.707 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="15" x2="15" y1="23.82" y2="12.35">
-<stop offset="0" stop-color="#666666"/>
-<stop offset="1" stop-color="#282828"/>
+<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"/>
+</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"/>
 </linearGradient>
-<rect fill="url(#SVGID_2)" height="11.471" width="14.119" x="7.941" y="12.354"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="15" x2="15" y1="13.24" y2="22.92">
-<stop offset="0" stop-color="#FEE06A"/>
-<stop offset="1" stop-color="#FFB701"/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_3)" points="17.648,13.236 17.648,15.883 16.766,15.883 16.766,13.236 13.236,13.236 13.236,15.883 12.354,15.883 12.354,13.236 8.824,13.236 8.824,17.648 21.178,17.648 21.178,13.236 "/>
-<rect fill="url(#SVGID_3)" height="4.412" width="3.529" x="8.824" y="18.53"/>
-<rect fill="url(#SVGID_3)" height="4.412" width="3.53" x="13.236" y="18.53"/>
-<rect fill="url(#SVGID_3)" height="4.412" width="3.529" x="17.648" y="18.53"/>
-<rect fill="#FFFFFF" fill-opacity="0.3" height="0.882" stroke-opacity="0.3" width="12.354" x="8.824" y="13.236"/>
-<rect fill="none" height="30.002" width="30.002"/>
+<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"/>
+<rect fill="none" height="30" width="30"/>
+</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_outbox.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_outbox.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_outbox.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <g>
 <rect fill="none" height="30" width="30"/>
-<rect fill="none" height="30.002" width="30.002"/>
-<polygon fill-opacity="0.6" points="11.471,19.118 11.471,12.942 7.941,12.942 15.001,3.53 22.061,12.942 18.53,12.942 18.53,19.118 " stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="15" x2="15" y1="4.79" y2="18.32">
-<stop offset="0" stop-color="#A0F800"/>
-<stop offset="1" stop-color="#319E00"/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_1)" points="15.001,5 9.707,12.06 12.354,12.06 12.354,18.236 17.648,18.236 17.648,12.06 20.295,12.06 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="15" x2="15" y1="4.79" y2="18.32">
-<stop offset="0" stop-color="#A0F800"/>
-<stop offset="0.76" stop-color="#4CB400"/>
-<stop offset="1" stop-color="#89CC6A"/>
+<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"/>
 </linearGradient>
-<path d="M15.001,5L9.707,12.06h2.647v6.177h5.295V12.06h2.646L15.001,5z M16.766,11.177v6.176h-3.53 v-6.176h-1.765l3.53-4.706l3.529,4.706H16.766z" fill="url(#SVGID_2)"/>
-<polygon fill-opacity="0.6" points="4.412,26.473 4.412,18.53 7.941,18.53 7.941,21.178 22.061,21.178 22.061,18.53 25.59,18.53 25.59,26.473 " stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="15" x2="15" y1="19.41" y2="25.59">
-<stop offset="0" stop-color="#4EDEFF"/>
-<stop offset="1" stop-color="#048CC6"/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_3)" points="22.942,19.412 22.942,22.061 7.059,22.061 7.059,19.412 5.294,19.412 5.294,22.061 5.294,24.707 5.294,25.59 24.707,25.59 24.707,24.707 24.707,22.061 24.707,19.412 "/>
-<rect fill-opacity="0.2" height="0.883" stroke-opacity="0.2" width="19.413" x="5.294" y="24.707"/>
-<rect fill="#FFFFFF" fill-opacity="0.2" height="0.883" stroke-opacity="0.2" width="1.765" x="5.294" y="19.412"/>
-<rect fill="#FFFFFF" fill-opacity="0.2" height="0.883" stroke-opacity="0.2" width="1.765" x="22.942" y="19.412"/>
-<rect fill="#FFFFFF" fill-opacity="0.2" height="0.882" stroke-opacity="0.2" width="15.883" x="7.059" y="22.061"/>
+<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"/>
+<rect fill="#FFFFFF" fill-opacity="0.2" height="1" stroke-opacity="0.2" width="2" x="2" y="20"/>
+<rect fill="#FFFFFF" fill-opacity="0.2" height="1" stroke-opacity="0.2" width="2" x="26" y="20"/>
+<rect fill="#FFFFFF" fill-opacity="0.2" height="1" stroke-opacity="0.2" width="22" x="4" y="23"/>
+<rect fill="none" height="30" width="30"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ovi.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ovi.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ovi.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <rect fill="none" height="30" width="30"/>
 <rect fill="none" height="30" width="30"/>
 <rect fill="#44A51C" height="30" width="30"/>
-<path d="M7.069,9.857c-3.87,0-5.903,2.655-5.903,6.435c0,3.829,1.497,6.84,5.863,6.84 c4.022,0,5.882-2.724,5.882-6.754C12.911,12.533,11.078,9.857,7.069,9.857z M7.027,21.064c-2.063,0-2.152-2.928-2.152-4.844 c0-1.868,0.156-4.297,2.152-4.297c1.901,0,2.169,2.567,2.169,4.297C9.197,18.448,9.084,21.064,7.027,21.064z" fill="#FFFFFF"/>
-<path d="M17.85,23.132c1.57,0,2.125-0.788,2.498-1.933l3.385-11.162h-3.158l-2.42,9.658l-2.282-9.658h-3.739 l3.212,11.162C15.697,22.344,16.275,23.132,17.85,23.132z" fill="#FFFFFF"/>
-<path d="M26.988,5.348c-1.162,0-1.969,0.587-1.969,1.667c0,1.082,0.827,1.667,1.969,1.667 c1.143,0,1.967-0.585,1.967-1.667C28.955,5.957,28.086,5.348,26.988,5.348z" fill="#FFFFFF"/>
-<path d="M25.686,22.773c0.263,0.191,0.681,0.358,1.27,0.358c0.615,0,1.018-0.169,1.282-0.358 c0.507-0.357,0.507-0.963,0.507-1.289V10.037h-3.525c0,0-0.129,0-0.244,0c-0.341,0-0.626,0.007-0.818,0.275 c-0.098,0.124-0.229,0.351-0.229,0.759c0,0.424,0.132,0.628,0.229,0.756c0.192,0.272,0.478,0.273,0.818,0.273 c0.115,0,0.209-0.001,0.209-0.001v9.385C25.182,21.811,25.182,22.416,25.686,22.773z" fill="#FFFFFF"/>
+<path d="M7.069,9.857c-3.87,0-5.903,2.655-5.903,6.435,0,3.829,1.497,6.84,5.863,6.84,4.022,0,5.882-2.724,5.882-6.754,0-3.85-1.83-6.523-5.841-6.523zm-0.042,11.2c-2.063,0-2.152-2.928-2.152-4.844,0-1.868,0.156-4.297,2.152-4.297,1.901,0,2.169,2.567,2.169,4.297,0.001,2.23-0.112,4.84-2.169,4.84z" fill="#FFFFFF"/>
+<path d="M17.85,23.13c1.57,0,2.125-0.788,2.498-1.933l3.385-11.16h-3.158l-2.42,9.658-2.282-9.658h-3.739l3.212,11.16c0.35,1.14,0.93,1.93,2.5,1.93z" fill="#FFFFFF"/>
+<path d="M26.99,5.348c-1.162,0-1.969,0.587-1.969,1.667,0,1.082,0.827,1.667,1.969,1.667,1.143,0,1.967-0.585,1.967-1.667,0-1.058-0.87-1.667-1.97-1.667z" fill="#FFFFFF"/>
+<path d="M25.69,22.77c0.263,0.191,0.681,0.358,1.27,0.358,0.615,0,1.018-0.169,1.282-0.358,0.507-0.357,0.507-0.963,0.507-1.289v-11.44h-3.525-0.244c-0.341,0-0.626,0.007-0.818,0.275-0.098,0.124-0.229,0.351-0.229,0.759,0,0.424,0.132,0.628,0.229,0.756,0.192,0.272,0.478,0.273,0.818,0.273,0.115,0,0.209-0.001,0.209-0.001v9.385c-0.01,0.31-0.01,0.92,0.5,1.27z" fill="#FFFFFF"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_pager.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_pager.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_pager.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,40 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g>
 <rect fill="none" height="30" width="30"/>
-<path d="M5,25c-1.654,0-3-1.346-3-3V8c0-1.654,1.346-3,3-3h20c1.654,0,3,1.346,3,3v14c0,1.654-1.346,3-3,3H5z" fill-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="15" x2="15" y1="6.2" y2="23.82">
-<stop offset="0" stop-color="#808080"/>
-<stop offset="0.5" stop-color="#636363"/>
-<stop offset="1" stop-color="#1C1C1C"/>
+<path d="M4,25c-1.654,0-3-1.346-3-3V8c0-1.654,1.346-3,3-3h22c1.654,0,3,1.346,3,3v14c0,1.654-1.346,3-3,3H4z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="6.2002" y2="23.8229">
+<stop offset="0" style="stop-color:#808080"/>
+<stop offset="0.5" style="stop-color:#636363"/>
+<stop offset="1" style="stop-color:#1C1C1C"/>
 </linearGradient>
-<path d="M27,22c0,1.1-0.9,2-2,2H5c-1.1,0-2-0.9-2-2V8c0-1.1,0.9-2,2-2h20c1.1,0,2,0.9,2,2V22z" fill="url(#SVGID_1)"/>
-<path d="M25,6H5C3.9,6,3,6.9,3,8v1c0-1.1,0.9-2,2-2h20c1.1,0,2,0.9,2,2V8C27,6.9,26.1,6,25,6z" fill="#FFFFFF" fill-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="15" x2="15" y1="8.11" y2="17.9">
-<stop offset="0" stop-color="#4F4F4F"/>
-<stop offset="1" stop-color="#9E9E9E"/>
+<path d="M28,22c0,1.1-0.9,2-2,2H4c-1.1,0-2-0.9-2-2V8c0-1.1,0.9-2,2-2h22c1.1,0,2,0.9,2,2V22z" fill="url(#SVGID_1_)"/>
+<path d="M26,6H4C2.9,6,2,6.9,2,8v1c0-1.1,0.9-2,2-2h22c1.1,0,2,0.9,2,2V8C28,6.9,27.1,6,26,6z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="8.1113" y2="17.9019">
+<stop offset="0" style="stop-color:#4F4F4F"/>
+<stop offset="1" style="stop-color:#9E9E9E"/>
 </linearGradient>
-<path d="M5,18c-0.55,0-1-0.45-1-1V9c0-0.55,0.45-1,1-1h20c0.55,0,1,0.45,1,1v8c0,0.55-0.45,1-1,1H5z" fill="url(#SVGID_2)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="15" x2="15" y1="9.09" y2="16.92">
-<stop offset="0" stop-color="#3BC8EB"/>
-<stop offset="1" stop-color="#1E6BC4"/>
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_3)" height="8" width="20" x="5" y="9"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="23.5" x2="23.5" y1="20.02" y2="21.98">
-<stop offset="0" stop-color="#96D12A"/>
-<stop offset="0.39" stop-color="#96D12A"/>
-<stop offset="1" stop-color="#4B8B00"/>
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_4)" height="2" width="3" x="22" y="20"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="18.5" x2="18.5" y1="20.02" y2="21.98">
-<stop offset="0" stop-color="#C0C0C0"/>
-<stop offset="1" stop-color="#4F4F4F"/>
+<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">
+<stop offset="0" style="stop-color:#C0C0C0"/>
+<stop offset="1" style="stop-color:#4F4F4F"/>
 </linearGradient>
-<rect fill="url(#SVGID_5)" height="2" width="3" x="17" y="20"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6" x1="13.5" x2="13.5" y1="20.02" y2="21.98">
-<stop offset="0" stop-color="#DE6F00"/>
-<stop offset="1" stop-color="#AB0000"/>
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_6)" height="2" width="3" x="12" y="20"/>
-<polygon fill="#FFFFFF" fill-opacity="0.2" points="25,12 5,13 5,9 25,9 "/>
+<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"/>
+</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_pair.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_pair.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_pair.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,21 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <g>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="10.2173" x2="10.2173" y1="0.5332" y2="24.8036">
+<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"/>
 </linearGradient>
-<path d="M16.436,7.809L9.33,0.533v9.584L5.426,6.121L4,7.576l4.908,5.033L4,17.641l1.424,1.453L9.33,15.1  v9.584l7.105-7.271l-4.692-4.803L16.436,7.809z M13.6,7.824l-2.27,2.318l-0.004-4.641L13.6,7.824z M13.6,17.398l-2.273,2.316  l0.004-4.641L13.6,17.398z" fill="url(#SVGID_1_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="19.7832" x2="19.7832" y1="5.3164" y2="29.5868">
+<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"/>
 </linearGradient>
-<path d="M26,12.592l-7.104-7.275V14.9l-3.905-3.996l-1.426,1.455l4.909,5.033l-4.909,5.031l1.423,1.453  l3.908-3.994v9.584L26,22.193l-4.691-4.801L26,12.592z M23.164,12.605l-2.269,2.32l-0.003-4.643L23.164,12.605z M23.164,22.182  l-2.271,2.316l0.003-4.641L23.164,22.182z" fill="url(#SVGID_2_)"/>
+<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"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_person.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_person.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_person.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,40 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g>
 <rect fill="none" height="30" width="30"/>
-<path d="M2.647,27.354v-0.882c0-2.625,1.168-4.641,3.38-5.83 c0.531-0.285,1.713-0.749,3.328-1.371c0.6-0.23,1.317-0.508,1.667-0.655c0.13-0.374,0.097-1.011,0.001-1.202 c0,0-0.975-1.768-1.011-1.842c-0.802-0.083-1.569-0.771-1.944-1.764c-0.403-1.067-0.252-2.129,0.329-2.73 c-0.52-2.232-0.404-3.951,0.347-5.112c0.446-0.689,1.118-1.172,1.917-1.382c0.824-0.997,1.986-1.938,4.132-1.938 c2.504,0.085,4.447,0.948,5.651,2.499c1.184,1.524,1.567,3.644,1.085,5.982c0.549,0.615,0.67,1.672,0.25,2.721 c-0.362,0.91-1.035,1.542-1.771,1.69c-0.041,0.086-1.036,1.887-1.036,1.887c-0.107,0.211-0.12,0.911,0.021,1.25 c0.294,0.117,0.874,0.336,1.399,0.533c1.713,0.645,3.066,1.16,3.577,1.429c0.566,0.3,3.387,1.983,3.387,5.835v0.882H2.647z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="15" x2="15" y1="23.08" y2="16.98">
-<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"/>
+<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"/>
 </linearGradient>
-<path d="M18.678,19.592c-0.812-0.356-0.785-2.109-0.451-2.639c0.058-0.092,0.111-0.184,0.168-0.277 h-6.788c0.056,0.094,0.109,0.186,0.167,0.277c0.334,0.531,0.36,2.282-0.451,2.639c-0.812,0.357,3.771,3.47,3.771,3.47 S19.49,19.949,18.678,19.592z" fill="url(#SVGID_1)"/>
-<path d="M11.775,16.953c0.136,0.216,0.216,0.637,0.214,1.082 c0.764,0.833,1.816,1.67,2.96,1.67c1.467,0,2.406-0.753,3.066-1.568c-0.018-0.481,0.064-0.949,0.211-1.182 c0.058-0.094,0.111-0.186,0.168-0.277h-6.788C11.664,16.77,11.716,16.859,11.775,16.953z" fill-opacity="0.1" stroke-opacity="0.1"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="15" x2="15" y1="19.27" y2="26.47">
-<stop offset="0" stop-color="#FF7236"/>
-<stop offset="1" stop-color="#BA1212"/>
+<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"/>
 </linearGradient>
-<path d="M23.557,21.418c-0.854-0.449-5.084-1.951-5.164-2.045l-3.231,2.723l-3.473-2.828 c-0.094,0.145-4.277,1.631-5.244,2.15c-1.107,0.598-2.915,1.967-2.915,5.055h22.943C26.473,23.385,24.409,21.869,23.557,21.418z" fill="url(#SVGID_2)"/>
-<path d="M23.145,22.199c-0.453-0.238-2.211-0.9-3.375-1.34c-0.554-0.207-0.943-0.354-1.223-0.463 l-0.275,0.232c0.18,0.068,0.38,0.144,0.615,0.232c1.163,0.438,2.923,1.1,3.375,1.339c0.362,0.191,2.014,1.177,2.374,3.39h0.882 C25.16,23.377,23.508,22.391,23.145,22.199z" fill="#FF7B56"/>
-<path d="M7.745,22.195c0.475-0.254,2.012-0.848,3.134-1.279c0.389-0.15,0.708-0.273,0.975-0.377l-0.29-0.236 c-0.339,0.139-0.832,0.33-1.566,0.611c-1.122,0.434-2.66,1.025-3.134,1.281c-1.372,0.739-2.174,1.879-2.391,3.395h0.882 C5.571,24.074,6.374,22.935,7.745,22.195z" fill="#FF7B56"/>
-<radialGradient cx="12.31" cy="9.37" gradientUnits="userSpaceOnUse" id="SVGID_3" r="11.7">
-<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"/>
+<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"/>
+<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"/>
 </radialGradient>
-<path d="M20.629,11.538c-0.029-0.014-0.061-0.017-0.092-0.025v-0.001 c-0.006-0.001-0.011-0.002-0.018-0.003c-0.045-0.012-0.09-0.021-0.135-0.025c-5.667-1-8.266-4.181-8.463-3.338 c-0.155,0.67-1.744,2.12-2.576,2.844c0.007,0.032,0.012,0.061,0.018,0.093c0,0,0.03,0.149,0.092,0.401 c-0.066,0.007-0.13,0.021-0.194,0.049c-0.53,0.226-0.695,1.106-0.371,1.965c0.325,0.86,1.017,1.374,1.545,1.149 c0.034-0.015,0.061-0.039,0.091-0.057c0.309,0.701,0.686,1.452,1.149,2.206c0.775,0.934,1.962,2.029,3.273,2.029 c1.585,0,2.556-0.88,3.223-1.767c0.017-0.037,0.034-0.072,0.054-0.103c0.494-0.783,0.895-1.569,1.22-2.3 c0.519,0.183,1.184-0.305,1.513-1.132C21.301,12.666,21.152,11.778,20.629,11.538z" fill="url(#SVGID_3)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="14.9" x2="14.9" y1="3.64" y2="10.94">
-<stop offset="0" stop-color="#8A5D3B"/>
-<stop offset="0.38" stop-color="#632F00"/>
-<stop offset="1" stop-color="#361700"/>
+<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"/>
 </linearGradient>
-<path d="M14.791,3.53c-1.964,0-2.91,0.905-3.638,1.852C9.966,5.567,8.085,6.67,9.414,11.5 c0.831-0.724,2.354-2.684,2.509-3.354c0.199-0.851,2.842,2.399,8.615,3.366c0.067-0.27,0.099-0.43,0.099-0.43 C21.543,6.959,19.57,3.691,14.791,3.53z" fill="url(#SVGID_4)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="15.05" x2="15.05" y1="19.58" y2="24.38">
-<stop offset="0" stop-color="#BC1C24"/>
-<stop offset="1" stop-color="#6B1C24"/>
+<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"/>
 </linearGradient>
-<path d="M20.26,20.102c-0.997-0.375-1.831-0.688-1.866-0.729l-3.231,2.723l-3.472-2.828 c-0.042,0.063-0.857,0.38-1.844,0.76l5.335,4.359L20.26,20.102z" fill="url(#SVGID_5)"/>
-<rect fill="none" height="30.002" width="30.002"/>
+<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"/>
+</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_phone_disabled.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_phone_disabled.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g>
+<rect fill="none" height="30" width="30"/>
+<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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
+</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 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_phonebook.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_phonebook.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_phonebook.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,39 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g>
 <rect fill="none" height="30" width="30"/>
-<path d="M4,1v5C2.897,6,2,6.897,2,8s0.897,2,2,2v1c-1.103,0-2,0.897-2,2s0.897,2,2,2v1c-1.103,0-2,0.897-2,2 s0.897,2,2,2v1c-1.103,0-2,0.897-2,2s0.897,2,2,2v4h24V1H4z" fill-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="18" x2="18" y1="2" y2="28">
-<stop offset="0" stop-color="#A0F800"/>
-<stop offset="1" stop-color="#319E00"/>
+<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.725,1.289-2.725,2.391 c0,0-0.098,2.688,0.389,3.753c0.266,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.58,2.914-3.751,3.148V23h10v-2.992C22.713,19.772,19.2,17.938,19.134,16.857z" fill-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="7" x2="7" y1="2" y2="28">
-<stop offset="0" stop-color="#FFFFFF"/>
-<stop offset="1" stop-color="#A5A5A5"/>
+<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" stop-color="#ABABAB"/>
-<stop offset="1" stop-color="#4F4F4F"/>
+<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" stop-color="#ABABAB"/>
-<stop offset="1" stop-color="#4F4F4F"/>
+<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" stop-color="#ABABAB"/>
-<stop offset="1" stop-color="#4F4F4F"/>
+<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" stop-color="#ABABAB"/>
-<stop offset="1" stop-color="#4F4F4F"/>
+<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.725,1.289-2.725,2.391 c0,0-0.098,2.688,0.389,3.753c0.266,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.58,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" width="22" x="5" y="2"/>
+<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 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_play.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_play.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_play.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,17 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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="M5.294,26.473c-0.156,0-0.313-0.042-0.45-0.124  C4.576,26.189,4.412,25.9,4.412,25.59V4.412c0-0.312,0.164-0.6,0.432-0.759C4.982,3.571,5.138,3.53,5.294,3.53  c0.146,0,0.291,0.036,0.423,0.107L25.13,14.226c0.283,0.154,0.46,0.452,0.46,0.775c0,0.323-0.177,0.62-0.46,0.774L5.717,26.364  C5.585,26.436,5.44,26.473,5.294,26.473L5.294,26.473z" style="opacity:0.6;enable-background:new    ;"/>
-<polygon points="5.294,4.412 24.707,15.001 5.294,25.59 " style="fill:url(#SVGID_1_);"/>
-<polygon points="5.294,24.707 5.294,25.59 24.707,15.001   23.898,14.56 " style="opacity:0.1;fill:#753200;enable-background:new    ;"/>
-<polygon points="24.707,15.001 5.294,4.412 5.294,5.294   23.898,15.442 " style="opacity:0.4;fill:#FFFFFF;enable-background:new    ;"/>
-<rect height="30.002" style="fill:none;" width="30.002"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<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;"/>
+<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.7813" x2="339.7813" y1="-399.7783" y2="-423.7783">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+<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>
 </defs>
-</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_playlist.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_playlist.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g>
+<rect fill="none" height="30" width="30"/>
+<polygon fill-opacity="0.6" points="3,29 3,1 27,1 27,22.414 20.414,29 " 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:#F9F9F9"/>
+<stop offset="1" style="stop-color:#B5B5B5"/>
+</linearGradient>
+<polygon fill="url(#SVGID_1_)" points="4,2 4,28 20,28 26,22 26,2 "/>
+<polygon fill="#FFFFFF" points="26,22 20,22 20,28 "/>
+<rect fill-opacity="0.5" height="1.5" stroke-opacity="0.5" width="16" x="7" y="6.5"/>
+<rect fill-opacity="0.5" height="1.5" stroke-opacity="0.5" width="16" x="7" y="10.5"/>
+<rect fill-opacity="0.5" height="1.5" stroke-opacity="0.5" width="11" x="7" y="14.5"/>
+</g>
+<g>
+<path d="M20.96,28.68c-1.825,0-3.309-1.187-3.309-2.646s1.483-2.647,3.309-2.647c0.224,0,0.445,0.018,0.661,0.053v-7.245l5.735,1.537v4.111l-3.089-0.828v5.02c0,1.47-1.49,2.66-3.31,2.66z" fill-opacity="0.6" stroke-opacity="0.6" style="enable-background:new;"/>
+<path d="M22.06,16.77v7.229c-0.34-0.109-0.712-0.17-1.103-0.17-1.584,0-2.868,0.987-2.868,2.206s1.284,2.206,2.868,2.206c1.583,0,2.867-0.988,2.867-2.206v-5.595l3.088,0.828v-3.198l-4.86-1.3z" fill="url(#SVGID_1__)"/>
+<path d="M20.96,27.8c-1.487,0-2.709-0.871-2.854-1.985-0.009,0.072-0.014,0.146-0.014,0.221,0,1.219,1.283,2.206,2.867,2.206,1.583,0,2.867-0.988,2.867-2.206v-0.45c-0.02,1.22-1.3,2.21-2.88,2.21z" fill-opacity="0.2" stroke-opacity="0.2" style="enable-background:new;"/>
+<polygon fill-opacity="0.2" points="23.82,20.44,26.91,21.26,26.91,20.82,23.82,20" stroke-opacity="0.2" style="enable-background:new;"/>
+<path d="M20.96,24.27c0.391,0,0.763,0.062,1.103,0.171v-0.441c-0.339-0.109-0.712-0.17-1.103-0.17-1.584,0-2.867,0.987-2.867,2.206,0,0.074,0.005,0.147,0.014,0.22,0.15-1.12,1.37-1.99,2.86-1.99z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4" style="enable-background:new;"/>
+<polygon fill="#FFFFFF" fill-opacity="0.4" points="22.06,16.77,22.06,17.21,26.91,18.51,26.91,18.07" stroke-opacity="0.4" style="enable-background:new;"/>
+<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"/>
+</linearGradient>
+</defs>
+<rect fill="none" height="30" width="30"/>
+</g>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_plus.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_plus.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="none" width="30" height="30"/>
-<path fill="#009CEF" d="M28.5,25.5c0,1.655-1.342,3-3,3h-21c-1.656,0-3-1.345-3-3v-21c0-1.656,1.344-3,3-3h21c1.658,0,3,1.344,3,3
-	V25.5z"/>
-<polygon fill="#FFFFFF" points="24,12.75 17.25,12.75 17.25,6 12.75,6 12.75,12.75 6,12.75 6,17.25 12.75,17.25 12.75,24 17.25,24 
-	17.25,17.25 24,17.25 "/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_presentation.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_presentation.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_presentation.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,48 +1,53 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <g>
-<polygon fill-opacity="0.6" points="28.125,8.438 28.125,2.813 1.875,2.813 1.875,8.438 2.813,8.438   2.813,23.438 1.875,23.438 1.875,27.188 28.125,27.188 28.125,23.438 27.188,23.438 27.188,8.438 " stroke-opacity="0.6"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 214.52 -8.0195)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-199.52" x2="-199.52" y1="-11.7695" y2="-15.5195">
+<rect fill="none" height="30" width="30"/>
+<polygon fill-opacity="0.6" points="29,8 29,2 1,2 1,8 2,8 2,24 1,24 1,28 29,28 29,24 28,24 28,8 "/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="3" y2="7">
 <stop offset="0" style="stop-color:#B2B2B2"/>
 <stop offset="1" style="stop-color:#666666"/>
 </linearGradient>
-<rect fill="url(#SVGID_1_)" height="3.75" width="24.375" x="2.813" y="3.75"/>
-<rect fill="#FFFFFF" height="16.875" width="22.5" x="3.75" y="7.5"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 214.52 -8.0195)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-199.52" x2="-199.52" y1="-16.457" y2="-31.457">
+<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="1" style="stop-color:#999999"/>
 </linearGradient>
-<rect fill="url(#SVGID_2_)" height="15" width="20.625" x="4.688" y="8.438"/>
-<polygon fill="#FFFFFF" fill-opacity="0.7" points="19.688,10.313 19.688,13.125 15,13.125 15,16.875   10.313,16.875 10.313,15 5.625,15 5.625,22.5 24.375,22.5 24.375,10.313 " stroke-opacity="0.7"/>
-<rect fill="#808080" height="1.875" width="24.375" x="2.813" y="24.375"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="0.938" stroke-opacity="0.4" width="24.375" x="2.813" y="3.75"/>
-<rect fill="#FFFFFF" fill-opacity="0.2" height="0.938" stroke-opacity="0.2" width="24.375" x="2.813" y="24.375"/>
-<rect fill-opacity="0.2" height="0.938" stroke-opacity="0.2" width="24.375" x="2.813" y="6.563"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 214.52 -8.0195)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-206.5508" x2="-206.5508" y1="-19.2695" y2="-29.4774">
+<rect fill="url(#SVGID_2_)" height="16" width="22" x="4" y="8"/>
+<polygon fill="#FFFFFF" fill-opacity="0.7" points="20,10 20,13 15,13 15,17 10,17 10,15 5,15 5,23 25,23 25,10 " stroke-opacity="0.7"/>
+<rect fill="#808080" height="2" width="26" x="2" y="25"/>
+<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="26" x="2" y="3"/>
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_3_)" height="5.625" width="2.813" x="6.563" y="15.938"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 214.52 -8.0195)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-201.8633" x2="-201.8633" y1="-19.2715" y2="-29.4785">
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_4_)" height="3.75" width="2.813" x="11.25" y="17.813"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 214.52 -8.0195)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="-197.1763" x2="-197.1763" y1="-19.2705" y2="-29.4782">
+<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"/>
+</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"/>
 </linearGradient>
-<rect fill="url(#SVGID_5_)" height="7.5" width="2.812" x="15.938" y="14.063"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 214.52 -8.0195)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-192.4888" x2="-192.4888" y1="-19.2695" y2="-29.477">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+<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"/>
+<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="3" x="11" y="18"/>
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_6_)" height="10.313" width="2.813" x="20.625" y="11.25"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="0.938" stroke-opacity="0.4" width="2.813" x="6.563" y="15.938"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="0.938" stroke-opacity="0.4" width="2.813" x="11.25" y="17.813"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="0.938" stroke-opacity="0.4" width="2.812" x="15.938" y="14.063"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="0.938" stroke-opacity="0.4" width="2.813" x="20.625" y="11.25"/>
-<rect fill="none" height="30" width="30"/>
+<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>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_priority_high.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,22 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <g>
-<rect fill="none" height="30" width="30"/>
+<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"/>
+</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"/>
+</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"/>
+<path d="M15,21c2.036,0,3.7,1.53,3.95,3.5C18.971,24.334,19,24.172,19,24c0-2.208-1.792-4-4-4  c-2.21,0-4,1.792-4,4c0,0.172,0.029,0.334,0.05,0.5C11.299,22.53,12.962,21,15,21z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
 <rect fill="none" height="30" width="30"/>
-<polygon fill-opacity="0.6" points="11.36,17.813 9.25,1.875 20.75,1.875 18.641,17.813 " stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="15" x2="15" y1="2.81" y2="26.25">
-<stop offset="0" stop-color="#FF4D00"/>
-<stop offset="1" stop-color="#800000"/>
-</linearGradient>
-<path d="M19.688,2.813l-1.875,14.063h-5.625L10.313,2.813H19.688z" fill="url(#SVGID_1)"/>
-<path d="M15,28.125c-2.584,0-4.688-2.104-4.688-4.688S12.416,18.75,15,18.75 c2.584,0,4.688,2.104,4.688,4.688S17.584,28.125,15,28.125L15,28.125z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="15" x2="15" y1="20" y2="27.09">
-<stop offset="0" stop-color="#FF4D00"/>
-<stop offset="1" stop-color="#800000"/>
-</linearGradient>
-<circle cx="15" cy="23.438" fill="url(#SVGID_2)" r="3.75"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="19.563,3.75 19.688,2.813 10.313,2.813 10.438,3.75 " stroke-opacity="0.4"/>
-<path d="M15,20.625c1.908,0,3.469,1.435,3.703,3.281 c0.02-0.156,0.047-0.308,0.047-0.469c0-2.07-1.68-3.75-3.75-3.75c-2.072,0-3.75,1.68-3.75,3.75c0,0.161,0.027,0.313,0.047,0.469 C11.53,22.06,13.089,20.625,15,20.625z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_priority_low.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,17 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <g>
-<rect height="30" style="fill:none;" width="30"/>
-</g>
-<polygon points="3.623,15 10.313,15 10.313,1.875 19.688,1.875 19.688,15   26.377,15 15,28.652 " style="opacity:0.6;enable-background:new    ;"/>
-<polygon points="18.75,15.938 18.75,2.813 11.25,2.813 11.25,15.938 5.625,15.938 15,27.188   24.375,15.938 " style="fill:url(#SVGID_1_);"/>
-<polygon points="18.75,15.938 18.75,16.875 23.594,16.875   24.375,15.938 " style="opacity:0.4;fill:#FFFFFF;enable-background:new    ;"/>
-<polygon points="11.25,16.875 11.25,15.938 5.625,15.938   6.406,16.875 " style="opacity:0.4;fill:#FFFFFF;enable-background:new    ;"/>
-<rect height="0.938" style="opacity:0.4;fill:#FFFFFF;enable-background:new    ;" width="7.5" x="11.25" y="2.813"/>
+<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 "/>
+<polygon fill="url(#SVGID_1_)" points="19,16 19,2 11,2 11,16 5,16 15,28 25,16 "/>
+<polygon fill="#FFFFFF" fill-opacity="0.4" points="19,16 19,17 24.167,17 25,16 " stroke-opacity="0.4"/>
+<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 gradientTransform="matrix(0.9375 0 0 -0.9375 -284.4375 -346.3125)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="319.4004" x2="319.4004" y1="-372.2549" y2="-398.4015">
+<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>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_radio_selected.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,29 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <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-opacity="0.6" stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="1.2188" y2="29.4379">
-<stop offset="0" style="stop-color:#B9BCBD"/>
-<stop offset="0.3394" style="stop-color:#E0E1E2"/>
-<stop offset="1" style="stop-color:#FFFFFF"/>
+<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="1" stop-color="#FFFFFF"/>
 </linearGradient>
-<path d="M15,29C7.279,29,1,22.72,1,15S7.279,1,15,1s14,6.28,14,14S22.721,29,15,29L15,29z" fill="url(#SVGID_1_)"/>
-<path d="M15,1C7.279,1,1,7.28,1,15s6.279,14,14,14C7.831,29,2,23.168,2,16S7.831,3,15,3s13,5.832,13,13  s-5.831,13-13,13c7.721,0,14-6.28,14-14S22.721,1,15,1z" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M15,2c7.551,0,13.709,6.013,13.975,13.5C28.98,15.333,29,15.169,29,15c0-7.72-6.279-14-14-14S1,7.28,1,15  c0,0.169,0.02,0.333,0.025,0.5C1.291,8.013,7.449,2,15,2z" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M15,24c-4.963,0-9-4.038-9-9s4.037-9,9-9s9,4.038,9,9S19.963,24,15,24L15,24z" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="7.125" y2="23.2505">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+<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_)"/>
+<path d="M15,1c-7.721,0-14,6.28-14,14s6.279,14,14,14c-7.169,0-13-5.83-13-13s5.831-13,13-13,13,5.832,13,13-5.831,13-13,13c7.721,0,14-6.28,14-14s-6.28-14-14-14z" fill-opacity="0.1" stroke-opacity="0.1"/>
+<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"/>
 </linearGradient>
-<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="url(#SVGID_2_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="14.9995" x2="14.9995" y1="7" y2="23.0005">
-<stop offset="0" style="stop-color:#D6FF8C"/>
-<stop offset="0.3394" style="stop-color:#7AD900"/>
-<stop offset="0.6182" style="stop-color:#5BC000"/>
-<stop offset="1" style="stop-color:#96DB00"/>
+<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"/>
 </linearGradient>
-<path d="M15,8c3.859,0,7,3.141,7,7s-3.141,7-7,7s-7-3.141-7-7S11.141,8,15,8 M15,7c-4.411,0-8,3.59-8,8  s3.589,8,8,8s8-3.59,8-8S19.411,7,15,7L15,7z" fill="url(#SVGID_3_)"/>
-</g>
+<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_)"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_radio_selected_highlight.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,32 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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,30C6.729,30,0,23.271,0,15S6.729,0,15,0s15,6.729,15,15S23.271,30,15,30L15,30z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="1.2188" y2="29.4379">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="1" style="stop-color:#16A0D4"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" 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="#4EDEFF"/>
+<stop offset="1" stop-color="#16A0D4"/>
 </linearGradient>
-<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="url(#SVGID_1_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="3.1875" y2="27.3754">
-<stop offset="0" style="stop-color:#E0E1E2"/>
-<stop offset="1" style="stop-color:#FFFFFF"/>
+<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"/>
 </linearGradient>
-<path d="M15,27C8.383,27,3,21.617,3,15S8.383,3,15,3s12,5.383,12,12S21.617,27,15,27L15,27z" fill="url(#SVGID_2_)"/>
-<path d="M15,4c6.448,0,11.71,5.115,11.975,11.5C26.981,15.333,27,15.169,27,15c0-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,4z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M15,24c-4.963,0-9-4.038-9-9s4.037-9,9-9s9,4.038,9,9S19.963,24,15,24L15,24z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="14.9995" x2="14.9995" y1="7.125" y2="23.2505">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+<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"/>
 </linearGradient>
-<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="url(#SVGID_3_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="14.9995" x2="14.9995" y1="7" y2="23.0005">
-<stop offset="0" style="stop-color:#D6FF8C"/>
-<stop offset="0.3394" style="stop-color:#7AD900"/>
-<stop offset="0.6182" style="stop-color:#5BC000"/>
-<stop offset="1" style="stop-color:#96DB00"/>
+<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"/>
 </linearGradient>
-<path d="M15,8c3.859,0,7,3.141,7,7s-3.141,7-7,7s-7-3.141-7-7S11.141,8,15,8 M15,7c-4.411,0-8,3.59-8,8  s3.589,8,8,8s8-3.59,8-8S19.411,7,15,7L15,7z" fill="url(#SVGID_4_)"/>
+<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_)"/>
 <rect fill="none" height="30" width="30"/>
-</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_radio_unselected.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,17 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <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-opacity="0.6" stroke-opacity="0.6"/>
-<path d="M15,29C7.279,29,1,22.72,1,15S7.279,1,15,1s14,6.28,14,14S22.721,29,15,29L15,29z" fill="url(#SVGID_1_)"/>
-<path d="M15,1C7.279,1,1,7.28,1,15s6.279,14,14,14C7.831,29,2,23.168,2,16S7.831,3,15,3s13,5.832,13,13  s-5.831,13-13,13c7.721,0,14-6.28,14-14S22.721,1,15,1z" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M15,2c7.551,0,13.709,6.013,13.975,13.5C28.98,15.333,29,15.169,29,15c0-7.72-6.279-14-14-14S1,7.28,1,15  c0,0.169,0.02,0.333,0.025,0.5C1.291,8.013,7.449,2,15,2z" fill-opacity="0.1" stroke-opacity="0.1"/>
+<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"/>
+<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_)"/>
+<path d="M15,1c-7.721,0-14,6.28-14,14s6.279,14,14,14c-7.169,0-13-5.83-13-13s5.831-13,13-13,13,5.832,13,13-5.831,13-13,13c7.721,0,14-6.28,14-14s-6.28-14-14-14z" fill-opacity="0.1" stroke-opacity="0.1"/>
+<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="14.9995" x2="14.9995" y1="1.2188" y2="29.4379">
-<stop offset="0" style="stop-color:#E0E1E2"/>
-<stop offset="1" style="stop-color:#FFFFFF"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="1.219" y2="29.44">
+<stop offset="0" stop-color="#E0E1E2"/>
+<stop offset="1" stop-color="#FFFFFF"/>
 </linearGradient>
 </defs>
-</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_radio_unselected_highlight.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,20 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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,30C6.729,30,0,23.271,0,15S6.729,0,15,0s15,6.729,15,15S23.271,30,15,30L15,30z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="1.2188" y2="29.4379">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="1" style="stop-color:#16A0D4"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" 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="#4EDEFF"/>
+<stop offset="1" stop-color="#16A0D4"/>
 </linearGradient>
-<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="url(#SVGID_1_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="3.1875" y2="27.3754">
-<stop offset="0" style="stop-color:#E0E1E2"/>
-<stop offset="1" style="stop-color:#FFFFFF"/>
+<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"/>
 </linearGradient>
-<path d="M15,27C8.383,27,3,21.617,3,15S8.383,3,15,3s12,5.383,12,12S21.617,27,15,27L15,27z" fill="url(#SVGID_2_)"/>
-<path d="M15,3C8.383,3,3,8.383,3,15c0,6.238,4.785,11.374,10.877,11.943C8.337,26.379,4,21.687,4,16  C4,9.935,8.935,5,15,5s11,4.935,11,11c0,5.687-4.337,10.379-9.877,10.943C22.215,26.374,27,21.238,27,15C27,8.383,21.617,3,15,3z" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M15,4c6.448,0,11.71,5.115,11.975,11.5C26.981,15.333,27,15.169,27,15c0-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,4z" fill-opacity="0.1" stroke-opacity="0.1"/>
+<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"/>
 <rect fill="none" height="30" width="30"/>
-</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_reboot.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_reboot.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g>
+<rect fill="none" height="30" width="30"/>
+<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"/>
+</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"/>
+<path d="M20.632,8.973c-0.419-0.315-0.917-0.481-1.439-0.481c-0.691,0-1.345,0.313-1.796,0.83V7.396  C17.396,6.074,16.321,5,15,5s-2.396,1.074-2.396,2.396V9.32c-0.452-0.516-1.105-0.83-1.796-0.83c-0.522,0-1.021,0.166-1.438,0.48  c-2.385,1.79-3.752,4.525-3.752,7.505c0,5.173,4.209,9.382,9.383,9.382s9.383-4.209,9.383-9.382  C24.383,13.497,23.016,10.762,20.632,8.973z M15,21.065c-2.529,0-4.587-2.059-4.587-4.59c0-1.457,0.669-2.796,1.834-3.672  c0.132-0.099,0.25-0.209,0.356-0.329v2.255c0,1.322,1.075,2.398,2.396,2.398s2.396-1.076,2.396-2.398v-2.254  c0.106,0.119,0.225,0.229,0.355,0.327c1.167,0.878,1.836,2.217,1.836,3.673C19.588,19.007,17.529,21.065,15,21.065z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<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"/>
+</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"/>
+</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>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_received.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_received.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_received.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,19 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <g>
 <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 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="15" x2="15" y1="1.85" y2="28">
-<stop offset="0" stop-color="#A0F800"/>
-<stop offset="0.76" stop-color="#4CB400"/>
-<stop offset="1" stop-color="#89CC6A"/>
+<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"/>
 </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="15" x2="15" y1="2.87" y2="26.44">
-<stop offset="0" stop-color="#A0F800"/>
-<stop offset="1" stop-color="#319E00"/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_2)" points="7.135,17 12,17 12,3 18,3 18,17 22.865,17 15,26.438 "/>
+<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"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_record.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_record.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_record.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,13 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <g>
-<path d="M15,27C8.383,27,3,21.617,3,15C3,8.383,8.383,3,15,3c6.617,0,12,5.383,12,12C27,21.617,21.617,27,15,27L15,27  z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<circle cx="15" cy="15" fill="url(#SVGID_1_)" r="11"/>
-<path d="M15,5c5.906,0,10.712,4.659,10.975,10.5C25.982,15.333,26,15.169,26,15  c0-6.075-4.925-11-11-11S4,8.925,4,15c0,0.169,0.018,0.333,0.025,0.5C4.289,9.659,9.094,5,15,5z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<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"/>
+<circle cx="15" cy="15" fill="url(#SVGID_1_)" r="13"/>
+<path d="M15,3.182c6.98,0,12.659,5.505,12.97,12.409C27.979,15.394,28,15.199,28,15  c0-7.18-5.82-13-13-13S2,7.82,2,15c0,0.199,0.021,0.394,0.03,0.591C2.342,8.687,8.02,3.182,15,3.182z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
 <rect fill="none" height="30" width="30"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="4" y2="26.0005">
+<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"/>
 </linearGradient>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_refresh.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_refresh.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_refresh.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,20 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g>
 <rect fill="none" height="30" width="30"/>
-<path d="M27.799,26.385l-4.348-4.35C25.102,20.063,26,17.6,26,15c0-5.405-4.033-10.077-9.383-10.869l-1.033-0.153 l0.184-1.766L2.2,3.615l4.349,4.348C4.898,9.937,4,12.4,4,15c0,5.404,4.033,10.076,9.381,10.869l1.033,0.152l-0.182,1.766 L27.799,26.385z M14.003,20.908C11.104,20.42,9,17.936,9,15c0-1.251,0.394-2.45,1.124-3.462l4.239,4.241l0.709-6.845l0.924,0.156 C18.896,9.579,21,12.063,21,15c0,1.256-0.393,2.457-1.117,3.469l-4.248-4.247l-0.707,6.843L14.003,20.908z" fill-opacity="0.6"/>
-<path d="M8,15c0-1.931,0.799-3.666,2.068-4.932l3.518,3.518l1.061-10.253L4.393,4.394l3.539,3.538 C6.121,9.741,5,12.239,5,15c0,5.021,3.705,9.166,8.527,9.879l0.309-2.984C10.529,21.338,8,18.461,8,15z" fill="url(#SVGID_1)"/>
-<path d="M16.414,16.414l-1.061,10.252l10.252-1.061l-3.537-3.539C23.877,20.258,25,17.762,25,15 c0-5.021-3.705-9.166-8.529-9.88l-0.309,2.984C19.469,8.661,22,11.538,22,15c0,1.93-0.793,3.672-2.061,4.939L16.414,16.414z" fill="url(#SVGID_1)"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="14.506,4.681 14.646,3.333 4.393,4.394 5.602,5.602 "/>
-<path d="M8.033,15.676C8.013,15.893,8,16.111,8,16.332c0,3.414,2.462,6.254,5.701,6.867l0.135-1.305 C10.748,21.375,8.338,18.83,8.033,15.676z" fill="#FFFFFF" fill-opacity="0.4"/>
-<path d="M19.939,21.271C21.207,20.006,22,18.262,22,16.332c0-0.227-0.012-0.451-0.033-0.673 c-0.158,1.665-0.906,3.159-2.027,4.28l-3.525-3.525l-0.123,1.193L19.939,21.271z" fill="#FFFFFF" fill-opacity="0.4"/>
-<path d="M7.297,8.63C5.863,10.359,5,12.578,5,15c0,0.235,0.016,0.467,0.031,0.698 c0.158-2.506,1.23-4.765,2.9-6.434L7.297,8.63z" fill="#FFFFFF" fill-opacity="0.4"/>
-<path d="M22.703,22.701c-0.201,0.244-0.412,0.477-0.635,0.699l2.33,2.33l1.207-0.125L22.703,22.701z" fill="#FFFFFF" fill-opacity="0.4"/>
-<path d="M16.471,6.453c4.598,0.681,8.172,4.479,8.496,9.182C24.98,15.424,25,15.214,25,15 c0-5.021-3.705-9.166-8.529-9.88l-0.135,1.305L16.471,6.453z" fill="#FFFFFF" fill-opacity="0.4"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="4.04" x2="24.92" y1="5.45" y2="26.33">
-<stop offset="0" stop-color="#A0F800"/>
-<stop offset="1" stop-color="#319E00"/>
+<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"/>
+</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"/>
 </linearGradient>
-</defs>
+<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"/>
+<path d="M8.033,15.676C8.014,15.893,8,16.111,8,16.333c0,3.414,2.463,6.254,5.702,6.866l0.135-1.304  C10.748,21.375,8.338,18.83,8.033,15.676z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M19.939,21.272C21.207,20.006,22,18.263,22,16.333c0-0.228-0.012-0.452-0.033-0.674  c-0.158,1.665-0.905,3.16-2.027,4.28l-3.525-3.525l-0.123,1.193L19.939,21.272z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M7.297,8.63C5.863,10.359,5,12.578,5,15c0,0.235,0.016,0.467,0.032,0.698  c0.158-2.506,1.23-4.765,2.899-6.434L7.297,8.63z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M22.703,22.702c-0.201,0.243-0.412,0.476-0.635,0.698l2.33,2.331l1.208-0.125L22.703,22.702z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M16.472,6.453c4.597,0.681,8.171,4.479,8.496,9.182C24.981,15.424,25,15.214,25,15  c0-5.021-3.705-9.166-8.528-9.88l-0.135,1.305L16.472,6.453z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_reminder.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_reminder.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_reminder.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,39 +1,41 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g>
 <rect fill="none" height="30" width="30"/>
-<path d="M26.473,22.033c0-1.34-0.314-2.311-1.766-3.146v-4.769 c0-4.452-3.018-8.205-7.111-9.344c-0.242-1.211-1.313-2.127-2.595-2.127s-2.353,0.916-2.594,2.127 c-4.095,1.139-7.112,4.892-7.112,9.344v4.767c-1.452,0.837-1.765,1.809-1.765,3.148v2.674h6.749c0.93,1.578,2.696,2.647,4.721,2.647 s3.794-1.069,4.725-2.647h6.749V22.033z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="15" x2="15" y1="26.47" y2="22.31">
-<stop offset="0" stop-color="#F56700"/>
-<stop offset="1" stop-color="#EF2D00"/>
+<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"/>
 </linearGradient>
-<path d="M10.462,22.17L10.462,22.17c0,2.373,2.029,4.303,4.537,4.303s4.54-1.93,4.54-4.303l0,0H10.462 z" fill="url(#SVGID_1)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="5.83" x2="23.6" y1="21.62" y2="21.62">
-<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"/>
+<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"/>
+<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"/>
 </linearGradient>
-<path d="M23.824,19.412H6.177c-1.621,0.767-1.765,1.526-1.765,2.621v1.791H25.59v-1.791 C25.59,20.938,25.445,20.179,23.824,19.412z" fill="url(#SVGID_2)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="13.47" x2="16.43" y1="4.85" y2="4.85">
-<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"/>
+<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"/>
 </linearGradient>
-<path d="M16.766,6.177V5.294c0-0.971-0.794-1.765-1.765-1.765s-1.765,0.794-1.765,1.765v0.882H16.766z " fill="url(#SVGID_3)"/>
-<path d="M16.766,6.177V5.294c0-0.265-0.063-0.514-0.168-0.739 c-0.521-0.087-1.053-0.143-1.597-0.143c-0.544,0-1.076,0.056-1.597,0.143c-0.105,0.226-0.168,0.475-0.168,0.739v0.882H16.766z" fill="#873900" fill-opacity="0.2" stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="7.36" x2="22.16" y1="12.35" y2="12.35">
-<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"/>
+<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"/>
+<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"/>
 </linearGradient>
-<path d="M23.824,19.412v-5.294c0-4.853-3.971-8.824-8.823-8.824c-4.854,0-8.824,3.971-8.824,8.824 v5.294H23.824z" fill="url(#SVGID_4)"/>
-<path d="M15.001,5.294c-4.854,0-8.824,3.971-8.824,8.824v0.883 c0-4.854,3.971-8.824,8.824-8.824c4.853,0,8.823,3.971,8.823,8.824v-0.883C23.824,9.265,19.854,5.294,15.001,5.294z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<rect fill="#873900" fill-opacity="0.2" height="0.882" stroke-opacity="0.2" width="17.647" x="6.177" y="18.53"/>
-<path d="M4.903,20.295H25.1c-0.263-0.305-0.662-0.594-1.273-0.883 H6.177C5.565,19.701,5.166,19.99,4.903,20.295z" fill="#FFF6C9" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M18.648,24.707c0.212-0.274,0.4-0.564,0.54-0.883h-8.376 c0.14,0.318,0.328,0.608,0.54,0.883H18.648z" fill="#753200" fill-opacity="0.4" stroke-opacity="0.4"/>
-<rect fill="#753200" fill-opacity="0.1" height="0.882" stroke-opacity="0.1" width="21.178" x="4.412" y="22.942"/>
-<rect fill="none" height="30.002" width="30.002"/>
+<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"/>
+<rect fill="none" height="30" width="30" x="0.453"/>
+</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_repeat.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_repeat.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_repeat.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,49 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <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_)"/>
+<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"/>
+<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"/>
+<path d="M23.285,9.843c2.027,2.028,3.146,4.616,3.366,7.266c0.272-3.296-0.844-6.686-3.366-9.207  l-2.47,2.472c0.331,0.331,0.62,0.689,0.883,1.059L23.285,9.843z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M6.966,17.108c-0.284,2.397,0.483,4.898,2.32,6.735c3.178,3.178,8.351,3.178,11.529,0  c1.836-1.837,2.604-4.338,2.319-6.735c-0.21,1.753-0.978,3.452-2.319,4.794c-3.179,3.178-8.352,3.178-11.529,0  C7.943,20.561,7.175,18.861,6.966,17.108z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<polygon fill="#FFFFFF" fill-opacity="0.4" points="14.436,4.511 14.639,2.549 2.697,3.784 4.456,5.544 " stroke-opacity="0.4"/>
+<rect fill="none" height="30" width="30"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="14.9995" x2="14.9995" y1="4.9224" y2="12.8702">
+<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"/>
 </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 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_repeat_exception.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,60 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <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">
+<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"/>
 </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>
+<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"/>
+<path d="M23.285,9.843c2.027,2.028,3.146,4.616,3.366,7.266c0.272-3.296-0.844-6.686-3.366-9.207  l-2.47,2.472c0.331,0.331,0.62,0.689,0.883,1.059L23.285,9.843z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M6.966,17.108c-0.284,2.397,0.483,4.898,2.32,6.735c3.178,3.178,8.351,3.178,11.529,0  c1.836-1.837,2.604-4.338,2.319-6.735c-0.21,1.753-0.978,3.452-2.319,4.794c-3.179,3.178-8.352,3.178-11.529,0  C7.943,20.561,7.175,18.861,6.966,17.108z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<polygon fill="#FFFFFF" fill-opacity="0.4" points="14.436,4.511 14.639,2.549 2.697,3.784 4.456,5.544 " stroke-opacity="0.4"/>
+<rect fill="none" height="30" width="30"/>
 </g>
 <g>
-<rect height="34.268" style="opacity:0.6;enable-background:new    ;" transform="matrix(0.7073 -0.707 0.707 0.7073 -6.2126 14.9968)" width="3.169" x="13.418" y="-2.134"/>
-<polygon points="25.996,26.987 3.015,4.005 4.006,3.014 26.987,25.996 " style="fill:url(#SVGID_1__);"/>
-<rect height="30.002" style="fill:none;" width="30.002"/>
+<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.7832" x2="339.7832" y1="-397.2993" y2="-425.2942">
-<stop offset="0" style="stop-color:#DE8029"/>
-<stop offset="0.2606" style="stop-color:#DE4E29"/>
-<stop offset="1" style="stop-color:#D82E09"/>
+<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>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_reply.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_reply.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_reply.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,16 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <g>
-<rect height="30" style="fill:none;" width="30"/>
-</g>
-<polygon points="1.348,15 15,3.624 15,10.313 28.125,10.313 28.125,19.688   15,19.688 15,26.377 " style="opacity:0.6;enable-background:new    ;"/>
-<polygon points="14.063,18.75 27.188,18.75 27.188,11.25 14.063,11.25 14.063,5.625 2.813,15   14.063,24.375 " style="fill:url(#SVGID_1_);"/>
-<polygon points="14.063,6.689 14.063,5.625 2.813,15 3.451,15.531 " style="opacity:0.5;fill:#FFFFFF;enable-background:new    ;"/>
-<rect height="1.064" style="opacity:0.5;fill:#FFFFFF;enable-background:new    ;" width="13.125" x="14.063" y="11.25"/>
+<rect fill="none" height="30" width="30"/>
+<polygon fill-opacity="0.6" points="0.438,15 15,2.865 15,10 29,10 29,20 15,20 15,27.135 "/>
+<polygon fill="url(#SVGID_1_)" points="14,19 28,19 28,11 14,11 14,5 2,15 14,25 "/>
+<polygon fill="#FFFFFF" fill-opacity="0.5" points="14,6.135 14,5 2,15 2.681,15.567 " stroke-opacity="0.5"/>
+<rect fill="#FFFFFF" fill-opacity="0.5" height="1.135" stroke-opacity="0.5" width="14" x="14" y="11"/>
 <defs>
-<linearGradient gradientTransform="matrix(0.9375 0 0 -0.9375 -284.4375 -346.3125)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="319.4004" x2="319.4004" y1="-375.2852" y2="-395.6606">
+<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"/>
 </linearGradient>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_reply_all.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,22 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <rect fill="none" height="30" width="30"/>
 <rect fill="none" height="30" width="30"/>
-<polygon fill-opacity="0.6" points="17.813,7.626 17.813,0.938 4.161,12.314 6.692,14.423 1.348,18.877 15,30.254 15,23.564 28.125,23.564 28.125,15.126 28.125,14.189 28.125,7.626 " stroke-opacity="0.6"/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_1)" points="15,7.5 15,14.189 27.188,14.189 27.188,8.564 16.875,8.564 16.875,2.939 5.625,12.314 7.424,13.813 "/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_2)" points="14.063,22.627 27.188,22.627 27.188,15.126 14.063,15.126 14.063,9.501 2.813,18.877 14.063,28.252 "/>
-<polygon fill="#FFFFFF" fill-opacity="0.5" points="14.063,10.565 14.063,9.501 2.813,18.877 3.451,19.409 " stroke-opacity="0.5"/>
-<rect fill="#FFFFFF" fill-opacity="0.5" height="1.064" stroke-opacity="0.5" width="13.125" x="14.063" y="15.126"/>
-<rect fill-opacity="0.2" height="0.938" stroke-opacity="0.2" width="12.188" x="15" y="13.251"/>
-</g>
+<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"/>
+<rect fill="#FFFFFF" fill-opacity="0.5" height="1.064" stroke-opacity="0.5" width="13.12" x="14.06" y="15.13"/>
+<rect fill-opacity="0.2" height="0.938" stroke-opacity="0.2" width="12.19" x="15" y="13.25"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_rgb.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_rgb.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_rgb.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,14 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <g>
-<circle cx="15" cy="9" fill-opacity="0.6" r="6" stroke-opacity="0.6"/>
-<path d="M15,14c-2.757,0-5-2.243-5-5s2.243-5,5-5c2.758,0,5,2.243,5,5S17.758,14,15,14L15,14z" fill="#FF0000"/>
-<circle cx="8" cy="21" fill-opacity="0.6" r="6" stroke-opacity="0.6"/>
-<circle cx="8" cy="21" fill="#00FF00" r="5"/>
-<circle cx="22" cy="21" fill-opacity="0.6" r="6" stroke-opacity="0.6"/>
-<circle cx="22" cy="21" fill="#0000FF" r="5"/>
 <rect fill="none" height="30" width="30"/>
-<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="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"/>
+<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"/>
+<rect fill="none" height="30" width="30" x="0"/>
+<rect fill="none" height="30" width="30" x="0"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sarcastic_mad.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sarcastic_mad.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +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>
-<path d="M15,30C6.729,30,0,23.271,0,15S6.729,0,15,0c8.271,0,15,6.729,15,15S23.271,30,15,30L15,30z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<radialGradient cx="15" cy="2.8335" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="24.8358">
-<stop offset="0" style="stop-color:#FEE891"/>
-<stop offset="0.7818" style="stop-color:#FFB701"/>
-<stop offset="1" style="stop-color:#FFC501"/>
-</radialGradient>
-<circle cx="15" cy="15" fill="url(#SVGID_1_)" r="14"/>
-<path d="M15,2c7.563,0,13.709,6.002,13.975,13.5C28.98,15.332,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.332,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="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"/>
-</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"/>
-<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"/>
-</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"/>
-</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"/>
-<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"/>
-</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.5c-1.768,0-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.5c-1.768,0-3-0.791-3-1.5  C9,21.224,8.776,21,8.5,21S8,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.5  c0,0.276,0.224,0.5,0.5,0.5s0.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"/>
-</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.5c-1.768,0-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>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_saved.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_saved.svg	Mon Apr 19 14:02:13 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 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_secure.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_secure.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_secure.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,41 +1,43 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g>
 <rect fill="none" height="30" width="30"/>
-<path d="M23.824,13.236h-0.882v-2.647c0-4.379-3.562-7.942-7.941-7.942 c-4.379,0-7.942,3.563-7.942,7.942v2.647H6.177c-1.459,0-2.647,1.188-2.647,2.647v8.824c0,1.459,1.188,2.647,2.647,2.647h17.647 c1.46,0,2.648-1.188,2.648-2.647v-8.824C26.473,14.424,25.284,13.236,23.824,13.236z M12.354,10.589 c0-1.459,1.188-2.647,2.647-2.647c1.46,0,2.647,1.188,2.647,2.647v2.647h-5.295V10.589z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="7.94" x2="22.06" y1="14.12" y2="14.12">
-<stop offset="0" stop-color="#B4B4B4"/>
-<stop offset="0.21" stop-color="#F0F0F0"/>
-<stop offset="0.53" stop-color="#969696"/>
-<stop offset="0.81" stop-color="#A1A1A1"/>
-<stop offset="1" stop-color="#BEBEBE"/>
+<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.001,7.059c1.946,0,3.529,1.583,3.529,3.53v7.06c0,1.946-1.583,3.529-3.529,3.529 c-1.947,0-3.53-1.583-3.53-3.529v-7.06C11.471,8.642,13.054,7.059,15.001,7.059 M15.001,3.53c-3.883,0-7.06,3.176-7.06,7.059v7.06 c0,3.883,3.177,7.059,7.06,7.059c3.882,0,7.06-3.176,7.06-7.059v-7.06C22.061,6.706,18.883,3.53,15.001,3.53L15.001,3.53z" fill="url(#SVGID_1)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="7.94" x2="22.06" y1="9.71" y2="9.71">
-<stop offset="0" stop-color="#8C8C8C"/>
-<stop offset="0.21" stop-color="#BDBDBD"/>
-<stop offset="0.53" stop-color="#707070"/>
-<stop offset="1" stop-color="#8F8F8F"/>
+<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.2083" style="stop-color:#BDBDBD"/>
+<stop offset="0.526" style="stop-color:#707070"/>
+<stop offset="1" style="stop-color:#8F8F8F"/>
 </linearGradient>
-<path d="M11.471,15.883v-5.294c0-1.947,1.583-3.53,3.53-3.53c1.946,0,3.529,1.583,3.529,3.53v5.294 h3.53v-5.294c0-3.883-3.178-7.059-7.06-7.059c-3.883,0-7.06,3.176-7.06,7.059v5.294H11.471z" fill="url(#SVGID_2)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="8.82" x2="21.18" y1="10.15" y2="10.15">
-<stop offset="0" stop-color="#B4B4B4"/>
-<stop offset="0.21" stop-color="#F0F0F0"/>
-<stop offset="0.53" stop-color="#969696"/>
-<stop offset="0.81" stop-color="#A1A1A1"/>
-<stop offset="1" stop-color="#BEBEBE"/>
+<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="M10.589,15.883v-5.294c0-2.433,1.979-4.412,4.412-4.412c2.433,0,4.411,1.979,4.411,4.412 v5.294h1.766v-5.294c0-3.405-2.771-6.177-6.177-6.177s-6.177,2.771-6.177,6.177v5.294H10.589z" fill="url(#SVGID_3)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="4.41" x2="25.59" y1="20.3" y2="20.3">
-<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"/>
+<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"/>
 </linearGradient>
-<path d="M25.59,24.707c0,0.971-0.795,1.766-1.766,1.766H6.177c-0.971,0-1.765-0.795-1.765-1.766 v-8.824c0-0.97,0.794-1.765,1.765-1.765h17.647c0.971,0,1.766,0.794,1.766,1.765V24.707z" fill="url(#SVGID_4)"/>
-<path d="M23.824,25.59H6.177c-0.971,0-1.765-0.795-1.765-1.766v0.883 c0,0.971,0.794,1.766,1.765,1.766h17.647c0.971,0,1.766-0.795,1.766-1.766v-0.883C25.59,24.795,24.795,25.59,23.824,25.59z" fill="#873900" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M23.824,14.118H6.177c-0.971,0-1.765,0.794-1.765,1.765v0.883 c0-0.971,0.794-1.765,1.765-1.765h17.647c0.971,0,1.766,0.794,1.766,1.765v-0.883C25.59,14.913,24.795,14.118,23.824,14.118z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<rect fill-opacity="0.2" height="1.764" stroke-opacity="0.2" width="21.178" x="4.412" y="22.061"/>
-<rect fill-opacity="0.2" height="1.765" stroke-opacity="0.2" width="21.178" x="4.412" y="18.53"/>
-<rect fill="none" height="30.002" width="30.002"/>
+<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,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 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_selected.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_selected.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_selected.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,23 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <rect fill="none" fill-opacity="0.5" height="30" stroke-opacity="0.5" width="30"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="1.2188" y2="29.4379">
-<stop offset="0" style="stop-color:#E0E1E2"/>
-<stop offset="1" style="stop-color:#FFFFFF"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="1.219" y2="29.44">
+<stop offset="0" stop-color="#E0E1E2"/>
+<stop offset="1" stop-color="#FFFFFF"/>
 </linearGradient>
 <rect fill="url(#SVGID_1_)" height="28" width="28" x="1" y="1"/>
-<path d="M1,1v28h2V5c0-0.55,0.45-1,1-1h22c0.55,0,1,0.45,1,1v24h2V1H1z" fill-opacity="0.05" stroke-opacity="0.05"/>
-<path d="M1,1v28h1V4c0-0.55,0.45-1,1-1h24c0.55,0,1,0.45,1,1v25h1V1H1z" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M1,1v28h2v-24c0-0.55,0.45-1,1-1h22c0.55,0,1,0.45,1,1v24h2v-28h-28z" fill-opacity="0.05" stroke-opacity="0.05"/>
+<path d="M1,1v28h1v-25c0-0.55,0.45-1,1-1h24c0.55,0,1,0.45,1,1v25h1v-28h-28z" fill-opacity="0.1" stroke-opacity="0.1"/>
 <rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="28" x="1" y="1"/>
-<path d="M0,0v30h30V0H0z M29,29H1V1h28V29z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<polygon fill-opacity="0.6" points="11.887,22.979 4.213,15.31 8.303,11.22 12.545,15.462 21.695,6.31 25.787,10.399 12.494,23.69 " stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9985" x2="14.9985" y1="6.9722" y2="23.6437">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_2_)" points="24.371,10.399 21.695,7.724 12.545,16.876 8.303,12.634 5.627,15.31 12.539,22.22   12.545,22.212 12.551,22.22 "/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="8.303,13.634 12.545,17.876 21.695,8.724 23.871,10.899 24.371,10.399 21.695,7.724   12.545,16.876 8.303,12.634 5.627,15.31 6.127,15.81 " stroke-opacity="0.4"/>
-</g>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_selected_highlight.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,27 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <rect fill-opacity="0.6" height="30" stroke-opacity="0.6" width="30"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="1.2188" y2="29.4379">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="1" style="stop-color:#16A0D4"/>
+<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"/>
 </linearGradient>
 <rect fill="url(#SVGID_1_)" height="28" width="28" x="1" y="1"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="3.1875" y2="27.3754">
-<stop offset="0" style="stop-color:#E0E1E2"/>
-<stop offset="1" style="stop-color:#FFFFFF"/>
+<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>
 <rect fill="url(#SVGID_2_)" height="24" 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" stroke-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" stroke-opacity="0.1"/>
+<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.887,22.979 4.213,15.31 8.303,11.22 12.545,15.462 21.695,6.31 25.787,10.399 12.494,23.69 " stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="14.9985" x2="14.9985" y1="6.9722" y2="23.6437">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_3_)" points="24.371,10.399 21.695,7.724 12.545,16.876 8.303,12.634 5.627,15.31 12.539,22.22   12.545,22.212 12.551,22.22 "/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="8.303,13.634 12.545,17.876 21.695,8.724 23.871,10.899 24.371,10.399 21.695,7.724   12.545,16.876 8.303,12.634 5.627,15.31 6.127,15.81 " stroke-opacity="0.4"/>
-</g>
+<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"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_selected_partial.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,28 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="1.2188" y2="29.4379">
-<stop offset="0" style="stop-color:#E0E1E2"/>
-<stop offset="1" style="stop-color:#FFFFFF"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" 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="1" stop-color="#FFFFFF"/>
 </linearGradient>
 <rect fill="url(#SVGID_1_)" height="28" width="28" x="1" y="1"/>
-<path d="M1,1v28h2V5c0-0.55,0.45-1,1-1h22c0.55,0,1,0.45,1,1v24h2V1H1z" fill-opacity="0.05" stroke-opacity="0.05"/>
-<path d="M1,1v28h1V4c0-0.55,0.45-1,1-1h24c0.55,0,1,0.45,1,1v25h1V1H1z" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M1,1v28h2v-24c0-0.55,0.45-1,1-1h22c0.55,0,1,0.45,1,1v24h2v-28h-28z" fill-opacity="0.05" stroke-opacity="0.05"/>
+<path d="M1,1v28h1v-25c0-0.55,0.45-1,1-1h24c0.55,0,1,0.45,1,1v25h1v-28h-28z" fill-opacity="0.1" stroke-opacity="0.1"/>
 <rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="28" x="1" y="1"/>
-<path d="M0,0v30h30V0H0z M29,29H1V1h28V29z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<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="14.9995" x2="14.9995" y1="7.125" y2="23.2505">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+<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"/>
 </linearGradient>
 <rect fill="url(#SVGID_2_)" height="16" width="16" x="7" y="7"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="14.9995" x2="14.9995" y1="7" y2="23.0005">
-<stop offset="0" style="stop-color:#D6FF8C"/>
-<stop offset="0.3394" style="stop-color:#7AD900"/>
-<stop offset="0.6182" style="stop-color:#5BC000"/>
-<stop offset="1" style="stop-color:#96DB00"/>
+<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"/>
 </linearGradient>
-<path d="M22,8v14H8V8H22 M23,7H7v16h16V7L23,7z" fill="url(#SVGID_3_)"/>
-</g>
+<path d="M22,8v14h-14v-14h14m1-1h-16v16h16v-16z" fill="url(#SVGID_3_)"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sent.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sent.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sent.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,19 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <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 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="15" x2="15" y1="28.15" y2="2">
-<stop offset="0" stop-color="#57CDFF"/>
-<stop offset="0.28" stop-color="#19A3D6"/>
-<stop offset="1" stop-color="#4EDEFF"/>
+<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>
-<polygon fill="url(#SVGID_1)" points="19,14 19,28 11,28 11,14 5,14 15,2 25,14 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="15" x2="15" y1="27.13" y2="3.56">
-<stop offset="0" stop-color="#048CC6"/>
-<stop offset="1" stop-color="#4EDEFF"/>
+<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>
-<polygon fill="url(#SVGID_2)" points="7.135,13 12,13 12,27 18,27 18,13 22.865,13 15,3.563 "/>
+<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"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_setting_group_closed.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_setting_group_closed.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="none" width="30" height="30"/>
-<path fill="#000000" d="M28.5,25.5c0,1.655-1.342,3-3,3h-21c-1.656,0-3-1.345-3-3v-21c0-1.656,1.344-3,3-3h21c1.658,0,3,1.344,3,3
-	V25.5z"/>
-<polygon fill="#FFFFFF" points="24,12.75 17.25,12.75 17.25,6 12.75,6 12.75,12.75 6,12.75 6,17.25 12.75,17.25 12.75,24 17.25,24 
-	17.25,17.25 24,17.25 "/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_setting_group_opened.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_setting_group_opened.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="none" width="30" height="30"/>
-<path fill="#000000" d="M28.5,25.5c0,1.655-1.342,3-3,3h-21c-1.656,0-3-1.345-3-3v-21c0-1.656,1.344-3,3-3h21c1.658,0,3,1.344,3,3
-	V25.5z"/>
-<polygon fill="#FFFFFF" points="24,12.75 6,12.75 6,17.25 24,17.25 "/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_signal_good.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,21 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g>
 <rect fill="none" height="30" width="30"/>
-<rect fill-opacity="0.6" height="10.589" stroke-opacity="0.6" width="7.06" x="2.647" y="15.001"/>
-<rect fill="url(#SVGID_1)" height="8.824" width="5.294" x="3.53" y="15.883"/>
-<rect fill-opacity="0.6" height="15.883" stroke-opacity="0.6" width="7.059" x="11.471" y="9.707"/>
-<rect fill="url(#SVGID_1)" height="14.118" width="5.295" x="12.354" y="10.589"/>
-<rect fill-opacity="0.6" height="21.178" stroke-opacity="0.6" width="7.06" x="20.295" y="4.412"/>
-<rect fill="url(#SVGID_1)" height="19.413" width="5.295" x="21.178" y="5.294"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="0.883" stroke-opacity="0.4" width="5.294" x="3.53" y="15.883"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="0.882" stroke-opacity="0.4" width="5.295" x="12.354" y="10.589"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="0.882" stroke-opacity="0.4" width="5.295" x="21.178" y="5.294"/>
-<rect fill="none" height="30.002" width="30.002"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="6.18" x2="6.18" y1="5.29" y2="24.49">
-<stop offset="0" stop-color="#A0F800"/>
-<stop offset="1" stop-color="#319E00"/>
+<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"/>
+</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"/>
 </linearGradient>
-</defs>
+<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"/>
+</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"/>
+<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="6" x="12" y="10"/>
+<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="6" x="22" y="4"/>
+<rect fill="none" height="30" width="30"/>
+</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_signal_low.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,29 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g>
 <rect fill="none" height="30" width="30"/>
-<rect fill-opacity="0.6" height="10.589" stroke-opacity="0.6" width="7.06" x="2.647" y="15.001"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="6.18" x2="6.18" y1="15.88" y2="24.83">
-<stop offset="0" stop-color="#DE8029"/>
-<stop offset="1" stop-color="#D82E09"/>
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_1)" height="8.824" width="5.294" x="3.53" y="15.883"/>
-<rect fill-opacity="0.6" height="15.883" stroke-opacity="0.6" width="7.059" x="11.471" y="9.707"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="15" x2="15" y1="5.29" y2="24.71">
-<stop offset="0" stop-color="#C4C4C4"/>
-<stop offset="1" stop-color="#4F4F4F"/>
+<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="26.0007">
+<stop offset="0" style="stop-color:#C4C4C4"/>
+<stop offset="1" style="stop-color:#4F4F4F"/>
 </linearGradient>
-<rect fill="url(#SVGID_2)" height="14.118" width="5.295" x="12.354" y="10.589"/>
-<polygon fill="#FFFFFF" fill-opacity="0.3" points="17.648,12.698 17.648,10.589 15.539,10.589 " stroke-opacity="0.3"/>
-<polygon fill="#FFFFFF" fill-opacity="0.3" points="12.354,17.386 17.648,22.68 17.648,17.689 12.354,12.395 " stroke-opacity="0.3"/>
-<polygon fill="#FFFFFF" fill-opacity="0.3" points="12.354,22.377 12.354,24.707 14.683,24.707 " stroke-opacity="0.3"/>
-<rect fill-opacity="0.6" height="21.178" stroke-opacity="0.6" width="7.06" x="20.295" y="4.412"/>
-<rect fill="url(#SVGID_2)" height="19.413" width="5.295" x="21.178" y="5.294"/>
-<polygon fill="#FFFFFF" fill-opacity="0.3" points="26.473,10.271 26.473,5.294 21.495,5.294 " stroke-opacity="0.3"/>
-<polygon fill="#FFFFFF" fill-opacity="0.3" points="21.178,14.959 26.473,20.254 26.473,15.263 21.178,9.968 " stroke-opacity="0.3"/>
-<polygon fill="#FFFFFF" fill-opacity="0.3" points="21.178,19.951 21.178,24.707 25.934,24.707 " stroke-opacity="0.3"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="0.883" stroke-opacity="0.4" width="5.294" x="3.53" y="15.883"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="0.882" stroke-opacity="0.4" width="5.295" x="12.354" y="10.589"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="0.882" stroke-opacity="0.4" width="5.295" x="21.178" y="5.294"/>
-<rect fill="none" height="30.002" width="30.002"/>
+<rect fill="url(#SVGID_2_)" height="16" width="6" x="12" y="10"/>
+<polygon fill="#FFFFFF" fill-opacity="0.3" points="18,12.39 18,10 15.61,10 " stroke-opacity="0.3"/>
+<polygon fill="#FFFFFF" fill-opacity="0.3" points="12,17.703 18,23.703 18,18.047 12,12.047 " stroke-opacity="0.3"/>
+<polygon fill="#FFFFFF" fill-opacity="0.3" points="12,23.36 12,26 14.64,26 " stroke-opacity="0.3"/>
+<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="26.0005">
+<stop offset="0" style="stop-color:#C4C4C4"/>
+<stop offset="1" style="stop-color:#4F4F4F"/>
+</linearGradient>
+<rect fill="url(#SVGID_3_)" height="22" width="6" x="22" y="4"/>
+<polygon fill="#FFFFFF" fill-opacity="0.3" points="28,9.64 28,4 22.36,4 " stroke-opacity="0.3"/>
+<polygon fill="#FFFFFF" fill-opacity="0.3" points="22,14.953 28,20.953 28,15.297 22,9.297 " stroke-opacity="0.3"/>
+<polygon fill="#FFFFFF" fill-opacity="0.3" points="22,20.61 22,26 27.39,26 " stroke-opacity="0.3"/>
+<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="6" x="2" y="16"/>
+<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="6" x="12" y="10"/>
+<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="6" x="22" y="4"/>
+<rect fill="none" height="30" width="30"/>
+</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_signal_medium.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,26 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g>
 <rect fill="none" height="30" width="30"/>
-<rect fill-opacity="0.6" height="10.589" stroke-opacity="0.6" width="7.06" x="2.647" y="15.001"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="6.18" x2="6.18" y1="10.37" y2="24.27">
-<stop offset="0" stop-color="#FECF5E"/>
-<stop offset="1" stop-color="#FF9E01"/>
+<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"/>
+</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"/>
 </linearGradient>
-<rect fill="url(#SVGID_1)" height="8.824" width="5.294" x="3.53" y="15.883"/>
-<rect fill-opacity="0.6" height="15.883" stroke-opacity="0.6" width="7.059" x="11.471" y="9.707"/>
-<rect fill="url(#SVGID_1)" height="14.118" width="5.295" x="12.354" y="10.589"/>
-<rect fill-opacity="0.6" height="21.178" stroke-opacity="0.6" width="7.06" x="20.295" y="4.412"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="23.82" x2="23.82" y1="5.3" y2="24.49">
-<stop offset="0" stop-color="#C4C4C4"/>
-<stop offset="1" stop-color="#4F4F4F"/>
+<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:#C4C4C4"/>
+<stop offset="1" style="stop-color:#4F4F4F"/>
 </linearGradient>
-<rect fill="url(#SVGID_3)" height="19.413" width="5.295" x="21.178" y="5.294"/>
-<polygon fill="#FFFFFF" fill-opacity="0.3" points="26.473,10.271 26.473,5.294 21.495,5.294 " stroke-opacity="0.3"/>
-<polygon fill="#FFFFFF" fill-opacity="0.3" points="21.178,14.959 26.473,20.254 26.473,15.263 21.178,9.968 " stroke-opacity="0.3"/>
-<polygon fill="#FFFFFF" fill-opacity="0.3" points="21.178,19.951 21.178,24.707 25.934,24.707 " stroke-opacity="0.3"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="0.883" stroke-opacity="0.4" width="5.294" x="3.53" y="15.883"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="0.882" stroke-opacity="0.4" width="5.295" x="12.354" y="10.589"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="0.882" stroke-opacity="0.4" width="5.295" x="21.178" y="5.294"/>
-<rect fill="none" height="30.002" width="30.002"/>
+<rect fill="url(#SVGID_3_)" height="22" width="6" x="22" y="4"/>
+<polygon fill="#FFFFFF" fill-opacity="0.3" points="28,9.64 28,4 22.36,4 " stroke-opacity="0.3"/>
+<polygon fill="#FFFFFF" fill-opacity="0.3" points="22,14.953 28,20.953 28,15.297 22,9.297 " stroke-opacity="0.3"/>
+<polygon fill="#FFFFFF" fill-opacity="0.3" points="22,20.61 22,26 27.39,26 " stroke-opacity="0.3"/>
+<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="6" x="2" y="16"/>
+<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="6" x="12" y="10"/>
+<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="6" x="22" y="4"/>
+<rect fill="none" height="30" width="30"/>
+</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sisx.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sisx.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<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">
+<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="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="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"/>
+<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"/>
+</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"/>
+<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="10" x="18" y="26"/>
+<rect fill="none" height="30" width="30"/>
+</g>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_angry.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,14 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g>
 <g>
-<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.6" stroke-opacity="0.6"/>
-<radialGradient cx="14.8057" cy="9.2969" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="19.5366">
+<rect fill="none" height="30" width="30"/>
+</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"/>
 </radialGradient>
-<circle cx="15" cy="15" fill="url(#SVGID_1_)" r="14"/>
-<path d="M15,2c7.563,0,13.709,6.002,13.975,13.5C28.98,15.332,29,15.169,29,15c0-7.732-6.268-14-14-14  S1,7.268,1,15c0,0.169,0.02,0.332,0.025,0.5C1.291,8.002,7.438,2,15,2z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
+<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"/>
@@ -31,10 +34,10 @@
 <stop offset="1" style="stop-color:#6D93B3"/>
 </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.542" 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.725 -2.3132)"/>
+<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="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.3777 -0.3777 -0.9259 46.3257 12.6943)"/>
+<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)"/>
 <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"/>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_bigsmile.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,27 +1,33 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g>
 <g>
-<path d="M15,30C6.729,30,0,23.271,0,15S6.729,0,15,0c8.271,0,15,6.729,15,15S23.271,30,15,30L15,30z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<radialGradient cx="15" cy="2.8335" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="24.8358">
+<rect fill="none" height="30" width="30"/>
+</g>
+<g>
+<rect fill="none" height="30" width="30"/>
+</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"/>
 </radialGradient>
-<circle cx="15" cy="15" fill="url(#SVGID_1_)" r="14"/>
-<path d="M15,2c7.563,0,13.709,6.002,13.975,13.5C28.98,15.332,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.332,0.025,0.5C1.291,8.002,7.437,2,15,2z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
+<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"/>
 </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.053-0.765-0.254-1.01-0.57c-0.246-0.317-0.354-0.711-0.304-1.108  C5.424,10.035,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.186-0.495-0.438C10.214,11.248,9.371,11,8.691,11s-1.404,0.248-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.273-0.16,0.523-0.434,0.559C11.042,13.998,11.021,14,11,14L11,14z" fill="#0C3554"/>
+<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"/>
 <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"/>
 </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.053,0.765-0.254,1.01-0.57c0.246-0.317,0.354-0.711,0.304-1.108  C24.576,10.035,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.186,0.495-0.438C19.786,11.248,20.629,11,21.309,11s1.404,0.248,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.273,0.16,0.523,0.434,0.559C18.958,13.998,18.979,14,19,14L19,14z" fill="#0C3554"/>
+<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"/>
 <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"/>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_cry.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,43 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g>
 <g>
-<path d="M15,30C6.729,30,0,23.271,0,15C0,6.729,6.729,0,15,0c8.271,0,15,6.729,15,15C30,23.271,23.271,30,15,30L15,30  z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<radialGradient cx="15" cy="2.8335" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="24.8358">
+<rect fill="none" height="30" width="30"/>
+</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"/>
 </radialGradient>
-<circle cx="15" cy="15" fill="url(#SVGID_1_)" r="14"/>
-<path d="M15,2c7.563,0,13.71,6.002,13.975,13.5C28.98,15.332,29,15.169,29,15c0-7.732-6.268-14-14-14  C7.269,1,1,7.268,1,15c0,0.169,0.02,0.332,0.025,0.5C1.291,8.002,7.438,2,15,2z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
+<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="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)"/>
 <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.725-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.611,6.563,13.688z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<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"/>
 </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.725,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.611,23.443,13.688z" fill-opacity="0.2" stroke-opacity="0.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"/>
 </linearGradient>
-<path d="M5.563,13.688c-0.396,0.725-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.611,5.563,13.688z" fill="url(#SVGID_3_)"/>
+<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"/>
 </linearGradient>
-<path d="M24.443,13.688c0.396,0.725,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.611,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.884l0,0c-0.118-0.539-0.022-1.018,0.213-1.07l5.984-1.309  C11.408,8.953,11.695,9.348,11.813,9.888L11.813,9.888z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M24.848,12.26c-0.102,0.544-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.129C24.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.129  c-0.238-0.044-0.348-0.52-0.246-1.063l0,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.129c-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.129C24.84,11.241,24.992,11.497,24.94,11.769L24.94,11.769z" fill="#3B2314"/>
-<path d="M12.026,10.865c0.118,0.54,0.022,1.018-0.214,1.071l-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.271,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="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="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"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_evil.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,30 +1,33 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g>
 <g>
-<path d="M15,30C6.729,30,0,23.271,0,15c0-2.678,0.721-5.3,2.089-7.614L0,0l5.785,3.177C8.416,1.123,11.662,0,15,0  c3.338,0,6.584,1.123,9.215,3.177L30,0l-2.089,7.386C29.279,9.699,30,12.322,30,15C30,23.271,23.271,30,15,30L15,30z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<radialGradient cx="15" cy="2.6045" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="25.1671">
+<rect fill="none" height="30" width="30"/>
+</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"/>
 </radialGradient>
-<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,2  l1.613,5.531C1.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="url(#SVGID_1_)"/>
-<path d="M15.075,24.834c-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.353,9.856,22.834,15,22.834c5.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.081,20.692,24.834,15.075,24.834L15.075,24.834z  " fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M15,2c7.563,0,13.709,6.002,13.975,13.5C28.98,15.332,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.332,0.025,0.5C1.291,8.002,7.437,2,15,2z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M27,19.803l-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.408c-1.177,4.936-4.949,7.068-10.094,7.068c-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.803c0.497,0,0.957-0.506,1.293-1.015  C5.888,23.535,9.807,25.834,15,25.834c5.189,0,9.107-2.295,10.704-7.039C25.994,19.178,26.407,19.568,27,19.803z" fill="#FFFFFF" fill-opacity="0.6" stroke-opacity="0.6"/>
+<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"/>
+<path d="M15.075,24.834c-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.353,9.856,22.834,15,22.834c5.143,0,8.993-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.081,20.692,24.834,15.075,24.834L15.075,24.834z  " fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M27,19.803l-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.408c-1.177,4.936-4.949,7.068-10.093,7.068c-5.144,0-8.917-2.133-10.095-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.803c0.497,0,0.957-0.506,1.293-1.015  C5.888,23.535,9.807,25.834,15,25.834c5.189,0,9.107-2.295,10.704-7.039C25.994,19.178,26.407,19.568,27,19.803z" fill="#FFFFFF" fill-opacity="0.6" stroke-opacity="0.6"/>
 <path d="M27,19.334l-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  c-1.177,4.155-4.95,6.637-10.094,6.637s-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.334c0.497,0,0.957-0.426,1.293-0.854C5.888,22.478,9.807,24.834,15,24.834  c5.189,0,9.107-2.354,10.704-6.348C25.994,18.807,26.407,19.137,27,19.334z" fill="url(#SVGID_2_)"/>
-<path d="M12.703,13.146l-9-4C3.451,9.034,3.155,9.148,3.043,9.4c-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.246C7.296,15.941,7.683,16,8.067,16  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,13.555,12.956,13.259,12.703,13.146z M7.243,14.867c-0.916-0.311-1.585-0.894-1.991-1.733  c-0.385-0.796-0.451-1.684-0.353-2.361l6.049,2.688C10.283,14.438,8.674,15.354,7.243,14.867z" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M12.703,12.043l-9-4c-0.252-0.112-0.548,0.001-0.66,0.254C2.931,8.55,3.044,8.845,3.297,8.958  c0,0,9.135,4.042,9.203,4.042c0.192,0,0.375-0.109,0.458-0.297C13.069,12.451,12.956,12.156,12.703,12.043z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M4.555,9.505c-0.5,1.4-0.205,4.357,2.527,5.284c1.889,0.642,4.044-0.755,4.563-2.133L4.555,9.505z" fill="#FFFFFF"/>
-<circle cx="7.985" cy="12.228" fill="#0C3554" r="1.5"/>
-<path d="M4.365,10.53l6.729,2.99c0.239-0.272,0.434-0.561,0.546-0.853L4.551,9.519  C4.451,9.802,4.386,10.15,4.365,10.53z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M12.703,12.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.215c0.519,1.074,1.408,1.852,2.57,2.246c0.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,13.002,12.956,12.707,12.703,12.595z M7.243,14.316c-0.916-0.311-1.585-0.895-1.991-1.734  c-0.385-0.796-0.451-1.684-0.353-2.361l6.049,2.688C10.283,13.885,8.674,14.803,7.243,14.316z" fill="#3B2314"/>
-<path d="M17.043,13.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,15.045,20.371,16,21.933,16c0.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.319,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.259,16.932,13.555,17.043,13.807z M19.052,13.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.733C21.326,15.354,19.717,14.438,19.052,13.461z" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M17.043,12.703C17.126,12.891,17.309,13,17.5,13c0.068,0,9.203-4.042,9.203-4.042  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,12.156,16.932,12.451,17.043,12.703z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M25.444,9.505c0.501,1.4,0.205,4.357-2.526,5.284c-1.889,0.642-4.045-0.755-4.563-2.133L25.444,9.505z" fill="#FFFFFF"/>
-<circle cx="22.015" cy="12.228" fill="#0C3554" r="1.5"/>
-<path d="M25.635,10.53l-6.729,2.99c-0.238-0.272-0.434-0.561-0.545-0.853l7.087-3.149  C25.549,9.802,25.613,10.15,25.635,10.53z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M17.043,13.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.246  c0.529-1.097,0.58-2.32,0.393-3.215l0.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,12.707,16.932,13.002,17.043,13.255z M19.052,12.909l6.049-2.688c0.098,0.677,0.032,1.565-0.353,2.361  c-0.406,0.84-1.076,1.424-1.991,1.734C21.326,14.803,19.717,13.885,19.052,12.909z" fill="#3B2314"/>
+<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"/>
+<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="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"/>
+<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"/>
 <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"/>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_eyebrows.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,15 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g>
 <g>
-<path d="M15,30C6.729,30,0,23.271,0,15S6.729,0,15,0c8.271,0,15,6.729,15,15S23.271,30,15,30L15,30z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<radialGradient cx="15" cy="2.8335" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="24.8358">
+<rect fill="none" height="30" width="30"/>
+</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"/>
 </radialGradient>
-<circle cx="15" cy="15" fill="url(#SVGID_1_)" r="14"/>
-<path d="M15,2c7.563,0,13.709,6.002,13.975,13.5C28.98,15.332,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.332,0.025,0.5C1.291,8.002,7.437,2,15,2z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
+<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"/>
@@ -21,45 +25,45 @@
 </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="4.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.0121 8.4476)"/>
-<ellipse cx="20.61" cy="3.926" fill="#3B2314" rx="4.361" ry="1" transform="matrix(0.9218 -0.3876 0.3876 0.9218 0.0893 8.2948)"/>
-<ellipse cx="8.446" cy="5.419" fill-opacity="0.2" rx="4.361" ry="1.542" stroke-opacity="0.2" transform="matrix(-0.9963 -0.0858 0.0858 -0.9963 16.3958 11.5433)"/>
-<ellipse cx="8.655" cy="5.007" fill="#3B2314" rx="4.361" ry="1" transform="matrix(-0.9963 -0.0858 0.0858 -0.9963 16.8477 10.7385)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="8.5" x2="8.5" y1="6.5415" y2="18.6124">
+<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="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)"/>
+<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"/>
 </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_4_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="8.5" x2="8.5" y1="7.625" y2="17.5013">
+<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">
 <stop offset="0" style="stop-color:#CCCCCC"/>
 <stop offset="0.2" style="stop-color:#EEEEEE"/>
 <stop offset="1" style="stop-color:#FCFCFC"/>
 </linearGradient>
-<circle cx="8.5" cy="12.5" fill="url(#SVGID_5_)" r="4.5"/>
-<path d="M8.5,9c2.314,0,4.198,1.753,4.45,4c0.019-0.166,0.05-0.328,0.05-0.5C13,10.015,10.985,8,8.5,8  S4,10.015,4,12.5c0,0.172,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.879,7,11.5S8.122,9,9.5,9s2.5,1.121,2.5,2.5S10.878,14,9.5,14L9.5,14z" fill="#0C3554"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="10.0005" x2="10.0005" y1="11.0039" y2="13.1352">
+<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"/>
+<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"/>
 </linearGradient>
-<circle cx="10" cy="12" fill="url(#SVGID_6_)" r="1"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="21.5" x2="21.5" y1="6.5415" y2="18.6124">
+<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"/>
 </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_7_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="21.5" x2="21.5" y1="7.625" y2="17.5013">
+<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">
 <stop offset="0" style="stop-color:#CCCCCC"/>
 <stop offset="0.2" style="stop-color:#EEEEEE"/>
 <stop offset="1" style="stop-color:#FCFCFC"/>
 </linearGradient>
-<circle cx="21.5" cy="12.5" fill="url(#SVGID_8_)" r="4.5"/>
-<path d="M21.5,9c2.314,0,4.197,1.753,4.449,4C25.969,12.834,26,12.672,26,12.5c0-2.485-2.015-4.5-4.5-4.5  S17,10.015,17,12.5c0,0.172,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.121-2.5-2.5S21.121,9,22.5,9s2.5,1.121,2.5,2.5S23.879,14,22.5,14L22.5,14z" fill="#0C3554"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="23" x2="23" y1="11.0039" y2="13.1352">
+<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"/>
+<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"/>
 </linearGradient>
-<circle cx="23" cy="12" fill="url(#SVGID_9_)" r="1"/>
+<circle cx="23" cy="13" fill="url(#SVGID_9_)" r="1"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_heart.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,13 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 transform="matrix(1 0 0 1 0 2)">
-<path d="M8.655,19.771c-0.487-0.313-1.012-0.624-1.55-0.943  C3.923,16.941-0.036,14.594,0,9.517C0.044,3.269,4.054,0,7.994,0C10.794,0,13.315,1.515,15,4.136  c1.67-2.523,4.237-4.027,7.024-4.027c3.809,0,7.932,2.926,7.977,9.35c0.035,4.889-3.723,7.188-6.742,9.035  c-0.674,0.412-1.309,0.802-1.883,1.201C18.383,21.781,15.08,26,15.08,26S11.71,21.742,8.655,19.771z" fill-opacity="0.6" fill-rule="evenodd" stroke-opacity="0.6"/>
-<radialGradient cx="15" cy="13.8979" gradientTransform="matrix(1 0 0 0.984 0 -6.2057)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="13.8351">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g>
+<g>
+<rect fill="none" height="30" width="30"/>
+</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"/>
 </radialGradient>
-<path d="M14.994,6.245C11.37-2.077,1.068-0.136,1,9.523  c-0.037,5.305,4.906,7.288,8.197,9.408c3.191,2.057,5.462,4.87,5.818,6.068c0.305-1.174,2.834-4.066,5.788-6.125  c3.23-2.252,8.234-4.104,8.197-9.409C28.932-0.217,18.451-1.745,14.994,6.245z" fill="url(#SVGID_1_)" fill-rule="evenodd"/>
-<path d="M14.994,7.245  c3.389-7.832,13.518-6.514,13.983,2.659C28.984,9.758,29,9.618,29,9.466C28.932-0.217,18.451-1.745,14.994,6.245  C11.37-2.077,1.068-0.136,1,9.523C0.999,9.676,1.016,9.815,1.023,9.962C1.482,0.796,11.441-0.912,14.994,7.245z" fill="#FFFFFF" fill-opacity="0.3" fill-rule="evenodd" stroke-opacity="0.3"/>
+<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"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_irritated.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,23 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g>
 <g>
-<path d="M15,30C6.729,30,0,23.271,0,15C0,6.729,6.729,0,15,0c8.271,0,15,6.729,15,15C30,23.271,23.271,30,15,30L15,30  z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<radialGradient cx="15" cy="2.8335" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="24.8358">
+<rect fill="none" height="30" width="30"/>
+</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"/>
 </radialGradient>
-<circle cx="15" cy="15" fill="url(#SVGID_1_)" r="14"/>
-<path d="M15,2c7.563,0,13.709,6.002,13.975,13.5C28.98,15.332,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.332,0.025,0.5C1.291,8.002,7.437,2,15,2z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M24.854,23.146l-3-3c-0.195-0.195-0.512-0.195-0.707,0L18.5,22.793l-2.646-2.646  c-0.195-0.195-0.512-0.195-0.707,0L12.5,22.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,23.951,6.372,24,6.5,24s0.256-0.049,0.354-0.146L9.5,21.207l2.646,2.646  C12.244,23.951,12.372,24,12.5,24s0.256-0.049,0.354-0.146l2.646-2.646l2.646,2.646C18.244,23.951,18.372,24,18.5,24  s0.256-0.049,0.354-0.146l2.646-2.646l2.646,2.646C24.244,23.951,24.372,24,24.5,24s0.256-0.049,0.354-0.146  C25.049,23.658,25.049,23.342,24.854,23.146z" fill-opacity="0.4" stroke-opacity="0.4"/>
-<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="#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="#3B2314"/>
-<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.649l3.839-2.536l-3.839-0.535  c-0.256-0.103-0.381-0.394-0.279-0.65c0.103-0.256,0.395-0.381,0.65-0.278l6.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.118-0.464-0.314c-0.103-0.256,0.022-0.547,0.279-0.649l3.839-0.536  L6.314,9.965c-0.256-0.103-0.381-0.394-0.279-0.65c0.103-0.256,0.395-0.381,0.65-0.278l6.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.535l-3.839-1.535  c-0.256-0.104-0.381-0.395-0.279-0.65c0.103-0.257,0.395-0.382,0.65-0.279l6.161,2.465l-6.161,2.465C6.625,14.988,6.562,15,6.5,15  L6.5,15z" fill="#3B2314"/>
-<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.649L19.692,12.5l3.839-0.535  c0.257-0.103,0.382-0.394,0.279-0.65c-0.103-0.256-0.395-0.381-0.65-0.278L17,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.118,0.465-0.314c0.103-0.256-0.022-0.547-0.279-0.649L19.692,12.5  l3.839-2.535c0.257-0.103,0.382-0.394,0.279-0.65c-0.103-0.256-0.395-0.381-0.65-0.278L17,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.535  c0.257-0.104,0.382-0.395,0.279-0.65c-0.103-0.257-0.395-0.382-0.65-0.279L17,12.5l6.16,2.465C23.221,14.988,23.284,15,23.346,15  L23.346,15z" fill="#3B2314"/>
+<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="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="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"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_kissing.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,39 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g>
 <g>
-<path d="M15,30C6.729,30,0,23.271,0,15C0,6.729,6.729,0,15,0c8.271,0,15,6.729,15,15C30,23.271,23.271,30,15,30L15,30  z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<radialGradient cx="15" cy="2.8335" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="24.8358">
+<rect fill="none" height="30" width="30"/>
+</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"/>
 </radialGradient>
-<circle cx="15" cy="15" fill="url(#SVGID_1_)" r="14"/>
-<radialGradient cx="5" cy="-64.3545" gradientTransform="matrix(1 0 0 1.1014 0 84.2272)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="5.192">
+<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"/>
 </radialGradient>
-<ellipse cx="5" cy="16.254" fill="url(#SVGID_2_)" rx="4" ry="2.746"/>
-<radialGradient cx="25" cy="-64.3545" gradientTransform="matrix(1 0 0 1.1014 0 84.2272)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="5.192">
+<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"/>
 </radialGradient>
-<ellipse cx="25" cy="16.254" fill="url(#SVGID_3_)" rx="4" ry="2.746"/>
-<path d="M15,2c7.563,0,13.709,6.002,13.975,13.5C28.98,15.332,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.332,0.025,0.5C1.291,8.002,7.437,2,15,2z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M17.387,16c-1.181,0-1.919,0.746-2.387,1.25C14.533,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"/>
+<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"/>
 <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"/>
 </radialGradient>
-<path d="M17.387,16c-1.181,0-1.919,0.746-2.387,1.25C14.533,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_)"/>
+<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="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.422-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.623-1.209c0.183-0.209,0.498-0.23,0.706-0.047c0.208,0.182,0.229,0.497,0.048,0.705  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.422,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.497-0.048,0.705C18.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.17l-0.675,0.676c-0.195,0.195-0.512,0.195-0.707,0  s-0.195-0.512,0-0.707l1.409-1.41l0.352,0.402c0.672,0.77,1.628,1.209,2.624,1.209s1.952-0.439,2.623-1.209  c0.183-0.209,0.498-0.229,0.706-0.047c0.208,0.182,0.229,0.498,0.048,0.705C11.53,12.561,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.676c0.195,0.195,0.512,0.195,0.707,0  s0.195-0.512,0-0.707l-1.409-1.41l-0.353,0.402c-0.672,0.77-1.627,1.209-2.623,1.209s-1.951-0.439-2.623-1.209  c-0.183-0.209-0.498-0.229-0.706-0.047c-0.208,0.182-0.229,0.498-0.048,0.705C18.47,12.561,19.7,13.125,20.984,13.125L20.984,13.125  z" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M9.016,12.313c-1.108,0-2.177-0.422-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.623-1.209  c0.183-0.209,0.498-0.23,0.706-0.047c0.208,0.182,0.229,0.497,0.048,0.705C11.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.422,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.497-0.048,0.705C18.47,11.747,19.7,12.313,20.984,12.313L20.984,12.313z  " fill="#3B2314"/>
+<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"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_nerd.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,42 +1,45 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g>
 <g>
-<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.6" stroke-opacity="0.6"/>
-<radialGradient cx="15" cy="2.8335" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="24.8358">
+<rect fill="none" height="30" width="30"/>
+</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"/>
 </radialGradient>
-<circle cx="15" cy="15" fill="url(#SVGID_1_)" r="14"/>
-<path d="M27,13.5c0-0.537-0.08-1.055-0.225-1.545C26.85,11.973,26.92,12,27,12h1.67c-0.15-0.688-0.357-1.354-0.605-2  H27c-0.383,0-0.703,0.222-0.871,0.536C25.15,9.013,23.445,8,21.5,8c-2.517,0-4.634,1.692-5.287,4h-2.426  C13.134,9.692,11.017,8,8.5,8c-1.945,0-3.651,1.013-4.628,2.537C3.703,10.222,3.382,10,3,10H1.936c-0.248,0.646-0.455,1.312-0.605,2  H3c0.08,0,0.15-0.027,0.224-0.045C3.081,12.445,3,12.963,3,13.5C3,16.537,5.462,19,8.5,19c2.869,0,5.222-2.197,5.475-5h2.051  c0.253,2.803,2.605,5,5.475,5C24.537,19,27,16.537,27,13.5z M13,13.505C12.997,15.984,10.98,18,8.5,18C6.019,18,4,15.981,4,13.5  S6.019,9,8.5,9c2.48,0,4.497,2.016,4.5,4.495V13.505z M21.5,18c-2.481,0-4.5-2.019-4.5-4.5S19.019,9,21.5,9s4.5,2.019,4.5,4.5  S23.981,18,21.5,18z" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M15.075,26c-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,22.519,9.855,24,15,24c5.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,23.247,20.692,26,15.075,26L15.075,26z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M15,2c7.563,0,13.709,6.002,13.975,13.5C28.98,15.332,29,15.169,29,15c0-7.732-6.268-14-14-14  S1,7.268,1,15c0,0.169,0.02,0.332,0.025,0.5C1.291,8.002,7.438,2,15,2z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
+<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="M27,13.5c0-0.537-0.08-1.055-0.225-1.545C26.85,11.972,26.92,12,27,12h1.67c-0.15-0.688-0.357-1.354-0.605-2  H27c-0.383,0-0.703,0.222-0.871,0.536C25.15,9.013,23.445,8,21.5,8c-2.517,0-4.634,1.692-5.287,4h-2.425  C13.134,9.692,11.017,8,8.5,8c-1.945,0-3.651,1.013-4.628,2.537C3.703,10.222,3.382,10,3,10H1.936c-0.248,0.646-0.455,1.312-0.605,2  H3c0.08,0,0.15-0.028,0.224-0.045C3.081,12.445,3,12.963,3,13.5C3,16.537,5.462,19,8.5,19c2.869,0,5.222-2.197,5.475-5h2.051  c0.253,2.803,2.605,5,5.475,5C24.537,19,27,16.537,27,13.5z M13,13.505C12.997,15.984,10.98,18,8.5,18C6.019,18,4,15.981,4,13.5  S6.019,9,8.5,9c2.48,0,4.497,2.016,4.5,4.495V13.505z M21.5,18c-2.481,0-4.5-2.019-4.5-4.5S19.019,9,21.5,9s4.5,2.019,4.5,4.5  S23.981,18,21.5,18z" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="4" x2="13" 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="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.463,3,12.5S5.462,18,8.5,18c3.037,0,5.5-2.463,5.5-5.5S11.537,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="#3B2314"/>
 <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.463,16,12.5s2.463,5.5,5.5,5.5s5.5-2.463,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"/>
+<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.553-0.448,1-1,1h-2c-0.553,0-1-0.447-1-1l0,0c0-0.553,0.447-1,1-1h2C29.552,9,30,9.447,30,10  L30,10z" fill="#3B2314"/>
-<path d="M4,10c0,0.553-0.448,1-1,1H1c-0.552,0-1-0.447-1-1l0,0c0-0.553,0.448-1,1-1h2C3.552,9,4,9.447,4,10L4,10z" fill="#3B2314"/>
-<path d="M8.5,9c2.311,0,4.197,1.756,4.449,4C12.969,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.189,9,8.5,9z" fill-opacity="0.3" stroke-opacity="0.3"/>
+<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="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="M27,20.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,23.367,20.145,25.5,15,25.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,20.969c0.497,0,0.957-0.506,1.293-1.015  C5.888,24.701,9.807,27,15,27c5.189,0,9.107-2.295,10.704-7.039C25.994,20.344,26.407,20.734,27,20.969z" fill="#FFFFFF" fill-opacity="0.6" stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="14.9995" x2="14.9995" y1="18.1426" y2="26.0441">
+<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"/>
 </linearGradient>
-<path d="M27,20.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,22.519,20.144,25,15,25s-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,20.5c0.497,0,0.957-0.426,1.293-0.854C5.888,23.644,9.807,26,15,26  c5.189,0,9.107-2.354,10.704-6.348C25.994,19.973,26.407,20.303,27,20.5z" fill="url(#SVGID_4_)"/>
+<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"/>
 </g>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_neutral.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,51 +1,54 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g>
 <g>
-<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-opacity="0.6" stroke-opacity="0.6"/>
-<radialGradient cx="15" cy="2.8335" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="24.8358">
+<rect fill="none" height="30" width="30"/>
+</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"/>
 </radialGradient>
-<circle cx="15" cy="15" fill="url(#SVGID_1_)" r="14"/>
-<path d="M15,2c7.563,0,13.709,6.002,13.975,13.5C28.98,15.332,29,15.169,29,15c0-7.732-6.268-14-14-14  S1,7.268,1,15c0,0.169,0.02,0.332,0.025,0.5C1.291,8.002,7.438,2,15,2z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="8.5" x2="8.5" y1="6.5415" y2="18.6124">
+<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"/>
 </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">
+<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">
 <stop offset="0" style="stop-color:#CCCCCC"/>
 <stop offset="0.2" style="stop-color:#EEEEEE"/>
 <stop offset="1" style="stop-color:#FCFCFC"/>
 </linearGradient>
-<circle cx="8.5" cy="12.5" fill="url(#SVGID_3_)" r="4.5"/>
-<path d="M8.5,9c2.314,0,4.197,1.753,4.449,4C12.969,12.834,13,12.672,13,12.5C13,10.015,10.985,8,8.5,8  S4,10.015,4,12.5c0,0.172,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="M8.5,15C7.121,15,6,13.879,6,12.5S7.121,10,8.5,10s2.5,1.121,2.5,2.5S9.879,15,8.5,15L8.5,15z" fill="#0C3554"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="21.5" x2="21.5" y1="6.5415" y2="18.6124">
+<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"/>
+<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"/>
+</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"/>
 </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_4_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="21.5" x2="21.5" y1="7.625" y2="17.5013">
+<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">
 <stop offset="0" style="stop-color:#CCCCCC"/>
 <stop offset="0.2" style="stop-color:#EEEEEE"/>
 <stop offset="1" style="stop-color:#FCFCFC"/>
 </linearGradient>
-<circle cx="21.5" cy="12.5" fill="url(#SVGID_5_)" r="4.5"/>
-<path d="M21.5,9c2.314,0,4.197,1.753,4.449,4C25.969,12.834,26,12.672,26,12.5c0-2.485-2.015-4.5-4.5-4.5  S17,10.015,17,12.5c0,0.172,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="M21.5,15c-1.379,0-2.5-1.121-2.5-2.5s1.121-2.5,2.5-2.5s2.5,1.121,2.5,2.5S22.879,15,21.5,15L21.5,15z" fill="#0C3554"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="9" x2="9" y1="12.0039" y2="14.1352">
+<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"/>
+<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"/>
 </linearGradient>
-<circle cx="9" cy="13" fill="url(#SVGID_6_)" r="1"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="22" x2="22" y1="12.0039" y2="14.1352">
-<stop offset="0" style="stop-color:#0C3554"/>
-<stop offset="1" style="stop-color:#9BD1FF"/>
-</linearGradient>
-<circle cx="22" cy="13" fill="url(#SVGID_7_)" r="1"/>
+<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"/>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_pirate.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_pirate.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +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 transform="matrix(1 0 0 1 1 1)">
-<path d="M29,5.734c0,0-0.313-1-1.195-1.295c1.055-1.158,0.93-2.721,0.93-2.721S28,1,26.797,1  c-1.003,0-2.091,0.326-3.063,0.918c-0.463,0.283-0.876,0.617-1.24,0.979C20.136,1.088,17.195,0,14,0C6.28,0,0,6.28,0,14  s6.28,14,14,14s14-6.28,14-14c0-2.266-0.553-4.4-1.513-6.296C28.531,7.125,29,5.734,29,5.734z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<radialGradient cx="14" cy="10.1787" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="17.7916">
-<stop offset="0" style="stop-color:#FEE891"/>
-<stop offset="0.7818" style="stop-color:#FFB701"/>
-<stop offset="1" style="stop-color:#FFC501"/>
-</radialGradient>
-<path d="M2,9c-0.642,1.539-1,3.228-1,5c0,7.18,5.82,13,13,13s13-5.82,13-13c0-1.772-0.357-3.461-1-5H2z" fill="url(#SVGID_1_)"/>
-<path d="M26.361,10C26.252,9.662,26.137,9.326,26,9H2c-0.136,0.326-0.252,0.662-0.361,1H26.361z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="8.5" x2="8.5" y1="8.917" y2="16.1255">
-<stop offset="0" style="stop-color:#DB9D00"/>
-<stop offset="1" style="stop-color:#FFEEA9"/>
-</linearGradient>
-<path d="M8.5,16C7.075,16,6,14.495,6,12.5S7.075,9,8.5,9s2.5,1.505,2.5,3.5S9.925,16,8.5,16L8.5,16z" fill="url(#SVGID_2_)"/>
-<ellipse cx="8.5" cy="12.5" fill="#0C3554" rx="1.5" ry="2.5"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="8.5835" x2="8.5835" y1="11.9707" y2="15.1465">
-<stop offset="0" style="stop-color:#0C3554"/>
-<stop offset="1" style="stop-color:#6D93B3"/>
-</linearGradient>
-<path d="M7.167,13.623C7.414,14.437,7.915,15,8.5,15c0.829,0,1.5-1.119,1.5-2.5  c0-0.155-0.011-0.305-0.027-0.452C9.819,12.018,9.662,12,9.5,12C8.429,12,7.522,12.677,7.167,13.623z" fill="url(#SVGID_3_)"/>
-<path d="M13.396,23.658c0.353,0.037,0.719,0.056,1.088,0.056c3.674,0,6.368-1.058,7.209-4.025  c0.053-0.19,0.252-0.302,0.439-0.246c0.189,0.054,0.301,0.251,0.246,0.44c-0.005,0.02-0.012,0.035-0.018,0.055L23,21.213  c-0.338,0-0.65-0.277-0.887-0.568c-1.15,2.831-3.992,4.876-7.684,4.876c-0.393,0-0.242-0.028-0.621-0.019  c-0.805,0.024-0.825-1.33-0.804-1.525C13.025,23.779,13.201,23.636,13.396,23.658z" fill="#FFFFFF" fill-opacity="0.6" stroke-opacity="0.6"/>
-<path d="M13.396,22.943c0.353,0.037,0.719,0.056,1.088,0.056c3.674,0,6.368-1.771,7.209-4.738  c0.053-0.19,0.252-0.302,0.439-0.247c0.189,0.055,0.301,0.252,0.246,0.441c-0.005,0.018-0.012,0.035-0.018,0.055L23,20.499  c-0.338,0-0.65-0.991-0.887-1.282c-1.15,2.83-3.822,4.85-7.514,4.85c-0.393,0-0.784-0.02-1.162-0.06  c-0.196-0.021-0.434-0.03-0.434-0.745C13.004,23.064,13.201,22.922,13.396,22.943z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<linearGradient gradientTransform="matrix(-1 0 0 1 -470.001 0)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-493.001" x2="-483.0034" y1="21.5703" y2="21.5703">
-<stop offset="0" style="stop-color:#460800"/>
-<stop offset="1" style="stop-color:#992323"/>
-</linearGradient>
-<path d="M13.396,23.658c0.353,0.037,0.719,0.056,1.088,0.056c3.674,0,6.368-1.771,7.209-4.739  c0.053-0.189,0.252-0.302,0.439-0.246c0.189,0.054,0.301,0.251,0.246,0.44c-0.005,0.019-0.012,0.036-0.018,0.054L23,20.499  c-0.338,0-0.65-0.277-0.887-0.567c-1.15,2.829-3.939,4.496-7.629,4.496c-0.394,0-0.785-0.02-1.162-0.06  c-0.196-0.021-0.338-0.196-0.318-0.392C13.025,23.779,13.201,23.636,13.396,23.658z" fill="url(#SVGID_4_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="24.9082" x2="24.9082" y1="2.167" y2="5.5838">
-<stop offset="0" style="stop-color:#FF4D00"/>
-<stop offset="1" style="stop-color:#800000"/>
-</linearGradient>
-<path d="M24.255,2.772C23.01,3.531,22.189,4.662,22,5.71c0.971,0.341,2.318,0.149,3.563-0.61  c1.244-0.758,2.065-1.889,2.254-2.938C26.848,1.821,25.5,2.014,24.255,2.772z" fill="url(#SVGID_5_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="25.6973" x2="25.6973" y1="5.0835" y2="6.8041">
-<stop offset="0" style="stop-color:#FF4D00"/>
-<stop offset="1" style="stop-color:#800000"/>
-</linearGradient>
-<path d="M25.68,5.006c-0.986,0.055-1.837,0.467-2.285,1.032c0.471,0.514,1.336,0.83,2.321,0.774  C26.701,6.758,27.553,6.346,28,5.78C27.531,5.268,26.664,4.951,25.68,5.006z" fill="url(#SVGID_6_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="1.9995" x2="26" y1="5" y2="5">
-<stop offset="0" style="stop-color:#FF4D00"/>
-<stop offset="1" style="stop-color:#800000"/>
-</linearGradient>
-<path d="M2,9h24c-1.959-4.697-6.593-8-12-8S3.959,4.303,2,9z" fill="url(#SVGID_7_)"/>
-<path d="M14,2c5.014,0,9.358,2.842,11.527,7H26c-1.959-4.697-6.593-8-12-8S3.959,4.303,2,9h0.474  C4.642,4.842,8.986,2,14,2z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M26.111,18.697l-3.076-3.076c0.473-0.657,0.758-1.457,0.758-2.328c0-2.209-1.791-4-4-4  c-0.871,0-1.671,0.285-2.328,0.758L9.303,1.889C8.64,2.146,8.005,2.456,7.4,2.814l8.783,8.782c-0.243,0.517-0.39,1.087-0.39,1.696  c0,2.209,1.791,4,4,4c0.609,0,1.18-0.146,1.696-0.39l3.696,3.696C25.544,19.995,25.854,19.36,26.111,18.697z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M26.379,17.965l-3.137-3.137C23.715,14.171,24,13.371,24,12.5c0-2.209-1.791-4-4-4  c-0.871,0-1.671,0.285-2.328,0.758l-7.637-7.637C9.342,1.843,8.678,2.125,8.041,2.455l8.349,8.349C16.146,11.32,16,11.891,16,12.5  c0,2.209,1.791,4,4,4c0.609,0,1.18-0.146,1.696-0.39l3.849,3.849C25.875,19.322,26.157,18.658,26.379,17.965z" fill="#3B2314"/>
-<path d="M20,9c2.123,0,3.844,1.66,3.975,3.75C23.98,12.666,24,12.586,24,12.5c0-2.209-1.791-4-4-4  s-4,1.791-4,4c0,0.086,0.02,0.166,0.025,0.25C16.156,10.66,17.877,9,20,9z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
-</g>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_sarcastic.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,58 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g>
 <g>
-<path d="M15,30C6.729,30,0,23.271,0,15C0,6.729,6.729,0,15,0c8.271,0,15,6.729,15,15C30,23.271,23.271,30,15,30L15,30  z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<radialGradient cx="15" cy="2.8335" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="24.8358">
+<rect fill="none" height="30" width="30"/>
+</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"/>
 </radialGradient>
-<circle cx="15" cy="15" fill="url(#SVGID_1_)" r="14"/>
-<path d="M15,2c7.563,0,13.709,6.002,13.975,13.5C28.98,15.332,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.332,0.025,0.5C1.291,8.002,7.437,2,15,2z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
-<ellipse cx="21.936" cy="3.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.2453 8.8002)"/>
-<ellipse cx="21.611" cy="3.464" fill="#3B2314" rx="4.361" ry="1" transform="matrix(0.9218 -0.3876 0.3876 0.9218 0.3466 8.6467)"/>
-<ellipse cx="7.636" cy="3.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 13.2053 10.2478)"/>
-<ellipse cx="7.961" cy="3.464" fill="#3B2314" rx="4.361" ry="1" transform="matrix(-0.9218 -0.3876 0.3876 -0.9218 13.9573 9.7432)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="8.5" x2="8.5" y1="5.5415" y2="17.6124">
+<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="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)"/>
+<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"/>
 </linearGradient>
-<path d="M8.5,17C5.467,17,3,14.533,3,11.5S5.467,6,8.5,6S14,8.467,14,11.5S11.533,17,8.5,17L8.5,17z" fill="url(#SVGID_2_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="8.5" x2="8.5" y1="6.625" y2="16.5008">
+<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">
 <stop offset="0" style="stop-color:#CCCCCC"/>
 <stop offset="0.2" style="stop-color:#EEEEEE"/>
 <stop offset="1" style="stop-color:#FCFCFC"/>
 </linearGradient>
-<circle cx="8.5" cy="11.5" fill="url(#SVGID_3_)" r="4.5"/>
-<path d="M8.5,8c2.314,0,4.198,1.753,4.45,4c0.019-0.166,0.05-0.328,0.05-0.5C13,9.015,10.985,7,8.5,7S4,9.015,4,11.5  c0,0.172,0.032,0.334,0.05,0.5C4.302,9.753,6.186,8,8.5,8z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M9.5,13C8.122,13,7,11.879,7,10.5S8.122,8,9.5,8S12,9.121,12,10.5S10.878,13,9.5,13L9.5,13z" fill="#0C3554"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="10.0005" x2="10.0005" y1="10.0039" y2="12.1352">
+<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"/>
+<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"/>
 </linearGradient>
-<circle cx="10" cy="11" fill="url(#SVGID_4_)" r="1"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="21.5" x2="21.5" y1="5.5415" y2="17.6124">
+<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"/>
 </linearGradient>
-<path d="M21.5,17c-3.033,0-5.5-2.467-5.5-5.5S18.467,6,21.5,6S27,8.467,27,11.5S24.533,17,21.5,17L21.5,17z" fill="url(#SVGID_5_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="21.5" x2="21.5" y1="6.625" y2="16.5008">
+<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">
 <stop offset="0" style="stop-color:#CCCCCC"/>
 <stop offset="0.2" style="stop-color:#EEEEEE"/>
 <stop offset="1" style="stop-color:#FCFCFC"/>
 </linearGradient>
-<circle cx="21.5" cy="11.5" fill="url(#SVGID_6_)" r="4.5"/>
-<path d="M21.5,8c2.314,0,4.197,1.753,4.449,4C25.969,11.834,26,11.672,26,11.5C26,9.015,23.985,7,21.5,7  S17,9.015,17,11.5c0,0.172,0.031,0.334,0.051,0.5C17.303,9.753,19.186,8,21.5,8z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M22.5,13c-1.379,0-2.5-1.121-2.5-2.5S21.121,8,22.5,8S25,9.121,25,10.5S23.879,13,22.5,13L22.5,13z" fill="#0C3554"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="23" x2="23" y1="10.0039" y2="12.1352">
+<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"/>
+<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"/>
 </linearGradient>
-<circle cx="23" cy="11" fill="url(#SVGID_7_)" r="1"/>
+<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.001 0)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="-481.001" x2="-467.001" y1="21" y2="21">
+<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"/>
 </linearGradient>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_sarcastic_mad.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,15 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g>
 <g>
-<path d="M15,30C6.729,30,0,23.271,0,15S6.729,0,15,0c8.271,0,15,6.729,15,15S23.271,30,15,30L15,30z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<radialGradient cx="15" cy="2.8335" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="24.8358">
+<rect fill="none" height="30" width="30"/>
+</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"/>
 </radialGradient>
-<circle cx="15" cy="15" fill="url(#SVGID_1_)" r="14"/>
-<path d="M15,2c7.563,0,13.709,6.002,13.975,13.5C28.98,15.332,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.332,0.025,0.5C1.291,8.002,7.437,2,15,2z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
+<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"/>
@@ -32,12 +35,12 @@
 <stop offset="1" style="stop-color:#6D93B3"/>
 </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.5c-1.768,0-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.5c-1.768,0-3-0.791-3-1.5  C9,21.224,8.776,21,8.5,21S8,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.5  c0,0.276,0.224,0.5,0.5,0.5s0.5-0.224,0.5-0.5C23,20.098,21.243,19,19,19z" fill-opacity="0.4" stroke-opacity="0.4"/>
+<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"/>
 </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.5c-1.768,0-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_)"/>
+<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>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_smile.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,33 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g>
 <g>
-<path d="M15,30C6.729,30,0,23.271,0,15S6.729,0,15,0c8.271,0,15,6.729,15,15S23.271,30,15,30L15,30z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<radialGradient cx="15" cy="2.8335" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="24.8358">
+<rect fill="none" height="30" width="30"/>
+</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"/>
 </radialGradient>
-<circle cx="15" cy="15" fill="url(#SVGID_1_)" r="14"/>
-<path d="M15.075,26c-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,22.519,9.855,24,15,24c5.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,23.247,20.692,26,15.075,26L15.075,26z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M15,2c7.563,0,13.709,6.002,13.975,13.5C28.98,15.332,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.332,0.025,0.5C1.291,8.002,7.437,2,15,2z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
+<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"/>
 </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.053-0.765-0.254-1.01-0.57c-0.246-0.317-0.354-0.711-0.304-1.108  C5.424,10.035,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.186-0.495-0.438C10.214,11.248,9.371,11,8.691,11s-1.404,0.248-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.273-0.16,0.523-0.434,0.559C11.042,13.998,11.021,14,11,14L11,14z" fill="#0C3554"/>
+<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"/>
 <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"/>
 </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.053,0.765-0.254,1.01-0.57c0.246-0.317,0.354-0.711,0.304-1.108  C24.576,10.035,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.186,0.495-0.438C19.786,11.248,20.629,11,21.309,11s1.404,0.248,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.273,0.16,0.523,0.434,0.559C18.958,13.998,18.979,14,19,14L19,14z" fill="#0C3554"/>
-<path d="M27,20.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,23.367,20.145,25.5,15,25.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,20.969c0.497,0,0.957-0.506,1.293-1.015  C5.888,24.701,9.807,27,15,27c5.189,0,9.107-2.295,10.704-7.039C25.994,20.344,26.407,20.734,27,20.969z" fill="#FFFFFF" fill-opacity="0.6" stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="14.9995" x2="14.9995" y1="18.1426" y2="26.0441">
+<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="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"/>
 </linearGradient>
-<path d="M27,20.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,22.519,20.144,25,15,25s-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,20.5c0.497,0,0.957-0.426,1.293-0.854C5.888,23.644,9.807,26,15,26  c5.189,0,9.107-2.354,10.704-6.348C25.994,19.973,26.407,20.303,27,20.5z" fill="url(#SVGID_4_)"/>
+<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>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_spring.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_spring.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,90 +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>
-<path d="M16.75,11.111V9.971C16.998,9.99,17.25,10,17.507,10c1.958,0,4.081-0.578,5.979-1.63  c2.972-1.646,5.026-4.185,5.499-6.793l0.151-0.838l-0.804-0.283C27.474,0.153,26.519,0,25.493,0c-1.958,0-4.081,0.579-5.979,1.63  C17.529,2.729,15.969,4.23,15,5.881c-0.969-1.65-2.53-3.151-4.515-4.25C8.588,0.579,6.465,0,4.507,0  c-1.025,0-1.98,0.153-2.839,0.456L0.864,0.739l0.151,0.838c0.473,2.608,2.527,5.147,5.499,6.792C8.412,9.421,10.535,10,12.492,10  c0.001,0,0.001,0,0.001,0c0.257,0,0.509-0.01,0.757-0.029v1.141C5.802,11.981,0,18.322,0,26c0,1.058,0.119,2.139,0.354,3.213  L0.524,30h28.951l0.171-0.787C29.881,28.139,30,27.058,30,26C30,18.322,24.198,11.981,16.75,11.111z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<radialGradient cx="15" cy="13.1133" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="21.8867">
-<stop offset="0" style="stop-color:#FEE891"/>
-<stop offset="0.7818" style="stop-color:#FFB701"/>
-<stop offset="1" style="stop-color:#FFC501"/>
-</radialGradient>
-<path d="M29,26c0-7.732-6.268-14-14-14C7.269,12,1,18.268,1,26c0,1.031,0.119,2.033,0.33,3h27.34  C28.881,28.033,29,27.031,29,26z" fill="url(#SVGID_1_)"/>
-<path d="M15,13c7.563,0,13.71,6.002,13.975,13.5C28.98,26.332,29,26.169,29,26c0-7.732-6.268-14-14-14  C7.269,12,1,18.268,1,26c0,0.169,0.02,0.332,0.025,0.5C1.291,19.002,7.438,13,15,13z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="8.5" x2="8.5" y1="16.542" y2="28.6124">
-<stop offset="0" style="stop-color:#DB9D00"/>
-<stop offset="1" style="stop-color:#FFEEA9"/>
-</linearGradient>
-<path d="M8.5,28C5.468,28,3,25.533,3,22.5S5.468,17,8.5,17c3.033,0,5.5,2.467,5.5,5.5S11.533,28,8.5,28  L8.5,28z" fill="url(#SVGID_2_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="8.5" x2="8.5" y1="17.625" y2="27.5008">
-<stop offset="0" style="stop-color:#CCCCCC"/>
-<stop offset="0.2" style="stop-color:#EEEEEE"/>
-<stop offset="1" style="stop-color:#FCFCFC"/>
-</linearGradient>
-<circle cx="8.5" cy="22.5" fill="url(#SVGID_3_)" r="4.5"/>
-<path d="M8.5,19c2.314,0,4.198,1.753,4.45,4c0.019-0.166,0.05-0.328,0.05-0.5c0-2.485-2.014-4.5-4.5-4.5  C6.016,18,4,20.015,4,22.5c0,0.172,0.032,0.334,0.051,0.5C4.303,20.753,6.187,19,8.5,19z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M8.5,23c-1.102,0-2-0.897-2-2s0.898-2,2-2c1.104,0,2,0.897,2,2S9.604,23,8.5,23L8.5,23z" fill="#0C3554"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="21.5" x2="21.5" y1="16.542" y2="28.6124">
-<stop offset="0" style="stop-color:#DB9D00"/>
-<stop offset="1" style="stop-color:#FFEEA9"/>
-</linearGradient>
-<path d="M21.5,28c-3.032,0-5.5-2.467-5.5-5.5s2.468-5.5,5.5-5.5c3.033,0,5.5,2.467,5.5,5.5S24.533,28,21.5,28  L21.5,28z" fill="url(#SVGID_4_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="21.5" x2="21.5" y1="17.625" y2="27.5008">
-<stop offset="0" style="stop-color:#CCCCCC"/>
-<stop offset="0.2" style="stop-color:#EEEEEE"/>
-<stop offset="1" style="stop-color:#FCFCFC"/>
-</linearGradient>
-<circle cx="21.5" cy="22.5" fill="url(#SVGID_5_)" r="4.5"/>
-<path d="M21.5,19c2.314,0,4.198,1.753,4.45,4c0.019-0.166,0.05-0.328,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.172,0.032,0.334,0.051,0.5C17.303,20.753,19.187,19,21.5,19z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M21.5,23c-1.102,0-2-0.897-2-2s0.898-2,2-2c1.104,0,2,0.897,2,2S22.604,23,21.5,23L21.5,23z" fill="#0C3554"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="8.5" x2="8.5" y1="20.5039" y2="22.6352">
-<stop offset="0" style="stop-color:#0C3554"/>
-<stop offset="1" style="stop-color:#9BD1FF"/>
-</linearGradient>
-<circle cx="8.5" cy="21.5" fill="url(#SVGID_6_)" r="1"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="21.5" x2="21.5" y1="20.5039" y2="22.6352">
-<stop offset="0" style="stop-color:#0C3554"/>
-<stop offset="1" style="stop-color:#9BD1FF"/>
-</linearGradient>
-<circle cx="21.5" cy="21.5" fill="url(#SVGID_7_)" r="1"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="14.2085" x2="15.7085" y1="11.75" y2="11.75">
-<stop offset="0" style="stop-color:#81E200"/>
-<stop offset="0.6364" style="stop-color:#138F00"/>
-<stop offset="1" style="stop-color:#3DAF00"/>
-</linearGradient>
-<rect fill="url(#SVGID_8_)" height="6.5" width="1.5" x="14.25" y="8.5"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="8.5" x2="8.5" y1="1.3125" y2="8.6699">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="1" style="stop-color:#0BA133"/>
-</linearGradient>
-<path d="M10.001,2.505C7.22,0.964,4.191,0.627,2,1.399c0.399,2.208,2.217,4.555,4.999,6.096  C9.78,9.036,12.808,9.373,15,8.602C14.601,6.394,12.782,4.046,10.001,2.505z" fill="url(#SVGID_9_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="23.4902" x2="21.6777" y1="9.5977" y2="5.4102">
-<stop offset="0" style="stop-color:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
-</linearGradient>
-<path d="M19.999,2.505C22.78,0.964,25.809,0.627,28,1.399c-0.399,2.208-2.217,4.555-4.999,6.096  C20.22,9.036,17.191,9.373,15,8.602C15.399,6.394,17.217,4.046,19.999,2.505z" fill="url(#SVGID_10_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="7.2104" x2="8.4605" y1="9.5762" y2="5.1384">
-<stop offset="0" style="stop-color:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
-</linearGradient>
-<path d="M6.999,7.495C9.78,9.036,12.808,9.373,15,8.602c0,0-5.116-2.277-6.844-3.203  C5.844,4.161,2,1.399,2,1.399C2.399,3.606,4.217,5.954,6.999,7.495z" fill="url(#SVGID_11_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="21.5" x2="21.5" y1="1.125" y2="9.1258">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="1" style="stop-color:#0BA133"/>
-</linearGradient>
-<path d="M19.999,2.505c-2.782,1.541-4.6,3.889-4.999,6.097c0,0,4.789-1.8,6.906-3.015  C24.281,4.224,28,1.399,28,1.399C25.809,0.627,22.78,0.964,19.999,2.505z" fill="url(#SVGID_12_)"/>
-<path d="M10.001,2.505C7.22,0.964,4.191,0.627,2,1.399C4.767,1.004,7.391,1.54,9.759,2.942  c2.333,1.382,3.96,3.3,5.241,5.659C14.601,6.394,12.782,4.046,10.001,2.505z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M20.241,2.942C23.938,0.805,28,1.399,28,1.399c-2.191-0.772-5.22-0.435-8.001,1.106  c-2.782,1.541-4.6,3.889-4.999,6.097C15,8.602,16.365,5.184,20.241,2.942z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="7.2104" x2="8.4605" y1="9.5762" y2="5.1384">
-<stop offset="0" style="stop-color:#A7FF00"/>
-<stop offset="0.2303" style="stop-color:#D6FF61"/>
-<stop offset="1" style="stop-color:#138F00"/>
-</linearGradient>
-<path d="M7.241,7.058C3.496,5.045,2,1.399,2,1.399c0.399,2.208,2.217,4.555,4.999,6.096  C9.78,9.036,12.808,9.373,15,8.602C15,8.602,11.5,9.347,7.241,7.058z" fill="url(#SVGID_13_)" fill-opacity="0.6" stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="22.5986" x2="21.786" y1="9.311" y2="6.1229">
-<stop offset="0" style="stop-color:#A7FF00"/>
-<stop offset="0.2303" style="stop-color:#D6FF61"/>
-<stop offset="1" style="stop-color:#138F00"/>
-</linearGradient>
-<path d="M22.759,7.058C20.441,8.43,18.093,8.98,15,8.602c2.191,0.771,5.22,0.435,8.001-1.106  c2.782-1.541,4.6-3.889,4.999-6.096C27.114,3.668,25.719,5.305,22.759,7.058z" fill="url(#SVGID_14_)" fill-opacity="0.6" stroke-opacity="0.6"/>
-</g>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_suprised.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_suprised.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +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>
-<path d="M15,30C6.729,30,0,23.271,0,15C0,6.729,6.729,0,15,0c8.271,0,15,6.729,15,15C30,23.271,23.271,30,15,30L15,30  z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<radialGradient cx="15" cy="2.8335" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="24.8358">
-<stop offset="0" style="stop-color:#FEE891"/>
-<stop offset="0.7818" style="stop-color:#FFB701"/>
-<stop offset="1" style="stop-color:#FFC501"/>
-</radialGradient>
-<circle cx="15" cy="15" fill="url(#SVGID_1_)" r="14"/>
-<path d="M15,2c7.563,0,13.71,6.002,13.975,13.5C28.98,15.332,29,15.169,29,15c0-7.732-6.268-14-14-14  C7.269,1,1,7.268,1,15c0,0.169,0.02,0.332,0.025,0.5C1.291,8.002,7.438,2,15,2z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
-<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"/>
-</linearGradient>
-<path d="M8.5,18C5.468,18,3,15.533,3,12.5S5.468,7,8.5,7c3.033,0,5.5,2.467,5.5,5.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">
-<stop offset="0" style="stop-color:#CCCCCC"/>
-<stop offset="0.2" style="stop-color:#EEEEEE"/>
-<stop offset="1" style="stop-color:#FCFCFC"/>
-</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.328,0.05-0.5C13,10.015,10.986,8,8.5,8  C6.016,8,4,10.015,4,12.5c0,0.172,0.032,0.334,0.051,0.5C4.303,10.753,6.187,9,8.5,9z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M8.5,14.5c-1.102,0-2-0.897-2-2s0.898-2,2-2c1.104,0,2,0.897,2,2S9.604,14.5,8.5,14.5L8.5,14.5z" fill="#0C3554"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" 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"/>
-</linearGradient>
-<path d="M21.5,18c-3.032,0-5.5-2.467-5.5-5.5S18.468,7,21.5,7c3.033,0,5.5,2.467,5.5,5.5S24.533,18,21.5,18  L21.5,18z" fill="url(#SVGID_4_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="21.5" x2="21.5" y1="7.625" y2="17.5013">
-<stop offset="0" style="stop-color:#CCCCCC"/>
-<stop offset="0.2" style="stop-color:#EEEEEE"/>
-<stop offset="1" style="stop-color:#FCFCFC"/>
-</linearGradient>
-<circle cx="21.5" cy="12.5" fill="url(#SVGID_5_)" r="4.5"/>
-<path d="M21.5,9c2.314,0,4.198,1.753,4.45,4c0.019-0.166,0.05-0.328,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.172,0.032,0.334,0.051,0.5C17.303,10.753,19.187,9,21.5,9z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M21.5,14.5c-1.102,0-2-0.897-2-2s0.898-2,2-2c1.104,0,2,0.897,2,2S22.604,14.5,21.5,14.5L21.5,14.5z" fill="#0C3554"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="8.5" x2="8.5" y1="12.0039" y2="14.1352">
-<stop offset="0" style="stop-color:#0C3554"/>
-<stop offset="1" style="stop-color:#9BD1FF"/>
-</linearGradient>
-<circle cx="8.5" cy="13" fill="url(#SVGID_6_)" r="1"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="21.5" x2="21.5" y1="12.0039" y2="14.1352">
-<stop offset="0" style="stop-color:#0C3554"/>
-<stop offset="1" style="stop-color:#9BD1FF"/>
-</linearGradient>
-<circle cx="21.5" cy="13" 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"/>
-</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"/>
-</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"/>
-</g>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_surprised.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,51 +1,54 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g>
 <g>
-<path d="M15,30C6.729,30,0,23.271,0,15C0,6.729,6.729,0,15,0c8.271,0,15,6.729,15,15C30,23.271,23.271,30,15,30L15,30  z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<radialGradient cx="15" cy="2.8335" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="24.8358">
+<rect fill="none" height="30" width="30"/>
+</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"/>
 </radialGradient>
-<circle cx="15" cy="15" fill="url(#SVGID_1_)" r="14"/>
-<path d="M15,2c7.563,0,13.71,6.002,13.975,13.5C28.98,15.332,29,15.169,29,15c0-7.732-6.268-14-14-14  C7.269,1,1,7.268,1,15c0,0.169,0.02,0.332,0.025,0.5C1.291,8.002,7.438,2,15,2z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="8.5" x2="8.5" y1="6.5415" y2="18.6124">
+<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"/>
 </linearGradient>
-<path d="M8.5,18C5.468,18,3,15.533,3,12.5S5.468,7,8.5,7c3.033,0,5.5,2.467,5.5,5.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">
+<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">
 <stop offset="0" style="stop-color:#CCCCCC"/>
 <stop offset="0.2" style="stop-color:#EEEEEE"/>
 <stop offset="1" style="stop-color:#FCFCFC"/>
 </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.328,0.05-0.5C13,10.015,10.986,8,8.5,8  C6.016,8,4,10.015,4,12.5c0,0.172,0.032,0.334,0.051,0.5C4.303,10.753,6.187,9,8.5,9z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M8.5,14.5c-1.102,0-2-0.897-2-2s0.898-2,2-2c1.104,0,2,0.897,2,2S9.604,14.5,8.5,14.5L8.5,14.5z" fill="#0C3554"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="21.5" x2="21.5" y1="6.5415" y2="18.6124">
+<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"/>
+<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"/>
+</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"/>
 </linearGradient>
-<path d="M21.5,18c-3.032,0-5.5-2.467-5.5-5.5S18.468,7,21.5,7c3.033,0,5.5,2.467,5.5,5.5S24.533,18,21.5,18  L21.5,18z" fill="url(#SVGID_4_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="21.5" x2="21.5" y1="7.625" y2="17.5013">
+<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">
 <stop offset="0" style="stop-color:#CCCCCC"/>
 <stop offset="0.2" style="stop-color:#EEEEEE"/>
 <stop offset="1" style="stop-color:#FCFCFC"/>
 </linearGradient>
-<circle cx="21.5" cy="12.5" fill="url(#SVGID_5_)" r="4.5"/>
-<path d="M21.5,9c2.314,0,4.198,1.753,4.45,4c0.019-0.166,0.05-0.328,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.172,0.032,0.334,0.051,0.5C17.303,10.753,19.187,9,21.5,9z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M21.5,14.5c-1.102,0-2-0.897-2-2s0.898-2,2-2c1.104,0,2,0.897,2,2S22.604,14.5,21.5,14.5L21.5,14.5z" fill="#0C3554"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="8.5" x2="8.5" y1="12.0039" y2="14.1352">
+<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"/>
+<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"/>
 </linearGradient>
-<circle cx="8.5" cy="13" fill="url(#SVGID_6_)" r="1"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="21.5" x2="21.5" y1="12.0039" y2="14.1352">
-<stop offset="0" style="stop-color:#0C3554"/>
-<stop offset="1" style="stop-color:#9BD1FF"/>
-</linearGradient>
-<circle cx="21.5" cy="13" fill="url(#SVGID_7_)" r="1"/>
+<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"/>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_tongue.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,29 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g>
 <g>
-<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-opacity="0.6" stroke-opacity="0.6"/>
-<radialGradient cx="15" cy="2.8335" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="24.8358">
+<rect fill="none" height="30" width="30"/>
+</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"/>
 </radialGradient>
-<circle cx="15" cy="15" fill="url(#SVGID_1_)" r="14"/>
-<path d="M15,2c7.563,0,13.709,6.002,13.975,13.5C28.98,15.332,29,15.169,29,15c0-7.732-6.268-14-14-14  S1,7.268,1,15c0,0.169,0.02,0.332,0.025,0.5C1.291,8.002,7.438,2,15,2z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M27,19.626l-0.942-1.885c0.062-0.259-0.087-0.522-0.347-0.597  c-0.262-0.074-0.398,0.175-0.617,0.346C23,19.126,20.144,20.626,15,20.626s-8-1.5-10.094-3.136c-0.076-0.268-0.355-0.42-0.617-0.346  c-0.26,0.074-0.408,0.338-0.347,0.597L3,19.626c0.497,0,0.957-0.426,1.293-0.854C7,20.126,10,21.626,15,21.626s9-1.5,10.704-2.849  C25.994,19.1,26.407,19.429,27,19.626z" fill="#FFFFFF" fill-opacity="0.6" stroke-opacity="0.6"/>
-<path d="M27,19.334l-0.942-1.885c0.062-0.258-0.087-0.522-0.347-0.596c-0.262-0.075-0.398,0.174-0.617,0.345  C23,18.834,20.144,19.376,15,19.376s-8-0.542-10.094-2.178c-0.076-0.267-0.355-0.42-0.617-0.345  c-0.26,0.073-0.408,0.338-0.347,0.596L3,19.334c0.497,0,0.957-0.426,1.293-0.854C7,19.834,10,20.834,15,20.834s9-1,10.704-2.348  C25.994,18.808,26.407,19.137,27,19.334z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M9.84,19.896c-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,20.299,9.84,19.896,9.84,19.896z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<radialGradient cx="-109.6074" cy="-17.5278" gradientTransform="matrix(1.1747 0 0 1.1055 140.3261 39.9384)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="4.8868">
+<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="M27,18.308l-0.942-1.885c0.062-0.259-0.087-0.523-0.347-0.597  c-0.262-0.075-0.398,0.175-0.617,0.346C23,17.808,20.144,19.308,15,19.308s-8-1.5-10.094-3.136c-0.076-0.267-0.355-0.42-0.617-0.346  c-0.26,0.074-0.408,0.338-0.347,0.597L3,18.308c0.497,0,0.957-0.426,1.293-0.854C7,18.808,10,20.308,15,20.308s9-1.5,10.704-2.849  C25.994,17.781,26.407,18.11,27,18.308z" fill="#FFFFFF" fill-opacity="0.6" stroke-opacity="0.6"/>
+<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"/>
 </radialGradient>
-<path d="M9.145,19.896c-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,20.299,9.145,19.896,9.145,19.896z" fill="url(#SVGID_2_)"/>
-<path d="M13.201,20.076c-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,21.287,13.201,20.076z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="14.9995" x2="14.9995" y1="16.9053" y2="20.856">
+<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"/>
 </linearGradient>
-<path d="M27,19.334l-0.942-1.885c0.062-0.258-0.087-0.522-0.347-0.596c-0.262-0.075-0.398,0.174-0.617,0.345  C23,18.834,20.144,19.834,15,19.834s-8-1-10.094-2.636c-0.076-0.267-0.355-0.42-0.617-0.345c-0.26,0.073-0.408,0.338-0.347,0.596  L3,19.334c0.497,0,0.957-0.426,1.293-0.854C7,19.834,10,20.834,15,20.834s9-1,10.704-2.348C25.994,18.808,26.407,19.137,27,19.334z" fill="url(#SVGID_3_)"/>
+<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"/>
@@ -35,8 +38,8 @@
 <stop offset="1" style="stop-color:#6D93B3"/>
 </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.834c-0.209,0-0.404-0.133-0.475-0.341c-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.342c0.087,0.262-0.055,0.545-0.316,0.632  C12.105,14.825,12.053,14.834,12,14.834L12,14.834z" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M12,14.021c-0.209,0-0.404-0.132-0.475-0.341c-0.041-0.121-0.992-3.065-4.552-3.065  c-0.276,0-0.474-0.503-0.474-0.78c0-0.275,0.225-0.5,0.5-0.5c4.312,0,5.429,3.893,5.475,4.028c0.087,0.263-0.055,0.546-0.316,0.632  c-0.053,0.018-0.105-0.66-0.158-0.66V14.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.66-4.525-2.66c-0.275,0-0.5-0.223-0.5-0.5  c0-0.275,0.225-0.5,0.5-0.5c4.312,0,5.429,3.205,5.475,3.342c0.087,0.262-0.055,0.545-0.316,0.633  C12.105,14.326,12.053,14.334,12,14.334L12,14.334z" fill="#0C3554"/>
+<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"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_unhappy.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,15 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g>
 <g>
-<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.6" stroke-opacity="0.6"/>
-<radialGradient cx="15" cy="2.8335" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="24.8358">
+<rect fill="none" height="30" width="30"/>
+</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"/>
 </radialGradient>
-<circle cx="15" cy="15" fill="url(#SVGID_1_)" r="14"/>
-<path d="M15,2c7.563,0,13.709,6.002,13.975,13.5C28.98,15.332,29,15.169,29,15c0-7.732-6.269-14-14-14  C7.268,1,1,7.268,1,15c0,0.169,0.02,0.332,0.025,0.5C1.29,8.002,7.437,2,15,2z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
+<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"/>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_very_cool.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,51 +1,54 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g>
 <g>
-<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.6" stroke-opacity="0.6"/>
-<radialGradient cx="15" cy="2.8335" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="24.8358">
+<rect fill="none" height="30" width="30"/>
+</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"/>
 </radialGradient>
-<circle cx="15" cy="15" fill="url(#SVGID_1_)" r="14"/>
-<path d="M15,2c7.563,0,13.709,6.002,13.975,13.5C28.98,15.332,29,15.169,29,15c0-7.732-6.268-14-14-14  S1,7.268,1,15c0,0.169,0.02,0.332,0.025,0.5C1.291,8.002,7.438,2,15,2z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M29.008,9c0-0.552-0.447-1-1-1h-0.537H15H3.537H2C1.447,8,1,8.448,1,9c0,0,0,2.501,0,3c0,4,3,5,7,5  c3.255,0,5.633-3.359,6.641-6h0.719c1.008,2.641,3.386,6,6.641,6c4,0,7.008-1,7.008-5C29.008,11.501,29.008,9,29.008,9z" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M29.008,8c0-0.552-0.447-1-1-1h-0.537H15H3.537H2C1.447,7,1,7.448,1,8c0,0,0,2.501,0,3c0,4,3,5,7,5  c3.255,0,5.633-3.359,6.641-6h0.719c1.008,2.641,3.386,6,6.641,6c4,0,7.008-1,7.008-5C29.008,10.501,29.008,8,29.008,8z"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="8.082" x2="8.082" y1="8" y2="14.9378">
+<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="M28.004,9c0-0.552-0.415-1-0.929-1h-0.498H15H4.359H2.932C2.419,8,2.004,8.448,2.004,9c0,0,0,2.501,0,3  c0,4,2.785,5,6.498,5c3.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-5  C28.004,11.501,28.004,9,28.004,9z" fill-opacity="0.4" stroke-opacity="0.4"/>
+<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"/>
 </linearGradient>
-<path d="M8,15c-3.879,0-6-0.897-6-4c0-1.084,1.355-2.135,2.008-3h10.156  c-0.113,0.908-0.714,2.754-2.011,4.466C11.277,13.622,9.846,15,8,15L8,15z" fill="url(#SVGID_2_)"/>
-<linearGradient gradientTransform="matrix(-1 0 0 1 -656.8359 0)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-678.7578" x2="-678.7578" y1="8" y2="14.9378">
+<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"/>
 </linearGradient>
-<path d="M22,15c3.879,0,6.008-0.897,6.008-4c0-1.084-0.355-2.135-1.008-3H15.836  c0.113,0.908,0.714,2.754,2.011,4.466C18.723,13.622,20.154,15,22,15L22,15z" fill="url(#SVGID_3_)"/>
-<rect fill="#FFFFFF" fill-opacity="0.6" height="1" stroke-opacity="0.6" width="11" x="2" y="9"/>
-<rect fill="#FFFFFF" fill-opacity="0.6" height="1" stroke-opacity="0.6" width="11.008" x="17" y="9"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="14.9448" x2="14.9448" y1="16.9014" y2="28.1491">
+<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"/>
 </linearGradient>
-<path d="M14.945,17C8.945,17,4,18,4,18c0.506,5.605,5.209,10,10.945,10c5.734,0,10.438-4.395,10.944-10  C25.89,18,20.945,17,14.945,17z" fill="url(#SVGID_4_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="14.9448" x2="14.9448" y1="17.9189" y2="27.1216">
+<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"/>
 </linearGradient>
-<path d="M4,18c0.506,5.045,5.209,9,10.945,9c5.734,0,10.438-3.955,10.944-9H4z" fill="url(#SVGID_5_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="14.9448" x2="14.9448" y1="18.9375" y2="26.0951">
+<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">
 <stop offset="0" style="stop-color:#E6E6E6"/>
 <stop offset="1" style="stop-color:#FFFFFF"/>
 </linearGradient>
-<path d="M14.945,26c-4.703,0-8.771-2.996-9.76-7h19.52C23.715,23.004,19.646,26,14.945,26L14.945,26z" fill="url(#SVGID_6_)"/>
-<path d="M13.89,25.943c0.33,0.032,0.663,0.053,1,0.055V19h-1V25.943z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M14.89,25.998c0.019,0,0.036,0.002,0.056,0.002c0.318,0,0.633-0.016,0.944-0.043V19h-1V25.998  z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M7.89,23.364c0.313,0.279,0.647,0.54,1,0.781V19h-1V23.364z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M8.89,24.146c0.319,0.219,0.653,0.421,1,0.605V19h-1V24.146z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M19.89,24.813c0.348-0.18,0.679-0.381,1-0.594V19h-1V24.813z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M20.89,24.219c0.351-0.233,0.687-0.481,1-0.752V19h-1V24.219z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M5.512,20h18.865c0.129-0.326,0.243-0.658,0.328-1H5.186C5.27,19.342,5.385,19.674,5.512,20z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M6.634,22c0.263,0.351,0.548,0.687,0.862,1h14.897c0.314-0.313,0.599-0.649,0.862-1H6.634z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M14.945,25c-4.703,0-8.771-2.996-9.76-7h19.52C23.715,22.004,19.646,25,14.945,25L14.945,25z" fill="url(#SVGID_6_)"/>
+<path d="M13.89,24.944c0.33,0.032,0.663,0.052,1,0.054V18h-1V24.944z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M14.89,24.998c0.019,0,0.036,0.002,0.056,0.002c0.318,0,0.633-0.016,0.944-0.043V18h-1V24.998  z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M7.89,22.365c0.313,0.279,0.647,0.539,1,0.781V18h-1V22.365z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M8.89,23.146c0.319,0.219,0.653,0.421,1,0.605V18h-1V23.146z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M19.89,23.813c0.348-0.179,0.679-0.38,1-0.594V18h-1V23.813z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M20.89,23.219c0.351-0.232,0.687-0.48,1-0.752V18h-1V23.219z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M5.512,19h18.865c0.129-0.326,0.243-0.658,0.328-1H5.186C5.27,18.342,5.385,18.674,5.512,19z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M6.634,21c0.263,0.352,0.548,0.688,0.862,1h14.897c0.314-0.313,0.599-0.648,0.862-1H6.634z" fill-opacity="0.2" stroke-opacity="0.2"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_verycool.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_verycool.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="30" height="30" viewBox="0 0 30 30">
-<rect fill="none" height="30" width="30"/>
-<circle cx="15" cy="15" r="13.5"/>
-<radialGradient id="SVGID_1" gradientUnits="userSpaceOnUse" cx="14.77" cy="9.23" r="16.13">
-<stop stop-color="#FFF000" offset="0"/>
-<stop stop-color="#FFBF00" offset="1"/>
-</radialGradient>
-<circle cx="15" cy="15" fill="url(#SVGID_1)" r="12.536"/>
-<path d="M27.984,7.288c0,0-12.255,1.618-13.005,1.62c-0.765,0-12.964-1.62-12.964-1.62c-0.941,3.373,1.03,6.873,4.398,7.812 c3.232,0.903,6.556-0.88,7.657-3.995c0.299-0.128,0.607-0.194,0.911-0.194c0.324,0.001,0.648,0.071,0.96,0.224 c1.111,3.095,4.426,4.864,7.647,3.965C26.956,14.161,28.93,10.661,27.984,7.288z"/>
-<linearGradient id="SVGID_2" gradientUnits="userSpaceOnUse" x1="9.62" y1="8.68" x2="8.39" y2="14.58">
-<stop stop-color="#FFFFFF" offset="0"/>
-<stop stop-color="#000000" offset="1"/>
-</linearGradient>
-<path d="M9.609,8.279L6.07,14.973c0.116,0.04,0.218,0.101,0.336,0.133 c0.349,0.098,0.698,0.148,1.047,0.187c0.241,0.02,0.48,0.024,0.72,0.02c0.046,0,0.094,0,0.141-0.002l3.564-6.744L9.609,8.279z" fill="url(#SVGID_2)" fill-opacity="0.8"/>
-<linearGradient id="SVGID_3" gradientUnits="userSpaceOnUse" x1="7.26" y1="8.56" x2="6.09" y2="14.15">
-<stop stop-color="#FFFFFF" offset="0"/>
-<stop stop-color="#000000" offset="1"/>
-</linearGradient>
-<path d="M7.941,8.069l-3.265,6.224c0.157,0.103,0.305,0.215,0.472,0.304 c0.024,0.015,0.048,0.032,0.076,0.046c0.028,0.014,0.057,0.022,0.086,0.034l3.412-6.508L7.941,8.069z" fill="url(#SVGID_3)" fill-opacity="0.8"/>
-<linearGradient id="SVGID_4" gradientUnits="userSpaceOnUse" x1="22.38" y1="8.48" x2="20.5" y2="13.98">
-<stop stop-color="#FFFFFF" offset="0"/>
-<stop stop-color="#000000" offset="1"/>
-</linearGradient>
-<path d="M21.84,8.091l-3.273,6.271c0.102,0.063,0.202,0.139,0.306,0.198 c0.089,0.046,0.181,0.091,0.271,0.133c0.208,0.101,0.42,0.186,0.634,0.263c0.201,0.068,0.403,0.129,0.609,0.18 c0.057,0.016,0.117,0.024,0.177,0.038l3.869-7.415L21.84,8.091z" fill="url(#SVGID_4)" fill-opacity="0.8"/>
-<path d="M5.679,17.128c0.974,4.288,4.739,7.515,9.321,7.515c4.583,0,8.349-3.227,9.32-7.515H5.679z" fill="#FFFFFF"/>
-<path d="M5.679,17.128c0.974,4.288,4.739,7.515,9.321,7.515c4.583,0,8.349-3.227,9.32-7.515H5.679z M15,23.004 c-3.035,0-5.621-1.72-6.962-4.215h13.923C20.621,21.287,18.032,23.004,15,23.004z"/>
-</svg>
\ No newline at end of file
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_wink.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,15 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g>
 <g>
-<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-opacity="0.6" stroke-opacity="0.6"/>
-<radialGradient cx="15" cy="2.8335" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="24.8358">
+<rect fill="none" height="30" width="30"/>
+</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"/>
 </radialGradient>
-<circle cx="15" cy="15" fill="url(#SVGID_1_)" r="14"/>
-<path d="M15,2c7.563,0,13.709,6.002,13.975,13.5C28.98,15.332,29,15.169,29,15c0-7.732-6.268-14-14-14  S1,7.268,1,15c0,0.169,0.02,0.332,0.025,0.5C1.291,8.002,7.438,2,15,2z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
+<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"/>
@@ -25,8 +28,8 @@
 <stop offset="0" style="stop-color:#DB9D00"/>
 <stop offset="1" style="stop-color:#FFEEA9"/>
 </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.053,0.765-0.254,1.01-0.57c0.246-0.317,0.354-0.711,0.304-1.108  C14.576,11.035,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.186,0.495-0.438C9.786,12.248,10.629,12,11.309,12s1.404,0.248,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.273,0.16,0.523,0.434,0.559C8.958,14.998,8.979,15,9,15L9,15z" fill="#0C3554"/>
+<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="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">
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_wink_grin.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,37 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g>
 <g>
-<path d="M15,30C6.729,30,0,23.271,0,15S6.729,0,15,0c8.271,0,15,6.729,15,15S23.271,30,15,30L15,30z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<radialGradient cx="15" cy="2.8335" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="24.8358">
+<rect fill="none" height="30" width="30"/>
+</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"/>
 </radialGradient>
-<circle cx="15" cy="15" fill="url(#SVGID_1_)" r="14"/>
-<linearGradient gradientTransform="matrix(0.966 0.2584 -0.2584 0.966 -118.2363 192.4348)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="82.7344" x2="82.7344" y1="-202.0483" y2="-192.8457">
+<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"/>
 </linearGradient>
-<path d="M11.559,27.405c-4.1-1.097-7.131-5.184-8.119-8.915L3,16.834c0,0,7.074,0.857,10.939,1.892  c3.863,1.034,10.313,3.794,10.313,3.794l-1.206,1.216C20.326,26.475,15.66,28.502,11.559,27.405L11.559,27.405z" fill="url(#SVGID_2_)"/>
-<linearGradient gradientTransform="matrix(0.966 0.2584 -0.2584 0.966 -118.2363 192.4348)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="82.7344" x2="82.7344" y1="-201.0308" y2="-193.8726">
+<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"/>
 </linearGradient>
-<path d="M11.817,26.439c-4.101-1.098-7.39-4.218-8.378-7.949L3,16.834l21.253,5.686l-1.206,1.216  C20.326,26.475,15.918,27.536,11.817,26.439L11.817,26.439z" fill="url(#SVGID_3_)"/>
-<linearGradient gradientTransform="matrix(0.966 0.2584 -0.2584 0.966 -118.2363 192.4348)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="82.7344" x2="82.7344" y1="-200.0122" y2="-194.9006">
+<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">
 <stop offset="0" style="stop-color:#E6E6E6"/>
 <stop offset="1" style="stop-color:#FFFFFF"/>
 </linearGradient>
-<path d="M12.076,25.473c3.863,1.034,7.82-0.02,10.225-2.439L4.436,18.254  C5.31,21.551,8.212,24.439,12.076,25.473z" fill="url(#SVGID_4_)"/>
-<path d="M11.039,25.138c0.32,0.118,0.646,0.228,0.982,0.319l1.291-4.828l-0.996-0.268L11.039,25.138z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M12.021,25.457c0.019,0.004,0.036,0.012,0.055,0.016c0.317,0.086,0.635,0.154,0.953,0.211  l1.28-4.789l-0.997-0.266L12.021,25.457z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M17.311,25.645c0.393-0.08,0.775-0.187,1.15-0.307l0.832-3.109l-0.997-0.268L17.311,25.645z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M18.461,25.338c0.408-0.133,0.809-0.283,1.19-0.461l0.638-2.383l-0.996-0.266L18.461,25.338z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M21.389,23.824c0.322-0.246,0.63-0.508,0.912-0.791L4.436,18.254c0.104,0.387,0.238,0.768,0.395,1.141  L21.389,23.824z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M5.941,21.104c0.231,0.352,0.486,0.689,0.765,1.014l0.813-3.039L6.553,18.82L5.941,21.104z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M6.521,22.067c0.262,0.296,0.541,0.581,0.84,0.852l0.969-3.624l-0.996-0.266L6.521,22.067z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M15,2c7.563,0,13.71,6.002,13.975,13.5C28.98,15.333,29,15.169,29,15c0-7.732-6.268-14-14-14  C7.269,1,1,7.268,1,15c0,0.169,0.02,0.333,0.025,0.5C1.291,8.002,7.438,2,15,2z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M12.823,23.764c3.863,1.034,7.82-0.02,10.225-2.439L5.183,16.545  C6.057,19.842,8.959,22.73,12.823,23.764z" fill="url(#SVGID_4_)"/>
+<path d="M11.786,23.429c0.32,0.118,0.646,0.228,0.982,0.319l1.291-4.828l-0.996-0.268L11.786,23.429z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M12.769,23.748c0.019,0.004,0.036,0.012,0.055,0.016c0.317,0.086,0.635,0.154,0.953,0.211  l1.28-4.789L14.06,18.92L12.769,23.748z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M18.058,23.936c0.393-0.08,0.775-0.187,1.15-0.307l0.832-3.109l-0.997-0.268L18.058,23.936z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M19.208,23.629c0.408-0.133,0.809-0.283,1.19-0.461l0.638-2.383L20.04,20.52L19.208,23.629z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M22.136,22.115c0.322-0.246,0.63-0.508,0.912-0.791L5.183,16.545c0.104,0.387,0.238,0.768,0.395,1.141  L22.136,22.115z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<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"/>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_wondering.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,39 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g>
 <g>
-<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.6" stroke-opacity="0.6"/>
-<radialGradient cx="15" cy="2.8335" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="24.8358">
+<rect fill="none" height="30" width="30"/>
+</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"/>
 </radialGradient>
-<circle cx="15" cy="15" fill="url(#SVGID_1_)" r="14"/>
-<path d="M15,2c7.563,0,13.709,6.002,13.975,13.5C28.98,15.332,29,15.169,29,15c0-7.732-6.268-14-14-14  S1,7.268,1,15c0,0.169,0.02,0.332,0.025,0.5C1.291,8.002,7.438,2,15,2z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
+<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="M27,13c0,0.553-0.205,1-0.459,1H15.459C15.205,14,15,13.553,15,13l0,0c0-0.553,0.205-1,0.459-1h11.082  C26.795,12,27,12.447,27,13L27,13z" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M14,13c0,0.553-0.205,1-0.459,1H2.459C2.205,14,2,13.553,2,13l0,0c0-0.553,0.205-1,0.459-1h11.082  C13.795,12,14,12.447,14,13L14,13z" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="8.4746" x2="8.4746" y1="7.208" y2="17.834">
+<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"/>
 </linearGradient>
-<path d="M8.475,18c2.863,0,5.221-2.201,5.475-5H3C3.254,15.799,5.611,18,8.475,18z" fill="url(#SVGID_2_)"/>
-<path d="M8.475,17c2.314,0,4.197-1.753,4.449-4H4.025C4.277,15.247,6.16,17,8.475,17z" fill="#FFFFFF"/>
-<path d="M13.762,14c0.092-0.322,0.156-0.656,0.188-1H3c0.031,0.344,0.096,0.678,0.188,1H13.762z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M9.525,15c1.207,0,2.217-0.86,2.449-2H7.076C7.309,14.14,8.318,15,9.525,15z" fill="#0C3554"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="21.4746" x2="21.4746" y1="7.208" y2="17.834">
+<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="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="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"/>
 </linearGradient>
-<path d="M21.475,18c2.863,0,5.221-2.201,5.475-5H16C16.254,15.799,18.611,18,21.475,18z" fill="url(#SVGID_3_)"/>
-<path d="M21.475,17c2.314,0,4.197-1.753,4.449-4h-8.898C17.277,15.247,19.16,17,21.475,17z" fill="#FFFFFF"/>
-<path d="M26.762,14c0.092-0.322,0.156-0.656,0.188-1H16c0.031,0.344,0.096,0.678,0.188,1H26.762z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M22.525,15c1.207,0,2.217-0.86,2.449-2h-4.898C20.309,14.14,21.318,15,22.525,15z" fill="#0C3554"/>
-<path d="M27,12c0,0.553-0.205,1-0.459,1H15.459C15.205,13,15,12.553,15,12l0,0  c0-0.553,0.205-1,0.459-1h11.082C26.795,11,27,11.447,27,12L27,12z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M27,12.5c0,0.276-0.205,0.5-0.459,0.5H15.459C15.205,13,15,12.776,15,12.5l0,0c0-0.276,0.205-0.5,0.459-0.5  h11.082C26.795,12,27,12.224,27,12.5L27,12.5z" fill="#3B2314"/>
-<path d="M14,12c0,0.553-0.205,1-0.459,1H2.459C2.205,13,2,12.553,2,12l0,0c0-0.553,0.205-1,0.459-1  h11.082C13.795,11,14,11.447,14,12L14,12z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M14,12.5c0,0.276-0.205,0.5-0.459,0.5H2.459C2.205,13,2,12.776,2,12.5l0,0C2,12.224,2.205,12,2.459,12  h11.082C13.795,12,14,12.224,14,12.5L14,12.5z" fill="#3B2314"/>
+<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="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"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sound.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sound.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sound.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,20 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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="M21.094,27.188c-2.842,0-5.156-1.893-5.156-4.219s2.314-4.219,5.156-4.219  c0.48,0,0.953,0.053,1.406,0.158v-8.596h-8.438v9.844c0,2.326-2.314,4.219-5.156,4.219S3.75,22.482,3.75,20.156  s2.314-4.219,5.156-4.219c0.48,0,0.953,0.053,1.406,0.158V2.813H26.25v20.156C26.25,25.295,23.936,27.188,21.094,27.188  L21.094,27.188z" style="opacity:0.6;enable-background:new    ;"/>
-<path d="M11.25,3.75v13.68c-0.67-0.35-1.476-0.555-2.344-0.555c-2.33,0-4.219,1.469-4.219,3.281  s1.889,3.281,4.219,3.281s4.219-1.469,4.219-3.281V9.375h10.313v10.867c-0.67-0.35-1.476-0.555-2.344-0.555  c-2.33,0-4.219,1.469-4.219,3.281s1.889,3.281,4.219,3.281s4.219-1.469,4.219-3.281V3.75H11.25z" style="fill:url(#SVGID_1_);"/>
-<path d="M8.906,22.5c-2.125,0-3.863-1.225-4.159-2.813c-0.028,0.154-0.06,0.308-0.06,0.469c0,1.813,1.889,3.281,4.219,3.281  s4.219-1.469,4.219-3.281v-0.938C13.125,21.031,11.236,22.5,8.906,22.5z"/>
-<path d="M21.094,25.313c-2.125,0-3.863-1.225-4.158-2.813c-0.029,0.154-0.061,0.308-0.061,0.469c0,1.813,1.889,3.281,4.219,3.281  s4.219-1.469,4.219-3.281v-0.938C25.313,23.844,23.424,25.313,21.094,25.313z"/>
-<rect height="0.938" width="10.313" x="13.125" y="8.438"/>
-<path d="M8.906,17.813c0.868,0,1.673,0.205,2.344,0.555V17.43  c-0.67-0.35-1.476-0.555-2.344-0.555c-2.33,0-4.219,1.469-4.219,3.281c0,0.161,0.032,0.314,0.06,0.469  C5.043,19.037,6.782,17.813,8.906,17.813z" style="opacity:0.4;fill:#FFFFFF;enable-background:new    ;"/>
-<path d="M21.094,20.625c0.868,0,1.674,0.205,2.344,0.555v-0.938  c-0.67-0.35-1.476-0.555-2.344-0.555c-2.33,0-4.219,1.469-4.219,3.281c0,0.161,0.031,0.314,0.061,0.469  C17.23,21.85,18.969,20.625,21.094,20.625z" style="opacity:0.4;fill:#FFFFFF;enable-background:new    ;"/>
-<rect height="0.938" style="opacity:0.4;fill:#FFFFFF;enable-background:new    ;" width="14.063" x="11.25" y="3.75"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<path d="M21.09,27.19c-2.842,0-5.156-1.893-5.156-4.219s2.314-4.219,5.156-4.219c0.48,0,0.953,0.053,1.406,0.158v-8.596h-8.438v9.844c0,2.326-2.314,4.219-5.156,4.219s-5.154-1.89-5.154-4.21,2.314-4.219,5.156-4.219c0.48,0,0.953,0.053,1.406,0.158v-13.29h15.94v20.16c0,2.33-2.31,4.22-5.16,4.22z" fill-opacity="0.6" stroke-opacity="0.6" style="enable-background:new;"/>
+<path d="M11.25,3.75v13.68c-0.67-0.35-1.476-0.555-2.344-0.555-2.33,0-4.219,1.469-4.219,3.281s1.889,3.281,4.219,3.281,4.219-1.469,4.219-3.281v-10.78h10.31v10.87c-0.67-0.35-1.476-0.555-2.344-0.555-2.33,0-4.219,1.469-4.219,3.281s1.889,3.281,4.219,3.281,4.219-1.469,4.219-3.281v-19.21h-14.06z" fill="url(#SVGID_1_)"/>
+<path d="M8.906,22.5c-2.125,0-3.863-1.225-4.159-2.813-0.028,0.154-0.06,0.308-0.06,0.469,0,1.813,1.889,3.281,4.219,3.281s4.219-1.469,4.219-3.281v-0.938c0,1.81-1.88,3.28-4.214,3.28z"/>
+<path d="M21.09,25.31c-2.125,0-3.863-1.225-4.158-2.813-0.029,0.154-0.061,0.308-0.061,0.469,0,1.813,1.889,3.281,4.219,3.281s4.219-1.469,4.219-3.281v-0.938c0,1.81-1.89,3.28-4.22,3.28z"/>
+<rect height="0.938" width="10.31" x="13.12" y="8.438"/>
+<path d="M8.906,17.81c0.868,0,1.673,0.205,2.344,0.555v-0.93c-0.67-0.35-1.476-0.555-2.344-0.555-2.33,0-4.219,1.469-4.219,3.281,0,0.161,0.032,0.314,0.06,0.469,0.296-1.59,2.035-2.82,4.159-2.82z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4" style="enable-background:new;"/>
+<path d="M21.09,20.62c0.868,0,1.674,0.205,2.344,0.555v-0.938c-0.67-0.35-1.476-0.555-2.344-0.555-2.33,0-4.219,1.469-4.219,3.281,0,0.161,0.031,0.314,0.061,0.469,0.3-1.58,2.04-2.81,4.16-2.81z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4" style="enable-background:new;"/>
+<rect fill="#FFFFFF" fill-opacity="0.4" height="0.938" stroke-opacity="0.4" style="enable-background:new;" width="14.06" x="11.25" y="3.75"/>
 <defs>
-<linearGradient gradientTransform="matrix(0.9375 0 0 -0.9375 -280.6875 -343.5)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="315.4004" x2="315.4004" y1="-370.7158" y2="-394.2559">
-<stop offset="0" style="stop-color:#DE6929"/>
-<stop offset="1" style="stop-color:#D9340F"/>
+<linearGradient gradientTransform="matrix(0.9375 0 0 -0.9375 -280.6875 -343.5)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="315.4" x2="315.4" y1="-370.7" y2="-394.3">
+<stop offset="0" stop-color="#DE6929"/>
+<stop offset="1" stop-color="#D9340F"/>
 </linearGradient>
 </defs>
-</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_star_non_favourited.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,15 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 fill-opacity="0.5" stroke-opacity="0.5">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g fill-opacity="None" stroke-opacity="None">
 <rect fill="none" height="30" width="30"/>
-<polygon fill-opacity="0.6" points="15.006,22.895 5.718,29.71 9.3,18.732 0,11.963 11.473,11.963 15.009,1 18.531,11.963 30,11.963 20.709,18.732 24.281,29.711 "/>
-<path d="M17.823,12.963l-2.816-8.716l-2.827,8.716H3.001l7.444,5.387l-2.863,8.723l7.425-5.416l7.413,5.416 l-2.855-8.723l7.437-5.387H17.823z" fill="url(#SVGID_1)"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="12.906,13.963 15.005,7.493 17.096,13.963 25.621,13.963 27.001,12.963 17.823,12.963 15.007,4.247 12.18,12.963 3.001,12.963 4.383,13.963 "/>
+<polygon fill-opacity="0.6" points="15.006,22.895 5.718,29.71 9.3,18.732 0,11.963 11.473,11.963 15.009,1 18.531,11.963 30,11.963   20.709,18.732 24.281,29.711 " stroke-opacity="0.6"/>
+<path d="M17.823,12.963l-2.816-8.717l-2.827,8.717H3.001l7.444,5.387l-2.862,8.723l7.424-5.416l7.413,5.416  l-2.855-8.723l7.437-5.387H17.823z" fill="url(#SVGID_1_)"/>
+<polygon fill="#FFFFFF" fill-opacity="0.4" points="12.907,13.963 15.005,7.493 17.096,13.963 25.621,13.963 27.001,12.963   17.823,12.963 15.007,4.246 12.18,12.963 3.001,12.963 4.383,13.963 " stroke-opacity="0.4"/>
+<rect fill="none" height="30" width="30"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="15" x2="15" y1="4.25" y2="27.07">
-<stop offset="0" stop-color="#FECF5E"/>
-<stop offset="1" stop-color="#FF9E01"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15.0005" x2="15.0005" y1="4.2461" y2="27.0728">
+<stop offset="0" style="stop-color:#FECF5E"/>
+<stop offset="1" style="stop-color:#FF9E01"/>
 </linearGradient>
 </defs>
 </g>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_star_offline.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,23 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <g>
 <rect fill="none" height="30" width="30"/>
-<polygon fill-opacity="0.6" points="15.006,22.895 5.718,29.71 9.3,18.732 0,11.963 11.473,11.963 15.009,1 18.531,11.963 30,11.963 20.709,18.732 24.281,29.711 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="15" x2="15" y1="4.25" y2="27.07">
-<stop offset="0" stop-color="#FECF5E"/>
-<stop offset="1" stop-color="#FF9E01"/>
+<polygon fill-opacity="0.6" points="15.006,22.895 5.718,29.71 9.3,18.732 0,11.963 11.473,11.963 15.009,1 18.531,11.963 30,11.963   20.709,18.732 24.281,29.711 " stroke-opacity="0.6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15.0005" x2="15.0005" y1="4.2461" y2="27.0728">
+<stop offset="0" style="stop-color:#FECF5E"/>
+<stop offset="1" style="stop-color:#FF9E01"/>
 </linearGradient>
-<path d="M17.823,12.963l-2.816-8.716l-2.827,8.716H3.001l7.444,5.387l-2.863,8.723l7.425-5.416l7.413,5.416 l-2.855-8.723l7.437-5.387H17.823z" fill="url(#SVGID_1)"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="12.906,13.963 15.005,7.493 17.096,13.963 25.621,13.963 27.001,12.963 17.823,12.963 15.007,4.247 12.18,12.963 3.001,12.963 4.383,13.963 "/>
+<path d="M17.823,12.963l-2.816-8.717l-2.827,8.717H3.001l7.444,5.387l-2.862,8.723l7.424-5.416l7.413,5.416  l-2.855-8.723l7.437-5.387H17.823z" fill="url(#SVGID_1_)"/>
+<polygon fill="#FFFFFF" fill-opacity="0.4" points="12.907,13.963 15.005,7.493 17.096,13.963 25.621,13.963 27.001,12.963   17.823,12.963 15.007,4.246 12.18,12.963 3.001,12.963 4.383,13.963 " stroke-opacity="0.4"/>
+<rect fill="none" height="30" width="30"/>
 </g>
 <g>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -257 -316)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="261.2295" x2="282.7705" y1="-330.6934" y2="-330.6934">
-<stop offset="0" style="stop-color:#FF4D00"/>
-<stop offset="0.8424" style="stop-color:#CC1414"/>
-<stop offset="1" style="stop-color:#FF4D00"/>
+<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>
-<polygon fill="url(#SVGID_1_)" points="24.702,25.229 4.229,5.254 5.299,4.158 25.771,24.133 "/>
-<rect fill="none" height="30" width="30.001"/>
+</defs>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sync.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sync.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sync.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,22 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g>
 <rect fill="none" height="30" width="30"/>
-<polygon fill-opacity="0.6" points="5,29 5,20 0.131,20 8,8.197 15.869,20 11,20 11,23 23,23 23,29 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="2.94" x2="22.36" y1="14.94" y2="34.36">
-<stop offset="0" stop-color="#A0F800"/>
-<stop offset="1" stop-color="#319E00"/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_1)" points="10,24 10,19 14,19 8,10 2,19 6,19 6,28 22,28 22,24 "/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="14,19 8,10 2,19 3,19 8,11.5 13,19 "/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" width="12" x="10" y="24"/>
-<polygon fill-opacity="0.6" points="14.131,10 19,10 19,7 7,7 7,1 25,1 25,10 29.869,10 22,21.803 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="10.94" x2="30.36" y1="-1.06" y2="18.36">
-<stop offset="0" stop-color="#4EDEFF"/>
-<stop offset="1" stop-color="#048CC6"/>
+<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"/>
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_2)" points="24,11 24,2 8,2 8,6 20,6 20,11 16,11 22,20 28,11 "/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="20,11 16,11 16.666,12 20,12 "/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="24,11 24,12 27.334,12 28,11 "/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" width="16" x="8" y="2"/>
+<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"/>
+<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>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_tag_inactive.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,49 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 fill-opacity="0.5" stroke-opacity="0.5">
-<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_)"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g fill-opacity="None" stroke-opacity="None">
+<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" fill-opacity="0.6" stroke-opacity="0.6"/>
+<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" fill-opacity="0.4" stroke-opacity="0.4"/>
+<polygon fill="#FFFFFF" fill-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 " stroke-opacity="0.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" fill-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 " stroke-opacity="0.4"/>
+<polygon fill-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 " stroke-opacity="0.15"/>
+<rect fill="none" height="30" width="30"/>
 <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 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"/>
 </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 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_telephony_offline.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,35 +1,38 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <g>
-<path d="M0,23.199c0-0.816,0.104-2.131,0.592-3.754  c0.758-2.514,4.254-7.972,7.795-11.513c3.586-3.584,8.342-6.553,9.887-7.141c2.486-0.941,5.271-0.881,6.21-0.639  c0.13,0.039,0.725,0.242,1.528,0.691l0.289,0.166c0.487,0.297,0.924,0.602,1.327,0.938c0.153,0.128,0.268,0.212,0.367,0.286  c0.221,0.162,0.431,0.316,0.74,0.67c0.697,0.793,0.938,1.152,0.979,1.215C29.902,4.405,30,4.737,30,5.08  c0,0.625-0.315,1.213-0.846,1.574l-7.584,5.164c-0.428,0.291-0.956,0.4-1.448,0.301c-0.466-0.094-0.861-0.363-1.116-0.758  L17.64,9.226c-1.688,1.08-3.245,2.367-4.98,4.104c-1.111,1.111-2.242,2.663-3.031,3.879L9,17.998l0.811,0.217l0.871,0.518  c0.523,0.308,0.842,0.873,0.842,1.515c0,0.26-0.053,0.517-0.153,0.758l-0.022,0.058l-1.558,2.725l-3.054,5.26  c-0.25,0.438-0.67,0.764-1.147,0.893c-0.452,0.121-0.922,0.062-1.319-0.17c-0.082-0.053-0.385-0.258-1.068-0.807l-0.061-0.012  l-0.185-0.18c-0.354-0.291-0.463-0.404-0.729-0.699l-0.164-0.18c-1.315-1.439-1.844-3.023-1.867-3.09  C0.028,24.326,0,23.592,0,23.199L0,23.199z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="6.0952" x2="16.7272" y1="5.8071" y2="16.4392">
+<rect fill="none" height="30" width="30"/>
+<path d="M23.199,30c-0.816,0-2.131-0.104-3.754-0.592c-2.514-0.758-7.971-4.254-11.512-7.795  c-3.584-3.586-6.553-8.342-7.141-9.887c-0.941-2.486-0.881-5.271-0.639-6.21c0.039-0.13,0.242-0.725,0.691-1.528l0.166-0.289  c0.297-0.488,0.602-0.924,0.938-1.328C2.076,2.218,2.16,2.104,2.234,2.004c0.162-0.221,0.316-0.43,0.67-0.74  c0.793-0.697,1.152-0.939,1.215-0.98C4.406,0.098,4.738,0,5.08,0c0.625,0,1.213,0.316,1.574,0.846l5.164,7.584  c0.291,0.428,0.4,0.956,0.301,1.448c-0.094,0.466-0.363,0.862-0.758,1.116l-2.135,1.367c1.08,1.688,2.367,3.244,4.104,4.98  c1.111,1.111,2.662,2.242,3.879,3.031L17.998,21l0.217-0.811l0.518-0.871c0.307-0.523,0.873-0.842,1.514-0.842  c0.26,0,0.516,0.053,0.758,0.154l0.057,0.023l2.725,1.557l5.26,3.053c0.438,0.25,0.764,0.67,0.893,1.148  c0.121,0.453,0.061,0.922-0.17,1.32c-0.053,0.082-0.258,0.385-0.807,1.068l-0.012,0.061l-0.18,0.184  c-0.291,0.354-0.404,0.463-0.699,0.729l-0.18,0.164c-1.439,1.316-3.023,1.844-3.09,1.867C24.326,29.973,23.592,30,23.199,30  L23.199,30z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="12.7437" x2="12.7437" y1="2.375" y2="29.2518">
 <stop offset="0" style="stop-color:#A0F800"/>
 <stop offset="1" style="stop-color:#319E00"/>
 </linearGradient>
-<path d="M17.955,7.865c-2.35,1.365-4.244,3-6.003,4.758c-1.693,1.693-3.463,4.389-4.088,5.594L1.147,24.49  c-0.197-0.553-0.303-2.414,0.401-4.756c0.707-2.344,4.117-7.669,7.546-11.095c3.426-3.424,8.063-6.354,9.532-6.912  c2.315-0.876,4.866-0.798,5.608-0.607c0,0,0.676,0.223,1.553,0.748C26.163,2.094,17.955,7.865,17.955,7.865z" fill="url(#SVGID_1_)"/>
-<radialGradient cx="139.6035" cy="-88.5283" gradientTransform="matrix(-4.371139e-008 1 1 4.371139e-008 101.0201 -117.4801)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="12.7529">
+<path d="M7.865,12.045c1.365,2.35,3,4.244,4.758,6.004c1.693,1.693,4.389,3.463,5.594,4.088l6.273,6.717  c-0.553,0.197-2.414,0.303-4.756-0.402c-2.344-0.707-7.668-4.117-11.094-7.545c-3.424-3.426-6.354-8.064-6.912-9.533  C0.852,9.059,0.93,6.508,1.121,5.766c0,0,0.223-0.676,0.748-1.553C2.094,3.837,7.865,12.045,7.865,12.045z" fill="url(#SVGID_1_)"/>
+<radialGradient cx="22.123" cy="17.5088" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="12.7529">
 <stop offset="0" style="stop-color:#A0F800"/>
 <stop offset="1" style="stop-color:#319E00"/>
 </radialGradient>
-<path d="M5.872,28.543l3.049-5.254l1.527-2.672c0.164-0.391,0.059-0.828-0.277-1.025l-1.293-0.77H8.875  l-1.012-0.605c0.002-0.002,0.008-0.006,0.01-0.008c-3.107-0.396-6.043,1.551-6.701,4.549c-0.086,0.396-0.129,0.791-0.131,1.18  c0.027,0.238,0.064,0.433,0.105,0.554c0,0,0.467,1.428,1.653,2.725c0.396,0.435,0.41,0.476,0.824,0.81  c0.002,0.002,0.004,0.002,0.008,0.004c0.813,0.658,1.138,0.875,1.138,0.875C5.141,29.117,5.635,28.957,5.872,28.543z" fill="url(#SVGID_2_)"/>
-<path d="M8.877,18.822l1.293,0.77c0.336,0.197,0.441,0.635,0.277,1.025  L8.92,23.289l-3.049,5.254c-0.236,0.414-0.73,0.574-1.102,0.359c0,0-0.326-0.217-1.144-0.881L8.877,18.822z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<radialGradient cx="122.1025" cy="-72.9136" gradientTransform="matrix(-4.371139e-008 1 1 4.371139e-008 101.0201 -117.4801)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="12.9265">
+<path d="M28.543,24.129l-5.254-3.049l-2.672-1.527c-0.391-0.164-0.828-0.059-1.025,0.277l-0.77,1.293v0.002  l-0.605,1.012c-0.002-0.002-0.006-0.008-0.008-0.01c-0.396,3.107,1.551,6.043,4.549,6.701c0.396,0.086,0.791,0.129,1.18,0.131  c0.238-0.027,0.432-0.064,0.553-0.105c0,0,1.428-0.467,2.725-1.654c0.434-0.395,0.475-0.41,0.809-0.824  c0.002-0.002,0.002-0.004,0.004-0.008c0.658-0.813,0.875-1.137,0.875-1.137C29.117,24.859,28.957,24.365,28.543,24.129z" fill="url(#SVGID_2_)"/>
+<path d="M18.822,21.123l0.77-1.293c0.197-0.336,0.635-0.441,1.025-0.277l2.672,1.527l5.254,3.049  c0.414,0.236,0.574,0.73,0.359,1.102c0,0-0.217,0.326-0.881,1.143L18.822,21.123z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<radialGradient cx="4.623" cy="1.8936" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="12.9256">
 <stop offset="0" style="stop-color:#A0F800"/>
 <stop offset="1" style="stop-color:#319E00"/>
 </radialGradient>
-<path d="M21.008,10.99l7.582-5.162c0.4-0.271,0.529-0.791,0.289-1.162c0,0-0.209-0.322-0.893-1.1  c-0.001,0,0-0.002-0.002-0.002c-0.372-0.423-0.511-0.443-0.995-0.845c-0.673-0.559-1.343-0.951-1.856-1.207  C21.892,0.899,18.742,2.878,18.058,6c-0.142,0.637-0.162,1.271-0.088,1.887l1.122,1.754l0.756,1.18  C20.086,11.19,20.605,11.264,21.008,10.99z" fill="url(#SVGID_3_)"/>
-<path d="M27.984,3.563c0.686,0.78,0.895,1.102,0.895,1.102  c0.24,0.371,0.111,0.891-0.289,1.162l-7.582,5.162c-0.401,0.273-0.922,0.201-1.16-0.17l-0.756-1.18L27.984,3.563z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<rect fill="none" height="30" width="30" x="0" y="0"/>
+<path d="M10.99,8.992L5.828,1.41c-0.271-0.4-0.791-0.529-1.162-0.289c0,0-0.322,0.209-1.1,0.893  c0,0.001-0.002,0-0.002,0.002C3.141,2.388,3.121,2.527,2.719,3.011C2.16,3.684,1.768,4.354,1.512,4.867  C0.9,8.109,2.879,11.258,6,11.943c0.637,0.141,1.271,0.162,1.887,0.088l1.754-1.123l1.18-0.755  C11.191,9.914,11.264,9.395,10.99,8.992z" fill="url(#SVGID_3_)"/>
+<path d="M3.564,2.016C4.344,1.33,4.666,1.121,4.666,1.121C5.037,0.881,5.557,1.01,5.828,1.41  l5.162,7.582c0.273,0.402,0.201,0.922-0.17,1.161l-1.18,0.755L3.564,2.016z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<rect fill="none" height="30" width="30"/>
 </g>
 <g>
-<rect height="34.268" style="opacity:0.6;enable-background:new    ;" transform="matrix(0.7073 -0.707 0.707 0.7073 -6.2126 14.9968)" width="3.169" x="13.418" y="-2.134"/>
-<linearGradient gradientTransform="matrix(0.8824 0 0 -0.8824 -284.8232 -348.3516)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="339.7832" x2="339.7832" y1="-397.2993" y2="-425.2942">
-<stop offset="0" style="stop-color:#DE8029"/>
-<stop offset="0.2606" style="stop-color:#DE4E29"/>
-<stop offset="1" style="stop-color:#D82E09"/>
+<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>
-<polygon points="25.996,26.987 3.015,4.005 4.006,3.014 26.987,25.996 " style="fill:url(#SVGID_1__);"/>
-<rect height="30.002" style="fill:none;" width="30.002"/>
+</defs>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_text.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_text.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g>
+<rect fill="none" height="30" width="30"/>
+<polygon fill-opacity="0.6" points="3,29 3,1 27,1 27,22.414 20.414,29 " stroke-opacity="0.6"/>
+<polygon fill="url(#SVGID_1_)" points="4,2 4,28 20,28 26,22 26,2 "/>
+<polygon fill="#FFFFFF" points="26,22 20,22 20,28 "/>
+<rect fill-opacity="0.5" height="1.5" stroke-opacity="0.5" width="16" x="7" y="6.5"/>
+<rect fill-opacity="0.5" height="1.5" stroke-opacity="0.5" width="16" x="7" y="10.5"/>
+<rect fill-opacity="0.5" height="1.5" stroke-opacity="0.5" width="11" x="7" y="14.5"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="2" y2="28.0005">
+<stop offset="0" style="stop-color:#F9F9F9"/>
+<stop offset="1" style="stop-color:#B5B5B5"/>
+</linearGradient>
+</defs>
+</g>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_tick.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_tick.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_tick.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,15 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <g>
-<rect height="30.002" style="fill:none;" width="30.002"/>
-</g>
-<polygon points="11.561,21.769 4.789,15.001 8.398,11.392 12.141,15.135   20.215,7.059 23.824,10.668 12.096,22.396 " style="opacity:0.6;enable-background:new    ;"/>
-<polygon points="22.576,10.668 20.215,8.307 12.141,16.383 8.398,12.64 6.037,15.001 12.136,21.098   12.141,21.092 12.146,21.098 " style="fill:url(#SVGID_1_);"/>
-<polygon points="8.398,13.522 12.141,17.266 20.215,9.189   22.135,11.109 22.576,10.668 20.215,8.307 12.141,16.383 8.398,12.64 6.037,15.001 6.478,15.442 " style="opacity:0.4;fill:#FFFFFF;enable-background:new    ;"/>
+<rect fill="none" height="30.002" width="30.002"/>
+<polygon fill-opacity="0.6" points="0.587,15.429 5.713,10.303 11.597,16.187 24.289,3.491 29.416,8.617   11.605,26.427 " stroke-opacity="0.6"/>
+<polygon fill="url(#SVGID_1_)" points="28.002,8.617 24.289,4.905 11.597,17.601 5.713,11.718 2.001,15.429 11.589,25.013   11.597,25.003 11.605,25.013 "/>
+<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 -284.8232 -348.3516)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="338.9951" x2="338.9951" y1="-403.4404" y2="-420.1114">
+<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"/>
 </linearGradient>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_tip.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_tip.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g>
+<rect fill="none" height="30" width="30"/>
+<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"/>
+</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"/>
+</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.4" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#686E70"/>
+</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"/>
+<rect fill-opacity="0.25" height="0.927" stroke-opacity="0.25" width="12.002" x="8.998" y="24.491"/>
+<path d="M6.23,9.388C8.414,10.377,11.529,11,15,11c3.475,0,6.592-0.624,8.775-1.615  c-0.779-3.471-3.676-6.199-8.771-6.199C9.908,3.186,7.008,5.914,6.23,9.388z" fill="#FFFFFF" fill-opacity="0.6" stroke-opacity="0.6"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="21" x2="9.1644" y1="24.75" y2="24.75">
+<stop offset="0" style="stop-color:#969696"/>
+<stop offset="0.6242" style="stop-color:#F2F2F2"/>
+<stop offset="1" style="stop-color:#B3B3B3"/>
+</linearGradient>
+</defs>
+</g>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_todo.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_todo.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_todo.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,7 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <g>
+<rect fill="none" height="30" width="30"/>
 <polygon fill-opacity="0.6" points="21,3 21,1 9,1 9,3 4,3 4,29 19.414,29 26,22.414 26,3 " stroke-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="2.1206" y2="28.8787">
 <stop offset="0" style="stop-color:#FFFFFF"/>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_todo_done.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,7 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <g>
+<rect fill="none" height="30" width="30"/>
 <polygon fill-opacity="0.6" points="21,3 21,1 9,1 9,3 4,3 4,29 19.414,29 26,22.414 26,3 " stroke-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="2.1206" y2="28.8787">
 <stop offset="0" style="stop-color:#FFFFFF"/>
@@ -21,14 +22,15 @@
 <polygon fill="#FFFFFF" points="19,28 25,22 19,22 "/>
 <rect fill="none" height="30" width="30"/>
 </g>
-<g transform="matrix(0.5 0 0 0.5 15 15)">
+<g>
+<polygon fill-opacity="0.6" points="12.32,21.07,15.86,17.54,19.39,21.07,26.46,14,30,17.54,19.39,28.14" stroke-opacity="0.6"/>
+<polygon fill="url(#SVGID_1__)" points="26.46,15.41,19.39,22.48,15.86,18.95,13.74,21.07,19.39,26.73,28.59,17.54"/>
 <rect fill="none" height="30" width="30"/>
-<polygon fill-opacity="0.6" points="0,15.346 5.688,9.658 11.586,15.558 24.311,2.83 30,8.518 11.516,27 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="15" x2="15" y1="3.75" y2="26.94">
+<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"/>
 </linearGradient>
-<polygon fill="url(#SVGID_1)" points="28.032,8.518 24.311,4.797 11.586,17.523 5.688,11.625 1.966,15.346 11.579,24.955 11.586,24.943 11.595,24.955 "/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="5.688,13.016 11.586,18.914 24.311,6.188 27.337,9.213 28.032,8.518 24.311,4.797 11.586,17.523 5.688,11.625 1.966,15.346 2.662,16.041 "/>
+</defs>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_unknown.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_unknown.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_unknown.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,21 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="32" viewBox="0 0 32 32" width="32" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g transform="matrix(1 0 0 1 9 3)">
-<path d="M5.5,26C3.57,26,2,24.43,2,22.5S3.57,19,5.5,19S9,20.57,9,22.5S7.43,26,5.5,26L5.5,26z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5.4995" x2="5.4995" y1="0.917" y2="24.9193">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<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>
-<circle cx="5.5" cy="22.5" fill="url(#SVGID_1_)" r="2.5"/>
-<path d="M2.511,18.719v-2.654c0-1.242,0.284-2.343,0.843-3.273c0.512-0.857,1.27-1.766,2.316-2.773  c1.214-1.193,1.579-1.766,1.688-2C7.538,7.626,7.63,7.247,7.63,6.895c0-0.758-0.18-1.287-0.551-1.619  C6.683,4.923,6.013,4.743,5.092,4.743c-1.044,0-2.324,0.224-3.806,0.667L0,5.793V0.98l0.733-0.203C2.598,0.262,4.299,0,5.791,0  c2.549,0,4.557,0.553,5.969,1.643C13.246,2.792,14,4.485,14,6.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.434H2.511z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="6.9995" x2="6.9995" y1="0.9165" y2="24.9195">
+<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"/>
 </linearGradient>
-<path d="M11.148,2.434C9.911,1.479,8.126,1,5.791,1C4.384,1,2.788,1.247,1,1.741v2.71  c1.581-0.472,2.945-0.708,4.092-0.708c1.18,0,2.063,0.262,2.654,0.788C8.334,5.057,8.63,5.843,8.63,6.895  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.284C12.824,8.268,13,7.461,13,6.674C13,4.804,12.384,3.39,11.148,2.434z" fill="url(#SVGID_2_)"/>
-<path d="M5.5,21c1.209,0,2.218,0.859,2.449,2C7.982,22.838,8,22.672,8,22.5C8,21.119,6.881,20,5.5,20  S3,21.119,3,22.5c0,0.172,0.018,0.338,0.05,0.5C3.282,21.859,4.291,21,5.5,21z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M8.63,7.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  C8.507,8.912,8.63,8.397,8.63,7.895z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M11.148,3.434c1.106,0.856,1.712,2.083,1.827,3.671C12.987,6.961,13,6.816,13,6.674  c0-1.87-0.616-3.284-1.852-4.24C9.911,1.479,8.126,1,5.791,1C4.384,1,2.788,1.247,1,1.741v1C2.788,2.247,4.384,2,5.791,2  C8.126,2,9.911,2.479,11.148,3.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.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"/>
+<rect fill="none" height="30" width="30"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_unselected.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_unselected.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_unselected.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,17 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <rect fill="url(#SVGID_1_)" height="28" width="28" x="1" y="1"/>
-<path d="M1,1v28h2V5c0-0.55,0.45-1,1-1h22c0.55,0,1,0.45,1,1v24h2V1H1z" fill-opacity="0.05" stroke-opacity="0.05"/>
-<path d="M1,1v28h1V4c0-0.55,0.45-1,1-1h24c0.55,0,1,0.45,1,1v25h1V1H1z" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M1,1v28h2v-24c0-0.55,0.45-1,1-1h22c0.55,0,1,0.45,1,1v24h2v-28h-28z" fill-opacity="0.05" stroke-opacity="0.05"/>
+<path d="M1,1v28h1v-25c0-0.55,0.45-1,1-1h24c0.55,0,1,0.45,1,1v25h1v-28h-28z" fill-opacity="0.1" stroke-opacity="0.1"/>
 <rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="28" x="1" y="1"/>
-<path d="M0,0v30h30V0H0z M29,29H1V1h28V29z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<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="14.9995" x2="14.9995" y1="1.2188" y2="29.4379">
-<stop offset="0" style="stop-color:#E0E1E2"/>
-<stop offset="1" style="stop-color:#FFFFFF"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="1.219" y2="29.44">
+<stop offset="0" stop-color="#E0E1E2"/>
+<stop offset="1" stop-color="#FFFFFF"/>
 </linearGradient>
 </defs>
-</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_unselected_highlight.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,20 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <rect fill-opacity="0.6" height="30" stroke-opacity="0.6" width="30"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="1.2188" y2="29.4379">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="1" style="stop-color:#16A0D4"/>
+<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"/>
 </linearGradient>
 <rect fill="url(#SVGID_1_)" height="28" width="28" x="1" y="1"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="3.1875" y2="27.3754">
-<stop offset="0" style="stop-color:#E0E1E2"/>
-<stop offset="1" style="stop-color:#FFFFFF"/>
+<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>
 <rect fill="url(#SVGID_2_)" height="24" 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" stroke-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" stroke-opacity="0.1"/>
+<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"/>
-</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_untrusted.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_untrusted.svg	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g>
+<path d="M4,29c-1.654,0-3-1.346-3-3V16c0-1.654,1.346-3,3-3h7v-3c0-4.962,4.038-9,9-9c5.299,0,9,3.29,9,8  c0,0.552-0.447,1-1,1h-4c-0.553,0-1-0.448-1-1c0-0.495,0-2-3-2c-1.654,0-3,1.346-3,3v3h4c1.654,0,3,1.346,3,3v10  c0,1.654-1.346,3-3,3H4z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="12" x2="28" y1="9" y2="9">
+<stop offset="0" style="stop-color:#8C8C8C"/>
+<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="M20,2c-4.4,0-8,3.6-8,8v6h4v-6c0-2.206,1.794-4,4-4s4,0.794,4,3h4C28,4.6,24.4,2,20,2z" fill="url(#SVGID_1_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="13" x2="27" 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="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"/>
+</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,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"/>
+<rect fill="none" height="30" width="30"/>
+</g>
+</svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_url_address.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,46 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <g>
 <rect fill="none" height="30" width="30"/>
-<polygon fill-opacity="0.6" points="3,29 3,1 27,1 27,22.414 20.414,29 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="15" x2="15" y1="2" y2="28">
-<stop offset="0" stop-color="#F9F9F9"/>
-<stop offset="1" stop-color="#B5B5B5"/>
+<polygon fill-opacity="0.6" points="3,29 3,1 27,1 27,22.414 20.414,29 " stroke-opacity="0.6"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 8.9805)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-87.52" x2="-87.52" y1="6.9805" y2="-19.0195">
+<stop offset="0" style="stop-color:#F9F9F9"/>
+<stop offset="1" style="stop-color:#B5B5B5"/>
 </linearGradient>
-<polygon fill="url(#SVGID_1)" points="4,2 4,28 20,28 26,22 26,2 "/>
-<circle cx="15" cy="14" fill-opacity="0.2" r="8"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="19.92" x2="23.02" y1="21.92" y2="25.02">
-<stop offset="0" stop-color="#F9F9F9"/>
-<stop offset="1" stop-color="#DCDCDC"/>
-</linearGradient>
-<polygon fill="url(#SVGID_2)" points="26,22 20,22 20,28 "/>
-<radialGradient cx="15" cy="10.23" gradientUnits="userSpaceOnUse" id="SVGID_3" r="10.54">
-<stop offset="0" stop-color="#94FFFF"/>
-<stop offset="0.5" stop-color="#36B5FF"/>
-<stop offset="1" stop-color="#1B66D8"/>
+<polygon fill="url(#SVGID_1_)" points="4,2 4,28 20,28 26,22 26,2 "/>
+<polygon fill="#FFFFFF" points="26,22 20,22 20,28 "/>
+<circle cx="15" cy="14" fill-opacity="0.2" r="8" stroke-opacity="0.2"/>
+<radialGradient cx="-32.2568" cy="-444.0615" gradientTransform="matrix(0.3502 0 0 -0.3502 26.2965 -145.2794)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="30.0961">
+<stop offset="0" style="stop-color:#94FFFF"/>
+<stop offset="0.5" style="stop-color:#36B5FF"/>
+<stop offset="1" style="stop-color:#1B66D8"/>
 </radialGradient>
-<circle cx="15" cy="13" fill="url(#SVGID_3)" 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"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="15" x2="15" y1="5.04" y2="21.08">
-<stop offset="0" stop-color="#31A7F8"/>
-<stop offset="0.5" stop-color="#1E74DC"/>
-<stop offset="1" stop-color="#C8E4EB"/>
+<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.156-6.855l-0.361,0.059l-2.089-0.399  L12.5,6.919l-0.098,0.654H10.89l0.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.004  l-0.339,0.882l1.239,3.169h1.264l1.252-1.012v-0.414l0.331-0.512l0.272-0.142c-0.068,0.104-0.178,0.351-0.178,0.351  c-0.013,0.082,0.178,1.694,0.733,1.567c0.422-0.097,1.929-2.896,1.957-3.16c0.058-0.526-0.229-0.745-0.405-0.827l-0.195-0.093  l-0.899,0.904c-0.097,0.006-0.183,0.022-0.263,0.047v-0.749l0.979-0.954l0.496-1.604l0.758-0.615l-0.166-0.303l0.572-0.551  l-0.318-0.582l0.242,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.316  h0.714l0.349,0.781h-0.517V8.978H15.096z M17.453,10.554l0.57,0.832l0.039,0.1l-0.584-0.354l-0.142-0.504L17.453,10.554z   M18.313,12.008l0.172,0.173l-0.223,0.049l-0.051-0.061L18.313,12.008z M13.848,6.408l0.363,0.562l-0.413,0.126l-0.161-0.092  L13.848,6.408z" fill-opacity="0.3" stroke-opacity="0.3"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 8.9805)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-87.52" x2="-87.52" y1="3.9404" y2="-12.1023">
+<stop offset="0" style="stop-color:#31A7F8"/>
+<stop offset="0.497" style="stop-color:#1E74DC"/>
+<stop offset="1" style="stop-color:#C8E4EB"/>
 </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_4)" fill-opacity="0.3"/>
-<radialGradient cx="15.46" cy="7.16" gradientUnits="userSpaceOnUse" id="SVGID_5" r="9.49">
-<stop offset="0" stop-color="#94FF26"/>
-<stop offset="0.32" stop-color="#94FF26"/>
-<stop offset="0.73" stop-color="#1FC211"/>
-<stop offset="1" stop-color="#0BA133"/>
+<path d="M15,5c-4.418,0-8,3.583-8,8c0,4.42,3.582,8,8,8  c4.42,0,8-3.58,8-8C23,8.583,19.42,5,15,5z M15,20.385c-4.072,0-7.385-3.313-7.385-7.385c0-4.072,3.313-7.384,7.385-7.384  c4.072,0,7.385,3.313,7.385,7.385C22.385,17.073,19.072,20.385,15,20.385z" fill="url(#SVGID_3_)" fill-opacity="0.3" stroke-opacity="0.3"/>
+<radialGradient cx="-87.0591" cy="1.8228" gradientTransform="matrix(1 0 0 -1 102.52 8.9805)" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="9.4861">
+<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"/>
 </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_5)"/>
-<radialGradient cx="15.46" cy="7.15" gradientUnits="userSpaceOnUse" id="SVGID_6" r="10.97">
-<stop offset="0" stop-color="#94FF26"/>
-<stop offset="0.32" stop-color="#94FF26"/>
-<stop offset="0.73" stop-color="#1FC211"/>
-<stop offset="1" stop-color="#0BA133"/>
+<path d="M19.335,15.286l-0.833,0.833c0,0-0.503,0-0.525,0.199c-0.012,0.086-0.039,0.457-0.125,0.65  c-0.168,0.114-0.367,0.5-0.367,0.5s-0.104,0.742,0.453,0.614C18.488,17.959,20.189,15.688,19.335,15.286z" fill="url(#SVGID_4_)"/>
+<radialGradient cx="-87.0596" cy="1.8252" gradientTransform="matrix(1 0 0 -1 102.52 8.9805)" gradientUnits="userSpaceOnUse" id="SVGID_5_" r="10.9749">
+<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"/>
 </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_6)"/>
+<path d="M17.455,5.997c-0.137,0.051-0.229,0.087-0.229,0.087l-2.059-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.421l-0.328,1.417l0.646,1.252  l0.389,0.248l1.365-0.279l0.498,0.429l0.453,0.045l0.492,1.929l-0.328,0.852l0.725,1.604l0.205,0.664h1.263l0.713-0.385l0.539-0.625  v-0.758l1.023-0.521v-1.121l0.404-0.771l0.902-0.813l0.217-0.942l-1.182,0.264l-0.312-0.378l0.222-0.354l-0.839-0.506l-0.356-1.286  l0.619-0.404l0.569,0.833l0.216,0.549l0.428,0.429l0.5,0.261l0.557-0.089l0.617-0.594l-0.436-0.792l-0.547,0.143l-0.494-0.59  l0.471-0.328l1.475,0.179v0.524l1.284,2.646l0.291-0.233C22.234,9.53,20.219,6.969,17.455,5.997z M16.785,9.572l-0.674,0.179h-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.572z M18.32,8.393  l-1.213-0.214V7.75l0.606-0.143l0.179-0.215l0.428,0.357V8.393z" fill="url(#SVGID_5_)"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_video.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_video.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_video.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,42 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <g>
-<rect fill-opacity="0.6" height="26" stroke-opacity="0.6" width="29" x="1" y="2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15.5005" x2="15.5005" y1="27" y2="3.4999">
+<rect fill="none" height="30" width="30"/>
+<rect fill-opacity="0.6" height="26" width="28" x="1" y="2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15.0005" x2="15.0005" y1="27" y2="3.4999">
 <stop offset="0" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#666666"/>
 </linearGradient>
-<rect fill="url(#SVGID_1_)" height="24" width="27" x="2" y="3"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="15.5005" x2="15.5005" y1="21.125" y2="9.0729">
+<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"/>
 </linearGradient>
-<rect fill="url(#SVGID_2_)" height="12" width="23" x="4" y="9"/>
-<rect fill="#F1F1F2" height="2" width="3" x="4" y="5"/>
-<rect fill="#F1F1F2" height="2" width="3" x="9" y="5"/>
-<rect fill="#F1F1F2" height="2" width="3" x="14" y="5"/>
+<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="4" y="23"/>
-<rect fill="#F1F1F2" height="2" width="3" x="9" y="23"/>
-<rect fill="#F1F1F2" height="2" width="3" x="14" y="23"/>
+<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="#FFFFFF" fill-opacity="0.3" height="1" stroke-opacity="0.3" width="27" x="2" y="3"/>
-<rect fill="#FFFFFF" fill-opacity="0.1" height="1" stroke-opacity="0.1" width="27" x="2" y="26"/>
-<rect fill="#FFFFFF" fill-opacity="0.3" height="1" stroke-opacity="0.3" width="23" x="4" y="20"/>
-<rect fill="#00006B" fill-opacity="0.2" height="1" stroke-opacity="0.2" width="23" x="4" y="9"/>
-<rect fill="none" height="30" width="30"/>
-<rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="3" x="4" y="5"/>
-<rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="3" x="9" y="5"/>
-<rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="3" x="14" y="5"/>
-<rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="3" x="19" y="5"/>
-<rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="3" x="24" y="5"/>
-<rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="3" x="4" y="23"/>
-<rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="3" x="9" y="23"/>
-<rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="3" x="14" y="23"/>
-<rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="3" x="19" y="23"/>
-<rect fill-opacity="0.1" height="1" stroke-opacity="0.1" 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"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_vpn.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_vpn.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_vpn.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,60 +1,55 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <g>
 <rect fill="none" height="30" width="30"/>
-<path d="M15.001,27.188c-6.721,0-12.188-5.467-12.188-12.187 c0-6.721,5.467-12.188,12.188-12.188c6.72,0,12.187,5.467,12.187,12.188C27.188,21.721,21.721,27.188,15.001,27.188L15.001,27.188z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<radialGradient cx="14.83" cy="11" gradientUnits="userSpaceOnUse" id="SVGID_1" r="13.9">
-<stop offset="0" stop-color="#94FFFF"/>
-<stop offset="0.5" stop-color="#36B5FF"/>
-<stop offset="1" stop-color="#1B66D8"/>
+<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"/>
 </radialGradient>
-<circle cx="15" cy="15.001" fill="url(#SVGID_1)" r="11.25"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="3.75" x2="6.33" y1="16.28" y2="16.28">
-<stop offset="0" stop-color="#58595B"/>
-<stop offset="1" stop-color="#000000"/>
-</linearGradient>
-<path d="M4.318,18.518l2.013-1.711v-1.326L5.2,14.35 l-0.207-0.219l-0.312-0.044c0,0-0.266-0.037-0.385-0.037l-0.499,0.003c-0.026,0.313-0.048,0.628-0.048,0.948 C3.75,16.23,3.955,17.409,4.318,18.518z" fill="url(#SVGID_2)" fill-opacity="0.3" stroke-opacity="0.3"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="6.77" x2="26.1" y1="13.53" y2="13.53">
-<stop offset="0" stop-color="#58595B"/>
-<stop offset="1" stop-color="#000000"/>
+<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"/>
 </linearGradient>
-<path d="M18.123,4.199C18.063,4.235,18,4.271,17.939,4.304 c-0.102-0.013-0.229-0.028-0.364-0.045l0.017-0.198c-0.037-0.008-1.751-0.311-2.591-0.311c-2.647,0-5.077,0.92-6.999,2.452 l1.206,0.401C9.37,6.658,9.542,6.686,9.72,6.686c0.506,0,0.946-0.223,1.266-0.387c0.045-0.021,0.088-0.045,0.127-0.064 c0.061,0.007,0.122,0.011,0.184,0.011c-0.076,0.155-0.134,0.299-0.161,0.456c-0.244,0.001-0.732,0.034-1.607,1.186L9.092,8.461 l0.213,0.273c-1.978,1.538-1.993,1.63-2.043,1.939l-0.047,0.15c-0.399,1.244-0.579,2.083-0.32,2.683 c0.467,1.073,1.047,2.222,2.026,2.302c0.069,0.006,0.146,0.009,0.229,0.009c0.463,0,1.111-0.099,1.604-0.188 c0.015,0.028,0.298,0.541,0.298,0.541l0.672-0.02c0.197,0.637,0.432,1.508,0.457,1.883c-0.819,1.457,0.241,3.164,0.702,3.909 l0.06,0.099c0.142,0.398,0.484,1.17,1.386,1.17c0,0,0.89,0.102,1.055,0.102c0.491,0,0.918-0.174,1.272-0.513 c0.328-0.094,0.531-0.288,0.646-0.508c0.094-0.087,0.209-0.196,0.314-0.331c0.01-0.006,0.384-0.116,0.384-0.116l0.259-0.319 c0.024-0.03,0.035-0.062,0.057-0.092c0.031,0.051,0.051,0.104,0.094,0.152c0.226,0.26,0.545,0.403,0.897,0.403 c0.1,0,0.204-0.013,0.306-0.034c0.869-0.197,1.984-1.789,2.087-2.721c0.067-0.609-0.212-1.138-0.725-1.381l-0.597-0.28l-0.578,0.579 c-0.043-0.514-0.01-0.69,0.147-0.801c0,0,0.465-0.411,0.642-0.553c0.484-0.389,1.086-0.873,1.453-1.77 c0.094-0.24,0.269-0.692,0.13-1.146l0.908-0.872c0.97,2.266,1.224,2.648,1.909,2.66l0.596-0.015l0.281-0.338 c0.139-0.166,0.285-0.453,0.209-0.882c-0.011-0.189,0-0.747,0.018-1.239C25.395,8.882,22.252,5.391,18.123,4.199z" fill="url(#SVGID_3)" fill-opacity="0.3" stroke-opacity="0.3"/>
-<radialGradient cx="14.88" cy="11.02" gradientUnits="userSpaceOnUse" id="SVGID_4" r="10.52">
-<stop offset="0" stop-color="#7AF200"/>
-<stop offset="0.32" stop-color="#7AF200"/>
-<stop offset="1" stop-color="#1CAD0F"/>
+<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"/>
 </radialGradient>
-<path d="M4.262,14.994L4.262,14.994c0,0.005,0.001,0.007,0.001,0.01c0,0.334,0.021,0.666,0.05,0.994 c0.01,0.106,0.025,0.215,0.038,0.322c0.028,0.224,0.062,0.447,0.102,0.666c0.022,0.117,0.044,0.234,0.068,0.35 c0.051,0.227,0.143,0.143,0.143,0.143l0.73-0.982v-0.627l-0.856-0.856C4.539,15.013,4.263,14.97,4.262,14.994z" fill="url(#SVGID_4)"/>
-<radialGradient cx="14.88" cy="9.73" gradientUnits="userSpaceOnUse" id="SVGID_5" r="11.72">
-<stop offset="0" stop-color="#7AF200"/>
-<stop offset="0.32" stop-color="#7AF200"/>
-<stop offset="1" stop-color="#1CAD0F"/>
+<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"/>
 </radialGradient>
-<path d="M11.138,5.282c0.316,0.103,0.575-0.108,0.869-0.295c0.104-0.021,1.261-0.482,1.386-0.482 c0.125,0,0.545-0.017,0.649-0.183c0,0,1.809,0.314,2.081,0.21c0.147-0.059,0.771-0.108,1.306-0.143 c-0.029-0.007-0.058-0.016-0.087-0.022c-0.028-0.005-0.058-0.01-0.087-0.016c-0.336-0.067-0.676-0.122-1.021-0.157 c-0.002,0-0.004,0-0.008-0.001c-0.363-0.037-0.731-0.056-1.105-0.056c-0.346,0-0.688,0.02-1.027,0.053 c-0.059,0.006-0.119,0.013-0.178,0.02c-0.328,0.036-0.652,0.083-0.97,0.147c-0.005,0.002-0.012,0.003-0.017,0.003 c-0.332,0.068-0.654,0.153-0.971,0.25c-0.055,0.016-0.107,0.034-0.161,0.051c-0.282,0.09-0.561,0.191-0.833,0.304 c-0.031,0.014-0.064,0.025-0.096,0.039c-0.3,0.128-0.593,0.27-0.878,0.423C9.944,5.448,9.903,5.473,9.861,5.498 C9.738,5.565,9.624,5.641,9.504,5.713C10.093,5.91,10.827,5.176,11.138,5.282z" fill="url(#SVGID_5)"/>
-<path d="M21.547,10.445l0.615,0.263c0,0,0.113,0.102,0.426,0.425c0.254-0.021,0.723,0.283,0.953,0.577 c0.047,0.059,1.232,3.022,1.466,3.026c0.103,0,0.509-0.616,0.568-1.376c0.036-0.458-0.244-1.399-0.255-1.431 c-0.966-3.241-3.412-5.841-6.557-7.018c-0.234,0.138-0.637,0.365-0.637,0.365s-2.769-0.378-2.957-0.189 c-0.189,0.189-0.927,0.382-1.096,0.405c-0.167,0.021-0.515,0.111-0.098,0.625c-0.063,0.064-1.253,0.893-1.253,0.516 c0-0.378,0.266-1.052-0.107-0.691c-0.269,0.26-0.429,0.611-0.463,0.678c-0.088,0.169-0.141,0.25-0.079,0.731 c0.065,0.481-0.767,0.478-0.824,0.354c-0.149-0.336-0.974,0.751-0.974,0.751L10.623,8.9c0,0-2.43,1.873-2.451,1.998 c-0.021,0.126-0.626,1.751-0.417,2.235c0.211,0.484,0.742,1.701,1.243,1.742c0.657,0.054,2.255-0.301,2.255-0.301 c0.043,0.106,0.343,0.642,0.343,0.642s0.783-0.025,0.827,0.059c0.015,0.028,0.943,2.758,0.637,3.122 c-0.73,1.096,0.418,2.7,0.738,3.242c0.32,0.934,0.527,0.516,0.948,0.669c0.519,0.046,0.955,0.236,1.396-0.329 c0.127-0.105,0.344-0.022,0.344-0.17c0-0.082,0.375-0.322,0.473-0.548c0.102-0.048,0.363-0.224,0.541-0.309 c0.16-0.011-0.153-0.441,0.166-0.897c0.344-0.137,1.273-0.763,1.273-0.763c0.042-0.918-0.451-2.054,0.471-2.706 c0.596-0.605,1.375-0.95,1.753-1.873c0.104-0.272,0.337-0.831-0.333-0.664c-0.631,0.16-1.336,0.195-1.002-0.083 c-0.039-0.341-0.459-0.501-0.836-0.836c-0.194-0.459-0.501-1.281-0.501-1.281l-0.669-1.016l1.12-0.257l0.454,0.762l0.879,0.923 c0.293,0.96,0.461,1.27,0.461,1.27c0.439-0.155,0.784-0.318,0.784-0.318l1.022-0.981c0,0-0.105-0.313-0.521-0.709l-0.746,0.076 l-0.883-1.057l0.329-0.066L21.547,10.445z M15.33,5.672c0.083-0.249,0.564-0.332,0.564-0.332s0.305,0.276,0.336,0.408 c0.032,0.132-0.381,0.356-0.41,0.668c-0.027,0.312-0.883-0.032-0.93-0.141C14.843,6.165,15.245,5.918,15.33,5.672z M17.39,9.875 c-0.356,0-2.39,0.731-2.39,0.731l-1.495-1.148l-1.629,0.426l-0.762-0.391l-0.484-0.444l0.956-0.328c0,0,0.771-0.634,1-0.822 c0.196-0.16,0.976-0.069,0.976-0.069l0.625-0.209l1.418,0.056l-0.529,0.566l0.745,0.508l0.345-0.309 c0.111,0.264,1.225,0.821,1.225,0.821S17.85,9.205,18.073,9.4C18.043,10.266,17.537,9.917,17.39,9.875z M18.203,8.477L16.436,7.5 l0.186-0.507l0.996,0.234l1.133-0.02L18.203,8.477z M19.473,8.594c0,0-0.16-0.546,0.425-0.844c0.723-0.091,0.923,0.395,0.923,0.395 l0.938,0.938l-0.254,0.605L19.473,8.594z" fill="url(#SVGID_5)"/>
-<path d="M20.577,18.703l-0.696,0.695c0,0-0.42,0-0.439,0.168c-0.01,0.071-0.033,0.382-0.104,0.542 c-0.139,0.098-0.307,0.417-0.307,0.417s-0.086,0.62,0.377,0.516C19.869,20.936,21.291,19.039,20.577,18.703z" fill="url(#SVGID_5)"/>
+<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>
 <g>
-<g>
-<rect height="15" style="fill:none;" width="15" x="15" y="15"/>
-<path d="M23.824,23.824v-3.53c0-0.729-0.594-1.323-1.324-1.323   c-0.729,0-1.323,0.594-1.323,1.323v3.53h-2.647v-3.53c0-2.189,1.781-3.971,3.971-3.971c2.19,0,3.971,1.781,3.971,3.971v3.53H23.824   z" style="opacity:0.6;enable-background:new    ;"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 90.98 116.5195)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-68.48" x2="-68.48" y1="99.5352" y2="93.1702">
-<stop offset="0" style="stop-color:#C8C8C8"/>
-<stop offset="1" style="stop-color:#646464"/>
+<rect fill="none" height="15" width="15" x="15" y="15"/>
+<path d="M23.82,23.82v-3.53c0-0.729-0.594-1.323-1.324-1.323-0.729,0-1.323,0.594-1.323,1.323v3.53h-2.647v-3.53c0-2.189,1.781-3.971,3.971-3.971s3.971,1.781,3.971,3.971v3.53h-2.646z" fill-opacity="0.6" stroke-opacity="0.6" style="enable-background:new;"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 90.98 116.5195)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-68.48" x2="-68.48" y1="99.54" y2="93.17">
+<stop offset="0" stop-color="#C8C8C8"/>
+<stop offset="1" stop-color="#646464"/>
 </linearGradient>
-<path d="M20.735,23.383v-3.088c0-0.974,0.792-1.766,1.765-1.766c0.974,0,1.765,0.792,1.765,1.766   v3.088h1.766v-3.088c0-1.941-1.589-3.53-3.53-3.53s-3.53,1.589-3.53,3.53v3.088H20.735z" style="fill:url(#SVGID_1_);"/>
-<rect height="7.06" style="opacity:0.6;enable-background:new    ;" width="11.472" x="16.765" y="21.618"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 90.98 116.5195)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-73.7739" x2="-63.1851" y1="91.3721" y2="91.3721">
-<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"/>
+<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"/>
 </linearGradient>
-<rect height="6.178" style="fill:url(#SVGID_2_);" width="10.589" x="17.206" y="22.059"/>
-<rect height="0.882" style="opacity:0.5;enable-background:new    ;" width="10.589" x="17.206" y="26.03"/>
-<rect height="0.883" style="opacity:0.5;enable-background:new    ;" width="10.589" x="17.206" y="24.265"/>
-</g>
-<rect height="30.002" style="fill:none;" width="30.002"/>
+<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"/>
+<rect fill-opacity="0.5" height="0.883" stroke-opacity="0.5" style="enable-background:new;" width="10.59" x="17.21" y="24.26"/>
+<rect fill="none" height="30" width="30"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wifi.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wifi.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wifi.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,21 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <g>
-<path d="M15.001,27.354c-6.813,0-12.354-5.542-12.354-12.354  c0-6.813,5.541-12.354,12.354-12.354c6.812,0,12.354,5.541,12.354,12.354C27.354,21.813,21.813,27.354,15.001,27.354L15.001,27.354z  " style="opacity:0.6;enable-background:new    ;"/>
-<circle cx="15.001" cy="15.001" r="11.471" style="fill:url(#SVGID_1_);"/>
-<g style="opacity:0.2;">
+<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"/>
+<g fill-opacity="0.2" stroke-opacity="0.2">
 <g>
-<path d="M23.816,12.91c-0.25-0.66-1.155-2.372-2.479-3.669c0.428-1.803-0.673-2.099-1.102-2.168    c-0.764-0.048-2.287-0.631-3.692-0.179c-2.034,0.653-4.121,2.692-5.816,5.115c-1.733,2.458-2.42,6.604-2.786,6.727    c0.503,1.588,2.556,3.72,2.556,3.72s-0.606,1.934,1.201,2.237c1.752,0.181,3.473-1.429,3.473-1.429s8.524-1.653,6.86-9.798    C22.065,13.479,23.546,12.997,23.816,12.91z M14.81,19.633c-0.043,0.364-2.094,2.987-2.949,2.352    c-0.807-0.6-1.604-1.535-2.061-2.785c0.021-0.021,1.353-0.391,1.382-0.373c-1.315-5.875,3.628-6.804,3.628-6.804    c0.013,0.002-2.073,2.306-1.286,5.979c-0.004-0.044,1.184-0.322,1.755-0.505C15.469,18.003,14.905,18.814,14.81,19.633z     M16.391,20.156c-0.014-0.004,2.699-2.897,1.916-6.566c0.002,0.04-1.187,0.32-1.756,0.503c-0.494-1.313,0.058-4.504,1.222-5.24    c0.692-0.208,2.204,0.433,3.315,1.848c0.375,0.476-0.626,1.228-0.654,1.212C21.748,17.783,16.391,20.156,16.391,20.156z"/>
+<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"/>
 </g>
 </g>
-<path d="M15.001,4.412c6.187,0,11.216,4.901,11.449,11.03  c0.005-0.148,0.022-0.293,0.022-0.441c0-6.336-5.137-11.471-11.472-11.471C8.665,3.53,3.53,8.665,3.53,15.001  c0,0.148,0.017,0.293,0.022,0.441C3.786,9.313,8.814,4.412,15.001,4.412z" style="opacity:0.4;fill:#FFFFFF;enable-background:new    ;"/>
+<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"/>
 <g>
-<path d="M22.746,12.039c-0.25-0.661-1.154-2.372-2.479-3.67c0.428-1.802-0.672-2.099-1.102-2.167   c-1.87-0.119-2.554,0.502-3.148,0.934c-1.111,0.809-3.615,0.67-6.36,4.002c-1.733,2.457-1.116,6.242-1.116,6.242   s-1.305,0.362-1.67,0.485c0.503,1.588,2.556,3.721,2.556,3.721s-0.606,1.933,1.201,2.235c1.752,0.181,3.473-1.428,3.473-1.428   s8.524-1.653,6.86-9.798C20.995,12.607,22.476,12.124,22.746,12.039z M12.986,21.864c-0.927,0.276-3.315-0.964-4.257-3.538   c0.021-0.022,1.353-0.391,1.382-0.373c-1.315-5.874,4.255-7.393,4.255-7.393c0.013,0.002-2.7,2.895-1.912,6.568   c-0.004-0.044,1.184-0.324,1.755-0.506C14.703,17.936,14.151,21.129,12.986,21.864z M15.321,19.284   c-0.014-0.004,2.699-2.897,1.915-6.567c0.003,0.041-1.187,0.32-1.756,0.504c-0.492-1.314,0.058-4.506,1.221-5.24   c0.927-0.278,3.316,0.962,4.256,3.538c-0.02,0.021-1.353,0.389-1.381,0.374C20.892,17.764,15.321,19.284,15.321,19.284z" style="fill:#FFFFFF;"/>
+<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"/>
 </g>
-<rect height="30.002" style="fill:none;" width="30.002"/>
+<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.7822" x2="339.7822" y1="-399.0518" y2="-428.7852">
+<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>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wlan.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wlan.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wlan.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,23 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <g>
-<path d="M15.001,27.354c-6.813,0-12.354-5.542-12.354-12.354  c0-6.813,5.541-12.354,12.354-12.354c6.812,0,12.354,5.541,12.354,12.354C27.354,21.813,21.813,27.354,15.001,27.354L15.001,27.354z  " style="opacity:0.6;enable-background:new    ;"/>
-<circle cx="15.001" cy="15.001" r="11.471" style="fill:url(#SVGID_1_);"/>
-<path d="M15.001,4.412c6.187,0,11.216,4.901,11.449,11.03  c0.006-0.148,0.022-0.293,0.022-0.441c0-6.336-5.137-11.471-11.472-11.471C8.665,3.53,3.53,8.665,3.53,15.001  c0,0.148,0.018,0.293,0.022,0.441C3.786,9.313,8.815,4.412,15.001,4.412z" style="opacity:0.4;fill:#FFFFFF;enable-background:new    ;"/>
-<path d="M21.196,18.977l1.337,1.15c1.35-1.55,2.174-3.57,2.174-5.788  c0-2.216-0.824-4.236-2.174-5.788l-1.337,1.152c1.085,1.24,1.746,2.859,1.746,4.636C22.942,16.118,22.281,17.736,21.196,18.977z" style="opacity:0.2;enable-background:new    ;"/>
-<path d="M10.57,18.977c-1.084-1.24-1.746-2.858-1.746-4.638  c0-1.777,0.662-3.396,1.746-4.636L9.232,8.551c-1.349,1.551-2.173,3.571-2.173,5.788c0,2.218,0.824,4.238,2.173,5.788L10.57,18.977z  " style="opacity:0.2;enable-background:new    ;"/>
-<path d="M18.515,16.672l1.346,1.156c0.817-0.934,1.317-2.151,1.317-3.489  c0-1.337-0.5-2.555-1.316-3.486l-1.346,1.157c0.553,0.622,0.896,1.432,0.896,2.33C19.412,15.237,19.068,16.049,18.515,16.672z" style="opacity:0.2;enable-background:new    ;"/>
-<path d="M13.252,16.672c-0.552-0.623-0.898-1.435-0.898-2.333  c0-0.898,0.347-1.708,0.898-2.33l-1.344-1.157c-0.82,0.932-1.319,2.15-1.319,3.487c0,1.338,0.5,2.556,1.318,3.488L13.252,16.672z" style="opacity:0.2;enable-background:new    ;"/>
-<polygon points="13.138,24.629 15.902,15.023 18.664,24.629 " style="opacity:0.2;enable-background:new    ;"/>
-<path d="M20.313,18.095l1.338,1.149c1.349-1.549,2.173-3.569,2.173-5.788c0-2.216-0.824-4.236-2.173-5.788  L20.313,8.82c1.085,1.241,1.747,2.859,1.747,4.636C22.061,15.235,21.398,16.854,20.313,18.095z" style="fill:#FFFFFF;"/>
-<path d="M9.688,18.095c-1.084-1.241-1.747-2.859-1.747-4.638c0-1.777,0.662-3.396,1.747-4.636L8.35,7.669  C7.001,9.22,6.177,11.24,6.177,13.457c0,2.218,0.824,4.239,2.173,5.788L9.688,18.095z" style="fill:#FFFFFF;"/>
-<path d="M17.633,15.789l1.345,1.156c0.818-0.934,1.317-2.151,1.317-3.489s-0.499-2.555-1.316-3.486  l-1.346,1.157c0.553,0.621,0.897,1.431,0.897,2.33S18.186,15.167,17.633,15.789z" style="fill:#FFFFFF;"/>
-<path d="M12.37,15.789c-0.552-0.623-0.898-1.434-0.898-2.333s0.347-1.708,0.898-2.331l-1.344-1.157  c-0.819,0.932-1.319,2.15-1.319,3.487c0,1.338,0.5,2.555,1.318,3.489L12.37,15.789z" style="fill:#FFFFFF;"/>
-<polygon points="12.256,23.747 15.02,14.141 17.782,23.747 " style="fill:#FFFFFF;"/>
-<rect height="30.002" style="fill:none;" width="30.002"/>
+<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="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="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 "/>
+<rect fill="none" height="30" width="30" x="0.491"/>
 <defs>
-<linearGradient gradientTransform="matrix(0.8824 0 0 -0.8824 -284.8232 -348.3516)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="339.7822" x2="339.7822" y1="-399.0518" y2="-428.7852">
+<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>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wlan_offline.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,30 +1,37 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
+<g>
 <rect fill="none" height="30" width="30"/>
-<path d="M15.001,27.354c-6.813,0-12.354-5.542-12.354-12.354 c0-6.813,5.541-12.354,12.354-12.354c6.812,0,12.354,5.541,12.354,12.354C27.354,21.813,21.813,27.354,15.001,27.354L15.001,27.354z " fill-opacity="0.6" stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="15" x2="15" y1="3.77" y2="30.01">
-<stop offset="0" stop-color="#4EDEFF"/>
-<stop offset="1" stop-color="#048CC6"/>
+<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>
-<circle cx="15.001" cy="15.001" fill="url(#SVGID_1)" r="11.471"/>
-<path d="M15.001,4.412c6.187,0,11.216,4.901,11.449,11.03 c0.006-0.148,0.022-0.293,0.022-0.441c0-6.336-5.137-11.471-11.472-11.471C8.665,3.53,3.53,8.665,3.53,15.001 c0,0.148,0.018,0.293,0.022,0.441C3.786,9.313,8.815,4.412,15.001,4.412z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M21.196,18.977l1.337,1.15c1.35-1.55,2.174-3.57,2.174-5.788 c0-2.216-0.824-4.236-2.174-5.788l-1.337,1.152c1.085,1.24,1.746,2.859,1.746,4.636C22.942,16.118,22.281,17.736,21.196,18.977z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M10.57,18.977c-1.084-1.24-1.746-2.858-1.746-4.638 c0-1.777,0.662-3.396,1.746-4.636L9.232,8.551c-1.349,1.551-2.173,3.571-2.173,5.788c0,2.218,0.824,4.238,2.173,5.788L10.57,18.977z " fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M18.515,16.672l1.346,1.156c0.817-0.934,1.317-2.151,1.317-3.489 c0-1.337-0.5-2.555-1.316-3.486l-1.346,1.157c0.553,0.622,0.896,1.432,0.896,2.33C19.412,15.237,19.068,16.049,18.515,16.672z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M13.252,16.672c-0.552-0.623-0.898-1.435-0.898-2.333 c0-0.898,0.347-1.708,0.898-2.33l-1.344-1.157c-0.82,0.932-1.319,2.15-1.319,3.487c0,1.338,0.5,2.556,1.318,3.488L13.252,16.672z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<polygon fill-opacity="0.2" points="13.138,24.629 15.902,15.023 18.664,24.629 " stroke-opacity="0.2"/>
-<path d="M20.313,18.095l1.338,1.149c1.349-1.549,2.173-3.569,2.173-5.788c0-2.216-0.824-4.236-2.173-5.788 L20.313,8.82c1.085,1.241,1.747,2.859,1.747,4.636C22.061,15.235,21.398,16.854,20.313,18.095z" fill="#FFFFFF"/>
-<path d="M9.688,18.095c-1.084-1.241-1.747-2.859-1.747-4.638c0-1.777,0.662-3.396,1.747-4.636L8.35,7.669 C7.001,9.22,6.177,11.24,6.177,13.457c0,2.218,0.824,4.239,2.173,5.788L9.688,18.095z" fill="#FFFFFF"/>
-<path d="M17.633,15.789l1.345,1.156c0.818-0.934,1.317-2.151,1.317-3.489s-0.499-2.555-1.316-3.486 l-1.346,1.157c0.553,0.621,0.897,1.431,0.897,2.33S18.186,15.167,17.633,15.789z" fill="#FFFFFF"/>
-<path d="M12.37,15.789c-0.552-0.623-0.898-1.434-0.898-2.333s0.347-1.708,0.898-2.331l-1.344-1.157 c-0.819,0.932-1.319,2.15-1.319,3.487c0,1.338,0.5,2.555,1.318,3.489L12.37,15.789z" fill="#FFFFFF"/>
-<polygon fill="#FFFFFF" points="12.256,23.747 15.02,14.141 17.782,23.747 "/>
-<rect fill-opacity="0.6" height="34.268" stroke-opacity="0.6" transform="matrix(0.7073 -0.707 0.707 0.7073 -6.2126 14.9968)" width="3.169" x="13.418" y="-2.134"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="2.23" y2="26.93">
+<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="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="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 "/>
+<rect fill="none" height="30" width="30" x="0.491"/>
+</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.26" stop-color="#DE4E29"/>
+<stop offset="0.2606" stop-color="#DE4E29"/>
 <stop offset="1" stop-color="#D82E09"/>
 </linearGradient>
-<polygon fill="url(#SVGID_1_)" points="25.996,26.987 3.015,4.005 4.006,3.014 26.987,25.996 "/>
-<rect fill="none" height="30.002" width="30.002"/>
+</defs>
+</g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 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	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wlan_secure.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,48 +1,45 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30">
 <g>
-<path d="M15.001,27.354c-6.813,0-12.354-5.542-12.354-12.354  c0-6.813,5.541-12.354,12.354-12.354c6.812,0,12.354,5.541,12.354,12.354C27.354,21.813,21.813,27.354,15.001,27.354L15.001,27.354z  " style="opacity:0.6;enable-background:new    ;"/>
-<circle cx="15.001" cy="15.001" r="11.471" style="fill:url(#SVGID_1_);"/>
-<path d="M15.001,4.412c6.187,0,11.216,4.901,11.449,11.03  c0.006-0.148,0.022-0.293,0.022-0.441c0-6.336-5.137-11.471-11.472-11.471C8.665,3.53,3.53,8.665,3.53,15.001  c0,0.148,0.018,0.293,0.022,0.441C3.786,9.313,8.815,4.412,15.001,4.412z" style="opacity:0.4;fill:#FFFFFF;enable-background:new    ;"/>
-<path d="M21.196,18.977l1.337,1.15c1.35-1.55,2.174-3.57,2.174-5.788  c0-2.216-0.824-4.236-2.174-5.788l-1.337,1.152c1.085,1.24,1.746,2.859,1.746,4.636C22.942,16.118,22.281,17.736,21.196,18.977z" style="opacity:0.2;enable-background:new    ;"/>
-<path d="M10.57,18.977c-1.084-1.24-1.746-2.858-1.746-4.638  c0-1.777,0.662-3.396,1.746-4.636L9.232,8.551c-1.349,1.551-2.173,3.571-2.173,5.788c0,2.218,0.824,4.238,2.173,5.788L10.57,18.977z  " style="opacity:0.2;enable-background:new    ;"/>
-<path d="M18.515,16.672l1.346,1.156c0.817-0.934,1.317-2.151,1.317-3.489  c0-1.337-0.5-2.555-1.316-3.486l-1.346,1.157c0.553,0.622,0.896,1.432,0.896,2.33C19.412,15.237,19.068,16.049,18.515,16.672z" style="opacity:0.2;enable-background:new    ;"/>
-<path d="M13.252,16.672c-0.552-0.623-0.898-1.435-0.898-2.333  c0-0.898,0.347-1.708,0.898-2.33l-1.344-1.157c-0.82,0.932-1.319,2.15-1.319,3.487c0,1.338,0.5,2.556,1.318,3.488L13.252,16.672z" style="opacity:0.2;enable-background:new    ;"/>
-<polygon points="13.138,24.629 15.902,15.023 18.664,24.629 " style="opacity:0.2;enable-background:new    ;"/>
-<path d="M20.313,18.095l1.338,1.149c1.349-1.549,2.173-3.569,2.173-5.788c0-2.216-0.824-4.236-2.173-5.788  L20.313,8.82c1.085,1.241,1.747,2.859,1.747,4.636C22.061,15.235,21.398,16.854,20.313,18.095z" style="fill:#FFFFFF;"/>
-<path d="M9.688,18.095c-1.084-1.241-1.747-2.859-1.747-4.638c0-1.777,0.662-3.396,1.747-4.636L8.35,7.669  C7.001,9.22,6.177,11.24,6.177,13.457c0,2.218,0.824,4.239,2.173,5.788L9.688,18.095z" style="fill:#FFFFFF;"/>
-<path d="M17.633,15.789l1.345,1.156c0.818-0.934,1.317-2.151,1.317-3.489s-0.499-2.555-1.316-3.486  l-1.346,1.157c0.553,0.621,0.897,1.431,0.897,2.33S18.186,15.167,17.633,15.789z" style="fill:#FFFFFF;"/>
-<path d="M12.37,15.789c-0.552-0.623-0.898-1.434-0.898-2.333s0.347-1.708,0.898-2.331l-1.344-1.157  c-0.819,0.932-1.319,2.15-1.319,3.487c0,1.338,0.5,2.555,1.318,3.489L12.37,15.789z" style="fill:#FFFFFF;"/>
-<polygon points="12.256,23.747 15.02,14.141 17.782,23.747 " style="fill:#FFFFFF;"/>
-<rect height="30.002" style="fill:none;" width="30.002"/>
-<defs>
-<linearGradient gradientTransform="matrix(0.8824 0 0 -0.8824 -284.8232 -348.3516)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="339.7822" x2="339.7822" y1="-399.0518" y2="-428.7852">
+<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>
-</defs>
+<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="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="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 "/>
+<rect fill="none" height="30" width="30" x="0.491"/>
 </g>
 <g>
-<g>
-<rect height="15" style="fill:none;" width="15" x="15" y="15"/>
-<path d="M23.824,23.824v-3.53c0-0.729-0.594-1.323-1.324-1.323   c-0.729,0-1.323,0.594-1.323,1.323v3.53h-2.647v-3.53c0-2.189,1.781-3.971,3.971-3.971c2.19,0,3.971,1.781,3.971,3.971v3.53H23.824   z" style="opacity:0.6;enable-background:new    ;"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 90.98 116.5195)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-68.48" x2="-68.48" y1="99.5352" y2="93.1702">
-<stop offset="0" style="stop-color:#C8C8C8"/>
-<stop offset="1" style="stop-color:#646464"/>
+<rect fill="none" height="15" width="15" x="15" y="15"/>
+<path d="M23.82,23.82v-3.53c0-0.729-0.594-1.323-1.324-1.323-0.729,0-1.323,0.594-1.323,1.323v3.53h-2.647v-3.53c0-2.189,1.781-3.971,3.971-3.971s3.971,1.781,3.971,3.971v3.53h-2.646z" fill-opacity="0.6" stroke-opacity="0.6" style="enable-background:new;"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 90.98 116.5195)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-68.48" x2="-68.48" y1="99.54" y2="93.17">
+<stop offset="0" stop-color="#C8C8C8"/>
+<stop offset="1" stop-color="#646464"/>
 </linearGradient>
-<path d="M20.735,23.383v-3.088c0-0.974,0.792-1.766,1.765-1.766c0.974,0,1.765,0.792,1.765,1.766   v3.088h1.766v-3.088c0-1.941-1.589-3.53-3.53-3.53s-3.53,1.589-3.53,3.53v3.088H20.735z" style="fill:url(#SVGID_1__);"/>
-<rect height="7.06" style="opacity:0.6;enable-background:new    ;" width="11.472" x="16.765" y="21.618"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 90.98 116.5195)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-73.7739" x2="-63.1851" y1="91.3721" y2="91.3721">
-<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"/>
+<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"/>
 </linearGradient>
-<rect height="6.178" style="fill:url(#SVGID_2_);" width="10.589" x="17.206" y="22.059"/>
-<rect height="0.882" style="opacity:0.5;enable-background:new    ;" width="10.589" x="17.206" y="26.03"/>
-<rect height="0.883" style="opacity:0.5;enable-background:new    ;" width="10.589" x="17.206" y="24.265"/>
-</g>
-<rect height="30.002" style="fill:none;" width="30.002"/>
+<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"/>
+<rect fill-opacity="0.5" height="0.883" stroke-opacity="0.5" style="enable-background:new;" width="10.59" x="17.21" y="24.26"/>
+<rect fill="none" height="30" width="30"/>
 </g>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_battery.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_battery.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_battery.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" y="0px">
 <rect fill="none" height="16" width="16"/>
-<path d="M3,3.5V15h10V3.5H3z M11,13H5V5.5h6V13z"/>
+<path d="M3,3.5v11.5h10v-11.5h-10zm8,9.5h-6v-7.5h6v7.5z"/>
 <rect height="2" width="5" x="5.5" y="1"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_bluetooth.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_bluetooth.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_bluetooth.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" y="0px">
 <rect fill="none" height="16" width="16"/>
-<path d="M11.877,5.274L7.106,0.5v5.454L5.059,3.908L4.123,4.847c0,0,2.117,2.118,2.984,2.982v0.342  c-0.867,0.862-2.984,2.982-2.984,2.982l0.937,0.936l2.047-2.042V15.5l4.771-4.773c0,0-2.075-2.076-2.727-2.726  C9.802,7.344,11.877,5.274,11.877,5.274z M10.004,10.727c-0.339,0.338-0.955,0.956-1.538,1.538V9.192  C9.049,9.775,9.688,10.411,10.004,10.727z M8.47,6.807V3.738c0.579,0.583,1.195,1.199,1.534,1.538  C9.688,5.585,9.049,6.227,8.47,6.807z"/>
+<path d="M11.88,5.274l-4.774-4.774v5.454l-2.047-2.046-0.936,0.939s2.117,2.118,2.984,2.982v0.342c-0.867,0.862-2.984,2.982-2.984,2.982l0.937,0.936,2.047-2.042v5.45l4.771-4.773s-2.075-2.076-2.727-2.726c0.649-0.66,2.727-2.73,2.727-2.73zm-1.88,5.456c-0.339,0.338-0.955,0.956-1.538,1.538v-3.078c0.587,0.583,1.226,1.218,1.538,1.538zm-1.53-3.923v-3.069c0.579,0.583,1.195,1.199,1.534,1.538-0.312,0.309-0.951,0.951-1.53,1.531z"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_egprs.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_egprs.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_egprs.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" y="0px">
 <rect fill="none" height="16" width="16"/>
-<path d="M12.497,9.081H4.575v3.323h10.006V15H1.417V1h13.164v2.597H4.575v2.907h7.922V9.081z"/>
+<path d="M12.5,9.081h-7.925v3.323h10.01v2.6h-13.16v-14h13.16v2.597h-10v2.907h7.922v2.577z"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_failed.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_failed.svg	Mon Apr 19 14:02:13 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="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<path d="M11.618,3.512C10.627,2.713,9.37,2.23,8,2.23C4.818,2.23,2.23,4.818,2.23,8c0,1.37,0.482,2.627,1.281,3.618  L11.618,3.512z" fill="none"/>
-<path d="M12.487,4.382l-8.104,8.107C5.373,13.288,6.631,13.77,8,13.77c3.182,0,5.77-2.588,5.77-5.77  C13.77,6.631,13.288,5.373,12.487,4.382z" fill="none"/>
-<path d="M8,1C4.135,1,1,4.135,1,8c0,3.866,3.135,7,7,7c3.866,0,7-3.135,7-7C15,4.135,11.866,1,8,1z M8,2.23  c1.37,0,2.627,0.482,3.618,1.281l-8.106,8.106C2.713,10.627,2.23,9.37,2.23,8C2.23,4.818,4.818,2.23,8,2.23z M8,13.77  c-1.369,0-2.627-0.482-3.617-1.281l8.104-8.107C13.288,5.373,13.77,6.631,13.77,8C13.77,11.182,11.182,13.77,8,13.77z"/>
-<rect fill="none" height="16" width="16"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_gps.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_gps.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_gps.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" y="0px">
 <rect fill="none" height="16" width="16"/>
-<path d="M8.777,4.889l0.687,0.687L8.992,6.047c-0.625-0.317-1.36-0.316-1.985,0L5.758,4.798l-0.96,0.959l1.249,1.25  c-0.315,0.624-0.316,1.359,0,1.983L5.576,9.464L4.889,8.777L1,12.666L3.334,15l3.889-3.889l-0.687-0.688l0.472-0.471  c0.625,0.316,1.36,0.315,1.984-0.001l1.25,1.25l0.96-0.96l-1.25-1.25c0.316-0.623,0.317-1.36,0.001-1.983l0.471-0.473l0.688,0.686  L15,3.333L12.666,1L8.777,4.889z"/>
+<path d="M8.777,4.889l0.687,0.687-0.472,0.471c-0.625-0.317-1.36-0.316-1.985,0l-1.249-1.249-0.96,0.959,1.249,1.25c-0.315,0.624-0.316,1.359,0,1.983l-0.471,0.474-0.687-0.687-3.889,3.893,2.334,2.33,3.889-3.889-0.687-0.688,0.472-0.471c0.625,0.316,1.36,0.315,1.984-0.001l1.25,1.25,0.96-0.96-1.25-1.25c0.316-0.623,0.317-1.36,0.001-1.983l0.471-0.473,0.688,0.686,3.89-3.887-2.33-2.333-3.893,3.889z"/>
 <rect height="0.831" transform="matrix(0.7069 -0.7073 0.7073 0.7069 -1.7029 4.1127)" width="3.299" x="2.461" y="3.696"/>
-<rect height="0.831" transform="matrix(-0.7071 0.7071 -0.7071 -0.7071 28.7026 11.8883)" width="3.298" x="10.24" y="11.473"/>
+<rect height="0.831" transform="matrix(-0.7071 0.7071 -0.7071 -0.7071 28.7026 11.8883)" width="3.298" x="10.24" y="11.47"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_hsdpa.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_hsdpa.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_hsdpa.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" y="0px">
 <rect fill="none" height="16" width="16"/>
-<path d="M1.363,7.515c0.315,0.176,1.042,0.469,1.768,0.469c0.924,0,1.393-0.445,1.393-1.007c0-0.76-0.749-1.1-1.521-1.1H2.276V4.601  h0.69c0.597,0,1.346-0.234,1.346-0.878c0-0.457-0.363-0.795-1.124-0.795c-0.621,0-1.276,0.269-1.58,0.457L1.246,2.096  c0.457-0.292,1.358-0.574,2.353-0.574c1.615,0,2.517,0.854,2.517,1.896c0,0.808-0.456,1.452-1.393,1.768v0.023  c0.913,0.164,1.65,0.854,1.65,1.861c0,1.334-1.182,2.318-3.113,2.318c-0.983,0-1.815-0.257-2.26-0.527L1.363,7.515z"/>
-<path d="M8,9.389c-0.598,0-1.03-0.457-1.03-1.078c0-0.644,0.433-1.088,1.053-1.088c0.61,0,1.031,0.434,1.042,1.088  c0,0.621-0.421,1.078-1.052,1.078H8z"/>
-<path d="M14.697,3.114h-2.951l-0.164,1.159c0.164-0.012,0.305-0.023,0.492-0.023c0.726,0,1.475,0.164,2.002,0.55  C14.648,5.186,15,5.818,15,6.72c0,1.416-1.218,2.669-3.267,2.669c-0.923,0-1.695-0.211-2.118-0.433l0.328-1.334  c0.328,0.163,1.019,0.374,1.71,0.374c0.736,0,1.521-0.351,1.521-1.158c0-0.797-0.62-1.276-2.141-1.276  c-0.423,0-0.715,0.023-1.019,0.07l0.49-3.98h4.192V3.114z"/>
-<path d="M9.971,14.256c-0.309,0.092-0.896,0.223-1.48,0.223c-0.808,0-1.393-0.184-1.801-0.528c-0.401-0.345-0.624-0.86-0.624-1.438  c0.006-1.313,1.078-2.062,2.53-2.062c0.571,0,1.012,0.099,1.23,0.188l-0.211,0.72c-0.244-0.1-0.54-0.169-1.026-0.169  c-0.834,0-1.472,0.421-1.472,1.274c0,0.82,0.578,1.294,1.4,1.294c0.223,0,0.407-0.023,0.487-0.053v-0.831H8.319v-0.695h1.651V14.256  z"/>
+<path d="M1.363,7.515c0.315,0.176,1.042,0.469,1.768,0.469,0.924,0,1.393-0.445,1.393-1.007,0-0.76-0.749-1.1-1.521-1.1h-0.727v-1.276h0.69c0.597,0,1.346-0.234,1.346-0.878,0-0.457-0.363-0.795-1.124-0.795-0.621,0-1.276,0.269-1.58,0.457l-0.362-1.289c0.457-0.292,1.358-0.574,2.353-0.574,1.615,0,2.517,0.854,2.517,1.896,0,0.808-0.456,1.452-1.393,1.768v0.023c0.913,0.164,1.65,0.854,1.65,1.861,0,1.334-1.182,2.318-3.113,2.318-0.983,0-1.815-0.257-2.26-0.527l0.363-1.346z"/>
+<path d="M8,9.389c-0.598,0-1.03-0.457-1.03-1.078,0-0.644,0.433-1.088,1.053-1.088,0.61,0,1.031,0.434,1.042,1.088,0,0.621-0.421,1.078-1.052,1.078h-0.013z"/>
+<path d="M14.7,3.114h-2.951l-0.164,1.159c0.164-0.012,0.305-0.023,0.492-0.023,0.726,0,1.475,0.164,2.002,0.55,0.57,0.386,0.92,1.018,0.92,1.92,0,1.416-1.218,2.669-3.267,2.669-0.923,0-1.695-0.211-2.118-0.433l0.328-1.334c0.328,0.163,1.019,0.374,1.71,0.374,0.736,0,1.521-0.351,1.521-1.158,0-0.797-0.62-1.276-2.141-1.276-0.423,0-0.715,0.023-1.019,0.07l0.49-3.98h4.192v1.462z"/>
+<path d="M9.971,14.26c-0.309,0.092-0.896,0.223-1.48,0.223-0.808,0-1.393-0.184-1.801-0.528-0.401-0.345-0.624-0.86-0.624-1.438,0.006-1.313,1.078-2.062,2.53-2.062,0.571,0,1.012,0.099,1.23,0.188l-0.211,0.72c-0.244-0.1-0.54-0.169-1.026-0.169-0.834,0-1.472,0.421-1.472,1.274,0,0.82,0.578,1.294,1.4,1.294,0.223,0,0.407-0.023,0.487-0.053v-0.831h-0.685v-0.695h1.651v2.076z"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_missed_call.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_missed_call.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_missed_call.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" y="0px">
 <rect fill="none" height="16" width="16"/>
-<path d="M12.308,9.615c0,1.484-1.208,2.692-2.692,2.692S6.923,11.1,6.923,9.615V7.461h3.77L5.846,1L1,7.461h3.231v2.154  C4.231,12.577,6.654,15,9.615,15C12.577,15,15,12.577,15,9.615H12.308z"/>
+<path d="M12.31,9.615c0,1.484-1.208,2.692-2.692,2.692s-2.695-1.21-2.695-2.695v-2.154h3.77l-4.844-6.461-4.846,6.461h3.231v2.154c0,2.965,2.423,5.385,5.384,5.385,2.965,0,5.385-2.42,5.385-5.385h-2.692z"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_new_email.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_new_email.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_new_email.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" y="0px">
 <rect fill="none" height="16" width="16"/>
-<path d="M12.308,9.615c0,1.484-1.208,2.692-2.692,2.692S6.923,11.1,6.923,9.615V7.461h3.77L5.846,1L1,7.461h3.231  v2.154C4.231,12.577,6.654,15,9.615,15C12.577,15,15,12.577,15,9.615H12.308z" display="none"/>
-<path d="M14.999,7.988c0,1.123-0.225,2.095-0.676,2.915c-0.547,1.01-1.339,1.519-2.376,1.519c-1.005,0-1.731-0.509-2.186-1.519  C9.214,11.493,8.51,11.79,7.646,11.79c-1.016,0-1.828-0.39-2.442-1.164c-0.568-0.72-0.853-1.592-0.853-2.627  c0-1.042,0.284-1.912,0.853-2.612c0.606-0.755,1.421-1.13,2.442-1.13c0.76,0,1.358,0.206,1.796,0.62V4.42h1.476v5.097  c0,0.988,0.344,1.482,1.032,1.482c0.561,0,0.994-0.388,1.297-1.162c0.223-0.577,0.335-1.191,0.335-1.85  c0-1.522-0.55-2.822-1.644-3.903C10.844,3,9.53,2.462,8,2.462c-1.539,0-2.846,0.536-3.921,1.61C3.003,5.148,2.463,6.451,2.463,7.988  c0,1.536,0.539,2.846,1.622,3.925c1.079,1.088,2.385,1.626,3.916,1.626V15c-1.93,0-3.58-0.687-4.947-2.057  c-1.368-1.376-2.053-3.027-2.053-4.954c0-1.918,0.686-3.564,2.058-4.935C4.43,1.686,6.075,1,8,1c1.93,0,3.579,0.682,4.948,2.05  C14.314,4.414,14.999,6.06,14.999,7.988z M9.353,7.932c0-1.49-0.568-2.236-1.707-2.236c-0.57,0-1.013,0.254-1.32,0.762  c-0.269,0.43-0.399,0.941-0.399,1.541c0,1.567,0.572,2.349,1.718,2.349C8.784,10.347,9.353,9.542,9.353,7.932z"/>
+<path d="M12.31,9.615c0,1.484-1.208,2.692-2.692,2.692s-2.695-1.21-2.695-2.695v-2.154h3.77l-4.844-6.461-4.846,6.461h3.231v2.154c0,2.965,2.423,5.385,5.384,5.385,2.965,0,5.385-2.42,5.385-5.385h-2.692z" display="none"/>
+<path d="M15,7.988c0,1.123-0.225,2.095-0.676,2.915-0.547,1.01-1.339,1.519-2.376,1.519-1.005,0-1.731-0.509-2.186-1.519-0.54,0.59-1.244,0.89-2.108,0.89-1.016,0-1.828-0.39-2.442-1.164-0.568-0.72-0.853-1.592-0.853-2.627,0-1.042,0.284-1.912,0.853-2.612,0.606-0.755,1.421-1.13,2.442-1.13,0.76,0,1.358,0.206,1.796,0.62v-0.461h1.476v5.097c0,0.988,0.344,1.482,1.032,1.482,0.561,0,0.994-0.388,1.297-1.162,0.223-0.577,0.335-1.191,0.335-1.85,0-1.522-0.55-2.822-1.644-3.903-1.1-1.085-2.41-1.623-3.94-1.623-1.539,0-2.846,0.536-3.921,1.61-1.076,1.076-1.616,2.379-1.616,3.916,0,1.536,0.539,2.846,1.622,3.925,1.079,1.088,2.385,1.626,3.916,1.626v1.46c-1.93,0-3.58-0.687-4.947-2.057-1.368-1.376-2.053-3.027-2.053-4.954,0-1.918,0.686-3.564,2.058-4.935,1.371-1.365,3.016-2.051,4.941-2.051,1.93,0,3.579,0.682,4.948,2.05,1.36,1.364,2.05,3.01,2.05,4.938zm-5.647-0.056c0-1.49-0.568-2.236-1.707-2.236-0.57,0-1.013,0.254-1.32,0.762-0.269,0.43-0.399,0.941-0.399,1.541,0,1.567,0.572,2.349,1.718,2.349,1.139,0,1.708-0.808,1.708-2.418z"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_new_im.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_new_im.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_new_im.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" y="0px">
 <rect fill="none" height="16" width="16"/>
-<path d="M8.001,2.001c-3.86,0-7,2.384-7,5.313c0,1.571,0.909,3.051,2.495,4.066l0.157,2.62l2.277-1.632  c0.672,0.158,1.362,0.26,2.071,0.26c3.859,0,7-2.384,7-5.314C15.001,4.386,11.86,2.001,8.001,2.001z M8.001,11.429  c-0.557,0-1.145-0.074-1.796-0.228l-0.531-0.125L4.721,11.76l-0.063-1.061L4.143,10.37C2.909,9.581,2.202,8.467,2.202,7.315  c0-2.229,2.656-4.113,5.799-4.113s5.8,1.884,5.8,4.113C13.801,9.545,11.145,11.429,8.001,11.429z"/>
+<path d="M8.001,2.001c-3.86,0-7,2.384-7,5.313,0,1.571,0.909,3.051,2.495,4.066l0.157,2.62,2.277-1.632c0.672,0.158,1.362,0.26,2.071,0.26,3.859,0,7-2.384,7-5.314s-3.14-5.315-6.999-5.315zm0,9.429c-0.557,0-1.145-0.074-1.796-0.228l-0.531-0.125-0.953,0.68-0.063-1.061-0.515-0.33c-1.234-0.789-1.941-1.903-1.941-3.055,0-2.229,2.656-4.113,5.799-4.113s5.8,1.884,5.8,4.113c0,2.23-2.66,4.115-5.799,4.115z"/>
 <rect height="1.359" width="7.281" x="4.359" y="5.32"/>
 <rect height="1.359" width="5" x="4.359" y="7.82"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_new_message.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_new_message.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_new_message.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" y="0px">
 <rect fill="none" height="16" width="16"/>
-<path d="M1,3.059v9.883h14V3.059H1z M2.235,5.285l2.822,2.47l-2.822,2.999V5.285z M2.353,4.294h11.291L8,9.235L2.353,4.294z   M13.765,11.706H2.235v-0.052l3.286-3.492L8,10.33l2.479-2.168l3.286,3.492V11.706z M10.942,7.755l2.822-2.473v5.472L10.942,7.755z"/>
+<path d="M1,3.059v9.883h14v-9.881h-14zm1.235,2.226l2.822,2.47-2.822,2.999v-5.465zm0.118-0.991h11.29l-5.64,4.941-5.647-4.941zm11.41,7.416h-11.52v-0.052l3.286-3.492,2.479,2.162,2.479-2.168,3.286,3.492v0.056zm-2.82-3.955l2.822-2.473v5.472l-2.82-2.995z"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_outbox.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_outbox.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +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="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<rect fill="none" height="16" width="16"/>
-<polygon points="13.805,9.712 13.805,12.312 2.195,12.312 2.195,9.712 1,9.712 1,13.594 1.398,13.594 2.195,13.594 13.805,13.594   14.602,13.594 15,13.594 15,9.712 "/>
-<polygon points="6.121,10.856 9.877,10.856 9.877,7.101 11.756,7.101 8,2.406 4.244,7.101 6.121,7.101 "/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_progress.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_progress.svg	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +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="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<rect fill="none" height="16" width="16"/>
-<path d="M3.8,8c0-1.159,0.479-2.2,1.242-2.959l2.109,2.111L7.788,1L1.637,1.637L3.76,3.76C2.674,4.845,2,6.344,2,8  c0,3.014,2.224,5.499,5.117,5.928l0.185-1.79C5.318,11.803,3.8,10.077,3.8,8z"/>
-<path d="M8.85,8.849L8.213,15l6.15-0.637l-2.122-2.123C13.326,11.155,14,9.656,14,8c0-3.013-2.223-5.499-5.116-5.928L8.697,3.863  C10.684,4.197,12.2,5.923,12.2,8c0,1.157-0.476,2.203-1.236,2.964L8.85,8.849z"/>
-</svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_progress_1.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_progress_1.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_progress_1.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<path d="M6.974,13.209C4.568,12.725,2.75,10.575,2.75,8c0-2.574,1.82-4.723,4.224-5.209V1C3.596,1.504,1,4.441,1,8  c0,3.559,2.596,6.497,5.974,7V13.209z"/>
-<path d="M9.025,1v1.792C11.432,3.277,13.25,5.426,13.25,8c0,2.574-1.818,4.725-4.225,5.209V15C12.402,14.497,15,11.559,15,8  C15,4.441,12.402,1.504,9.025,1z"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" y="0px">
+<path d="M6.974,13.21c-2.406-0.49-4.224-2.63-4.224-5.21,0-2.574,1.82-4.723,4.224-5.209v-1.791c-3.378,0.504-5.974,3.441-5.974,7s2.596,6.497,5.974,7v-1.791z"/>
+<path d="M9.025,1v1.792c2.405,0.485,4.225,2.634,4.225,5.208s-1.818,4.725-4.225,5.209v1.79c3.375-0.5,5.975-3.44,5.975-7,0-3.559-2.6-6.496-5.975-7z"/>
 <rect fill="none" height="16" width="16"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_progress_2.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_progress_2.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_progress_2.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<path d="M4.111,11.615C2.447,9.809,2.236,6.999,3.747,4.912c1.511-2.085,4.247-2.755,6.479-1.735l1.052-1.451  C8.244,0.147,4.417,1,2.328,3.883c-2.089,2.883-1.711,6.789,0.73,9.183L4.111,11.615z"/>
-<path d="M12.939,2.933l-1.051,1.452c1.664,1.808,1.875,4.617,0.363,6.703c-1.512,2.084-4.247,2.756-6.479,1.734l-1.052,1.451  c3.031,1.578,6.861,0.725,8.949-2.158C15.76,9.233,15.381,5.328,12.939,2.933z"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" y="0px">
+<path d="M4.111,11.62c-1.664-1.811-1.875-4.621-0.364-6.708,1.511-2.085,4.247-2.755,6.479-1.735l1.052-1.451c-3.036-1.579-6.863-0.726-8.952,2.157s-1.711,6.789,0.73,9.183l1.053-1.45z"/>
+<path d="M12.94,2.933l-1.051,1.452c1.664,1.808,1.875,4.617,0.363,6.703-1.512,2.084-4.247,2.756-6.479,1.734l-1.052,1.451c3.031,1.578,6.861,0.725,8.949-2.158,2.09-2.877,1.71-6.782-0.73-9.177z"/>
 <rect fill="none" height="16" width="16"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_progress_3.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_progress_3.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_progress_3.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" y="0px">
 <rect fill="none" height="16" width="16"/>
-<path d="M2.729,8.637C2.444,6.197,3.924,3.799,6.373,3.001c2.449-0.798,5.056,0.269,6.264,2.407l1.703-0.556  c-1.527-3.059-5.125-4.62-8.509-3.517C2.446,2.438,0.457,5.821,1.025,9.191L2.729,8.637z"/>
-<path d="M14.977,6.807l-1.705,0.555c0.285,2.44-1.195,4.838-3.643,5.637c-2.448,0.798-5.057-0.267-6.264-2.408l-1.703,0.556  c1.525,3.06,5.125,4.621,8.51,3.518C13.556,13.563,15.543,10.178,14.977,6.807z"/>
+<path d="M2.729,8.637c-0.285-2.44,1.195-4.838,3.644-5.636s5.056,0.269,6.264,2.407l1.703-0.556c-1.527-3.059-5.125-4.62-8.509-3.517-3.385,1.103-5.374,4.486-4.806,7.856l1.704-0.554z"/>
+<path d="M14.98,6.807l-1.705,0.555c0.285,2.44-1.195,4.838-3.643,5.637-2.448,0.798-5.057-0.267-6.264-2.408l-1.703,0.556c1.525,3.06,5.125,4.621,8.51,3.518,3.38-1.11,5.36-4.49,4.8-7.863z"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_progress_4.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_progress_4.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_progress_4.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" y="0px">
 <rect fill="none" height="16" width="16"/>
-<path d="M3.363,5.413c1.206-2.139,3.811-3.208,6.259-2.412c2.448,0.795,3.931,3.192,3.649,5.63l1.703,0.554  c0.564-3.372-1.426-6.75-4.811-7.85C6.779,0.236,3.183,1.8,1.661,4.86L3.363,5.413z"/>
-<path d="M14.34,11.139l-1.705-0.553c-1.203,2.141-3.81,3.208-6.257,2.412S2.447,9.807,2.729,7.366L1.026,6.813  c-0.565,3.371,1.427,6.752,4.811,7.85C9.223,15.764,12.817,14.199,14.34,11.139z"/>
+<path d="M3.363,5.413c1.206-2.139,3.811-3.208,6.259-2.412,2.448,0.795,3.931,3.192,3.649,5.63l1.703,0.554c0.564-3.372-1.426-6.75-4.811-7.85-3.381-1.099-6.977,0.465-8.499,3.525l1.702,0.553z"/>
+<path d="M14.34,11.14l-1.705-0.553c-1.203,2.141-3.81,3.208-6.257,2.412s-3.936-3.193-3.654-5.634l-1.703-0.553c-0.565,3.371,1.427,6.752,4.811,7.85,3.386,1.1,6.983-0.46,8.503-3.52z"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_progress_5.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_progress_5.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_progress_5.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" y="0px">
 <rect fill="none" height="16" width="16"/>
-<path d="M5.772,3.183c2.23-1.021,4.964-0.353,6.476,1.73c1.512,2.082,1.301,4.891-0.36,6.699l1.052,1.447  c2.437-2.393,2.813-6.296,0.724-9.174c-2.089-2.879-5.914-3.73-8.942-2.15L5.772,3.183z"/>
-<path d="M11.279,14.266l-1.053-1.449c-2.23,1.022-4.963,0.354-6.475-1.729C2.24,9.006,2.45,6.197,4.112,4.39L3.06,2.941  c-2.438,2.393-2.813,6.297-0.725,9.176C4.425,14.996,8.25,15.845,11.279,14.266z"/>
+<path d="M5.772,3.183c2.23-1.021,4.964-0.353,6.476,1.73,1.512,2.082,1.301,4.891-0.36,6.699l1.052,1.447c2.437-2.393,2.813-6.296,0.724-9.174-2.089-2.879-5.914-3.73-8.942-2.15l1.054,1.447z"/>
+<path d="M11.28,14.27l-1.053-1.449c-2.23,1.022-4.963,0.354-6.475-1.729-1.515-2.084-1.305-4.893,0.357-6.7l-1.052-1.449c-2.438,2.393-2.813,6.297-0.725,9.176,2.09,2.88,5.915,3.72,8.945,2.15z"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_signal.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_signal.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_signal.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" y="0px">
 <rect fill="none" height="16" width="16"/>
-<path d="M1.637,1v2.545c0,0,3.234,3.232,5.084,5.088V15H9.27V8.634c1.858-1.856,5.093-5.088,5.093-5.088V1H1.637z M2.837,3.048V2.2  h3.908v4.761C5.434,5.648,3.421,3.632,2.837,3.048z M13.162,3.048L9.245,6.961V2.2h3.917V3.048z"/>
+<path d="M1.637,1v2.545s3.234,3.232,5.084,5.088v6.367h2.549v-6.366c1.858-1.856,5.093-5.088,5.093-5.088v-2.546h-12.72zm1.2,2.048v-0.848h3.908v4.761c-1.311-1.313-3.324-3.329-3.908-3.913zm10.32,0l-3.915,3.913v-4.761h3.917v0.848z"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_wcdma.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_wcdma.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_wcdma.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" y="0px">
 <rect fill="none" height="16" width="16"/>
-<path d="M1.402,10.279c0.349,0.195,1.153,0.52,1.956,0.52c1.022,0,1.541-0.492,1.541-1.115c0-0.841-0.829-1.217-1.684-1.217H2.413  V7.056h0.763c0.661,0,1.49-0.26,1.49-0.972c0-0.506-0.401-0.881-1.244-0.881c-0.687,0-1.412,0.298-1.748,0.506L1.273,4.283  C1.778,3.96,2.775,3.648,3.876,3.648c1.787,0,2.784,0.945,2.784,2.099c0,0.894-0.505,1.605-1.541,1.955v0.026  C6.129,7.91,6.945,8.674,6.945,9.789c0,1.475-1.308,2.563-3.444,2.563c-1.088,0-2.008-0.283-2.5-0.582L1.402,10.279z"/>
-<path d="M15,11.871c-0.598,0.199-1.736,0.48-2.868,0.48c-1.564,0-2.696-0.396-3.487-1.14c-0.776-0.745-1.207-1.859-1.207-3.109  c0.01-2.836,2.086-4.454,4.898-4.454c1.104,0,1.957,0.214,2.383,0.405l-0.408,1.556c-0.473-0.215-1.047-0.365-1.988-0.365  c-1.614,0-2.851,0.909-2.851,2.754c0,1.772,1.122,2.796,2.712,2.796c0.432,0,0.788-0.052,0.942-0.114V8.884H11.8V7.381H15V11.871z"/>
+<path d="M1.402,10.28c0.349,0.195,1.153,0.52,1.956,0.52,1.022,0,1.541-0.492,1.541-1.115,0-0.841-0.829-1.217-1.684-1.217h-0.802v-1.412h0.763c0.661,0,1.49-0.26,1.49-0.972,0-0.506-0.401-0.881-1.244-0.881-0.687,0-1.412,0.298-1.748,0.506l-0.401-1.426c0.505-0.323,1.502-0.635,2.603-0.635,1.787,0,2.784,0.945,2.784,2.099,0,0.894-0.505,1.605-1.541,1.955v0.026c1.01,0.182,1.826,0.946,1.826,2.061,0,1.475-1.308,2.563-3.444,2.563-1.088,0-2.008-0.283-2.5-0.582l0.401-1.49z"/>
+<path d="M15,11.87c-0.598,0.199-1.736,0.48-2.868,0.48-1.564,0-2.696-0.396-3.487-1.14-0.776-0.745-1.207-1.859-1.207-3.109,0.01-2.836,2.086-4.454,4.898-4.454,1.104,0,1.957,0.214,2.383,0.405l-0.408,1.556c-0.473-0.215-1.047-0.365-1.988-0.365-1.614,0-2.851,0.909-2.851,2.754,0,1.772,1.122,2.796,2.712,2.796,0.432,0,0.788-0.052,0.942-0.114v-1.796h-1.31v-1.503h3.2v4.49z"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_wlan.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_wlan.svg	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_wlan.svg	Mon May 03 12:48:33 2010 +0300
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" y="0px">
 <rect fill="none" height="16" width="16"/>
-<path d="M10.287,13.119L8.622,6.468C9.354,6.208,9.88,5.53,9.88,4.712c0-1.041-0.842-1.883-1.881-1.883  c-1.04,0-1.883,0.841-1.883,1.883c0,0.817,0.525,1.494,1.254,1.756l-1.661,6.651h-2.42V15h9.41v-1.881H10.287z"/>
-<path d="M1.621,4.713c0,2.103,1.152,3.656,1.188,3.708c0.189-0.128,0.511-0.35,0.702-0.478C3.473,7.894,2.465,6.465,2.465,4.713  c0-1.896,1.008-3.179,1.046-3.233C3.319,1.35,3,1.128,2.813,1C2.775,1.053,1.621,2.672,1.621,4.713z"/>
-<path d="M3.867,4.713c0,1.398,0.761,2.39,0.797,2.44c0.19-0.127,0.512-0.35,0.702-0.478C5.325,6.621,4.714,5.702,4.714,4.713  c0-1.101,0.611-1.913,0.651-1.964C5.176,2.621,4.852,2.4,4.664,2.267C4.628,2.325,3.867,3.287,3.867,4.713z"/>
-<path d="M14.379,4.71c0-2.104-1.154-3.657-1.191-3.71C13,1.128,12.677,1.35,12.49,1.478c0.033,0.049,1.043,1.48,1.043,3.232  c0,1.895-1.01,3.178-1.043,3.231c0.188,0.131,0.51,0.353,0.697,0.481C13.221,8.373,14.379,6.751,14.379,4.71z"/>
-<path d="M12.13,4.71c0-1.399-0.761-2.391-0.798-2.442c-0.187,0.127-0.511,0.35-0.702,0.479c0.041,0.057,0.654,0.977,0.654,1.963  c0,1.101-0.613,1.912-0.652,1.963c0.189,0.127,0.51,0.349,0.699,0.481C11.368,7.099,12.13,6.134,12.13,4.71z"/>
+<path d="M10.29,13.12l-1.668-6.652c0.732-0.26,1.258-0.938,1.258-1.756,0-1.041-0.842-1.883-1.881-1.883-1.04,0-1.883,0.841-1.883,1.883,0,0.817,0.525,1.494,1.254,1.756l-1.661,6.651h-2.42v1.88h9.41v-1.881h-2.413z"/>
+<path d="M1.621,4.713c0,2.103,1.152,3.656,1.188,3.708,0.189-0.128,0.511-0.35,0.702-0.478-0.038-0.049-1.046-1.478-1.046-3.23,0-1.896,1.008-3.179,1.046-3.233-0.192-0.13-0.511-0.352-0.698-0.48-0.038,0.053-1.192,1.672-1.192,3.713z"/>
+<path d="M3.867,4.713c0,1.398,0.761,2.39,0.797,2.44,0.19-0.127,0.512-0.35,0.702-0.478-0.041-0.054-0.652-0.973-0.652-1.962,0-1.101,0.611-1.913,0.651-1.964-0.189-0.128-0.513-0.349-0.701-0.482-0.036,0.058-0.797,1.02-0.797,2.446z"/>
+<path d="M14.38,4.71c0-2.104-1.154-3.657-1.191-3.71-0.19,0.128-0.51,0.35-0.7,0.478,0.033,0.049,1.043,1.48,1.043,3.232,0,1.895-1.01,3.178-1.043,3.231,0.188,0.131,0.51,0.353,0.697,0.481,0.03-0.049,1.19-1.671,1.19-3.712z"/>
+<path d="M12.13,4.71c0-1.399-0.761-2.391-0.798-2.442-0.187,0.127-0.511,0.35-0.702,0.479,0.041,0.057,0.654,0.977,0.654,1.963,0,1.101-0.613,1.912-0.652,1.963,0.189,0.127,0.51,0.349,0.699,0.481,0.04-0.055,0.8-1.02,0.8-2.444z"/>
 </svg>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/icons/hbdefault/theme.theme
--- a/src/hbcore/resources/themes/icons/hbdefault/theme.theme	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-[Default Theme]
-Name=hbdefault
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbcolordialog/hbcolordialog.css
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbcolordialog/hbcolordialog.css	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbcolordialog/hbcolordialog.css	Mon May 03 12:48:33 2010 +0300
@@ -1,6 +1,5 @@
 HbColorDialog {
-    /* unfortunately, #ffffff notation is not supported. Have a nice day
-       with hex->dec conversions */
+    /* Unfortunately, #ffffff notation is not supported. */
 
     color0:  16777215; /* white */
     color1:  0;        /* black */ 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbcolorgridviewitem/hbcolorgridviewitem.css
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbcolorgridviewitem/hbcolorgridviewitem.css	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbcolorgridviewitem/hbcolorgridviewitem.css	Mon May 03 12:48:33 2010 +0300
@@ -6,22 +6,23 @@
 {
     left:   -var(hb-param-margin-gene-popup);
     top:    -var(hb-param-margin-gene-popup);
-    fixed-width: var(hb-param-graphic-size-primary-small);
-    fixed-height: var(hb-param-graphic-size-primary-small);
+    bottom:  var(hb-param-margin-gene-popup);
+    right:   var(hb-param-margin-gene-popup);
+/*    fixed-width: var(hb-param-graphic-size-primary-small);
+    fixed-height: var(hb-param-graphic-size-primary-small); */
 }
 
 HbColorGridViewItem::cg-color-icon
 {
     left:   -var(hb-param-margin-gene-popup);
     top:    -var(hb-param-margin-gene-popup);
-    fixed-width: var(hb-param-graphic-size-primary-small);
-    fixed-height: var(hb-param-graphic-size-primary-small);
+    bottom:  var(hb-param-margin-gene-popup);
+    right:   var(hb-param-margin-gene-popup);
+/*    fixed-width:   var(hb-param-graphic-size-primary-small);
+    fixed-height: var(hb-param-graphic-size-primary-small); */
 }
 
 HbColorGridViewItem::cg-selection-icon
 {
-    left:   -var(hb-param-margin-gene-popup);
-    top:    -var(hb-param-margin-gene-popup);
-    fixed-width: var(hb-param-graphic-size-secondary);
-    fixed-height: var(hb-param-graphic-size-secondary);
+    fixed-width:   var(hb-param-graphic-size-secondary);
 }
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbcolorgridviewitem/hbcolorgridviewitem.widgetml
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbcolorgridviewitem/hbcolorgridviewitem.widgetml	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbcolorgridviewitem/hbcolorgridviewitem.widgetml	Mon May 03 12:48:33 2010 +0300
@@ -1,20 +1,24 @@
 <hbwidget version="0.1" type="HbColorGridViewItem">
   
-   <layout name="colorgriditem_layout" type="mesh">
-	<meshitem src="cg-border-icon" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-	<meshitem src="cg-border-icon" srcEdge="TOP" dst="" dstEdge="TOP" />	
+  <layout name="colorgriditem_layout" type="mesh">
+    <meshitem src="cg-border-icon" srcEdge="LEFT" dst="" dstEdge="LEFT" />
+    <meshitem src="cg-border-icon" srcEdge="TOP" dst="" dstEdge="TOP" />	
+    <meshitem src="cg-border-icon"  srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
+    <meshitem src="cg-border-icon" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
 
-	<meshitem src="cg-color-icon" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-	<meshitem src="cg-color-icon" srcEdge="TOP" dst="" dstEdge="TOP" />	
+    <meshitem src="cg-color-icon" srcEdge="LEFT" dst="" dstEdge="LEFT" />
+    <meshitem src="cg-color-icon" srcEdge="TOP" dst="" dstEdge="TOP" />	
+    <meshitem src="cg-color-icon" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
+    <meshitem src="cg-color-icon" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
 
-	<meshitem src="cg-selection-icon" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-	<meshitem src="cg-selection-icon" srcEdge="TOP" dst="" dstEdge="TOP" />	
+    <meshitem src="cg-selection-icon" srcEdge="CENTERV" dst="" dstEdge="CENTERV" />
+    <meshitem src="cg-selection-icon" srcEdge="CENTERH" dst="" dstEdge="CENTERH" />	
 
     <meshitem src="frame" srcEdge="LEFT" dst="" dstEdge="LEFT" />
     <meshitem src="frame" srcEdge="TOP" dst="" dstEdge="TOP" />
     <meshitem src="frame" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
     <meshitem src="frame" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
-
+    
   </layout>
-
+  
 </hbwidget>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbcombobox/hbcombobox.widgetml
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbcombobox/hbcombobox.widgetml	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbcombobox/hbcombobox.widgetml	Mon May 03 12:48:33 2010 +0300
@@ -8,7 +8,8 @@
       
     <meshitem src="text_background" srcEdge="LEFT" dst="" dstEdge="LEFT" />
     <meshitem src="text_background" srcEdge="RIGHT" dst="combobox_button" dstEdge="LEFT" />
-    <meshitem src="text_background" srcEdge="CENTERV" dst="" dstEdge="CENTERV" />
+    <meshitem src="text_background" srcEdge="TOP" dst="" dstEdge="TOP" />
+    <meshitem src="text_background" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
 
     <meshitem src="combobox_labelfield" srcEdge="LEFT" dst="" dstEdge="LEFT" />
     <meshitem src="combobox_labelfield" srcEdge="RIGHT" dst="combobox_button" dstEdge="LEFT" />
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbdataformheadingwidget/hbdataformheadingwidget.css
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbdataformheadingwidget/hbdataformheadingwidget.css	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbdataformheadingwidget/hbdataformheadingwidget.css	Mon May 03 12:48:33 2010 +0300
@@ -1,5 +1,11 @@
+HbDataFormHeadingWidget[!hasHeading][!hasDescription]{
+    layout:layout_combo;
+}
+HbDataFormHeadingWidget[!hasHeading]{
+    layout:layout_description_combo;
+}
 HbDataFormHeadingWidget{
-    layout:default;
+    layout:layout_heading_description_combo;
 }
 
 HbDataFormHeadingWidget::dataForm_Heading
@@ -14,7 +20,18 @@
     text-align:left;
     text-line-count-max:1;
 }
-
+HbDataFormHeadingWidget[!hasHeading]::dataForm_Desc
+{
+	top:-var(hb-param-margin-gene-top);
+    bottom :var(hb-param-margin-gene-top);
+    left:-var(hb-param-margin-gene-left);
+    right:var(hb-param-margin-gene-right);
+    /*bottom:var(hb-param-margin-gene-middle-vertical);*/
+    font-variant:secondary;
+    text-height:var(hb-param-text-height-secondary);
+    text-align:left;
+    text-line-count-max:3;
+}
 HbDataFormHeadingWidget::dataForm_Desc
 {
     bottom :var(hb-param-margin-gene-top);
@@ -27,9 +44,17 @@
     text-line-count-max:3;
 }
 
+HbDataFormHeadingWidget[!hasHeading][!hasDescription]::dataForm_Combo
+{
+    top:-var(hb-param-margin-gene-top);
+    left:-var(hb-param-margin-gene-left);
+    right:var(hb-param-margin-gene-right);
+    bottom:var(hb-param-margin-gene-bottom);
+}
+
 HbDataFormHeadingWidget::dataForm_Combo
 {
-    /*top:-var(hb-param-margin-gene-middle-vertical);*/
+
     left:-var(hb-param-margin-gene-left);
     right:var(hb-param-margin-gene-right);
     bottom:var(hb-param-margin-gene-bottom);
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbdataformheadingwidget/hbdataformheadingwidget.widgetml
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbdataformheadingwidget/hbdataformheadingwidget.widgetml	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbdataformheadingwidget/hbdataformheadingwidget.widgetml	Mon May 03 12:48:33 2010 +0300
@@ -1,6 +1,6 @@
 <hbwidget version="0.1" type="HbDataFormHeadingWidget">
 
-  <layout name="default" type="mesh">
+  <layout name="layout_heading_description_combo" type="mesh">
     <meshitem src="dataForm_Heading" srcEdge="TOP" dst="" dstEdge="TOP" />
     <meshitem src="dataForm_Heading" srcEdge="LEFT" dst="" dstEdge="LEFT" />
     <meshitem src="dataForm_Heading" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
@@ -20,5 +20,33 @@
     <meshitem src="dataFormHeading_Background" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
 
   </layout>
+  <layout name="layout_description_combo" type="mesh">
+    <meshitem src="dataForm_Desc" srcEdge="TOP" dst="" dstEdge="TOP" />
+    <meshitem src="dataForm_Desc" srcEdge="LEFT" dst="" dstEdge="LEFT" />
+    <meshitem src="dataForm_Desc" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
+    <meshitem src="dataForm_Desc" srcEdge="BOTTOM" dst="dataForm_Combo" dstEdge="TOP" />
 
+    <meshitem src="dataForm_Combo" srcEdge="LEFT" dst="" dstEdge="LEFT" />
+    <meshitem src="dataForm_Combo" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
+    <meshitem src="dataForm_Combo" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM"/>
+
+    <meshitem src="dataFormHeading_Background" srcEdge="TOP" dst="" dstEdge="TOP" />
+    <meshitem src="dataFormHeading_Background" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
+    <meshitem src="dataFormHeading_Background" srcEdge="LEFT" dst="" dstEdge="LEFT" />
+    <meshitem src="dataFormHeading_Background" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
+
+
+  </layout>
+    <layout name="layout_combo" type="mesh">
+    <meshitem src="dataForm_Combo" srcEdge="TOP" dst="" dstEdge="TOP" />
+    <meshitem src="dataForm_Combo" srcEdge="LEFT" dst="" dstEdge="LEFT" />
+    <meshitem src="dataForm_Combo" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
+    <meshitem src="dataForm_Combo" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
+
+    <meshitem src="dataFormHeading_Background" srcEdge="TOP" dst="" dstEdge="TOP" />
+    <meshitem src="dataFormHeading_Background" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
+    <meshitem src="dataFormHeading_Background" srcEdge="LEFT" dst="" dstEdge="LEFT" />
+    <meshitem src="dataFormHeading_Background" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
+
+  </layout>
 </hbwidget>
\ No newline at end of file
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbdataformheadingwidget/hbdataformheadingwidget_color.css
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbdataformheadingwidget/hbdataformheadingwidget_color.css	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbdataformheadingwidget/hbdataformheadingwidget_color.css	Mon May 03 12:48:33 2010 +0300
@@ -1,14 +1,11 @@
 HbDataFormHeadingWidget::dataForm_Heading
 {
-	color:var(qtc_view_normal);
+	color:var(qtc_dataform_heading);
 }
 
 HbDataFormHeadingWidget::dataForm_Desc
 {
-	color:var(qtc_view_normal);
-}
-HbDataFormHeadingWidget::dataFormHeading_Background
-{
 	color:var(qtc_dataform_heading);
 }
 
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbdatagroup/hbdatagroup.css
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbdatagroup/hbdatagroup.css	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbdatagroup/hbdatagroup.css	Mon May 03 12:48:33 2010 +0300
@@ -21,13 +21,3 @@
 	bottom:var(hb-param-margin-gene-bottom);
 }
 
-HbDataGroup::dataGroup_Description
-{
-    left:-var(hb-param-margin-gene-left);
-    bottom:var(hb-param-margin-gene-bottom);
-    right:var(hb-param-margin-gene-right);
-    text-height:var(hb-param-text-height-secondary);
-    font-variant:secondary;
-    text-align:left;
-    text-line-count-max:3;
-}
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbdatagroup/hbdatagroup.widgetml
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbdatagroup/hbdatagroup.widgetml	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbdatagroup/hbdatagroup.widgetml	Mon May 03 12:48:33 2010 +0300
@@ -15,11 +15,7 @@
 
     <meshitem src="dataGroup_Combo" srcEdge="LEFT" dst="" dstEdge="LEFT" />
     <meshitem src="dataGroup_Combo" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="dataGroup_Combo" srcEdge="BOTTOM" dst="dataGroup_Description" dstEdge="TOP" />
-
-    <meshitem src="dataGroup_Description" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="dataGroup_Description" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
-    <meshitem src="dataGroup_Description" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
+    <meshitem src="dataGroup_Combo" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
 
     <meshitem src="dataGroup_ComboBackground" srcEdge="TOP" dst="dataGroup_HeadingWidget" dstEdge="BOTTOM" />
     <meshitem src="dataGroup_ComboBackground" srcEdge="LEFT" dst="" dstEdge="LEFT" />
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbdatagroup/hbdatagroup_color.css
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbdatagroup/hbdatagroup_color.css	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-HbDataGroupHeadingWidget::dataGroup_Description
-{
-	color:var(qtc_list_item_content_normal);
-}
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbdatagroupheadingwidget/hbdatagroupheadingwidget.css
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbdatagroupheadingwidget/hbdatagroupheadingwidget.css	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbdatagroupheadingwidget/hbdatagroupheadingwidget.css	Mon May 03 12:48:33 2010 +0300
@@ -21,6 +21,16 @@
     text-align:left;
     text-line-count-max:1;
 }
+HbDataGroupHeadingWidget::dataGroup_Description
+{
+    left:-var(hb-param-margin-gene-left);
+    bottom:var(hb-param-margin-gene-bottom);
+    right:var(hb-param-margin-gene-right);
+    text-height:var(hb-param-text-height-secondary);
+    font-variant:secondary;
+    text-align:left;
+    text-line-count-max:3;
+}
 
 HbDataGroupHeadingWidget::dataGroup_Background
 {
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbdatagroupheadingwidget/hbdatagroupheadingwidget.widgetml
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbdatagroupheadingwidget/hbdatagroupheadingwidget.widgetml	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbdatagroupheadingwidget/hbdatagroupheadingwidget.widgetml	Mon May 03 12:48:33 2010 +0300
@@ -7,9 +7,15 @@
     
     <meshitem src="dataGroup_HeadingLabel" srcEdge="LEFT" dst="" dstEdge="LEFT" />
     <meshitem src="dataGroup_HeadingLabel" srcEdge="TOP" dst="" dstEdge="TOP" />
-    <meshitem src="dataGroup_HeadingLabel" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
+    <meshitem src="dataGroup_HeadingLabel" srcEdge="BOTTOM" dst="dataGroup_Description" dstEdge="TOP" />
     <meshitem src="dataGroup_HeadingLabel" srcEdge="RIGHT" dst="dataGroup_Icon" dstEdge="LEFT" />
 
+
+    <meshitem src="dataGroup_Description" srcEdge="LEFT" dst="" dstEdge="LEFT" />
+    <meshitem src="dataGroup_Description" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
+    <meshitem src="dataGroup_Description" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
+    
+    
     <meshitem src="dataGroup_Background" srcEdge="TOP" dst="" dstEdge="TOP" />
     <meshitem src="dataGroup_Background" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
     <meshitem src="dataGroup_Background" srcEdge="LEFT" dst="" dstEdge="LEFT" />
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbdatagroupheadingwidget/hbdatagroupheadingwidget_color.css
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbdatagroupheadingwidget/hbdatagroupheadingwidget_color.css	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbdatagroupheadingwidget/hbdatagroupheadingwidget_color.css	Mon May 03 12:48:33 2010 +0300
@@ -2,3 +2,8 @@
 {
 	color:var(qtc_list_item_title_normal);
 }
+
+HbDataGroupHeadingWidget::dataGroup_Description
+{
+	color:var(qtc_list_item_content_normal);
+}
\ No newline at end of file
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbdatetimepicker/hbdatetimepicker.css
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbdatetimepicker/hbdatetimepicker.css	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbdatetimepicker/hbdatetimepicker.css	Mon May 03 12:48:33 2010 +0300
@@ -8,10 +8,10 @@
 	layout:datetimepicker-layout;
 }
 
-HbDateTimePicker::separator{
-    pref-width: 0.5un;
+HbDateTimePicker::frame{
+    border-width: var(hb-param-background-tumbler);
 }
 
-HbDateTimePicker::frame{
-    border-width: var(hb-param-background-tumbler);
-}
\ No newline at end of file
+HbDateTimePicker::highlight{
+    fixed-height: expr(var(hb-param-text-height-secondary)+2*var(hb-param-margin-gene-middle-vertical));
+}
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbdatetimepicker/hbdatetimepicker.widgetml
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbdatetimepicker/hbdatetimepicker.widgetml	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbdatetimepicker/hbdatetimepicker.widgetml	Mon May 03 12:48:33 2010 +0300
@@ -15,5 +15,10 @@
     <meshitem src="frame" srcEdge="TOP" dst="" dstEdge="TOP" />
     <meshitem src="frame" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
     <meshitem src="frame" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
+
+    <meshitem src="highlight" srcEdge="LEFT" dst="" dstEdge="LEFT" />
+    <meshitem src="highlight" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
+    <meshitem src="highlight" srcEdge="CENTERV" dst="" dstEdge="CENTERV" />
+    
   </layout>
 </hbwidget>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbdialog/hbdialog.css
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbdialog/hbdialog.css	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbdialog/hbdialog.css	Mon May 03 12:48:33 2010 +0300
@@ -1,22 +1,10 @@
 HbDialog {
     max-width:expr(var(hb-param-screen-width)-2*var(hb-param-margin-gene-screen));
     max-height:expr(var(hb-param-screen-height)-2*var(hb-param-margin-gene-screen));
-    min-width:10un;
 }
 
 HbDialog::heading {
-    pref-height:expr(var(hb-param-text-height-primary)+2*var(hb-param-margin-gene-popup));
-}
-
-HbDialog::heading > HbLabel::text {
-    left:-var(hb-param-margin-gene-popup);
-    right:var(hb-param-margin-gene-popup);
-    top:-var(hb-param-margin-gene-popup);
-    bottom:var(hb-param-margin-gene-popup);
-    text-height:var(hb-param-text-height-primary);
-    text-align:left;
-    text-line-count-max: 1;
-    font-variant:primary;
+    max-height:expr(var(hb-param-text-height-primary)+2*var(hb-param-margin-gene-popup));
 }
 
 HbDialog::controls {
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbdialog/hbdialog_color.css
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbdialog/hbdialog_color.css	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbdialog/hbdialog_color.css	Mon May 03 12:48:33 2010 +0300
@@ -1,18 +1,1 @@
-/* Popup selector */
 
-HbDialog
-{
-background:var(popupbackground);
-foreground:var(popupforeground);
-}
-
-HbDialog::heading > HbLabel::text
-{
-color:var(qtc_popup_heading_normal);
-}
-
-HbDialog#TestPopup
-{
- background:var(testforeground);
- foreground:var(popupforeground);
-}
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbgridviewitem/hbgridviewitem.widgetml
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbgridviewitem/hbgridviewitem.widgetml	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbgridviewitem/hbgridviewitem.widgetml	Mon May 03 12:48:33 2010 +0300
@@ -25,16 +25,6 @@
         <meshitem src="selection-icon" srcEdge="TOP" dst="" dstEdge="TOP" />
         <meshitem src="selection-icon" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
 
-        <meshitem src="frame" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-        <meshitem src="frame" srcEdge="TOP" dst="" dstEdge="TOP" />
-        <meshitem src="frame" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-        <meshitem src="frame" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
-
-        <meshitem src="background" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-        <meshitem src="background" srcEdge="TOP" dst="" dstEdge="TOP" />
-        <meshitem src="background" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-        <meshitem src="background" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
-
         <meshitem src="multiselection-toucharea" srcEdge="TOP" dst="" dstEdge="TOP" />
         <meshitem src="multiselection-toucharea" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
         <meshitem src="multiselection-toucharea" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
@@ -61,16 +51,6 @@
         <meshitem src="selection-icon" srcEdge="TOP" dst="" dstEdge="TOP" />
         <meshitem src="selection-icon" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
 
-        <meshitem src="frame" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-        <meshitem src="frame" srcEdge="TOP" dst="" dstEdge="TOP" />
-        <meshitem src="frame" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-        <meshitem src="frame" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
-
-        <meshitem src="background" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-        <meshitem src="background" srcEdge="TOP" dst="" dstEdge="TOP" />
-        <meshitem src="background" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-        <meshitem src="background" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
-
         <meshitem src="multiselection-toucharea" srcEdge="TOP" dst="" dstEdge="TOP" />
         <meshitem src="multiselection-toucharea" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
         <meshitem src="multiselection-toucharea" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
@@ -96,16 +76,6 @@
         <meshitem src="selection-icon" srcEdge="TOP" dst="" dstEdge="TOP" />
         <meshitem src="selection-icon" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
 
-        <meshitem src="frame" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-        <meshitem src="frame" srcEdge="TOP" dst="" dstEdge="TOP" />
-        <meshitem src="frame" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-        <meshitem src="frame" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
-
-        <meshitem src="background" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-        <meshitem src="background" srcEdge="TOP" dst="" dstEdge="TOP" />
-        <meshitem src="background" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-        <meshitem src="background" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
-
         <meshitem src="multiselection-toucharea" srcEdge="TOP" dst="" dstEdge="TOP" />
         <meshitem src="multiselection-toucharea" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
         <meshitem src="multiselection-toucharea" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbgridviewitem/hbgridviewitem_color.css
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbgridviewitem/hbgridviewitem_color.css	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbgridviewitem/hbgridviewitem_color.css	Mon May 03 12:48:33 2010 +0300
@@ -13,6 +13,18 @@
     color: var(qtc_grid_disabled);
 }
 
+HbGridViewItem::icon{
+    color: var(qtc_grid_normal);
+}
+
+HbGridViewItem::icon[state="pressed"]{
+    color: var(qtc_grid_pressed);
+}
+
+HbGridViewItem::icon[state="disabled"]{
+    color: var(qtc_grid_disabled);
+}
+
 /*
     Grid item inside popup color definitions.
 */
@@ -27,3 +39,15 @@
 HbGridViewItem::text[insidePopup][state="disabled"]{
     color: var(qtc_popup_grid_disabled);
 }
+
+HbGridViewItem::icon[insidePopup]{
+    color: var(qtc_popup_grid_normal);
+}
+
+HbGridViewItem::icon[insidePopup][state="pressed"]{
+    color: var(qtc_popup_grid_pressed);
+}
+
+HbGridViewItem::icon[insidePopup][state="disabled"]{
+    color: var(qtc_popup_grid_disabled);
+}
\ No newline at end of file
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbgroupboxheadingwidget/hbgroupboxheadingwidget.css
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbgroupboxheadingwidget/hbgroupboxheadingwidget.css	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbgroupboxheadingwidget/hbgroupboxheadingwidget.css	Mon May 03 12:48:33 2010 +0300
@@ -7,6 +7,7 @@
 HbGroupBoxHeadingWidget[groupBoxType="3"] 
 {
     layout:collapsing_container;
+    size-policy-vertical:fixed;
 }
 
 /* Simple Label groupBox */
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hblabel/hblabel.css
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hblabel/hblabel.css	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hblabel/hblabel.css	Mon May 03 12:48:33 2010 +0300
@@ -16,3 +16,14 @@
     top:-var(hb-param-margin-label);
     bottom:var(hb-param-margin-label);
 }
+
+HbDialog::heading > HbLabel::text {
+    left:-var(hb-param-margin-gene-popup);
+    right:var(hb-param-margin-gene-popup);
+    top:-var(hb-param-margin-gene-popup);
+    bottom:var(hb-param-margin-gene-popup);
+    text-height:var(hb-param-text-height-primary);
+    text-align:left;
+    text-line-count-max: 1;
+    font-variant:primary;
+}
\ No newline at end of file
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hblabel/hblabel_color.css
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hblabel/hblabel_color.css	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hblabel/hblabel_color.css	Mon May 03 12:48:33 2010 +0300
@@ -2,3 +2,8 @@
 {
     color:var(qtc_default_main_pane_normal);
 }
+
+HbDialog::heading > HbLabel::text
+{
+    color:var(qtc_popup_heading_normal);
+}
\ No newline at end of file
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hblistviewitem/hblistviewitem.widgetml
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hblistviewitem/hblistviewitem.widgetml	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hblistviewitem/hblistviewitem.widgetml	Mon May 03 12:48:33 2010 +0300
@@ -21,6 +21,8 @@
     <layout name="layout-1" type="mesh">
       <meshitem src="selection-icon" srcEdge="LEFT" dst="" dstEdge="LEFT" spacing="-var(hb-param-margin-gene-left)" />
       <meshitem src="selection-icon" srcEdge="CENTERV" dst="text-1" dstEdge="CENTERV" />
+      <meshitem src="selection-icon" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" spacer="spacer1" />
+      <meshitem src="selection-icon" srcEdge="TOP" dst="" dstEdge="TOP" spacer="spacer2" />
       
       <meshitem src="icon-1" srcEdge="LEFT" dst="selection-icon" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-left)" />
       <meshitem src="icon-1" srcEdge="TOP" dst="text-1" dstEdge="TOP" />
@@ -40,21 +42,6 @@
       <meshitem src="text-3" srcEdge="RIGHT" dst="" dstEdge="RIGHT" spacing="var(hb-param-margin-gene-right)" />
       <meshitem src="text-3" srcEdge="BOTTOM" dst="text-2" dstEdge="BOTTOM" spacing="0.0un" />
       
-      <meshitem src="background" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-      <meshitem src="background" srcEdge="TOP" dst="" dstEdge="TOP" />
-      <meshitem src="background" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-      <meshitem src="background" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
-  
-      <meshitem src="frame" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-      <meshitem src="frame" srcEdge="TOP" dst="" dstEdge="TOP" />
-      <meshitem src="frame" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-      <meshitem src="frame" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
-      
-      <meshitem src="focus-indicator" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-      <meshitem src="focus-indicator" srcEdge="TOP" dst="" dstEdge="TOP" />
-      <meshitem src="focus-indicator" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-      <meshitem src="focus-indicator" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
-
       <meshitem src="multiselection-toucharea" srcEdge="CENTERH" dst="selection-icon" dstEdge="CENTERH" />
       <meshitem src="multiselection-toucharea" srcEdge="TOP" dst="" dstEdge="TOP" />
       <meshitem src="multiselection-toucharea" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
@@ -86,6 +73,8 @@
 
       <meshitem src="selection-icon" srcEdge="LEFT" dst="icon-1" dstEdge="LEFT" spacing="-var(hb-param-margin-gene-middle-horizontal)"/>
       <meshitem src="selection-icon" srcEdge="TOP" dst="icon-1" dstEdge="TOP" spacing="-var(hb-param-margin-gene-middle-vertical)"/>
+      <meshitem src="selection-icon" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" spacer="spacer1" />
+      <meshitem src="selection-icon" srcEdge="TOP" dst="" dstEdge="TOP" spacer="spacer2" />
 
       <meshitem src="text-1" srcEdge="BOTTOM" dst="icon-1" dstEdge="CENTERV" spacing="expr((1/2)*var(hb-param-margin-gene-middle-vertical))"/>
       <meshitem src="text-1" srcEdge="RIGHT" dst="icon-2" dstEdge="LEFT" spacing="var(hb-param-margin-gene-middle-horizontal)"/>
@@ -100,16 +89,6 @@
       <meshitem src="text-3" srcEdge="RIGHT" dst="" dstEdge="RIGHT" spacing="var(hb-param-margin-gene-right)" />
       <meshitem src="text-3" srcEdge="BOTTOM" dst="text-2" dstEdge="BOTTOM" spacing="0.0un" />
     
-      <meshitem src="background" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-      <meshitem src="background" srcEdge="TOP" dst="" dstEdge="TOP" />
-      <meshitem src="background" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-      <meshitem src="background" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
-  
-      <meshitem src="frame" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-      <meshitem src="frame" srcEdge="TOP" dst="" dstEdge="TOP" />
-      <meshitem src="frame" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-      <meshitem src="frame" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
-
       <meshitem src="multiselection-toucharea" srcEdge="LEFT" dst="" dstEdge="LEFT" />
       <meshitem src="multiselection-toucharea" srcEdge="TOP" dst="" dstEdge="TOP" />
       <meshitem src="multiselection-toucharea" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
@@ -135,6 +114,8 @@
     <layout name="layout-3" type="mesh">
       <meshitem src="selection-icon" srcEdge="LEFT" dst="" dstEdge="LEFT" spacing="-var(hb-param-margin-gene-left)" />
       <meshitem src="selection-icon" srcEdge="CENTERV" dst="text-1" dstEdge="CENTERV" />
+      <meshitem src="selection-icon" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" spacer="spacer1" />
+      <meshitem src="selection-icon" srcEdge="TOP" dst="" dstEdge="TOP" spacer="spacer2" />
 
       <meshitem src="text-1" srcEdge="LEFT" dst="selection-icon" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-left)" />
       <meshitem src="text-1" srcEdge="TOP" dst="" dstEdge="TOP" spacing="-var(hb-param-margin-gene-top)" />
@@ -150,16 +131,6 @@
       <meshitem src="text-3" srcEdge="RIGHT" dst="" dstEdge="RIGHT" spacing="var(hb-param-margin-gene-right)" />
       <meshitem src="text-3" srcEdge="CENTERV" dst="text-1" dstEdge="CENTERV" />
               
-      <meshitem src="background" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-      <meshitem src="background" srcEdge="TOP" dst="" dstEdge="TOP" />
-      <meshitem src="background" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-      <meshitem src="background" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
-  
-      <meshitem src="frame" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-      <meshitem src="frame" srcEdge="TOP" dst="" dstEdge="TOP" />
-      <meshitem src="frame" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-      <meshitem src="frame" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
-
       <meshitem src="multiselection-toucharea" srcEdge="CENTERH" dst="selection-icon" dstEdge="CENTERH" />
       <meshitem src="multiselection-toucharea" srcEdge="TOP" dst="" dstEdge="TOP" />
       <meshitem src="multiselection-toucharea" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
@@ -185,6 +156,8 @@
     <layout name="layout-4" type="mesh">
       <meshitem src="selection-icon" srcEdge="LEFT" dst="" dstEdge="LEFT" spacing="-var(hb-param-margin-gene-left)" />
       <meshitem src="selection-icon" srcEdge="CENTERV" dst="icon-1" dstEdge="CENTERV" />
+      <meshitem src="selection-icon" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" spacer="spacer1" />
+      <meshitem src="selection-icon" srcEdge="TOP" dst="" dstEdge="TOP" spacer="spacer2" />
 
       <meshitem src="icon-1" srcEdge="LEFT" dst="selection-icon" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-left)" />
       <meshitem src="icon-1" srcEdge="TOP" dst="" dstEdge="TOP" spacing="-var(hb-param-margin-gene-top)"/>
@@ -203,16 +176,6 @@
       <meshitem src="text-3" srcEdge="RIGHT" dst="" dstEdge="RIGHT" spacing="var(hb-param-margin-gene-right)"/>
       <meshitem src="text-3" srcEdge="CENTERV" dst="icon-1" dstEdge="CENTERV" />
       
-      <meshitem src="background" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-      <meshitem src="background" srcEdge="TOP" dst="" dstEdge="TOP" />
-      <meshitem src="background" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-      <meshitem src="background" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
-  
-      <meshitem src="frame" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-      <meshitem src="frame" srcEdge="TOP" dst="" dstEdge="TOP" />
-      <meshitem src="frame" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-      <meshitem src="frame" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
-
       <meshitem src="multiselection-toucharea" srcEdge="CENTERH" dst="selection-icon" dstEdge="CENTERH" />
       <meshitem src="multiselection-toucharea" srcEdge="TOP" dst="" dstEdge="TOP" />
       <meshitem src="multiselection-toucharea" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
@@ -243,6 +206,8 @@
 
       <meshitem src="selection-icon" srcEdge="LEFT" dst="icon-1" dstEdge="LEFT" spacing="-var(hb-param-margin-gene-middle-horizontal)"/>
       <meshitem src="selection-icon" srcEdge="TOP" dst="icon-1" dstEdge="TOP" spacing="-var(hb-param-margin-gene-middle-vertical)"/>
+      <meshitem src="selection-icon" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" spacer="spacer1" />
+      <meshitem src="selection-icon" srcEdge="TOP" dst="" dstEdge="TOP" spacer="spacer2" />
      
       <meshitem src="text-1" srcEdge="RIGHT" dst="icon-2" dstEdge="LEFT" spacing="var(hb-param-margin-gene-middle-horizontal)" />
       <meshitem src="text-1" srcEdge="CENTERV" dst="icon-1" dstEdge="CENTERV" />
@@ -256,16 +221,6 @@
       <meshitem src="text-3" srcEdge="RIGHT" dst="" dstEdge="RIGHT" spacing="var(hb-param-margin-gene-right)"/>
       <meshitem src="text-3" srcEdge="CENTERV" dst="icon-1" dstEdge="CENTERV" />
 
-      <meshitem src="background" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-      <meshitem src="background" srcEdge="TOP" dst="" dstEdge="TOP" />
-      <meshitem src="background" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-      <meshitem src="background" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
-
-      <meshitem src="frame" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-      <meshitem src="frame" srcEdge="TOP" dst="" dstEdge="TOP" />
-      <meshitem src="frame" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-      <meshitem src="frame" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
-
       <meshitem src="multiselection-toucharea" srcEdge="LEFT" dst="" dstEdge="LEFT" />
       <meshitem src="multiselection-toucharea" srcEdge="TOP" dst="" dstEdge="TOP" />
       <meshitem src="multiselection-toucharea" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
@@ -295,6 +250,8 @@
 
     <meshitem src="selection-icon" srcEdge="LEFT" dst="icon-1" dstEdge="LEFT" spacing="-var(hb-param-margin-gene-middle-horizontal)"/>
     <meshitem src="selection-icon" srcEdge="TOP" dst="icon-1" dstEdge="TOP" spacing="-var(hb-param-margin-gene-middle-vertical)"/>
+    <meshitem src="selection-icon" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" spacer="spacer1" />
+    <meshitem src="selection-icon" srcEdge="TOP" dst="" dstEdge="TOP" spacer="spacer2" />
 
     <meshitem src="text-1" srcEdge="RIGHT" dst="icon-2" dstEdge="LEFT" spacing="var(hb-param-margin-gene-middle-horizontal)" />
     <meshitem src="text-1" srcEdge="CENTERV" dst="icon-1" dstEdge="CENTERV" />
@@ -302,16 +259,6 @@
     <meshitem src="icon-2" srcEdge="RIGHT" dst="" dstEdge="RIGHT" spacing="var(hb-param-margin-gene-right)"/>
     <meshitem src="icon-2" srcEdge="CENTERV" dst="icon-1" dstEdge="CENTERV" />
 
-    <meshitem src="background" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="background" srcEdge="TOP" dst="" dstEdge="TOP" />
-    <meshitem src="background" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="background" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
-
-    <meshitem src="frame" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="frame" srcEdge="TOP" dst="" dstEdge="TOP" />
-    <meshitem src="frame" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="frame" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
-
     <meshitem src="multiselection-toucharea" srcEdge="LEFT" dst="" dstEdge="LEFT" />
     <meshitem src="multiselection-toucharea" srcEdge="TOP" dst="" dstEdge="TOP" />
     <meshitem src="multiselection-toucharea" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
@@ -321,32 +268,22 @@
         Required items: 
             text-1
             
-        Items from left to right:
+        Items from left to right: 
             <- text-1 ->
                                          
         Other:
             text-1: connected from TOP to item TOP and BOTTOM to item BOTTOM
-            Primitives other than text-1 are defined to force them not to become visible. Their size is set (0.0,0.0) in .css. 
+            Primitives other than text-1 are forced not to become visible. Their size is set (0.0,0.0) in .css. 
     -->
   <layout name="separator-1" type="mesh">
     <meshitem src="text-1" srcEdge="LEFT" dst="" dstEdge="LEFT" spacing="-var(hb-param-margin-gene-left)"/>
     <meshitem src="text-1" srcEdge="TOP" dst="" dstEdge="TOP" spacing="-var(hb-param-margin-gene-middle-vertical)"/>
-    <meshitem src="text-1" srcEdge="RIGHT" dst="" dstEdge="RIGHT" spacing="var(hB-param-margin-gene-right)" />
+    <meshitem src="text-1" srcEdge="RIGHT" dst="" dstEdge="RIGHT" spacing="var(hb-param-margin-gene-right)" />
     <meshitem src="text-1" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" spacing="var(hb-param-margin-gene-middle-vertical)" />
 
     <meshitem src="text-2" srcEdge="LEFT" dst="" dstEdge="LEFT"/>
     <meshitem src="text-3" srcEdge="LEFT" dst="" dstEdge="LEFT"/>
     <meshitem src="icon-1" srcEdge="LEFT" dst="" dstEdge="LEFT"/>
     <meshitem src="icon-2" srcEdge="LEFT" dst="" dstEdge="LEFT"/>
-
-    <meshitem src="background" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="background" srcEdge="TOP" dst="" dstEdge="TOP" />
-    <meshitem src="background" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="background" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
-
-    <meshitem src="frame" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="frame" srcEdge="TOP" dst="" dstEdge="TOP" />
-    <meshitem src="frame" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="frame" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
   </layout>
 </hbwidget>
\ No newline at end of file
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hblistviewitem/hblistviewitem_color.css
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hblistviewitem/hblistviewitem_color.css	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hblistviewitem/hblistviewitem_color.css	Mon May 03 12:48:33 2010 +0300
@@ -41,6 +41,30 @@
     color: var(qtc_list_item_disabled);
 }
 
+HbListViewItem::icon-1{
+    color: var(qtc_list_item_title_normal);
+}
+
+HbListViewItem::icon-1[state="pressed"]{
+    color: var(qtc_list_item_pressed);
+}
+
+HbListViewItem::icon-1[state="disabled"]{
+    color: var(qtc_list_item_disabled);
+}
+
+HbListViewItem::icon-2{
+    color: var(qtc_list_item_title_normal);
+}
+
+HbListViewItem::icon-2[state="pressed"]{
+    color: var(qtc_list_item_pressed);
+}
+
+HbListViewItem::icon-2[state="disabled"]{
+    color: var(qtc_list_item_disabled);
+}
+ 
 
 /*
     List item inside popup color definitions.
@@ -85,3 +109,26 @@
     color: var(qtc_popup_list_item_disabled);
 }
 
+HbListViewItem::icon-1[insidePopup]{
+    color: var(qtc_popup_list_title_normal);
+}
+
+HbListViewItem::icon-1[insidePopup][state="pressed"]{
+    color: var(qtc_popup_list_item_pressed);
+}
+
+HbListViewItem::icon-1[insidePopup][state="disabled"]{
+    color: var(qtc_popup_list_item_disabled);
+}
+
+HbListViewItem::icon-2[insidePopup]{
+    color: var(qtc_popup_list_title_normal);
+}
+
+HbListViewItem::icon-2[insidePopup][state="pressed"]{
+    color: var(qtc_popup_list_item_pressed);
+}
+
+HbListViewItem::icon-2[insidePopup][state="disabled"]{
+    color: var(qtc_popup_list_item_disabled);
+}
\ No newline at end of file
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbmenuitem/hbmenuitem.widgetml
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbmenuitem/hbmenuitem.widgetml	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbmenuitem/hbmenuitem.widgetml	Mon May 03 12:48:33 2010 +0300
@@ -14,10 +14,12 @@
     <meshitem src="frame" srcEdge="LEFT" dst="" dstEdge="LEFT" />
     <meshitem src="frame" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
     <meshitem src="frame" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
+	<meshitem src="frame" srcEdge="TOP" dst="" dstEdge="TOP" />
     
     <meshitem src="separator" srcEdge="LEFT" dst="" dstEdge="LEFT" />
     <meshitem src="separator" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
     <meshitem src="separator" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
+	<meshitem src="separator" srcEdge="TOP" dst="" dstEdge="TOP" />
   </layout> 
    
 </hbwidget>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbprogressbar/hbprogressbar.css
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbprogressbar/hbprogressbar.css	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbprogressbar/hbprogressbar.css	Mon May 03 12:48:33 2010 +0300
@@ -1,133 +1,134 @@
 /* Layout selection*/
 HbProgressBar[!minMaxTextVisible]
-{	
-	layout:progressbar_no_text;
+{   
+    layout:progressbar_no_text;
 }
 
 HbProgressBar[minMaxTextVisible][orientation="Horizontal"][minMaxTextAlignment="AlignTop"]
-{	
-	layout:horizontal_progressbar_top_text;
+{   
+    layout:horizontal_progressbar_top_text;
 }
 
 HbProgressBar[minMaxTextVisible][orientation="Horizontal"][minMaxTextAlignment="AlignBottom"]
-{	
-	layout:horizontal_progressbar_bottom_text;
+{   
+    layout:horizontal_progressbar_bottom_text;
 }
 
 HbProgressBar[minMaxTextVisible][orientation="Horizontal"][minMaxTextAlignment="AlignCenter"]
-{	
-	layout:horizontal_progressbar_center_text;
+{   
+    layout:horizontal_progressbar_center_text;
 }
 
 HbProgressBar[minMaxTextVisible][orientation="Vertical"][minMaxTextAlignment="AlignTop"]
-{	
-	layout:vertical_progressbar_left_text;
+{   
+    layout:vertical_progressbar_left_text;
 }
 
 HbProgressBar[minMaxTextVisible][orientation="Vertical"][minMaxTextAlignment="AlignBottom"]
-{	
-	layout:vertical_progressbar_right_text;
+{   
+    layout:vertical_progressbar_right_text;
 }
 
 HbProgressBar[minMaxTextVisible][orientation="Vertical"][minMaxTextAlignment="AlignCenter"]
-{	
-	layout:vertical_progressbar_center_text;
+{   
+    layout:vertical_progressbar_center_text;
 }
 
 /* Progressbar Elements : frame, min-text & max-text */
 HbProgressBar[orientation="Horizontal"]::frame
 {
-   pref-height: var(hb-param-widget-progress-bar-height);
-   size-policy-vertical: fixed;
-   size-policy-horizontal: preferred;
+    pref-height: var(hb-param-widget-progress-bar-height);
+    size-policy-vertical: fixed;
+    size-policy-horizontal: preferred;
   
 }
 
 HbProgressBar[orientation="Vertical"]::frame
 {
-   pref-width: var(hb-param-widget-progress-bar-height);
-   size-policy-vertical: preferred;
-   size-policy-horizontal: fixed;
-  
+    pref-width: var(hb-param-widget-progress-bar-height);
+    size-policy-vertical: preferred;
+    size-policy-horizontal: fixed;
 }
 
-HbProgressBar[orientation="Horizontal"]::toucharea1
+HbProgressBar[orientation="Horizontal"]::toucharea
 {
-   pref-height: var(hb-param-touch-area-gene-primary-medium);
-   size-policy-vertical: fixed;
-   size-policy-horizontal: preferred;  
+    pref-height: var(hb-param-touch-area-gene-primary-medium);
+    size-policy-vertical: fixed;
+    size-policy-horizontal: preferred;  
 }
 
-HbProgressBar[orientation="Vertical"]::toucharea1
+HbProgressBar[orientation="Vertical"]::toucharea
 {
-   pref-width: var(hb-param-touch-area-gene-primary-medium);
-   size-policy-vertical: preferred;
-   size-policy-horizontal: fixed;
+    pref-width: var(hb-param-touch-area-gene-primary-medium);
+    size-policy-vertical: preferred;
+    size-policy-horizontal: fixed;
   
 }
 
 HbProgressBar::min-text
 {
-	fixed-width: 10.0un;
-	fixed-height: var(hb-param-text-height-tiny);
-	font-variant:secondary;
+    fixed-width: 10.0un;
+    text-line-count-max:1;
+    text-height: var(hb-param-text-height-tiny);
+    font-variant:secondary;
 }
 
 HbProgressBar::max-text
 {
-	fixed-width: 10.0un;
-	fixed-height: var(hb-param-text-height-tiny);
-	font-variant:secondary;
+    fixed-width: 10.0un;
+    text-line-count-max:1;
+    text-height: var(hb-param-text-height-tiny);
+    font-variant:secondary;
 }
 
 /* Alignment */
 /* Alignment  - Horizontal progressbar*/
 HbProgressBar[orientation="Horizontal"]::min-text
 {
-	text-align: left;
+    text-align: left;
 }
 
 HbProgressBar[orientation="Horizontal"]::max-text
 {
-	text-align: right;
+    text-align: right;
 }
 
 HbProgressBar[orientation="Horizontal"][minMaxTextAlignment="AlignCenter"]::min-text
 {
-	text-align: right;
+    text-align: right;
 }
 
 HbProgressBar[orientation="Horizontal"][minMaxTextAlignment="AlignCenter"]::max-text
 {
-	text-align: left;
+    text-align: left;
 }
 /* Alignment  - Vertical progressbar*/
 HbProgressBar[orientation="Vertical"][minMaxTextAlignment="AlignTop"]::min-text
 {
-	text-align: right;
+    text-align: right;
 }
 
 HbProgressBar[orientation="Vertical"][minMaxTextAlignment="AlignTop"]::max-text
 {
-	text-align: right;
+    text-align: right;
 }
 
 HbProgressBar[orientation="Vertical"][minMaxTextAlignment="AlignBottom"]::min-text
 {
-	text-align: left;
+    text-align: left;
 }
 
 HbProgressBar[orientation="Vertical"][minMaxTextAlignment="AlignBottom"]::max-text
 {
-	text-align: left;
+    text-align: left;
 }
 
 HbProgressBar[orientation="Vertical"][minMaxTextAlignment="AlignCenter"]::min-text
 {
-	text-align: center;
+    text-align: center;
 }
 
 HbProgressBar[orientation="Vertical"][minMaxTextAlignment="AlignCenter"]::max-text
 {
-	text-align: center;
+    text-align: center;
 }
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbprogressbar/hbprogressbar.widgetml
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbprogressbar/hbprogressbar.widgetml	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbprogressbar/hbprogressbar.widgetml	Mon May 03 12:48:33 2010 +0300
@@ -18,10 +18,10 @@
     <meshitem src="frame" srcEdge="TOP" dst="" dstEdge="TOP" />
     <meshitem src="frame" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
 
-    <meshitem src="toucharea1" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="toucharea1" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="toucharea1" srcEdge="CENTERV" dst="" dstEdge="CENTERV" />
-    <meshitem src="toucharea1" srcEdge="CENTERH" dst="" dstEdge="CENTERH" />
+    <meshitem src="toucharea" srcEdge="LEFT" dst="frame" dstEdge="LEFT" />
+    <meshitem src="toucharea" srcEdge="RIGHT" dst="frame" dstEdge="RIGHT" />
+    <meshitem src="toucharea" srcEdge="CENTERV" dst="frame" dstEdge="CENTERV" />
+    <meshitem src="toucharea" srcEdge="CENTERH" dst="frame" dstEdge="CENTERH" />
 
   </layout>
 
@@ -56,10 +56,10 @@
     <meshitem src="frame" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
     <meshitem src="frame" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
 
-    <meshitem src="toucharea1" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="toucharea1" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="toucharea1" srcEdge="CENTERV" dst="" dstEdge="CENTERV" />
-    <meshitem src="toucharea1" srcEdge="CENTERH" dst="" dstEdge="CENTERH" />
+    <meshitem src="toucharea" srcEdge="LEFT" dst="frame" dstEdge="LEFT" />
+    <meshitem src="toucharea" srcEdge="RIGHT" dst="frame" dstEdge="RIGHT" />
+    <meshitem src="toucharea" srcEdge="CENTERV" dst="frame" dstEdge="CENTERV" />
+    <meshitem src="toucharea" srcEdge="CENTERH" dst="frame" dstEdge="CENTERH" />
 
   </layout>
   
@@ -94,10 +94,10 @@
     <meshitem src="max-text" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
     <meshitem src="max-text" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
 
-    <meshitem src="toucharea1" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="toucharea1" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="toucharea1" srcEdge="CENTERV" dst="" dstEdge="CENTERV" />
-    <meshitem src="toucharea1" srcEdge="CENTERH" dst="" dstEdge="CENTERH" />
+    <meshitem src="toucharea" srcEdge="LEFT" dst="frame" dstEdge="LEFT" />
+    <meshitem src="toucharea" srcEdge="RIGHT" dst="frame" dstEdge="RIGHT" />
+    <meshitem src="toucharea" srcEdge="CENTERV" dst="frame" dstEdge="CENTERV" />
+    <meshitem src="toucharea" srcEdge="CENTERH" dst="frame" dstEdge="CENTERH" />
 
   </layout>
 
@@ -120,23 +120,21 @@
             max-text: connected from item BOTTOM to BOTTOM
     -->
   <layout name="horizontal_progressbar_center_text" type="mesh">
-    <meshitem src="min-text" srcEdge="TOP" dst="" dstEdge="TOP" />
     <meshitem src="min-text" srcEdge="LEFT" dst="" dstEdge="LEFT" />
     <meshitem src="min-text" srcEdge="RIGHT" dst="frame" dstEdge="LEFT" spacing="var(hb-param-margin-gene-middle-horizontal)"/>
-    <meshitem src="min-text" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
+    <meshitem src="min-text" srcEdge="CENTERV" dst="frame" dstEdge="CENTERV" />
     
     <meshitem src="frame" srcEdge="TOP" dst="" dstEdge="TOP" />
     <meshitem src="frame" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
     
-    <meshitem src="max-text" srcEdge="TOP" dst="" dstEdge="TOP" />
     <meshitem src="max-text" srcEdge="LEFT" dst="frame" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-middle-horizontal)"/>
     <meshitem src="max-text" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="max-text" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
+    <meshitem src="max-text" srcEdge="CENTERV" dst="frame" dstEdge="CENTERV" />
 
-    <meshitem src="toucharea1" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="toucharea1" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="toucharea1" srcEdge="CENTERV" dst="" dstEdge="CENTERV" />
-    <meshitem src="toucharea1" srcEdge="CENTERH" dst="" dstEdge="CENTERH" />
+    <meshitem src="toucharea" srcEdge="LEFT" dst="frame" dstEdge="LEFT" />
+    <meshitem src="toucharea" srcEdge="RIGHT" dst="frame" dstEdge="RIGHT" />
+    <meshitem src="toucharea" srcEdge="CENTERV" dst="frame" dstEdge="CENTERV" />
+    <meshitem src="toucharea" srcEdge="CENTERH" dst="frame" dstEdge="CENTERH" />
 
   </layout>
 
@@ -173,10 +171,10 @@
     <meshitem src="frame" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
     <meshitem src="frame" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
 
-    <meshitem src="toucharea1" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="toucharea1" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="toucharea1" srcEdge="CENTERV" dst="" dstEdge="CENTERV" />
-    <meshitem src="toucharea1" srcEdge="CENTERH" dst="" dstEdge="CENTERH" />
+    <meshitem src="toucharea" srcEdge="LEFT" dst="frame" dstEdge="LEFT" />
+    <meshitem src="toucharea" srcEdge="RIGHT" dst="frame" dstEdge="RIGHT" />
+    <meshitem src="toucharea" srcEdge="CENTERV" dst="frame" dstEdge="CENTERV" />
+    <meshitem src="toucharea" srcEdge="CENTERH" dst="frame" dstEdge="CENTERH" />
 
   </layout>
 
@@ -212,11 +210,11 @@
     <meshitem src="min-text" srcEdge="LEFT" dst="frame" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-middle-horizontal)"/>
     <meshitem src="min-text" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
     <meshitem src="min-text" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
-
-    <meshitem src="toucharea1" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="toucharea1" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="toucharea1" srcEdge="CENTERV" dst="" dstEdge="CENTERV" />
-    <meshitem src="toucharea1" srcEdge="CENTERH" dst="" dstEdge="CENTERH" />
+ 
+    <meshitem src="toucharea" srcEdge="LEFT" dst="frame" dstEdge="LEFT" />
+    <meshitem src="toucharea" srcEdge="RIGHT" dst="frame" dstEdge="RIGHT" />
+    <meshitem src="toucharea" srcEdge="CENTERV" dst="frame" dstEdge="CENTERV" />
+    <meshitem src="toucharea" srcEdge="CENTERH" dst="frame" dstEdge="CENTERH" />
 
   </layout>
 
@@ -248,10 +246,10 @@
     <meshitem src="min-text" srcEdge="CENTERH" dst="" dstEdge="CENTERH" />
     <meshitem src="min-text" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
 
-    <meshitem src="toucharea1" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="toucharea1" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="toucharea1" srcEdge="CENTERV" dst="" dstEdge="CENTERV" />
-    <meshitem src="toucharea1" srcEdge="CENTERH" dst="" dstEdge="CENTERH" />
+    <meshitem src="toucharea" srcEdge="LEFT" dst="frame" dstEdge="LEFT" />
+    <meshitem src="toucharea" srcEdge="RIGHT" dst="frame" dstEdge="RIGHT" />
+    <meshitem src="toucharea" srcEdge="CENTERV" dst="frame" dstEdge="CENTERV" />
+    <meshitem src="toucharea" srcEdge="CENTERH" dst="frame" dstEdge="CENTERH" />
 
 
   </layout>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbprogressbar/hbprogressbar_color.css
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbprogressbar/hbprogressbar_color.css	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbprogressbar/hbprogressbar_color.css	Mon May 03 12:48:33 2010 +0300
@@ -1,8 +1,9 @@
-HbProgressBar::min_text_element{
+/*color of text item depends on parent, using default color for text items*/
+HbProgressBar::min-text{
 	color: var(qtc_default_main_pane_normal);
 }
 
-HbProgressBar::max_text_element{
+HbProgressBar::max-text{
 	color: var(qtc_default_main_pane_normal);
 }
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbprogressdialogcontentwidget/hbprogressdialogcontentwidget.css
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbprogressdialogcontentwidget/hbprogressdialogcontentwidget.css	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbprogressdialogcontentwidget/hbprogressdialogcontentwidget.css	Mon May 03 12:48:33 2010 +0300
@@ -1,31 +1,24 @@
-HbProgressDialogContentWidget[hasIcon="true"]{
+/*Layout Selection*/
+HbProgressDialogContentWidget{
     layout:progressdialog_layout;
 }
 
-HbProgressDialogContentWidget[hasIcon="false"]{
-    layout:progressdialog_layout_text;
-}
-
+/*Primitive & sub-element properties*/
 HbProgressDialogContentWidget::text
 {
     top:-var(hb-param-margin-gene-popup);
-    left:-var(hb-param-margin-gene-popup);  
-    right:var(hb-param-margin-gene-popup);   
-    bottom:var(hb-param-margin-gene-popup);
+    left:-var(hb-param-margin-gene-popup);
+    right:var(hb-param-margin-gene-popup);
     
     font-variant:primary;
-    text-line-count-min: 3;
-    text-line-count-max: 5;
-    text-height:var(hb-param-text-height-secondary);
+    text-height: var(hb-param-text-height-primary);
 }
 
-
-HbProgressDialogContentWidget[hasIcon="true"]::icon
+HbProgressDialogContentWidget::icon
 {
     top:-var(hb-param-margin-gene-popup);
-    left:-var(hb-param-margin-gene-popup);  
-    right:var(hb-param-margin-gene-popup); 
-      
+    left:-var(hb-param-margin-gene-popup);
+    
     fixed-width:var(hb-param-graphic-size-primary-large);
     fixed-height:var(hb-param-graphic-size-primary-large);  
 }
@@ -34,8 +27,32 @@
 {   
     left:-var(hb-param-margin-gene-popup);
     right:var(hb-param-margin-gene-popup);
-    bottom:var(hb-param-margin-gene-popup);    
+    bottom:var(hb-param-margin-gene-popup);
     
     fixed-height:var(hb-param-widget-progress-bar-height);  
 }
 
+HbProgressDialogContentWidget::TextSpacer
+{
+    min-height:var(hb-param-margin-gene-popup);
+}
+
+HbProgressDialogContentWidget::IconSpacer
+{
+    min-height:var(hb-param-margin-gene-popup);
+}
+
+/* Text line count for Icon & Text Layout use cases */
+HbProgressDialogContentWidget[text="true"][icon="true"]::text
+{
+    text-line-count-min:1;
+    text-line-count-max:3;
+}
+
+/* Text line count for only text Layout use cases */
+HbProgressDialogContentWidget[text="true"][icon="false"]::text
+{
+    text-line-count-min:1;
+    text-line-count-max:5;
+}
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbprogressdialogcontentwidget/hbprogressdialogcontentwidget.widgetml
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbprogressdialogcontentwidget/hbprogressdialogcontentwidget.widgetml	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbprogressdialogcontentwidget/hbprogressdialogcontentwidget.widgetml	Mon May 03 12:48:33 2010 +0300
@@ -1,33 +1,46 @@
 <hbwidget version="0.1" type="HbProgressDialogContentWidget">
-
+  <!--  layout : progressdialog_layout -->
+  <!--
+        Required item: 
+            text
+        Optional item:
+            icon
+        Default item:
+            pBar
+            
+        Items from left to right:
+            <- icon   <-    text ->
+            <-      pBar         ->
+                                         
+        Other:
+            icon: connected from item TOP to TOP 
+                        
+            text: connected from item TOP to TOP 
+            
+            IconSpacer: connected from item TOP to icon BOTTOM
+            IconSpacer: connected from item BOTTOM to pBar TOP
+            
+            TextSpacer: connected from item TOP to text BOTTOM
+            TextSpacer: connected from item BOTTOM to pBar TOP
+            
+            pBar: connected from item BOTTOM to BOTTOM 
+    -->
   <layout name="progressdialog_layout" type="mesh">
 
-    <meshitem src="icon" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="icon" srcEdge="TOP" dst="" dstEdge="TOP" />
-
-    <meshitem src="text" srcEdge="LEFT" dst="icon" dstEdge="RIGHT" />
-    <meshitem src="text" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="text" srcEdge="TOP" dst="" dstEdge="TOP" />
-    <meshitem src="text" srcEdge="BOTTOM" dst="pbar" dstEdge="TOP" />
+      <meshitem src="icon" srcEdge="TOP" dst="" dstEdge="TOP" />
+      <meshitem src="icon" srcEdge="LEFT" dst="" dstEdge="LEFT" />
+      <meshitem src="icon" srcEdge="BOTTOM" dst="pbar" dstEdge="TOP" spacer="IconSpacer"/>
 
-    <meshitem src="pbar" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="pbar" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="pbar" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
- 
-  </layout>
-
-  <layout name="progressdialog_layout_text" type="mesh">
+      <meshitem src="text" srcEdge="TOP" dst="" dstEdge="TOP" />
+      <meshitem src="text" srcEdge="LEFT" dst="icon" dstEdge="RIGHT" />
+      <meshitem src="text" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
+      <meshitem src="text" srcEdge="BOTTOM" dst="pbar" dstEdge="TOP" spacer="TextSpacer"/>
 
-    <meshitem src="text" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="text" srcEdge="TOP" dst="" dstEdge="TOP" />
-    <meshitem src="text" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="text" srcEdge="BOTTOM" dst="pbar" dstEdge="TOP" />
-   
-    <meshitem src="pbar" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="pbar" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="pbar" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
- 
-  </layout>
+      <meshitem src="pbar" srcEdge="LEFT" dst="" dstEdge="LEFT" />
+      <meshitem src="pbar" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
+      <meshitem src="pbar" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
+
+    </layout>
 
 </hbwidget>
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbprogressslider/hbprogressslider.css
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbprogressslider/hbprogressslider.css	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbprogressslider/hbprogressslider.css	Mon May 03 12:48:33 2010 +0300
@@ -1,4 +1,4 @@
-HbProgressSlider[orientation="Horizontal"]::frame_element
+HbProgressSlider[orientation="Horizontal"]::frame
 {
    pref-height: var(hb-param-widget-progress-slider-height);
    size-policy-vertical: fixed;
@@ -6,7 +6,7 @@
   
 }
 
-HbProgressSlider[orientation="Vertical"]::frame_element
+HbProgressSlider[orientation="Vertical"]::frame
 {
    pref-width: var(hb-param-widget-progress-slider-height);
    size-policy-vertical: preferred;
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbprogressslider/hbprogressslider_color.css
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbprogressslider/hbprogressslider_color.css	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,13 @@
+/*  
+    Color of text item depends on parent,so using default-color 
+*/
+
+HbProgressSlider[!enabled]::min-text{
+    color: var(qtc_default_main_pane_disabled);
+}
+
+HbProgressSlider[!enabled]::max-text{
+    color: var(qtc_default_main_pane_disabled);
+}
+
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbprogresssliderhandle/hbprogresssliderhandle.css
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbprogresssliderhandle/hbprogresssliderhandle.css	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbprogresssliderhandle/hbprogresssliderhandle.css	Mon May 03 12:48:33 2010 +0300
@@ -4,18 +4,12 @@
     layout:progresshandle;
 }
 
-HbProgressSliderHandle::handle
+HbProgressSliderHandle::icon
 {
      fixed-height: expr(var(hb-param-widget-progress-slider-height)*1.5); 
      fixed-width: expr(var(hb-param-widget-progress-slider-height)*1.5);  
 }
 
-HbProgressSliderHandle::icon
-{
-     fixed-height: var(hb-param-graphic-size-secondary);
-     fixed-width: var(hb-param-graphic-size-secondary);  
-}
-
 HbProgressSliderHandle::toucharea
 {
      fixed-height: var(hb-param-touch-area-gene-primary-medium);
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbprogresssliderhandle/hbprogresssliderhandle.widgetml
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbprogresssliderhandle/hbprogresssliderhandle.widgetml	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbprogresssliderhandle/hbprogresssliderhandle.widgetml	Mon May 03 12:48:33 2010 +0300
@@ -2,17 +2,13 @@
 
   <layout name="progresshandle" type="mesh">
     
-    <meshitem src="handle" srcEdge="TOP" dst="" dstEdge="TOP" />
-    <meshitem src="handle" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
-    <meshitem src="handle" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="handle" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-
-    <meshitem src="icon" srcEdge="CENTERV" dst="handle" dstEdge="CENTERV" />
-    <meshitem src="icon" srcEdge="CENTERH" dst="handle" dstEdge="CENTERH" />
-
+    <meshitem src="icon" srcEdge="TOP" dst="" dstEdge="TOP" />
+    <meshitem src="icon" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
+    <meshitem src="icon" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
+    <meshitem src="icon" srcEdge="LEFT" dst="" dstEdge="LEFT" />
     
-    <meshitem src="toucharea" srcEdge="CENTERV" dst="handle" dstEdge="CENTERV" />
-    <meshitem src="toucharea" srcEdge="CENTERH" dst="handle" dstEdge="CENTERH" />
+    <meshitem src="toucharea" srcEdge="CENTERV" dst="icon" dstEdge="CENTERV" />
+    <meshitem src="toucharea" srcEdge="CENTERH" dst="icon" dstEdge="CENTERH" />
   </layout>
 
 </hbwidget>
\ No newline at end of file
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbprogresssliderhandle/hbprogresssliderhandle_color.css
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbprogresssliderhandle/hbprogresssliderhandle_color.css	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-HbProgressSliderHandle[state= "normal"]::icon
-{
-    color: var(qtc_input_function_latched);
-}
-HbProgressSliderHandle[state = "pressed"]::icon
-{
-    color: var(qtc_view_normal);
-}
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbpushbutton/hbpushbutton.css
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbpushbutton/hbpushbutton.css	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbpushbutton/hbpushbutton.css	Mon May 03 12:48:33 2010 +0300
@@ -2,13 +2,41 @@
     layout:icon_button;
 }
 
+/*
+	Default height of button as per the pdf if none of the primitives are there.
+*/
+HbPushButton[!icon][!text][!additionalText]{
+    min-height:expr(var(hb-param-margin-gene-top)+var(hb-param-margin-gene-bottom)+var(hb-param-text-height-secondary));
+    min-width:expr(var(hb-param-margin-gene-left)+var(hb-param-margin-gene-right)+var(hb-param-graphic-size-function));
+}
+
+
+/*
+	specifying the min-height for icon only layout as icon has pref-height. 
+	specifying the min-width for icon only layout as icon has pref-width. 
+*/
 HbPushButton[icon][!text][!additionalText]{
     layout:icon_button;
+    min-height:expr(var(hb-param-margin-gene-top)+var(hb-param-margin-gene-bottom)+var(hb-param-text-height-secondary));
+    min-width:expr(var(hb-param-margin-gene-left)+var(hb-param-margin-gene-right)+var(hb-param-graphic-size-function));
 }
 
 HbPushButton[text][!icon][!additionalText]{
     layout:text_button;
 }
+/*
+	specifying the min-height for icon + text vertical layout as icon has pref-height. 
+*/
+
+HbPushButton[!stretched][icon][text][!additionalText]{
+    layout:icon_text_Vertical;
+    min-height:expr(var(hb-param-margin-gene-top)+var(hb-param-margin-gene-bottom)+var(hb-param-text-height-secondary));
+    /*min-width:expr(var(hb-param-margin-gene-left) + var(hb-param-margin-gene-right) + var(hb-param-graphic-size-function));*/
+}
+
+HbPushButton[stretched][icon][text][!additionalText]{
+    layout:icon_text_Horizontal;
+}
 
 HbPushButton[!stretched][icon][text][additionalText]{
     layout:icon_text_additionalText_vertical;  
@@ -18,43 +46,45 @@
     layout:icon_text_additionalText_horizontal;
 }
 
-HbPushButton[stretched][icon][text][!additionalText]{
-    layout:icon_text_Horizontal;
-}
-
-HbPushButton[!stretched][icon][text][!additionalText]{
-    layout:icon_text_Vertical;
-}
-
 HbPushButton[!stretched][additionalText][text][!icon]{
     layout:text_additionalText_vertical;    
 }
 
+/*
+	icon common attributes
+*/
 HbPushButton::icon{
-    top: -var(hb-param-margin-gene-center-align) ;
-    bottom: var(hb-param-margin-gene-center-align) ; 
     pref-width: var(hb-param-graphic-size-function);
     pref-height: var(hb-param-graphic-size-function);
-    size-policy: preferred preferred;    
 }
 
+/*
+	text common attributes
+*/
 HbPushButton::text
 {
+    font-variant:primary;
+    text-height: var(hb-param-text-height-tiny);
+    text-align:center;
+}
+
+HbPushButton[icon][!text][!additionalText]::icon{
+    top: -var(hb-param-margin-gene-center-align) ;
+    bottom: var(hb-param-margin-gene-center-align) ; 
+}
+
+HbPushButton[text][!icon][!additionalText]::text
+{
     top: -var(hb-param-margin-gene-center-align) ;
     bottom: var(hb-param-margin-gene-center-align) ;
     left: -var(hb-param-margin-gene-left);
     right: var(hb-param-margin-gene-right);
-    font-variant:primary;
-    text-height: var(hb-param-text-height-tiny);
-    text-align:center;
     text-line-count-max:2;
 }
 
 /* icon_text_Horizontal */
 HbPushButton[stretched][icon][text][!additionalText]::text{
     right: var(hb-param-margin-gene-right);
-    font-variant: primary;
-    text-height: var(hb-param-text-height-tiny);
     text-align:left;
     text-line-count-max:2;    
 }
@@ -75,8 +105,6 @@
     bottom: var(hb-param-margin-gene-center-align) ;
     left:-var(hb-param-margin-gene-left);
     right:var(hb-param-margin-gene-right);
-    text-height:var(hb-param-text-height-tiny);
-    font-variant:primary;
     text-line-count-max:1;
 }
 
@@ -94,8 +122,6 @@
     left: -var(hb-param-margin-gene-left);
     right: var(hb-param-margin-gene-right);
     text-height: var(hb-param-text-height-title);
-    font-variant: primary;
-    text-align:center;
     text-line-count-max:1;  
 }
 
@@ -129,7 +155,6 @@
 {
     top: -var(hb-param-margin-gene-top);    
     right:var(hb-param-margin-gene-right);
-    font-variant:primary;
     text-height:var(hb-param-text-height-primary);
     text-align:left;
     text-line-count-max:1;
@@ -161,7 +186,6 @@
 HbPushButton[stretched][icon][text][additionalText]::text
 {
     left:-var(hb-param-margin-gene-middle-horizontal);
-    font-variant:primary;
     text-height:var(hb-param-text-height-primary);
     text-align:left;
     text-line-count-max:1;
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbpushbutton/hbpushbutton_color.css
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbpushbutton/hbpushbutton_color.css	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbpushbutton/hbpushbutton_color.css	Mon May 03 12:48:33 2010 +0300
@@ -9,6 +9,11 @@
     color:var(qtc_button_pressed);
 }
 
+HbPushButton[state = "latched"]::text
+{
+    color:var(qtc_button_latched);
+}
+
 HbPushButton::text[!enabled]
 {
     color:var(qtc_button_disabled);
@@ -27,13 +32,18 @@
     color:var(qtc_button_pressed);
 }
 
+HbPushButton[state = "latched"]::additional-text
+{
+    color:var(qtc_button_latched);
+}
+
 HbPushButton::additional-text[!enabled]
 {
     color:var(qtc_button_disabled);
 }
 
 /* Colors for different pushbutton states for mono icon */
-/*HbPushButton[state = "normal"]::icon
+HbPushButton[state = "normal"]::icon
 {
     color:var(qtc_button_normal);
 }
@@ -43,7 +53,12 @@
     color:var(qtc_button_pressed);
 }
 
+HbPushButton[state = "latched"]::icon
+{ 
+    color:var(qtc_button_latched);
+}
+
 HbPushButton::icon[!enabled]
 {
     color:var(qtc_button_disabled);
-}*/
+}
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbscreen/hbscreen.css
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbscreen/hbscreen.css	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbscreen/hbscreen.css	Mon May 03 12:48:33 2010 +0300
@@ -65,7 +65,6 @@
     right: 0un;
     top: 0un;
     fixed-height: expr((1/3)*var(hb-param-widget-chrome-height));
-    fixed-width: var(hb-param-screen-width);
 }
 
 HbScreen::titlebar[titleBarMinimizable="true"]{
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbscreen/hbscreen.widgetml
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbscreen/hbscreen.widgetml	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbscreen/hbscreen.widgetml	Mon May 03 12:48:33 2010 +0300
@@ -131,7 +131,7 @@
     <meshitem src="main" srcEdge="LEFT" dst="" dstEdge="LEFT" />
     <meshitem src="main" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
     <meshitem src="main" srcEdge="TOP" dst="statusbar" dstEdge="BOTTOM" />
-    <meshitem src="main" srcEdge="BOTTOM" dst="dock" dstEdge="TOP" />
+    <meshitem src="main" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
 
     <meshitem src="mainfull" srcEdge="LEFT" dst="" dstEdge="LEFT" />
     <meshitem src="mainfull" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
@@ -149,7 +149,7 @@
     <meshitem src="titlebar" srcEdge="TOP" dst="statusbar" dstEdge="BOTTOM" />
 
     <meshitem src="toolbar" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="toolbar" srcEdge="TOP" dst="main" dstEdge="TOP" />
+    <meshitem src="toolbar" srcEdge="TOP" dst="titlebar" dstEdge="BOTTOM" />
     <meshitem src="toolbar" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
 
     <meshitem src="dock" srcEdge="LEFT" dst="" dstEdge="LEFT" />
@@ -157,9 +157,9 @@
     <meshitem src="dock" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
 
     <meshitem src="main" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="main" srcEdge="RIGHT" dst="toolbar" dstEdge="LEFT" />
+    <meshitem src="main" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
     <meshitem src="main" srcEdge="TOP" dst="statusbar" dstEdge="BOTTOM" />
-    <meshitem src="main" srcEdge="BOTTOM" dst="dock" dstEdge="TOP" />
+    <meshitem src="main" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
 
     <meshitem src="mainfull" srcEdge="LEFT" dst="" dstEdge="LEFT" />
     <meshitem src="mainfull" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
@@ -185,121 +185,9 @@
     <meshitem src="dock" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
 
     <meshitem src="main" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="main" srcEdge="RIGHT" dst="toolbar" dstEdge="LEFT" />
-    <meshitem src="main" srcEdge="TOP" dst="statusbar" dstEdge="BOTTOM" />
-    <meshitem src="main" srcEdge="BOTTOM" dst="dock" dstEdge="TOP" />
-
-    <meshitem src="mainfull" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="mainfull" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="mainfull" srcEdge="TOP" dst="" dstEdge="TOP" />
-    <meshitem src="mainfull" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
-  </layout>
-
-  <layout name="landscape_horizontaltoolbar_undertitlebar" type="mesh">
-    <meshitem src="statusbar" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="statusbar" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="statusbar" srcEdge="TOP" dst="" dstEdge="TOP" />
-
-    <meshitem src="titlebar" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="titlebar" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="titlebar" srcEdge="TOP" dst="statusbar" dstEdge="BOTTOM" />
-
-    <meshitem src="toolbar" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="toolbar" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="toolbar" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
-
-    <meshitem src="dock" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="dock" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="dock" srcEdge="BOTTOM" dst="toolbar" dstEdge="TOP" />
-
-    <meshitem src="main" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="main" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="main" srcEdge="TOP" dst="statusbar" dstEdge="BOTTOM" />
-    <meshitem src="main" srcEdge="BOTTOM" dst="dock" dstEdge="TOP" />
-
-    <meshitem src="mainfull" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="mainfull" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="mainfull" srcEdge="TOP" dst="" dstEdge="TOP" />
-    <meshitem src="mainfull" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
-  </layout>
-
-  <layout name="portrait_horizontaltoolbar_undertitlebar" type="mesh">
-    <meshitem src="statusbar" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="statusbar" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="statusbar" srcEdge="TOP" dst="" dstEdge="TOP" />
-
-    <meshitem src="titlebar" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="titlebar" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="titlebar" srcEdge="TOP" dst="statusbar" dstEdge="BOTTOM" />
-
-    <meshitem src="toolbar" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="toolbar" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="toolbar" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
-
-    <meshitem src="dock" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="dock" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="dock" srcEdge="BOTTOM" dst="toolbar" dstEdge="TOP" />
-
-    <meshitem src="main" srcEdge="LEFT" dst="" dstEdge="LEFT" />
     <meshitem src="main" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
     <meshitem src="main" srcEdge="TOP" dst="statusbar" dstEdge="BOTTOM" />
-    <meshitem src="main" srcEdge="BOTTOM" dst="dock" dstEdge="TOP" />
-
-    <meshitem src="mainfull" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="mainfull" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="mainfull" srcEdge="TOP" dst="" dstEdge="TOP" />
-    <meshitem src="mainfull" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
-  </layout>
-
-  <layout name="portrait_verticaltoolbar_undertitlebar" type="mesh">
-    <meshitem src="statusbar" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="statusbar" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="statusbar" srcEdge="TOP" dst="" dstEdge="TOP" />
-
-    <meshitem src="titlebar" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="titlebar" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="titlebar" srcEdge="TOP" dst="statusbar" dstEdge="BOTTOM" />
-
-    <meshitem src="toolbar" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="toolbar" srcEdge="TOP" dst="main" dstEdge="TOP" />
-    <meshitem src="toolbar" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
-
-    <meshitem src="dock" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="dock" srcEdge="RIGHT" dst="toolbar" dstEdge="LEFT" />
-    <meshitem src="dock" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
-
-    <meshitem src="main" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="main" srcEdge="RIGHT" dst="toolbar" dstEdge="LEFT" />
-    <meshitem src="main" srcEdge="TOP" dst="statusbar" dstEdge="BOTTOM" />
-    <meshitem src="main" srcEdge="BOTTOM" dst="dock" dstEdge="TOP" />
-
-    <meshitem src="mainfull" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="mainfull" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="mainfull" srcEdge="TOP" dst="" dstEdge="TOP" />
-    <meshitem src="mainfull" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
-  </layout>
-
-  <layout name="landscape_verticaltoolbar_undertitlebar" type="mesh">
-    <meshitem src="statusbar" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="statusbar" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="statusbar" srcEdge="TOP" dst="" dstEdge="TOP" />
-
-    <meshitem src="titlebar" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="titlebar" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="titlebar" srcEdge="TOP" dst="statusbar" dstEdge="BOTTOM" />
-
-    <meshitem src="toolbar" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="toolbar" srcEdge="TOP" dst="titlebar" dstEdge="BOTTOM" />
-    <meshitem src="toolbar" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
-
-    <meshitem src="dock" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="dock" srcEdge="RIGHT" dst="toolbar" dstEdge="LEFT" />
-    <meshitem src="dock" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
-
-    <meshitem src="main" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="main" srcEdge="RIGHT" dst="toolbar" dstEdge="LEFT" />
-    <meshitem src="main" srcEdge="TOP" dst="statusbar" dstEdge="BOTTOM" />
-    <meshitem src="main" srcEdge="BOTTOM" dst="dock" dstEdge="TOP" />
+    <meshitem src="main" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
 
     <meshitem src="mainfull" srcEdge="LEFT" dst="" dstEdge="LEFT" />
     <meshitem src="mainfull" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
@@ -327,7 +215,7 @@
     <meshitem src="main" srcEdge="LEFT" dst="" dstEdge="LEFT" />
     <meshitem src="main" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
     <meshitem src="main" srcEdge="TOP" dst="statusbar" dstEdge="BOTTOM" />
-    <meshitem src="main" srcEdge="BOTTOM" dst="dock" dstEdge="TOP" />
+    <meshitem src="main" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
 
     <meshitem src="mainfull" srcEdge="LEFT" dst="" dstEdge="LEFT" />
     <meshitem src="mainfull" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
@@ -355,7 +243,7 @@
     <meshitem src="main" srcEdge="LEFT" dst="" dstEdge="LEFT" />
     <meshitem src="main" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
     <meshitem src="main" srcEdge="TOP" dst="" dstEdge="TOP" />
-    <meshitem src="main" srcEdge="BOTTOM" dst="dock" dstEdge="TOP" />
+    <meshitem src="main" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
 
     <meshitem src="mainfull" srcEdge="LEFT" dst="" dstEdge="LEFT" />
     <meshitem src="mainfull" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
@@ -373,7 +261,7 @@
     <meshitem src="titlebar" srcEdge="TOP" dst="statusbar" dstEdge="BOTTOM" />
 
     <meshitem src="toolbar" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="toolbar" srcEdge="TOP" dst="main" dstEdge="TOP" />
+    <meshitem src="toolbar" srcEdge="TOP" dst="titlebar" dstEdge="BOTTOM" />
     <meshitem src="toolbar" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
 
     <meshitem src="dock" srcEdge="LEFT" dst="" dstEdge="LEFT" />
@@ -381,9 +269,9 @@
     <meshitem src="dock" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
 
     <meshitem src="main" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="main" srcEdge="RIGHT" dst="toolbar" dstEdge="LEFT" />
+    <meshitem src="main" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
     <meshitem src="main" srcEdge="TOP" dst="" dstEdge="TOP" />
-    <meshitem src="main" srcEdge="BOTTOM" dst="dock" dstEdge="TOP" />
+    <meshitem src="main" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
 
     <meshitem src="mainfull" srcEdge="LEFT" dst="" dstEdge="LEFT" />
     <meshitem src="mainfull" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
@@ -409,9 +297,9 @@
     <meshitem src="dock" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
 
     <meshitem src="main" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="main" srcEdge="RIGHT" dst="toolbar" dstEdge="LEFT" />
+    <meshitem src="main" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
     <meshitem src="main" srcEdge="TOP" dst="" dstEdge="TOP" />
-    <meshitem src="main" srcEdge="BOTTOM" dst="dock" dstEdge="TOP" />
+    <meshitem src="main" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
 
     <meshitem src="mainfull" srcEdge="LEFT" dst="" dstEdge="LEFT" />
     <meshitem src="mainfull" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
@@ -439,119 +327,7 @@
     <meshitem src="main" srcEdge="LEFT" dst="" dstEdge="LEFT" />
     <meshitem src="main" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
     <meshitem src="main" srcEdge="TOP" dst="" dstEdge="TOP" />
-    <meshitem src="main" srcEdge="BOTTOM" dst="dock" dstEdge="TOP" />
-
-    <meshitem src="mainfull" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="mainfull" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="mainfull" srcEdge="TOP" dst="" dstEdge="TOP" />
-    <meshitem src="mainfull" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
-  </layout>
-
-  <layout name="portrait_horizontaltoolbar_understatusbar" type="mesh">
-    <meshitem src="statusbar" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="statusbar" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="statusbar" srcEdge="TOP" dst="" dstEdge="TOP" />
-
-    <meshitem src="titlebar" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="titlebar" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="titlebar" srcEdge="TOP" dst="statusbar" dstEdge="BOTTOM" />
-
-    <meshitem src="toolbar" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="toolbar" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="toolbar" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
-
-    <meshitem src="dock" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="dock" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="dock" srcEdge="BOTTOM" dst="toolbar" dstEdge="TOP" />
-
-    <meshitem src="main" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="main" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="main" srcEdge="TOP" dst="" dstEdge="TOP" />
-    <meshitem src="main" srcEdge="BOTTOM" dst="dock" dstEdge="TOP" />
-
-    <meshitem src="mainfull" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="mainfull" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="mainfull" srcEdge="TOP" dst="" dstEdge="TOP" />
-    <meshitem src="mainfull" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
-  </layout>
-
-  <layout name="portrait_verticaltoolbar_understatusbar" type="mesh">
-    <meshitem src="statusbar" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="statusbar" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="statusbar" srcEdge="TOP" dst="" dstEdge="TOP" />
-
-    <meshitem src="titlebar" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="titlebar" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="titlebar" srcEdge="TOP" dst="statusbar" dstEdge="BOTTOM" />
-
-    <meshitem src="toolbar" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="toolbar" srcEdge="TOP" dst="main" dstEdge="TOP" />
-    <meshitem src="toolbar" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
-
-    <meshitem src="dock" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="dock" srcEdge="RIGHT" dst="toolbar" dstEdge="LEFT" />
-    <meshitem src="dock" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
-
-    <meshitem src="main" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="main" srcEdge="RIGHT" dst="toolbar" dstEdge="LEFT" />
-    <meshitem src="main" srcEdge="TOP" dst="" dstEdge="TOP" />
-    <meshitem src="main" srcEdge="BOTTOM" dst="dock" dstEdge="TOP" />
-
-    <meshitem src="mainfull" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="mainfull" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="mainfull" srcEdge="TOP" dst="" dstEdge="TOP" />
-    <meshitem src="mainfull" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
-  </layout>
-
-  <layout name="landscape_verticaltoolbar_understatusbar" type="mesh">
-    <meshitem src="statusbar" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="statusbar" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="statusbar" srcEdge="TOP" dst="" dstEdge="TOP" />
-
-    <meshitem src="titlebar" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="titlebar" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="titlebar" srcEdge="TOP" dst="statusbar" dstEdge="BOTTOM" />
-
-    <meshitem src="toolbar" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="toolbar" srcEdge="TOP" dst="titlebar" dstEdge="BOTTOM" />
-    <meshitem src="toolbar" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
-
-    <meshitem src="dock" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="dock" srcEdge="RIGHT" dst="toolbar" dstEdge="LEFT" />
-    <meshitem src="dock" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
-
-    <meshitem src="main" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="main" srcEdge="RIGHT" dst="toolbar" dstEdge="LEFT" />
-    <meshitem src="main" srcEdge="TOP" dst="" dstEdge="TOP" />
-    <meshitem src="main" srcEdge="BOTTOM" dst="dock" dstEdge="TOP" />
-
-    <meshitem src="mainfull" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="mainfull" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="mainfull" srcEdge="TOP" dst="" dstEdge="TOP" />
-    <meshitem src="mainfull" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
-  </layout>
-
-  <layout name="landscape_horizontaltoolbar_understatusbar" type="mesh">
-    <meshitem src="statusbar" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="statusbar" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="statusbar" srcEdge="TOP" dst="" dstEdge="TOP" />
-
-    <meshitem src="titlebar" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="titlebar" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="titlebar" srcEdge="TOP" dst="statusbar" dstEdge="BOTTOM" />
-
-    <meshitem src="toolbar" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="toolbar" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="toolbar" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
-
-    <meshitem src="dock" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="dock" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="dock" srcEdge="BOTTOM" dst="toolbar" dstEdge="TOP" />
-
-    <meshitem src="main" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="main" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="main" srcEdge="TOP" dst="" dstEdge="TOP" />
-    <meshitem src="main" srcEdge="BOTTOM" dst="dock" dstEdge="TOP" />
+    <meshitem src="main" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
 
     <meshitem src="mainfull" srcEdge="LEFT" dst="" dstEdge="LEFT" />
     <meshitem src="mainfull" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbscrollarea/hbscrollarea.css
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbscrollarea/hbscrollarea.css	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbscrollarea/hbscrollarea.css	Mon May 03 12:48:33 2010 +0300
@@ -1,10 +1,10 @@
 *{
-	speed-factor:0.0004;
-        inertia-speed-factor:2.5;
-        max-scroll-speed:3.0;
-        spring-strength:0.0013;
-        spring-damping-factor:0.33;
-        friction:0.003;
+	speed-factor:0.0001;
+	inertia-speed-factor:1.0;
+	max-scroll-speed:3.0;
+	spring-strength:0.0013;
+	spring-damping-factor:0.33;
+	friction:0.003;
 }
 
 HbScrollArea[scrollDirections="Horizontal"]
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbscrollbar/hbscrollbar.css
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbscrollbar/hbscrollbar.css	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbscrollbar/hbscrollbar.css	Mon May 03 12:48:33 2010 +0300
@@ -45,22 +45,22 @@
 HbScrollBar[orientation="Horizontal"][interactive="true"]::handle
 {
         fixed-height:var(hb-param-widget-scroll-bar-interactive-width);
-        min-width: 6un;
+        min-width: 8un;
 }
 HbScrollBar[orientation="Vertical"][interactive="true"]::handle
 {
         fixed-width:var(hb-param-widget-scroll-bar-interactive-width);
-        min-height: 6un;
+        min-height: 8un;
 }
 HbScrollBar[orientation="Horizontal"][interactive="false"]::handle
 {
         fixed-height:var(hb-param-widget-scroll-bar-indicative-width);
-        min-width: 6un;
+        min-width: 4un;
 }
 HbScrollBar[orientation="Vertical"][interactive="false"]::handle
 {
         fixed-width:var(hb-param-widget-scroll-bar-indicative-width);
-        min-height: 6un;
+        min-height: 4un;
 }
 HbScrollBar[orientation="Horizontal"][interactive="true"]::toucharea
 {
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbsearchpanel/hbsearchpanel.css
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbsearchpanel/hbsearchpanel.css	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbsearchpanel/hbsearchpanel.css	Mon May 03 12:48:33 2010 +0300
@@ -18,7 +18,8 @@
     right: var(hb-param-margin-gene-middle-horizontal);
     top: -var(hb-param-margin-gene-middle-vertical);
     bottom: var(hb-param-margin-gene-middle-vertical);
-
+    text-height: var(hb-param-text-height-primary);
+    font-variant:primary;
 }
 
 HbSearchPanel::progressbutton
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbselectiondialogcontentwidget/hbselectiondialogcontentwidget.css
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbselectiondialogcontentwidget/hbselectiondialogcontentwidget.css	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,29 @@
+HbSelectionDialogContentWidget[!multiSelection]{
+	layout:default;
+}
+
+HbSelectionDialogContentWidget[multiSelection]{
+	layout:list_with_markall;
+	
+}
+
+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
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbselectiondialogcontentwidget/hbselectiondialogcontentwidget.widgetml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbselectiondialogcontentwidget/hbselectiondialogcontentwidget.widgetml	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,25 @@
+<hbwidget version="0.1" type="HbSelectionDialogContentWidget">
+
+  <layout name="default" type="mesh">
+    <meshitem src="list" srcEdge="LEFT" dst="" dstEdge="LEFT" />
+    <meshitem src="list" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
+    <meshitem src="list" srcEdge="TOP" dst="" dstEdge="TOP" />
+    <meshitem src="list" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
+  </layout>
+
+
+  <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="counter" srcEdge="CENTERV" dst="checkbox" dstEdge="CENTERV" />
+    <meshitem src="counter" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
+
+    <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>
+
+</hbwidget>
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbstatusbar/hbstatusbar.css
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbstatusbar/hbstatusbar.css	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbstatusbar/hbstatusbar.css	Mon May 03 12:48:33 2010 +0300
@@ -1,6 +1,7 @@
 HbStatusBar
 {
     layout:default;
+    mirroring: disabled;
 }
 
 HbStatusBar::timetext
@@ -13,13 +14,13 @@
 HbStatusBar::signal
 {
     fixed-width: var(hb-param-widget-chrome-height);
-    fixed-height: 2.5un;
+    fixed-height: 2.5un;	
 }
 
 HbStatusBar::battery
 {
     fixed-width: var(hb-param-widget-chrome-height);
-    fixed-height: 2.5un;
+    fixed-height: 2.5un;	
 }
 
 HbStatusBar::notificationindicators
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbtextedit/hbtextedit.css
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbtextedit/hbtextedit.css	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbtextedit/hbtextedit.css	Mon May 03 12:48:33 2010 +0300
@@ -1,9 +1,9 @@
 HbTextEdit{
     layout:default;
     text-align: left; 
-    line-color: var(qtc_view_normal);
     line-width: 0;
-    line-enabled: 0;
+    line-style: Solid;
+    smiley-scale: 1.5;
 }
 
 HbTextEdit::text{
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbtitlebar/hbtitlebar.css
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbtitlebar/hbtitlebar.css	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbtitlebar/hbtitlebar.css	Mon May 03 12:48:33 2010 +0300
@@ -4,7 +4,7 @@
 }
 
 HbTitleBar::status{
-    fixed-width: expr(2/3*var(hb-param-widget-chrome-height));
+    fixed-width: expr(var(hb-param-widget-chrome-height));
     fixed-height: expr(2/3*var(hb-param-widget-chrome-height));
 }
 
@@ -13,7 +13,7 @@
 }
 
 HbTitleBar::back{
-    fixed-width: expr(2/3*var(hb-param-widget-chrome-height));
+    fixed-width: expr(var(hb-param-widget-chrome-height));
     fixed-height: expr(2/3*var(hb-param-widget-chrome-height));
 }
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbtoolbutton/hbtoolbutton.css
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbtoolbutton/hbtoolbutton.css	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbtoolbutton/hbtoolbutton.css	Mon May 03 12:48:33 2010 +0300
@@ -20,21 +20,25 @@
 
 HbToolBar > HbToolButton[toolButtonStyle="3"][orientation="2"] {
     min-width:15un;
-    min-height:var(hb-param-widget-toolbar-height);
+    min-height:1un;
+    pref-height:var(hb-param-widget-toolbar-height);
 }
 
 HbToolBar > HbToolButton[toolButtonStyle="2"][orientation="2"] {
     min-width:15un;
-    min-height:var(hb-param-widget-toolbar-height);
+    min-height:1un;
+    pref-height:var(hb-param-widget-toolbar-height);
 }
 
 HbToolBar > HbToolButton[toolButtonStyle="1"][orientation="2"] {
     min-width:9un;
-    min-height:var(hb-param-widget-toolbar-height);
+    min-height:1un;
+    pref-height:var(hb-param-widget-toolbar-height);
 }
 
 HbToolBar > HbToolButton[orientation="1"] {
-    min-width:var(hb-param-widget-chrome-height);
+    pref-width:var(hb-param-widget-chrome-height);
+    min-width:1un;
     min-height:var(hb-param-widget-toolbar-height);
 }
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbtoolbutton/hbtoolbutton_color.css
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbtoolbutton/hbtoolbutton_color.css	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbtoolbutton/hbtoolbutton_color.css	Mon May 03 12:48:33 2010 +0300
@@ -83,3 +83,10 @@
 color:var(qtc_popup_sk_disabled);
 }
 
+HbTitleBar > HbIndicatorButton::icon {
+    color:var(qtc_title_pane_normal);
+}
+
+HbTitleBar > HbNavigationButton::icon {
+    color:(qtc_title_pane_normal);
+}
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbtooltiplabel/hbtooltiplabel.css
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbtooltiplabel/hbtooltiplabel.css	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbtooltiplabel/hbtooltiplabel.css	Mon May 03 12:48:33 2010 +0300
@@ -1,14 +1,19 @@
 HbToolTipLabel
-{	
-	layout:default;
+{
+    horizontal-margin:var(hb-param-margin-gene-middle-vertical);
+    vertical-margin:var(hb-param-margin-gene-middle-horizontal);	
+    screen-margin:var(hb-param-margin-gene-screen);	
+    layout:default;
 }
 
 HbToolTipLabel::label
 {
-	max-width: 40.0un;	
-        left:-1.0un;
-	right:1.0un;
-	top:-1.0un;
-	bottom:1.0un;
-        text-line-count-max: 1;
+    max-width: 40.0un;	
+    left:-var(hb-param-margin-gene-middle-horizontal);		
+    right:var(hb-param-margin-gene-middle-horizontal);	
+    top:-var(hb-param-margin-gene-middle-vertical);
+    bottom:var(hb-param-margin-gene-middle-vertical);
+    text-line-count-max: 1;
+    font-variant:secondary;
+    text-height:var(hb-param-text-height-tiny);
 }
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbtreeviewitem/hbtreeviewitem.css
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbtreeviewitem/hbtreeviewitem.css	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbtreeviewitem/hbtreeviewitem.css	Mon May 03 12:48:33 2010 +0300
@@ -16,6 +16,34 @@
 }
 
 HbTreeViewItem::text-1[modelItemType="ParentItem"]{
-	pref-height: var(hb-param-text-height-secondary);
+	text-height: var(hb-param-text-height-secondary);
 	font-variant: secondary;
 }
+
+HbListViewItem::text-2[modelItemType="ParentItem"]{
+	minimum-height: 0.0un;
+	minimum-width: 0.0un;
+	fixed-height: 0.0un;
+	fixed-width: 0.0un;
+}
+
+HbListViewItem::text-3[modelItemType="ParentItem"]{
+	minimum-height: 0.0un;
+	minimum-width: 0.0un;
+	fixed-height: 0.0un;
+	fixed-width: 0.0un;
+}
+
+HbListViewItem::icon-1[modelItemType="ParentItem"]{
+	minimum-height: 0.0un;
+	minimum-width: 0.0un;
+	fixed-height: 0.0un;
+	fixed-width: 0.0un;
+}
+
+HbListViewItem::icon-2[modelItemType="ParentItem"]{
+	minimum-height: 0.0un;
+	minimum-width: 0.0un;
+	fixed-height: 0.0un;
+	fixed-width: 0.0un;
+}
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbtreeviewitem/hbtreeviewitem.widgetml
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbtreeviewitem/hbtreeviewitem.widgetml	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbtreeviewitem/hbtreeviewitem.widgetml	Mon May 03 12:48:33 2010 +0300
@@ -12,6 +12,7 @@
             subitem-indicator: center aligned with text-1 center
             
             text-1: connected from TOP to item TOP and BOTTOM to item BOTTOM
+            Primitives other than text-1 are forced not to become visible. Their size is set (0.0,0.0) in .css. 
     -->
 
   <layout name="parentitemlayout-1" type="mesh">
@@ -26,15 +27,10 @@
     <meshitem src="text-1" srcEdge="RIGHT" dst="" dstEdge="RIGHT" spacing="var(hb-param-margin-gene-right)" />
     <meshitem src="text-1" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" spacing="var(hb-param-margin-gene-bottom)" />
 
-    <meshitem src="background" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="background" srcEdge="TOP" dst="" dstEdge="TOP" />
-    <meshitem src="background" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="background" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
-
-    <meshitem src="frame" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="frame" srcEdge="TOP" dst="" dstEdge="TOP" />
-    <meshitem src="frame" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="frame" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
+    <meshitem src="text-2" srcEdge="LEFT" dst="" dstEdge="LEFT"/>
+    <meshitem src="text-3" srcEdge="LEFT" dst="" dstEdge="LEFT"/>
+    <meshitem src="icon-1" srcEdge="LEFT" dst="" dstEdge="LEFT"/>
+    <meshitem src="icon-2" srcEdge="LEFT" dst="" dstEdge="LEFT"/>
 
     <meshitem src="multiselection-toucharea" srcEdge="CENTERH" dst="selection-icon" dstEdge="CENTERH" />
     <meshitem src="multiselection-toucharea" srcEdge="TOP" dst="" dstEdge="TOP" />
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbtumbleview/hbtumbleview.css
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbtumbleview/hbtumbleview.css	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbtumbleview/hbtumbleview.css	Mon May 03 12:48:33 2010 +0300
@@ -6,13 +6,20 @@
 HbTumbleView[scrollDirections="Horizontal"]
 {	
 	layout:tumble-layout;
+	min-width: 1un;
 }
 HbTumbleView[scrollDirections="Vertical"]
 {	
 	layout:tumble-layout;
+	min-width: 1un;
 }
 
 HbTumbleView::highlight {
     fixed-height: expr(var(hb-param-text-height-secondary)+2*var(hb-param-margin-gene-middle-vertical));
     
 }
+
+HbTumbleView::separator{
+    fixed-width: 0.5un;
+}
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbtumbleview/hbtumbleview.widgetml
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbtumbleview/hbtumbleview.widgetml	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbtumbleview/hbtumbleview.widgetml	Mon May 03 12:48:33 2010 +0300
@@ -4,5 +4,11 @@
     <meshitem src="highlight" srcEdge="LEFT" dst="" dstEdge="LEFT" />
     <meshitem src="highlight" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
     <meshitem src="highlight" srcEdge="CENTERV" dst="" dstEdge="CENTERV" />
+
+    
+    <meshitem src="separator" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
+    <meshitem src="separator" srcEdge="TOP" dst="" dstEdge="TOP" />
+    <meshitem src="separator" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
+
   </layout>
 </hbwidget>
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbview/hbview.css
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbview/hbview.css	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-HbView
-{
-    layout:default;
-    left: -var(hb-param-margin-view-left);
-    right: var(hb-param-margin-view-right);
-    top: -var(hb-param-margin-view-top);
-    bottom: var(hb-param-margin-view-bottom);
-}
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbwidget/hbwidget_color.css
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbwidget/hbwidget_color.css	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbwidget/hbwidget_color.css	Mon May 03 12:48:33 2010 +0300
@@ -1,6 +1,5 @@
-
-/* Only for AutoTest Purpose*/
-HbWidget#AutoTestWidget::text, testtext
+/* HbWidget can have a default text color (and other color attributes)*/
+HbWidget::text
 {
- color:var(testforeground_focused);
+color:var(qtc_default_main_pane_normal);
 }
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbwidgetbase/hbwidgetbase_color.css
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbwidgetbase/hbwidgetbase_color.css	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-/* HbWidget can have a default text color (and other color attributes)*/
-HbWidgetBase::text
-{
-color:var(foreground);
-}
\ No newline at end of file
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/mywidget/mywidget_color.css
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/mywidget/mywidget_color.css	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-MyWidget::text_1
-{
-color:var(testforeground_focused);
-}
-
-MyWidget[pressed]
-{
-background:var(my_widget_background_pressed);
-}
-
-MyWidget[!pressed]
-{
-background:var(my_widget_background_notpressed);
-}
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/style/hbdefault/variables/color/hbcolorgroup.css
--- a/src/hbcore/resources/themes/style/hbdefault/variables/color/hbcolorgroup.css	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/variables/color/hbcolorgroup.css	Mon May 03 12:48:33 2010 +0300
@@ -3,6 +3,8 @@
 
 @variables
 {
+
+
 /* Default palette */
 qtc_default_decor_normal:#3C3C3C;
 qtc_default_decor_pressed:#FFFFFF;
@@ -53,7 +55,7 @@
 qtc_grid_pressed:#FFFFFF;
 qtc_grid_highlight:#FFFFFF;
 qtc_grid_latched:#FFFFFF; /* Added 05.02.2010 */
-qtg_grid_disabled:#9B9B9B; /* Added 15.02.2010 */
+qtc_grid_disabled:#9B9B9B; /* Modified 01.03.2010 */
 
 /* Main area - List */ 
 qtc_list_item_title_normal:#505050;
@@ -92,7 +94,8 @@
 qtc_tumbler_highlight:#FFFFFF;
 
 /* Main area - DataForm */
-qtc_dataform_value:#3C3C3C; /* Added 08.02.2010 */
+qtc_dataform_heading:#3C3C3C; /* Added 04.03.2010 */
+qtc_dataform_heading_link:#33C8FF; /* Added 22.03.2010 */
 
 /* Main area - ProgressSlider */
 qtc_progslider_normal:#3C3C3C; /* Added 09.02.2010 */
@@ -127,8 +130,6 @@
 qtc_popup_sk_pressed:#FFFFFF;
 qtc_popup_sk_disabled:#787878; /* Added 05.02.2010 */
 qtc_popup_heading_normal:#3C3C3C;
-qtc_popup_heading_pressed:#FFFFFF;
-qtc_popup_heading_highlight:#FFFFFF;
 qtc_popup_normal:#3C3C3C;
 qtc_popup_link:#8CE0FF; /* Added 16.02.2010 */
 
@@ -149,7 +150,6 @@
 qtc_popup_grid_disabled:#787878;
 qtc_popup_grid_latched:#FFFFFF; /* Added 05.02.2010 */
 qtc_popup_grid_trans_normal:#FFFFFF; /* Added 05.02.2010 */
-qtc_popup_grid_trans_pressed:#FFFFFF; /* Added 05.02.2010 */
 
 /* Pop-ups - List in a pop-up */ 
 qtc_popup_list_title_normal:#505050;
@@ -159,6 +159,7 @@
 qtc_popup_list_item_highlight:#FFFFFF;
 qtc_popup_list_item_disabled:#787878;
 qtc_popup_list_item_latched:#FFFFFF; /* Added 05.02.2010 */
+qtc_popup_list_item_trans_normal:#FFFFFF; /* Added 12.02.2010 */
 
 /* Virtual inputs */
 qtc_input_button_normal:#505050; /* Modified 19.02.2010 */
@@ -171,6 +172,9 @@
 qtc_input_function_latched:#FFFFFF; /* Modified 19.02.2010 */
 qtc_input_function_disabled:#646464; /* Modified 19.02.2010 */
 qtc_input_preview_normal:#3C3C3C; /* Modified 22.02.2010 */
+qtc_input_hint_normal:#A0A0A0; /* Added 05.03.2010 */
+qtc_input_grid_line:#787878; /* Added 12.03.2010 */
+
 
 /* Application specific - Conversational list */ 
 qtc_conv_list_received_normal:#505050; /* Modified 05.02.2010 */
@@ -179,6 +183,7 @@
 qtc_conv_list_sent_normal:#505050; /* Modified 05.02.2010 */
 qtc_conv_list_sent_pressed:#FFFFFF; /* Modified 05.02.2010 */
 qtc_conv_list_sent_highlight:#FFFFFF; /* Modified 05.02.2010 */
+qtc_conv_list_dimmed:#787878; /* Added 26.03.2010 */
 
 /* Application specific - Calendar */ 
 qtc_cal_grid_line:#DCDCDC; /* Added 05.02.2010 */
@@ -205,9 +210,8 @@
 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_highlight:#FFFFFF; /* Added 05.02.2010 */
-
-/* Application specific - Messaging */
-qtc_messaging_heading:#3C3C3C; /* Added 05.02.2010 */
+qtc_hs_badge:#FFFFFF; /* Added 01.03.2010 */
+qtc_hs_cal:#3C3C3C; /* Added 18.03.2010 */
 
 /* Application specific - Radio & Calculator */ 
 qtc_lcd_title_normal:#505050; /* Added 11.02.2010 */
@@ -219,137 +223,7 @@
 /* Application specific - Multimedia */ 
 qtc_multimedia_trans:#FFFFFF; /* Modified 19.02.2010 */
 qtc_multimedia_trans_pressed:#FFFFFF; /* Added 19.02.2010 */
+qtc_multimedia_trans_disabled:#787878; /* Added 09.03.2010 */
 
-/* Deprecated compatibility mappings */
-default_decor_normal:var(qtc_default_decor_normal);
-default_decor_pressed:var(qtc_default_decor_pressed);
-default_decor_latched:var(qtc_default_decor_latched);
-default_decor_highlight:var(qtc_default_decor_highlight);
-default_decor_disabled:var(qtc_default_decor_disabled);
-default_main_pane_normal:var(qtc_default_main_pane_normal);
-default_main_pane_pressed:var(qtc_default_main_pane_pressed);
-default_main_pane_latched:var(qtc_default_main_pane_latched);
-default_main_pane_highlight:var(qtc_default_main_pane_highlight);
-default_main_pane_disabled:var(qtc_default_main_pane_disabled);
-default_popup_normal:var(qtc_default_popup_normal);
-default_popup_pressed:var(qtc_default_popup_pressed);
-default_popup_latched:var(qtc_default_popup_latched);
-default_popup_highlight:var(qtc_default_popup_highlight);
-default_popup_disabled:var(qtc_default_popup_disabled);
-title_pane_normal:var(qtc_title_pane_normal);
-title_pane_pressed:var(qtc_title_pane_pressed);
-title_pane_highlight:var(qtc_title_pane_highlight);
-title_pane_latched:var(qtc_title_pane_latched);
-title_pane_trans_normal:var(qtc_title_pane_trans_normal);
-title_pane_trans_pressed:var(qtc_title_pane_trans_pressed);
-title_pane_trans_highlight:var(qtc_title_pane_trans_highlight);
-title_pane_trans_latched:var(qtc_title_pane_trans_latched);
-view_normal:var(qtc_view_normal);
-view_pressed:var(qtc_view_pressed);
-view_line_normal:var(qtc_view_line_normal);
-view_link_normal:var(qtc_view_link_normal);
-view_visited_normal:var(qtc_view_visited_normal);
-view_separator_normal:var(qtc_view_separator_normal);
-viewtitle_normal:var(qtc_viewtitle_normal);
-tab_active_normal:var(qtc_tab_active_normal);
-tab_passive_normal:var(qtc_tab_passive_normal);
-tab_passive_pressed:var(qtc_tab_passive_pressed);
-grid_normal:var(qtc_grid_normal);
-grid_pressed:var(qtc_grid_pressed);
-grid_highlight:var(qtc_grid_highlight);
-list_item_title_normal:var(qtc_list_item_title_normal);
-list_item_content_normal:var(qtc_list_item_content_normal);
-list_item_parent_normal:var(qtc_list_item_parent_normal);
-list_item_pressed:var(qtc_list_item_pressed);
-list_item_highlight:var(qtc_list_item_highlight);
-list_item_disabled:var(qtc_list_item_disabled);
-button_normal:var(qtc_button_normal);
-button_pressed:var(qtc_button_pressed);
-button_latched:var(qtc_button_latched);
-button_highlight:var(qtc_button_highlight);
-button_disabled:var(qtc_button_disabled);
-editor_normal:var(qtc_editor_normal);
-editor_selected:var(qtc_editor_selected);
-editor_marker_normal:var(qtc_editor_marker_normal);
-editor_hint_normal:var(qtc_editor_hint_normal);
-toolbar_normal:var(qtc_toolbar_normal);
-toolbar_pressed:var(qtc_toolbar_pressed);
-toolbar_latched:var(qtc_toolbar_latched);
-toolbar_disabled:var(qtc_toolbar_disabled);
-toolbar_highlight:var(qtc_toolbar_highlight);
-toolbar_trans_normal:var(qtc_toolbar_trans_normal);
-toolbar_trans_pressed:var(qtc_toolbar_trans_pressed);
-toolbar_trans_latched:var(qtc_toolbar_trans_latched);
-toolbar_trans_disabled:var(qtc_toolbar_trans_disabled);
-toolbar_trans_highlight:var(qtc_toolbar_trans_highlight);
-groupbox_normal:var(qtc_groupbox_normal);
-groupbox_pressed:var(qtc_groupbox_pressed);
-groupbox_highlight:var(qtc_groupbox_highlight);
-popup_sk_normal:var(qtc_popup_sk_normal);
-popup_sk_highlight:var(qtc_popup_sk_highlight);
-popup_sk_pressed:var(qtc_popup_sk_pressed);
-popup_heading_normal:var(qtc_popup_heading_normal);
-popup_heading_pressed:var(qtc_popup_heading_pressed);
-popup_heading_highlight:var(qtc_popup_heading_highlight);
-popup_normal:var(qtc_popup_normal);
-popup_preview_normal:var(qtc_popup_preview_normal);
-popup_preview_pressed:var(qtc_popup_preview_pressed);
-popup_preview_link:var(qtc_popup_preview_link);
-popup_trans_normal:var(qtc_popup_trans_normal);
-popup_trans_pressed:var(qtc_popup_trans_pressed);
-popup_trans_link:var(qtc_popup_trans_link);
-popup_grid_normal:var(qtc_popup_grid_normal);
-popup_grid_pressed:var(qtc_popup_grid_pressed); 
-popup_grid_highlight:var(qtc_popup_grid_highlight);
-popup_grid_disabled:var(qtc_popup_grid_disabled);
-popup_list_title_normal:var(qtc_popup_list_title_normal);
-popup_list_item_content_normal:var(qtc_popup_list_item_content_normal);
-popup_list_item_parent_normal:var(qtc_popup_list_item_parent_normal);
-popup_list_item_pressed:var(qtc_popup_list_item_pressed);
-popup_list_item_highlight:var(qtc_popup_list_item_highlight);
-popup_list_item_disabled:var(qtc_popup_list_item_disabled);
-combobox_normal:var(qtc_combobox_normal);
-combobox_pressed:var(qtc_combobox_pressed);
-combobox_highlight:var(qtc_combobox_highlight);
-combobox_disabled:var(qtc_combobox_disabled);
-combobox_edit:var(qtc_combobox_edit);
-input_button_normal:var(qtc_input_button_normal);
-input_button_pressed:var(qtc_input_button_pressed);
-input_button_latched:var(qtc_input_button_latched);
-input_button_disabled:var(qtc_input_button_disabled);
-input_function_normal:var(qtc_input_function_normal);
-input_function_pressed:var(qtc_input_function_pressed);
-input_function_latched:var(qtc_input_function_latched);
-input_function_disabled:var(qtc_input_function_disabled);
-input_title_normal:var(qtc_input_title_normal);
 
-/* Deprecated legacy variables */
-/* Old color roles used for RnD */
-foreground:#FFFFFF;
-popupbackground:#000000;
-popupforeground:#FFFFFF;
-menubackground:#000000;
-menuforeground_enabled:#FFFFFF;
-menuforeground_disabled:#9B9B9B;
-toolbuttonforeground_enabled:#FFFFFF;
-toolbuttonforeground_disabled:#9B9B9B;
-slider_ticktext_color:#FFFFFF;
-
-/* Unclear cases - consider deprecated */
-list_item_separator_normal:#4d4d4d;
-qtc_checkbox_normal:#000000;
-qtc_checkbox_disabled:#a0a0a4;
-qtc_popup_trans:#000000;
-
-/* Deprecated autotest variables */
-testforeground:#010101;
-testforeground_focused:#010101;
-testforeground_nonfocused:#000000;
-testforeground_enabled:#000000;
-testforeground_disabled:#000000;
-testforground_state5:#010101;
-testforground_state5:#020202;
-my_widget_background_pressed:#ff0000;
-my_widget_background_notpressed:#0000ff;
 }
-
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/style/hbdefault/variables/layout/zoom/0/hbglobalparameters.css
--- a/src/hbcore/resources/themes/style/hbdefault/variables/layout/zoom/0/hbglobalparameters.css	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/variables/layout/zoom/0/hbglobalparameters.css	Mon May 03 12:48:33 2010 +0300
@@ -18,7 +18,7 @@
  */
  
 
-/* Hb parameters version 0.16 */ 
+/* Hb parameters version 0.17 */ 
 
 /* special variables that can be used e.g. in expressions:
 hb-param-screen-width
@@ -81,9 +81,9 @@
 hb-param-background-button-input-vkb: 1.5un;
 hb-param-background-bubble: 2.25un;
 
-hb-param-widget-slider-thumb-width: 2un;
-hb-param-widget-scroll-bar-indicative-width: 1.5un;
-hb-param-widget-scroll-bar-interactive-width: 1.5un;
+hb-param-widget-slider-thumb-width: 3un;
+hb-param-widget-scroll-bar-indicative-width: 2un;
+hb-param-widget-scroll-bar-interactive-width: 2un;
 hb-param-widget-chrome-height: 9.5un;
 hb-param-widget-toolbar-height: 9un;
 hb-param-widget-progress-bar-height: 3un;
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/resources/themes/theme.theme
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/theme.theme	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,3 @@
+[Default]
+BaseTheme = hbdefault
+DefaultActiveTheme = hbdefault
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyle.cpp
--- a/src/hbcore/style/hbstyle.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyle.cpp	Mon May 03 12:48:33 2010 +0300
@@ -63,6 +63,8 @@
 #include "hbstyleoptionindexfeedback.h"
 #include "hbstyleoptioncombobox.h"
 #include "hbstyleoptioninputdialog.h"
+#include "hbstyleoptionprogresssliderhandle_p.h"
+#include "hbstyleoptionprogressslider.h"
 
 #include <hbicon.h>
 #include <hbstyle.h>
@@ -95,7 +97,6 @@
 #include "hbwidgetstyleloader_p.h"
 #include "hbcssparser_p.h"
 #include "hbrepeaticonitem_p.h"
-#include "hbcolortheme_p.h"
 #include "hbnamespace_p.h"
 
 
@@ -109,13 +110,10 @@
 
 #include <QDebug>
 
-//Uncomment next define in order to get more debug prints.
+//Uncomment next define(s) in order to get more debug prints.
 //Similar define exists also in the engine side.
 //#define HBSTYLE_DEBUG
-
-#ifdef HBSTYLE_DEBUG
-#include <QDebug>
-#endif
+#define HBSTYLE_DEBUG_FONT
 
 /*!
     @beta
@@ -141,7 +139,651 @@
 
 */
 
-
+/*!
+        
+	    \deprecated P_PushButton_icon
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_PushButton_text
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+        
+        \deprecated P_PushButton_additionaltext
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_PushButton_background
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_PushButton_toucharea
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_PushButton_focus
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_DataGrou\deprecated P_background
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_DataGroupComboBackground
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_DataGrou\deprecated P_heading
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_DataGrou\deprecated P_description
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_DataForm_heading
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_DataForm_heading_background
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_DataForm_description
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_DataGrou\deprecated P_icon
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_ToolButton_frame
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_ToolButton_text
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_ToolButton_icon
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_Slider_thumb
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_SliderElement_text
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_SliderElement_icon
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_SliderElement_increase
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_SliderElement_decrease
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_Slider_groove
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_Slider_progressgroove
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_ItemViewItem_checkbox
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_ItemViewItem_radiobutton
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_ItemViewItem_selection
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_LineEdit_frame_normal
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_LineEdit_frame_highlight
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_TextEdit_frame_normal
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_TextEdit_frame_highlight
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_Edit_text
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_Label_text
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_Label_icon
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_MenuItem_frame
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_MenuItem_focus
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_MenuItem_text
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_MenuItem_submenuindicator
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_MenuItem_checkindicator
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_MenuItem_separator
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_ScrollBar_groove
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_ScrollBar_handle
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_ScrollBar_toucharea
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_Popu\deprecated P_background
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_Popu\deprecated P_background_weak
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_Popu\deprecated P_heading_frame
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_ToolTi\deprecated P_background
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_MessageBox_icon
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_ItemViewItem_background
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_ListViewItem_text
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_ListViewItem_richtext
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_ListViewItem_icon
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+        
+        \deprecated P_ItemHighlight_background
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_ToolBarExtension_background
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_GridViewItem_text
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_GridViewItem_icon
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_CheckBox_text
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_CheckBox_icon
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_CheckBox_toucharea
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_Fade_background
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_TitlePane_background
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_TitlePane_text
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_TitlePane_icon
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_TitleBar_toucharea
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_IndicatorGrou\deprecated P_background
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_IndicatorGrou\deprecated P_signalicon
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+   
+        \deprecated P_IndicatorGrou\deprecated P_batteryicon
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+  
+        \deprecated P_SignalIndicator_icon
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_SignalLevel_background
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_SignalLevel_icon
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_BatteryIndicator_icon
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_BatteryLevel_background
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_BatteryLevel_icon
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_IndicatorGrou\deprecated P_icon1
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_IndicatorGrou\deprecated P_icon2
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_IndicatorGrou\deprecated P_icon3
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_IndicatorGrou\deprecated P_icon4
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_ProgressBar_frame
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_ProgressBar_track
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_ProgressBar_waittrack
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+       
+        \deprecated P_ProgressBar_mintext
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_ProgressBar_maxtext
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_Softkey_background
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+ 
+        \deprecated P_NavigationButton_background
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_IndicatorButton_background
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_IndicatorButton_handleindication
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_ItemViewItem_frame
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+   
+        \deprecated P_SelectionControl_selectionstart
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_SelectionControl_selectionend
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_TreeViewItem_expandicon
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_Label_richtext
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_RatingSlider_track
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_RatingSlider_frame
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_RatingSlider_toucharea
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+				\deprecated P_ProgressSlider_frame
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+				\deprecated P_ProgressSlider_track
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_ProgressSlider_slidertrack
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_ProgressSlider_toucharea
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_ProgressSliderHandle_background
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+ 
+        \deprecated P_ProgressSliderHandle_icon
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_ProgressSliderHandle_toucharea
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_RatingSlider_layout
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_ScrollArea_continuationbottom
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_ScrollArea_continuationtop
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_ScrollArea_continuationleft
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_ScrollArea_continuationright
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_ItemViewItem_focus
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_NotificationDialog_icon
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_NotificationDialog_text
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_NotificationDialog_title
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_NotificationDialog_frame
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_ComboBox_background
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_ComboBoxPopu\deprecated P_background
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_ComboBoxButton_toucharea
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_ComboBox_text
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_DataItem_background
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_DataItem_separator
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_ColorGridViewItem_colorIcon
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_ColorGridViewItem_borderIcon
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_ColorGridViewItem_checkIcon
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_ComboBox_button
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_ProgressDialog_icon
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_ProgressDialog_text
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_DataItem_label
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_DataItem_description
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_SliderElement_touchincrease
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_SliderElement_touchdecrease
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_SliderElement_touchhandle
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_SliderElement_touchgroove
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_SliderTickMark_majoricon
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_SliderTickMark_minoricon
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_SliderTickMark_majorlabel
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_SliderTickMark_minorlabel
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_QueryInputMode_image
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_GroupBoxHeading_icon
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_GroupBoxHeading_text
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_GroupBoxMarquee_text
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_GroupBoxHeading_background
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_GroupBoxContent_background
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_DataItem_icon
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_ItemViewItem_touchmultiselection
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_TumbleView_background
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_TumbleView_frame
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_TumbleView_highlight
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_DateTimePicker_background
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_DateTimePicker_frame
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_DateTimePicker_separator
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_IndexFeedback_popu\deprecated P_text
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_IndexFeedback_popu\deprecated P_background
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_SliderPopu\deprecated P_background
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_StatusBar_background
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_StatusBar_timetext
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_InputDialog_text
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_InputDialog_additionaltext
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_ProgressSlider_toucharea
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_ProgressSlider_track
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_ProgressSliderHandle_icon
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_InputDialog_additionaltext
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_MessageBox_text
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_ProgressSlider_handle
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+
+
+        \deprecated P_ProgressBar_text
+        is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
+*/
 
 // TODO: margins should be defined in layout data once layout specification exists.
 static const int ItemName = 0xfffe;
@@ -172,6 +814,9 @@
 }
 
 /*!
+    \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.
@@ -271,6 +916,9 @@
 
 
 /*!
+    \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.
@@ -294,7 +942,7 @@
             }
             d->registeredPlugins.remove(pluginName);
 
-	        // unregister associated style files
+            // unregister associated style files
             HbWidgetStyleLoader::instance()->removeFilePath(
                 d->pluginStylePaths.value(pluginName),
                 HbLayeredStyleLoader::Concern_Layouts, 
@@ -312,6 +960,10 @@
 
 
 /*!
+
+  \deprecated HbStyle::createPrimitive(HbStyle::Primitive, QGraphicsItem*) 
+  is deprecated. This method will be replaced with an altered version which will use new base primitive enumerations.
+    
   Creates instances of primitive graphics items. This method should be used by all widgets that support styling.
   When changing the style the returned primitives can be replaced with an altered version of the primitives, or with a completely
   different primitive, to create a custom appearance. This shouldn't cause changes to the widget if the functional design
@@ -326,6 +978,7 @@
   \param primitive, to identify the primitive to create
   \param parent of the item
   \return HbWidgetBase is returned.
+
  */
 QGraphicsItem *HbStyle::createPrimitive( HbStyle::Primitive primitive, QGraphicsItem *parent ) const
 {
@@ -362,7 +1015,12 @@
                 }
             case P_ToolButton_icon:
             case P_PushButton_icon:
-			case P_ProgressDialog_icon:
+            case P_ProgressDialog_icon: {
+                HbIconItem *iconItem = new HbIconItem(HbIcon(),parent);
+                setItemName(iconItem, QLatin1String("icon"));
+                return iconItem; 
+                }
+
             case P_CheckBox_icon:
             case P_GroupBoxHeading_icon:
             case P_Label_icon:
@@ -392,6 +1050,11 @@
             case P_ToolButton_text:
             case P_CheckBox_text:
             case P_ProgressDialog_text:
+                {
+                    HbTextItem *textItem = new HbTextItem(parent);
+                    setItemName(textItem, QLatin1String("text"));
+                    return  textItem;
+                }
             case P_PushButton_text:
                 {
                 HbTextItem *ti = new HbTextItem(parent);
@@ -429,40 +1092,36 @@
                 setItemName(ti, QLatin1String("additional-text"));
                 return  ti;
                 }
-             case P_ProgressBar_toucharea:
-                {
-                HbTouchArea *ta = new HbTouchArea(parent);
-                ta->setFlag(QGraphicsItem::ItemIsFocusable);
-                setItemName(ta, QLatin1String("toucharea1"));
-				ta->setZValue(TOUCHAREA_ZVALUE);
-                return ta;
-                }
-			case P_ProgressSliderHandle_toucharea: 
+            case P_ProgressSlider_toucharea:
                 {
                 HbTouchArea *ta = new HbTouchArea(parent);
                 ta->setFlag(QGraphicsItem::ItemIsFocusable);
                 setItemName(ta, QLatin1String("toucharea"));
-				ta->setZValue(TOUCHAREA_ZVALUE);
+                ta->setZValue(TOUCHAREA_ZVALUE);
+                return ta;
+                }
+            case P_ProgressSliderHandle_toucharea: 
+                {
+                HbTouchArea *ta = new HbTouchArea(parent);
+                ta->setFlag(QGraphicsItem::ItemIsFocusable);
+                setItemName(ta, QLatin1String("toucharea"));
+                ta->setZValue(TOUCHAREA_ZVALUE);
                 if(parent){
                     parent->setHandlesChildEvents(true); 
                 }
                 return ta;
                 }
 
-			case P_ProgressSlider_handle:
-			    {
+            case P_ProgressSliderHandle_icon:
+                {
                 HbIconItem *item = new HbIconItem(QLatin1String("qtg_graf_progslider_handle_normal"), parent);
-				item->setAspectRatioMode(Qt::IgnoreAspectRatio);
-                return item;									 
-				}
-            case P_ProgressSlider_handleicon:{
-                HbIconItem *item = new HbIconItem(QLatin1String("qtg_mono_play"), parent);
+                item->setAspectRatioMode(Qt::IgnoreAspectRatio);
                 return item;
                 }
             case P_PushButton_toucharea: // Generic implementation, can add other cases here
             case P_CheckBox_toucharea:
             case P_RatingSlider_toucharea:
-	        case P_SliderElement_touchhandle: 
+            case P_SliderElement_touchhandle: 
                 {
                 HbTouchArea *ta = new HbTouchArea(parent);
                 ta->setFlag(QGraphicsItem::ItemIsFocusable);
@@ -597,7 +1256,7 @@
             {
                 HbFrameItem *n = new HbFrameItem(parent);
                 n->setZValue(-1);
-				setItemName(n , "dropdown_background");
+                setItemName(n , "dropdown_background");
                 return n;
             }
 
@@ -610,16 +1269,13 @@
                 n->setZValue(-5);
                 return n;
             }
-            case P_TumbleView_highlight:{
-                //return new HbIconItem(parent);
+            case P_TumbleView_highlight:
+            {
                 return new HbFrameItem(parent);//TODO:make it icon once iconitem setGeomoetry works for tumbleview
             }
+
             case P_DateTimePicker_separator:{
-                //return new HbIconItem(parent);
                 HbFrameItem *frameItem= new HbFrameItem(parent);//TODO:make it icon once iconitem setGeomoetry works for tumbleview
-                frameItem->frameDrawer().setFrameGraphicsName("qtg_graf_tumbler_devider");
-                frameItem->frameDrawer().setFrameType(HbFrameDrawer::OnePiece);
-                frameItem->setPreferredWidth(2);
                 return frameItem;
             }           
             case P_DataGroup_background :
@@ -665,12 +1321,12 @@
                 n->setZValue(-2);
                 return n;
             }
-            case P_ProgressBar_slidertrack:
+            case P_ProgressSlider_slidertrack:
             {
                 HbProgressTrackItem *n = new HbProgressTrackItem(parent);
                 n->setZValue(-1);
                 return n;
-            }        
+            }
             case P_Slider_progressgroove:
             {
                 HbSliderTrackItem *n=new HbSliderTrackItem(parent);
@@ -796,6 +1452,7 @@
             case P_TitlePane_icon:
             {
                 HbIconItem *n = new HbIconItem(parent);
+                n->setFlags(HbIcon::Colorized);
                 setItemName(n, QLatin1String("icon"));
                 return n;
             }
@@ -805,7 +1462,7 @@
                 n->setZValue(-1);
                 setItemName(n, QLatin1String("statusbar"));
                 return n;
-			}
+            }
             case P_StatusBar_timetext:
             {
                 HbTextItem *textItem = new HbTextItem(parent);
@@ -841,9 +1498,8 @@
                 return textItem;
             }
 
-
             case P_ProgressBar_waittrack:
-                return new HbRepeatIconItem(QLatin1String("qtg_fr_progbar_wait"), parent);
+                return new HbRepeatIconItem(QLatin1String("qtg_graf_progbar_h_wait"), parent);
 
             case P_RatingSlider_frame:
                 return  new HbRepeatItem(parent);
@@ -851,8 +1507,11 @@
             case P_RatingSlider_track:
                 return new HbRepeatMaskItem(parent);
             
-			case P_RatingSlider_layout:
-                return new HbWidgetBase(parent);
+            case P_RatingSlider_layout: {
+                HbWidgetBase *layout = new HbWidgetBase(parent);
+                setItemName(layout, "frame");
+                return layout;
+            }
 
             case P_ItemViewItem_checkbox: {
                 qDebug() << "Primitive P_ItemViewItem_checkbox is deprecated and will cease to exist in the near future.";
@@ -887,7 +1546,7 @@
                 setItemName(n, QLatin1String("icon"));
                 return n;
             }
-            case P_MessageBox_text:{
+            case P_MessageBox_text:{    //deprecated
                 HbTextItem *rti = new HbTextItem(parent);
                 return rti;
             }
@@ -935,7 +1594,7 @@
             case P_ColorGridViewItem_borderIcon:
                 return new HbIconItem("qtg_graf_colorpicker_filled", parent);
             case P_ColorGridViewItem_checkIcon:
-                return new HbIconItem("qtg_small_tick", parent); // TODO: likely wrong
+                return new HbIconItem("qtg_small_tick", parent);
 
             case P_TreeViewItem_expandicon: {
                 HbIconItem *iconItem = new HbIconItem(parent);
@@ -1041,7 +1700,7 @@
                 setItemName(n, QLatin1String("label-1"));
                 return n;
             }
-            case P_InputDialog_additional_text:
+            case P_InputDialog_additionaltext:
             {
                 HbTextItem *n = new HbTextItem(parent);
                 setItemName(n, QLatin1String("label-2"));
@@ -1053,6 +1712,10 @@
 }
 
 /*!
+
+  \deprecated HbStyle::updatePrimitive(QGraphicsItem*, HbStyle::Primitive, const QStyleOption*)
+  is deprecated. This method will be made private and finally removed since primitive updating will be done in the widgets.
+
   Updates the state and content of widget's child primitives. Update for a styled primitive should happen always when
   a state change that affects drawing occurs. Such a situation can be for example pressing of a button (change background image), or 
   changing a text for a widget having text content. The updatePrimitive() implementation for each primitive element can be considered 
@@ -1160,22 +1823,16 @@
                         if (opt->hasTextAlignment) {
                             textItem->setAlignment( opt->textAlignment );                                           
                         }                        
-                        textItem->setTextWrapping(Hb::TextWrapAnywhere);
+                        textItem->setTextWrapping(Hb::TextWordWrap);
                     }
                 }
                 break;
             case P_ProgressDialog_text:
-                 {
-                   if (const HbStyleOptionProgressDialog *opt = 
-					   qstyleoption_cast<const HbStyleOptionProgressDialog*>(option)) {
+                {
+                    if (const HbStyleOptionProgressDialog *opt = 
+                        qstyleoption_cast<const HbStyleOptionProgressDialog*>(option)) {
                         HbTextItem *textItem = static_cast<HbTextItem*>(item);
-                        textItem->setAlignment( opt->textAlignment );
-						if (opt->wrap) {
-							textItem->setTextWrapping(Hb::TextWrapAnywhere);
-						 } else {
-							 textItem->setTextWrapping(Hb::TextNoWrap);
-						}
-                        textItem->setText(opt->text);						
+                        textItem->setText(opt->text);                       
                     }
                 break;
                 }
@@ -1190,7 +1847,7 @@
                         if (opt->hasAdditionalTextAlignment) {
                             additionalTextItem->setAlignment( opt->additionalTextAlignment );                       
                         }                       
-                        additionalTextItem->setTextWrapping(Hb::TextWrapAnywhere);
+                        additionalTextItem->setTextWrapping(Hb::TextWordWrap);
                     }                    
                 }
                 break;
@@ -1219,8 +1876,8 @@
                 }
             case P_DataGroup_description:
                 {
-                   if (const HbStyleOptionDataGroup *opt = 
-                        qstyleoption_cast<const HbStyleOptionDataGroup*>(option)) {
+                   if (const HbStyleOptionDataGroupHeadingWidget *opt = 
+                        qstyleoption_cast<const HbStyleOptionDataGroupHeadingWidget*>(option)) {
                         HbTextItem *textItem = static_cast<HbTextItem*>(item);
                         textItem->setText(opt->description);
                     }
@@ -1265,22 +1922,22 @@
                     textItem->setText(opt->text);
                 }
                 break;
-            case P_ProgressBar_text: {
-                if (const HbStyleOptionProgressBar *opt = qstyleoption_cast<const HbStyleOptionProgressBar*>(option)) {
-                    HbTextItem *textItem = static_cast<HbTextItem*>(item);
-                    textItem->setAlignment(Qt::AlignCenter);
-                    textItem->setZValue(100);
-                    textItem->setText(opt->text);
-                }
-                break;
-            }
+            case P_ProgressBar_text: {    
+                  if (const HbStyleOptionProgressBar *opt = qstyleoption_cast<const HbStyleOptionProgressBar*>(option)) {    
+                      HbTextItem *textItem = static_cast<HbTextItem*>(item);    
+                      textItem->setAlignment(Qt::AlignCenter);    
+                      textItem->setZValue(100);    
+                      textItem->setText(opt->text);    
+                  }    
+                  break;    
+              } 
             case P_DataGroup_background: {
                 if (const HbStyleOptionDataGroupHeadingWidget *opt = 
                     qstyleoption_cast<const HbStyleOptionDataGroupHeadingWidget *>(option)) {
                     HbFrameItem *frameItem = static_cast<HbFrameItem*>( item );
-	                if(!frameItem){
-	                    return;
-	                }
+                    if(!frameItem){
+                        return;
+                    }
                     frameItem->setZValue(-1.0);
                     if(opt->pressed) {
                         frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_list_pressed"));
@@ -1451,11 +2108,11 @@
                 }
                 break;
             }
-			case P_StatusBar_background: {
+            case P_StatusBar_background: {
                 const HbStyleOptionStatusBar *opt = qstyleoption_cast<const HbStyleOptionStatusBar *>(option);
                 if (opt) {
-				    HbFrameItem *frameItem = static_cast<HbFrameItem*>(item);
-				    frameItem->frameDrawer().setFrameType(HbFrameDrawer::ThreePiecesHorizontal);
+                    HbFrameItem *frameItem = static_cast<HbFrameItem*>(item);
+                    frameItem->frameDrawer().setFrameType(HbFrameDrawer::ThreePiecesHorizontal);
                     if (opt->transparent) {
                         frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_statusbar_trans"));
                     } else {
@@ -1464,13 +2121,13 @@
                 }
                 break;
             }
-			case P_StatusBar_timetext: {
+            case P_StatusBar_timetext: {
                 if (const HbStyleOptionStatusBar *opt = 
                     qstyleoption_cast<const HbStyleOptionStatusBar*>(option)) {
                     HbTextItem *textItem = static_cast<HbTextItem*>(item);
                     textItem->setText(opt->timeText);
                     }
-				break;
+                break;
             }
             case P_IndicatorGroup_background: { // deprecated
                 const HbStyleOptionIndicatorGroup *opt = qstyleoption_cast<const HbStyleOptionIndicatorGroup *>(option);
@@ -1564,7 +2221,7 @@
                             iconItem->setIconName("qtg_status_wcdma");
                             break;
                         case 5:
-                            iconItem->setIconName("qtg_status_wlan");
+                            iconItem->setIconName("qtg_mono_wlan");
                             break;
                         default:
                             iconItem->setIconName("qtg_mono_offline");
@@ -1808,7 +2465,7 @@
                 const HbStyleOptionTitlePane *opt = qstyleoption_cast<const HbStyleOptionTitlePane *>(option);
                 if (opt) {
                     HbIconItem *iconItem = static_cast<HbIconItem*>(item);
-                    iconItem->setIconName("qgn_indi_input_arrow_down");
+                    iconItem->setIconName("qtg_mono_options_menu");
                 }
                 break;
             }
@@ -1855,7 +2512,6 @@
                 const HbStyleOptionToolButton *opt = qstyleoption_cast<const HbStyleOptionToolButton *>(option);
                 HbFrameItem *frameItem = static_cast<HbFrameItem*>( item );
                 frameItem->frameDrawer().setFillWholeRect(true);
-                frameItem->setGeometry(opt->rect);
                 if (opt->orientation == Qt::Vertical) {
                     frameItem->frameDrawer().setFrameType(HbFrameDrawer::ThreePiecesHorizontal);
                 } else {
@@ -1873,8 +2529,20 @@
                     break;
                 }
 
+                QString frameGraphicsName;
+                if(opt->isToolBarExtension) {
+                   if (mode == QIcon::Normal && state == QIcon::On) {
+                        if(!opt->isCheckable){
+                            frameGraphicsName = QLatin1String("qtg_fr_popup_grid_pressed");
+                        } else {
+                            frameGraphicsName = QLatin1String("qtg_fr_tb_ext");
+                        }
+                    }
+                    frameItem->frameDrawer().setFrameGraphicsName(frameGraphicsName);
+                    frameItem->frameDrawer().setFrameType(HbFrameDrawer::NinePieces);
+                    return;
+                }
                 if (!opt->toolBarPosition) {
-                    QString frameGraphicsName;
                     if (mode == QIcon::Disabled && state == QIcon::Off) {
                         frameGraphicsName = QLatin1String("qtg_fr_btn_disabled");
                     } else if (mode == QIcon::Normal && state == QIcon::On) {
@@ -1896,8 +2564,15 @@
 
                 QString frameGraphicsHeader;
                 if (!opt->useSecondaryGraphics){
-                    frameGraphicsHeader = opt->orientation == Qt::Vertical ? QLatin1String("qtg_fr_tb_h_"):
-                                                                             QLatin1String("qtg_fr_tb_v_");
+                    if (opt->useTransparentGraphics) {
+                        frameGraphicsHeader = opt->orientation == Qt::Vertical ?
+                                              QLatin1String("qtg_fr_tb_trans_h_"):
+                                              QLatin1String("qtg_fr_tb_trans_v_");
+                    } else {
+                        frameGraphicsHeader = opt->orientation == Qt::Vertical ?
+                                              QLatin1String("qtg_fr_tb_h_"):
+                                              QLatin1String("qtg_fr_tb_v_");
+                    }
                 }else {
                     frameGraphicsHeader = QLatin1String("qtg_fr_popup_sk_");
                     frameItem->frameDrawer().setMirroringMode(HbIcon::LayoutDirection);
@@ -2156,7 +2831,7 @@
             case P_CheckBox_text:
                 if (const HbStyleOptionCheckBox *opt = qstyleoption_cast<const HbStyleOptionCheckBox*>(option)) {
                     HbTextItem *textItem = static_cast<HbTextItem*>(item);
-                    textItem->setTextWrapping(Hb::TextWrapAnywhere);
+                    textItem->setTextWrapping(Hb::TextWordWrap);
                     textItem->setText(opt->text);
                 }
                 break;
@@ -2227,9 +2902,12 @@
             }
 
             case P_LineEdit_frame_highlight:{
-                if (HbFrameItem *frameItem = qgraphicsitem_cast<HbFrameItem*>( item ) ) {
-                    frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_lineedit_highlight"));
-                    frameItem->frameDrawer().setFrameType(HbFrameDrawer::NinePieces);
+                if (const HbStyleOption *opt = qstyleoption_cast<const HbStyleOption *>(option)) {
+                    if (HbFrameItem *frameItem = qgraphicsitem_cast<HbFrameItem*>( item ) ) {
+                        frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_lineedit_highlight"));
+                        frameItem->frameDrawer().setFrameType(HbFrameDrawer::NinePieces);
+                        frameItem->setGeometry(opt->boundingRect);
+                    }
                 }
             break;
             }
@@ -2243,9 +2921,12 @@
             }
 
             case P_TextEdit_frame_highlight:{
-                if (HbFrameItem *frameItem = qgraphicsitem_cast<HbFrameItem*>( item ) ) {
-                    frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_textedit_highlight"));
-                    frameItem->frameDrawer().setFrameType(HbFrameDrawer::NinePieces);
+                if (const HbStyleOption *opt = qstyleoption_cast<const HbStyleOption *>(option)) {
+                    if (HbFrameItem *frameItem = qgraphicsitem_cast<HbFrameItem*>( item ) ) {
+                        frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_textedit_highlight"));
+                        frameItem->frameDrawer().setFrameType(HbFrameDrawer::NinePieces);
+                        frameItem->setGeometry(opt->boundingRect);
+                    }
                 }
             break;
             }
@@ -2258,7 +2939,7 @@
                         if (opt->state & QStyle::State_Sunken) {
                             frameGraphicsName = QLatin1String("qtg_fr_combobox_pressed");
                         } else {
-                        	frameGraphicsName = QLatin1String("qtg_fr_combobox_normal");
+                            frameGraphicsName = QLatin1String("qtg_fr_combobox_normal");
                         }
                     } else {                        
                         frameGraphicsName = QLatin1String("qtg_fr_combobox_disabled");
@@ -2541,15 +3222,11 @@
             case P_ProgressDialog_icon:
                 if (const HbStyleOptionProgressDialog *opt = static_cast<const HbStyleOptionProgressDialog *>(option)) {
                     HbIconItem *icon = static_cast<HbIconItem*>(item);
-
                     icon->setIcon(opt->icon);
-                    icon->setAlignment(opt->iconAlignment);
                 }
-
                 break;
 
-            
-            case P_MessageBox_text:
+            case P_MessageBox_text:    //deprecated
                 if (const HbStyleOptionMessageBox *opt = static_cast<const HbStyleOptionMessageBox *>(option)) {
                     HbTextItem *textItem = static_cast<HbTextItem*>(item);
                     textItem->setAlignment(opt->textAlignment);
@@ -2563,44 +3240,27 @@
                 }
                 break;
             case P_MessageBox_icon:
-	              
                 if (const HbStyleOptionMessageBox *opt = static_cast<const HbStyleOptionMessageBox *>(option)) {
-                        HbIconItem *icon = static_cast<HbIconItem*>(item);
-                        HbIcon noteIcon = opt->icon;
-                        if(noteIcon.isNull()) {
-                            switch (opt->messageBoxType) {
-                                case HbStyleOptionMessageBox::MessageTypeInformation:
-                                    icon->setIcon(HbIcon(QLatin1String("note_info")));
-                                    break;
-                                case HbStyleOptionMessageBox::MessageTypeQuestion:
-                                    icon->setIcon(HbIcon(QLatin1String("qtg_large_question_mark")));
-                                    break;
-                                case HbStyleOptionMessageBox::MessageTypeWarning:
-                                    icon->setIcon(HbIcon(QLatin1String("note_warning")));
-                                    break;
-                                default:
-                                    break;
-                            }
-									                            
+                    HbIconItem *icon = static_cast<HbIconItem*>(item);
+                    HbIcon noteIcon = opt->icon;
+                    if(noteIcon.isNull()) {
+                        switch (opt->messageBoxType) {
+                        case HbStyleOptionMessageBox::MessageTypeInformation:
+                            icon->setIcon(HbIcon(QLatin1String("qtg_large_info")));
+                            break;
+                        case HbStyleOptionMessageBox::MessageTypeQuestion:
+                            icon->setIcon(HbIcon(QLatin1String("qtg_large_help")));
+                            break;
+                        case HbStyleOptionMessageBox::MessageTypeWarning:
+                            icon->setIcon(HbIcon(QLatin1String("qtg_large_warning")));
+                            break;
+                        default:
+                            break;
                         }
-						else {                 
-                            icon->setIcon(opt->icon);
-                        }
-                        icon->setAlignment(opt->iconAlignment);
-                }
-                break;
-            case P_ItemViewItem_background:
-                if (const HbStyleOptionAbstractViewItem *opt = qstyleoption_cast<const HbStyleOptionAbstractViewItem *>(option)) {
-                    HbIconItem *iconItem = static_cast<HbIconItem*>(item);
-                    iconItem->setZValue(-3.0);
-
-                    if (opt->background.canConvert<HbIcon>()){
-                        iconItem->setIcon(opt->background.value<HbIcon>());
-                    } else if (opt->background.canConvert<QBrush>()){
-                        iconItem->setBrush(opt->background.value<QBrush>());
+                    } else {                 
+                        icon->setIcon(opt->icon);
                     }
                 }
-
                 break;
             case P_ListViewItem_text:
                 if (const HbStyleOptionListViewItem *opt = qstyleoption_cast<const HbStyleOptionListViewItem *>(option)) {
@@ -2702,10 +3362,10 @@
                 break;
             case P_ToolBarExtension_background:
                 if (const HbStyleOption *opt = qstyleoption_cast<const HbStyleOption *>(option)) {
+                    Q_UNUSED(opt);
                     HbFrameItem *frameItem = static_cast<HbFrameItem*>(item);
                     frameItem->frameDrawer().setFrameType(HbFrameDrawer::NinePieces);
-                    frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_tb_ext"));
-                    frameItem->setGeometry(opt->boundingRect);
+                    frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_popup_trans"));
                 }
                 break;
             case P_SliderPopup_background:
@@ -2719,28 +3379,17 @@
             case P_ProgressBar_frame:
                 if (const HbStyleOptionProgressBar *opt = qstyleoption_cast<const HbStyleOptionProgressBar *>(option)) {
                     HbFrameItem *frameItem = static_cast<HbFrameItem*>(item);
-
-                    if(opt->isSlider) {
-                        frameItem->frameDrawer().setFrameType(HbFrameDrawer::OnePiece);
+                    frameItem->frameDrawer().setFrameType(HbFrameDrawer::ThreePiecesHorizontal);
                         if(opt->orientation == Qt::Horizontal){
-                            frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_graf_progslider_unrated"));
-                        }
-                        else{
-                            frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_graf_vprogslider_unrated"));
-                        }
-                    } else {
-                        frameItem->frameDrawer().setFrameType(HbFrameDrawer::ThreePiecesHorizontal);
-                        if(opt->orientation == Qt::Horizontal){
-                            frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_progbar_h_frame"));
-                        }
+                       
+                                frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_progbar_h_frame"));
+                         }
+                      
                         else{
                             frameItem->frameDrawer().setFrameType(HbFrameDrawer::ThreePiecesVertical);
-                            // frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_vprogbar_frame"));
                             frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_progbar_v_frame"));
                         }
-                    }
                     frameItem->frameDrawer().setFillWholeRect(true);
-                    //frameItem->setZValue(-2.0);
                 }
                 break;
             case P_ProgressBar_track:
@@ -2750,43 +3399,20 @@
                     if(!frameItem->isVisible()) {
                         break;
                     }
-                    if(opt->isSlider) {
-                        frameItem->frameDrawer().setFrameType(HbFrameDrawer::OnePiece);
-                        if(opt->orientation == Qt::Horizontal){
-                            frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_graf_progslider_rated"));
-                        }
-                        else{
-                            frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_graf_vprogslider_rated"));
-                        }
-                    } else {
-                        frameItem->frameDrawer().setFrameType(HbFrameDrawer::ThreePiecesHorizontal);
-                        if(opt->secondoryType){
-                            if(opt->orientation == Qt::Horizontal){
-                                frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_progbar_down"));
-
-                            }
-                            else{
-
-                                frameItem->frameDrawer().setFrameType(HbFrameDrawer::ThreePiecesVertical);
-                                frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_progress_v_frame_second"));
-                            }
-                            //frameItem->setZValue(-2.0);
-                        }
-                        else{
-                            if(opt->orientation == Qt::Horizontal){
-                                frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_progbar_h_filled"));
-                            }
-                            else{
-                                frameItem->frameDrawer().setFrameType(HbFrameDrawer::ThreePiecesVertical);
-                                frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_progbar_v_filled"));
-                            }
-                        }
-                    }
+                    frameItem->frameDrawer().setFrameType(HbFrameDrawer::ThreePiecesHorizontal);
+                    if(opt->orientation == Qt::Horizontal){
+                               frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_progbar_h_filled"));
+                     }
+                     else{
+                               frameItem->frameDrawer().setFrameType(HbFrameDrawer::ThreePiecesVertical);
+                               frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_progbar_v_filled"));
+                     }
                     frameItem->frameDrawer().setFillWholeRect(true);
                     frameItem->setMaximum(opt->maximum);
                     frameItem->setMinimum(opt->minimum);
                     frameItem->setValue(opt->progressValue);
                     frameItem->setInverted(opt->inverted);
+                    //frameItem->setGeometry(opt->rect);
                     frameItem->setOrientation(opt->orientation);
                     frameItem->update();
                 }
@@ -2807,48 +3433,52 @@
                     if(opt->stopWaitAnimation){
                         iconItem->stopAnimation();
                     }
-
-                /*    HbFrameDrawer drawer("qtg_fr_progbar_mask",HbFrameDrawer::ThreePiecesHorizontal);
-                    drawer.setFillWholeRect(true);
-                    QPixmap track(opt->frameRect.size().toSize());
-                    track.fill(Qt::black);
-                    QPainter p;
-                    p.begin(&track);
-                    drawer.paint(&p, opt->frameRect);
-                    p.end();
-                    iconItem->setIconHeight(opt->frameRect.height());//set height of the image drawer
-                    iconItem->setGeometry(opt->frameRect);//set geometry of QGI
-                    
-                    QImage i=track.toImage();
-                    i.invertPixels();
-                    iconItem->setMask(QPixmap::fromImage(i));*/
-                }
-                break;
-
-            case P_ProgressBar_slidertrack:
-                if (const HbStyleOptionProgressBar *opt = qstyleoption_cast<const HbStyleOptionProgressBar *>(option)) {
+                    }
+                    break;
+              
+            case P_ProgressSlider_frame:
+                if (const HbStyleOptionProgressSlider *opt = qstyleoption_cast<const HbStyleOptionProgressSlider *>(option)) {
+                    HbFrameItem *frameItem = static_cast<HbFrameItem*>(item);
+                    frameItem->frameDrawer().setFrameType(HbFrameDrawer::ThreePiecesHorizontal);
+                    if(opt->pressedState) {
+                        frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_progslider_frame_pressed"));
+                    }
+                    else {
+                        frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_progslider_frame_normal"));
+                    }
+                    frameItem->frameDrawer().setFillWholeRect(true);       
+                    frameItem->update();
+                    }
+                    break;
+            case P_ProgressSlider_track: // The ProgressValue Mask
+                if (const HbStyleOptionProgressSlider *opt = qstyleoption_cast<const HbStyleOptionProgressSlider *>(option)) {
                     HbProgressTrackItem* frameItem = static_cast<HbProgressTrackItem*>(item);
-
-                    if(opt->orientation == Qt::Horizontal){
-                        frameItem->frameDrawer().setFrameType(HbFrameDrawer::ThreePiecesHorizontal);
-                        frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_progbar_h_filled"));
-                    }
-                    else{
-                        frameItem->frameDrawer().setFrameType(HbFrameDrawer::ThreePiecesVertical);
-                        frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_progbar_v_filled"));
-                    }
+                    frameItem->frameDrawer().setFrameType(HbFrameDrawer::ThreePiecesHorizontal);
+                    frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_progslider_loaded"));
                     frameItem->frameDrawer().setFillWholeRect(true);
                     frameItem->setMaximum(opt->maximum);
                     frameItem->setMinimum(opt->minimum);
-                    frameItem->setValue(opt->sliderValue);
+                    frameItem->setValue(opt->progressValue);
                     frameItem->setInverted(opt->inverted);
-                    frameItem->setMaskWidth(opt->maskWidth);//maskWidth != 0 when  progress handle's moving.
                     frameItem->setOrientation(opt->orientation);
                     frameItem->update();
-                    //frameItem->setZValue(-1.0);
-                }
-                break;
-
+                    } 
+                    break;
+
+            case P_ProgressSlider_slidertrack: // The Slider Position Mask
+                if (const HbStyleOptionProgressSlider *opt = qstyleoption_cast<const HbStyleOptionProgressSlider *>(option)) {
+                    HbProgressTrackItem* frameItem = static_cast<HbProgressTrackItem*>(item);
+                    frameItem->frameDrawer().setFrameType(HbFrameDrawer::ThreePiecesHorizontal);
+                    frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_progslider_played"));
+                    frameItem->frameDrawer().setFillWholeRect(true);
+                    frameItem->setMaximum(opt->maximum);
+                    frameItem->setMinimum(opt->minimum);
+                    frameItem->setValue(opt->progressSliderValue);
+                    frameItem->setInverted(opt->inverted);
+                    frameItem->setOrientation(opt->orientation);
+                    frameItem->update();
+                    } 
+                    break;
             case P_ProgressBar_mintext: {
                  if (const HbStyleOptionProgressBar *opt = 
                         qstyleoption_cast<const HbStyleOptionProgressBar*>(option)) {
@@ -2857,7 +3487,7 @@
                             return;
                         }
                         textItem->setTextWrapping(Hb::TextWrapAnywhere);
-                        textItem->setText(opt->minText);                        	
+                        textItem->setText(opt->minText);                            
                     }
                  break;
             }
@@ -2870,7 +3500,7 @@
                             return;
                         }
                         textItem->setTextWrapping(Hb::TextWrapAnywhere);
-                        textItem->setText(opt->maxText);                        	
+                        textItem->setText(opt->maxText);                            
                     }
                 break;
             }
@@ -2909,40 +3539,22 @@
                 }
                 break;
             }
-
-   		case P_ProgressSlider_handle:
-					 if (const HbStyleOptionProgressBar *opt = qstyleoption_cast<const HbStyleOptionProgressBar *>(option)) {
+        case P_ProgressSliderHandle_icon:
+                    if (const HbStyleOptionProgressSliderHandle *opt = qstyleoption_cast<const HbStyleOptionProgressSliderHandle *>(option)) {
                         HbIconItem *iconItem = static_cast<HbIconItem*>(item);
-						iconItem->setIconName(QLatin1String("qtg_graf_progslider_handle_normal"));
-                        Q_UNUSED(opt)
-						}
-					    break;
-         case P_ProgressSlider_handleicon:
-                    if (const HbStyleOptionProgressBar *opt = qstyleoption_cast<const HbStyleOptionProgressBar *>(option)) {
-                        HbIconItem *iconItem = static_cast<HbIconItem*>(item);
-
-                        if(!opt->thumbIcon.isNull()) {                           
-                            HbIcon icon(opt->thumbIcon.iconName());                       
-                            iconItem->setIconName(opt->thumbIcon.iconName());
+
+                        if(!opt->handleIcon.isNull()) {
+                            iconItem->setIconName(opt->handleIcon.iconName());
                         }
                         else {
-                            switch(opt->sliderState) {
-                            case HbStyleOptionProgressBar::SliderStatePlayNormal:                            
-                                iconItem->setIconName(QLatin1String("qtg_mono_play"));
-                                break;
-                            case HbStyleOptionProgressBar::SliderStatePlayPressed:
-                                iconItem->setIconName(QLatin1String("qtg_mono_play"));
-                                break;
-                            case HbStyleOptionProgressBar::SliderStatePauseNormal:
-                                iconItem->setIconName(QLatin1String("qtg_mono_pause"));
-                                break;
-                            case HbStyleOptionProgressBar::SliderStatePausePressed:
-                                iconItem->setIconName(QLatin1String("qtg_mono_pause"));
-                                break;
+                            if(opt->pressedState) {
+                                iconItem->setIconName(QLatin1String("qtg_graf_progslider_handle_pressed"));
+                            }
+                            else {
+                                iconItem->setIconName(QLatin1String("qtg_graf_progslider_handle_normal"));
                             }
                         }
                     }
-
                     break;
             case P_QueryInputMode_image:
 
@@ -2953,10 +3565,24 @@
                     }
                 }*/
                 break;
+            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>());
+                    } else if (opt->background.canConvert<QBrush>()){
+                        iconItem->setBrush(opt->background.value<QBrush>());
+                    }
+                }
+
+                break;
             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>()) {
                         HbFrameBackground frame = opt->background.value<HbFrameBackground>();
@@ -2986,7 +3612,7 @@
                                 QLatin1String("qtg_fr_popup_list_normal") : QLatin1String("qtg_fr_list_normal"));
                         }
                     } else if (opt->viewItemType == Hb::ItemType_GridViewItem
-								|| opt->viewItemType == HbPrivate::ItemType_ColorGridViewItem) {
+                                || opt->viewItemType == HbPrivate::ItemType_ColorGridViewItem) {
                         frameItem->frameDrawer().setFrameType(HbFrameDrawer::NinePieces);
                         frameItem->frameDrawer().setFrameGraphicsName( opt->insidePopup ? 
                             QLatin1String("qtg_fr_popup_grid_normal") : QLatin1String("qtg_fr_grid_normal"));
@@ -3090,12 +3716,13 @@
                     }
                 }
                 break;
+
             case P_TumbleView_highlight:
                 if (const HbStyleOption *opt = qstyleoption_cast<const HbStyleOption*>(option)) {
                     if(HbFrameItem *frameItem = qgraphicsitem_cast<HbFrameItem*>(item)) {
-                        frameItem->frameDrawer().setFrameGraphicsName("qtg_graf_tumbler_highlight_sec");
-                        frameItem->frameDrawer().setFrameType(HbFrameDrawer::OnePiece);
-                        frameItem->setZValue(2);
+                        frameItem->frameDrawer().setFrameGraphicsName("qtg_fr_tumbler_highlight_pri");
+                        frameItem->frameDrawer().setFrameType(HbFrameDrawer::ThreePiecesHorizontal);
+                        frameItem->setZValue(3);
                         //TODO:temp fix, issue with css rule picking in derived class
                         
                         //frameItem->setGeometry(0,(opt->boundingRect.height()-frameItem->boundingRect().height())/2,opt->boundingRect.width(),opt->boundingRect.height());
@@ -3103,7 +3730,8 @@
                     }
                     
                 }
-                break;            
+                break;
+
             case P_IndexFeedback_popup_text:
                 if (const HbStyleOptionIndexFeedback *opt = qstyleoption_cast<const HbStyleOptionIndexFeedback *>(option)) {
                     HbTextItem *textItem = static_cast<HbTextItem*>(item);
@@ -3146,9 +3774,9 @@
             case P_DateTimePicker_separator:
                 if (const HbStyleOption *opt = qstyleoption_cast<const HbStyleOption*>(option)) {
                     if(HbFrameItem *frameItem = qgraphicsitem_cast<HbFrameItem*>(item)) {
-                        frameItem->frameDrawer().setFrameGraphicsName("qtg_graf_tumbler_highlight_pri");
+                        frameItem->frameDrawer().setFrameGraphicsName("qtg_graf_tumbler_divider");
                         frameItem->frameDrawer().setFrameType(HbFrameDrawer::OnePiece);
-                        frameItem->setZValue(0);
+                        frameItem->setZValue(2);
                         //TODO:temp fix, issue with css rule picking in derived class
 
                         //frameItem->setGeometry(0,(opt->boundingRect.height()-frameItem->boundingRect().height())/2,opt->boundingRect.width(),opt->boundingRect.height());
@@ -3165,10 +3793,10 @@
                         return;
                     }
                     textItem->setTextWrapping(Hb::TextWrapAnywhere);
-                    textItem->setText(opt->text);                        	
+                    textItem->setText(opt->text);                           
                 }
                 break;
-             case P_InputDialog_additional_text:
+             case P_InputDialog_additionaltext:
                 if (const HbStyleOptionInputDialog *opt = 
                     qstyleoption_cast<const HbStyleOptionInputDialog*>(option)) {
                     HbTextItem *textItem = static_cast<HbTextItem*>(item);
@@ -3176,7 +3804,7 @@
                         return;
                     }
                     textItem->setTextWrapping(Hb::TextWrapAnywhere);
-                    textItem->setText(opt->additionalText);                        	
+                    textItem->setText(opt->additionalText);                         
                 } 
                 break;
              default:
@@ -3191,6 +3819,7 @@
 static HbVector<HbCss::Declaration> declarations(
     const HbVector<HbCss::StyleRule> &styleRules,
     const QString &part,
+    HbWidget* widget,
     const HbDeviceProfile &profile)
 {
     quint64 pseudoClass(0);
@@ -3201,6 +3830,21 @@
         pseudoClass |= HbCss::PseudoClass_Portrait;
     }
 
+    HbMainWindow *mainWindow = 0;
+    if (widget) {
+        mainWindow = widget->mainWindow();
+    } else {
+        QList<HbMainWindow *> mainWindows = hbInstance->allMainWindows();
+        if (!mainWindows.isEmpty()) {
+            mainWindow = mainWindows.at(0);
+        }
+    }
+    if (mainWindow && mainWindow->isRightToLeft()) {
+        pseudoClass |= HbCss::PseudoClass_RightToLeft;
+    } else {
+        pseudoClass |= HbCss::PseudoClass_LeftToRight;
+    }
+
     HbVector<HbCss::Declaration> decls;
     for (int i = 0; i < styleRules.count(); i++) {
         const HbCss::Selector& selector = styleRules.at(i).selectors.at(0);
@@ -3235,19 +3879,19 @@
 #ifdef HBSTYLE_DEBUG
     qDebug() << "HbStyle::polish : -- --";
     if ( widget == item ) {
-        qDebug() << "HbStyle::polish : -- polishItem: " << widget->metaObject()->className();
+        qDebug() << "HbStyle::polishItem : -- item name: " << widget->metaObject()->className();
     } else if ( item ) {
-        qDebug() << "HbStyle::polish : -- polishItem: " << name << "(existing item)";
+        qDebug() << "HbStyle::polishItem : -- item name: " << name << "(existing item)";
     } else {
-        qDebug() << "HbStyle::polish : -- polishItem: " << name << "(missing item)";
+        qDebug() << "HbStyle::polishItem : -- item name: " << name << "(missing item)";
     }
 #endif
 
     HbDeviceProfile profile(HbDeviceProfile::profile(widget));
 
-    const HbVector<HbCss::Declaration> decl = declarations(styleRules, name, profile);
+    const HbVector<HbCss::Declaration> decl = declarations(styleRules, name, widget, profile);
 #ifdef HBSTYLE_DEBUG
-    qDebug() << "HbStyle::polish : -- Number of maching CSS declarations: " << decl.count();
+    qDebug() << "HbStyle::polishItem : -- Number of maching CSS declarations: " << decl.count();
 #endif
     HbCss::ValueExtractor extractor(decl, layoutParameters, profile);
     HbCss::GeometryValues geomValues;
@@ -3259,20 +3903,20 @@
 #endif
 #ifdef HBSTYLE_DEBUG
     if ( !extracted ) {
-        qDebug() << "HbStyle::polish : -- No geometry information found";
+        qDebug() << "HbStyle::polishItem : -- No geometry overrides found";
     }
 #endif
     extracted = extractor.extractPosition(posValues);
 #ifdef HBSTYLE_DEBUG
     if ( !extracted ) {
-        qDebug() << "HbStyle::polish : -- No position information found";
+        qDebug() << "HbStyle::polishItem : -- No position overrides found";
     }
 #endif
 
     if ( item ) {
         if (posValues.mFlags & HbCss::ExtractedZValue) {
 #ifdef HBSTYLE_DEBUG
-            qDebug() << "HbStyle::polish : -- Setting zvalue: " << posValues.mZ;
+            qDebug() << "HbStyle::polishItem : -- Setting zvalue: " << posValues.mZ;
 #endif
             item->setZValue(posValues.mZ);
         }
@@ -3282,20 +3926,44 @@
         ? static_cast<QGraphicsWidget*>(item)
         : 0;
     if ( gWidget ) {
-        if (posValues.mFlags & HbCss::ExtractedMirroring) {
+        if (posValues.mFlags & HbCss::ExtractedLayoutDirection) {
 #ifdef HBSTYLE_DEBUG
-            qDebug() << "HbStyle::polish : -- Setting mirroring: " << posValues.mMirroring;
+            qDebug() << "HbStyle::polishItem : -- Setting layout direction: " << posValues.mLayoutDirection;
 #endif
-            if(posValues.mMirroring){
+            if (posValues.mLayoutDirection == HbCss::LayoutDirection_LeftToRight) {
+                gWidget->setLayoutDirection(Qt::LeftToRight);
+            } else if (posValues.mLayoutDirection == HbCss::LayoutDirection_RightToLeft) {
+                gWidget->setLayoutDirection(Qt::RightToLeft);
+            } else {
                 gWidget->unsetLayoutDirection();
-            }else{
-                gWidget->setLayoutDirection(Qt::LeftToRight);
             }
         }
     }
 
     HbWidgetBase *hbWidget = qobject_cast<HbWidgetBase*>(gWidget);
     if ( hbWidget ) {
+#ifdef HBSTYLE_DEBUG_FONT
+        QString debugName;
+        bool isHbGroupBoxHeadingWidget(false);
+        if (!name.isEmpty()) {
+            QGraphicsItem* debugParent = hbWidget->parentItem();
+            if (debugParent->isWidget()) {
+                debugName = static_cast<QGraphicsWidget*>(debugParent)->metaObject()->className();
+                if (debugName == "HbGroupBoxHeadingWidget") {
+                    isHbGroupBoxHeadingWidget = true;
+                }
+            }
+            debugName.append("::");
+            debugName.append(name);
+        } else {
+            debugName = widget->metaObject()->className();
+        }
+        if ( isHbGroupBoxHeadingWidget ) {
+            qDebug() << "HbStyle::polishItem :" << debugName;
+            qDebug() << "HbStyle::polishItem : -- Number of maching CSS declarations: " << decl.count();
+        }
+
+#endif
         HbWidgetBasePrivate* hbWidget_p = HbWidgetBasePrivate::d_ptr(hbWidget);
         QFont font;
         HbFontSpec fontSpec;
@@ -3303,20 +3971,23 @@
         if (extractor.extractFont(&font, &fontSpec, &dummy)) {
             if ( !fontSpec.isNull() ) {
                 if ( font == QFont() ) {
-#ifdef HBSTYLE_DEBUG
-                    qDebug() << "HbStyle::polish : -- Setting fontspec: " << fontSpec.role();
+#ifdef HBSTYLE_DEBUG_FONT
+                    if ( isHbGroupBoxHeadingWidget )
+                    qDebug() << "HbStyle::polishItem : -- Setting fontspec: " << fontSpec.role();
 #endif
                     hbWidget->setFontSpec(fontSpec);
                 } else {
-#ifdef HBSTYLE_DEBUG
-                    qDebug() << "HbStyle::polish : -- Setting fontspec with overrides: "
+#ifdef HBSTYLE_DEBUG_FONT
+                    if ( isHbGroupBoxHeadingWidget )
+                    qDebug() << "HbStyle::polishItem : -- Setting fontspec with overrides: "
                              << fontSpec.role() << font;
 #endif
                     hbWidget->setFont(fontSpec.font().resolve(font));
                 }
             } else {
-#ifdef HBSTYLE_DEBUG
-                qDebug() << "HbStyle::polish : -- Setting explicit font: " << font;
+#ifdef HBSTYLE_DEBUG_FONT
+                if ( isHbGroupBoxHeadingWidget )
+                qDebug() << "HbStyle::polishItem : -- Setting explicit font: " << font;
 #endif
                 hbWidget->setFont(font);
             }
@@ -3326,9 +3997,9 @@
         if (icon) {
             Qt::AspectRatioMode mode;
             if (extractor.extractAspectRatioMode(&mode) 
-				&& !hbWidget_p->testApiProtectionFlag(HbWidgetBasePrivate::AC_IconAspectRatioMode)) {
+                && !hbWidget_p->testApiProtectionFlag(HbWidgetBasePrivate::AC_IconAspectRatioMode)) {
 #ifdef HBSTYLE_DEBUG
-                qDebug() << "HbStyle::polish : -- Setting aspect ratio mode: " << mode;
+                qDebug() << "HbStyle::polishItem : -- Setting aspect ratio mode: " << mode;
 #endif
                 icon->setAspectRatioMode(mode);
                 hbWidget_p->setApiProtectionFlag(HbWidgetBasePrivate::AC_IconAspectRatioMode, false);
@@ -3343,12 +4014,12 @@
                 HbCss::Origin clip = HbCss::Origin_Border;
                 if (extractor.extractBackground(&brush, &uri, &repeat, &alignment, &origin, &attachment, &clip)) {
 #ifdef HBSTYLE_DEBUG
-                    qDebug() << "HbStyle::polish : -- Setting icon background: " << brush;
+                    qDebug() << "HbStyle::polishItem : -- Setting icon background: " << brush;
 #endif
                     icon->setBrush( brush );
                 } else {
 #ifdef HBSTYLE_DEBUG
-                    qDebug() << "HbStyle::polish : -- Resetting icon background";
+                    qDebug() << "HbStyle::polishItem : -- Resetting icon background";
 #endif
                     icon->setBrush( QBrush() );
                 }
@@ -3363,7 +4034,7 @@
                 if ( textValues.mFlags & HbCss::ExtractedLineCountMin
                     && !hbWidget_p->testApiProtectionFlag(HbWidgetBasePrivate::AC_TextLinesMin)) {
 #ifdef HBSTYLE_DEBUG
-                    qDebug() << "HbStyle::polish : -- Setting text min lines: " << textValues.mLineCountMin;
+                    qDebug() << "HbStyle::polishItem : -- Setting text min lines: " << textValues.mLineCountMin;
 #endif
                     text->setMinimumLines( textValues.mLineCountMin );
                     hbWidget_p->setApiProtectionFlag(HbWidgetBasePrivate::AC_TextLinesMin, false);
@@ -3371,7 +4042,7 @@
                 if ( textValues.mFlags & HbCss::ExtractedLineCountMax
                     && !hbWidget_p->testApiProtectionFlag(HbWidgetBasePrivate::AC_TextLinesMax)) {
 #ifdef HBSTYLE_DEBUG
-                    qDebug() << "HbStyle::polish : -- Setting text max lines: " << textValues.mLineCountMax;
+                    qDebug() << "HbStyle::polishItem : -- Setting text max lines: " << textValues.mLineCountMax;
 #endif
                     text->setMaximumLines( textValues.mLineCountMax );
                     hbWidget_p->setApiProtectionFlag(HbWidgetBasePrivate::AC_TextLinesMax, false);
@@ -3380,7 +4051,7 @@
             if ( posValues.mFlags & HbCss::ExtractedTextAlign 
                 && !hbWidget_p->testApiProtectionFlag(HbWidgetBasePrivate::AC_TextAlign)) {
 #ifdef HBSTYLE_DEBUG
-                qDebug() << "HbStyle::polish : -- Setting text alignment: " << posValues.mTextAlignment;
+                qDebug() << "HbStyle::polishItem : -- Setting text alignment: " << posValues.mTextAlignment;
 #endif
                 text->setAlignment( posValues.mTextAlignment );
                 hbWidget_p->setApiProtectionFlag(HbWidgetBasePrivate::AC_TextAlign, false);
@@ -3388,7 +4059,7 @@
             if ( posValues.mFlags & HbCss::ExtractedWrapMode 
                 && !hbWidget_p->testApiProtectionFlag(HbWidgetBasePrivate::AC_TextWrapMode)) {
 #ifdef HBSTYLE_DEBUG
-                qDebug() << "HbStyle::polish : -- Setting wrap mode : " << posValues.mTextWrapMode;
+                qDebug() << "HbStyle::polishItem : -- Setting wrap mode : " << posValues.mTextWrapMode;
 #endif
                 text->setTextWrapping( posValues.mTextWrapMode );
                 hbWidget_p->setApiProtectionFlag(HbWidgetBasePrivate::AC_TextWrapMode, false);
@@ -3400,7 +4071,7 @@
             if ( posValues.mFlags & HbCss::ExtractedTextAlign
                 && !hbWidget_p->testApiProtectionFlag(HbWidgetBasePrivate::AC_TextAlign)) {
 #ifdef HBSTYLE_DEBUG
-                qDebug() << "HbStyle::polish : -- Setting text alignment: " << posValues.mTextAlignment;
+                qDebug() << "HbStyle::polishItem : -- Setting text alignment: " << posValues.mTextAlignment;
 #endif
                 richtext->setAlignment( posValues.mTextAlignment );
                 hbWidget_p->setApiProtectionFlag(HbWidgetBasePrivate::AC_TextAlign, false);
@@ -3408,7 +4079,7 @@
             if ( posValues.mFlags & HbCss::ExtractedWrapMode 
                 && !hbWidget_p->testApiProtectionFlag(HbWidgetBasePrivate::AC_TextWrapMode)) {
 #ifdef HBSTYLE_DEBUG
-                qDebug() << "HbStyle::polish : -- Setting wrap mode : " << posValues.mTextWrapMode;
+                qDebug() << "HbStyle::polishItem : -- Setting wrap mode : " << posValues.mTextWrapMode;
 #endif
                 richtext->setTextWrapping( posValues.mTextWrapMode );
                 hbWidget_p->setApiProtectionFlag(HbWidgetBasePrivate::AC_TextWrapMode, false);
@@ -3424,7 +4095,7 @@
 
             if (extractor.extractBorder(borderWidths,borderColors,borderStyles,borderRadii)) {
 #ifdef HBSTYLE_DEBUG
-                qDebug() << "HbStyle::polish : -- Setting border widths (l,t,r,b):"
+                qDebug() << "HbStyle::polishItem : -- Setting border widths (l,t,r,b):"
                     << borderWidths[HbCss::LeftEdge]
                     << borderWidths[HbCss::TopEdge]
                     << borderWidths[HbCss::RightEdge]
@@ -3444,7 +4115,7 @@
                 if ( textValues.mFlags & HbCss::ExtractedLineCountMin
                     && !hbWidget_p->testApiProtectionFlag(HbWidgetBasePrivate::AC_TextLinesMin)) {
 #ifdef HBSTYLE_DEBUG
-                    qDebug() << "HbStyle::polish : -- Setting text min lines: " << textValues.mLineCountMin;
+                    qDebug() << "HbStyle::polishItem : -- Setting text min lines: " << textValues.mLineCountMin;
 #endif
                     hbWidget->setProperty( "minRows", textValues.mLineCountMin );
                     hbWidget_p->setApiProtectionFlag(HbWidgetBasePrivate::AC_TextLinesMin, false);
@@ -3452,7 +4123,7 @@
                 if ( textValues.mFlags & HbCss::ExtractedLineCountMax
                     && !hbWidget_p->testApiProtectionFlag(HbWidgetBasePrivate::AC_TextLinesMin)) {
 #ifdef HBSTYLE_DEBUG
-                    qDebug() << "HbStyle::polish : -- Setting text max lines: " << textValues.mLineCountMax;
+                    qDebug() << "HbStyle::polishItem : -- Setting text max lines: " << textValues.mLineCountMax;
 #endif
                     hbWidget->setProperty( "maxRows", textValues.mLineCountMax );
                     hbWidget_p->setApiProtectionFlag(HbWidgetBasePrivate::AC_TextLinesMax, false);
@@ -3472,50 +4143,50 @@
     if ( lItem ) {
         if ( geomValues.mFlags & HbCss::ExtractedMinW ) {
 #ifdef HBSTYLE_DEBUG
-            qDebug() << "HbStyle::polish : -- Setting minimum width: " << geomValues.mMinW;
+            qDebug() << "HbStyle::polishItem : -- Setting minimum width: " << geomValues.mMinW;
 #endif
             lItem->setMinimumWidth( geomValues.mMinW );
         }
         if ( geomValues.mFlags & HbCss::ExtractedMinH ) {
 #ifdef HBSTYLE_DEBUG
-            qDebug() << "HbStyle::polish : -- Setting minimum height: " << geomValues.mMinH;
+            qDebug() << "HbStyle::polishItem : -- Setting minimum height: " << geomValues.mMinH;
 #endif
             lItem->setMinimumHeight( geomValues.mMinH );
         }
         if ( geomValues.mFlags & HbCss::ExtractedPrefW ) {
 #ifdef HBSTYLE_DEBUG
-            qDebug() << "HbStyle::polish : -- Setting preferred width: " << geomValues.mPrefW;
+            qDebug() << "HbStyle::polishItem : -- Setting preferred width: " << geomValues.mPrefW;
 #endif
             lItem->setPreferredWidth( geomValues.mPrefW );
         }
         if ( geomValues.mFlags & HbCss::ExtractedPrefH ) {
 #ifdef HBSTYLE_DEBUG
-            qDebug() << "HbStyle::polish : -- Setting preferred height: " << geomValues.mPrefH;
+            qDebug() << "HbStyle::polishItem : -- Setting preferred height: " << geomValues.mPrefH;
 #endif
             lItem->setPreferredHeight( geomValues.mPrefH );
         }
         if ( geomValues.mFlags & HbCss::ExtractedMaxW ) {
 #ifdef HBSTYLE_DEBUG
-            qDebug() << "HbStyle::polish : -- Setting maximum width: " << geomValues.mMaxW;
+            qDebug() << "HbStyle::polishItem : -- Setting maximum width: " << geomValues.mMaxW;
 #endif
             lItem->setMaximumWidth( geomValues.mMaxW );
         }
         if ( geomValues.mFlags & HbCss::ExtractedMaxH ) {
 #ifdef HBSTYLE_DEBUG
-            qDebug() << "HbStyle::polish : -- Setting maximum height: " << geomValues.mMaxH;
+            qDebug() << "HbStyle::polishItem : -- Setting maximum height: " << geomValues.mMaxH;
 #endif
             lItem->setMaximumHeight( geomValues.mMaxH );
         }
         QSizePolicy itemPol = lItem->sizePolicy();
         if ( geomValues.mFlags & HbCss::ExtractedPolHor ) {
 #ifdef HBSTYLE_DEBUG
-            qDebug() << "HbStyle::polish : -- Setting horizontal size policy: " << geomValues.mSizePolicy.horizontalPolicy();
+            qDebug() << "HbStyle::polishItem : -- Setting horizontal size policy: " << geomValues.mSizePolicy.horizontalPolicy();
 #endif
             itemPol.setHorizontalPolicy(geomValues.mSizePolicy.horizontalPolicy());
         }
         if ( geomValues.mFlags & HbCss::ExtractedPolVer ) {
 #ifdef HBSTYLE_DEBUG
-            qDebug() << "HbStyle::polish : -- Setting vertical size policy: " << geomValues.mSizePolicy.verticalPolicy();
+            qDebug() << "HbStyle::polishItem : -- Setting vertical size policy: " << geomValues.mSizePolicy.verticalPolicy();
 #endif
             itemPol.setVerticalPolicy(geomValues.mSizePolicy.verticalPolicy());
         }
@@ -3527,37 +4198,37 @@
         if ( layout ) {
             if (posValues.mFlags & HbCss::ExtractedLeft) {
 #ifdef HBSTYLE_DEBUG
-                qDebug() << "HbStyle::polish : -- Setting left override: " << posValues.mLeft;
+                qDebug() << "HbStyle::polishItem : -- Setting left override: " << posValues.mLeft;
 #endif
                 layout->overrideSpacing(name, Hb::LeftEdge, posValues.mLeft);
             }
             if (posValues.mFlags & HbCss::ExtractedRight) {
 #ifdef HBSTYLE_DEBUG
-                qDebug() << "HbStyle::polish : -- Setting right override: " << posValues.mRight;
+                qDebug() << "HbStyle::polishItem : -- Setting right override: " << posValues.mRight;
 #endif
                 layout->overrideSpacing(name, Hb::RightEdge, posValues.mRight);
             }
             if (posValues.mFlags & HbCss::ExtractedTop) {
 #ifdef HBSTYLE_DEBUG
-                qDebug() << "HbStyle::polish : -- Setting top override: " << posValues.mTop;
+                qDebug() << "HbStyle::polishItem : -- Setting top override: " << posValues.mTop;
 #endif
                 layout->overrideSpacing(name, Hb::TopEdge, posValues.mTop);
             }
             if (posValues.mFlags & HbCss::ExtractedBottom) {
 #ifdef HBSTYLE_DEBUG
-                qDebug() << "HbStyle::polish : -- Setting bottom override: " << posValues.mBottom;
+                qDebug() << "HbStyle::polishItem : -- Setting bottom override: " << posValues.mBottom;
 #endif
                 layout->overrideSpacing(name, Hb::BottomEdge, posValues.mBottom);
             }
             if (posValues.mFlags & HbCss::ExtractedCenterH) {
 #ifdef HBSTYLE_DEBUG
-                qDebug() << "HbStyle::polish : -- Setting centerh override: " << posValues.mCenterH;
+                qDebug() << "HbStyle::polishItem : -- Setting centerh override: " << posValues.mCenterH;
 #endif
                 layout->overrideSpacing(name, Hb::CenterHEdge, posValues.mCenterH);
             }
             if (posValues.mFlags & HbCss::ExtractedCenterV) {
 #ifdef HBSTYLE_DEBUG
-                qDebug() << "HbStyle::polish : -- Setting centerv override: " << posValues.mCenterV;
+                qDebug() << "HbStyle::polishItem : -- Setting centerv override: " << posValues.mCenterV;
 #endif
                 layout->overrideSpacing(name, Hb::CenterVEdge, posValues.mCenterV);
             }
@@ -3596,9 +4267,22 @@
 #ifdef HBSTYLE_DEBUG
     qDebug() << "HbStyle::polish : Polishing" << widget->metaObject()->className();
 #endif
+#ifdef HBSTYLE_DEBUG_FONT
+    bool isHbGroupBoxHeadingWidget(false);
+    if (QString(widget->metaObject()->className()) == "HbGroupBoxHeadingWidget") {
+        isHbGroupBoxHeadingWidget = true;
+        QVariant gbtype = widget->property( "groupBoxType" );
+        qDebug() << "HbStyle::polish : Polishing HbGroupBoxHeadingWidget, type" << gbtype.toInt();
+    }
+#endif
 
     HbLayeredStyleLoader *styleLoader = HbLayeredStyleLoader::getStack(HbLayeredStyleLoader::Concern_Layouts);
     if(!styleLoader){
+#ifdef HBSTYLE_DEBUG_FONT
+    if (isHbGroupBoxHeadingWidget) {
+        qDebug() << "HbStyle::polish : HbLayeredStyleLoader returned a null pointer.";
+    }
+#endif
 #ifdef HBSTYLE_DEBUG
         qDebug() << "HbStyle::polish : HbLayeredStyleLoader returned a null pointer.";
 #endif
@@ -3622,13 +4306,23 @@
         styleRules = styleLoader->styleRulesForNode(n, profile.orientation());
     }
 
+#ifdef HBSTYLE_DEBUG_FONT
+    if (isHbGroupBoxHeadingWidget) {
+        qDebug() << "HbStyle::polish : Number of style rules:" << styleRules.count();
+    }
+#endif
     if (!styleRules.count()) {
 #ifdef HBSTYLE_DEBUG
         qDebug() << "HbStyle::polish : No style rules found.";
 #endif
         return;
     }
-    const HbVector<HbCss::Declaration> decl = declarations(styleRules, "", profile);
+    const HbVector<HbCss::Declaration> decl = declarations(styleRules, "", widget, profile);
+#ifdef HBSTYLE_DEBUG_FONT
+    if (isHbGroupBoxHeadingWidget) {
+        qDebug() << "HbStyle::polish : Number of maching CSS declarations: " << decl.count();
+    }
+#endif
 #ifdef HBSTYLE_DEBUG
     qDebug() << "HbStyle::polish : Number of maching CSS declarations: " << decl.count();
 #endif
@@ -3646,6 +4340,15 @@
     }
 
     bool layoutDefined = extractor.extractLayout(&layoutName, &sectionName);
+#ifdef HBSTYLE_DEBUG_FONT
+    if (isHbGroupBoxHeadingWidget) {
+        if (!layoutDefined) {
+            qDebug() << "HbStyle::polish : Couldn't find layout name for the widget.";
+        } else {
+            qDebug() << "HbStyle::polish : Layout name: " << layoutName;
+        }
+    }
+#endif
 #ifdef HBSTYLE_DEBUG
     if (!layoutDefined) {
         qDebug() << "HbStyle::polish : Couldn't find layout name for the widget.";
@@ -3658,7 +4361,7 @@
     HbMeshLayout *meshLayout(0);
     if (layoutDefined) {
 
-        QString cachedLayoutName = d->widgetLayoutNames[widget];
+        QString cachedLayoutName = widgetLayoutNames[widget];
         bool cached = (cachedLayoutName == layoutName );
         if ( !cached ) {
 #ifdef HBSTYLE_DEBUG
@@ -3666,12 +4369,17 @@
 #endif
             HbWidgetStyleLoader *loader = HbWidgetStyleLoader::instance();
             if ( !loader->loadWidgetML(widget, layoutName, sectionName)) {
+#ifdef HBSTYLE_DEBUG_FONT
+                if (isHbGroupBoxHeadingWidget) {
+                    qDebug() << "HbStyle::polish : Failed to load WidgetML";
+                }
+#endif
 #ifdef HBSTYLE_DEBUG
                 qDebug() << "HbStyle::polish : Failed to load WidgetML";
 #endif
                 return;       
             }
-            d->widgetLayoutNames[widget] = 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*)));
@@ -3733,7 +4441,7 @@
     
     QString name = HbStyle::itemName(item);
     if (name.isEmpty() ) {
-        return ;
+        return;
     }
   
     HbTextItem* text = qgraphicsitem_cast<HbTextItem*>( item );
@@ -3744,7 +4452,7 @@
     }
     
     HbDeviceProfile profile;
-    const HbVector<HbCss::Declaration> decl = declarations(styleRules, name, profile);
+    const HbVector<HbCss::Declaration> decl = declarations(styleRules, name, 0, profile);
 
 #ifdef HBSTYLE_DEBUG
    qDebug() << "HbStyle::updateThemedItems : -- Number of maching CSS declarations: " << decl.count();
@@ -3752,34 +4460,36 @@
    ensureColorParameters();
    HbCss::ValueExtractor extractor(decl, colorParameters, profile);
    
-   QColor col;
-   bool extracted = extractor.extractColor( &col );
+    QColor col;
+    bool extracted = extractor.extractColor( &col );
+    if (!extracted || !col.isValid()) {
+        // Setting non black or white default color to make it visisble in black or white theme
+        col.setRgb(255,0,255);
+    }
    //apply the themed color to text-item
-   if(text) {   
+    if(text) {   
 #ifdef HBSTYLE_DEBUG
-       if ( !extracted ) {
+        if ( !extracted ) {
             qDebug() << "HbStyle::getColor : -- No color information found";
-       }
+        }
 #endif    
-       if( extracted && col.isValid() && !HbWidgetBasePrivate::d_ptr(text)->testApiProtectionFlag(HbWidgetBasePrivate::AC_TextColor)){
-           text->setTextColor(col);
-           HbWidgetBasePrivate::d_ptr(text)->setApiProtectionFlag(HbWidgetBasePrivate::AC_TextColor, false);
-       }
-   }   
-   if(iconItem){
-       //applying color to mono-colorised icons from theme
-       if( extracted && col.isValid()) {
-           iconItem->setColor( col ); 
-       }
-   }
-   if(marqueeItem){
-       //applying color to the marquee-item from theme
-       if(extracted && col.isValid() && !HbWidgetBasePrivate::d_ptr(marqueeItem)->testApiProtectionFlag(HbWidgetBasePrivate::AC_TextColor)) {
-           marqueeItem->setTextColor( col ); 
-           HbWidgetBasePrivate::d_ptr(marqueeItem)->setApiProtectionFlag(HbWidgetBasePrivate::AC_TextColor, false);
-       }
-   }
-} 
+        if ( !HbWidgetBasePrivate::d_ptr(text)->testApiProtectionFlag(HbWidgetBasePrivate::AC_TextColor ) ){
+            text->setTextColor(col);
+            HbWidgetBasePrivate::d_ptr(text)->setApiProtectionFlag(HbWidgetBasePrivate::AC_TextColor, false);
+        }
+    }   
+    if(iconItem){
+        //applying color to mono-colorised icons from theme
+        iconItem->setColor( col );
+    }
+    if(marqueeItem){
+        //applying color to the marquee-item from theme
+        if(!HbWidgetBasePrivate::d_ptr(marqueeItem)->testApiProtectionFlag(HbWidgetBasePrivate::AC_TextColor)) {
+            marqueeItem->setTextColor( col ); 
+            HbWidgetBasePrivate::d_ptr(marqueeItem)->setApiProtectionFlag(HbWidgetBasePrivate::AC_TextColor, false);
+        }
+    }
+}
  
 /*!
     HbStyle::updateThemedParams()
@@ -3845,8 +4555,7 @@
 */
 void HbStyle::widgetDestroyed(QObject* obj)
 {
-    Q_D( HbStyle );
-    d->widgetLayoutNames.remove((const QGraphicsWidget *)obj);
+    widgetLayoutNames.remove((const QGraphicsWidget *)obj);
 }
 
 /*!
@@ -3866,8 +4575,19 @@
 */
 void HbStyle::setItemName( QGraphicsItem *item, const QString &name )
 {
-    if (item) {
+    if (item && itemName(item) != name) {
         item->setData( ItemName, name );
+        QGraphicsItem* parent = item->parentItem();
+        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) ) {
+                HbMeshLayout* layout = static_cast<HbMeshLayout*>(parentW->layout());
+                if ( layout->indexOf(lItem) != -1 ) {
+                    layout->setItemId(lItem, name.isEmpty() ? QString() : name);
+                }
+            }
+        }
     }
 }
 
@@ -3952,9 +4672,12 @@
     d->ensureLayoutParameters(effectiveProfile);
     HbCss::ValueExtractor valueExtractor(d->layoutParameters, true, effectiveProfile);
     qreal value = 0;
-    for (int i = 0; i < d->layoutParameters.count(); i++) {
-        if (valueExtractor.extractValue(d->layoutParameters[i].property, value))
-            parameters.addParameter(d->layoutParameters[i].property, value);
+    QHash<QString, HbCss::Declaration>::const_iterator i = d->layoutParameters.constBegin();
+    while (i != d->layoutParameters.constEnd()) {
+        if (valueExtractor.extractValue(i.key(), value)) {
+            parameters.addParameter(i.key(), value);
+        }
+        ++i;
     }
 }
 
@@ -3980,7 +4703,7 @@
 HbStylePrivate::~HbStylePrivate()
 {
     layoutParameters.clear();
-	colorParameters.clear();
+    colorParameters.clear();
 
     HbWidgetStyleLoader *loader = HbWidgetStyleLoader::instance();
     if(loader){
@@ -4086,10 +4809,9 @@
 
         HbStyleSelector selector;
         selector.styleSheets.append(styleSheet);
-        layoutParameters = selector.variableRuleSets();
+        selector.variableRuleSets(&layoutParameters);
     }
     if (!firstParse && (layoutParametersProfileName != profile.name())) {
-        layoutParameters.remove(layoutParameters.count()-4, 4);
         addSpecialParams = true;
     }
     if (addSpecialParams) {
@@ -4104,7 +4826,7 @@
             val.type = HbCss::Value::Number;
             val.variant = HbVariant((double)pSize.width(),HbMemoryManager::HeapMemory);
             decl.values.append(val);
-            layoutParameters.append(decl);
+            layoutParameters.insert(decl.property, decl);
         }
         {
             HbCss::Declaration decl;
@@ -4114,7 +4836,7 @@
             val.type = HbCss::Value::Number;
             val.variant = HbVariant((double)pSize.height(),HbMemoryManager::HeapMemory);
             decl.values.append(val);
-            layoutParameters.append(decl);
+            layoutParameters.insert(decl.property, decl);
         }
         {
             HbCss::Declaration decl;
@@ -4124,7 +4846,7 @@
             val.type = HbCss::Value::Number;
             val.variant = HbVariant((double)qMin(pSize.height(),pSize.width()),HbMemoryManager::HeapMemory);
             decl.values.append(val);
-            layoutParameters.append(decl);
+            layoutParameters.insert(decl.property, decl);
         }
         {
             HbCss::Declaration decl;
@@ -4134,17 +4856,16 @@
             val.type = HbCss::Value::Number;
             val.variant = HbVariant((double)qMax(pSize.height(),pSize.width()),HbMemoryManager::HeapMemory);
             decl.values.append(val);
-            layoutParameters.append(decl);
+            layoutParameters.insert(decl.property, decl);
         }
     }
-
 }
 
 void HbStylePrivate::ensureColorParameters() const
 {
     if (colorParameters.isEmpty()) {
         HbLayeredStyleLoader *styleLoader = HbLayeredStyleLoader::getStack(HbLayeredStyleLoader::Concern_Colors);
-        colorParameters = styleLoader->variableRuleSets();
+        styleLoader->variableRuleSets(&colorParameters);
     }
 }
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyle.h
--- a/src/hbcore/style/hbstyle.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyle.h	Mon May 03 12:48:33 2010 +0300
@@ -48,6 +48,7 @@
     ~HbStyle();
 
 
+    // HbStyle::Primitive enums are DEPRECATED
     enum Primitive {
         P_None,
         P_PushButton_icon,
@@ -97,7 +98,6 @@
         P_Popup_background_weak,
         P_Popup_heading_frame,
         P_ToolTip_background,
-        P_MessageBox_text,
         P_MessageBox_icon,
         P_ItemViewItem_background,
         P_ListViewItem_text,
@@ -105,14 +105,6 @@
         P_ListViewItem_icon,        
         P_ItemHighlight_background,
         P_ToolBarExtension_background,
-        P_ProgressBar_frame,
-        P_ProgressBar_track,
-        P_ProgressBar_waittrack,
-        P_ProgressBar_slidertrack,
-        P_ProgressSlider_handleicon,
-		P_ProgressSlider_handle,
-        P_ProgressBar_text,
-        P_ProgressBar_toucharea,
         P_GridViewItem_text,
         P_GridViewItem_icon,
         P_CheckBox_text,
@@ -136,6 +128,9 @@
         P_IndicatorGroup_icon2,
         P_IndicatorGroup_icon3,
         P_IndicatorGroup_icon4,
+        P_ProgressBar_frame,
+        P_ProgressBar_track,
+        P_ProgressBar_waittrack,       
         P_ProgressBar_mintext,
         P_ProgressBar_maxtext,
         P_Softkey_background, // deprecated
@@ -150,7 +145,13 @@
         P_RatingSlider_track,
         P_RatingSlider_frame,
         P_RatingSlider_toucharea,
-		P_ProgressSliderHandle_toucharea,
+		P_ProgressSlider_frame,
+		P_ProgressSlider_track,
+        P_ProgressSlider_slidertrack,
+        P_ProgressSlider_toucharea,
+        P_ProgressSliderHandle_background, // deprecated
+        P_ProgressSliderHandle_icon,
+        P_ProgressSliderHandle_toucharea,
         P_RatingSlider_layout,
         P_ScrollArea_continuationbottom,
         P_ScrollArea_continuationtop,
@@ -200,16 +201,24 @@
         P_IndexFeedback_popup_text,
         P_IndexFeedback_popup_background,
         P_SliderPopup_background,
-		P_StatusBar_background,
-		P_StatusBar_timetext,
+        P_StatusBar_background,
+        P_StatusBar_timetext,
         P_InputDialog_text,
-        P_InputDialog_additional_text,
+        P_InputDialog_additionaltext,
         P_Last,   // Keep this always as the LAST item in the active primitives list!
 
         P_Deprecated = 0x000f0000,
         // Deprecated enumerations
+        // These are DEPRECATED, replace or remove from widget/app sources !!
+        P_ProgressBar_toucharea = P_ProgressSlider_toucharea,           // DEPRECATED
+        P_ProgressBar_slidertrack = P_ProgressSlider_track,             // DEPRECATED        
+        P_ProgressSlider_handleicon = P_ProgressSliderHandle_icon,      // DEPRECATED     
+        P_InputDialog_additional_text = P_InputDialog_additionaltext,    //deprecated
                
         P_NotUsed = 0x00f00000,
+        P_MessageBox_text,    //deprecated ,not used.
+        P_ProgressSlider_handle,    // DEPRECATED, NOT USED
+        P_ProgressBar_text,          // DEPRECATED, NOT USED
                 
         P_CustomBase = 0x0f000000
     };
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyle_p.h
--- a/src/hbcore/style/hbstyle_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyle_p.h	Mon May 03 12:48:33 2010 +0300
@@ -63,6 +63,8 @@
     int primitiveBaseId;
 };
 
+static QHash<const QGraphicsWidget*, QString> widgetLayoutNames;
+
 class HbStylePrivate
 {
     Q_DECLARE_PUBLIC( HbStyle )
@@ -93,12 +95,11 @@
     mutable QHash<QString, QString> pluginStylePaths;
     mutable int nextAvailableId;
 
-    mutable HbVector<HbCss::Declaration> colorParameters;
-    mutable HbVector<HbCss::Declaration> layoutParameters;
+    mutable QHash<QString, HbCss::Declaration> colorParameters;
+    mutable QHash<QString, HbCss::Declaration> layoutParameters;
     mutable QString layoutParametersProfileName;
 
     mutable QHash<QString, HbVector<HbCss::StyleRule> > styleRulesCache;
-    mutable QHash<const QGraphicsWidget*, QString> widgetLayoutNames;
 };
 
 #endif // HBSTYLE_P_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleinterface.cpp
--- a/src/hbcore/style/hbstyleinterface.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleinterface.cpp	Mon May 03 12:48:33 2010 +0300
@@ -28,6 +28,14 @@
 
 
 /*!
+    \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.
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleinterface.h
--- a/src/hbcore/style/hbstyleinterface.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleinterface.h	Mon May 03 12:48:33 2010 +0300
@@ -29,6 +29,8 @@
 #include <hbglobal.h>
 #include <hbstyle.h>
 class HbWidgetBase;
+
+// DEPRECATED API (style plugins are deprecated)
 // Interface used with HbStyle plugins, see HbStyle documentation for more information
 class HbStyleInterface
 {
@@ -39,6 +41,7 @@
     virtual QGraphicsItem *createPrimitive( HbStyle::Primitive primitive, QGraphicsItem *parent = 0 ) const = 0;
     virtual void updatePrimitive( QGraphicsItem *item, HbStyle::Primitive primitive, const QStyleOption *option ) const  = 0;
 	virtual QString layoutPath() const = 0;
+    void deprecated();
 };
 
 Q_DECLARE_INTERFACE(HbStyleInterface, "com.nokia.Hb.StyleInterface")
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoption.cpp
--- a/src/hbcore/style/hbstyleoption.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoption.cpp	Mon May 03 12:48:33 2010 +0300
@@ -26,7 +26,10 @@
 #include <hbstyleoption.h>
 
 /*!
-	@beta
+
+    \deprecated HbStyleOption::HbStyleOption(int, int)
+    is deprecated. Styleoptions will not be public.
+
     \class HbStyleOption
     \brief HbStyleOption is the base class for all Hbwidgets Style Options
 */
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoption.h
--- a/src/hbcore/style/hbstyleoption.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoption.h	Mon May 03 12:48:33 2010 +0300
@@ -29,6 +29,7 @@
 #include <hbglobal.h>
 #include <QStyleOptionGraphicsItem>
 
+// Deprecated
 class HB_CORE_EXPORT HbStyleOption : public QStyleOptionGraphicsItem
 {
 public:
@@ -48,6 +49,8 @@
         HbSO_Slider,
         HbSO_SliderElement,
         HbSO_ProgressBar,
+        HbSO_ProgressSlider,
+        HbSO_ProgressSliderHandle,
         HbSO_ListViewItem,
         HbSO_Popup,
         HbSO_MessageBox,
@@ -79,8 +82,8 @@
         HbSO_DataGroupHeadingWidget,
         HbSO_GroupBox,
         HbSO_IndexFeedback,
-		HbSO_StatusBar,
-		HbSO_InputDialog,
+        HbSO_StatusBar,
+        HbSO_InputDialog,
         // ...
         HbSO_CustomBase = 0xf0000000
     };
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptionabstractviewitem.cpp
--- a/src/hbcore/style/hbstyleoptionabstractviewitem.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionabstractviewitem.cpp	Mon May 03 12:48:33 2010 +0300
@@ -50,7 +50,8 @@
 
 /*!
     \var HbStyleOptionAbstractViewItem::itemName
-    @deprecated This variable will cease to exist in near future. HbStyleOptionListViewItem::itemNameIndex replaces this variable.
+    \deprecated HbStyleOptionAbstractViewItem::itemName
+       is deprecated. This variable will cease to exist in near future. HbStyleOptionListViewItem::itemNameIndex replaces this variable.
 
     This variable holds content item name of the primitive item required by css/xml layouting.
     
@@ -94,6 +95,12 @@
 */
 
 
+/*!
+	\deprecated HbStyleOptionAbstractViewItem::HbStyleOptionAbstractViewItem()
+	is deprecated. Styleoptions will not be public.
+	
+*/
+
 HbStyleOptionAbstractViewItem::HbStyleOptionAbstractViewItem() :
     HbStyleOption(),
     modelItemType(Hb::StandardItem),
@@ -105,6 +112,12 @@
     version = Version;
 }
 
+/*!
+	\deprecated HbStyleOptionAbstractViewItem::HbStyleOptionAbstractViewItem(const HbStyleOptionAbstractViewItem&)
+	is deprecated. Styleoptions will not be public.
+	
+*/
+
 HbStyleOptionAbstractViewItem::HbStyleOptionAbstractViewItem(const HbStyleOptionAbstractViewItem &other) :
     HbStyleOption(other),
     checkState(other.checkState),
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptionabstractviewitem.h
--- a/src/hbcore/style/hbstyleoptionabstractviewitem.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionabstractviewitem.h	Mon May 03 12:48:33 2010 +0300
@@ -31,6 +31,7 @@
 
 #include <QModelIndex>
 
+// Deprecated
 class HB_CORE_EXPORT HbStyleOptionAbstractViewItem : public HbStyleOption
 {
 public:
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptionbatteryindicator.cpp
--- a/src/hbcore/style/hbstyleoptionbatteryindicator.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionbatteryindicator.cpp	Mon May 03 12:48:33 2010 +0300
@@ -26,6 +26,10 @@
 #include "hbstyleoptionbatteryindicator_p.h"
 
 /*!
+	
+	  \deprecated HbStyleOptionBatteryIndicator::HbStyleOptionBatteryIndicator()
+    is deprecated. Styleoptions will not be public.
+    
     \class HbStyleOptionBatteryIndicator
     \brief HbStyleOptionBatteryIndicator has the style component for battery indicator
 */
@@ -39,6 +43,12 @@
     version = Version;
 }
 
+/*!
+	
+	  \deprecated HbStyleOptionBatteryIndicator::HbStyleOptionBatteryIndicator(const HbStyleOptionBatteryIndicator&)
+    is deprecated. Styleoptions will not be public.
+    
+*/
 HbStyleOptionBatteryIndicator::HbStyleOptionBatteryIndicator(const HbStyleOptionBatteryIndicator &other) :
     HbStyleOption(other),
     batteryLevel(other.batteryLevel),
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptioncheckbox.cpp
--- a/src/hbcore/style/hbstyleoptioncheckbox.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptioncheckbox.cpp	Mon May 03 12:48:33 2010 +0300
@@ -32,12 +32,21 @@
 */
 
 
+/*!
+    \deprecated HbStyleOptionCheckBox::HbStyleOptionCheckBox()
+    is deprecated. Styleoptions will not be public.
+*/
+
 HbStyleOptionCheckBox::HbStyleOptionCheckBox()
 {
     type = Type;
     version = Version;
 }
 
+/*!
+    \deprecated HbStyleOptionCheckBox::HbStyleOptionCheckBox(const HbStyleOptionCheckBox&)
+    is deprecated. Styleoptions will not be public.
+*/
 HbStyleOptionCheckBox::HbStyleOptionCheckBox(const HbStyleOptionCheckBox &other) 
     : HbStyleOption(other), 
     text(other.text)
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptioncheckbox.h
--- a/src/hbcore/style/hbstyleoptioncheckbox.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptioncheckbox.h	Mon May 03 12:48:33 2010 +0300
@@ -28,6 +28,7 @@
 
 #include <hbstyleoption.h>
 
+// Deprecated
 class HB_CORE_EXPORT HbStyleOptionCheckBox : public HbStyleOption
 {
 public:
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptioncolorgridviewitem.cpp
--- a/src/hbcore/style/hbstyleoptioncolorgridviewitem.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptioncolorgridviewitem.cpp	Mon May 03 12:48:33 2010 +0300
@@ -30,6 +30,11 @@
     \brief HbStyleOptionColorGridViewItem has the style component for color grid view item primitives
 */
 
+/*!
+
+    \deprecated HbStyleOptionColorGridViewItem::HbStyleOptionColorGridViewItem()
+    is deprecated. Styleoptions will not be public.
+*/
 HbStyleOptionColorGridViewItem::HbStyleOptionColorGridViewItem() :
     HbStyleOptionGridViewItem(),
     color(Qt::black),
@@ -39,7 +44,11 @@
     type = Type;
     version = Version;
 }
+/*!
 
+    \deprecated HbStyleOptionColorGridViewItem::HbStyleOptionColorGridViewItem(const HbStyleOptionColorGridViewItem&)
+    is deprecated. Styleoptions will not be public.
+*/
 HbStyleOptionColorGridViewItem::HbStyleOptionColorGridViewItem(const HbStyleOptionColorGridViewItem &other) :
     HbStyleOptionGridViewItem(other),
     color(other.color),
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptioncolorgridviewitem.h
--- a/src/hbcore/style/hbstyleoptioncolorgridviewitem.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptioncolorgridviewitem.h	Mon May 03 12:48:33 2010 +0300
@@ -28,6 +28,7 @@
 
 #include <hbstyleoptiongridviewitem.h>
 
+// Deprecated
 class HB_CORE_EXPORT HbStyleOptionColorGridViewItem : public HbStyleOptionGridViewItem
 {
 public:
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptioncombobox.cpp
--- a/src/hbcore/style/hbstyleoptioncombobox.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptioncombobox.cpp	Mon May 03 12:48:33 2010 +0300
@@ -35,6 +35,11 @@
     Text shown in the comboBox, if not NULL. 
 */
 
+/*!
+
+    \deprecated HbStyleOptionComboBox::HbStyleOptionComboBox()
+    is deprecated. Styleoptions will not be public.
+*/
 
 HbStyleOptionComboBox::HbStyleOptionComboBox() : HbStyleOption(HbSO_Combo),
     text( )  //CRC: this is not required 
@@ -42,7 +47,11 @@
     type = Type;
     version = Version;
 }
+/*!
 
+    \deprecated HbStyleOptionComboBox::HbStyleOptionComboBox(const HbStyleOptionComboBox&)
+    is deprecated. Styleoptions will not be public.
+*/
 HbStyleOptionComboBox::HbStyleOptionComboBox(const HbStyleOptionComboBox &other) :
     HbStyleOption(other),
     text(other.text)   
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptioncombobox.h
--- a/src/hbcore/style/hbstyleoptioncombobox.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptioncombobox.h	Mon May 03 12:48:33 2010 +0300
@@ -29,7 +29,7 @@
 #include <hbstyleoption.h>
 #include <hbnamespace.h>
 
-
+// Deprecated
 class HB_CORE_EXPORT HbStyleOptionComboBox : public HbStyleOption
 {
 public:
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptiondataform.cpp
--- a/src/hbcore/style/hbstyleoptiondataform.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptiondataform.cpp	Mon May 03 12:48:33 2010 +0300
@@ -25,12 +25,21 @@
 
 #include <hbstyleoptiondataform.h>
 
+
+/*!
+    \deprecated HbStyleOptionDataForm::HbStyleOptionDataForm()
+    is deprecated. Styleoptions will not be public.
+*/
 HbStyleOptionDataForm::HbStyleOptionDataForm() : HbStyleOption(HbSO_DataForm)
 {
     type = Type;
     version = Version;
 }
+/*!
 
+    \deprecated HbStyleOptionDataForm::HbStyleOptionDataForm(const HbStyleOptionDataForm&)
+    is deprecated. Styleoptions will not be public.
+*/
 HbStyleOptionDataForm::HbStyleOptionDataForm(const HbStyleOptionDataForm &other) :
     HbStyleOption(other),
     heading(other.heading),
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptiondataform.h
--- a/src/hbcore/style/hbstyleoptiondataform.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptiondataform.h	Mon May 03 12:48:33 2010 +0300
@@ -29,6 +29,7 @@
 #include <hbstyleoption.h>
 #include <hbicon.h>
 
+// Deprecated
 class HB_CORE_EXPORT HbStyleOptionDataForm : public HbStyleOption
 {
 public:
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptiondataformviewitem.cpp
--- a/src/hbcore/style/hbstyleoptiondataformviewitem.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptiondataformviewitem.cpp	Mon May 03 12:48:33 2010 +0300
@@ -30,6 +30,13 @@
     \brief HbStyleOptionDataFormViewItem has the style component for data item primitives
 */
 
+/*!
+
+    \deprecated HbStyleOptionDataFormViewItem::HbStyleOptionDataFormViewItem()
+    is deprecated. Styleoptions will not be public.
+
+*/
+
 HbStyleOptionDataFormViewItem::HbStyleOptionDataFormViewItem()  :
     HbStyleOption()
 {
@@ -37,6 +44,12 @@
     version = Version;
 }
 
+/*!
+
+    \deprecated HbStyleOptionDataFormViewItem::HbStyleOptionDataFormViewItem(const HbStyleOptionDataFormViewItem&)
+    is deprecated. Styleoptions will not be public.
+
+*/
 HbStyleOptionDataFormViewItem::HbStyleOptionDataFormViewItem(const HbStyleOptionDataFormViewItem &other)  :
     HbStyleOption(other)
 {
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptiondataformviewitem.h
--- a/src/hbcore/style/hbstyleoptiondataformviewitem.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptiondataformviewitem.h	Mon May 03 12:48:33 2010 +0300
@@ -28,6 +28,7 @@
 
 #include <hbstyleoption.h>
 
+// Deprecated
 class HB_CORE_EXPORT HbStyleOptionDataFormViewItem : public HbStyleOption
 {
 public:
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptiondatagroup.cpp
--- a/src/hbcore/style/hbstyleoptiondatagroup.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptiondatagroup.cpp	Mon May 03 12:48:33 2010 +0300
@@ -25,12 +25,26 @@
 
 #include <hbstyleoptiondatagroup_p.h>
 
+
+/*!
+
+    \deprecated HbStyleOptionDataGroup::HbStyleOptionDataGroup()
+    is deprecated. Styleoptions will not be public.
+
+*/
 HbStyleOptionDataGroup::HbStyleOptionDataGroup() : HbStyleOption(HbSO_DataGroup)
 {
     type = Type;
     version = Version;
 }
 
+/*!
+
+    \deprecated HbStyleOptionDataGroup::HbStyleOptionDataGroup(const HbStyleOptionDataGroup&)
+    is deprecated. Styleoptions will not be public.
+
+*/
+
 HbStyleOptionDataGroup::HbStyleOptionDataGroup(const HbStyleOptionDataGroup &other) :
     HbStyleOption(other),
     description(other.description)
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptiondatagroup_p.h
--- a/src/hbcore/style/hbstyleoptiondatagroup_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptiondatagroup_p.h	Mon May 03 12:48:33 2010 +0300
@@ -29,6 +29,7 @@
 #include <hbstyleoption.h>
 #include <hbicon.h>
 
+// Deprecated
 class HB_CORE_EXPORT HbStyleOptionDataGroup : public HbStyleOption
 {
 public:
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptiondatagroupheadingwidget.cpp
--- a/src/hbcore/style/hbstyleoptiondatagroupheadingwidget.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptiondatagroupheadingwidget.cpp	Mon May 03 12:48:33 2010 +0300
@@ -25,6 +25,14 @@
 
 #include <hbstyleoptiondatagroupheadingwidget_p.h>
 
+
+
+/*!
+
+    \deprecated HbStyleOptionDataGroupHeadingWidget::HbStyleOptionDataGroupHeadingWidget()
+    is deprecated. Styleoptions will not be public.
+
+*/
 HbStyleOptionDataGroupHeadingWidget::HbStyleOptionDataGroupHeadingWidget() :
     expanded(false),
     pressed(false)
@@ -33,9 +41,16 @@
     version = Version;
 }
 
+/*!
+
+    \deprecated HbStyleOptionDataGroupHeadingWidget::HbStyleOptionDataGroupHeadingWidget(const HbStyleOptionDataGroupHeadingWidget&)
+    is deprecated. Styleoptions will not be public.
+
+*/
 HbStyleOptionDataGroupHeadingWidget::HbStyleOptionDataGroupHeadingWidget(const HbStyleOptionDataGroupHeadingWidget &other) :
     HbStyleOption(other),
     heading(other.heading),
+    description(other.description),
     expanded(other.expanded),
     pressed(other.pressed)
 {
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptiondatagroupheadingwidget_p.h
--- a/src/hbcore/style/hbstyleoptiondatagroupheadingwidget_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptiondatagroupheadingwidget_p.h	Mon May 03 12:48:33 2010 +0300
@@ -29,6 +29,7 @@
 #include <hbstyleoption.h>
 #include <hbicon.h>
 
+// Deprecated
 class HB_CORE_EXPORT HbStyleOptionDataGroupHeadingWidget : public HbStyleOption
 {
 public:
@@ -40,6 +41,7 @@
     enum StyleOptionVersion { Version = 1 };
 
     QString heading;
+    QString description;
     bool expanded;
     bool pressed;
 };
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptiondataquery.cpp
--- a/src/hbcore/style/hbstyleoptiondataquery.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptiondataquery.cpp	Mon May 03 12:48:33 2010 +0300
@@ -26,12 +26,19 @@
 #include "hbstyleoptiondataquery.h"
 
 /*!
-    @deprecated HbStyleOptionDataQuery
-        Replaced with HbStyleOptionInputDialog
+    \this class is deprecated. Use HbStyleOptionInputDialog instead.
+
     \class HbStyleOptionDataQuery
     \brief HbStyleOptionDataQuery has the style component for input dialog
 */
 
+/*!
+    \deprecated HbStyleOptionDataQuery::HbStyleOptionDataQuery()
+        is deprecated. Use HbStyleOptionInputDialog instead.
+
+    Constructor.
+*/
+
 HbStyleOptionDataQuery::HbStyleOptionDataQuery():HbStyleOptionPopup()
 {
     type = Type;
@@ -40,6 +47,12 @@
     modeIcon = 0;
 }
 
+/*!
+    \deprecated HbStyleOptionDataQuery::HbStyleOptionDataQuery(const HbStyleOptionDataQuery &)
+        is deprecated. Use HbStyleOptionInputDialog instead.
+
+    Constructor.
+*/
 HbStyleOptionDataQuery::HbStyleOptionDataQuery(const HbStyleOptionDataQuery &other) :
 HbStyleOptionPopup(other)
 {
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptiondataquery.h
--- a/src/hbcore/style/hbstyleoptiondataquery.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptiondataquery.h	Mon May 03 12:48:33 2010 +0300
@@ -29,6 +29,8 @@
 #include <hbnamespace.h>
 #include <hbstyleoptionpopup.h>
 #include <hbicon.h>
+
+// Deprecated
 class HB_CORE_EXPORT HbStyleOptionDataQuery : public HbStyleOptionPopup
 {
 public:
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptiondecorator.cpp
--- a/src/hbcore/style/hbstyleoptiondecorator.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptiondecorator.cpp	Mon May 03 12:48:33 2010 +0300
@@ -31,6 +31,12 @@
 */
 
 
+/*!
+
+    \deprecated HbStyleOptionDecorator::HbStyleOptionDecorator()
+    is deprecated. Styleoptions will not be public.
+
+*/
 HbStyleOptionDecorator::HbStyleOptionDecorator() :
     mode(QIcon::Normal), transparent(false)
 {
@@ -38,6 +44,12 @@
     version = Version;
 }
 
+/*!
+
+    \deprecated  HbStyleOptionDecorator::HbStyleOptionDecorator(const HbStyleOptionDecorator&)
+    is deprecated. Styleoptions will not be public.
+
+*/
 HbStyleOptionDecorator::HbStyleOptionDecorator(const HbStyleOptionDecorator &other) :
     HbStyleOption(other),
     mode(other.mode), transparent(other.transparent)
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptiondecorator.h
--- a/src/hbcore/style/hbstyleoptiondecorator.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptiondecorator.h	Mon May 03 12:48:33 2010 +0300
@@ -29,6 +29,8 @@
 #include <hbstyleoption.h>
 #include <QIcon>
 
+
+//Deprecated
 class HB_CORE_EXPORT HbStyleOptionDecorator : public HbStyleOption
 {
 public:
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptiongridviewitem.cpp
--- a/src/hbcore/style/hbstyleoptiongridviewitem.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptiongridviewitem.cpp	Mon May 03 12:48:33 2010 +0300
@@ -43,6 +43,13 @@
 */
 
 
+
+/*!
+
+    \deprecated HbStyleOptionGridViewItem::HbStyleOptionGridViewItem()
+    is deprecated. Styleoptions will not be public.
+
+*/
 HbStyleOptionGridViewItem::HbStyleOptionGridViewItem() :
     HbStyleOptionAbstractViewItem()
 {
@@ -50,6 +57,12 @@
     version = Version;
 }
 
+/*!
+
+    \deprecated HbStyleOptionGridViewItem::HbStyleOptionGridViewItem(const HbStyleOptionGridViewItem&)
+    is deprecated. Styleoptions will not be public.
+
+*/
 HbStyleOptionGridViewItem::HbStyleOptionGridViewItem(const HbStyleOptionGridViewItem &other) :
     HbStyleOptionAbstractViewItem(other)
 {
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptiongridviewitem.h
--- a/src/hbcore/style/hbstyleoptiongridviewitem.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptiongridviewitem.h	Mon May 03 12:48:33 2010 +0300
@@ -32,6 +32,7 @@
 #include <hbstyleoptionabstractviewitem.h>
 #include <hbicon.h>
 
+// Deprecated
 class HB_CORE_EXPORT HbStyleOptionGridViewItem : public HbStyleOptionAbstractViewItem
 {
 public:
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptiongroupbox.cpp
--- a/src/hbcore/style/hbstyleoptiongroupbox.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptiongroupbox.cpp	Mon May 03 12:48:33 2010 +0300
@@ -32,6 +32,12 @@
 */
 
 
+/*!
+
+    \deprecated HbStyleOptionGroupBox::HbStyleOptionGroupBox()
+    is deprecated. Styleoptions will not be public.
+
+*/
 HbStyleOptionGroupBox::HbStyleOptionGroupBox():
     collapsed(false),
     heading(QString()),
@@ -42,6 +48,12 @@
     version = Version;
 }
 
+/*!
+
+    \deprecated HbStyleOptionGroupBox::HbStyleOptionGroupBox(const HbStyleOptionGroupBox&)
+    is deprecated. Styleoptions will not be public.
+
+*/
 HbStyleOptionGroupBox::HbStyleOptionGroupBox(const HbStyleOptionGroupBox &other) 
     : HbStyleOption(other), 
     collapsed( other.collapsed ),
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptiongroupbox.h
--- a/src/hbcore/style/hbstyleoptiongroupbox.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptiongroupbox.h	Mon May 03 12:48:33 2010 +0300
@@ -28,6 +28,7 @@
 
 #include <hbstyleoption.h>
 
+// Deprecated
 class HB_CORE_EXPORT HbStyleOptionGroupBox : public HbStyleOption
 {
 public:
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptionindexfeedback.cpp
--- a/src/hbcore/style/hbstyleoptionindexfeedback.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionindexfeedback.cpp	Mon May 03 12:48:33 2010 +0300
@@ -50,6 +50,14 @@
     \brief The bounding rect for the popup background when displaying index feedback.
 */
 
+
+
+/*!
+
+    \deprecated HbStyleOptionIndexFeedback::HbStyleOptionIndexFeedback()
+    is deprecated. Styleoptions will not be public.
+
+*/
 HbStyleOptionIndexFeedback::HbStyleOptionIndexFeedback() : 
     fontSpec(HbFontSpec::Primary)
 {
@@ -57,6 +65,12 @@
     version = Version;
 }
 
+/*!
+
+    \deprecated HbStyleOptionIndexFeedback::HbStyleOptionIndexFeedback(const HbStyleOptionIndexFeedback&)
+    is deprecated. Styleoptions will not be public.
+
+*/
 HbStyleOptionIndexFeedback::HbStyleOptionIndexFeedback(const HbStyleOptionIndexFeedback &other) :
     HbStyleOption(other),
     text(other.text),
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptionindexfeedback.h
--- a/src/hbcore/style/hbstyleoptionindexfeedback.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionindexfeedback.h	Mon May 03 12:48:33 2010 +0300
@@ -30,6 +30,7 @@
 #include <hbfontspec.h>
 #include <hbglobal.h>
 
+// Deprecated
 class HB_CORE_EXPORT HbStyleOptionIndexFeedback : public HbStyleOption
 {
 public:
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptionindicatorbutton.cpp
--- a/src/hbcore/style/hbstyleoptionindicatorbutton.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionindicatorbutton.cpp	Mon May 03 12:48:33 2010 +0300
@@ -30,13 +30,26 @@
     \brief HbStyleOptionIndicatorButton has the style component for the indicator button
 */
 
+
+
+/*!
+
+    \deprecated HbStyleOptionIndicatorButton::HbStyleOptionIndicatorButton()
+    is deprecated. Styleoptions will not be public.
+
+*/
 HbStyleOptionIndicatorButton::HbStyleOptionIndicatorButton() : 
     HbStyleOption(), mode(QIcon::Normal), transparent(false)
 {
     type = Type;
     version = Version;
 }
+/*!
 
+    \deprecated HbStyleOptionIndicatorButton::HbStyleOptionIndicatorButton(const HbStyleOptionIndicatorButton&)
+    is deprecated. Styleoptions will not be public.
+
+*/
 HbStyleOptionIndicatorButton::HbStyleOptionIndicatorButton(const HbStyleOptionIndicatorButton &other) :
     HbStyleOption(other), mode(other.mode), transparent(other.transparent)
 {
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptionindicatorbutton.h
--- a/src/hbcore/style/hbstyleoptionindicatorbutton.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionindicatorbutton.h	Mon May 03 12:48:33 2010 +0300
@@ -28,6 +28,7 @@
 
 #include <hbstyleoption.h>
 
+// Deprecated
 class HB_CORE_EXPORT HbStyleOptionIndicatorButton : public HbStyleOption
 {
 public:
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptionindicatorgroup.cpp
--- a/src/hbcore/style/hbstyleoptionindicatorgroup.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionindicatorgroup.cpp	Mon May 03 12:48:33 2010 +0300
@@ -30,12 +30,26 @@
     \brief HbStyleOptionIndicatorGroup has the style component for indicator group
 */
 
+
+/*!
+
+    \deprecated HbStyleOptionIndicatorGroup::HbStyleOptionIndicatorGroup()
+    is deprecated. Styleoptions will not be public.
+
+*/
 HbStyleOptionIndicatorGroup::HbStyleOptionIndicatorGroup() 
 {
     type = Type;
     version = Version;
 }
 
+
+/*!
+
+    \deprecated HbStyleOptionIndicatorGroup::HbStyleOptionIndicatorGroup(const HbStyleOptionIndicatorGroup&)
+    is deprecated. Styleoptions will not be public.
+
+*/
 HbStyleOptionIndicatorGroup::HbStyleOptionIndicatorGroup(const HbStyleOptionIndicatorGroup &other) :
     HbStyleOptionDecorator(other), iconName(other.iconName)
 {
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptionindicatorgroup.h
--- a/src/hbcore/style/hbstyleoptionindicatorgroup.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionindicatorgroup.h	Mon May 03 12:48:33 2010 +0300
@@ -29,6 +29,7 @@
 #include <hbstyleoptiondecorator.h>
 #include <QIcon>
 
+// Deprecated
 class HB_CORE_EXPORT HbStyleOptionIndicatorGroup : public HbStyleOptionDecorator
 {
 public:
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptionindicatormenu.cpp
--- a/src/hbcore/style/hbstyleoptionindicatormenu.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionindicatormenu.cpp	Mon May 03 12:48:33 2010 +0300
@@ -30,12 +30,26 @@
     \brief HbStyleOptionIndicatorMenu has the style component for indicator menu and content widget.
 */
 
+
+/*!
+
+    \deprecated HbStyleOptionIndicatorMenu::HbStyleOptionIndicatorMenu()
+    is deprecated. Styleoptions will not be public.
+
+*/
 HbStyleOptionIndicatorMenu::HbStyleOptionIndicatorMenu() 
 {
     type = Type;
     version = Version;
 }
 
+
+/*!
+
+    \deprecated HbStyleOptionIndicatorMenu::HbStyleOptionIndicatorMenu(const HbStyleOptionIndicatorMenu&)
+    is deprecated. Styleoptions will not be public.
+
+*/
 HbStyleOptionIndicatorMenu::HbStyleOptionIndicatorMenu(const HbStyleOptionIndicatorMenu &other) :
     HbStyleOptionPopup(other), timeString(other.timeString)
 {
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptionindicatormenu.h
--- a/src/hbcore/style/hbstyleoptionindicatormenu.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionindicatormenu.h	Mon May 03 12:48:33 2010 +0300
@@ -29,6 +29,7 @@
 #include <hbglobal.h>
 #include <hbstyleoptionpopup.h>
 
+// Deprecated
 class HB_CORE_EXPORT HbStyleOptionIndicatorMenu : public HbStyleOptionPopup
 {
 public:
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptioninputdialog.cpp
--- a/src/hbcore/style/hbstyleoptioninputdialog.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptioninputdialog.cpp	Mon May 03 12:48:33 2010 +0300
@@ -30,6 +30,13 @@
     \brief HbStyleOptionInputDialog has the style component for inpudialog primitives
 */
 
+
+/*!
+
+    \deprecated HbStyleOptionInputDialog::HbStyleOptionInputDialog() 
+    is deprecated. Styleoptions will not be public.
+
+*/
 HbStyleOptionInputDialog::HbStyleOptionInputDialog() :
     HbStyleOptionPopup(),
     text(),
@@ -39,6 +46,13 @@
     version = Version;
 }
 
+
+/*!
+
+    \deprecated HbStyleOptionInputDialog::HbStyleOptionInputDialog(const HbStyleOptionInputDialog&)
+    is deprecated. Styleoptions will not be public.
+
+*/
 HbStyleOptionInputDialog::HbStyleOptionInputDialog(const HbStyleOptionInputDialog &other) :
     HbStyleOptionPopup(other),
     text(other.text),
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptioninputdialog.h
--- a/src/hbcore/style/hbstyleoptioninputdialog.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptioninputdialog.h	Mon May 03 12:48:33 2010 +0300
@@ -29,7 +29,7 @@
 #include <hbstyleoption.h>
 #include <hbstyleoptionpopup.h>
 
-
+// Deprecated
 class HB_CORE_EXPORT HbStyleOptionInputDialog : public HbStyleOptionPopup
 {
 public:
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptionlabel.cpp
--- a/src/hbcore/style/hbstyleoptionlabel.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionlabel.cpp	Mon May 03 12:48:33 2010 +0300
@@ -55,6 +55,13 @@
     Aspect ratio mode of icon. 
 */
 
+
+/*!
+
+    \deprecated   HbStyleOptionLabel::HbStyleOptionLabel()
+    is deprecated. Styleoptions will not be public.
+
+*/
 HbStyleOptionLabel::HbStyleOptionLabel() : HbStyleOption(HbSO_Label),
     text(),
     fontSpec(), /*HbFontSpec::Primary*/
@@ -68,6 +75,13 @@
     version = Version;
 }
 
+
+/*!
+
+    \deprecated HbStyleOptionLabel::HbStyleOptionLabel(const HbStyleOptionLabel&) 
+    is deprecated. Styleoptions will not be public.
+
+*/
 HbStyleOptionLabel::HbStyleOptionLabel(const HbStyleOptionLabel &other) :
     HbStyleOption(other),
     text(other.text),
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptionlabel.h
--- a/src/hbcore/style/hbstyleoptionlabel.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionlabel.h	Mon May 03 12:48:33 2010 +0300
@@ -33,6 +33,7 @@
 
 #include <QIcon>
 
+// Deprecated
 class HB_CORE_EXPORT HbStyleOptionLabel : public HbStyleOption
 {
 public:
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptionlistviewitem.cpp
--- a/src/hbcore/style/hbstyleoptionlistviewitem.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionlistviewitem.cpp	Mon May 03 12:48:33 2010 +0300
@@ -89,6 +89,13 @@
 */
 
 
+
+/*!
+
+    \deprecated HbStyleOptionListViewItem::HbStyleOptionListViewItem()
+    is deprecated. Styleoptions will not be public.
+
+*/
 HbStyleOptionListViewItem::HbStyleOptionListViewItem() :
     HbStyleOptionAbstractViewItem(),
     role(Qt::DisplayRole),
@@ -101,6 +108,13 @@
     version = Version;
 }
 
+
+/*!
+
+    \deprecated HbStyleOptionListViewItem::HbStyleOptionListViewItem(const HbStyleOptionListViewItem&)
+    is deprecated. Styleoptions will not be public.
+
+*/
 HbStyleOptionListViewItem::HbStyleOptionListViewItem(const HbStyleOptionListViewItem &other) :
     HbStyleOptionAbstractViewItem(other),
     content(other.content),
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptionlistviewitem.h
--- a/src/hbcore/style/hbstyleoptionlistviewitem.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionlistviewitem.h	Mon May 03 12:48:33 2010 +0300
@@ -30,6 +30,7 @@
 #include <hbglobal.h>
 #include <QVariant>
 
+// Deprecated
 class HB_CORE_EXPORT HbStyleOptionListViewItem : public HbStyleOptionAbstractViewItem
 {
 public:
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptionmenuitem.cpp
--- a/src/hbcore/style/hbstyleoptionmenuitem.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionmenuitem.cpp	Mon May 03 12:48:33 2010 +0300
@@ -30,6 +30,13 @@
     \brief HbStyleOptionMenuItem has the style component for menu item primitives
 */
 
+
+/*!
+
+    \deprecated HbStyleOptionMenuItem::HbStyleOptionMenuItem()
+    is deprecated. Styleoptions will not be public.
+
+*/
 HbStyleOptionMenuItem::HbStyleOptionMenuItem() :
     text(),
     arrow(false),
@@ -41,6 +48,13 @@
     version = Version;
 }
 
+
+/*!
+
+    \deprecated HbStyleOptionMenuItem::HbStyleOptionMenuItem(const HbStyleOptionMenuItem&)
+    is deprecated. Styleoptions will not be public.
+
+*/
 HbStyleOptionMenuItem::HbStyleOptionMenuItem(const HbStyleOptionMenuItem &other) :
     HbStyleOption(other),
     text(other.text),
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptionmenuitem.h
--- a/src/hbcore/style/hbstyleoptionmenuitem.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionmenuitem.h	Mon May 03 12:48:33 2010 +0300
@@ -30,6 +30,7 @@
 #include <hbglobal.h>
 #include <hbstyleoption.h>
 
+// Deprecated
 class HB_CORE_EXPORT HbStyleOptionMenuItem : public HbStyleOption
 {
 public:
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptionmessagebox.cpp
--- a/src/hbcore/style/hbstyleoptionmessagebox.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionmessagebox.cpp	Mon May 03 12:48:33 2010 +0300
@@ -26,29 +26,43 @@
 #include "hbstyleoptionmessagebox.h"
 
 /*!
+	\this class is deprecated.
     \class HbStyleOptionMessageBox
     \brief HbStyleOptionMessageBox has the style component for note primitives
 */
 
+
+/*!
+
+    \deprecated HbStyleOptionMessageBox::HbStyleOptionMessageBox()
+    is deprecated. Styleoptions will not be public.
+
+*/
 HbStyleOptionMessageBox::HbStyleOptionMessageBox() :
     HbStyleOptionPopup(),
-    text(),
+    text(),    
     icon(),
-    textAlignment(Qt::AlignLeft|Qt::AlignVCenter),
+    textAlignment(Qt::AlignLeft|Qt::AlignVCenter),    
     iconAlignment(Qt::AlignCenter),
-    textWrapping(false)
+    textWrapping(false)    
 {
     type = Type;
     version = Version;
 }
 
+/*!
+
+    \deprecated HbStyleOptionMessageBox::HbStyleOptionMessageBox(const HbStyleOptionMessageBox&)
+    is deprecated. Styleoptions will not be public.
+
+*/
 HbStyleOptionMessageBox::HbStyleOptionMessageBox(const HbStyleOptionMessageBox &other) :
     HbStyleOptionPopup(other),
-    text(other.text),
+    text(other.text),   
     icon(other.icon),
-    textAlignment(other.textAlignment),
+    textAlignment(other.textAlignment),    
     iconAlignment(other.iconAlignment),
-    textWrapping(other.textWrapping)
+    textWrapping(other.textWrapping)    
 {
     type = Type;
     version = Version;
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptionmessagebox.h
--- a/src/hbcore/style/hbstyleoptionmessagebox.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionmessagebox.h	Mon May 03 12:48:33 2010 +0300
@@ -30,7 +30,7 @@
 #include <hbstyleoptionpopup.h>
 #include <hbicon.h>
 
-
+// Deprecated
 class HB_CORE_EXPORT HbStyleOptionMessageBox : public HbStyleOptionPopup
 {
 public:
@@ -41,11 +41,11 @@
     enum StyleOptionType { Type = HbSO_MessageBox };
     enum StyleOptionVersion { Version = 1 };
 
-    QString text;
+    QString text;    //deprecated
     HbIcon icon;
-    Qt::Alignment textAlignment;
-    Qt::Alignment iconAlignment;
-    bool textWrapping;
+    Qt::Alignment textAlignment;    //deprecated
+    Qt::Alignment iconAlignment;    //deprecated
+    bool textWrapping;    //deprecated
     enum MessageBoxType {
         MessageTypeInformation,
         MessageTypeQuestion,
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptionnavigationbutton.cpp
--- a/src/hbcore/style/hbstyleoptionnavigationbutton.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionnavigationbutton.cpp	Mon May 03 12:48:33 2010 +0300
@@ -30,13 +30,26 @@
     \brief HbStyleOptionNavigationButton has the style component for the navigation button
 */
 
+
+
+/*!
+
+    \deprecated HbStyleOptionNavigationButton::HbStyleOptionNavigationButton()
+    is deprecated. Styleoptions will not be public.
+
+*/
 HbStyleOptionNavigationButton::HbStyleOptionNavigationButton() : 
     HbStyleOption(), mode(QIcon::Normal), transparent(false)
 {
     type = Type;
     version = Version;
 }
+/*!
 
+    \deprecated HbStyleOptionNavigationButton::HbStyleOptionNavigationButton(const HbStyleOptionNavigationButton&)
+    is deprecated. Styleoptions will not be public.
+
+*/
 HbStyleOptionNavigationButton::HbStyleOptionNavigationButton(const HbStyleOptionNavigationButton &other) :
     HbStyleOption(other), mode(other.mode), transparent(other.transparent)
 {
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptionnavigationbutton.h
--- a/src/hbcore/style/hbstyleoptionnavigationbutton.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionnavigationbutton.h	Mon May 03 12:48:33 2010 +0300
@@ -28,6 +28,7 @@
 
 #include <hbstyleoption.h>
 
+// Deprecated
 class HB_CORE_EXPORT HbStyleOptionNavigationButton : public HbStyleOption
 {
 public:
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptionnotificationdialog.cpp
--- a/src/hbcore/style/hbstyleoptionnotificationdialog.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionnotificationdialog.cpp	Mon May 03 12:48:33 2010 +0300
@@ -31,15 +31,23 @@
 */
 
 /*!
-    \deprecated titleWrapping
+    \deprecated HbStyleOptionNotificationDialog::titleWrapping
         is deprecated. Use wrappingTitle instead.
 */
 
 /*!
-    \deprecated textWrapping
+    \deprecated HbStyleOptionNotificationDialog::textWrapping
         is deprecated. Use wrappingText instead.
 */
 
+
+
+/*!
+
+    \deprecated HbStyleOptionNotificationDialog::HbStyleOptionNotificationDialog()
+    is deprecated. Styleoptions will not be public.
+
+*/
 HbStyleOptionNotificationDialog::HbStyleOptionNotificationDialog() :
         titleAlignment(Qt::AlignLeft|Qt::AlignVCenter),
         textAlignment(Qt::AlignLeft|Qt::AlignVCenter),
@@ -54,6 +62,13 @@
     version = Version;
 }
 
+
+/*!
+
+    \deprecated HbStyleOptionNotificationDialog::HbStyleOptionNotificationDialog(const HbStyleOptionNotificationDialog&)
+    is deprecated. Styleoptions will not be public.
+
+*/
 HbStyleOptionNotificationDialog::HbStyleOptionNotificationDialog(
         const HbStyleOptionNotificationDialog &other) :
     HbStyleOptionPopup(other),
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptionnotificationdialog.h
--- a/src/hbcore/style/hbstyleoptionnotificationdialog.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionnotificationdialog.h	Mon May 03 12:48:33 2010 +0300
@@ -30,11 +30,13 @@
 #include <hbicon.h>
 #include <hbstyleoptionpopup.h>
 
+
+//Deprecated
 class HB_CORE_EXPORT HbStyleOptionNotificationDialog : public HbStyleOptionPopup
 {
 public:
-	HbStyleOptionNotificationDialog();
-	HbStyleOptionNotificationDialog(const HbStyleOptionNotificationDialog &other);
+    HbStyleOptionNotificationDialog();
+    HbStyleOptionNotificationDialog(const HbStyleOptionNotificationDialog &other);
     ~HbStyleOptionNotificationDialog();
 
     enum StyleOptionType { Type = HbSO_NotificationDialog };
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptionpopup.cpp
--- a/src/hbcore/style/hbstyleoptionpopup.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionpopup.cpp	Mon May 03 12:48:33 2010 +0300
@@ -30,12 +30,26 @@
     \brief HbStyleOptionPopup has the style component for popup primitives
 */
 
+
+/*!
+
+    \deprecated HbStyleOptionPopup::HbStyleOptionPopup()
+    is deprecated. Styleoptions will not be public.
+
+*/
 HbStyleOptionPopup::HbStyleOptionPopup()
 {
     type = Type;
     version = Version;
 }
 
+
+/*!
+
+    \deprecated HbStyleOptionPopup::HbStyleOptionPopup(const HbStyleOptionPopup&)
+    is deprecated. Styleoptions will not be public.
+
+*/
 HbStyleOptionPopup::HbStyleOptionPopup(const HbStyleOptionPopup &other) :
     HbStyleOption(other)
 {
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptionpopup.h
--- a/src/hbcore/style/hbstyleoptionpopup.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionpopup.h	Mon May 03 12:48:33 2010 +0300
@@ -29,6 +29,7 @@
 #include <hbnamespace.h>
 #include <hbstyleoption.h>
 
+//Deprecated
 class HB_CORE_EXPORT HbStyleOptionPopup : public HbStyleOption
 {
 public:
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptionprogressbar.cpp
--- a/src/hbcore/style/hbstyleoptionprogressbar.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionprogressbar.cpp	Mon May 03 12:48:33 2010 +0300
@@ -32,43 +32,58 @@
     \brief HbStyleOptionProgressBar has the style component for progress bar primitives
 
 */
+
+
+/*!
+
+    \deprecated HbStyleOptionProgressBar::HbStyleOptionProgressBar()
+    is deprecated. Styleoptions will not be public.
+
+*/
 HbStyleOptionProgressBar::HbStyleOptionProgressBar() :
     progressValue(0),
     minimum(0),
     maximum(100),
     inverted(false),
-    text(),// deprecated
+    text(),                             // deprecated
     isSlider(false),
     minText(QString()),
     maxText(QString()),
     orientation(Qt::Horizontal),
-    thumbIcon(),// deprecated
-    maskWidth(0),
-    secondoryType(false),
-    handleState(PlayNormal),// deprecated
-    sliderState(SliderStatePlayNormal),
+    thumbIcon(),                        // deprecated
+    maskWidth(0),                       // deprecated
+    secondaryType(false),
+    handleState(PlayNormal),            // deprecated
+    sliderState(SliderStatePlayNormal), // deprecated
     minMaxTextAlignment(Qt::AlignCenter)
 {
     type = Type;
     version = Version;
 }
 
+
+/*!
+
+    \deprecated HbStyleOptionProgressBar::HbStyleOptionProgressBar(const HbStyleOptionProgressBar&)
+    is deprecated. Styleoptions will not be public.
+
+*/
 HbStyleOptionProgressBar::HbStyleOptionProgressBar(const HbStyleOptionProgressBar &other) :
     HbStyleOption(other),
     progressValue(other.progressValue),
     minimum(other.minimum),
     maximum(other.maximum),
     inverted(other.inverted),
-    text(other.text),// deprecated
+    text(other.text),                   // deprecated
     isSlider(other.isSlider),
     minText(other.minText),
     maxText(other.maxText),
     orientation(other.orientation),
-    thumbIcon(other.thumbIcon),
-    maskWidth(other.maskWidth),
-    secondoryType(other.secondoryType),
-    handleState(other.handleState),
-    sliderState(other.sliderState),
+    thumbIcon(other.thumbIcon),         // deprecated
+    maskWidth(other.maskWidth),         // deprecated
+    secondaryType(other.secondaryType),
+    handleState(other.handleState),     // deprecated
+    sliderState(other.sliderState),     // deprecated
     minMaxTextAlignment(other.minMaxTextAlignment)
 {
     type = Type;
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptionprogressbar.h
--- a/src/hbcore/style/hbstyleoptionprogressbar.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionprogressbar.h	Mon May 03 12:48:33 2010 +0300
@@ -30,6 +30,7 @@
 #include <hbicon.h>
 #include <hbstyleoption.h>
 
+//Deprecated
 class HB_CORE_EXPORT HbStyleOptionProgressBar : public  HbStyleOption
 {
 public:
@@ -41,15 +42,14 @@
     enum StyleOptionType { Type = HbSO_ProgressBar };
     enum StyleOptionVersion { Version = 1 };
     
-    // deprecated
-    enum HandleState {
+    enum HandleState {          // deprecated
         PlayNormal,
         PlayPressed,
         PauseNormal,
         PausePressed
     };
 
-    enum SliderState
+    enum SliderState            // deprecated
     {
         SliderStatePlayNormal,
         SliderStatePlayPressed,
@@ -60,19 +60,19 @@
     int progressValue;
     int minimum;
     int maximum;
-    uint inverted : 1;//mirrored
-    QString text; // deprecated
+    uint inverted : 1;  //mirrored
+    QString text;               // deprecated
     bool isSlider;
     uint stopWaitAnimation : 1;
     QString minText;
     QString maxText;
     Qt::Orientation orientation;
 
-    int sliderValue;    
-    QRectF handleRect;  
-    HbIcon thumbIcon;   // deprecated
-    qreal maskWidth;    
-    bool secondoryType;
+    int sliderValue;            // deprecated  
+    QRectF handleRect;          // deprecated
+    HbIcon thumbIcon;           // deprecated
+    qreal maskWidth;            // deprecated
+    bool secondaryType;         // deprecated
     HandleState handleState;    // deprecated
     SliderState sliderState;    // deprecated
     Qt::Alignment minMaxTextAlignment;
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptionprogressdialog.cpp
--- a/src/hbcore/style/hbstyleoptionprogressdialog.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionprogressdialog.cpp	Mon May 03 12:48:33 2010 +0300
@@ -27,18 +27,36 @@
 
 /*!
     \class HbStyleOptionProgressDialog
-    \brief HbStyleOptionProgressDialog has the style component for progress note primitives
+    \brief HbStyleOptionProgressDialog has the style component for progress dialog primitives
 */
 
+
+/*!
+
+    \deprecated HbStyleOptionProgressDialog::HbStyleOptionProgressDialog()
+    is deprecated. Styleoptions will not be public.
+
+*/
 HbStyleOptionProgressDialog::HbStyleOptionProgressDialog()  :
-    HbStyleOption()
+    HbStyleOption(),
+    icon(),
+    text()
 {
     type = Type;
     version = Version;
 }
 
+
+/*!
+
+    \deprecated HbStyleOptionProgressDialog::HbStyleOptionProgressDialog(const HbStyleOptionProgressDialog&)
+    is deprecated. Styleoptions will not be public.
+
+*/
 HbStyleOptionProgressDialog::HbStyleOptionProgressDialog(const HbStyleOptionProgressDialog &other)  :
-HbStyleOption(other)
+    HbStyleOption(other),
+    icon(other.icon),
+    text(other.text)
 {
     type = Type;
     version = Version;
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptionprogressdialog.h
--- a/src/hbcore/style/hbstyleoptionprogressdialog.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionprogressdialog.h	Mon May 03 12:48:33 2010 +0300
@@ -29,6 +29,7 @@
 #include <hbstyleoption.h>
 #include <hbicon.h>
 
+//Deprecated
 class HB_CORE_EXPORT HbStyleOptionProgressDialog : public HbStyleOption
 {
 public:
@@ -36,13 +37,13 @@
     HbStyleOptionProgressDialog(const HbStyleOptionProgressDialog &other);
     ~HbStyleOptionProgressDialog();
     HbIcon icon;
-	QString text;
-    Qt::Alignment iconAlignment;
+    QString text;
+    Qt::Alignment iconAlignment;    // deprecated
     enum StyleOptionType { Type = HbSO_ProgressDialog };
     enum StyleOptionVersion { Version = 1 };
-	QSizeF progressBarSize;
-	bool wrap;
-	Qt::Alignment textAlignment;
+    QSizeF progressBarSize;    // deprecated
+    bool wrap;    // deprecated
+    Qt::Alignment textAlignment;    // deprecated
 };
 
 #endif
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptionprogressslider.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/style/hbstyleoptionprogressslider.cpp	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,50 @@
+/****************************************************************************
+**
+** 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 "hbstyleoptionprogressslider.h"
+
+/*!
+    \class HbStyleOptionProgressSlider
+    \brief HbStyleOptionProgressSlider has the style component for progress slider primitives
+
+*/
+HbStyleOptionProgressSlider::HbStyleOptionProgressSlider() 
+{
+    type = Type;
+    version = Version;
+	pressedState = false;
+}
+
+HbStyleOptionProgressSlider::HbStyleOptionProgressSlider(const HbStyleOptionProgressSlider &other) :
+    HbStyleOptionProgressBar(other)
+{
+    type = Type;
+    version = Version;
+}
+
+HbStyleOptionProgressSlider::~HbStyleOptionProgressSlider()
+{
+}
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptionprogressslider.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/style/hbstyleoptionprogressslider.h	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,48 @@
+/****************************************************************************
+**
+** 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 HBSTYLEOPTIONPROGRESSSLIDER_H
+#define HBSTYLEOPTIONPROGRESSSLIDER_H
+
+#include <hbglobal.h>
+#include <hbstyleoptionprogressbar.h>
+
+class HB_CORE_EXPORT HbStyleOptionProgressSlider : public  HbStyleOptionProgressBar
+{
+public:
+    HbStyleOptionProgressSlider();
+    HbStyleOptionProgressSlider(const HbStyleOptionProgressSlider &other);
+    ~HbStyleOptionProgressSlider();
+
+public:
+    enum StyleOptionType { Type = HbSO_ProgressSlider };
+    enum StyleOptionVersion { Version = 1 };
+
+    int progressSliderValue;    
+    bool pressedState;
+};
+
+#endif // HBSTYLEOPTIONPROGRESSSLIDER_H
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptionprogresssliderhandle.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/style/hbstyleoptionprogresssliderhandle.cpp	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,55 @@
+/****************************************************************************
+**
+** 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 "hbstyleoptionprogresssliderhandle_p.h"
+
+
+/*!
+    \class HbStyleOptionProgressSliderHandle
+    \brief HbStyleOptionProgressSliderHandle has the style component for progress slider handle primitives
+
+*/
+HbStyleOptionProgressSliderHandle::HbStyleOptionProgressSliderHandle() :
+    handleIcon(),
+    sliderHandleState(SliderStatePlayNormal)
+{
+    type = Type;
+    version = Version;
+}
+
+HbStyleOptionProgressSliderHandle::HbStyleOptionProgressSliderHandle(const HbStyleOptionProgressSliderHandle &other) :
+    HbStyleOption(other),
+    handleIcon(other.handleIcon),
+    sliderHandleState(other.sliderHandleState),pressedState(false)
+{
+    type = Type;
+    version = Version;
+}
+
+HbStyleOptionProgressSliderHandle::~HbStyleOptionProgressSliderHandle()
+{
+}
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptionprogresssliderhandle_p.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/style/hbstyleoptionprogresssliderhandle_p.h	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,59 @@
+/****************************************************************************
+**
+** 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 HBSTYLEOPTIONPROGRESSSLIDERHANDLE_P_H
+#define HBSTYLEOPTIONPROGRESSSLIDERHANDLE_P_H
+
+#include <hbglobal.h>
+#include <hbicon.h>
+#include <hbstyleoption.h>
+
+class HB_CORE_EXPORT HbStyleOptionProgressSliderHandle : public  HbStyleOption
+{
+public:
+    HbStyleOptionProgressSliderHandle();
+    HbStyleOptionProgressSliderHandle(const HbStyleOptionProgressSliderHandle &other);
+    ~HbStyleOptionProgressSliderHandle();
+
+public:
+    enum StyleOptionType { Type = HbSO_ProgressSliderHandle };
+    enum StyleOptionVersion { Version = 1 };
+    
+    enum SliderState
+    {
+        SliderStatePlayNormal,
+        SliderStatePlayPressed,
+        SliderStatePauseNormal,
+        SliderStatePausePressed
+    };
+   
+    HbIcon handleIcon;
+    SliderState sliderHandleState;      // deprecated
+    bool pressedState;
+  
+};
+
+#endif // HBSTYLEOPTIONPROGRESSSLIDERHANDLE_P_H
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptionpushbutton.cpp
--- a/src/hbcore/style/hbstyleoptionpushbutton.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionpushbutton.cpp	Mon May 03 12:48:33 2010 +0300
@@ -32,6 +32,13 @@
 */
 
 
+
+/*!
+
+    \deprecated HbStyleOptionPushButton::HbStyleOptionPushButton()
+    is deprecated. Styleoptions will not be public.
+
+*/
 HbStyleOptionPushButton::HbStyleOptionPushButton()
     : background(), icon(), text(),backgroundFrameDrawer(0)
 {
@@ -39,6 +46,13 @@
     version = Version;
 }
 
+
+/*!
+
+    \deprecated HbStyleOptionPushButton::HbStyleOptionPushButton(const HbStyleOptionPushButton&)
+    is deprecated. Styleoptions will not be public.
+
+*/
 HbStyleOptionPushButton::HbStyleOptionPushButton(const HbStyleOptionPushButton &other) :
     HbStyleOption(other), background(other.background), icon(other.icon), text(other.text),backgroundFrameDrawer(other.backgroundFrameDrawer)
 {
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptionpushbutton.h
--- a/src/hbcore/style/hbstyleoptionpushbutton.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionpushbutton.h	Mon May 03 12:48:33 2010 +0300
@@ -30,7 +30,7 @@
 #include <hbicon.h>
 #include <hbframedrawer.h>
 
-
+// Deprecated
 class HB_CORE_EXPORT HbStyleOptionPushButton : public HbStyleOption
 {
 public:
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptionratingslider.cpp
--- a/src/hbcore/style/hbstyleoptionratingslider.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionratingslider.cpp	Mon May 03 12:48:33 2010 +0300
@@ -32,19 +32,36 @@
     \brief HbStyleOptionProgressBar has the style component for progress bar primitives
 
 */
+
+
+/*!
+
+    \deprecated HbStyleOptionRatingSlider::HbStyleOptionRatingSlider()
+    is deprecated. Styleoptions will not be public.
+
+*/
 HbStyleOptionRatingSlider::HbStyleOptionRatingSlider()
  {
     type = Type;
     version = Version;
-	progressValue=0;
-	inverted=false;
-	noOfIntervals=5;
-	noOfStars=5;
 }
 
+
+
+/*!
+
+    \deprecated HbStyleOptionRatingSlider::HbStyleOptionRatingSlider(const HbStyleOptionRatingSlider&)
+    is deprecated. Styleoptions will not be public.
+
+*/
 HbStyleOptionRatingSlider::HbStyleOptionRatingSlider(const HbStyleOptionRatingSlider &other) :
-    HbStyleOption(other)
-  
+    HbStyleOption(other),
+    progressValue(other.progressValue),
+    inverted(other.inverted),
+    noOfIntervals(other.noOfIntervals),
+    noOfStars(other.noOfStars),
+    unRatedGraphicsName(other.unRatedGraphicsName),
+    ratedGraphicsName(other.ratedGraphicsName)
 {
     type = Type;
     version = Version;
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptionratingslider.h
--- a/src/hbcore/style/hbstyleoptionratingslider.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionratingslider.h	Mon May 03 12:48:33 2010 +0300
@@ -27,6 +27,8 @@
 #define HBSTYLEOPTIONRATINGSLIDER_H
 
 #include <hbstyleoption.h>
+
+//Deprecated
 class HB_CORE_EXPORT HbStyleOptionRatingSlider : public  HbStyleOption
 {
 public:
@@ -43,7 +45,6 @@
 	int noOfStars;
 	QString unRatedGraphicsName;
 	QString ratedGraphicsName;
-
 };
 
 #endif 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptionscrollbar.cpp
--- a/src/hbcore/style/hbstyleoptionscrollbar.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionscrollbar.cpp	Mon May 03 12:48:33 2010 +0300
@@ -30,6 +30,13 @@
     \brief HbStyleOptionScrollBar has the style component for scroll bar primitives
 */
 
+
+/*!
+
+    \deprecated HbStyleOptionScrollBar::HbStyleOptionScrollBar()
+    is deprecated. Styleoptions will not be public.
+
+*/
 HbStyleOptionScrollBar::HbStyleOptionScrollBar() :
     orientation(Qt::Vertical),
     thumbPressed(false),
@@ -40,6 +47,12 @@
     version = Version;    
 }
 
+/*!
+
+    \deprecated HbStyleOptionScrollBar::HbStyleOptionScrollBar(const HbStyleOptionScrollBar&)
+    is deprecated. Styleoptions will not be public.
+
+*/
 HbStyleOptionScrollBar::HbStyleOptionScrollBar(const HbStyleOptionScrollBar &other) :
     HbStyleOption(other),
     orientation(other.orientation)
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptionscrollbar.h
--- a/src/hbcore/style/hbstyleoptionscrollbar.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionscrollbar.h	Mon May 03 12:48:33 2010 +0300
@@ -29,6 +29,7 @@
 #include <hbglobal.h>
 #include <hbstyleoption.h>
 
+//Deprecated
 class HB_CORE_EXPORT HbStyleOptionScrollBar : public HbStyleOption
 {
 public:
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptionsignalindicator.cpp
--- a/src/hbcore/style/hbstyleoptionsignalindicator.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionsignalindicator.cpp	Mon May 03 12:48:33 2010 +0300
@@ -30,6 +30,13 @@
     \brief HbStyleOptionSignalIndicator has the style component for the signal indicator
 */
 
+
+/*!
+
+    \deprecated HbStyleOptionSignalIndicator::HbStyleOptionSignalIndicator()
+    is deprecated. Styleoptions will not be public.
+
+*/
 HbStyleOptionSignalIndicator::HbStyleOptionSignalIndicator() : 
     HbStyleOption(),
     networkMode(0),
@@ -40,6 +47,12 @@
     version = Version;
 }
 
+/*!
+
+    \deprecated HbStyleOptionSignalIndicator::HbStyleOptionSignalIndicator(const HbStyleOptionSignalIndicator&)
+    is deprecated. Styleoptions will not be public.
+
+*/
 HbStyleOptionSignalIndicator::HbStyleOptionSignalIndicator(const HbStyleOptionSignalIndicator &other) :
     HbStyleOption(other),
     networkMode(other.networkMode),
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptionsignalindicator_p.h
--- a/src/hbcore/style/hbstyleoptionsignalindicator_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionsignalindicator_p.h	Mon May 03 12:48:33 2010 +0300
@@ -28,6 +28,7 @@
 
 #include <hbstyleoption.h>
 
+// Deprecated
 class HB_CORE_EXPORT HbStyleOptionSignalIndicator : public HbStyleOption
 {
 public:
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptionslider.cpp
--- a/src/hbcore/style/hbstyleoptionslider.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionslider.cpp	Mon May 03 12:48:33 2010 +0300
@@ -30,6 +30,13 @@
     \brief HbStyleOptionSlider has the style component for slider primitives
  */
 
+
+/*!
+
+    \deprecated HbStyleOptionSlider::HbStyleOptionSlider()
+    is deprecated. Styleoptions will not be public.
+
+*/
 HbStyleOptionSlider::HbStyleOptionSlider() :
     maximum(0),
     minimum(0),
@@ -54,7 +61,12 @@
     type = Type;
     version = Version;
 }
+/*!
 
+    \deprecated HbStyleOptionSlider::HbStyleOptionSlider(const HbStyleOptionSlider&)
+    is deprecated. Styleoptions will not be public.
+
+*/
 HbStyleOptionSlider::HbStyleOptionSlider(const HbStyleOptionSlider &other) :
     HbStyleOption(other),
     maximum(other.maximum),
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptionslider.h
--- a/src/hbcore/style/hbstyleoptionslider.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionslider.h	Mon May 03 12:48:33 2010 +0300
@@ -31,6 +31,7 @@
 #include <hbstyleoption.h>
 #include <hbicon.h>
 
+// Deprecated
 class HB_CORE_EXPORT HbStyleOptionSlider : public HbStyleOption
 {
 public:
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptionsoftkey.cpp
--- a/src/hbcore/style/hbstyleoptionsoftkey.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionsoftkey.cpp	Mon May 03 12:48:33 2010 +0300
@@ -30,12 +30,26 @@
     \brief HbStyleOptionSoftKey has the style component for softkey
 */
 
+
+/*!
+
+    \deprecated HbStyleOptionSoftKey::HbStyleOptionSoftKey()
+    is deprecated. Styleoptions will not be public.
+
+*/
 HbStyleOptionSoftKey::HbStyleOptionSoftKey(): HbStyleOptionDecorator()
 {
     type = Type;
     version = Version;
 }
 
+
+/*!
+
+    \deprecated HbStyleOptionSoftKey::HbStyleOptionSoftKey(const HbStyleOptionSoftKey&)
+    is deprecated. Styleoptions will not be public.
+
+*/
 HbStyleOptionSoftKey::HbStyleOptionSoftKey(const HbStyleOptionSoftKey &other) :
     HbStyleOptionDecorator(other)
 {
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptionsoftkey.h
--- a/src/hbcore/style/hbstyleoptionsoftkey.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionsoftkey.h	Mon May 03 12:48:33 2010 +0300
@@ -30,6 +30,7 @@
 #include <hbnamespace.h>
 #include <QIcon>
 
+// Deprecated
 class HB_CORE_EXPORT HbStyleOptionSoftKey : public HbStyleOptionDecorator
 {
 public:
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptionstatusbar.cpp
--- a/src/hbcore/style/hbstyleoptionstatusbar.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionstatusbar.cpp	Mon May 03 12:48:33 2010 +0300
@@ -30,12 +30,26 @@
     \brief HbStyleOptionStatusBar has the style component for statusbar
 */
 
+
+/*!
+
+    \deprecated HbStyleOptionStatusBar::HbStyleOptionStatusBar()
+    is deprecated. Styleoptions will not be public.
+
+*/
 HbStyleOptionStatusBar::HbStyleOptionStatusBar() : transparent(false)
 {
     type = Type;
     version = Version;
 }
 
+
+/*!
+
+    \deprecated HbStyleOptionStatusBar::HbStyleOptionStatusBar(const HbStyleOptionStatusBar&)
+    is deprecated. Styleoptions will not be public.
+
+*/
 HbStyleOptionStatusBar::HbStyleOptionStatusBar(const HbStyleOptionStatusBar &other) :
     HbStyleOption(other)
 {
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptionstatusbar_p.h
--- a/src/hbcore/style/hbstyleoptionstatusbar_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionstatusbar_p.h	Mon May 03 12:48:33 2010 +0300
@@ -28,6 +28,7 @@
 
 #include <hbstyleoption.h>
 
+// Deprecated
 class HB_CORE_EXPORT HbStyleOptionStatusBar : public HbStyleOption
 {
 public:
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptiontitlepane.cpp
--- a/src/hbcore/style/hbstyleoptiontitlepane.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptiontitlepane.cpp	Mon May 03 12:48:33 2010 +0300
@@ -30,6 +30,13 @@
     \brief HbStyleOptionTitlePane has the style component for title pane
 */
 
+
+/*!
+
+    \deprecated HbStyleOptionTitlePane::HbStyleOptionTitlePane()
+    is deprecated. Styleoptions will not be public.
+
+*/
 HbStyleOptionTitlePane::HbStyleOptionTitlePane() :
     HbStyleOption(), caption(""), mode(QIcon::Normal), transparent(false)
 {
@@ -37,6 +44,13 @@
     version = Version;
 }
 
+
+/*!
+
+    \deprecated HbStyleOptionTitlePane::HbStyleOptionTitlePane(const HbStyleOptionTitlePane&)
+    is deprecated. Styleoptions will not be public.
+
+*/
 HbStyleOptionTitlePane::HbStyleOptionTitlePane(const HbStyleOptionTitlePane &other) :
     HbStyleOption(other), caption(other.caption), mode(other.mode), transparent(other.transparent)
 {
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptiontitlepane.h
--- a/src/hbcore/style/hbstyleoptiontitlepane.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptiontitlepane.h	Mon May 03 12:48:33 2010 +0300
@@ -29,6 +29,7 @@
 #include <hbstyleoptiondecorator.h>
 #include <QIcon>
 
+// Deprecated
 class HB_CORE_EXPORT HbStyleOptionTitlePane : public HbStyleOption
 {
 public:
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptiontoolbarextension.cpp
--- a/src/hbcore/style/hbstyleoptiontoolbarextension.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptiontoolbarextension.cpp	Mon May 03 12:48:33 2010 +0300
@@ -39,6 +39,14 @@
         is deprecated.
 
 */
+
+
+/*!
+
+    \deprecated HbStyleOptionToolBarExtension::HbStyleOptionToolBarExtension()
+    is deprecated. Styleoptions will not be public.
+
+*/
 HbStyleOptionToolBarExtension::HbStyleOptionToolBarExtension() :
     HbStyleOptionPopup(),
     opacity(1.0)
@@ -48,6 +56,12 @@
     version = Version;
 }
 
+/*!
+
+    \deprecated HbStyleOptionToolBarExtension::HbStyleOptionToolBarExtension(const HbStyleOptionToolBarExtension&)
+    is deprecated. Styleoptions will not be public.
+
+*/
 HbStyleOptionToolBarExtension::HbStyleOptionToolBarExtension(
     const HbStyleOptionToolBarExtension &other) :
     HbStyleOptionPopup(other),
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptiontoolbarextension.h
--- a/src/hbcore/style/hbstyleoptiontoolbarextension.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptiontoolbarextension.h	Mon May 03 12:48:33 2010 +0300
@@ -30,6 +30,7 @@
 #include <hbstyleoption.h>
 #include <hbstyleoptionpopup.h>
 
+// Deprecated
 class HB_CORE_EXPORT HbStyleOptionToolBarExtension : public HbStyleOptionPopup
 {
 public:
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptiontoolbutton.cpp
--- a/src/hbcore/style/hbstyleoptiontoolbutton.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptiontoolbutton.cpp	Mon May 03 12:48:33 2010 +0300
@@ -30,6 +30,12 @@
     \brief HbStyleOptionToolButton has the style component for tool button primitives
 */
 
+/*!
+
+    \deprecated HbStyleOptionToolButton::HbStyleOptionToolButton()
+    is deprecated. Styleoptions will not be public.
+
+*/
 HbStyleOptionToolButton::HbStyleOptionToolButton() : HbStyleOption(HbSO_ToolButton),
     icon(),
     customBackground(),
@@ -37,12 +43,19 @@
     toolBarPosition(HbStyleOptionToolButton::TB_None),
     orientation(Qt::Vertical),
     isCheckable(false),
-    useSecondaryGraphics(false)
+    useSecondaryGraphics(false),
+    isToolBarExtension(false)
 {
     type = Type;
     version = Version;
 }
 
+/*!
+
+    \deprecated HbStyleOptionToolButton::HbStyleOptionToolButton(const HbStyleOptionToolButton&)
+    is deprecated. Styleoptions will not be public.
+
+*/
 HbStyleOptionToolButton::HbStyleOptionToolButton(const HbStyleOptionToolButton &other) :
     HbStyleOption(other),
     icon(other.icon),
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptiontoolbutton.h
--- a/src/hbcore/style/hbstyleoptiontoolbutton.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptiontoolbutton.h	Mon May 03 12:48:33 2010 +0300
@@ -29,6 +29,7 @@
 #include <hbstyleoption.h>
 #include <hbicon.h>
 
+// Deprecated
 class HB_CORE_EXPORT HbStyleOptionToolButton : public HbStyleOption
 {
 public:
@@ -56,6 +57,8 @@
     Qt::Orientation orientation;
     bool isCheckable;
     bool useSecondaryGraphics;
+    bool useTransparentGraphics;
+    bool isToolBarExtension;
 };
 
 #endif // HBSTYLEOPTIONTOOLBUTTON_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptiontooltip.cpp
--- a/src/hbcore/style/hbstyleoptiontooltip.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptiontooltip.cpp	Mon May 03 12:48:33 2010 +0300
@@ -30,12 +30,24 @@
     \brief HbStyleOptionToolTip has the style component for tooltip primitives
 */
 
+/*!
+
+    \deprecated HbStyleOptionToolTip::HbStyleOptionToolTip()
+    is deprecated. Styleoptions will not be public.
+
+*/
 HbStyleOptionToolTip::HbStyleOptionToolTip()
 {
     type = Type;
     version = Version;
 }
 
+/*!
+
+    \deprecated HbStyleOptionToolTip::HbStyleOptionToolTip(const HbStyleOptionToolTip&)
+    is deprecated. Styleoptions will not be public.
+
+*/
 HbStyleOptionToolTip::HbStyleOptionToolTip(const HbStyleOptionToolTip &other) :
     HbStyleOptionPopup(other)
 {
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptiontooltip.h
--- a/src/hbcore/style/hbstyleoptiontooltip.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptiontooltip.h	Mon May 03 12:48:33 2010 +0300
@@ -29,6 +29,7 @@
 #include <hbstyleoption.h>
 #include <hbstyleoptionpopup.h>
 
+// Deprecated
 class HB_CORE_EXPORT HbStyleOptionToolTip : public HbStyleOptionPopup
 {
 public:
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptiontreeviewitem.cpp
--- a/src/hbcore/style/hbstyleoptiontreeviewitem.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptiontreeviewitem.cpp	Mon May 03 12:48:33 2010 +0300
@@ -36,6 +36,12 @@
     This variable holds whether tree item is expanded or collapsed.
 */
 
+/*!
+
+    \deprecated HbStyleOptionTreeViewItem::HbStyleOptionTreeViewItem()
+    is deprecated. Styleoptions will not be public.
+
+*/
 HbStyleOptionTreeViewItem::HbStyleOptionTreeViewItem() :
     HbStyleOptionListViewItem(),
     expanded(false)
@@ -44,6 +50,12 @@
     version = Version;
 }
 
+/*!
+
+    \deprecated HbStyleOptionTreeViewItem::HbStyleOptionTreeViewItem(const HbStyleOptionTreeViewItem&)
+    is deprecated. Styleoptions will not be public.
+
+*/
 HbStyleOptionTreeViewItem::HbStyleOptionTreeViewItem(const HbStyleOptionTreeViewItem &other) :
     HbStyleOptionListViewItem(other),
         expanded(other.expanded)
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/hbstyleoptiontreeviewitem.h
--- a/src/hbcore/style/hbstyleoptiontreeviewitem.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/hbstyleoptiontreeviewitem.h	Mon May 03 12:48:33 2010 +0300
@@ -30,6 +30,7 @@
 #include <hbglobal.h>
 #include <QVariant>
 
+// Deprecated
 class HB_CORE_EXPORT HbStyleOptionTreeViewItem : public HbStyleOptionListViewItem
 {
 public:
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/style/style.pri
--- a/src/hbcore/style/style.pri	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/style/style.pri	Mon May 03 12:48:33 2010 +0300
@@ -46,6 +46,7 @@
 PUBLIC_HEADERS += $$PWD/hbstyleoptionmessagebox.h
 PUBLIC_HEADERS += $$PWD/hbstyleoptionpopup.h
 PUBLIC_HEADERS += $$PWD/hbstyleoptionprogressbar.h
+PUBLIC_HEADERS += $$PWD/hbstyleoptionprogressslider.h
 PUBLIC_HEADERS += $$PWD/hbstyleoptionprogressdialog.h
 PUBLIC_HEADERS += $$PWD/hbstyleoptionpushbutton.h
 PUBLIC_HEADERS += $$PWD/hbstyleoptionscrollbar.h
@@ -65,12 +66,13 @@
 PUBLIC_HEADERS += $$PWD/hbstyleoptionratingslider.h
 PUBLIC_HEADERS += $$PWD/hbstyleoptioncombobox.h
 PUBLIC_HEADERS += $$PWD/hbstyleoptioninputdialog.h
-INTERNAL_HEADERS += $$PWD/hbstyle_p.h
-INTERNAL_HEADERS += $$PWD/hbstyleoptionsliderelement_p.h
-INTERNAL_HEADERS += $$PWD/hbstyleoptiondatagroup_p.h
-INTERNAL_HEADERS += $$PWD/hbstyleoptionstatusbar_p.h
-INTERNAL_HEADERS += $$PWD/hbstyleoptionsignalindicator_p.h
-INTERNAL_HEADERS += $$PWD/hbstyleoptionbatteryindicator_p.h
+PRIVATE_HEADERS += $$PWD/hbstyle_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptionsliderelement_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptionprogresssliderhandle_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptiondatagroup_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptionstatusbar_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptionsignalindicator_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptionbatteryindicator_p.h
 
 SOURCES += $$PWD/hbstyle.cpp
 SOURCES += $$PWD/hbstyleoption.cpp
@@ -90,6 +92,8 @@
 SOURCES += $$PWD/hbstyleoptionmessagebox.cpp
 SOURCES += $$PWD/hbstyleoptionpopup.cpp
 SOURCES += $$PWD/hbstyleoptionprogressbar.cpp
+SOURCES += $$PWD/hbstyleoptionprogressslider.cpp
+SOURCES += $$PWD/hbstyleoptionprogresssliderhandle.cpp
 SOURCES += $$PWD/hbstyleoptionprogressdialog.cpp
 SOURCES += $$PWD/hbstyleoptionpushbutton.cpp
 SOURCES += $$PWD/hbstyleoptionscrollbar.cpp
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/svgext/hbnvgdecoder/hbnvg.cpp
--- a/src/hbcore/svgext/hbnvgdecoder/hbnvg.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/svgext/hbnvgdecoder/hbnvg.cpp	Mon May 03 12:48:33 2010 +0300
@@ -36,49 +36,49 @@
 
 /*!
   Constants for nvg file header offsets
- */ 
+ */
 const quint8 NVG_SIGNATURE[]      = "nvg";
-const int NVG_SIGNATURE_LENGTH    = sizeof(NVG_SIGNATURE) - sizeof('\0');
-const int NVG_VIEWBOX_WIDTH_OFS   = 44;
-const int NVG_VIEWBOX_HEIGHT_OFS  = 48;
-const int NvgOffsetReserved1       = 6;
+const qint32 NVG_SIGNATURE_LENGTH    = sizeof(NVG_SIGNATURE) - sizeof('\0');
+const qint32 NVG_VIEWBOX_WIDTH_OFS   = 44;
+const qint32 NVG_VIEWBOX_HEIGHT_OFS  = 48;
+const qint32 NvgOffsetReserved1       = 6;
 
-void NVGIconList::addNVGIcon(HbNvgIconFactory::HbNvgIconType type, HbNvgIcon * nvgICon)
+void HbNvgIconList::addNvgIcon(HbNvgIconFactory::HbNvgIconType type, HbNvgIcon * nvgIcon)
 {
-    if (type <= HbNvgIconFactory::NVGTLV) {
+    if (type <= HbNvgIconFactory::NvgTlv) {
         if (icons[type]) {
             delete icons[type];
         }
-        icons[type] = nvgICon;
+        icons[type] = nvgIcon;
     }
 }
 
-HbNvgIcon * NVGIconList::getIcon(HbNvgIconFactory::HbNvgIconType type)
+HbNvgIcon * HbNvgIconList::getIcon(HbNvgIconFactory::HbNvgIconType type)
 {
-    if (type <= HbNvgIconFactory::NVGTLV) {
-        return icons[type]; 
+    if (type <= HbNvgIconFactory::NvgTlv) {
+        return icons[type];
     }
     return 0;
 }
 
-NVGIconList::~NVGIconList()
+HbNvgIconList::~HbNvgIconList()
 {
-    delete icons[HbNvgIconFactory::NVGCS];
-    delete icons[HbNvgIconFactory::NVGTLV];
+    delete icons[HbNvgIconFactory::NvgCs];
+    delete icons[HbNvgIconFactory::NvgTlv];
 }
 
 HbNvgEnginePrivate::HbNvgEnginePrivate():
         mCurrentBufferSize(1, 1),
         mRotateAngle(0.0),
-		mCentreX(0.0),
+        mCentreX(0.0),
         mCentreY(0.0),
         mPreserveAspectSetting(HbNvgEngine::NvgPreserveAspectRatioXmidYmid),
         mSmilFitSetting(HbNvgEngine::NvgMeet),
         mVgImageBinder(0),
         mCreatingNvgIcon(false),
-		mCurrentNvgIcon(NULL),
-		mLastError(HbNvgEngine::NvgErrNone),
-		mMirroringMode(false)
+        mCurrentNvgIcon(0),
+        mLastError(HbNvgEngine::NvgErrNone),
+        mMirrored(false)
 {
     vgSeti(VG_RENDERING_QUALITY, VG_RENDERING_QUALITY_BETTER);
     vgSeti(VG_FILL_RULE, VG_NON_ZERO);
@@ -98,30 +98,30 @@
     mRotateAngle    = angle;
 }
 
-void HbNvgEnginePrivate::setPreserveAspectRatio(HbNvgEngine::NvgAlignStatusType preserveAspectSetting,
-        HbNvgEngine::NvgMeetOrSliceType smilFitSetting)
-    {
-        mPreserveAspectSetting = preserveAspectSetting;
-        mSmilFitSetting = smilFitSetting;
-    }
+void HbNvgEnginePrivate::setPreserveAspectRatio(HbNvgEngine::HbNvgAlignType preserveAspectSetting,
+        HbNvgEngine::HbNvgMeetType smilFitSetting)
+{
+    mPreserveAspectSetting = preserveAspectSetting;
+    mSmilFitSetting = smilFitSetting;
+}
 
 QSize HbNvgEnginePrivate::contentDimensions(const QByteArray &buffer) const
 {
-    QSize ret(0,0);
-     if (buffer.length() < NVG_VIEWBOX_HEIGHT_OFS + sizeof (float)){
+    QSize ret(0, 0);
+    if (buffer.length() < NVG_VIEWBOX_HEIGHT_OFS + sizeof(float)) {
         ret = QSize(0, 0);
-        } 
-     
-    const quint8* lBuf = (quint8*) buffer.data();
-    if((buffer.length() > NVG_VIEWBOX_WIDTH_OFS) && (buffer.length() > NVG_VIEWBOX_HEIGHT_OFS)) {	
-	    float lViewboxWidth = * (float*)(lBuf + NVG_VIEWBOX_WIDTH_OFS);
-	    float lViewboxHeight = * (float*)(lBuf + NVG_VIEWBOX_HEIGHT_OFS);
+    }
 
-	    if (lViewboxWidth > 0 && lViewboxHeight > 0) {
-	        ret = QSize(lViewboxWidth, lViewboxHeight);
-	    } else {
-	        ret = QSize(0, 0);
-	    }
+    const quint8* buf = (quint8*) buffer.data();
+    if ((buffer.length() > NVG_VIEWBOX_WIDTH_OFS) && (buffer.length() > NVG_VIEWBOX_HEIGHT_OFS)) {
+        float viewboxWidth = * (float*)(buf + NVG_VIEWBOX_WIDTH_OFS);
+        float viewboxHeight = * (float*)(buf + NVG_VIEWBOX_HEIGHT_OFS);
+
+        if (viewboxWidth > 0 && viewboxHeight > 0) {
+            ret = QSize(viewboxWidth, viewboxHeight);
+        } else {
+            ret = QSize(0, 0);
+        }
     }
     return ret;
 }
@@ -145,79 +145,74 @@
     vgSeti(VG_MATRIX_MODE, mMatrixMode);
 }
 
-HbNvgEngine::NvgErrorType HbNvgEnginePrivate::drawNvg(const QByteArray &buffer, const QSize &size)
+HbNvgEngine::HbNvgErrorType HbNvgEnginePrivate::drawNvg(const QByteArray &buffer, const QSize &size)
 {
     mLastError = HbNvgEngine::NvgErrNone;
-    
+
     updateClientMatrices();
 
-    try
-    {
-        doDrawNvg(buffer, size);        
-        
-    } catch (const std::bad_alloc & e)
-    {
+    try {
+        doDrawNvg(buffer, size);
+
+    } catch (const std::bad_alloc & e) {
         mLastError = HbNvgEngine::NvgErrNoMemory;
-    } catch (const HbNvgException & e)
-    {
-        mLastError = (HbNvgEngine::NvgErrorType) e.errorID();
+    } catch (const HbNvgException & e) {
+        mLastError = (HbNvgEngine::HbNvgErrorType) e.errorID();
     }
-    
-	restoreClientMatrices();
-	
+
+    restoreClientMatrices();
+
     return mLastError;
 }
 
 HbNvgIcon * HbNvgEnginePrivate::createNvgIcon(const QByteArray &buffer, const QSize& size)
 {
-    NVG_DEBUGP1("Creating NVGCSIcon");
+    NVG_DEBUGP1("Creating NvgCsIcon");
 
-    mCurrentNvgIcon     = NULL;
-    
+    mCurrentNvgIcon     = 0;
+
 #ifdef OPENVG_OBJECT_CACHING
     mCreatingNvgIcon    = true;
 
-    mLastError = drawNvg(buffer, size); 
-    if ( mLastError != NvgErrNone) {
+    mLastError = drawNvg(buffer, size);
+    if (mLastError != NvgErrNone) {
         delete mCurrentNvgIcon;
-        mCurrentNvgIcon = NULL;
-        NVG_DEBUGP2("Creating NVGCSIcon failed %d\n", mLastError);
+        mCurrentNvgIcon = 0;
+        NVG_DEBUGP2("Creating NvgCsIcon failed %d\n", mLastError);
     }
 
-    mCreatingNvgIcon    = false;  
+    mCreatingNvgIcon    = false;
 #else
     QByteArray tempArray = buffer;
     QSize tempSize = size;
     Q_UNUSED(tempArray);
     Q_UNUSED(tempSize);
-#endif 
+#endif
     return mCurrentNvgIcon;
 }
 
 void HbNvgEnginePrivate::doDrawNvg(const QByteArray & buffer, const QSize &size)
-{    
+{
     // if size is null then return without doing anything
     if (size.isNull()) {
         return;
     }
-	
-    if (mCurrentBufferSize != size) {
-        mCurrentBufferSize = size;
-    }
+
+    mCurrentBufferSize = size;
 
     HbDereferencer nvgIconData(buffer);
 
     quint8 * signature = nvgIconData.derefInt8Array(NVG_SIGNATURE_LENGTH);
-    
+
     // checking the 'nvg' signature
-    if (memcmp(signature, NVG_SIGNATURE, NVG_SIGNATURE_LENGTH) != 0){
+    if (memcmp(signature, NVG_SIGNATURE, NVG_SIGNATURE_LENGTH) != 0) {
         NVG_DEBUGP1("Not an NVG icon");
         throw HbNvgException(HbNvgEngine::NvgErrNotSupported);
     }
 
     quint16 reserved1 = nvgIconData.derefInt16(NvgOffsetReserved1) & 0x03;
     HbNvgIconFactory::HbNvgIconType iconType = (HbNvgIconFactory::HbNvgIconType)(reserved1 & 0x03);
-    
+
 #ifdef OPENVG_OBJECT_CACHING
     mCurrentNvgIcon = HbNvgIconFactory::create(iconType);
     QScopedPointer <HbNvgIcon> nvgIcon(mCurrentNvgIcon);
@@ -225,16 +220,16 @@
     HbNvgIcon * nvGIcon = mIconList.getIcon(iconType);
     if (!nvGIcon) {
         mCurrentNvgIcon = HbNvgIconFactory::create(iconType);
-        mIconList.addNVGIcon(iconType, mCurrentNvgIcon);
+        mIconList.addNvgIcon(iconType, mCurrentNvgIcon);
     } else {
         mCurrentNvgIcon = nvGIcon;
     }
 #endif
-    
+
     mCurrentNvgIcon->setPreserveAspectRatio(mPreserveAspectSetting, mSmilFitSetting);
     mCurrentNvgIcon->rotate(mRotateAngle, mCentreX, mCentreY);
     mCurrentNvgIcon->setVgImageBinder(mVgImageBinder);
-    mCurrentNvgIcon->setMirroringMode(mMirroringMode);
+    mCurrentNvgIcon->enableMirroring(mMirrored);
 
 #ifdef OPENVG_OBJECT_CACHING
     if (mCreatingNvgIcon) {
@@ -255,12 +250,12 @@
 
 void HbNvgEnginePrivate::clearBackground()
 {
-    quint32 rgba = (mBackgroundColor.rgba () << 8) | (mBackgroundColor.rgba () >> 24);
+    quint32 rgba = (mBackgroundColor.rgba() << 8) | (mBackgroundColor.rgba() >> 24);
     qint32 r, g, b, a;
-    r = (int)((rgba & 0xFF000000) >> 24);
-    g = (int)((rgba & 0x00FF0000) >> 16);
-    b = (int)((rgba & 0x0000FF00) >> 8);
-    a = (int)(rgba & 0x000000FF);
+    r = (qint32)((rgba & 0xFF000000) >> 24);
+    g = (qint32)((rgba & 0x00FF0000) >> 16);
+    b = (qint32)((rgba & 0x0000FF00) >> 8);
+    a = (qint32)(rgba & 0x000000FF);
 
     r += r >> 7; g += g >> 7; b += b >> 7; a += a >> 7;
 
@@ -278,143 +273,143 @@
 }
 
 /*!
-  Constructs a HbNvgEngine 
+  Constructs a HbNvgEngine
  */
- HbNvgEngine::HbNvgEngine():d_ptr( new HbNvgEnginePrivate())      
+HbNvgEngine::HbNvgEngine(): d_ptr(new HbNvgEnginePrivate())
 {
-     Q_CHECK_PTR(d_ptr);
+    Q_CHECK_PTR(d_ptr);
 }
 
 /*!
  Destructor
  */
- HbNvgEngine::~HbNvgEngine()
+HbNvgEngine::~HbNvgEngine()
 {
     delete  d_ptr;
 }
 
- /*!
-   Set the \a angle for rotation of the NVG graphic at the 
-   coordiantes  \a xval and \a yval. 
-  */
- void  HbNvgEngine::rotate(float angle, float xval, float yval)
- {
-     d_ptr->rotate(angle, xval, yval);
- }
+/*!
+  Set the \a angle for rotation of the NVG graphic at the
+  coordiantes  \a xval and \a yval.
+ */
+void  HbNvgEngine::rotate(float angle, float xval, float yval)
+{
+    d_ptr->rotate(angle, xval, yval);
+}
+
+/*!
+  Sets the aspectratio \a preserveAspectSetting and \a smilFitSetting
+  to be applied on the nvg graphic.
+ */
+void HbNvgEngine::setPreserveAspectRatio(HbNvgAlignType preserveAspectSetting,
+        HbNvgMeetType smilFitSetting)
+{
+    d_ptr->setPreserveAspectRatio(preserveAspectSetting, smilFitSetting);
+}
+
+/*!
+  Returns viewbox dimensions of the nvg graphic as QSize .
+ */
+QSize HbNvgEngine::contentDimensions(const QByteArray &buffer)const
+{
+    return d_ptr->contentDimensions(buffer);
+}
 
- /*!
-   Sets the aspectratio \a preserveAspectSetting and \a smilFitSetting 
-   to be applied on the nvg graphic.
-  */
- void HbNvgEngine::setPreserveAspectRatio(NvgAlignStatusType preserveAspectSetting,
-             NvgMeetOrSliceType smilFitSetting)
-     {
-         d_ptr->setPreserveAspectRatio(preserveAspectSetting, smilFitSetting);
-     }
- 
- /*!
-   Returns viewbox dimensions of the nvg graphic as QSize . 
-  */
- QSize HbNvgEngine::contentDimensions(const QByteArray &buffer)const
- {
-     return d_ptr->contentDimensions(buffer);
- }
+/*!
+  Creates the nvgicon with the content \a buffer of size \a size and
+  return pointer to the HbNvgIcon.
+ */
+HbNvgIcon * HbNvgEngine::createNvgIcon(const QByteArray &buffer, const QSize &size)
+{
+    return d_ptr->createNvgIcon(buffer, size);
+}
 
- /*!
-   Creates the nvgicon with the content \a buffer of size \a size and 
-   return pointer to the HbNvgIcon.
-  */
- HbNvgIcon * HbNvgEngine::createNvgIcon(const QByteArray &buffer, const QSize &size)
- {
-     return d_ptr->createNvgIcon(buffer, size);
- }
- 
- /*!
-   Draw the  nvg graphic with the content \a buffer of size \a size.
-  */
- HbNvgEngine::NvgErrorType HbNvgEngine::drawNvg(const QByteArray &buffer, const QSize &size)
- {
-     return d_ptr->drawNvg(buffer,size);
- }
- 
- /*!
-   Set the HbVgImageBinder \a imageBinder  to the HbNvgEngine 
-  */
- void HbNvgEngine::setVgImageBinder(HbVgImageBinder *imageBinder) 
- {
-     d_ptr->setVgImageBinder(imageBinder);
- }
+/*!
+  Draw the  nvg graphic with the content \a buffer of size \a size.
+ */
+HbNvgEngine::HbNvgErrorType HbNvgEngine::drawNvg(const QByteArray &buffer, const QSize &size)
+{
+    return d_ptr->drawNvg(buffer, size);
+}
+
+/*!
+  Set the HbVgImageBinder \a imageBinder  to the HbNvgEngine
+ */
+void HbNvgEngine::setVgImageBinder(HbVgImageBinder *imageBinder)
+{
+    d_ptr->setVgImageBinder(imageBinder);
+}
+
+/*!
+  Returns HbNvgEngine::HbNvgErrorType as draw status of the HbNvgEngine.
+ */
+HbNvgEngine::HbNvgErrorType HbNvgEngine::error()const
+{
+    return d_ptr->error();
+}
 
- /*!
-   Returns HbNvgEngine::NvgErrorType as draw status of the HbNvgEngine. 
-  */
- HbNvgEngine::NvgErrorType HbNvgEngine::error()const
- {
-     return d_ptr->error();
- }
- 
- /*!
-   Sets the \a rgba8888Color as background color of the nvg graphics. 
-  */
- void HbNvgEngine::setBackgroundColor(const QColor &rgba8888Color)
- {
-     d_ptr->setBackgroundColor(rgba8888Color);
- }
- 
- void HbNvgEngine::setMirroringMode(bool mirroringMode)
+/*!
+  Sets the \a rgba8888Color as background color of the nvg graphics.
+ */
+void HbNvgEngine::setBackgroundColor(const QColor &rgba8888Color)
+{
+    d_ptr->setBackgroundColor(rgba8888Color);
+}
+
+void HbNvgEngine::enableMirroring(bool mirroringMode)
 {
-    d_ptr->setMirroringMode(mirroringMode); 
+    d_ptr->enableMirroring(mirroringMode);
+}
+
+/*!
+  Clears the background color of the nvg graphic.
+ */
+void HbNvgEngine::clearBackground()
+{
+    d_ptr->clearBackground();
 }
- 
- /*!
-   Clears the background color of the nvg graphic.
-  */
- void HbNvgEngine::clearBackground()
- {
-     d_ptr->clearBackground();
- }
-     
-HbNvgEngine::NvgErrorType openVgErrorToHbNvgError(int error)
+
+HbNvgEngine::HbNvgErrorType openVgErrorToHbNvgError(qint32 error)
 {
-     HbNvgEngine::NvgErrorType symError = HbNvgEngine::NvgErrNone;
-     switch (error) {
+    HbNvgEngine::HbNvgErrorType symError = HbNvgEngine::NvgErrNone;
+    switch (error) {
+
+    case VGU_OUT_OF_MEMORY_ERROR:
+    case VG_OUT_OF_MEMORY_ERROR: {
+        symError = HbNvgEngine::NvgErrNoMemory;
+        break;
+    }
 
-     case VGU_OUT_OF_MEMORY_ERROR:
-     case VG_OUT_OF_MEMORY_ERROR: {
-         symError = HbNvgEngine::NvgErrNoMemory;
-         break;
-         }
+    case VG_ILLEGAL_ARGUMENT_ERROR:
+    case VGU_ILLEGAL_ARGUMENT_ERROR: {
+        symError = HbNvgEngine::NvgErrArgument;
+        break;
+    }
 
-     case VG_ILLEGAL_ARGUMENT_ERROR:
-     case VGU_ILLEGAL_ARGUMENT_ERROR: {
-         symError = HbNvgEngine::NvgErrArgument;
-         break;
-         }
+    case VG_UNSUPPORTED_PATH_FORMAT_ERROR:
+    case VG_UNSUPPORTED_IMAGE_FORMAT_ERROR: {
+        symError = HbNvgEngine::NvgErrNotSupported;
+        break;
+    }
 
-     case VG_UNSUPPORTED_PATH_FORMAT_ERROR:
-     case VG_UNSUPPORTED_IMAGE_FORMAT_ERROR: {
-         symError = HbNvgEngine::NvgErrNotSupported;
-         break;
-         }
+    case VG_IMAGE_IN_USE_ERROR: {
+        symError = HbNvgEngine::NvgErrInUse;
+        break;
+    }
 
-     case VG_IMAGE_IN_USE_ERROR: {
-         symError = HbNvgEngine::NvgErrInUse;
-         break;
-         }
+    case VG_BAD_HANDLE_ERROR:
+    case VG_PATH_CAPABILITY_ERROR:
+    case VGU_PATH_CAPABILITY_ERROR:
+    case VGU_BAD_WARP_ERROR:
+    case VGU_BAD_HANDLE_ERROR: {
+        symError = HbNvgEngine::NvgErrUnknown;
+        break;
+    }
 
-     case VG_BAD_HANDLE_ERROR:
-     case VG_PATH_CAPABILITY_ERROR:
-     case VGU_PATH_CAPABILITY_ERROR:
-     case VGU_BAD_WARP_ERROR:
-     case VGU_BAD_HANDLE_ERROR: {
-         symError = HbNvgEngine::NvgErrUnknown;
-         break;
-         }
+    default: {
+        symError = HbNvgEngine::NvgErrUnknown;
+    }
+    }
 
-     default: {
-         symError = HbNvgEngine::NvgErrUnknown;
-         }
-     }
-
-     return symError;
+    return symError;
 }
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/svgext/hbnvgdecoder/hbnvg_p.h
--- a/src/hbcore/svgext/hbnvgdecoder/hbnvg_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/svgext/hbnvgdecoder/hbnvg_p.h	Mon May 03 12:48:33 2010 +0300
@@ -45,8 +45,8 @@
 class HB_CORE_PRIVATE_EXPORT HbNvgEngine
 {
 public :
-    
-    enum NvgAlignStatusType {
+
+    enum HbNvgAlignType {
         NvgPreserveAspectRatioNone,
         NvgPreserveAspectRatioXminYmin,
         NvgPreserveAspectRatioXmidYmin,
@@ -59,12 +59,12 @@
         NvgPreserveAspectRatioXmaxYmax
     };
 
-    enum NvgMeetOrSliceType  {
+    enum HbNvgMeetType  {
         NvgMeet,
         NvgSlice
     };
 
-    enum NvgErrorType {
+    enum HbNvgErrorType {
         NvgErrEof = -10,
         NvgErrUnknown = -9,
         NvgErrPermissionDenied = -8,
@@ -77,41 +77,42 @@
         NvgErrBadHandle = -1,
         NvgErrNone = 0
     };
-    
+
     HbNvgEngine();
 
     virtual ~HbNvgEngine();
-    
+
     void rotate(float angle, float xval, float yval);
-    
-    void setPreserveAspectRatio(NvgAlignStatusType preserveAspectSetting,
-                NvgMeetOrSliceType smilFitSetting);
-   
+
+    void setPreserveAspectRatio(HbNvgAlignType preserveAspectSetting,
+                                HbNvgMeetType smilFitSetting);
+
     QSize contentDimensions(const QByteArray &buffer)const;
-   
+
     HbNvgIcon * createNvgIcon(const QByteArray &buffer, const QSize &size);
-    
-    NvgErrorType drawNvg(const QByteArray &buffer, const QSize &size);
-    
-    void setVgImageBinder(HbVgImageBinder *imageBinder); 
-   
-    NvgErrorType error() const;
-    
+
+    HbNvgErrorType drawNvg(const QByteArray &buffer, const QSize &size);
+
+    void setVgImageBinder(HbVgImageBinder *imageBinder);
+
+    HbNvgErrorType error() const;
+
     void setBackgroundColor(const QColor &rgba8888Color);
-    
+
     void clearBackground();
-    
-    void setMirroringMode(bool mirroringMode); 
+
+    void enableMirroring(bool mirroringMode);
 
 private :
     HbNvgEnginePrivate * const d_ptr;
-    
+
 private:
     Q_DISABLE_COPY(HbNvgEngine)
     Q_DECLARE_PRIVATE_D(d_ptr, HbNvgEngine)
 };
 
-HbNvgEngine::NvgErrorType openVgErrorToHbNvgError(int error);
+HbNvgEngine::HbNvgErrorType openVgErrorToHbNvgError(qint32 error);
 
 #endif
-//-------------------------------End Of File-------------------------
+
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/svgext/hbnvgdecoder/hbnvg_p_p.h
--- a/src/hbcore/svgext/hbnvgdecoder/hbnvg_p_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/svgext/hbnvgdecoder/hbnvg_p_p.h	Mon May 03 12:48:33 2010 +0300
@@ -34,23 +34,23 @@
 class HbNvgIcon;
 class HbVgImageBinder;
 
-class NVGIconList
+class HbNvgIconList
 {
 public:
-    NVGIconList()
-    {
-        icons[HbNvgIconFactory::NVGCS] = 0;
-        icons[HbNvgIconFactory::NVGTLV] = 0;
+    HbNvgIconList() 
+	{
+        icons[HbNvgIconFactory::NvgCs] = 0;
+        icons[HbNvgIconFactory::NvgTlv] = 0;
     }
 
-    void addNVGIcon(HbNvgIconFactory::HbNvgIconType type, HbNvgIcon * nvgICon);
-    
+    void addNvgIcon(HbNvgIconFactory::HbNvgIconType type, HbNvgIcon * nvgIcon);
+
     HbNvgIcon * getIcon(HbNvgIconFactory::HbNvgIconType type);
-    
-    ~NVGIconList();
-    
+
+    ~HbNvgIconList();
+
 private:
-    HbNvgIcon * icons[HbNvgIconFactory::NVGTLV + 1];
+    HbNvgIcon * icons[HbNvgIconFactory::NvgTlv + 1];
 };
 
 class HbNvgEnginePrivate
@@ -61,71 +61,68 @@
     ~HbNvgEnginePrivate();
 
     void rotate(float angle, float xval, float yval) ;
-    
-    void setPreserveAspectRatio(HbNvgEngine::NvgAlignStatusType preserveAspectSetting,
-            HbNvgEngine::NvgMeetOrSliceType smilFitSetting);
+
+    void setPreserveAspectRatio(HbNvgEngine::HbNvgAlignType preserveAspectSetting,
+                                HbNvgEngine::HbNvgMeetType smilFitSetting);
 
     QSize contentDimensions(const QByteArray &buffer) const;
 
-    HbNvgEngine::NvgErrorType drawNvg(const QByteArray &buffer, const QSize &size);
+    HbNvgEngine::HbNvgErrorType drawNvg(const QByteArray &buffer, const QSize &size);
 
     HbNvgIcon * createNvgIcon(const QByteArray &buffer, const QSize &size);
 
-    void setVgImageBinder(HbVgImageBinder *imageBinder) 
-    {
+    void setVgImageBinder(HbVgImageBinder *imageBinder) {
         mVgImageBinder = imageBinder;
     }
 
-    HbNvgEngine::NvgErrorType error()const 
-    {
+    HbNvgEngine::HbNvgErrorType error()const {
         return mLastError;
     }
-    
-    void setMirroringMode(bool mirroringMode )
-    {
-        mMirroringMode = mirroringMode;
+
+    void enableMirroring(bool mirroringMode) {
+        mMirrored = mirroringMode;
     }
-    
+
     void setBackgroundColor(const QColor &rgba8888Color);
-      
+
     void clearBackground();
 
 private :
     void doDrawNvg(const QByteArray &buffer, const QSize &size);
 
-    int drawTlv(const QByteArray &buffer, const QSize &targetSize);
+    qint32 drawTlv(const QByteArray &buffer, const QSize &targetSize);
 
-    int drawCsIcon(const QByteArray &buffer, const QSize &targetSize);
+    qint32 drawCsIcon(const QByteArray &buffer, const QSize &targetSize);
 
     void updateClientMatrices();
-    
+
     void restoreClientMatrices();
 
 private :
 
     QSize mCurrentBufferSize;
-    
+
     VGfloat mRotateAngle;
     float   mCentreX;
-    float   mCentreY;   
-    
-    HbNvgEngine::NvgAlignStatusType  mPreserveAspectSetting;
-    HbNvgEngine::NvgMeetOrSliceType  mSmilFitSetting;
-    
+    float   mCentreY;
+
+    HbNvgEngine::HbNvgAlignType  mPreserveAspectSetting;
+    HbNvgEngine::HbNvgMeetType  mSmilFitSetting;
+
     QColor              mBackgroundColor;
     HbVgImageBinder *   mVgImageBinder;
-    
+
     bool         mCreatingNvgIcon;
     HbNvgIcon * mCurrentNvgIcon;
-    
-    HbNvgEngine::NvgErrorType mLastError;
-    
-    bool        mMirroringMode;
+
+    HbNvgEngine::HbNvgErrorType mLastError;
+
+    bool        mMirrored;
     VGint       mMatrixMode;
     VGfloat     mImageMatrix[9];
     VGfloat     mPathMatrix[9];
-    NVGIconList mIconList;
+    HbNvgIconList mIconList;
 };
 
 #endif
-//-------------------------------End Of File-------------------------
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/svgext/hbnvgdecoder/hbnvgcsicon.cpp
--- a/src/hbcore/svgext/hbnvgdecoder/hbnvgcsicon.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/svgext/hbnvgdecoder/hbnvgcsicon.cpp	Mon May 03 12:48:33 2010 +0300
@@ -36,94 +36,94 @@
 /*!
   NVG-CS version
  */
-const int Version2   = 2;
+const qint32 Version2   = 2;
 
 /*!
   File offsets
  */
-const int NVG_VIEWBOX_WIDTH_OFS = 44;
-const int NVG_VIEWBOX_HEIGHT_OFS = 48;
-const int NVG_VIEWBOX_X_OFS = 36;
-const int NVG_VIEWBOX_Y_OFS = 40;
-const int NVG_PATHDATATYPE_OFS = 26;
-const int NVG_SCALE_OFS = 28;
-const int NVG_BIAS_OFS = 32;
-const int NVG_COMMANDSECTION_OFS = 2;
-const int NVG_RGBA_OFS = 4;
-const int NVG_HEADERSIZE_OFS = 4;
-const int NVG_PAINTSECTION_LINEARGRAD_TRANSFORM_OFFSET = 20;
-const int NVG_PAINTSECTION_RADIALGRAD_TRANSFORM_OFFSET = 24;
-const int NVG_VERSION_OFS         = 3;
+const qint32 NVG_VIEWBOX_WIDTH_OFS = 44;
+const qint32 NVG_VIEWBOX_HEIGHT_OFS = 48;
+const qint32 NVG_VIEWBOX_X_OFS = 36;
+const qint32 NVG_VIEWBOX_Y_OFS = 40;
+const qint32 NVG_PATHDATATYPE_OFS = 26;
+const qint32 NVG_SCALE_OFS = 28;
+const qint32 NVG_BIAS_OFS = 32;
+const qint32 NVG_COMMANDSECTION_OFS = 2;
+const qint32 NVG_RGBA_OFS = 4;
+const qint32 NVG_HEADERSIZE_OFS = 4;
+const qint32 NVG_PAINTSECTION_LINEARGRAD_TRANSFORM_OFFSET = 20;
+const qint32 NVG_PAINTSECTION_RADIALGRAD_TRANSFORM_OFFSET = 24;
+const qint32 NVG_VERSION_OFS         = 3;
 
 /*!
   NVG-CS commands
- */ 
-const int CMD_SET_FILL_PAINT           = 4  << 24;
-const int CMD_SET_COLOR_RAMP           = 6  << 24;
-const int CMD_DRAW_PATH                = 7  << 24;
-const int CMD_SET_TRANSFORMATION       = 8  << 24;
-const int CMD_SET_STROKE_PAINT         = 5  << 24;
-const int CMD_SET_STROKE_WIDTH         = 9  << 24;
-const int CMD_SET_STROKE_LINE_JOIN_CAP = 10 << 24;
-const int CMD_SET_STROKE_MITER_LIMIT   = 11 << 24;
+ */
+const qint32 CMD_SET_FILL_PAINT           = 4  << 24;
+const qint32 CMD_SET_COLOR_RAMP           = 6  << 24;
+const qint32 CMD_DRAW_PATH                = 7  << 24;
+const qint32 CMD_SET_TRANSFORMATION       = 8  << 24;
+const qint32 CMD_SET_STROKE_PAINT         = 5  << 24;
+const qint32 CMD_SET_STROKE_WIDTH         = 9  << 24;
+const qint32 CMD_SET_STROKE_LINE_JOIN_CAP = 10 << 24;
+const qint32 CMD_SET_STROKE_MITER_LIMIT   = 11 << 24;
 
 /*!
  Stroke cap style
  */
-const int CAP_BUTT        = 1;
-const int CAP_SQUARE      = 2;
-const int CAP_ROUND       = 3;
+const qint32 CAP_BUTT        = 1;
+const qint32 CAP_SQUARE      = 2;
+const qint32 CAP_ROUND       = 3;
 
 /*!
  Stroke join style
  */
-const int LINE_JOIN_BEVEL = 1;
-const int LINE_JOIN_MITER = 2;
-const int LINE_JOIN_ROUND = 3;
+const qint32 LINE_JOIN_BEVEL = 1;
+const qint32 LINE_JOIN_MITER = 2;
+const qint32 LINE_JOIN_ROUND = 3;
 
 /*!
  Fill paint type
  */
-const int PAINT_FLAT      = 1;
-const int PAINT_LGRAD     = 2;
-const int PAINT_RGRAD     = 3;
+const qint32 PAINT_FLAT      = 1;
+const qint32 PAINT_LGRAD     = 2;
+const qint32 PAINT_RGRAD     = 3;
 
 /*!
  Stroke paint type
  */
-const int STROKE_LGRAD        = 2;
-const int STROKE_RGRAD        = 3;
-const int STROKE_COLOR_RAMP   = 4;
+const qint32 STROKE_LGRAD        = 2;
+const qint32 STROKE_RGRAD        = 3;
+const qint32 STROKE_COLOR_RAMP   = 4;
 
 /*!
  Transform encoding values
  */
-const int TRANSFORM_COMPLETE    = 0;
-const int TRANSFORM_SCALING     = 2;
-const int TRANSFORM_SHEARING    = 4;
-const int TRANSFORM_ROTATION    = 8;
-const int TRANSFORM_TRANSLATION = 16;
+const qint32 TRANSFORM_COMPLETE    = 0;
+const qint32 TRANSFORM_SCALING     = 2;
+const qint32 TRANSFORM_SHEARING    = 4;
+const qint32 TRANSFORM_ROTATION    = 8;
+const qint32 TRANSFORM_TRANSLATION = 16;
 
-const VGfloat IdentityMatrix[] = {
+const VGfloat identityMatrix[] = {
     1.0f, 0.0f, 0.0f,
     0.0f, 1.0f, 0.0f,
     0.0f, 0.0f , 1.0f
 };
 
-    /**
-     * @fn      Constructor
-     * @Version
-     * @parameter: buffer - None
-     *
-     * @return: None
-     */
+/**
+ * @fn      Constructor
+ * @Version
+ * @parameter: buffer - None
+ *
+ * @return: None
+ */
 
 HbNvgCsIcon::HbNvgCsIcon()
         :   mPaintFill(VG_INVALID_HANDLE),
         mPaintStroke(VG_INVALID_HANDLE),
         mVgPath(VG_INVALID_HANDLE),
         mLastPathDataType(0),
-        mDoFill (VG_FALSE),
+        mDoFill(VG_FALSE),
         mDoStroke(VG_FALSE),
         mCreatingNvgIcon(0),
         mPreserveAspectSetting(HbNvgEngine::NvgPreserveAspectRatioXmidYmid),
@@ -136,7 +136,7 @@
         mLastStrkePaintColor(0),
         mResetFillPaint(0),
         mResetStrokePaint(0),
-        mMirroringMode(false)
+        mMirrored(false)
 {
 }
 
@@ -159,10 +159,10 @@
     if (mVgPath) {
         vgDestroyPath(mVgPath);
     }
-    
+
     vgSetPaint(VG_INVALID_HANDLE, VG_FILL_PATH);
     vgSetPaint(VG_INVALID_HANDLE, VG_STROKE_PATH);
-    
+
     delete mNvgIconData;
     delete mOpenVgHandles;
 }
@@ -176,62 +176,78 @@
     mViewBoxH = h;
 }
 
-void  HbNvgCsIcon::setPreserveAspectRatio(HbNvgEngine::NvgAlignStatusType preserveAspectSetting,
-        HbNvgEngine::NvgMeetOrSliceType smilFitSetting)
+/*!
+    set the aspectRatio \a preserveAspectSetting and \a smilFitSetting
+    to be applied on the nvgicon.
+*/
+void  HbNvgCsIcon::setPreserveAspectRatio(HbNvgEngine::HbNvgAlignType preserveAspectSetting,
+        HbNvgEngine::HbNvgMeetType smilFitSetting)
 {
     mPreserveAspectSetting = preserveAspectSetting;
     mSmilFitSetting = smilFitSetting;
 }
 
-void HbNvgCsIcon::setMirroringMode(bool mirroringMode)
+void HbNvgCsIcon::enableMirroring(bool mirroringMode)
 {
-    mMirroringMode = mirroringMode;
+    mMirrored = mirroringMode;
 }
 
+/*!
+    Set the \a angle for rotation of the nvgicon at the
+    coordiantes  \a x and \a y.
+*/
 void HbNvgCsIcon::rotate(float angle, float xValue, float yValue)
 {
-     mRotationAngle  = angle;
-     mRotationX      = xValue;
-     mRotationY      = yValue;
+    mRotationAngle  = angle;
+    mRotationX      = xValue;
+    mRotationY      = yValue;
 }
 
+/*!
+    Do the direct draw of the nvg graphic data \a buffer of size \a targetSize
+    and return the status of the draw.
+*/
 void HbNvgCsIcon ::directDraw(const QByteArray &buffer, const QSize &targetSize)
 {
     drawCommandSection(buffer, targetSize, 0);
 }
 
+/*!
+    Create the nvg graphic data \a buffer of size \a targetSize
+    and return the status of the draw.
+*/
 void HbNvgCsIcon::create(const QByteArray &buffer, const QSize& targetSize)
 {
     drawCommandSection(buffer, targetSize, 1);
 }
 
 void HbNvgCsIcon::drawCommandSection(const QByteArray &buffer, const QSize & targetSize,
-        int objectCaching)
-{       
+                                     qint32 objectCaching)
+{
     mCreatingNvgIcon = objectCaching;
- 
+
     HbDereferencer iconData(buffer);
-    qint16 lHeaderSize  = iconData.derefInt16(NVG_HEADERSIZE_OFS);
+    qint16 headerSize  = iconData.derefInt16(NVG_HEADERSIZE_OFS);
     quint8 nvgVersion   = iconData.derefInt8(NVG_VERSION_OFS);
- 
-    HbNvgEngine::NvgErrorType errInit = HbNvgEngine::NvgErrNone;
-        
+
+    HbNvgEngine::HbNvgErrorType errInit = HbNvgEngine::NvgErrNone;
+
     errInit = initializeGc();
-    if (HbNvgEngine::NvgErrNone != errInit){
-       throw HbNvgException(errInit);
-    }
-        
-    qint16 lPathDataType = iconData.derefInt16(NVG_PATHDATATYPE_OFS);
-    float lScale         = iconData.derefReal32(NVG_SCALE_OFS);
-    float lBias          = iconData.derefReal32(NVG_BIAS_OFS);
-
-    errInit = createPathHandle(lPathDataType, lScale, lBias);
-    if (HbNvgEngine::NvgErrNone != errInit){
+    if (HbNvgEngine::NvgErrNone != errInit) {
         throw HbNvgException(errInit);
     }
 
-    VGfloat lCurrentPathMatrix[9];
-    vgGetMatrix(lCurrentPathMatrix);
+    qint16 pathDataType = iconData.derefInt16(NVG_PATHDATATYPE_OFS);
+    float scale         = iconData.derefReal32(NVG_SCALE_OFS);
+    float bias          = iconData.derefReal32(NVG_BIAS_OFS);
+
+    errInit = createPathHandle(pathDataType, scale, bias);
+    if (HbNvgEngine::NvgErrNone != errInit) {
+        throw HbNvgException(errInit);
+    }
+
+    VGfloat currentPathMatrix[9];
+    vgGetMatrix(currentPathMatrix);
     vgSeti(VG_MATRIX_MODE, VG_MATRIX_PATH_USER_TO_SURFACE);
 
     // We use the caller's base batrix regardless of which mode the caller was.
@@ -240,250 +256,227 @@
     // But even though the texture gets stroked instead, we must use the caller's
     // transformation matrix.
     // Everything gets restored to the original values before we return.
-    vgLoadMatrix(lCurrentPathMatrix);
+    vgLoadMatrix(currentPathMatrix);
 
-//    applyScissoring(lCurrentPathMatrix, targetSize);
+//    applyScissoring(currentPathMatrix, targetSize);
 
     /*
      * set the rotation angle if available
      */
-           
+
     setRotation();
-    
-    if (mMirroringMode) {
-	    vgTranslate((VGfloat)(targetSize.width()), 0); 
-	    vgScale(-1.0f, 1.0f);
-	    }
-    
+
+    if (mMirrored) {
+        vgTranslate((VGfloat)(targetSize.width()), 0);
+        vgScale(-1.0f, 1.0f);
+    }
+
 
 #ifdef __MIRROR_
-     vgScale(1.0f, -1.0f);
-     vgTranslate(0, (VGfloat)(-targetSize.height()));
+    vgScale(1.0f, -1.0f);
+    vgTranslate(0, (VGfloat)(-targetSize.height()));
 #endif
 
     //viewbox parameters
-    float lViewboxX   = iconData.derefReal32(NVG_VIEWBOX_X_OFS);
-    float lViewboxY   = iconData.derefReal32(NVG_VIEWBOX_Y_OFS);
-    float lViewboxW   = iconData.derefReal32(NVG_VIEWBOX_WIDTH_OFS);
-    float lViewboxH   = iconData.derefReal32(NVG_VIEWBOX_HEIGHT_OFS);
+    float viewboxX   = iconData.derefReal32(NVG_VIEWBOX_X_OFS);
+    float viewboxY   = iconData.derefReal32(NVG_VIEWBOX_Y_OFS);
+    float viewboxW   = iconData.derefReal32(NVG_VIEWBOX_WIDTH_OFS);
+    float viewboxH   = iconData.derefReal32(NVG_VIEWBOX_HEIGHT_OFS);
 
-    applyViewboxToViewPortTransformation(targetSize, lViewboxX, lViewboxY, lViewboxW, lViewboxH);
+    applyViewboxToViewPortTransformation(targetSize, viewboxX, viewboxY, viewboxW, viewboxH);
 
-    quint32 offsetSectionLength = iconData.getLength() - lHeaderSize;
-    quint8 * offsetPtr = iconData.derefInt8Array(offsetSectionLength, lHeaderSize);
-    
+    quint32 offsetSectionLength = iconData.getLength() - headerSize;
+    quint8 * offsetPtr = iconData.derefInt8Array(offsetSectionLength, headerSize);
+
     HbDereferencer offsetSection(offsetPtr, offsetSectionLength);
-    quint16 lOffsetVectorCount = offsetSection.derefInt16();
+    quint16 offsetVectorCount = offsetSection.derefInt16();
 
-    offsetPtr = iconData.derefInt8Array(offsetSectionLength - sizeof(quint16), lHeaderSize + sizeof(quint16));
+    offsetPtr = iconData.derefInt8Array(offsetSectionLength - sizeof(quint16), headerSize + sizeof(quint16));
     HbDereferencer offsetVector(offsetPtr, offsetSectionLength - sizeof(quint16));
 
-    qint32 commandSectionOffset = lOffsetVectorCount * sizeof(quint16);
-    HbDereferencer commandSection((offsetVector.getPtr() + commandSectionOffset), 
-            iconData.getLength() - commandSectionOffset - lHeaderSize - sizeof(quint16));
-            
+    qint32 commandSectionOffset = offsetVectorCount * sizeof(quint16);
+    HbDereferencer commandSection((offsetVector.getPtr() + commandSectionOffset),
+                                  iconData.getLength() - commandSectionOffset - headerSize - sizeof(quint16));
+
     // from version 2 onwards command section will start on word boundary
-    if (nvgVersion >= Version2 && ((lOffsetVectorCount  & 0x01) == 0))
-        {
+    if (nvgVersion >= Version2 && ((offsetVectorCount  & 0x01) == 0)) {
         commandSection.skip(2);
-        }
-         
-    quint16 lCmdCount = commandSection.derefInt16();
-    commandSection.skip(NVG_COMMANDSECTION_OFS);   
-    
+    }
+
+    quint16 cmdCount = commandSection.derefInt16();
+    commandSection.skip(NVG_COMMANDSECTION_OFS);
+
     /*
      * from version 2 onwards there will be a padding added
      * after the command count to make it word aligned
      */
-    if (nvgVersion >= Version2)
-        {
+    if (nvgVersion >= Version2) {
         commandSection.skip(2);
-        }
-        
-    executeNVGCSCommandLoop(lCmdCount, &iconData, &offsetVector, &commandSection, nvgVersion);
+    }
+
+    executeNvgCsCommandLoop(cmdCount, &iconData, &offsetVector, &commandSection, nvgVersion);
 }
 
-void HbNvgCsIcon::executeNVGCSCommandLoop(quint16 commandCount, HbDereferencer *iconData, 
-        HbDereferencer * offsetVector,HbDereferencer * commandSection, quint8 nvgVersion)
-    {
+void HbNvgCsIcon::executeNvgCsCommandLoop(quint16 commandCount, HbDereferencer *iconData,
+        HbDereferencer * offsetVector, HbDereferencer * commandSection, quint8 nvgVersion)
+{
     quint32 transVal;
 
-    VGfloat lCurrentPathMatrix[9];
-    
-    vgGetMatrix(lCurrentPathMatrix);
-        
-    qint32 lOffsetIx = 0;
-    for (int i=0; i < commandCount; i++)
-        {
+    VGfloat currentPathMatrix[9];
+
+    vgGetMatrix(currentPathMatrix);
+
+    qint32 offsetIx = 0;
+    for (qint32 i = 0; i < commandCount; i++) {
         quint32 currentCommand = commandSection->derefInt32();
-        lOffsetIx = currentCommand & 0x0000ffff;
-                
-        switch (currentCommand & 0xff000000)
-            {
-            case CMD_SET_FILL_PAINT:
-                {
-                mFillAlpha        = (currentCommand & 0x00ff0000) >> 16;
-                quint16 offset    = offsetVector->derefInt16(lOffsetIx * sizeof(quint16));
-                
-                HbDereferencer section = getCommandSection(offset, iconData, nvgVersion);
-                                
-                setFillPaint(&section); 
-                }
-                break;    
-            case CMD_SET_COLOR_RAMP:
-                {
-                quint16 offset = offsetVector->derefInt16(lOffsetIx * sizeof(quint16));
+        offsetIx = currentCommand & 0x0000ffff;
+
+        switch (currentCommand & 0xff000000) {
+        case CMD_SET_FILL_PAINT: {
+            mFillAlpha        = (currentCommand & 0x00ff0000) >> 16;
+            quint16 offset    = offsetVector->derefInt16(offsetIx * sizeof(quint16));
+
+            HbDereferencer section = getCommandSection(offset, iconData, nvgVersion);
+
+            setFillPaint(&section);
+        }
+        break;
+        case CMD_SET_COLOR_RAMP: {
+            quint16 offset = offsetVector->derefInt16(offsetIx * sizeof(quint16));
+
+            HbDereferencer section = getCommandSection(offset, iconData, nvgVersion);
 
-                HbDereferencer section = getCommandSection(offset, iconData, nvgVersion);
+            setColorRamp(&section);
+        }
+        break;
+        case CMD_DRAW_PATH: {
+            if ((currentCommand & 0x00010000)) {
+                mDoStroke = VG_TRUE;
+            }
+
+            if ((currentCommand & 0x00020000)) {
+                mDoFill = VG_TRUE;
+            }
+            quint16 offset = offsetVector->derefInt16(offsetIx * sizeof(quint16));
+
+            HbDereferencer section = getCommandSection(offset, iconData, nvgVersion);
+
+            drawPath(&section);
+        }
+        break;
+        case CMD_SET_TRANSFORMATION: {
+            setTransform(commandSection, transVal, currentPathMatrix);
+            commandSection->skip(transVal * sizeof(quint32));
+        }
+        break;
+        case CMD_SET_STROKE_PAINT: {
+            mStrokeAlpha = (currentCommand & 0x00ff0000) >> 16;
+            quint16 offset = offsetVector->derefInt16(offsetIx * sizeof(quint16));
+
+            HbDereferencer section = getCommandSection(offset, iconData, nvgVersion);
 
-                setColorRamp(&section);
-                }
-                break;
-            case CMD_DRAW_PATH:
-                {
-                if ((currentCommand & 0x00010000)) 
-                    {
-                    mDoStroke = VG_TRUE;
-                    }
-                
-                if ((currentCommand & 0x00020000))
-                    {
-                    mDoFill = VG_TRUE;
-                    }
-                quint16 offset = offsetVector->derefInt16(lOffsetIx * sizeof(quint16));
+            setStrokePaint(&section);
+        }
+        break;
+        case CMD_SET_STROKE_WIDTH: {
+            float strokeWidth;
+            commandSection->skip(sizeof(quint32));
 
-                HbDereferencer section = getCommandSection(offset, iconData, nvgVersion);
+            /*
+             * check for alignment and copy data if not aligned, else directly convert
+             * version 2 or above guarantees that is always word aligned
+             */
+            quint8 * cptr = commandSection->derefInt8Array(sizeof(float), 0);
+            if (nvgVersion < Version2 && !isAligned4(cptr)) {
+
+                memcpy(reinterpret_cast<void *>(&strokeWidth),
+                       reinterpret_cast<void *>(cptr), sizeof(strokeWidth));
+            } else {
+                strokeWidth = commandSection->derefReal32();
+            }
 
-                drawPath(&section);
-                }
-                break;
-            case CMD_SET_TRANSFORMATION:
-                {
-                setTransform(commandSection, transVal, lCurrentPathMatrix);
-                commandSection->skip(transVal * sizeof(quint32));
-                }
-                break;
-            case CMD_SET_STROKE_PAINT:
-                {
-                mStrokeAlpha = (currentCommand & 0x00ff0000) >> 16;
-                quint16 offset = offsetVector->derefInt16(lOffsetIx * sizeof(quint16));
+            COND_COM_OC(mCreatingNvgIcon,
+                        addSetStrokeWidthCommand(strokeWidth),
+                        vgSetf(VG_STROKE_LINE_WIDTH, strokeWidth));
+        }
+        break;
+        case CMD_SET_STROKE_MITER_LIMIT: {
+            float miterLimit;
+            commandSection->skip(sizeof(float));
+
+            /*
+             * check for alignment and copy data if not aligned, else directly convert
+             * version 2 or above guarantees that is always word aligned
+             */
+            quint8 * cptr = commandSection->derefInt8Array(sizeof(float), 0);
 
-                HbDereferencer section = getCommandSection(offset, iconData, nvgVersion);
+            if (nvgVersion < Version2 && !isAligned4(cptr)) {
+                memcpy(reinterpret_cast<void *>(&miterLimit),
+                       reinterpret_cast<void *>(cptr), sizeof(miterLimit));
+            } else {
+                miterLimit = commandSection->derefReal32();
+            }
 
-                setStrokePaint(&section); 
-                }
+            COND_COM_OC(mCreatingNvgIcon,
+                        addSetStrokeMiterLimitCommand(miterLimit),
+                        vgSetf(VG_STROKE_MITER_LIMIT, miterLimit));
+        }
+        break;
+        case CMD_SET_STROKE_LINE_JOIN_CAP: {
+            quint8 joinType = (currentCommand & 0x0000ff00) >> 8;
+            quint8 capType = (currentCommand & 0x000000ff);
+
+            VGCapStyle capStyle;
+            switch (capType) {
+            case CAP_SQUARE:
+                capStyle = VG_CAP_SQUARE;
                 break;
-            case CMD_SET_STROKE_WIDTH:
-                {
-                float lStrokeWidth;
-                commandSection->skip(sizeof(quint32));
-                
-                /*
-                 * check for alignment and copy data if not aligned, else directly convert
-                 * version 2 or above guarantees that is always word aligned
-                 */
-                quint8 * cptr = commandSection->derefInt8Array(sizeof(float), 0); 
-                if (nvgVersion < Version2 && !isAligned4(cptr))
-                    {
-                    
-                    memcpy(reinterpret_cast<void *>(&lStrokeWidth),
-                              reinterpret_cast<void *>(cptr), sizeof(lStrokeWidth));
-                    }
-                else
-                    {
-                    lStrokeWidth = commandSection->derefReal32();
-                    }
-                
-                COND_COM_OC(mCreatingNvgIcon,
-                        addSetStrokeWidthCommand(lStrokeWidth),
-                        vgSetf(VG_STROKE_LINE_WIDTH, lStrokeWidth));
-                }
+            case CAP_ROUND:
+                capStyle = VG_CAP_ROUND;
                 break;
-            case CMD_SET_STROKE_MITER_LIMIT:
-                {
-                float lMiterLimit;
-                commandSection->skip(sizeof(float));
-
-                /*
-                 * check for alignment and copy data if not aligned, else directly convert
-                 * version 2 or above guarantees that is always word aligned
-                 */
-                quint8 * cptr = commandSection->derefInt8Array(sizeof(float), 0); 
+            case CAP_BUTT:
+            default:
+                capStyle = VG_CAP_BUTT;
+                break;
+            }
 
-                if (nvgVersion < Version2 && !isAligned4(cptr))
-                    {
-                    memcpy(reinterpret_cast<void *>(&lMiterLimit),
-                              reinterpret_cast<void *>(cptr), sizeof(lMiterLimit));
-                    }
-                else
-                    {
-                    lMiterLimit = commandSection->derefReal32();
-                    }
-                
-                COND_COM_OC(mCreatingNvgIcon,
-                        addSetStrokeMiterLimitCommand(lMiterLimit),
-                        vgSetf(VG_STROKE_MITER_LIMIT, lMiterLimit));
-                }
+            VGJoinStyle lineJoinStyle;
+            switch (joinType) {
+            case LINE_JOIN_BEVEL:
+                lineJoinStyle = VG_JOIN_BEVEL;
+                break;
+            case LINE_JOIN_ROUND:
+                lineJoinStyle = VG_JOIN_ROUND;
                 break;
-            case CMD_SET_STROKE_LINE_JOIN_CAP:
-                {
-                quint8 lJoinType =(currentCommand & 0x0000ff00)>>8;
-                quint8 lCapType = (currentCommand & 0x000000ff);
-                
-                VGCapStyle capStyle;
-                switch(lCapType)
-                    {
-                    case CAP_SQUARE:
-                        capStyle = VG_CAP_SQUARE;
-                        break;
-                    case CAP_ROUND:
-                        capStyle = VG_CAP_ROUND;
-                        break;
-                    case CAP_BUTT:
-                    default:
-                        capStyle = VG_CAP_BUTT;
-                        break;
-                    }
-   
-                VGJoinStyle lineJoinStyle;
-                switch(lJoinType)
-                    {
-                    case LINE_JOIN_BEVEL:
-                        lineJoinStyle = VG_JOIN_BEVEL;
-                        break;
-                    case LINE_JOIN_ROUND:
-                        lineJoinStyle = VG_JOIN_ROUND;
-                        break;
-                    case LINE_JOIN_MITER:
-                    default:
-                        lineJoinStyle = VG_JOIN_MITER;
-                        break;
-                    }
-                
-                COND_COM_OC(mCreatingNvgIcon,
+            case LINE_JOIN_MITER:
+            default:
+                lineJoinStyle = VG_JOIN_MITER;
+                break;
+            }
+
+            COND_COM_OC(mCreatingNvgIcon,
                         addStrokeLineJoinCapCommand(capStyle, lineJoinStyle),
                         vgSeti(VG_STROKE_CAP_STYLE, capStyle);
                         vgSeti(VG_STROKE_JOIN_STYLE, lineJoinStyle););
-                }
-                break;
-            default:
-                {
-                throw HbNvgException(HbNvgEngine::NvgErrCorrupt);			
-                }
-            }
-        
+        }
+        break;
+        default: {
+            throw HbNvgException(HbNvgEngine::NvgErrCorrupt);
+        }
+        }
+
         // go to the next command
         commandSection->skip(sizeof(quint32));
-        }
-    
     }
 
-HbDereferencer HbNvgCsIcon::getCommandSection(quint16 offset, HbDereferencer * iconData, int nvgVersion)
-    {
+}
+
+HbDereferencer HbNvgCsIcon::getCommandSection(quint16 offset, HbDereferencer * iconData, qint32 nvgVersion)
+{
     // the max length that the command section can have
-    int commandSectionLength = iconData->getLength() - offset;
+    qint32 commandSectionLength = iconData->getLength() - offset;
 
-    if (commandSectionLength <= 0){
+    if (commandSectionLength <= 0) {
         throw HbNvgException(HbNvgEngine::NvgErrCorrupt);
     }
 
@@ -498,20 +491,20 @@
         if (!isAligned4(offset)) {
             throw HbNvgException(HbNvgEngine::NvgErrCorrupt);
         }
-    }else{
+    } else {
         /*
          * no need to do anything here as once the nvgdecoder release
          * its version will be always greater than 2
          * infact the check for version will be removed
-         */ 
-    }
-    
-    return section;
+         */
     }
 
-void HbNvgCsIcon::applyViewboxToViewPortTransformation(const QSize& targetSize, 
+    return section;
+}
+
+void HbNvgCsIcon::applyViewboxToViewPortTransformation(const QSize& targetSize,
         float viewboxX, float viewboxY, float viewboxW, float viewboxH)
-    {
+{
     HbNvgFitToViewBoxImpl *viewBoxTx = new HbNvgFitToViewBoxImpl();
     Q_CHECK_PTR(viewBoxTx);
     QScopedPointer<HbNvgFitToViewBoxImpl> viewboxTrnsfr(viewBoxTx);
@@ -520,51 +513,48 @@
      * this is bit unreadable,
      * need to find a better design to separate the object caching solution from normal rendering,
      */
-    
-    COND_COM_OC_NOC(
-            {
-            if (mCreatingNvgIcon) {
-                setViewBox(viewboxX, viewboxY, viewboxW, viewboxH);
-                }
-            else{
-                viewboxTrnsfr->setAlign(mPreserveAspectSetting);
-                viewboxTrnsfr->setScaling(mSmilFitSetting);
-                
-                if (viewboxW > 0 && viewboxH > 0){
-                    viewboxTrnsfr->setViewBox(viewboxX, viewboxY, viewboxW, viewboxH);
-                }
-                
-                int lWidth = aTargetSize.width();
-                int lHeight = aTargetSize.height();
-                
-                viewboxTrnsfr->setWindowViewportTrans(QRect(0, 0, lWidth, lHeight), QSize(0, 0));
+
+    COND_COM_OC_NOC( {
+        if (mCreatingNvgIcon) {
+            setViewBox(viewboxX, viewboxY, viewboxW, viewboxH);
+        } else {
+            viewboxTrnsfr->setAllignment(mPreserveAspectSetting);
+            viewboxTrnsfr->setScaling(mSmilFitSetting);
+
+            if (viewboxW > 0 && viewboxH > 0) {
+                viewboxTrnsfr->setViewBox(viewboxX, viewboxY, viewboxW, viewboxH);
             }
-           },
-            {
-            viewboxTrnsfr->setAlign(mPreserveAspectSetting);
-            viewboxTrnsfr->setScaling(mSmilFitSetting);
-            
-            if (viewboxW > 0 && viewboxH > 0){
-                viewboxTrnsfr->setViewBox(viewboxX, viewboxY, viewboxW, viewboxH);
-                }
-            
-            int lWidth = targetSize.width();
-            int lHeight = targetSize.height();
-            
-            viewboxTrnsfr->setWindowViewportTrans(QRect(0, 0, lWidth, lHeight), QSize(0, 0));
-            });
-    }
+
+            qint32 width = aTargetSize.width();
+            qint32 height = aTargetSize.height();
+
+            viewboxTrnsfr->setWindowViewportTrans(QRect(0, 0, width, height), QSize(0, 0));
+        }
+    }, {
+        viewboxTrnsfr->setAllignment(mPreserveAspectSetting);
+        viewboxTrnsfr->setScaling(mSmilFitSetting);
+
+        if (viewboxW > 0 && viewboxH > 0) {
+            viewboxTrnsfr->setViewBox(viewboxX, viewboxY, viewboxW, viewboxH);
+        }
+
+        qint32 width = targetSize.width();
+        qint32 height = targetSize.height();
+
+        viewboxTrnsfr->setWindowViewportTrans(QRect(0, 0, width, height), QSize(0, 0));
+    });
+}
 
 void HbNvgCsIcon::applyScissoring(VGfloat *aMatrix, const QSize& targetSize)
-    {
+{
     /*
      * calculate the rectangle with respect to the transformation applied
      * and set the scissoring rect
-     */ 
+     */
     QPoint leftBottom  = getTranslatedPoint(aMatrix, QPoint(0, 0));
     QPoint leftTop     = getTranslatedPoint(aMatrix, QPoint(0, targetSize.height()));
     QPoint rightBottom = getTranslatedPoint(aMatrix, QPoint(targetSize.width(), 0));
-    QPoint rightTop    = getTranslatedPoint(aMatrix, QPoint(targetSize.width(),targetSize.height()));
+    QPoint rightTop    = getTranslatedPoint(aMatrix, QPoint(targetSize.width(), targetSize.height()));
 
     VGfloat minX = leftBottom.x();
     VGfloat minY = leftBottom.y();
@@ -584,10 +574,10 @@
 
     vgSeti(VG_SCISSORING, VG_TRUE);
     vgSetiv(VG_SCISSOR_RECTS, 4, clipRect);
-    }
+}
 
 
-HbNvgEngine::NvgErrorType HbNvgCsIcon::initializeGc()
+HbNvgEngine::HbNvgErrorType HbNvgCsIcon::initializeGc()
 {
     if (mPaintFill == VG_INVALID_HANDLE) {
         mPaintFill = vgCreatePaint();
@@ -595,9 +585,9 @@
             return openVgErrorToHbNvgError(vgGetError());
         }
     }
-    
+
     vgSetPaint(mPaintFill, VG_FILL_PATH);
-    
+
     if (mPaintStroke == VG_INVALID_HANDLE) {
         mPaintStroke = vgCreatePaint();
         if (mPaintStroke == VG_INVALID_HANDLE) {
@@ -610,12 +600,12 @@
     return HbNvgEngine::NvgErrNone;
 }
 
-HbNvgEngine::NvgErrorType HbNvgCsIcon::createPathHandle(qint16 pathDataType, float scale, float bias)
+HbNvgEngine::HbNvgErrorType HbNvgCsIcon::createPathHandle(qint16 pathDataType, float scale, float bias)
 {
-    (void) scale;
-    (void) bias;
+    Q_UNUSED(scale);
+    Q_UNUSED(bias);
 
-    HbNvgEngine::NvgErrorType error = HbNvgEngine::NvgErrNone;
+    HbNvgEngine::HbNvgErrorType error = HbNvgEngine::NvgErrNone;
 
     if (mLastPathDataType != pathDataType) {
         if (mVgPath != VG_INVALID_HANDLE) {
@@ -631,25 +621,25 @@
                                    VG_PATH_DATATYPE_S_16, 1.0f / 2.0f, 0.0f, 0, 0,
                                    VG_PATH_CAPABILITY_APPEND_TO);
             break;
-            }
-            
+        }
+
         case NvgSixteenBitEncoding: {
             mVgPath = vgCreatePath(VG_PATH_FORMAT_STANDARD,
                                    VG_PATH_DATATYPE_S_16, 1.0f / 16.0f, 0.0f, 0, 0,
                                    VG_PATH_CAPABILITY_APPEND_TO);
             break;
-            }
-            
+        }
+
         case NvgThirtyTwoBitEncoding: {
             mVgPath = vgCreatePath(VG_PATH_FORMAT_STANDARD,
                                    VG_PATH_DATATYPE_S_32, 1.0f / 65536.0f, 0.0f, 0, 0,
                                    VG_PATH_CAPABILITY_APPEND_TO);
             break;
-            }
+        }
 
         default: {
             return HbNvgEngine::NvgErrCorrupt;
-            }
+        }
         }
     }
 
@@ -691,262 +681,248 @@
     }
 }
 
-    /**
-     * @fn setFillPaint
-     * @brief  SetPaint gradient or solid in OpenVG
-     * @version
-     * @param   buffer - buffer containing OpenVG data
-     * @return  None
-     */
+/**
+ * @fn setFillPaint
+ * @brief  SetPaint gradient or solid in OpenVG
+ * @version
+ * @param   buffer - buffer containing OpenVG data
+ * @return  None
+ */
 
 void HbNvgCsIcon::setFillPaint(HbDereferencer *iconData)
 {
-    COND_COM_OC_OOC(register int drawingMode = mCreatingNvgIcon);
-    
-    quint32 lCommonData  = iconData->derefInt32();
-    quint32 lPaintType   = lCommonData & 0x07;
-    quint16 lSpecifcData = (lCommonData >> 16) & 0xff;
+    COND_COM_OC_OOC(register qint32 drawingMode = mCreatingNvgIcon);
+
+    quint32 commonData  = iconData->derefInt32();
+    quint32 paintType   = commonData & 0x07;
+    quint16 specifcData = (commonData >> 16) & 0xff;
 
-    switch (lPaintType) {
-        case PAINT_LGRAD: {
-            mGradPaintFill = mPaintFill;
-            COND_COM_OC_OOC(
-                if (mCreatingNvgIcon) {
-                // CNVGCSIcon will destroy the paint handle
-                mGradPaintFill = vgCreatePaint();
-                if (mGradPaintFill == VG_INVALID_HANDLE){
-                    throw HbNvgException(openVgErrorToHbNvgError(vgGetError()));
-                }
-            });
+    switch (paintType) {
+    case PAINT_LGRAD: {
+        mGradPaintFill = mPaintFill;
+        COND_COM_OC_OOC(
+        if (mCreatingNvgIcon) {
+        // CNVGCSIcon will destroy the paint handle
+        mGradPaintFill = vgCreatePaint();
+            if (mGradPaintFill == VG_INVALID_HANDLE) {
+                throw HbNvgException(openVgErrorToHbNvgError(vgGetError()));
+            }
+        });
+
+        // gradient data, the data will be word aligned
+        float* gradData = (float*)iconData->derefInt8Array(4 * sizeof(VGfloat), sizeof(float));
 
-            // gradient data, the data will be word aligned
-            float* lGradData =  (float*)iconData->derefInt8Array(4 * sizeof(VGfloat), sizeof(float));
-            
-            vgSetParameteri(mGradPaintFill, VG_PAINT_TYPE, VG_PAINT_TYPE_LINEAR_GRADIENT);
-            vgSetParameterfv(mGradPaintFill, VG_PAINT_LINEAR_GRADIENT, 4, lGradData);
-            vgSeti(VG_MATRIX_MODE, VG_MATRIX_FILL_PAINT_TO_USER);
+        vgSetParameteri(mGradPaintFill, VG_PAINT_TYPE, VG_PAINT_TYPE_LINEAR_GRADIENT);
+        vgSetParameterfv(mGradPaintFill, VG_PAINT_LINEAR_GRADIENT, 4, gradData);
+        vgSeti(VG_MATRIX_MODE, VG_MATRIX_FILL_PAINT_TO_USER);
+
+        if (specifcData & 0x1) {
+            float* gradMatrix1 = (float*) iconData->derefInt8Array(6 * sizeof(VGfloat),
+                                  NVG_PAINTSECTION_LINEARGRAD_TRANSFORM_OFFSET);
 
-            if (lSpecifcData & 0x1) {
-                float* lGradMatrix1 = (float*) iconData->derefInt8Array(6 * sizeof (VGfloat),
-                                                                   NVG_PAINTSECTION_LINEARGRAD_TRANSFORM_OFFSET);
-                               
-                float lGradMatrix[9] = {lGradMatrix1[0], lGradMatrix1[3], 0.0f,
-                                        lGradMatrix1[1], lGradMatrix1[4], 0.0f,
-                                        lGradMatrix1[2], lGradMatrix1[5], 1.0f
-                                       };
-    
-                COND_COM_OC(drawingMode,
-                            addLinearGradientCommand(4, lGradData, lGradMatrix, mGradPaintFill),
-                            vgLoadMatrix(lGradMatrix););
-                Q_UNUSED(IdentityMatrix);
-            } else {
-                COND_COM_OC(drawingMode,
-                            addLinearGradientCommand(4, lGradData, (VGfloat*)IdentityMatrix, mGradPaintFill),
-                            vgLoadIdentity());
-            }
+            float gradMatrix[9] = {gradMatrix1[0], gradMatrix1[3], 0.0f,
+                                    gradMatrix1[1], gradMatrix1[4], 0.0f,
+                                    gradMatrix1[2], gradMatrix1[5], 1.0f
+                                   };
 
-            COND_COM_OC(drawingMode, ; ,
-                        vgSeti(VG_MATRIX_MODE, VG_MATRIX_PATH_USER_TO_SURFACE));
+            COND_COM_OC(drawingMode,
+                        addLinearGradientCommand(4, gradData, gradMatrix, mGradPaintFill),
+                        vgLoadMatrix(gradMatrix););
+            Q_UNUSED(identityMatrix);
+        } else {
+            COND_COM_OC(drawingMode,
+                        addLinearGradientCommand(4, gradData, (VGfloat*)identityMatrix, mGradPaintFill),
+                        vgLoadIdentity());
         }
-        break;
-        case PAINT_RGRAD: {
-            mGradPaintFill = mPaintFill;
-    
-            COND_COM_OC_OOC(
-            if (mCreatingNvgIcon) {
-                mGradPaintFill = vgCreatePaint();
-                if (mGradPaintFill == VG_INVALID_HANDLE){
-                    throw HbNvgException(openVgErrorToHbNvgError(vgGetError()));
-                }                
-            });
-    
-            // gradient data, the data will be word aligned
-            float* lGradData = (float*)iconData->derefInt8Array(4 * sizeof(VGfloat), sizeof(quint32));
-                       
-            vgSetParameteri(mGradPaintFill, VG_PAINT_TYPE, VG_PAINT_TYPE_RADIAL_GRADIENT);
-            vgSetParameterfv(mGradPaintFill, VG_PAINT_RADIAL_GRADIENT, 5, lGradData);
-            vgSeti(VG_MATRIX_MODE, VG_MATRIX_FILL_PAINT_TO_USER);
-    
-    
-            if (lSpecifcData & 0x1) {
-                float* lGradMatrix1 = (float*)iconData->derefInt8Array(6 * sizeof (VGfloat),
-                                        NVG_PAINTSECTION_RADIALGRAD_TRANSFORM_OFFSET);
-                float lGradMatrix[9] = {lGradMatrix1[0], lGradMatrix1[3], 0.0f,
-                                        lGradMatrix1[1], lGradMatrix1[4], 0.0f,
-                                        lGradMatrix1[2], lGradMatrix1[5], 1.0f
-                                       };
-    
-                COND_COM_OC(drawingMode,
-                            addRadialGradientCommand(5, lGradData, lGradMatrix, mGradPaintFill),
-                            vgLoadMatrix(lGradMatrix));
-                Q_UNUSED(IdentityMatrix);
-            } else {
-                COND_COM_OC(drawingMode,
-                            addRadialGradientCommand(5, lGradData, (VGfloat*)IdentityMatrix, mGradPaintFill),
-                            vgLoadIdentity());
+
+        COND_COM_OC(drawingMode, ; ,
+                    vgSeti(VG_MATRIX_MODE, VG_MATRIX_PATH_USER_TO_SURFACE));
+    }
+    break;
+    case PAINT_RGRAD: {
+        mGradPaintFill = mPaintFill;
+
+        COND_COM_OC_OOC(
+        if (mCreatingNvgIcon) {
+        mGradPaintFill = vgCreatePaint();
+            if (mGradPaintFill == VG_INVALID_HANDLE) {
+                throw HbNvgException(openVgErrorToHbNvgError(vgGetError()));
             }
-    
-            COND_COM_OC(drawingMode, ; ,
-                        vgSeti(VG_MATRIX_MODE, VG_MATRIX_PATH_USER_TO_SURFACE));
+        });
+
+        // gradient data, the data will be word aligned
+        float* gradData = (float*)iconData->derefInt8Array(4 * sizeof(VGfloat), sizeof(quint32));
+
+        vgSetParameteri(mGradPaintFill, VG_PAINT_TYPE, VG_PAINT_TYPE_RADIAL_GRADIENT);
+        vgSetParameterfv(mGradPaintFill, VG_PAINT_RADIAL_GRADIENT, 5, gradData);
+        vgSeti(VG_MATRIX_MODE, VG_MATRIX_FILL_PAINT_TO_USER);
+
+
+        if (specifcData & 0x1) {
+            float* gradMatrix1 = (float*)iconData->derefInt8Array(6 * sizeof(VGfloat),
+                                  NVG_PAINTSECTION_RADIALGRAD_TRANSFORM_OFFSET);
+            float gradMatrix[9] = {gradMatrix1[0], gradMatrix1[3], 0.0f,
+                                    gradMatrix1[1], gradMatrix1[4], 0.0f,
+                                    gradMatrix1[2], gradMatrix1[5], 1.0f
+                                   };
+
+            COND_COM_OC(drawingMode,
+                        addRadialGradientCommand(5, gradData, gradMatrix, mGradPaintFill),
+                        vgLoadMatrix(gradMatrix));
+            Q_UNUSED(identityMatrix);
+        } else {
+            COND_COM_OC(drawingMode,
+                        addRadialGradientCommand(5, gradData, (VGfloat*)identityMatrix, mGradPaintFill),
+                        vgLoadIdentity());
         }
-        break;
-        case PAINT_FLAT:
-            {
-            quint32 lRgba = iconData->derefInt32(NVG_RGBA_OFS);
-    
-            lRgba = (lRgba & 0xffffff00) | mFillAlpha;
-            
-            COND_COM_OC(drawingMode,
-                    addSetColorCommand(lRgba),
+
+        COND_COM_OC(drawingMode, ; ,
+                    vgSeti(VG_MATRIX_MODE, VG_MATRIX_PATH_USER_TO_SURFACE));
+    }
+    break;
+    case PAINT_FLAT: {
+        quint32 rgba = iconData->derefInt32(NVG_RGBA_OFS);
+
+        rgba = (rgba & 0xffffff00) | mFillAlpha;
+
+        COND_COM_OC(drawingMode,
+                    addSetColorCommand(rgba),
                     vgSetParameteri(mPaintFill, VG_PAINT_TYPE, VG_PAINT_TYPE_COLOR);
-                    vgSetColor(mPaintFill, lRgba));            
-            }
-            break;
-        default: {
-            throw HbNvgException(HbNvgEngine::NvgErrCorrupt);
-        }
+                    vgSetColor(mPaintFill, rgba));
+    }
+    break;
+    default: {
+        throw HbNvgException(HbNvgEngine::NvgErrCorrupt);
+    }
     }
 }
 
 void HbNvgCsIcon::setColorRamp(HbDereferencer *iconData)
 {
-    quint32 lCommonData = iconData->derefInt32();
+    quint32 commonData = iconData->derefInt32();
+
+    int stopCount = (commonData >> 16) & 0x00ff;
+    float* stopData = (float*) iconData->derefInt8Array(stopCount * 5 * sizeof(float), sizeof(quint32));
 
-    int lStopCount = (lCommonData >> 16) & 0x00ff;
-    float* lStopData = (float*) iconData->derefInt8Array(lStopCount * 5 * sizeof(float), sizeof(quint32));
-    
-    VGfloat *crs = new VGfloat[lStopCount * 5];
+    VGfloat *crs = new VGfloat[stopCount * 5];
     Q_CHECK_PTR(crs);
-    QScopedArrayPointer<VGfloat> colorRamps(crs); 
-    
+    QScopedArrayPointer<VGfloat> colorRamps(crs);
+
     if (mFillAlpha == 0xff) {
         vgSetParameteri(mGradPaintFill, VG_PAINT_COLOR_RAMP_SPREAD_MODE, VG_COLOR_RAMP_SPREAD_PAD);
-        vgSetParameterfv(mGradPaintFill, VG_PAINT_COLOR_RAMP_STOPS, lStopCount*5, lStopData);
+        vgSetParameterfv(mGradPaintFill, VG_PAINT_COLOR_RAMP_STOPS, stopCount*5, stopData);
     } else {
         // Copy color ramps and modify alpha
-        memcpy(colorRamps.data(), lStopData, lStopCount*5*sizeof(VGfloat));
-        VGfloat lAlphaInFloat = mFillAlpha * 0.003921568627450f; //(1.0f/255.0f);
-        VGfloat* lAlphaValue = &(colorRamps[4]);
-        for (int i = 0; i < lStopCount; i++) {
-            *lAlphaValue *= lAlphaInFloat;
-            lAlphaValue += 5;
+        memcpy(colorRamps.data(), stopData, stopCount*5*sizeof(VGfloat));
+        VGfloat alphaInFloat = mFillAlpha * 0.003921568627450f; //(1.0f/255.0f);
+        VGfloat* alphaValue = &(colorRamps[4]);
+        for (int i = 0; i < stopCount; i++) {
+            *alphaValue *= alphaInFloat;
+            alphaValue += 5;
         }
 
         vgSetParameteri(mGradPaintFill, VG_PAINT_COLOR_RAMP_SPREAD_MODE, VG_COLOR_RAMP_SPREAD_PAD);
-        vgSetParameterfv(mGradPaintFill, VG_PAINT_COLOR_RAMP_STOPS, lStopCount * 5, colorRamps.data());
+        vgSetParameterfv(mGradPaintFill, VG_PAINT_COLOR_RAMP_STOPS, stopCount * 5, colorRamps.data());
     }
 }
 
 void HbNvgCsIcon::drawPath(HbDereferencer * iconData)
 {
-    int numSegments = iconData->derefInt16();
+    qint32 numSegments = iconData->derefInt16();
     const VGubyte * pathSegments  = iconData->derefInt8Array(numSegments, sizeof(quint16));
     /*
     * verify that what we got is proper data
     * for that calculate the path co-ordinate length
     * and check that the path data does not overflow
-    */    
-   int coordinateCount = 0;
-   for (int i = 0; i < numSegments; ++i)
-       {
-       switch (pathSegments[i])
-           {
-           case VG_HLINE_TO:
-           case VG_VLINE_TO:
-               coordinateCount += 1;
-               break;
-           case VG_MOVE_TO:
-           case VG_LINE_TO:
-           case VG_SQUAD_TO:
-               coordinateCount += 2;
-               break;                
-           case VG_QUAD_TO:
-           case VG_SCUBIC_TO:
-               coordinateCount += 4;
-               break;
-           case VG_SCCWARC_TO:
-           case VG_SCWARC_TO:
-           case VG_LCCWARC_TO:
-           case VG_LCWARC_TO:
-               coordinateCount += 5;
-               break;
-           case VG_CUBIC_TO:
-               coordinateCount += 6;
-               break;
-           default:
-               break;
-           }
-       }
+    */
+    qint32 coordinateCount = 0;
+    for (qint32 i = 0; i < numSegments; ++i) {
+        switch (pathSegments[i]) {
+        case VG_HLINE_TO:
+        case VG_VLINE_TO:
+            coordinateCount += 1;
+            break;
+        case VG_MOVE_TO:
+        case VG_LINE_TO:
+        case VG_SQUAD_TO:
+            coordinateCount += 2;
+            break;
+        case VG_QUAD_TO:
+        case VG_SCUBIC_TO:
+            coordinateCount += 4;
+            break;
+        case VG_SCCWARC_TO:
+        case VG_SCWARC_TO:
+        case VG_LCCWARC_TO:
+        case VG_LCWARC_TO:
+            coordinateCount += 5;
+            break;
+        case VG_CUBIC_TO:
+            coordinateCount += 6;
+            break;
+        default:
+            break;
+        }
+    }
+
+    // this one is just to check the alignment
+    quint8* pathData = iconData->derefInt8Array(sizeof(float), sizeof(quint16) + numSegments);
 
-   // this one is just to check the alignment
-   quint8* pathData = iconData->derefInt8Array(sizeof(float), sizeof(quint16) + numSegments);
-   
-   /*
-    * path data need to be word aligned
-    * alignment are done according to the path format
-    */
-   quint32 sizeofpathdata = sizeof(float);
-   quint32 alignSkip = 0;
-   quint8 * alignedPtr = 0;
-   if (mLastPathDataType == NvgSixteenBitEncoding)
-       {
-       alignedPtr = Align2(pathData);
-       sizeofpathdata = sizeof( quint16);
-       }
-   else if (mLastPathDataType == NvgThirtyTwoBitEncoding)
-       {        
-       alignedPtr = Align4(pathData);
-       }
-   else
-       {
-       throw HbNvgException(HbNvgEngine::NvgErrCorrupt);
-       }
-   
-   alignSkip = alignedPtr - pathData; 
-   
-   /*
-    * check to see whether we have enough path data
-    */
-   iconData->isSafe(coordinateCount * sizeofpathdata + alignSkip, sizeof(quint16) + numSegments);
-   
-   pathData = alignedPtr;
-   
-   VGint paintMode = (mDoFill ? VG_FILL_PATH : 0)|(mDoStroke ? VG_STROKE_PATH : 0);
-   if (paintMode == 0)
-       {
-       paintMode = VG_FILL_PATH;
-       }
-   
-   COND_COM_OC(mCreatingNvgIcon,
-           {
-               VGPath path = createPath();
-               
-               if (path != VG_INVALID_HANDLE)
-                   {
-                   vgAppendPathData(path, numSegments, pathSegments, pathData);
-                   }
-               else
-                   {
-                   addPathData(numSegments, pathSegments, pathData);
-                   }        
-                   addDrawPathCommand(path, paintMode);
-           }, 
-           {
-               vgClearPath(mVgPath, VG_PATH_CAPABILITY_APPEND_TO);
-               
-               vgAppendPathData(mVgPath, numSegments, pathSegments, pathData);
-               vgDrawPath(mVgPath, paintMode);
-           });
+    /*
+     * path data need to be word aligned
+     * alignment are done according to the path format
+     */
+    quint32 sizeofpathdata = sizeof(float);
+    quint32 alignSkip = 0;
+    quint8 * alignedPtr = 0;
+    if (mLastPathDataType == NvgSixteenBitEncoding) {
+        alignedPtr = Align2(pathData);
+        sizeofpathdata = sizeof(quint16);
+    } else if (mLastPathDataType == NvgThirtyTwoBitEncoding) {
+        alignedPtr = Align4(pathData);
+    } else {
+        throw HbNvgException(HbNvgEngine::NvgErrCorrupt);
+    }
+
+    alignSkip = alignedPtr - pathData;
+
+    /*
+     * check to see whether we have enough path data
+     */
+    iconData->assertBound(coordinateCount * sizeofpathdata + alignSkip, sizeof(quint16) + numSegments);
+
+    pathData = alignedPtr;
+
+    VGint paintMode = (mDoFill ? VG_FILL_PATH : 0) | (mDoStroke ? VG_STROKE_PATH : 0);
+    if (paintMode == 0) {
+        paintMode = VG_FILL_PATH;
+    }
+
+    COND_COM_OC(mCreatingNvgIcon, {
+        VGPath path = createPath();
+
+        if (path != VG_INVALID_HANDLE) {
+            vgAppendPathData(path, numSegments, pathSegments, pathData);
+        } else {
+            addPathData(numSegments, pathSegments, pathData);
+        }
+        addDrawPathCommand(path, paintMode);
+    }, {
+        vgClearPath(mVgPath, VG_PATH_CAPABILITY_APPEND_TO);
+
+        vgAppendPathData(mVgPath, numSegments, pathSegments, pathData);
+        vgDrawPath(mVgPath, paintMode);
+    });
     mDoStroke   = VG_FALSE;
     mDoFill     = VG_FALSE;
 }
 
 void HbNvgCsIcon::setTransform(HbDereferencer * iconData, quint32 & counter, const VGfloat* currentMatrix)
 {
-    COND_COM_OC(mCreatingNvgIcon, ;, vgLoadMatrix(currentMatrix));
+    COND_COM_OC(mCreatingNvgIcon, ; , vgLoadMatrix(currentMatrix));
 
-    quint32 lCommonData =  iconData->derefInt32();
-    quint32 lTransformType = (lCommonData & 0x00ff0000) >> 16 ;
+    quint32 commonData =  iconData->derefInt32();
+    quint32 transformType = (commonData & 0x00ff0000) >> 16 ;
 
     VGfloat matrixTemp[9] = {
         1.0f, 0.0f, 0.0f,
@@ -956,41 +932,41 @@
 
     counter = 0;
 
-    if (lTransformType != 1) {
-        if (lTransformType == TRANSFORM_COMPLETE) {
-            matrixTemp[0] = iconData->derefReal32((++counter) * sizeof (VGfloat));
-            matrixTemp[4] = iconData->derefReal32((++counter) * sizeof (VGfloat));
-            matrixTemp[3] = iconData->derefReal32((++counter) * sizeof (VGfloat));
-            matrixTemp[1] = iconData->derefReal32((++counter) * sizeof (VGfloat));
-            matrixTemp[6] = iconData->derefReal32((++counter) * sizeof (VGfloat));
-            matrixTemp[7] = iconData->derefReal32((++counter) * sizeof (VGfloat));
+    if (transformType != 1) {
+        if (transformType == TRANSFORM_COMPLETE) {
+            matrixTemp[0] = iconData->derefReal32((++counter) * sizeof(VGfloat));
+            matrixTemp[4] = iconData->derefReal32((++counter) * sizeof(VGfloat));
+            matrixTemp[3] = iconData->derefReal32((++counter) * sizeof(VGfloat));
+            matrixTemp[1] = iconData->derefReal32((++counter) * sizeof(VGfloat));
+            matrixTemp[6] = iconData->derefReal32((++counter) * sizeof(VGfloat));
+            matrixTemp[7] = iconData->derefReal32((++counter) * sizeof(VGfloat));
         } else {
-            if (lTransformType & TRANSFORM_ROTATION) {
+            if (transformType & TRANSFORM_ROTATION) {
                 //vgScale
-                matrixTemp[0] = iconData->derefReal32((++counter) * sizeof (VGfloat));
-                matrixTemp[4] = iconData->derefReal32((++counter) * sizeof (VGfloat));
-                
+                matrixTemp[0] = iconData->derefReal32((++counter) * sizeof(VGfloat));
+                matrixTemp[4] = iconData->derefReal32((++counter) * sizeof(VGfloat));
+
                 //vgShear
-                matrixTemp[3] = iconData->derefReal32((++counter) * sizeof (VGfloat));
-                matrixTemp[1] = iconData->derefReal32((++counter) * sizeof (VGfloat));
+                matrixTemp[3] = iconData->derefReal32((++counter) * sizeof(VGfloat));
+                matrixTemp[1] = iconData->derefReal32((++counter) * sizeof(VGfloat));
             } else {
-                if (lTransformType & TRANSFORM_SCALING) {
+                if (transformType & TRANSFORM_SCALING) {
                     //vgScale
-                    matrixTemp[0] = iconData->derefReal32((++counter) * sizeof (VGfloat));
-                    matrixTemp[4] = iconData->derefReal32((++counter) * sizeof (VGfloat));
+                    matrixTemp[0] = iconData->derefReal32((++counter) * sizeof(VGfloat));
+                    matrixTemp[4] = iconData->derefReal32((++counter) * sizeof(VGfloat));
                 }
 
-                if (lTransformType & TRANSFORM_SHEARING) {
+                if (transformType & TRANSFORM_SHEARING) {
                     //vgShear
-                    matrixTemp[3] = iconData->derefReal32((++counter) * sizeof (VGfloat));
-                    matrixTemp[1] = iconData->derefReal32((++counter) * sizeof (VGfloat));;
+                    matrixTemp[3] = iconData->derefReal32((++counter) * sizeof(VGfloat));
+                    matrixTemp[1] = iconData->derefReal32((++counter) * sizeof(VGfloat));;
                 }
             }
 
-            if (lTransformType & TRANSFORM_TRANSLATION) {
+            if (transformType & TRANSFORM_TRANSLATION) {
                 //vgTranslate
-                matrixTemp[6] = iconData->derefReal32((++counter) * sizeof (VGfloat));;
-                matrixTemp[7] = iconData->derefReal32((++counter) * sizeof (VGfloat));;
+                matrixTemp[6] = iconData->derefReal32((++counter) * sizeof(VGfloat));;
+                matrixTemp[7] = iconData->derefReal32((++counter) * sizeof(VGfloat));;
             }
         }
 
@@ -1005,130 +981,128 @@
 
 void HbNvgCsIcon::setStrokePaint(HbDereferencer * iconData)
 {
-    COND_COM_OC_OOC(register int drawingMode = mCreatingNvgIcon;);
-    
-    quint32 lCommonData = iconData->derefInt32();
-    quint32 lStrokeType = lCommonData & 0x07;
-    quint16 lSpecifcData = (lCommonData >> 16) & 0xff;
+    COND_COM_OC_OOC(register qint32 drawingMode = mCreatingNvgIcon;);
 
-    switch (lStrokeType) {
+    quint32 commonData = iconData->derefInt32();
+    quint32 strokeType = commonData & 0x07;
+    quint16 specifcData = (commonData >> 16) & 0xff;
+
+    switch (strokeType) {
     case STROKE_LGRAD: {
         mGradPaintStroke = mPaintStroke;
-        
+
         COND_COM_OC_OOC(
-                   if (mCreatingNvgIcon)
-                       {
-                       mGradPaintStroke = vgCreatePaint();
-                       if (mGradPaintStroke == VG_INVALID_HANDLE) {
-                           throw HbNvgException(HbNvgEngine::NvgErrBadHandle);
-                       }
-                       });
-              
+        if (mCreatingNvgIcon) {
+        mGradPaintStroke = vgCreatePaint();
+            if (mGradPaintStroke == VG_INVALID_HANDLE) {
+                throw HbNvgException(HbNvgEngine::NvgErrBadHandle);
+            }
+        });
+
         // gradient data, the data will be word aligned
-        float* lGradData = (float*)iconData->derefInt8Array(4 * sizeof(VGfloat), sizeof(float));
-                   
+        float* gradData = (float*)iconData->derefInt8Array(4 * sizeof(VGfloat), sizeof(float));
+
         COND_COM_OC(drawingMode, ; ,
                     vgSetParameteri(mGradPaintStroke, VG_PAINT_TYPE, VG_PAINT_TYPE_LINEAR_GRADIENT);
-                    vgSetParameterfv(mGradPaintStroke, VG_PAINT_LINEAR_GRADIENT, 4, lGradData);
+                    vgSetParameterfv(mGradPaintStroke, VG_PAINT_LINEAR_GRADIENT, 4, gradData);
                     vgSeti(VG_MATRIX_MODE, VG_MATRIX_STROKE_PAINT_TO_USER));
 
-        if (lSpecifcData & 0x1) {
-            float* lGradMatrix1 = (float*)iconData->derefInt8Array(6 * sizeof(VGfloat),
-                    4 + 4 * sizeof(VGfloat));
-                            
-            float lGradMatrix[9] = {lGradMatrix1[0], lGradMatrix1[3], 0.0f,
-                                    lGradMatrix1[1], lGradMatrix1[4], 0.0f,
-                                    lGradMatrix1[2], lGradMatrix1[5], 1.0f
+        if (specifcData & 0x1) {
+            float* gradMatrix1 = (float*)iconData->derefInt8Array(6 * sizeof(VGfloat),
+                                  4 + 4 * sizeof(VGfloat));
+
+            float gradMatrix[9] = {gradMatrix1[0], gradMatrix1[3], 0.0f,
+                                    gradMatrix1[1], gradMatrix1[4], 0.0f,
+                                    gradMatrix1[2], gradMatrix1[5], 1.0f
                                    };
 
             COND_COM_OC(drawingMode,
-                        addStrokeLinearGradientCommand(4, lGradData, lGradMatrix, mGradPaintStroke),
-                        vgLoadMatrix(lGradMatrix));
-            Q_UNUSED(IdentityMatrix);
+                        addStrokeLinearGradientCommand(4, gradData, gradMatrix, mGradPaintStroke),
+                        vgLoadMatrix(gradMatrix));
+            Q_UNUSED(identityMatrix);
         } else {
             COND_COM_OC(drawingMode,
-                        addStrokeLinearGradientCommand(4, lGradData, (VGfloat*)IdentityMatrix, mGradPaintStroke),
+                        addStrokeLinearGradientCommand(4, gradData, (VGfloat*)identityMatrix, mGradPaintStroke),
                         vgLoadIdentity());
         }
         vgSeti(VG_MATRIX_MODE, VG_MATRIX_PATH_USER_TO_SURFACE);
-    } 
+    }
     break;
     case STROKE_RGRAD: {
         mGradPaintStroke = mPaintStroke;
-        
+
         COND_COM_OC_OOC(
-                    if (mCreatingNvgIcon)
-                        {
-                        mGradPaintStroke = vgCreatePaint();
-                        if (mGradPaintStroke == VG_INVALID_HANDLE) {
-                            throw HbNvgException(HbNvgEngine::NvgErrBadHandle);
-                        }
-                        });
+        if (mCreatingNvgIcon) {
+        mGradPaintStroke = vgCreatePaint();
+            if (mGradPaintStroke == VG_INVALID_HANDLE) {
+                throw HbNvgException(HbNvgEngine::NvgErrBadHandle);
+            }
+        });
         // gradient data, the data will be word aligned
-        float* lGradData = (float*)iconData->derefInt8Array(5 * sizeof(VGfloat), sizeof(quint32));
+        float* gradData = (float*)iconData->derefInt8Array(5 * sizeof(VGfloat), sizeof(quint32));
 
         COND_COM_OC(drawingMode, ; ,
                     vgSetParameteri(mGradPaintStroke, VG_PAINT_TYPE, VG_PAINT_TYPE_RADIAL_GRADIENT);
-                    vgSetParameterfv(mGradPaintStroke, VG_PAINT_RADIAL_GRADIENT, 5, lGradData);
+                    vgSetParameterfv(mGradPaintStroke, VG_PAINT_RADIAL_GRADIENT, 5, gradData);
                     vgSeti(VG_MATRIX_MODE, VG_MATRIX_STROKE_PAINT_TO_USER));
 
-        if (lSpecifcData & 0x1) {
-            float* lGradMatrix1 = (float*)iconData->derefInt8Array(6 * sizeof(VGfloat),
-                4 + 5 * sizeof(VGfloat));
-            float lGradMatrix[9] = {lGradMatrix1[0], lGradMatrix1[3], 0.0f,
-                                    lGradMatrix1[1], lGradMatrix1[4], 0.0f,
-                                    lGradMatrix1[2], lGradMatrix1[5], 1.0f
+        if (specifcData & 0x1) {
+            float* gradMatrix1 = (float*)iconData->derefInt8Array(6 * sizeof(VGfloat),
+                                  4 + 5 * sizeof(VGfloat));
+            float gradMatrix[9] = {gradMatrix1[0], gradMatrix1[3], 0.0f,
+                                    gradMatrix1[1], gradMatrix1[4], 0.0f,
+                                    gradMatrix1[2], gradMatrix1[5], 1.0f
                                    };
 
             COND_COM_OC(drawingMode,
-                        addStrokeRadialGradientCommand(4, lGradData, lGradMatrix, mGradPaintStroke),
-                        vgLoadMatrix(lGradMatrix));
-            Q_UNUSED(IdentityMatrix);
+                        addStrokeRadialGradientCommand(4, gradData, gradMatrix, mGradPaintStroke),
+                        vgLoadMatrix(gradMatrix));
+            Q_UNUSED(identityMatrix);
         } else {
             COND_COM_OC(drawingMode,
-                        addStrokeRadialGradientCommand(4, lGradData, (VGfloat*)IdentityMatrix, mGradPaintStroke),
+                        addStrokeRadialGradientCommand(4, gradData, (VGfloat*)identityMatrix, mGradPaintStroke),
                         vgLoadIdentity());
         }
         vgSeti(VG_MATRIX_MODE, VG_MATRIX_PATH_USER_TO_SURFACE);
-        }
-        break;
+    }
+    break;
 
     case STROKE_COLOR_RAMP: {
-        int lStopCount = lSpecifcData;
-        float* lStopData = (float*) iconData->derefInt8Array(lStopCount * 5 * sizeof(VGfloat), 4);
+        qint32 stopCount = specifcData;
+        float* stopData = (float*) iconData->derefInt8Array(stopCount * 5 * sizeof(VGfloat), 4);
 
         if (mStrokeAlpha == 0xff) {
             vgSetParameteri(mGradPaintStroke, VG_PAINT_COLOR_RAMP_SPREAD_MODE, VG_COLOR_RAMP_SPREAD_PAD);
-            vgSetParameterfv(mGradPaintStroke, VG_PAINT_COLOR_RAMP_STOPS, lStopCount*5, lStopData);
+            vgSetParameterfv(mGradPaintStroke, VG_PAINT_COLOR_RAMP_STOPS, stopCount*5, stopData);
         } else {
-            VGfloat *crs = new VGfloat[lStopCount * 5];
+            VGfloat *crs = new VGfloat[stopCount * 5];
             Q_CHECK_PTR(crs);
             QScopedArrayPointer<VGfloat> colorRamps(crs);
             // Copy color ramps and modify alpha
-            memcpy(colorRamps.data(), lStopData, lStopCount*5*sizeof(VGfloat));
-            VGfloat lAlphaInFloat = mStrokeAlpha * 0.003921568627450f; //(1.0f/255.0f);
-            VGfloat* lAlphaValue = &colorRamps[4];
-            for (int i = 0; i < lStopCount; i++) {
-                *lAlphaValue *= lAlphaInFloat;
-                lAlphaValue += 5;
+            memcpy(colorRamps.data(), stopData, stopCount*5*sizeof(VGfloat));
+            VGfloat alphaInFloat = mStrokeAlpha * (1.0f/255.0f);
+            VGfloat* alphaValue = &colorRamps[4];
+            for (qint32 i = 0; i < stopCount; i++) {
+                *alphaValue *= alphaInFloat;
+                alphaValue += 5;
             }
 
             vgSetParameteri(mGradPaintStroke, VG_PAINT_COLOR_RAMP_SPREAD_MODE, VG_COLOR_RAMP_SPREAD_PAD);
-            vgSetParameterfv(mGradPaintStroke, VG_PAINT_COLOR_RAMP_STOPS, lStopCount*5, colorRamps.data());
-            }
+            vgSetParameterfv(mGradPaintStroke, VG_PAINT_COLOR_RAMP_STOPS, stopCount*5, colorRamps.data());
         }
-        break;
+    }
+    break;
 
     default: {
-        quint32 lRgba = iconData->derefInt32(NVG_RGBA_OFS);
-        lRgba = (lRgba & 0xffffff00) | mStrokeAlpha; // replace alpha
+        quint32 rgba = iconData->derefInt32(NVG_RGBA_OFS);
+        rgba = (rgba & 0xffffff00) | mStrokeAlpha; // replace alpha
 
         COND_COM_OC(drawingMode,
-                    addStrokeSetColorCommand(lRgba),
+                    addStrokeSetColorCommand(rgba),
                     vgSetParameteri(mPaintStroke, VG_PAINT_TYPE, VG_PAINT_TYPE_COLOR);
-                    vgSetColor(mPaintStroke, lRgba));
-        }
-        break;
+                    vgSetColor(mPaintStroke, rgba));
+    }
+    break;
     }
 }
 
@@ -1157,9 +1131,7 @@
                             VG_PATH_CAPABILITY_APPEND_TO);
     }
     break;
-    default: {
-
-    }
+    default: 
     break;
     }
     return path;
@@ -1168,12 +1140,12 @@
 
 void HbNvgCsIcon::addPathData(VGint numSegments, const VGubyte * pathSegments, const void * pathData)
 {
-    mNvgIconData->encodeInt32(NvgPathData);
-    mNvgIconData->encodeInt32(numSegments);
+    mNvgIconData->encodeUint32(NvgPathData);
+    mNvgIconData->encodeUint32(numSegments);
     mNvgIconData->encodeData(pathSegments, numSegments);
 
-    int coordinateCount = 0;
-    for (int i = 0; i < numSegments; ++i) {
+    qint32 coordinateCount = 0;
+    for (qint32 i = 0; i < numSegments; ++i) {
         switch (pathSegments[i]) {
         case VG_HLINE_TO:
         case VG_VLINE_TO:
@@ -1201,126 +1173,126 @@
             break;
         }
     }
-    mNvgIconData->encodeInt16(coordinateCount);
+    mNvgIconData->encodeUint16(coordinateCount);
     mNvgIconData->encodeData(pathData, coordinateCount * 4);
 }
 
 void HbNvgCsIcon::addDrawPathCommand(VGPath path, VGbitfield paintMode)
 {
     mOpenVgHandles->addPath(path);
-    mNvgIconData->encodeInt32(NvgPath);
-    mNvgIconData->encodeInt32(path);
-    mNvgIconData->encodeInt32(paintMode);
+    mNvgIconData->encodeUint32(NvgPath);
+    mNvgIconData->encodeUint32(path);
+    mNvgIconData->encodeUint32(paintMode);
 }
 
 void HbNvgCsIcon::addLinearGradientCommand(VGint count, VGfloat* gradientData, VGfloat* gradientMatrix, VGPaint paint)
 {
     mOpenVgHandles->addPaint(paint);
-    mNvgIconData->encodeInt32(NvgPaint);
+    mNvgIconData->encodeUint32(NvgPaint);
     addLinearGradientCommandData(paint, count, gradientData, gradientMatrix);
 }
 
 void HbNvgCsIcon::addRadialGradientCommand(VGint count, VGfloat* gradientData, VGfloat* gradientMatrix, VGPaint paint)
 {
     mOpenVgHandles->addPaint(paint);
-    mNvgIconData->encodeInt32(NvgPaint);
+    mNvgIconData->encodeUint32(NvgPaint);
     addRadialGradientCommandData(paint, count, gradientData, gradientMatrix);
 }
 
 void HbNvgCsIcon::addSetColorCommand(VGuint rgba)
 {
-    mNvgIconData->encodeInt32(NvgPaint);
-    mNvgIconData->encodeInt32(VG_PAINT_TYPE_COLOR);
-    mNvgIconData->encodeInt32(rgba);
+    mNvgIconData->encodeUint32(NvgPaint);
+    mNvgIconData->encodeUint32(VG_PAINT_TYPE_COLOR);
+    mNvgIconData->encodeUint32(rgba);
 }
 
 void HbNvgCsIcon::addColorRampCommand(VGPaint paint)
 {
-    mNvgIconData->encodeInt32(NvgColorRamp);
-    mNvgIconData->encodeInt32(paint);
+    mNvgIconData->encodeUint32(NvgColorRamp);
+    mNvgIconData->encodeUint32(paint);
 }
 
 void HbNvgCsIcon::addSetTransformCommand(const VGfloat* transformMatrix, int aFlag)
 {
-    mNvgIconData->encodeInt32(NvgTransform);
+    mNvgIconData->encodeUint32(NvgTransform);
     mNvgIconData->encodeData(transformMatrix, 9 * sizeof(VGfloat));
-    mNvgIconData->encodeInt32(aFlag);
+    mNvgIconData->encodeUint32(aFlag);
 }
 
 void HbNvgCsIcon::addSetStrokeWidthCommand(VGfloat strokeWidth)
 {
-    mNvgIconData->encodeInt32(NvgStrokeWidth);
+    mNvgIconData->encodeUint32(NvgStrokeWidth);
     mNvgIconData->encodeReal32(strokeWidth);
 }
 
 void HbNvgCsIcon::addSetStrokeMiterLimitCommand(VGfloat miterLimit)
 {
-    mNvgIconData->encodeInt32(NvgStrokeMiterLimit);
+    mNvgIconData->encodeUint32(NvgStrokeMiterLimit);
     mNvgIconData->encodeReal32(miterLimit);
 }
 
 void HbNvgCsIcon::addStrokeLineJoinCapCommand(VGint capStyle, VGint joinStyle)
 {
-    mNvgIconData->encodeInt32(NvgStrokeLineJoinCap);
-    mNvgIconData->encodeInt32(capStyle);
-    mNvgIconData->encodeInt32(joinStyle);
+    mNvgIconData->encodeUint32(NvgStrokeLineJoinCap);
+    mNvgIconData->encodeUint32(capStyle);
+    mNvgIconData->encodeUint32(joinStyle);
 }
 
 void HbNvgCsIcon::addStrokeLinearGradientCommand(VGint count, VGfloat* gradientData, VGfloat* gradientMatrix, VGPaint paint)
 {
     mOpenVgHandles->addPaint(paint);
-    mNvgIconData->encodeInt32(NvgStrokePaint);
+    mNvgIconData->encodeUint32(NvgStrokePaint);
     addLinearGradientCommandData(paint, count, gradientData, gradientMatrix);
 }
 
 void HbNvgCsIcon::addStrokeRadialGradientCommand(VGint count, VGfloat* gradientData, VGfloat* gradientMatrix, VGPaint paint)
 {
     mOpenVgHandles->addPaint(paint);
-    mNvgIconData->encodeInt32(NvgStrokePaint);
+    mNvgIconData->encodeUint32(NvgStrokePaint);
     addRadialGradientCommandData(paint, count, gradientData, gradientMatrix);
 }
 
 void HbNvgCsIcon::addStrokeSetColorCommand(VGuint rgba)
 {
-    mNvgIconData->encodeInt32(NvgStrokePaint);
+    mNvgIconData->encodeUint32(NvgStrokePaint);
     addSetColorCommandData(rgba);
 }
 
 void HbNvgCsIcon::addStrokeColorRampCommand(VGPaint paint)
 {
-    mNvgIconData->encodeInt32(NvgStrokeColorRamp);
-    mNvgIconData->encodeInt32(paint);
+    mNvgIconData->encodeUint32(NvgStrokeColorRamp);
+    mNvgIconData->encodeUint32(paint);
 }
 
 void HbNvgCsIcon::addLinearGradientCommandData(VGPaint paint, VGint count, VGfloat* gradientData, VGfloat* gradientMatrix)
 {
-    mNvgIconData->encodeInt32(VG_PAINT_TYPE_LINEAR_GRADIENT);
-    mNvgIconData->encodeInt32(paint);
-    mNvgIconData->encodeInt32(count);
+    mNvgIconData->encodeUint32(VG_PAINT_TYPE_LINEAR_GRADIENT);
+    mNvgIconData->encodeUint32(paint);
+    mNvgIconData->encodeUint32(count);
     mNvgIconData->encodeData(gradientData, count * sizeof(VGfloat));
     mNvgIconData->encodeData(gradientMatrix, 9 * sizeof(VGfloat));
 }
 
 void HbNvgCsIcon::addRadialGradientCommandData(VGPaint paint, VGint count, VGfloat* gradientData, VGfloat* gradientMatrix)
 {
-    mNvgIconData->encodeInt32(VG_PAINT_TYPE_RADIAL_GRADIENT);
-    mNvgIconData->encodeInt32(paint);
-    mNvgIconData->encodeInt32(count);
+    mNvgIconData->encodeUint32(VG_PAINT_TYPE_RADIAL_GRADIENT);
+    mNvgIconData->encodeUint32(paint);
+    mNvgIconData->encodeUint32(count);
     mNvgIconData->encodeData(gradientData, count * sizeof(VGfloat));
     mNvgIconData->encodeData(gradientMatrix, 9 * sizeof(VGfloat));
 }
 
 void HbNvgCsIcon::addSetColorCommandData(VGuint rgba)
 {
-    mNvgIconData->encodeInt32(VG_PAINT_TYPE_COLOR);
-    mNvgIconData->encodeInt32(rgba);
+    mNvgIconData->encodeUint32(VG_PAINT_TYPE_COLOR);
+    mNvgIconData->encodeUint32(rgba);
 }
 
-HbNvgEngine::NvgErrorType HbNvgCsIcon::draw(const QSize &size)
+HbNvgEngine::HbNvgErrorType HbNvgCsIcon::draw(const QSize &size)
 {
-    NVG_DEBUGP2("DRAWING NVGCSIcon %s, ", __FUNCTION__);
+    NVG_DEBUGP2("DRAWING NvgCsIcon %s, ", __FUNCTION__);
 
-    HbNvgEngine::NvgErrorType error = HbNvgEngine::NvgErrNone;
+    HbNvgEngine::HbNvgErrorType error = HbNvgEngine::NvgErrNone;
 
     // Get Matrix modes and all caller matrices (must be restored afterwards)
     updateClientMatrices();
@@ -1334,9 +1306,9 @@
     return error;
 }
 
-HbNvgEngine::NvgErrorType HbNvgCsIcon::doDraw(const QSize &size)
+HbNvgEngine::HbNvgErrorType HbNvgCsIcon::doDraw(const QSize &size)
 {
-    HbNvgEngine::NvgErrorType ret = HbNvgEngine::NvgErrNone;
+    HbNvgEngine::HbNvgErrorType ret = HbNvgEngine::NvgErrNone;
 
     vgSetPaint(mPaintFill,   VG_FILL_PATH);
     vgSetPaint(mPaintStroke, VG_STROKE_PATH);
@@ -1345,13 +1317,13 @@
     mLastFillPaintType      = 0;
     mLastStrokePaintType    = 0;
 
-    VGfloat lCurrentPathMatrix[9];
-    vgGetMatrix(lCurrentPathMatrix);
+    VGfloat currentPathMatrix[9];
+    vgGetMatrix(currentPathMatrix);
 
     vgSeti(VG_MATRIX_MODE, VG_MATRIX_PATH_USER_TO_SURFACE);
-    vgLoadMatrix(lCurrentPathMatrix);
+    vgLoadMatrix(currentPathMatrix);
     setRotation();
-#ifdef __MIRROR_  
+#ifdef __MIRROR_
     vgScale(1.0f, -1.0f);
     vgTranslate(0, (VGfloat)(-size.height()));
 #endif
@@ -1363,7 +1335,7 @@
     VGfloat currentMatrix[9];
 
     vgGetMatrix(currentMatrix);
-    
+
     mNvgIconData->beginRead();
 
     while (!mNvgIconData->eof()) {
@@ -1381,36 +1353,36 @@
         }
         case NvgPathData: {
             if (mVgPath != VG_INVALID_HANDLE) {
-            
+
                 VGint numSegments = mNvgIconData->readInt32();
-                
+
                 VGubyte *pSegArry = new VGubyte[numSegments];
                 Q_CHECK_PTR(pSegArry);
                 QScopedArrayPointer<VGubyte> pathSegments(pSegArry);
                 mNvgIconData->read(pathSegments.data(), numSegments);
-                
+
                 VGint coordinateCount = mNvgIconData->readInt32();
-                
+
                 VGubyte *pDataArry = new VGubyte[coordinateCount * 4];
                 Q_CHECK_PTR(pDataArry);
                 QScopedArrayPointer<VGubyte> pathData(pDataArry);
                 mNvgIconData->read(pathData.data(), coordinateCount * 4);
-                
+
                 vgClearPath(mVgPath, VG_PATH_CAPABILITY_APPEND_TO);
                 vgAppendPathData(mVgPath, numSegments, pathSegments.data(), pathData.data());
             }
             break;
-            }
+        }
         case NvgPaint: {
             drawPaint(mPaintFill, VG_MATRIX_FILL_PAINT_TO_USER, mLastFillPaintType, mLastFillPaintColor, VG_FILL_PATH);
             break;
-            }
+        }
         case NvgColorRamp: {
             mNvgIconData->readInt32();
             break;
-            }
+        }
         case NvgTransform: {
-            int flag;
+            qint32 flag;
             VGfloat transformMatrix[9];
 
             mNvgIconData->read((quint8 *)transformMatrix, 9 * sizeof(VGfloat));
@@ -1420,21 +1392,21 @@
             if (flag) {
                 vgMultMatrix(transformMatrix);
             }
-            
+
             break;
-            }
+        }
         case NvgStrokeWidth: {
             VGfloat strokeWidth = mNvgIconData->readReal32();
             vgSetf(VG_STROKE_LINE_WIDTH, strokeWidth);
             break;
-            }
-        
+        }
+
         case NvgStrokeMiterLimit: {
             VGfloat miterLimit = mNvgIconData->readReal32();
             vgSetf(VG_STROKE_MITER_LIMIT, miterLimit);
             break;
-            }
-        
+        }
+
         case NvgStrokeLineJoinCap: {
             VGint lineJoin = mNvgIconData->readInt32();
             VGint cap = mNvgIconData->readInt32();
@@ -1442,18 +1414,18 @@
             vgSeti(VG_STROKE_JOIN_STYLE, (VGJoinStyle)lineJoin);
             vgSeti(VG_STROKE_CAP_STYLE, (VGCapStyle)cap);
             break;
-            }
+        }
         case NvgStrokePaint: {
             drawPaint(mPaintStroke, VG_MATRIX_STROKE_PAINT_TO_USER, mLastStrokePaintType, mLastStrkePaintColor, VG_STROKE_PATH);
             break;
-            }
+        }
         case NvgStrokeColorRamp: {
             mNvgIconData->readInt32();
             break;
-            }
-        default: {  
+        }
+        default: {
             throw HbNvgException(HbNvgEngine::NvgErrCorrupt);
-            }
+        }
         }
     }
 
@@ -1464,8 +1436,8 @@
 
 void HbNvgCsIcon::drawColorRamp(VGPaint paint)
 {
-    int stopCount = mNvgIconData->readInt32();
-    
+    qint32 stopCount = mNvgIconData->readInt32();
+
     VGfloat *crs = new VGfloat[stopCount];
     Q_CHECK_PTR(crs);
     QScopedArrayPointer<VGfloat> colorRamps(crs);
@@ -1487,7 +1459,7 @@
         }
 
         VGPaint paintHandle = mNvgIconData->readInt32();
-        int count = mNvgIconData->readInt32();
+        qint32 count = mNvgIconData->readInt32();
         VGfloat gradientData[5];
         VGfloat gradientMatrix[9];
 
@@ -1543,7 +1515,7 @@
     Q_CHECK_PTR(viewBoxTx);
     QScopedPointer<HbNvgFitToViewBoxImpl> fitToViewBoxImpl(viewBoxTx);
 
-    fitToViewBoxImpl->setAlign(mPreserveAspectSetting);
+    fitToViewBoxImpl->setAllignment(mPreserveAspectSetting);
     fitToViewBoxImpl->setScaling(mSmilFitSetting);
     fitToViewBoxImpl->setViewBox(mViewBoxX, mViewBoxY, mViewBoxW, mViewBoxH);
     fitToViewBoxImpl->setWindowViewportTrans(QRect(0, 0, size.width(), size.height()), QSize(0, 0));
@@ -1551,8 +1523,8 @@
 
 void HbNvgCsIcon::setRotation()
 {
-    if (mRotationAngle) {    
-        vgTranslate(mRotationX, mRotationY);             
+    if (mRotationAngle) {
+        vgTranslate(mRotationX, mRotationY);
         vgRotate(mRotationAngle);
         vgTranslate(-mRotationX, -mRotationY);
     }
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/svgext/hbnvgdecoder/hbnvgcsicon_p.h
--- a/src/hbcore/svgext/hbnvgdecoder/hbnvgcsicon_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/svgext/hbnvgdecoder/hbnvgcsicon_p.h	Mon May 03 12:48:33 2010 +0300
@@ -73,49 +73,49 @@
 
     virtual ~HbNvgCsIcon();
 
-    virtual HbNvgEngine::NvgErrorType draw(const QSize &size);
+    virtual HbNvgEngine::HbNvgErrorType draw(const QSize &size);
 
     void  setViewBox(float x, float y, float w, float h) ;
 
-    void setPreserveAspectRatio(HbNvgEngine::NvgAlignStatusType preserveAspectSetting,
-            HbNvgEngine::NvgMeetOrSliceType smilFitSetting);
+    void setPreserveAspectRatio(HbNvgEngine::HbNvgAlignType preserveAspectSetting,
+                                HbNvgEngine::HbNvgMeetType smilFitSetting);
 
     void rotate(float angle, float xValue, float yValue) ;
-	
-    void setMirroringMode( bool mirroringMode);
+
+    void enableMirroring(bool mirroringMode);
 
     void directDraw(const QByteArray &buffer, const QSize &targetSize);
 
     void create(const QByteArray &buffer, const QSize& targetSize);
-   
+
     void setIconData(const QByteArray &buffer);
-    
+
 private:
 
-    HbNvgEngine::NvgErrorType initializeGc();
+    HbNvgEngine::HbNvgErrorType initializeGc();
 
-    void drawCommandSection(const QByteArray &buffer, const QSize &targetSize, int objectCaching);
+    void drawCommandSection(const QByteArray &buffer, const QSize &targetSize, qint32 objectCaching);
 
-    HbNvgEngine::NvgErrorType createPathHandle(qint16 pathDataType, float scale, float bias);
-    
-    HbNvgEngine::NvgErrorType doDraw(const QSize &size);
-    
+    HbNvgEngine::HbNvgErrorType createPathHandle(qint16 pathDataType, float scale, float bias);
+
+    HbNvgEngine::HbNvgErrorType doDraw(const QSize &size);
+
     void addDrawPathCommand(VGPath path, VGbitfield paintMode);
-        
+
     void addPathData(VGint numSegments, const VGubyte * pathSegments, const void * pathData);
 
     void addLinearGradientCommand(VGint count, VGfloat* gradientData, VGfloat* gradientMatrix, VGPaint paint);
-    
+
     void addRadialGradientCommand(VGint count, VGfloat* gradientData, VGfloat* gradientMatrix, VGPaint paint);
-    
+
     void addSetColorCommand(VGuint rgba);
-    
+
     void addColorRampCommand(VGPaint paint);
 
-    void addSetTransformCommand(const VGfloat* transformMatrix, int flag);
-   
+    void addSetTransformCommand(const VGfloat* transformMatrix, qint32 flag);
+
     void addSetStrokeWidthCommand(VGfloat strokeWidth);
-    
+
     void addSetStrokeMiterLimitCommand(VGfloat miterLimit);
 
     void addStrokeLineJoinCapCommand(VGint capStyle, VGint joinStyle);
@@ -129,27 +129,27 @@
     void addStrokeColorRampCommand(VGPaint paint);
 
     void addLinearGradientCommandData(VGPaint paint, VGint count, VGfloat* gradientData, VGfloat* gradientMatrix);
-    
+
     void addRadialGradientCommandData(VGPaint paint, VGint count, VGfloat* gradientData, VGfloat* gradientMatrix);
-    
+
     void addSetColorCommandData(VGuint rgba);
 
     void drawPaint(VGPaint paint, VGMatrixMode matrixMode, quint32 &lastPaintType, quint32 &lastPaintColor, VGPaintMode paintMode);
-    
+
     void drawColorRamp(VGPaint paint);
-    
+
     void setViewBoxToViewTransformation(const QSize &size);
-    
+
     void setRotation();
 
     void updateClientMatrices();
-    
+
     void restoreClientMatrices();
 
     QPoint getTranslatedPoint(VGfloat *trMatrix, const QPoint &point);
-    
+
     VGfloat maxVal4(VGfloat x1, VGfloat x2, VGfloat x3, VGfloat x4);
-    
+
     VGfloat minVal4(VGfloat x1, VGfloat x2, VGfloat x3, VGfloat x4);
 
     void setFillPaint(HbDereferencer *iconData);
@@ -169,41 +169,43 @@
     void clearBackground();
 
     void resetNvgState();
-    
+
     void applyViewboxToViewPortTransformation(const QSize& targetSize, float viewboxX, float viewboxY, float viewboxW, float viewboxH);
-        
+
     void applyScissoring(VGfloat *aMatrix, const QSize& targetSize);
-    
-    void executeNVGCSCommandLoop(quint16 commandCount, HbDereferencer * iconData, HbDereferencer * offsetVector,
-                                              HbDereferencer * commandSection, quint8 nvgVersion);
 
-    HbDereferencer getCommandSection(quint16 offset, HbDereferencer * iconData, int nvgVersion);
-        
-    template <class T>
-    inline T Align4(T value)
-        {return((T)((((quint32)value)+sizeof(quint32)-1)&~(sizeof(quint32)-1)));}
+    void executeNvgCsCommandLoop(quint16 commandCount, HbDereferencer * iconData, HbDereferencer * offsetVector,
+                                 HbDereferencer * commandSection, quint8 nvgVersion);
+
+    HbDereferencer getCommandSection(quint16 offset, HbDereferencer * iconData, qint32 nvgVersion);
 
     template <class T>
-    inline T Align2(T value)
-        {return((T)((((quint32)value)+sizeof(quint16)-1)&~(sizeof(quint16)-1)));}
-    
+    inline T Align4(T value) {
+        return((T)((((quint32)value) + sizeof(quint32) - 1)&~(sizeof(quint32) - 1)));
+    }
+
+    template <class T>
+    inline T Align2(T value) {
+        return((T)((((quint32)value) + sizeof(quint16) - 1)&~(sizeof(quint16) - 1)));
+    }
+
 #ifdef    OPENVG_OBJECT_CACHING
     VGPath createPath();
 #endif
-    
+
 private:
 
     VGPaint                 mPaintFill;
     VGPaint                 mPaintStroke;
     VGPath                  mVgPath;
-    qint16                  mLastPathDataType;    
+    qint16                  mLastPathDataType;
     VGboolean               mDoFill;
     VGboolean               mDoStroke;
     VGPaint                 mGradPaintFill;
-    int                     mFillAlpha;
-    int                     mStrokeAlpha;
+    qint32                     mFillAlpha;
+    qint32                     mStrokeAlpha;
     VGPaint                 mGradPaintStroke;
-    int                     mCreatingNvgIcon;    
+    qint32                     mCreatingNvgIcon;
     float                   mViewBoxX;
     float                   mViewBoxY;
     float                   mViewBoxW;
@@ -211,9 +213,9 @@
     float                   mRotationAngle;
     float                   mRotationX;
     float                   mRotationY;
-    HbNvgEngine::NvgAlignStatusType      mPreserveAspectSetting;
-    HbNvgEngine::NvgMeetOrSliceType      mSmilFitSetting;
-    HbNvgIconData *         mNvgIconData;       
+    HbNvgEngine::HbNvgAlignType      mPreserveAspectSetting;
+    HbNvgEngine::HbNvgMeetType      mSmilFitSetting;
+    HbNvgIconData *         mNvgIconData;
     VGint                   mMatrixMode;
     VGfloat                 mImageMatrix[9];
     VGfloat                 mPathMatrix[9];
@@ -224,6 +226,6 @@
     quint32                 mLastStrkePaintColor;
     quint32                 mResetFillPaint;
     quint32                 mResetStrokePaint;
-    bool                    mMirroringMode;
+    bool                    mMirrored;
 };
 #endif
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/svgext/hbnvgdecoder/hbnvgdecoder.pri
--- a/src/hbcore/svgext/hbnvgdecoder/hbnvgdecoder.pri	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/svgext/hbnvgdecoder/hbnvgdecoder.pri	Mon May 03 12:48:33 2010 +0300
@@ -27,23 +27,23 @@
 INCLUDEPATH += $$PWD
 DEPENDPATH += $$PWD
 
-INTERNAL_HEADERS += $$PWD/hbnvg_p.h
-INTERNAL_HEADERS += $$PWD/hbnvgicon_p.h
+PRIVATE_HEADERS += $$PWD/hbnvg_p.h
+PRIVATE_HEADERS += $$PWD/hbnvgicon_p.h
 
-INTERNAL_HEADERS += $$PWD/hbtlvcommon_p.h
-INTERNAL_HEADERS += $$PWD/hbnvgfittoviewbox_p.h
-INTERNAL_HEADERS += $$PWD/hbnvgimagebinder_p.h 
-INTERNAL_HEADERS += $$PWD/hbtlviconcreator_p.h
-INTERNAL_HEADERS += $$PWD/hbtlvrenderer_p.h
-INTERNAL_HEADERS += $$PWD/hbtlviconrenderer_p.h
-INTERNAL_HEADERS += $$PWD/hbnvgtlvicon_p.h
-INTERNAL_HEADERS += $$PWD/hbnvgicondata_p.h
-INTERNAL_HEADERS += $$PWD/hbopenvghandlestore_p.h
-INTERNAL_HEADERS += $$PWD/hbnvgcsicon_p.h
-INTERNAL_HEADERS += $$PWD/hbnvgiconfactory_p.h 
-INTERNAL_HEADERS += $$PWD/hbnvg_p_p.h
-INTERNAL_HEADERS += $$PWD/hbnvgexception_p.h
-INTERNAL_HEADERS += $$PWD/hbnvgenginepool_p.h
+PRIVATE_HEADERS += $$PWD/hbtlvcommon_p.h
+PRIVATE_HEADERS += $$PWD/hbnvgfittoviewbox_p.h
+PRIVATE_HEADERS += $$PWD/hbnvgimagebinder_p.h 
+PRIVATE_HEADERS += $$PWD/hbtlviconcreator_p.h
+PRIVATE_HEADERS += $$PWD/hbtlvrenderer_p.h
+PRIVATE_HEADERS += $$PWD/hbtlviconrenderer_p.h
+PRIVATE_HEADERS += $$PWD/hbnvgtlvicon_p.h
+PRIVATE_HEADERS += $$PWD/hbnvgicondata_p.h
+PRIVATE_HEADERS += $$PWD/hbopenvghandlestore_p.h
+PRIVATE_HEADERS += $$PWD/hbnvgcsicon_p.h
+PRIVATE_HEADERS += $$PWD/hbnvgiconfactory_p.h 
+PRIVATE_HEADERS += $$PWD/hbnvg_p_p.h
+PRIVATE_HEADERS += $$PWD/hbnvgexception_p.h
+PRIVATE_HEADERS += $$PWD/hbnvgenginepool_p.h
 
 SOURCES += $$PWD/hbnvgfittoviewbox.cpp
 #SOURCES += $$PWD/hbnvgfittoviewbox_p.inl
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/svgext/hbnvgdecoder/hbnvgenginepool.cpp
--- a/src/hbcore/svgext/hbnvgdecoder/hbnvgenginepool.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/svgext/hbnvgdecoder/hbnvgenginepool.cpp	Mon May 03 12:48:33 2010 +0300
@@ -25,17 +25,17 @@
 
 #include "hbnvgenginepool_p.h"
 
-HbPooledNVGEngine * HbNVGEnginePool::getNVGEngine()
+HbPooledNVGEngine * HbNvgEnginePool::getNvgEngine()
 {
     HbPooledNVGEngine* pNvgEngine;
     if (!pooledEngine) {
-        pooledEngine = new HbNVGEngineInstance;
+        pooledEngine = new HbNvgEngineInstance;
         Q_CHECK_PTR(pooledEngine);
     }
-    pNvgEngine = new HbPooledNVGEngine(*pooledEngine); 
+    pNvgEngine = new HbPooledNVGEngine(*pooledEngine);
     Q_CHECK_PTR(pNvgEngine);
-    return pNvgEngine; 
+    return pNvgEngine;
 }
 
-HbNVGEnginePool * HbNVGEnginePool::pool = 0;
+HbNvgEnginePool * HbNvgEnginePool::pool = 0;
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/svgext/hbnvgdecoder/hbnvgenginepool_p.h
--- a/src/hbcore/svgext/hbnvgdecoder/hbnvgenginepool_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/svgext/hbnvgdecoder/hbnvgenginepool_p.h	Mon May 03 12:48:33 2010 +0300
@@ -22,132 +22,122 @@
 ** Nokia at developer.feedback@nokia.com.
 **
 ****************************************************************************/
- 
+
 #ifndef HB_NVGNEGINE_POOL_H_
 #define HB_NVGNEGINE_POOL_H_
- 
+
 #include "hbnvg_p.h"
 
-class HB_CORE_PRIVATE_EXPORT HbNVGEngineInstance
+class HB_CORE_PRIVATE_EXPORT HbNvgEngineInstance
 {
 public:
-    HbNVGEngineInstance() : refCount(0), nvgEngine(0) {}
-        
-    void deref()
-    {
+    HbNvgEngineInstance() : refCount(0), nvgEngine(0) {}
+
+    void deref() {
         if (--refCount == 0) {
             delete nvgEngine;
             nvgEngine = 0;
         }
     }
-    
-    void ref()
-    {
+
+    void ref() {
         if (!nvgEngine) {
-            nvgEngine = new HbNvgEngine; 
+            nvgEngine = new HbNvgEngine;
         }
         ++refCount;
     }
-    
-    ~HbNVGEngineInstance()
-    {
+
+    ~HbNvgEngineInstance() {
         if (nvgEngine) {
             delete nvgEngine;
         }
     }
-    
-    HbNvgEngine * engine()
-    {
+
+    HbNvgEngine * engine() {
         if (!nvgEngine) {
             nvgEngine = new HbNvgEngine;
         }
         return nvgEngine;
     }
-            
-    void resetNVGEngine() {
+
+    void resetNvgEngine() {
         if (nvgEngine) {
             delete nvgEngine;
             nvgEngine = 0;
         }
     }
-    
+
 private:
-    int refCount;
+    qint32 refCount;
     HbNvgEngine * nvgEngine;
 };
 
 class HB_CORE_PRIVATE_EXPORT HbPooledNVGEngine
 {
 public:
-    HbPooledNVGEngine(HbNVGEngineInstance & instance)
-     : engineInstance(instance)
-    {
+    HbPooledNVGEngine(HbNvgEngineInstance & instance)
+            : engineInstance(instance) {
         engineInstance.ref();
     }
-    
-    ~HbPooledNVGEngine()
-    {
+
+    ~HbPooledNVGEngine() {
         engineInstance.deref();
     }
-    
-    HbNvgEngine& operator*() const
-    {
-        return *(engineInstance.engine());
-    }
-    
-    HbNvgEngine& operator*()
-    {
+
+    HbNvgEngine& operator*() const {
         return *(engineInstance.engine());
     }
 
-    HbNvgEngine * operator->()
-    {
+    HbNvgEngine& operator*() {
+        return *(engineInstance.engine());
+    }
+
+    HbNvgEngine * operator->() {
         return engineInstance.engine();
     }
 
-    HbNvgEngine * operator->() const
-    {
+    HbNvgEngine * operator->() const {
+        return engineInstance.engine();
+    }
+
+    HbNvgEngine * engine() {
         return engineInstance.engine();
     }
 
-    HbNvgEngine * engine()
-    {
-        return engineInstance.engine();
-    }
-    
 private:
-    HbNVGEngineInstance & engineInstance;
+    HbNvgEngineInstance & engineInstance;
 };
 
-class HB_CORE_PRIVATE_EXPORT HbNVGEnginePool
+class HB_CORE_PRIVATE_EXPORT HbNvgEnginePool
 {
 public:
-    
-    ~HbNVGEnginePool() {delete pooledEngine;}
-    
-    static HbNVGEnginePool * instance()
-    {
+
+    ~HbNvgEnginePool() {
+        delete pooledEngine;
+    }
+
+    static HbNvgEnginePool * instance() {
         if (!pool) {
-            pool = new HbNVGEnginePool;
+            pool = new HbNvgEnginePool;
         }
         return pool;
     }
-    
- 	HbPooledNVGEngine * getNVGEngine();
- 	
- 	void resetNVGEngine() {
- 	    if (pooledEngine) {
-            pooledEngine->resetNVGEngine();
- 	    }
- 	}
- 	
+
+    HbPooledNVGEngine * getNvgEngine();
+
+    void resetNvgEngine() {
+        if (pooledEngine) {
+            pooledEngine->resetNvgEngine();
+        }
+    }
+
 private:
-    HbNVGEnginePool() : pooledEngine(0) {}
-    
- 	HbNVGEngineInstance * pooledEngine;
- 	static HbNVGEnginePool * pool;
+    HbNvgEnginePool() : pooledEngine(0) {}
+
+    HbNvgEngineInstance * pooledEngine;
+    static HbNvgEnginePool * pool;
 };
 
 #endif
- 
-  
+
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/svgext/hbnvgdecoder/hbnvgexception_p.h
--- a/src/hbcore/svgext/hbnvgdecoder/hbnvgexception_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/svgext/hbnvgdecoder/hbnvgexception_p.h	Mon May 03 12:48:33 2010 +0300
@@ -27,23 +27,21 @@
 #define HBNVGEXCEPTION_P_H_
 
 #include <exception>
-#include <QString>
 
 class HbNvgException: public std::exception
 {
 public:
-    HbNvgException(int id) 
-    : errID(id)
-    {}
-    
-    int errorID() const 
-    {
+    HbNvgException(qint32 id)
+            : errID(id) {}
+
+    qint32 errorID() const
+	{
         return errID;
     }
-    
+
 private:
-    int     errID;
+    qint32     errID;
 };
 
-#endif 
+#endif
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/svgext/hbnvgdecoder/hbnvgfittoviewbox.cpp
--- a/src/hbcore/svgext/hbnvgdecoder/hbnvgfittoviewbox.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/svgext/hbnvgdecoder/hbnvgfittoviewbox.cpp	Mon May 03 12:48:33 2010 +0300
@@ -25,16 +25,16 @@
 
 #include "hbnvgfittoviewbox_p.h"
 
-const qreal Zero = 0.0f ;
-const qreal One = 1.0f ;
+const qreal zero = 0.0f ;
+const qreal one = 1.0f ;
 
 HbNvgFitToViewBoxImpl::HbNvgFitToViewBoxImpl()
-		: mM00(One),
-        mM01(Zero),
-        mM02(Zero),
-        mM10(Zero),
-        mM11(One),
-        mM12(Zero),
+        : mM00(one),
+        mM01(zero),
+        mM02(zero),
+        mM10(zero),
+        mM11(one),
+        mM12(zero),
         mViewBoxDefined(false),
         mAlign(HbNvgEngine::NvgPreserveAspectRatioXmidYmid),
         mMeetSlice(HbNvgEngine::NvgMeet)
@@ -54,45 +54,45 @@
 {
 
     //VIEWPORT NUMBERS
-    qreal lViewPortX = viewPort.left();
-    qreal lViewPortY = viewPort.top();
-    qreal lViewPortWidth = viewPort.width();
-    qreal lViewPortHeight = viewPort.height();
+    qreal viewPortX = viewPort.left();
+    qreal viewPortY = viewPort.top();
+    qreal viewPortWidth = viewPort.width();
+    qreal viewPortHeight = viewPort.height();
 
     vgSeti(VG_MATRIX_MODE, VG_MATRIX_PATH_USER_TO_SURFACE);
-    vgTranslate(lViewPortX, lViewPortY);
+    vgTranslate(viewPortX, viewPortY);
 
-    qreal lViewBoxXmin;
-    qreal lViewBoxYmin;
-    qreal lViewBoxWidth;
-    qreal lViewBoxHeight;
+    qreal viewBoxXmin;
+    qreal viewBoxYmin;
+    qreal viewBoxWidth;
+    qreal viewBoxHeight;
 
     if (mViewBoxDefined) {
-        lViewBoxXmin = mVbX;
-        lViewBoxYmin = mVbY;
-        lViewBoxWidth = mVbW;
-        lViewBoxHeight = mVbH;
+        viewBoxXmin = mVbX;
+        viewBoxYmin = mVbY;
+        viewBoxWidth = mVbW;
+        viewBoxHeight = mVbH;
     } else {
         //this will default viewBox to <svg> element width and height
-        lViewBoxXmin = 0;
-        lViewBoxYmin = 0;
-        lViewBoxWidth = size.width();
-        lViewBoxHeight = size.height();
+        viewBoxXmin = 0;
+        viewBoxYmin = 0;
+        viewBoxWidth = size.width();
+        viewBoxHeight = size.height();
     }
 
-    if (lViewBoxWidth == 0.0f || lViewBoxHeight == 0.0f) {
+    if (viewBoxWidth == 0.0f || viewBoxHeight == 0.0f) {
         return;
     }
 
-    qreal sx = lViewPortWidth / lViewBoxWidth;
-    qreal sy = lViewPortHeight / lViewBoxHeight;
+    qreal sx = viewPortWidth / viewBoxWidth;
+    qreal sy = viewPortHeight / viewBoxHeight;
 
     if (sx == 0.0f || sy == 0.0f) {
         return;
     }
 
-    qreal xtrans = qreal(-1.0f) * lViewBoxXmin;
-    qreal ytrans = qreal(-1.0f) * lViewBoxYmin;
+    qreal xtrans = qreal(-1.0f) * viewBoxXmin;
+    qreal ytrans = qreal(-1.0f) * viewBoxYmin;
 
     switch (mAlign) {
     case HbNvgEngine::NvgPreserveAspectRatioNone:
@@ -131,19 +131,19 @@
         if (mMeetSlice == HbNvgEngine::NvgMeet) {
             if (sx > sy) {
                 sx = sy;
-                xtrans = ((lViewPortWidth - ((lViewBoxWidth / lViewBoxHeight) * lViewPortHeight)) * (.5f)) / sx - lViewBoxXmin;
-            } else { 
+                xtrans = ((viewPortWidth - ((viewBoxWidth / viewBoxHeight) * viewPortHeight)) * (.5f)) / sx - viewBoxXmin;
+            } else {
                 sy = sx;
                 //no change for ytrans...default above
             }
         } else if (mMeetSlice == HbNvgEngine::NvgSlice) {
             if (sx > sy) {
                 sy = sx;
-            } else { 
+            } else {
                 sx = sy;
-                xtrans = lViewPortWidth - sx * lViewBoxWidth;
+                xtrans = viewPortWidth - sx * viewBoxWidth;
                 xtrans = xtrans / sx;
-                xtrans = xtrans / qreal(2) - lViewBoxXmin;
+                xtrans = xtrans / qreal(2) - viewBoxXmin;
             }
         }
         break;
@@ -153,8 +153,8 @@
         if (mMeetSlice == HbNvgEngine::NvgMeet) {
             if (sx > sy) {
                 sx = sy;
-                xtrans = ((lViewPortWidth - ((lViewBoxWidth / lViewBoxHeight) * lViewPortHeight))) / sx - lViewBoxXmin;
-            } else { 
+                xtrans = ((viewPortWidth - ((viewBoxWidth / viewBoxHeight) * viewPortHeight))) / sx - viewBoxXmin;
+            } else {
                 sy = sx;
                 //no change for ytrans...default above
             }
@@ -162,10 +162,10 @@
             if (sx > sy) {
                 sy = sx;
                 //no change for ytrans...default above
-            } else { 
+            } else {
                 sx = sy;
-                xtrans = lViewPortWidth - sx * lViewBoxWidth;
-                xtrans = xtrans / sx - lViewBoxXmin;
+                xtrans = viewPortWidth - sx * viewBoxWidth;
+                xtrans = xtrans / sx - viewBoxXmin;
             }
         }
         break;
@@ -176,18 +176,18 @@
             if (sx > sy) {
                 sx = sy;
                 //no change for xtrans...default above
-            } else { 
+            } else {
                 sy = sx;
                 ytrans = ((qreal)
-                          (lViewPortHeight - ((qreal)(lViewBoxHeight / lViewBoxWidth) * lViewPortWidth)) * qreal(.5f)) / sy - lViewBoxYmin;
+                          (viewPortHeight - ((qreal)(viewBoxHeight / viewBoxWidth) * viewPortWidth)) * qreal(.5f)) / sy - viewBoxYmin;
             }
         } else if (mMeetSlice == HbNvgEngine::NvgSlice) {
             if (sx > sy) {
                 sy = sx;
-                ytrans = lViewPortHeight - sx * lViewBoxHeight;
+                ytrans = viewPortHeight - sx * viewBoxHeight;
                 ytrans = ytrans / sx;
-                ytrans = ytrans / qreal(2) - lViewBoxYmin;
-            } else { 
+                ytrans = ytrans / qreal(2) - viewBoxYmin;
+            } else {
                 sx = sy;
             }
         }
@@ -199,23 +199,23 @@
         if (mMeetSlice == HbNvgEngine::NvgMeet) {
             if (sx > sy) {
                 sx = sy;
-                xtrans = ((lViewPortWidth - ((lViewBoxWidth / lViewBoxHeight) * lViewPortHeight)) * (.5f)) / sx - lViewBoxXmin;
+                xtrans = ((viewPortWidth - ((viewBoxWidth / viewBoxHeight) * viewPortHeight)) * (.5f)) / sx - viewBoxXmin;
 
             } else if (sx < sy) {
                 sy = sx;
-                ytrans = ((lViewPortHeight - ((lViewBoxHeight / lViewBoxWidth) * lViewPortWidth)) * (.5f)) / sy - lViewBoxYmin;
+                ytrans = ((viewPortHeight - ((viewBoxHeight / viewBoxWidth) * viewPortWidth)) * (.5f)) / sy - viewBoxYmin;
             }
         } else if (mMeetSlice == HbNvgEngine::NvgSlice) {
             if (sx > sy) {
                 sy = sx;
-                ytrans = lViewPortHeight - sx * lViewBoxHeight;
+                ytrans = viewPortHeight - sx * viewBoxHeight;
                 ytrans = ytrans / sx;
-                ytrans = ytrans / qreal(2) - lViewBoxYmin;
-            } else { 
+                ytrans = ytrans / qreal(2) - viewBoxYmin;
+            } else {
                 sx = sy;
-                xtrans = lViewPortWidth - sx * lViewBoxWidth;
+                xtrans = viewPortWidth - sx * viewBoxWidth;
                 xtrans = xtrans / sx;
-                xtrans = xtrans / qreal(2) - lViewBoxXmin;
+                xtrans = xtrans / qreal(2) - viewBoxXmin;
             }
         }
         break;
@@ -225,21 +225,21 @@
         if (mMeetSlice == HbNvgEngine::NvgMeet) {
             if (sx > sy) {
                 sx = sy;
-                xtrans = ((lViewPortWidth - ((lViewBoxWidth / lViewBoxHeight) * lViewPortHeight))) / sx - lViewBoxXmin;
-            } else { 
+                xtrans = ((viewPortWidth - ((viewBoxWidth / viewBoxHeight) * viewPortHeight))) / sx - viewBoxXmin;
+            } else {
                 sy = sx;
-                ytrans = ((lViewPortHeight - ((lViewBoxHeight / lViewBoxWidth) * lViewPortWidth)) * (.5f)) / sy - lViewBoxYmin;
+                ytrans = ((viewPortHeight - ((viewBoxHeight / viewBoxWidth) * viewPortWidth)) * (.5f)) / sy - viewBoxYmin;
             }
         } else if (mMeetSlice == HbNvgEngine::NvgSlice) {
             if (sx > sy) {
                 sy = sx;
-                ytrans = lViewPortHeight - sx * lViewBoxHeight;
+                ytrans = viewPortHeight - sx * viewBoxHeight;
                 ytrans = ytrans / sx;
-                ytrans = ytrans / qreal(2) - lViewBoxYmin;
-            } else { 
+                ytrans = ytrans / qreal(2) - viewBoxYmin;
+            } else {
                 sx = sy;
-                xtrans = lViewPortWidth - sx * lViewBoxWidth;
-                xtrans = xtrans / sx - lViewBoxXmin;
+                xtrans = viewPortWidth - sx * viewBoxWidth;
+                xtrans = xtrans / sx - viewBoxXmin;
             }
         }
         break;
@@ -250,16 +250,16 @@
             if (sx > sy) {
                 sx = sy;
                 //no change for xtrans...default above
-            } else { 
+            } else {
                 sy = sx;
 
-                ytrans = ((lViewPortHeight - ((lViewBoxHeight / lViewBoxWidth) * lViewPortWidth))) / sy - lViewBoxYmin;
+                ytrans = ((viewPortHeight - ((viewBoxHeight / viewBoxWidth) * viewPortWidth))) / sy - viewBoxYmin;
             }
         } else if (mMeetSlice == HbNvgEngine::NvgSlice) {
             if (sx > sy) {
                 sy = sx;
-                ytrans = lViewPortHeight - sx * lViewBoxHeight;
-                ytrans = ytrans / sx - lViewBoxYmin;
+                ytrans = viewPortHeight - sx * viewBoxHeight;
+                ytrans = ytrans / sx - viewBoxYmin;
             } else {
                 sx = sy;
             }
@@ -271,21 +271,21 @@
         if (mMeetSlice == HbNvgEngine::NvgMeet) {
             if (sx > sy) {
                 sx = sy;
-                xtrans = ((lViewPortWidth - ((lViewBoxWidth / lViewBoxHeight) * lViewPortHeight)) * qreal(.5f)) / sx - lViewBoxXmin;
+                xtrans = ((viewPortWidth - ((viewBoxWidth / viewBoxHeight) * viewPortHeight)) * qreal(.5f)) / sx - viewBoxXmin;
             } else {
                 sy = sx;
-                ytrans = ((lViewPortHeight - ((lViewBoxHeight / lViewBoxWidth) * lViewPortWidth))) / sy - lViewBoxYmin;
+                ytrans = ((viewPortHeight - ((viewBoxHeight / viewBoxWidth) * viewPortWidth))) / sy - viewBoxYmin;
             }
         } else if (mMeetSlice == HbNvgEngine::NvgSlice) {
             if (sx > sy) {
                 sy = sx;
-                ytrans = lViewPortHeight - sx * lViewBoxHeight;
-                ytrans = ytrans / sx - lViewBoxYmin;
+                ytrans = viewPortHeight - sx * viewBoxHeight;
+                ytrans = ytrans / sx - viewBoxYmin;
             } else {
                 sx = sy;
-                xtrans = lViewPortWidth - sx * lViewBoxWidth;
+                xtrans = viewPortWidth - sx * viewBoxWidth;
                 xtrans = xtrans / sx;
-                xtrans = xtrans / qreal(2) - lViewBoxXmin;
+                xtrans = xtrans / qreal(2) - viewBoxXmin;
             }
         }
         break;
@@ -295,20 +295,20 @@
         if (mMeetSlice == HbNvgEngine::NvgMeet) {
             if (sx > sy) {
                 sx = sy;
-                xtrans = ((lViewPortWidth - ((lViewBoxWidth / lViewBoxHeight) * lViewPortHeight))) / sx - lViewBoxXmin;
+                xtrans = ((viewPortWidth - ((viewBoxWidth / viewBoxHeight) * viewPortHeight))) / sx - viewBoxXmin;
             } else {
                 sy = sx;
-                ytrans = ((lViewPortHeight - ((lViewBoxHeight / lViewBoxWidth) * lViewPortWidth))) / sy - lViewBoxYmin;
+                ytrans = ((viewPortHeight - ((viewBoxHeight / viewBoxWidth) * viewPortWidth))) / sy - viewBoxYmin;
             }
         } else if (mMeetSlice == HbNvgEngine::NvgSlice) {
             if (sx > sy) {
                 sy = sx;
-                ytrans = lViewPortHeight - sx * lViewBoxHeight;
-                ytrans = ytrans / sx - lViewBoxYmin;
+                ytrans = viewPortHeight - sx * viewBoxHeight;
+                ytrans = ytrans / sx - viewBoxYmin;
             } else {
                 sx = sy;
-                xtrans = lViewPortWidth - sx * lViewBoxWidth;
-                xtrans = xtrans / sx - lViewBoxXmin;
+                xtrans = viewPortWidth - sx * viewBoxWidth;
+                xtrans = xtrans / sx - viewBoxXmin;
             }
         }
         break;
@@ -322,7 +322,8 @@
 
 void HbNvgFitToViewBoxImpl::concatenate(qreal m00, qreal m01, qreal m02, qreal m10, qreal m11, qreal m12)
 {
-    qreal m0, m1;
+    qreal m0;
+    qreal m1;
     m0  = mM00;
     m1  = mM01;
     mM00 = m00 * m0 + m10 * m1;
@@ -335,4 +336,3 @@
     mM12 += m02 * m0 + m12 * m1;
 }
 
-//--------------------------------EndOfFile------------------------------------
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/svgext/hbnvgdecoder/hbnvgfittoviewbox_p.h
--- a/src/hbcore/svgext/hbnvgdecoder/hbnvgfittoviewbox_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/svgext/hbnvgdecoder/hbnvgfittoviewbox_p.h	Mon May 03 12:48:33 2010 +0300
@@ -37,30 +37,62 @@
 public:
     HbNvgFitToViewBoxImpl();
 
-    virtual ~HbNvgFitToViewBoxImpl();
+    ~HbNvgFitToViewBoxImpl();
 
 public:
-    inline void setViewBox(qreal vbX, qreal vbY, qreal vbW, qreal vbH);
-
-    inline void setAlign(HbNvgEngine::NvgAlignStatusType alignStatus);
-
-    inline void setScaling(HbNvgEngine::NvgMeetOrSliceType  meetSlice);
-
-    inline void setTransform(qreal m00, qreal m01, qreal m02, qreal m10, qreal m11, qreal m12);
+    void setViewBox(qreal vbX, qreal vbY, qreal vbW, qreal vbH)
+    {
+        mVbX = vbX;
+        mVbY = vbY;
+        mVbW = vbW;
+        mVbH = vbH;
+        mViewBoxDefined = true;
+    }
 
 
-    inline void translate(qreal xValue, qreal yValue);
+    void setAllignment(HbNvgEngine::HbNvgAlignType alignStatus)
+    {
+        mAlign = alignStatus;
+    }
+
+    void setScaling(HbNvgEngine::HbNvgMeetType meetSlice)
+    {
+        mMeetSlice = meetSlice;
+    }
 
-    inline void scale(qreal xValue, qreal yValue);
-    
-    inline void concatenate(qreal *matrix);
+    void setTransform(qreal m00, qreal m01, qreal m02, qreal m10, qreal m11, qreal m12)
+    {
+        mM00 = m00;
+        mM01 = m01;
+        mM02 = m02;
+        mM10 = m10;
+        mM11 = m11;
+        mM12 = m12;
+    }
+
+    void translate(qreal tx, qreal ty)
+    {
+        qreal lTranslateMatrix[6] =  { 1, 0, tx, 0, 1, ty};
+        concatenate(lTranslateMatrix);
+    }
+
+    void scale(qreal sx, qreal sy)
+    {
+        qreal lScaleMatrix[6] = { sx, 0, 0, 0, sy, 0};
+        concatenate(lScaleMatrix);
+    }
+
+    void concatenate(qreal *matrix)
+    {
+        concatenate(matrix[0], matrix[1], matrix[2], matrix[3], matrix[4], matrix[5]);
+    }
 
     void setWindowViewportTrans(const QRect &viewPort, const QSize &size);
 
     void concatenate(qreal m00, qreal m01, qreal m02, qreal m10, qreal m11, qreal m12);
 
 private:
-    
+
     qreal mM00;
     qreal mM01;
     qreal mM02;
@@ -75,11 +107,10 @@
 
     bool mViewBoxDefined;
 
-    HbNvgEngine::NvgAlignStatusType mAlign;
+    HbNvgEngine::HbNvgAlignType mAlign;
 
-    HbNvgEngine::NvgMeetOrSliceType  mMeetSlice;
+    HbNvgEngine::HbNvgMeetType  mMeetSlice;
 };
 
-#include "hbnvgfittoviewbox_p.inl"
 #endif
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/svgext/hbnvgdecoder/hbnvgfittoviewbox_p.inl
--- a/src/hbcore/svgext/hbnvgdecoder/hbnvgfittoviewbox_p.inl	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +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.
-**
-****************************************************************************/
-
-inline void HbNvgFitToViewBoxImpl::setViewBox(qreal vbX, qreal vbY, qreal vbW, qreal vbH)
-    {
-    mVbX = vbX;
-    mVbY = vbY;
-    mVbW = vbW;
-    mVbH = vbH;
-    mViewBoxDefined = true;
-    }
-
-inline void HbNvgFitToViewBoxImpl::setAlign(HbNvgEngine::NvgAlignStatusType alignStatus)
-    {
-    mAlign = alignStatus;
-    }
-
-inline void HbNvgFitToViewBoxImpl::setScaling(HbNvgEngine::NvgMeetOrSliceType meetSlice)
-    {
-    mMeetSlice = meetSlice;
-    }
-
-inline void HbNvgFitToViewBoxImpl::setTransform(qreal m00, qreal m01, qreal m02, qreal m10, qreal m11, qreal m12)
-    {
-    mM00 = m00;
-    mM01 = m01;
-    mM02 = m02;
-    mM10 = m10;
-    mM11 = m11;
-    mM12 = m12;
-    }
-
-inline void HbNvgFitToViewBoxImpl::translate(qreal tx, qreal ty)
-    {
-    qreal lTranslateMatrix[6] =  { 1, 0, tx, 0, 1, ty};
-    concatenate(lTranslateMatrix);
-    }
-
-inline void HbNvgFitToViewBoxImpl::scale(qreal sx, qreal sy)
-    {
-    qreal lScaleMatrix[6] = { sx, 0, 0, 0, sy, 0};
-    concatenate(lScaleMatrix);
-    }
-
-inline void HbNvgFitToViewBoxImpl::concatenate(qreal *matrix)
-    {
-    concatenate(matrix[0], matrix[1], matrix[2], matrix[3], matrix[4], matrix[5]);
-    }
-
-
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/svgext/hbnvgdecoder/hbnvgicon_p.h
--- a/src/hbcore/svgext/hbnvgdecoder/hbnvgicon_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/svgext/hbnvgdecoder/hbnvgicon_p.h	Mon May 03 12:48:33 2010 +0300
@@ -37,55 +37,26 @@
 {
 public:
 
-    /*!
-     set the aspectRatio \a preserveAspectSetting and \a smilFitSetting 
-     to be applied on the nvgicon. 
-     */
-    virtual void setPreserveAspectRatio(HbNvgEngine::NvgAlignStatusType preserveAspectSetting,
-            HbNvgEngine::NvgMeetOrSliceType smilFitSetting) = 0;
+    virtual void setPreserveAspectRatio(HbNvgEngine::HbNvgAlignType preserveAspectSetting,
+                                        HbNvgEngine::HbNvgMeetType smilFitSetting) = 0;
 
-    /*!
-     Set the \a angle for rotation of the nvgicon at the 
-     coordiantes  \a x and \a y. 
-     */
+
     virtual void rotate(float angle, float x, float y) = 0;
-    
-    virtual void setMirroringMode( bool mirroringmode)= 0;
 
-    /*!
-     Draw the nvgicon the nvgicon created of size \a size.
-     
-     */
-    virtual HbNvgEngine::NvgErrorType draw(const QSize &size) = 0;
+    virtual void enableMirroring(bool mirroringmode) = 0;
 
-    /*!
-     Destructor
-     */
-    virtual ~HbNvgIcon()
-    {
-    }
+    virtual HbNvgEngine::HbNvgErrorType draw(const QSize &size) = 0;
 
-    /*!
-      Set the VGImageBinder to the nvgicon.
-      */
+    virtual ~HbNvgIcon() {}
+
     virtual void setVgImageBinder(HbVgImageBinder *) {}
 
-    /*! 
-     Do the direct draw of the nvg graphic data \a buffer of size \a targetSize 
-     and return the status of the draw.
-     */
     virtual void directDraw(const QByteArray &buffer, const QSize& targetSize) = 0;
 
-    /*! 
-     Create the nvg graphic data \a buffer of size \a targetSize 
-     and return the status of the draw.
-     */
     virtual void create(const QByteArray &buffer, const QSize& targetSize) = 0;
-
-    /*! 
-     Sets the nvg graphic data \a buffer to the nvgicon.
-     */
+    
     virtual void setIconData(const QByteArray & /*buffer*/) {}
 };
 
 #endif
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/svgext/hbnvgdecoder/hbnvgicondata.cpp
--- a/src/hbcore/svgext/hbnvgdecoder/hbnvgicondata.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/svgext/hbnvgdecoder/hbnvgicondata.cpp	Mon May 03 12:48:33 2010 +0300
@@ -25,12 +25,12 @@
 
 #include "hbnvgicondata_p.h"
 
-HbNvgIconData::HbNvgIconData(uint length)
+HbNvgIconData::HbNvgIconData(quint32 length)
         : mNvgData(0),
         totalRead(0),
         readStream(0)
 {
-    mNvgData = new QByteArray(NULL , length);
+    mNvgData = new QByteArray(0, length);
     Q_CHECK_PTR(mNvgData);
 }
 
@@ -42,7 +42,7 @@
     mNvgData = new QByteArray(buffer);
     Q_CHECK_PTR(mNvgData);
     dataSize = mNvgData->length();
-    
+
     //set the reading pointers
     beginRead();
 }
@@ -52,10 +52,10 @@
     delete mNvgData;
 }
 
-int HbNvgIconData::encodeData(const void *data, quint32 length)
-{    
+qint32 HbNvgIconData::encodeData(const void *data, quint32 length)
+{
     mNvgData->append((const char*)data , length);
-    return (int)HbNvgEngine::NvgErrNone; //in error case, exception will be thrown 
+    return (qint32)HbNvgEngine::NvgErrNone; //in error case, exception will be thrown
 }
 
 void HbNvgIconData::beginRead()
@@ -70,34 +70,34 @@
 }
 
 #define STR_TO_OTHER_DIR(TOTYPE) do {\
-                                TOTYPE data = *(TOTYPE *)&readStream[totalRead];\
-                                totalRead += sizeof(TOTYPE);\
-                                return data;\
-                           } while (0)
+        TOTYPE data = *(TOTYPE *)&readStream[totalRead];\
+        totalRead += sizeof(TOTYPE);\
+        return data;\
+    } while (0)
 
 
 #define STR_TO_OTHER_IDIR(TOTYPE) do {\
-                                TOTYPE data;\
-                                quint8 * dataPtr = (quint8 *)&data;\
-                                for (int i = 0; i < sizeof(TOTYPE); ++i)\
-                                    {\
-                                    dataPtr[i] = readStream[totalRead+i];\
-                                    }\
-                                totalRead += sizeof(TOTYPE);\
-                                return data;\
-                            } while (0)
+        TOTYPE data;\
+        quint8 * dataPtr = (quint8 *)&data;\
+        for (qint32 i = 0; i < sizeof(TOTYPE); ++i)\
+        {\
+            dataPtr[i] = readStream[totalRead+i];\
+        }\
+        totalRead += sizeof(TOTYPE);\
+        return data;\
+    } while (0)
 
 #define STR_TO_OTHER(TOTYPE) do {\
-                                checkOutOfBound(sizeof(TOTYPE));\
-                                if (reinterpret_cast<int>(&readStream[totalRead]) & (sizeof(TOTYPE) - 1))\
-                                    {\
-                                    STR_TO_OTHER_IDIR(TOTYPE);\
-                                    }\
-                                else\
-                                    {\
-                                    STR_TO_OTHER_DIR(TOTYPE);\
-                                    }\
-                            } while (0)
+        checkOutOfBound(sizeof(TOTYPE));\
+        if (reinterpret_cast<qint32>(&readStream[totalRead]) & (sizeof(TOTYPE) - 1))\
+        {\
+            STR_TO_OTHER_IDIR(TOTYPE);\
+        }\
+        else\
+        {\
+            STR_TO_OTHER_DIR(TOTYPE);\
+        }\
+    } while (0)
 
 qint16 HbNvgIconData::readInt16()
 {
@@ -125,14 +125,14 @@
     STR_TO_OTHER(qreal);
 }
 
-void HbNvgIconData::read(quint8 *ptr, int length)
+void HbNvgIconData::read(quint8 *ptr, qint32 length)
 {
-	checkOutOfBound(length);
+    checkOutOfBound(length);
     memcpy(ptr, &readStream[totalRead], length);
     totalRead += length;
 }
 
-void HbNvgIconData::skip(int length)
+void HbNvgIconData::skip(qint32 length)
 {
     checkOutOfBound(length);
     totalRead += length;
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/svgext/hbnvgdecoder/hbnvgicondata_p.h
--- a/src/hbcore/svgext/hbnvgdecoder/hbnvgicondata_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/svgext/hbnvgdecoder/hbnvgicondata_p.h	Mon May 03 12:48:33 2010 +0300
@@ -35,23 +35,37 @@
 class HbNvgIconData
 {
 public:
-    HbNvgIconData(uint length = 0);
+    HbNvgIconData(quint32 length = 0);
 
     HbNvgIconData(const QByteArray &buffer);
 
-    virtual ~HbNvgIconData();
+    ~HbNvgIconData();
+
+    qint32 encodeUint8(quint8 aVal)
+    {
+        return encodeData(&aVal, sizeof(aVal));
+    }
+
+    qint32 encodeUint16(quint16 aVal)
+    {
+        return encodeData(&aVal, sizeof(aVal));
+    }
 
-    int encodeInt8(quint8 val); 
-   
-    int encodeInt16(quint16 val); 
-   
-    int encodeInt32(quint32 val);
-   
-    int encodeReal32(float val); 
-   
-    int encodeReal64(qreal val);
-   
-    int encodeData(const void *data, quint32 length);
+    qint32 encodeUint32(quint32 aVal)
+    {
+        return encodeData(&aVal, sizeof(aVal));
+    }
+
+    int encodeReal32(float aVal)
+    {
+        return encodeData(&aVal, sizeof(aVal));
+    }
+    qint32 encodeReal64(double aVal)
+    {
+        return encodeData(&aVal, sizeof(aVal));
+    }
+
+    qint32 encodeData(const void *data, quint32 length);
 
     void beginRead();
 
@@ -63,73 +77,154 @@
 
     qint8 readInt8();
 
-    void read(quint8 *ptr, int length);
+    void read(quint8 *ptr, qint32 length);
 
     float readReal32();
 
     qreal readReal64();
 
-    int readPos();
-    
-    void skip(int length);
+    qint32 readPos() const
+    {
+        return totalRead;
+    }
+
+    void skip(qint32 length);
 
     const char* buffer() {
         return mNvgData->data() ;
     }
 
-    bool eof();
-    
-    int dataLength();
+    bool eof() const
+    {
+        return (totalRead >= dataSize);
+    }
+
+    qint32 dataLength() const
+    {
+        return dataSize;
+    }
 
 private:
 
-	void checkOutOfBound(int length);
-	    
+    void checkOutOfBound(qint32 length)
+    {
+        if (totalRead + length > dataSize ||
+                totalRead + length < 0){
+            throw HbNvgException(HbNvgEngine::NvgErrEof);
+        }
+    }
+
     QByteArray*        mNvgData;
-    int                totalRead;
-    int                dataSize;
+    qint32                totalRead;
+    qint32                dataSize;
     quint8 *           readStream;
 };
 
 class HbDereferencer
-    {
+{
+#define DEREF_PTR(TOTYPE, Offset, Size) do {\
+                                checkOutOfBound(Offset + Size); \
+                                return * (TOTYPE *)&mReadStream[mTotalRead + Offset];\
+                           } while (0)
 public:
-    
-    HbDereferencer(quint8* buf, int length);
-    
-    HbDereferencer(const QByteArray& buffer);
-    
-    void skip(int length);
+   
+    HbDereferencer(quint8* buf, qint32 length)
+        : mTotalRead(0),
+        mDataLength(length),
+        mReadStream((unsigned char*)buf)
+    {
+    }
+
+    HbDereferencer(const QByteArray& buffer)
+            : mTotalRead(0),
+            mDataLength(buffer.length()),
+            mReadStream((unsigned char*)buffer.data())
+    {        
+    }
+
+    void skip(qint32 length)
+    {
+        checkOutOfBound(length);
+        mTotalRead += length;
+    }
+
+    qint16 derefInt16(qint16 at = 0)
+    {
+        DEREF_PTR(qint16, at, sizeof(qint16));
+    }
+    operator qint16()
+    {
+        return derefInt16();    
+    }
+
+    qint32 derefInt32(qint32 at = 0)
+    {
+        DEREF_PTR(qint32, at, sizeof(qint32));
+    }
     
-    qint16 derefInt16(int at = 0);
-    operator qint16();
-    
-    qint32 derefInt32(int at = 0);
-    operator qint32();
-    
-    qint8 derefInt8(int at = 0);
-    operator qint8();
+    operator qint32()
+    {
+        return derefInt32();    
+    }
 
-    quint8 * derefInt8Array(int length, int at = 0);
-       
-    float derefReal32(int at = 0);
-    operator float();
-    
-    void isSafe(int length, int at = 0);
-
-    quint8* getPtr();
-
-    int getLength();
+    qint8 derefInt8(qint32 at = 0)
+    {
+        DEREF_PTR(qint8, at, sizeof(qint8));
+    }
     
-    int getReadingPos();
+    operator qint8()
+    {
+        return derefInt8();    
+    }
+
+    quint8* derefInt8Array(qint32 length, qint32 at = 0)
+    {
+        checkOutOfBound(at + length);
+        return (quint8 *)&mReadStream[mTotalRead + at];
+    }
 
-private:
-    void checkOutOfBound(int length);
+    float derefReal32(qint32 at = 0)
+    {
+        DEREF_PTR(float, at, sizeof(float));
+    }
+    operator float()
+    {
+        return derefReal32();
+    }
+
+    void assertBound(qint32 length, qint32 at = 0)
+    {
+        checkOutOfBound(at + length);
+    }
 
-    int                mTotalRead;
-    int                mDataLength;
+    quint8* getPtr() const
+    {
+        return mReadStream;
+    }
+
+    qint32 getLength() const
+    {
+        return mDataLength;
+    }
+
+    qint32 getReadingPos() const
+    {
+        return mTotalRead;
+    }
+    
+private:
+    void checkOutOfBound(qint32 length)
+    {
+        if (mTotalRead + length > mDataLength ||
+                mTotalRead + length < 0){
+            throw HbNvgException(HbNvgEngine::NvgErrEof);
+        }
+    }
+
+    qint32                mTotalRead;
+    qint32                mDataLength;
     quint8*            mReadStream;
-    };
+};
 
-#include "hbnvgicondata_p.inl"
 #endif
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/svgext/hbnvgdecoder/hbnvgicondata_p.inl
--- a/src/hbcore/svgext/hbnvgdecoder/hbnvgicondata_p.inl	Mon Apr 19 14:02:13 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 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.
-**
-****************************************************************************/
-
-inline void HbNvgIconData::checkOutOfBound(int length)
-{
-    if (totalRead + length > dataSize ||
-            totalRead + length < 0){
-        throw HbNvgException(HbNvgEngine::NvgErrEof);
-    }
-}
-
-inline int HbNvgIconData::readPos()
-    {
-    return totalRead;
-    }
-
-inline int HbNvgIconData::dataLength()
-    {
-    return dataSize;
-    }
-
-inline bool HbNvgIconData::eof()
-    {
-    return (totalRead >= dataSize);
-    }
-
-inline int HbNvgIconData::encodeInt8(quint8 aVal)
-    {
-    return encodeData(&aVal, sizeof(aVal));
-    }
-
-inline int HbNvgIconData::encodeInt16(quint16 aVal)
-    {
-    return encodeData(&aVal, sizeof(aVal));
-    }
-
-inline int HbNvgIconData::encodeInt32(quint32 aVal)
-    {
-    return encodeData(&aVal, sizeof(aVal));
-    }
-
-inline int HbNvgIconData::encodeReal32(float aVal)
-    {
-    return encodeData(&aVal, sizeof(aVal));
-    }
-
-inline int HbNvgIconData::encodeReal64(qreal aVal)
-    {
-    return encodeData(&aVal, sizeof(aVal));
-    }
-
-inline HbDereferencer::HbDereferencer(quint8* buf, int length)
-    : mTotalRead(0),
-    mDataLength(length),
-    mReadStream((unsigned char*)buf)
-{
-}
-
-inline HbDereferencer::HbDereferencer(const QByteArray& buf)
-    : mTotalRead(0),
-    mDataLength(buf.length()),
-    mReadStream((unsigned char*)buf.data())
-    {        
-    }
-
-inline void HbDereferencer::checkOutOfBound(int length)
-{
-    if (mTotalRead + length > mDataLength ||
-            mTotalRead + length < 0){
-        throw HbNvgException(HbNvgEngine::NvgErrEof);
-    }
-}
-
-inline void HbDereferencer::skip(int length)
-    {
-    checkOutOfBound(length);
-    mTotalRead += length;
-    }
-
-#define DEREF_PTR(TOTYPE, Offset, Size) do {\
-                                checkOutOfBound(Offset + Size); \
-                                return * (TOTYPE *)&mReadStream[mTotalRead + Offset];\
-                           } while (0)
-
-inline float HbDereferencer::derefReal32(int at)
-    {
-    DEREF_PTR(float, at, sizeof(float));
-    }
-
-inline quint8* HbDereferencer::derefInt8Array(int length, int at)
-    {
-    checkOutOfBound(at + length);
-    return (quint8 *)&mReadStream[mTotalRead + at];
-    }
-
-inline void HbDereferencer::isSafe(int length, int at)
-    {
-    checkOutOfBound(at + length);
-    }
-
-inline qint8 HbDereferencer::derefInt8(int at)
-    {
-    DEREF_PTR(qint8, at, sizeof(qint8));
-    }
-
-inline qint32 HbDereferencer::derefInt32(int at)
-    {
-    DEREF_PTR(int, at, sizeof(int));
-    }
-
-inline qint16 HbDereferencer::derefInt16(int at)
-    {
-    DEREF_PTR(qint16, at, sizeof(qint16));
-    }
-
-inline HbDereferencer::operator float()
-    {
-    return derefReal32();    
-    }
-
-inline HbDereferencer::operator qint8()
-    {
-    return derefInt8();    
-    }
-
-inline HbDereferencer::operator qint32()
-    {
-    return derefInt32();    
-    }
-
-inline HbDereferencer::operator qint16()
-    {
-    return derefInt16();    
-    }
-
-inline quint8* HbDereferencer::getPtr()
-    {
-    return mReadStream;
-    }
-
-inline int HbDereferencer::getLength()
-    {
-    return mDataLength;
-    }
-
-inline int HbDereferencer::getReadingPos()
-    {
-    return mTotalRead;
-    }
-
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/svgext/hbnvgdecoder/hbnvgiconfactory.cpp
--- a/src/hbcore/svgext/hbnvgdecoder/hbnvgiconfactory.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/svgext/hbnvgdecoder/hbnvgiconfactory.cpp	Mon May 03 12:48:33 2010 +0300
@@ -30,11 +30,11 @@
 
 HbNvgIcon * HbNvgIconFactory::create(HbNvgIconFactory::HbNvgIconType type)
 {
-    HbNvgIcon * icon = NULL;
+    HbNvgIcon * icon = 0;
 
-    if (type == NVGCS) {
+    if (type == NvgCs) {
         icon = new HbNvgCsIcon();
-    } else if (type == NVGTLV) {
+    } else if (type == NvgTlv) {
         icon = new HbNvgTlvIcon();
     } else {
         throw HbNvgException(HbNvgEngine::NvgErrNotSupported);
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/svgext/hbnvgdecoder/hbnvgiconfactory_p.h
--- a/src/hbcore/svgext/hbnvgdecoder/hbnvgiconfactory_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/svgext/hbnvgdecoder/hbnvgiconfactory_p.h	Mon May 03 12:48:33 2010 +0300
@@ -32,8 +32,8 @@
 {
 public:
     enum HbNvgIconType {
-        NVGCS,
-        NVGTLV
+        NvgCs,
+        NvgTlv
     };
 
     static HbNvgIcon * create(HbNvgIconType type);
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/svgext/hbnvgdecoder/hbnvgimagebinder_p.h
--- a/src/hbcore/svgext/hbnvgdecoder/hbnvgimagebinder_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/svgext/hbnvgdecoder/hbnvgimagebinder_p.h	Mon May 03 12:48:33 2010 +0300
@@ -31,9 +31,9 @@
 public:
     virtual ~HbVgImageBinder() {}
 
-    virtual int bindClientBuffer(quint32 buffer) = 0;
+    virtual qint32 bindClientBuffer(quint32 buffer) = 0;
 
-    virtual int unBindClientBuffer() = 0;
+    virtual qint32 unbindClientBuffer() = 0;
 };
 
 #endif
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/svgext/hbnvgdecoder/hbnvgtlvicon.cpp
--- a/src/hbcore/svgext/hbnvgdecoder/hbnvgtlvicon.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/svgext/hbnvgdecoder/hbnvgtlvicon.cpp	Mon May 03 12:48:33 2010 +0300
@@ -34,7 +34,7 @@
 HbNvgTlvIcon::HbNvgTlvIcon()
         : mNvgIconData(0),
         mVgImageBinder(0),
-        mMirroringMode(false)
+        mMirrored(false)
 {
     mNvgIconData = new HbNvgIconData();
     Q_CHECK_PTR(mNvgIconData);
@@ -48,23 +48,28 @@
     delete mOpenVgHandles;
 }
 
-void HbNvgTlvIcon::setPreserveAspectRatio(HbNvgEngine::NvgAlignStatusType preserveAspectSetting,
-        HbNvgEngine::NvgMeetOrSliceType smilFitSetting)
+/*!
+    set the aspectRatio \a preserveAspectSetting and \a smilFitSetting
+    to be applied on the nvgicon.
+*/
+
+void HbNvgTlvIcon::setPreserveAspectRatio(HbNvgEngine::HbNvgAlignType /*preserveAspectSetting*/,
+        HbNvgEngine::HbNvgMeetType /*smilFitSetting*/)
 {
-    (void)preserveAspectSetting;
-    (void)smilFitSetting;    
 }
 
-void HbNvgTlvIcon::rotate(float angle, float x, float y)
+/*!
+    Set the \a angle for rotation of the nvgicon at the
+    coordiantes  \a x and \a y.
+*/
+
+void HbNvgTlvIcon::rotate(float /*angle*/, float /*x*/, float /*y*/)
 {
-    (void)angle;
-    (void)x;
-    (void)y;
 }
 
-void HbNvgTlvIcon::setMirroringMode(bool mirroringMode)
+void HbNvgTlvIcon::enableMirroring(bool mirroringMode)
 {
-    mMirroringMode = mirroringMode;
+    mMirrored = mirroringMode;
 }
 
 void HbNvgTlvIcon::directDraw(const QByteArray &buffer, const QSize &targetSize)
@@ -72,16 +77,16 @@
     // Try to set user's matrix to path matrix
     VGfloat origMatrix[9];
     vgGetMatrix(origMatrix);
-        
-    vgSeti(VG_MATRIX_MODE, VG_MATRIX_PATH_USER_TO_SURFACE); 
-    vgLoadMatrix(origMatrix);   
-    
-    if (mMirroringMode) {
-        vgTranslate((VGfloat)(targetSize.width()), 0); 
+
+    vgSeti(VG_MATRIX_MODE, VG_MATRIX_PATH_USER_TO_SURFACE);
+    vgLoadMatrix(origMatrix);
+
+    if (mMirrored) {
+        vgTranslate((VGfloat)(targetSize.width()), 0);
         vgScale(-1.0f, 1.0f);
     }
-        
-       
+
+
 #ifndef __MIRROR_
     vgScale(1.0f, -1.0f);
     vgTranslate(0, (VGfloat)(-targetSize.height()));
@@ -91,7 +96,7 @@
     QScopedPointer<HbTlvRenderer> iconRenderer(tlvRenderer);
 
     iconRenderer->initialize();
-    
+
     iconRenderer->setVgImageBinder(mVgImageBinder);
 
     iconRenderer->execute();
@@ -104,27 +109,27 @@
     QScopedPointer<HbTlvIconCreator> iconCreater(tlvIconCreator);
 
     iconCreater->initialize();
-    
+
     iconCreater->execute();
 }
 
-HbNvgEngine::NvgErrorType HbNvgTlvIcon::draw(const QSize &size)
+/*!
+    Draw the nvgicon the nvgicon created of size \a size.
+*/
+HbNvgEngine::HbNvgErrorType HbNvgTlvIcon::draw(const QSize &size)
 {
-    HbNvgEngine::NvgErrorType error = HbNvgEngine::NvgErrNone;
+    HbNvgEngine::HbNvgErrorType error = HbNvgEngine::NvgErrNone;
 
     updateClientMatrices();
 
-    try
-    {
+    try {
         doDraw(size);
-    } catch (const std::bad_alloc & e)
-    {
+    } catch (const std::bad_alloc & e) {
         error = HbNvgEngine::NvgErrNoMemory;
-    } catch (const HbNvgException & e)
-    {
-        error = (HbNvgEngine::NvgErrorType) e.errorID();
+    } catch (const HbNvgException & e) {
+        error = (HbNvgEngine::HbNvgErrorType) e.errorID();
     }
-    
+
     // restore everything as we may have changed matrix mode
     restoreClientMatrices();
 
@@ -151,7 +156,7 @@
 
     iconRenderer->execute();
 }
- 
+
 void HbNvgTlvIcon::addPathHandle(VGPath path)
 {
     if (path) {
@@ -161,26 +166,26 @@
 
 void HbNvgTlvIcon::addDrawPathCommand(VGPath path, VGPaintMode paintMode)
 {
-    mOpenVgHandles->addPath(path);	
-    mNvgIconData->encodeInt8(TlvPath);
-    mNvgIconData->encodeInt32(path);
-    mNvgIconData->encodeInt32(paintMode);
+    mOpenVgHandles->addPath(path);
+    mNvgIconData->encodeUint8(TlvPath);
+    mNvgIconData->encodeUint32(path);
+    mNvgIconData->encodeUint32(paintMode);
 }
 
-void HbNvgTlvIcon::addCommand(const quint8 * commandBuffer, int commandBufferLength)
+void HbNvgTlvIcon::addCommand(const quint8 * commandBuffer, qint32 commandBufferLength)
 {
     mNvgIconData->encodeData(commandBuffer, commandBufferLength);
 }
 
-void HbNvgTlvIcon::addCommand(qint8 commandType, const quint8 * commandBuffer, int commandBufferLength)
+void HbNvgTlvIcon::addCommand(qint8 commandType, const quint8 * commandBuffer, qint32 commandBufferLength)
 {
-    mNvgIconData->encodeInt8(commandType);
+    mNvgIconData->encodeUint8(commandType);
     mNvgIconData->encodeData(commandBuffer, commandBufferLength);
 }
 
 void HbNvgTlvIcon::updateClientMatrices()
 {
-	mMatrixMode = vgGeti(VG_MATRIX_MODE);
+    mMatrixMode = vgGeti(VG_MATRIX_MODE);
     vgSeti(VG_MATRIX_MODE, VG_MATRIX_PATH_USER_TO_SURFACE);
     vgGetMatrix(mPathMatrix);
     vgSeti(VG_MATRIX_MODE, VG_MATRIX_IMAGE_USER_TO_SURFACE);
@@ -194,6 +199,6 @@
     vgLoadMatrix(mPathMatrix);
     vgSeti(VG_MATRIX_MODE, VG_MATRIX_IMAGE_USER_TO_SURFACE);
     vgLoadMatrix(mImageMatrix);
-	vgSeti(VG_MATRIX_MODE, mMatrixMode);
+    vgSeti(VG_MATRIX_MODE, mMatrixMode);
 }
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/svgext/hbnvgdecoder/hbnvgtlvicon_p.h
--- a/src/hbcore/svgext/hbnvgdecoder/hbnvgtlvicon_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/svgext/hbnvgdecoder/hbnvgtlvicon_p.h	Mon May 03 12:48:33 2010 +0300
@@ -41,7 +41,7 @@
 private:
 
 public:
-    enum NvgTlvIconCommands {
+    enum HbNvgTlvIconCommands {
         TlvPath = 0x50,
         TlvNone
     };
@@ -51,16 +51,16 @@
 
     virtual ~HbNvgTlvIcon();
 
-    void setPreserveAspectRatio(HbNvgEngine::NvgAlignStatusType preserveAspectSetting,
-            HbNvgEngine::NvgMeetOrSliceType smilFitSetting);
+    void setPreserveAspectRatio(HbNvgEngine::HbNvgAlignType preserveAspectSetting,
+                                HbNvgEngine::HbNvgMeetType smilFitSetting);
 
     void rotate(float angle, float x, float y) ;
-    
-    void setMirroringMode( bool mirroringMode);
+
+    void enableMirroring(bool mirroringMode);
 
-    virtual HbNvgEngine::NvgErrorType draw(const QSize &size);
+    virtual HbNvgEngine::HbNvgErrorType draw(const QSize &size);
 
-    
+
     void directDraw(const QByteArray &buffer, const QSize &targetSize);
 
     void create(const QByteArray &buffer, const QSize& targetSize);
@@ -68,22 +68,22 @@
     void setVgImageBinder(HbVgImageBinder *imageBinder) {
         mVgImageBinder = imageBinder;
     }
-    
+
     void addDrawPathCommand(VGPath path, VGPaintMode paintMode);
 
-    void addCommand(const quint8 * commandBuffer, int commandBufferLength);
+    void addCommand(const quint8 * commandBuffer, qint32 commandBufferLength);
 
-    void addCommand(qint8 commandType, const quint8 * commandBuffer, int commandBufferLength);
+    void addCommand(qint8 commandType, const quint8 * commandBuffer, qint32 commandBufferLength);
 
 
 private:
 
     void doDraw(const QSize &size);
-    
+
     void addPathHandle(VGPath path);
 
     void updateClientMatrices();
-    
+
     void restoreClientMatrices();
 
     VGint             mMatrixMode;
@@ -93,7 +93,7 @@
     HbNvgIconData *      mNvgIconData;
     HbVgImageBinder *    mVgImageBinder;
     HbOpenVgHandleStore* mOpenVgHandles;
-    bool                 mMirroringMode;
+    bool                 mMirrored;
 };
 
 #endif
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/svgext/hbnvgdecoder/hbnvgutil_p.h
--- a/src/hbcore/svgext/hbnvgdecoder/hbnvgutil_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/svgext/hbnvgdecoder/hbnvgutil_p.h	Mon May 03 12:48:33 2010 +0300
@@ -46,7 +46,7 @@
 
 #define VGCREATEPATH(a1, a2, a3, a4, a5, a6, a7)  vgCreatePath(a1, a2, a3, a4, a5, a6, a7)
 #define VGDESTROYPATH(h)     vgDestroyPath(h)
-    
+
 #define VGCREATEIMAGE(a1, a2, a3, a4) vgCreateImage(a1, a2, a3, a4)
 #define VGDESTROYIMAGE(h)     vgDestroyImage(h)
 
@@ -55,7 +55,7 @@
 #define DECLARE_HANDLECHECKER()
 #define INIT_HANDLECHECKER()
 #define ASSERT_HANDLE_COUNT()
-    
+
 #else
 
 #define NVG_DEBUGP1(x1)                                 qDebug(x1)
@@ -70,152 +70,150 @@
 
 #define NVG_DEBUGSTMT(x1)                             do { x1; } while (0)
 
-struct HandleCounter
-        {
-        int    paintHC;
-        int    pathHC;
-        int    imageHC;
-        HandleCounter() : paintHC(0), pathHC(0), imageHC(0) {}
-        };
+struct HbHandleCounter {
+    qint32    paintHC;
+    qint32    pathHC;
+    qint32    imageHC;
+    HbHandleCounter() : paintHC(0), pathHC(0), imageHC(0) {}
+};
 
-inline void incrementPaintHandleCountL(HandleCounter * handleCounter)
-    {
-    if (handleCounter){
+inline void incrementPaintHandleCountL(HbHandleCounter * handleCounter)
+{
+    if (handleCounter) {
         handleCounter->paintHC++;
     }
-    }
+}
 
-inline void decrementPaintHandleCountL(HandleCounter * handleCounter)
-    {
-    if (handleCounter){
+inline void decrementPaintHandleCountL(HbHandleCounter * handleCounter)
+{
+    if (handleCounter) {
         handleCounter->paintHC--;
     }
-    }
+}
 
-inline void decrementImageHandleCountL(HandleCounter * handleCounter)
-    {
-    if (handleCounter){
+inline void decrementImageHandleCountL(HbHandleCounter * handleCounter)
+{
+    if (handleCounter) {
         handleCounter->imageHC--;
     }
-    }
+}
 
-inline void decrementPathHandleCountL(HandleCounter * handleCounter)
-    {
-    if (handleCounter){
+inline void decrementPathHandleCountL(HbHandleCounter * handleCounter)
+{
+    if (handleCounter) {
         handleCounter->pathHC--;
     }
-    }
+}
 
-inline void incrementPathHandleCountL(HandleCounter * handleCounter)
-    {
-    if (handleCounter){
+inline void incrementPathHandleCountL(HbHandleCounter * handleCounter)
+{
+    if (handleCounter) {
         handleCounter->pathHC++;
     }
-    }
+}
 
-inline void incrementImageHandleCountL(HandleCounter * handleCounter)
-    {
-    if (handleCounter){
+inline void incrementImageHandleCountL(HbHandleCounter * handleCounter)
+{
+    if (handleCounter) {
         handleCounter->imageHC++;
     }
-    }
+}
 
-inline void checkHandleCout(HandleCounter * handleCounter)
-    {
-    if (handleCounter)
-        {
-        if (handleCounter->paintHC != 0){
-			// @TODO, throw panic.
+inline void checkHandleCout(HbHandleCounter * handleCounter)
+{
+    if (handleCounter) {
+        if (handleCounter->paintHC != 0) {
+            // @TODO, throw panic.
             //User::Panic(_L("Paint Handle Deallocation Not Matching"), 1);
         }
-        
-        if (handleCounter->pathHC != 0){
+
+        if (handleCounter->pathHC != 0) {
             // @TODO , throw panic
             //User::Panic(_L("Path Handle Deallocation Not Matching"), 1);
         }
-        
-        if (handleCounter->imageHC != 0){
+
+        if (handleCounter->imageHC != 0) {
             // @TODO , throw panic
             //User::Panic(_L("Image Handle Deallocation Not Matching"), 1);
         }
     }
-    
+
     delete handleCounter;
     handleCounter = 0;
-    }
+}
 
-inline VGHandle vgCreatePaintWrapper(HandleCounter * handleCounter)
-    {
+inline VGHandle vgCreatePaintWrapper(HbHandleCounter * handleCounter)
+{
     VGPaint pH = vgCreatePaint();
-    if (pH){
+    if (pH) {
         incrementPaintHandleCountL(handleCounter);
     }
     return pH;
-    }
-                                    
-inline void vgDestroyPaintWrapper(HandleCounter * handleCounter, VGHandle h)
-    {
-    if (h){
+}
+
+inline void vgDestroyPaintWrapper(HbHandleCounter * handleCounter, VGHandle h)
+{
+    if (h) {
         vgDestroyPaint(h);
         decrementPaintHandleCountL(handleCounter);
     }
-    }
-    
-    
-inline VGHandle vgCreatePathWrapper(HandleCounter * handleCounter, VGint a1,
-        VGPathDatatype a2,
-        VGfloat a3, VGfloat a4,
-        VGint a5,
-        VGint a6,
-        VGbitfield a7)
-    {
+}
+
+
+inline VGHandle vgCreatePathWrapper(HbHandleCounter * handleCounter, VGint a1,
+                                    VGPathDatatype a2,
+                                    VGfloat a3, VGfloat a4,
+                                    VGint a5,
+                                    VGint a6,
+                                    VGbitfield a7)
+{
     VGPath pH = vgCreatePath(a1, a2, a3, a4, a5, a6, a7);
-    if (pH){
+    if (pH) {
         incrementPathHandleCountL(handleCounter);
     }
     return pH;
-    }
-   
-inline void vgDestroyPathWrapper(HandleCounter * handleCounter, VGHandle h)
-    {
-    if (h){
+}
+
+inline void vgDestroyPathWrapper(HbHandleCounter * handleCounter, VGHandle h)
+{
+    if (h) {
         vgDestroyPath(h);
         decrementPathHandleCountL(handleCounter);
     }
-    }
-    
-inline VGHandle vgCreateImageWrapper(HandleCounter * handleCounter, VGImageFormat a1,
-        VGint a2, VGint a3,
-        VGbitfield a4)
-    {
+}
+
+inline VGHandle vgCreateImageWrapper(HbHandleCounter * handleCounter, VGImageFormat a1,
+                                     VGint a2, VGint a3,
+                                     VGbitfield a4)
+{
     VGImage iH = vgCreateImage(a1, a2, a3, a4);
-    if (iH){
+    if (iH) {
         incrementImageHandleCountL(handleCounter);
     }
     return iH;
-    }
+}
 
-inline void vgDestroyImageWrapper(HandleCounter * handleCounter, VGHandle h)
-    {
-    if (h){
+inline void vgDestroyImageWrapper(HbHandleCounter * handleCounter, VGHandle h)
+{
+    if (h) {
         vgDestroyImage(h);
         decrementImageHandleCountL(handleCounter);
     }
-    }
-   
-    #define DECLARE_HANDLECHECKER_GLOBAL()  HandleCounter * __handleCounter;
-    #define DECLARE_HANDLECHECKER()  private:  HandleCounter * __handleCounter;
-    #define INIT_HANDLECHECKER()  __handleCounter = new HandleCounter;
-    #define ASSERT_HANDLE_COUNT() checkHandleCout(__handleCounter);
+}
+
+#define DECLARE_HANDLECHECKER_GLOBAL()  HbHandleCounter * __handleCounter;
+#define DECLARE_HANDLECHECKER()  private:  HbHandleCounter * __handleCounter;
+#define INIT_HANDLECHECKER()  __handleCounter = new HbHandleCounter;
+#define ASSERT_HANDLE_COUNT() checkHandleCout(__handleCounter);
 
-    #define VGCREATEPAINT()     (NVG_DEBUGP3("/*vgCreatePaint() %s:%d*/", __FILE__, __LINE__), vgCreatePaintWrapper(__handleCounter))
-    #define VGDESTROYPAINT(h)   (NVG_DEBUGP3("/*vgDestroyPaint() %s:%d*/", __FILE__, __LINE__), vgDestroyPaintWrapper(__handleCounter, h))
-    
-    #define VGCREATEPATH(a1, a2, a3, a4, a5, a6, a7)  (NVG_DEBUGP3("/*vgCreatePath() %s:%d*/", __FILE__, __LINE__), vgCreatePathWrapper(__handleCounter, a1, a2, a3, a4, a5, a6, a7))
-	#define VGDESTROYPATH(h)     (NVG_DEBUGP3("/*vgDestroyPath() %s:%d*/", __FILE__, __LINE__), vgDestroyPathWrapper(__handleCounter, h))
+#define VGCREATEPAINT()     (NVG_DEBUGP3("/*vgCreatePaint() %s:%d*/", __FILE__, __LINE__), vgCreatePaintWrapper(__handleCounter))
+#define VGDESTROYPAINT(h)   (NVG_DEBUGP3("/*vgDestroyPaint() %s:%d*/", __FILE__, __LINE__), vgDestroyPaintWrapper(__handleCounter, h))
 
-    #define VGCREATEIMAGE(a1, a2, a3, a4) (NVG_DEBUGP3("/*vgCreateImage() %s:%d*/", __FILE__, __LINE__), vgCreateImageWrapper(__handleCounter, a1, a2, a3, a4))
-    #define VGDESTROYIMAGE(h)     (NVG_DEBUGP3("/*vgDestroyImage() %s:%d*/", __FILE__, __LINE__), vgDestroyImageWrapper(__handleCounter, h))
+#define VGCREATEPATH(a1, a2, a3, a4, a5, a6, a7)  (NVG_DEBUGP3("/*vgCreatePath() %s:%d*/", __FILE__, __LINE__), vgCreatePathWrapper(__handleCounter, a1, a2, a3, a4, a5, a6, a7))
+#define VGDESTROYPATH(h)     (NVG_DEBUGP3("/*vgDestroyPath() %s:%d*/", __FILE__, __LINE__), vgDestroyPathWrapper(__handleCounter, h))
+
+#define VGCREATEIMAGE(a1, a2, a3, a4) (NVG_DEBUGP3("/*vgCreateImage() %s:%d*/", __FILE__, __LINE__), vgCreateImageWrapper(__handleCounter, a1, a2, a3, a4))
+#define VGDESTROYIMAGE(h)     (NVG_DEBUGP3("/*vgDestroyImage() %s:%d*/", __FILE__, __LINE__), vgDestroyImageWrapper(__handleCounter, h))
 
 #endif
 
@@ -256,7 +254,9 @@
  */
 template <class T>
 inline bool isAligned4(T aValue)
-    {return !((quint32)aValue & (sizeof(quint32) - 1));}
+{
+    return !((quint32)aValue & (sizeof(quint32) - 1));
+}
 
 /*
  * There is an Align2 function which does the alignement
@@ -264,6 +264,8 @@
  */
 template <class T>
 inline bool isAligned2(T aValue)
-    {return !((quint16)aValue & (sizeof(quint16) - 1));}
-    
+{
+    return !((quint16)aValue & (sizeof(quint16) - 1));
+}
+
 #endif /* HBNVGUTIL_H*/
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/svgext/hbnvgdecoder/hbopenvghandlestore.cpp
--- a/src/hbcore/svgext/hbnvgdecoder/hbopenvghandlestore.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/svgext/hbnvgdecoder/hbopenvghandlestore.cpp	Mon May 03 12:48:33 2010 +0300
@@ -28,19 +28,22 @@
 
 QT_USE_NAMESPACE
 
-struct QVGImageDeleter
-{
-    static inline void cleanup(void *pointer) { if (pointer) vgDestroyImage(*(VGImage*)pointer); }
+struct HbVgImageDeleter {
+    static inline void cleanup(void *pointer) {
+        if (pointer) vgDestroyImage(*(VGImage*)pointer);
+    }
 };
 
-struct QVGPaintDeleter
-{
-    static inline void cleanup(void *pointer) { if (pointer) vgDestroyPaint(*(VGPaint*)pointer); }
+struct HbVgPaintDeleter {
+    static inline void cleanup(void *pointer) {
+        if (pointer) vgDestroyPaint(*(VGPaint*)pointer);
+    }
 };
 
-struct QVGPathDeleter
-{
-    static inline void cleanup(void *pointer) { if (pointer) vgDestroyPath(*(VGPath*)pointer); }
+struct HbVgPathDeleter {
+    static inline void cleanup(void *pointer) {
+        if (pointer) vgDestroyPath(*(VGPath*)pointer);
+    }
 };
 
 HbOpenVgHandleStore::HbOpenVgHandleStore()
@@ -49,8 +52,8 @@
 
 HbOpenVgHandleStore::~HbOpenVgHandleStore()
 {
-    int handleListCount    = mHandles.count();
-    for (int i = 0; i < handleListCount; i++) {
+    qint32 handleListCount    = mHandles.count();
+    for (qint32 i = 0; i < handleListCount; i++) {
         if (mHandles[i].mVgHandle) {
             switch (mHandles[i].mHandleType) {
             case HbTlvVgHandlePair::VgPath:
@@ -68,25 +71,25 @@
 }
 
 
-void HbOpenVgHandleStore::addPath(VGPath handle) 
-    {
-    QScopedPointer<VGPath, QVGPathDeleter> scHandle(&handle);        
+void HbOpenVgHandleStore::addPath(VGPath handle)
+{
+    QScopedPointer<VGPath, HbVgPathDeleter> scHandle(&handle);
     mHandles.append(HbTlvVgHandlePair(handle, HbTlvVgHandlePair::VgPath));
     scHandle.take();
-    }
+}
 
-void HbOpenVgHandleStore::addPaint(VGPaint handle) 
-    {
-    QScopedPointer<VGPath, QVGPaintDeleter> scHandle(&handle);        
+void HbOpenVgHandleStore::addPaint(VGPaint handle)
+{
+    QScopedPointer<VGPath, HbVgPaintDeleter> scHandle(&handle);
     mHandles.append(HbTlvVgHandlePair(handle, HbTlvVgHandlePair::VgPaint));
     scHandle.take();
-    }
+}
 
-void HbOpenVgHandleStore::addImage(VGImage handle) 
-    {
-    QScopedPointer<VGPath, QVGImageDeleter> scHandle(&handle);        
+void HbOpenVgHandleStore::addImage(VGImage handle)
+{
+    QScopedPointer<VGPath, HbVgImageDeleter> scHandle(&handle);
     mHandles.append(HbTlvVgHandlePair(handle, HbTlvVgHandlePair::VgImage));
     scHandle.take();
-    }
-  
-  
+}
+
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/svgext/hbnvgdecoder/hbopenvghandlestore_p.h
--- a/src/hbcore/svgext/hbnvgdecoder/hbopenvghandlestore_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/svgext/hbnvgdecoder/hbopenvghandlestore_p.h	Mon May 03 12:48:33 2010 +0300
@@ -33,21 +33,20 @@
 {
 public:
     struct HbTlvVgHandlePair {
-        enum HandleType {
+        enum HbHandleType {
             VgPath,
             VgPaint,
             VgImage
         };
         VGHandle    mVgHandle;
-        HandleType  mHandleType;
+        HbHandleType  mHandleType;
 
-        explicit HbTlvVgHandlePair(VGHandle vgHandle,  HandleType handleType = VgPath)
+        explicit HbTlvVgHandlePair(VGHandle vgHandle,  HbHandleType handleType = VgPath)
                 : mVgHandle(vgHandle),
-                mHandleType(handleType) 
-        {
+                mHandleType(handleType) {
         }
     };
-        
+
     HbOpenVgHandleStore();
 
     ~HbOpenVgHandleStore();
@@ -57,7 +56,7 @@
     void addPaint(VGPaint handle);
 
     void addImage(VGImage handle);
-    
+
 private:
 
     QList<HbTlvVgHandlePair> mHandles;
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/svgext/hbnvgdecoder/hbtlvcommon_p.h
--- a/src/hbcore/svgext/hbnvgdecoder/hbtlvcommon_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/svgext/hbnvgdecoder/hbtlvcommon_p.h	Mon May 03 12:48:33 2010 +0300
@@ -30,7 +30,7 @@
 
 static const qint16 NvgHeaderSize  = 0x34;
 
-enum OpenVgApi  {
+enum HbOpenVgApi  {
     VgClear = 0,
     VgSeti,
     VgSetf,
@@ -68,7 +68,7 @@
     VgBindImage,
     VgUnBindImage,
     VgFlush,
-    VgAPICount
+    VgApiCount
 };
 
 #endif
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/svgext/hbnvgdecoder/hbtlviconcreator.cpp
--- a/src/hbcore/svgext/hbnvgdecoder/hbtlviconcreator.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/svgext/hbnvgdecoder/hbtlviconcreator.cpp	Mon May 03 12:48:33 2010 +0300
@@ -35,7 +35,7 @@
  Length of each encoded OpenVG API in bytes. -1 if not pre known.
  The order here and in the enum TOpenVGAPI should be same.
  */
-const int apiCommandLength[] = {
+const qint32 apiCommandLength[] = {
     16, //VgClear
     4, //VgSeti
     6, //VgSetf
@@ -75,51 +75,51 @@
     0  //VgFlush
 };
 
-HbTlvIconCreator::HbTlvIconCreator(const QByteArray &ptr, int width, int height, HbNvgTlvIcon * nvgTlvIcon)
+HbTlvIconCreator::HbTlvIconCreator(const QByteArray &ptr, qint32 width, qint32 height, HbNvgTlvIcon * nvgTlvIcon)
 {
-    vgapi[VgSeti]              = &HbTlvIconCreator::dVgAddCommand;
-    vgapi[VgSetf]              = &HbTlvIconCreator::dVgAddCommand;
-    vgapi[VgSetParameteri]     = &HbTlvIconCreator::dVgAddCommand;
-    vgapi[VgSetParameterf]     = &HbTlvIconCreator::dVgAddCommand;
-    vgapi[VgSetParameterfv]    = &HbTlvIconCreator::dVgSetParameterfv;
-    vgapi[VgSetColor]          = &HbTlvIconCreator::dVgAddCommand;
-    vgapi[VgSetPaint]          = &HbTlvIconCreator::dVgAddCommand;
-    vgapi[VgLoadMatrix]        = &HbTlvIconCreator::dVgAddCommand;
-    vgapi[VgMultMatrix]        = &HbTlvIconCreator::dVgAddCommand;
-    vgapi[VgLoadIdentity]      = &HbTlvIconCreator::dVgAddCommand;
-    vgapi[VgScale]             = &HbTlvIconCreator::dVgAddCommand;
-    vgapi[VgTranslate]         = &HbTlvIconCreator::dVgAddCommand;
-    vgapi[VgAppendPathData]    = &HbTlvIconCreator::dVgAppendPathData;
-    vgapi[VgDrawPath]          = &HbTlvIconCreator::dVgDrawPath;
-    vgapi[VgClearPath]         = &HbTlvIconCreator::dVgClearPath;
-    vgapi[VguRect]             = &HbTlvIconCreator::dVguRect;
-    vgapi[VguEllipse]          = &HbTlvIconCreator::dVguEllipse;
-    vgapi[VguRoundRect]        = &HbTlvIconCreator::dVguRoundRect;
-    vgapi[VguLine]             = &HbTlvIconCreator::dVguLine;
-    vgapi[VgCreatePaint]       = &HbTlvIconCreator::dVgAddCommand;
-    vgapi[VgSetiv]             = &HbTlvIconCreator::dVgSetiv;
-    vgapi[VgClear]             = &HbTlvIconCreator::dVgAddCommand;
-    vgapi[VgSetfv]             = &HbTlvIconCreator::dVgSetfv;
-    vgapi[VgRotate]            = &HbTlvIconCreator::dVgAddCommand;
-    vgapi[VgCreatePath]        = &HbTlvIconCreator::dVgCreatePath;
-    vgapi[VgCreateImage]       = &HbTlvIconCreator::dVgAddCommand;
-    vgapi[VgGetPixels]         = &HbTlvIconCreator::dVgGetPixels;
-    vgapi[VgDrawImage]         = &HbTlvIconCreator::dVgAddCommand;
-    vgapi[VgClearImage]        = &HbTlvIconCreator::dVgAddCommand;
-    vgapi[VgImageSubData]      = &HbTlvIconCreator::dVgImageSubData;
-    vgapi[VgDestroyImage]      = &HbTlvIconCreator::dVgAddCommand;
-    vgapi[VgDestroyPaint]      = &HbTlvIconCreator::dVgDestroyPaint;
-    vgapi[VgDestroyPath]       = &HbTlvIconCreator::dVgDestroyPath;
-    vgapi[VgPrepareToBindImage] = &HbTlvIconCreator::dVgAddCommand;
-    vgapi[VgBindImage]         = &HbTlvIconCreator::dVgAddCommand;
-    vgapi[VgUnBindImage]       = &HbTlvIconCreator::dVgAddCommand;
-    vgapi[VgFlush]             = &HbTlvIconCreator::dVgAddCommand;
+    vgapi[VgSeti]              = &HbTlvIconCreator::tlvVgAddCommand;
+    vgapi[VgSetf]              = &HbTlvIconCreator::tlvVgAddCommand;
+    vgapi[VgSetParameteri]     = &HbTlvIconCreator::tlvVgAddCommand;
+    vgapi[VgSetParameterf]     = &HbTlvIconCreator::tlvVgAddCommand;
+    vgapi[VgSetParameterfv]    = &HbTlvIconCreator::tlvVgSetParameterfv;
+    vgapi[VgSetColor]          = &HbTlvIconCreator::tlvVgAddCommand;
+    vgapi[VgSetPaint]          = &HbTlvIconCreator::tlvVgAddCommand;
+    vgapi[VgLoadMatrix]        = &HbTlvIconCreator::tlvVgAddCommand;
+    vgapi[VgMultMatrix]        = &HbTlvIconCreator::tlvVgAddCommand;
+    vgapi[VgLoadIdentity]      = &HbTlvIconCreator::tlvVgAddCommand;
+    vgapi[VgScale]             = &HbTlvIconCreator::tlvVgAddCommand;
+    vgapi[VgTranslate]         = &HbTlvIconCreator::tlvVgAddCommand;
+    vgapi[VgAppendPathData]    = &HbTlvIconCreator::tlvVgAppendPathData;
+    vgapi[VgDrawPath]          = &HbTlvIconCreator::tlvVgDrawPath;
+    vgapi[VgClearPath]         = &HbTlvIconCreator::tlvVgClearPath;
+    vgapi[VguRect]             = &HbTlvIconCreator::tlvVguRect;
+    vgapi[VguEllipse]          = &HbTlvIconCreator::tlvVguEllipse;
+    vgapi[VguRoundRect]        = &HbTlvIconCreator::tlvVguRoundRect;
+    vgapi[VguLine]             = &HbTlvIconCreator::tlvVguLine;
+    vgapi[VgCreatePaint]       = &HbTlvIconCreator::tlvVgAddCommand;
+    vgapi[VgSetiv]             = &HbTlvIconCreator::tlvVgSetiv;
+    vgapi[VgClear]             = &HbTlvIconCreator::tlvVgAddCommand;
+    vgapi[VgSetfv]             = &HbTlvIconCreator::tlvVgSetfv;
+    vgapi[VgRotate]            = &HbTlvIconCreator::tlvVgAddCommand;
+    vgapi[VgCreatePath]        = &HbTlvIconCreator::tlvVgCreatePath;
+    vgapi[VgCreateImage]       = &HbTlvIconCreator::tlvVgAddCommand;
+    vgapi[VgGetPixels]         = &HbTlvIconCreator::tlvVgGetPixels;
+    vgapi[VgDrawImage]         = &HbTlvIconCreator::tlvVgAddCommand;
+    vgapi[VgClearImage]        = &HbTlvIconCreator::tlvVgAddCommand;
+    vgapi[VgImageSubData]      = &HbTlvIconCreator::tlvVgImageSubData;
+    vgapi[VgDestroyImage]      = &HbTlvIconCreator::tlvVgAddCommand;
+    vgapi[VgDestroyPaint]      = &HbTlvIconCreator::tlvVgDestroyPaint;
+    vgapi[VgDestroyPath]       = &HbTlvIconCreator::tlvVgDestroyPath;
+    vgapi[VgPrepareToBindImage] = &HbTlvIconCreator::tlvVgAddCommand;
+    vgapi[VgBindImage]         = &HbTlvIconCreator::tlvVgAddCommand;
+    vgapi[VgUnBindImage]       = &HbTlvIconCreator::tlvVgAddCommand;
+    vgapi[VgFlush]             = &HbTlvIconCreator::tlvVgAddCommand;
 
     mTargetWidth        = width;
     mTargetHeight       = height;
     mPrepareToBindImage = 0;
     mNvgTlvIcon         = nvgTlvIcon;
-    mLastVGPath         = 0;
+    mLastVgPath         = 0;
 
     vgGetMatrix(mUserMatrix);
 
@@ -139,52 +139,52 @@
 
 HbTlvIconCreator::~HbTlvIconCreator()
 {
-    if (mLastVGPath) {
-        vgDestroyPath(mLastVGPath);
+    if (mLastVgPath) {
+        vgDestroyPath(mLastVgPath);
     }
 
     delete mNvgIconData;
 }
 
-void HbTlvIconCreator::dVgAddCommand(int length, int pos)
+void HbTlvIconCreator::tlvVgAddCommand(qint32 length, qint32 pos)
 {
     mNvgTlvIcon->addCommand(mCurrentCommand, mCommandBuffer + pos, length);
 }
 
-void HbTlvIconCreator::dVgAddCommand()
+void HbTlvIconCreator::tlvVgAddCommand()
 {
     mNvgTlvIcon->addCommand(mCurrentCommand, mCommandBuffer + mNvgIconData->readPos(),
                             apiCommandLength[mCurrentCommand]);
     mNvgIconData->skip(apiCommandLength[mCurrentCommand]);
 }
 
-void HbTlvIconCreator::dVgSetParameterfv()
+void HbTlvIconCreator::tlvVgSetParameterfv()
 {
-	int length = 0;
-    int cpos = mNvgIconData->readPos();
+    qint32 length = 0;
+    qint32 cpos = mNvgIconData->readPos();
 
     mNvgIconData->readInt32();
     mNvgIconData->readInt16();
     quint32 countt = mNvgIconData->readInt32();
-	length = length + sizeof(quint32) + sizeof(quint16) + sizeof(quint32) + countt * sizeof(float);
+    length = length + sizeof(quint32) + sizeof(quint16) + sizeof(quint32) + countt * sizeof(float);
     mNvgIconData->skip(countt * sizeof(float));
 
-    dVgAddCommand(length, cpos);
+    tlvVgAddCommand(length, cpos);
 }
 
-void HbTlvIconCreator::dVgSetiv()
+void HbTlvIconCreator::tlvVgSetiv()
 {
-	int length   = 0;
-    int cpos     = mNvgIconData->readPos();
+    qint32 length   = 0;
+    qint32 cpos     = mNvgIconData->readPos();
     mNvgIconData->readInt16();
     quint16 count = mNvgIconData->readInt16();
-	
-	length = sizeof(qint16) + sizeof(qint16);
+
+    length = sizeof(qint16) + sizeof(qint16);
     length += count * sizeof(qint32);
-    
+
     mNvgIconData->skip(count * sizeof(qint32));
 
-    dVgAddCommand(length, cpos);
+    tlvVgAddCommand(length, cpos);
 }
 
 VGPath  HbTlvIconCreator::createPath()
@@ -194,65 +194,64 @@
     VGPath pathH = vgCreatePath(VG_PATH_FORMAT_STANDARD,
                                 VG_PATH_DATATYPE_S_32, scale, 0.0f, 0, 0,
                                 VG_PATH_CAPABILITY_APPEND_TO);
-	
-    if (pathH == VG_INVALID_HANDLE)
-        {
+
+    if (pathH == VG_INVALID_HANDLE) {
         throw HbNvgException(openVgErrorToHbNvgError(vgGetError()));
-        }
+    }
     return pathH;
 }
 
-void HbTlvIconCreator::dVgClearPath()
+void HbTlvIconCreator::tlvVgClearPath()
 {
     mNvgIconData->readInt8();
     mNvgIconData->readInt16();
 }
 
-void HbTlvIconCreator::dVgAppendPathData()
+void HbTlvIconCreator::tlvVgAppendPathData()
 {
     quint16         numSegments;
-    quint16         coordinatecount;
-    
-	mNvgIconData->readInt32();
+    quint16         coordinateCount;
+
+    mNvgIconData->readInt32();
     numSegments = mNvgIconData->readInt16();
 
     VGubyte *pSegArry = new VGubyte[numSegments];
     Q_CHECK_PTR(pSegArry);
     QScopedArrayPointer<quint8> pathSegments(pSegArry);
 
-    for (int j = 0; j < numSegments; j++ ) {
+    for (qint32 j = 0; j < numSegments; j++) {
         pathSegments[j] = mNvgIconData->readInt8();
     }
 
-    coordinatecount = mNvgIconData->readInt16();
+    coordinateCount = mNvgIconData->readInt16();
 
-    qint32 *pDataArry = new qint32[coordinatecount];
+    qint32 *pDataArry = new qint32[coordinateCount];
     Q_CHECK_PTR(pDataArry);
     QScopedArrayPointer<qint32> pathData(pDataArry);
-    
-    for (int i = 0; i < coordinatecount; i++) {
+
+    for (qint32 i = 0; i < coordinateCount; i++) {
         pathData[i] = mNvgIconData->readInt32();
     }
 
-    if (mLastVGPath) {
-        vgDestroyPath(mLastVGPath);
-        mLastVGPath = 0;
+    if (mLastVgPath) {
+        vgDestroyPath(mLastVgPath);
+        mLastVgPath = 0;
     }
-    mLastVGPath = createPath();
-    
-    vgAppendPathData(mLastVGPath, numSegments, pathSegments.data(), pathData.data());    
+    mLastVgPath = createPath();
+
+    vgAppendPathData(mLastVgPath, numSegments, pathSegments.data(), pathData.data());
 }
 
-void HbTlvIconCreator::dVgDrawPath()
+void HbTlvIconCreator::tlvVgDrawPath()
 {
     mNvgIconData->readInt32();
     quint16 value = mNvgIconData->readInt16();
 
-    mNvgTlvIcon->addDrawPathCommand(mLastVGPath, (VGPaintMode)value);
-    mLastVGPath = 0;
+    mNvgTlvIcon->addDrawPathCommand(mLastVgPath, (VGPaintMode)value);
+    mLastVgPath = 0;
 }
 
-void HbTlvIconCreator::dVguRect()
+void HbTlvIconCreator::tlvVguRect()
 {
     mNvgIconData->readInt32();
 
@@ -262,17 +261,17 @@
     float width   = mNvgIconData->readReal32();
     float height  = mNvgIconData->readReal32();
 
-    if (mLastVGPath) {
-        vgDestroyPath(mLastVGPath);
-        mLastVGPath = 0;
+    if (mLastVgPath) {
+        vgDestroyPath(mLastVgPath);
+        mLastVgPath = 0;
     }
-    mLastVGPath = createPath();
+    mLastVgPath = createPath();
 
-    vguRect(mLastVGPath, x, y, width, height);
+    vguRect(mLastVgPath, x, y, width, height);
 
 }
 
-void HbTlvIconCreator::dVguEllipse()
+void HbTlvIconCreator::tlvVguEllipse()
 {
     float cx;
     float cy;
@@ -287,16 +286,16 @@
     width  = mNvgIconData->readReal32();
     height = mNvgIconData->readReal32();
 
-    if (mLastVGPath) {
-        vgDestroyPath(mLastVGPath);
-        mLastVGPath = 0;
+    if (mLastVgPath) {
+        vgDestroyPath(mLastVgPath);
+        mLastVgPath = 0;
     }
-    mLastVGPath = createPath();
+    mLastVgPath = createPath();
 
-    vguEllipse(mLastVGPath, cx, cy, width, height);
+    vguEllipse(mLastVgPath, cx, cy, width, height);
 }
 
-void HbTlvIconCreator::dVguRoundRect()
+void HbTlvIconCreator::tlvVguRoundRect()
 {
     float x;
     float y;
@@ -316,16 +315,16 @@
     arcWidth = mNvgIconData->readReal32();
     arcHeight = mNvgIconData->readReal32();
 
-    if (mLastVGPath) {
-        vgDestroyPath(mLastVGPath);
-        mLastVGPath = 0;
+    if (mLastVgPath) {
+        vgDestroyPath(mLastVgPath);
+        mLastVgPath = 0;
     }
-    mLastVGPath = createPath();
+    mLastVgPath = createPath();
 
-    vguRoundRect(mLastVGPath, x, y, width, height, arcWidth, arcHeight);
+    vguRoundRect(mLastVgPath, x, y, width, height, arcWidth, arcHeight);
 }
 
-void HbTlvIconCreator::dVguLine()
+void HbTlvIconCreator::tlvVguLine()
 {
     float x0;
     float y0;
@@ -340,44 +339,44 @@
     x1 = mNvgIconData->readReal32();
     y1 = mNvgIconData->readReal32();
 
-    if (mLastVGPath) {
-        vgDestroyPath(mLastVGPath);
-        mLastVGPath = 0;
+    if (mLastVgPath) {
+        vgDestroyPath(mLastVgPath);
+        mLastVgPath = 0;
     }
-    mLastVGPath = createPath();
+    mLastVgPath = createPath();
 
-    vguLine(mLastVGPath, x0, y0, x1, y1);
- }
+    vguLine(mLastVgPath, x0, y0, x1, y1);
+}
 
-void HbTlvIconCreator::dVgSetfv()
+void HbTlvIconCreator::tlvVgSetfv()
 {
-	int length = 0;
+    qint32 length = 0;
     quint16 type;
     quint16 count;
-    int cpos   = mNvgIconData->readPos();
+    qint32 cpos   = mNvgIconData->readPos();
 
-    type  = mNvgIconData->readInt16();
-    Q_UNUSED(type);
+    mNvgIconData->readInt16();
+    
     count = mNvgIconData->readInt16();
 
     mNvgIconData->skip(sizeof(float) * count);
-    
+
     length = length + 2 * sizeof(quint16) + count * sizeof(VGfloat);
-    
-    dVgAddCommand(length, cpos);
-    }
 
-void HbTlvIconCreator::dVgCreatePath()
+    tlvVgAddCommand(length, cpos);
+}
+
+void HbTlvIconCreator::tlvVgCreatePath()
 {
     mNvgIconData->skip(apiCommandLength[VgCreatePath]);
 }
 
-void HbTlvIconCreator::dVgImageSubData()
+void HbTlvIconCreator::tlvVgImageSubData()
 {
-    int cpos   = mNvgIconData->readPos();
-	
-	mNvgIconData->readInt32();
-    int dataLength         = 0;
+    qint32 cpos   = mNvgIconData->readPos();
+
+    mNvgIconData->readInt32();
+    qint32 dataLength         = 0;
 
     mNvgIconData->readInt32();
     mNvgIconData->readInt32();
@@ -388,30 +387,30 @@
     dataLength = mNvgIconData->readInt32();
     mNvgIconData->skip(dataLength);
 
-    dVgAddCommand(mNvgIconData->readPos() - cpos, cpos);
+    tlvVgAddCommand(mNvgIconData->readPos() - cpos, cpos);
 }
 
-void HbTlvIconCreator::dVgGetPixels()
+void HbTlvIconCreator::tlvVgGetPixels()
 {
 }
 
-void HbTlvIconCreator::dVgDestroyPaint()
+void HbTlvIconCreator::tlvVgDestroyPaint()
 {
 }
 
-void HbTlvIconCreator::dVgDestroyPath()
+void HbTlvIconCreator::tlvVgDestroyPath()
 {
 }
 
-void HbTlvIconCreator::dVgFlush()
+void HbTlvIconCreator::tlvVgFlush()
 {
 }
 
-HbNvgEngine::NvgErrorType HbTlvIconCreator::execute(int index)
+HbNvgEngine::HbNvgErrorType HbTlvIconCreator::execute(qint32 index)
 {
-    HbNvgEngine::NvgErrorType ret = HbNvgEngine::NvgErrNone;
+    HbNvgEngine::HbNvgErrorType ret = HbNvgEngine::NvgErrNone;
     mCurrentCommand = index;
-    if (0 <= index && index < VgFlush + 1) {
+    if ((0 <= index) && (index < VgFlush + 1)) {
         (this->*(vgapi[index]))();
     } else {
         throw HbNvgException(HbNvgEngine::NvgErrCorrupt);
@@ -419,14 +418,14 @@
     return ret;
 }
 
-HbNvgEngine::NvgErrorType HbTlvIconCreator::execute()
+HbNvgEngine::HbNvgErrorType HbTlvIconCreator::execute()
 {
-HbNvgEngine::NvgErrorType error = HbNvgEngine::NvgErrNone;
+    HbNvgEngine::HbNvgErrorType error = HbNvgEngine::NvgErrNone;
 
     while (!mNvgIconData->eof()) {
-    	execute(mNvgIconData->readInt8());
+        execute(mNvgIconData->readInt8());
     }
-    
+
     return error;
 }
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/svgext/hbnvgdecoder/hbtlviconcreator_p.h
--- a/src/hbcore/svgext/hbnvgdecoder/hbtlviconcreator_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/svgext/hbnvgdecoder/hbtlviconcreator_p.h	Mon May 03 12:48:33 2010 +0300
@@ -39,75 +39,75 @@
 {
 public:
 
-	HbTlvIconCreator(const QByteArray &ptr, int width, int height, HbNvgTlvIcon * nvgTlvIcon);
-	
+    HbTlvIconCreator(const QByteArray &ptr, qint32 width, qint32 height, HbNvgTlvIcon * nvgTlvIcon);
+
     virtual ~HbTlvIconCreator();
 
-    HbNvgEngine::NvgErrorType execute();
+    HbNvgEngine::HbNvgErrorType execute();
 
     void setTlvIcon(HbNvgTlvIcon * nvgTlvIcon) {
         mNvgTlvIcon = nvgTlvIcon;
     }
-    
+
     void initialize();
 
 private:
 
-    void dVgAddCommand(int length, int pos);
-    void dVgAddCommand();
-    void dVgSetParameterfv();
-    void dVgSetPaint();
-    void dVgAppendPathData();
-    void dVgDrawPath();
-    void dVgClearPath();
-    void dVgCreatePaint();
-    void dVgSetiv();
-    void dVgClear();
-    void dVgSetfv();
-    void dVgCreatePath();
-    void dVgCreateImage();
-    void dVgGetPixels();
-    void dVgClearImage();
-    void dVgImageSubData();
-    void dVgDrawImage();
-    void dVgDestroyImage();
-    void dVgDestroyPaint();
-    void dVgDestroyPath();
-    void dVguRect();
-    void dVguEllipse();
-    void dVguRoundRect();
-    void dVguLine();
-    void dVgPrepareToBindImage();
-    void dVgBindImage();
-    void dVgUnBindImage();
-    void dVgFlush();
-    HbNvgEngine::NvgErrorType execute(int index);
+    void tlvVgAddCommand(qint32 length, qint32 pos);
+    void tlvVgAddCommand();
+    void tlvVgSetParameterfv();
+    void tlvVgSetPaint();
+    void tlvVgAppendPathData();
+    void tlvVgDrawPath();
+    void tlvVgClearPath();
+    void tlvVgCreatePaint();
+    void tlvVgSetiv();
+    void tlvVgClear();
+    void tlvVgSetfv();
+    void tlvVgCreatePath();
+    void tlvVgCreateImage();
+    void tlvVgGetPixels();
+    void tlvVgClearImage();
+    void tlvVgImageSubData();
+    void tlvVgDrawImage();
+    void tlvVgDestroyImage();
+    void tlvVgDestroyPaint();
+    void tlvVgDestroyPath();
+    void tlvVguRect();
+    void tlvVguEllipse();
+    void tlvVguRoundRect();
+    void tlvVguLine();
+    void tlvVgPrepareToBindImage();
+    void tlvVgBindImage();
+    void tlvVgUnBindImage();
+    void tlvVgFlush();
+    HbNvgEngine::HbNvgErrorType execute(qint32 index);
 
 #ifdef HB_NVG_DEBUG
     //Command specific logging methods
-    void logVgSeti(VGParamType type, VGint fvalue, int cmdsize);
-    void logVgSetf(VGParamType type, VGfloat fvalue, int cmdsize);
-    void logVgSetParameteri(VGHandle handle, VGint paramType, VGint pvalue, int cmdsize, int lpvalue);
-    void logVgSetPaint(VGPaint paint, VGbitfield paintModes, int cmdsize, int lpvalue);
-    void logVgDrawPath(VGbitfield paintModes, int cmdsize);
-    void logVgSetParameterfv(VGPaint handle, VGint paramtype, int count, int handlenum);
+    void logVgSeti(VGParamType type, VGint fvalue, qint32 cmdsize);
+    void logVgSetf(VGParamType type, VGfloat fvalue, qint32 cmdsize);
+    void logVgSetParameteri(VGHandle handle, VGint paramType, VGint pvalue, qint32 cmdsize, qint32 lpvalue);
+    void logVgSetPaint(VGPaint paint, VGbitfield paintModes, qint32 cmdsize, qint32 lpvalue);
+    void logVgDrawPath(VGbitfield paintModes, qint32 cmdsize);
+    void logVgSetParameterfv(VGPaint handle, VGint paramtype, qint32 count, qint32 handlenum);
 #endif
 
 private:
 
-    typedef void (HbTlvIconCreator::*pvgapi)();
+    typedef void (HbTlvIconCreator::*VgApiCallBack)();
 
     VGPath  createPath();
 
-    pvgapi vgapi[VgAPICount];
+    VgApiCallBack vgapi[VgApiCount];
 
     HbNvgIconData *  mNvgIconData;
-    int              mDataLength;
+    qint32              mDataLength;
     QSize            mResizedCanvasSize;
 
     quint8          mNvgHeader[NvgHeaderSize];
-    int             mTargetWidth;
-    int             mTargetHeight;
+    qint32             mTargetWidth;
+    qint32             mTargetHeight;
     bool            mScaled;
 
     VGfloat         mUserMatrix[9];
@@ -117,7 +117,7 @@
 
     qint8           mCurrentCommand;
     quint8 *        mCommandBuffer;
-    VGPath          mLastVGPath;
+    VGPath          mLastVgPath;
 
     friend class HbNvgTlvIcon;
 };
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/svgext/hbnvgdecoder/hbtlviconrenderer.cpp
--- a/src/hbcore/svgext/hbnvgdecoder/hbtlviconrenderer.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/svgext/hbnvgdecoder/hbtlviconrenderer.cpp	Mon May 03 12:48:33 2010 +0300
@@ -23,15 +23,15 @@
 **
 ****************************************************************************/
 
-#include <VG/openvg.h>
-
 #include "hbtlviconrenderer_p.h"
 #include "hbnvgimagebinder_p.h"
 #include "hbnvgutil_p.h"
 #include "hbnvgicondata_p.h"
 #include "hbnvgtlvicon_p.h"
 
-HbTlvIconRenderer::HbTlvIconRenderer(const QByteArray &buffer, int width, int height)
+#include <VG/openvg.h>
+
+HbTlvIconRenderer::HbTlvIconRenderer(const QByteArray &buffer, qint32 width, qint32 height)
         : HbTlvRenderer(buffer, width, height)
 {
 }
@@ -40,7 +40,7 @@
 {
 }
 
-void HbTlvIconRenderer::execute(int index)
+void HbTlvIconRenderer::execute(qint32 index)
 {
     if (index == HbNvgTlvIcon::TlvPath) {
         drawPath();
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/svgext/hbnvgdecoder/hbtlviconrenderer_p.h
--- a/src/hbcore/svgext/hbnvgdecoder/hbtlviconrenderer_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/svgext/hbnvgdecoder/hbtlviconrenderer_p.h	Mon May 03 12:48:33 2010 +0300
@@ -32,13 +32,13 @@
 {
 public:
 
-	HbTlvIconRenderer(const QByteArray &buffer, int width, int height);
+    HbTlvIconRenderer(const QByteArray &buffer, qint32 width, qint32 height);
 
     virtual ~HbTlvIconRenderer();
 
 protected:
     void drawPath();
-    virtual void execute(int index);
+    virtual void execute(qint32 index);
 };
 
 #endif
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/svgext/hbnvgdecoder/hbtlvrenderer.cpp
--- a/src/hbcore/svgext/hbnvgdecoder/hbtlvrenderer.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/svgext/hbnvgdecoder/hbtlvrenderer.cpp	Mon May 03 12:48:33 2010 +0300
@@ -34,46 +34,46 @@
 
 #include <QtDebug>
 
-HbTlvRenderer::HbTlvRenderer(const QByteArray &buffer, int width, int height)
+HbTlvRenderer::HbTlvRenderer(const QByteArray &buffer, qint32 width, qint32 height)
         : mVgImageBinder(0)
 {
-    vgapi[VgSeti]              = &HbTlvRenderer::dVgSeti;
-    vgapi[VgSetf]              = &HbTlvRenderer::dVgSetf;
-    vgapi[VgSetParameteri]     = &HbTlvRenderer::dVgSetParameteri;
-    vgapi[VgSetParameterf]     = &HbTlvRenderer::dVgSetParameterf;
-    vgapi[VgSetParameterfv]    = &HbTlvRenderer::dVgSetParameterfv;
-    vgapi[VgSetColor]          = &HbTlvRenderer::dVgSetColor;
-    vgapi[VgSetPaint]          = &HbTlvRenderer::dVgSetPaint;
-    vgapi[VgLoadMatrix]        = &HbTlvRenderer::dVgLoadMatrix;
-    vgapi[VgMultMatrix]        = &HbTlvRenderer::dVgMultMatrix;
-    vgapi[VgLoadIdentity]      = &HbTlvRenderer::dVgLoadIdentity;
-    vgapi[VgScale]             = &HbTlvRenderer::dVgScale;
-    vgapi[VgTranslate]         = &HbTlvRenderer::dVgTranslate;
-    vgapi[VgAppendPathData]    = &HbTlvRenderer::dVgAppendPathData;
-    vgapi[VgDrawPath]          = &HbTlvRenderer::dVgDrawPath;
-    vgapi[VgClearPath]         = &HbTlvRenderer::dVgClearPath;
-    vgapi[VguRect]             = &HbTlvRenderer::dVguRect;
-    vgapi[VguEllipse]          = &HbTlvRenderer::dVguEllipse;
-    vgapi[VguRoundRect]        = &HbTlvRenderer::dVguRoundRect;
-    vgapi[VguLine]             = &HbTlvRenderer::dVguLine;
-    vgapi[VgCreatePaint]       = &HbTlvRenderer::dVgCreatePaint;
-    vgapi[VgSetiv]             = &HbTlvRenderer::dVgSetiv;
-    vgapi[VgClear]             = &HbTlvRenderer::dVgClear;
-    vgapi[VgSetfv]             = &HbTlvRenderer::dVgSetfv;
-    vgapi[VgRotate]            = &HbTlvRenderer::dVgRotate;
-    vgapi[VgCreatePath]        = &HbTlvRenderer::dVgCreatePath;
-    vgapi[VgCreateImage]       = &HbTlvRenderer::dVgCreateImage;
-    vgapi[VgGetPixels]         = &HbTlvRenderer::dVgGetPixels;
-    vgapi[VgDrawImage]         = &HbTlvRenderer::dVgDrawImage;
-    vgapi[VgClearImage]        = &HbTlvRenderer::dVgClearImage;
-    vgapi[VgImageSubData]      = &HbTlvRenderer::dVgImageSubData;
-    vgapi[VgDestroyImage]      = &HbTlvRenderer::dVgDestroyImage;
-    vgapi[VgDestroyPaint]      = &HbTlvRenderer::dVgDestroyPaint;
-    vgapi[VgDestroyPath]       = &HbTlvRenderer::dVgDestroyPath;
-    vgapi[VgPrepareToBindImage] = &HbTlvRenderer::dVgPrepareToBindImage;
-    vgapi[VgBindImage]         = &HbTlvRenderer::dVgBindImage;
-    vgapi[VgUnBindImage]       = &HbTlvRenderer::dVgUnBindImage;
-    vgapi[VgFlush]             = &HbTlvRenderer::dVgFlush;
+    vgapi[VgSeti]              = &HbTlvRenderer::tlvVgSeti;
+    vgapi[VgSetf]              = &HbTlvRenderer::tlvVgSetf;
+    vgapi[VgSetParameteri]     = &HbTlvRenderer::tlvVgSetParameteri;
+    vgapi[VgSetParameterf]     = &HbTlvRenderer::tlvVgSetParameterf;
+    vgapi[VgSetParameterfv]    = &HbTlvRenderer::tlvVgSetParameterfv;
+    vgapi[VgSetColor]          = &HbTlvRenderer::tlvVgSetColor;
+    vgapi[VgSetPaint]          = &HbTlvRenderer::tlvVgSetPaint;
+    vgapi[VgLoadMatrix]        = &HbTlvRenderer::tlvVgLoadMatrix;
+    vgapi[VgMultMatrix]        = &HbTlvRenderer::tlvVgMultMatrix;
+    vgapi[VgLoadIdentity]      = &HbTlvRenderer::tlvVgLoadIdentity;
+    vgapi[VgScale]             = &HbTlvRenderer::tlvVgScale;
+    vgapi[VgTranslate]         = &HbTlvRenderer::tlvVgTranslate;
+    vgapi[VgAppendPathData]    = &HbTlvRenderer::tlvVgAppendPathData;
+    vgapi[VgDrawPath]          = &HbTlvRenderer::tlvVgDrawPath;
+    vgapi[VgClearPath]         = &HbTlvRenderer::tlvVgClearPath;
+    vgapi[VguRect]             = &HbTlvRenderer::tlvVguRect;
+    vgapi[VguEllipse]          = &HbTlvRenderer::tlvVguEllipse;
+    vgapi[VguRoundRect]        = &HbTlvRenderer::tlvVguRoundRect;
+    vgapi[VguLine]             = &HbTlvRenderer::tlvVguLine;
+    vgapi[VgCreatePaint]       = &HbTlvRenderer::tlvVgCreatePaint;
+    vgapi[VgSetiv]             = &HbTlvRenderer::tlvVgSetiv;
+    vgapi[VgClear]             = &HbTlvRenderer::tlvVgClear;
+    vgapi[VgSetfv]             = &HbTlvRenderer::tlvVgSetfv;
+    vgapi[VgRotate]            = &HbTlvRenderer::tlvVgRotate;
+    vgapi[VgCreatePath]        = &HbTlvRenderer::tlvVgCreatePath;
+    vgapi[VgCreateImage]       = &HbTlvRenderer::tlvVgCreateImage;
+    vgapi[VgGetPixels]         = &HbTlvRenderer::tlvVgGetPixels;
+    vgapi[VgDrawImage]         = &HbTlvRenderer::tlvVgDrawImage;
+    vgapi[VgClearImage]        = &HbTlvRenderer::tlvVgClearImage;
+    vgapi[VgImageSubData]      = &HbTlvRenderer::tlvVgImageSubData;
+    vgapi[VgDestroyImage]      = &HbTlvRenderer::tlvVgDestroyImage;
+    vgapi[VgDestroyPaint]      = &HbTlvRenderer::tlvVgDestroyPaint;
+    vgapi[VgDestroyPath]       = &HbTlvRenderer::tlvVgDestroyPath;
+    vgapi[VgPrepareToBindImage] = &HbTlvRenderer::tlvVgPrepareToBindImage;
+    vgapi[VgBindImage]         = &HbTlvRenderer::tlvVgBindImage;
+    vgapi[VgUnBindImage]       = &HbTlvRenderer::tlvVgUnBindImage;
+    vgapi[VgFlush]             = &HbTlvRenderer::tlvVgFlush;
 
     mTargetWidth        = width;
     mTargetHeight       = height;
@@ -84,33 +84,32 @@
 
     mNvgIconData = new HbNvgIconData(buffer);
     Q_CHECK_PTR(mNvgIconData);
-    
+
     mDataLength  = buffer.size();
 
-	INIT_HANDLECHECKER()
+    INIT_HANDLECHECKER()
 }
 
 void HbTlvRenderer::initialize()
-{    
+{
     mNvgIconData->beginRead();
     mNvgIconData->read(mNvgHeader, sizeof(mNvgHeader));
 }
 
 HbTlvRenderer::~HbTlvRenderer()
 {
-	if (mPathHandle != VG_INVALID_HANDLE){
+    if (mPathHandle != VG_INVALID_HANDLE) {
         VGDESTROYPATH(mPathHandle);
     }
 
-    int handleListCount    = mTlvVgHandleList.count();
+    qint32 handleListCount    = mTlvVgHandleList.count();
 
-    if (handleListCount > 0)
-        {
+    if (handleListCount > 0) {
         vgSetPaint(VG_INVALID_HANDLE, VG_FILL_PATH);
         vgSetPaint(VG_INVALID_HANDLE, VG_STROKE_PATH);
-        }
-        
-    for (int i = 0; i < handleListCount; i++) {
+    }
+
+    for (qint32 i = 0; i < handleListCount; i++) {
         if (mTlvVgHandleList[i].mVgHandle) {
             switch (mTlvVgHandleList[i].mHandleType) {
             case HbTlvVgHandlePair::VgPath:
@@ -126,15 +125,15 @@
         }
     }
 
-	mTlvVgHandleList.clear();
-	if (mNvgIconData){
-		mNvgIconData->endRead();
-    	delete mNvgIconData;
+    mTlvVgHandleList.clear();
+    if (mNvgIconData) {
+        mNvgIconData->endRead();
+        delete mNvgIconData;
     }
-        ASSERT_HANDLE_COUNT()
+    ASSERT_HANDLE_COUNT()
 }
 
-void HbTlvRenderer::dVgSeti()
+void HbTlvRenderer::tlvVgSeti()
 {
     quint16 type;
     quint16 value;
@@ -146,7 +145,7 @@
     NVG_DEBUGSTMT(logVgSeti((VGParamType)type, value));
 }
 
-void HbTlvRenderer::dVgSetf()
+void HbTlvRenderer::tlvVgSetf()
 {
     quint16 type   = mNvgIconData->readInt16();
     VGfloat value     = mNvgIconData->readReal32();
@@ -156,7 +155,7 @@
     NVG_DEBUGSTMT(logVgSetf((VGParamType)type, value));
 }
 
-void HbTlvRenderer::dVgSetParameteri()
+void HbTlvRenderer::tlvVgSetParameteri()
 {
     quint8  handle;
     quint16 type;
@@ -171,7 +170,7 @@
     NVG_DEBUGSTMT(logVgSetParameteri(getHandle(handle), type, value, handle));
 }
 
-void HbTlvRenderer::dVgSetParameterf()
+void HbTlvRenderer::tlvVgSetParameterf()
 {
     quint32 handle = mNvgIconData->readInt32();
     quint16 type = mNvgIconData->readInt16();
@@ -182,7 +181,7 @@
     NVG_DEBUGP4("vgSetParameterf(%d, %d, %d)\n", handle, type, value);
 }
 
-void HbTlvRenderer::dVgSetParameterfv()
+void HbTlvRenderer::tlvVgSetParameterfv()
 {
     quint32 handle = mNvgIconData->readInt32();
     quint16 type = mNvgIconData->readInt16();
@@ -192,27 +191,27 @@
     Q_CHECK_PTR(fArr);
     QScopedArrayPointer<float> value(fArr);
 
-    for (uint i = 0; i < countt; i++ ) {
+    for (quint32 i = 0; i < countt; i++) {
         value[i] = mNvgIconData->readReal32();
     }
 
     vgSetParameterfv(getHandle(handle), type, countt, value.data());
-    
+
     NVG_DEBUGSTMT(logVgSetParameterfv(getHandle(handle), type, countt, value.data()));
 }
 
-void HbTlvRenderer::dVgSetColor()
+void HbTlvRenderer::tlvVgSetColor()
 {
     quint32 paintvalue = mNvgIconData->readInt32();
     quint32 rgba = mNvgIconData->readInt32();
 
     vgSetColor(getHandle(paintvalue), rgba);
 
-	NVG_DEBUGP6("vgSetColor(%d, ((%d << 24) | (%d << 16) | (%d << 8) | %d));\n", getHandle(paintvalue),
-	 (rgba & 0xFF000000) >> 24, (rgba & 0x00FF0000) >> 16,(rgba & 0x0000FF00) >> 8, (rgba & 0x000000FF));
+    NVG_DEBUGP6("vgSetColor(%d, ((%d << 24) | (%d << 16) | (%d << 8) | %d));\n", getHandle(paintvalue),
+                (rgba & 0xFF000000) >> 24, (rgba & 0x00FF0000) >> 16, (rgba & 0x0000FF00) >> 8, (rgba & 0x000000FF));
 }
 
-void HbTlvRenderer::dVgSetPaint()
+void HbTlvRenderer::tlvVgSetPaint()
 {
     quint32 paintvalue = mNvgIconData->readInt32();
     quint8 value = mNvgIconData->readInt8();
@@ -266,16 +265,16 @@
     return max;
 }
 
-void HbTlvRenderer::dVgSetiv()
+void HbTlvRenderer::tlvVgSetiv()
 {
     quint16 type = mNvgIconData->readInt16();
     quint16 count = mNvgIconData->readInt16();
-    
+
     VGint *intArr = new VGint[count];
     Q_CHECK_PTR(intArr);
     QScopedArrayPointer<VGint> value(intArr);
 
-    for (int i = 0; i < count; i++) {
+    for (qint32 i = 0; i < count; i++) {
         value[i] = mNvgIconData->readInt32();
     }
 
@@ -283,11 +282,11 @@
         VGfloat * matrix = mUserMatrix;
 
         // calculate the rectangle with respect to the transformation applied
-        for (int i = 0; i < count; i += 4) {
-            int sx = i + 0;
-            int sy = i + 1;
-            int sw = i + 2;
-            int sh = i + 3;
+        for (qint32 i = 0; i < count; i += 4) {
+            qint32 sx = i + 0;
+            qint32 sy = i + 1;
+            qint32 sw = i + 2;
+            qint32 sh = i + 3;
 
             QPoint leftBottom  = getTranslatedPoint(matrix,
                                                     QPoint(value[sx], value[sy]));
@@ -320,20 +319,21 @@
         }
     }
 
-    vgSetiv((VGParamType)type, count, value.data());
+    if (type != VG_SCISSOR_RECTS)
+        vgSetiv((VGParamType)type, count, value.data());
 
     NVG_DEBUGSTMT(logvgSetXv((VGParamType)type, count, 'i', value.data()));
 }
 
-void HbTlvRenderer::dVgLoadMatrix()
+void HbTlvRenderer::tlvVgLoadMatrix()
 {
     VGfloat matrix[9];
-    for (int i = 0; i < 9; i++) {
+    for (qint32 i = 0; i < 9; i++) {
         matrix[i] = mNvgIconData->readReal32();
     }
-    
+
     // keep the caller's matrix as base
-    int matrixMode = vgGeti(VG_MATRIX_MODE);
+    qint32 matrixMode = vgGeti(VG_MATRIX_MODE);
 
     if (matrixMode == VG_MATRIX_PATH_USER_TO_SURFACE ||
             matrixMode == VG_MATRIX_IMAGE_USER_TO_SURFACE /* need to check?*/) {
@@ -344,48 +344,48 @@
     }
 
 #ifdef HB_NVG_DEBUG
-	int matrixCount = clock() % 1000;
-	NVG_DEBUGP2("VGfloat ldMatrix%d[] = {", matrixCount);
-    
+    qint32 matrixCount = clock() % 1000;
+    NVG_DEBUGP2("VGfloat ldMatrix%d[] = {", matrixCount);
+
     NVG_DEBUGP4("    %f, %f, %f, ", matrix[0], matrix[1], matrix[2]);
     NVG_DEBUGP4("    %f, %f, %f, ", matrix[3], matrix[4], matrix[5]);
     NVG_DEBUGP4("    %f, %f, %f)", matrix[6], matrix[7], matrix[8]);
-    
-	NVG_DEBUGP2("vgLoadMatrix(ldMatrix%d);\n", matrixCount);
+
+    NVG_DEBUGP2("vgLoadMatrix(ldMatrix%d);\n", matrixCount);
 #endif
 }
 
-void HbTlvRenderer::dVgMultMatrix()
+void HbTlvRenderer::tlvVgMultMatrix()
 {
     VGfloat matrix[9];
-    for (int i = 0; i < 9; i++) {
+    for (qint32 i = 0; i < 9; i++) {
         matrix[i] = mNvgIconData->readReal32();
     }
 
     vgMultMatrix(matrix);
-    
+
 #ifdef HB_NVG_DEBUG
-    int matrixCount = clock() % 1000;
+    qint32 matrixCount = clock() % 1000;
     NVG_DEBUGP2("VGfloat mlMatrix%d[] = {", ++matrixCount);
 
     NVG_DEBUGP4("    %f, %f, %f, ", matrix[0], matrix[1], matrix[2]);
     NVG_DEBUGP4("    %f, %f, %f, ", matrix[3], matrix[4], matrix[5]);
     NVG_DEBUGP4("    %f, %f, %f)", matrix[6], matrix[7], matrix[8]);
-	NVG_DEBUGP2("vgMultMatrix(mlMatrix%d);\n", matrixCount);
+    NVG_DEBUGP2("vgMultMatrix(mlMatrix%d);\n", matrixCount);
 #endif
 }
 
-void HbTlvRenderer::dVgLoadIdentity()
+void HbTlvRenderer::tlvVgLoadIdentity()
 {
     if (vgGeti(VG_MATRIX_MODE) == (VGint)VG_MATRIX_PATH_USER_TO_SURFACE) {
-        vgLoadMatrix(mUserMatrix);     
-    }else{
+        vgLoadMatrix(mUserMatrix);
+    } else {
         vgLoadIdentity();
     }
     NVG_DEBUGP1("vgLoadIdentity();\n");
 }
 
-void HbTlvRenderer::dVgScale()
+void HbTlvRenderer::tlvVgScale()
 {
     VGfloat sx = mNvgIconData->readReal32();
     VGfloat sy = mNvgIconData->readReal32();
@@ -394,7 +394,7 @@
     NVG_DEBUGP3("vgScale(%f, %f)\n", sx, sy);
 }
 
-void HbTlvRenderer::dVgTranslate()
+void HbTlvRenderer::tlvVgTranslate()
 {
     VGfloat tx = mNvgIconData->readReal32();
     VGfloat ty = mNvgIconData->readReal32();
@@ -404,29 +404,29 @@
     NVG_DEBUGP3("vgTranslate(%f, %f)\n", tx, ty);
 }
 
-void HbTlvRenderer::dVgAppendPathData()
+void HbTlvRenderer::tlvVgAppendPathData()
 {
     quint16         numSegments;
-    quint16         coordinatecount;
-    
+    quint16         coordinateCount;
+
     mNvgIconData->readInt32();
     numSegments = mNvgIconData->readInt16();
-    
+
     VGubyte *pSegArr = new VGubyte[numSegments];
     Q_CHECK_PTR(pSegArr);
     QScopedArrayPointer<VGubyte>pathSegments(pSegArr);
 
-    for (int j = 0; j < numSegments; j++) {
+    for (qint32 j = 0; j < numSegments; j++) {
         pathSegments[j] = mNvgIconData->readInt8();
     }
 
-    coordinatecount = mNvgIconData->readInt16();
-    
-    qint32 *pDataArr = new qint32[coordinatecount];
+    coordinateCount = mNvgIconData->readInt16();
+
+    qint32 *pDataArr = new qint32[coordinateCount];
     Q_CHECK_PTR(pDataArr);
-    QScopedArrayPointer<qint32>pathData(pDataArr );
-    
-    for (int i = 0; i < coordinatecount; i++ ) {
+    QScopedArrayPointer<qint32>pathData(pDataArr);
+
+    for (qint32 i = 0; i < coordinateCount; i++) {
         pathData[i] = mNvgIconData->readInt32();
     }
 
@@ -435,7 +435,7 @@
     NVG_DEBUGP3("vgappendPathData((VGPath)%d, (SENGMENTS)%d)\n", mPathHandle, numSegments);
 }
 
-void HbTlvRenderer::dVgDrawPath()
+void HbTlvRenderer::tlvVgDrawPath()
 {
     quint16 value;
 
@@ -443,11 +443,11 @@
     value = mNvgIconData->readInt16();
 
     vgDrawPath(mPathHandle, value);
-    
+
     NVG_DEBUGSTMT(logVgDrawPath(mPathHandle, value));
 }
 
-void HbTlvRenderer::dVgClearPath()
+void HbTlvRenderer::tlvVgClearPath()
 {
     quint16 value;
 
@@ -458,21 +458,21 @@
     NVG_DEBUGP1("vgClearPath()\n");
 }
 
-void HbTlvRenderer::dVgCreatePaint()
+void HbTlvRenderer::tlvVgCreatePaint()
 {
     quint32  encodedHandle = mNvgIconData->readInt32();
-    
+
     VGPaint paintH = VGCREATEPAINT();
     if (paintH == VG_INVALID_HANDLE) {
         throw HbNvgException(openVgErrorToHbNvgError(vgGetError()));
-        }
+    }
 
     mTlvVgHandleList.append(HbTlvVgHandlePair(paintH, encodedHandle, HbTlvVgHandlePair::VgPaint));
 
     NVG_DEBUGP2("%d = vgCreatePaint()\n", getHandle(encodedHandle));
 }
 
-void HbTlvRenderer::dVguRect()
+void HbTlvRenderer::tlvVguRect()
 {
     float x;
     float y;
@@ -489,10 +489,10 @@
 
     vguRect(mPathHandle, x, y, width, height);
 
-    NVG_DEBUGP6("vguRect(%d, %f, %f, %f, %f)\n",mPathHandle, x, y, width, height);
+    NVG_DEBUGP6("vguRect(%d, %f, %f, %f, %f)\n", mPathHandle, x, y, width, height);
 }
 
-void HbTlvRenderer::dVguEllipse()
+void HbTlvRenderer::tlvVguEllipse()
 {
     float cx;
     float cy;
@@ -512,7 +512,7 @@
     NVG_DEBUGP6("vguEllipse( %d ,%f, %f, %f, %f)\n", mPathHandle, cx, cy, width, height);
 }
 
-void HbTlvRenderer::dVguRoundRect()
+void HbTlvRenderer::tlvVguRoundRect()
 {
     float x;
     float y;
@@ -531,14 +531,14 @@
 
     arcWidth = mNvgIconData->readReal32();
     arcHeight = mNvgIconData->readReal32();
-    
+
     //uncomment in qt
     vguRoundRect(mPathHandle, x, y, width, height, arcWidth, arcHeight);
 
-    NVG_DEBUGP8("vguRoundRect(%d %f, %f, %f, %f, %f, %f )\n", mPathHandle, x, y, width, height, arcWidth, arcHeight);   
+    NVG_DEBUGP8("vguRoundRect(%d %f, %f, %f, %f, %f, %f )\n", mPathHandle, x, y, width, height, arcWidth, arcHeight);
 }
 
-void HbTlvRenderer::dVguLine()
+void HbTlvRenderer::tlvVguLine()
 {
     float x0;
     float y0;
@@ -555,10 +555,10 @@
 
     vguLine(mPathHandle, x0, y0, x1, y1);
 
-    NVG_DEBUGP6("vguLine(%d, %f, %f, %f, %f)\n",mPathHandle, x0, y0, x1, y1);
+    NVG_DEBUGP6("vguLine(%d, %f, %f, %f, %f)\n", mPathHandle, x0, y0, x1, y1);
 }
 
-void HbTlvRenderer::dVgClear()
+void HbTlvRenderer::tlvVgClear()
 {
     float width;
     float height;
@@ -569,12 +569,12 @@
     height = mNvgIconData->readReal32();
 
     if (!mScaled) {
-        VGfloat scaleX = mTargetWidth  / width;
-        VGfloat scaleY = mTargetHeight / height;
+        VGfloat scaleX = (VGfloat) mTargetWidth  / width;
+        VGfloat scaleY = (VGfloat) mTargetHeight / height;
         vgLoadMatrix(mUserMatrix);
-        vgTranslate(mTargetWidth / 2, mTargetHeight / 2);
+        vgTranslate((VGfloat) mTargetWidth / 2, (VGfloat) mTargetHeight / 2);
         vgScale(scaleX, scaleY);
-        vgTranslate(- width / 2, - height / 2);
+        vgTranslate(- width / 2.0, - height / 2.0);
 
         vgGetMatrix(mUserMatrix);
         mScaled = true;
@@ -583,9 +583,9 @@
     NVG_DEBUGP1("vgClear()\n");
 }
 
-void HbTlvRenderer::dVgSetfv()
+void HbTlvRenderer::tlvVgSetfv()
 {
-    int innerpos = 1;
+    qint32 innerpos = 1;
     quint16 type;
     quint16 count;
 
@@ -596,18 +596,18 @@
     Q_CHECK_PTR(vgfArr);
     QScopedArrayPointer<VGfloat> value(vgfArr);
 
-    for (int i = 0; i < count; i++ ) {
+    for (qint32 i = 0; i < count; i++) {
         value[i] = mNvgIconData->readReal32();
     }
-    
+
     innerpos = innerpos + 2 * sizeof(quint16) + count * sizeof(VGfloat);
 
     vgSetfv((VGParamType)type, count, value.data());
-    
+
     NVG_DEBUGSTMT(logvgSetXv((VGParamType)type, count, 'f', (VGint *)value.data()));
 }
 
-void HbTlvRenderer::dVgRotate()
+void HbTlvRenderer::tlvVgRotate()
 {
     float angle;
 
@@ -618,7 +618,7 @@
     NVG_DEBUGP2("vgRotate(%f)\n", angle);
 }
 
-void HbTlvRenderer::dVgCreatePath()
+void HbTlvRenderer::tlvVgCreatePath()
 {
     quint32 pathFormat;
     quint8  datatype;
@@ -641,21 +641,21 @@
 
     mPathHandle = VGCREATEPATH(pathFormat, (VGPathDatatype)datatype, scale, bias, segmentCapacityHint, coordCapacityHint,
                                (VGbitfield)capabilities);
-    if (mPathHandle == VG_INVALID_HANDLE){
+    if (mPathHandle == VG_INVALID_HANDLE) {
         throw HbNvgException(openVgErrorToHbNvgError(vgGetError()));
-    	}
+    }
     NVG_DEBUGP9("%d = vgCreatePath(%d, (VGPathDatatype)%d, %f, %f, %d, %d,(VGPathDatatype)%d)\n",
-    	 mPathHandle, pathFormat, datatype, scale, bias, segmentCapacityHint, coordCapacityHint, capabilities);
+                mPathHandle, pathFormat, datatype, scale, bias, segmentCapacityHint, coordCapacityHint, capabilities);
 }
 
-void HbTlvRenderer::dVgCreateImage()
+void HbTlvRenderer::tlvVgCreateImage()
 {
     qint32 format   = (VGImageFormat)mNvgIconData->readInt32();
-    int width      = (VGImageFormat)mNvgIconData->readInt32();
-    int height     = (VGImageFormat)mNvgIconData->readInt32();
-    quint8 aq       = (VGImageFormat)mNvgIconData->readInt8();
+    qint32 width      = (VGImageFormat)mNvgIconData->readInt32();
+    qint32 height     = (VGImageFormat)mNvgIconData->readInt32();
+    quint8 allowedQuality       = (VGImageFormat)mNvgIconData->readInt8();
 
-    int    encodedHandle = mNvgIconData->readInt32();
+    qint32    encodedHandle = mNvgIconData->readInt32();
     VGImage image = 0;
 
     if (mPrepareToBindImage) {
@@ -677,59 +677,59 @@
     }
 
     image = VGCREATEIMAGE((VGImageFormat)format,
-                          width, height, aq);
-	if (image == VG_INVALID_HANDLE) {
-            throw HbNvgException(openVgErrorToHbNvgError(vgGetError()));
-        }
+                          width, height, allowedQuality);
+    if (image == VG_INVALID_HANDLE) {
+        throw HbNvgException(openVgErrorToHbNvgError(vgGetError()));
+    }
 
-    mTlvVgHandleList.append(HbTlvVgHandlePair(image, encodedHandle, HbTlvVgHandlePair::VgImage, aq));
+    mTlvVgHandleList.append(HbTlvVgHandlePair(image, encodedHandle, HbTlvVgHandlePair::VgImage, allowedQuality));
 
-    NVG_DEBUGP6("%d = vgCreateImage(%d, %d, %d, %d)\n",getHandle(encodedHandle), format, width, height, (quint32)aq);
+    NVG_DEBUGP6("%d = vgCreateImage(%d, %d, %d, %d)\n", getHandle(encodedHandle), format, width, height, (quint32)allowedQuality);
 }
 
-void HbTlvRenderer::dVgClearImage()
+void HbTlvRenderer::tlvVgClearImage()
 {
-    int encodedImageHandle = mNvgIconData->readInt32();
+    qint32 encodedImageHandle = mNvgIconData->readInt32();
     VGImage imageHandle     = getHandle(encodedImageHandle);
 
-    int x      = mNvgIconData->readInt32();
-    int y      = mNvgIconData->readInt32();
-    int width  = mNvgIconData->readInt32();
-    int height = mNvgIconData->readInt32();
+    qint32 x      = mNvgIconData->readInt32();
+    qint32 y      = mNvgIconData->readInt32();
+    qint32 width  = mNvgIconData->readInt32();
+    qint32 height = mNvgIconData->readInt32();
     vgClearImage(imageHandle, x, y, width, height);
 
     NVG_DEBUGP6("vgClearImage(%d, %d, %d, %d, %d)\n", imageHandle, x, y, width, height);
 }
 
-void HbTlvRenderer::dVgDrawImage()
+void HbTlvRenderer::tlvVgDrawImage()
 {
-    int encodedImageHandle = mNvgIconData->readInt32();
+    qint32 encodedImageHandle = mNvgIconData->readInt32();
     VGImage imageHandle     = getHandle(encodedImageHandle);
 
     vgDrawImage(imageHandle);
     NVG_DEBUGP2("vgDrawImage(%d)\n", imageHandle);
 }
 
-void HbTlvRenderer::dVgImageSubData()
+void HbTlvRenderer::tlvVgImageSubData()
 {
-    int encodedImageHandle = mNvgIconData->readInt32();
+    qint32 encodedImageHandle = mNvgIconData->readInt32();
     VGImage imageHandle     = getHandle(encodedImageHandle);
-    int dataLength         = 0;
+    qint32 dataLength         = 0;
 
-    int dataStride = mNvgIconData->readInt32();
-    int dataFormat = mNvgIconData->readInt32();
-    int x          = mNvgIconData->readInt32();
-    int y          = mNvgIconData->readInt32();
-    int width      = mNvgIconData->readInt32();
-    int height     = mNvgIconData->readInt32();
+    qint32 dataStride = mNvgIconData->readInt32();
+    qint32 dataFormat = mNvgIconData->readInt32();
+    qint32 x          = mNvgIconData->readInt32();
+    qint32 y          = mNvgIconData->readInt32();
+    qint32 width      = mNvgIconData->readInt32();
+    qint32 height     = mNvgIconData->readInt32();
 
-	dataLength      = mNvgIconData->readInt32();
+    dataLength      = mNvgIconData->readInt32();
     if (dataLength) {
         quint8* uIntArry = new quint8[dataLength];
         Q_CHECK_PTR(uIntArry);
         QScopedArrayPointer<quint8> data(uIntArry);
-       	mNvgIconData->read(data.data(), dataLength);
-		quint8 * dataPtr;
+        mNvgIconData->read(data.data(), dataLength);
+        quint8 * dataPtr;
         if (dataStride < 0) {
             dataPtr = data.data() + (height - 1) * (-dataStride);
         } else {
@@ -737,48 +737,47 @@
         }
         vgImageSubData(imageHandle, dataPtr, dataStride, (VGImageFormat)dataFormat, x, y, width, height);
 
-		NVG_DEBUGSTMT(logvgImageSubData(imageHandle, dataPtr, dataLength, dataStride,
-		        (VGImageFormat)dataFormat, x, y, width, height));
-        }
-    else {
+        NVG_DEBUGSTMT(logvgImageSubData(imageHandle, dataPtr, dataLength, dataStride,
+                                        (VGImageFormat)dataFormat, x, y, width, height));
+    } else {
         throw HbNvgException(HbNvgEngine::NvgErrCorrupt);
     }
 }
 
-void HbTlvRenderer::dVgGetPixels()
+void HbTlvRenderer::tlvVgGetPixels()
 {
     NVG_DEBUGP1("vgGetPixels()\n");
 }
 
-void HbTlvRenderer::dVgDestroyImage()
+void HbTlvRenderer::tlvVgDestroyImage()
 {
     VGImage imageHandle = removeHandle(mNvgIconData->readInt32());
     VGDESTROYIMAGE(imageHandle);
     NVG_DEBUGP2("vgDestroyImage(%d)\n", imageHandle);
 }
 
-void HbTlvRenderer::dVgDestroyPaint()
+void HbTlvRenderer::tlvVgDestroyPaint()
 {
-    int paint = mNvgIconData->readInt32();
-	VGDESTROYPAINT(removeHandle(paint));
+    qint32 paint = mNvgIconData->readInt32();
+    VGDESTROYPAINT(removeHandle(paint));
     NVG_DEBUGP1("vgDestroyPaint()\n");
 }
 
-void HbTlvRenderer::dVgDestroyPath()
+void HbTlvRenderer::tlvVgDestroyPath()
 {
     // only one path handle is maintained, which is a member variable
     NVG_DEBUGP2("vgDestroyPath(%d);\n", mPathHandle);
 }
 
-void HbTlvRenderer::dVgFlush()
+void HbTlvRenderer::tlvVgFlush()
 {
     //no need to implement?
     NVG_DEBUGP1("vgFlush()\n");
 }
 
-void HbTlvRenderer::execute(int index)
+void HbTlvRenderer::execute(qint32 index)
 {
-    if (0 <= index && index < VgFlush + 1) {
+    if ((0 <= index) && (index < VgFlush + 1)) {
         (this->*(vgapi[index]))();
     } else {
         throw HbNvgException(HbNvgEngine::NvgErrCorrupt);
@@ -795,11 +794,11 @@
     NVG_DEBUGP1("TLV rendering ends");
 }
 
-void HbTlvRenderer::getHandlePair(int index, HbTlvVgHandlePair & pair)
+void HbTlvRenderer::getHandlePair(qint32 index, HbTlvVgHandlePair & pair)
 {
-    int handleListCount    = mTlvVgHandleList.count();
+    qint32 handleListCount    = mTlvVgHandleList.count();
 
-    for (int i = 0; i < handleListCount; i++) {
+    for (qint32 i = 0; i < handleListCount; i++) {
         if (mTlvVgHandleList[i].mTlvHandle == index) {
             pair = mTlvVgHandleList[i];
             break;
@@ -807,33 +806,31 @@
     }
 }
 
-VGHandle HbTlvRenderer::removeHandle(int index)
+VGHandle HbTlvRenderer::removeHandle(qint32 index)
 {
-	int handleListCount    = mTlvVgHandleList.count();
-	VGHandle handle         = 0;
-	
-	for (int i = 0; i < handleListCount; i++)
-	    {
-	    if (mTlvVgHandleList[i].mTlvHandle == index)
-	        {
-	        handle = mTlvVgHandleList[i].mVgHandle;
-	        mTlvVgHandleList.removeAt(i);
-	        break;
-	        }
-	    }
-	
-	if (!handle) {
+    qint32 handleListCount    = mTlvVgHandleList.count();
+    VGHandle handle         = 0;
+
+    for (qint32 i = 0; i < handleListCount; i++) {
+        if (mTlvVgHandleList[i].mTlvHandle == index) {
+            handle = mTlvVgHandleList[i].mVgHandle;
+            mTlvVgHandleList.removeAt(i);
+            break;
+        }
+    }
+
+    if (!handle) {
         throw HbNvgException(HbNvgEngine::NvgErrCorrupt);
-	    }
-	return handle;
+    }
+    return handle;
 }
 
-VGHandle HbTlvRenderer::getHandle(int index)
+VGHandle HbTlvRenderer::getHandle(qint32 index)
 {
-    int handleListCount    = mTlvVgHandleList.count();
+    qint32 handleListCount    = mTlvVgHandleList.count();
     VGHandle handle = 0;
 
-    for (int i = 0; i < handleListCount; i++) {
+    for (qint32 i = 0; i < handleListCount; i++) {
         if (mTlvVgHandleList[i].mTlvHandle == index) {
             handle = mTlvVgHandleList[i].mVgHandle;
             break;
@@ -841,15 +838,15 @@
     }
     if (!handle) {
         throw HbNvgException(HbNvgEngine::NvgErrCorrupt);
-        }
+    }
     return handle;
 }
 
-void HbTlvRenderer::setHandle(int index, VGHandle handle)
+void HbTlvRenderer::setHandle(qint32 index, VGHandle handle)
 {
-    int handleListCount    = mTlvVgHandleList.count();
+    qint32 handleListCount    = mTlvVgHandleList.count();
 
-    for (int i = 0; i < handleListCount; i++) {
+    for (qint32 i = 0; i < handleListCount; i++) {
         if (mTlvVgHandleList[i].mTlvHandle == index) {
             mTlvVgHandleList[i].mVgHandle = handle;
             break;
@@ -857,28 +854,28 @@
     }
 }
 
-void HbTlvRenderer::dVgPrepareToBindImage()
+void HbTlvRenderer::tlvVgPrepareToBindImage()
 {
     mPrepareToBindImage = 1;
     NVG_DEBUGP1("vgPrepareToBindImage()\n");
 }
 
-void HbTlvRenderer::dVgBindImage()
+void HbTlvRenderer::tlvVgBindImage()
 {
     mPrepareToBindImage = 0;
 
-    int imageHandle = mNvgIconData->readInt32();
+    qint32 imageHandle = mNvgIconData->readInt32();
 
     if (mVgImageBinder) {
-		mVgImageBinder->bindClientBuffer((VGHandle)getHandle(imageHandle));
-		}
+        mVgImageBinder->bindClientBuffer((VGHandle)getHandle(imageHandle));
+    }
     NVG_DEBUGP2("vgBindImage(%d)\n", imageHandle);
 }
 
-void HbTlvRenderer::dVgUnBindImage()
+void HbTlvRenderer::tlvVgUnBindImage()
 {
     if (mVgImageBinder) {
-        mVgImageBinder->unBindClientBuffer();
+        mVgImageBinder->unbindClientBuffer();
     }
     NVG_DEBUGP1("vgUnBindImage()\n");
 }
@@ -1021,7 +1018,7 @@
     };
 
     logptr.append(", ");
-    logptr.setNum((int)value,10);
+    logptr.setNum((qint32)value, 10);
     logptr.append(")");
     qDebug() << logptr.data();
     return;
@@ -1161,7 +1158,7 @@
     }
     break;
     };
-    
+
     logptr.append(", ");
     switch (value) {
     case VG_RENDERING_QUALITY_NONANTIALIASED: {
@@ -1449,7 +1446,7 @@
     };
 
     logptr.append(", ");
-    logptr.setNum((int)count,(int)10);
+    logptr.setNum((qint32)count, (qint32)10);
     logptr.append(")");
     qDebug() << logptr.data();
     return;
@@ -1524,7 +1521,7 @@
     }
     break;
     default: {
-        logptr.setNum((int)value,10);
+        logptr.setNum((qint32)value, 10);
     }
     break;
     };
@@ -1533,7 +1530,7 @@
     return;
 }
 
-void HbTlvRenderer::logVgSetPaint(VGPaint paint, VGbitfield paintModes, int /*Lpvalue*/)
+void HbTlvRenderer::logVgSetPaint(VGPaint paint, VGbitfield paintModes, qint32 /*Lpvalue*/)
 {
     QByteArray logptr;
     logptr.append("vgSetPaint(");
@@ -1550,7 +1547,7 @@
     }
     break;
     default: {
-        logptr.setNum((int)paintModes,10);
+        logptr.setNum((qint32)paintModes, 10);
     }
     break;
     };
@@ -1563,7 +1560,7 @@
 {
     QByteArray logptr;
     logptr.append("vgDrawPath(");
-    logptr.setNum((int)path,10);
+    logptr.setNum((qint32)path, 10);
     logptr.append(", ");
     switch (paintModes) {
     case VG_STROKE_PATH: {
@@ -1579,7 +1576,7 @@
     }
     break;
     default: {
-        logptr.setNum((int)paintModes,10);
+        logptr.setNum((qint32)paintModes, 10);
     }
     break;
     };
@@ -1588,13 +1585,13 @@
     return;
 }
 
-void HbTlvRenderer::logVgSetParameterfv(VGPaint handle, VGint paramtype, int count, float* handlenum)
+void HbTlvRenderer::logVgSetParameterfv(VGPaint handle, VGint paramtype, qint32 count, float* handlenum)
 {
     QByteArray logptr;
     logptr.append("vgSetParameterfv(");
-    logptr.setNum((int)handle,10);
+    logptr.setNum((qint32)handle, 10);
     logptr.append(", ");
-    logptr.setNum((int)handlenum,10);
+    logptr.setNum((qint32)handlenum, 10);
     logptr.append(", ");
     switch (paramtype) {
     case VG_PAINT_TYPE: {
@@ -1630,20 +1627,20 @@
     }
     break;
     default: {
-        logptr.setNum((int)paramtype,10);
+        logptr.setNum((qint32)paramtype, 10);
     }
     break;
     };
     logptr.append(", ");
-    logptr.setNum((int)count,10);
+    logptr.setNum((qint32)count, 10);
     logptr.append(")");
     qDebug() << logptr.data();
     return;
 }
 
-void HbTlvRenderer::logvgImageSubData(VGImage imageHandle, const void* /* dataPtr*/, int dataLength, VGint dataStride,
-                VGImageFormat dataFormat, VGint x, VGint y, VGint width, VGint height)
-    {
+void HbTlvRenderer::logvgImageSubData(VGImage imageHandle, const void* /* dataPtr*/, qint32 dataLength, VGint dataStride,
+                                      VGImageFormat dataFormat, VGint x, VGint y, VGint width, VGint height)
+{
     QByteArray logPtr;
     logPtr.append("vgImageSubData(");
     logPtr.append(imageHandle);
@@ -1657,8 +1654,6 @@
     logPtr.append(height);
     logPtr.append(")");
     qDebug() << logPtr.data();
-    }
+}
 #endif
-    
 
-
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/svgext/hbnvgdecoder/hbtlvrenderer_p.h
--- a/src/hbcore/svgext/hbnvgdecoder/hbtlvrenderer_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/svgext/hbnvgdecoder/hbtlvrenderer_p.h	Mon May 03 12:48:33 2010 +0300
@@ -50,96 +50,95 @@
 
 public:
 
-	HbTlvRenderer(const QByteArray &ptr, int width, int height);
+    HbTlvRenderer(const QByteArray &ptr, qint32 width, qint32 height);
 
     virtual ~HbTlvRenderer();
 
     virtual void execute();
 
-    void setVgImageBinder(HbVgImageBinder *imageBinder) 
-    {
+    void setVgImageBinder(HbVgImageBinder *imageBinder) {
         mVgImageBinder = imageBinder;
     }
 
     void initialize();
-    
+
 protected:
 
-    void dVgSeti();
-    void dVgSetf();
-    void dVgSetParameteri();
-    void dVgSetParameterf();
-    void dVgSetParameterfv();
-    void dVgSetColor();
-    void dVgSetPaint();
-    void dVgLoadMatrix();
-    void dVgMultMatrix();
-    void dVgLoadIdentity();
-    void dVgScale();
-    void dVgTranslate();
-    void dVgAppendPathData();
-    void dVgDrawPath();
-    void dVgClearPath();
-    void dVguRect();
-    void dVguEllipse();
-    void dVguRoundRect();
-    void dVguLine();
-    void dVgCreatePaint();
-    void dVgSetiv();
-    void dVgClear();
-    void dVgSetfv();
-    void dVgRotate();
-    void dVgCreatePath();
-    void dVgCreateImage();
-    void dVgGetPixels();
-    void dVgClearImage();
-    void dVgImageSubData();
-    void dVgDrawImage();
-    void dVgDestroyImage();
-    void dVgDestroyPaint();
-    void dVgDestroyPath();
-    void dVgPrepareToBindImage();
-    void dVgBindImage();
-    void dVgUnBindImage();
-    void dVgFlush();
+    void tlvVgSeti();
+    void tlvVgSetf();
+    void tlvVgSetParameteri();
+    void tlvVgSetParameterf();
+    void tlvVgSetParameterfv();
+    void tlvVgSetColor();
+    void tlvVgSetPaint();
+    void tlvVgLoadMatrix();
+    void tlvVgMultMatrix();
+    void tlvVgLoadIdentity();
+    void tlvVgScale();
+    void tlvVgTranslate();
+    void tlvVgAppendPathData();
+    void tlvVgDrawPath();
+    void tlvVgClearPath();
+    void tlvVguRect();
+    void tlvVguEllipse();
+    void tlvVguRoundRect();
+    void tlvVguLine();
+    void tlvVgCreatePaint();
+    void tlvVgSetiv();
+    void tlvVgClear();
+    void tlvVgSetfv();
+    void tlvVgRotate();
+    void tlvVgCreatePath();
+    void tlvVgCreateImage();
+    void tlvVgGetPixels();
+    void tlvVgClearImage();
+    void tlvVgImageSubData();
+    void tlvVgDrawImage();
+    void tlvVgDestroyImage();
+    void tlvVgDestroyPaint();
+    void tlvVgDestroyPath();
+    void tlvVgPrepareToBindImage();
+    void tlvVgBindImage();
+    void tlvVgUnBindImage();
+    void tlvVgFlush();
 
-    virtual void execute(int index);
+    virtual void execute(qint32 index);
 
 #ifdef HB_NVG_DEBUG
     //Command specific logging methods
     void logVgSeti(VGParamType type, VGint fvalue);
     void logVgSetf(VGParamType type, VGfloat fvalue);
-    void logvgSetXv(VGParamType type, VGint count, qint8 vtype, VGint * data); 
-    void logVgSetParameteri(VGHandle handle, VGint paramType, VGint pvalue, int Lpvalue);
-    void logVgSetPaint(VGPaint paint, VGbitfield paintModes, int Lpvalue);
+    void logvgSetXv(VGParamType type, VGint count, qint8 vtype, VGint * data);
+    void logVgSetParameteri(VGHandle handle, VGint paramType, VGint pvalue, qint32 Lpvalue);
+    void logVgSetPaint(VGPaint paint, VGbitfield paintModes, qint32 Lpvalue);
     void logVgDrawPath(VGuint path, VGbitfield paintModes);
-    void logVgSetParameterfv(VGPaint handle, VGint paramtype, int count, float* handlenum);
-    void logvgImageSubData(VGImage imageHandle, const void * dataPtr, int dataLength, VGint dataStride,
-                    VGImageFormat dataFormat, VGint x, VGint y, VGint width, VGint height);
+    void logVgSetParameterfv(VGPaint handle, VGint paramtype, qint32 count, float* handlenum);
+    void logvgImageSubData(VGImage imageHandle, const void * dataPtr, qint32 dataLength, VGint dataStride,
+                           VGImageFormat dataFormat, VGint x, VGint y, VGint width, VGint height);
 #endif
 
 protected:
 
-    typedef void (HbTlvRenderer::*pvgapi)();
-    pvgapi vgapi[VgAPICount];
+    typedef void (HbTlvRenderer::*VgApiCallBack)();
+    VgApiCallBack vgapi[VgApiCount];
 
     HbNvgIconData *  mNvgIconData;
-    int             mDataLength;
+    qint32             mDataLength;
     QSize           mResizedCanvasSize;
 
     struct HbTlvVgHandlePair {
-        enum HandleType {
+        enum HbHandleType {
             VgPath,
             VgPaint,
             VgImage
         };
-        VGHandle    mVgHandle;
-        int         mTlvHandle;
-        HandleType  mHandleType;
-        int         mCustomData;
+        VGHandle      mVgHandle;
+        qint32           mTlvHandle;
+        HbHandleType  mHandleType;
+        qint32           mCustomData;
 
-        explicit HbTlvVgHandlePair(VGHandle vgHandle = 0, int tlvHandle = 0,
-                                   HandleType handleType = VgPaint, int customData = 0)
+        explicit HbTlvVgHandlePair(VGHandle vgHandle = 0, qint32 tlvHandle = 0,
+                                   HbHandleType handleType = VgPaint, qint32 customData = 0)
                 : mVgHandle(vgHandle),
                 mTlvHandle(tlvHandle),
                 mHandleType(handleType),
@@ -147,11 +146,11 @@
         }
     };
 
-    VGHandle getHandle(int index);
-    VGHandle removeHandle(int index);
-    void getHandlePair(int index, HbTlvVgHandlePair & pair);
+    VGHandle getHandle(qint32 index);
+    VGHandle removeHandle(qint32 index);
+    void getHandlePair(qint32 index, HbTlvVgHandlePair & pair);
 
-    void setHandle(int index, VGHandle handle);
+    void setHandle(qint32 index, VGHandle handle);
 
     QPoint  getTranslatedPoint(VGfloat *matrix, const QPoint &point);
     VGfloat minVal4(VGfloat x1, VGfloat x2, VGfloat x3, VGfloat x4);
@@ -160,18 +159,18 @@
     VGPath          mPathHandle;
 
     quint8          mNvgHeader[NvgHeaderSize];
-    int            mTargetWidth;
-    int            mTargetHeight;
+    qint32            mTargetWidth;
+    qint32            mTargetHeight;
     bool           mScaled;
 
     VGfloat             mUserMatrix[9];
     HbVgImageBinder *    mVgImageBinder;
-    int               mPrepareToBindImage;
+    qint32               mPrepareToBindImage;
     QList<HbTlvVgHandlePair > mTlvVgHandleList;
 
     HbNvgTlvIcon *   mNvgTlvIcon;
     friend class HbNvgTlvIcon;
-    
+
     DECLARE_HANDLECHECKER()
 };
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/svgext/hbtlvwrapper/hbtlvwrapper.cpp
--- a/src/hbcore/svgext/hbtlvwrapper/hbtlvwrapper.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/svgext/hbtlvwrapper/hbtlvwrapper.cpp	Mon May 03 12:48:33 2010 +0300
@@ -35,10 +35,10 @@
     \class HbTlvWrapper
 
     \brief HbTlvWrapper provides the NVG-TLV data when run on s60 baseport.
-    The TLV data is constructed using the TLV Encoder in s60 SVGEngine.    
-    HbTlvWrapper is a singleton class. The NVG-TLV is used in the scenarios where the svg 
+    The TLV data is constructed using the TLV Encoder in s60 SVGEngine.
+    HbTlvWrapper is a singleton class. The NVG-TLV is used in the scenarios where the svg
     file can not be converted to nvg, e.g.: svg file containging group-opacity. Since the
-    TLV is vector data the rendering would be faster using the sgimage when compared to 
+    TLV is vector data the rendering would be faster using the sgimage when compared to
     rendering via QPixmap or QPicture.
 
 */
@@ -46,19 +46,20 @@
 /*!
     \fn QByteArray HbTlvWrapper::getTLVEncodedData(QString& filename,QSizeF& size, Qt::AspectRatioMode aspectRatioM)
 
-    This function returns the NVG-TLV data in the form of a bytearray. it accepts the 
+    This function returns the NVG-TLV data in the form of a bytearray. it accepts the
     svg filename, rendersize, aspect ratio as a parameter. This data later can be rendered using the HbNvgEngine's
-    drawNvg(). 
+    drawNvg().
 */
 
 /*!
     \fn QByteArray HbTlvWrapper::getTLVEncodedDataFromDom(quint32 domhandle,QSizeF& size, Qt::AspectRatioMode aspectRatioM)
 
-    This function returns the NVG-TLV data in the form of a bytearray. it accepts the 
+    This function returns the NVG-TLV data in the form of a bytearray. it accepts the
     handle to dom prepared previously by calling contentDimensions(). Also takes in
     rendersize, aspect ratio as a parameter. This data later can be rendered using the HbNvgEngine's
-    drawNvg(). 
+    drawNvg().
 */
+const QString unicodeFormat("fffe");
 
 HbTlvWrapper::HbTlvWrapper(): d_ptr(new HbTlvWrapperPrivate)
 {
@@ -74,14 +75,14 @@
     return &instance;
 }
 
-const QByteArray HbTlvWrapper::getTLVEncodedData(QString& filename,QSizeF& size, Qt::AspectRatioMode aspectRatioM)
+const QByteArray HbTlvWrapper::getTlvEncodedData(const QString& filename, const QSizeF& size, Qt::AspectRatioMode aspectRatioMode)
 {
-    return(d_ptr->getTLVEncodedData(filename, size, aspectRatioM));
+    return(d_ptr->getTlvEncodedData(filename, size, aspectRatioMode));
 }
 
-const QByteArray HbTlvWrapper::getTLVEncodedDataFromDom(quint32& domhandle, QSizeF& size, Qt::AspectRatioMode aspectRatioM)
+const QByteArray HbTlvWrapper::getTlvEncodedDataFromDom(const quint32& domhandle, QSizeF& size, Qt::AspectRatioMode aspectRatioMode)
 {
-    return (d_ptr->getTLVEncodedDataFromDom(domhandle,size,aspectRatioM));
+    return (d_ptr->getTlvEncodedDataFromDom(domhandle, size, aspectRatioMode));
 }
 
 const QSize HbTlvWrapper::contentDimensions(QString& filename, quint32& domhandle)
@@ -92,24 +93,20 @@
 HbTlvWrapperPrivate::HbTlvWrapperPrivate()
 {
     // Dummy bitmap for  s60 engine's constructl.
-    bitmap = new (ELeave) CFbsBitmap();
+    bitmap = new CFbsBitmap;
     TFontSpec spec;
-    s60SvgEngine = CSvgEngineInterfaceImpl::NewL(bitmap,NULL, spec, ESVGRendererTLV);
+    TRAPD(err, s60SvgEngine = CSvgEngineInterfaceImpl::NewL(bitmap, 0, spec, ESVGRendererTLV));
 }
 HbTlvWrapperPrivate::~HbTlvWrapperPrivate()
 {
-    if (bitmap) {
-        delete bitmap;
-        bitmap=NULL;
-    }
-    if (s60SvgEngine) {
-        delete s60SvgEngine;
-        s60SvgEngine=NULL;    
-    }
+    delete bitmap;
+    bitmap = 0;
     
+    delete s60SvgEngine;
+    s60SvgEngine = 0;
 }
 
-const QByteArray HbTlvWrapperPrivate::getTLVEncodedData(QString& filename,QSizeF& size, Qt::AspectRatioMode aspectRatioM)
+const QByteArray HbTlvWrapperPrivate::getTlvEncodedData(const QString& filename, const QSizeF& size, Qt::AspectRatioMode aspectRatioMode)
 {
 #ifdef __TLV_
     TInt domhandle;
@@ -117,106 +114,91 @@
     if (!file.open(QIODevice::NotOpen | QIODevice::ReadOnly)) {
         return QByteArray();
     }
-    QFile temp(filename);
-    if (!temp.open(QIODevice::NotOpen | QIODevice::ReadOnly)) {
-            return QByteArray();
-        }
     
-    QByteArray isUniCoded = temp.read(2).toHex();
+    QByteArray isUniCoded = file.read(2).toHex();
+    file.seek(0);
     QByteArray byteArray;
-    if(isUniCoded=="fffe") {
+    if (isUniCoded == unicodeFormat) {
         QTextStream in(&file);
         QString data = in.readAll();
-        byteArray = data.toUtf8 ();
-    }
-    else {
+        byteArray = data.toUtf8();
+    } else {
         byteArray = file.readAll();
     }
-    TPtrC8 ptr8((TUint8 *)(byteArray.constData()));
-    s60SvgEngine->PrepareDom(ptr8,domhandle);
     
-    TSize bitmapsize(size.width(),size.height());
-    s60SvgEngine->UseDom(domhandle,bitmap,NULL,bitmapsize,ENone,ENone);
-    // Aspect ratio setting
-    TSvgPreserveAspectAlignType preserveAspectSetting;
-    TSvgMeetOrSliceType smilFitSetting;
-    switch(aspectRatioM) {    
+    file.close();
         
-        case Qt::IgnoreAspectRatio: {
-            preserveAspectSetting = ESvgPreserveAspectRatio_None;
-            smilFitSetting = ESvgMeetOrSlice_Meet; 
-            break;
-        }
-        case Qt::KeepAspectRatio: {
-            preserveAspectSetting = ESvgPreserveAspectRatio_XmidYmid;
-            smilFitSetting = ESvgMeetOrSlice_Meet;
-            break;
-        }
-        case Qt::KeepAspectRatioByExpanding: {
-            preserveAspectSetting = ESvgPreserveAspectRatio_XmidYmid;
-            smilFitSetting = ESvgMeetOrSlice_Slice;
-            break;
-        } 
-        default: {
-            preserveAspectSetting= ESvgPreserveAspectRatio_XmidYmid;
-            smilFitSetting = ESvgMeetOrSlice_Meet;
-            break;
-            }        
-        }
-    s60SvgEngine->SetPreserveAspectRatio((CSvgDocumentImpl*)domhandle,preserveAspectSetting,smilFitSetting,ETrue);
+    TPtrC8 fileDataPtr8((TUint8 *)(byteArray.constData()));
+    s60SvgEngine->PrepareDom(fileDataPtr8, domhandle);
+
+    TSize bitmapsize(size.width(), size.height());
+    s60SvgEngine->UseDom(domhandle, bitmap, 0, bitmapsize, ENone, ENone);
+    // Aspect ratio setting
+    TSvgPreserveAspectAlignType preserveAspectSetting = ESvgPreserveAspectRatio_XmidYmid;
+    TSvgMeetOrSliceType smilFitSetting = ESvgMeetOrSlice_Meet;;
+    switch (aspectRatioMode) {
+
+    case Qt::IgnoreAspectRatio: {
+        preserveAspectSetting = ESvgPreserveAspectRatio_None;
+        break;
+    }
+    case Qt::KeepAspectRatio: {
+        break;
+    }
+    case Qt::KeepAspectRatioByExpanding: {
+        smilFitSetting = ESvgMeetOrSlice_Slice;
+        break;
+    }
+    default: {
+        break;
+    }
+    }
+    s60SvgEngine->SetPreserveAspectRatio((CSvgDocumentImpl*)domhandle, preserveAspectSetting, smilFitSetting, ETrue);
     s60SvgEngine->Start();
     const TPtrC8 des = s60SvgEngine->TLVEncodedData();
-    
+
     s60SvgEngine->DeleteDom(domhandle);
-    temp.close();
-    file.close();
-    
+
     return (QByteArray((const char *)des.Ptr(), des.Length()));
 #else
-	return QByteArray();
-#endif	    
+    return QByteArray();
+#endif
 }
 
-const QByteArray HbTlvWrapperPrivate::getTLVEncodedDataFromDom(quint32& domhandle, QSizeF& size, Qt::AspectRatioMode aspectRatioM)
+const QByteArray HbTlvWrapperPrivate::getTlvEncodedDataFromDom(const quint32& domhandle, QSizeF& size, Qt::AspectRatioMode aspectRatioMode)
 {
 #ifdef __TLV_
-    TSize bitmapsize(size.width(),size.height());
-    s60SvgEngine->UseDom(domhandle,bitmap,NULL,bitmapsize,ENone,ENone);
+    TSize bitmapsize(size.width(), size.height());
+    s60SvgEngine->UseDom(domhandle, bitmap, 0, bitmapsize, ENone, ENone);
     // Aspect ratio setting
-    TSvgPreserveAspectAlignType preserveAspectSetting;
-    TSvgMeetOrSliceType smilFitSetting;
-    switch(aspectRatioM) {    
-        
-        case Qt::IgnoreAspectRatio: {
-            preserveAspectSetting = ESvgPreserveAspectRatio_None;
-            smilFitSetting = ESvgMeetOrSlice_Meet; 
-            break;
-        }
-        case Qt::KeepAspectRatio: {
-            preserveAspectSetting = ESvgPreserveAspectRatio_XmidYmid;
-            smilFitSetting = ESvgMeetOrSlice_Meet;
-            break;
-        }
-        case Qt::KeepAspectRatioByExpanding: {
-            preserveAspectSetting = ESvgPreserveAspectRatio_XmidYmid;
-            smilFitSetting = ESvgMeetOrSlice_Slice;
-            break;
-        } 
-        default: {
-            preserveAspectSetting= ESvgPreserveAspectRatio_XmidYmid;
-            smilFitSetting = ESvgMeetOrSlice_Meet;
-            break;
-            }        
-        }
-    s60SvgEngine->SetPreserveAspectRatio((CSvgDocumentImpl*)domhandle,preserveAspectSetting,smilFitSetting,EFalse);
+    TSvgPreserveAspectAlignType preserveAspectSetting = ESvgPreserveAspectRatio_XmidYmid;
+    TSvgMeetOrSliceType smilFitSetting = ESvgMeetOrSlice_Meet;
+    switch (aspectRatioMode) {
+
+    case Qt::IgnoreAspectRatio: {
+        preserveAspectSetting = ESvgPreserveAspectRatio_None;
+        break;
+    }
+    case Qt::KeepAspectRatio: {
+        break;
+    }
+    case Qt::KeepAspectRatioByExpanding: {
+        smilFitSetting = ESvgMeetOrSlice_Slice;
+        break;
+    }
+    default: {
+        break;
+    }
+    }
+    s60SvgEngine->SetPreserveAspectRatio((CSvgDocumentImpl*)domhandle, preserveAspectSetting, smilFitSetting, EFalse);
     s60SvgEngine->Start();
     const TPtrC8 des = s60SvgEngine->TLVEncodedData();
-    
+
     s60SvgEngine->DeleteDom(domhandle);
     return (QByteArray((const char *)des.Ptr(), des.Length()));
 #else
     return QByteArray();
-#endif      
+#endif
 }
 const QSize HbTlvWrapperPrivate::contentDimensions(QString& filename, quint32& domhandle)
 {
@@ -226,35 +208,31 @@
     if (!file.open(QIODevice::NotOpen | QIODevice::ReadOnly)) {
         return QSize();
     }
-    QFile temp(filename);
-    if (!temp.open(QIODevice::NotOpen | QIODevice::ReadOnly)) {
-            return QSize();
-        }
     
-    QByteArray isUniCoded = temp.read(2).toHex();
+    QByteArray isUniCoded = file.read(2).toHex();
+    file.seek(0);
     QByteArray byteArray;
-    if(isUniCoded=="fffe") {
+    if (isUniCoded == unicodeFormat) {
         QTextStream in(&file);
         QString data = in.readAll();
-        byteArray = data.toUtf8 ();
-    }
-    else {
+        byteArray = data.toUtf8();
+    } else {
         byteArray = file.readAll();
     }
-    TPtrC8 ptr8((TUint8 *)(byteArray.constData()));
-    s60SvgEngine->PrepareDom(ptr8,handle);
-    TSize dummysize;
-    s60SvgEngine->UseDom(handle,bitmap,NULL,dummysize,ENone,ENone);
-    s60SvgEngine->ChooseViewBoxIfNotSet(handle);
-    contentsize=s60SvgEngine->ContentDimensions(); 
-    domhandle = handle; 
     
-    temp.close();
     file.close();
     
-    return(QSize (contentsize.iWidth,contentsize.iHeight));
+    TPtrC8 ptr8((TUint8 *)(byteArray.constData()));
+    s60SvgEngine->PrepareDom(ptr8, handle);
+    TSize dummysize;
+    s60SvgEngine->UseDom(handle, bitmap, 0, dummysize, ENone, ENone);
+    s60SvgEngine->ChooseViewBoxIfNotSet(handle);
+    contentsize = s60SvgEngine->ContentDimensions();
+    domhandle = handle;
+   
+    return(QSize(contentsize.iWidth, contentsize.iHeight));
 #else
     return QSize();
-#endif      
+#endif
 }
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/svgext/hbtlvwrapper/hbtlvwrapper.pri
--- a/src/hbcore/svgext/hbtlvwrapper/hbtlvwrapper.pri	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/svgext/hbtlvwrapper/hbtlvwrapper.pri	Mon May 03 12:48:33 2010 +0300
@@ -27,8 +27,8 @@
 INCLUDEPATH += $$PWD
 DEPENDPATH += $$PWD
 
-INTERNAL_HEADERS += $$PWD/hbtlvwrapper_p.h
+PRIVATE_HEADERS += $$PWD/hbtlvwrapper_p.h
 
-INTERNAL_HEADERS += $$PWD/hbtlvwrapper_p_p.h
+PRIVATE_HEADERS += $$PWD/hbtlvwrapper_p_p.h
 
 SOURCES += $$PWD/hbtlvwrapper.cpp
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/svgext/hbtlvwrapper/hbtlvwrapper_p.h
--- a/src/hbcore/svgext/hbtlvwrapper/hbtlvwrapper_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/svgext/hbtlvwrapper/hbtlvwrapper_p.h	Mon May 03 12:48:33 2010 +0300
@@ -37,9 +37,9 @@
 {
 public:
     static HbTlvWrapper *instance();
-    const QByteArray getTLVEncodedData(QString& filename,QSizeF& size, Qt::AspectRatioMode aspectRatioM);
-    const QByteArray getTLVEncodedDataFromDom(quint32& domhandle, QSizeF& size, Qt::AspectRatioMode aspectRatioM);
-    const QSize contentDimensions(QString& filename, quint32& domhandle); 
+    const QByteArray getTlvEncodedData(const QString& filename, const QSizeF& size, Qt::AspectRatioMode aspectRatioMode);
+    const QByteArray getTlvEncodedDataFromDom(const quint32& domhandle, QSizeF& size, Qt::AspectRatioMode aspectRatioMode);
+    const QSize contentDimensions(QString& filename, quint32& domhandle);
 private:
     HbTlvWrapper();
     ~HbTlvWrapper();
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/svgext/hbtlvwrapper/hbtlvwrapper_p_p.h
--- a/src/hbcore/svgext/hbtlvwrapper/hbtlvwrapper_p_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/svgext/hbtlvwrapper/hbtlvwrapper_p_p.h	Mon May 03 12:48:33 2010 +0300
@@ -36,10 +36,10 @@
 public:
     HbTlvWrapperPrivate();
     ~HbTlvWrapperPrivate();
-    const QByteArray getTLVEncodedData(QString& filename, QSizeF& size, Qt::AspectRatioMode aspectRatioM);
-    const QByteArray getTLVEncodedDataFromDom(quint32& domhandle,QSizeF& size, Qt::AspectRatioMode aspectRatioM);
-    const QSize contentDimensions(QString& filename, quint32& domhandle); 
-public:
+    const QByteArray getTlvEncodedData(const QString& filename, const QSizeF& size, Qt::AspectRatioMode aspectRatioMode);
+    const QByteArray getTlvEncodedDataFromDom(const quint32& domhandle, QSizeF& size, Qt::AspectRatioMode aspectRatioMode);
+    const QSize contentDimensions(QString& filename, quint32& domhandle);
+private:
     CSvgEngineInterfaceImpl *s60SvgEngine;
     CFbsBitmap *bitmap;
     TSize contentsize;
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/theme/hbcolorscheme.cpp
--- a/src/hbcore/theme/hbcolorscheme.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/theme/hbcolorscheme.cpp	Mon May 03 12:48:33 2010 +0300
@@ -26,7 +26,7 @@
 
 
 /*!
-    @proto
+    @stable
     @hbcore
     \class HbColorScheme
     \brief HbColorScheme class is used to query colors from theme.
@@ -68,7 +68,14 @@
 #include <hbcolorscheme.h>
 #include "hbcolortheme_p.h"
 
+/*!
+Constructor
+*/
+HbColorScheme::HbColorScheme()
+{
+}
+
 QColor HbColorScheme::color( const QString &colorRole )
 {
-    return HbColorTheme::global()->color(colorRole);
+    return HbColorTheme::instance()->color(colorRole);
 }
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/theme/hbcolorscheme.h
--- a/src/hbcore/theme/hbcolorscheme.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/theme/hbcolorscheme.h	Mon May 03 12:48:33 2010 +0300
@@ -38,6 +38,8 @@
 {
 public:
     static QColor color( const QString &colorRole );
+private:
+    HbColorScheme();
 };
 
 #endif // HBCOLORSCHEME_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/theme/hbcolortheme_p.cpp
--- a/src/hbcore/theme/hbcolortheme_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/theme/hbcolortheme_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -40,6 +40,16 @@
     
 }
 
+void HbColorThemePrivate::setCurrentTheme(const QString& themeName)
+{
+    // If new theme is different from earlier set theme
+    if (currentTheme != themeName) {
+        bool reloadAll = currentTheme.isEmpty();
+        currentTheme = themeName;
+        reloadColorFiles( reloadAll );
+    }
+}
+
 /*!
  *  HbColorThemePrivate::reloadColorFiles
  *
@@ -47,16 +57,17 @@
  */
 void HbColorThemePrivate::reloadColorFiles(bool sender)
 {
-    QMap<int,QString> hierarchyVariableListWithPathInfo = HbThemeUtils::constructHierarchyListWithPathInfo("variables/color/hbcolorgroup.css", currentTheme, Hb::StyleSheetResource);
-    QMap<int,QString> variableFileListWithInfo = HbStandardDirs::findResourceList(hierarchyVariableListWithPathInfo,Hb::StyleSheetResource);
+    QMap<int,QString> hierarchyVariableListWithPathInfo =
+            HbThemeUtils::constructHierarchyListWithPathInfo("variables/color/hbcolorgroup.css", currentTheme, Hb::StyleSheetResource);
+    HbStandardDirs::findResourceList(hierarchyVariableListWithPathInfo,Hb::StyleSheetResource, true);
 
 #ifdef THEME_SERVER_TRACES    
     qDebug() << "CSS files:";
-    foreach ( const QString& file, variableFileListWithInfo )
+    foreach ( const QString& file, hierarchyVariableListWithPathInfo )
         qDebug() << file;
 #endif // THEME_SERVER_TRACES
 
-    cssif.initialise( variableFileListWithInfo, sender );
+    cssif.initialise(hierarchyVariableListWithPathInfo, sender);
 
 }
 
@@ -78,80 +89,12 @@
     
 }
 
-
-/*!
-    @proto
-    @hbcore
-    \class HbColorTheme
-    \brief HbColorTheme class is used to query colors from theme.
+Q_GLOBAL_STATIC(HbColorTheme, globalColorTheme)
+HbColorTheme *HbColorTheme::self = 0;
 
-    HbColorTheme is a singleton class which should be used to query colors
-    from theme. Colors can be queried in two ways:
-    
-    - By passing widget pointer and one of its supported color attribute names.
-    - By passing some predefined standard attribute name.
-    
-    First method makes it possible for theme developer to specify instance specific colors.
-    For example, a theme developer can specify that a button with "ok" id (object-name) should use
-    different colors than normal buttons. This method is appropriate for the widgets which comes as
-    a part of Hb library, so that those widgets allow theme developer to write any complex theme.
-    Following example shows how a color for textitem of popup can be queried from theme:
-    \code
-    // textItem is child of HbDialog widget here
-    QColor col = HbColorTheme::global()->color(textItem->parentWidget(), "foreground");
-    if (col.isValid()) {
-        textItem->setTextColor(col);
-    }
-    \endcode
-    Attribute name can include state name also (<attribute_name>.<state_name>). There are four
-    supported states "enabled", "disabled", "focused" or "nonfocused". If no state is defined
-    color for "enabled" state is returned.
-    
-    \warning  The list of states and default state may change in the future depending on the
-    requirements. Also list of attributes may grow and change as more widgets come in future.
- 
-    Second method is more appropriate for custom widgets which want to be consistent with standard
-    look and feel and  be themable. For example, a custom widget may want to have background color
-    same as that of HbDialog. In such scenario the widget can query standard "popupbackground" color
-    from theme.
-    Following code queries color of popoup forground and applies it to a text item.
-    \code
-    QColor col = HbColorTheme::global()->color("popupforeground");
-    if (col.isValid()) {
-       mytextitem->setTextColor(col);
-    }
-    \endcode
-    
-    Note: It is custom widgets responsibility to query color again from theme when theme changes.
-    This can be done by handing HbEvent::ThemeChanged event. Theming framework makes sure that this
-    event is sent to all HbWidgets.
-    
-    \warning List of standard color roles is not yet finalyzed
-*/
-
-/*!
- * \fn HbColorTheme::global ()
- * This function returns singleton instanace of the class.
- */
-
-/*!
- * \fn QColor HbColorTheme::color(const QGraphicsWidget * widget, const QString &colorAttribute,int state) const
- * This function returns value of some \a colorAttribute for a particular \a widget with particular \a state.
- *
- * See class level document for detailed example
- * 
- */
-
-/*!
- * \fn HbColorTheme::color(const QString &colorRole,int state) const
- * This function returns value of some predefined \a colorRole with particular \a state.
- *
- * See class level document for detailed example.
- */
-HbColorTheme *HbColorTheme::global ()
+HbColorTheme *HbColorTheme::instance ()
 {
-    static HbColorTheme instance;
-    return &instance;
+    return globalColorTheme();
 }
 
 /*!
@@ -188,7 +131,7 @@
  */
 HbColorTheme::HbColorTheme (): d_ptr( new HbColorThemePrivate )
 {
-    
+    self = this;
 }
 
 /*!
@@ -209,12 +152,7 @@
 void HbColorTheme::setCurrentTheme ( const QString& themeName )
 {
     Q_D(HbColorTheme);
-    // If new theme is different from earlier set theme
-    if ( d->currentTheme != themeName ) {
-        bool reloadAll = d->currentTheme.isEmpty();
-        d->currentTheme = themeName;
-        d->reloadColorFiles( reloadAll );
-    }
+    d->setCurrentTheme(themeName);
 }
 
 /*!
@@ -228,3 +166,9 @@
     d->cssif.flush();
     d->reloadColorFiles( true );
 }
+
+void HbColorTheme::flushVariableCache()
+{
+    Q_D(HbColorTheme);
+    d->cssif.flushVariableCache();
+}
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/theme/hbcolortheme_p.h
--- a/src/hbcore/theme/hbcolortheme_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/theme/hbcolortheme_p.h	Mon May 03 12:48:33 2010 +0300
@@ -42,19 +42,21 @@
     friend class TestHbColorTheme;
 public:
 
+    HbColorTheme();
     ~HbColorTheme();
 
-    static HbColorTheme *global ();
-    void setCurrentTheme( const QString& currentTheme );
+    void setCurrentTheme(const QString& currentTheme);
+    static HbColorTheme *instance();
 
     QColor color(const QGraphicsWidget * wid, const QString &prop) const;
     QColor color(const QString &colorRole) const;
     void reloadCss();
+    void flushVariableCache();
 
 private:
     HbColorThemePrivate * const d_ptr;
+    static HbColorTheme *self;
     Q_DISABLE_COPY (HbColorTheme)
-    HbColorTheme ();
     Q_DECLARE_PRIVATE_D(d_ptr, HbColorTheme)
 };
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/theme/hbcolortheme_p_p.h
--- a/src/hbcore/theme/hbcolortheme_p_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/theme/hbcolortheme_p_p.h	Mon May 03 12:48:33 2010 +0300
@@ -27,7 +27,6 @@
 #define HBCOLORTHEME_P_H
 
 #include <QString>
-#include <QSettings>
 #include <hbglobal.h>
 #include "hbcssthemeinterface_p.h"
 #include "hbcssparser_p.h"
@@ -37,6 +36,7 @@
 {
 public:
     HbColorThemePrivate();
+    void setCurrentTheme(const QString& themeName);
     void reloadColorFiles(bool sender);
     QColor resolveColor(HbCss::Value values) const;
     ~HbColorThemePrivate();
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/theme/hbcssthemeinterface_p.cpp
--- a/src/hbcore/theme/hbcssthemeinterface_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/theme/hbcssthemeinterface_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -46,6 +46,7 @@
                                      bool enableBinarySupport)
 {
     int handle;
+    flushVariableCache();
     HbLayeredStyleLoader *loader = HbLayeredStyleLoader::getStack(HbLayeredStyleLoader::Concern_Colors);
     
     //first unload the layers, for which the contents are different after theme change
@@ -85,6 +86,12 @@
 {
     HbLayeredStyleLoader *loader = HbLayeredStyleLoader::getStack(HbLayeredStyleLoader::Concern_Colors);
     loader->clear();
+    flushVariableCache();
+}
+
+void HbCssThemeInterface::flushVariableCache()
+{
+    mVariables.clear();
 }
 
 /*!
@@ -103,11 +110,10 @@
     HbCss::Value value;
 
     HbLayeredStyleLoader *loader = HbLayeredStyleLoader::getStack(HbLayeredStyleLoader::Concern_Colors);
-	HbDeviceProfile profile(HbDeviceProfile::profile(w));
-	HbCss::ValueExtractor valueExtractor(loader->declarationsForNode(n, profile.orientation()), true);
-    valueExtractor.extractValue (attribute, value);
+    HbDeviceProfile profile(HbDeviceProfile::profile(w));
+    HbCss::ValueExtractor valueExtractor(loader->declarationsForNode(n, profile.orientation()), true);
+    valueExtractor.extractValue(attribute, value);
     
-
     if ( value.type == Value::Variable) {
         value = findVariable ( value.variant.toString ());
     }
@@ -124,12 +130,14 @@
 HbCss::Value HbCssThemeInterface::findVariable(
         const QString& variableName) const
 {
-    HbLayeredStyleLoader *loader = HbLayeredStyleLoader::getStack(HbLayeredStyleLoader::Concern_Colors);
-    HbCss::Value val;
+    if ( mVariables.isEmpty() ) {
+        HbLayeredStyleLoader *loader = HbLayeredStyleLoader::getStack(HbLayeredStyleLoader::Concern_Colors);
+        loader->variableRuleSets(&mVariables);
+    }
+
     HbCss::Value value;
-
-    HbCss::ValueExtractor valueExtractor(loader->variableRuleSets(),true);
-    valueExtractor.extractValue (variableName, value);
+    HbCss::ValueExtractor valueExtractor(mVariables, true);
+    valueExtractor.extractValue(variableName, value);
 
     //for varibale cascading support
     if ( value.type == Value::Variable){
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/theme/hbcssthemeinterface_p.h
--- a/src/hbcore/theme/hbcssthemeinterface_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/theme/hbcssthemeinterface_p.h	Mon May 03 12:48:33 2010 +0300
@@ -47,9 +47,11 @@
     HbCss::Value findVariable( const QString& variableName )const;
 
     void flush();
+    void flushVariableCache();
 
 private:
    QMap<int,HbLayeredStyleLoader::LayerPriority> handles;
+   mutable QHash<QString, HbCss::Declaration> mVariables;
         
 };
 #endif //HBCSSTHEMEINTERFACE_P_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/theme/hbeffecttheme_p.cpp
--- a/src/hbcore/theme/hbeffecttheme_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/theme/hbeffecttheme_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -38,16 +38,17 @@
     HbEffectThemePrivate();
     ~HbEffectThemePrivate();
 
-    bool initialise(const QString &dir);
+    void initialise(const QString &dir);
     QString mThemeName;
     QStringList mDirList;
     QStringList mListOfExistingFolders;
 };
 
-bool HbEffectThemePrivate::initialise(const QString &dir)
+void HbEffectThemePrivate::initialise(const QString &themeName)
 {
+    mThemeName = themeName;
     QMap<int, QString> maplist = HbThemeUtils::constructHierarchyListWithPathInfo(
-        QString(), dir, Hb::EffectResource);
+        QString(), mThemeName, Hb::EffectResource);
         
     mDirList.clear();
         
@@ -56,8 +57,8 @@
         mDirList.append(list.at(i));
     }
 
-    mListOfExistingFolders = HbStandardDirs::findExistingFolderList(mDirList, Hb::EffectResource);
-    return mListOfExistingFolders.count() > 0;
+    mListOfExistingFolders = HbStandardDirs::findExistingFolderList(mDirList, mThemeName, 
+                                                                    Hb::EffectResource);
 }
 
 HbEffectThemePrivate::HbEffectThemePrivate()
@@ -69,11 +70,12 @@
 {
 }
 
-Q_GLOBAL_STATIC(HbEffectTheme, instance)
+Q_GLOBAL_STATIC(HbEffectTheme, globalEffectTheme)
+HbEffectTheme *HbEffectTheme::self = 0;
 
-HbEffectTheme *HbEffectTheme::global()
+HbEffectTheme *HbEffectTheme::instance()
 {
-    return instance();
+    return globalEffectTheme();
 }
 
 QString HbEffectTheme::getEffectXml(const QString &fileNameLogical, bool &fromTheme) const 
@@ -99,6 +101,7 @@
 HbEffectTheme::HbEffectTheme()
   : d_ptr(new HbEffectThemePrivate)
 {
+    self = this;
 }
 
 HbEffectTheme::~HbEffectTheme()
@@ -108,12 +111,8 @@
 
 void HbEffectTheme::setCurrentTheme(const QString& themeName)
 {
-    bool success = d_ptr->initialise(themeName);
-    if (success && d_ptr->mListOfExistingFolders.count() == 2) {
-        d_ptr->mThemeName = "hbdefault";
-    } else {
-        d_ptr->mThemeName = themeName;
-    }
+    d_ptr->initialise(themeName);
+    d_ptr->mThemeName = themeName;
     HbEffectInternal::reloadFxmlFiles();
 }
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/theme/hbeffecttheme_p.h
--- a/src/hbcore/theme/hbeffecttheme_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/theme/hbeffecttheme_p.h	Mon May 03 12:48:33 2010 +0300
@@ -37,15 +37,16 @@
 public:
     HbEffectTheme();
     ~HbEffectTheme();
-    static HbEffectTheme *global();
+    static HbEffectTheme *instance();
+    void setCurrentTheme(const QString &themeName);
 
     QString getEffectXml(const QString &fileNameLogical, bool &fromTheme) const;
-    void setCurrentTheme(const QString &themeName);
     void clearDirList();
     QString currentTheme() const;
 
 private:
     HbEffectThemePrivate* d_ptr;
+    static HbEffectTheme *self;
     Q_DISABLE_COPY(HbEffectTheme)
     friend class TestHbEffectTheme;
 };
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/theme/hbtheme.cpp
--- a/src/hbcore/theme/hbtheme.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/theme/hbtheme.cpp	Mon May 03 12:48:33 2010 +0300
@@ -24,7 +24,9 @@
 ****************************************************************************/
 #include "hbtheme.h"
 #include "hbtheme_p.h"
+#include "hbthemeclient_p.h"
 #include <qglobal.h>
+#include <QSettings>
 #include "hbstandarddirs_p.h"
 #include "hbicontheme_p.h"
 #include "hbcolortheme_p.h"
@@ -33,15 +35,15 @@
 #include "hbcolortheme_p_p.h"
 #include "hbcolortheme_p.h"
 #include "hbeffecttheme_p.h"
+#include "hbeffectinternal_p.h"
 /*!
-    @proto
+    @stable
     @hbcore
     \class HbTheme
 
-    \brief HbTheme provides an interface for changing the active theme.
+    \brief HbTheme provides means for retrieving information of the currently active theme.
 
     HbTheme is a part of hbinstance, which is accessed with the method hbinstance->theme().
-    It provides means for retrieving information of the currently active theme.
 
     In addition, it provides two signals for handling a theme change event.
 
@@ -92,7 +94,7 @@
 */
 QString HbTheme::description() const
 {
-    return HbIconTheme::global()->description();
+    return d_ptr->iconTheme.description();
 }
 
 /*!
@@ -102,6 +104,7 @@
 {
     d_ptr->q_ptr = this;
     d_ptr->fetchCurrentThemeFromSettings();
+    HbThemeUtils::initSettings();
     d_ptr->handleThemeChange();
 }
 
@@ -143,23 +146,10 @@
 */
 void HbThemePrivate::fetchCurrentThemeFromSettings()
 {
-    QSettings&  settings = HbThemeUtils::getThemeSettings();
-    currentTheme = settings.value("currenttheme").toString();
-    
-    QString cleanCurrentTheme = currentTheme.trimmed();
-    
-    if (cleanCurrentTheme.isEmpty()) {
-        //cleanCurrentTheme = HbThemeUtils::defaultTheme();
-        // TEMP CHANGE: Use "sfblacktheme" as default theme,
-        // theme.theme still contains "hbdefault" as default theme, so that is used as parent theme in lookups
-        cleanCurrentTheme = "sfblacktheme";
-    }
-    
-    // If QSettings itself does not have clean name
-    if (cleanCurrentTheme != currentTheme) {
-        currentTheme = cleanCurrentTheme;
-        settings.setValue("currenttheme", currentTheme) ;
-        settings.sync();
+    currentTheme = HbThemeUtils::getThemeSetting(HbThemeUtils::CurrentThemeSetting);
+    if (currentTheme.trimmed().isEmpty()){
+        currentTheme = HbThemeUtils::defaultTheme().name;
+        HbThemeUtils::setThemeSetting(HbThemeUtils::CurrentThemeSetting, currentTheme);
     }
 }
 
@@ -171,28 +161,30 @@
     Q_Q(HbTheme);
     QString newTheme;
     if (str.isEmpty()) {
-    QSettings&  settings = HbThemeUtils::getThemeSettings();
-    settings.sync();
-    newTheme = settings.value("currenttheme").toString();
+        newTheme = HbThemeUtils::getThemeSetting(HbThemeUtils::CurrentThemeSetting);
     } else {
         newTheme = str;
+        // Update the new currentTheme setting in HbThemeUtils.
+        HbThemeUtils::updateThemeSetting(HbThemeUtils::CurrentThemeSetting, newTheme);
     }
 
     // Clear the theme index table offsets as the theme has changed.
     // New offsets will be retrieved from server when the index is accessed.
     themeIndex.clear();
 
-    HbIconTheme::global()->setCurrentTheme(newTheme);
-    HbColorTheme::global()->setCurrentTheme(newTheme);
-    HbEffectTheme::global()->setCurrentTheme(newTheme);
+    iconTheme.setCurrentTheme(newTheme);
+    HbColorTheme::instance()->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.
     if(currentTheme != newTheme) {
         currentTheme = newTheme;
-        // This signal should be used to replace pixmaps from the old theme with the pixmaps from the new theme
+        // 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.
-        emit q->changed ();
+        iconTheme.emitUpdateIcons();
+
+        emit q->changed();
         // This signal should be used to update the screen after the theme change - it's handled by HbInstance.
         emit q->changeFinished();
     }
@@ -201,16 +193,20 @@
 /*!
     Clears the contents to reload new css files
 */
-void HbThemePrivate::clearCache()
+void HbThemePrivate::updateTheme(const QStringList &updatedFiles)
 {
-    // Clear the icon directory list 
-    HbIconTheme::global()->clearDirList();
+    // Reload the CSS
+    HbColorTheme::instance()->reloadCss();
+    
+    // Reload effects
+    HbEffectInternal::reloadFxmlFiles();
 
-    // Reload the CSS
-    HbColorTheme::global()->reloadCss();
-    
+    iconTheme.emitUpdateIcons(updatedFiles);
+
     Q_Q(HbTheme);
     // Emit the theme changed signals so that the UI is refreshed.
-    emit q->changed ();
+    // Icons will updated if needed
+    emit q->changed();
+
     emit q->changeFinished();
 }
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/theme/hbtheme.h
--- a/src/hbcore/theme/hbtheme.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/theme/hbtheme.h	Mon May 03 12:48:33 2010 +0300
@@ -34,10 +34,7 @@
 class HbIconLoader;
 class HbLayeredStyleLoader;
 class HbThemeClientPrivate;
-
-#ifdef Q_OS_SYMBIAN
-class CThemeListenerPrivate;
-#endif
+class HbIconTheme;
 
 class HB_CORE_EXPORT HbTheme : public QObject
 {
@@ -47,7 +44,6 @@
     static HbTheme *instance();
     QString name() const;
     QString description() const;
-
 signals:
     void changed();
     void changeFinished();
@@ -60,14 +56,11 @@
     friend class HbThemeClientPrivate;
     friend class HbIconLoader;
     friend class HbIconLoaderPrivate;
+    friend class HbIconEngine;
     friend class HbLayeredStyleLoader;
     friend class HbWidgetLoader;
     friend class HbEffectController;
     friend class HbDeviceProfile;
-#ifdef Q_OS_SYMBIAN
-    friend class CThemeListenerPrivate;
-#endif
-
     Q_DECLARE_PRIVATE_D( d_ptr, HbTheme )
     Q_DISABLE_COPY(HbTheme)
 };
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/theme/hbtheme_p.h
--- a/src/hbcore/theme/hbtheme_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/theme/hbtheme_p.h	Mon May 03 12:48:33 2010 +0300
@@ -25,7 +25,7 @@
 #ifndef HBTHEME_P_H
 #define HBTHEME_P_H
 
-#include "hbthemeclient_p.h"
+#include "hbicontheme_p.h"
 #include "hbthemeindex_p.h"
 #include "hbtheme.h"
 
@@ -35,13 +35,16 @@
 public:
     void handleThemeChange(const QString &str = QString());
     void fetchCurrentThemeFromSettings();
-    void clearCache();
+    void updateTheme(const QStringList &updatedFiles);
     HbThemePrivate();
     ~HbThemePrivate();
     static HbThemePrivate *d_ptr(HbTheme *t) { return t->d_func(); }
+    static HbThemePrivate *instance() { return HbTheme::instance()->d_func(); }
+    QStringList iconDirectories() { return iconTheme.dirList();}
 
 public:
     QString currentTheme;
+	HbIconTheme iconTheme;
     ThemeIndexTables themeIndex;
     HbTheme* q_ptr;
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/theme/hbthemeclient_generic_p.cpp
--- a/src/hbcore/theme/hbthemeclient_generic_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/theme/hbthemeclient_generic_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -200,7 +200,7 @@
  * Returns the layout definition for the given file name,layout name,section name
 */
 
-LayoutDefinition *HbThemeClientPrivate::getSharedLayoutDefs(const QString &fileName,const QString &layout,const QString &section)
+HbWidgetLoader::LayoutDefinition *HbThemeClientPrivate::getSharedLayoutDefs(const QString &fileName,const QString &layout,const QString &section)
 {
     if ( !clientConnected ) {
         return 0;
@@ -255,7 +255,7 @@
     connect(localSocket, SIGNAL(readyRead()), this, SLOT(changeTheme()));
 
     if (sharedMLOffset >= 0) {
-        return HbMemoryUtils::getAddress<LayoutDefinition>(
+        return HbMemoryUtils::getAddress<HbWidgetLoader::LayoutDefinition>(
                 HbMemoryManager::SharedMemory, sharedMLOffset);
     } else {
         return 0;
@@ -664,7 +664,9 @@
         handleThemeChange(themeName);
     }
     if(EThemeContentUpdate == request) {
-        hbInstance->theme()->d_ptr->clearCache();
+        QStringList updatedFiles;
+        inputDataStream >> updatedFiles;
+        hbInstance->theme()->d_ptr->updateTheme(updatedFiles);
     }
 }
 
@@ -714,7 +716,7 @@
 #ifdef THEME_SERVER_TRACES
         qDebug() << Q_FUNC_INFO <<"themeChanged(): called";
 #endif
-        hbInstance->theme()->d_ptr->handleThemeChange();
+        hbInstance->theme()->d_ptr->handleThemeChange(themeName);
     }
 }
 
@@ -1025,7 +1027,7 @@
     localSocket->flush();
     localSocket->waitForReadyRead();
 #ifdef THEME_SERVER_TRACES
-    qDebug() <<"image req : " <<iconPath;
+    qDebug() <<"image req : " <<multiPartIconList;
 #endif
     QByteArray inputByteArray = localSocket->readAll();
     QDataStream inputDataStream(inputByteArray);
@@ -1072,3 +1074,133 @@
     return sharedIconInfoList;
 }
 
+/**
+ * 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;
+}
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/theme/hbthemeclient_p.cpp
--- a/src/hbcore/theme/hbthemeclient_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/theme/hbthemeclient_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -158,11 +158,12 @@
  * \a layout
  * \a section
  */  
-LayoutDefinition *HbThemeClient::getSharedLayoutDefs(const QString &fileName,const QString &layout,const QString &section)
+HbWidgetLoader::LayoutDefinition *HbThemeClient::getSharedLayoutDefs(const QString &fileName,const QString &layout,const QString &section)
 {
     int offset = sharedCacheItemOffset(fileName + layout + section);
     if ( -1 != offset ) {
-       LayoutDefinition *layoutDefs = HbMemoryUtils::getAddress<LayoutDefinition>(HbMemoryManager::SharedMemory,offset);
+       HbWidgetLoader::LayoutDefinition *layoutDefs =
+           HbMemoryUtils::getAddress<HbWidgetLoader::LayoutDefinition>(HbMemoryManager::SharedMemory,offset);
        return layoutDefs;
     }
     Q_D(HbThemeClient);
@@ -191,6 +192,16 @@
 }
 
 /**
+ * HbThemeClient::notifyForegroundLostToServer()
+ *
+ */
+void HbThemeClient::notifyForegroundLostToServer()
+{
+    Q_D(HbThemeClient);
+    d->notifyForegroundLostToServer();
+}
+
+/**
  * HbThemeClient::getSharedEffect()
  *
  * \a filePath
@@ -367,4 +378,33 @@
     return d->getMultiIconInfo(multiPartIconList, sizeList,aspectRatioMode, mode, mirrored, options, color);
 }
 
+/**
+ * freeSharedMemory  gets free memory in shared chunk
+ *
+ */
+int HbThemeClient::freeSharedMemory()
+{
+    Q_D(HbThemeClient);
+    return d->freeSharedMemory();
+}
 
+/**
+ * allocatedSharedMemory  gets allocated memory in shared chunk
+ *
+ */
+int HbThemeClient::allocatedSharedMemory()
+{
+    Q_D(HbThemeClient);
+    return d->allocatedSharedMemory();
+}
+
+/**
+ * allocatedHeapMemory  gets free memory in shared chunk
+ *
+ */
+int HbThemeClient::allocatedHeapMemory()
+{
+    Q_D(HbThemeClient);
+    return d->allocatedHeapMemory();
+}
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/theme/hbthemeclient_p.h
--- a/src/hbcore/theme/hbthemeclient_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/theme/hbthemeclient_p.h	Mon May 03 12:48:33 2010 +0300
@@ -28,6 +28,7 @@
 #include <qglobal.h>
 #include "hbiconloader_p.h"
 #include "hbthemecommon_p.h"
+#include "hbwidgetloader_p.h"
 #include "hbcssparser_p.h"
 #include "hbdeviceprofiledatabase_p.h"
 #include "hblayeredstyleloader_p.h"
@@ -36,7 +37,6 @@
 
 class HbThemeClientPrivate;
 class HbEffectFxmlData;
-struct LayoutDefinition;
 
 class HB_AUTOTEST_EXPORT HbThemeClient
 {
@@ -57,7 +57,7 @@
 
     QByteArray getSharedBlob(const QString &name);
 
-    LayoutDefinition *getSharedLayoutDefs(const QString &fileName,const QString &layout,const QString &section);
+    HbWidgetLoader::LayoutDefinition *getSharedLayoutDefs(const QString &fileName,const QString &layout,const QString &section);
 
     HbCss::StyleSheet *getSharedStyleSheet(const QString &filepath, HbLayeredStyleLoader::LayerPriority priority);
     
@@ -69,6 +69,8 @@
 
     int globalCacheOffset();
 
+    void notifyForegroundLostToServer();
+
     void unloadIcon(const QString& iconPath , 
                         const QSizeF &size,
                         Qt::AspectRatioMode aspectRatioMode,
@@ -108,6 +110,10 @@
     void createMemoryReport() const;
 #endif
 
+    int freeSharedMemory();
+    int allocatedSharedMemory();
+    int allocatedHeapMemory();
+
 public:
     static HbThemeClient *global();
     static void releaseInstance();
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/theme/hbthemeclient_p_p.h
--- a/src/hbcore/theme/hbthemeclient_p_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/theme/hbthemeclient_p_p.h	Mon May 03 12:48:33 2010 +0300
@@ -29,6 +29,7 @@
 #include <QIcon>
 #include "hbthemecommon_p.h"
 #include "hbiconloader_p.h"
+#include "hbwidgetloader_p.h"
 #include "hblayeredstyleloader_p.h"
 #include "hbdeviceprofile_p.h"
 #include "hbthemeindex_p.h"
@@ -41,10 +42,9 @@
 #include <e32base.h>
 #endif
 
-class CThemeListenerPrivate;
+class CHbThemeListenerPrivate;
 class QSizeF;
 class HbEffectFxmlData;
-struct LayoutDefinition;
 #ifndef Q_OS_SYMBIAN
 class QLocalSocket;
 #endif
@@ -75,7 +75,7 @@
                                        HbIconLoader::IconLoaderOptions options,
                                        const QColor &color);						
    
-    LayoutDefinition *getSharedLayoutDefs(const QString &fileName, const QString &layout, const QString &section);
+    HbWidgetLoader::LayoutDefinition *getSharedLayoutDefs(const QString &fileName, const QString &layout, const QString &section);
    
     HbCss::StyleSheet *getSharedStyleSheet(const QString &filepath, HbLayeredStyleLoader::LayerPriority priority);
 
@@ -116,9 +116,15 @@
                                         bool mirrored,
                                         HbIconLoader::IconLoaderOptions options,
                                         const QColor &color);
+   
+    void notifyForegroundLostToServer();
     
     void getThemeIndexTables(ThemeIndexTables &tables);
 
+    int freeSharedMemory();
+    int allocatedSharedMemory();
+    int allocatedHeapMemory();
+
     ~HbThemeClientPrivate();
     bool event(QEvent *e);
     
@@ -141,10 +147,11 @@
 
 private:
 #ifdef Q_OS_SYMBIAN
-    CThemeListenerPrivate *themelistener;
-    friend class CThemeListenerPrivate;
+    CHbThemeListenerPrivate *themelistener;
+    friend class CHbThemeListenerPrivate;
 #ifdef HB_SGIMAGE_ICON
     RSgDriver sgDriver;
+    bool sgDriverInit;
 #endif
 
 #else
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/theme/hbthemeclient_symbian_p.cpp
--- a/src/hbcore/theme/hbthemeclient_symbian_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/theme/hbthemeclient_symbian_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -41,9 +41,16 @@
 * constructor
 */
 HbThemeClientPrivate::HbThemeClientPrivate(): 
-    clientConnected(false), 
-    themelistener(new CThemeListenerPrivate(this))    
+    clientConnected(false) 
 {
+    if(THEME_SERVER_NAME != HbMemoryUtils::getCleanAppName()) {
+        themelistener = new CHbThemeListenerPrivate(this);
+    }
+
+
+#ifdef HB_SGIMAGE_ICON
+    sgDriverInit = false;    
+#endif
 }
 
 /**
@@ -54,7 +61,7 @@
 bool HbThemeClientPrivate::connectToServer()
 {
     TInt error(KErrNone);
-    for( int tries(0); tries < 2; tries++) {
+    for( int tries(0); tries < 100; tries++) {
         error = CreateSession(KThemeServerName, Version(), KDefaultMessageSlots);
         if(!error) {
             // connected to existing server - OK
@@ -72,8 +79,11 @@
         break; // server not launched : don't cycle round again.
     }
 #ifdef HB_SGIMAGE_ICON
-    if (!error) {
-        error = sgDriver.Open();       
+    if (!error && !sgDriverInit) {
+        error = sgDriver.Open();
+    	if (error == KErrNone) {
+            sgDriverInit = true;
+        }
     }
 #endif
     return ( clientConnected = (KErrNone == error) );
@@ -440,13 +450,13 @@
  *
  * Returns the layout definition for the given file name,layout name,section name
 */
-LayoutDefinition* HbThemeClientPrivate::getSharedLayoutDefs(const QString &fileName,const QString &layout,const QString &section)
+HbWidgetLoader::LayoutDefinition* HbThemeClientPrivate::getSharedLayoutDefs(const QString &fileName,const QString &layout,const QString &section)
 {
     if ( !clientConnected ) {
         return 0;
     }
 
-    LayoutDefinition* layoutDef(0);
+    HbWidgetLoader::LayoutDefinition* layoutDef(0);
 
     TBuf<256> fileDes(fileName.utf16());
     TBuf<256> layoutDes(layout.utf16());
@@ -461,7 +471,7 @@
    
     if (KErrNone == err) {
         if( widgetmlInfo.offset >=0){
-            layoutDef = HbMemoryUtils::getAddress<LayoutDefinition>(
+            layoutDef = HbMemoryUtils::getAddress<HbWidgetLoader::LayoutDefinition>(
                     HbMemoryManager::SharedMemory, widgetmlInfo.offset);
         }
     }
@@ -521,7 +531,7 @@
 #ifdef THEME_SERVER_TRACES
         qDebug() << Q_FUNC_INFO <<"themeChanged(): called";
 #endif
-        hbInstance->theme()->d_ptr->handleThemeChange();
+        hbInstance->theme()->d_ptr->handleThemeChange(themeName);
     }
 }
 
@@ -557,6 +567,12 @@
 HbThemeClientPrivate::~HbThemeClientPrivate()
 {
     RSessionBase::Close();
+#ifdef HB_SGIMAGE_ICON
+    if (sgDriverInit) {
+        sgDriver.Close();  
+        sgDriverInit = false;
+    }
+#endif
     delete themelistener;
 }
 
@@ -615,6 +631,8 @@
                                                             HbIconLoader::IconLoaderOptions options,
                                                             const QColor &color)
 {
+    Q_UNUSED(options)
+
     HbSharedIconInfoList sharedIconInfoList;
     
     if ( !clientConnected ) {
@@ -642,3 +660,67 @@
     return sharedIconInfoList;
 }
 
+/**
+ *  Notifies the server about the foreground lost event.
+ */
+void HbThemeClientPrivate::notifyForegroundLostToServer()
+{
+#if defined(HB_SGIMAGE_ICON) || defined(HB_NVG_CS_ICON)
+    TInt err = SendReceive(ENotifyForegroundLost);
+    if (KErrNone == err) {        
+        //ForegroundLostToServer Event is sent to server Successfully.
+    }
+#endif
+}
+
+/**
+ * HbThemeClientPrivate::freeSharedMemory()
+ */
+int HbThemeClientPrivate::freeSharedMemory()
+{
+    int freeSharedMem = -1;
+    if ( !clientConnected ) {
+        qWarning()<<"Theme client unable to connect to server in HbThemeClientPrivate::freeSharedMemory";
+        return freeSharedMem;
+    }
+
+    TPckg<int> freeInfo(freeSharedMem);
+    TIpcArgs args(0, &freeInfo);
+    TInt err = SendReceive(EFreeSharedMem, args);
+    qDebug() << "HbThemeClientPrivate::freeSharedMemory end";
+    return freeSharedMem;
+}
+
+/**
+ * HbThemeClientPrivate::allocatedSharedMemory()
+ */
+int HbThemeClientPrivate::allocatedSharedMemory()
+{
+    int allocatedSharedMem = -1;
+    if ( !clientConnected ) {
+        qWarning()<<"Theme client unable to connect to server in HbThemeClientPrivate::allocatedSharedMemory";
+        return allocatedSharedMem;
+    }
+
+    TPckg<int> allocatedInfo(allocatedSharedMem);
+    TIpcArgs args(0, &allocatedInfo);
+    TInt err = SendReceive(EAllocatedSharedMem, args);
+    return allocatedSharedMem;
+}
+
+/**
+ * HbThemeClientPrivate::allocatedHeapMemory()
+ */
+int HbThemeClientPrivate::allocatedHeapMemory()
+{
+    int allocatedHeapMem = -1;
+    if ( !clientConnected ) {
+        qWarning()<<"Theme client unable to connect to server in HbThemeClientPrivate::allocatedHeapMemory";
+        return allocatedHeapMem;
+    }
+
+    TPckg<int> allocatedInfo(allocatedHeapMem);
+    TIpcArgs args(0, &allocatedInfo);
+    TInt err = SendReceive(EAllocatedHeapMem, args);
+    return allocatedHeapMem;
+}
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/theme/hbthemeclientqt_p.h
--- a/src/hbcore/theme/hbthemeclientqt_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,109 +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 HBTHEMECLIENTQT_P_H
-#define HBTHEMECLIENTQT_P_H
-
-#include <QIcon>
-#include "hbthemecommon_p.h"
-#include "hbiconloader_p.h"
-#include "hbdeviceprofiledatabase_p.h"
-#include "hblayeredstyleloader_p.h"
-//ToDo: replace this with forward declaration
-#include "hbcssparser_p.h"
-#include "hbthemeindex_p.h"
-
-class QString;
-class QSizeF;
-class QLocalSocket;
-class HbEffectFxmlData;
-struct LayoutDefinition;
-
-class HB_AUTOTEST_EXPORT HbThemeClientPrivate : public QObject
-{
-    Q_OBJECT
-
-    public:
-    HbThemeClientPrivate();
-    bool connectToServer();
-
-    QSizeF getSharedIconDefaultSize(const QString& iconPath);
-
-    HbSharedIconInfo getSharedIconInfo(const QString& iconPath ,
-                                       const QSizeF &size,
-                                       Qt::AspectRatioMode aspectRatioMode,
-                                       QIcon::Mode mode,
-                                       bool mirrored,
-                                       HbIconLoader::IconLoaderOptions options,
-                                       const QColor &color);						
-   
-    LayoutDefinition *getSharedLayoutDefs(const QString &fileName, const QString &layout, const QString &section);
-   
-    HbCss::StyleSheet *getSharedStyleSheet(const QString &filepath, HbLayeredStyleLoader::LayerPriority priority);
-
-    HbEffectFxmlData *getSharedEffect(const QString &filePath);
-    
-    HbDeviceProfileList *deviceProfiles();
-
-    int globalCacheOffset();
-
-    bool addSharedEffect(const QString& filePath);
-    
-    void unloadIcon(const QString& iconPath , 
-                        const QSizeF &size,
-                        Qt::AspectRatioMode aspectRatioMode,
-                        QIcon::Mode mode,
-                        bool mirrored,
-                        const QColor &color);
-
-    HbSharedIconInfo getMultiPartIconInfo(const QStringList &multiPartIconList, 
-                        const HbMultiPartSizeData &multiPartIconData,
-                        const QSizeF &size,
-                        Qt::AspectRatioMode aspectRatioMode,
-                        QIcon::Mode mode,
-                        bool mirrored,
-                        HbIconLoader::IconLoaderOptions options,
-                        const QColor &color);
-    bool event(QEvent *e);
-
-    void getThemeIndexTables(ThemeIndexTables &tables);
-
-    ~HbThemeClientPrivate();
-    
-public slots:
-    void changeTheme();
-
-public:
-    bool clientConnected;
-
-private:
-    void readIconInfo(QDataStream &dataStream, HbSharedIconInfo &iconInfo);
-    void handleThemeChangeRequest(QDataStream &dataStream);
-
-private:
-    QLocalSocket* localSocket;
-};
-
-#endif // HBTHEMECLIENTQT_P_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/theme/hbthemeclientsymbian_p.cpp
--- a/src/hbcore/theme/hbthemeclientsymbian_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,537 +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 "hbthemeclientsymbian_p.h"
-#include "hbthemesymbiancommon_p.h"
-#include "hbthemelistener_p.h"
-#include "hbmemorymanager_p.h"
-#include "hbeffectfxmldata_p.h"
-
-#include <QFile>
-#include <QDebug>
-#include <QTime>
-
-const TUint KDefaultMessageSlots = 4;
-
-/**
-* constructor
-*/
-HbThemeClientPrivate::HbThemeClientPrivate(): 
-    clientConnected(false),
-    themelistener( new CThemeListenerPrivate() )    
-{
-}
-
-/**
-* HbThemeClientPrivate::connectToServer()
-*
-* Connects to the server
-*/
-bool HbThemeClientPrivate::connectToServer()
-{
-   
-    TInt error = StartServer();
-    
-    if ( KErrNone == error ) {
-        error = CreateSession(KThemeServerName, Version(), KDefaultMessageSlots);
-    }
-    return( clientConnected = (KErrNone == error ) );
-}
-
-/**
- * HbThemeClientPrivate::Version()
- *
- * Returns the version number
-*/  
-TVersion HbThemeClientPrivate::Version(void) const
-{
-    return(TVersion(KThemeServerMajorVersionNumber,
-                    KThemeServerMinorVersionNumber,
-                    KThemeServerBuildVersionNumber));
-}
-
-QSizeF HbThemeClientPrivate::getSharedIconDefaultSize(const QString& iconPath)
-{
-    if (!clientConnected) {
-        return QSizeF();
-    }
-    
-    QSizeF defaultSize;
-
-    TBuf<256> buffer(iconPath.utf16());
-    TPckg<QSizeF> retPckg(defaultSize);
-
-    TIconParams params;
-    params.fileName = buffer;
-    
-    TPckg<TIconParams> paramPckg(params);
-    TIpcArgs args(&paramPckg, &retPckg);
-    
-    TInt err = SendReceive(EIconDefaultSize, args);
-    if (KErrNone != err) {
-        defaultSize = QSizeF();
-    }
-    return defaultSize;
-}
-
-/**
- * HbThemeClientPrivate::getSharedIconInfo()
- *
- * Returns the shared icon information
-*/ 
-HbSharedIconInfo HbThemeClientPrivate::getSharedIconInfo(const QString& iconPath ,
-                        const QSizeF &size,
-                        Qt::AspectRatioMode aspectRatioMode,
-                        QIcon::Mode mode,
-                        bool mirrored,
-                        HbIconLoader::IconLoaderOptions options,
-                        const QColor &color )
-{
-    HbSharedIconInfo sharedIconInfo;
-    sharedIconInfo.type = INVALID_FORMAT;
-
-    if ( !clientConnected ) {
-        return sharedIconInfo;
-    }
-    
-    TBuf<256> buffer(iconPath.utf16());
-    TPckg<HbSharedIconInfo> iconInfo(sharedIconInfo);
-
-    TIconParams params;
-    params.fileName = buffer;
-    params.width = size.width();
-    params.height = size.height();
-    params.aspectRatioMode = (TUint8)aspectRatioMode;
-    params.mode = (TUint8)mode;
-    params.options = (TUint8)options;    
-    params.mirrored = (TBool)mirrored;
-    params.rgba = (TUint32) color.rgba();
-    params.colorflag = color.isValid();
-    
-    TPckg<TIconParams> paramPckg(params);
-    
-    TIpcArgs args(&paramPckg,&iconInfo);
-    
-    TInt err = SendReceive(EIconLookup, args);
-    if (KErrNone != err) {
-        sharedIconInfo.type  = INVALID_FORMAT;
-    }
-    return sharedIconInfo;
-}
-
-/**
- * getMultiPartIconInfo
- */
-
-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)
-{
-    HbSharedIconInfo sharedIconInfo;
-    sharedIconInfo.type = INVALID_FORMAT;
-
-    if ( !clientConnected ) {
-        return sharedIconInfo;
-    }
-
-    TPckg<HbSharedIconInfo> iconInfo(sharedIconInfo);
-    TMultiIconSymbParams params;
-    
-    TBuf<256> iconId(multiPartIconData.multiPartIconId.utf16());
-    params.multiPartIconId.Copy(iconId);
-    for (int i = 0; i < multiPartIconList.length(); i++) {
-        TBuf<256> pieceIconId(multiPartIconList[i].utf16());
-        params.multiPartIconList[i].Copy(pieceIconId);
-    }
-     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;
-    } 
-
-    for (int i = 0; i < noOfPieces; i++) {
-        params.sources[i] = (TRect &)multiPartIconData.sources[i];
-    }
-    for (int i = 0; i < noOfPieces; i++) {
-        params.targets[i] = (TRect &)multiPartIconData.targets[i];
-    }
-    for (int i = 0; i < noOfPieces; i++) {
-        params.pixmapSizes[i] = (TSize &)multiPartIconData.pixmapSizes[i];
-    }
-
-    params.size = size;
-    params.aspectRatioMode = (TUint8)aspectRatioMode;
-    params.mode = (TUint8)mode;
-    params.options = (TUint8)options;    
-    params.mirrored = (TBool)mirrored;
-    params.rgba = (TUint32) color.rgba();
-    params.colorflag = color.isValid();
-
-    TPckg<TMultiIconSymbParams> paramPckg(params);
-    TIpcArgs args(&paramPckg,&iconInfo);
-    TInt err = SendReceive(EMultiPieceIcon, args);
-    if (KErrNone != err) {
-        sharedIconInfo.type  = INVALID_FORMAT;
-    }
-    return sharedIconInfo;
-}
-
-
-
-/**
- * HbThemeClientPrivate::getSharedStyleSheet()
- *
- * Returns the shared css(stylesheet) information
-*/ 
-HbCss::StyleSheet *HbThemeClientPrivate::getSharedStyleSheet(const QString &fileName, HbLayeredStyleLoader::LayerPriority priority)
-{
-    if ( !clientConnected ) {
-        return 0;
-    }
-    HbCss::StyleSheet* styleSheet(0);
-    	
-    TBuf<256> fileDes(fileName.utf16());
-    TBuf<5> layerPriority;
-    layerPriority.AppendNum((TInt)priority);
-    
-    HbSharedStyleSheetInfo stylesheetInfo;
-    TPckg<HbSharedStyleSheetInfo> sharedInfo(stylesheetInfo);
-    
-    //TInt fileOffset = -1;
-    TIpcArgs args(&fileDes, &layerPriority, &sharedInfo);
-
-#ifdef THEME_SERVER_TRACES
-    QTime time;
-    time.start();
-#endif
-    TInt err = SendReceive(EStyleSheetLookup, args);
-#ifdef THEME_SERVER_TRACES
-    qDebug("Time elapsed in IPC is : %d ms", time.elapsed());
-#endif
-    
-    if (KErrNone == err) {
-        if (stylesheetInfo.offset >= 0) {
-            styleSheet = HbMemoryUtils::getAddress<HbCss::StyleSheet>(
-                HbMemoryManager::SharedMemory, stylesheetInfo.offset);
-        }
-    }
-    return styleSheet;
-}
-
-/**
- * HbThemeClientPrivate::getSharedEffect()
- *
- * Returns the shared effect information
-*/ 
-HbEffectFxmlData *HbThemeClientPrivate::getSharedEffect(const QString &filePath)
-{
-#ifdef THEME_SERVER_TRACES  
-    qDebug() << "HbThemeClientPrivate::getSharedEffect" << filePath;
-#endif
-    if ( !clientConnected ) {
-        return 0;
-    }
-
-    HbEffectFxmlData *fxmlData = 0;
-    
-    TBuf<256> fileDes(filePath.utf16());
-    HbSharedEffectInfo effectInfo;
-    
-    TPckg<HbSharedEffectInfo> sharedInfo(effectInfo);
-        
-    TIpcArgs args(&fileDes, &sharedInfo);
-
-#ifdef THEME_SERVER_TRACES
-    QTime time;
-    time.start();
-#endif
-    TInt err = SendReceive(EEffectLookupFilePath, args);
-#ifdef THEME_SERVER_TRACES
-    qDebug() << "Time elapsed in EEffectLookupFilePath IPC is : %d ms" << time.elapsed();
-#endif
-    
-    if (KErrNone == err) {
-#ifdef THEME_SERVER_TRACES    
-        qDebug() << "HbThemeClientPrivate::getSharedEffect effectInfo.offSet is:" <<  effectInfo.offset;
-#endif
-        if (effectInfo.offset >= 0) {
-            fxmlData = HbMemoryUtils::getAddress<HbEffectFxmlData>(
-                HbMemoryManager::SharedMemory, effectInfo.offset);
-        } else {
-            qWarning() << "get effect offset error!" << effectInfo.offset;
-        }
-    } else {
-        qWarning() << "get effect sendreceive error!" << (int)err;
-    }
-    return fxmlData;
-}
- 
-/**
- * HbThemeClientPrivate::addSharedEffect()
- *
- * Adds the shared effect information
-*/    
-bool HbThemeClientPrivate::addSharedEffect(const QString& filePath)
-{
-#ifdef THEME_SERVER_TRACES    
-    qDebug() << "HbThemeClientPrivate::addSharedEffect" << filePath;
-#endif
-    if ( !clientConnected ) {
-        return false;
-    }
-
-    TBuf<256> fileDes(filePath.utf16());
-    TInt retVal = KErrGeneral;
-        
-    TPckg<TInt> sharedInfo(retVal);
-            
-    TIpcArgs args(&fileDes, &sharedInfo);
-
-#ifdef THEME_SERVER_TRACES
-    QTime time;
-    time.start();
-#endif
-    TInt err = SendReceive(EEffectAdd, args);
-#ifdef THEME_SERVER_TRACES
-    qDebug("Time elapsed in EEffectAdd IPC is : %d ms", time.elapsed());
-#endif
-    
-    if (KErrNone == err) {
-        TInt result = sharedInfo();
-#ifdef THEME_SERVER_TRACES    
-        qDebug() << "TInt result (offset):" << result;
-#endif
-       
-        if (result >= 0) {
-#ifdef THEME_SERVER_TRACES    
-            qDebug() << "add effect results returning TRUE";
-#endif
-            return true;
-        }
-        qWarning() << "add effect offset error!" << (int) result;
-    } else {
-        qWarning() << "add effect sendreceive error!" << (int) err;
-    }
-    return false;
-}
-
-/**
- * HbThemeClientPrivate::unloadIcon()
- *
- * unload icon
-*/  
-void HbThemeClientPrivate::unloadIcon(const QString& iconPath ,
-                        const QSizeF &size,
-                        Qt::AspectRatioMode aspectRatioMode,
-                        QIcon::Mode mode,
-                        bool mirrored,
-                        const QColor &color)
-{
-    if ( !clientConnected ) {
-        return;
-    }
-    
-    TBuf<256> buffer(iconPath.utf16());
-    
-    TIconParams params;
-    params.fileName = buffer;
-    params.width = size.width();
-    params.height = size.height();
-    params.aspectRatioMode = (TUint8)aspectRatioMode;
-    params.mode = (TUint8)mode;
-    params.options = (TUint8)0;    
-    params.mirrored = (TBool)mirrored;
-    params.rgba = (TUint32) color.rgba();
-    params.colorflag = color.isValid();
-    
-    TPckg<TIconParams> paramPckg(params);
-    TIpcArgs args(&paramPckg,0);
-    SendReceive(EUnloadIcon, args);
-}
-
-/**
- * HbThemeClientPrivate::getSharedLayoutDefs()
- *
- * Returns the layout definition for the given file name,layout name,section name
-*/
-LayoutDefinition* HbThemeClientPrivate::getSharedLayoutDefs(const QString &fileName,const QString &layout,const QString &section)
-{
-    if ( !clientConnected ) {
-        return 0;
-    }
-
-    LayoutDefinition* layoutDef(0);
-
-    TBuf<256> fileDes(fileName.utf16());
-    TBuf<256> layoutDes(layout.utf16());
-    TBuf<256> sectionDes(section.utf16());
-
-    HbSharedWMLInfo widgetmlInfo;
-    TPckg<HbSharedWMLInfo> wmlInfo(widgetmlInfo);
-
-    TIpcArgs args(&fileDes,&layoutDes,&sectionDes,&wmlInfo);
-
-    TInt err = SendReceive(EWidgetMLLookup, args);
-   
-    if (KErrNone == err) {
-        if( widgetmlInfo.offset >=0){
-            layoutDef = HbMemoryUtils::getAddress<LayoutDefinition>(
-                    HbMemoryManager::SharedMemory, widgetmlInfo.offset);
-        }
-    }
-    return layoutDef;
-}
-
-/*
-Returns the list of Device Profiles.
-*/
-HbDeviceProfileList *HbThemeClientPrivate::deviceProfiles()
-{
-    if ( !clientConnected ) {
-		if(!connectToServer()) {
-        	qWarning()<<"Theme client unable to connect to server in HbThemeClientPrivate::deviceProfiles";
-	    	return 0;
-        }
-    }
-
-    HbDeviceProfileList *deviceProfiles(0);
-    HbDeviceProfileInfo deviceProfileInfo;
-    TPckg<HbDeviceProfileInfo> profileInfo(deviceProfileInfo);
-    TIpcArgs args(&profileInfo);
-    TInt err = SendReceive(EDeviceProfileOffset, args);
-    if (KErrNone == err) {
-        if( deviceProfileInfo.offset >= 0) {
-            deviceProfiles = HbMemoryUtils::getAddress<HbDeviceProfileList>(
-                    HbMemoryManager::SharedMemory, deviceProfileInfo.offset);
-        }
-    }
-    return deviceProfiles;
-}
-
-int HbThemeClientPrivate::globalCacheOffset()
-{
-    int offset = -1;
-    if ( !clientConnected ) {
-        qWarning()<<"Theme client unable to connect to server in HbThemeClientPrivate::globalCacheOffset";
-        return offset;
-    }
-
-    HbSecondaryCacheInfo sharedCacheInfo;
-    TPckg<HbSecondaryCacheInfo> cacheInfo(sharedCacheInfo);
-    TIpcArgs args(&cacheInfo);
-    TInt err = SendReceive(ESecondaryCacheOffset, args);
-    if (KErrNone == err) {
-        offset = sharedCacheInfo.offset;
-    }
-    return offset;
-}
-
-void HbThemeClientPrivate::getThemeIndexTables(ThemeIndexTables &tables)
-{
-    TPckg<ThemeIndexTables> pack(tables);
-    TIpcArgs args(&pack);
-    SendReceive(EThemeIndex, args);
-
-    if (tables.tables[0] >= 0) {
-        tables.tables[0] = reinterpret_cast<int>(HbMemoryUtils::getAddress<char>(
-            HbMemoryManager::SharedMemory, tables.tables[0]));
-    }
-    if (tables.tables[1] >= 0) {    
-        tables.tables[1] = reinterpret_cast<int>(HbMemoryUtils::getAddress<char>(
-                HbMemoryManager::SharedMemory, tables.tables[1]));
-    }
-
-    if (tables.tables[2] >= 0) {    
-        tables.tables[2] = reinterpret_cast<int>(HbMemoryUtils::getAddress<char>(
-            HbMemoryManager::SharedMemory, tables.tables[2]));
-    }
-
-    if (tables.tables[3] >= 0) {    
-        tables.tables[3] = reinterpret_cast<int>(HbMemoryUtils::getAddress<char>(
-            HbMemoryManager::SharedMemory, tables.tables[3]));
-    }
-}
-
-
-/**
- * Destructor
- */
-HbThemeClientPrivate::~HbThemeClientPrivate()
-{
-    RSessionBase::Close();
-    delete themelistener;
-}
-
-/**
- * StartServer
- */
-TInt HbThemeClientPrivate::StartServer()
-{
-    TFindServer findThemeServer(KThemeServerName);
-    TFullName name;
-    if ( KErrNone == findThemeServer.Next( name ) ) {
-        // Server already running
-        return KErrNone;
-    }
-    return CreateServerProcess();
-}
-
-/**
- * CreateServerProcess
- */
-TInt HbThemeClientPrivate::CreateServerProcess()
-{
-    TInt result;
-    const TUid KServerUid2={0x100039CE};
-    const TUidType serverUid( KNullUid, KServerUid2, KServerUid3 );
-    RProcess server;
-    _LIT(KThemeServerExe,"hbthemeserver.exe");
-    
-    result = server.Create( KThemeServerExe, KNullDesC, EOwnerProcess );
-    
-    if (KErrNone != result) {
-        return  result; 
-    }
-    else {
-        TRequestStatus status;
-        server.Rendezvous(status);
-        if (status!=KRequestPending) {
-            server.Kill(0); // abort startup
-        }
-        else {
-            server.Resume(); // logon OK - start the server
-        }
-        User::WaitForRequest(status);// wait for start or death
-        server.Close();
-        return status.Int(); // return the error
-    }
-}
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/theme/hbthemeclientsymbian_p.h
--- a/src/hbcore/theme/hbthemeclientsymbian_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,130 +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 HBTHEMECLIENTSYMBIAN_P_H
-#define HBTHEMECLIENTSYMBIAN_P_H
-
-
-#include <QIcon>
-
-#include "hbthemecommon_p.h"
-#include "hbiconloader_p.h"
-#include "hblayeredstyleloader_p.h"
-//ToDo: replace this with forward declaration
-#include "hbcssparser_p.h"
-#include "hbdeviceprofile_p.h"
-#include "hbthemeindex_p.h"
-#ifdef HB_SGIMAGE_ICON
-#include <sgresource/sgimage.h>
-#endif
-#if !defined(__E32BASE_H__)
-#include <e32base.h>
-#endif
-
-class CThemeListenerPrivate;
-class QSizeF;
-class HbEffectFxmlData;
-struct LayoutDefinition;
-
-class HB_AUTOTEST_EXPORT HbThemeClientPrivate : public RSessionBase
-{
-public:
-    HbThemeClientPrivate();
-
-    bool connectToServer();
-
-    QSizeF getSharedIconDefaultSize(const QString& iconPath);
-
-    HbSharedIconInfo getSharedIconInfo(const QString& iconPath ,
-                                       const QSizeF &size,
-                                       Qt::AspectRatioMode aspectRatioMode,
-                                       QIcon::Mode mode,
-                                       bool mirrored,
-                                       HbIconLoader::IconLoaderOptions options,
-                                       const QColor &color);
-
-    HbCss::StyleSheet *getSharedStyleSheet(const QString &filepath, HbLayeredStyleLoader::LayerPriority priority);
-
-    LayoutDefinition *getSharedLayoutDefs(const QString &fileName,const QString &layout,const QString &section);
-
-    HbDeviceProfileList *deviceProfiles();
-
-    int globalCacheOffset();
- 
-    void unloadIcon(const QString& iconPath,
-                    const QSizeF &size,
-                    Qt::AspectRatioMode aspectRatioMode,
-                    QIcon::Mode mode,
-                    bool mirrored,
-                    const QColor &color);
-    
-    void unLoadMultiIcon(const QStringList& iconPathList, 
-                    const QVector<QSizeF> &sizeList,
-                    Qt::AspectRatioMode aspectRatioMode,
-                    QIcon::Mode mode,
-                    bool mirrored,
-                    const QColor &color);   
-    
-    HbEffectFxmlData *getSharedEffect(const QString &filePath);
-    
-    bool addSharedEffect(const QString &filePath);
-    
-    void getThemeIndexTables(ThemeIndexTables &tables);
-	
-    HbSharedIconInfo getMultiPartIconInfo(const QStringList &multiPartIconList, 
-                                          const HbMultiPartSizeData &multiPartIconData ,
-                                          const QSizeF &size,
-                                          Qt::AspectRatioMode aspectRatioMode,
-                                          QIcon::Mode mode,
-                                          bool mirrored,
-                                          HbIconLoader::IconLoaderOptions options,
-                                          const QColor &color);
-    
-    HbSharedIconInfoList getMultiIconInfo(const QStringList &multiPartIconList, 
-                                        const QVector<QSizeF>  &sizeList ,
-                                        Qt::AspectRatioMode aspectRatioMode,
-                                        QIcon::Mode mode,
-                                        bool mirrored,
-                                        HbIconLoader::IconLoaderOptions options,
-                                        const QColor &color);
-    
-    ~HbThemeClientPrivate();
-    
-public:
-    bool clientConnected;
-
-private:
-    TVersion Version() const;
-    TInt StartServer();
-    TInt CreateServerProcess();
-    
-private:
-    CThemeListenerPrivate *themelistener;
-#ifdef HB_SGIMAGE_ICON
-    RSgDriver sgDriver;
-#endif
-};
-
-#endif /* HBTHEMECLIENTSYMBIAN_P_H */
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/theme/hbthemecommon_p.h
--- a/src/hbcore/theme/hbthemecommon_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/theme/hbthemecommon_p.h	Mon May 03 12:48:33 2010 +0300
@@ -40,7 +40,8 @@
 #define THEME_SERVER_NAME "hbthemeserver"
 #define HB_THEME_SHARED_PIXMAP_CHUNK "themeserver_chunk"
 #define ORGANIZATION "Nokia"
-#define THEME_COMPONENT "ThemeFramework"
+#define THEME_COMPONENT "Hb Themes"
+#define CURRENT_THEME_KEY "CurrentTheme"
 
 // To enable/disable debug messages for theme server functionality
 // this is master trace switch that enables all theme server related traces
@@ -242,6 +243,7 @@
 // Function codes (opcodes) used in message passing between client and server
 enum HbThemeServerRequest
     {
+     EInvalidServerRequest = 0,
      EIconLookup = 1,
      EIconDefaultSize,
      EStyleSheetLookup,
@@ -251,6 +253,7 @@
      EWidgetMLLookup,
      EDeviceProfileOffset,
      ESecondaryCacheOffset,
+     ENotifyForegroundLost,
  #ifdef HB_ICON_CACHE_DEBUG
      EIconCleanUp,
      ECacheIconCount,
@@ -288,7 +291,10 @@
      EMemoryGood,
      EFreeRam,
      EThemeServerStop,
-     EThemeIndex	 
+     EThemeIndex,
+     EFreeSharedMem,
+     EAllocatedSharedMem,
+     EAllocatedHeapMem
 #ifdef HB_THEME_SERVER_MEMORY_REPORT
      ,ECreateMemoryReport
 #endif
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/theme/hbthemecommon_symbian_p.h
--- a/src/hbcore/theme/hbthemecommon_symbian_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/theme/hbthemecommon_symbian_p.h	Mon May 03 12:48:33 2010 +0300
@@ -74,6 +74,8 @@
 // server name
 _LIT(KThemeServerName,"hbthemeserver");
 const TUid KServerUid3={0x20022E82};
+// Common unique ID for Pub/Sub
+const TInt KNewThemeForThemeChanger = 9;
 
 // A version must be specifyed when creating a session with the server
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/theme/hbthemelistener_symbian_p.cpp
--- a/src/hbcore/theme/hbthemelistener_symbian_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/theme/hbthemelistener_symbian_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -43,7 +43,7 @@
 /**
  * Constructor
  */
-CThemeListenerPrivate::CThemeListenerPrivate(HbThemeClientPrivate *themeClient)
+CHbThemeListenerPrivate::CHbThemeListenerPrivate(HbThemeClientPrivate *themeClient)
                       : CActive(EPriorityNormal), themeClient(themeClient)
 {
     User::LeaveIfError(themeState.Attach(KServerUid3,KThemeName));
@@ -56,7 +56,7 @@
 /**
  * Destructor
  */
-CThemeListenerPrivate::~CThemeListenerPrivate()
+CHbThemeListenerPrivate::~CHbThemeListenerPrivate()
 {
     Cancel();
     themeState.Close();
@@ -65,10 +65,10 @@
 /**
  * RunL
  */
-void CThemeListenerPrivate::RunL()
+void CHbThemeListenerPrivate::RunL()
 {
 #ifdef THEME_LISTENER_TRACES
-    qDebug() << "CThemeListenerPrivate::RunL: start\n appname"<<HbMemoryUtils::getCleanAppName();
+    qDebug() << "CHbThemeListenerPrivate::RunL: start\n appname"<<HbMemoryUtils::getCleanAppName();
 #endif
     themeState.Subscribe(iStatus);
     SetActive();    
@@ -80,9 +80,9 @@
     QString str((QChar*)name.Ptr(),name.Length());
 #ifdef THEME_LISTENER_TRACES
     if (r==KErrNone) {
-        qDebug() << "CThemeListenerPrivate::RunL: Get() Themename" <<str; 
+        qDebug() << "CHbThemeListenerPrivate::RunL: Get() Themename" <<str; 
     } else {
-        qDebug() << "CThemeListenerPrivate::RunL: Get() Error!!!!!!!!";
+        qDebug() << "CHbThemeListenerPrivate::RunL: Get() Error!!!!!!!!";
     }
 #endif
     themeClient->handleThemeChange(str);
@@ -92,7 +92,7 @@
 /**
  * DoCancel
  */
-void CThemeListenerPrivate::DoCancel()
+void CHbThemeListenerPrivate::DoCancel()
 {
     themeState.Cancel();
 }
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/theme/hbthemelistener_symbian_p.h
--- a/src/hbcore/theme/hbthemelistener_symbian_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/theme/hbthemelistener_symbian_p.h	Mon May 03 12:48:33 2010 +0300
@@ -29,12 +29,12 @@
 #include <e32base.h>
 #include <e32property.h> 
 
-class CThemeListenerPrivate:public CActive
+class CHbThemeListenerPrivate:public CActive
 {
 public:
     //themeClient is notified, when the theme changes.
-    CThemeListenerPrivate(HbThemeClientPrivate *themeClient);
-    ~CThemeListenerPrivate();
+    CHbThemeListenerPrivate(HbThemeClientPrivate *themeClient);
+    ~CHbThemeListenerPrivate();
 private:
     void RunL();
     void DoCancel();
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/theme/hbthemeutils_p.cpp
--- a/src/hbcore/theme/hbthemeutils_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/theme/hbthemeutils_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -31,35 +31,55 @@
 #include <QtDebug>
 #include <QDir>
 #include <QMap>
+#include <QVariant>
 
 #include <hbapplication.h>
-
+#include <hbtheme.h>
 #include "hbstandarddirs_p.h"
 #include "hbiniparser_p.h"
 #include "hblayeredstyleloader_p.h"
 #include "hbthemecommon_p.h"
 
-static const QString iconsResourceFolder("icons");
-static const QString effectsResourceFolder("effects");
-static const QString styleResourceFolder("style");
-static const QString themeResourceFolder("theme");
+#ifdef Q_OS_SYMBIAN
+#include "hbthemecommon_symbian_p.h"
+#include <e32std.h>
+#endif
+
+// Standard folder names
 
-static const QString &getResourceFolderName(Hb::ResourceType resType)
+const char *HbThemeUtils::iconsResourceFolder = "icons";
+const char *HbThemeUtils::effectsResourceFolder = "effects";
+const char *HbThemeUtils::styleResourceFolder = "style";
+const char *HbThemeUtils::themeResourceFolder = "theme";
+const char *HbThemeUtils::operatorHierarchy = "operatortheme";
+const char *HbThemeUtils::appHierarchy = "apptheme";
+const char *HbThemeUtils::platformHierarchy = "themes";
+
+const char *operatorBasePathKey = "OperatorBasePath";
+static const char *themeSettingFile = "theme.theme";
+static const char *baseThemeVariable = "BaseTheme";
+static const char *defaultThemeVariable = "DefaultActiveTheme";
+
+// These are the used setting names corresponding to HbThemeUtils::Setting enumeration.
+// Value 0 is not used to be able to change the implementation to use Symbian's Cenrep if needed.
+static const QString settingNames[6] = {"", "currenttheme", "defaulttheme", "defaultthemedir", "basetheme", "operatorbasepath"};
+
+static const char *getResourceFolderName(Hb::ResourceType resType)
 {
     switch(resType) {
     case Hb::IconResource:
-        return iconsResourceFolder;
+        return HbThemeUtils::iconsResourceFolder;
     case Hb::EffectResource:
-        return effectsResourceFolder;
+        return HbThemeUtils::effectsResourceFolder;
     case Hb::ThemeResource:
-        return themeResourceFolder;
+        return HbThemeUtils::themeResourceFolder;
     case Hb::StyleSheetResource:
-        return styleResourceFolder;
+        return HbThemeUtils::styleResourceFolder;
     default:
         break;
     }
     // This just to avoid warning
-    return iconsResourceFolder;
+    return HbThemeUtils::iconsResourceFolder;
 }
 
 /*!
@@ -78,23 +98,82 @@
 class HbThemeUtilsPrivate
 {
 public:
-    HbThemeUtilsPrivate()
+    HbThemeUtilsPrivate() : settingsRetrieved(false)
     {
          // add the operator level, app level and platform level hierarchies in the hierarchy list.
-        hierarchy<<HbThemeUtils::operatorHierarchy()
-                <<HbThemeUtils::appHierarchy()
-                <<HbThemeUtils::platformHierarchy();
+        hierarchies << HbHierarchy(HbThemeUtils::operatorHierarchy, HbLayeredStyleLoader::Priority_Operator)
+#ifdef USE_APPTHEMES
+                    << HbHierarchy(HbThemeUtils::appHierarchy, HbLayeredStyleLoader::Priority_Application)
+#endif
+                    << HbHierarchy(HbThemeUtils::platformHierarchy, HbLayeredStyleLoader::Priority_Theme);
         // @todo: The operator name has been hard-coded here. Will be removed once it is decided on how to
         // get the operator name.
         operatorName = "myoperator";
     }
+    QString constructOperatorPath(const QString &basePath, const QString &resourcePath, const QString &fileName) const
+    {
+        return basePath + resourcePath + '/' + operatorName + '/' + fileName;
+    }
+    void initSettings();
 
+    void readSettings();
+
+public: // data
     QString operatorName;
-    QStringList hierarchy;
+    QVector<HbHierarchy> hierarchies;
+
+    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 operatorBasePath;
 };
 
+void HbThemeUtilsPrivate::initSettings()
+{
+    //server gets and stores the operator path to settings, clients only read it.
+    if (HbMemoryUtils::getCleanAppName()== THEME_SERVER_NAME) {
+        QStringList operatorPath;
+        operatorPath << QLatin1String(HbThemeUtils::operatorHierarchy) + '/';
+        operatorPath = HbStandardDirs::findExistingFolderList(operatorPath, QString(), Hb::IconResource);
+        if (operatorPath.size() > 0) {
+            operatorBasePath = operatorPath.at(0);
+        }
+        HbThemeUtils::setThemeSetting(HbThemeUtils::OperatorBasePathSetting, operatorBasePath);
+    } else {
+        operatorBasePath = HbThemeUtils::getThemeSetting(HbThemeUtils::OperatorBasePathSetting).trimmed();
+    }
+}
+
+void HbThemeUtilsPrivate::readSettings()
+{
+    // Read settings from QSettings and store them in member variables to
+    // avoid slow instantiating of QSettings in advance.
+
+    // The only changing setting is currentThemeSetting and its value is updated in theme change event.
+
+    if (!settingsRetrieved) {
+        QSettings settings(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();
+        operatorBasePath = settings.value(settingNames[HbThemeUtils::OperatorBasePathSetting]).toString();
+
+        settingsRetrieved = true;
+    }
+}
+
 static HbThemeUtilsPrivate d;
 
+void HbThemeUtils::initSettings()
+{
+    d.initSettings();
+}
+
 /* Adds a new hierarchy level to be used for attribute look-up
  * 
  * @param newHierrachy the name of the new hierrachy
@@ -104,23 +183,26 @@
  *
  * @return the positon in the new hierarchy in the hierarchy list. -1 if the new hierarchy is not added.
  */
+
 int HbThemeUtils::addHierarchy(const QString &newHierarchy, int priorityOrder)
 {    
     int retValue = -1;
     if (priorityOrder >= 0) {
         // check that the hierarchy to be added is neither of opertor level,app level and platform level.
-        if(newHierarchy != HbThemeUtils::operatorHierarchy() 
-           && newHierarchy != HbThemeUtils::appHierarchy() 
-           && newHierarchy != HbThemeUtils::platformHierarchy()){
+        if(newHierarchy != HbThemeUtils::operatorHierarchy
+            && newHierarchy != HbThemeUtils::appHierarchy
+            && newHierarchy != HbThemeUtils::platformHierarchy){
+
             // if priority given is more than the number of hierarchies already existing, append the new
             // hierarchy at end.
-            if (priorityOrder > d.hierarchy.count()) {
-                d.hierarchy.append(newHierarchy);
-                retValue = d.hierarchy.count() - 1;
+            HbHierarchy add(newHierarchy, HbLayeredStyleLoader::Priority_Theme);
+            if (priorityOrder > d.hierarchies.count()) {
+                d.hierarchies.append(add);
+                retValue = d.hierarchies.count() - 1;
             }
             // else insert it at the correct position
             else {
-                d.hierarchy.insert(priorityOrder, newHierarchy);
+                d.hierarchies.insert(priorityOrder,add);
                 retValue = priorityOrder;
             }
         }
@@ -128,30 +210,40 @@
     return retValue;
 }
 
-
 /* Removes a hierarchy level from the hierarchy list
  *
  * @param newHierrachy the name of the hierrachy to be removed.
  *
  * @ret true if the hierarchy has been removed, else false.
  */
-bool HbThemeUtils::removeHierarchy(const QString &hierarchy)
+bool HbThemeUtils::removeHierarchy(const QString &hierarchyName)
 {
     bool retValue = false;
     // check whether an attempt is made to remove operator level, app level or platform level hierarchy
-    if (hierarchy != HbThemeUtils::operatorHierarchy() 
-        && hierarchy != HbThemeUtils::appHierarchy() 
-        && hierarchy != HbThemeUtils::platformHierarchy()) {
-        retValue = d.hierarchy.removeOne(hierarchy);
+    if (hierarchyName != HbThemeUtils::operatorHierarchy
+        && hierarchyName != HbThemeUtils::appHierarchy
+        && hierarchyName != HbThemeUtils::platformHierarchy) {
+        QVector<HbHierarchy>::iterator end = d.hierarchies.end();
+        for (QVector<HbHierarchy>::iterator i = d.hierarchies.begin(); i != end; ++i) {
+            if (i->name == hierarchyName) {
+                d.hierarchies.erase(i);
+                retValue = true;
+                break;
+            }
+        }
     }
     return retValue;
 }
 
+QString HbThemeUtils::operatorBasePath()
+{
+    return d.operatorBasePath;
+}
 /* @ret hierarchy of themes in priority.
  */
-QStringList HbThemeUtils::hierarchy()
+QVector<HbHierarchy> HbThemeUtils::hierarchies()
 {
-   return d.hierarchy; 
+   return d.hierarchies;
 }
 
 /* It constructs the hierarchy list with complete path info using the existing hierarchy list.
@@ -166,96 +258,188 @@
                                                                    const QString &currentTheme,
                                                                    const Hb::ResourceType resType)
 {
-    Q_UNUSED(currentTheme);
     QMap<int,QString> hierarchyListWithPathInfo;
 
     // Map the resource enum to string here
-    const QString &resourceFolder = getResourceFolderName(resType);
-    
-    foreach (const QString &hierarchy, HbThemeUtils::hierarchy()) {
-        if (hierarchy == HbThemeUtils::operatorHierarchy()) {
-            hierarchyListWithPathInfo.insert(HbLayeredStyleLoader::Priority_Operator, (hierarchy + '/' + resourceFolder + '/' + d.operatorName + '/' + fileName));
-        }
-        else if (hierarchy == HbThemeUtils::appHierarchy()) {
-            QString exebasename = QFileInfo(QCoreApplication::applicationFilePath()).baseName();
-            hierarchyListWithPathInfo.insert(HbLayeredStyleLoader::Priority_Application, (hierarchy + '/' + exebasename + '/' + resourceFolder + '/' + currentTheme + '/' + fileName));
-        }
-        else if(hierarchy == HbThemeUtils::platformHierarchy()) {
-            hierarchyListWithPathInfo.insert(HbLayeredStyleLoader::Priority_Theme, (hierarchy + '/' + resourceFolder + '/' + currentTheme + '/' + fileName));
-        }
-        else {
+    const QString &resourcePath = getResourceFolderName(resType);
+
+    foreach (const HbHierarchy &hierarchy, d.hierarchies) {
+        switch(hierarchy.layerPriority) {
+        case HbLayeredStyleLoader::Priority_Operator:
+            if (!d.operatorBasePath.isEmpty()) {
+                hierarchyListWithPathInfo.insert(HbLayeredStyleLoader::Priority_Operator,
+                                                 d.constructOperatorPath(d.operatorBasePath, resourcePath, fileName));
+            }
+            break;
+        case HbLayeredStyleLoader::Priority_Application:
+            hierarchyListWithPathInfo.insert(HbLayeredStyleLoader::Priority_Application, 
+                    (hierarchy.name + '/' + HbMemoryUtils::getCleanAppName() + '/' + resourcePath + '/' + currentTheme + '/' + fileName));
+            break;
+        case HbLayeredStyleLoader::Priority_Theme:
+            // Add platform theme folder only if it is different from base theme
+            // Base theme is anyway added at the core priority
+            if (currentTheme != baseTheme().name) {
+                hierarchyListWithPathInfo.insert(HbLayeredStyleLoader::Priority_Theme, 
+                        (hierarchy.name + '/' + resourcePath + '/' + currentTheme + '/' + fileName));
+            }
+            break;
+        default:
             // this is for a new hierarchy level and for the time being HbLayeredStyleLoader::Priority_Theme prirority is used,since there is no enum defined in hblayeredstyleloader_p.h
             // priority should be replaced with respective enum.
-            hierarchyListWithPathInfo.insert(HbLayeredStyleLoader::Priority_Theme, (hierarchy + '/' + resourceFolder + '/' + currentTheme + '/' + fileName));
+            hierarchyListWithPathInfo.insert(HbLayeredStyleLoader::Priority_Theme, 
+                    (hierarchy.name + '/' + resourcePath + '/' + currentTheme + '/' + fileName));
         }
     }
     
-    if (resType == Hb::StyleSheetResource) {
-        // lets add default CSS path too in this list for now
-        // This comes last in fallback hierarchy
-        hierarchyListWithPathInfo.insert(HbLayeredStyleLoader::Priority_Core, ("themes/" + resourceFolder + '/' + defaultTheme() + '/' + fileName));
+    if (resType == Hb::StyleSheetResource || resType == Hb::EffectResource) {
+        // lets add base CSS path too in this list for now
+        // This comes last in base hierarchy
+        hierarchyListWithPathInfo.insert(HbLayeredStyleLoader::Priority_Core, 
+                (QLatin1String("themes/") + resourcePath + '/' + baseTheme().name + '/' + fileName));
     }
 
     return hierarchyListWithPathInfo;
 }
 
-
+/* returns information of base theme
+ */
+const HbThemeInfo &HbThemeUtils::baseTheme()
+{
+    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 in rom set
+            baseThemeInfo = getBaseThemeFromFile(HbStandardDirs::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();            
+        }
+    }
+    
+    return baseThemeInfo;
+}
 
 /* returns name of default theme
  */
-
-QString HbThemeUtils::defaultTheme()
+HbThemeInfo HbThemeUtils::defaultTheme()
 {
-    static QString defaultThemeName;
-    
-    // defaultThemeName is empty, means it was not yet filled with appropriate value
-    if (defaultThemeName.isEmpty()) {
-        HbIniParser iniParser;
+    // 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);
+}
+
+QString HbThemeUtils::getThemeSetting(Setting setting)
+{
+    // Make sure settings are read from QSettings.
+    d.readSettings();
 
-        // First check whether it is already stored in QSettings
-        QSettings&  settings = getThemeSettings();
-        defaultThemeName = settings.value("defaulttheme").toString();
+    switch (setting) {
+        case CurrentThemeSetting:
+            return d.currentTheme;
+        case DefaultThemeSetting:
+            return d.defaultTheme;
+        case DefaultThemeRootDirSetting:
+            return d.defaultThemeRootDir;
+        case BaseThemeSetting:
+            return d.baseTheme;
+        case OperatorBasePathSetting:
+            return d.operatorBasePath;
+        default:
+            return QString();
+    }
+}
 
-        // if not in QSettings, read from theme.theme file
-        if (defaultThemeName.isEmpty()) {
-            // Find theme.theme file
-            QString dir = "themes";
-            QString masterThemeFile = HbStandardDirs::findResource( dir + '/' + "themes" +
-                '/' + "theme.theme", Hb::ThemeResource);
+void HbThemeUtils::setThemeSetting(Setting setting, const QString &value)
+{
+    QSettings settings(QLatin1String(ORGANIZATION), QLatin1String(THEME_COMPONENT));
+    settings.setValue(settingNames[setting], QVariant(value));
+    // Destructor of QSettings flushes the changed setting in the INI file.
+}   
 
-            // Try to read file and get parameters
-            QFile themeFile(masterThemeFile);
-            if (!themeFile.open(QIODevice::ReadOnly) || !iniParser.read(&themeFile)){
-                qDebug() << "Can't access file";
-                return false;
-            } 
+/**
+* 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.
+* 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;
+            break;
+        case DefaultThemeSetting:
+            d.defaultTheme = value;
+            break;
+        case DefaultThemeRootDirSetting:
+            d.defaultThemeRootDir = value;
+            break;
+        case BaseThemeSetting:
+            d.baseTheme = value;
+            break;
+        case OperatorBasePathSetting:
+            d.operatorBasePath = 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;
 
-            //Find default theme index.theme file and clean it
-            defaultThemeName = iniParser.value("Default Theme", "Name").trimmed();
-            //Save Default theme
-            settings.setValue("defaulttheme", defaultThemeName);        
-        }
-        else {
+    if (themeSetting.open(QIODevice::ReadOnly) && iniParser.read(&themeSetting)){
+        themeInfo.name = iniParser.value("Default", baseThemeVariable).trimmed();
         
-            QString cleanDefThemeName = defaultThemeName.trimmed();         
-            // if stored default theme name is not clean, store the cleaned theme name
-            // (stored theme name may not be clean in case old implementaion which did not
-            //  handle dirty theme name, was run on the same device earlier.)
-            if (cleanDefThemeName != defaultThemeName) {
-                defaultThemeName = cleanDefThemeName;
-                settings.setValue("defaulttheme", defaultThemeName);
+        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;
+        }
+
+        // If there is any base theme
+        if (!themeInfo.name.isEmpty() && isThemeValid(HbThemeInfo(themeInfo.name,rootDir))) {
+            // Save these theme names in settings
+            setThemeSetting(BaseThemeSetting, themeInfo.name);
+            setThemeSetting(DefaultThemeRootDirSetting, rootDir);
+
+            // Store default theme also in settings, only if it is valid
+            if (themeInfo.name == defaultTheme || isThemeValid(HbThemeInfo(defaultTheme, rootDir))) {
+                setThemeSetting(DefaultThemeSetting, defaultTheme);
             }
+            themeInfo.rootDir = rootDir;
+            d.settingsRetrieved = false;
         }
     }
-    
-    return defaultThemeName;
+    return themeInfo;
 }
 
-/* returns settings for the theme
+/* checks whether the theme is valid
  */
-QSettings& HbThemeUtils::getThemeSettings()
-    {
-     static QSettings settings(QLatin1String(ORGANIZATION), QLatin1String(THEME_COMPONENT));
-     return settings;
-    }
-   
+bool HbThemeUtils::isThemeValid(const HbThemeInfo &themeInfo)
+{
+    // If the theme contains index.theme in icons resources
+    // it will be assumed valid
+    QFile themeIndexFile(themeInfo.rootDir + '/' + platformHierarchy + '/' + iconsResourceFolder + "/" + themeInfo.name + "/index.theme");
+    return themeIndexFile.open(QIODevice::ReadOnly);
+}
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/theme/hbthemeutils_p.h
--- a/src/hbcore/theme/hbthemeutils_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/theme/hbthemeutils_p.h	Mon May 03 12:48:33 2010 +0300
@@ -26,36 +26,84 @@
 #ifndef HBTHEMEUTILS_P_H
 #define HBTHEMEUTILS_P_H
 
-#include <QStringList>
+#include <QList>
 #include <hbglobal.h>
 #include <hbnamespace.h>
-#include <QSettings>
+#include <hblayeredstyleloader_p.h>
+#include <QPair>
+
+#undef USE_APPTHEMES
+
+struct HbHierarchy
+{
+    HbHierarchy() {}
+    HbHierarchy(QString name,
+                HbLayeredStyleLoader::LayerPriority layerPriority) : name(name),
+                                                                     layerPriority(layerPriority) {}
+    QString name;
+    HbLayeredStyleLoader::LayerPriority layerPriority;
+};
+
 
-class HB_AUTOTEST_EXPORT HbThemeUtils
+struct HbThemeInfo
+{
+    HbThemeInfo()
+    {
+    }
+    HbThemeInfo(const QString &themeName, const QString &dir):name(themeName),rootDir(dir)
+    {
+    }
+    QString name;
+    QString rootDir;
+
+};
+
+
+class HB_CORE_PRIVATE_EXPORT HbThemeUtils
 {
 public:
-    static QStringList hierarchy();
+    static QVector<HbHierarchy> hierarchies();
+    static void initSettings();
+
+//following methods for unittests only
     static int addHierarchy(const QString& newHierarchy, int priorityOrder);
     static bool removeHierarchy(const QString &hierarchy);
-    static QMap<int,QString> constructHierarchyListWithPathInfo(
+    static QString operatorBasePath();
+//unittest functions end.
+    static QMap<int, QString> constructHierarchyListWithPathInfo(
                                         const QString &fileName,
                                         const QString &currentTheme,
                                         const Hb::ResourceType resType );
 
-    static QSettings& getThemeSettings();
-    static QString operatorHierarchy()
-    {
-        return "operatortheme";
-    }
-    static QString appHierarchy()
+    enum Setting
     {
-        return "apptheme";
-    }
-    static QString platformHierarchy()
-    {
-        return "themes";
-    }
-    static QString defaultTheme();
+        CurrentThemeSetting = 1,
+        DefaultThemeSetting = 2,
+        DefaultThemeRootDirSetting = 3,
+        BaseThemeSetting = 4,
+        OperatorBasePathSetting = 5
+    };
+
+    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);
+
+    // Standard folder names
+    static const char *iconsResourceFolder;
+    static const char *effectsResourceFolder;
+    static const char *styleResourceFolder;
+    static const char *themeResourceFolder;
+    static const char *operatorHierarchy;
+    static const char *appHierarchy;
+    static const char *platformHierarchy;
+
+private:
+    static HbThemeInfo getBaseThemeFromFile(const QString &rootDir);
 };
 
 #endif //HBTHEMEUTILS_P_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/theme/theme.pri
--- a/src/hbcore/theme/theme.pri	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/theme/theme.pri	Mon May 03 12:48:33 2010 +0300
@@ -38,21 +38,21 @@
 SOURCES += $$PWD/hbthemeclient_p.cpp
 SOURCES += $$PWD/hbeffecttheme_p.cpp
 
-INTERNAL_HEADERS += $$PWD/hbthemecommon_p.h
-INTERNAL_HEADERS += $$PWD/hbtheme_p.h
-INTERNAL_HEADERS += $$PWD/hbthemeutils_p.h
-INTERNAL_HEADERS += $$PWD/hbcolortheme_p.h
-INTERNAL_HEADERS += $$PWD/hbcolortheme_p_p.h
-INTERNAL_HEADERS += $$PWD/hbcssthemeinterface_p.h
-INTERNAL_HEADERS += $$PWD/hbthemeclient_p.h
-INTERNAL_HEADERS += $$PWD/hbeffecttheme_p.h
-INTERNAL_HEADERS += $$PWD/hbthemeclient_p_p.h
+PRIVATE_HEADERS += $$PWD/hbthemecommon_p.h
+PRIVATE_HEADERS += $$PWD/hbtheme_p.h
+PRIVATE_HEADERS += $$PWD/hbthemeutils_p.h
+PRIVATE_HEADERS += $$PWD/hbcolortheme_p.h
+PRIVATE_HEADERS += $$PWD/hbcolortheme_p_p.h
+PRIVATE_HEADERS += $$PWD/hbcssthemeinterface_p.h
+PRIVATE_HEADERS += $$PWD/hbthemeclient_p.h
+PRIVATE_HEADERS += $$PWD/hbeffecttheme_p.h
+PRIVATE_HEADERS += $$PWD/hbthemeclient_p_p.h
 
 symbian {
 SOURCES += $$PWD/hbthemelistener_symbian_p.cpp
 SOURCES += $$PWD/hbthemeclient_symbian_p.cpp
-INTERNAL_HEADERS += $$PWD/hbthemelistener_symbian_p.h
-INTERNAL_HEADERS += $$PWD/hbthemecommon_symbian_p.h
+PRIVATE_HEADERS += $$PWD/hbthemelistener_symbian_p.h
+PRIVATE_HEADERS += $$PWD/hbthemecommon_symbian_p.h
 }
 
 !symbian {
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/utils/hbdeviceprofile.cpp
--- a/src/hbcore/utils/hbdeviceprofile.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/utils/hbdeviceprofile.cpp	Mon May 03 12:48:33 2010 +0300
@@ -28,12 +28,17 @@
 #include "hbinstance_p.h"
 #include "hbmemorymanager_p.h"
 #include "hbtheme_p.h"
+#include "hbthemeclient_p.h"
 #include <hbmainwindow.h>
 #include "hbmainwindow_p.h"
 
+#include <QDebug>
+
 // To store the pointer to the deviceProfiles at the client side.
 static HbDeviceProfileList *deviceProfilesList = NULL;
 
+#define MM_PER_INCH 25.4
+
 /*!
 	@stable
     @hbcore
@@ -74,12 +79,16 @@
 {
     if (d_ptr->deviceProfiles()) {
         int count = deviceProfilesList->count();
-        for (int i = 0; i < count; i++) {
+        bool found( false );
+        for (int i = 0; !found && i < count; i++) {
             if (deviceProfilesList->at(i).mName == name) {
                 d_ptr->mProfile = deviceProfilesList->at(i);
-                break;
+                found = true;
             }
         }
+        if (!found) {
+            qWarning() << "Device profile" << name << "not found!";
+        }
     }
 }
 
@@ -134,7 +143,9 @@
 */
 QSizeF HbDeviceProfile::physicalSize() const
 {
-    return d_ptr->mProfile.mPhysicalSize;
+    QSizeF physicalSize(d_ptr->mProfile.mLogicalSize);
+    physicalSize /= ppmValue();
+    return physicalSize;
 }
 
 /*!
@@ -142,7 +153,8 @@
 */
 Qt::Orientation HbDeviceProfile::orientation() const
 {
-    return d_ptr->mProfile.mOrientation;
+    QSize s = d_ptr->mProfile.mLogicalSize;
+    return (s.width() > s.height()) ? Qt::Horizontal : Qt::Vertical;
 }
 
 /*!
@@ -192,11 +204,7 @@
 */
 qreal HbDeviceProfile::ppmValue() const
 {
-    // Assuming square pixels
-    if (d_ptr->mProfile.mPhysicalSize.width() != 0) {
-        return d_ptr->mProfile.mLogicalSize.width() / d_ptr->mProfile.mPhysicalSize.width();
-    }
-    return 0.0;
+    return d_ptr->mProfile.mPpiValue / MM_PER_INCH;
 }
 
 /*!
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/utils/hbdeviceprofile_p.h
--- a/src/hbcore/utils/hbdeviceprofile_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/utils/hbdeviceprofile_p.h	Mon May 03 12:48:33 2010 +0300
@@ -34,18 +34,18 @@
 struct DeviceProfile
 {
     HbString mName;
+    HbString mAltName;
+	
     QSize mLogicalSize;
-    QSizeF mPhysicalSize;
-    Qt::Orientation mOrientation;
     qreal mUnitValue;
-    HbString mAltName;
+    qreal mPpiValue;
     bool mTouch;
     HbString mUiMetricsFile;
     qreal mOrientationAngle;
 
-    DeviceProfile(HbMemoryManager::MemoryType type = HbMemoryManager::HeapMemory):mName(type),
-    mOrientation(Qt::Vertical),mUnitValue(1),mAltName(type),mTouch(true),mUiMetricsFile(type),
-    mOrientationAngle(0)
+    DeviceProfile(HbMemoryManager::MemoryType type = HbMemoryManager::HeapMemory)
+        : mName(type), mAltName(type), mUnitValue(1), mPpiValue(1),
+          mTouch(true), mUiMetricsFile(type), mOrientationAngle(0)
     {
     }
 };
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/utils/hbdeviceprofiledatabase_p.cpp
--- a/src/hbcore/utils/hbdeviceprofiledatabase_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/utils/hbdeviceprofiledatabase_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -77,21 +77,22 @@
 HbDeviceProfileDatabase::HbDeviceProfileDatabase(HbMemoryManager::MemoryType type)
     : mDeviceProfiles(0),mDeviceModes(0),mDeviceProfilesOffset(-1),mType(type)
 {
-    if(HbMemoryManager::SharedMemory == mType) {
-        GET_MEMORY_MANAGER(HbMemoryManager::SharedMemory);
-        try
-        {
-            mDeviceProfilesOffset = manager->alloc(sizeof(HbDeviceProfileList));
-        }
-        catch(...)
-        {
-
-        }
-    }else {
-        mDeviceProfiles = new HbDeviceProfileList(HbMemoryManager::HeapMemory);
-        mDeviceProfilesOffset = (qptrdiff)mDeviceProfiles;
+    GET_MEMORY_MANAGER(mType);
+    try {
+        mDeviceProfilesOffset = manager->alloc(sizeof(HbDeviceProfileList));
+        mDeviceProfiles = new((char*)manager->base() + mDeviceProfilesOffset)
+                HbDeviceProfileList(mType);
+        init();
+    } catch(std::exception &) {
+        if (mDeviceProfilesOffset != -1) {
+            if (mDeviceProfiles) {
+                mDeviceProfiles->~HbDeviceProfileList();
+                mDeviceProfiles = 0;
+            }
+            manager->free(mDeviceProfilesOffset);
+            mDeviceProfilesOffset = -1;
+        }        
     }
-    init();
 }
 
 int HbDeviceProfileDatabase::deviceProfilesOffset()
@@ -105,17 +106,6 @@
 */
 void HbDeviceProfileDatabase::init()
 {
-    if(HbMemoryManager::SharedMemory == mType) {
-        // return if mDeviceProfilesOffset is -1 as unable to allocate
-        // memory in shared memory.
-        if(mDeviceProfilesOffset == -1 ) {
-            return;
-        }
-        GET_MEMORY_MANAGER(HbMemoryManager::SharedMemory);
-        mDeviceProfiles = new((char*)manager->base() + mDeviceProfilesOffset)
-                       HbDeviceProfileList(HbMemoryManager::SharedMemory);
-    }
-
     HbDeviceProfileReader reader(mDeviceProfiles,mType);
 	
     // resolve correct displaydefinition.xml path for emulator and HW (z:/resource)
@@ -210,7 +200,8 @@
     if(HbMemoryManager::SharedMemory == mType) {
         Qt::Orientation defaultOrientation = Qt::Vertical;
         if (mDeviceProfiles && mDeviceProfiles->count()) {
-            defaultOrientation = mDeviceProfiles->at(0).mOrientation;
+            QSize s = mDeviceProfiles->at(0).mLogicalSize;
+            defaultOrientation = (s.width() > s.height()) ? Qt::Horizontal : Qt::Vertical;
         }
         // Orientation status keeps track of current device orientation.
         // It is initialized at device profile database creation.
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/utils/hbdeviceprofilereader_p.cpp
--- a/src/hbcore/utils/hbdeviceprofilereader_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/utils/hbdeviceprofilereader_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -26,7 +26,8 @@
 #include "hbdeviceprofilereader_p.h"
 #include "hbdeviceprofiledatabase_p.h"
 
-#define FROM_INCHES_TO_MM 25.4
+#include <qmath.h>
+
 /*
     \class HbDeviceProfileReader
 
@@ -118,24 +119,38 @@
     QXmlStreamAttributes attrs = attributes();
  
     DeviceProfile deviceProfile(mType);
-    deviceProfile.mName=attrs.value("name").toString();
-    const QSize logicalSize(attrs.value("resolutionWidth").toString().toInt(),
-                          attrs.value("resolutionHeight").toString().toInt());
-    deviceProfile.mLogicalSize.setWidth(logicalSize.width());
-    deviceProfile.mLogicalSize.setHeight(logicalSize.height());
-    const qreal ppiValue(attrs.value("ppiValue").toString().toFloat());
-    if(ppiValue) {
-        deviceProfile.mPhysicalSize = (QSizeF((logicalSize.width() / ppiValue) * FROM_INCHES_TO_MM,
-                                         (logicalSize.height() / ppiValue * FROM_INCHES_TO_MM)) );
-    } else {
-        deviceProfile.mPhysicalSize = QSizeF(0,0);
+
+    int w = attrs.value("resolutionWidth").toString().toInt();
+    int h = attrs.value("resolutionHeight").toString().toInt();
+    deviceProfile.mLogicalSize.setWidth(w);
+    deviceProfile.mLogicalSize.setHeight(h);
+
+    QString orientationStr = "portrait";
+    QString altOrientationStr = "landscape";
+    if ( w > h ) {
+        orientationStr = "landscape";
+        altOrientationStr = "portrait";
     }
-    deviceProfile.mOrientation = (logicalSize.width() <= logicalSize.height() ?
-                                  Qt::Vertical : Qt::Horizontal);
-    deviceProfile.mAltName = attrs.value("alternateProfileName").toString();
     deviceProfile.mUnitValue = attrs.value("unitValue").toString().toFloat();
+    deviceProfile.mPpiValue = attrs.value("ppiValue").toString().toFloat();
     deviceProfile.mOrientationAngle= attrs.value("orientationAngle").toString().toInt();
 
+    QString resName = attrs.value("resolutionName").toString();
+    // Legacy support for deprecated "styleName"
+    if (resName.isEmpty()) {
+        resName = attrs.value("styleName").toString();
+    }
+
+    // Calculate inch size
+    qreal diagonal = qSqrt((qreal)(w*w+h*h)); // in "pixels"
+    int inchSizeX10 = qRound(10*(diagonal / deviceProfile.mPpiValue));
+    QString inchSizeStr = QString::number(inchSizeX10/10);
+    inchSizeStr.append('.');
+    inchSizeStr.append(QString::number(inchSizeX10%10));
+
+    deviceProfile.mName = resName + '-' + inchSizeStr + "-inch_" + orientationStr;
+    deviceProfile.mAltName = resName + '-' + inchSizeStr + "-inch_" + altOrientationStr;
+
     bool defaultMode = false;
     defaultMode = attrs.value("defaultMode").toString() == "true";
     
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/utils/hbextendeddeviceprofile_p.cpp
--- a/src/hbcore/utils/hbextendeddeviceprofile_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/utils/hbextendeddeviceprofile_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -107,24 +107,6 @@
 }
 
 /*!
-    Sets physical screen size in mm.
-    \param size physical screen size.
-*/
-void HbExtendedDeviceProfile::setPhysicalSize(const QSizeF &size)
-{
-     d_ptr->mProfile.mPhysicalSize = size;
-}
-
-/*!
-    Sets orientation.
-    \param orientation desired orientation.
-*/
-void HbExtendedDeviceProfile::setOrientation(Qt::Orientation orientation)
-{
-    d_ptr->mProfile.mOrientation = orientation;
-}
-
-/*!
     Sets name of alternate profile.
     Typically, orientation of alternative profile is opposite of this profile.
     \param name name of alternate profile.
@@ -143,4 +125,13 @@
      d_ptr->mProfile.mUnitValue = value;
 }
 
+/*!
+    Sets ppi (points per inc) value.
+    \param value desired new value.
+*/
+void HbExtendedDeviceProfile::setPpiValue(qreal value)
+{
+     d_ptr->mProfile.mPpiValue = value;
+}
+
 // end of file
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/utils/hbextendeddeviceprofile_p.h
--- a/src/hbcore/utils/hbextendeddeviceprofile_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/utils/hbextendeddeviceprofile_p.h	Mon May 03 12:48:33 2010 +0300
@@ -43,10 +43,9 @@
 
     void setName(const QString &name);
     void setLogicalSize(const QSize &size);
-    void setPhysicalSize(const QSizeF &size);
-    void setOrientation(Qt::Orientation orientation);
     void setAlternateProfileName(const QString &name);
     void setUnitValue(qreal value);
+    void setPpiValue(qreal value);
 };
 
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/utils/hbfeaturemanager_p.h
--- a/src/hbcore/utils/hbfeaturemanager_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/utils/hbfeaturemanager_p.h	Mon May 03 12:48:33 2010 +0300
@@ -49,7 +49,8 @@
 
     typedef enum {
         TextMeasurement = 0x1,
-        TheTestUtility  = 0x2
+        TheTestUtility  = 0x2,
+        LanguageSwitch  = 0x4
     } HbFeature;
 
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/utils/hbfontspec.cpp
--- a/src/hbcore/utils/hbfontspec.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/utils/hbfontspec.cpp	Mon May 03 12:48:33 2010 +0300
@@ -23,15 +23,17 @@
 **
 ****************************************************************************/
 #include "hbfontspec.h"
+#ifndef HB_BOOTSTRAPPED
 #include "hbinstance_p.h"
 #include "hbtypefaceinfo_p.h"
 #include "hbstyle.h"
+#endif
 
+#include <QVariant>
 #include <QFont>
-#include <QSharedData>
 
 /*!
-    @beta
+	@stable
     @hbcore
     \class HbFontSpec
     \brief HbFontSpec is used to request a system font.
@@ -137,6 +139,9 @@
 */
 qreal HbFontSpecPrivate::textHeight() const
 {
+#ifdef HB_BOOTSTRAPPED
+    return 0;
+#else
     if ( (mRole != HbFontSpec::Undefined) && (mTextHeight < 0) ) {
         qreal parameterValue;
         QString parameterName;
@@ -162,6 +167,7 @@
         mTextHeight = parameterValue;
     }
 	return mTextHeight;
+#endif
 }
 
 /*!
@@ -169,6 +175,9 @@
 */
 QFont HbFontSpecPrivate::font() const
 {
+#ifdef HB_BOOTSTRAPPED
+    return QFont();
+#else
     if ( mRole == HbFontSpec::Undefined ) {
         return QFont();
     }
@@ -188,6 +197,7 @@
     font.setPixelSize(downSizedSize);
 
     return font;
+#endif
 }
 
 /*!
@@ -286,60 +296,6 @@
 }
 
 /*!
-    \deprecated HbFontSpec::pixelSize() const
-        is deprecated. Use QFont instead.
-*/
-int HbFontSpec::pixelSize() const
-{
-    return -1;
-}
-
-/*!
-    \deprecated HbFontSpec::setPixelSize(int)
-        is deprecated. Use QFont instead.
-*/
-void HbFontSpec::setPixelSize(int pixelSize)
-{
-    Q_UNUSED(pixelSize);
-}
-
-/*!
-    \deprecated HbFontSpec::pointSize() const
-        is deprecated. Use QFont instead.
-*/
-int HbFontSpec::pointSize() const
-{
-    return -1;
-}
-
-/*!
-    \deprecated HbFontSpec::setPointSize(int)
-        is deprecated. Use QFont instead.
-*/
-void HbFontSpec::setPointSize(int pointSize)
-{
-    Q_UNUSED(pointSize);
-}
-
-/*!
-    \deprecated HbFontSpec::fontDelta() const
-        is deprecated. Use QFont instead.
-*/
-QFont HbFontSpec::fontDelta() const
-{
-    return QFont();
-}
-
-/*!
-    \deprecated HbFontSpec::setFontDelta(const QFont&)
-        is deprecated. Use QFont instead.
-*/
-void HbFontSpec::setFontDelta(const QFont &fontDelta)
-{
-    Q_UNUSED(fontDelta);
-}
-
-/*!
     Returns the fontspec as a QVariant.
 */
 HbFontSpec::operator QVariant() const
@@ -365,24 +321,6 @@
 }
 
 /*!
-    \deprecated HbFontSpec::textPaneHeight() const
-        is deprecated. Use textHeight instead.
-*/
-qreal HbFontSpec::textPaneHeight() const
-{
-	return textHeight();
-}
-
-/*!
-    \deprecated HbFontSpec::setTextPaneHeight(qreal)
-        is deprecated. Use textHeight instead.
-*/
-void HbFontSpec::setTextPaneHeight(qreal textHeight)
-{
-    setTextHeight(textHeight);
-}
-
-/*!
     Returns the text height that was set using \a setTextHeight.
 
     If text height is not set returns default value defined by the font role.
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/utils/hbfontspec.h
--- a/src/hbcore/utils/hbfontspec.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/utils/hbfontspec.h	Mon May 03 12:48:33 2010 +0300
@@ -68,23 +68,6 @@
     qreal textHeight() const;
     void setTextHeight(qreal textHeight);
 
-    //Deprecated
-    int pixelSize() const;
-    //Deprecated
-    void setPixelSize(int pixelSize);
-    //Deprecated
-    int pointSize() const;
-    //Deprecated
-    void setPointSize(int pointSize);
-    //Deprecated
-    qreal textPaneHeight() const;
-    //Deprecated
-    void setTextPaneHeight(qreal textPaneHeight);
-    //Deprecated
-    QFont fontDelta() const;
-    //Deprecated
-    void setFontDelta(const QFont &font);
-
     operator QVariant() const;
     bool operator==(const HbFontSpec &other) const;
     bool operator!=(const HbFontSpec &other) const;
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/utils/hbforegroundwatcher.cpp
--- a/src/hbcore/utils/hbforegroundwatcher.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/utils/hbforegroundwatcher.cpp	Mon May 03 12:48:33 2010 +0300
@@ -28,11 +28,15 @@
 #include <hbnamespace.h>
 #include <hbeffectinternal_p.h>
 #include <hbinstance.h>
+#include <hbsensorlistener_p.h>
+#include "hbsleepmodelistener_p.h"
 #ifdef HB_EFFECTS_OPENVG
 #include <hbvgeffect_p.h>
 #endif
 #include <QEvent>
 #include <QApplication>
+#include "hbmemorymanager_p.h"
+#include "hbthemecommon_p.h"
 
 /*!
   @proto
@@ -77,7 +81,7 @@
 }
 
 HbForegroundWatcher::HbForegroundWatcher(QObject *parent)
-    : QObject(parent), mForeground(true), mLights(true)
+    : QObject(parent), mForeground(true), mLights(true), mSensorListener(0)
 {
     connect(QApplication::instance(), SIGNAL(aboutToQuit()), SLOT(handleAboutToQuit()));
 #ifdef Q_OS_SYMBIAN
@@ -89,6 +93,12 @@
     }
 #endif
     QApplication::instance()->installEventFilter(this);
+    HbSleepModeListener::instance(); // make sure the instance is created
+}
+
+void HbForegroundWatcher::setSensorListener(HbSensorListener *sensorListener)
+{
+    mSensorListener = sensorListener;
 }
 
 /*!
@@ -98,6 +108,10 @@
 */
 void HbForegroundWatcher::HandleGainingForeground()
 {
+    if (THEME_SERVER_NAME == HbMemoryUtils::getCleanAppName()) {
+        return;
+    }
+    
     if (!mForeground) {
         emit foregroundGained();
         if (!hbInstance->allMainWindows().isEmpty()) {
@@ -117,6 +131,10 @@
 */
 void HbForegroundWatcher::HandleLosingForeground()
 {
+    if (THEME_SERVER_NAME == HbMemoryUtils::getCleanAppName()) {
+        return;
+    }
+    
     if (mForeground) {
         emit foregroundLost();
         if (!hbInstance->allMainWindows().isEmpty()) {
@@ -161,12 +179,18 @@
             HbEffectInternal::stopEffects();
             emit stopAnimation();
         }
+        if (mSensorListener && mSensorListener->isEnabled()) {
+            mSensorListener->enableSensors(false, true);
+        }
         mLights = false;
     } else if (event->type() == HbEvent::SleepModeExit && !mLights) {
         if (mForeground) {
             HbEffectInternal::resumeEffects();
             emit resumeAnimation();
         }
+        if (mSensorListener && !mSensorListener->isEnabled()) {
+            mSensorListener->enableSensors(true, true);
+        }
         mLights = true;
     } else if (event->type() == QEvent::ApplicationActivate && !mForeground) {
 #ifndef Q_OS_SYMBIAN
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/utils/hbforegroundwatcher_p.h
--- a/src/hbcore/utils/hbforegroundwatcher_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/utils/hbforegroundwatcher_p.h	Mon May 03 12:48:33 2010 +0300
@@ -35,6 +35,9 @@
 class CCoeEnv;
 #endif
 
+class HbMainWindowOrientation;
+class HbSensorListener;
+
 class HB_CORE_PRIVATE_EXPORT HbForegroundWatcher : public QObject
 #ifdef Q_OS_SYMBIAN
 , public MCoeForegroundObserver
@@ -44,7 +47,8 @@
 
 public:
     static HbForegroundWatcher *instance();
-
+    void setSensorListener(HbSensorListener *sensorListener);
+        
 signals:
     void foregroundGained();
     void foregroundLost();
@@ -64,6 +68,7 @@
 
     bool mForeground;
     bool mLights;
+    HbSensorListener *mSensorListener;
     CCoeEnv *mStaticEnv;
 };
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/utils/hbsleepmodelistener_p.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/utils/hbsleepmodelistener_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,184 @@
+/****************************************************************************
+**
+** 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 <hbinstance.h>
+#include <hbevent.h>
+
+#include "hbsleepmodelistener_p.h"
+#include "hbsleepmodelistener_p_p.h"
+
+#if defined(Q_OS_SYMBIAN)
+
+#include <hwrmlight.h>
+#include <hwrmextendedlight.h>
+#include "hbcorepskeys_p.h"
+
+// app uid of sleepmode application
+const TUid KSleepModeProperty = {0x101F7A01};
+const TInt KSleepModeOn = 0x00002001;
+
+// Maximum number of possible lights targets
+const TInt KHWRMLightMaxTargets(31);
+
+// First target value in targets enumeration
+const TInt KHWRMLightFirstTarget(CHWRMExtendedLight::EPrimaryDisplay);
+
+CSleepModeListenerPrivate::~CSleepModeListenerPrivate()
+{
+    Cancel();
+    sleepModeState.Close();
+}
+
+CSleepModeListenerPrivate::CSleepModeListenerPrivate()
+                      :CActive( EPriorityNormal )
+{
+    User::LeaveIfError(sleepModeState.Attach(KSleepModeProperty, KSleepModeOn));
+    CActiveScheduler::Add(this);
+    // initial subscription
+    sleepModeState.Subscribe(iStatus);
+    SetActive();
+}
+
+void CSleepModeListenerPrivate::RunL()
+{
+    sleepModeState.Subscribe(iStatus);
+    SetActive();
+    CHWRMLight::TLightStatus status(CHWRMLight::ELightStatusUnknown);
+    RLightStatusArray currentStatus(KHWRMLightMaxTargets);
+    TInt err = InitializeStatusArray(currentStatus);
+    if (err == KErrNone) {
+        TInt arraySize = sizeof(THWRMStatusInfo) * KHWRMLightMaxTargets;
+        TPtr8 arrayPtr((TUint8*)&currentStatus[0], arraySize, arraySize);
+        err = sleepModeState.Get(arrayPtr);
+        if (err == KErrNone) {
+            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 != KHbPsOrientationCategoryUid.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);
+                }
+            }
+        }
+    }
+
+    // Clean up
+    currentStatus.Close();
+}
+
+void CSleepModeListenerPrivate::DoCancel()
+{
+    sleepModeState.Cancel();
+}
+
+TInt CSleepModeListenerPrivate::InitializeStatusArray(
+    RLightStatusArray& aArray) const
+{
+    TInt err = KErrNone;
+    TInt currentTarget(KHWRMLightFirstTarget);
+    for( TInt i = 0; i < KHWRMLightMaxTargets; ++i) {
+        THWRMStatusInfo info;
+        info.iTarget = currentTarget;
+        info.iStatus = CHWRMLight::ELightStatusUnknown;
+        err = aArray.Append(info);
+        if (err != KErrNone) {
+            break;
+        }
+
+        // shift the mask and target ready for next loop
+        currentTarget <<= 1;
+    }
+
+    return err;
+}
+
+TInt CSleepModeListenerPrivate::FindByTarget(const TInt* aTarget,
+    const THWRMStatusInfo& aItem)
+    {
+    if (*aTarget < aItem.iTarget) {
+        return -1;
+    } else if ( *aTarget > aItem.iTarget ) {
+        return 1;
+    }
+    return 0;
+    }
+
+#else
+
+HbSleepModeListenerPrivate::HbSleepModeListenerPrivate()
+{
+
+}
+
+HbSleepModeListenerPrivate::~HbSleepModeListenerPrivate()
+{
+
+}
+
+#endif
+
+/*!
+    Returns static instance
+ */
+HbSleepModeListener* HbSleepModeListener::instance()
+{
+    static HbSleepModeListener theInstance;
+    return &theInstance;
+}
+
+/*!
+    Constructor
+*/
+HbSleepModeListener::HbSleepModeListener() : d(0)
+{
+#if defined(Q_OS_SYMBIAN)
+
+    d = new CSleepModeListenerPrivate();
+
+#else
+
+    d = new HbSleepModeListenerPrivate();
+
+#endif
+}
+
+/*!
+    Destructor
+*/
+HbSleepModeListener::~HbSleepModeListener()
+{
+    delete d;
+}
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/utils/hbsleepmodelistener_p.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/utils/hbsleepmodelistener_p.h	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,59 @@
+/****************************************************************************
+**
+** 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 HBSLEEPMODELISTENER_P_H
+#define HBSLEEPMODELISTENER_P_H
+
+#if defined(Q_OS_SYMBIAN)
+
+class CSleepModeListenerPrivate;
+
+#else
+
+class HbSleepModeListenerPrivate;
+
+#endif
+
+class HB_CORE_PRIVATE_EXPORT HbSleepModeListener
+{
+public:
+    static HbSleepModeListener *instance();
+
+private:
+    HbSleepModeListener();
+    ~HbSleepModeListener();
+
+#if defined(Q_OS_SYMBIAN)
+
+    CSleepModeListenerPrivate *d;
+
+#else
+
+    HbSleepModeListenerPrivate *d;
+
+#endif
+};
+
+#endif // HBSLEEPMODELISTENER_P_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/utils/hbsleepmodelistener_p_p.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/utils/hbsleepmodelistener_p_p.h	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,80 @@
+/****************************************************************************
+**
+** 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 HBSLEEPMODELISTENER_P_P_H
+#define HBSLEEPMODELISTENER_P_P_H
+
+#include <hbapplication.h>
+
+#if defined(Q_OS_SYMBIAN)
+
+#include <e32base.h>
+#include <e32property.h>
+
+/**
+* Data structure used to handle light status information.
+*/
+struct THWRMStatusInfo
+    {
+    // Light target.
+    TInt iTarget;
+
+    // Status of the target.
+    TInt iStatus;
+    };
+
+/**
+* Defines THWRMStatusInfo array.
+*/
+typedef RArray<THWRMStatusInfo> RLightStatusArray;
+
+class CSleepModeListenerPrivate: public CActive
+{
+public:
+    CSleepModeListenerPrivate();
+    ~CSleepModeListenerPrivate();
+private:
+    void RunL();
+    void DoCancel();
+
+    TInt InitializeStatusArray(RLightStatusArray& aArray) const;
+
+    static TInt FindByTarget(const TInt* aTarget, const THWRMStatusInfo& aItem);
+private:
+    RProperty sleepModeState;
+};
+
+#else
+
+class HB_AUTOTEST_EXPORT HbSleepModeListenerPrivate
+{
+public:
+    HbSleepModeListenerPrivate();
+    ~HbSleepModeListenerPrivate();
+};
+
+#endif
+
+#endif // HBSLEEPMODELISTENER_P_P_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/utils/hbtextmeasurementutility_p.cpp
--- a/src/hbcore/utils/hbtextmeasurementutility_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/utils/hbtextmeasurementutility_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -360,20 +360,7 @@
     return false;
 #else
 
-    int w = (int)profile.physicalSize().width();
-    int h = (int)profile.physicalSize().height();
-    qreal diag = qSqrt((qreal)(w*w+h*h));
-    qreal ppi = profile.ppmValue() * 2.54;
-    QString inchSize = QString::number((qreal)(qRound(10*(diag / ppi)))/10);
-
-    QString styleName;
-    int separator = profile.name().indexOf(' ');
-    styleName.append(profile.name().left(separator));
-    styleName.append('_');
-    styleName.append(inchSize);
-    styleName.append("_inch_");
-    styleName.append(profile.name().mid(separator+1));
-
+    qDebug() << "HbTextMeasurementUtility::writeReport: Using profile" << profile.name();
 
 #ifdef Q_OS_SYMBIAN
     QString filePath("C:\\data\\log\\qtestcase\\loc\\");
@@ -382,7 +369,7 @@
     filePath.append(QDir::separator());
     filePath.append("loc");
     filePath.append(QDir::separator());
-    filePath.append(styleName);
+    filePath.append(profile.name());
     filePath.append(QDir::separator());
 #endif
     filePath = QDir::toNativeSeparators(filePath);
@@ -394,7 +381,7 @@
 
     filePath.append(domainName);
     filePath.append('_');
-    filePath.append(styleName);
+    filePath.append(profile.name());
     filePath.append('_');
     filePath.append(QString::number(QDate::currentDate().year()));
     filePath.append("wk");
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/utils/hbthetestutility_p.cpp
--- a/src/hbcore/utils/hbthetestutility_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/utils/hbthetestutility_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -90,9 +90,7 @@
 */
 bool HbTheTestUtilityPrivate::checkConfigFile()
 {
-#if defined (Q_OS_UNIX)
-    return false; // currently no UNIX support
-#elif defined (Q_OS_SYMBIAN)
+#if defined (Q_OS_SYMBIAN)
     bool useC = false;
     useF = doCheckConfigFile(KDriveFPath);
     if (!useF) {
@@ -104,6 +102,8 @@
     return (useC || useE || useF);
 #elif defined (Q_OS_WIN32)
     return doCheckConfigFile(KDriveCPath);
+#else
+    return false; // only Symbian and Windows are supported
 #endif
 }
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/utils/hbthetestwidget_p.cpp
--- a/src/hbcore/utils/hbthetestwidget_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/utils/hbthetestwidget_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -31,6 +31,11 @@
 #include "hbstyleoptiontoolbutton.h"
 #include "hbcolorscheme.h"
 #include "hbtextitem.h"
+#include "hbpopup.h"
+#include "hbdialog.h"
+#include "hbthemecommon_p.h"
+#include "hbthemeclient_p.h"
+
 
 #ifdef Q_OS_SYMBIAN
 #include <eikenv.h>
@@ -39,6 +44,7 @@
 
 #include <QGraphicsSceneMouseEvent>
 #include <QGraphicsGridLayout>
+#include <QGraphicsLinearLayout>
 #include <QGraphicsWidget>
 #include <QTextStream>
 #include <QFile>
@@ -320,7 +326,10 @@
 
 void HbTheTestWidget::toggleOrientation()
 {
-    d->mMainWindow->toggleOrientation();
+    if (d->mMainWindow->orientation() == Qt::Horizontal)
+        d->mMainWindow->setOrientation(Qt::Vertical);
+    else 
+        d->mMainWindow->setOrientation(Qt::Horizontal);
 }
 
 void HbTheTestWidget::toggleMirroring()
@@ -338,6 +347,35 @@
 #endif
 }
 
+void HbTheTestWidget::showThemeServerMemoryInfo()
+{
+    HbDialog popup;
+    popup.setTimeout(HbPopup::StandardTimeout);   
+    popup.setPreferredPos(QPointF(10,10));
+    
+    HbWidget widget;
+    QGraphicsLinearLayout *layout = new QGraphicsLinearLayout(Qt::Vertical);
+    widget.setLayout(layout);
+    
+    int freeSharedMemory = HbThemeClient::global()->freeSharedMemory();
+    int allocatedSharedMemory = HbThemeClient::global()->allocatedSharedMemory();
+    int allocatedHeapMemory = HbThemeClient::global()->allocatedHeapMemory();
+    QString message("Free shared mem: ");
+    message += QString::number(freeSharedMemory / 1024);
+    message += " kB \nAllocated shared mem: ";
+    message += QString::number(allocatedSharedMemory / 1024);
+    message += " kB \nAllocated heap: ";
+    message += QString::number(allocatedHeapMemory / 1024);
+    message += " kB \n";
+    HbTextItem *textItem = new HbTextItem(message);
+    textItem->setTextColor(HbColorScheme::color("qtc_default_main_pane_normal"));
+    layout->addItem(textItem); 
+    
+    popup.setContentsMargins(0,20,0,20);
+    popup.setContentWidget(&widget);
+    popup.exec();
+}
+
 void HbTheTestWidget::screenCapture()
 {
     setVisible(false);
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/utils/hbthetestwidget_p.h
--- a/src/hbcore/utils/hbthetestwidget_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/utils/hbthetestwidget_p.h	Mon May 03 12:48:33 2010 +0300
@@ -79,6 +79,7 @@
     void toggleOrientation();
     void toggleMirroring();
     void setApplicationBackground(); // only for S60
+    void showThemeServerMemoryInfo();
     void screenCapture(); // not working on HW
 
 protected:
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/utils/hbwidgetloader.cpp
--- a/src/hbcore/utils/hbwidgetloader.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/utils/hbwidgetloader.cpp	Mon May 03 12:48:33 2010 +0300
@@ -29,6 +29,7 @@
 
 #include "hbinstance.h"
 #include "hbtheme_p.h"
+#include "hbthemeclient_p.h"
 
 #include <QtDebug>
 #include <QFile>
@@ -53,13 +54,20 @@
 // cache at the client side to store the mesh items.
 // key used here is the filename+layoutname+sectionname.
 
-typedef QHash<QString,LayoutDefinition*> ClientHashForLayoutDefs;
-Q_GLOBAL_STATIC(ClientHashForLayoutDefs,clientLayoutDefsCache)
+typedef QHash<QString,HbWidgetLoader::LayoutDefinition*> ClientHashForLayoutDefs;
+Q_GLOBAL_STATIC(ClientHashForLayoutDefs, clientLayoutDefsCache)
 
 // List of files that doesn't exist.
 // This reduces the check QFile::exists() at client side as well as the server side.
 // also no unnecessary IPC calls.
-Q_GLOBAL_STATIC(QStringList,filesNotPresent)
+Q_GLOBAL_STATIC(QStringList, filesNotPresent)
+
+// Layout caching
+static HbWidgetLoader::LayoutDefinition *staticCacheLayout = NULL;
+static QString staticCacheFileName = QString();
+static QString staticCacheName = QString();
+static QString staticCacheSection = QString();
+static QDateTime staticCacheModified = QDateTime();
 
 class HbWidgetLoaderPrivate
 {
@@ -72,9 +80,18 @@
     
     void setWidget( HbWidget* widget );
     
-    bool updateCacheIfNeeded(const QString &fileName, const QString &name, const QString &section);
+    bool getSharedLayoutDefinition(
+        const QString &fileName,
+        const QString &name,
+        const QString &section,
+        HbWidgetLoader::LayoutDefinition *&layoutDef );
+
+    bool getCachedLayoutDefinition(
+        const QString &fileName,
+        const QString &name,
+        const QString &section,
+        HbWidgetLoader::LayoutDefinition *&layoutDef );
     
-    static QString version();
 private:
     Q_DISABLE_COPY(HbWidgetLoaderPrivate)
 
@@ -82,7 +99,9 @@
     HbWidgetLoader* q_ptr;
     
     HbWidgetLoaderActions* mActions;
-    HbWidgetLoaderSyntax* mSyntax;    
+    HbWidgetLoaderSyntax* mSyntax;
+    HbWidgetLoaderMemoryActions* mMemActions;
+    HbWidgetLoaderMemorySyntax* mMemSyntax;
 };
 
 
@@ -91,11 +110,6 @@
     \internal
     \proto
 */
-LayoutDefinition *HbWidgetLoaderActions::mCacheLayout = NULL;
-QString HbWidgetLoaderActions::mCacheFileName = QString();
-QString HbWidgetLoaderActions::mCacheName = QString();
-QString HbWidgetLoaderActions::mCacheSection = QString();
-QDateTime HbWidgetLoaderActions::mCacheModified = QDateTime();
 
 /*!
     Constructor.
@@ -116,34 +130,20 @@
 }
 
 /*!
-    Set widget. Temporary solution for time being.
-    \param widget 
-*/
-void HbWidgetLoader::setWidget( HbWidget* widget )
-{
-    Q_D(HbWidgetLoader);
-    
-    d->mActions->reset();       
-    d->mActions->mWidget = widget;
-}
-
-/*!
     Prints current version of widget loader and minimum version of supported WidgetML in brackets
     For example "3.2 (1.4)" means that current version is 3.2 and WidgetML versions from 1.4 to 3.2 are supported   
 */
 QString HbWidgetLoader::version()
 {
-    return HbWidgetLoaderPrivate::version();       
+    return HbWidgetLoaderSyntax::version();       
 }
 
 /*!
     Loads and processes a WidgetML file.
 
-    Proto:
-    - Assumes that a widget is set with setWidget.
-    - 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.
-    - Creates the anchor edge attachments for existing child items of the widget.
+    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.
+    Creates the anchor edge attachments based on WidgetML.
 
     \param fileName file to be processed.
     \param name the name of the layout to be loaded.
@@ -151,57 +151,33 @@
     \param storage specifies where to store the mesh items.
     \return true if file was loaded and processed successfully.
 */
-bool HbWidgetLoader::load( const QString &fileName, const QString &name, const QString &section,const HbMemoryManager::MemoryType storage )
+bool HbWidgetLoader::load(
+    HbWidget* widget,
+    const QString &fileName,
+    const QString &name,
+    const QString &section,
+    HbMemoryManager::MemoryType storage)
 {
     Q_D(HbWidgetLoader);
-    bool result = false;
-
-    LayoutDefinition* sharedLayoutDef = NULL;
+    bool result(true);
 
-    // if the storage is SharedMemory
-    if (storage == HbMemoryManager::SharedMemory) {
-        // check in the client side cache if the vector of meshitems is present.
-        QString key (fileName + name + section);
-        if(clientLayoutDefsCache()->contains(key)){
-            // present in the client cache.
-            sharedLayoutDef = clientLayoutDefsCache()->value(key);
-            //update the widget layout.
-            d->mActions->updateWidget(sharedLayoutDef);
-            return true;
-        }
+    d->setWidget(widget);
+
+    LayoutDefinition* layoutDef(0);
 
-        // Not found in the client cache.
-        if (filesNotPresent()->contains(fileName)){
-            return false;
-        } 
-        // Check for the availability of the file, as QFile::Exists takes more time this 
-        // method is used
-        QFile file(fileName);        
-        bool fileExists = file.open(QIODevice::ReadOnly);
-        file.close();
-        if (!fileExists) {
-            // file doesn't exist save the info in the filesNotPresent list.
-            filesNotPresent()->append(fileName);
-            return false;
+    if (storage == HbMemoryManager::SharedMemory) {
+        result = d->getSharedLayoutDefinition(fileName, name, section, layoutDef);
+    }
+    if (result) {
+        if (!layoutDef) {
+            //fall back
+            result = d->getCachedLayoutDefinition(fileName, name, section, layoutDef);
         }
-
-        // get the shared layout definition address.
-        sharedLayoutDef = HbThemeClient::global()->getSharedLayoutDefs(fileName, name, section);
-
-        if (sharedLayoutDef){
-            // This will update the widgets layout anchors.
-            d->mActions->updateWidget(sharedLayoutDef);
-
-            // Insert in to the client side cache.
-            clientLayoutDefsCache()->insert(key, sharedLayoutDef);
-            return true;
+        if (result){
+            Q_ASSERT(layoutDef);
+            result = d->mMemSyntax->load(layoutDef);
         }
     }
-    //fall back
-    result = d->updateCacheIfNeeded(fileName, name, section);
-    if (result){
-        d->mActions->updateWidget(0);
-    }
     return result;
 }
 
@@ -212,79 +188,165 @@
     \param section space separated route to section, that you want to load.
     \return true if input was loaded and processed successfully.
 */
-bool HbWidgetLoader::load( QIODevice *device, const QString &name, const QString &section,const HbMemoryManager::MemoryType storage  )
+bool HbWidgetLoader::load(
+    HbWidget* widget,
+    QIODevice *device,
+    const QString &name,
+    const QString &section)
 {
-    Q_D(HbWidgetLoader);    
-    Q_UNUSED(storage);
-	
-    bool result = d->mSyntax->load(device, name, section);
-    if (result){
-    	HbWidgetLoaderActions::mCacheName = name;
-        HbWidgetLoaderActions::mCacheSection = section;
-        HbWidgetLoaderActions::mCacheFileName = QString();
-        HbWidgetLoaderActions::mCacheModified = QDateTime();
-		d->mActions->updateWidget(0);
-    }
-    
-    return result;
+    Q_D(HbWidgetLoader);
+    d->setWidget(widget);
+    d->mSyntax->setActions(d->mActions);
+    return d->mSyntax->load(device, name, section);
 }
 
+/*!
+    Loads WidgetML to given memory structure.
+*/
+bool HbWidgetLoader::loadLayoutDefinition(
+    LayoutDefinition *targetLayoutDef,
+    QIODevice *device,
+    const QString &name,
+    const QString &section )
+{
+    Q_D(HbWidgetLoader);
+    d->mMemActions->mLayoutDef = targetLayoutDef;
+    d->mSyntax->setActions(d->mMemActions);
+    return d->mSyntax->load(device, name, section);
+}
 
+/*!
+    \internal
+*/
 HbWidgetLoaderPrivate::HbWidgetLoaderPrivate() : q_ptr(0)
 {
     mActions = new HbWidgetLoaderActions();
-    mSyntax = new HbWidgetLoaderSyntax(mActions);
+    mMemActions = new HbWidgetLoaderMemoryActions();
+    mSyntax = new HbWidgetLoaderSyntax(mMemActions);
+    mMemSyntax = new HbWidgetLoaderMemorySyntax(mActions);
 }
 
+/*!
+    \internal
+*/
 HbWidgetLoaderPrivate::~HbWidgetLoaderPrivate()
 {
+    delete mMemSyntax;
+    delete mSyntax;
+    delete mMemActions;
     delete mActions;
-    delete mSyntax;
+}
+
+/*!
+    \internal
+*/
+void HbWidgetLoaderPrivate::setWidget( HbWidget* widget )
+{
+    mActions->reset();       
+    mActions->mWidget = widget;
+    mActions->mCurrentProfile = HbDeviceProfile::profile(widget);
 }
 
-bool HbWidgetLoaderPrivate::updateCacheIfNeeded(const QString &fileName, const QString &name, const QString &section)
+/*!
+    \internal
+*/
+bool HbWidgetLoaderPrivate::getSharedLayoutDefinition(
+    const QString &fileName,
+    const QString &name,
+    const QString &section,
+    HbWidgetLoader::LayoutDefinition *&layoutDef )
+{
+    // check in the client side cache if the vector of meshitems is present.
+    QString key (fileName + name + section);
+    if (clientLayoutDefsCache()->contains(key)){
+        // present in the client cache.
+        layoutDef = clientLayoutDefsCache()->value(key);
+        return true;
+    }
+
+    // Not found in the client cache.
+    if (filesNotPresent()->contains(fileName)){
+        return false;
+    } 
+    // Check for the availability of the file, as QFile::Exists takes more time this 
+    // method is used
+    QFile file(fileName);        
+    bool fileExists = file.open(QIODevice::ReadOnly);
+    file.close();
+    if (!fileExists) {
+        // file doesn't exist save the info in the filesNotPresent list.
+        filesNotPresent()->append(fileName);
+        return false;
+    }
+
+    // get the shared layout definition address.
+    layoutDef = HbThemeClient::global()->getSharedLayoutDefs(fileName, name, section);
+    if (layoutDef) {
+        clientLayoutDefsCache()->insert(key, layoutDef);
+    }
+    return true;
+}
+
+/*!
+    \internal
+*/
+bool HbWidgetLoaderPrivate::getCachedLayoutDefinition(
+    const QString &fileName,
+    const QString &name,
+    const QString &section,
+    HbWidgetLoader::LayoutDefinition *&layoutDef )
 {
     QFileInfo info(fileName);
     
 #ifdef HB_WIDGETLOADER_DEBUG
     qDebug() << "Cached layout currently contains" << HbWidgetLoaderActions::mCacheLayout.count() << "items";
 #endif
-    bool cacheHit = (name == HbWidgetLoaderActions::mCacheName
-		&& section == HbWidgetLoaderActions::mCacheSection
-		&& fileName == HbWidgetLoaderActions::mCacheFileName 
-		&& info.lastModified() == HbWidgetLoaderActions::mCacheModified);
+    bool cacheHit = (name == staticCacheName
+		&& section == staticCacheSection
+		&& fileName == staticCacheFileName 
+		&& info.lastModified() == staticCacheModified);
 		
-    if(cacheHit){
+    if (cacheHit){
 #ifdef HB_WIDGETLOADER_DEBUG
         qDebug() << "Cache hit.";
 #endif
+        layoutDef = staticCacheLayout;
     	return true;
     }
     
-    
 #ifdef HB_WIDGETLOADER_DEBUG
 	qDebug() << "Cache miss, reloading cache data";
 #endif
 		
+    // Not found in the client cache.
+    if (filesNotPresent()->contains(fileName)){
+        return false;
+    } 
 	QFile file(fileName);
-	if( !file.open( QFile::ReadOnly | QFile::Text ) ) {
+	if ( !file.open( QFile::ReadOnly | QFile::Text ) ) {
 	    qWarning( "Unable to open file ");
+        filesNotPresent()->append(fileName);
 	    return false;
 	}
-	    
+
+    if (!staticCacheLayout) {
+        staticCacheLayout = new HbWidgetLoader::LayoutDefinition(HbMemoryManager::HeapMemory);
+    } else {
+        Q_ASSERT(staticCacheLayout->type == HbMemoryManager::HeapMemory);
+    }
+
+    mMemActions->mLayoutDef = staticCacheLayout;
+    mSyntax->setActions(mMemActions);
     bool result = mSyntax->load(&file, name, section);
-    if(result){
-    	HbWidgetLoaderActions::mCacheName = name;
-        HbWidgetLoaderActions::mCacheSection = section;
-        HbWidgetLoaderActions::mCacheFileName = fileName;
-        HbWidgetLoaderActions::mCacheModified = info.lastModified();
+    if (result){
+        layoutDef = staticCacheLayout;
+    	staticCacheName = name;
+        staticCacheSection = section;
+        staticCacheFileName = fileName;
+        staticCacheModified = info.lastModified();
     }
     
     return result;
 }
 
-QString HbWidgetLoaderPrivate::version()
-{
-    return HbWidgetLoaderSyntax::version();
-}
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/utils/hbwidgetloader_p.h
--- a/src/hbcore/utils/hbwidgetloader_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/utils/hbwidgetloader_p.h	Mon May 03 12:48:33 2010 +0300
@@ -27,9 +27,12 @@
 #define HBWIDGETLOADER_P_H
 
 #include <hbglobal.h>
+#include <hbnamespace.h>
 #include <QString>
+#include "hbstring_p.h"
+#include "hbvector_p.h"
 #include "hbmemorymanager_p.h"
-
+#include "hbxmlloaderabstractsyntax_p.h"
 
 QT_BEGIN_NAMESPACE
 class QIODevice;
@@ -37,22 +40,56 @@
 class HbWidget;
 class HbWidgetLoaderPrivate;
 
-class HB_AUTOTEST_EXPORT HbWidgetLoader
+class HB_CORE_PRIVATE_EXPORT HbWidgetLoader
 {
 public:
 
+    struct MeshItem
+    {
+        HbString src;
+        HbString dst;
+        Hb::Edge srcEdge;
+        Hb::Edge dstEdge;
+        HbXmlLengthValue::Type spacingType;
+        qreal spacingVal;
+        HbString spacingText;
+        HbString spacer;
+        MeshItem(HbMemoryManager::MemoryType type = HbMemoryManager::HeapMemory)
+            : src(type), dst(type), spacingText(type), spacer(type) {}
+    };
+
+    struct LayoutDefinition {
+        HbMemoryManager::MemoryType type;
+        HbVector<MeshItem> meshItems;
+        LayoutDefinition(HbMemoryManager::MemoryType memtype)
+            : type(memtype), meshItems(memtype)
+        {
+        }
+    };
+
     HbWidgetLoader();
     virtual ~HbWidgetLoader();
 
-    void setWidget( HbWidget* widget );
+    bool load(
+        HbWidget* widget,
+        const QString &fileName,
+        const QString &name,
+        const QString &section = QString(),
+        HbMemoryManager::MemoryType storage = HbMemoryManager::HeapMemory);
 
-    bool load( const QString &fileName, const QString &name, const QString &section = QString(),
-               HbMemoryManager::MemoryType storage = HbMemoryManager::HeapMemory);
-    bool load( QIODevice *device, const QString &name, const QString &section = QString(),
-               HbMemoryManager::MemoryType storage = HbMemoryManager::HeapMemory);
+    bool load(
+        HbWidget* widget,
+        QIODevice *device,
+        const QString &name,
+        const QString &section = QString());
+    
+    bool loadLayoutDefinition(
+        LayoutDefinition *targetLayoutDef,
+        QIODevice *device,
+        const QString &name,
+        const QString &section );
     
     static QString version();
-    
 
 private:
     HbWidgetLoaderPrivate * const d_ptr;
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/utils/hbwidgetloaderactions_p.cpp
--- a/src/hbcore/utils/hbwidgetloaderactions_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/utils/hbwidgetloaderactions_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -35,33 +35,27 @@
     \proto
 */
 
-
-HbWidgetLoaderActions::HbWidgetLoaderActions(HbMemoryManager::MemoryType type) : HbXmlLoaderAbstractActions(),mType(type),mLayoutDefinitionOffset(-1)
+/*!
+    \internal
+*/
+HbWidgetLoaderActions::HbWidgetLoaderActions() 
+    : HbXmlLoaderBaseActions(), mWidget(0), mLayout(0)
 {
-    // if the memory type is shared memory then allocate memory in the sharedmemory
-    // for the vector of meshitems
-    // else allocate the memory in the heap.
-    if(HbMemoryManager::SharedMemory == mType){
-        GET_MEMORY_MANAGER(HbMemoryManager::SharedMemory);
-        mLayoutDefinitionOffset = manager->alloc(sizeof(LayoutDefinition));
-
-        if (mLayoutDefinitionOffset > -1) {
-        	mCacheLayout = new((char*)manager->base() + mLayoutDefinitionOffset) LayoutDefinition(HbMemoryManager::SharedMemory);
-        }
-    }
-    else {
-        if(mCacheLayout == NULL){
-        	mCacheLayout = new LayoutDefinition(HbMemoryManager::HeapMemory);
-        }
-    }
 }
 
+/*!
+    \internal
+*/
 HbWidgetLoaderActions::~HbWidgetLoaderActions()
 {
 }
 
-bool HbWidgetLoaderActions::createMeshLayout()
-{    
+/*!
+    \internal
+*/
+bool HbWidgetLoaderActions::createMeshLayout( const QString &widget )
+{
+    Q_UNUSED( widget );
     HbMeshLayout *layout = static_cast<HbMeshLayout*>(mWidget->layout());
     if (!layout) {
         layout = new HbMeshLayout();
@@ -75,122 +69,103 @@
         layout->clearSpacingOverrides();
         layout->clearItemIds();
     }
+    mLayout = layout;
     return true;
 }
 
-bool HbWidgetLoaderActions::addMeshLayoutEdge( const QString &src, const QString &srcEdge, 
-                                               const QString &dst, const QString &dstEdge,
-                                               const QString &spacing, const QString &spacer )
-{    
+/*!
+    \internal
+*/
+bool HbWidgetLoaderActions::addMeshLayoutEdge( const QString &src, Hb::Edge srcEdge, 
+                                               const QString &dst, Hb::Edge dstEdge,
+                                               const HbXmlLengthValue &spacing, const QString &spacer )
+{
+    bool ok = true;
     if ( !spacer.isEmpty() ) {
         // spacer is added
         // divide original mesh 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 &= addMeshLayoutEdge( src, srcEdge, spacer, srcEdge, spacing, QString() );
-            ok &= addMeshLayoutEdge( spacer, getAnchorOppositeEdge(srcEdge), dst, dstEdge, QString(), QString() );
+            HbXmlLengthValue val(0, HbXmlLengthValue::Pixel);
+            ok &= addMeshLayoutEdge( spacer, getAnchorOppositeEdge(srcEdge), dst, dstEdge, val, QString() );
         } else {
-            // if the starting item is not layout
+            // 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() );
-            ok &= addMeshLayoutEdge( spacer, srcEdge, dst, dstEdge, QString(), 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);
+        }
+    }
+    return ok;
+}
 
-        if ( ok ) {
-            mCacheLayout->spacers.append(HbString(spacer,mType));
-        }
+/*
+    \class HbWidgetLoaderMemoryActions
+    \internal
+    \proto
+*/
+
+/*!
+    \internal
+*/
+HbWidgetLoaderMemoryActions::HbWidgetLoaderMemoryActions() : HbXmlLoaderAbstractActions(), mLayoutDef(0)
+{
+}
 
-        return ok;
-    }
+/*!
+    \internal
+*/
+HbWidgetLoaderMemoryActions::~HbWidgetLoaderMemoryActions()
+{
+}
+
+/*!
+    \internal
+*/
+bool HbWidgetLoaderMemoryActions::createMeshLayout( const QString &widget )
+{
+    Q_UNUSED(widget);
+    mLayoutDef->meshItems.clear();
+    return true;
+}
 
-    MeshItem item(mType);
+/*!
+    \internal
+*/
+bool HbWidgetLoaderMemoryActions::addMeshLayoutEdge( const QString &src, Hb::Edge srcEdge, 
+                                               const QString &dst, Hb::Edge dstEdge,
+                                               const HbXmlLengthValue &spacing, const QString &spacer )
+{    
+    HbWidgetLoader::MeshItem item(mLayoutDef->type);
     item.src = src;
-    item.dst = dst;
+    item.dst = dst;    
+    item.srcEdge = srcEdge;    
+    item.dstEdge = dstEdge;
+    item.spacingType = spacing.mType;
+    item.spacingVal = spacing.mValue;
+    item.spacingText = spacing.mString;
+    item.spacer = spacer;
     
-    int edgeIndex = getAnchorEdge( srcEdge );
-    if( edgeIndex < 0 ) {
-        qWarning() << "Invalid mesh start edge"; 
-        return false;
-    }
-    
-    item.srcEdge = (Hb::Edge)edgeIndex;
-    
-    edgeIndex = getAnchorEdge( dstEdge );
-    if( edgeIndex < 0 ){
-        qWarning() << "Invalid mesh end edge"; 
-        return false;
-    }
-    
-    item.dstEdge = (Hb::Edge)edgeIndex;
-    
-    item.spacing = spacing;
-
-    mCacheLayout->meshItems.append(item);
+    mLayoutDef->meshItems.append(item);
 
     return true;
 }
 
-/*
-  Updates the widget's layout with the data given in LayoutDefinition.
-  If no LayoutDefinition it's assumed that the correct layout definition
-  is found in internal cache.
-*/
-void HbWidgetLoaderActions::updateWidget(LayoutDefinition* layoutDef)
-{
-    if (!layoutDef) {
-        // Use client side cache.
-        layoutDef = mCacheLayout;
-    }
-    if (layoutDef){
-        // Construct layout from layout definition
-	    createMeshLayout();
-	    HbWidgetLoaderSyntax loaderSyntax(NULL);
-	    HbMeshLayout *layout = static_cast<HbMeshLayout*>(mWidget->layout());
-
-	    for (int i = 0; i < layoutDef->meshItems.count(); i++){
-			const MeshItem &item = layoutDef->meshItems.at(i);
-	        // Mesh item stored in the sharedmemory doesn't contain
-	        // the actual data. so, converting that to pixels.
-	        qreal spacing=0.0;
-            if (!(item.spacing.isEmpty())){
-                loaderSyntax.toPixels(HbDeviceProfile::profile(mWidget), item.spacing,spacing);
-            }
-            layout->setAnchor(item.src, item.srcEdge, item.dst, item.dstEdge, spacing);
-	    }
-        for (int i=0; i<layoutDef->spacers.count(); i++){
-            QString spacer = layoutDef->spacers.at(i);
-            if ( !mWidget->layoutPrimitive( spacer ) ) {
-                static_cast<HbWidgetPrivate*>(HbWidgetBasePrivate::d_ptr(mWidget))
-                    ->createSpacerItem(spacer);
-            }
-        }
-    }
-}
-
-/*
-  Returns the mesh items offset.
-*/
-
-int HbWidgetLoaderActions::getLayoutDefintionOffset()
-{
-    if(HbMemoryManager::SharedMemory == mType) {
-    	return mLayoutDefinitionOffset;
-    }else {
-    	return -1;
-    }
-}
-
-/*
-  Sets the MeshItemsOffset
-*/
-void HbWidgetLoaderActions::setLayoutDefintionOffset(int offset)
-{
-    mLayoutDefinitionOffset = offset;
-}
-
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/utils/hbwidgetloaderactions_p.h
--- a/src/hbcore/utils/hbwidgetloaderactions_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/utils/hbwidgetloaderactions_p.h	Mon May 03 12:48:33 2010 +0300
@@ -32,8 +32,10 @@
 #include <hbstring_p.h>
 #include <hbmeshlayout_p.h>
 #include <hbmemorymanager_p.h>
+#include "hbwidgetloader_p.h"
 #include "hbwidgetloaderactions_p.h"
-#include "hbxmlloaderabstractactions_p.h"
+#include "hbxmlloaderbaseactions_p.h"
+#include "hbxmlloaderabstractsyntax_p.h"
 #include "hbvector_p.h"
 #include <QDateTime>
 
@@ -47,58 +49,43 @@
 #define HB_DOCUMENTLOADER_PRINT(a) qDebug() << QString(a);
 #endif // HB_DOCUMENTLOADER_DEBUG
 
-
-struct MeshItem
-{
-    HbString src;
-    HbString dst;
-    Hb::Edge srcEdge;
-    Hb::Edge dstEdge;
-    HbString spacing;
-    MeshItem(HbMemoryManager::MemoryType type = HbMemoryManager::HeapMemory):src(type),dst(type),spacing(type)
-    {
-    }
-};
-
-struct LayoutDefinition {
-    HbVector<MeshItem> meshItems;
-    HbVector<HbString> spacers;
-    LayoutDefinition(HbMemoryManager::MemoryType type = HbMemoryManager::HeapMemory):meshItems(type),spacers(type)
-    {
-    }
-};
-
-class HB_CORE_PRIVATE_EXPORT HbWidgetLoaderActions : public HbXmlLoaderAbstractActions
+class HbWidgetLoaderActions : public HbXmlLoaderBaseActions
 {
     public:
-        HbWidgetLoaderActions(HbMemoryManager::MemoryType type = HbMemoryManager::HeapMemory);
+        HbWidgetLoaderActions();
         virtual ~HbWidgetLoaderActions();
 
-        bool createMeshLayout();
-        bool addMeshLayoutEdge( const QString &src, const QString &srcEdge, 
-                                const QString &dst, const QString &dstEdge,
-                                const QString &spacing, const QString &spacer = QString() );
+        void setWidget( HbWidget *widget );
 
-        void updateWidget(LayoutDefinition *layoutDef);
-
-        int getLayoutDefintionOffset();
-        void setLayoutDefintionOffset(int offset);
+        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() );
 
     public:
         Q_DISABLE_COPY(HbWidgetLoaderActions)
 
         HbWidget *mWidget;
-        bool mLayoutFound;
+    private:
+        HbMeshLayout *mLayout;
+};
+
+class HbWidgetLoaderMemoryActions : public HbXmlLoaderAbstractActions
+{
+    public:
+        HbWidgetLoaderMemoryActions();
+        virtual ~HbWidgetLoaderMemoryActions();
 
-        // Layout caching
-        static LayoutDefinition *mCacheLayout;
-        static QString mCacheFileName;
-        static QString mCacheName;
-        static QString mCacheSection;
-        static QDateTime mCacheModified;
-    private:
-        HbMemoryManager::MemoryType mType;
-        int mLayoutDefinitionOffset;
+        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() );
+
+    public:
+        Q_DISABLE_COPY(HbWidgetLoaderMemoryActions)
+
+    public:
+        HbWidgetLoader::LayoutDefinition *mLayoutDef;
 };
 
 #endif // HBWIDGETLOADERACTIONS_P_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/utils/hbwidgetloadersyntax_p.cpp
--- a/src/hbcore/utils/hbwidgetloadersyntax_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/utils/hbwidgetloadersyntax_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -31,12 +31,11 @@
 
 
 /*
-    \class HbWidgetLoaderActions
+    \class HbWidgetLoaderSyntax
     \internal
     \proto
 */
 
-
 // Uncomment the following in order to get additional debug prints
 //#define HB_WIDGETLOADER_DEBUG
  
@@ -55,16 +54,24 @@
 #define MIN_SUPPORTED_VERSION_MAJOR 0
 #define MIN_SUPPORTED_VERSION_MINOR 1
 
-
-HbWidgetLoaderSyntax::HbWidgetLoaderSyntax( HbWidgetLoaderActions *actions ) :
-    HbXmlLoaderAbstractSyntax( actions ), mRealActions( actions )
+/*!
+    \internal
+*/
+HbWidgetLoaderSyntax::HbWidgetLoaderSyntax( HbXmlLoaderAbstractActions *actions ) :
+    HbXmlLoaderBaseSyntax( actions )
 {
 }
 
+/*!
+    \internal
+*/
 HbWidgetLoaderSyntax::~HbWidgetLoaderSyntax()
 {
 }
 
+/*!
+    \internal
+*/
 bool HbWidgetLoaderSyntax::load( QIODevice *device, const QString &name, const QString &section )
 {
     //  HbXmlLoaderAbstractSyntax::load is not called here as it is coupled with the
@@ -74,7 +81,7 @@
     mLayoutName = name;
     mLayoutFound = false;
 
-    bool result = HbXmlLoaderAbstractSyntax::loadDevice(device,section);
+    bool result = HbXmlLoaderBaseSyntax::loadDevice(device,section);
 
     if ( result && !mLayoutFound ) {
         // File parsed ok, but requested layout not found.
@@ -85,16 +92,22 @@
     return result;
 }
 
-ElementType HbWidgetLoaderSyntax::elementType( QStringRef name ) const
+/*!
+    \internal
+*/
+HbXml::ElementType HbWidgetLoaderSyntax::elementType( QStringRef name ) const
 {
     const QString stringName = name.toString();
 
     if( stringName == lexemValue(TYPE_HBWIDGET) ){
-        return DOCUMENT;
+        return HbXml::DOCUMENT;
     } 
-    return HbXmlLoaderAbstractSyntax::elementType( name );
+    return HbXmlLoaderBaseSyntax::elementType( name );
 }
 
+/*!
+    \internal
+*/
 bool HbWidgetLoaderSyntax::processDocument()
 {
     bool ok, ok1, ok2, res = true;
@@ -132,10 +145,12 @@
                 
     }
 
-    return mRealActions->pushDocument( attribute( ATTR_CONTEXT ) );
+    return mActions->pushDocument( attribute( ATTR_CONTEXT ) );
 }
 
-
+/*!
+    \internal
+*/
 bool HbWidgetLoaderSyntax::processLayout()
 {
     const QString layout_type = attribute( ATTR_TYPE );
@@ -146,21 +161,21 @@
         if( layout_name == mLayoutName ) {
             mCurrentLayoutType = LAYOUT_MESH_TARGET;
             mLayoutFound = true;
-
-            mRealActions->mCacheLayout->meshItems.clear();
-            mRealActions->mCacheLayout->spacers.clear();
-            result = true;
+            result = mActions->createMeshLayout( QString() );
         } else {
             mCurrentLayoutType = LAYOUT_MESH_ALIEN;
             result = true;
         }
     } else {        
-        result =  HbXmlLoaderAbstractSyntax::processLayout();
+        result =  HbXmlLoaderBaseSyntax::processLayout();
     }
     
     return result;
 }
 
+/*!
+    \internal
+*/
 bool HbWidgetLoaderSyntax::readLayoutStartItem()
 {
     bool result = false;
@@ -175,29 +190,41 @@
         {
             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 srcEdge = attribute( ML_SRC_EDGE );
-                const QString dstEdge = attribute( ML_DST_EDGE );
+                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 );
                 
-                                
-                result = mRealActions->addMeshLayoutEdge( src, srcEdge, dst, dstEdge, spacing, 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 );
+                }
               
             }
             break;
         }
         default:
         {
-            result = HbXmlLoaderAbstractSyntax::readLayoutStartItem();
+            result = HbXmlLoaderBaseSyntax::readLayoutStartItem();
             break;
         }
     }
     return result;
 }
 
+/*!
+    \internal
+*/
 QString HbWidgetLoaderSyntax::version()
 {
     return ( QString::number( VERSION_MAJOR ) + QString( "." )
@@ -205,3 +232,46 @@
             + QString::number( MIN_SUPPORTED_VERSION_MAJOR ) + QString( "." )
             + QString::number( MIN_SUPPORTED_VERSION_MINOR ) + QString( ")" ) );
 }
+
+
+/*
+    \class HbWidgetLoaderMemorySyntax
+    \internal
+    \proto
+*/
+
+/*!
+    \internal
+*/
+HbWidgetLoaderMemorySyntax::HbWidgetLoaderMemorySyntax( HbXmlLoaderAbstractActions *actions )
+    : HbXmlLoaderAbstractSyntax(actions)
+{
+}
+
+/*!
+    \internal
+*/
+HbWidgetLoaderMemorySyntax::~HbWidgetLoaderMemorySyntax()
+{
+}
+    
+/*!
+    \internal
+*/
+bool HbWidgetLoaderMemorySyntax::load( HbWidgetLoader::LayoutDefinition* layoutDef )
+{
+    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 );
+    }
+
+    return retVal;
+}
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/utils/hbwidgetloadersyntax_p.h
--- a/src/hbcore/utils/hbwidgetloadersyntax_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/utils/hbwidgetloadersyntax_p.h	Mon May 03 12:48:33 2010 +0300
@@ -26,7 +26,7 @@
 #ifndef HBWIDGETLOADERSYNTAX_P_H
 #define HBWIDGETLOADERSYNTAX_P_H
 
-#include "hbxmlloaderabstractsyntax_p.h"
+#include "hbxmlloaderbasesyntax_p.h"
 #include "hbxmlloaderabstractactions_p.h"
 #include "hbwidgetloaderactions_p.h"
 #include <hbglobal.h>
@@ -37,12 +37,12 @@
 class HbWidget;
 class HbWidgetLoaderPrivate;
 
-class HB_CORE_PRIVATE_EXPORT HbWidgetLoaderSyntax : public HbXmlLoaderAbstractSyntax
+class HbWidgetLoaderSyntax : public HbXmlLoaderBaseSyntax
 {
 
 public:
 
-    HbWidgetLoaderSyntax( HbWidgetLoaderActions *actions );
+    HbWidgetLoaderSyntax( HbXmlLoaderAbstractActions *actions );
 
     virtual ~HbWidgetLoaderSyntax();
     
@@ -54,18 +54,30 @@
 public:
     Q_DISABLE_COPY(HbWidgetLoaderSyntax)
 
-    ElementType elementType( QStringRef name ) const;
+    HbXml::ElementType elementType( QStringRef name ) const;
     bool processLayout();
     bool processDocument();
     bool readLayoutStartItem();
     
-public:
+private:
     
-    HbWidgetLoaderActions *mRealActions;
-
     QString mLayoutName;
-
     bool mLayoutFound;
 };
 
+class HbWidgetLoaderMemorySyntax : public HbXmlLoaderAbstractSyntax
+{
+public:
+
+    HbWidgetLoaderMemorySyntax( HbXmlLoaderAbstractActions *actions );
+
+    virtual ~HbWidgetLoaderMemorySyntax();
+    
+    bool load( HbWidgetLoader::LayoutDefinition* layoutDef );
+        
+public:
+    Q_DISABLE_COPY(HbWidgetLoaderMemorySyntax)
+
+};
+
 #endif // HBWIDGETLOADERSYNTAX_P_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/utils/hbxmlloaderabstractactions_p.cpp
--- a/src/hbcore/utils/hbxmlloaderabstractactions_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/utils/hbxmlloaderabstractactions_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -24,9 +24,11 @@
 ****************************************************************************/
 
 #include "hbxmlloaderabstractactions_p.h"
+#include "hbxmlloaderabstractsyntax_p.h"
 
 #include <QCoreApplication>
 
+#define RETURNVALUE true
 
 /*
     \class HbXmlLoaderAbstractActions
@@ -34,327 +36,339 @@
     \proto
 */
 
-HbXmlLoaderAbstractActions::HbXmlLoaderAbstractActions() : 
-    mContext(), 
-    mStack(),
-    mCurrentContainer(0)
+HbXmlLoaderAbstractActions::HbXmlLoaderAbstractActions()
 {
 }
 
 HbXmlLoaderAbstractActions::~HbXmlLoaderAbstractActions()
 {
-    reset();    
 }
 
-QList <QObject*> HbXmlLoaderAbstractActions::takeAll()
-{
-    QList<QPointer<QObject> > objects = mTopObjectMap.values();
-    
-    QList<QObject *> result;
-    while (objects.size()) {
-        QPointer<QObject> ptr = objects.takeLast();
-        if (ptr.data()) {
-            result.append(ptr.data());
-        }
-    }
-    
-    return result;
-    
-}
-
-
-void HbXmlLoaderAbstractActions::removeChildren( QPointer<QObject> parent )
-{
-    mObjectMap.remove( mObjectMap.key( parent ) );
-    QList<QPointer<QObject> > objects = mObjectMap.values();
-    for( int i = 0; i < objects.size(); i++ ) {
-        if( objects[i].data() ) {
-            if( objects[i].data()->parent() == parent ) {
-                removeChildren( objects[i] ); 
-            }
-        }
-    }
-}
-
-QGraphicsWidget* HbXmlLoaderAbstractActions::findWidget( const QString &name )
-{
-    QGraphicsWidget *result = 0;
-    
-    ObjectMap::iterator it = mObjectMap.find(name);
-    if (it != mObjectMap.end()) {
-        QObject *current = it.value().data();
-        result = qobject_cast<QGraphicsWidget *>(current);
-    }    
-        
-    return result;        
-}
-
-
-QObject* HbXmlLoaderAbstractActions::findObject( const QString &name )
-{
-    if( mObjectMap.contains(name) ) {               
-        return mObjectMap.value(name).data();
-    }
-    return 0;    
-}
-
-
-
-bool HbXmlLoaderAbstractActions::pushDocument(const QString& context)
-{
-    Element e;
-    e.type = DOCUMENT;
-    e.data = 0;
-    mStack.append( e );
-
-    mContext = context;
-
-    HB_DOCUMENTLOADER_PRINT( QString( "ADD ELEMENT " )  );
-    return true;
-}
-
-
-
-bool HbXmlLoaderAbstractActions::pop( const ElementType type )
-{
-    
-    // No check for now...
-    
-    switch( type ) {
-         case OBJECT:
-         case WIDGET:
-         case SPACERITEM:
-         case DOCUMENT:
-         {
-            if( mStack.isEmpty() ) {
-                return false;
-            }
-            
-            HB_DOCUMENTLOADER_PRINT( QString( "REMOVE ELEMENT " ) );            
-            mStack.removeLast();
-            break;
-         }
-         
-         case LAYOUT:
-         case CONTAINER:
-         case CONNECT:
-         case PROPERTY:
-         default:
-         {
-         }
-    }         
-    return true;
-}
-
-
 void HbXmlLoaderAbstractActions::cleanUp()
 {
-    mStack.clear();
-    
-    // Create mTopObjectMap
-    for (ObjectMap::const_iterator it = mObjectMap.constBegin(); 
-         it != mObjectMap.constEnd(); 
-         ++it ) {
-        QObject *object = it.value().data();
-        
-        QGraphicsWidget *asWidget = qobject_cast<QGraphicsWidget *>(object);
-        if (asWidget) {
-            if (!asWidget->parentItem() && !asWidget->parent()) {
-                mTopObjectMap.insert(it.key(), object);
-            }
-        } else if (object && !object->parent()) {
-            mTopObjectMap.insert(it.key(), object);
-        } else {
-            // not added - owned by another object.
-        }
-    }
-}
-
-QObject* HbXmlLoaderAbstractActions::createObject( const QString& type, const QString &name, const QString &plugin )
-{
-    Q_UNUSED( type );
-    Q_UNUSED( name );
-    Q_UNUSED( plugin );
-    return 0;
 }
 
-
-QObject* HbXmlLoaderAbstractActions::lookUp(const QString& type, const QString &name, const QString &plugin)
-{   
-    const bool nameNotEmpty = name.size() != 0;
-    bool doLookUp = true;
-    QObject *current = 0;
-    
-    if (nameNotEmpty) {
-        ObjectMap::iterator it = mObjectMap.find(name);
-        if (it != mObjectMap.end()) {
-            current = it.value();
-            
-            if (!current) {
-                mObjectMap.remove(name);
-            }
-            if (current && !type.isEmpty()) {
-                const QByteArray array = type.toUtf8();
-                
-                if (!current->inherits(array.data())) {                    
-                    HB_DOCUMENTLOADER_PRINT( QString( "Existing object requested with invalid type" ) );
-                    // We have object already in mObjectMap, but it does not fulfill
-                    // all needs. So object look up has failed.
-                    doLookUp = false;
-                    current = 0;
-                }
-            }
-        }
-    }
-    
-    if (doLookUp && !current) {
-        current = createObject(type, name, plugin);
-        
-        if (nameNotEmpty) {
-            mObjectMap.insert(name, current);
-        }
-    }
-
-    return current;
-}
-
-QGraphicsLayoutItem *HbXmlLoaderAbstractActions::findSpacerItemFromStackTop() const
+void HbXmlLoaderAbstractActions::reset()
 {
-    QGraphicsLayoutItem *current = 0;
-    if ( mStack[mStack.size()-1].type == SPACERITEM ) {
-        current = (QGraphicsLayoutItem*)mStack[mStack.size()-1].data;
-    }
-    return current;
-}
-
-QObject *HbXmlLoaderAbstractActions::findFromStack(bool *isWidgetElement) const
-{
-    QObject *current = 0;
-    bool widget = false;
-    
-    for( int i = mStack.size() - 1; i >=0; i-- )
-    {
-        if( ( mStack[i].type == OBJECT ) || ( mStack[i].type == WIDGET ) ) {
-            current = (QObject*)mStack[i].data;
-            widget = ( mStack[i].type == WIDGET );
-            break;
-        }
-    }
-    
-    if (isWidgetElement) {
-        *isWidgetElement = widget;
-    }
-    return current;
 }
 
 void HbXmlLoaderAbstractActions::deleteAll()
 {
-    QList<QObject *> list = takeAll();
-    
-    qDeleteAll( list );
-    
-    reset();
+}
+
+bool HbXmlLoaderAbstractActions::pushDocument( const QString& context)
+{
+    Q_UNUSED(context);
+    return RETURNVALUE;
+}
+
+bool HbXmlLoaderAbstractActions::pushObject( const QString& type, const QString &name )
+{
+    Q_UNUSED(type);
+    Q_UNUSED(name);
+    return RETURNVALUE;
+}
+
+bool HbXmlLoaderAbstractActions::pushWidget(
+    const QString& type,
+    const QString &name,
+    const QString &role,
+    const QString &plugin )
+{
+    Q_UNUSED(type);
+    Q_UNUSED(name);
+    Q_UNUSED(role);
+    Q_UNUSED(plugin);
+    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,
+    const QString &dstName,
+    const QString &slotName )
+{
+    Q_UNUSED(srcName);
+    Q_UNUSED(signalName);
+    Q_UNUSED(dstName);
+    Q_UNUSED(slotName);
+    return RETURNVALUE;
+}
+
+bool HbXmlLoaderAbstractActions::pushProperty( const char *propertyName, const HbXmlVariable &variable )
+{
+    Q_UNUSED(propertyName);
+    Q_UNUSED(variable);
+    return RETURNVALUE;
+}
+
+bool HbXmlLoaderAbstractActions::pushRef( const QString &name, const QString &role )
+{
+    Q_UNUSED(name);
+    Q_UNUSED(role);
+    return RETURNVALUE;
+}
+
+bool HbXmlLoaderAbstractActions::pushContainer(
+    const char *propertyName,
+    HbXmlLoaderAbstractSyntax::DocumentLexems type,
+    const QList<HbXmlVariable*> &container )
+{
+    Q_UNUSED(propertyName);
+    Q_UNUSED(type);
+    Q_UNUSED(container);
+    return RETURNVALUE;
+}
+
+        
+bool HbXmlLoaderAbstractActions::pop( const HbXml::ElementType type )
+{
+    Q_UNUSED(type);
+    return RETURNVALUE;
 }
 
 
-void HbXmlLoaderAbstractActions::reset()
+bool HbXmlLoaderAbstractActions::setContentsMargins( 
+    const HbXmlLengthValue &left,
+    const HbXmlLengthValue &top,
+    const HbXmlLengthValue &right,
+    const HbXmlLengthValue &bottom )
+{
+    Q_UNUSED(left);
+    Q_UNUSED(top);
+    Q_UNUSED(right);
+    Q_UNUSED(bottom);
+    return RETURNVALUE;
+}
+
+bool HbXmlLoaderAbstractActions::setSizePolicy(
+    QSizePolicy::Policy *horizontalPolicy, 
+    QSizePolicy::Policy *verticalPolicy, 
+    int *horizontalStretch,
+    int *verticalStretch )
+{
+    Q_UNUSED(horizontalPolicy);
+    Q_UNUSED(verticalPolicy);
+    Q_UNUSED(horizontalStretch);
+    Q_UNUSED(verticalStretch);
+    return RETURNVALUE;
+}
+
+bool HbXmlLoaderAbstractActions::setSizeHint(
+    Qt::SizeHint hint,
+    const HbXmlLengthValue &hintWidth,
+    const HbXmlLengthValue &hintHeight,
+    bool fixed)
 {
-    mStack.clear();
-    mTopObjectMap.clear();
-    mObjectMap.clear();
+    Q_UNUSED(hint);
+    Q_UNUSED(hintWidth);
+    Q_UNUSED(hintHeight);
+    Q_UNUSED(fixed);
+    return RETURNVALUE;
+}
+
+bool HbXmlLoaderAbstractActions::setToolTip( const HbXmlVariable &tooltip )
+{
+    Q_UNUSED(tooltip);
+    return RETURNVALUE;
+}
+
+bool HbXmlLoaderAbstractActions::createAnchorLayout( const QString &widget )
+{
+    Q_UNUSED(widget);
+    return RETURNVALUE;
+}
+
+bool HbXmlLoaderAbstractActions::addAnchorLayoutEdge(
+    const QString &src,
+    Hb::Edge srcEdge, 
+    const QString &dst,
+    Hb::Edge dstEdge,
+    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::createMeshLayout( const QString &widget )
+{
+    Q_UNUSED(widget);
+    return RETURNVALUE;
+}
 
-bool HbXmlLoaderAbstractActions::setObjectTree( QList<QObject *> roots )
+bool HbXmlLoaderAbstractActions::addMeshLayoutEdge(
+    const QString &src,
+    Hb::Edge srcEdge, 
+    const QString &dst,
+    Hb::Edge dstEdge,
+    const HbXmlLengthValue &spacing,
+    const QString &spacer )
 {
-    reset();
-    
-    for( int i = 0; i < roots.size(); i++ ) {
-        mTopObjectMap.insert( roots[i]->objectName(), roots[i] );        
-    }
-    
-    addToObjectMap( roots );
-    
-    return true;
+    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 )
+{
+    Q_UNUSED(widget);
+    Q_UNUSED(spacing);
+    return RETURNVALUE;
 }
 
-void HbXmlLoaderAbstractActions::addToObjectMap( QList<QObject *> objects )
+bool HbXmlLoaderAbstractActions::addGridLayoutCell(
+    const QString &src,
+    int row, 
+    int column,
+    int *rowspan,
+    int *columnspan,
+    Qt::Alignment *alignment )
 {
-    for( int i = 0; i < objects.size(); i++ ) {
-        mObjectMap.insert( objects[i]->objectName(), objects[i] );
-        QGraphicsWidget *widget = qobject_cast<QGraphicsWidget *>( objects[i] );
-        if( widget ) {
-            addToObjectMap( widget->childItems() );
-        } else {
-            addToObjectMap( objects[i]->children() );
-        }
-    }
+    Q_UNUSED(src);
+    Q_UNUSED(row);
+    Q_UNUSED(column);
+    Q_UNUSED(rowspan);
+    Q_UNUSED(columnspan);
+    Q_UNUSED(alignment);
+    return RETURNVALUE;
 }
 
-void HbXmlLoaderAbstractActions::addToObjectMap( QList<QGraphicsItem *> objects )
+bool HbXmlLoaderAbstractActions::setGridLayoutRowProperties(
+    int row,
+    int *rowStretchFactor,
+    Qt::Alignment *alignment )
 {
-    for( int i = 0; i < objects.size(); i++ ) {
-        if( objects[i]->isWidget() ) {
-            QGraphicsWidget *widget = static_cast<QGraphicsWidget *>( objects[i] );
-            mObjectMap.insert( widget->objectName(), widget );
-            addToObjectMap( widget->childItems() );
-        }
-    }    
+    Q_UNUSED(row);
+    Q_UNUSED(rowStretchFactor);
+    Q_UNUSED(alignment);
+    return RETURNVALUE;
+}
+
+bool HbXmlLoaderAbstractActions::setGridLayoutColumnProperties(
+    int column,
+    int *columnStretchFactor,
+    Qt::Alignment *alignment )
+{
+    Q_UNUSED(column);
+    Q_UNUSED(columnStretchFactor);
+    Q_UNUSED(alignment);
+    return RETURNVALUE;
 }
 
-QString HbXmlLoaderAbstractActions::translate( const QString &value, const QString &comment )
+bool HbXmlLoaderAbstractActions::setGridLayoutRowHeights(
+    int row,
+    const HbXmlLengthValue &minHeight,
+    const HbXmlLengthValue &maxHeight, 
+    const HbXmlLengthValue &prefHeight,
+    const HbXmlLengthValue &fixedHeight, 
+    const HbXmlLengthValue &rowSpacing )
 {
-    if( ! mContext.isEmpty() ) {
-        QByteArray contextUtf8(mContext.toUtf8());
-        QByteArray valueUtf8(value.toUtf8());
-		
-		if (comment.isEmpty()) {
-			return QCoreApplication::translate( 
-						contextUtf8.data(), valueUtf8.data(), 
-						0, QCoreApplication::UnicodeUTF8 );
-		} else {
-			QByteArray commentUtf8(comment.toUtf8());
-			return QCoreApplication::translate( 
-						contextUtf8.data(), valueUtf8.data(), 
-						commentUtf8.data(), QCoreApplication::UnicodeUTF8 );
-		}        
-    } else {
-        return value;
-    }
+    Q_UNUSED(row);
+    Q_UNUSED(minHeight);
+    Q_UNUSED(maxHeight);
+    Q_UNUSED(prefHeight);
+    Q_UNUSED(fixedHeight);
+    Q_UNUSED(rowSpacing);
+    return RETURNVALUE;
+}
+
+bool HbXmlLoaderAbstractActions::setGridLayoutColumnWidths(
+    int column,
+    const HbXmlLengthValue &minWidth,
+    const HbXmlLengthValue &maxWidth,
+    const HbXmlLengthValue &prefWidth,
+    const HbXmlLengthValue &fixedWidth,
+    const HbXmlLengthValue &columnSpacing )
+{
+    Q_UNUSED(column);
+    Q_UNUSED(minWidth);
+    Q_UNUSED(maxWidth);
+    Q_UNUSED(prefWidth);
+    Q_UNUSED(fixedWidth);
+    Q_UNUSED(columnSpacing);
+    return RETURNVALUE;
+}
+bool HbXmlLoaderAbstractActions::createLinearLayout(
+    const QString &widget,
+    Qt::Orientation *orientation, 
+    const HbXmlLengthValue &spacing )
+{
+    Q_UNUSED(widget);
+    Q_UNUSED(orientation);
+    Q_UNUSED(spacing);
+    return RETURNVALUE;
 }
 
-int HbXmlLoaderAbstractActions::getAnchorEdge( const QString &edge ) const
+bool HbXmlLoaderAbstractActions::addLinearLayoutItem(
+    const QString &itemname,
+    int *index,
+    int *stretchfactor, 
+    Qt::Alignment *alignment,
+    const HbXmlLengthValue &spacing )
 {
-    if( edge=="TOP" ) {
-        return Hb::TopEdge;
-    } else if( edge=="BOTTOM" ) {
-        return Hb::BottomEdge;
-    } else if( edge=="LEFT" ) {
-        return Hb::LeftEdge;
-    } else if( edge=="RIGHT" ) {
-        return Hb::RightEdge;
-    } else if( edge=="CENTERH" ) {
-        return Hb::CenterHEdge;
-    } else if( edge=="CENTERV" ) {
-        return Hb::CenterVEdge;
-    }
-    return -1;
+    Q_UNUSED(itemname);
+    Q_UNUSED(index);
+    Q_UNUSED(stretchfactor);
+    Q_UNUSED(alignment);
+    Q_UNUSED(spacing);
+    return RETURNVALUE;
+}
+
+bool HbXmlLoaderAbstractActions::addLinearLayoutStretch(
+    int *index,
+    int *stretchfactor )
+{
+    Q_UNUSED(index);
+    Q_UNUSED(stretchfactor);
+    return RETURNVALUE;
 }
 
-QString HbXmlLoaderAbstractActions::getAnchorOppositeEdge( const QString &edge ) const
+bool HbXmlLoaderAbstractActions::setLayoutContentsMargins(
+    const HbXmlLengthValue &left,
+    const HbXmlLengthValue &top,
+    const HbXmlLengthValue &right,
+    const HbXmlLengthValue &bottom )
 {
-    if( edge=="TOP" ) {
-        return "BOTTOM";
-    } else if( edge=="BOTTOM" ) {
-        return "TOP";
-    } else if( edge=="LEFT" ) {
-        return "RIGHT";
-    } else if( edge=="RIGHT" ) {
-        return "LEFT";
-    }
-
-    return edge;
+    Q_UNUSED(left);
+    Q_UNUSED(top);
+    Q_UNUSED(right);
+    Q_UNUSED(bottom);
+    return RETURNVALUE;
+}
+bool HbXmlLoaderAbstractActions::createStackedLayout( const QString &widget )
+{
+    Q_UNUSED(widget);
+    return RETURNVALUE;
 }
 
+bool HbXmlLoaderAbstractActions::addStackedLayoutItem( const QString &itemname, int *index )
+{
+    Q_UNUSED(itemname);
+    Q_UNUSED(index);
+    return RETURNVALUE;
+}
 
+bool HbXmlLoaderAbstractActions::createNullLayout( const QString &widget )
+{
+    Q_UNUSED(widget);
+    return RETURNVALUE;
+}
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/utils/hbxmlloaderabstractactions_p.h
--- a/src/hbcore/utils/hbxmlloaderabstractactions_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/utils/hbxmlloaderabstractactions_p.h	Mon May 03 12:48:33 2010 +0300
@@ -27,8 +27,10 @@
 #ifndef HBXMLLOADERABSTRACTACTIONS_P_H
 #define HBXMLLOADERABSTRACTACTIONS_P_H
 
+#include <hbxmlloaderabstractsyntax_p.h>
+
 #include <hbglobal.h>
-#include <hbwidget.h>
+#include <hbnamespace.h>
 
 #include <QGraphicsWidget>
 #include <QGraphicsLayout>
@@ -45,87 +47,134 @@
 #define HB_DOCUMENTLOADER_PRINT(a) qDebug() << QString(a);
 #endif // HB_DOCUMENTLOADER_DEBUG
 
+struct HbXmlLengthValue;
 
-enum ElementType {
-    DOCUMENT,
-    OBJECT,
-    WIDGET,
-    LAYOUT,
-    SPACERITEM,
-    CONNECT,
-    CONTAINER,
-    PROPERTY,
-    SECTION,
-    REF,
-    VARIABLE,
-    METADATA,
-    UNKNOWN,
-    DEPRECATED
-};
-
-
-
-class HbXmlLoaderAbstractPrivate;
-
-class HB_CORE_EXPORT HbXmlLoaderAbstractActions
-{
-    public:
-        
-        struct Element 
-        {
-            ElementType type;
-            void *data;
-        };
-        
-        typedef QMap<QString, QPointer<QObject> > ObjectMap;
-        
+class HB_CORE_PRIVATE_EXPORT HbXmlLoaderAbstractActions
+{        
     public:    
     
         HbXmlLoaderAbstractActions();
         virtual ~HbXmlLoaderAbstractActions();
         
-        QList<QObject *> takeAll();
-        
-        
-        QGraphicsWidget* findWidget(const QString &name);
-        QObject* findObject(const QString &name);
+        virtual void reset();
+        virtual void cleanUp();
+        virtual void deleteAll();
 
-        virtual QObject *createObject( const QString& type, const QString &name, const QString &plugin );
-        
+        virtual bool pushDocument( const QString& context);
+        virtual bool pushObject( const QString& type, const QString &name );
+        virtual bool pushWidget(
+            const QString &type,
+            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,
+            const QString &dstName,
+            const QString &slotName );
+        virtual bool pushProperty( const char *propertyName, const HbXmlVariable &variable );
+        virtual bool pushRef( const QString &name, const QString &role );
+        virtual bool pushContainer(
+            const char *propertyName,
+            HbXmlLoaderAbstractSyntax::DocumentLexems type,
+            const QList<HbXmlVariable*> &container );
         
-        bool pushDocument( const QString& context);
-        bool pop( const ElementType type );
-        
-        int getAnchorEdge( const QString &edge ) const;
-        QString getAnchorOppositeEdge( const QString &edge ) const;
+        virtual bool pop( const HbXml::ElementType type );
 
-        void cleanUp();
-        void reset();
-        void deleteAll();
-        
-        bool setObjectTree( QList<QObject *> roots );
+        virtual bool setContentsMargins(
+            const HbXmlLengthValue &left,
+            const HbXmlLengthValue &top,
+            const HbXmlLengthValue &right,
+            const HbXmlLengthValue &bottom );
+        virtual bool setSizePolicy(
+            QSizePolicy::Policy *horizontalPolicy, 
+            QSizePolicy::Policy *verticalPolicy, 
+            int *horizontalStretch,
+            int *verticalStretch );
+        virtual bool setSizeHint(
+            Qt::SizeHint hint,
+            const HbXmlLengthValue &hintWidth,
+            const HbXmlLengthValue &hintHeight,
+            bool fixed);
+        virtual bool setToolTip( const HbXmlVariable &tooltip );
 
-        QString translate( const QString &value, const QString &comment );
-        
-    
-        Q_DISABLE_COPY(HbXmlLoaderAbstractActions)
-
-        QObject *lookUp(const QString& type, const QString &name, const QString &plugin = QString());
-        QObject *findFromStack(bool *isWidgetElement = 0) const;
-        QGraphicsLayoutItem *findSpacerItemFromStackTop() const;
-        void removeChildren( QPointer<QObject> parent );
+        virtual bool createAnchorLayout( const QString &widget );
+        virtual bool addAnchorLayoutEdge(
+            const QString &src,
+            Hb::Edge srcEdge, 
+            const QString &dst,
+            Hb::Edge dstEdge,
+            const HbXmlLengthValue &spacing,
+            const QString &spacer = QString() );
         
-        void addToObjectMap( QList<QObject *> objects );
-        void addToObjectMap( QList<QGraphicsItem *> objects );
-
-    public:
-        QString mContext;
+        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() );
 
-        QList<Element> mStack;
-        ObjectMap mObjectMap;    
-        ObjectMap mTopObjectMap;
-        QGraphicsLayout *mCurrentLayout;
-        QList<QVariant> *mCurrentContainer;
+        virtual bool createGridLayout( const QString &widget, const HbXmlLengthValue &spacing );
+        virtual bool addGridLayoutCell(
+            const QString &src,
+            int row, 
+            int column,
+            int *rowspan,
+            int *columnspan,
+            Qt::Alignment *alignment );
+        virtual bool setGridLayoutRowProperties(
+            int row,
+            int *rowStretchFactor,
+            Qt::Alignment *alignment );
+        virtual bool setGridLayoutColumnProperties(
+            int column,
+            int *columnStretchFactor,
+            Qt::Alignment *alignment );
+        virtual bool setGridLayoutRowHeights(
+            int row,
+            const HbXmlLengthValue &minHeight,
+            const HbXmlLengthValue &maxHeight, 
+            const HbXmlLengthValue &prefHeight,
+            const HbXmlLengthValue &fixedHeight, 
+            const HbXmlLengthValue &rowSpacing );
+        virtual bool setGridLayoutColumnWidths(
+            int column,
+            const HbXmlLengthValue &minWidth,
+            const HbXmlLengthValue &maxWidth,
+            const HbXmlLengthValue &prefWidth,
+            const HbXmlLengthValue &fixedWidth,
+            const HbXmlLengthValue &columnSpacing );
+
+        virtual bool createLinearLayout(
+            const QString &widget,
+            Qt::Orientation *orientation, 
+            const HbXmlLengthValue &spacing );
+        virtual bool addLinearLayoutItem(
+            const QString &itemname,
+            int *index,
+            int *stretchfactor, 
+            Qt::Alignment *alignment,
+            const HbXmlLengthValue &spacing );
+        virtual bool addLinearLayoutStretch(
+            int *index,
+            int *stretchfactor );
+
+        virtual bool setLayoutContentsMargins(
+            const HbXmlLengthValue &left,
+            const HbXmlLengthValue &top,
+            const HbXmlLengthValue &right,
+            const HbXmlLengthValue &bottom );
+
+        virtual bool createStackedLayout( const QString &widget );
+        virtual bool addStackedLayoutItem( const QString &itemname, int *index );
+                                
+        virtual bool createNullLayout( const QString &widget );
+
+    private:
+        Q_DISABLE_COPY(HbXmlLoaderAbstractActions)
 };
 
 #endif // HBXMLLOADERABSTRACTACTIONS_P_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/utils/hbxmlloaderabstractsyntax_p.cpp
--- a/src/hbcore/utils/hbxmlloaderabstractsyntax_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/utils/hbxmlloaderabstractsyntax_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -25,9 +25,8 @@
 
 #include "hbxmlloaderabstractsyntax_p.h"
 
-
-#include <hbicon.h>
-#include <hbinstance.h>
+#include <QColor>
+#include <QDataStream>
 #include <QDebug>
 
 /*
@@ -37,7 +36,7 @@
 */
 
 // Static table of lexems.
-// These must be kept in sync with the DocumentLexems enum. 
+// These must be kept in sync with the DocumentLexems enum.
 static const char *knownLexems[HbXmlLoaderAbstractSyntax::NUMBER_OF_LEXEMS] = {
     "name",             // ATTR_NAME
     "type",             // ATTR_TYPE
@@ -175,6 +174,388 @@
     "index"             // SL_INDEX
 };
 
+QDataStream &operator<<(QDataStream &stream, const HbXmlLengthValue &value)
+{
+    quint8 type = value.mType;
+    stream << type;
+    switch ( value.mType ) {
+        case HbXmlLengthValue::None:
+            break;
+        case HbXmlLengthValue::PlainNumber:
+        case HbXmlLengthValue::Pixel:
+        case HbXmlLengthValue::Unit:
+        case HbXmlLengthValue::Millimeter:
+            {
+            double f_value = (double)value.mValue;
+            stream << f_value;
+            break;
+            }
+        case HbXmlLengthValue::Variable:
+        case HbXmlLengthValue::Expression:
+            stream << value.mString;
+            break;
+        default:
+            break;
+    }
+    return stream;
+}
+
+QDataStream &operator>>(QDataStream &stream, HbXmlLengthValue &value)
+{
+    quint8 type;
+    stream >> type;
+    value.mType = (HbXmlLengthValue::Type)type;
+    switch ( value.mType ) {
+        case HbXmlLengthValue::None:
+            break;
+        case HbXmlLengthValue::PlainNumber:
+        case HbXmlLengthValue::Pixel:
+        case HbXmlLengthValue::Unit:
+        case HbXmlLengthValue::Millimeter:
+            {
+            double f_value;
+            stream >> f_value;
+            value.mValue = f_value;
+            break;
+            }
+        case HbXmlLengthValue::Variable:
+        case HbXmlLengthValue::Expression:
+            stream >> value.mString;
+            break;
+        default:
+            break;
+    }
+    return stream;
+}
+
+
+HbXmlVariable::HbXmlVariable() : mType(UNKNOWN)
+{
+}
+
+HbXmlVariable::~HbXmlVariable()
+{
+    switch (mType) {
+        case HbXmlVariable::INT:
+        {
+        if (mParameters.count()) delete (qint16*)mParameters.takeAt(0);
+        break;
+        }
+
+        case HbXmlVariable::REAL:
+        {
+        if (mParameters.count()) delete (HbXmlLengthValue*)mParameters.takeAt(0);
+        break;
+        }
+
+        case HbXmlVariable::LOCALIZED_STRING:
+        {
+        if (mParameters.count()) delete (QString*)mParameters.takeAt(0);
+        if (mParameters.count()) delete (QString*)mParameters.takeAt(0);
+        break;
+        }
+
+        case HbXmlVariable::STRING:
+        {
+        if (mParameters.count()) delete (QString*)mParameters.takeAt(0);
+        if (mParameters.count()) delete (QString*)mParameters.takeAt(0);
+        break;
+        }
+
+        case HbXmlVariable::BOOL:
+        {
+        if (mParameters.count()) delete (bool*)mParameters.takeAt(0);
+        break;
+        }
+
+        case HbXmlVariable::ICON:
+        {
+        if (mParameters.count()) delete (QString*)mParameters.takeAt(0);
+        if (mParameters.count()) delete (HbXmlLengthValue*)mParameters.takeAt(0);
+        if (mParameters.count()) delete (HbXmlLengthValue*)mParameters.takeAt(0);
+        break;
+        }
+
+        case HbXmlVariable::SIZE:
+        {
+        if (mParameters.count()) delete (HbXmlLengthValue*)mParameters.takeAt(0);
+        if (mParameters.count()) delete (HbXmlLengthValue*)mParameters.takeAt(0);
+        break;
+        }
+
+        case HbXmlVariable::RECT:
+        {
+        if (mParameters.count()) delete (HbXmlLengthValue*)mParameters.takeAt(0);
+        if (mParameters.count()) delete (HbXmlLengthValue*)mParameters.takeAt(0);
+        if (mParameters.count()) delete (HbXmlLengthValue*)mParameters.takeAt(0);
+        if (mParameters.count()) delete (HbXmlLengthValue*)mParameters.takeAt(0);
+        break;
+        }
+
+        case HbXmlVariable::POINT:
+        {
+        if (mParameters.count()) delete (HbXmlLengthValue*)mParameters.takeAt(0);
+        if (mParameters.count()) delete (HbXmlLengthValue*)mParameters.takeAt(0);
+        break;
+        }
+
+        case HbXmlVariable::ENUMS:
+        {
+        if (mParameters.count()) delete (QString*)mParameters.takeAt(0);
+        break;
+        }
+
+        case HbXmlVariable::COLOR:
+        {
+        if (mParameters.count()) delete (QColor*)mParameters.takeAt(0);
+        break;
+        }
+
+        case HbXmlVariable::FONTSPEC:
+        {
+        if (mParameters.count()) delete (quint8*)mParameters.takeAt(0);
+        if (mParameters.count()) delete (HbXmlLengthValue*)mParameters.takeAt(0);
+        break;
+        }
+
+        default:
+        {
+        break;
+        }
+    }
+    Q_ASSERT(!mParameters.count());
+}
+
+QDataStream &operator<<(QDataStream &stream, const HbXmlVariable &variable)
+{
+    stream << (quint8)variable.mType;
+    switch (variable.mType) {
+        case HbXmlVariable::INT:
+        {
+        stream << *((qint16*)variable.mParameters.at(0));
+        break;
+        }
+
+        case HbXmlVariable::REAL:
+        {
+        stream << *((HbXmlLengthValue*)variable.mParameters.at(0));
+        break;
+        }
+
+        case HbXmlVariable::LOCALIZED_STRING:
+        {
+        stream << *((QString*)variable.mParameters.at(0))
+               << *((QString*)variable.mParameters.at(1));
+        break;
+        }
+
+        case HbXmlVariable::STRING:
+        {
+        stream << *((QString*)variable.mParameters.at(0))
+               << *((QString*)variable.mParameters.at(1));
+        break;
+        }
+
+        case HbXmlVariable::BOOL:
+        {
+        stream << *((bool*)variable.mParameters.at(0));
+        break;
+        }
+
+        case HbXmlVariable::ICON:
+        {
+        stream << *((QString*)variable.mParameters.at(0))
+               << *((HbXmlLengthValue*)variable.mParameters.at(1))
+               << *((HbXmlLengthValue*)variable.mParameters.at(2));
+        break;
+        }
+
+        case HbXmlVariable::SIZE:
+        {
+        stream << *((HbXmlLengthValue*)variable.mParameters.at(0))
+               << *((HbXmlLengthValue*)variable.mParameters.at(1));
+        break;
+        }
+
+        case HbXmlVariable::RECT:
+        {
+        stream << *((HbXmlLengthValue*)variable.mParameters.at(0))
+               << *((HbXmlLengthValue*)variable.mParameters.at(1))
+               << *((HbXmlLengthValue*)variable.mParameters.at(2))
+               << *((HbXmlLengthValue*)variable.mParameters.at(3));
+        break;
+        }
+
+        case HbXmlVariable::POINT:
+        {
+        stream << *((HbXmlLengthValue*)variable.mParameters.at(0))
+               << *((HbXmlLengthValue*)variable.mParameters.at(1));
+        break;
+        }
+
+        case HbXmlVariable::ENUMS:
+        {
+        // Relies on implicit conversion.
+        stream << *((QString*)variable.mParameters.at(0));
+        break;
+        }
+
+        case HbXmlVariable::COLOR:
+        {
+        stream << *((QColor*)variable.mParameters.at(0));
+        break;
+        }
+
+        case HbXmlVariable::FONTSPEC:
+        {
+        stream << *((quint8*)variable.mParameters.at(0))
+               << *((HbXmlLengthValue*)variable.mParameters.at(1));
+        break;
+        }
+
+        default:
+        {
+        break;
+        }
+
+    }
+    return stream;
+}
+
+QDataStream &operator>>(QDataStream &stream, HbXmlVariable &variable)
+{
+    quint8 type_b;
+    stream >> type_b;
+    variable.mType = (HbXmlVariable::Type)type_b;
+    switch (variable.mType) {
+        case HbXmlVariable::INT:
+        {
+        qint16 *int_b = new qint16();
+        stream >> *int_b;
+        variable.mParameters.append(int_b);
+        break;
+        }
+
+        case HbXmlVariable::REAL:
+        {
+        HbXmlLengthValue *realVal = new HbXmlLengthValue();
+        stream >> *realVal;
+        variable.mParameters.append(realVal);
+        break;
+        }
+
+        case HbXmlVariable::LOCALIZED_STRING:
+        {
+        QString *value = new QString();
+        QString *comment = new QString();
+        stream >> *value >> *comment;
+        variable.mParameters.append(value);
+        variable.mParameters.append(comment);
+        break;
+        }
+
+        case HbXmlVariable::STRING:
+        {
+        QString *value = new QString();
+        QString *locId = new QString();
+        stream >> *value >> *locId;
+        variable.mParameters.append(value);
+        variable.mParameters.append(locId);
+        break;
+        }
+
+        case HbXmlVariable::BOOL:
+        {
+        bool *bool_b = new bool();
+        stream >> *bool_b;
+        variable.mParameters.append(bool_b);
+        break;
+        }
+
+        case HbXmlVariable::ICON:
+        {
+        QString *iconName = new QString();
+        HbXmlLengthValue *widthVal = new HbXmlLengthValue();
+        HbXmlLengthValue *heightVal = new HbXmlLengthValue();
+        stream >> *iconName >> *widthVal >> *heightVal;
+        variable.mParameters.append(iconName);
+        variable.mParameters.append(widthVal);
+        variable.mParameters.append(heightVal);
+        break;
+        }
+
+        case HbXmlVariable::SIZE:
+        {
+        HbXmlLengthValue *widthVal = new HbXmlLengthValue();
+        HbXmlLengthValue *heightVal = new HbXmlLengthValue();
+        stream >> *widthVal >> *heightVal;
+        variable.mParameters.append(widthVal);
+        variable.mParameters.append(heightVal);
+        break;
+        }
+
+        case HbXmlVariable::RECT:
+        {
+        HbXmlLengthValue *widthVal = new HbXmlLengthValue();
+        HbXmlLengthValue *heightVal = new HbXmlLengthValue();
+        HbXmlLengthValue *posxVal = new HbXmlLengthValue();
+        HbXmlLengthValue *posyVal = new HbXmlLengthValue();
+        stream >> *widthVal >> *heightVal >> *posxVal >> *posyVal;
+        variable.mParameters.append(widthVal);
+        variable.mParameters.append(heightVal);
+        variable.mParameters.append(posxVal);
+        variable.mParameters.append(posyVal);
+        break;
+        }
+
+        case HbXmlVariable::POINT:
+        {
+        HbXmlLengthValue *posxVal = new HbXmlLengthValue();
+        HbXmlLengthValue *posyVal = new HbXmlLengthValue();
+        stream >> *posxVal >> *posyVal;
+        variable.mParameters.append(posxVal);
+        variable.mParameters.append(posyVal);
+        break;
+        }
+
+        case HbXmlVariable::ENUMS:
+        {
+        // Relies on implicit conversion.
+        QString *string = new QString();
+        stream >> *string;
+        variable.mParameters.append(string);
+        break;
+        }
+
+        case HbXmlVariable::COLOR:
+        {
+        QColor *color = new QColor();
+        stream >> *color;
+        variable.mParameters.append(color);
+        break;
+        }
+
+        case HbXmlVariable::FONTSPEC:
+        {
+        quint8 *role_b = new quint8();
+        HbXmlLengthValue *textHeightVal = new HbXmlLengthValue();
+        stream >> *role_b >> *textHeightVal;
+        variable.mParameters.append(role_b);
+        variable.mParameters.append(textHeightVal);
+        break;
+        }
+
+        default:
+        {
+        break;
+        }
+
+    }
+    return stream;
+
+}
+
+
 HbXmlLoaderAbstractSyntax::HbXmlLoaderAbstractSyntax( HbXmlLoaderAbstractActions *actions )
 : mActions(actions)
 {
@@ -185,495 +566,15 @@
 }
 
 bool HbXmlLoaderAbstractSyntax::load( QIODevice *device, const QString &section )
-{   
-    // Initialize to some profile.
-    mCurrentProfile = HbDeviceProfile::current(); 
-    return loadDevice(device, section);
-}
-
-bool HbXmlLoaderAbstractSyntax::loadDevice(QIODevice *device, const QString &section)
 {
-    const QChar separator(' ');
-    mReader.setDevice( device );
-
-    bool exit = false;
-    bool result = true;
-    mCurrentSection.clear();
-    mRequiredSection.clear();
-
-    mTopState = TS_READ_DOCUMENT;
-
-    mDocumentState = DS_START_DOCUMENT;
-    mElementState = ES_GENERAL_ITEM;
-
-    mCurrentLayoutType = LAYOUT_NULL;
-    mCurrentContainerType = CONTAINER_NULL;
-
-    if( section != 0 ) {
-        mRequiredSection = section.split( separator, QString::SkipEmptyParts );
-    }
-
-    while( !exit ) {
-        switch( mTopState ) {
-            case TS_READ_DOCUMENT:
-            {
-                mCurrentTokenType = mReader.readNext();
-                HB_DOCUMENTLOADER_PRINT( "TOP_STATE READ_ELEMENT " + mReader.name().toString() );
-                switch( mCurrentTokenType ) {
-                    case QXmlStreamReader::EndElement:
-                    case QXmlStreamReader::StartElement:
-                    {
-                        mCurrentElementType = elementType( mReader.name() );
-                        if( ( mCurrentElementType == METADATA ) && ( mCurrentTokenType == QXmlStreamReader::StartElement ) ) {
-                            mTopState = TS_READ_METADATA;
-                            break;
-                        }
-                        if( ! readDocument() ) {
-                            qWarning() << "Error in document, line " << mReader.lineNumber();
-                            mTopState = TS_ERROR;
-                        }
-                        break;
-                    }
-                    case QXmlStreamReader::EndDocument:
-                    {
-                        if( mDocumentState == DS_END_DOCUMENT ) {
-                            mTopState = TS_EXIT;
-                        } else {
-                            qWarning() << "Unexpected end of document, line " << mReader.lineNumber();
-                            mTopState = TS_ERROR;
-                        }
-                        break;
-                    }
-                    case QXmlStreamReader::Characters:
-                    {
-                        if( mReader.isWhitespace() ) {
-                            break;
-                        }
-                        HB_DOCUMENTLOADER_PRINT( "Characters" );
-                    }
-                    case QXmlStreamReader::NoToken:
-                    HB_DOCUMENTLOADER_PRINT( "NoToken" );
-                    case QXmlStreamReader::Invalid:
-                    HB_DOCUMENTLOADER_PRINT( "Invalid" );
-                    case QXmlStreamReader::EntityReference:
-                    {
-                        qWarning() << "Parse error, line " << mReader.lineNumber();
-                        mTopState = TS_ERROR;
-                        break;
-                    }
-                    case QXmlStreamReader::StartDocument:
-                    case QXmlStreamReader::Comment:
-                    case QXmlStreamReader::DTD:
-                    case QXmlStreamReader::ProcessingInstruction:
-                    default:
-                    {
-                        break;
-                    }
-                }
-                break;
-            }
-
-            case TS_READ_METADATA:
-            {
-                HB_DOCUMENTLOADER_PRINT( "TOP_STATE READ_METADATA" );
-                mCurrentTokenType = mReader.readNext();
-                switch( mCurrentTokenType ) {
-                    case QXmlStreamReader::EndElement:
-                    {
-                        mCurrentElementType = elementType( mReader.name() );
-                        if( mCurrentElementType == METADATA ) {
-                            mTopState = TS_READ_DOCUMENT;
-                        }
-                        break;
-                    }
-                    case QXmlStreamReader::NoToken:
-                    case QXmlStreamReader::Invalid:
-                    {
-                        qWarning() << "Parse error, line " << mReader.lineNumber();
-                        mTopState = TS_ERROR;
-                        break;
-                    }
-                    case QXmlStreamReader::EndDocument:
-                    {
-                        qWarning() << "Unexpected end of document, line " << mReader.lineNumber();
-                        mTopState = TS_ERROR;
-                        break;
-                    }
-                    default:
-                    {
-                        break;
-                    }
-                }
-                break;
-            }
-
-            case TS_ERROR:
-            {
-                HB_DOCUMENTLOADER_PRINT( "TOP_STATE ERROR" );
-                result = false;
-                mTopState = TS_EXIT;
-                mActions->deleteAll();
-                break;
-            }
-            case TS_EXIT:
-            {
-                mActions->cleanUp();
-                HB_DOCUMENTLOADER_PRINT( "TOP_STATE EXIT" );
-                exit = true;
-                break;
-            }
-            default:
-            {
-                HB_DOCUMENTLOADER_PRINT( "INTERNAL ERROR" );
-                mTopState = TS_ERROR;
-                break;
-            }
-        }
-    }
-    mReader.clear();
-    return result;
-}
-
-bool HbXmlLoaderAbstractSyntax::readDocument()
-{
-    bool result = false;
-    switch( mDocumentState ) {
-        case DS_START_DOCUMENT:
-        {
-            HB_DOCUMENTLOADER_PRINT( "DOCUMENT_STATE START DOCUMENT" );
-            if( mCurrentElementType == DOCUMENT ) {
-                result = processDocument();
-                HB_DOCUMENTLOADER_PRINT( "SWITCHING TO READ SECTIONS STATE" );
-                mDocumentState = DS_READ_SECTIONS;
-            }
-            break;
-        }
-        case DS_READ_SECTIONS:
-        {
-            if( ( mCurrentElementType == DOCUMENT ) && ( mCurrentTokenType == QXmlStreamReader::EndElement ) ) {
-                HB_DOCUMENTLOADER_PRINT( "SWITCHING TO END DOCUMENT STATE" );
-                mDocumentState = DS_END_DOCUMENT;
-                result = checkEndElementCorrectness();
-                break;
-            }
-
-            if( ( mCurrentSection != mRequiredSection ) ) {
-                HB_DOCUMENTLOADER_PRINT( "DOCUMENT_STATE READ ALIEN SECTIONS" );
-                result = readAlienSection();        
-            } else {
-                HB_DOCUMENTLOADER_PRINT( "DOCUMENT_STATE READ TARGET SECTIONS" );
-                result = readTargetSection();
-            }
-            break;
-        }
-        case DS_END_DOCUMENT:
-        {
-            HB_DOCUMENTLOADER_PRINT( "DOCUMENT_STATE END DOCUMENT - ERROR" );
-            break;
-        }
-    }    
-    
-    return result;
-}
-
-bool HbXmlLoaderAbstractSyntax::readAlienSection()
-{
-    if( mCurrentElementType == SECTION ) {
-
-        if( mCurrentTokenType == QXmlStreamReader::StartElement ) {
-
-            QString name = attribute( ATTR_NAME );
-            if( name.isEmpty() ) {
-                qWarning() << "Section witout a name, line " << mReader.lineNumber();
-                return false;
-            }
-            
-            HB_DOCUMENTLOADER_PRINT( QString( "READ ALIEN SECTION: LEAVING SECTION " ) + "'" + mCurrentSection.join(" ") + "'" );
-            mCurrentSection << name;
-            HB_DOCUMENTLOADER_PRINT( QString("READ ALIEN SECTION: ENTERING SECTION " ) + "'" + mCurrentSection.join(" ") + "'" );
-
-        } else if( mCurrentTokenType == QXmlStreamReader::EndElement ) {
-            
-            HB_DOCUMENTLOADER_PRINT( QString( "READ ALIEN SECTION: LEAVING SECTION " ) + "'" + mCurrentSection.join(" ") + "'" );
-            mCurrentSection.removeLast();
-            HB_DOCUMENTLOADER_PRINT( QString( "READ ALIEN SECTION: ENTERING SECTION " ) + "'" + mCurrentSection.join(" ") + "'" );
-                       
-        } else {
-            
-            HB_DOCUMENTLOADER_PRINT( "READ ALIEN SECTION: UNEXPECTED TOKEN TYPE" );
-        
-        }
-    }
-    return true;
-}
-
-bool HbXmlLoaderAbstractSyntax::readTargetSection()
-{
-    bool result = false;
-    
-
-    if( mCurrentTokenType == QXmlStreamReader::StartElement ) {
-        HB_DOCUMENTLOADER_PRINT( QString( "READ TARGET SECTION: START ELEMENT " ) + mReader.name().toString() );
-        switch( mElementState ) {
-            case ES_GENERAL_ITEM:
-            {
-                result = readGeneralStartItem();
-                break;
-            }
-            case ES_LAYOUT_ITEM:
-            {
-                result = readLayoutStartItem();
-                break;
-            }
-            case ES_CONTAINER_ITEM:
-            {
-                result = readContainerStartItem();
-                break;
-            }
-        }
-
-    } else if( mCurrentTokenType == QXmlStreamReader::EndElement ) {
-        HB_DOCUMENTLOADER_PRINT( QString( "READ TARGET SECTION: END ELEMENT " ) + mReader.name().toString() );
-
-        switch( mElementState ) {
-            case ES_GENERAL_ITEM:
-            {
-                result = readGeneralEndItem();
-                break;
-            }
-            case ES_LAYOUT_ITEM:
-            {
-                result = readLayoutEndItem();
-                break;
-            }
-            case ES_CONTAINER_ITEM:
-            {
-                result = readContainerEndItem();
-                break;
-            }
-        }            
-                   
-    } else {
-        HB_DOCUMENTLOADER_PRINT( "READ TARGET SECTION: UNEXPECTED TOKEN TYPE" );
-    }
-    
-    return result;
-}
-
-bool HbXmlLoaderAbstractSyntax::readContainerStartItem()
-{
-	qWarning() << "Internal error, wrong container type, line " << mReader.lineNumber();
+    Q_UNUSED(device);
+    Q_UNUSED(section);
     return false;
 }
 
-bool HbXmlLoaderAbstractSyntax::readContainerEndItem()
-{
-    HB_DOCUMENTLOADER_PRINT( "GENERAL CONTAINER END ITEM" );
-    if( mCurrentElementType == CONTAINER ) {
-        HB_DOCUMENTLOADER_PRINT( "GENERAL CONTAINER END ITEM : SWITCHING TO GENERAL ITEM PROCESSING MODE" );
-        mElementState = ES_GENERAL_ITEM;
-    }    
-    return true;
-}
-
-bool HbXmlLoaderAbstractSyntax::readLayoutStartItem()
-{
-	qWarning() << "Internal error, wrong layout type, line " << mReader.lineNumber();
-    return false;
-}
-
-bool HbXmlLoaderAbstractSyntax::readLayoutEndItem()
-{
-    HB_DOCUMENTLOADER_PRINT( "GENERAL LAYOUT END ITEM" );
-    if( mCurrentElementType == LAYOUT ) {
-        HB_DOCUMENTLOADER_PRINT( "GENERAL LAYOUT END ITEM : SWITCHING TO GENERAL ITEM PROCESSING MODE" );
-        mElementState = ES_GENERAL_ITEM;
-    }    
-    return true;
-}
-
-bool HbXmlLoaderAbstractSyntax::readGeneralStartItem()
-{
-    bool result = false;
-    switch( mCurrentElementType ) {
-         case DOCUMENT:
-         {
-            HB_DOCUMENTLOADER_PRINT( "GENERAL START ITEM: DOCUMENT" );
-            result = processDocument();
-            break;
-         }
-         case LAYOUT:
-         {
-            HB_DOCUMENTLOADER_PRINT( "GENERAL START ITEM: LAYOUT" );
-            result = processLayout();
-            
-            HB_DOCUMENTLOADER_PRINT( "GENERAL START ITEM: SWITCHING TO LAYOUT PROCESSING MODE" );
-            mElementState = ES_LAYOUT_ITEM;
-            break;
-         }
-         case CONTAINER:
-         {
-            HB_DOCUMENTLOADER_PRINT( "GENERAL START ITEM: CONTAINER" );
-            result = processContainer();
-            
-            HB_DOCUMENTLOADER_PRINT( "GENERAL START ITEM: SWITCHING TO CONTAINER PROCESSING MODE" );
-            mElementState = ES_CONTAINER_ITEM;
-            break;
-         }
-         case SECTION:
-         {
-            HB_DOCUMENTLOADER_PRINT( "GENERAL START ITEM: SECTION" );
-            QString name = attribute( ATTR_NAME );
-            if( name.isEmpty() ) {
-                qWarning() << "Section witout a name, line " << mReader.lineNumber();
-                break;
-            }
-            
-            HB_DOCUMENTLOADER_PRINT( QString( "GENERAL START ITEM: LEAVING SECTION " ) + "'" + mCurrentSection.join(" ") + "'" );
-            mCurrentSection << name;
-            HB_DOCUMENTLOADER_PRINT( QString( "GENERAL START ITEM: ENTERING SECTION " ) + "'" + mCurrentSection.join(" ") + "'" );
-
-            result = true;
-            break;
-         }
-         default:
-         {
-            HB_DOCUMENTLOADER_PRINT( "GENERAL START ITEM: ERROR" );
-            qWarning() << "Unknown element, line " << mReader.lineNumber();
-            break;
-         }
-    }
-    return result;
-}
-
-bool HbXmlLoaderAbstractSyntax::readGeneralEndItem()
+void HbXmlLoaderAbstractSyntax::setActions( HbXmlLoaderAbstractActions *actions )
 {
-    
-    bool result = false;
-    
-    switch( mCurrentElementType ) {
-         case LAYOUT:
-         {
-            HB_DOCUMENTLOADER_PRINT( "GENERAL START ITEM: LAYOUT - ERROR, CANNOT BE IN THIS STATE" );
-            result = false;
-            break;
-         }
-         case CONTAINER:
-         {
-            HB_DOCUMENTLOADER_PRINT( "GENERAL START ITEM: CONTAINER - ERROR, CANNOT BE IN THIS STATE" );
-            result = false;
-            break;
-         }
-         case SECTION:
-         {
-            HB_DOCUMENTLOADER_PRINT( "GENERAL END ITEM: SECTION" );
-
-            HB_DOCUMENTLOADER_PRINT( QString( "GENERAL END ITEM: LEAVING SECTION " ) + "'" + mCurrentSection.join(" ") + "'" );
-            mCurrentSection.removeLast();
-            HB_DOCUMENTLOADER_PRINT( QString( "GENERAL END ITEM: ENTERING SECTION " ) + "'" + mCurrentSection.join(" ") + "'" );
-
-            result = true;
-            break;
-         }
-    
-         default:
-         {
-            HB_DOCUMENTLOADER_PRINT( "GENERAL END ITEM: CHECKING ELEMENT CORRECTNESS" );
-            result = checkEndElementCorrectness();
-         }                     
-    }
-    return result;
-}
-
-
-bool HbXmlLoaderAbstractSyntax::processDocument()
-{
-    return false;
-}
-
-
-bool HbXmlLoaderAbstractSyntax::processLayout()
-{
-	qWarning() << "Unknown layout type, line " << mReader.lineNumber();
-    return false;
-}
-
-bool HbXmlLoaderAbstractSyntax::processContainer()
-{
-	qWarning() << "Unknown container type, line " << mReader.lineNumber();
-    return false;
-}
-
-
-
-bool HbXmlLoaderAbstractSyntax::checkEndElementCorrectness()
-{        
-    if ( ! mActions->pop( elementType( mReader.name() ) ) ) {
-        qWarning() << "Error in end element, line " << mReader.lineNumber(); 
-        return false;
-    }
-    return true;
-}
-
-ElementType 
-    HbXmlLoaderAbstractSyntax::elementType( QStringRef name ) const
-{
-    const QString stringName = name.toString();
-    
-    if( stringName == lexemValue(TYPE_WIDGET) ) {
-        return WIDGET;
-    } else  if( stringName == lexemValue(TYPE_OBJECT) ) {
-        return OBJECT;
-/*    } else  if( ( ( stringName == lexemValue(TYPE_DOCUMENT] ) && ( mMode == MODE_APPLICATION ) ) || 
-                ( ( stringName == lexemValue(TYPE_HBWIDGET] ) && ( mMode == MODE_WIDGET ) ) ) {
-        return DOCUMENT;*/
-    } else  if( stringName == lexemValue(TYPE_CONNECT) ) {
-        return CONNECT;
-    } else  if( stringName == lexemValue(TYPE_LAYOUT) ) {
-        return LAYOUT;
-    } else  if( stringName == lexemValue(TYPE_SPACERITEM) ) {
-        return SPACERITEM;
-    } else  if( stringName == lexemValue(TYPE_CONTAINER) ) {
-        return CONTAINER;
-    } else  if( stringName == lexemValue(TYPE_SECTION) ) {
-        return SECTION;
-    } else  if( stringName == lexemValue(TYPE_REF) ) {
-        return REF;
-    } else  if( ( stringName == lexemValue(TYPE_ICON) ) || 
-                ( stringName == lexemValue(TYPE_INT) ) || 
-                ( stringName == lexemValue(TYPE_REAL) ) || 
-                ( stringName == lexemValue(TYPE_LOCALIZED_STRING) ) || 
-                ( stringName == lexemValue(TYPE_STRING) ) || 
-                ( stringName == lexemValue(TYPE_ENUMS) ) || 
-                ( stringName == lexemValue(TYPE_BOOL) ) || 
-                ( stringName == lexemValue(TYPE_SIZE) ) || 
-                ( stringName == lexemValue(TYPE_RECT) ) ||
-                ( stringName == lexemValue(TYPE_POINT) ) ||
-                ( stringName == lexemValue(TYPE_COLOR) ) ||
-                ( stringName == lexemValue(TYPE_FONTSPEC) )||
-                ( stringName == lexemValue(LL_ORIENTATION) )||
-                ( stringName == lexemValue(TYPE_ALIGNMENT) )) {
-        return PROPERTY; 
-    } else  if( ( stringName == lexemValue(TYPE_CONTENTSMARGINS) ) ||
-                 ( stringName == lexemValue(TYPE_SIZEPOLICY) ) ||
-                ( stringName == lexemValue(TYPE_SIZEHINT) ) || 
-                ( stringName == lexemValue(TYPE_TOOLTIP) ) ) {
-        return VARIABLE;
-    } else if( stringName == lexemValue(TYPE_ZVALUE) ) {
-        qWarning() << "zvalue variable in docml is deprecated. Use z property instead.";
-        //return DEPRECATED;
-        return VARIABLE;
-    } else if( stringName == lexemValue(TYPE_METADATA) ) {
-        return METADATA;
-    }
-    
-    return UNKNOWN;
-}
-
-
-QString HbXmlLoaderAbstractSyntax::attribute( DocumentLexems lexem ) const
-{
-    return mReader.attributes().value( lexemValue(lexem) ).toString();
+    mActions = actions;
 }
 
 bool HbXmlLoaderAbstractSyntax::toReal(const QString &value, qreal& result) const
@@ -681,53 +582,44 @@
     bool ok = false;
     result = qreal(value.toDouble(&ok));
     if ( !ok ) {
-        qWarning() << "Could not convert value to real, line " << mReader.lineNumber(); 
+        qWarning() << "Could not convert value to real";
         result = (qreal)0.0;
     }
     return ok;
 }
 
-bool HbXmlLoaderAbstractSyntax::toPixels(const QString &value, qreal& result) const
+bool HbXmlLoaderAbstractSyntax::toLengthValue(const QString &value, HbXmlLengthValue& lengthVal) const
 {
-	// call the toPixels function with the mCurrentProfile.
-    return toPixels(mCurrentProfile,value,result);
-}
-
-bool HbXmlLoaderAbstractSyntax::toPixels(const HbDeviceProfile &deviceProfile,
-                                         const QString &value, qreal& result) const
-{
+    bool retVal(true);
     QString val = value;
     val.reserve(val.length());
-    enum { None, Px, Un, Mm } unit = None;
-    if( val.endsWith(lexemValue(UNIT_UNIT), Qt::CaseInsensitive) ) {
-        unit = Un;
-    } else if( val.endsWith(lexemValue(UNIT_PIXEL), Qt::CaseInsensitive) ) {
-        unit = Px;
-    } else if( val.endsWith(lexemValue(UNIT_MILLIMETER), Qt::CaseInsensitive) ) {
-        unit = Mm;
-    } else if( (val.startsWith( lexemValue(UNIT_VAR_START) ) ||
-                val.startsWith( lexemValue(UNIT_VAR_NEG_START) ) ||
-                val.startsWith( lexemValue(UNIT_EXPR_START) ) ||
-                val.startsWith( lexemValue(UNIT_EXPR_NEG_START) )) && val.endsWith( lexemValue(UNIT_VAR_END) ) ) {
-        //variable or expression is decided by the start of value string
-        return hbInstance->style()->parameter( val, result, deviceProfile );
+    HbXmlLengthValue::Type type = HbXmlLengthValue::PlainNumber;
+    if ( val.endsWith(lexemValue(UNIT_UNIT), Qt::CaseInsensitive) ) {
+        type = HbXmlLengthValue::Unit;
+    } else if ( val.endsWith(lexemValue(UNIT_PIXEL), Qt::CaseInsensitive) ) {
+        type = HbXmlLengthValue::Pixel;
+    } else if ( val.endsWith(lexemValue(UNIT_MILLIMETER), Qt::CaseInsensitive) ) {
+        type = HbXmlLengthValue::Millimeter;
+    } else if ( (val.startsWith( lexemValue(UNIT_VAR_START) ) ||
+                val.startsWith( lexemValue(UNIT_VAR_NEG_START) ) ) && val.endsWith( lexemValue(UNIT_VAR_END) ) ) {
+        type = HbXmlLengthValue::Variable;
+    } else if ( (val.startsWith( lexemValue(UNIT_EXPR_START) ) ||
+                val.startsWith( lexemValue(UNIT_EXPR_NEG_START) )) && val.endsWith( lexemValue(UNIT_EXPR_END) ) ) {
+        type = HbXmlLengthValue::Expression;
     }
-
-    if (unit != None) {
-        // Assuming all unit identifiers have two characters
-        val.chop(2);
+    lengthVal.mType = type;
+    if ( type == HbXmlLengthValue::Variable || type == HbXmlLengthValue::Expression ) {
+        lengthVal.mString = value;
+        lengthVal.mValue = 0;
+    } else {
+        lengthVal.mString = QString();
+        if (type != HbXmlLengthValue::PlainNumber) {
+            // Assuming all unit identifiers have two characters
+            val.chop(2);
+        }
+        retVal = toReal( val, lengthVal.mValue );
     }
-
-    if ( !toReal( val, result ) ) {
-        return false;
-    }
-
-    if (unit == Un) {
-        result = deviceProfile.unitValue() * result;
-    } else if (unit == Mm) {
-        result = deviceProfile.ppmValue() * result;
-    } // else -> already in pixels
-    return true;
+    return retVal;
 }
 
 const char *HbXmlLoaderAbstractSyntax::lexemValue(DocumentLexems lex) const
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/utils/hbxmlloaderabstractsyntax_p.h
--- a/src/hbcore/utils/hbxmlloaderabstractsyntax_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/utils/hbxmlloaderabstractsyntax_p.h	Mon May 03 12:48:33 2010 +0300
@@ -26,20 +26,141 @@
 #ifndef HBXMLLOADERABSTRACTSYNTAX_P_H
 #define HBXMLLOADERABSTRACTSYNTAX_P_H
 
-#include "hbxmlloaderabstractactions_p.h"
-
 #include <hbglobal.h>
-#include <hbdeviceprofile.h>
 
 #include <QHash>
 #include <QList>
 #include <QXmlStreamReader>
 #include <QPointer>
+#include <QByteArray>
+#include <QVariant>
+
+namespace HbXml {
+
+    enum ElementType {
+        DOCUMENT,
+        OBJECT,
+        WIDGET,
+        LAYOUT,
+        SPACERITEM,
+        CONNECT,
+        CONTAINER,
+        PROPERTY,
+        SECTION,
+        REF,
+        VARIABLE,
+        METADATA,
+        UNKNOWN,
+        DEPRECATED
+    };
+
+    enum ActionType {
+        ActionReset,
+        ActionCleanUp,
+        ActionDeleteAll,
+        ActionPushDocument,
+        ActionPushObject,
+        ActionPushWidget,
+        ActionPushSpacerItem,
+        ActionPushConnect,
+        ActionPushProperty,
+        ActionPushRef,
+        ActionPushContainer,
+        ActionPop,
+        ActionSetContentsMargins,
+        ActionSetSizePolicy,
+        ActionSetSizeHint,
+        ActionSetToolTip,
+        ActionCreateAnchorLayout,
+        ActionAddAnchorLayoutEdge,
+        ActionCreateMeshLayout,
+        ActionAddMeshLayoutEdge,
+        ActionCreateGridLayout,
+        ActionAddGridLayoutCell,
+        ActionSetGridLayoutRowProperties,
+        ActionSetGridLayoutColumnProperties,
+        ActionSetGridLayoutRowHeights,
+        ActionSetGridLayoutColumnWidths,
+        ActionCreateLinearLayout,
+        ActionAddLinearLayoutItem,
+        ActionAddLinearLayoutStretch,
+        ActionSetLayoutContentsMargins,
+        ActionCreateStackedLayout,
+        ActionAddStackedLayoutItem,
+        ActionCreateNullLayout,
+        ActionEnd
+    };
+
+    struct Element {
+        ElementType type;
+        void *data;
+    };
+};
+
 
 class HbXmlLoaderAbstractActions;
 class HbWidget;
 
-class HB_CORE_EXPORT HbXmlLoaderAbstractSyntax
+struct HB_CORE_PRIVATE_EXPORT HbXmlLengthValue
+{
+    enum Type {
+        None = 0,
+        PlainNumber,
+        Pixel,
+        Unit,
+        Millimeter,
+        Variable,
+        Expression
+    };
+
+    HbXmlLengthValue() : mValue(0), mString(QString()), mType(None) {};
+    HbXmlLengthValue(qreal value, Type type) : mValue(value), mString(QString()), mType(type) {};
+
+    qreal mValue;
+    QString mString;
+    Type mType;
+};
+
+HB_CORE_PRIVATE_EXPORT QDataStream &operator<<(QDataStream &, const HbXmlLengthValue &);
+HB_CORE_PRIVATE_EXPORT QDataStream &operator>>(QDataStream &, HbXmlLengthValue &);
+
+
+class HB_CORE_PRIVATE_EXPORT HbXmlVariable
+{
+public:
+    enum Type {
+        UNKNOWN,
+        INT,
+        REAL,
+        STRING,
+        LOCALIZED_STRING,
+        BOOL,
+        ICON,
+        SIZE,
+        RECT,
+        POINT,
+        ENUMS,
+        COLOR,
+        FONTSPEC
+    };
+
+public:
+    HbXmlVariable();
+    ~HbXmlVariable();
+
+private:
+    Q_DISABLE_COPY(HbXmlVariable)
+
+public:
+    Type mType;
+    QList<void*> mParameters;
+};
+
+HB_CORE_PRIVATE_EXPORT QDataStream &operator<<(QDataStream &, const HbXmlVariable &);
+HB_CORE_PRIVATE_EXPORT QDataStream &operator>>(QDataStream &, HbXmlVariable &);
+
+
+class HB_CORE_PRIVATE_EXPORT HbXmlLoaderAbstractSyntax
 {
 
 public:
@@ -182,91 +303,23 @@
 
         NUMBER_OF_LEXEMS // Keep this last!
     };
-    
-    enum TopState {
-        TS_READ_DOCUMENT,
-        TS_READ_METADATA,
-        TS_ERROR,
-        TS_EXIT
-    };
-    
-    enum DocumentState {
-        DS_START_DOCUMENT,
-        DS_READ_SECTIONS,
-        DS_END_DOCUMENT
-    };
-    
-    enum ElementState {
-        ES_GENERAL_ITEM,
-        ES_LAYOUT_ITEM,
-        ES_CONTAINER_ITEM
-    };
-    
-    
- 
+
 public:
-
     HbXmlLoaderAbstractSyntax( HbXmlLoaderAbstractActions *actions );
     virtual ~HbXmlLoaderAbstractSyntax();
     
     virtual bool load( QIODevice *device, const QString &section );
         
 public:
-    
-
-    virtual bool processDocument();
-    virtual bool processLayout();
-    virtual bool processContainer();
-    virtual bool checkEndElementCorrectness();
-    
-        
-    virtual ElementType elementType( QStringRef name ) const;    
-    
-    
-    virtual QString attribute( DocumentLexems lexem ) const;
-    
-    virtual bool toReal(const QString &value, qreal& result) const;
-    virtual bool toPixels(const QString &value, qreal& result) const;
-        
-    virtual bool readDocument();
-    virtual bool readAlienSection();
-    virtual bool readTargetSection();
-    
-    virtual bool readGeneralStartItem();
-    virtual bool readGeneralEndItem();
-    virtual bool readLayoutStartItem();
-    virtual bool readLayoutEndItem();
-    virtual bool readContainerStartItem();
-    virtual bool readContainerEndItem();
-
-public :
-    bool toPixels(const HbDeviceProfile &deviceProfile, const QString &value, qreal& result) const;
+    void setActions( HbXmlLoaderAbstractActions *actions );
+    bool toReal(const QString &value, qreal& result) const;
+    bool toLengthValue(const QString &value, HbXmlLengthValue& lengthVal) const;
     const char *lexemValue(DocumentLexems lex) const;
                   
-protected :
-    bool loadDevice(QIODevice *device, const QString &section);
-    
-public:
-    
-    TopState mTopState;
-    DocumentState mDocumentState;
-    ElementState mElementState;
+protected:
     
-    QStringList mCurrentSection;
-    QStringList mRequiredSection;
-    QStringList mCurrentContainer;
-    
-    QXmlStreamReader::TokenType mCurrentTokenType;
-    ElementType mCurrentElementType;
-    
-    DocumentLexems mCurrentLayoutType;
-    DocumentLexems mCurrentContainerType;
-
     HbXmlLoaderAbstractActions *mActions;
 
-    QXmlStreamReader mReader;
-    HbDeviceProfile mCurrentProfile;
-
 private:
 
     Q_DISABLE_COPY(HbXmlLoaderAbstractSyntax)
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/utils/hbxmlloaderbaseactions_p.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/utils/hbxmlloaderbaseactions_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,377 @@
+/****************************************************************************
+**
+** 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 "hbxmlloaderbaseactions_p.h"
+#include "hbxmlloaderabstractsyntax_p.h"
+#include <hbinstance.h>
+#include <hbdeviceprofile.h>
+#include <hbstyle.h>
+
+#include <QCoreApplication>
+
+const char *GRAPHICSWIDGETCLASSNAME = "QGraphicsWidget";
+
+/*
+    \class HbXmlLoaderBaseActions
+    \internal
+    \proto
+*/
+
+HbXmlLoaderBaseActions::HbXmlLoaderBaseActions() : 
+    mContext(), 
+    mStack()
+{
+}
+
+HbXmlLoaderBaseActions::~HbXmlLoaderBaseActions()
+{
+    reset();    
+}
+
+QList <QObject*> HbXmlLoaderBaseActions::takeAll()
+{
+    QList<ObjectMapItem> objects = mTopObjectMap.values();
+    
+    QList<QObject *> result;
+    while (objects.size()) {
+        ObjectMapItem item = objects.takeLast();
+        if (item.first.data()) {
+            result.append(item.first.data());
+        }
+    }
+    
+    return result;
+    
+}
+
+QGraphicsWidget* HbXmlLoaderBaseActions::findWidget( const QString &name )
+{
+    QGraphicsWidget *result = 0;
+    
+    ObjectMap::iterator it = mObjectMap.find(name);
+    if (it != mObjectMap.end() && it.value().second == HbXml::WIDGET ) {
+        result = static_cast<QGraphicsWidget *>(it.value().first.data());
+    }    
+        
+    return result;        
+}
+
+
+QObject* HbXmlLoaderBaseActions::findObject( const QString &name )
+{
+    if( mObjectMap.contains(name) ) {               
+        return mObjectMap.value(name).first.data();
+    }
+    return 0;    
+}
+
+
+
+bool HbXmlLoaderBaseActions::pushDocument(const QString& context)
+{
+    HbXml::Element e;
+    e.type = HbXml::DOCUMENT;
+    e.data = 0;
+    mStack.append( e );
+
+    mContext = context;
+
+    HB_DOCUMENTLOADER_PRINT( QString( "ADD ELEMENT " )  );
+    return true;
+}
+
+
+
+bool HbXmlLoaderBaseActions::pop( const HbXml::ElementType type )
+{
+    
+    // No check for now...
+    
+    switch( type ) {
+         case HbXml::OBJECT:
+         case HbXml::WIDGET:
+         case HbXml::SPACERITEM:
+         case HbXml::DOCUMENT:
+         {
+            if( mStack.isEmpty() ) {
+                return false;
+            }
+            
+            HB_DOCUMENTLOADER_PRINT( QString( "REMOVE ELEMENT " ) );            
+            mStack.removeLast();
+            break;
+         }
+         
+         case HbXml::LAYOUT:
+         case HbXml::CONTAINER:
+         case HbXml::CONNECT:
+         case HbXml::PROPERTY:
+         default:
+         {
+         }
+    }         
+    return true;
+}
+
+
+void HbXmlLoaderBaseActions::cleanUp()
+{
+    mStack.clear();
+    
+    // Create mTopObjectMap
+    for (ObjectMap::const_iterator it = mObjectMap.constBegin(); 
+         it != mObjectMap.constEnd(); 
+         ++it ) {
+        QObject *object = it.value().first.data();
+
+        if (it.value().second == HbXml::WIDGET) {
+            QGraphicsWidget *asWidget = static_cast<QGraphicsWidget *>(object);
+            if (!asWidget->parentItem() && !asWidget->parent()) {
+                mTopObjectMap.insert(it.key(), it.value());
+            }
+        } else if (object && !object->parent()) {
+            mTopObjectMap.insert(it.key(), it.value());
+        } else {
+            // not added - owned by another object.
+        }
+    }
+}
+
+QObject* HbXmlLoaderBaseActions::createObject( const QString& type, const QString &name, const QString &plugin )
+{
+    Q_UNUSED( type );
+    Q_UNUSED( name );
+    Q_UNUSED( plugin );
+    return 0;
+}
+
+
+HbXmlLoaderBaseActions::ObjectMapItem HbXmlLoaderBaseActions::lookUp(const QString& type, const QString &name, const QString &plugin)
+{   
+    const bool nameNotEmpty = name.size() != 0;
+    bool doLookUp = true;
+    ObjectMapItem current;
+    current.first = 0;
+    current.second = HbXml::OBJECT;
+    
+    if (nameNotEmpty) {
+        ObjectMap::iterator it = mObjectMap.find(name);
+        if (it != mObjectMap.end()) {
+            current = it.value();
+            
+            if (!current.first) {
+                mObjectMap.remove(name);
+            }
+            // CHECK DISABLED FOR NOW.
+            /*
+            if (current.first && !type.isEmpty()) {
+                const QByteArray array = type.toUtf8();
+                
+                if (!current.first->inherits(array.data())) {                    
+                    HB_DOCUMENTLOADER_PRINT( QString( "Existing object requested with invalid type" ) );
+                    // We have object already in mObjectMap, but it does not fulfill
+                    // all needs. So object look up has failed.
+                    doLookUp = false;
+                    current.first = 0;
+                }
+            }
+            */
+        }
+    }
+    
+    if (doLookUp && !current.first) {
+        QObject *obj = createObject(type, name, plugin);        
+        if (obj) {
+            current.first = obj;
+            current.second = qobject_cast<QGraphicsWidget*>(obj) ? HbXml::WIDGET : HbXml::OBJECT;
+        }
+        if (nameNotEmpty) {
+            mObjectMap.insert(name, current);
+        }
+    }
+
+    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;
+    bool widget = false;
+    
+    for( int i = mStack.size() - 1; i >=0; i-- )
+    {
+        if( ( mStack.at(i).type == HbXml::OBJECT ) || ( mStack.at(i).type == HbXml::WIDGET ) ) {
+            current = static_cast<QObject*>(mStack.at(i).data);
+            widget = ( mStack.at(i).type == HbXml::WIDGET );
+            break;
+        }
+    }
+    
+    if (isWidgetElement) {
+        *isWidgetElement = widget;
+    }
+    return current;
+}
+
+void HbXmlLoaderBaseActions::deleteAll()
+{
+    QList<QObject *> list = takeAll();
+    
+    qDeleteAll( list );
+    
+    reset();
+}
+
+
+void HbXmlLoaderBaseActions::reset()
+{
+    mStack.clear();
+    mTopObjectMap.clear();
+    mObjectMap.clear();
+}
+
+
+
+bool HbXmlLoaderBaseActions::setObjectTree( QList<QObject *> roots )
+{
+    reset();
+    
+    for( int i = 0; i < roots.size(); i++ ) {
+        QObject *obj = roots.at(i);
+        ObjectMapItem item;
+        item.first = obj;
+        item.second = qobject_cast<QGraphicsWidget*>(obj) ? HbXml::WIDGET : HbXml::OBJECT;
+        mTopObjectMap.insert( roots.at(i)->objectName(), item );
+    }
+    
+    addToObjectMap( roots );
+    
+    return true;
+}
+
+void HbXmlLoaderBaseActions::addToObjectMap( QList<QObject *> objects )
+{
+    for( int i = 0; i < objects.size(); i++ ) {
+        QObject *obj = objects.at(i);
+        QGraphicsWidget *widget = qobject_cast<QGraphicsWidget*>(obj);
+
+        ObjectMapItem item;
+        item.first = obj;
+        item.second = widget ? HbXml::WIDGET : HbXml::OBJECT;
+        mObjectMap.insert( obj->objectName(), item );
+
+        if( widget ) {
+            addToObjectMap( widget->childItems() );
+        } else {
+            addToObjectMap( obj->children() );
+        }
+    }
+}
+
+void HbXmlLoaderBaseActions::addToObjectMap( QList<QGraphicsItem *> objects )
+{
+    for( int i = 0; i < objects.size(); i++ ) {
+        if( objects.at(i)->isWidget() ) {
+            QGraphicsWidget *widget = static_cast<QGraphicsWidget *>( objects.at(i) );
+            ObjectMapItem item;
+            item.first = widget;
+            item.second = HbXml::WIDGET;
+            mObjectMap.insert( widget->objectName(), item );
+            addToObjectMap( widget->childItems() );
+        }
+    }    
+}
+
+QString HbXmlLoaderBaseActions::translate( const QString &value, const QString &comment )
+{
+    if( ! mContext.isEmpty() ) {
+        QByteArray contextUtf8(mContext.toUtf8());
+        QByteArray valueUtf8(value.toUtf8());
+		
+		if (comment.isEmpty()) {
+			return QCoreApplication::translate( 
+						contextUtf8.data(), valueUtf8.data(), 
+						0, QCoreApplication::UnicodeUTF8 );
+		} else {
+			QByteArray commentUtf8(comment.toUtf8());
+			return QCoreApplication::translate( 
+						contextUtf8.data(), valueUtf8.data(), 
+						commentUtf8.data(), QCoreApplication::UnicodeUTF8 );
+		}        
+    } else {
+        return value;
+    }
+}
+
+Hb::Edge HbXmlLoaderBaseActions::getAnchorOppositeEdge( Hb::Edge edge ) const
+{
+    if ( edge == Hb::TopEdge ) {
+        return Hb::BottomEdge;
+    } else if ( edge == Hb::BottomEdge ) {
+        return Hb::TopEdge;
+    } else if ( edge == Hb::LeftEdge ) {
+        return Hb::RightEdge;
+    } else if ( edge == Hb::RightEdge ) {
+        return Hb::LeftEdge;
+    }
+
+    return edge;
+}
+
+bool HbXmlLoaderBaseActions::toPixels(const HbXmlLengthValue &lengthVal, qreal& result) const
+{
+    bool retVal(true);
+    switch (lengthVal.mType) {
+        case HbXmlLengthValue::None:
+            retVal = false;
+            break;
+        case HbXmlLengthValue::PlainNumber:
+        case HbXmlLengthValue::Pixel:
+            result = lengthVal.mValue;
+            break;
+        case HbXmlLengthValue::Unit:
+            result = mCurrentProfile.unitValue() * lengthVal.mValue;
+            break;
+        case HbXmlLengthValue::Millimeter:
+            result = mCurrentProfile.ppmValue() * lengthVal.mValue;
+            break;
+        case HbXmlLengthValue::Variable:
+        case HbXmlLengthValue::Expression:
+            retVal = hbInstance->style()->parameter( lengthVal.mString, result, mCurrentProfile );
+            break;
+    }
+    return retVal;
+}
+
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/utils/hbxmlloaderbaseactions_p.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/utils/hbxmlloaderbaseactions_p.h	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,107 @@
+/****************************************************************************
+**
+** 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 HBXMLLOADERBASEACTIONS_P_H
+#define HBXMLLOADERBASEACTIONS_P_H
+
+#include "hbxmlloaderabstractactions_p.h"
+
+#include <hbglobal.h>
+#include <hbdeviceprofile.h>
+
+#include <QGraphicsWidget>
+#include <QGraphicsLayout>
+#include <QPointer>
+
+
+// Uncomment the following in order to get additional debug prints
+//#define HB_DOCUMENTLOADER_DEBUG
+ 
+#ifndef HB_DOCUMENTLOADER_DEBUG
+#define HB_DOCUMENTLOADER_PRINT(a) 
+#else
+#include <QDebug>
+#define HB_DOCUMENTLOADER_PRINT(a) qDebug() << QString(a);
+#endif // HB_DOCUMENTLOADER_DEBUG
+
+class HbXmlLoaderAbstractPrivate;
+struct HbXmlLengthValue;
+
+class HB_CORE_PRIVATE_EXPORT HbXmlLoaderBaseActions : public HbXmlLoaderAbstractActions
+{
+    public:
+
+        typedef QPair<QPointer<QObject>, HbXml::ElementType> ObjectMapItem;                
+        typedef QMap<QString, ObjectMapItem> ObjectMap;
+        
+    public:    
+    
+        HbXmlLoaderBaseActions();
+        virtual ~HbXmlLoaderBaseActions();
+
+        virtual QObject *createObject(const QString& type, const QString &name, const QString &plugin);
+
+        bool setObjectTree(QList<QObject *> roots);
+        QList<QObject *> takeAll();
+
+        QGraphicsWidget* findWidget(const QString &name);
+        QObject* findObject(const QString &name);
+
+	public:
+
+        virtual bool pushDocument(const QString& context);
+        virtual bool pop(const HbXml::ElementType type);
+        virtual void cleanUp();
+        virtual void reset();
+        virtual void deleteAll();
+
+    protected:
+
+        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);
+
+        bool toPixels(const HbXmlLengthValue &lengthVal, qreal& result) const;
+        QString translate(const QString &value, const QString &comment);
+        Hb::Edge getAnchorOppositeEdge( Hb::Edge edge ) const;
+		
+    protected:
+        QString mContext;
+
+        QList<HbXml::Element> mStack;
+        ObjectMap mObjectMap;    
+        ObjectMap mTopObjectMap;
+        QGraphicsLayout *mCurrentLayout;
+    private:
+        Q_DISABLE_COPY(HbXmlLoaderBaseActions)
+    public:
+        HbDeviceProfile mCurrentProfile;
+};
+
+#endif // HBXMLLOADERBASEACTIONS_P_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/utils/hbxmlloaderbasesyntax_p.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/utils/hbxmlloaderbasesyntax_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,693 @@
+/****************************************************************************
+**
+** 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 "hbxmlloaderbasesyntax_p.h"
+
+#include <QDebug>
+
+/*
+    \class HbXmlLoaderBaseSyntax
+    \internal
+    \proto
+*/
+
+HbXmlLoaderBaseSyntax::HbXmlLoaderBaseSyntax( HbXmlLoaderAbstractActions *actions )
+: HbXmlLoaderAbstractSyntax(actions)
+{
+}
+
+HbXmlLoaderBaseSyntax::~HbXmlLoaderBaseSyntax()
+{
+}
+
+bool HbXmlLoaderBaseSyntax::load( QIODevice *device, const QString &section )
+{
+    return loadDevice(device, section);
+}
+
+bool HbXmlLoaderBaseSyntax::scanForSections( QIODevice *device, QList<QString> &sectionsList ) {
+    const QChar separator(' ');
+    bool exit = false;
+    bool result = true;
+
+    mReader.setDevice( device );
+
+    mCurrentSection.clear();
+
+    mTopState = TS_READ_DOCUMENT;
+
+
+    while( !exit ) {
+        switch( mTopState ) {
+            case TS_READ_DOCUMENT:
+            {
+                mCurrentTokenType = mReader.readNext();
+                HB_DOCUMENTLOADER_PRINT( "TOP_STATE READ_ELEMENT " + mReader.name().toString() );
+                switch( mCurrentTokenType ) {
+                    case QXmlStreamReader::EndElement:
+                    case QXmlStreamReader::StartElement:
+                    {
+                        mCurrentElementType = elementType( mReader.name() );
+                        if( ( mCurrentElementType == HbXml::METADATA ) && ( mCurrentTokenType == QXmlStreamReader::StartElement ) ) {
+                            mTopState = TS_READ_METADATA;
+                            break;
+                        }
+
+                        if( mCurrentElementType == HbXml::SECTION ) {
+
+                            if( mCurrentTokenType == QXmlStreamReader::StartElement ) {
+
+                                QString name = attribute( ATTR_NAME );
+                                if( name.isEmpty() ) {
+                                    qWarning() << "Section without a name, line " << mReader.lineNumber();
+                                    mTopState = TS_ERROR;
+                                    break;
+                                }
+
+                                mCurrentSection << name;
+                                sectionsList.append( mCurrentSection.join( separator ) );
+
+                            } else if( mCurrentTokenType == QXmlStreamReader::EndElement ) {
+                                mCurrentSection.removeLast();
+                            }
+                        }
+                        break;
+                    }
+                    case QXmlStreamReader::EndDocument:
+                    {
+                        mTopState = TS_EXIT;
+                        break;
+                    }
+                    case QXmlStreamReader::Characters:
+                    {
+                        if( mReader.isWhitespace() ) {
+                            break;
+                        }
+                        HB_DOCUMENTLOADER_PRINT( "Characters" );
+                    }
+                    case QXmlStreamReader::NoToken:
+                    HB_DOCUMENTLOADER_PRINT( "NoToken" );
+                    case QXmlStreamReader::Invalid:
+                    HB_DOCUMENTLOADER_PRINT( "Invalid" );
+                    case QXmlStreamReader::EntityReference:
+                    {
+                        qWarning() << "Parse error, line " << mReader.lineNumber();
+                        mTopState = TS_ERROR;
+                        break;
+                    }
+                    case QXmlStreamReader::StartDocument:
+                    case QXmlStreamReader::Comment:
+                    case QXmlStreamReader::DTD:
+                    case QXmlStreamReader::ProcessingInstruction:
+                    default:
+                    {
+                        break;
+                    }
+                }
+                break;
+            }
+
+            case TS_READ_METADATA:
+            {
+                HB_DOCUMENTLOADER_PRINT( "TOP_STATE READ_METADATA" );
+                mCurrentTokenType = mReader.readNext();
+                switch( mCurrentTokenType ) {
+                    case QXmlStreamReader::EndElement:
+                    {
+                        mCurrentElementType = elementType( mReader.name() );
+                        if( mCurrentElementType == HbXml::METADATA ) {
+                            mTopState = TS_READ_DOCUMENT;
+                        }
+                        break;
+                    }
+                    case QXmlStreamReader::NoToken:
+                    case QXmlStreamReader::Invalid:
+                    {
+                        qWarning() << "Parse error, line " << mReader.lineNumber();
+                        mTopState = TS_ERROR;
+                        break;
+                    }
+                    case QXmlStreamReader::EndDocument:
+                    {
+                        qWarning() << "Unexpected end of document, line " << mReader.lineNumber();
+                        mTopState = TS_ERROR;
+                        break;
+                    }
+                    default:
+                    {
+                        break;
+                    }
+                }
+                break;
+            }
+
+            case TS_ERROR:
+            {
+                HB_DOCUMENTLOADER_PRINT( "TOP_STATE ERROR" );
+                result = false;
+                mTopState = TS_EXIT;
+                break;
+            }
+            case TS_EXIT:
+            {
+                HB_DOCUMENTLOADER_PRINT( "TOP_STATE EXIT" );
+                exit = true;
+                break;
+            }
+            default:
+            {
+                HB_DOCUMENTLOADER_PRINT( "INTERNAL ERROR" );
+                mTopState = TS_ERROR;
+                break;
+            }
+        }
+    }
+    mReader.clear();
+    return result;
+
+}
+
+bool HbXmlLoaderBaseSyntax::loadDevice(QIODevice *device, const QString &section)
+{
+    const QChar separator(' ');
+    mReader.setDevice( device );
+
+    bool exit = false;
+    bool result = true;
+    mCurrentSection.clear();
+    mRequiredSection.clear();
+
+    mTopState = TS_READ_DOCUMENT;
+
+    mDocumentState = DS_START_DOCUMENT;
+    mElementState = ES_GENERAL_ITEM;
+
+    mCurrentLayoutType = LAYOUT_NULL;
+    mCurrentContainerType = CONTAINER_NULL;
+
+    if( section != 0 ) {
+        mRequiredSection = section.split( separator, QString::SkipEmptyParts );
+    }
+
+    while( !exit ) {
+        switch( mTopState ) {
+            case TS_READ_DOCUMENT:
+            {
+                mCurrentTokenType = mReader.readNext();
+                HB_DOCUMENTLOADER_PRINT( "TOP_STATE READ_ELEMENT " + mReader.name().toString() );
+                switch( mCurrentTokenType ) {
+                    case QXmlStreamReader::EndElement:
+                    case QXmlStreamReader::StartElement:
+                    {
+                        mCurrentElementType = elementType( mReader.name() );
+                        if( ( mCurrentElementType == HbXml::METADATA ) && ( mCurrentTokenType == QXmlStreamReader::StartElement ) ) {
+                            mTopState = TS_READ_METADATA;
+                            break;
+                        }
+                        if( ! readDocument() ) {
+                            qWarning() << "Error in document, line " << mReader.lineNumber();
+                            mTopState = TS_ERROR;
+                        }
+                        break;
+                    }
+                    case QXmlStreamReader::EndDocument:
+                    {
+                        if( mDocumentState == DS_END_DOCUMENT ) {
+                            mTopState = TS_EXIT;
+                        } else {
+                            qWarning() << "Unexpected end of document, line " << mReader.lineNumber();
+                            mTopState = TS_ERROR;
+                        }
+                        break;
+                    }
+                    case QXmlStreamReader::Characters:
+                    {
+                        if( mReader.isWhitespace() ) {
+                            break;
+                        }
+                        HB_DOCUMENTLOADER_PRINT( "Characters" );
+                    }
+                    case QXmlStreamReader::NoToken:
+                    HB_DOCUMENTLOADER_PRINT( "NoToken" );
+                    case QXmlStreamReader::Invalid:
+                    HB_DOCUMENTLOADER_PRINT( "Invalid" );
+                    case QXmlStreamReader::EntityReference:
+                    {
+                        qWarning() << "Parse error, line " << mReader.lineNumber();
+                        mTopState = TS_ERROR;
+                        break;
+                    }
+                    case QXmlStreamReader::StartDocument:
+                    case QXmlStreamReader::Comment:
+                    case QXmlStreamReader::DTD:
+                    case QXmlStreamReader::ProcessingInstruction:
+                    default:
+                    {
+                        break;
+                    }
+                }
+                break;
+            }
+
+            case TS_READ_METADATA:
+            {
+                HB_DOCUMENTLOADER_PRINT( "TOP_STATE READ_METADATA" );
+                mCurrentTokenType = mReader.readNext();
+                switch( mCurrentTokenType ) {
+                    case QXmlStreamReader::EndElement:
+                    {
+                        mCurrentElementType = elementType( mReader.name() );
+                        if( mCurrentElementType == HbXml::METADATA ) {
+                            mTopState = TS_READ_DOCUMENT;
+                        }
+                        break;
+                    }
+                    case QXmlStreamReader::NoToken:
+                    case QXmlStreamReader::Invalid:
+                    {
+                        qWarning() << "Parse error, line " << mReader.lineNumber();
+                        mTopState = TS_ERROR;
+                        break;
+                    }
+                    case QXmlStreamReader::EndDocument:
+                    {
+                        qWarning() << "Unexpected end of document, line " << mReader.lineNumber();
+                        mTopState = TS_ERROR;
+                        break;
+                    }
+                    default:
+                    {
+                        break;
+                    }
+                }
+                break;
+            }
+
+            case TS_ERROR:
+            {
+                HB_DOCUMENTLOADER_PRINT( "TOP_STATE ERROR" );
+                result = false;
+                mTopState = TS_EXIT;
+                mActions->deleteAll();
+                break;
+            }
+            case TS_EXIT:
+            {
+                mActions->cleanUp();
+                HB_DOCUMENTLOADER_PRINT( "TOP_STATE EXIT" );
+                exit = true;
+                break;
+            }
+            default:
+            {
+                HB_DOCUMENTLOADER_PRINT( "INTERNAL ERROR" );
+                mTopState = TS_ERROR;
+                break;
+            }
+        }
+    }
+    mReader.clear();
+    return result;
+}
+
+bool HbXmlLoaderBaseSyntax::readDocument()
+{
+    bool result = false;
+    switch( mDocumentState ) {
+        case DS_START_DOCUMENT:
+        {
+            HB_DOCUMENTLOADER_PRINT( "DOCUMENT_STATE START DOCUMENT" );
+            if( mCurrentElementType == HbXml::DOCUMENT ) {
+                result = processDocument();
+                HB_DOCUMENTLOADER_PRINT( "SWITCHING TO READ SECTIONS STATE" );
+                mDocumentState = DS_READ_SECTIONS;
+            }
+            break;
+        }
+        case DS_READ_SECTIONS:
+        {
+            if( ( mCurrentElementType == HbXml::DOCUMENT ) && ( mCurrentTokenType == QXmlStreamReader::EndElement ) ) {
+                HB_DOCUMENTLOADER_PRINT( "SWITCHING TO END DOCUMENT STATE" );
+                mDocumentState = DS_END_DOCUMENT;
+                result = checkEndElementCorrectness();
+                break;
+            }
+
+            if( ( mCurrentSection != mRequiredSection ) ) {
+                HB_DOCUMENTLOADER_PRINT( "DOCUMENT_STATE READ ALIEN SECTIONS" );
+                result = readAlienSection();
+            } else {
+                HB_DOCUMENTLOADER_PRINT( "DOCUMENT_STATE READ TARGET SECTIONS" );
+                result = readTargetSection();
+            }
+            break;
+        }
+        case DS_END_DOCUMENT:
+        {
+            HB_DOCUMENTLOADER_PRINT( "DOCUMENT_STATE END DOCUMENT - ERROR" );
+            break;
+        }
+    }
+
+    return result;
+}
+
+bool HbXmlLoaderBaseSyntax::readAlienSection()
+{
+    if( mCurrentElementType == HbXml::SECTION ) {
+
+        if( mCurrentTokenType == QXmlStreamReader::StartElement ) {
+
+            QString name = attribute( ATTR_NAME );
+            if( name.isEmpty() ) {
+                qWarning() << "Section without a name, line " << mReader.lineNumber();
+                return false;
+            }
+
+            HB_DOCUMENTLOADER_PRINT( QString( "READ ALIEN SECTION: LEAVING SECTION " ) + "'" + mCurrentSection.join(" ") + "'" );
+            mCurrentSection << name;
+            HB_DOCUMENTLOADER_PRINT( QString("READ ALIEN SECTION: ENTERING SECTION " ) + "'" + mCurrentSection.join(" ") + "'" );
+
+        } else if( mCurrentTokenType == QXmlStreamReader::EndElement ) {
+
+            HB_DOCUMENTLOADER_PRINT( QString( "READ ALIEN SECTION: LEAVING SECTION " ) + "'" + mCurrentSection.join(" ") + "'" );
+            mCurrentSection.removeLast();
+            HB_DOCUMENTLOADER_PRINT( QString( "READ ALIEN SECTION: ENTERING SECTION " ) + "'" + mCurrentSection.join(" ") + "'" );
+
+        } else {
+
+            HB_DOCUMENTLOADER_PRINT( "READ ALIEN SECTION: UNEXPECTED TOKEN TYPE" );
+
+        }
+    }
+    return true;
+}
+
+bool HbXmlLoaderBaseSyntax::readTargetSection()
+{
+    bool result = false;
+
+
+    if( mCurrentTokenType == QXmlStreamReader::StartElement ) {
+        HB_DOCUMENTLOADER_PRINT( QString( "READ TARGET SECTION: START ELEMENT " ) + mReader.name().toString() );
+        switch( mElementState ) {
+            case ES_GENERAL_ITEM:
+            {
+                result = readGeneralStartItem();
+                break;
+            }
+            case ES_LAYOUT_ITEM:
+            {
+                result = readLayoutStartItem();
+                break;
+            }
+            case ES_CONTAINER_ITEM:
+            {
+                result = readContainerStartItem();
+                break;
+            }
+        }
+
+    } else if( mCurrentTokenType == QXmlStreamReader::EndElement ) {
+        HB_DOCUMENTLOADER_PRINT( QString( "READ TARGET SECTION: END ELEMENT " ) + mReader.name().toString() );
+
+        switch( mElementState ) {
+            case ES_GENERAL_ITEM:
+            {
+                result = readGeneralEndItem();
+                break;
+            }
+            case ES_LAYOUT_ITEM:
+            {
+                result = readLayoutEndItem();
+                break;
+            }
+            case ES_CONTAINER_ITEM:
+            {
+                result = readContainerEndItem();
+                break;
+            }
+        }
+
+    } else {
+        HB_DOCUMENTLOADER_PRINT( "READ TARGET SECTION: UNEXPECTED TOKEN TYPE" );
+    }
+
+    return result;
+}
+
+bool HbXmlLoaderBaseSyntax::readContainerStartItem()
+{
+	qWarning() << "Internal error, wrong container type, line " << mReader.lineNumber();
+    return false;
+}
+
+bool HbXmlLoaderBaseSyntax::readContainerEndItem()
+{
+    HB_DOCUMENTLOADER_PRINT( "GENERAL CONTAINER END ITEM" );
+    if( mCurrentElementType == HbXml::CONTAINER ) {
+        HB_DOCUMENTLOADER_PRINT( "GENERAL CONTAINER END ITEM : SWITCHING TO GENERAL ITEM PROCESSING MODE" );
+        mElementState = ES_GENERAL_ITEM;
+    }
+    return true;
+}
+
+bool HbXmlLoaderBaseSyntax::readLayoutStartItem()
+{
+	qWarning() << "Internal error, wrong layout type, line " << mReader.lineNumber();
+    return false;
+}
+
+bool HbXmlLoaderBaseSyntax::readLayoutEndItem()
+{
+    HB_DOCUMENTLOADER_PRINT( "GENERAL LAYOUT END ITEM" );
+    if( mCurrentElementType == HbXml::LAYOUT ) {
+        HB_DOCUMENTLOADER_PRINT( "GENERAL LAYOUT END ITEM : SWITCHING TO GENERAL ITEM PROCESSING MODE" );
+        mElementState = ES_GENERAL_ITEM;
+    }
+    return true;
+}
+
+bool HbXmlLoaderBaseSyntax::readGeneralStartItem()
+{
+    bool result = false;
+    switch( mCurrentElementType ) {
+         case HbXml::DOCUMENT:
+         {
+            HB_DOCUMENTLOADER_PRINT( "GENERAL START ITEM: DOCUMENT" );
+            result = processDocument();
+            break;
+         }
+         case HbXml::LAYOUT:
+         {
+            HB_DOCUMENTLOADER_PRINT( "GENERAL START ITEM: LAYOUT" );
+            result = processLayout();
+
+            HB_DOCUMENTLOADER_PRINT( "GENERAL START ITEM: SWITCHING TO LAYOUT PROCESSING MODE" );
+            mElementState = ES_LAYOUT_ITEM;
+            break;
+         }
+         case HbXml::CONTAINER:
+         {
+            HB_DOCUMENTLOADER_PRINT( "GENERAL START ITEM: CONTAINER" );
+            result = processContainer();
+
+            HB_DOCUMENTLOADER_PRINT( "GENERAL START ITEM: SWITCHING TO CONTAINER PROCESSING MODE" );
+            mElementState = ES_CONTAINER_ITEM;
+            break;
+         }
+         case HbXml::SECTION:
+         {
+            HB_DOCUMENTLOADER_PRINT( "GENERAL START ITEM: SECTION" );
+            QString name = attribute( ATTR_NAME );
+            if( name.isEmpty() ) {
+                qWarning() << "Section witout a name, line " << mReader.lineNumber();
+                break;
+            }
+
+            HB_DOCUMENTLOADER_PRINT( QString( "GENERAL START ITEM: LEAVING SECTION " ) + "'" + mCurrentSection.join(" ") + "'" );
+            mCurrentSection << name;
+            HB_DOCUMENTLOADER_PRINT( QString( "GENERAL START ITEM: ENTERING SECTION " ) + "'" + mCurrentSection.join(" ") + "'" );
+
+            result = true;
+            break;
+         }
+         default:
+         {
+            HB_DOCUMENTLOADER_PRINT( "GENERAL START ITEM: ERROR" );
+            qWarning() << "Unknown element, line " << mReader.lineNumber();
+            break;
+         }
+    }
+    return result;
+}
+
+bool HbXmlLoaderBaseSyntax::readGeneralEndItem()
+{
+
+    bool result = false;
+
+    switch( mCurrentElementType ) {
+         case HbXml::LAYOUT:
+         {
+            HB_DOCUMENTLOADER_PRINT( "GENERAL START ITEM: LAYOUT - ERROR, CANNOT BE IN THIS STATE" );
+            result = false;
+            break;
+         }
+         case HbXml::CONTAINER:
+         {
+            HB_DOCUMENTLOADER_PRINT( "GENERAL START ITEM: CONTAINER - ERROR, CANNOT BE IN THIS STATE" );
+            result = false;
+            break;
+         }
+         case HbXml::SECTION:
+         {
+            HB_DOCUMENTLOADER_PRINT( "GENERAL END ITEM: SECTION" );
+
+            HB_DOCUMENTLOADER_PRINT( QString( "GENERAL END ITEM: LEAVING SECTION " ) + "'" + mCurrentSection.join(" ") + "'" );
+            mCurrentSection.removeLast();
+            HB_DOCUMENTLOADER_PRINT( QString( "GENERAL END ITEM: ENTERING SECTION " ) + "'" + mCurrentSection.join(" ") + "'" );
+
+            result = true;
+            break;
+         }
+
+         default:
+         {
+            HB_DOCUMENTLOADER_PRINT( "GENERAL END ITEM: CHECKING ELEMENT CORRECTNESS" );
+            result = checkEndElementCorrectness();
+         }
+    }
+    return result;
+}
+
+
+bool HbXmlLoaderBaseSyntax::processDocument()
+{
+    return false;
+}
+
+
+bool HbXmlLoaderBaseSyntax::processLayout()
+{
+	qWarning() << "Unknown layout type, line " << mReader.lineNumber();
+    return false;
+}
+
+bool HbXmlLoaderBaseSyntax::processContainer()
+{
+	qWarning() << "Unknown container type, line " << mReader.lineNumber();
+    return false;
+}
+
+
+
+bool HbXmlLoaderBaseSyntax::checkEndElementCorrectness()
+{
+    if ( !mActions->pop( elementType( mReader.name() ) ) ) {
+        qWarning() << "Error in end element, line " << mReader.lineNumber();
+        return false;
+    }
+    return true;
+}
+
+HbXml::ElementType
+    HbXmlLoaderBaseSyntax::elementType( QStringRef name ) const
+{
+    const QString stringName = name.toString();
+
+    if ( stringName == lexemValue(TYPE_WIDGET) ) {
+        return HbXml::WIDGET;
+    } else if ( stringName == lexemValue(TYPE_OBJECT) ) {
+        return HbXml::OBJECT;
+    } else if ( stringName == lexemValue(TYPE_CONNECT) ) {
+        return HbXml::CONNECT;
+    } else if ( stringName == lexemValue(TYPE_LAYOUT) ) {
+        return HbXml::LAYOUT;
+    } else if ( stringName == lexemValue(TYPE_SPACERITEM) ) {
+        return HbXml::SPACERITEM;
+    } else if ( stringName == lexemValue(TYPE_CONTAINER) ) {
+        return HbXml::CONTAINER;
+    } else if ( stringName == lexemValue(TYPE_SECTION) ) {
+        return HbXml::SECTION;
+    } else if ( stringName == lexemValue(TYPE_REF) ) {
+        return HbXml::REF;
+    } else if ( ( stringName == lexemValue(TYPE_ICON) ) ||
+                ( stringName == lexemValue(TYPE_INT) ) ||
+                ( stringName == lexemValue(TYPE_REAL) ) ||
+                ( stringName == lexemValue(TYPE_LOCALIZED_STRING) ) ||
+                ( stringName == lexemValue(TYPE_STRING) ) ||
+                ( stringName == lexemValue(TYPE_ENUMS) ) ||
+                ( stringName == lexemValue(TYPE_BOOL) ) ||
+                ( stringName == lexemValue(TYPE_SIZE) ) ||
+                ( stringName == lexemValue(TYPE_RECT) ) ||
+                ( stringName == lexemValue(TYPE_POINT) ) ||
+                ( stringName == lexemValue(TYPE_COLOR) ) ||
+                ( stringName == lexemValue(TYPE_FONTSPEC) )||
+                ( stringName == lexemValue(LL_ORIENTATION) )||
+                ( stringName == lexemValue(TYPE_ALIGNMENT) )) {
+        return HbXml::PROPERTY;
+    } else if ( ( stringName == lexemValue(TYPE_CONTENTSMARGINS) ) ||
+                 ( stringName == lexemValue(TYPE_SIZEPOLICY) ) ||
+                ( stringName == lexemValue(TYPE_SIZEHINT) ) ||
+                ( stringName == lexemValue(TYPE_TOOLTIP) ) ) {
+        return HbXml::VARIABLE;
+    } else if ( stringName == lexemValue(TYPE_ZVALUE) ) {
+        qWarning() << "zvalue variable in docml is deprecated. Use z property instead.";
+        //return HbXml::DEPRECATED;
+        return HbXml::VARIABLE;
+    } else if ( stringName == lexemValue(TYPE_METADATA) ) {
+        return HbXml::METADATA;
+    }
+
+    return HbXml::UNKNOWN;
+}
+
+
+QString HbXmlLoaderBaseSyntax::attribute( DocumentLexems lexem ) const
+{
+    return mReader.attributes().value( lexemValue(lexem) ).toString();
+}
+
+bool HbXmlLoaderBaseSyntax::getAnchorEdge( const QString &edgeString, Hb::Edge &edge ) const
+{
+    bool retVal(true);
+    if( edgeString=="TOP" ) {
+        edge = Hb::TopEdge;
+    } else if( edgeString=="BOTTOM" ) {
+        edge = Hb::BottomEdge;
+    } else if( edgeString=="LEFT" ) {
+        edge = Hb::LeftEdge;
+    } else if( edgeString=="RIGHT" ) {
+        edge = Hb::RightEdge;
+    } else if( edgeString=="CENTERH" ) {
+        edge = Hb::CenterHEdge;
+    } else if( edgeString=="CENTERV" ) {
+        edge = Hb::CenterVEdge;
+    } else {
+        retVal = false;
+    }
+    return retVal;
+}
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/utils/hbxmlloaderbasesyntax_p.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/utils/hbxmlloaderbasesyntax_p.h	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,124 @@
+/****************************************************************************
+**
+** 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 HBXMLLOADERBASESYNTAX_P_H
+#define HBXMLLOADERBASESYNTAX_P_H
+
+#include "hbxmlloaderabstractactions_p.h"
+#include "hbxmlloaderabstractsyntax_p.h"
+
+#include <hbglobal.h>
+
+#include <QHash>
+#include <QList>
+#include <QXmlStreamReader>
+#include <QPointer>
+#include <QByteArray>
+
+class HbXmlLoaderAbstractActions;
+class HbWidget;
+
+class HB_CORE_PRIVATE_EXPORT HbXmlLoaderBaseSyntax : public HbXmlLoaderAbstractSyntax
+{
+
+public:
+    enum TopState {
+        TS_READ_DOCUMENT,
+        TS_READ_METADATA,
+        TS_ERROR,
+        TS_EXIT
+    };
+
+    enum DocumentState {
+        DS_START_DOCUMENT,
+        DS_READ_SECTIONS,
+        DS_END_DOCUMENT
+    };
+
+    enum ElementState {
+        ES_GENERAL_ITEM,
+        ES_LAYOUT_ITEM,
+        ES_CONTAINER_ITEM
+    };
+
+public:
+
+    HbXmlLoaderBaseSyntax( HbXmlLoaderAbstractActions *actions );
+    virtual ~HbXmlLoaderBaseSyntax();
+
+    virtual bool load( QIODevice *device, const QString &section );
+    bool scanForSections( QIODevice *device, QList<QString> &sectionsList );
+
+public:
+    virtual bool processDocument();
+    virtual bool processLayout();
+    virtual bool processContainer();
+    virtual bool checkEndElementCorrectness();
+
+    virtual HbXml::ElementType elementType( QStringRef name ) const;
+
+    virtual QString attribute( HbXmlLoaderAbstractSyntax::DocumentLexems lexem ) const;
+
+    virtual bool readDocument();
+    virtual bool readAlienSection();
+    virtual bool readTargetSection();
+
+    virtual bool readGeneralStartItem();
+    virtual bool readGeneralEndItem();
+    virtual bool readLayoutStartItem();
+    virtual bool readLayoutEndItem();
+    virtual bool readContainerStartItem();
+    virtual bool readContainerEndItem();
+
+protected :
+    bool getAnchorEdge( const QString &edgeString, Hb::Edge &edge ) const;
+    bool loadDevice(QIODevice *device, const QString &section);
+
+protected:
+
+    TopState mTopState;
+    DocumentState mDocumentState;
+    ElementState mElementState;
+
+    QStringList mCurrentSection;
+    QStringList mRequiredSection;
+    QStringList mCurrentContainerNames;
+
+    QList<HbXmlVariable*> mCurrentContainer;
+
+    QXmlStreamReader::TokenType mCurrentTokenType;
+    HbXml::ElementType mCurrentElementType;
+
+    DocumentLexems mCurrentLayoutType;
+    DocumentLexems mCurrentContainerType;
+
+    QXmlStreamReader mReader;
+
+private:
+
+    Q_DISABLE_COPY(HbXmlLoaderBaseSyntax)
+};
+
+#endif // HBXMLLOADERBASESYNTAX_P_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/utils/hbxmlloaderbinaryactions_p.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/utils/hbxmlloaderbinaryactions_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,423 @@
+/****************************************************************************
+**
+** 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 "hbxmlloaderbinaryactions_p.h"
+#include "hbxmlloaderbinarysyntax_p.h"
+#include "hbxmlloaderabstractsyntax_p.h"
+
+#include <QCoreApplication>
+
+#define VERSION_MAJOR 0
+#define VERSION_MINOR 1
+
+/*
+    \class HbXmlLoaderBinaryActions
+    \internal
+    \proto
+*/
+
+HbXmlLoaderBinaryActions::HbXmlLoaderBinaryActions() : HbXmlLoaderAbstractActions()
+{
+}
+
+HbXmlLoaderBinaryActions::~HbXmlLoaderBinaryActions()
+{
+}
+
+void HbXmlLoaderBinaryActions::setOutputDevice( QIODevice *device )
+{
+    mOut.setDevice(device);
+}
+
+void HbXmlLoaderBinaryActions::cleanUp()
+{
+    mOut << (quint8)HbXml::ActionCleanUp;
+}
+
+void HbXmlLoaderBinaryActions::reset()
+{
+    mOut << (quint8)HbXml::ActionReset;
+}
+
+void HbXmlLoaderBinaryActions::deleteAll()
+{
+    mOut << (quint8)HbXml::ActionDeleteAll;
+}
+
+bool HbXmlLoaderBinaryActions::pushDocument( const QString& context)
+{
+    if( mOut.device()->pos() != 0 ) {
+        mOut << (quint8)HbXml::ActionPushDocument << context;
+        return true;
+    }
+    mOut.device()->write(HbXmlLoaderBinarySyntax::signature(), strlen(HbXmlLoaderBinarySyntax::signature()));
+    mOut << (qint8)VERSION_MAJOR << (qint8)VERSION_MINOR;
+    mOut << (quint8)HbXml::ActionPushDocument << context;
+    return true;
+}
+
+bool HbXmlLoaderBinaryActions::pushObject( const QString& type, const QString &name )
+{
+    mOut << (quint8)HbXml::ActionPushObject << type << name;
+    return true;
+}
+
+bool HbXmlLoaderBinaryActions::pushWidget(
+    const QString &type,
+    const QString &name,
+    const QString &role,
+    const QString &plugin )
+{
+    mOut << (quint8)HbXml::ActionPushWidget << type << name << role << plugin;
+    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,
+    const QString &dstName,
+    const QString &slotName )
+{
+    mOut << (quint8)HbXml::ActionPushConnect << srcName << signalName << dstName << slotName;
+    return true;
+}
+
+bool HbXmlLoaderBinaryActions::pushProperty( const char *propertyName, const HbXmlVariable &variable )
+{
+    mOut << (quint8)HbXml::ActionPushProperty << propertyName << variable;
+    return true;
+}
+
+bool HbXmlLoaderBinaryActions::pushRef( const QString &name, const QString &role )
+{
+    mOut << (quint8)HbXml::ActionPushRef << name << role;
+    return true;
+}
+
+bool HbXmlLoaderBinaryActions::pushContainer(
+    const char *propertyName,
+    HbXmlLoaderAbstractSyntax::DocumentLexems type,
+    const QList<HbXmlVariable*> &container )
+{
+    mOut << (quint8)HbXml::ActionPushContainer << propertyName << (quint8)type << (quint8)container.count();
+    for (int i=0; i < container.count(); i++) {
+        mOut << *(container.at(i));
+    }
+    return true;
+}
+
+
+bool HbXmlLoaderBinaryActions::pop( const HbXml::ElementType type )
+{
+    mOut << (quint8)HbXml::ActionPop << (quint8)type;
+    return true;
+}
+
+
+bool HbXmlLoaderBinaryActions::setContentsMargins(
+    const HbXmlLengthValue &left,
+    const HbXmlLengthValue &top,
+    const HbXmlLengthValue &right,
+    const HbXmlLengthValue &bottom )
+{
+    mOut << (quint8)HbXml::ActionSetContentsMargins << left << top << right << bottom;
+    return true;
+}
+
+bool HbXmlLoaderBinaryActions::setSizePolicy(
+    QSizePolicy::Policy *horizontalPolicy,
+    QSizePolicy::Policy *verticalPolicy,
+    int *horizontalStretch,
+    int *verticalStretch )
+{
+    mOut << (quint8)HbXml::ActionSetSizePolicy;
+    if ( horizontalPolicy ) {
+        mOut << true << (quint8)*horizontalPolicy;
+    } else {
+        mOut << false;
+    }
+    if ( verticalPolicy ) {
+        mOut << true << (quint8)*verticalPolicy;
+    } else {
+        mOut << false;
+    }
+    if ( horizontalStretch ) {
+        mOut << true << (qint16)*horizontalStretch;
+    } else {
+        mOut << false;
+    }
+    if ( verticalStretch ) {
+        mOut << true << (qint16)*verticalStretch;
+    } else {
+        mOut << false;
+    }
+    return true;
+}
+
+bool HbXmlLoaderBinaryActions::setSizeHint(
+    Qt::SizeHint hint,
+    const HbXmlLengthValue &hintWidth,
+    const HbXmlLengthValue &hintHeight,
+    bool fixed)
+{
+    mOut << (quint8)HbXml::ActionSetSizeHint << (quint8)hint << hintWidth << hintHeight << fixed;
+    return true;
+}
+
+bool HbXmlLoaderBinaryActions::setToolTip( const HbXmlVariable &tooltip )
+{
+    mOut << (quint8)HbXml::ActionSetToolTip << tooltip;
+    return true;
+}
+
+bool HbXmlLoaderBinaryActions::createAnchorLayout( const QString &widget )
+{
+    mOut << (quint8)HbXml::ActionCreateAnchorLayout << widget;
+    return true;
+}
+
+bool HbXmlLoaderBinaryActions::addAnchorLayoutEdge(
+    const QString &src,
+    Hb::Edge srcEdge,
+    const QString &dst,
+    Hb::Edge dstEdge,
+    const HbXmlLengthValue &spacing,
+    const QString &spacer )
+{
+    mOut << (quint8)HbXml::ActionAddAnchorLayoutEdge << src << (quint8)srcEdge << dst << (quint8)dstEdge << spacing << spacer;
+    return true;
+}
+
+
+bool HbXmlLoaderBinaryActions::createMeshLayout( const QString &widget )
+{
+    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;
+    return true;
+}
+
+bool HbXmlLoaderBinaryActions::addGridLayoutCell(
+    const QString &src,
+    int row,
+    int column,
+    int *rowspan,
+    int *columnspan,
+    Qt::Alignment *alignment )
+{
+    mOut << (quint8)HbXml::ActionAddGridLayoutCell << src << (qint16)row << (qint16)column;
+    if ( rowspan ) {
+        mOut << true << (qint16)*rowspan;
+    } else {
+        mOut << false;
+    }
+    if ( columnspan ) {
+        mOut << true << (qint16)*columnspan;
+    } else {
+        mOut << false;
+    }
+    if ( alignment ) {
+        mOut << true << (quint8)*alignment;
+    } else {
+        mOut << false;
+    }
+    return true;
+}
+
+bool HbXmlLoaderBinaryActions::setGridLayoutRowProperties(
+    int row,
+    int *rowStretchFactor,
+    Qt::Alignment *alignment )
+{
+    mOut << (quint8)HbXml::ActionSetGridLayoutRowProperties << (qint16)row;
+    if ( rowStretchFactor ) {
+        mOut << true << (qint16)*rowStretchFactor;
+    } else {
+        mOut << false;
+    }
+    if ( alignment ) {
+        mOut << true << (quint8)*alignment;
+    } else {
+        mOut << false;
+    }
+    return true;
+}
+
+bool HbXmlLoaderBinaryActions::setGridLayoutColumnProperties(
+    int column,
+    int *columnStretchFactor,
+    Qt::Alignment *alignment )
+{
+    mOut << (quint8)HbXml::ActionSetGridLayoutColumnProperties << (qint16)column;
+    if ( columnStretchFactor ) {
+        mOut << true << (qint16)*columnStretchFactor;
+    } else {
+        mOut << false;
+    }
+    if ( alignment ) {
+        mOut << true << (quint8)*alignment;
+    } else {
+        mOut << false;
+    }
+    return true;
+}
+
+bool HbXmlLoaderBinaryActions::setGridLayoutRowHeights(
+    int row,
+    const HbXmlLengthValue &minHeight,
+    const HbXmlLengthValue &maxHeight,
+    const HbXmlLengthValue &prefHeight,
+    const HbXmlLengthValue &fixedHeight,
+    const HbXmlLengthValue &rowSpacing )
+{
+    mOut << (quint8)HbXml::ActionSetGridLayoutRowHeights << (qint16)row << minHeight << maxHeight << prefHeight << fixedHeight << rowSpacing;
+    return true;
+}
+
+bool HbXmlLoaderBinaryActions::setGridLayoutColumnWidths(
+    int column,
+    const HbXmlLengthValue &minWidth,
+    const HbXmlLengthValue &maxWidth,
+    const HbXmlLengthValue &prefWidth,
+    const HbXmlLengthValue &fixedWidth,
+    const HbXmlLengthValue &columnSpacing )
+{
+    mOut << (quint8)HbXml::ActionSetGridLayoutColumnWidths << (qint16)column << minWidth << maxWidth << prefWidth << fixedWidth << columnSpacing;
+    return true;
+}
+bool HbXmlLoaderBinaryActions::createLinearLayout(
+    const QString &widget,
+    Qt::Orientation *orientation,
+    const HbXmlLengthValue &spacing )
+{
+    mOut << (quint8)HbXml::ActionCreateLinearLayout << widget;
+    if ( orientation ) {
+        mOut << true << (quint8)*orientation;
+    } else {
+        mOut << false;
+    }
+    mOut << spacing;
+    return true;
+}
+
+bool HbXmlLoaderBinaryActions::addLinearLayoutItem(
+    const QString &itemname,
+    int *index,
+    int *stretchfactor,
+    Qt::Alignment *alignment,
+    const HbXmlLengthValue &spacing )
+{
+    mOut << (quint8)HbXml::ActionAddLinearLayoutItem << itemname;
+    if ( index ) {
+        mOut << true << (qint16)*index;
+    } else {
+        mOut << false;
+    }
+    if ( stretchfactor ) {
+        mOut << true << (qint16)*stretchfactor;
+    } else {
+        mOut << false;
+    }
+    if ( alignment ) {
+        mOut << true << (quint8)*alignment;
+    } else {
+        mOut << false;
+    }
+    mOut << spacing;
+    return true;
+}
+
+bool HbXmlLoaderBinaryActions::addLinearLayoutStretch(
+    int *index,
+    int *stretchfactor )
+{
+    mOut << (quint8)HbXml::ActionAddLinearLayoutStretch;
+    if ( index ) {
+        mOut << true << (qint16)*index;
+    } else {
+        mOut << false;
+    }
+    if ( stretchfactor ) {
+        mOut << true << (qint16)*stretchfactor;
+    } else {
+        mOut << false;
+    }
+    return true;
+}
+
+bool HbXmlLoaderBinaryActions::setLayoutContentsMargins(
+    const HbXmlLengthValue &left,
+    const HbXmlLengthValue &top,
+    const HbXmlLengthValue &right,
+    const HbXmlLengthValue &bottom )
+{
+    mOut << (quint8)HbXml::ActionSetLayoutContentsMargins << left << top << right << bottom;
+    return true;
+}
+bool HbXmlLoaderBinaryActions::createStackedLayout( const QString &widget )
+{
+    mOut << (quint8)HbXml::ActionCreateStackedLayout << widget;
+    return true;
+}
+
+bool HbXmlLoaderBinaryActions::addStackedLayoutItem( const QString &itemname, int *index )
+{
+    mOut << (quint8)HbXml::ActionAddStackedLayoutItem << itemname;
+    if ( index ) {
+        mOut << true << (qint16)*index;
+    } else {
+        mOut << false;
+    }
+    return true;
+}
+
+bool HbXmlLoaderBinaryActions::createNullLayout( const QString &widget )
+{
+    mOut << (quint8)HbXml::ActionCreateNullLayout << widget;
+    return true;
+}
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/utils/hbxmlloaderbinaryactions_p.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/utils/hbxmlloaderbinaryactions_p.h	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,177 @@
+/****************************************************************************
+**
+** 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 HBXMLLOADERBINARYACTIONS_P_H
+#define HBXMLLOADERBINARYACTIONS_P_H
+
+#include <hbxmlloaderabstractactions_p.h>
+#include <hbxmlloaderabstractsyntax_p.h>
+
+#include <hbglobal.h>
+
+#include <QGraphicsWidget>
+#include <QGraphicsLayout>
+#include <QPointer>
+
+
+// Uncomment the following in order to get additional debug prints
+//#define HB_DOCUMENTLOADER_DEBUG
+ 
+struct HbXmlLengthValue;
+
+class HB_CORE_PRIVATE_EXPORT HbXmlLoaderBinaryActions : public HbXmlLoaderAbstractActions
+{        
+    public:    
+    
+        HbXmlLoaderBinaryActions();
+        virtual ~HbXmlLoaderBinaryActions();
+
+        void setOutputDevice( QIODevice *device );
+
+    public: // from base class
+        void reset();
+        void cleanUp();
+        void deleteAll();
+
+        bool pushDocument( const QString& context);
+        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 );
+        bool pushContainer(
+            const char *propertyName,
+            HbXmlLoaderAbstractSyntax::DocumentLexems type,
+            const QList<HbXmlVariable*> &container );
+        
+        bool pop( const HbXml::ElementType type );
+
+        bool setContentsMargins(
+            const HbXmlLengthValue &left,
+            const HbXmlLengthValue &top,
+            const HbXmlLengthValue &right,
+            const HbXmlLengthValue &bottom );
+        bool setSizePolicy(
+            QSizePolicy::Policy *horizontalPolicy, 
+            QSizePolicy::Policy *verticalPolicy, 
+            int *horizontalStretch,
+            int *verticalStretch );
+        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 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 addGridLayoutCell(
+            const QString &src,
+            int row, 
+            int column,
+            int *rowspan,
+            int *columnspan,
+            Qt::Alignment *alignment );
+        bool setGridLayoutRowProperties(
+            int row,
+            int *rowStretchFactor,
+            Qt::Alignment *alignment );
+        bool setGridLayoutColumnProperties(
+            int column,
+            int *columnStretchFactor,
+            Qt::Alignment *alignment );
+        bool setGridLayoutRowHeights(
+            int row,
+            const HbXmlLengthValue &minHeight,
+            const HbXmlLengthValue &maxHeight, 
+            const HbXmlLengthValue &prefHeight,
+            const HbXmlLengthValue &fixedHeight, 
+            const HbXmlLengthValue &rowSpacing );
+        bool setGridLayoutColumnWidths(
+            int column,
+            const HbXmlLengthValue &minWidth,
+            const HbXmlLengthValue &maxWidth,
+            const HbXmlLengthValue &prefWidth,
+            const HbXmlLengthValue &fixedWidth,
+            const HbXmlLengthValue &columnSpacing );
+
+        bool createLinearLayout(
+            const QString &widget,
+            Qt::Orientation *orientation, 
+            const HbXmlLengthValue &spacing );
+        bool addLinearLayoutItem(
+            const QString &itemname,
+            int *index,
+            int *stretchfactor, 
+            Qt::Alignment *alignment,
+            const HbXmlLengthValue &spacing );
+        bool addLinearLayoutStretch(
+            int *index,
+            int *stretchfactor );
+
+        bool setLayoutContentsMargins(
+            const HbXmlLengthValue &left,
+            const HbXmlLengthValue &top,
+            const HbXmlLengthValue &right,
+            const HbXmlLengthValue &bottom );
+
+        bool createStackedLayout( const QString &widget );
+        bool addStackedLayoutItem( const QString &itemname, int *index );
+                                
+        bool createNullLayout( const QString &widget );
+
+    private:
+        Q_DISABLE_COPY(HbXmlLoaderBinaryActions)
+        QDataStream mOut;
+};
+
+#endif // HBXMLLOADERBINARYACTIONS_P_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/utils/hbxmlloaderbinarysyntax_p.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/utils/hbxmlloaderbinarysyntax_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,672 @@
+/****************************************************************************
+**
+** 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 "hbxmlloaderbinarysyntax_p.h"
+#include "hbxmlloaderabstractactions_p.h"
+
+#include <QDebug>
+
+// Document loader version number
+#define VERSION_MAJOR 0
+#define VERSION_MINOR 1
+
+#define MIN_SUPPORTED_VERSION_MAJOR 0
+#define MIN_SUPPORTED_VERSION_MINOR 1
+
+// <start-of-text> + "hbBIN" + <end-of-text>
+const char *BINARYFORMATSIGNATURE = "\x02\x68\x62\x42\x49\x4e\x03";
+
+//#define BINARY_SYNTAX_DEBUG
+
+/*
+    \class HbXmlLoaderBinarySyntax
+    \internal
+    \proto
+*/
+
+HbXmlLoaderBinarySyntax::HbXmlLoaderBinarySyntax( HbXmlLoaderAbstractActions *actions )
+    : HbXmlLoaderAbstractSyntax(actions)
+{
+}
+
+HbXmlLoaderBinarySyntax::~HbXmlLoaderBinarySyntax()
+{
+}
+
+const char* HbXmlLoaderBinarySyntax::signature()
+{
+    return BINARYFORMATSIGNATURE;
+}
+
+QString HbXmlLoaderBinarySyntax::version()
+{
+    return ( QString::number( VERSION_MAJOR ) + QString( "." )
+            + QString::number( VERSION_MINOR ) + QString( " (" )
+            + QString::number( MIN_SUPPORTED_VERSION_MAJOR ) + QString( "." )
+            + QString::number( MIN_SUPPORTED_VERSION_MINOR ) + QString( ")" ) );
+}
+
+bool HbXmlLoaderBinarySyntax::isBinary( QIODevice *device )
+{
+    qint64 pos = device->pos();
+    QByteArray bytes = device->read( strlen(HbXmlLoaderBinarySyntax::signature()) );
+    bool result = !strcmp( bytes.constData(), HbXmlLoaderBinarySyntax::signature() );
+    device->seek( pos );
+    return result;
+}
+
+bool HbXmlLoaderBinarySyntax::load( QIODevice *device, const QString &section )
+{
+    bool result(true);
+    mIn.setDevice( device );
+
+    result = validateDocument();
+
+    // section support start
+    if( !section.isEmpty() && result ) {
+        qint64 fileSize = mIn.device()->pos() + mIn.device()->bytesAvailable();
+        qint64 nextPos;
+        QHash< QString, qint64 > sectionsList;
+
+        mIn.device()->seek( fileSize - sizeof( qint64 ) );
+        mIn >> nextPos;
+
+        mIn.device()->seek( nextPos );
+        mIn >> sectionsList;
+
+        if( sectionsList.contains( section ) ) {
+            mIn.device()->seek( sectionsList.value( section ) );
+        } else {
+            // error
+            qWarning() << "No such section " << section;
+            result = false;
+        }
+    }
+    // section support end
+
+
+    if ( result ) {
+        result = processDocument(section);
+    }
+    return result;
+}
+
+bool HbXmlLoaderBinarySyntax::processDocument( const QString &section )
+{
+    Q_UNUSED(section);
+    bool result(true);
+
+#ifdef BINARY_SYNTAX_DEBUG
+    QMap<HbXml::ActionType, int> hitList;
+#endif
+
+    HbXml::ActionType action;
+    quint8 temp;
+    mIn >> temp;
+    action = (HbXml::ActionType)temp;
+    while ( result && action != HbXml::ActionEnd ) {
+#ifdef BINARY_SYNTAX_DEBUG
+        if (hitList.contains(action)) {
+            hitList[action]++;
+        } else {
+            hitList.insert(action, 1);
+        }
+
+        qDebug() << "HbXmlLoaderBinarySyntax, action:" << action;
+#endif
+        switch (action) {
+        case HbXml::ActionReset: result = parseReset(); break;
+        case HbXml::ActionCleanUp: result = parseCleanUp(); break;
+        case HbXml::ActionDeleteAll: result = parseDeleteAll(); break;
+        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;
+        case HbXml::ActionPushContainer: result = parsePushContainer(); break;
+        case HbXml::ActionPop: result = parsePop(); break;
+        case HbXml::ActionSetContentsMargins: result = parseSetContentsMargins(); break;
+        case HbXml::ActionSetSizePolicy: result = parseSetSizePolicy(); break;
+        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::ActionCreateGridLayout: result = parseCreateGridLayout(); break;
+        case HbXml::ActionAddGridLayoutCell: result = parseAddGridLayoutCell(); break;
+        case HbXml::ActionSetGridLayoutRowProperties: result = parseSetGridLayoutRowProperties(); break;
+        case HbXml::ActionSetGridLayoutColumnProperties: result = parseSetGridLayoutColumnProperties(); break;
+        case HbXml::ActionSetGridLayoutRowHeights: result = parseSetGridLayoutRowHeights(); break;
+        case HbXml::ActionSetGridLayoutColumnWidths: result = parseSetGridLayoutColumnWidths(); break;
+        case HbXml::ActionCreateLinearLayout: result = parseCreateLinearLayout(); break;
+        case HbXml::ActionAddLinearLayoutItem: result = parseAddLinearLayoutItem(); break;
+        case HbXml::ActionAddLinearLayoutStretch: result = parseAddLinearLayoutStretch(); break;
+        case HbXml::ActionSetLayoutContentsMargins: result = parseSetLayoutContentsMargins(); break;
+        case HbXml::ActionCreateStackedLayout: result = parseCreateStackedLayout(); break;
+        case HbXml::ActionAddStackedLayoutItem: result = parseAddStackedLayoutItem(); break;
+        case HbXml::ActionCreateNullLayout: result = parseCreateNullLayout(); break;
+        default:
+            // Unknown action
+            result = false;
+            break;
+        }
+        if (result) {
+            if ( mIn.atEnd() || action == HbXml::ActionCleanUp ) {
+                action = HbXml::ActionEnd;
+            } else {
+                mIn >> temp;
+                action = (HbXml::ActionType)temp;
+            }
+        } else {
+            // Failure
+            qDebug() << "HbXmlLoaderBinarySyntax, failed at action" << action;
+            mActions->deleteAll();
+        }
+    }
+#ifdef BINARY_SYNTAX_DEBUG
+    qDebug() << "HbXmlLoaderBinarySyntax, action statistics";
+    QMap<HbXml::ActionType, int>::iterator it = hitList.begin();
+    while (it != hitList.end()) {
+        qDebug() << "-- Action:" << it.key() << ", hits:" << it.value();
+        it++;
+    }
+#endif
+    return result;
+}
+
+bool HbXmlLoaderBinarySyntax::validateDocument()
+{
+    QByteArray bytes = mIn.device()->read( strlen(HbXmlLoaderBinarySyntax::signature()) );
+    if ( strcmp( bytes.constData(), HbXmlLoaderBinarySyntax::signature() )) {
+        qWarning() << "Not a binary file.";
+        return false;
+    }
+
+    bool supportedVersion(true);
+    qint8 major, minor;
+    mIn >> major >> minor;
+    if ( ( major > VERSION_MAJOR ) || ( major < MIN_SUPPORTED_VERSION_MAJOR ) ) {
+        supportedVersion = false;
+    } else if( ( ( major == VERSION_MAJOR ) && ( minor > VERSION_MINOR )  ) ||
+               ( ( major == MIN_SUPPORTED_VERSION_MAJOR ) && ( minor < MIN_SUPPORTED_VERSION_MINOR ) ) ) {
+        supportedVersion = false;
+    }
+    if (!supportedVersion) {
+        QString ver_str;
+        ver_str.append(QString::number(major));
+        ver_str.append('.');
+        ver_str.append(QString::number(minor));
+        qWarning() << "Not supported document version " + ver_str + ". Current parser version is: " + version();
+        return false;
+    }
+    return true;
+}
+
+
+bool HbXmlLoaderBinarySyntax::parseReset()
+{
+    mActions->reset();
+    return true;
+}
+
+bool HbXmlLoaderBinarySyntax::parseCleanUp()
+{
+    mActions->cleanUp();
+    return true;
+}
+
+bool HbXmlLoaderBinarySyntax::parseDeleteAll()
+{
+    mActions->deleteAll();
+    return true;
+}
+
+bool HbXmlLoaderBinarySyntax::parsePushDocument()
+{
+    QString context;
+    mIn >> context;
+    return mActions->pushDocument(context);
+}
+
+bool HbXmlLoaderBinarySyntax::parsePushObject()
+{
+    QString type, name;
+    mIn >> type >> name;
+    return mActions->pushObject(type, name);
+}
+
+bool HbXmlLoaderBinarySyntax::parsePushWidget()
+{
+    QString type, name, role, plugin;
+    mIn >> type >> name >> role >> plugin;
+    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;
+    mIn >> srcName >> signalName >> dstName >> slotName;
+    return mActions->pushConnect(srcName, signalName, dstName, slotName);
+}
+
+bool HbXmlLoaderBinarySyntax::parsePushProperty()
+{
+    char *propertyName;
+    HbXmlVariable buffer;
+    mIn >> propertyName >> buffer;
+    bool res = mActions->pushProperty(propertyName, buffer);
+    delete propertyName;
+    return res;
+}
+
+bool HbXmlLoaderBinarySyntax::parsePushRef()
+{
+    QString name, role;
+    mIn >> name >> role;
+    return mActions->pushRef(name, role);
+}
+
+bool HbXmlLoaderBinarySyntax::parsePushContainer()
+{
+    char *propertyName;
+    quint8 type, count;
+    QList<HbXmlVariable*> container;
+    mIn >> propertyName >> type >> count;
+    for (int i=0; i < count; i++) {
+        HbXmlVariable *variable = new HbXmlVariable();
+        mIn >> *variable;
+        container.append(variable);
+    }
+
+
+    bool res =  mActions->pushContainer(propertyName, (HbXmlLoaderAbstractSyntax::DocumentLexems)type, container);
+
+    delete propertyName;
+
+    return res;
+}
+
+bool HbXmlLoaderBinarySyntax::parsePop()
+{
+    quint8 type;
+    mIn >> type;
+    return mActions->pop((HbXml::ElementType)type);
+}
+
+bool HbXmlLoaderBinarySyntax::parseSetContentsMargins()
+{
+    HbXmlLengthValue left, top, right, bottom;
+    mIn >> left >> top >> right >> bottom;
+    return mActions->setContentsMargins(left, top, right, bottom);
+}
+
+bool HbXmlLoaderBinarySyntax::parseSetSizePolicy()
+{
+    QSizePolicy::Policy horizontalPolicy, verticalPolicy;
+    QSizePolicy::Policy *horizontalPolicy_p = 0, *verticalPolicy_p = 0;
+    int horizontalStretch, verticalStretch;
+    int *horizontalStretch_p = 0, *verticalStretch_p = 0;
+
+    bool temp;
+    qint16 tempInt;
+    quint8 tempEnum;
+    mIn >> temp;
+    if ( temp ) {
+        mIn >> tempEnum;
+        horizontalPolicy = (QSizePolicy::Policy)tempEnum;
+        horizontalPolicy_p = &horizontalPolicy;
+    }
+    mIn >> temp;
+    if ( temp ) {
+        mIn >> tempEnum;
+        verticalPolicy = (QSizePolicy::Policy)tempEnum;
+        verticalPolicy_p = &verticalPolicy;
+    }
+    mIn >> temp;
+    if ( temp ) {
+        mIn >> tempInt;
+        horizontalStretch = (int)tempInt;
+        horizontalStretch_p = &horizontalStretch;
+    }
+    mIn >> temp;
+    if ( temp ) {
+        mIn >> tempInt;
+        verticalStretch = (int)tempInt;
+        verticalStretch_p = &verticalStretch;
+    }
+    return mActions->setSizePolicy(horizontalPolicy_p, verticalPolicy_p, horizontalStretch_p, verticalStretch_p);
+}
+
+bool HbXmlLoaderBinarySyntax::parseSetSizeHint()
+{
+    quint8 hint;
+    HbXmlLengthValue hintWidth, hintHeight;
+    bool fixed;
+    mIn >> hint >> hintWidth >> hintHeight >> fixed;
+    return mActions->setSizeHint((Qt::SizeHint)hint, hintWidth, hintHeight, fixed);
+}
+
+bool HbXmlLoaderBinarySyntax::parseSetToolTip()
+{
+    HbXmlVariable tooltip;
+    mIn >> tooltip;
+    return mActions->setToolTip(tooltip);
+}
+
+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 HbXmlLoaderBinarySyntax::parseCreateMeshLayout()
+{
+    QString widget;
+    mIn >> widget;
+    return mActions->createMeshLayout(widget);
+}
+
+bool HbXmlLoaderBinarySyntax::parseAddMeshLayoutEdge()
+{
+    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);
+}
+
+bool HbXmlLoaderBinarySyntax::parseCreateGridLayout()
+{
+    QString widget;
+    HbXmlLengthValue spacing;
+    mIn >> widget >> spacing;
+    return mActions->createGridLayout(widget, spacing);
+}
+
+bool HbXmlLoaderBinarySyntax::parseAddGridLayoutCell()
+{
+    QString src;
+    int row, column, rowspan, columnspan;
+    int *rowspan_p = 0, *columnspan_p = 0;
+    Qt::Alignment alignment;
+    Qt::Alignment *alignment_p = 0;
+    mIn >> src;
+
+    bool temp;
+    qint16 tempInt;
+    quint8 tempEnum;
+
+    mIn >> tempInt;
+    row = (int)tempInt;
+
+    mIn >> tempInt;
+    column = (int)tempInt;
+
+    // Optional parameters
+    mIn >> temp;
+    if ( temp ) {
+        mIn >> tempInt;
+        rowspan = (int)tempInt;
+        rowspan_p = &rowspan;
+    }
+    mIn >> temp;
+    if ( temp ) {
+        mIn >> tempInt;
+        columnspan = (int)tempInt;
+        columnspan_p = &columnspan;
+    }
+    mIn >> temp;
+    if ( temp ) {
+        mIn >> tempEnum;
+        alignment = (Qt::Alignment)tempEnum;
+        alignment_p = &alignment;
+    }
+    return mActions->addGridLayoutCell(src, row, column, rowspan_p, columnspan_p, alignment_p);
+}
+
+bool HbXmlLoaderBinarySyntax::parseSetGridLayoutRowProperties()
+{
+    int row, rowStretchFactor;
+    int *rowStretchFactor_p = 0;
+    Qt::Alignment alignment;
+    Qt::Alignment *alignment_p = 0;
+
+    bool temp;
+    qint16 tempInt;
+    quint8 tempEnum;
+
+    mIn >> tempInt;
+    row = (int)tempInt;
+
+    // Optional parameters
+    mIn >> temp;
+    if ( temp ) {
+        mIn >> tempInt;
+        rowStretchFactor = (int)tempInt;
+        rowStretchFactor_p = &rowStretchFactor;
+    }
+    mIn >> temp;
+    if ( temp ) {
+        mIn >> tempEnum;
+        alignment = (Qt::Alignment)tempEnum;
+        alignment_p = &alignment;
+    }
+
+    return mActions->setGridLayoutRowProperties(row, rowStretchFactor_p, alignment_p);
+}
+
+bool HbXmlLoaderBinarySyntax::parseSetGridLayoutColumnProperties()
+{
+    int column, columnStretchFactor;
+    int *columnStretchFactor_p = 0;
+    Qt::Alignment alignment;
+    Qt::Alignment *alignment_p = 0;
+
+    bool temp;
+    qint16 tempInt;
+    quint8 tempEnum;
+
+    mIn >> tempInt;
+    column = (int)tempInt;
+
+    // Optional parameters
+    mIn >> temp;
+    if ( temp ) {
+        mIn >> tempInt;
+        columnStretchFactor = (int)tempInt;
+        columnStretchFactor_p = &columnStretchFactor;
+    }
+    mIn >> temp;
+    if ( temp ) {
+        mIn >> tempEnum;
+        alignment = (Qt::Alignment)tempEnum;
+        alignment_p = &alignment;
+    }
+    return mActions->setGridLayoutColumnProperties(column, columnStretchFactor_p, alignment_p);
+}
+
+bool HbXmlLoaderBinarySyntax::parseSetGridLayoutRowHeights()
+{
+    qint16 tempInt;
+    int row;
+    HbXmlLengthValue minHeight, maxHeight, prefHeight, fixedHeight, rowSpacing;
+    mIn >> tempInt >> minHeight >> maxHeight >> prefHeight >> fixedHeight >> rowSpacing;
+    row = (int)tempInt;
+    return mActions->setGridLayoutRowHeights(row, minHeight, maxHeight, prefHeight, fixedHeight, rowSpacing);
+}
+
+bool HbXmlLoaderBinarySyntax::parseSetGridLayoutColumnWidths()
+{
+    qint16 tempInt;
+    int column;
+    HbXmlLengthValue minWidth, maxWidth, prefWidth, fixedWidth, columnSpacing;
+    mIn >> tempInt >> minWidth >> maxWidth >> prefWidth >> fixedWidth >> columnSpacing;
+    column = (int)tempInt;
+    return mActions->setGridLayoutColumnWidths(column, minWidth, maxWidth, prefWidth, fixedWidth, columnSpacing);
+}
+
+bool HbXmlLoaderBinarySyntax::parseCreateLinearLayout()
+{
+    QString widget;
+    Qt::Orientation orientation;
+    Qt::Orientation *orientation_p = 0;
+    HbXmlLengthValue spacing;
+    mIn >> widget;
+
+    // Optional parameter
+    bool temp;
+    quint8 tempEnum;
+    mIn >> temp;
+    if ( temp ) {
+        mIn >> tempEnum;
+        orientation = (Qt::Orientation)tempEnum;
+        orientation_p = &orientation;
+    }
+    mIn >> spacing;
+
+    return mActions->createLinearLayout(widget, orientation_p, spacing);
+}
+
+bool HbXmlLoaderBinarySyntax::parseAddLinearLayoutItem()
+{
+    QString itemname;
+    int index, stretchfactor;
+    int *index_p = 0, *stretchfactor_p = 0;
+    Qt::Alignment alignment;
+    Qt::Alignment *alignment_p = 0;
+    HbXmlLengthValue spacing;
+    mIn >> itemname;
+
+    // Optional parameters
+    bool temp;
+    qint16 tempInt;
+    quint8 tempEnum;
+    mIn >> temp;
+    if ( temp ) {
+        mIn >> tempInt;
+        index = (int)tempInt;
+        index_p = &index;
+    }
+    mIn >> temp;
+    if ( temp ) {
+        mIn >> tempInt;
+        stretchfactor = (int)tempInt;
+        stretchfactor_p = &stretchfactor;
+    }
+    mIn >> temp;
+    if ( temp ) {
+        mIn >> tempEnum;
+        alignment = (Qt::Alignment)tempEnum;
+        alignment_p = &alignment;
+    }
+    mIn >> spacing;
+
+    return mActions->addLinearLayoutItem(itemname, index_p, stretchfactor_p, alignment_p, spacing);
+}
+
+bool HbXmlLoaderBinarySyntax::parseAddLinearLayoutStretch()
+{
+    int index, stretchfactor;
+    int *index_p = 0, *stretchfactor_p = 0;
+
+    // Optional parameters
+    bool temp;
+    qint16 tempInt;
+    mIn >> temp;
+    if ( temp ) {
+        mIn >> tempInt;
+        index = (int)tempInt;
+        index_p = &index;
+    }
+    mIn >> temp;
+    if ( temp ) {
+        mIn >> tempInt;
+        stretchfactor = (int)tempInt;
+        stretchfactor_p = &stretchfactor;
+    }
+
+    return mActions->addLinearLayoutStretch(index_p, stretchfactor_p);
+}
+
+bool HbXmlLoaderBinarySyntax::parseSetLayoutContentsMargins()
+{
+    HbXmlLengthValue left, top, right, bottom;
+    mIn >> left >> top >> right >> bottom;
+    return mActions->setLayoutContentsMargins(left, top, right, bottom);
+}
+
+bool HbXmlLoaderBinarySyntax::parseCreateStackedLayout()
+{
+    QString widget;
+    mIn >> widget;
+    return mActions->createStackedLayout(widget);
+}
+
+bool HbXmlLoaderBinarySyntax::parseAddStackedLayoutItem()
+{
+    QString itemname;
+    int index;
+    int *index_p = 0;
+
+    mIn >> itemname;
+
+    // Optional parameters
+    bool temp;
+    qint16 tempInt;
+    mIn >> temp;
+    if ( temp ) {
+        mIn >> tempInt;
+        index = (int)tempInt;
+        index_p = &index;
+    }
+    return mActions->addStackedLayoutItem(itemname, index_p);
+}
+
+bool HbXmlLoaderBinarySyntax::parseCreateNullLayout()
+{
+    QString widget;
+    mIn >> widget;
+    return mActions->createNullLayout(widget);
+}
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/utils/hbxmlloaderbinarysyntax_p.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/utils/hbxmlloaderbinarysyntax_p.h	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,90 @@
+/****************************************************************************
+**
+** 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 HBXMLLOADERBINARYSYNTAX_P_H
+#define HBXMLLOADERBINARYSYNTAX_P_H
+
+#include <hbxmlloaderabstractsyntax_p.h>
+#include <hbglobal.h>
+
+class HbXmlLoaderAbstractActions;
+
+class HB_CORE_PRIVATE_EXPORT HbXmlLoaderBinarySyntax : public HbXmlLoaderAbstractSyntax
+{
+public:
+
+    HbXmlLoaderBinarySyntax( HbXmlLoaderAbstractActions *actions );
+    virtual ~HbXmlLoaderBinarySyntax();
+
+    static const char* signature();
+    static QString version();
+
+    bool isBinary( QIODevice *device );
+    bool load( QIODevice *device, const QString &section );
+
+private:
+    bool validateDocument();
+    bool processDocument( const QString &section );
+
+    bool parseReset();
+    bool parseCleanUp();
+    bool parseDeleteAll();
+    bool parsePushDocument();
+    bool parsePushObject();
+    bool parsePushWidget();
+    bool parsePushSpacerItem();
+    bool parsePushConnect();
+    bool parsePushProperty();
+    bool parsePushRef();
+    bool parsePushContainer();
+    bool parsePop();
+    bool parseSetContentsMargins();
+    bool parseSetSizePolicy();
+    bool parseSetSizeHint();
+    bool parseSetToolTip();
+    bool parseCreateAnchorLayout();
+    bool parseAddAnchorLayoutEdge();
+    bool parseCreateMeshLayout();
+    bool parseAddMeshLayoutEdge();
+    bool parseCreateGridLayout();
+    bool parseAddGridLayoutCell();
+    bool parseSetGridLayoutRowProperties();
+    bool parseSetGridLayoutColumnProperties();
+    bool parseSetGridLayoutRowHeights();
+    bool parseSetGridLayoutColumnWidths();
+    bool parseCreateLinearLayout();
+    bool parseAddLinearLayoutItem();
+    bool parseAddLinearLayoutStretch();
+    bool parseSetLayoutContentsMargins();
+    bool parseCreateStackedLayout();
+    bool parseAddStackedLayoutItem();
+    bool parseCreateNullLayout();
+
+private:
+    Q_DISABLE_COPY(HbXmlLoaderBinarySyntax)
+    QDataStream mIn;
+};
+
+#endif // HBXMLLOADERBINARYSYNTAX_P_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/utils/utils.pri
--- a/src/hbcore/utils/utils.pri	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/utils/utils.pri	Mon May 03 12:48:33 2010 +0300
@@ -31,39 +31,46 @@
 PUBLIC_HEADERS += $$PWD/hbdeviceprofile.h
 PUBLIC_HEADERS += $$PWD/hbsmileytheme.h
 
-INTERNAL_HEADERS += $$PWD/hbdeviceprofile_p.h
-INTERNAL_HEADERS += $$PWD/hbtypefaceinfo_p.h
-INTERNAL_HEADERS += $$PWD/hbdeviceprofiledatabase_p.h
-INTERNAL_HEADERS += $$PWD/hbdeviceprofilemanager_p.h
-INTERNAL_HEADERS += $$PWD/hbdeviceprofilereader_p.h
-INTERNAL_HEADERS += $$PWD/hbextendeddeviceprofile_p.h
-INTERNAL_HEADERS += $$PWD/hbiniparser_p.h
-INTERNAL_HEADERS += $$PWD/hbtextmeasurementutility_p.h
-INTERNAL_HEADERS += $$PWD/hbthetestwidget_p.h
-INTERNAL_HEADERS += $$PWD/hbthetestutility_p.h
-INTERNAL_HEADERS += $$PWD/hbtextutils_p.h
-INTERNAL_HEADERS += $$PWD/hbtypefacexmlparser_p.h
-INTERNAL_HEADERS += $$PWD/hbscreenmode_p.h
-INTERNAL_HEADERS += $$PWD/hbdevicemodeinfo_p.h
-INTERNAL_HEADERS += $$PWD/hbwsiniparser_p.h
-INTERNAL_HEADERS += $$PWD/hbwidgetloader_p.h
-INTERNAL_HEADERS += $$PWD/hbforegroundwatcher_p.h
-INTERNAL_HEADERS += $$PWD/hboogmwatcher_p.h
-INTERNAL_HEADERS += $$PWD/hbfeaturemanager_p.h
+PRIVATE_HEADERS += $$PWD/hbdeviceprofile_p.h
+PRIVATE_HEADERS += $$PWD/hbtypefaceinfo_p.h
+PRIVATE_HEADERS += $$PWD/hbdeviceprofiledatabase_p.h
+PRIVATE_HEADERS += $$PWD/hbdeviceprofilemanager_p.h
+PRIVATE_HEADERS += $$PWD/hbdeviceprofilereader_p.h
+PRIVATE_HEADERS += $$PWD/hbextendeddeviceprofile_p.h
+PRIVATE_HEADERS += $$PWD/hbiniparser_p.h
+PRIVATE_HEADERS += $$PWD/hbtextmeasurementutility_p.h
+PRIVATE_HEADERS += $$PWD/hbthetestwidget_p.h
+PRIVATE_HEADERS += $$PWD/hbthetestutility_p.h
+PRIVATE_HEADERS += $$PWD/hbtextutils_p.h
+PRIVATE_HEADERS += $$PWD/hbtypefacexmlparser_p.h
+PRIVATE_HEADERS += $$PWD/hbscreenmode_p.h
+PRIVATE_HEADERS += $$PWD/hbdevicemodeinfo_p.h
+PRIVATE_HEADERS += $$PWD/hbwsiniparser_p.h
+PRIVATE_HEADERS += $$PWD/hbwidgetloader_p.h
+PRIVATE_HEADERS += $$PWD/hbforegroundwatcher_p.h
+PRIVATE_HEADERS += $$PWD/hboogmwatcher_p.h
+PRIVATE_HEADERS += $$PWD/hbfeaturemanager_p.h
+PRIVATE_HEADERS += $$PWD/hbsleepmodelistener_p.h
+PRIVATE_HEADERS += $$PWD/hbsleepmodelistener_p_p.h
+
 
 symbian {
-  INTERNAL_HEADERS += $$PWD/hboogmwatcher_sym_p.h
+  PRIVATE_HEADERS += $$PWD/hboogmwatcher_sym_p.h
 } else {
-  INTERNAL_HEADERS += $$PWD/hboogmwatcher_dummy_p.h
+  PRIVATE_HEADERS += $$PWD/hboogmwatcher_dummy_p.h
 }
 
-INTERNAL_HEADERS += $$PWD/hbxmlloaderabstractsyntax_p.h
-INTERNAL_HEADERS += $$PWD/hbxmlloaderabstractactions_p.h
-INTERNAL_HEADERS += $$PWD/hbwidgetloadersyntax_p.h
-INTERNAL_HEADERS += $$PWD/hbwidgetloaderactions_p.h
+PRIVATE_HEADERS += $$PWD/hbxmlloaderabstractsyntax_p.h
+PRIVATE_HEADERS += $$PWD/hbxmlloaderabstractactions_p.h
+PRIVATE_HEADERS += $$PWD/hbxmlloaderbasesyntax_p.h
+PRIVATE_HEADERS += $$PWD/hbxmlloaderbaseactions_p.h
+PRIVATE_HEADERS += $$PWD/hbxmlloaderbinarysyntax_p.h
+PRIVATE_HEADERS += $$PWD/hbxmlloaderbinaryactions_p.h
+PRIVATE_HEADERS += $$PWD/hbwidgetloadersyntax_p.h
+PRIVATE_HEADERS += $$PWD/hbwidgetloaderactions_p.h
 
-INTERNAL_HEADERS += $$PWD/hbtimer_p.h
-INTERNAL_HEADERS += $$PWD/hbsmileythemeparser_p.h
+PRIVATE_HEADERS += $$PWD/hbtimer_p.h
+PRIVATE_HEADERS += $$PWD/hbsmileythemeparser_p.h
 
 SOURCES += $$PWD/hbdeviceprofile.cpp
 SOURCES += $$PWD/hbdeviceprofiledatabase_p.cpp
@@ -89,6 +96,10 @@
 
 SOURCES += $$PWD/hbxmlloaderabstractsyntax_p.cpp
 SOURCES += $$PWD/hbxmlloaderabstractactions_p.cpp
+SOURCES += $$PWD/hbxmlloaderbasesyntax_p.cpp
+SOURCES += $$PWD/hbxmlloaderbaseactions_p.cpp
+SOURCES += $$PWD/hbxmlloaderbinarysyntax_p.cpp
+SOURCES += $$PWD/hbxmlloaderbinaryactions_p.cpp
 SOURCES += $$PWD/hbwidgetloadersyntax_p.cpp
 SOURCES += $$PWD/hbwidgetloaderactions_p.cpp
 
@@ -96,4 +107,5 @@
 SOURCES += $$PWD/hbsmileytheme.cpp
 SOURCES += $$PWD/hbsmileythemeparser_p.cpp
 SOURCES += $$PWD/hbfeaturemanager_p.cpp
+SOURCES += $$PWD/hbsleepmodelistener_p.cpp
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/vkbhosts/hbabstractvkbhost.cpp
--- a/src/hbcore/vkbhosts/hbabstractvkbhost.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/vkbhosts/hbabstractvkbhost.cpp	Mon May 03 12:48:33 2010 +0300
@@ -26,6 +26,7 @@
 #include "hbabstractvkbhost_p.h"
 #include "hbinputvirtualkeyboard.h"
 #include "hbinputsettingproxy.h"
+#include "hbinputvkbhostbridge.h"
 #include "hbinputmethod.h"
 #include "hbdeviceprofile.h"
 #include "hbmainwindow.h"
@@ -67,6 +68,7 @@
 mInputMethod(0),
 mKeypadStatusBeforeOrientationChange(HbVkbHost::HbVkbStatusClosed)
 {
+    mTimeLine.setUpdateInterval(16);
 }
 
 void HbAbstractVkbHostPrivate::prepareAnimationsCommon()
@@ -150,8 +152,17 @@
             // The cursor is outside the visible area. Figure out how much and
             // to which direction the container has to be moved.
             if (microFocus.bottom() <= visibleArea.top()) {
-                // It goes to the upper part of the visible area.
-                mContainerMovementVector = QPointF(0.0, HbCursorLineMargin - microFocus.top());
+                // First see what would happen if we returned the container to original position.
+                // Is the cursor visible then?
+                // This is always preferred, use it if possible.
+                QPointF toOriginalPos = mOriginalContainerPosition - mContainerWidget->pos();
+                QRectF translatedMicroFocus = microFocus.translated(toOriginalPos);
+                if (visibleArea.contains(translatedMicroFocus)) {
+                    mContainerMovementVector = toOriginalPos;
+                } else {
+                    // It goes to the upper part of the visible area.
+                    mContainerMovementVector = QPointF(0.0, HbCursorLineMargin - microFocus.top());
+                }
             } else {
                 mContainerMovementVector = QPointF(0.0, visibleArea.bottom() - HbCursorLineMargin - microFocus.bottom());
             }
@@ -198,8 +209,18 @@
 {
     prepareAnimationsCommon();
 
-    return (prepareContainerAnimation(status) |
-            prepareKeypadAnimation(status));
+    bool containerResult = prepareContainerAnimation(status);
+    if (containerResult) {
+        // A sanity check. Container should never be moved below it's original
+        // position. Limit the movement in case editor's micro focus returned faulty value
+        // or something else bad happened.
+        if ((mContainerMovementStartingPoint + mContainerMovementVector).y() > mOriginalContainerPosition.y()) {
+            mContainerMovementVector.setY(mOriginalContainerPosition.y() - mContainerMovementStartingPoint.y());
+            qWarning("Abstract VKB host: Invalid container position.");
+        }
+    }
+
+    return (containerResult | prepareKeypadAnimation(status));
 }
 
 void HbAbstractVkbHostPrivate::connectSignals()
@@ -245,7 +266,7 @@
 }
 
 void HbAbstractVkbHostPrivate::openKeypad()
-{
+{    
     if (mContainerWidget) {
         HbMainWindow* mainWin = mainWindow();
         if (mainWin && mKeypad) {
@@ -311,17 +332,17 @@
             mCallback->aboutToOpen(q_ptr);
             q_ptr->resizeKeyboard(); // Make sure that the keyboard doesn't exceed given boundaries.
         }
-
         if (prepareAnimations(HbVkbHost::HbVkbStatusOpened)) {
             if (!disableCursorShift()) {
                 // Move the container widget to keep the focused line visible.
                 mContainerWidget->setPos(mContainerWidget->pos() + mContainerMovementVector);
-
+                
                 // Move the keypad
                 mKeypad->setPos(mKeypadMovementStartingPoint + mKeypadMovementVector);
             }
 
             mKeypadStatus = HbVkbHost::HbVkbStatusOpened;
+            mCallback->keyboardOpened(q_ptr);
             q_ptr->openFinished();
         }
     }
@@ -339,7 +360,7 @@
         }
 
         if (mKeypadStatus != HbVkbHost::HbVkbStatusMinimized) {
-            mCallback->aboutToOpen(q_ptr);
+            mCallback->aboutToOpen(q_ptr);           
             q_ptr->resizeKeyboard(); // Make sure that the keyboard doesn't exceed given boundaries.
         }
 
@@ -367,6 +388,7 @@
 
         // Hide the keypad
         mKeypad->hide();
+        mCallback->keyboardClosed(q_ptr);
         mCallback = 0;
     }
 }
@@ -375,12 +397,13 @@
 {
     HbMainWindow *mainWin = mainWindow();
     if (mKeypadStatus != HbVkbHost::HbVkbStatusMinimized && mKeypad && mainWin) {
-        mCallback->aboutToClose(q_ptr);
+        mCallback->aboutToClose(q_ptr);                
         if (mKeypad->scene() != mainWin->scene()) {
             // Add item to scene if it is not already in there.
             mainWin->scene()->addItem(mKeypad);
         }
 
+        mKeypadStatus = HbVkbHost::HbVkbStatusMinimized;
         if (!disableCursorShift()) {
             // Return the container widget to original position.
             mContainerWidget->setPos(mOriginalContainerPosition);
@@ -388,8 +411,6 @@
             // Set the keypad to minimized position.
             mKeypad->setPos(QPointF(0.0, mScreenSize.height() - mCallback->minimizedKeyboardSize().height()));
         }
-
-        mKeypadStatus = HbVkbHost::HbVkbStatusMinimized;
     }
 }
 
@@ -409,6 +430,8 @@
         // Clear possible pending call.
         mPendingCall.vkb = 0;
 
+        emit q_ptr->keypadClosed();
+        HbVkbHostBridge::instance()->connectHost(0);
         mKeypadStatus = HbVkbHost::HbVkbStatusClosed;
     }
 }
@@ -514,6 +537,7 @@
 /*!
 \reimp
 */
+
 void HbAbstractVkbHost::openKeypad(HbVirtualKeyboard *vkb, HbInputMethod* owner, bool animationAllowed)
 {
     Q_D(HbAbstractVkbHost);
@@ -529,7 +553,8 @@
         return;
     }
 
-    if (d->mTimeLine.state() == QTimeLine::Running) {
+    if (!HbVkbHostBridge::instance()->connectHost(this)) {
+        connect(HbVkbHostBridge::instance(), SIGNAL(stateTransitionCompleted()), this, SLOT(stateTransitionCompleted()));
         // The previous keyboard is still closing. Set the call pending and return.
         d->mPendingCall.vkb = vkb;
         d->mPendingCall.animationAllowed = animationAllowed;
@@ -552,10 +577,13 @@
             return;
         }
 
+        emit aboutToOpen();
+
         if (animationAllowed) {
             d->openKeypad();
         } else {
             d->openKeypadWithoutAnimation();
+            emit keypadOpened();
         }
 
         d->connectSignals();
@@ -573,10 +601,14 @@
     if (d->mKeypadStatus != HbVkbStatusClosed && !d->mKeypadOperationOngoing) {
         d->mKeypadOperationOngoing = true;
 
+        emit aboutToClose();
+
         if (animationAllowed) {
             d->closeKeypad();
         } else {
             d->closeKeypadWithoutAnimation();
+            emit keypadClosed();
+            HbVkbHostBridge::instance()->connectHost(0);
         }
 
         d->disconnectSignals();
@@ -661,7 +693,6 @@
         if (!d->disableCursorShift()) {
             // Make sure the container reached target position.
             d->mContainerWidget->setPos(d->mContainerMovementStartingPoint + d->mContainerMovementVector);
-
             // Make sure the keypad reached target position.
             d->mKeypad->setPos(d->mKeypadMovementStartingPoint + d->mKeypadMovementVector);
         }
@@ -686,17 +717,13 @@
             d->mCallback->keyboardMinimized(this);
             emit keypadClosed();
         } else {
-            // It was closed.
+            // It was closed. Hide the keyboard.
             d->mKeypad->hide();
+            // Return the container where it was.
+            d->mContainerWidget->setPos(d->mOriginalContainerPosition);
             d->mCallback->keyboardClosed(this);
             emit keypadClosed();
-
-            if (d->mPendingCall.vkb) {
-                // There was an open call pending. Do it now.
-                HbVirtualKeyboard *vkb = d->mPendingCall.vkb;
-                d->mPendingCall.vkb = 0;
-                openKeypad(vkb, d->mInputMethod, d->mPendingCall.animationAllowed);
-            }
+            HbVkbHostBridge::instance()->connectHost(0);
         }
     }
 }
@@ -921,12 +948,11 @@
     Q_D(HbAbstractVkbHost);
 
     if (view != d->mContainerWidget) {
-        if (d->mTimeLine.state() == QTimeLine::Running) {
+        if (d->mTimeLine.state() == QTimeLine::Running) {               
             d->cancelAnimationAndHideVkbWidget();
             if (d->mCallback) {
                 d->mCallback->keyboardClosed(this);
-            }
-            emit keypadClosed();
+            }          
         } else if (d->mKeypadStatus != HbVkbStatusClosed) {
             d->closeKeypadWithoutAnimation();
         }
@@ -950,4 +976,31 @@
      }
 }
 
+/*!
+\reimp
+*/
+bool HbAbstractVkbHost::stateTransitionOngoing() const
+{
+     Q_D(const HbAbstractVkbHost);
+     return (d->mTimeLine.state() == QTimeLine::Running);
+}
+
+/*!
+Receives signal from HbVkbHostBridge when previous host completes its state
+transition and sens pending call if any.
+*/
+void HbAbstractVkbHost::stateTransitionCompleted()
+{
+    Q_D(HbAbstractVkbHost);
+
+    disconnect(HbVkbHostBridge::instance(), SIGNAL(stateTransitionCompleted()), this, SLOT(stateTransitionCompleted()));
+
+    if (d->mPendingCall.vkb) {
+        // There was an open call pending. Do it now.
+        HbVirtualKeyboard *vkb = d->mPendingCall.vkb;
+        d->mPendingCall.vkb = 0;
+        openKeypad(vkb, d->mInputMethod, d->mPendingCall.animationAllowed);
+    }
+}
+
 // End of file
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/vkbhosts/hbabstractvkbhost.h
--- a/src/hbcore/vkbhosts/hbabstractvkbhost.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/vkbhosts/hbabstractvkbhost.h	Mon May 03 12:48:33 2010 +0300
@@ -59,6 +59,7 @@
 
 protected: // From HbVkbHost
     void refresh();
+    bool stateTransitionOngoing() const;
 
 public:
     void resizeKeyboard();
@@ -76,6 +77,7 @@
     virtual void closeFinished();
     virtual void animationFinished(); 
     virtual void currentViewChanged(HbView*);
+    virtual void stateTransitionCompleted();
 
 protected:
     HbAbstractVkbHost() : d_ptr(0) {}
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/vkbhosts/hbstaticvkbhost.cpp
--- a/src/hbcore/vkbhosts/hbstaticvkbhost.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/vkbhosts/hbstaticvkbhost.cpp	Mon May 03 12:48:33 2010 +0300
@@ -78,7 +78,7 @@
 */
 HbStaticVkbHost::HbStaticVkbHost(HbWidget *widget) : HbAbstractVkbHost(new HbStaticVkbHostPrivate(this, widget))
 {  
-    setParent(widget);
+    setParent(widget);  
 }
 
 /*!
diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/vkbhosts/vkbhosts.pri
--- a/src/hbcore/vkbhosts/vkbhosts.pri	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/vkbhosts/vkbhosts.pri	Mon May 03 12:48:33 2010 +0300
@@ -28,7 +28,7 @@
 INCLUDEPATH += $$PWD
 DEPENDPATH += $$PWD
 
-INTERNAL_HEADERS += $$PWD/hbabstractvkbhost_p.h
+PRIVATE_HEADERS += $$PWD/hbabstractvkbhost_p.h
 
 PUBLIC_HEADERS += $$PWD/hbstaticvkbhost.h
 PUBLIC_HEADERS += $$PWD/hbabstractvkbhost.h
diff -r 16d8024aca5e -r f7ac710697a9 src/hbfeedback/hbfeedback.pro
--- a/src/hbfeedback/hbfeedback.pro	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbfeedback/hbfeedback.pro	Mon May 03 12:48:33 2010 +0300
@@ -28,7 +28,6 @@
 TARGET = $$hbLibraryTarget(HbFeedback)
 DEFINES += BUILD_HB_FEEDBACK
 DEFINES += HB_INSTALL_DIR=\"\\\"$${HB_INSTALL_DIR}\\\"\"
-developer:DEFINES += BUILD_HB_INTERNAL
 
 INCLUDEPATH += .
 DEPENDPATH += .
@@ -42,7 +41,7 @@
 
 CONVENIENCE_HEADERS += $${HB_BUILD_DIR}/include/hbfeedback/hbfeedback.h
 CONVENIENCE_HEADERS += $$files($${HB_BUILD_DIR}/include/hbfeedback/Hb*)
-HEADERS += $$PUBLIC_HEADERS $$INTERNAL_HEADERS $$CONVENIENCE_HEADERS
+HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS $$CONVENIENCE_HEADERS
 
 # dependencies
 hbAddLibrary(hbcore/HbCore)
@@ -68,14 +67,13 @@
 symbian {
     LIBS += -ltouchfeedback -lcone -lws32
     LIBS        += -ltacticon
-    INCLUDEPATH += /epoc32/include/platform/mw
+    INCLUDEPATH += $${EPOCROOT}epoc32/include/platform/mw
 
-    defFilePath = ..
     TARGET.EPOCALLOWDLLDATA = 1
     TARGET.CAPABILITY = CAP_GENERAL_DLL
     TARGET.UID3=0x20022E9D
     # for touchfeedback headers
-    INCLUDEPATH += /epoc32/include/mw
+    INCLUDEPATH += $${EPOCROOT}epoc32/include/mw
 
     hbExportHeaders(hbfeedback)
 }
diff -r 16d8024aca5e -r f7ac710697a9 src/hbfeedback/player/hbabstractfeedback.cpp
--- a/src/hbfeedback/player/hbabstractfeedback.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbfeedback/player/hbabstractfeedback.cpp	Mon May 03 12:48:33 2010 +0300
@@ -31,7 +31,7 @@
 class HbAbstractFeedbackPrivate
 {
 public:
-    HbAbstractFeedbackPrivate() : cWindow(0) {};
+    HbAbstractFeedbackPrivate() : cWindow(0),cModalities(HbFeedback::All) {};
     ~HbAbstractFeedbackPrivate() {};
     QRect mapWidgetToWindow(const QGraphicsItem* graphicsItem, const QGraphicsView* graphicsView);
     QRect mapWidgetToWindow(const QWidget* widget);
@@ -39,6 +39,7 @@
 public:
     QPointer<QWidget> cWindow;
     QRect cRect;
+    HbFeedback::Modalities cModalities;
 };
 
 /*!
@@ -135,6 +136,17 @@
 }
 
 /*!
+    \fn HbFeedback::Modalities HbAbstractFeedback::modalities() const
+
+    Returns the modalities (eg. tactile, audio) used to produce the feedback.
+*/
+
+HbFeedback::Modalities HbAbstractFeedback::modalities() const
+{
+    return d->cModalities;
+}
+
+/*!
     \fn bool HbAbstractFeedback::isLocated() const
 
     Returns true if both the parent window and the feedback area rectange (in relation to the parent window) has been defined. Not all feedback objects have to be located.
@@ -223,6 +235,14 @@
 }
 
 /*!
+    Sets the modalities (eg. tactile, audio) used to produce the feedback.
+*/
+void HbAbstractFeedback::setModalities(HbFeedback::Modalities modalities)
+{
+    d->cModalities = modalities;
+}
+
+/*!
     Assigns a copy of the feedback \a feedback to this feedback, and returns a
     reference to it.
 */
diff -r 16d8024aca5e -r f7ac710697a9 src/hbfeedback/player/hbabstractfeedback.h
--- a/src/hbfeedback/player/hbabstractfeedback.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbfeedback/player/hbabstractfeedback.h	Mon May 03 12:48:33 2010 +0300
@@ -52,11 +52,13 @@
 
     QRect rect() const;
     QWidget* window() const;
+    HbFeedback::Modalities modalities() const;
 
     void setRect(QRect rect);
     void setRect(const QWidget* widget);
     void setRect(const QGraphicsItem* graphicsItem, const QGraphicsView* graphicsView);
     void setOwningWindow(const QWidget* widget);
+    void setModalities(HbFeedback::Modalities modalities = HbFeedback::All);
 
     virtual HbAbstractFeedback &operator=(const HbAbstractFeedback &feedback);
     virtual bool operator==(const HbAbstractFeedback &feedback) const;
diff -r 16d8024aca5e -r f7ac710697a9 src/hbfeedback/player/hbcontinuousfeedback.cpp
--- a/src/hbfeedback/player/hbcontinuousfeedback.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbfeedback/player/hbcontinuousfeedback.cpp	Mon May 03 12:48:33 2010 +0300
@@ -24,6 +24,7 @@
 ****************************************************************************/
 
 #include "hbcontinuousfeedback.h"
+#include "hbfeedbackplayer.h"
 
 #include <QGraphicsItem>
 #include <QGraphicsView>
@@ -33,6 +34,7 @@
 {
 public:
     HbContinuousFeedbackPrivate() : cEffect(HbFeedback::ContinuousSmooth),
+        cFeedbackId(-1),
         cTimeout(HbFeedback::StandardFeedbackTimeout),
         cIntensity(HbFeedback::IntensityFull)
     {
@@ -42,6 +44,7 @@
 
 public:
     HbFeedback::ContinuousEffect cEffect;
+    int cFeedbackId;
     int cTimeout;
     int cIntensity;
 };
@@ -158,7 +161,7 @@
 
 /*!
     Sets the intensity of the continuous feedback effect. The intensity
-    has to always be between zero and HbFeedback::IntensityFull = 100.
+    has to always be between HbFeedback::IntensityZero and HbFeedback::IntensityFull.
 */
 void HbContinuousFeedback::setIntensity(int intensity)
 {
@@ -166,8 +169,49 @@
         d->cIntensity = intensity;
     }
 }
+/*!
+    Plays the continuous feedback.
+*/
+void HbContinuousFeedback::play()
+{
+    HbFeedbackPlayer* feedbackPlayer = HbFeedbackPlayer::instance();
+
+    if (feedbackPlayer) {
+        d->cFeedbackId = feedbackPlayer->startContinuousFeedback(*this);
+    }
+}
+/*!
+    Stops the continous feedback.
+  */
+void HbContinuousFeedback::stop()
+{
+    HbFeedbackPlayer* feedbackPlayer = HbFeedbackPlayer::instance();
+
+    if (feedbackPlayer) {
+        feedbackPlayer->cancelContinuousFeedback(d->cFeedbackId);
+    }
+}
+
 
 /*!
+    Returns true if the continuous feedback is being played.
+*/
+bool HbContinuousFeedback::isPlaying()
+{
+    bool feedbackOngoing = false;
+    HbFeedbackPlayer* feedbackPlayer = HbFeedbackPlayer::instance();
+
+    if (feedbackPlayer) {
+        feedbackOngoing = feedbackPlayer->continuousFeedbackOngoing(d->cFeedbackId);
+    }
+
+    return feedbackOngoing;
+}
+
+/*!
+  \deprecated HbContinuousFeedback::isValid() const
+        is deprecated.
+
     Continuous feedback is valid if the feedback effect is not set to HbFeedback::ContinuousNone
     and if the owning window has been defined. There can only be one ongoing continuous feedback effect
     per one application window.
diff -r 16d8024aca5e -r f7ac710697a9 src/hbfeedback/player/hbcontinuousfeedback.h
--- a/src/hbfeedback/player/hbcontinuousfeedback.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbfeedback/player/hbcontinuousfeedback.h	Mon May 03 12:48:33 2010 +0300
@@ -42,7 +42,7 @@
         return HbFeedback::TypeContinuous;
     }
 
-    bool isValid() const;
+    bool isValid() const; // deprecated
 
     HbFeedback::ContinuousEffect continuousEffect() const;
     int intensity() const;
@@ -52,6 +52,10 @@
     void setIntensity(int intensity);
     void setTimeout(int msecTimeout);
 
+    void play();
+    void stop();
+    bool isPlaying();
+
     HbContinuousFeedback &operator=(const HbContinuousFeedback &feedback);
     bool operator==(const HbContinuousFeedback &feedback) const;
     bool operator!=(const HbContinuousFeedback &feedback) const;
diff -r 16d8024aca5e -r f7ac710697a9 src/hbfeedback/player/hbfeedbackplayer.cpp
--- a/src/hbfeedback/player/hbfeedbackplayer.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbfeedback/player/hbfeedbackplayer.cpp	Mon May 03 12:48:33 2010 +0300
@@ -109,6 +109,11 @@
     more information on the design of the player.
 
     \sa HbInstantFeedback, HbContinuousFeedback, HbTacticonFeedback, HbHitAreaFeedback, HbFeedbackSettings.
+    
+    \deprecated HbFeedbackPlayer
+        is deprecated. Use HbInstantFeedback and HbContinuousFeedback classes instead.
+        
+    \sa HbInstantFeedback, HbContinuousFeedback
 */
 
 
@@ -116,6 +121,12 @@
 
 /*!
     Constructor.
+    
+    \deprecated HbFeedbackPlayer::HbFeedbackPlayer()
+        is deprecated. Use HbInstantFeedback and HbContinuousFeedback classes instead.
+        
+    \sa HbInstantFeedback, HbContinuousFeedback
+    
 */
 HbFeedbackPlayer::HbFeedbackPlayer() : d(new HbFeedbackPlayerPrivate(this))
 {
@@ -124,6 +135,11 @@
 
 /*!
     Destructor.
+    
+    \deprecated HbFeedbackPlayer::~HbFeedbackPlayer()
+        is deprecated. Use HbInstantFeedback and HbContinuousFeedback classes instead.
+        
+    \sa HbInstantFeedback, HbContinuousFeedback
 */
 HbFeedbackPlayer::~HbFeedbackPlayer()
 {
@@ -132,6 +148,11 @@
 
 /*!
     Returns the handle to the global instance.
+    
+    \deprecated HbFeedbackPlayer::instance()
+        is deprecated. Use HbInstantFeedback and HbContinuousFeedback classes instead.
+        
+    \sa HbInstantFeedback, HbContinuousFeedback
 */
 HbFeedbackPlayer* HbFeedbackPlayer::instance()
 {
@@ -140,6 +161,12 @@
 
 /*!
     Returns a reference to the feedback settings interface.
+    
+    \deprecated HbFeedbackPlayer::settings()
+        is deprecated. Use HbFeedbackSettings::instance() to access feedback settings.
+        
+    \sa HbFeedbackSettings
+
 */
 HbFeedbackSettings& HbFeedbackPlayer::settings()
 {
@@ -151,13 +178,18 @@
 
     \param feedback instant feedback object
     \sa HbInstantFeedback
+    
+    \deprecated HbFeedbackPlayer::playInstantFeedback(const HbInstantFeedback&)
+        is deprecated. Use HbInstantFeedback::play() instead.
+        
+    \sa HbInstantFeedback
 */
 void HbFeedbackPlayer::playInstantFeedback(const HbInstantFeedback& feedback)
 {
     if (feedback.isValid() && d->feedbackSettings->isFeedbackAllowed(HbFeedback::TypeInstant)) {
         if (d->basePlayer)  {
-            d->basePlayer->playInstantFeedback(feedback);
-        }
+                d->basePlayer->playInstantFeedback(feedback);
+            }
 #ifdef FEEDBACK_TEST_EVENT
         HbFeedbackTestEvent te(feedback);
         qApp->sendEvent(this, &te);
@@ -196,6 +228,11 @@
     \return identifier The identifier for the started effect.
 
     \sa HbContinuousFeedback
+    
+    \deprecated HbFeedbackPlayer::startContinuousFeedback(const HbContinuousFeedback&)
+        is deprecated. Use HbContinuousFeedback::play instead.
+        
+    \sa HbContinuousFeedback
 */
 int HbFeedbackPlayer::startContinuousFeedback(const HbContinuousFeedback& feedback)
 {
@@ -223,6 +260,11 @@
     \param feedback continuous feedback object
 
     \sa HbContinuousFeedback
+    
+    \deprecated HbFeedbackPlayer::updateContinuousFeedback(int, const HbContinuousFeedback&)
+        is deprecated.
+        
+    \sa HbContinuousFeedback
 */
 void HbFeedbackPlayer::updateContinuousFeedback(int identifier, const HbContinuousFeedback& feedback)
 {
@@ -244,6 +286,11 @@
     Cancels an ongoing continuous feedback effect.
 
     \param identifier The identifier for the ongoing effect.
+    
+    \deprecated HbFeedbackPlayer::cancelContinuousFeedback(int)
+        is deprecated. Use HbContinuousFeedback::stop() instead.
+        
+    \sa HbContinuousFeedback
 */
 void HbFeedbackPlayer::cancelContinuousFeedback(int identifier)
 {
@@ -261,6 +308,11 @@
 
 /*!
     Cancels all ongoing continuous feedback effects.
+    
+    \deprecated HbFeedbackPlayer::cancelContinuousFeedbacks()
+        is deprecated.
+        
+    \sa HbContinuousFeedback
 */
 void HbFeedbackPlayer::cancelContinuousFeedbacks()
 {
@@ -275,6 +327,11 @@
     \param identifier The identifier for the ongoing effect.
 
     \return true, if the effect is ongoing.
+    
+    \deprecated HbFeedbackPlayer::continuousFeedbackOngoing(int)
+        is deprecated. Use HbContinuousFeedback::isPlaying() instead.
+        
+    \sa HbContinuousFeedback
 */
 bool HbFeedbackPlayer::continuousFeedbackOngoing(int identifier)
 {
diff -r 16d8024aca5e -r f7ac710697a9 src/hbfeedback/player/hbfeedbackplayer_symbian.cpp
--- a/src/hbfeedback/player/hbfeedbackplayer_symbian.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbfeedback/player/hbfeedbackplayer_symbian.cpp	Mon May 03 12:48:33 2010 +0300
@@ -61,6 +61,7 @@
     inline TTacticonType convertTacticonToSymbian(HbFeedback::TacticonEffect effect);
     inline TTouchContinuousFeedback convertToSymbian(HbFeedback::ContinuousEffect effect);
     inline TTouchEventType convertToSymbian(HbFeedback::HitAreaType hitAreaType);
+    inline TTouchFeedbackType convertToSymbian(HbFeedback::Modalities modalities);
 			
 public:
     MTouchFeedback *iFeedback;
@@ -209,6 +210,9 @@
     case HbFeedback::PopUp:
         instantFeedbackSymbian = ETouchFeedbackPopUp;
         break;
+    case HbFeedback::LongPress:
+        instantFeedbackSymbian = ETouchFeedbackBasic; // Effects changing in 10.1 are mapped to basic.
+        break;
     default:
         break;
     }
@@ -298,9 +302,24 @@
     return touchEventType;
 }
 
+TTouchFeedbackType HbFeedbackBasePlayerPrivate::convertToSymbian(HbFeedback::Modalities modalities)
+{
+    int symbianFeedbackType = 0;
 
-CCoeControl* HbFeedbackBasePlayerPrivate::convertToSymbian(QWidget* window) {
+    if(modalities == HbFeedback::All) {
+        // enable all modalities
+        symbianFeedbackType |= ETouchFeedbackAudio;
+        symbianFeedbackType |= ETouchFeedbackVibra;
+    } else {
+        // enable individual modalities
+        if(modalities & HbFeedback::Audio)   symbianFeedbackType |= ETouchFeedbackAudio;
+        if(modalities & HbFeedback::Tactile) symbianFeedbackType |= ETouchFeedbackVibra;
+    }
+    return TTouchFeedbackType(symbianFeedbackType);
+}
 
+CCoeControl* HbFeedbackBasePlayerPrivate::convertToSymbian(QWidget* window)
+{
     CCoeControl* control = 0;
     
     if ( window && window->winId()) {
@@ -348,6 +367,7 @@
 }
 
 void HbFeedbackBasePlayer::playInstantFeedback(const HbInstantFeedback& feedback) {
+    TPointerEvent pointerEvent;
 
     if (d->iFeedback) {
         // If the effect is a tacticon, use the tacticon playing mechanism of the feedback player
@@ -360,9 +380,9 @@
         } else {
             CCoeControl* control = d->convertToSymbian(feedback.window());
             if (control) {
-                d->iFeedback->InstantFeedback(control, d->convertToSymbian(feedback.instantEffect()));
-            }
-            else {
+                d->iFeedback->InstantFeedback(control, d->convertToSymbian(feedback.instantEffect()),
+                                              d->convertToSymbian(feedback.modalities()),pointerEvent);
+            } else {
                 d->iFeedback->InstantFeedback(d->convertToSymbian(feedback.instantEffect()));
             }
         }
diff -r 16d8024aca5e -r f7ac710697a9 src/hbfeedback/player/hbfeedbacksettings.cpp
--- a/src/hbfeedback/player/hbfeedbacksettings.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbfeedback/player/hbfeedbacksettings.cpp	Mon May 03 12:48:33 2010 +0300
@@ -187,6 +187,9 @@
 }
 
 /*!
+  \deprecated HbFeedbackSettings::enableType(HbFeedback::Type)
+        is deprecated.
+
     Enables given type of feedback effects in the application.
     All feedback types are enabled by default.
     Emits signal typeEnabled(HbFeedback::Type type) if
@@ -201,6 +204,9 @@
 }
 
 /*!
+  \deprecated HbFeedbackSettings::disableType(HbFeedback::Type)
+        is deprecated.
+
     Disables given type of feedback effect mechanism in the application.
 
     Emits signal typeDisabled(HbFeedback::Type type) if
@@ -217,6 +223,9 @@
 }
 
 /*!
+  \deprecated HbFeedbackSettings::isTypeEnabled(HbFeedback::Type)
+        is deprecated.
+
     Returns true if a particular type of feedback effect mechanism has been 
     enabled for the application.
 */
@@ -226,6 +235,9 @@
 }
 
 /*!
+  \deprecated HbFeedbackSettings::isFeedbackAllowed(HbFeedback::Type)
+        is deprecated.
+
     True if feedback effects and the particular feedback type of feedback 
     effect mechanism is enabled, false if not.
 */
@@ -233,3 +245,13 @@
 {
     return d->feedbackEnabled && isTypeEnabled(type);
 }
+
+/*!
+  \deprecated HbFeedbackSettings::feedbackTypeEnabled(HbFeedback::Type)
+        is deprecated.
+
+  \deprecated HbFeedbackSettings::feedbackTypeDisabled(HbFeedback::Type)
+        is deprecated.
+*/
+
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbfeedback/player/hbfeedbacksettings.h
--- a/src/hbfeedback/player/hbfeedbacksettings.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbfeedback/player/hbfeedbacksettings.h	Mon May 03 12:48:33 2010 +0300
@@ -47,17 +47,17 @@
     void disableFeedback();
     bool isFeedbackEnabled();
 
-    void enableType(HbFeedback::Type type);
-    void disableType(HbFeedback::Type type);
-    bool isTypeEnabled(HbFeedback::Type type);
+    void enableType(HbFeedback::Type type); // deprecated
+    void disableType(HbFeedback::Type type); // deprecated
+    bool isTypeEnabled(HbFeedback::Type type); // deprecated
 
-    bool isFeedbackAllowed(HbFeedback::Type type);
+    bool isFeedbackAllowed(HbFeedback::Type type); // deprecated
 
 signals:
     void feedbackEnabled();
     void feedbackDisabled();
-    void feedbackTypeEnabled(HbFeedback::Type type);
-    void feedbackTypeDisabled(HbFeedback::Type type);
+    void feedbackTypeEnabled(HbFeedback::Type type); // deprecated
+    void feedbackTypeDisabled(HbFeedback::Type type); // deprecated
 
 private:
     HbFeedbackSettingsPrivate* const d;
diff -r 16d8024aca5e -r f7ac710697a9 src/hbfeedback/player/player.pri
--- a/src/hbfeedback/player/player.pri	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbfeedback/player/player.pri	Mon May 03 12:48:33 2010 +0300
@@ -42,19 +42,19 @@
                     $$PWD/hbhitareafeedback.h \
                     $$PWD/hbtacticonfeedback.h 
 
-INTERNAL_HEADERS += $$PWD/hbfeedbackplayer_p.h
+PRIVATE_HEADERS += $$PWD/hbfeedbackplayer_p.h
 
 symbian {
     SOURCES  += $$PWD/hbfeedbackplayer_symbian.cpp
-    INTERNAL_HEADERS  += $$PWD/hbfeedbackplayer_symbian_p.h
+    PRIVATE_HEADERS  += $$PWD/hbfeedbackplayer_symbian_p.h
 } 
 else {
     SOURCES += hbfeedbackplayer_stub.cpp
-    INTERNAL_HEADERS += hbfeedbackplayer_stub_p.h
+    PRIVATE_HEADERS += hbfeedbackplayer_stub_p.h
 }
 
 developer|feedback_traces {
     DEFINES += FEEDBACK_TEST_EVENT
     SOURCES +=          $$PWD/hbfeedbacktestevent.cpp
-    INTERNAL_HEADERS += $$PWD/hbfeedbacktestevent_p.h
+    PRIVATE_HEADERS += $$PWD/hbfeedbacktestevent_p.h
 }
diff -r 16d8024aca5e -r f7ac710697a9 src/hbfunctions.prf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbfunctions.prf	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,107 @@
+#
+#############################################################################
+##
+## 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.
+##
+#############################################################################
+#
+
+defineReplace(hbLibraryTarget) {
+    unset(LIBRARY_NAME)
+    LIBRARY_NAME = $$1
+    # the following leads to ugly vcproj names but had to be commented
+    # out, because it broke vcproj generator dependency checks
+    #!debug_and_release|build_pass { <-- 
+        CONFIG(debug, debug|release) {
+            mac:RET = $$member(LIBRARY_NAME, 0)_debug
+   	        else:win32:RET = $$member(LIBRARY_NAME, 0)d
+        }
+    #}
+    isEmpty(RET):RET = $$LIBRARY_NAME
+    return($$RET)
+}
+
+# params: <collection/library>
+# eg. hbAddLibrary(hbcore/HbCore)
+defineTest(hbAddLibrary) {
+    PARTS = $$split(1, "/")
+    COLLECTION = $$lower($$first(PARTS))
+    LIBRARY = $$last(PARTS)
+
+    INCLUDEPATH *= $${HB_BUILD_DIR}/include/$${COLLECTION}
+    INCLUDEPATH *= $${HB_BUILD_DIR}/include/$${COLLECTION}/private
+    DEPENDPATH *= $${HB_BUILD_DIR}/include/$${COLLECTION}
+    DEPENDPATH *= $${HB_BUILD_DIR}/include/$${COLLECTION}/private
+
+    LIBS *= -L$${HB_BUILD_DIR}/lib
+    LIBS *= -l$$hbLibraryTarget($$LIBRARY)
+    QMAKE_RPATHDIR *= $${HB_BUILD_DIR}/lib
+    unix:HB_COVERAGE_EXCLUDE += \"*/$$COLLECTION/*\"
+
+    export(LIBS)
+    export(INCLUDEPATH)
+    export(DEPENDPATH)
+    export(QMAKE_RPATHDIR)
+    export(HB_COVERAGE_EXCLUDE)
+    return(true)
+}
+
+# params: <collection>
+# NOTE: PUBLIC_HEADERS, INTERNAL_HEADERS, CONVENIENCE_HEADERS
+# eg. hbExportHeaders(hbcore)
+defineTest(hbExportHeaders) {
+    for(PUBLIC_HEADER, PUBLIC_HEADERS) {
+        PUBLIC_HEADER = $$section(PUBLIC_HEADER, ":", 1)
+        EXPORT_PATH = $$sprintf($$HB_EXPORT_DIR, $$1, $$basename(PUBLIC_HEADER))
+        BLD_INF_RULES.prj_exports *= "$$PUBLIC_HEADER $$EXPORT_PATH"
+    }
+    # DO NOT EXPORT PRIVATE HEADERS!
+    #for(INTERNAL_HEADER, INTERNAL_HEADERS) {
+    #    INTERNAL_HEADER = $$section(INTERNAL_HEADER, ":", 1)
+    #    EXPORT_PATH = $$sprintf($$HB_PRIVATE_EXPORT_DIR, $$1, $$basename(INTERNAL_HEADER))
+    #    BLD_INF_RULES.prj_exports *= "$$INTERNAL_HEADER $$EXPORT_PATH"
+    #}
+    for(CONVENIENCE_HEADER, CONVENIENCE_HEADERS) {
+        CONVENIENCE_HEADER = $$section(CONVENIENCE_HEADER, ":", 1)
+        EXPORT_PATH = $$sprintf($$HB_EXPORT_DIR, $$1, $$basename(CONVENIENCE_HEADER))
+        BLD_INF_RULES.prj_exports *= "$$CONVENIENCE_HEADER $$EXPORT_PATH"
+    }
+    export(BLD_INF_RULES.prj_exports)
+    return(true)
+}
+
+# params: <path>
+# eg. features.path = $$hbNativePath($$[QMAKE_MKSPECS]/features)
+defineReplace(hbNativePath) {
+    symbian|win32:!win32-g++ {
+        unixstyle = false
+    } else:win32-g++:isEmpty(QMAKE_SH) {
+        unixstyle = false
+    } else {
+        unixstyle = true
+    }
+    $$unixstyle {
+        return($$quote(\"$$replace(1, "\\", "/")\"))
+    } else {
+        return($$quote(\"$$replace(1, "/", "\\")\"))
+    }
+}
diff -r 16d8024aca5e -r f7ac710697a9 src/hbinput/hbinput.pro
--- a/src/hbinput/hbinput.pro	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbinput/hbinput.pro	Mon May 03 12:48:33 2010 +0300
@@ -27,7 +27,6 @@
 TEMPLATE = lib
 TARGET = $$hbLibraryTarget(HbInput)
 DEFINES += BUILD_HB_INPUT
-developer:DEFINES += BUILD_HB_INTERNAL
 
 # directories
 DESTDIR = $${HB_BUILD_DIR}/lib
@@ -38,7 +37,7 @@
 
 CONVENIENCE_HEADERS += $${HB_BUILD_DIR}/include/hbinput/hbinput.h
 CONVENIENCE_HEADERS += $$files($${HB_BUILD_DIR}/include/hbinput/Hb*)
-HEADERS += $$PUBLIC_HEADERS $$INTERNAL_HEADERS $$CONVENIENCE_HEADERS
+HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS $$CONVENIENCE_HEADERS
 
 # dependencies
 hbAddLibrary(hbcore/HbCore)
@@ -52,7 +51,7 @@
     pubheaders.files = $$PUBLIC_HEADERS
     pubheaders.path = $${HB_INCLUDE_DIR}/hbinput
 
-    privheaders.files = $$INTERNAL_HEADERS
+    privheaders.files = $$PRIVATE_HEADERS
     privheaders.path = $${HB_INCLUDE_DIR}/hbinput/private
 
     convheaders.files = $$CONVENIENCE_HEADERS
@@ -66,7 +65,6 @@
 #QMAKE_DISTCLEAN += $$hbNativePath($${HB_BUILD_DIR}/include/hbinput/private/*)
 
 symbian {
-    defFilePath = ..
     TARGET.EPOCALLOWDLLDATA = 1
     TARGET.CAPABILITY = CAP_GENERAL_DLL
     TARGET.UID3 = 0x20022EA7
diff -r 16d8024aca5e -r f7ac710697a9 src/hbinput/inputwidgets/hbinput12keytouchkeypad.cpp
--- a/src/hbinput/inputwidgets/hbinput12keytouchkeypad.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinput12keytouchkeypad.cpp	Mon May 03 12:48:33 2010 +0300
@@ -23,7 +23,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QGraphicsGridLayout>
 #include <hbinputmethod.h>
 #include <hbinputkeymap.h>
 #include <hbinpututils.h>
@@ -70,6 +70,7 @@
 @proto
 @hbinput
 \class Hb12KeyTouchKeypad
+\deprecated class Hb12KeyTouchKeypad
 \brief Touch keypad for 12 key ITU-T layout
 
 Implements touch key pad for 12 key ITU-T keypad. The key pad know how to operate
@@ -106,7 +107,7 @@
 
     QString keydata = mKeymap->keyboard(HbKeyboardVirtual12Key)->keys.at(key)->characters(modifiers);
 
-    QChar numChr = HbInputUtils::findFirstNumberCharacterBoundToKey(mKeymap->keyboard(HbKeyboardVirtual12Key)->keys.at(key), mKeymap->language());
+    QChar numChr = findFirstNumberCharacterBoundToKey(key);
 
     if(mOwner && mOwner->focusObject()) {
         // First we filter all the data that is mapped to the button, then get the firt 3/4 allowed characters and set that string
@@ -127,7 +128,7 @@
 void Hb12KeyTouchKeypadPrivate::setKeyMappingTitleNumeric(int key, HbTouchKeypadButton* button, HbModifiers modifiers)
 {
     Q_UNUSED(modifiers);
-    QChar numChr = HbInputUtils::findFirstNumberCharacterBoundToKey(mKeymap->keyboard(HbKeyboardVirtual12Key)->keys.at(key), mKeymap->language());
+    QChar numChr = findFirstNumberCharacterBoundToKey(key);
 
     if (numChr > 0) {
         button->setText(numChr);
@@ -186,7 +187,7 @@
     if (key >= mKeymap->keyboard(HbKeyboardVirtual12Key)->keys.count()) {
         return QString();
     }
-    QChar numChr = HbInputUtils::findFirstNumberCharacterBoundToKey(mKeymap->keyboard(HbKeyboardVirtual12Key)->keys.at(key), mKeymap->language());
+    QChar numChr = findFirstNumberCharacterBoundToKey(key);
     if (!numChr.isNull()) {
         return QString(numChr);
     } else {
@@ -335,9 +336,96 @@
             mButtons[i]->setFade(disableButton);
         }
     }
+
+	QString allowedSctCharacters;
+	getAllowedSctCharcters(allowedSctCharacters);
+	if (allowedSctCharacters.isNull() && (Qt::ImhDigitsOnly & focusedObject->inputMethodHints())) {
+		mButtons[9]->setFade(true);
+		mButtons[11]->setFade(true);
+		mButtons[13]->setFade(true);
+	}
+	else if (Qt::ImhDialableCharactersOnly & focusedObject->inputMethodHints()) {
+		mButtons[9]->setFade(false);
+		mButtons[11]->setFade(false);
+		mButtons[13]->setFade(true);
+	}
+	else {
+		mButtons[9]->setFade(false);
+		mButtons[11]->setFade(false);
+		mButtons[13]->setFade(false);
+	}
+}
+/*! returns first number character mapped bound to the key
+*/
+
+QChar Hb12KeyTouchKeypadPrivate::findFirstNumberCharacterBoundToKey(int key)
+{
+    QChar numChr = 0;
+    if (!mKeymap) {
+        return numChr;
+    }
+	
+    HbInputLanguage language = mKeymap->language();
+	HbInputFocusObject *focusObject = 0;
+
+	if (mOwner) {
+        focusObject = mOwner->focusObject();
+	}
+	bool isNumericEditor = false;
+
+	if (focusObject) {
+        isNumericEditor = focusObject->editorInterface().isNumericEditor();
+	}
+	
+    HbInputDigitType digitType = HbInputUtils::inputDigitType(language);
+
+    if (language.language()  != (QLocale::Language)0) {
+        if (isNumericEditor) {
+            QLocale::Language systemLanguage = QLocale::system().language();
+            // show native digits only when the device language and writing language are same, 
+            // else show latin digits
+            if (language.language() != systemLanguage) {
+                digitType = HbDigitTypeLatin;
+            }	
+        }	
+        numChr = HbInputUtils::findFirstNumberCharacterBoundToKey(mKeymap->keyboard(HbKeyboardVirtual12Key)->keys.at(key),
+            language, digitType);
+    }
+    return numChr;
 }
 
 /*!
+Get the allowed sct Characters
+*/
+void Hb12KeyTouchKeypadPrivate::getAllowedSctCharcters(QString& allowedSctCharacters)
+{
+	QString sctCharacters;
+	if (mKeymap) {
+		const HbKeyboardMap* keymap = mKeymap->keyboard(HbKeyboardSctPortrait);
+		if (keymap == 0) {
+			return;
+		}
+		foreach (const HbMappedKey* mappedKey, keymap->keys) {
+			sctCharacters.append(mappedKey->characters(HbModifierNone));
+		}
+	}
+	HbInputFocusObject* focusObject = mOwner->focusObject();
+	QString tempAllowedSctCharacters;
+	if (focusObject) {
+		focusObject->filterStringWithEditorFilter(sctCharacters,tempAllowedSctCharacters);
+	}
+	allowedSctCharacters.clear();
+	for(int i=0; i<tempAllowedSctCharacters.length() ;i++) {
+		// dont add duplicates to the list
+		if(!allowedSctCharacters.contains(tempAllowedSctCharacters[i])) {
+			allowedSctCharacters.append(tempAllowedSctCharacters[i]);
+		}
+	}
+}
+
+/*!
+\deprecated Hb12KeyTouchKeypad::Hb12KeyTouchKeypad(HbInputMethod*, QGraphicsItem*)
+     is deprecated.
 Constructs the object.
 */
 Hb12KeyTouchKeypad::Hb12KeyTouchKeypad(HbInputMethod* aOwner,
@@ -353,6 +441,8 @@
 }
 
 /*!
+\deprecated Hb12KeyTouchKeypad::keyboardType() const
+    is deprecated.
 Returns keyboard type.
 */
 HbKeyboardType Hb12KeyTouchKeypad::keyboardType() const
@@ -361,6 +451,8 @@
 }
 
 /*!
+\deprecated Hb12KeyTouchKeypad::~Hb12KeyTouchKeypad()
+    is deprecated.
 Destructs the object.
 */
 Hb12KeyTouchKeypad::~Hb12KeyTouchKeypad()
@@ -368,6 +460,33 @@
 }
 
 /*!
+\deprecated Hb12KeyTouchKeypad::mappedKeyPress(int)
+    is deprecated.
+Handles virtual key press
+*/
+void Hb12KeyTouchKeypad::mappedKeyPress(int buttonid)
+{
+    Q_D(Hb12KeyTouchKeypad);
+	if(buttonid >= 0 && d->mButtons[buttonid] && !d->mButtons[buttonid]->isFaded()) {
+        HbInputVkbWidget::mappedKeyPress(buttonid);
+    }
+}
+
+/*!
+\deprecated Hb12KeyTouchKeypad::mappedKeyRelease(int)
+    is deprecated.
+Handles virtual key release
+*/
+void Hb12KeyTouchKeypad::mappedKeyRelease(int buttonid)
+{
+    Q_D(Hb12KeyTouchKeypad);
+    if(buttonid >= 0 && d->mButtons[buttonid] && !d->mButtons[buttonid]->isFaded()) {
+        HbInputVkbWidget::mappedKeyRelease(buttonid);
+    }
+}
+/*!
+\deprecated Hb12KeyTouchKeypad::setMode(HbKeypadMode, QFlags<HbModifier>)
+    is deprecated.
 Sets the keypad to given mode. Possible values are EModeAbc, EModeNumeric and EModeSct.
 */
 void Hb12KeyTouchKeypad::setMode(HbKeypadMode mode, HbModifiers modifiers)
@@ -426,8 +545,9 @@
 }
 
 /*!
-Sets key map data object. Given key map data will be used as a source for button titles.
-Usually the key map data for active input language is used.
+\reimp
+\deprecated Hb12KeyTouchKeypad::setKeymap(const HbKeymap*)
+    is deprecated.
 */
 void Hb12KeyTouchKeypad::setKeymap(const HbKeymap* keymap)
 {
@@ -446,6 +566,11 @@
     }
 }
 
+/*!
+\reimp
+\deprecated Hb12KeyTouchKeypad::aboutToOpen(HbVkbHost*)
+    is deprecated.
+*/
 void Hb12KeyTouchKeypad::aboutToOpen(HbVkbHost *host)
 {
     Q_D(Hb12KeyTouchKeypad);
diff -r 16d8024aca5e -r f7ac710697a9 src/hbinput/inputwidgets/hbinput12keytouchkeypad.h
--- a/src/hbinput/inputwidgets/hbinput12keytouchkeypad.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinput12keytouchkeypad.h	Mon May 03 12:48:33 2010 +0300
@@ -53,6 +53,10 @@
     void applyEditorConstraints();
 
 public slots:
+	void mappedKeyPress(int buttonid);
+	void mappedKeyRelease(int buttonid);
+
+public slots:
     void sctModeListClosed();
 
 private:
diff -r 16d8024aca5e -r f7ac710697a9 src/hbinput/inputwidgets/hbinput12keytouchkeypad_p.h
--- a/src/hbinput/inputwidgets/hbinput12keytouchkeypad_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinput12keytouchkeypad_p.h	Mon May 03 12:48:33 2010 +0300
@@ -56,12 +56,14 @@
     void setKeyMappingTitleNumeric(int aKey, HbTouchKeypadButton* aButton, HbModifiers aModifiers);
 
     void applyEditorConstraints();
+	void getAllowedSctCharcters(QString& allowedSctCharacters);
 
     void createKeypad();
     void createLayout();
     QString textForKey(int key);
     QString additionalTextForKey(int key);
     int keyCode(HbTouchKeypadButton *button);
+    QChar findFirstNumberCharacterBoundToKey(int key);	
 public:
     HbTouchKeypadButton* mButtons[HbNum12KeypadBaseButtons];
     bool mKeypadCreated;
diff -r 16d8024aca5e -r f7ac710697a9 src/hbinput/inputwidgets/hbinputcandidatelist.cpp
--- a/src/hbinput/inputwidgets/hbinputcandidatelist.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputcandidatelist.cpp	Mon May 03 12:48:33 2010 +0300
@@ -65,7 +65,7 @@
     void calculateAndSetSize(qreal maxWidth);
     void initFrameIcon();
 
-public: 
+public:
     HbListWidget* mList;
     HbInputMethod* mInput;
     int numRows;
@@ -79,16 +79,16 @@
       numRows(HbCandListDefaultNumRows),
       numCandidates(0),
       longestStringWidth(0),
-      mFrameBackground( 0 )
+      mFrameBackground(0)
 {
     Q_Q(HbCandidateList);
 
     mList = new HbListWidget(q);
+    mList->setEnabledAnimations(HbAbstractItemView::None);
 }
 
 HbCandidateListPrivate::~HbCandidateListPrivate()
 {
-//    delete mBackground;
 }
 
 void HbCandidateListPrivate::initFrameIcon()
@@ -105,23 +105,13 @@
 
 void HbCandidateListPrivate::calculateAndSetSize(qreal maxWidth)
 {
-    Q_Q(HbCandidateList); 
+    Q_Q(HbCandidateList);
 
     const qreal oneLineHeight = 40.0;  // temporarily as a constant, eventually we'll need to calculate this.
 
     QRectF geom = q->geometry();
     qreal finalWidth = 30 + longestStringWidth * 2;    // Use magic numbers for now until we can calculate this from font.
 
-    // Font has not been set yet at this point...
-    /*QList<HbAbstractViewItem *>  items = mList->itemPrototypes();
-    mList->adjustSize();
-    HbAbstractViewItem * firstItem = items.at(0);
-
-    if(firstItem){
-    QFontMetrics fontMetrics(firstItem->fontSpec().font());
-    finalWidth = fontMetrics.boundingRect(longestString).width();	
-    }*/
-
     if (finalWidth > maxWidth) {
         finalWidth = maxWidth;
     }
@@ -136,8 +126,9 @@
     finalWidth = finalWidth + l + r ;
     finalHeight = (qreal)numLines * oneLineHeight + 5.0 + t + b;
 
-    if(finalHeight > HbDeviceProfile::current().logicalSize().height() - 30)
+    if(finalHeight > HbDeviceProfile::current().logicalSize().height() - 30) {
         finalHeight = HbDeviceProfile::current().logicalSize().height() - 30;
+    }
 
     geom.setHeight(finalHeight);
     geom.setWidth(finalWidth);
@@ -167,9 +158,9 @@
 */
 HbCandidateList::HbCandidateList(HbInputMethod* input, QGraphicsItem* parent)
     : HbDialog(*new HbCandidateListPrivate(input), parent)
-{ 
+{
     Q_D(HbCandidateList);
-    
+
     d->setPriority(HbPopupPrivate::VirtualKeyboard + 1);  // Should be shown on top of virtual keyboard.
     d->initFrameIcon();
 
@@ -187,8 +178,9 @@
     setTimeout(NoTimeout);
     setAttribute(Qt::WA_InputMethodEnabled, false);
     connect(d->mList, SIGNAL(activated(HbListWidgetItem*)), this, SLOT(itemActivated(HbListWidgetItem*)));
- 
-    setBackgroundFaded(false);        
+    connect(d->mList, SIGNAL(longPressed(HbListWidgetItem*, const QPointF&)), this, SLOT(itemActivated(HbListWidgetItem*)));
+
+    setBackgroundFaded(false);
 }
 
 /*!
@@ -201,7 +193,7 @@
 /*!
 Populates the candidate list with text strings given as parameter.
 
-@param 
+@param
 */
 void HbCandidateList::populateList(const QStringList& candidates)
 {
@@ -259,9 +251,9 @@
 Inherited from HbDialog.
 */
 void HbCandidateList::closeEvent(QCloseEvent* /*event*/)
-{   
+{
     hide();
-	emit candidatePopupCancelled();    
+    emit candidatePopupCancelled();
 }
 
 /*!
@@ -272,7 +264,7 @@
     Q_UNUSED(item);
     Q_D(HbCandidateList);
 
-    d->mInput->candidatePopupClosed();    
+    d->mInput->candidatePopupClosed();
     hide();
 }
 
@@ -295,6 +287,7 @@
     d->numRows = numLines;
     update();
 }
+
 /*!
 this event handler is called, for Hide events, is delivered after the widget has been hidden.
 */
diff -r 16d8024aca5e -r f7ac710697a9 src/hbinput/inputwidgets/hbinputcandidatelist.h
--- a/src/hbinput/inputwidgets/hbinputcandidatelist.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputcandidatelist.h	Mon May 03 12:48:33 2010 +0300
@@ -48,10 +48,11 @@
     QString currentCandidate();
     void setNumberOfVisibleLines(int numLines);
     bool setSizeAndPositionForAutoCompletion(HbVkbHost *vkbHost);
+
 signals:
-	void candidatePopupCancelled();
+    void candidatePopupCancelled();
 
-protected  : 
+protected:
     void closeEvent(QCloseEvent* event);
     void keyPressEvent(QKeyEvent* event);
     void hideEvent(QHideEvent * event);
diff -r 16d8024aca5e -r f7ac710697a9 src/hbinput/inputwidgets/hbinputcharpreviewpane.cpp
--- a/src/hbinput/inputwidgets/hbinputcharpreviewpane.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputcharpreviewpane.cpp	Mon May 03 12:48:33 2010 +0300
@@ -27,10 +27,7 @@
 #include <QSignalMapper>
 #include <QPainter>
 #include <QSizePolicy>
-
-#if QT_VERSION >= 0x040600
 #include <QGraphicsDropShadowEffect>
-#endif
 
 #include <hbeffect.h>
 #include <hbinputsettingproxy.h>
@@ -51,6 +48,7 @@
 const qreal HbPreviewBoundaryDelta = 1.5;
 const qreal HbBoundaryLabelWidthFactor = 0.75;
 const qreal HbLabelwidthFactor = 0.50;
+
 /// @cond
 
 /*
@@ -66,10 +64,14 @@
     */
     HbAccentedCharPreviewPane(QGraphicsItem *parent = 0)
         :HbWidget(parent),
-        mFramePrim(0),
         mTextItem(0)
     {
-        mFramePrim = static_cast<HbFrameItem*>(style()->createPrimitive(HbStyle::P_Popup_background, this));
+        HbFrameItem *n = new HbFrameItem(parent);
+        n->frameDrawer().setFrameType(HbFrameDrawer::ThreePiecesHorizontal);
+        n->frameDrawer().setFrameGraphicsName("qtg_fr_character_preview");
+
+
+        setBackgroundItem( n );
         mTextItem = static_cast<HbTextItem*>(style()->createPrimitive(HbStyle::P_Label_text, this));
     }
     /*!
@@ -77,9 +79,8 @@
     */
     void updatePrimitives()
     {
-        if (mFramePrim) {
-            mFramePrim->frameDrawer().setFrameType(HbFrameDrawer::ThreePiecesHorizontal);
-            mFramePrim->frameDrawer().setFrameGraphicsName("qtg_fr_character_preview");
+        HbWidget::updatePrimitives();
+        if (mTextItem) {
             mTextItem->setFontSpec(HbFontSpec(HbFontSpec::Primary));
             mTextItem->setAlignment(Qt::AlignCenter);
         }
@@ -89,8 +90,8 @@
     */
     ~HbAccentedCharPreviewPane() {
     }
+
 public:
-    HbFrameItem* mFramePrim;
     HbTextItem* mTextItem;
 };
 
@@ -113,7 +114,6 @@
     QStringList mCharacterList;
     QSignalMapper *mReleaseMapper;
     QGraphicsLinearLayout* mCandLayout;
-    HbFrameItem* mFramePrim;
     QSizeF mItemSize;
     HbAccentedCharPreviewPane* mAccentedPreviewPane;
 };
@@ -121,17 +121,17 @@
 void HbCharPreviewPanePrivate::init()
 {
     Q_Q(HbCharPreviewPane);
-    mFramePrim = static_cast<HbFrameItem*>(q->primitive(HbStyle::P_Popup_background));
 
-    if (!mFramePrim) {
-        mFramePrim = static_cast<HbFrameItem*>(q->style()->createPrimitive(HbStyle::P_Popup_background, q));
-    }
+    HbFrameItem *n = new HbFrameItem( q );
+    n->frameDrawer().setFrameType(HbFrameDrawer::ThreePiecesHorizontal);
+    n->frameDrawer().setFrameGraphicsName("qtg_fr_character_preview");
+
+    q->setBackgroundItem( n );
 }
 
 HbCharPreviewPanePrivate::HbCharPreviewPanePrivate()
     : mReleaseMapper(0),
-    mCandLayout(0),
-    mFramePrim(0)
+    mCandLayout(0)
 {
     mAccentedPreviewPane = new HbAccentedCharPreviewPane();
 }
@@ -187,6 +187,7 @@
     mCandLayout->updateGeometry();
     q->adjustSize();
 }
+
 /*!
 Sets the character for preview and shows in it's Pane.
 @param character The character for preview.
@@ -256,6 +257,7 @@
 @proto
 @hbinput
 \class HbCharPreviewPane
+\deprecated class HbCharPreviewPane
 \brief Character preview widget for virtual keyboards.
 
 
@@ -268,9 +270,10 @@
 \sa HbInputVkbWidget
 \sa HbPreviewLabel
 */
+
 /*!
-Constructor.
-@param parent of the widget.
+\deprecated HbCharPreviewPane::HbCharPreviewPane(QGraphicsItem*)
+    is deprecated.
 */
 HbCharPreviewPane::HbCharPreviewPane(QGraphicsItem* parent)
     : HbDialog(*new HbCharPreviewPanePrivate, parent)
@@ -319,16 +322,16 @@
 }
 
 /*!
-Destroys the object.
+\deprecated HbCharPreviewPane::~HbCharPreviewPane()
+    is deprecated.
 */
 HbCharPreviewPane::~HbCharPreviewPane()
 {
 }
 
 /*!
-Sets the list of characters for preview.
-@param characterList The character preview list.
-@param itemSceneBoundingRect of the QGraphicsItem.
+\deprecated HbCharPreviewPane::showCharacters(const QStringList&, const QRectF &)
+    is deprecated.
 */
 void HbCharPreviewPane::showCharacters(const QStringList& characterList, const QRectF &itemSceneBoundingRect)
 {
@@ -392,17 +395,14 @@
     // we need to fix it here.
     d->mousePressLocation = HbPopupPrivate::None;
 
+	// set the background as a panel if the foreground is a panel to provide focus handling
+	if ((flags() & QGraphicsItem::ItemIsPanel) && isModal()) {
+		d->backgroundItem->setFlag(QGraphicsItem::ItemIsPanel);
+	}
     // show it!
     show();
 }
 
-void HbCharPreviewPane::updatePrimitives()
-{
-    Q_D(HbCharPreviewPane);
-    d->mFramePrim->frameDrawer().setFrameType(HbFrameDrawer::ThreePiecesHorizontal);
-    d->mFramePrim->frameDrawer().setFrameGraphicsName("qtg_fr_character_preview");
-    d->mFramePrim->setGeometry(boundingRect());
-}
-
 #include "moc_hbinputcharpreviewpane.cpp"
 // End Of File
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbinput/inputwidgets/hbinputcharpreviewpane.h
--- a/src/hbinput/inputwidgets/hbinputcharpreviewpane.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputcharpreviewpane.h	Mon May 03 12:48:33 2010 +0300
@@ -39,7 +39,7 @@
 public:
     explicit HbCharPreviewPane(QGraphicsItem* parent = NULL);
     virtual ~HbCharPreviewPane();
-    
+
     void showCharacters(const QStringList& characterList, const QRectF &itemSceneBoundingRect);
 
     enum { Type = Hb::ItemType_InputCharPreviewPane };
@@ -48,9 +48,6 @@
 signals:
     void charFromPreviewSelected(QString character);
 
-public slots:
-   void updatePrimitives();
-
 private:
     Q_DECLARE_PRIVATE_D(d_ptr, HbCharPreviewPane)
 	Q_DISABLE_COPY(HbCharPreviewPane)
diff -r 16d8024aca5e -r f7ac710697a9 src/hbinput/inputwidgets/hbinputcheckboxlist.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbinput/inputwidgets/hbinputcheckboxlist.cpp	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,152 @@
+/****************************************************************************
+**
+** 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 <hblistwidget.h>
+#include <hblistwidgetitem.h>
+#include <hbdataformmodelitem.h>
+#include <hbdataformmodel.h>
+
+#include "hbinputcheckboxlist_p.h"
+
+/// @cond
+
+class HbInputCheckBoxListPrivate
+{
+public:
+    HbListWidget *mListWidget;
+};
+
+/// @endcond
+
+/*!
+Constructs checkbox list
+*/
+HbInputCheckBoxList::HbInputCheckBoxList(QGraphicsItem *parent)
+ : HbDataFormViewItem(parent), d_ptr(new HbInputCheckBoxListPrivate())
+{
+}
+
+/*!
+Destructs checkbox list
+*/
+HbInputCheckBoxList::~HbInputCheckBoxList()
+{
+    delete d_ptr;
+}
+
+/*!
+Returns a new copy of this object
+*/
+HbAbstractViewItem* HbInputCheckBoxList::createItem()
+{
+    return new HbInputCheckBoxList(*this);
+}
+
+/*!
+\reimp
+Returns true if \a model index is supported, otherwise returns false.
+ */
+bool HbInputCheckBoxList::canSetModelIndex(const QModelIndex &index) const
+{
+    HbDataFormModelItem::DataItemType itemType = 
+        static_cast<HbDataFormModelItem::DataItemType>(index.data(HbDataFormModelItem::ItemTypeRole).toInt());
+
+    if(itemType == HbDataFormModelItem::CustomItemBase) {
+        return true;
+    } else {
+        return false;
+    }
+}
+
+/*!
+Updates the selected items to the model
+*/
+void HbInputCheckBoxList::itemActivated(const QModelIndex &index)
+{
+    Q_D(HbInputCheckBoxList);
+    QModelIndex itemIndex = modelIndex();
+    HbDataFormModelItem *modelItem = static_cast<HbDataFormModelItem*>(
+        static_cast<HbDataFormModel*>(itemView()->model())->itemFromIndex(itemIndex));
+
+    QList<QVariant> selectedValues = modelItem->contentWidgetData(QString("selectedItems")).toList();
+    selectedValues.replace(index.row(), !selectedValues.at(index.row()).toBool());
+    modelItem->setContentWidgetData(QString("selectedItems"), selectedValues);
+
+    HbAbstractViewItem *viewItem = d->mListWidget->viewItem(index.row());
+    if (selectedValues.at(index.row()).toBool()) {
+        d->mListWidget->setCurrentIndex(viewItem->modelIndex(), QItemSelectionModel::Select);
+    } else {
+        d->mListWidget->setCurrentIndex(viewItem->modelIndex(), QItemSelectionModel::Deselect);
+    }
+ }
+
+/*!
+Creates a widget for showing checkbox list
+*/
+HbWidget* HbInputCheckBoxList::createCustomWidget()
+{
+    Q_D(HbInputCheckBoxList);
+
+    QModelIndex itemIndex = modelIndex();
+    HbDataFormModelItem *modelItem = static_cast<HbDataFormModelItem*>(
+        static_cast<HbDataFormModel*>(itemView()->model())->itemFromIndex(itemIndex));
+
+    d->mListWidget = new HbListWidget();
+    d->mListWidget->setSelectionMode(HbAbstractItemView::MultiSelection);
+    d->mListWidget->contentWidget()->setContentsMargins(10, 10, 10, 10);
+    d->mListWidget->setBackgroundItem(HbStyle::P_DataItem_background);
+    
+    QStringList items = modelItem->contentWidgetData(QString("items")).toStringList();
+    foreach(QString itemName, items) {
+        HbListWidgetItem *item = new HbListWidgetItem();
+        item->setData(QVariant(itemName), Qt::DisplayRole);
+        d->mListWidget->addItem(item);
+    }
+
+    QList<QVariant> selectedValues = modelItem->contentWidgetData(QString("selectedItems")).toList();
+    for (int i = 0; i < d->mListWidget->count(); ++i) {
+        if (selectedValues.at(i).toBool()) {
+            HbAbstractViewItem *viewItem = d->mListWidget->viewItem(i);
+            d->mListWidget->setCurrentIndex(viewItem->modelIndex(), QItemSelectionModel::Select);
+        }
+    }
+
+    QString objectName = modelItem->contentWidgetData(QString("objectName")).toString();
+    d->mListWidget->setObjectName(objectName);
+
+    connect(d->mListWidget, SIGNAL(activated(const QModelIndex &)), this, SLOT(itemActivated(const QModelIndex &)));
+
+    return d->mListWidget;    
+}
+
+/*!
+Copy constructor for private use.
+*/
+HbInputCheckBoxList::HbInputCheckBoxList(const HbInputCheckBoxList &other)
+ : HbDataFormViewItem(other), d_ptr(new HbInputCheckBoxListPrivate())
+{
+}
+
+// End of file
diff -r 16d8024aca5e -r f7ac710697a9 src/hbinput/inputwidgets/hbinputcheckboxlist_p.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbinput/inputwidgets/hbinputcheckboxlist_p.h	Mon May 03 12:48:33 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 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_CHECKBOX_LIST_H
+#define HB_INPUT_CHECKBOX_LIST_H
+
+#include <hbdataformviewitem.h>
+
+class HbInputCheckBoxListPrivate;
+
+class HB_INPUT_PRIVATE_EXPORT HbInputCheckBoxList : public HbDataFormViewItem
+{
+    Q_OBJECT
+
+public:
+    explicit HbInputCheckBoxList(QGraphicsItem *parent = 0);
+    ~HbInputCheckBoxList();
+
+    HbAbstractViewItem* createItem();
+    bool canSetModelIndex(const QModelIndex &index) const;
+
+public slots:
+    void itemActivated(const QModelIndex &index);
+
+protected:
+    HbWidget* createCustomWidget();
+
+    HbInputCheckBoxListPrivate * const d_ptr;
+
+private:
+    HbInputCheckBoxList(const HbInputCheckBoxList &other);
+
+    Q_DECLARE_PRIVATE_D(d_ptr, HbInputCheckBoxList)
+};
+
+#endif // HB_INPUT_CHECKBOX_LIST_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbinput/inputwidgets/hbinputcommondialogs.cpp
--- a/src/hbinput/inputwidgets/hbinputcommondialogs.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputcommondialogs.cpp	Mon May 03 12:48:33 2010 +0300
@@ -23,6 +23,8 @@
 **
 ****************************************************************************/
 #include <QDir>
+#include <QtAlgorithms>
+
 #include <hbinputdef.h>
 #include <hblistdialog.h>
 #include <hblistwidgetitem.h>
@@ -32,6 +34,18 @@
 
 #include "hbinputcommondialogs.h"
 
+/// @cond
+
+bool caseInsensitiveLessThanForHbInputLanguage(const HbInputLanguage &s1, const HbInputLanguage &s2)
+{
+    //Temporaries because localisedName() is a non-const function
+    HbInputLanguage t1 = s1;
+    HbInputLanguage t2 = s2;
+    return t1.localisedName().toLower() < t2.localisedName().toLower();
+}
+
+/// @endcond
+
 /*!
 Displays language selection dialog and returns selected language.
 */
@@ -54,7 +68,8 @@
     } else {
         languages=languageList;
     }
-
+	
+	qStableSort(languages.begin(), languages.end(), caseInsensitiveLessThanForHbInputLanguage);
     QList<HbListWidgetItem*> listItems;
     HbListWidgetItem* item = 0;
     foreach( HbInputLanguage language, languages ) {
diff -r 16d8024aca5e -r f7ac710697a9 src/hbinput/inputwidgets/hbinputexactwordpopup.cpp
--- a/src/hbinput/inputwidgets/hbinputexactwordpopup.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputexactwordpopup.cpp	Mon May 03 12:48:33 2010 +0300
@@ -270,6 +270,6 @@
     if (indicatorArrow == HbNoIndicatorArrow) {
         d->mOption->icon = (QString(""));
     } else {
-        d->mOption->icon = (QString("qtg_mono_input_down"));
+        d->mOption->icon = (QString("qtg_graf_inpu_swipe"));
    }
 }
diff -r 16d8024aca5e -r f7ac710697a9 src/hbinput/inputwidgets/hbinputexactwordpopup.h
--- a/src/hbinput/inputwidgets/hbinputexactwordpopup.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputexactwordpopup.h	Mon May 03 12:48:33 2010 +0300
@@ -41,19 +41,19 @@
         HbIndicatorArrow
     };
 
-    static HbExactWordPopup* instance( HbExactWordPopupIndicator indicatorArrow = HbNoIndicatorArrow );
+    static HbExactWordPopup* instance(HbExactWordPopupIndicator indicatorArrow = HbNoIndicatorArrow);
 
     QString text();
-    int type() const { return Type; }
+    int type() const {return Type;}
 
 public slots:
     void setText(const QString &text);
     void showText(QPointF pos);
     void hideText();
-    void setIndicatorArrow( HbExactWordPopupIndicator indicatorArrow );
+    void setIndicatorArrow(HbExactWordPopupIndicator indicatorArrow);
 
 protected:
-    HbExactWordPopup( QGraphicsWidget *parent=0, HbExactWordPopupIndicator indicatorArrow = HbNoIndicatorArrow );
+    HbExactWordPopup(QGraphicsWidget *parent = 0, HbExactWordPopupIndicator indicatorArrow = HbNoIndicatorArrow);
     void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
     void updatePrimitives();
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbinput/inputwidgets/hbinputhwtoolcluster.cpp
--- a/src/hbinput/inputwidgets/hbinputhwtoolcluster.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputhwtoolcluster.cpp	Mon May 03 12:48:33 2010 +0300
@@ -30,8 +30,10 @@
 #include <hbinpututils.h>
 #include <hbinputvkbhost.h>
 #include <hbinputsettingproxy.h>
-#include <hbinputsettingdialog.h>
 #include <hbinputcommondialogs.h>
+#include <hbmainwindow.h>
+#include <hbview.h>
+#include <hbdataform.h>
 
 #include "hbinputvkbwidget_p.h"
 #include "hbinputhwtoolcluster.h"
@@ -150,7 +152,7 @@
         d->mSettingsButton->setButtonType(HbTouchKeypadButton::HbTouchButtonFunction);
         d->mSettingsButton->setBackgroundAttributes(HbTouchKeypadButton::HbTouchButtonReleased);
 
-        connect(d->mSettingsButton, SIGNAL(clicked()), this, SLOT(showSettingsDialog()));
+        connect(d->mSettingsButton, SIGNAL(clicked()), this, SLOT(showSettingList()));
     }
     if(!d->mLanguageButton) {
         d->mLanguageButton = new HbTouchKeypadButton(this, QString(""));
@@ -182,7 +184,7 @@
     }
 
     // update prediction button status
-    if (HbInputSettingProxy::instance()->predictiveInputStatus()) {
+    if (HbInputSettingProxy::instance()->predictiveInputStatusForActiveKeyboard()) {
         d->mPredictionIndicatorButton->setIcon(HbIcon(predictionOffIcon));
     } else {
         d->mPredictionIndicatorButton->setIcon(HbIcon(predictionOnIcon));
@@ -274,19 +276,13 @@
 }
 
 /*!
+\deprecated HbHwToolCluster::showSettingsDialog()
+    is deprecated. Use showSettingsView instead.
+
 Shows the settings dialog
 */
 void HbHwToolCluster::showSettingsDialog()
 {
-    Q_D(HbHwToolCluster);
-
-    HbInputSettingDialog::HbSettingItems items = HbInputSettingDialog::HbSettingItemAll;
-    if(d->mOwner->focusObject() && d->mOwner->focusObject()->editorInterface().isNumericEditor()){
-        items &=  (~HbInputSettingDialog::HbSettingItemPrediction);
-    }
-    HbInputSettingDialog* settings = new HbInputSettingDialog(items);
-    settings->exec();
-    delete settings;
 }
 
 /*!
diff -r 16d8024aca5e -r f7ac710697a9 src/hbinput/inputwidgets/hbinputmodeindicator.cpp
--- a/src/hbinput/inputwidgets/hbinputmodeindicator.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputmodeindicator.cpp	Mon May 03 12:48:33 2010 +0300
@@ -64,7 +64,10 @@
     const QString predictionOnIcon("qtg_mono_predictive_text_on");
     const QString predictionOffIcon("qtg_mono_predictive_text_off");
 
-    if (HbInputSettingProxy::instance()->predictiveInputStatus()) {
+    //Do not update the indicator if prediction is not allowed in the editor  even though
+    //prediction is active.
+    if (HbInputSettingProxy::instance()->predictiveInputStatusForActiveKeyboard() &&  mFocusObject && 
+                                     mFocusObject->editorInterface().isPredictionAllowed()) {
         mButton.setIcon(HbIcon(predictionOnIcon));
     } else {
         mButton.setIcon(HbIcon(predictionOffIcon));
@@ -85,9 +88,8 @@
 */
 
 /*!
-Constructor.
-@param button the keypad button which shows input mode icon
-@param parent parent of the widget.
+\deprecated HbInputModeIndicator::HbInputModeIndicator(HbTouchKeypadButton&, QGraphicsWidget*)
+    is deprecated. Use (upcoming) version without HbTouchKeypadButton parameter.
 */
 HbInputModeIndicator::HbInputModeIndicator(HbTouchKeypadButton& button, QGraphicsWidget* parent)
     : QObject(parent)
@@ -96,7 +98,7 @@
     if (mPrivate->mFocusObject) {
         connect( &mPrivate->mFocusObject->editorInterface(), SIGNAL(modified()), this, SLOT(updateIndicator()));
     }
-    connect(HbInputSettingProxy::instance(), SIGNAL(predictiveInputStateChanged(int)), this, SLOT(udpdatePredictionStatus(int)));
+    connect(HbInputSettingProxy::instance(), SIGNAL(predictiveInputStateChanged(HbKeyboardSettingFlags, bool)), this, SLOT(updatePredictionStatus(HbKeyboardSettingFlags, bool)));
     updateIndicator(); // check mode of current editor
 }
 
@@ -130,12 +132,25 @@
 }
 
 /*!
+\deprecated HbInputModeIndicator::udpdatePredictionStatus(int)
+    is deprecated. Use updatePredictionStatus(bool) instead.
+
 Updates prediction status.
 */
 void HbInputModeIndicator::udpdatePredictionStatus(int newStatus)
 {
-   Q_UNUSED(newStatus);
-   mPrivate->updatePrediction();
+    Q_UNUSED(newStatus);
+}
+
+/*!
+Updates prediction status.
+*/
+void HbInputModeIndicator::updatePredictionStatus(HbKeyboardSettingFlags keyboardType, bool newStatus)
+{
+    Q_UNUSED(keyboardType);
+    Q_UNUSED(newStatus);
+    mPrivate->updatePrediction();
 }
 
 // End of file
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbinput/inputwidgets/hbinputmodeindicator.h
--- a/src/hbinput/inputwidgets/hbinputmodeindicator.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputmodeindicator.h	Mon May 03 12:48:33 2010 +0300
@@ -43,6 +43,7 @@
 public slots:
     void updateIndicator();
     void udpdatePredictionStatus(int newStatus);
+    void updatePredictionStatus(HbKeyboardSettingFlags keyboardType, bool newStatus);
 
 private:
     Q_DISABLE_COPY(HbInputModeIndicator)
diff -r 16d8024aca5e -r f7ac710697a9 src/hbinput/inputwidgets/hbinputpreviewlabel.cpp
--- a/src/hbinput/inputwidgets/hbinputpreviewlabel.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputpreviewlabel.cpp	Mon May 03 12:48:33 2010 +0300
@@ -35,8 +35,12 @@
 */
 
 /*!
-Constructor.
-@param previewSymbols The string of the label and parent Graphics Item.
+\deprecated class HbPreviewLabel
+*/
+
+/*!
+\deprecated HbPreviewLabel::HbPreviewLabel(QString, QGraphicsItem *)
+    is deprecated.
 */
 HbPreviewLabel::HbPreviewLabel(QString previewSymbols, QGraphicsItem *parent)
     :HbWidget(parent),
@@ -49,15 +53,16 @@
 }
 
 /*!
-Destroy the object
+\deprecated HbPreviewLabel::~HbPreviewLabel()
+    is deprecated.
 */
 HbPreviewLabel::~HbPreviewLabel()
 {
 }
 
 /*!
-sets geometry of textItem
-@param itemsize the Geometry of Button.
+\deprecated HbPreviewLabel::setTextGeometry(qreal, qreal)
+    is deprecated.
 */
 void HbPreviewLabel::setTextGeometry(qreal width, qreal height)
 {
@@ -72,8 +77,8 @@
 }
 
 /*!
-This function handles the mouse press event.
-@param event The mouse events in the graphics view framework.
+\deprecated HbPreviewLabel::mousePressEvent(QGraphicsSceneMouseEvent *)
+    is deprecated.
 */
 void HbPreviewLabel::mousePressEvent(QGraphicsSceneMouseEvent * event)
 {
@@ -82,11 +87,8 @@
 }
 
 /*!
-This function handles the mouse move event.
-@param event The mouse events in the graphics view framework.
-
-In case of a key/touch movement will activate a mousePressEvent on another Label
-and the next Label is set as the grabber item.
+\deprecated HbPreviewLabel::mouseMoveEvent(QGraphicsSceneMouseEvent *)
+    is deprecated. 
 */
 void HbPreviewLabel::mouseMoveEvent(QGraphicsSceneMouseEvent * event)
 {
@@ -128,11 +130,8 @@
 }
 
 /*!
-This function handles the mouse release event.
-@param event The mouse events in the graphics view framework.
-
-emits the signal selected to input the corrosponding character mapped to the key whenever
-a key is released and afterwards hides the PreviewPopup by emiitting hidePreview
+\deprecated HbPreviewLabel::mouseReleaseEvent(QGraphicsSceneMouseEvent *)
+    is deprecated.
 */
 void HbPreviewLabel::mouseReleaseEvent(QGraphicsSceneMouseEvent * event)
 {
@@ -145,3 +144,4 @@
 }
 
 // End Of File
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbinput/inputwidgets/hbinputqwertytouchkeyboard.cpp
--- a/src/hbinput/inputwidgets/hbinputqwertytouchkeyboard.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputqwertytouchkeyboard.cpp	Mon May 03 12:48:33 2010 +0300
@@ -23,7 +23,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QGraphicsGridLayout>
 #include <hbinputmethod.h>
 #include <hbinputkeymap.h>
 #include <hbinputsettingproxy.h>
@@ -61,16 +61,19 @@
 const QString HbQwertyButtonTextLayout = "_hb_qwerty_button_text_layout";
 const QString HbQwertyButtonIconLayout = "_hb_qwerty_button_icon_layout";
 
+/*!
+\deprecated class HbQwertyKeyboard
+*/
+
 HbQwertyKeyboardPrivate::HbQwertyKeyboardPrivate()
 :mCtrlBtnIndex(-1),
 mPressedButtonIndex(-1),
 mPreviewPane(0),
 mInStickyRegion(false),
 mLongKeyPressCharsShown(false),
-mClickMapper(0),
 mKeypadCreated(false),
 mKeymapChanged(false),
-mKeyboardSize(HbQwerty4x10),
+mKeyboardSize(HbQwerty4x10), 
 mSize(QSizeF())
 {
 }
@@ -90,7 +93,6 @@
             button->setAsStickyButton(true);
             q->connect(button, SIGNAL(pressed()), mPressMapper, SLOT(map()));
             q->connect(button, SIGNAL(released()), mReleaseMapper, SLOT(map()));
-            q->connect(button, SIGNAL(clicked()), mClickMapper, SLOT(map()));
             q->connect(button, SIGNAL(enteredInNonStickyRegion()), q, SLOT(enteredInNonStickyRegion()));
             if (i >= HbVirtualQwerty4x10MaxKeysCount) {
                 button->hide();
@@ -145,7 +147,6 @@
             button->setAsStickyButton(false);
             q->connect(button, SIGNAL(pressed()), mPressMapper, SLOT(map()));
             q->connect(button, SIGNAL(released()), mReleaseMapper, SLOT(map()));
-            q->connect(button, SIGNAL(clicked()), mClickMapper, SLOT(map()));
             q->connect(button, SIGNAL(enteredInNonStickyRegion()), q, SLOT(enteredInNonStickyRegion()));
             mButtons.append(button);
         }
@@ -215,7 +216,6 @@
 
             q->connect(button, SIGNAL(pressed()), mPressMapper, SLOT(map()));
             q->connect(button, SIGNAL(released()), mReleaseMapper, SLOT(map()));
-            q->connect(button, SIGNAL(clicked()), mClickMapper, SLOT(map()));
             q->connect(button, SIGNAL(enteredInNonStickyRegion()), q, SLOT(enteredInNonStickyRegion()));
             mButtons.append(button);
         }
@@ -225,7 +225,6 @@
     // intercepting signal before passing to mOwner
     q->connect(mPressMapper, SIGNAL(mapped(int)), q, SLOT(mappedKeyPress(int)));
     q->connect(mReleaseMapper, SIGNAL(mapped(int)), q, SLOT(mappedKeyRelease(int)));
-    q->connect(mClickMapper, SIGNAL(mapped(int)), q, SLOT(mappedKeyClick(int)));
 }
 
 void HbQwertyKeyboardPrivate::getAllowedSctCharcters(QString & allowedSctCharacters)
@@ -258,25 +257,53 @@
         }
     }
 }
-void HbQwertyKeyboardPrivate::updateButtonsText()
-{    
-    if(mMode == EModeNumeric) {
+
+void HbQwertyKeyboardPrivate::updateButtonsTextAndMappers()
+{
+    if (mMode == EModeNumeric) {
         QString allowedSctCharacters;
         getAllowedSctCharcters(allowedSctCharacters);
         int sctIndex = 1;
-        for(int jj = 0; jj < HbVirtualQwertyNumericKeypadButtonCount ; jj++) {
-            if(jj>=12 && jj<=16) {
+        for (int jj = 0; jj < HbVirtualQwertyNumericKeypadButtonCount ; jj++) {
+            if (jj>=12 && jj<=16) {
                 QString buttonText;
-                if(allowedSctCharacters.length() >= sctIndex) {
+                if (allowedSctCharacters.length() >= sctIndex) {
                     buttonText = allowedSctCharacters[sctIndex-1];
                 }
                 mButtons[jj]->setText(buttonText);
+                // Update press and release mapper.
+                mReleaseMapper->removeMappings(mButtons.at(jj));
+                mPressMapper->removeMappings(mButtons.at(jj));
+                if(!mButtons.at(jj)->text().isEmpty()) {
+                    mReleaseMapper->setMapping(mButtons.at(jj), mButtons.at(jj)->text().at(0).unicode());
+                    mPressMapper->setMapping(mButtons.at(jj), mButtons.at(jj)->text().at(0).unicode());
+                } 
                 sctIndex++;
             }
         }
+    } else { // mMode == EModeAbc
+        const HbKeyboardMap* keymap = mKeymap->keyboard(HbKeyboardVirtualQwerty);
+        if (keymap == 0) {
+            return;
+        }
+        int keymapCount = keymap->keys.count();
 
+        for (int i = 0; i < mButtons.count(); i++) {
+            if (i < keymapCount) {
+                mButtons.at(i)->setText(textForKey(i));
+                mButtons.at(i)->setKeyCode(keymap->keys.at(i)->keycode.unicode());
+                if (mKeymapChanged) {
+                    HbTouchKeypadButton *button = mButtons.at(i);
+                    mReleaseMapper->removeMappings(button);
+                    mPressMapper->removeMappings(button);
+                    mReleaseMapper->setMapping(button, keymap->keys.at(i)->keycode.unicode());
+                    mPressMapper->setMapping(button, keymap->keys.at(i)->keycode.unicode());
+                }
+            }
+        }
     }
 }
+
 HbQwertyKeyboardPrivate::~HbQwertyKeyboardPrivate()
 {
     delete mPreviewPane;
@@ -294,7 +321,8 @@
     }
 }
 
-int HbQwertyKeyboardPrivate::indexForKeycode(int keycode) {
+int HbQwertyKeyboardPrivate::indexForKeycode(int keycode)
+{
     int index = -1;
     if (mMode == EModeNumeric) {
         switch(keycode) {
@@ -307,8 +335,20 @@
             case Qt::Key_Backspace:
                 index = 17;
                 break;
+            case '0':
+                index = 9;
+                break;
             default:
-                index = keycode;
+                if (keycode >= '1' && keycode <= '9') {
+                    index = keycode - '1';
+                } else {
+                    QString sctChars;
+                    getAllowedSctCharcters(sctChars);
+                    sctChars.truncate(5);
+                    if (sctChars.contains(QChar(keycode))) {
+                        index = sctChars.indexOf(QChar(keycode)) + 12;
+                    }
+                }
                 break;
         }
     } else {
@@ -379,7 +419,6 @@
 
 void HbQwertyKeyboardPrivate::handleStandardButtonRelease(int buttonId)
 {
-    Q_UNUSED(buttonId);
     // mLongKeyPressCharsShown will be true in case there is a long key press
     // detected and preview pane is showing some character(s) to be selected
     // by user. so when mLongKeyPressCharsShown is true we should not close
@@ -388,17 +427,17 @@
         if (mPreviewPane->isVisible()) {
             mPreviewPane->hide();
         }
-    }
-    mLongKeyPressCharsShown = false;
-}
+
+	/* Release Event is handled in Button Release as we do not get Click event from
+	pushButton on longpress of the button
+	*/
 
-void HbQwertyKeyboardPrivate::handleStandardButtonClick(int buttonId)
-{
     // handle keypress only if there was no flick
-    if (mFlickDirection!=HbInputVkbWidget::HbFlickDirectionDown){
-        QKeyEvent releaseEvent(QEvent::KeyRelease, buttonId, Qt::NoModifier);
-        if (mOwner) {
-            mOwner->filterEvent(&releaseEvent);
+    if (mFlickDirection==HbInputVkbWidget::HbFlickDirectionNone && buttonId >= 0){
+            QKeyEvent releaseEvent(QEvent::KeyRelease, buttonId, Qt::NoModifier);
+            if (mOwner) {
+                mOwner->filterEvent(&releaseEvent);
+            }
         }
     }
 }
@@ -483,35 +522,32 @@
     for (int i = 0; i < HbVirtualQwertyNumericKeypadButtonCount; ++i) {
         if (i <= 9) {
             mButtonLayout->addItem(mButtons.at(i), 0, i);
-            mReleaseMapper->setMapping(mButtons.at(i), i);
-            mPressMapper->setMapping(mButtons.at(i), i);
-            mClickMapper->setMapping(mButtons.at(i), i);
+            mReleaseMapper->setMapping(mButtons.at(i), mButtons.at(i)->text().at(0).unicode());
+            mPressMapper->setMapping(mButtons.at(i), mButtons.at(i)->text().at(0).unicode());
         } else if(i>=12 && i<= 16) {
             mButtonLayout->addItem(mButtons.at(i), 1, i%10);
-            mReleaseMapper->setMapping(mButtons.at(i), i);
-            mPressMapper->setMapping(mButtons.at(i), i);
-            mClickMapper->setMapping(mButtons.at(i), i);
+            if(!mButtons.at(i)->text().isEmpty()) {
+                mReleaseMapper->setMapping(mButtons.at(i), mButtons.at(i)->text().at(0).unicode());
+                mPressMapper->setMapping(mButtons.at(i), mButtons.at(i)->text().at(0).unicode());
+            } 
         } else  {
             switch(i) {
             case 10: {
                 mButtonLayout->addItem(mButtons.at(i), 1, 0);
                 mReleaseMapper->setMapping(mButtons.at(i), Qt::Key_Shift);
                 mPressMapper->setMapping(mButtons.at(i), Qt::Key_Shift);
-                mClickMapper->setMapping(mButtons.at(i), Qt::Key_Shift);
                 }
                 break;
             case 11: {
                 mButtonLayout->addItem(mButtons.at(i), 1, 1);
                 mReleaseMapper->setMapping(mButtons.at(i), Qt::Key_Control);
                 mPressMapper->setMapping(mButtons.at(i), Qt::Key_Control);
-                mClickMapper->setMapping(mButtons.at(i), Qt::Key_Control);
                 }
                 break;
             case 17: {
                 mButtonLayout->addItem(mButtons.at(i), 1, 7);
                 mReleaseMapper->setMapping(mButtons.at(i), Qt::Key_Backspace);
                 mPressMapper->setMapping(mButtons.at(i), Qt::Key_Backspace);
-                mClickMapper->setMapping(mButtons.at(i), Qt::Key_Backspace);
                 }
                 break;
             default:
@@ -583,7 +619,6 @@
             HbTouchKeypadButton * button = mButtons.at(jj);
             mReleaseMapper->removeMappings(button);
             mPressMapper->removeMappings(button);
-            mClickMapper->removeMappings(button);
         }
         for (int i = mButtonLayout->count() - 1; i >= 0; i--) {
             mButtonLayout->removeAt(i);
@@ -604,10 +639,10 @@
     for (int i = 0; i < keymap->keys.count() && i < HbVirtualQwerty4x11MaxKeysCount; ++i) {
         if (refreshButtonText) {
             mButtons[i]->setText(textForKey(i));
+            mButtons[i]->setKeyCode(keymap->keys.at(i)->keycode.unicode());
         }
         mReleaseMapper->setMapping(mButtons.at(i), keymap->keys.at(i)->keycode.unicode());
         mPressMapper->setMapping(mButtons.at(i), keymap->keys.at(i)->keycode.unicode());
-        mClickMapper->setMapping(mButtons.at(i), keymap->keys.at(i)->keycode.unicode());
         int row = 0;
         int column = 0;
         if (i < 10) {
@@ -647,7 +682,6 @@
             setButtonObjectName(*mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), 1, 9, Qt::Key_Backspace);
             mReleaseMapper->setMapping(mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), Qt::Key_Backspace);
             mPressMapper->setMapping(mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), Qt::Key_Backspace);
-            mClickMapper->setMapping(mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), Qt::Key_Backspace);
             break;
             }
         case 1: {
@@ -655,7 +689,6 @@
             setButtonObjectName(*mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), 2, 9, Qt::Key_Enter);
             mReleaseMapper->setMapping(mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), Qt::Key_Enter);
             mPressMapper->setMapping(mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), Qt::Key_Enter);
-            mClickMapper->setMapping(mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), Qt::Key_Enter);
             break;
             }
         case 2: {
@@ -663,7 +696,6 @@
             setButtonObjectName(*mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), 3, 0, Qt::Key_Shift);
             mReleaseMapper->setMapping(mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), Qt::Key_Shift);
             mPressMapper->setMapping(mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), Qt::Key_Shift);
-            mClickMapper->setMapping(mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), Qt::Key_Shift);
             break;
             }
         case 3: {
@@ -671,7 +703,6 @@
             setButtonObjectName(*mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), 3, 1, Qt::Key_Control);
             mReleaseMapper->setMapping(mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), Qt::Key_Control);
             mPressMapper->setMapping(mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), Qt::Key_Control);
-            mClickMapper->setMapping(mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), Qt::Key_Control);
             break;
             }
         case 4: {
@@ -679,7 +710,6 @@
             setButtonObjectName(*mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), 3, 4, Qt::Key_Space);
             mReleaseMapper->setMapping(mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), Qt::Key_Space);
             mPressMapper->setMapping(mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), Qt::Key_Space);
-            mClickMapper->setMapping(mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), Qt::Key_Space);
             break;
             }
         default:
@@ -712,10 +742,10 @@
     for (int i = 0; i < keymap->keys.count() && i <= HbVirtualQwerty4x11MaxKeysCount; ++i) {
         if (refreshButtonText) {
             mButtons[i]->setText(textForKey(i));
+            mButtons[i]->setKeyCode(keymap->keys.at(i)->keycode.unicode());
         }
         mReleaseMapper->setMapping(mButtons.at(i), keymap->keys.at(i)->keycode.unicode());
         mPressMapper->setMapping(mButtons.at(i), keymap->keys.at(i)->keycode.unicode());
-        mClickMapper->setMapping(mButtons.at(i), keymap->keys.at(i)->keycode.unicode());
         int row = 0;
         int column = 0;
         if (i < 11) {
@@ -756,7 +786,6 @@
             setButtonObjectName(*mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), 1, 10, Qt::Key_Backspace);
             mReleaseMapper->setMapping(mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), Qt::Key_Backspace);
             mPressMapper->setMapping(mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), Qt::Key_Backspace);
-            mClickMapper->setMapping(mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), Qt::Key_Backspace);
             break;
             }
         case 1: {
@@ -764,7 +793,6 @@
             setButtonObjectName(*mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), 2, 10, Qt::Key_Enter);
             mReleaseMapper->setMapping(mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), Qt::Key_Enter);
             mPressMapper->setMapping(mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), Qt::Key_Enter);
-            mClickMapper->setMapping(mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), Qt::Key_Enter);
             break;
             }
         case 2: {
@@ -772,7 +800,6 @@
             setButtonObjectName(*mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), 3, 0, Qt::Key_Shift);
             mReleaseMapper->setMapping(mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), Qt::Key_Shift);
             mPressMapper->setMapping(mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), Qt::Key_Shift);
-            mClickMapper->setMapping(mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), Qt::Key_Shift);
             break;
             }
         case 3: {
@@ -780,7 +807,6 @@
             setButtonObjectName(*mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), 3, 1, Qt::Key_Control);
             mReleaseMapper->setMapping(mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), Qt::Key_Control);
             mPressMapper->setMapping(mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), Qt::Key_Control);
-            mClickMapper->setMapping(mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), Qt::Key_Control);
             break;
             }
         case 4: {
@@ -788,7 +814,6 @@
             setButtonObjectName(*mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), 3, 4, Qt::Key_Space);
             mReleaseMapper->setMapping(mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), Qt::Key_Space);
             mPressMapper->setMapping(mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), Qt::Key_Space);
-            mClickMapper->setMapping(mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), Qt::Key_Space);
             break;
             }
         default:
@@ -881,10 +906,8 @@
 //
 
 /*!
-Constructs the object. aOwner is the owning input method implementation. keyData
-is key mapping data to be used to display button texts. Key mapping data can be
-changed later (for example when the input language changes) by calling
-setKeyMapData. The keyboard is initialized based on the mode.
+\deprecated HbQwertyKeyboard::HbQwertyKeyboard(HbInputMethod*, const HbKeymap*, QGraphicsItem*, HbKeypadMode)
+    is deprecated.
 */
 HbQwertyKeyboard::HbQwertyKeyboard(HbInputMethod* owner,
                                    const HbKeymap* keymap,
@@ -908,33 +931,38 @@
     d->mMode = mode;
 }
 
+/*!
+\deprecated HbQwertyKeyboard::HbQwertyKeyboard(HbQwertyKeyboardPrivate&, QGraphicsItem*)
+    is deprecated.
+*/
 HbQwertyKeyboard::HbQwertyKeyboard(HbQwertyKeyboardPrivate &dd, QGraphicsItem* parent)
 : HbInputVkbWidget(dd, parent)
 {
 }
 
-// ---------------------------------------------------------------------------
-// HbQwertyKeyboard::~HbQwertyKeyboard
-//
-// ---------------------------------------------------------------------------
-//
+/*!
+\deprecated HbQwertyKeyboard::~HbQwertyKeyboard()
+    is deprecated.
+*/
 HbQwertyKeyboard::~HbQwertyKeyboard()
 {
 }
 
 /*!
-Returns keyboard type.
+\reimp
+\deprecated HbQwertyKeyboard::keyboardType() const
+    is deprecated.
 */
 HbKeyboardType HbQwertyKeyboard::keyboardType() const
 {
     return HbKeyboardVirtualQwerty;
 }
 
-// ---------------------------------------------------------------------------
-// HbQwertyKeyboard::setMode
-//
-// ---------------------------------------------------------------------------
-//
+/*!
+\reimp
+\deprecated HbQwertyKeyboard::setMode(HbKeypadMode, QFlags<HbModifier>)
+    is deprecated.
+*/
 void HbQwertyKeyboard::setMode(HbKeypadMode mode, HbModifiers modifiers)
 {
     Q_D(HbQwertyKeyboard);
@@ -942,7 +970,7 @@
     if(d->mMode == EModeNumeric && d->mKeypadCreated) {
         // for numeric edito we need to update sct character button everytime
         // we move between editors. ( dialer editor, digits only, formatted editor ect)
-        d->updateButtonsText();
+        d->updateButtonsTextAndMappers();
     }
 
 	setupToolCluster();
@@ -978,27 +1006,14 @@
         // Numeric keyboard does not change mode
         return;
     }
-
-    for (int i = 0; i < d->mButtons.count(); i++) {
-        if (i < keymapCount) {
-            d->mButtons.at(i)->setText(d->textForKey(i));
-            if (d->mKeymapChanged) {
-                HbTouchKeypadButton *button = d->mButtons.at(i);
-                d->mReleaseMapper->removeMappings(button);
-                d->mPressMapper->removeMappings(button);
-                d->mClickMapper->removeMappings(button);
-                d->mReleaseMapper->setMapping(button, keymap->keys.at(i)->keycode.unicode());
-                d->mPressMapper->setMapping(button, keymap->keys.at(i)->keycode.unicode());
-                d->mClickMapper->setMapping(button, keymap->keys.at(i)->keycode.unicode());
-            }
-        }
-    }
+    d->updateButtonsTextAndMappers();
     d->applyEditorConstraints();
 }
 
 /*!
-Sets key map data object. Given key map data will be used as a source for button titles.
-Usually the key map data for active input language is used.
+\reimp
+\deprecated HbQwertyKeyboard::setKeymap(const HbKeymap*)
+    is deprecated.
 */
 void HbQwertyKeyboard::setKeymap(const HbKeymap* keymap)
 {
@@ -1018,7 +1033,8 @@
 }
 
 /*!
-Initializes keypad dimensions based on the current screen configuration.
+\reimp
+\deprecated HbQwertyKeyboard::aboutToOpen(HbVkbHost*)
 */
 void HbQwertyKeyboard::aboutToOpen(HbVkbHost *host)
 {
@@ -1030,7 +1046,8 @@
 }
 
 /*!
-Returns preferred keyboard size. HbVkbHost uses this information when it opens the keyboard.
+\reimp
+\deprecated HbQwertyKeyboard::preferredKeyboardSize()
 */
 QSizeF HbQwertyKeyboard::preferredKeyboardSize()
 {
@@ -1049,7 +1066,8 @@
 }
 
 /*!
-This function shows the preview of characters on top of currently pressed button.
+\deprecated HbQwertyKeyboard::previewCharacters(const QStringList&)
+    is deprecated.
 */
 bool HbQwertyKeyboard::previewCharacters(const QStringList& characters)
 {
@@ -1091,7 +1109,8 @@
 }
 
 /*!
-This function is called when the keypad is about to close.
+\reimp
+\deprecated HbQwertyKeyboard::aboutToClose(HbVkbHost*)
 */
 void HbQwertyKeyboard::aboutToClose(HbVkbHost *host)
 {
@@ -1101,7 +1120,7 @@
     if (d->mPreviewPane->isVisible()) {
         d->mPreviewPane->hide();
     }
-    // reset the states as the keypad is closing..!
+    // reset the states as the keypad is closing
     d->mLongKeyPressCharsShown = false;
     d->mInStickyRegion = true;
 
@@ -1125,9 +1144,8 @@
 }
 
 /*!
-This slot is called when we slide our fingures on top of the keypad buttons and
-while sliding our fingure comes on top of a non sticky button Or on a region outside
-the keypad area.
+\deprecated HbQwertyKeyboard::enteredInNonStickyRegion()
+    is deprecated.
 */
 void HbQwertyKeyboard::enteredInNonStickyRegion()
 {
@@ -1140,20 +1158,11 @@
 }
 
 /*!
-Handles virtual key release
+\deprecated HbQwertyKeyboard::mappedKeyClick(int)
+  is deprecated and will be removed.
 */
 void HbQwertyKeyboard::mappedKeyClick(int buttonid)
 {
-    Q_D(HbQwertyKeyboard);
-
-    if( d->mMode == EModeNumeric && buttonid != Qt::Key_Control && buttonid != Qt::Key_Shift 
-        && buttonid != Qt::Key_Backspace ) {
-        const QString &text = d->mButtons[buttonid]->text();
-        if(!text.isEmpty()){
-            buttonid = text[0].unicode();
-        }
-    }
-
-    d->handleStandardButtonClick(buttonid);
+    Q_UNUSED(buttonid);
 }
 // End of file
diff -r 16d8024aca5e -r f7ac710697a9 src/hbinput/inputwidgets/hbinputqwertytouchkeyboard_p.h
--- a/src/hbinput/inputwidgets/hbinputqwertytouchkeyboard_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputqwertytouchkeyboard_p.h	Mon May 03 12:48:33 2010 +0300
@@ -52,7 +52,6 @@
     ~HbQwertyKeyboardPrivate();
     void handleStandardButtonPress(int buttonId);
     void handleStandardButtonRelease(int buttonId);
-    void handleStandardButtonClick(int aButtonId);
 
     void setLayoutDimensions(QSizeF dimensions);
     QSizeF calculateDimensions(QSizeF size);
@@ -73,7 +72,7 @@
     int keyCode(int buttonId);
     int keyCode(HbTouchKeypadButton *button);
     void getAllowedSctCharcters(QString & allowedSctCharacters);
-    void updateButtonsText();
+    void updateButtonsTextAndMappers();
 public:
     QList<HbTouchKeypadButton*> mButtons;
     QList<HbStyleOptionLabel*> mKeypadButtonOption;
diff -r 16d8024aca5e -r f7ac710697a9 src/hbinput/inputwidgets/hbinputscreenshotwidget.h
--- a/src/hbinput/inputwidgets/hbinputscreenshotwidget.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputscreenshotwidget.h	Mon May 03 12:48:33 2010 +0300
@@ -45,8 +45,8 @@
 
 protected: // From QGraphicsItem
     virtual QPainterPath shape () const;
-    virtual void mousePressEvent(QGraphicsSceneMouseEvent* aEvent); 
-    virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent* aEvent);
+    virtual void mousePressEvent(QGraphicsSceneMouseEvent* event);
+    virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent* event);
     virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget);
     virtual int type() const { return Hb::ItemType_InputVkbWidget; }
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbinput/inputwidgets/hbinputsctlandscape.cpp
--- a/src/hbinput/inputwidgets/hbinputsctlandscape.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputsctlandscape.cpp	Mon May 03 12:48:33 2010 +0300
@@ -47,6 +47,7 @@
     @proto
     @hbinput
     \class HbInputSctLandscape
+    \deprecated class HbInputSctLandscape
     \brief A widget for displaying special character table in landscape mode.
     
     This widget displays special character table. Characters are organized in grid
@@ -454,15 +455,6 @@
 */
 void HbInputSctLandscapePrivate::handleStandardButtonClick(int buttonId)
 {
-    // if there was a flick event, then make sure that the release events are not handled
-    // basically, a release on a button would add the character to the editor, and this wasn't
-    // intended, as you are gesturing for another action
-    if(mFlickDirection==HbInputVkbWidget::HbFlickDirectionDown ||
-       mFlickDirection==HbInputVkbWidget::HbFlickDirectionLeft ||
-       mFlickDirection==HbInputVkbWidget::HbFlickDirectionRight) {
-        return;
-    }
-
     Q_Q(HbInputSctLandscape);
 
     switch (sctVkbTable[buttonId].mKey) {
@@ -538,7 +530,8 @@
 /// @endcond
 
 /*!
-Constructs the object.
+\deprecated HbInputSctLandscape::HbInputSctLandscape(HbInputMethod*, const HbKeymap*, QGraphicsItem*)
+    is deprecated.
 */
 HbInputSctLandscape::HbInputSctLandscape(HbInputMethod* owner, const HbKeymap *keymap, QGraphicsItem* parent)
                     : HbInputVkbWidget(*new HbInputSctLandscapePrivate, parent)
@@ -569,20 +562,27 @@
     setKeymap(keymap);
 }
 
+/*!
+\deprecated HbInputSctLandscape::HbInputSctLandscape(HbInputSctLandscapePrivate&, QGraphicsItem*)
+    is deprecated.
+*/
 HbInputSctLandscape::HbInputSctLandscape(HbInputSctLandscapePrivate &dd, QGraphicsItem* parent)
             : HbInputVkbWidget(dd, parent)
 {
 }
 
 /*!
-Destructs the object.
+\deprecated HbInputSctLandscape::~HbInputSctLandscape()
+    is deprecated.
 */
 HbInputSctLandscape::~HbInputSctLandscape()
 {
 }
 
 /*!
-Returns keyboard type.
+\reimp
+\deprecated HbInputSctLandscape::keyboardType() const
+    is deprecated.
 */
 HbKeyboardType HbInputSctLandscape::keyboardType() const
 {
@@ -590,9 +590,8 @@
 }
 
 /*!
-Sets the sct keypad buttons depending on the keymapping set to the keypad.
-Different Smiley, special character views can be activated directly.
-Most used character pane can also be enabled by this function.
+\deprecated HbInputSctLandscape::setSct(HbSctView, bool)
+    is deprecated.
 */
 void HbInputSctLandscape::setSct(HbSctView view , bool enableMostUsedCharacterPane)
 {
@@ -608,8 +607,9 @@
 }
 
 /*!
-This function should be called when ever there is a language change.
-This gets the special characters from the given keymappings.
+\reimp
+\deprecated HbInputSctLandscape::setKeymap(const HbKeymap*)
+    is deprecated.
 */
 void HbInputSctLandscape::setKeymap(const HbKeymap* keymap)
 {
@@ -619,7 +619,9 @@
 }
 
 /*!
-This function provides the actual button layout of the keypad.
+\reimp
+\deprecated HbInputSctLandscape::keypadLayout()
+    is deprecated.
 */
 QGraphicsLayout *HbInputSctLandscape::keypadLayout()
 {
@@ -628,7 +630,9 @@
 }
 
 /*!
-This is called right before the keypad is about to open.
+\reimp
+\deprecated HbInputSctLandscape::aboutToOpen(HbVkbHost*)
+    is deprecated.
 */
 void HbInputSctLandscape::aboutToOpen(HbVkbHost *host)
 {
@@ -645,7 +649,9 @@
 }
 
 /*!
-This is called right before the keypad is about to close. 
+\reimp
+\deprecated HbInputSctLandscape::aboutToClose(HbVkbHost*)
+    is deprecated.
 */
 void HbInputSctLandscape::aboutToClose(HbVkbHost *host)
 {
@@ -657,8 +663,8 @@
 }
 
 /*!
-this is called whenever there is a left/right flick event on sct keypad
-used to navigate within the sct keypad for more characters
+\deprecated HbInputSctLandscape::flickTriggered(HbInputVkbWidget::HbFlickDirection)
+    is deprecated.
 */
 void HbInputSctLandscape::flickTriggered(HbInputVkbWidget::HbFlickDirection direction)
 {
diff -r 16d8024aca5e -r f7ac710697a9 src/hbinput/inputwidgets/hbinputsctportrait.cpp
--- a/src/hbinput/inputwidgets/hbinputsctportrait.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputsctportrait.cpp	Mon May 03 12:48:33 2010 +0300
@@ -50,6 +50,7 @@
     @proto
     @hbinput
     \class HbInputSctPortrait
+    \deprecated class HbInputSctPortrait
     \brief A widget for displaying special character table in portrait mode.
     
     This widget displays special character table. Characters are organized in grid
@@ -296,7 +297,7 @@
     if (buttonId == HbDelButtonId) {
         code = Qt::Key_Delete;
     } else if (buttonId == HbAbcButtonId) {
-        code = Qt::Key_Asterisk;
+		code = Qt::Key_Control;
     } else if (buttonId == HbSpecialCharacterButtonId) {
         code = Qt::Key_F1;
     } else if (buttonId == HbSmileyButtonId) {
@@ -323,13 +324,14 @@
     Q_Q(HbInputSctPortrait);
 
     if (buttonId >= 0 && buttonId < HbNumSctButtons &&
-        buttonId%HbSctGridColumns != HbSctGridColumns-1) {
-        QString buttonText = mSctButtons.at(buttonId)->text();
-
-        if (buttonText.length() > 0) {
-            emit q->sctCharacterSelected(buttonText.at(0));
-        }
-    } else if (keyCode(buttonId) == Qt::Key_F1) {
+		buttonId%HbSctGridColumns != HbSctGridColumns-1) {
+			QString buttonText = mSctButtons.at(buttonId)->text();
+			if (mSctButtons.at(buttonId) && !mSctButtons.at(buttonId)->isFaded()) {
+				if (buttonText.length() > 0) {
+					emit q->sctCharacterSelected(buttonText.at(0));
+				}
+			}
+	} else if (keyCode(buttonId) == Qt::Key_F1) {
         if(mActiveView != HbInputVkbWidget::HbSctViewSpecialCharacter) {
             mStartIndex = 0;
         }
@@ -374,7 +376,8 @@
 /// @endcond
 
 /*!
-Constructs the object.
+\deprecated HbInputSctPortrait::HbInputSctPortrait(HbInputMethod*, const HbKeymap *, QGraphicsItem*)
+    is deprecated.
 */
 HbInputSctPortrait::HbInputSctPortrait(HbInputMethod* owner, const HbKeymap *keymap, QGraphicsItem* parent)
                     : HbInputVkbWidget(*new HbInputSctPortraitPrivate, parent)
@@ -403,26 +406,36 @@
     setKeymap(keymap);
 }
 
+/*!
+\deprecated HbInputSctPortrait::HbInputSctPortrait(HbInputSctPortraitPrivate &, QGraphicsItem*)
+    is deprecated.
+*/
 HbInputSctPortrait::HbInputSctPortrait(HbInputSctPortraitPrivate &dd, QGraphicsItem* parent)
     : HbInputVkbWidget(dd, parent)
 {
 }
 
 /*!
-Destructs the object.
+\deprecated HbInputSctPortrait::~HbInputSctPortrait()
+    is deprecated.
 */
 HbInputSctPortrait::~HbInputSctPortrait()
 {
 }
 
 /*!
-Returns keyboard type.
+\deprecated HbInputSctPortrait::keyboardType() const
+    is deprecated.
 */
 HbKeyboardType HbInputSctPortrait::keyboardType() const
 {
     return HbKeyboardSctPortrait;
 }
 
+/*!
+\deprecated HbInputSctPortrait::setSct(HbSctView)
+    is deprecated.
+*/
 void HbInputSctPortrait::setSct(HbSctView view)
 {
     Q_D(HbInputSctPortrait);
@@ -434,8 +447,8 @@
 }
 
 /*!
-This function should be called when ever there is a language change.
-This gets the accented and special characters from the given keymappings.
+\deprecated HbInputSctPortrait::setKeymap(const HbKeymap*)
+    is deprecated.
 */
 void HbInputSctPortrait::setKeymap(const HbKeymap* keymap)
 {
@@ -444,12 +457,20 @@
     d->getSpecialCharacters();
 }
 
+/*!
+\deprecated HbInputSctPortrait::keypadLayout()
+    is deprecated.
+*/
 QGraphicsLayout *HbInputSctPortrait::keypadLayout()
 {
     Q_D(HbInputSctPortrait);
     return d->mButtonLayout;
 }
 
+/*!
+\deprecated HbInputSctPortrait::aboutToOpen(HbVkbHost*)
+    is deprecated.
+*/
 void HbInputSctPortrait::aboutToOpen(HbVkbHost *host)
 {
     Q_D(HbInputSctPortrait);
@@ -462,6 +483,10 @@
     d->setLayoutDimensions(keypadSize);
 }
 
+/*!
+\deprecated HbInputSctPortrait::flickTriggered(HbInputVkbWidget::HbFlickDirection)
+    is deprecated.
+*/
 void HbInputSctPortrait::flickTriggered(HbInputVkbWidget::HbFlickDirection direction)
 {
     Q_D(HbInputSctPortrait);
diff -r 16d8024aca5e -r f7ac710697a9 src/hbinput/inputwidgets/hbinputsettingdialog.cpp
--- a/src/hbinput/inputwidgets/hbinputsettingdialog.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputsettingdialog.cpp	Mon May 03 12:48:33 2010 +0300
@@ -26,6 +26,7 @@
 #if QT_VERSION >= 0x040600
 #include <QGraphicsDropShadowEffect>
 #endif
+#include <QtAlgorithms>
 
 #include <hbdataform.h>
 #include <hbdataformmodel.h>
@@ -38,7 +39,7 @@
 #include <hbdeviceprofile.h>
 
 #include <hbinputlanguage.h>
-
+#include <hbstringutil.h>
 #include <hbdialog_p.h>
 
 #include "hbinputsettingproxy.h"
@@ -57,6 +58,7 @@
     void fillLanguageList(QStringList &list, QList<HbInputLanguage> &languageList, QString replace = QString(" "));
     int languageToIndex(HbInputLanguage &language, QList<HbInputLanguage> &languageList);
     HbInputLanguage indexToLanguage(int index, QList<HbInputLanguage> &languageList);
+    static bool caseInsensitiveLessThan(const HbInputLanguage &s1, const HbInputLanguage &s2);
 
 public:
     HbDataForm *mForm;
@@ -64,23 +66,24 @@
     QList<HbInputLanguage> mSecondaryLanguages;
     HbInputLanguage mPrimaryInputLanguage;
     HbInputLanguage mSecondaryInputLanguage;
-    int mPredictionStatus;
-    HbComboBox *mPrimaryComboBox;
-    HbComboBox *mSecondaryComboBox;
+    bool mPredictionStatus;
     HbPushButton *mPredictionButton;
+    HbDataFormModelItem *mSecondaryLangComboBox;
 };
 
 HbInputSettingDialogPrivate::HbInputSettingDialogPrivate()
- : mPrimaryComboBox(0), mSecondaryComboBox(0), mPredictionButton(0)
+ : mPredictionButton(0), mSecondaryLangComboBox(0)
 {
     mForm = new HbDataForm();
 
     HbInputSettingProxy *settings = HbInputSettingProxy::instance();
     mPrimaryInputLanguage = settings->globalInputLanguage();
     mSecondaryInputLanguage = settings->globalSecondaryInputLanguage();
-    mPredictionStatus = settings->predictiveInputStatus();
+    mPredictionStatus = settings->predictiveInputStatusForActiveKeyboard();
 
     HbInputUtils::listSupportedInputLanguages(mPrimaryLanguages);
+    qStableSort(mPrimaryLanguages.begin(), mPrimaryLanguages.end(), HbInputSettingDialogPrivate::caseInsensitiveLessThan);
+    //No need to sort secondary language as primary language list is already sorted.
     createSecondaryLanguageList();
 }
 
@@ -134,13 +137,24 @@
     }
 }
 
+bool HbInputSettingDialogPrivate::caseInsensitiveLessThan(const HbInputLanguage &s1, const HbInputLanguage &s2)
+{
+    //Temporaries because localisedName() is a non-const function
+    HbInputLanguage t1 = s1;
+    HbInputLanguage t2 = s2;
+    //Locale based comparison does not seem to be working perfectly.
+    //return !HbStringUtil::compareC(s1.localisedName(),s2.localisedName());
+    return t1.localisedName().toLower() < t2.localisedName().toLower();
+}
+
+
 /// @endcond
 
-// ---------------------------------------------------------------------------
-// HbInputSettingDialog::HbInputSettingDialog
-//
-// ---------------------------------------------------------------------------
-//
+/*!
+\deprecated HbInputSettingDialog::HbInputSettingDialog(HbSettingItems, QGraphicsWidget*)
+    is deprecated. HbInputSettingDialog will be removed.
+
+*/
 HbInputSettingDialog::HbInputSettingDialog(HbSettingItems items, QGraphicsWidget *parent)
     : HbDialog(*new HbInputSettingDialogPrivate, parent)
 {
@@ -192,14 +206,13 @@
     }
     // Create drop down list for secondary language selection
     if(items & HbSettingItemSecondaryLang) {
-        HbDataFormModelItem *secondaryLanguage =
-            model->appendDataFormItem(HbDataFormModelItem::ComboBoxItem, tr("Secondary Writing language"));
+        d->mSecondaryLangComboBox = model->appendDataFormItem(HbDataFormModelItem::ComboBoxItem, tr("Secondary Writing language"));
         QStringList secondaryLanguageItems;
         d->fillLanguageList(secondaryLanguageItems, d->mSecondaryLanguages, tr("None"));
-        secondaryLanguage->setContentWidgetData(QString("items"),secondaryLanguageItems);
-        secondaryLanguage->setContentWidgetData(QString("currentIndex"),d->languageToIndex(d->mSecondaryInputLanguage, d->mSecondaryLanguages));
-        secondaryLanguage->setData(HbDataFormModelItem::KeyRole, QString("secondary_language"));
-        d->mForm->addConnection(secondaryLanguage, SIGNAL(currentIndexChanged(int)), this, SLOT(secondaryLanguageChanged(int)));
+        d->mSecondaryLangComboBox->setContentWidgetData(QString("items"),secondaryLanguageItems);
+        d->mSecondaryLangComboBox->setContentWidgetData(QString("currentIndex"),d->languageToIndex(d->mSecondaryInputLanguage, d->mSecondaryLanguages));
+        d->mSecondaryLangComboBox->setData(HbDataFormModelItem::KeyRole, QString("secondary_language"));
+        d->mForm->addConnection(d->mSecondaryLangComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(secondaryLanguageChanged(int)));
     }
     if(items & HbSettingItemPrediction) {
         QString statusOff = tr("Off");
@@ -226,20 +239,21 @@
     setContentWidget(d->mForm);
 }
 
-// ---------------------------------------------------------------------------
-// HbInputSettingDialog::~HbInputSettingDialog
-//
-// ---------------------------------------------------------------------------
-//
+/*!
+\deprecated HbInputSettingDialog::~HbInputSettingDialog()
+    is deprecated. HbInputSettingDialog will be removed.
+
+*/
 HbInputSettingDialog::~HbInputSettingDialog()
 {
 }
 
-// ---------------------------------------------------------------------------
-// HbInputSettingDialog::selected
-// Called when new settings are accepted
-// ---------------------------------------------------------------------------
-//
+/*!
+\deprecated HbInputSettingDialog::selected()
+    is deprecated. HbInputSettingDialog will be removed.
+
+Called when new settings are accepted
+*/
 void HbInputSettingDialog::selected()
 {
     Q_D(HbInputSettingDialog);
@@ -261,46 +275,49 @@
         d->mPredictionStatus = false;
     }
     //  synchronize the prediction status in settings to prediction status set through the settings dialog.	
-    if(d->mPredictionStatus != settings->predictiveInputStatus()) {
-        settings->setPredictiveInputStatus(d->mPredictionStatus);
+    if (d->mPredictionStatus != settings->predictiveInputStatusForActiveKeyboard()) {
+        settings->setPredictiveInputStatusForActiveKeyboard(d->mPredictionStatus);
     }
 }
 
 /*!
 \deprecated HbInputSettingDialog::settingItemDisplayed(const QModelIndex&)
-  is deprecated and will be removed.
+    is deprecated. HbInputSettingDialog will be removed.
+
+Called when setting items are shown
 */
 void HbInputSettingDialog::settingItemDisplayed(const QModelIndex &index)
 {
     Q_UNUSED(index);
 }
 
-// ---------------------------------------------------------------------------
-// HbInputSettingDialog::primaryLanguageChanged
-// Called when user changes primary language
-// ---------------------------------------------------------------------------
-//
+/*!
+\deprecated HbInputSettingDialog::primaryLanguageChanged(int index)
+    is deprecated. HbInputSettingDialog will be removed.
+
+Called when user changes primary language
+*/
 void HbInputSettingDialog::primaryLanguageChanged(int index)
 {
     Q_D(HbInputSettingDialog);
 
     HbInputSettingProxy *settings = HbInputSettingProxy::instance();
     HbPredictionFactory *predFactory = HbPredictionFactory::instance();
-    int oldPLangSupportsPrediction = (predFactory->predictionEngineForLanguage(d->mPrimaryInputLanguage) != NULL);		
+    bool oldPLangSupportsPrediction = (predFactory->predictionEngineForLanguage(d->mPrimaryInputLanguage) != NULL);		
     d->mPrimaryInputLanguage = d->indexToLanguage(index, d->mPrimaryLanguages);
-    int langSupportsPrediction = (predFactory->predictionEngineForLanguage(d->mPrimaryInputLanguage) != NULL);		
+    bool langSupportsPrediction = (predFactory->predictionEngineForLanguage(d->mPrimaryInputLanguage) != NULL);		
     if( oldPLangSupportsPrediction != langSupportsPrediction ) {
         if(langSupportsPrediction) { // language supports prediction
             // first we need to enable the button then only we can click on it
-            if (d->mPredictionButton && settings->predictiveInputStatus() != d->mPredictionStatus) {
+            if (d->mPredictionButton && settings->predictiveInputStatusForActiveKeyboard() != d->mPredictionStatus) {
                 d->mPredictionButton->click();
-            } else if (!d->mPredictionButton && settings->predictiveInputStatus() != d->mPredictionStatus) { 
+            } else if (!d->mPredictionButton && settings->predictiveInputStatusForActiveKeyboard() != d->mPredictionStatus) { 
                 // for numeric editors we dont have prediction button but we need to change the prediction status while changing language
-                d->mPredictionStatus = settings->predictiveInputStatus();
+                d->mPredictionStatus = settings->predictiveInputStatusForActiveKeyboard();
             }
         } else { // language does not supports prediction
             if(d->mPredictionButton && (d->mPredictionStatus)) {
-                d->mPredictionButton->click();		
+                d->mPredictionButton->click();
             } else if (!d->mPredictionButton && langSupportsPrediction != d->mPredictionStatus) {
                 // for numeric editors we dont have prediction button but we need to change the prediction status
                 d->mPredictionStatus = langSupportsPrediction;	
@@ -310,26 +327,23 @@
             d->mPredictionButton->setEnabled(langSupportsPrediction);
         }
     }
-    if (d->mSecondaryComboBox) {
-        HbInputLanguage secondaryLanguage = d->mSecondaryInputLanguage;
 
-        // Update secondary language list
+    // refreshing the secondary language list
+    // remove the current primary language selected from the secondary language items list
+    if(d->mSecondaryLangComboBox) {
         d->createSecondaryLanguageList();
         QStringList secondaryLanguageItems;
         d->fillLanguageList(secondaryLanguageItems, d->mSecondaryLanguages, tr("None"));
-        d->mSecondaryComboBox->setItems(secondaryLanguageItems);
-
-        if (d->mPrimaryInputLanguage != secondaryLanguage) {
-            d->mSecondaryComboBox->setCurrentIndex(d->languageToIndex(secondaryLanguage, d->mSecondaryLanguages));
-        }
+        d->mSecondaryLangComboBox->setContentWidgetData(QString("items"),secondaryLanguageItems);
     }
 }
 
-// ---------------------------------------------------------------------------
-// HbInputSettingDialog::secondaryLanguageChanged
-// Called when user changes secondary language
-// ---------------------------------------------------------------------------
-//
+/*!
+\deprecated HbInputSettingDialog::secondaryLanguageChanged(int)
+    is deprecated. HbInputSettingDialog will be removed.
+
+Called when user changes secondary language
+*/
 void HbInputSettingDialog::secondaryLanguageChanged(int index)
 {
     Q_D(HbInputSettingDialog);
@@ -337,11 +351,12 @@
     d->mSecondaryInputLanguage = d->indexToLanguage(index, d->mSecondaryLanguages);
 }
 
-// ---------------------------------------------------------------------------
-// HbInputSettingDialog::predictionStatusChanged
-// Called when user changes prediction status
-// ---------------------------------------------------------------------------
-//
+/*!
+\deprecated HbInputSettingDialog::predictionStatusChanged()
+    is deprecated. HbInputSettingDialog will be removed.
+
+Called when user changes prediction status
+*/
 void HbInputSettingDialog::predictionStatusChanged()
 {
     Q_D(HbInputSettingDialog);
@@ -350,6 +365,9 @@
 }
 
 /*!
+\deprecated HbInputSettingDialog::showEvent(QShowEvent*)
+    is deprecated. HbInputSettingDialog will be removed.
+
 \reimp
 */
 void HbInputSettingDialog::showEvent(QShowEvent *event)
diff -r 16d8024aca5e -r f7ac710697a9 src/hbinput/inputwidgets/hbinputsettinglist.cpp
--- a/src/hbinput/inputwidgets/hbinputsettinglist.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputsettinglist.cpp	Mon May 03 12:48:33 2010 +0300
@@ -153,14 +153,13 @@
 
     connect(d->mLanguageButton, SIGNAL(clicked(bool)), this, SLOT(languageButtonClicked()));
     connect(d->mPredictionButton, SIGNAL(clicked(bool)), this, SLOT(predictionButtonClicked()));
-    connect(d->mOptionList, SIGNAL(activated(HbListWidgetItem *)), this, SLOT(listItemActivated(HbListWidgetItem *)));
+    connect(d->mOptionList, SIGNAL(activated(HbListWidgetItem*)), this, SLOT(listItemActivated(HbListWidgetItem*)));
+    connect(d->mOptionList, SIGNAL(longPressed(HbListWidgetItem*, const QPointF&)), this, SLOT(listItemActivated(HbListWidgetItem*)));
 
     HbInputSettingProxy *settings = HbInputSettingProxy::instance();
     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(int)), this, SLOT(predictionStatusChanged(int)));
-
-    connect(this, SIGNAL(aboutToClose()), this, SLOT(saveSettings()));
+    connect(settings, SIGNAL(predictiveInputStateChanged(HbKeyboardSettingFlags, bool)), this, SLOT(predictionStatusChanged(HbKeyboardSettingFlags, bool)));
 }
 
 /*!
@@ -171,10 +170,18 @@
 }
 
 /*!
-Opens the setting list
+\deprecated HbInputSettingList::showSettingList()
+    is deprecated. Use updateSettingList and open functions instead.
 */
 void HbInputSettingList::showSettingList()
 {
+}
+
+/*!
+Updates settings list with current values
+*/
+void HbInputSettingList::updateSettingList()
+{
     Q_D(HbInputSettingList);
 
     HbInputSettingProxy *settings = HbInputSettingProxy::instance();
@@ -182,7 +189,7 @@
     d->mSecondaryLanguage = settings->globalSecondaryInputLanguage();
 
     d->mLanguageButton->setText(d->mPrimaryLanguage.localisedName());
-    d->mPredictionButton->setText(d->mPredictionValues.at(settings->predictiveInputStatus()));
+    d->mPredictionButton->setText(d->mPredictionValues.at(settings->predictiveInputStatusForActiveKeyboard()));
 
     QList<HbInputMethodDescriptor> customList = HbInputMethod::listCustomInputMethods();
     bool showInputMethod = true;
@@ -195,8 +202,6 @@
     } else if (d->mOptionList->count() == 2 && !showInputMethod) {
         delete d->mOptionList->takeItem(0);
     }
-
-    exec();
 }
 
 /*!
@@ -233,7 +238,12 @@
         d->mPrimaryLanguage = d->mSecondaryLanguage;
         d->mSecondaryLanguage = language;
 
-        primaryLanguageChanged(d->mPrimaryLanguage);
+        HbInputSettingProxy::instance()->setGlobalInputLanguage(d->mPrimaryLanguage);
+        HbInputSettingProxy::instance()->setGlobalSecondaryInputLanguage(d->mSecondaryLanguage);
+        
+        if (!HbPredictionFactory::instance()->predictionEngineForLanguage(d->mPrimaryLanguage)) {
+            HbInputSettingProxy::instance()->setPredictiveInputStatus(false);
+        }
     }
 
     close();
@@ -244,8 +254,7 @@
 */
 void HbInputSettingList::predictionButtonClicked()
 {
-    HbInputSettingProxy *settings = HbInputSettingProxy::instance();
-    settings->setPredictiveInputStatus(!settings->predictiveInputStatus());
+    HbInputSettingProxy::instance()->togglePrediction();
 
     close();
 }
@@ -288,34 +297,35 @@
 }
 
 /*!
+\deprecated HbInputSettingList::predictionStatusChanged(int)
+    is deprecated. Use predictionStatusChanged(bool) instead.
+
 Updates prediction button text
 */
 void HbInputSettingList::predictionStatusChanged(int newStatus)
 {
-    Q_D(HbInputSettingList);
-
-    d->mPredictionButton->setText(d->mPredictionValues.at(newStatus));
+    Q_UNUSED(newStatus);
 }
 
 /*!
-Stores the current language selection
+Updates prediction button text
+*/
+void HbInputSettingList::predictionStatusChanged(HbKeyboardSettingFlags keyboardType, bool newStatus)
+{
+    Q_D(HbInputSettingList);
+    Q_UNUSED(keyboardType);
+    Q_UNUSED(newStatus);
+
+    bool status = HbInputSettingProxy::instance()->predictiveInputStatusForActiveKeyboard();
+    d->mPredictionButton->setText(d->mPredictionValues.at(status));
+}
+
+/*!
+\deprecated HbInputSettingList::saveSettings()
+    is deprecated. Will be removed.
 */
 void HbInputSettingList::saveSettings()
 {
-    Q_D(HbInputSettingList);
-
-    HbInputSettingProxy *settings = HbInputSettingProxy::instance();
-    HbPredictionFactory *predFactory = HbPredictionFactory::instance();		
-
-    if (d->mPrimaryLanguage != settings->globalInputLanguage()) {
-        settings->setGlobalInputLanguage(d->mPrimaryLanguage);
-        settings->setGlobalSecondaryInputLanguage(d->mSecondaryLanguage);
-        if(!predFactory->predictionEngineForLanguage(d->mPrimaryLanguage)) {
-            predictionStatusChanged(false);
-            settings->setPredictiveInputStatus(false);
-        }
-    }
 }
 
 // End of file
-
diff -r 16d8024aca5e -r f7ac710697a9 src/hbinput/inputwidgets/hbinputsettinglist.h
--- a/src/hbinput/inputwidgets/hbinputsettinglist.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputsettinglist.h	Mon May 03 12:48:33 2010 +0300
@@ -27,6 +27,7 @@
 #define HB_INPUT_SETTING_LIST_H
 
 #include <hbdialog.h>
+#include <hbinputdef.h>
 
 class HbInputSettingListPrivate;
 class HbListWidgetItem;
@@ -42,6 +43,7 @@
 
 public:
     void showSettingList();
+    void updateSettingList();
     void setLanguageSelectionEnabled(bool disabled);
     void setPredictionSelectionEnabled(bool disabled);
 
@@ -52,6 +54,7 @@
     void primaryLanguageChanged(const HbInputLanguage &newLanguage);
     void secondaryLanguageChanged(const HbInputLanguage &newLanguage);
     void predictionStatusChanged(int newStatus);
+    void predictionStatusChanged(HbKeyboardSettingFlags keyboardType, bool newStatus);
     void saveSettings();
 
 signals:
diff -r 16d8024aca5e -r f7ac710697a9 src/hbinput/inputwidgets/hbinputsettingwidget.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbinput/inputwidgets/hbinputsettingwidget.cpp	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,586 @@
+/****************************************************************************
+**
+** 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 <hbdataform.h>
+#include <hbdataformmodel.h>
+#include <hbinpututils.h>
+#include <hbinputsettingproxy.h>
+#include <hbinputpredictionfactory.h>
+
+#include "hbinputsettingwidget.h"
+#include "hbinputcheckboxlist_p.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
+
+class HbInputSettingWidgetPrivate
+{
+    Q_DECLARE_PUBLIC(HbInputSettingWidget)
+
+public:
+    HbInputSettingWidgetPrivate(HbDataForm *dataForm);
+
+    void initialize();
+    void createSettingItems();
+    void fillLanguageList(QStringList &list, QList<HbInputLanguage> &languageList, const QString &replace = QString(" "));
+    int languageToIndex(const HbInputLanguage &language, const QList<HbInputLanguage> &languageList);
+    HbInputLanguage indexToLanguage(int index, const QList<HbInputLanguage> &languageList);
+    void createSecondaryLanguageList();
+
+public:
+    HbDataForm *mForm;
+    HbDataFormModelItem *mPrimaryLanguageItem;
+    HbDataFormModelItem *mSecondaryLanguageItem;
+    HbDataFormModelItem *mKeypressTimeoutItem;
+    HbDataFormModelItem *mCharacterPreviewItem;
+    HbDataFormModelItem *mPredictionItem;
+    HbDataFormModelItem *mAutoCompletionItem;
+    HbDataFormModelItem *mCorrectionLevelItem;
+    HbDataFormModelItem *mPrimaryCandidateItem;
+    HbInputLanguage mPrimaryInputLanguage;
+    HbInputLanguage mSecondaryInputLanguage;
+    QList<HbInputLanguage> mPrimaryLanguages;
+    QList<HbInputLanguage> mSecondaryLanguages;
+    bool mPredictionStatusForITUT;
+    bool mPredictionStatusForQwerty;
+    bool mCharacterPreviewEnabled;
+    int mKeypressTimeout;
+    bool mAutocompletionForITUT;
+    bool mAutocompletionForQwerty;
+    HbTypingCorrectionLevel mTypingCorrectionLevel;
+    HbPrimaryCandidateMode mPrimaryCandidateMode;
+    HbInputSettingWidget *q_ptr;
+};
+
+/*!
+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)
+{
+}
+
+/*!
+Initializes setting widget
+*/
+void HbInputSettingWidgetPrivate::initialize()
+{
+    HbInputSettingProxy *settings = HbInputSettingProxy::instance();
+    mPrimaryInputLanguage = settings->globalInputLanguage();
+    mSecondaryInputLanguage = settings->globalSecondaryInputLanguage();
+    mPredictionStatusForITUT = settings->predictiveInputStatus(HbKeyboardSetting12key);
+    mPredictionStatusForQwerty = settings->predictiveInputStatus(HbKeyboardSettingQwerty);
+    mCharacterPreviewEnabled = settings->isCharacterPreviewForQwertyEnabled();
+    mKeypressTimeout = settings->keypressTimeout();
+    mAutocompletionForITUT = settings->isAutocompletionEnabled(HbKeyboardSetting12key);
+    mAutocompletionForQwerty = settings->isAutocompletionEnabled(HbKeyboardSettingQwerty);
+    mPrimaryCandidateMode = settings->primaryCandidateMode();
+    mTypingCorrectionLevel = settings->typingCorrectionLevel();
+
+    HbInputUtils::listSupportedInputLanguages(mPrimaryLanguages);
+    createSecondaryLanguageList();
+
+    createSettingItems();
+}
+
+/*!
+Creates setting items to this widget
+*/
+void HbInputSettingWidgetPrivate::createSettingItems()
+{
+    Q_Q(HbInputSettingWidget);
+
+    HbDataFormModel *model = new HbDataFormModel();
+
+    HbInputCheckBoxList *customPrototype = new HbInputCheckBoxList(mForm);
+    QList<HbAbstractViewItem*> prototypes = mForm->itemPrototypes();
+    prototypes.append(customPrototype);
+    mForm->setItemPrototypes(prototypes);
+
+    HbDataFormModelItem *languageGroup = model->appendDataFormGroup(QObject::tr("Language"));
+
+    mPrimaryLanguageItem = new HbDataFormModelItem(HbDataFormModelItem::ComboBoxItem, QObject::tr("Primary Writing language"));
+    languageGroup->appendChild(mPrimaryLanguageItem);
+    QStringList writingLanguageItems;
+    fillLanguageList(writingLanguageItems, mPrimaryLanguages);
+    mPrimaryLanguageItem->setContentWidgetData(QString("items"), writingLanguageItems);
+    mPrimaryLanguageItem->setContentWidgetData(QString("currentIndex"), languageToIndex(mPrimaryInputLanguage, mPrimaryLanguages));
+    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)));
+
+    HbDataFormModelItem *keyboardGroup = model->appendDataFormGroup(QObject::tr("Keyboard"));
+
+    mKeypressTimeoutItem = new HbDataFormModelItem(HbDataFormModelItem::SliderItem, QObject::tr("Keypress Timeout"));
+    keyboardGroup->appendChild(mKeypressTimeoutItem);
+    mKeypressTimeoutItem->setContentWidgetData(QString("minimum"), HbInputMinKeypressTimeout);
+    mKeypressTimeoutItem->setContentWidgetData(QString("maximum"), HbInputMaxKeypressTimeout);
+    mKeypressTimeoutItem->setContentWidgetData(QString("sliderPosition"), mKeypressTimeout);
+    mKeypressTimeoutItem->setContentWidgetData(QString("objectName"), QString("keypress_timeout"));
+    mForm->addConnection(mKeypressTimeoutItem, SIGNAL(valueChanged(int)), q, SLOT(setKeypressTimeoutValue(int)));
+
+    mCharacterPreviewItem = new HbDataFormModelItem(HbDataFormModelItem::ToggleValueItem, QObject::tr("Character bubble"));
+    keyboardGroup->appendChild(mCharacterPreviewItem);
+    if (mCharacterPreviewEnabled) {
+        mCharacterPreviewItem->setContentWidgetData(QString("text"), statusOn);
+        mCharacterPreviewItem->setContentWidgetData(QString("additionalText"), statusOff);
+    } else {
+        mCharacterPreviewItem->setContentWidgetData(QString("text"), statusOff);
+        mCharacterPreviewItem->setContentWidgetData(QString("additionalText"), statusOn);
+    }
+    mCharacterPreviewItem->setContentWidgetData(QString("objectName"), QString("character_bubble"));
+    mForm->addConnection(mCharacterPreviewItem, SIGNAL(clicked(bool)), q, SLOT(setCharacterPreviewState()));
+
+    HbDataFormModelItem *textInputGroup = model->appendDataFormGroup(QObject::tr("Intelligent Text Input"));
+
+    HbDataFormModelItem::DataItemType checkboxList =
+        static_cast<HbDataFormModelItem::DataItemType>(HbDataFormModelItem::CustomItemBase);
+
+    mPredictionItem = new HbDataFormModelItem(checkboxList, QObject::tr("Prediction"));
+    textInputGroup->appendChild(mPredictionItem);
+    QStringList predictionValues;
+    predictionValues << QObject::tr("Qwerty") << QObject::tr("Virtual ITU-T");
+    mPredictionItem->setContentWidgetData(QString("items"), predictionValues);
+    QList<QVariant> predictionEnabled;
+    predictionEnabled << mPredictionStatusForQwerty << mPredictionStatusForITUT;
+    mPredictionItem->setContentWidgetData(QString("selectedItems"), predictionEnabled);
+    mPredictionItem->setContentWidgetData(QString("objectName"), QString("prediction"));
+    mForm->addConnection(mPredictionItem, SIGNAL(activated(const QModelIndex &)), q, SLOT(setPredictionState(const QModelIndex &)));
+
+    mAutoCompletionItem = new HbDataFormModelItem(checkboxList, QObject::tr("Autocompletion"));
+    textInputGroup->appendChild(mAutoCompletionItem);
+    QStringList autoCompletionValues;
+    autoCompletionValues << QObject::tr("Qwerty") << QObject::tr("Virtual ITU-T");
+    mAutoCompletionItem->setContentWidgetData(QString("items"), autoCompletionValues);
+    QList<QVariant> autocompletionEnabled;
+    autocompletionEnabled << mAutocompletionForQwerty << mAutocompletionForITUT;
+    mAutoCompletionItem->setContentWidgetData(QString("selectedItems"), autocompletionEnabled);
+    mAutoCompletionItem->setContentWidgetData(QString("objectName"), QString("autocompletion"));
+    mForm->addConnection(mAutoCompletionItem, SIGNAL(activated(const QModelIndex &)), q, SLOT(setAutocompletionState(const QModelIndex &)));
+
+    mCorrectionLevelItem = new HbDataFormModelItem(HbDataFormModelItem::RadioButtonListItem, QObject::tr("Typing Correction"));
+    textInputGroup->appendChild(mCorrectionLevelItem);
+    QStringList correctionLevels;
+    correctionLevels << QObject::tr("Low") << QObject::tr("Medium") << QObject::tr("High");
+    mCorrectionLevelItem->setContentWidgetData(QString("items"), correctionLevels);
+    mCorrectionLevelItem->setContentWidgetData(QString("selected"), mTypingCorrectionLevel);
+    mCorrectionLevelItem->setContentWidgetData(QString("objectName"), QString("typing_correction"));
+    mForm->addConnection(mCorrectionLevelItem, SIGNAL(itemSelected(int)), q, SLOT(setCorrectionLevel(int)));
+
+    mPrimaryCandidateItem = new HbDataFormModelItem(HbDataFormModelItem::ToggleValueItem, QObject::tr("Primary Candidate"));
+    textInputGroup->appendChild(mPrimaryCandidateItem);
+    if (mPrimaryCandidateMode == HbPrimaryCandidateModeBestPrediction) {
+        mPrimaryCandidateItem->setContentWidgetData(QString("text"), bestPrediction);
+        mPrimaryCandidateItem->setContentWidgetData(QString("additionalText"), exactTyping);
+    } else {
+        mPrimaryCandidateItem->setContentWidgetData(QString("text"), exactTyping);
+        mPrimaryCandidateItem->setContentWidgetData(QString("additionalText"), bestPrediction);
+    }
+    mPrimaryCandidateItem->setContentWidgetData(QString("objectName"), QString("primary_candidate"));
+    mForm->addConnection(mPrimaryCandidateItem, SIGNAL(clicked(bool)), q, SLOT(setPrimaryCandidateMode()));
+
+    mForm->setModel(model);
+}
+
+/*!
+Fills given list with language names in the language list
+*/
+void HbInputSettingWidgetPrivate::fillLanguageList(QStringList &list, QList<HbInputLanguage> &languageList, const QString &replace)
+{
+    foreach(HbInputLanguage language, languageList) {
+        QString langName = language.localisedName();
+        if (langName.length() == 0) {
+            langName = replace;
+        }
+        list << langName;
+    }
+}
+
+/*!
+Returns index of the given language at the language list
+*/
+int HbInputSettingWidgetPrivate::languageToIndex(const HbInputLanguage &language, const QList<HbInputLanguage> &languageList)
+{
+    for (int i = 0; i < languageList.count(); ++i) {
+        if (languageList.at(i) == language) {
+            return i;
+        }
+    }
+    return -1;
+}
+
+/*!
+Returns language in the given index at the language list
+*/
+HbInputLanguage HbInputSettingWidgetPrivate::indexToLanguage(int index, const QList<HbInputLanguage> &languageList)
+{
+    if (index >= 0 && index < languageList.count()) {
+        return languageList.at(index);
+    } else {
+        return HbInputLanguage();
+    }
+}
+
+/*!
+Creates list of secondary languages
+*/
+void HbInputSettingWidgetPrivate::createSecondaryLanguageList()
+{
+    mSecondaryLanguages.clear();
+
+    mSecondaryLanguages.append(HbInputLanguage());
+
+    if (mPrimaryInputLanguage.language() != QLocale::Chinese) {
+        foreach(HbInputLanguage language, mPrimaryLanguages) {
+            if (language != mPrimaryInputLanguage &&
+                language != QLocale::Chinese) {
+                mSecondaryLanguages.append(language);
+            }
+        }
+    }
+}
+
+/// @endcond
+
+/*!
+Constructs input setting widget
+*/
+HbInputSettingWidget::HbInputSettingWidget(HbDataForm *dataForm, QGraphicsWidget* parent)
+ : QObject(parent), d_ptr(new HbInputSettingWidgetPrivate(dataForm))
+{
+    Q_D(HbInputSettingWidget);
+    d->q_ptr = this;
+}
+
+/*!
+Destructs the object
+*/
+HbInputSettingWidget::~HbInputSettingWidget()
+{
+    delete d_ptr;
+}
+
+/*!
+Initializes the data form object with input settings
+*/
+void HbInputSettingWidget::initializeWidget()
+{
+    Q_D(HbInputSettingWidget);
+
+    d->initialize();
+
+    HbInputSettingProxy *settings = HbInputSettingProxy::instance();
+    connect(settings, SIGNAL(globalInputLanguageChanged(const HbInputLanguage &)), this, SLOT(updateGlobalInputLanguage(const HbInputLanguage &)));
+    connect(settings, SIGNAL(globalSecondaryInputLanguageChanged(const HbInputLanguage &)), this, SLOT(updateGlobalSecondaryInputLanguage(const HbInputLanguage &)));
+    connect(settings, SIGNAL(predictiveInputStateChanged(HbKeyboardSettingFlags, bool)), this, SLOT(updatePredictiveInputState(HbKeyboardSettingFlags, bool)));
+    connect(settings, SIGNAL(characterPreviewStateForQwertyChanged(bool)), this, SLOT(updateCharacterPreviewStateForQwerty(bool)));
+    connect(settings, SIGNAL(keypressTimeoutChanged(int)), this, SLOT(updateKeypressTimeout(int)));
+    connect(settings, SIGNAL(autocompletionStateChanged(HbKeyboardSettingFlags, bool)), this, SLOT(updateAutocompletionState(HbKeyboardSettingFlags, bool)));
+    connect(settings, SIGNAL(typingCorrectionLevelChanged(HbTypingCorrectionLevel)), this, SLOT(updateTypingCorrectionLevel(HbTypingCorrectionLevel)));
+    connect(settings, SIGNAL(primaryCandidateModeChanged(HbPrimaryCandidateMode)), this, SLOT(updatePrimaryCandidateMode(HbPrimaryCandidateMode)));
+}
+
+/*!
+Called by framework when primary language is changed
+*/
+void HbInputSettingWidget::updateGlobalInputLanguage(const HbInputLanguage &newLanguage)
+{
+    Q_D(HbInputSettingWidget);
+
+    if (d->mPrimaryInputLanguage != newLanguage) {
+        setPrimaryLanguage(d->languageToIndex(newLanguage, d->mPrimaryLanguages));
+        d->mPrimaryLanguageItem->setContentWidgetData(QString("currentIndex"), d->languageToIndex(d->mPrimaryInputLanguage, d->mPrimaryLanguages));
+    }
+}
+
+/*!
+Called by framework when secondary language is changed
+*/
+void HbInputSettingWidget::updateGlobalSecondaryInputLanguage(const HbInputLanguage &newLanguage)
+{
+    Q_D(HbInputSettingWidget);
+
+    if (d->mSecondaryInputLanguage != newLanguage) {
+        setSecondaryLanguage(d->languageToIndex(newLanguage, d->mSecondaryLanguages));
+        d->mSecondaryLanguageItem->setContentWidgetData(QString("currentIndex"), d->languageToIndex(d->mSecondaryInputLanguage, d->mSecondaryLanguages));
+    }
+}
+
+/*!
+Called by framework when prediction status is changed
+*/
+void HbInputSettingWidget::updatePredictiveInputState(HbKeyboardSettingFlags keyboardType, bool newState)
+{
+    Q_D(HbInputSettingWidget);
+
+    bool changed = false;
+    if (keyboardType & HbKeyboardSetting12key &&
+        d->mPredictionStatusForITUT != newState) {
+        d->mPredictionStatusForITUT = newState;
+        changed = true;
+    } else if (keyboardType & HbKeyboardSettingQwerty &&
+        d->mPredictionStatusForQwerty != newState) {
+        d->mPredictionStatusForQwerty = newState;
+        changed = true;
+    }
+
+    if (changed) {
+        QList<QVariant> predictionEnabled;
+        predictionEnabled << d->mPredictionStatusForQwerty << d->mPredictionStatusForITUT;
+        d->mPredictionItem->setContentWidgetData(QString("selectedItems"), predictionEnabled);
+    }
+}
+
+/*!
+Called by framework when character preview state is changed
+*/
+void HbInputSettingWidget::updateCharacterPreviewStateForQwerty(bool newState)
+{
+    Q_D(HbInputSettingWidget);
+
+    if (d->mCharacterPreviewEnabled != newState) {
+        d->mCharacterPreviewEnabled = newState;
+        if (d->mCharacterPreviewEnabled) {
+            d->mCharacterPreviewItem->setContentWidgetData(QString("text"), statusOn);
+            d->mCharacterPreviewItem->setContentWidgetData(QString("additionalText"), statusOff);
+        } else {
+            d->mCharacterPreviewItem->setContentWidgetData(QString("text"), statusOff);
+            d->mCharacterPreviewItem->setContentWidgetData(QString("additionalText"), statusOn);
+        }
+    }
+}
+
+/*!
+Called by framework when keypress timeout is changed
+*/
+void HbInputSettingWidget::updateKeypressTimeout(int newTimeout)
+{
+    Q_D(HbInputSettingWidget);
+
+    if (d->mKeypressTimeout != newTimeout) {
+        d->mKeypressTimeout = newTimeout;
+        d->mKeypressTimeoutItem->setContentWidgetData(QString("sliderPosition"), d->mKeypressTimeout);
+    }
+}
+
+/*!
+Called by framework when autocompletion state is changed
+*/
+void HbInputSettingWidget::updateAutocompletionState(HbKeyboardSettingFlags keyboardType, bool newState)
+{
+    Q_D(HbInputSettingWidget);
+
+    bool changed = false;
+    if (keyboardType & HbKeyboardSetting12key &&
+        d->mAutocompletionForITUT != newState) {
+        d->mAutocompletionForITUT = newState;
+        changed = true;
+    } else if (keyboardType & HbKeyboardSettingQwerty &&
+        d->mAutocompletionForQwerty != newState) {
+        d->mAutocompletionForQwerty = newState;
+        changed = true;
+    }
+
+    if (changed) {
+        QList<QVariant> autocompletionEnabled;
+        autocompletionEnabled << d->mAutocompletionForQwerty << d->mAutocompletionForITUT;
+        d->mAutoCompletionItem->setContentWidgetData(QString("selectedItems"), autocompletionEnabled);
+    }
+}
+
+/*!
+Called by framework when typing correction level is changed
+*/
+void HbInputSettingWidget::updateTypingCorrectionLevel(HbTypingCorrectionLevel newLevel)
+{
+    Q_D(HbInputSettingWidget);
+
+    if (d->mTypingCorrectionLevel != newLevel) {
+        d->mTypingCorrectionLevel = newLevel;
+        d->mCorrectionLevelItem->setContentWidgetData(QString("selected"), d->mTypingCorrectionLevel);
+    }
+}
+
+/*!
+Called by framework when primary candidate mode is changed
+*/
+void HbInputSettingWidget::updatePrimaryCandidateMode(HbPrimaryCandidateMode newMode)
+{
+    Q_D(HbInputSettingWidget);
+
+    if (d->mPrimaryCandidateMode != newMode) {
+        d->mPrimaryCandidateMode = newMode;
+        if (d->mPrimaryCandidateMode == HbPrimaryCandidateModeBestPrediction) {
+            d->mPrimaryCandidateItem->setContentWidgetData(QString("text"), bestPrediction);
+            d->mPrimaryCandidateItem->setContentWidgetData(QString("additionalText"), exactTyping);
+        } else {
+            d->mPrimaryCandidateItem->setContentWidgetData(QString("text"), exactTyping);
+            d->mPrimaryCandidateItem->setContentWidgetData(QString("additionalText"), bestPrediction);
+        }
+    }
+}
+
+/*!
+Saves the new primary language and modifies the secondary language list if necessary
+*/
+void HbInputSettingWidget::setPrimaryLanguage(int index)
+{
+    Q_D(HbInputSettingWidget);
+
+	HbInputSettingProxy *settings = HbInputSettingProxy::instance();
+    HbPredictionFactory *predFactory = HbPredictionFactory::instance();
+    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);
+		}
+	} 	
+
+    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 != secondaryLanguage) {
+        d->mSecondaryLanguageItem->setContentWidgetData(QString("currentIndex"), d->languageToIndex(secondaryLanguage, d->mSecondaryLanguages));
+    }
+}
+
+/*!
+Saves the new secondary language
+*/
+void HbInputSettingWidget::setSecondaryLanguage(int index)
+{
+    Q_D(HbInputSettingWidget);
+
+    d->mSecondaryInputLanguage = d->indexToLanguage(index, d->mSecondaryLanguages);
+    HbInputSettingProxy::instance()->setGlobalSecondaryInputLanguage(d->mSecondaryInputLanguage);
+}
+
+/*!
+Saves the keypress timeout value
+*/
+void HbInputSettingWidget::setKeypressTimeoutValue(int value)
+{
+    Q_D(HbInputSettingWidget);
+
+    d->mKeypressTimeout = value;
+    HbInputSettingProxy::instance()->setKeypressTimeout(d->mKeypressTimeout);
+}
+
+/*!
+Saves the new character preview state
+*/
+void HbInputSettingWidget::setCharacterPreviewState()
+{
+    Q_D(HbInputSettingWidget);
+
+    d->mCharacterPreviewEnabled = !d->mCharacterPreviewEnabled;
+    HbInputSettingProxy::instance()->setCharacterPreviewForQwerty(d->mCharacterPreviewEnabled);
+}
+
+/*!
+Saves the new prediction state for selected keyboard
+*/
+void HbInputSettingWidget::setPredictionState(const QModelIndex &index)
+{
+    Q_D(HbInputSettingWidget);
+
+    if (index.row() == 0) {
+        d->mPredictionStatusForQwerty = !d->mPredictionStatusForQwerty;
+        HbInputSettingProxy::instance()->setPredictiveInputStatus(HbKeyboardSettingQwerty, d->mPredictionStatusForQwerty);
+    } else {
+        d->mPredictionStatusForITUT = !d->mPredictionStatusForITUT;
+        HbInputSettingProxy::instance()->setPredictiveInputStatus(HbKeyboardSetting12key, d->mPredictionStatusForITUT);
+    }
+}
+
+/*!
+Saves the new autocompletion state for selected keyboard
+*/
+void HbInputSettingWidget::setAutocompletionState(const QModelIndex &index)
+{
+    Q_D(HbInputSettingWidget);
+
+    if (index.row() == 0) {
+        d->mAutocompletionForQwerty = !d->mAutocompletionForQwerty;
+        HbInputSettingProxy::instance()->setAutocompletionStatus(HbKeyboardSettingQwerty, d->mAutocompletionForQwerty);
+    } else {
+        d->mAutocompletionForITUT = !d->mAutocompletionForITUT;
+        HbInputSettingProxy::instance()->setAutocompletionStatus(HbKeyboardSetting12key, d->mAutocompletionForITUT);
+    }
+}
+
+/*!
+Saves the new typing correction level
+*/
+void HbInputSettingWidget::setCorrectionLevel(int index)
+{
+    Q_D(HbInputSettingWidget);
+
+    d->mTypingCorrectionLevel = static_cast<HbTypingCorrectionLevel>(index);
+    HbInputSettingProxy::instance()->setTypingCorrectionLevel(d->mTypingCorrectionLevel);
+}
+
+/*!
+Saves the new primary candidate mode
+*/
+void HbInputSettingWidget::setPrimaryCandidateMode()
+{
+    Q_D(HbInputSettingWidget);
+
+    if (d->mPrimaryCandidateMode == HbPrimaryCandidateModeBestPrediction) {
+        d->mPrimaryCandidateMode = HbPrimaryCandidateModeExactTyping;
+    } else {
+        d->mPrimaryCandidateMode = HbPrimaryCandidateModeBestPrediction;
+    }
+    HbInputSettingProxy::instance()->setPrimaryCandidateMode(d->mPrimaryCandidateMode);
+}
+
+// End of file
diff -r 16d8024aca5e -r f7ac710697a9 src/hbinput/inputwidgets/hbinputsettingwidget.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbinput/inputwidgets/hbinputsettingwidget.h	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,78 @@
+/****************************************************************************
+**
+** 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_SETTING_WIDGET_H
+#define HB_INPUT_SETTING_WIDGET_H
+
+#include <QObject>
+#include <hbinputdef.h>
+
+class HbInputSettingWidgetPrivate;
+class QGraphicsWidget;
+class QModelIndex;
+class HbDataForm;
+class HbDataFormModelItem;
+class HbInputLanguage;
+
+class HB_INPUT_EXPORT HbInputSettingWidget : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit HbInputSettingWidget(HbDataForm *dataForm, QGraphicsWidget* parent = 0);
+    virtual ~HbInputSettingWidget();
+
+    void initializeWidget();
+
+public slots:
+    void updateGlobalInputLanguage(const HbInputLanguage &newLanguage);
+    void updateGlobalSecondaryInputLanguage(const HbInputLanguage &newLanguage);
+    void updatePredictiveInputState(HbKeyboardSettingFlags keyboardType, bool newState);
+    void updateCharacterPreviewStateForQwerty(bool newState);
+    void updateKeypressTimeout(int newTimeout);
+    void updateAutocompletionState(HbKeyboardSettingFlags keyboardType, bool newState);
+    void updateTypingCorrectionLevel(HbTypingCorrectionLevel newLevel);
+    void updatePrimaryCandidateMode(HbPrimaryCandidateMode newMode);
+
+    void setPrimaryLanguage(int index);
+    void setSecondaryLanguage(int index);
+    void setKeypressTimeoutValue(int value);
+    void setCharacterPreviewState();
+    void setPredictionState(const QModelIndex &index);
+    void setAutocompletionState(const QModelIndex &index);
+    void setCorrectionLevel(int index);
+    void setPrimaryCandidateMode();
+
+protected:
+    HbInputSettingWidgetPrivate * const d_ptr;
+
+private:
+    Q_DECLARE_PRIVATE_D(d_ptr, HbInputSettingWidget)
+    Q_DISABLE_COPY(HbInputSettingWidget)
+};
+
+#endif // HB_INPUT_SETTING_WIDGET_H
+
+// End of file
diff -r 16d8024aca5e -r f7ac710697a9 src/hbinput/inputwidgets/hbinputtouchkeypadbutton.cpp
--- a/src/hbinput/inputwidgets/hbinputtouchkeypadbutton.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputtouchkeypadbutton.cpp	Mon May 03 12:48:33 2010 +0300
@@ -35,6 +35,7 @@
 #ifdef HB_EFFECTS
 #include <hbeffect.h>
 #endif
+#include <hbtapgesture.h>
 
 #include "hbinputtouchkeypadbutton.h"
 #include "hbinputvkbwidget.h"
@@ -44,6 +45,7 @@
 @proto
 @hbinput
 \class HbTouchKeypadButton
+\deprecated class HbTouchKeypadButton
 \brief A button widget to be used in touch keypads.
 
 Expands HbPushButton functionality to suit touch keypad purposes. It handles virtual keyboard closing gesture
@@ -97,7 +99,8 @@
 /// @endcond
 
 /*!
-Constructs the object. aOwner is the owning touch keypad widget.
+\deprecated HbTouchKeypadButton::HbTouchKeypadButton(HbInputVkbWidget *, const QString &, QGraphicsWidget *)
+    is deprecated.
 */
 HbTouchKeypadButton::HbTouchKeypadButton(HbInputVkbWidget *owner,
                                          const QString &text,
@@ -114,7 +117,7 @@
 }
 
 /*!
-Constructs the object. aOwner is the owning touch keypad widget.
+\deprecated HbTouchKeypadButton::HbTouchKeypadButton(HbInputVkbWidget *, const HbIcon &, const QString &, QGraphicsItem *)
 */
 HbTouchKeypadButton::HbTouchKeypadButton(HbInputVkbWidget *owner,
                                          const HbIcon &icon,
@@ -132,7 +135,7 @@
 }
 
 /*!
-Destructs the object.
+\deprecated HbTouchKeypadButton::~HbTouchKeypadButton()
 */
 HbTouchKeypadButton::~HbTouchKeypadButton()
 {
@@ -140,189 +143,79 @@
 }
 
 /*!
-Handles mouse press event. The event is first directed to owner keypad and then
-handled normally.
+\reimp
+\deprecated HbTouchKeypadButton::mousePressEvent(QGraphicsSceneMouseEvent *)
+    is deprecated.
 */
 void HbTouchKeypadButton::mousePressEvent(QGraphicsSceneMouseEvent *event)
 {
-    Q_D(HbTouchKeypadButton);
-    //Since this is a virtual keypress, it is ambiguous. Update the probable
-    //keys from the this particular key press. It is required very much for 
-    //QWERTY keypad but for ITU-T it may not be. Since it does not add too much 
-    //of performance overhead, let it be there.
-    if(d->mOwner && d->mOwner->d_func()) { 
-        d->mOwner->d_func()->updateMouseHitItem(this, mapToScene(event->pos()));
-    }
-
-    /* If the Normal button is InActive(i.e. Faded) and there is no text mapped to that button and for Inactive Function buttons
-    we should not handle MousePressEvent.However, we need to redirect MousePressEvent to the VKB Widget 
-    because we need to handle keypad closegesture i.e.   the keypad should close when flick veritically on Faded Buttons
-    Note: We have to handle MousePressEvent for Normal Inactive Buttons which have text mapped to it, because we need to handle long key press */
-    if(!(d->mButtonType == HbTouchButtonNormalInActive && text().isEmpty())) {
-        HbPushButton::mousePressEvent(event);
-        if(event->isAccepted()) {
-            setBackgroundAttributes(HbTouchKeypadButton::HbTouchButtonPressed);
-        }
-    }
-    if(event->isAccepted()) {
-        d->mOwner->d_func()->redirectMousePressEvent(event);
-    }
+    Q_UNUSED(event)
 }
 
 /*!
-Handles mouse release event. The event is first directed to owner keypad
-and then handled normally.
+\reimp
+\deprecated HbTouchKeypadButton::mouseReleaseEvent(QGraphicsSceneMouseEvent *)
+    is deprecated.
 */
 void HbTouchKeypadButton::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
 {
-    Q_D(HbTouchKeypadButton);
-	//Since this is a virtual keypress, it is ambiguous. Update the probable
-    //keys from the this partucular key press. It is required very much for 
-    //QWERTY keypad but for ITU-T it may not be. Since it does not add too much 
-    //of performance overhead, let it be there.
-    //This updation happens on both press and release of the key. This is 
-    //because press and release events may not happen on the same button.
-	// should be updated before the release signal is emitted here
-    d->mOwner->d_func()->updateMouseHitItem(this, mapToScene(event->pos()));
-
-    d->mOwner->d_func()->redirectMouseReleaseEvent(event);
-
-    /* If the Normal button is InActive(i.e. Faded) and there is no text mapped to that button and for Inactive Function buttons
-    we should not handle MousePressEvent.However, we need to redirect MousePressEvent to the VKB Widget 
-    because we need to handle keypad closegesture i.e.   the keypad should close when flick veritically on Faded Buttons
-    Note: We have to handle MousePressEvent for Normal Inactive Buttons which have text mapped to it, because we need to handle long key press */
-    if(!(d->mButtonType == HbTouchButtonNormalInActive && text().isEmpty())) {
-        if (d->mLatch) {
-            setBackgroundAttributes(HbTouchKeypadButton::HbTouchButtonLatched);
-        } else {
-            setBackgroundAttributes(HbTouchKeypadButton::HbTouchButtonReleased);
-        }
-        
-        // redirectMouseReleaseEvent() is called first so that the mouserelease is handled first and checked for
-        // any flick events, and based on that handle the necessary mouse release actions
-        // else it would give rise to a situation that after a flick, the selected button where release happens
-        // will additionally handle, and give rise to undesired results.
-        HbPushButton::mouseReleaseEvent(event);
-    }
-
-
-    ungrabMouse();
+    Q_UNUSED(event)
 }
 
 /*!
-Handles mouse move event. In case this is a sticky key movement will activate a mousePressEvent on another button
-and the next button is set as the grabber item.
+\reimp
+\deprecated HbTouchKeypadButton::mouseMoveEvent(QGraphicsSceneMouseEvent *)
+    is deprecated.
 */
 void HbTouchKeypadButton::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
 {
-    Q_D(HbTouchKeypadButton);
-
-    bool transfered = false;
-    bool hasHitButton = hitButton(event->pos());
-    // if it is a sticky key and the mouse pointer moved out of the current button's boundary
-    // that means we need to activate and pass the grabber to the button which is having the mouse pointer
-    if (d->mStickyKey && !hasHitButton) {
-        // get the list of item's at current mouse position
-        QList<QGraphicsItem *> list = scene()->items(event->scenePos());
-        for (int i =0; i < list.count(); i++) {
-            // let's check if we have HbTouchKeypadButton
-            HbTouchKeypadButton *button  = hbtouchkeypadbutton_cast(list.at(i));
-            if (button  && button->isEnabled() && (button->parent() == parent())) {
-                // we found a button which contains the current mouse pointer position
-                // now we will be making the found button as mouse grabber if it is a 
-                // sticky button.
-                if (button->isStickyButton()) {
-                    // release old button
-                    ungrabMouse();
-                    event->setButton(Qt::LeftButton);
-                    HbPushButton::mouseReleaseEvent(event);
-                    if (d->mLatch) {
-                        setBackgroundAttributes(HbTouchKeypadButton::HbTouchButtonLatched);
-                    } else {
-                        setBackgroundAttributes(HbTouchKeypadButton::HbTouchButtonReleased);
-                    }
-                    updatePrimitives();
-                    // now call the mousepressEvent function of the button under mouse
-                    QGraphicsSceneMouseEvent pressEvent;
-                    pressEvent.setButton(Qt::LeftButton);
-                    button->mousePressEvent(&pressEvent);
+    Q_UNUSED(event)
+}
 
-                    // now to make button under cursor to get mouse events we have to manually make that button
-                    // a mouse grabber item. after this button will start recieving the button movements.
-                    button->grabMouse();
-                    transfered = true;
-                }
-                break;
+/*!
+\reimp
+\deprecated HbTouchKeypadButton::gestureEvent(QGestureEvent *)
+    is deprecated.
+*/
+void HbTouchKeypadButton::gestureEvent(QGestureEvent *event)
+{
+    Q_D(HbTouchKeypadButton);
+    if (HbTapGesture *tap = qobject_cast<HbTapGesture*>(event->gesture(Qt::TapGesture))) {
+        switch(tap->state()) {
+        case Qt::GestureStarted:
+            if (d->mOwner && d->mOwner->d_func()) {
+                d->mOwner->d_func()->updateMouseHitItem(this, tap->scenePosition());
             }
-        }
-
-        if (!transfered) {
-            emit enteredInNonStickyRegion();
-        }
-    }
-    // handling for non-sticy buttons
-    if(!(d->mStickyKey)) {
-        if (!hasHitButton && isDown()) {
-            // the mouse moved out of the button pressed
-            emit d->mOwner->mouseMovedOutOfButton();
-            HbAbstractButton::setDown(false);
-            // if we move out of a button, the released attribute should be reflected
-            setBackgroundAttributes(HbTouchKeypadButton::HbTouchButtonReleased);
-            return;
-        }   
-        else if (hasHitButton && !isDown()) {   
-            // makes sure that press event is regenerated
-            HbPushButton::mouseMoveEvent(event);
-            // if we return back to this button, the attribute should be pressed
-            setBackgroundAttributes(HbTouchKeypadButton::HbTouchButtonPressed);
-        return;
-        }
-
-    }
-
-    if (!transfered) {
-        if (isDown()) {
-            // If mouse pointer moved away from the button, button needs to be updated
-            if (!hasHitButton && d->mStickyKey) {
+            if (!(d->mButtonType == HbTouchButtonNormalInActive && text().isEmpty())) {
+                setBackgroundAttributes(HbTouchKeypadButton::HbTouchButtonPressed);
+            }
+            break;
+        case Qt::GestureUpdated:
+            // Handle tap-and-hold?
+            break;
+        case Qt::GestureFinished:
+            if (!(d->mButtonType == HbTouchButtonNormalInActive && text().isEmpty())) {
                 if (d->mLatch) {
                     setBackgroundAttributes(HbTouchKeypadButton::HbTouchButtonLatched);
                 } else {
                     setBackgroundAttributes(HbTouchKeypadButton::HbTouchButtonReleased);
                 }
+                break;
+        case Qt::GestureCanceled:
+                setBackgroundAttributes(HbTouchKeypadButton::HbTouchButtonReleased);
+                break;
+        default:
+                break;
             }
-            if ( d->mStickyKey ) {
-                HbPushButton::mouseMoveEvent(event);
-                // Button is no longer pressed down so the button should be released
-                if (!isDown() ) {
-                        // setting button to down so that clicked and pressed signals are not emitted 
-                    // by the button.
-                    setDown(true);
-                    event->setButton(Qt::LeftButton);
-                    // we should not redirect this event to vkb at this point.
-                    // as this was a mouse move event and we dont want vkb to be closed
-                    // during the mouse move event.
-                    HbPushButton::mouseReleaseEvent(event);
-                }
-            }
-        } else if (d->mStickyKey) {
-            // this condition satisfies when we are coming back to 
-            // sticky button after moved out of its geometry. 
-            // In this case button_down == false
-            if (hasHitButton) {
-                if (d->mLatch) {
-                    setBackgroundAttributes(HbTouchKeypadButton::HbTouchButtonLatched);
-                } else {
-                    setBackgroundAttributes(HbTouchKeypadButton::HbTouchButtonPressed);
-                }
-            }
-            // now passing to base class will emit a pressed signal().
-            HbPushButton::mouseMoveEvent(event);
         }
     }
+    HbPushButton::gestureEvent(event);
 }
 
 /*!
 \reimp
+\deprecated HbTouchKeypadButton::resizeEvent(QGraphicsSceneResizeEvent *)
+    is deprecated.
 */
 void HbTouchKeypadButton::resizeEvent(QGraphicsSceneResizeEvent *event)
 {
@@ -340,7 +233,8 @@
 }
 
 /*!
-Returns true if button is Faded
+\deprecated HbTouchKeypadButton::isFaded()
+    is deprecated.
 */
 bool HbTouchKeypadButton::isFaded()
 {
@@ -349,8 +243,8 @@
 }
 
 /*!
-Sets the button fade status. Fading does not mean disabling the button.
-It just fades the button and does not change the Enabling properties of the button.
+\deprecated HbTouchKeypadButton::setFade(bool)
+    is deprecated.
 */
 void HbTouchKeypadButton::setFade(bool fade)
 {
@@ -385,9 +279,8 @@
 }
 
 /*!
-Sets button type.
-
-\sa type
+\deprecated  HbTouchKeypadButton::setButtonType(HbTouchButtonType)
+    is deprecated.
 */
 void HbTouchKeypadButton::setButtonType(HbTouchButtonType buttonType)
 {
@@ -403,10 +296,8 @@
 }
 
 /*!
-Gets button type.
-This function will be removed once the long press on qwerty buttons give accented char
-functionality is removed
-\sa type
+\deprecated HbTouchKeypadButton::getButtonType()
+    is deprecated.
 */
 int HbTouchKeypadButton::getButtonType()
 {
@@ -415,8 +306,8 @@
 }
 
 /*!
-This function will be removed once the long press on qwerty buttons give accented char
-functionality is removed
+\deprecated HbTouchKeypadButton::getFrameIcon()
+    is deprecated.
 */
 HbFrameItem * HbTouchKeypadButton::getFrameIcon()
 {
@@ -425,9 +316,8 @@
 }
 
 /*!
-Sets button's background attributes.
-
-\sa HbTouchButtonState
+\deprecated HbTouchKeypadButton::setBackgroundAttributes(HbTouchButtonState)
+    is deprecated.
 */
 void HbTouchKeypadButton::setBackgroundAttributes(HbTouchButtonState buttonState)
 {
@@ -459,7 +349,8 @@
 }
 
 /*!
-Sets button's background graphics. Parameter string is a resource name.
+\deprecated HbTouchKeypadButton::setBackground(const QString&)
+    is deprecated.
 */
 void HbTouchKeypadButton::setBackground(const QString& backgroundFrameFilename)
 {
@@ -470,9 +361,9 @@
     }
 }
 
-/*
-Currently HbPushButton is not capable of being skinned with multiple images (using HbFrameDraw)
-hence maintaining a separate frame item per button, that will set the multi piece image and use it
+/*!
+\deprecated HbTouchKeypadButton::setFrameIcon(const QString&)
+    is deprecated.
 */
 void HbTouchKeypadButton::setFrameIcon(const QString& frameIconFileName )
 {
@@ -489,6 +380,8 @@
 
 /*!
 \reimp
+\deprecated HbTouchKeypadButton::type() const
+    is deprecated.
 */
 int HbTouchKeypadButton::type() const
 {
@@ -506,9 +399,8 @@
 }
 
 /*!
-Sets button's stickyness state.
-
-\sa isStickyButton
+\deprecated  HbTouchKeypadButton::setAsStickyButton(bool)
+    is deprecated.
 */
 void HbTouchKeypadButton::setAsStickyButton(bool isSticky)
 {
@@ -517,12 +409,8 @@
 }
 
 /*!
-Returns true if button is sticky button. Sticky buttons propagates press state to neighboring button
-as a result of a drag event that crosses button border. Original button get release event and the neighbour
-target button receives press event. This feature is needed for implementing slides where finger moves
-across several buttons. 
-
-\sa setAsStickyButton
+\deprecated HbTouchKeypadButton::isStickyButton() const
+    is deprecated.
 */
 bool HbTouchKeypadButton::isStickyButton() const
 {
@@ -531,7 +419,8 @@
 }
 
 /*!
-Sets button's latched state.
+\deprecated HbTouchKeypadButton::setLatch(bool)
+    is deprecated
 */
 void HbTouchKeypadButton::setLatch(bool enable)
 {
@@ -548,7 +437,8 @@
 }
 
 /*!
-Returns true if button is in latched state.
+\deprecated HbTouchKeypadButton::isLatched() const
+    is deprecated.
 */
 bool HbTouchKeypadButton::isLatched() const
 {
@@ -557,7 +447,8 @@
 }
 
 /*!
-Returns the keycode that the button is mapped to.
+\deprecated HbTouchKeypadButton::keyCode() const
+    is deprecated.
 */
 int HbTouchKeypadButton::keyCode() const
 {
@@ -566,7 +457,8 @@
 }
 
 /*!
-Sets the keycode that the button is mapped to.
+\deprecated HbTouchKeypadButton::setKeyCode(int)
+    is deprecated.
 */
 void HbTouchKeypadButton::setKeyCode(int code)
 {
@@ -576,6 +468,8 @@
 
 /*!
 \reimp
+\deprecated HbTouchKeypadButton::setText(const QString &)
+    is deprecated.
 */
 void HbTouchKeypadButton::setText(const QString &text)
 {
@@ -589,6 +483,8 @@
 
 /*!
 \reimp
+\deprecated HbTouchKeypadButton::setAdditionalText(const QString &)
+    is deprecated.
 */
 void HbTouchKeypadButton::setAdditionalText(const QString &additionalText)
 {
@@ -601,6 +497,8 @@
 
 /*!
 \reimp
+\deprecated HbTouchKeypadButton::changeEvent(QEvent *)
+    is deprecated.
 */
 void HbTouchKeypadButton::changeEvent( QEvent *event )
 {
@@ -613,6 +511,8 @@
 
 /*!
 \reimp
+\deprecated HbTouchKeypadButton::updatePrimitives()
+    is deprecated.
 */
 void HbTouchKeypadButton::updatePrimitives()
 {
@@ -626,6 +526,8 @@
 
 /*!
 \reimp
+\deprecated HbTouchKeypadButton::sizeHint(Qt::SizeHint, const QSizeF &) const
+    is deprecated.
 */
 QSizeF HbTouchKeypadButton::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
 {
@@ -648,7 +550,8 @@
 }
 
 /*!
-Notification for state change.
+\deprecated HbTouchKeypadButton::itemChange(GraphicsItemChange, const QVariant &)
+    is deprecated.
 */
 QVariant HbTouchKeypadButton::itemChange( GraphicsItemChange change, const QVariant & value )
 {
@@ -665,7 +568,8 @@
 }
 
 /*!
-Sets initial keypad button size to make vkb layouting faster. Calls setPreferredSize internally.
+\deprecated HbTouchKeypadButton::setInitialSize(const QSizeF&)
+    is deprecated.
 */
 void HbTouchKeypadButton::setInitialSize(const QSizeF& initialSize)
 {
diff -r 16d8024aca5e -r f7ac710697a9 src/hbinput/inputwidgets/hbinputtouchkeypadbutton.h
--- a/src/hbinput/inputwidgets/hbinputtouchkeypadbutton.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputtouchkeypadbutton.h	Mon May 03 12:48:33 2010 +0300
@@ -84,6 +84,7 @@
     void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
     void resizeEvent(QGraphicsSceneResizeEvent *event);
     void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
+    void gestureEvent(QGestureEvent *event);
     void setBackground(const QString& backgroundFrameFilename);
     virtual void changeEvent( QEvent *event );
     virtual void updatePrimitives();
diff -r 16d8024aca5e -r f7ac710697a9 src/hbinput/inputwidgets/hbinputusedsymbolpane.cpp
--- a/src/hbinput/inputwidgets/hbinputusedsymbolpane.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputusedsymbolpane.cpp	Mon May 03 12:48:33 2010 +0300
@@ -40,6 +40,7 @@
     @proto
     @hbinput
     \class HbInputUsedSymbolPane
+    \deprecated class HbInputUsedSymbolPane
     \brief A widget for displaying most frequently used special characters.
     
     This is a widget that knows how to display most frequently used special characters.
@@ -120,7 +121,8 @@
 /// @endcond
 
 /*!
-Constructs the object.
+\deprecated HbInputUsedSymbolPane::HbInputUsedSymbolPane(HbInputVkbWidget*, QGraphicsWidget*)
+    is deprecated.
 */
 HbInputUsedSymbolPane::HbInputUsedSymbolPane(HbInputVkbWidget* aOwner, QGraphicsWidget* aParent)
     : QGraphicsWidget(aParent)
@@ -130,7 +132,8 @@
 }
 
 /*!
-Destructs the object.
+\deprecated HbInputUsedSymbolPane::~HbInputUsedSymbolPane()
+    is deprecated.
 */
 HbInputUsedSymbolPane::~HbInputUsedSymbolPane()
 {
@@ -138,9 +141,8 @@
 }
 
 /*!
-Sets the number of characters to be displayed when the widget is visible. The
-actual number of characters displayed may be smaller if there are fewer 
-characters in setting proxy's frequency list.
+\deprecated HbInputUsedSymbolPane::setNumberOfCharacters(int)
+    is deprecated.
 */
 void HbInputUsedSymbolPane::setNumberOfCharacters(int aNumChrs)
 {
@@ -148,7 +150,8 @@
 }
 
 /*!
-Handles mouse press event.
+\deprecated HbInputUsedSymbolPane::mousePressEvent(QGraphicsSceneMouseEvent*)
+    is deprecated.
 */
 void HbInputUsedSymbolPane::mousePressEvent(QGraphicsSceneMouseEvent* aEvent)
 {
@@ -162,7 +165,9 @@
 }
 
 /*!
-Handles mouse release event.
+\reimp
+\deprecated HbInputUsedSymbolPane::mouseReleaseEvent(QGraphicsSceneMouseEvent*)
+    is deprecated.
 */
 void HbInputUsedSymbolPane::mouseReleaseEvent(QGraphicsSceneMouseEvent* aEvent)
 {
@@ -170,7 +175,9 @@
 }
 
 /*!
-Handles mouse double click event.
+\reimp
+\deprecated HbInputUsedSymbolPane::mouseDoubleClickEvent(QGraphicsSceneMouseEvent*)
+    is deprecated.
 */
 void HbInputUsedSymbolPane::mouseDoubleClickEvent(QGraphicsSceneMouseEvent* aEvent)
 {
@@ -181,7 +188,8 @@
 }
 
 /*!
-Paints the widget.
+\deprecated HbInputUsedSymbolPane::paint(QPainter*, const QStyleOptionGraphicsItem*, QWidget*)
+    is deprecated.
 */
 void HbInputUsedSymbolPane::paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget)
 {
@@ -213,6 +221,11 @@
         chrRect.moveRight(chrRect.right() + xstep);
     }
 }
+
+/*!
+\deprecated HbInputUsedSymbolPane::restoreSctLine(HbInputFilter*)
+    is deprecated.
+*/
 void HbInputUsedSymbolPane::restoreSctLine(HbInputFilter *aFilter)
 {
         if (aFilter != mPrivate->mFilter)
diff -r 16d8024aca5e -r f7ac710697a9 src/hbinput/inputwidgets/hbinputvirtualrocker.cpp
--- a/src/hbinput/inputwidgets/hbinputvirtualrocker.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputvirtualrocker.cpp	Mon May 03 12:48:33 2010 +0300
@@ -28,7 +28,6 @@
 #include <QPainter>
 #include <QCoreApplication>
 #include <QDir>
-#include <QDebug>
 #include <hbicon.h>
 #include <hbinputsettingproxy.h>
 #include <hbwidgetfeedback.h>
@@ -76,9 +75,13 @@
           mMousePressPoint(0.0,0.0),
           mKeyboard(parent),
           mPressed(false)
-{
+{    
     mIconNormal = new HbIcon("qtg_graf_trackpoint_normal" );
     mIconNormal->setSize( QSizeF( HbIconWidth, HbIconWidth ));
+
+    q_ptr->grabGesture(Qt::SwipeGesture);    
+    q_ptr->grabGesture(Qt::TapGesture);
+    q_ptr->grabGesture(Qt::PanGesture);
 }
 
 HbInputVirtualRockerPrivate::~HbInputVirtualRockerPrivate()
@@ -329,4 +332,9 @@
     return d->mShifted;
 }
 
+void HbInputVirtualRocker::gestureEvent(QGestureEvent *event)
+{
+    Q_UNUSED (event);
+}
+
 // End of file
diff -r 16d8024aca5e -r f7ac710697a9 src/hbinput/inputwidgets/hbinputvirtualrocker.h
--- a/src/hbinput/inputwidgets/hbinputvirtualrocker.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputvirtualrocker.h	Mon May 03 12:48:33 2010 +0300
@@ -64,6 +64,7 @@
     void mouseMoveEvent ( QGraphicsSceneMouseEvent *event);
     void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event);
     void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget);
+    virtual void gestureEvent(QGestureEvent *event);
 
 signals:
     void rockerDirection(int aDirection, HbInputVirtualRocker::RockerSelectionMode aSelectionMode);
diff -r 16d8024aca5e -r f7ac710697a9 src/hbinput/inputwidgets/hbinputvkbwidget.cpp
--- a/src/hbinput/inputwidgets/hbinputvkbwidget.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputvkbwidget.cpp	Mon May 03 12:48:33 2010 +0300
@@ -45,20 +45,21 @@
 #include <hbstackedwidget.h>
 #include <hbframedrawer.h>
 #include <hbevent.h>
+#include <hbdataform.h>
 
 #include <hbinputmethod.h>
 #include <hbinputsettingproxy.h>
 #include <hbinpututils.h>
 #include <hbinputdef.h>
 #include <hbinputvkbhost.h>
-#include <hbinputsettingdialog.h>
+#include <hbinputsettingwidget.h>
 #include <hbinputcommondialogs.h>
 #include <hbinputkeymap.h>
 #include <hbinputkeymapfactory.h>
 #include <hbwidgetfeedback.h>
-#include <hbsmileyengine.h>
 #include <hbinputpredictionfactory.h>
-
+#include <HbSwipeGesture>
+#include <HbTapGesture>
 #include "hbinputvirtualrocker.h"
 #include "hbinputvkbwidget.h"
 #include "hbinputvkbwidget_p.h"
@@ -129,9 +130,12 @@
 mAnimateWhenDialogCloses(false),
 mKeyboardSize(HbQwerty4x10),
 mCloseHandleHeight(0),
-mCloseHandle(NULL),
+mCloseHandle(0),
+mSettingView(0),
+mCurrentView(0),
 mKeyboardDimmed(false)
 {
+    mScreenshotTimeLine.setUpdateInterval(16);
 }
 
 
@@ -173,6 +177,12 @@
     mReleaseMapper = new QSignalMapper(q);
     mPressMapper = new QSignalMapper(q);
     mActionMapper = new QSignalMapper(q);
+
+    q->grabGesture(Qt::SwipeGesture);
+
+    // eating gestures below the panel (remove when panel starts to do this)
+    q->grabGesture(Qt::TapGesture);
+    q->grabGesture(Qt::PanGesture);
 }
 
 // re-implemented by inherited keyboards
@@ -307,14 +317,10 @@
     if (mOwner->focusObject()->editorInterface().editor()->inherits("HbAbstractEdit")) {
         if (!mOwner->focusObject()->editorInterface().smileyTheme().isNull()) {
             ret = true;
-        }		
-    }	else {
-        HbSmileyEngine smileyEngine;
-        if (!smileyEngine.defaultTheme().isNull()) {
-            ret = true;
-        }	
-    }	
-    return ret;	
+        }
+    }
+
+    return ret;
 }
 /// @endcond
 
@@ -335,11 +341,9 @@
     HbEffect::disable(this);
 #endif // HB_EFFECTS
 
-#if QT_VERSION >= 0x040600
     // Make sure the keypad never steals focus.
     setFlag(QGraphicsItem::ItemIsPanel, true);
     setActive(false);
-#endif
 }
 
 /*!
@@ -359,11 +363,9 @@
     HbEffect::disable(this);
 #endif // HB_EFFECTS
 
-#if QT_VERSION >= 0x040600
     // Make sure the keypad never steals focus.
     setFlag(QGraphicsItem::ItemIsPanel, true);
     setActive(false);
-#endif
 }
 
 /*!
@@ -383,6 +385,7 @@
     d->mCurrentHost = host;
     d->mRocker->setVisible(d->mShowRocker);
     d->setRockerPosition();
+    d->mFlickDirection = HbFlickDirectionNone;
 }
 
 /*!
@@ -396,6 +399,7 @@
     Q_D(HbInputVkbWidget);
 
     d->mRocker->setVisible(false);
+    d->mFlickDirection = HbFlickDirectionNone;
 }
 
 /*!
@@ -406,71 +410,22 @@
 void HbInputVkbWidget::keyboardMinimized(HbVkbHost *host)
 {
     Q_UNUSED(host);
-}
-
-/*!
-handles mouse press event.
-*/
-void HbInputVkbWidget::mousePressEvent(QGraphicsSceneMouseEvent* event)
-{
     Q_D(HbInputVkbWidget);
-    Q_UNUSED(event);
-    if (!d->mMouseButtonPressedDown) {
-        d->mMouseButtonPressedDown = true;
-        d->mMousePressTime.start();
-    }
+    d->mFlickDirection = HbFlickDirectionNone;
 }
 
 /*!
-Handles mouse release event.
+\deprecated HbInputVkbWidget::mousePressEvent(QGraphicsSceneMouseEvent*)
+    is deprecated.
 */
-void HbInputVkbWidget::mouseReleaseEvent(QGraphicsSceneMouseEvent* event)
+void HbInputVkbWidget::mousePressEvent(QGraphicsSceneMouseEvent* event)
 {
-    Q_D(HbInputVkbWidget);
-    d->mFlickDirection = HbFlickDirectionNone;
-    d->mMouseButtonPressedDown = false;
-
-    QPointF mouseDownpoint = event->buttonDownScenePos(Qt::LeftButton);
-
-    if (d->mCurrentHost && d->mCurrentHost->keypadStatus() != HbVkbHost::HbVkbStatusOpened &&
-        d->mCurrentHost->activeKeypad() && d->mOwner) {
-        HbWidgetFeedback::triggered(this, Hb::InstantFlicked);
-        d->mCurrentHost->openKeypad(d->mCurrentHost->activeKeypad(), d->mOwner);
-    } else if (d->mMousePressTime.elapsed() < MaxSweepTime || mouseDownpoint.y() <= scenePos().y() + d->mCloseHandleHeight) {
-        QPointF delta = event->scenePos() - mouseDownpoint;
-
-        qreal height;
-        if (HbInputSettingProxy::instance()->screenOrientation() == Qt::Horizontal) {
-            height = geometry().height() * 0.5;
-        } else {
-            // For ITU-T, 40% of the scene height is considered.
-            height = 0.4 * geometry().height();
-        }
-        // If the user drags the mouse on keypad and the
-        // delta is greater than 10% of the height, keypad is closed
-        height = HbMouseDragDelta * height;
-
-        if (delta.y() > height) {
-            HbWidgetFeedback::triggered(this, Hb::InstantFlicked);
-            d->mFlickDirection = HbFlickDirectionDown;
-            emit keypadCloseEventDetected(HbVkbCloseMethodButtonDrag);
-        }
-
-        if (qAbs(delta.x()) > SweepLength) {
-
-            d->mFlickDirection = delta.x()>0 ? HbFlickDirectionRight : HbFlickDirectionLeft;
-
-            if (d->mFlickAnimation){
-                HbWidgetFeedback::triggered(this, Hb::InstantFlicked);
-                animKeyboardChange();
-            }
-            emit flickEvent(d->mFlickDirection);
-        }
-    }
+    Q_UNUSED(event);
 }
 
 /*!
-Handles virtual key press
+\deprecated HbInputVkbWidget::mappedKeyPress(int)
+    is deprecated.
 */
 void HbInputVkbWidget::mappedKeyPress(int buttonid)
 {
@@ -479,7 +434,8 @@
 }
 
 /*!
-Handles virtual key release
+\deprecated HbInputVkbWidget::mappedKeyRelease(int)
+    is deprecated.
 */
 void HbInputVkbWidget::mappedKeyRelease(int buttonid)
 {
@@ -572,8 +528,7 @@
 }
 
 /*!
-This is called right before the keypad is about to open. This gives inheriting classes opportunity
-to do whatever initialization they need to do at this point.
+\reimp
 */
 void HbInputVkbWidget::aboutToOpen(HbVkbHost *host)
 {
@@ -594,7 +549,7 @@
 
         d->mCloseHandle = new QGraphicsWidget();
         d->mCloseHandle->setObjectName("vkbHandle");
-        d->mCloseHandleHeight = HbCloseHandleHeight;
+        d->mCloseHandleHeight = (int)HbCloseHandleHeight;
         d->mCloseHandle->setMinimumHeight(d->mCloseHandleHeight);
         d->mCloseHandle->setMaximumHeight(d->mCloseHandleHeight);
 
@@ -613,7 +568,7 @@
 }
 
 /*!
-This is called right before the keypad is about to close.
+\reimp
 */
 void HbInputVkbWidget::aboutToClose(HbVkbHost *host)
 {
@@ -662,28 +617,36 @@
 
     if (!d->mSettingList) {
         d->mSettingList = new HbInputSettingList();
-        connect(d->mSettingList, SIGNAL(aboutToClose()), this, SLOT(settingsClosed()));
-        connect(d->mSettingList, SIGNAL(inputSettingsButtonClicked()), this, SLOT(executeSettingsDialog()));
+        connect(d->mSettingList, SIGNAL(inputSettingsButtonClicked()), this, SLOT(showSettingsView()));
         connect(d->mSettingList, SIGNAL(inputMethodsButtonClicked()), this, SLOT(executeMethodDialog()));
     }
 
-#if QT_VERSION >= 0x040600
     HbInputFocusObject *focusObject = d->mOwner->focusObject();
     if (focusObject &&
         focusObject->editorInterface().isPredictionAllowed() &&
-        !focusObject->editorInterface().isNumericEditor() &&
         predFactory->predictionEngineForLanguage(HbInputSettingProxy::instance()->globalInputLanguage())) {
         d->mSettingList->setPredictionSelectionEnabled(true);
     } else {
         d->mSettingList->setPredictionSelectionEnabled(false);
     }
-#endif
 
     d->mSettingsButton->setBackgroundAttributes(HbTouchKeypadButton::HbTouchButtonLatched);
     qreal x = d->mSettingsButton->scenePos().x() + d->mSettingsButton->rect().width();
     qreal y = d->mSettingsButton->scenePos().y();
     d->mSettingList->setPreferredPos(QPointF(x, y), HbPopup::BottomRightCorner);
-    d->mSettingList->showSettingList();
+    d->mSettingList->updateSettingList();
+    d->mSettingList->open(this, SLOT(settingsClosed()));
+}
+
+/*!
+Slot which is called when settings list is closed.
+*/
+void HbInputVkbWidget::settingsClosed()
+{
+    Q_D(HbInputVkbWidget);
+
+    d->mSettingsButton->setBackgroundAttributes(HbTouchKeypadButton::HbTouchButtonReleased);
+
     d->mSettingsListOpen = false;
     if ( d->mAnimateWhenDialogCloses ) {
         animKeyboardChange();
@@ -694,15 +657,6 @@
 }
 
 /*!
-Slot to connect aboutToClose of settings list to update keyboard graphics.
-*/
-void HbInputVkbWidget::settingsClosed()
-{
-    Q_D(HbInputVkbWidget);
-    d->mSettingsButton->setBackgroundAttributes(HbTouchKeypadButton::HbTouchButtonReleased);
-}
-
-/*!
 Closes settings list
 */
 void HbInputVkbWidget::closeSettingList()
@@ -713,39 +667,62 @@
 }
 
 /*!
-Toggles prediction status.
+\deprecated HbInputVkbWidget::togglePredictionStatus()
+    is deprecated.
 */
 void HbInputVkbWidget::togglePredictionStatus()
 {
     closeSettingList();
-    bool predictionStatus = HbInputSettingProxy::instance()->predictiveInputStatus();
-    HbInputSettingProxy::instance()->setPredictiveInputStatus(!predictionStatus);
+    HbInputSettingProxy::instance()->togglePrediction();
     update();
 }
 
 /*!
-Executes settingsDialog
+\deprecated HbInputVkbWidget::executeSettingsDialog()
+    is deprecated. Use showSettingsView instead.
 */
 void HbInputVkbWidget::executeSettingsDialog()
 {
+}
+
+/*!
+Shows settings view
+*/
+void HbInputVkbWidget::showSettingsView()
+{
     Q_D(HbInputVkbWidget);
 
     closeSettingList();
-    HbInputSettingDialog::HbSettingItems items = HbInputSettingDialog::HbSettingItemAll;
-    if (d->mOwner->focusObject()->editorInterface().isNumericEditor()) {
-        items &=  (~HbInputSettingDialog::HbSettingItemPrediction);
-    }
-    HbInputSettingDialog* settings = new HbInputSettingDialog(items);
-    d->mSettingsListOpen = true;
-    settings->exec();
-    delete settings;
-    d->mSettingsListOpen = false;
-    if ( d->mAnimateWhenDialogCloses ) {
-        animKeyboardChange();
-        d->mAnimateWhenDialogCloses = false;
-    } else {
-        keypadLanguageChangeFinished();
-    }
+
+    d->mSettingView = new HbView(this);
+    d->mSettingView->setTitle(tr("Input Settings"));
+    mainWindow()->addView(d->mSettingView);
+
+    HbAction *backAction = new HbAction(Hb::BackNaviAction, d->mSettingView);
+    backAction->setText(tr("Back"));
+    connect(backAction, SIGNAL(triggered(bool)), this, SLOT(closeSettingsView()));
+    d->mSettingView->setNavigationAction(backAction);
+
+    HbDataForm *dataForm = new HbDataForm();
+    d->mSettingView->setWidget(dataForm);
+    HbInputSettingWidget *settingWidget = new HbInputSettingWidget(dataForm, d->mSettingView);
+    settingWidget->initializeWidget();
+
+    d->mCurrentView = mainWindow()->currentView();
+    mainWindow()->setCurrentView(d->mSettingView);
+}
+
+/*!
+Closes settings view and returns to previous view
+*/
+void HbInputVkbWidget::closeSettingsView()
+{
+    Q_D(HbInputVkbWidget);
+
+    mainWindow()->setCurrentView(d->mCurrentView);
+    mainWindow()->removeView(d->mSettingView);
+    delete d->mSettingView;
+    d->mSettingView = 0;
 }
 
 /*!
@@ -764,9 +741,8 @@
 }
 
 /*!
-Virtual function, each derived keypads should calculate and provide the
-layout information through this functions. This layout information is used
-by HbInputVkbWidget for layouting different components of vkb.
+\deprecated HbInputVkbWidget::keypadLayout()
+    is deprecated.
 */
 QGraphicsLayout *HbInputVkbWidget::keypadLayout()
 {
@@ -775,7 +751,7 @@
 }
 
 /*!
-Returns the keypad in QWidget form.
+\reimp
 */
 QWidget* HbInputVkbWidget::asWidget()
 {
@@ -783,7 +759,7 @@
 }
 
 /*!
-Returns the keypad in QGraphicsWidget form.
+\reimp
 */
 QGraphicsWidget* HbInputVkbWidget::asGraphicsWidget()
 {
@@ -791,7 +767,7 @@
 }
 
 /*!
-Returns preferred keyboard size. HbVkbHost uses this information when it opens the keyboard.
+\reimp
 */
 QSizeF HbInputVkbWidget::preferredKeyboardSize()
 {
@@ -807,7 +783,7 @@
 }
 
 /*!
-This method is called every time vkb host draws an opening animation frame.
+\reimp
 */
 void HbInputVkbWidget::keyboardAnimationFrame(HbVkbAnimationType type, qreal x)
 {
@@ -827,7 +803,7 @@
     QSizeF ret = preferredKeyboardSize();
     if (ret.height() >  d->mCloseHandleHeight) {
         ret.setHeight(ret.height() - d->mCloseHandleHeight);
-	}
+    }
 
     return ret;
 }
@@ -844,7 +820,6 @@
     d->mDrawbackground = backgroundEnabled;
 }
 
-
 /*!
 Returns all possible keys those the user could have intended to press
 for the last registered touch along with their corresponding probability.
@@ -915,7 +890,8 @@
 }
 
 /*!
-Sets up the common buttons in the tool cluster (settings and application buttons).
+\deprecated HbInputVkbWidget::setupToolCluster()
+    is deprecated.
 */
 void HbInputVkbWidget::setupToolCluster()
 {
@@ -993,18 +969,18 @@
             d->mApplicationButton->setText(QString());
             d->mApplicationButton->setIcon(HbIcon());
             d->mApplicationButton->setToolTip(QString());
-			d->mApplicationButtonAction = 0;
+            d->mApplicationButtonAction = 0;
         } else {
             d->mApplicationButton = new HbTouchKeypadButton(this, QString());
             d->mApplicationButton->setButtonType(HbTouchKeypadButton::HbTouchButtonFunction);
             d->mApplicationButton->setBackgroundAttributes(HbTouchKeypadButton::HbTouchButtonReleased);
         }
-        d->mApplicationButtonAction = NULL;
+        d->mApplicationButtonAction = 0;
     }
 }
 
 /*!
-shape function actually refines the bounding rect. This function is used for collision detection
+Refines the bounding rect. This function is used for collision detection
 and hit test.
 */
 QPainterPath HbInputVkbWidget::shape() const
@@ -1015,24 +991,30 @@
     return path;
 }
 
+/*!
+\reimp
+*/
 QSizeF HbInputVkbWidget::minimizedKeyboardSize()
 {
     Q_D(HbInputVkbWidget);
     return QSizeF(0.0, d->mCloseHandleHeight);
 }
 
+/*!
+Shows smiley picker widget.
+*/
 void HbInputVkbWidget::showSmileyPicker(int rows, int columns)
 {
     Q_D(HbInputVkbWidget);
     if (!d->mOwner || !d->mOwner->focusObject()) {
         return;
     }
-    // check whether the smiley recognition is enabled 	in the currently focused editor.
+    // check whether the smiley recognition is enabled  in the currently focused editor.
     if (!d->isSmileysEnabled()) {
         return;
     }
     HbInputFocusObject *focusObject = d->mOwner->focusObject();
-	
+
     if (!d->mSmileyPicker || d->mFocusedObject != focusObject) {
         d->mFocusedObject = focusObject;
         if (d->mSmileyPicker) {
@@ -1040,27 +1022,25 @@
         }
         // get the smiley list from editor interface smiley theme.
         QStringList smileys = focusObject->editorInterface().smileyTheme().smileys();
-        // if the smiley list is empty and the editor is not a Hb editor, 
-        // then get the default smiley list from smiley engine.
-        if (smileys.isEmpty() && !focusObject->editorInterface().editor()->inherits("HbAbstractEdit")) {
-            HbSmileyEngine smileyEngine;
-            smileys = smileyEngine.defaultTheme().smileys();
-        }
 
         if (!smileys.isEmpty()) {
             d->mSmileyPicker = new HbInputSmileyPicker(rows, columns, 0, smileys);
             d->mSmileyPicker->setObjectName("vkbwidget_smiley_picker");
             connect(d->mSmileyPicker, SIGNAL(selected(QString)), this, SIGNAL(smileySelected(QString)));
-        }			
+        }
     }
 
     if (d->mSmileyPicker) {
         d->mSmileyPicker->setGeometry(QRectF(0, pos().y(), geometry().width(),
             geometry().height()));
         d->mSmileyPicker->show();
-    }		
+    }
 }
 
+/*!
+\deprecated HbInputVkbWidget::flickDirection()
+    is deprecated.
+*/
 HbInputVkbWidget::HbFlickDirection HbInputVkbWidget::flickDirection()
 {
     Q_D(HbInputVkbWidget);
@@ -1068,7 +1048,8 @@
 }
 
 /*!
-    Intended for internal use only
+\deprecated HbInputVkbWidget::refreshApplicationButton()
+    is deprecated.
 */
 void HbInputVkbWidget::refreshApplicationButton()
 {
@@ -1091,7 +1072,7 @@
     }
 }
 
-void HbInputVkbWidget::keypadLanguageChangeAnimationUpdate(qreal aValue)
+void HbInputVkbWidget::keypadLanguageChangeAnimationUpdate(qreal value)
 {
     Q_D(HbInputVkbWidget);
 
@@ -1102,7 +1083,7 @@
 
     QRectF rect = boundingRect();
     QPointF position = pos();
-    position.setX(direction * (-rect.width() + rect.width() * aValue));
+    position.setX(direction * (-rect.width() + rect.width() * value));
     if (d->mScreenshotWidget) {
        d->mScreenshotWidget->setPos(position.x() + direction * rect.width(), position.y());
        setPos(position);
@@ -1113,7 +1094,8 @@
 {
     Q_D(HbInputVkbWidget);
     delete d->mScreenshotWidget;
-    d->mScreenshotWidget = NULL;
+    d->mScreenshotWidget = 0;
+    d->mFlickDirection = HbFlickDirectionNone;
 }
 
 void HbInputVkbWidget::animKeyboardChange()
@@ -1133,6 +1115,9 @@
     }
 }
 
+/*!
+\reimp
+*/
 QSizeF HbInputVkbWidget::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
 {
     Q_UNUSED(constraint);
@@ -1159,7 +1144,7 @@
 }
 
 /*!
-    \reimp
+\reimp
  */
 void HbInputVkbWidget::changeEvent(QEvent *event)
 {
@@ -1171,4 +1156,42 @@
     HbWidget::changeEvent(event);
 }
 
+/*!
+\reimp
+*/
+void HbInputVkbWidget::gestureEvent(QGestureEvent *event)
+{
+    Q_D(HbInputVkbWidget);
+
+    if(HbSwipeGesture *gesture = qobject_cast<HbSwipeGesture *>(event->gesture(Qt::SwipeGesture))) {
+        if (gesture->state() == Qt::GestureFinished) {
+            HbWidgetFeedback::triggered(this, Hb::InstantFlicked);
+            // vertical swipes
+            if (gesture->sceneSwipeAngle() > 250 && gesture->sceneSwipeAngle() < 290 &&
+                    gesture->sceneVerticalDirection() == QSwipeGesture::Down) {
+                d->mFlickDirection = HbFlickDirectionDown;
+                emit keypadCloseEventDetected(HbVkbCloseMethodCloseGesture);
+            } else if (gesture->sceneSwipeAngle() > 70 && gesture->sceneSwipeAngle() < 110 &&
+                           gesture->sceneVerticalDirection() == QSwipeGesture::Up) {
+                d->mFlickDirection = HbFlickDirectionUp;
+                d->mCurrentHost->openKeypad(d->mCurrentHost->activeKeypad(), d->mOwner);
+            } else {
+                d->mFlickDirection = (HbInputVkbWidget::HbFlickDirection)gesture->sceneHorizontalDirection();
+                // horizontal swipes
+                if (d->mFlickAnimation){
+                    animKeyboardChange();
+                }
+                emit flickEvent(d->mFlickDirection);
+            }
+        }
+    } else if(HbTapGesture *gesture = qobject_cast<HbTapGesture *>(event->gesture(Qt::TapGesture))) {
+        if (gesture->state() == Qt::GestureFinished) {        
+            // if keypad is minimized, open it 
+            if ( d->mCurrentHost->keypadStatus() == HbVkbHost::HbVkbStatusMinimized ) {
+                d->mCurrentHost->openKeypad(this, d->mOwner);
+            }
+        }
+    }
+}
+
 // End of file
diff -r 16d8024aca5e -r f7ac710697a9 src/hbinput/inputwidgets/hbinputvkbwidget.h
--- a/src/hbinput/inputwidgets/hbinputvkbwidget.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputvkbwidget.h	Mon May 03 12:48:33 2010 +0300
@@ -34,8 +34,8 @@
 const int HbRepeatTimeout = 1000;
 const int HbRepeatTimeoutShort = 150;
 
-const QString backgroundGraphics("qtg_fr_input_bg");
-const QString HbInputVkbHandleIcon("qtg_graf_input_swipe");
+const QString backgroundGraphics("qtg_fr_input_v_bg");
+const QString HbInputVkbHandleIcon("qtg_graf_input_v_swipe");
 const qreal HbCloseHandleHeight = 20.0;
 
 class HbInputVkbWidgetPrivate;
@@ -43,13 +43,14 @@
 class HbInputMethod;
 class HbView;
 class HbKeymap;
+class HbPanGesture;
 
 class HB_INPUT_EXPORT HbInputVkbWidget : public HbWidget, public HbVirtualKeyboard
 {
     Q_OBJECT
 
 public:
-    enum HbFlickDirection 
+    enum HbFlickDirection
     {
         HbFlickDirectionNone = 0,
         HbFlickDirectionLeft,
@@ -70,7 +71,7 @@
         HbSctViewSpecialCharacter,
         HbSctViewSmiley
     };
-    
+
     HbInputVkbWidget(QGraphicsItem *parent = 0);
     virtual ~HbInputVkbWidget();
     virtual HbFlickDirection flickDirection();
@@ -105,12 +106,12 @@
 
 protected: // From QGraphicsItem
     virtual QPainterPath shape () const;
-    virtual void mousePressEvent(QGraphicsSceneMouseEvent* aEvent); 
-    virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent* aEvent);
+    virtual void mousePressEvent(QGraphicsSceneMouseEvent* event);
     virtual void changeEvent(QEvent *event);
     virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget);
-    virtual int type() const { return Hb::ItemType_InputVkbWidget; }
+    virtual int type() const {return Hb::ItemType_InputVkbWidget;}
     QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const;
+    virtual void gestureEvent(QGestureEvent *event);
 
 protected:
     // layout
@@ -120,26 +121,28 @@
 public slots:
     void showSettingList();
     void executeSettingsDialog();
+    void showSettingsView();
+    void closeSettingsView();
     void executeMethodDialog();
     void closeSettingList();
-    void mappedKeyPress(int aButtonId);
-    void mappedKeyRelease(int aButtonId);
+    void mappedKeyPress(int buttonId);
+    void mappedKeyRelease(int buttonId);
     void settingsClosed();
     void togglePredictionStatus();
     void showSmileyPicker(int rows, int columns);
 
     void refreshApplicationButton();
-    void keypadLanguageChangeAnimationUpdate(qreal aValue);
+    void keypadLanguageChangeAnimationUpdate(qreal value);
     void keypadLanguageChangeFinished();
 
 signals:
     void keypadCloseEventDetected(HbInputVkbWidget::HbVkbCloseMethod closeMethod);
-    void rockerDirection(int aDirection, HbInputVirtualRocker::RockerSelectionMode aSelectionMode);
+    void rockerDirection(int direction, HbInputVirtualRocker::RockerSelectionMode selectionMode);
     void flickEvent(HbInputVkbWidget::HbFlickDirection direction);
     void smileySelected(QString text);
     void mouseMovedOutOfButton();
 protected:
-    HbInputVkbWidget(HbInputVkbWidgetPrivate &dd, QGraphicsItem* parent); 
+    HbInputVkbWidget(HbInputVkbWidgetPrivate &dd, QGraphicsItem* parent);
 
 private:
     Q_DECLARE_PRIVATE_D(d_ptr, HbInputVkbWidget)
diff -r 16d8024aca5e -r f7ac710697a9 src/hbinput/inputwidgets/hbinputvkbwidget_p.h
--- a/src/hbinput/inputwidgets/hbinputvkbwidget_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputvkbwidget_p.h	Mon May 03 12:48:33 2010 +0300
@@ -159,6 +159,8 @@
     HbQwertyKeyboardSize mKeyboardSize;
     int mCloseHandleHeight;
     QGraphicsWidget *mCloseHandle; 
+    HbView *mSettingView;
+    HbView *mCurrentView;
     bool mKeyboardDimmed;
 };
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbinput/inputwidgets/inputwidgets.pri
--- a/src/hbinput/inputwidgets/inputwidgets.pri	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbinput/inputwidgets/inputwidgets.pri	Mon May 03 12:48:33 2010 +0300
@@ -48,12 +48,14 @@
 PUBLIC_HEADERS += $$PWD/hbinputsmileypicker.h
 PUBLIC_HEADERS += $$PWD/hbinputscreenshotwidget.h
 PUBLIC_HEADERS += $$PWD/hbinputsettinglist.h
+PUBLIC_HEADERS += $$PWD/hbinputsettingwidget.h
 # hb input widget private headers
-INTERNAL_HEADERS += $$PWD/hbinputvkbwidget_p.h
-INTERNAL_HEADERS += $$PWD/hbinput12keytouchkeypad_p.h
-INTERNAL_HEADERS += $$PWD/hbinputqwertytouchkeyboard_p.h
-INTERNAL_HEADERS += $$PWD/hbinputsctlandscape_p.h
-INTERNAL_HEADERS += $$PWD/hbinputsctportrait_p.h
+PRIVATE_HEADERS += $$PWD/hbinputvkbwidget_p.h
+PRIVATE_HEADERS += $$PWD/hbinput12keytouchkeypad_p.h
+PRIVATE_HEADERS += $$PWD/hbinputqwertytouchkeyboard_p.h
+PRIVATE_HEADERS += $$PWD/hbinputsctlandscape_p.h
+PRIVATE_HEADERS += $$PWD/hbinputsctportrait_p.h
+PRIVATE_HEADERS += $$PWD/hbinputcheckboxlist_p.h
 
 # hb input widget sources
 SOURCES += $$PWD/hbinputvkbwidget.cpp
@@ -76,3 +78,5 @@
 SOURCES += $$PWD/hbinputsmileypicker.cpp
 SOURCES += $$PWD/hbinputscreenshotwidget.cpp
 SOURCES += $$PWD/hbinputsettinglist.cpp
+SOURCES += $$PWD/hbinputsettingwidget.cpp
+SOURCES += $$PWD/hbinputcheckboxlist.cpp
diff -r 16d8024aca5e -r f7ac710697a9 src/hbplugins/feedback/feedbackeffectplugin/hbfeedbackeffectengine.cpp
--- a/src/hbplugins/feedback/feedbackeffectplugin/hbfeedbackeffectengine.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbplugins/feedback/feedbackeffectplugin/hbfeedbackeffectengine.cpp	Mon May 03 12:48:33 2010 +0300
@@ -45,7 +45,7 @@
 /*!
     Constructor
 */
-HbFeedbackEffectEngine::HbFeedbackEffectEngine() : previousCursorPosition(0)
+HbFeedbackEffectEngine::HbFeedbackEffectEngine() : activelyScrollingItemView(0), previousCursorPosition(0)
 {
     // initialize
     HbFeedbackPlayer::instance();
@@ -66,16 +66,202 @@
     boundaryWidgets.clear();
 }
 
+QString HbFeedbackEffectEngine::effectOverrideProperty(Hb::InstantInteraction interaction)
+{
+    QString propertyName;
+    switch (interaction) {
+    case Hb::InstantPressed:
+        propertyName = "pressedFeedbackEffect";
+        break;
+    case Hb::InstantReleased:
+        propertyName = "releasedFeedbackEffect";
+        break;
+    case Hb::InstantClicked:
+        propertyName = "clickedFeedbackEffect";
+        break;
+    case Hb::InstantKeyRepeated:
+        propertyName = "keyRepeatedFeedbackEffect";
+        break;
+    case Hb::InstantLongPressed:
+        propertyName = "longPressedFeedbackEffect";
+        break;
+    case Hb::InstantDraggedOver:
+        propertyName = "draggedOverFeedbackEffect";
+        break;
+    case Hb::InstantFlicked:
+        propertyName = "flickedFeedbackEffect";
+        break;
+    case Hb::InstantPopupOpened:
+        propertyName = "popupOpenedFeedbackEffect";
+        break;
+    case Hb::InstantPopupClosed:
+        propertyName = "popupClosedFeedbackEffect";
+        break;
+    case Hb::InstantBoundaryReached:
+        propertyName = "boundaryReachedFeedbackEffect";
+        break;
+    case Hb::InstantRotated90Degrees:
+        propertyName = "rotated90DegreesFeedbackEffect";
+        break;
+    case Hb::InstantSelectionChanged:
+        propertyName = "selectionChangedFeedbackEffect";
+        break;
+    case Hb::InstantMultitouchActivated:
+        propertyName = "multitouchActivatedFeedbackEffect";
+        break;
+    default:
+        propertyName = "defaultFeedbackEffect";
+        break;
+    }
+    return propertyName;
+}
+
+QString HbFeedbackEffectEngine::effectOverrideProperty(Hb::ContinuousInteraction interaction)
+{
+    QString propertyName;
+    switch (interaction) {
+    case Hb::ContinuousScrolled:
+        propertyName = "scrolledFeedbackEffect";
+        break;
+    case Hb::ContinuousDragged:
+        propertyName = "draggedFeedbackEffect";
+        break;
+    case Hb::ContinuousPinched:
+        propertyName = "pinchedFeedbackEffect";
+        break;
+    case Hb::ContinuousRotated:
+        propertyName = "rotatedFeedbackEffect";
+        break;
+    default:
+        propertyName = "defaultFeedbackEffect";
+        break;
+    }
+    return propertyName;
+}
+
+QString HbFeedbackEffectEngine::modalitiesOverrideProperty(Hb::InstantInteraction interaction)
+{
+    QString propertyName;
+    switch (interaction) {
+    case Hb::InstantPressed:
+        propertyName = "pressedFeedbackModalities";
+        break;
+    case Hb::InstantReleased:
+        propertyName = "releasedFeedbackModalities";
+        break;
+    case Hb::InstantClicked:
+        propertyName = "clickedFeedbackModalities";
+        break;
+    case Hb::InstantKeyRepeated:
+        propertyName = "keyRepeatedFeedbackModalities";
+        break;
+    case Hb::InstantLongPressed:
+        propertyName = "longPressedFeedbackModalities";
+        break;
+    case Hb::InstantDraggedOver:
+        propertyName = "draggedOverFeedbackModalities";
+        break;
+    case Hb::InstantFlicked:
+        propertyName = "flickedFeedbackModalities";
+        break;
+    case Hb::InstantPopupOpened:
+        propertyName = "popupOpenedFeedbackModalities";
+        break;
+    case Hb::InstantPopupClosed:
+        propertyName = "popupClosedFeedbackModalities";
+        break;
+    case Hb::InstantBoundaryReached:
+        propertyName = "boundaryReachedFeedbackModalities";
+        break;
+    case Hb::InstantRotated90Degrees:
+        propertyName = "rotated90DegreesFeedbackModalities";
+        break;
+    case Hb::InstantSelectionChanged:
+        propertyName = "selectionChangedFeedbackModalities";
+        break;
+    case Hb::InstantMultitouchActivated:
+        propertyName = "multitouchActivatedFeedbackModalities";
+        break;
+    default:
+        propertyName = "defaultFeedbackModalities";
+        break;
+    }
+    return propertyName;
+}
+
+QString HbFeedbackEffectEngine::modalitiesOverrideProperty(Hb::ContinuousInteraction interaction)
+{
+    QString propertyName;
+    switch (interaction) {
+    case Hb::ContinuousScrolled:
+        propertyName = "scrolledFeedbackModalities";
+        break;
+    case Hb::ContinuousDragged:
+        propertyName = "draggedFeedbackModalities";
+        break;
+    case Hb::ContinuousPinched:
+        propertyName = "pinchedFeedbackModalities";
+        break;
+    case Hb::ContinuousRotated:
+        propertyName = "rotatedFeedbackModalities";
+        break;
+    default:
+        propertyName = "defaultFeedbackModalities";
+        break;
+    }
+    return propertyName;
+}
+
+
+bool HbFeedbackEffectEngine::widgetOverridesEffect(const HbWidget *widget, Hb::InstantInteraction interaction) {
+    return (widget == overrider.widget && overrider.overridesEffect && overrider.instantInteraction == interaction);
+}
+
+bool HbFeedbackEffectEngine::widgetOverridesEffect(const HbWidget *widget, Hb::ContinuousInteraction interaction) {
+    return (widget == overrider.widget && overrider.overridesEffect && overrider.continuousInteraction == interaction);
+}
+
+bool HbFeedbackEffectEngine::widgetOverridesModalities(const HbWidget *widget,Hb::InstantInteraction interaction) {
+    return (widget == overrider.widget && overrider.overridesModalities && overrider.instantInteraction == interaction);
+}
+
+bool HbFeedbackEffectEngine::widgetOverridesModalities(const HbWidget *widget,Hb::ContinuousInteraction interaction) {
+    return (widget == overrider.widget && overrider.overridesModalities && overrider.continuousInteraction == interaction);
+}
+
+
 /*!
     Called by the feedback manager when an interaction is triggered.
 */
 void HbFeedbackEffectEngine::triggered(const HbWidget *widget, Hb::InstantInteraction interaction, Hb::InteractionModifiers modifiers)
 {
-    HbFeedback::InstantEffect widgetOverride = widget->overrideFeedback(interaction);
-    if (widgetOverride != HbFeedback::NoOverride ) {
-        playInstantFeedback(widget, widgetOverride);
+    
+    overrider.widget = widget;
+    overrider.instantInteraction = interaction;
+    overrider.overridesEffect = false;
+    overrider.overridesModalities = false;
+
+    QString effectProperty = effectOverrideProperty(interaction);
+    QVariant veffect = widget->property(effectProperty.toLatin1());
+    if(veffect.isValid() && veffect.type() == QVariant::Int) {
+        overrider.overridesEffect = true;
+        overrider.newInstantEffect = HbFeedback::InstantEffect(veffect.toInt());
+    }
+    
+    QString modalitiesProperty = modalitiesOverrideProperty(interaction);
+    QVariant vmodalities = widget->property(modalitiesProperty.toLatin1());
+    if(vmodalities.isValid() && vmodalities.type() == QVariant::Int) {
+        overrider.overridesModalities = true;
+        overrider.newModalities = HbFeedback::Modalities(vmodalities.toInt());
+    }
+
+    if(overrider.overridesEffect && overrider.overridesModalities) {
+        // play specified effect via the specified modality
+        playInstantFeedback(widget,overrider.newInstantEffect,overrider.newModalities);
+
     } else {
-        HbFeedbackEngine::triggered(widget, interaction, modifiers);
+        // use default values for unspecified effect/modalities
+        HbFeedbackEngine::triggered(widget,interaction,modifiers);
     }
 }
 
@@ -84,8 +270,23 @@
 */
 void HbFeedbackEffectEngine::pressed(const HbWidget *widget)
 {
-    HbFeedback::InstantEffect effect = HbFeedbackEffectUtils::instantOnPress(widget, modifiers());
-    playInstantFeedback(widget, effect);
+    HbFeedback::InstantEffect effect = HbFeedback::None;
+    HbFeedback::Modalities modalities = 0;
+    Hb::InstantInteraction interaction = Hb::InstantPressed;
+
+    if(widgetOverridesEffect( widget, interaction)) {
+        effect = overrider.newInstantEffect;
+    } else {
+        effect = HbFeedbackEffectUtils::instantOnPress(widget, modifiers());
+    }
+
+    if(widgetOverridesModalities(widget,interaction)) {
+        modalities = overrider.newModalities ;
+    } else  {
+        modalities = HbFeedbackEffectUtils::modalities(widget, Hb::InstantPressed, modifiers());
+    }
+
+    playInstantFeedback(widget, effect, modalities);
 }
 
 /*!
@@ -93,30 +294,52 @@
 */
 void HbFeedbackEffectEngine::released(const HbWidget *widget)
 {
+    HbFeedback::InstantEffect effect = HbFeedback::None;
+    HbFeedback::Modalities modalities = 0;
+    Hb::InstantInteraction interaction = Hb::InstantReleased;
+
     if (continuousFeedbacks.contains(widget)) {
         cancelContinuousFeedback(widget);
     }
-    // slider-like widgets are a bit special
-    if (HbFeedbackEffectUtils::widgetFamily(widget) == HbFeedbackEffectUtils::Slider) {
-        playInstantFeedback(widget, HbFeedbackEffectUtils::instantOnRelease(widget, modifiers()));
-    }
-    // lists in arrange mode react on release
-    else if (const HbListViewItem *listViewItem = qobject_cast<const HbListViewItem *>(widget)) {
-        const HbAbstractItemView* itemView = listViewItem->itemView();
-        if (const HbListView * listView = qobject_cast<const HbListView *>(itemView)) {
-            if( listView->arrangeMode() ) {
-                playInstantFeedback(listViewItem,HbFeedbackEffectUtils::instantOnRelease(listViewItem, modifiers()));
+
+    if(widgetOverridesEffect( widget, interaction)) {
+        effect = overrider.newInstantEffect;
+    } else {
+        // use default effect
+        // slider-like widgets are a bit special
+        if (HbFeedbackEffectUtils::widgetFamily(widget) == HbFeedbackEffectUtils::Slider) {
+            effect = HbFeedbackEffectUtils::instantOnRelease(widget, modifiers()) ;
+        }
+        // lists in arrange mode react on release
+        else if (const HbListViewItem *listViewItem = qobject_cast<const HbListViewItem *>(widget)) {
+            const HbAbstractItemView* itemView = listViewItem->itemView();
+            if (const HbListView * listView = qobject_cast<const HbListView *>(itemView)) {
+                if( listView->arrangeMode() ) {
+                    effect = HbFeedbackEffectUtils::instantOnRelease(listViewItem, modifiers()) ;
+                }
             }
         }
-    } else if (widget->type() == Hb::ItemType_VirtualTrackPoint) {
-        playInstantFeedback(widget, HbFeedback::Editor);
-    } else if (widget->type() == Hb::ItemType_WritingBox) {
-        playInstantFeedback(widget, HbFeedback::Editor);
+        else if (HbFeedbackEffectUtils::widgetFamily(widget) == HbFeedbackEffectUtils::Editor) {
+            effect = HbFeedbackEffectUtils::instantOnRelease(widget, modifiers());
+        } else if (widget->type() == HbPrivate::ItemType_GroupBoxHeadingWidget || widget->type() == Hb::ItemType_ComboBox) {
+            effect = HbFeedbackEffectUtils::instantOnRelease(widget, modifiers()) ;
+        }
+        else if (widget->type() == HbPrivate::ItemType_GroupBoxHeadingWidget
+                 || widget->type() == HbPrivate::ItemType_GroupBoxContentWidget
+                 || widget->type() == HbPrivate::ItemType_DataGroupHeadingWidget
+                 || widget->type() == Hb::ItemType_ComboBox) {
+            effect = HbFeedbackEffectUtils::instantOnRelease(widget, modifiers());
+        }
     }
-    else if (widget->type() == HbPrivate::ItemType_GroupBoxHeadingWidget || widget->type() == Hb::ItemType_ComboBox) {
-        playInstantFeedback(widget, HbFeedbackEffectUtils::instantOnRelease(widget, modifiers()));
+
+    if(widgetOverridesModalities(widget,interaction)) {
+        modalities = overrider.newModalities ;
+    } else  {
+        modalities = HbFeedbackEffectUtils::modalities(widget, Hb::InstantReleased, modifiers());
     }
 
+    playInstantFeedback(widget,effect, modalities);
+
     // normally touch end feedback effect is initiated with a clicked signal
 }
 
@@ -125,9 +348,30 @@
 */
 void HbFeedbackEffectEngine::longPressed(const HbWidget *widget)
 {
-    if (widget->type() == Hb::ItemType_InputCharacterButton) {
-        playInstantFeedback(widget, HbFeedback::SensitiveKeypad);
+    HbFeedback::InstantEffect effect = HbFeedback::None;
+    HbFeedback::Modalities modalities = 0;
+    Hb::InstantInteraction interaction = Hb::InstantLongPressed;
+
+    if(widgetOverridesEffect(widget, interaction)) {
+        effect = overrider.newInstantEffect;
+    } else {
+        effect = HbFeedback::None;
+        if (widget->type() == Hb::ItemType_InputCharacterButton) {
+            effect = HbFeedback::SensitiveKeypad;
+        }
+        else {
+            effect = HbFeedback::LongPress;
+        }
     }
+
+    if(widgetOverridesModalities(widget,interaction)) {
+        modalities = overrider.newModalities ;
+    } else  {
+        modalities = HbFeedbackEffectUtils::modalities(widget, interaction, modifiers());
+    }
+
+    playInstantFeedback(widget, effect, modalities);
+
 }
 
 /*!
@@ -135,10 +379,27 @@
 */
 void HbFeedbackEffectEngine::clicked(const HbWidget *widget)
 {
+    HbFeedback::InstantEffect effect = HbFeedback::None ;
+    HbFeedback::Modalities modalities = 0 ;
+    Hb::InstantInteraction interaction = Hb::InstantClicked;
+
     if (continuousFeedbacks.contains(widget)) {
         cancelContinuousFeedback(widget);
     }
-    playInstantFeedback(widget, HbFeedbackEffectUtils::instantOnRelease(widget, modifiers()));
+
+    if(widgetOverridesEffect( widget, interaction)) {
+        effect = overrider.newInstantEffect;
+    } else {
+        effect = HbFeedbackEffectUtils::instantOnRelease(widget, modifiers());
+    }
+
+    if(widgetOverridesModalities(widget,interaction)) {
+        modalities = overrider.newModalities ;
+    } else  {
+        modalities = HbFeedbackEffectUtils::modalities(widget, interaction, modifiers());
+    }
+
+    playInstantFeedback(widget, effect, modalities);
 }
 
 /*!
@@ -146,7 +407,23 @@
 */
 void HbFeedbackEffectEngine::keyRepeated(const HbWidget *widget)
 {
-    playInstantFeedback(widget, HbFeedbackEffectUtils::instantOnKeyRepeat(widget));
+    HbFeedback::InstantEffect effect = HbFeedback::None ;
+    HbFeedback::Modalities modalities = 0 ;
+    Hb::InstantInteraction interaction = Hb::InstantKeyRepeated;
+
+    if(widgetOverridesEffect( widget, interaction)) {
+        effect = overrider.newInstantEffect;
+    } else {
+        effect = HbFeedbackEffectUtils::instantOnKeyRepeat(widget);
+    }
+
+    if(widgetOverridesModalities(widget,interaction)) {
+        modalities = overrider.newModalities ;
+    } else  {
+        modalities = HbFeedbackEffectUtils::modalities(widget, interaction, modifiers());
+    }
+
+    playInstantFeedback(widget, effect, modalities);
 }
 
 /*!
@@ -154,34 +431,49 @@
 */
 void HbFeedbackEffectEngine::draggedOver(const HbWidget *widget)
 {
-    // For editor highlighting
-    if (const HbAbstractEdit *edit = qobject_cast<const HbAbstractEdit *>(widget)) {
-        if (edit->cursorPosition() != previousCursorPosition) {
-            playInstantFeedback(widget, HbFeedbackEffectUtils::instantOnEditorHighlight(edit, previousCursorPosition));
-            previousCursorPosition = edit->cursorPosition();
+    HbFeedback::InstantEffect effect = HbFeedback::None ;
+    HbFeedback::Modalities modalities = 0 ;
+    Hb::InstantInteraction interaction = Hb::InstantDraggedOver;
+
+    if(widgetOverridesEffect( widget, interaction)) {
+        effect = overrider.newInstantEffect;
+    } else {
+        // For editor highlighting
+        if (const HbAbstractEdit *edit = qobject_cast<const HbAbstractEdit *>(widget)) {
+            if (edit->cursorPosition() != previousCursorPosition) {
+                effect = HbFeedbackEffectUtils::instantOnEditorHighlight(edit, previousCursorPosition) ;
+                previousCursorPosition = edit->cursorPosition();
+            }
         }
-    }
-    else if (const HbInputVirtualRocker *trackPoint = qobject_cast<const HbInputVirtualRocker *>(widget)) {
-        if (trackPoint && trackPoint->mainWindow() && trackPoint->mainWindow()->scene() &&
-            trackPoint->mainWindow()->scene()->focusItem()) {
-            
-            QGraphicsItem* graphicsItem = trackPoint->mainWindow()->scene()->focusItem();
-            
-            if (graphicsItem->isWidget() && 
-                static_cast<QGraphicsWidget*>(graphicsItem)->inherits("HbAbstractEdit")) {
-             
-                if (HbAbstractEdit* edit = static_cast<HbAbstractEdit*>(graphicsItem)) {
-                    if (edit->cursorPosition() != previousCursorPosition) {
-                        playInstantFeedback(widget, HbFeedbackEffectUtils::instantOnEditorHighlight(edit, previousCursorPosition));
-                        previousCursorPosition = edit->cursorPosition();
+        else if (const HbInputVirtualRocker *trackPoint = qobject_cast<const HbInputVirtualRocker *>(widget)) {
+            if (trackPoint && trackPoint->mainWindow() && trackPoint->mainWindow()->scene() &&
+                trackPoint->mainWindow()->scene()->focusItem()) {
+
+                QGraphicsItem* graphicsItem = trackPoint->mainWindow()->scene()->focusItem();
+
+                if (graphicsItem->isWidget() &&
+                    static_cast<QGraphicsWidget*>(graphicsItem)->inherits("HbAbstractEdit")) {
+
+                    if (HbAbstractEdit* edit = static_cast<HbAbstractEdit*>(graphicsItem)) {
+                        if (edit->cursorPosition() != previousCursorPosition) {
+                            effect = HbFeedbackEffectUtils::instantOnEditorHighlight(edit, previousCursorPosition);
+                            previousCursorPosition = edit->cursorPosition();
+                        }
                     }
                 }
             }
+        } else {
+            effect = HbFeedbackEffectUtils::instantOnDrag(widget, modifiers());
         }
     }
-    else {
-        playInstantFeedback(widget, HbFeedbackEffectUtils::instantOnDrag(widget, modifiers()));
+
+    if(widgetOverridesModalities(widget,interaction)) {
+        modalities = overrider.newModalities ;
+    } else  {
+        modalities = HbFeedbackEffectUtils::modalities(widget, interaction, modifiers());
     }
+
+    playInstantFeedback(widget, effect, modalities);
 }
 
 /*!
@@ -189,7 +481,23 @@
 */
 void HbFeedbackEffectEngine::flicked(const HbWidget *widget)
 {
-    playInstantFeedback(widget, HbFeedback::Flick);
+    HbFeedback::InstantEffect effect = HbFeedback::None ;
+    HbFeedback::Modalities modalities = 0 ;
+    Hb::InstantInteraction interaction = Hb::InstantFlicked;
+
+    if(widgetOverridesEffect( widget, interaction)) {
+        effect = overrider.newInstantEffect;
+    } else {
+        effect = HbFeedback::Flick ;
+    }
+
+    if(widgetOverridesModalities(widget,interaction)) {
+        modalities = overrider.newModalities ;
+    } else  {
+        modalities = HbFeedbackEffectUtils::modalities(widget, interaction, modifiers());
+    }
+
+    playInstantFeedback(widget, effect, modalities);
 }
 
 /*!
@@ -205,7 +513,24 @@
 */
 void HbFeedbackEffectEngine::rotated90Degrees(const HbWidget *widget)
 {
-    playInstantFeedback(widget, HbFeedback::RotateStep);
+    HbFeedback::InstantEffect effect = HbFeedback::None ;
+    HbFeedback::Modalities modalities = 0 ;
+    Hb::InstantInteraction interaction = Hb::InstantRotated90Degrees;
+
+    if(widgetOverridesEffect( widget, interaction)) {
+        effect = overrider.newInstantEffect;
+    } else {
+        effect = HbFeedback::RotateStep;
+
+    }
+
+    if(widgetOverridesModalities(widget,interaction)) {
+        modalities = overrider.newModalities ;
+    } else  {
+        modalities = HbFeedbackEffectUtils::modalities(widget, interaction, modifiers());
+    }
+
+    playInstantFeedback(widget, effect, modalities);
 }
 
 /*!
@@ -213,8 +538,21 @@
 */
 void HbFeedbackEffectEngine::popupOpened(const HbWidget *widget)
 {
-    if (HbFeedbackEffectUtils::isFeedbackAllowedForPopup(widget)) {
-        playInstantFeedback(widget, HbFeedback::PopupOpen);
+    HbFeedback::Modalities modalities = 0 ;
+    Hb::InstantInteraction interaction = Hb::InstantPopupOpened;
+
+    if(widgetOverridesModalities(widget,interaction)) {
+        modalities = overrider.newModalities ;
+    } else  {
+        modalities = HbFeedbackEffectUtils::modalities(widget, interaction, modifiers());
+    }
+
+    if(widgetOverridesEffect( widget, interaction)) {
+        playInstantFeedback(widget, overrider.newInstantEffect, modalities);
+    } else {
+        if(HbFeedbackEffectUtils::isFeedbackAllowedForPopup(widget)) {
+            playInstantFeedback(widget, HbFeedback::PopupOpen, modalities);
+        }
     }
 }
 
@@ -223,8 +561,21 @@
 */
 void HbFeedbackEffectEngine::popupClosed(const HbWidget *widget)
 {
-    if (HbFeedbackEffectUtils::isFeedbackAllowedForPopup(widget)) {
-        playInstantFeedback(widget, HbFeedback::PopupClose);
+    HbFeedback::Modalities modalities = 0 ;
+    Hb::InstantInteraction interaction = Hb::InstantPopupClosed;
+
+    if(widgetOverridesModalities(widget,interaction)) {
+        modalities = overrider.newModalities ;
+    } else  {
+        modalities = HbFeedbackEffectUtils::modalities(widget, interaction, modifiers());
+    }
+
+    if(widgetOverridesEffect( widget, interaction)) {
+        playInstantFeedback(widget, overrider.newInstantEffect, modalities);
+    } else {
+        if(HbFeedbackEffectUtils::isFeedbackAllowedForPopup(widget)) {
+            playInstantFeedback(widget, HbFeedback::PopupClose, modalities);
+        }
     }
 }
 
@@ -233,7 +584,23 @@
 */
 void HbFeedbackEffectEngine::selectionChanged(const HbWidget *widget)
 {
-    playInstantFeedback(widget, HbFeedbackEffectUtils::instantOnSelectionChanged(widget));
+    HbFeedback::InstantEffect effect = HbFeedback::None ;
+    HbFeedback::Modalities modalities = 0 ;
+    Hb::InstantInteraction interaction = Hb::InstantSelectionChanged;
+
+    if(widgetOverridesEffect( widget, interaction)) {
+        effect = overrider.newInstantEffect;
+    } else {
+        effect = HbFeedbackEffectUtils::instantOnSelectionChanged(widget, modifiers());
+    }
+
+    if(widgetOverridesModalities(widget,interaction)) {
+        modalities = overrider.newModalities ;
+    } else  {
+        modalities = HbFeedbackEffectUtils::modalities(widget, interaction, modifiers());
+    }
+
+    playInstantFeedback(widget, effect, modalities);
 }
 
 /*!
@@ -241,7 +608,23 @@
 */
 void HbFeedbackEffectEngine::multitouchActivated(const HbWidget *widget)
 {
-    playInstantFeedback(widget, HbFeedback::MultitouchActivate);
+    HbFeedback::InstantEffect effect = HbFeedback::None ;
+    HbFeedback::Modalities modalities = 0 ;
+    Hb::InstantInteraction interaction = Hb::InstantMultitouchActivated;
+
+    if(widgetOverridesEffect( widget, interaction)) {
+        effect = overrider.newInstantEffect;
+    } else {
+        effect = HbFeedback::MultitouchActivate;
+    }
+
+    if(widgetOverridesModalities(widget,interaction)) {
+        modalities = overrider.newModalities ;
+    } else  {
+        modalities = HbFeedbackEffectUtils::modalities(widget, interaction, modifiers());
+    }
+
+    playInstantFeedback(widget, effect, modalities);
 }
 
 /*!
@@ -249,83 +632,119 @@
 */
 void HbFeedbackEffectEngine::continuousTriggered(const HbWidget *widget, Hb::ContinuousInteraction interaction, QPointF delta)
 {
-    bool feedbackPlayed(false);
-    switch(HbFeedbackEffectUtils::widgetFamily(widget))
-    {
-        case HbFeedbackEffectUtils::Slider:
+    HbFeedback::ContinuousEffect effect = HbFeedback::ContinuousNone ;
+    HbFeedback::Modalities modalities = 0 ;
+
+    overrider.widget = widget;
+    overrider.continuousInteraction = interaction;
+    overrider.overridesEffect = false;
+    overrider.overridesModalities = false;
+
+    QString effectProperty = effectOverrideProperty(interaction);
+    QVariant veffect = widget->property(effectProperty.toLatin1());
+    if(veffect.isValid() && veffect.type() == QVariant::Int) {
+        overrider.overridesEffect = true;
+        overrider.newContinuousEffect = HbFeedback::ContinuousEffect(veffect.toInt());
+    }
+
+    QString modalitiesProperty = modalitiesOverrideProperty(interaction);
+    QVariant vmodalities = widget->property(modalitiesProperty.toLatin1());
+    if(vmodalities.isValid() && vmodalities.type() == QVariant::Int) {
+        overrider.overridesModalities = true;
+        overrider.newModalities = HbFeedback::Modalities(vmodalities.toInt());
+    }
+
+    if(widgetOverridesModalities(widget,interaction)) {
+        modalities = overrider.newModalities ;
+    } else  {
+        modalities = HbFeedbackEffectUtils::modalities(widget, interaction, modifiers());
+    }
+
+    if(widgetOverridesEffect( widget, interaction)) {
+        // use overridden effect
+        effect = overrider.newContinuousEffect;
+        int intensity = HbFeedbackEffectUtils::intensity(widget, interaction, delta);
+        playContinuousFeedback(widget, HbFeedback::ContinuousEffect(effect), intensity, modalities);
+        
+    } else {
+        // use default effect
+        bool feedbackPlayed(false);
+
+        switch(HbFeedbackEffectUtils::widgetFamily(widget))
         {
-            if (!HbFeedbackEffectUtils::isSliderMoveContinuous(widget)) {
-                playInstantFeedback(widget, HbFeedback::SensitiveSlider);
-                feedbackPlayed = true;
+        case HbFeedbackEffectUtils::Slider:
+            {
+                if (!HbFeedbackEffectUtils::isSliderMoveContinuous(widget)) {
+                    if(!widgetOverridesModalities(widget,interaction)) {
+                        modalities = HbFeedback::Audio | HbFeedback::Tactile;
+                    }
+                    playInstantFeedback(widget, HbFeedback::SensitiveSlider, modalities);
+                    feedbackPlayed = true;
+                }
+                break;
             }
-            break;
-        }
         case HbFeedbackEffectUtils::List:
         case HbFeedbackEffectUtils::Grid:
-        {
-            if (interaction == Hb::ContinuousScrolled) {
-                 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;
-                     }
-                     oldVisibleIndexes.clear();
-                     oldVisibleIndexes = visibleIndexes;
-
-                    if (newItemFound) {
-                        const HbListView* listView = qobject_cast<const HbListView*>(widget);
-                        if (!(  listView &&
-                                listView->arrangeMode() &&
-                                listView->draggedItem())){
-                            playInstantFeedback(widget, HbFeedback::ItemScroll);
+            {
+                if (interaction == Hb::ContinuousScrolled) {
+                    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;
+                        }
+                        oldVisibleIndexes.clear();
+                        oldVisibleIndexes = visibleIndexes;
+                        
+                        if (newItemFound) {
+                            const HbListView* listView = qobject_cast<const HbListView*>(widget);
+                            if (!(  listView &&
+                                    listView->arrangeMode() &&
+                                    listView->draggedItem())){
+                                if(!widgetOverridesModalities(widget,interaction)) {
+                                    modalities = HbFeedback::Audio | HbFeedback::Tactile;
+                                }
+                                playInstantFeedback(widget, HbFeedback::ItemScroll, modalities);
+                            }
                         }
                     }
-                 }
-             }
-            break;
-        }
+                }
+                break;
+            }
         default:
-        {
-            break;
-        }
-    }
-
-    if (interaction == Hb::ContinuousScrolled) {
-        // menu widget does scroll feedback elsewhere
-        if (widget->type() == HbPrivate::ItemType_MenuListView) {
-            feedbackPlayed = true;
+            {
+                break;
+            }
         }
-
-        // generic scroll areas don't emit continuous feedback
-        if (const HbScrollArea* scrollArea = qobject_cast<const HbScrollArea *>(widget)) {
-            Q_UNUSED(scrollArea)
-            feedbackPlayed = true;
+        
+        if (interaction == Hb::ContinuousScrolled) {
+            // menu widget does scroll feedback elsewhere
+            if (widget->type() == HbPrivate::ItemType_MenuListView) {
+                feedbackPlayed = true;
+            }
+            
+            // generic scroll areas don't emit continuous feedback
+            if (const HbScrollArea* scrollArea = qobject_cast<const HbScrollArea *>(widget)) {
+                Q_UNUSED(scrollArea)
+                feedbackPlayed = true;
+            }
         }
-    }
-
-    if (!feedbackPlayed) {
-        int intensity = HbFeedbackEffectUtils::intensity(widget, interaction, delta);
-
-        // Check if the widget has overriden feedback for this interaction
-        HbFeedback::ContinuousEffect widgetOverride = widget->overrideContinuousFeedback(interaction, &intensity) ;
-        if (widgetOverride != HbFeedback::NoContinuousOverride) {
-            playContinuousFeedback(widget, widgetOverride, intensity);
-        } else {
-            playContinuousFeedback(widget, HbFeedbackEffectUtils::continuousEffect(widget, interaction), intensity);
+        if (!feedbackPlayed) {
+            int intensity = HbFeedbackEffectUtils::intensity(widget, interaction, delta);
+            playContinuousFeedback(widget, HbFeedbackEffectUtils::continuousEffect(widget, interaction), intensity, modalities);
 
         }
     }
@@ -336,35 +755,50 @@
 */
 void HbFeedbackEffectEngine::continuousStopped(const HbWidget *widget, Hb::ContinuousInteraction interaction)
 {
-    // determine if instant feedback should be played when a continuous interaction is stopped
     HbFeedback::InstantEffect effect = HbFeedback::None;
-    if (boundaryWidgets.contains(widget)) {
-        if (interaction == Hb::ContinuousScrolled) {
-            effect = HbFeedback::BounceEffect;
-        }
-        boundaryWidgets.removeAll(widget);
+    HbFeedback::Modalities modalities = 0;
+
+    if(widgetOverridesModalities(widget,interaction)) {
+        modalities = overrider.newModalities ;
+    } else  {
+        modalities = HbFeedback::Tactile;
     }
 
-    // stop ongoing continuous and list scrolling feedback effects
-    if (continuousFeedbacks.contains(widget)) {
-       cancelContinuousFeedback(widget);
+    if(widgetOverridesEffect( widget, interaction)) {
+        effect = overrider.newInstantEffect;
+        playInstantFeedback(widget, overrider.newInstantEffect, modalities);
+    } else {
+        // determine if instant feedback should be played when a continuous interaction is stopped
+        effect = HbFeedback::None;
+        if (boundaryWidgets.contains(widget)) {
+            if (interaction == Hb::ContinuousScrolled) {
+                effect = HbFeedback::BounceEffect;
+            }
+            boundaryWidgets.removeAll(widget);
+        }
+
+        // stop ongoing continuous and list scrolling feedback effects
+        if (continuousFeedbacks.contains(widget)) {
+            cancelContinuousFeedback(widget);
+        }
+        if (activelyScrollingItemView == widget) {
+            activelyScrollingItemView = 0;
+        }
+        playInstantFeedback(widget, effect, modalities);
     }
-    if (activelyScrollingItemView == widget) {
-        activelyScrollingItemView = 0;
-    }
-    playInstantFeedback(widget, effect);
 }
 
 /*!
     Plays the instant feedback.
 */
-void HbFeedbackEffectEngine::playInstantFeedback(const HbWidget* widget, HbFeedback::InstantEffect effect)
+void HbFeedbackEffectEngine::playInstantFeedback(const HbWidget* widget, HbFeedback::InstantEffect effect, HbFeedback::Modalities modalities)
 {
     const QGraphicsView* view = widget->mainWindow();
     if (view && HbFeedbackEffectUtils::isFeedbackAllowed(widget)) {
         HbInstantFeedback feedback(effect);
         feedback.setRect(widget, view);
         feedback.setOwningWindow(view);
+        feedback.setModalities(modalities);
 
         if (hbFeedbackPlayer && feedback.isLocated()) {
             hbFeedbackPlayer->playInstantFeedback(feedback);
@@ -375,13 +809,14 @@
 /*!
     Plays the continuous feedback.
 */
-void HbFeedbackEffectEngine::playContinuousFeedback(const HbWidget* widget, HbFeedback::ContinuousEffect effect, int intensity)
+void HbFeedbackEffectEngine::playContinuousFeedback(const HbWidget* widget, HbFeedback::ContinuousEffect effect, int intensity, HbFeedback::Modalities modalities)
 {
     const QGraphicsView* view = widget->mainWindow();
     if (view && HbFeedbackEffectUtils::isFeedbackAllowed(widget)) {
         HbContinuousFeedback feedback(effect,view);
         feedback.setRect(widget, view);
         feedback.setIntensity(intensity);
+        feedback.setModalities(modalities);
 
         if (hbFeedbackPlayer && feedback.isLocated()) {
             // if continuous feedback is still active and not stopped by continuous feedback timeout
diff -r 16d8024aca5e -r f7ac710697a9 src/hbplugins/feedback/feedbackeffectplugin/hbfeedbackeffectengine.h
--- a/src/hbplugins/feedback/feedbackeffectplugin/hbfeedbackeffectengine.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbplugins/feedback/feedbackeffectplugin/hbfeedbackeffectengine.h	Mon May 03 12:48:33 2010 +0300
@@ -42,7 +42,6 @@
 public:
     HbFeedbackEffectEngine();
     ~HbFeedbackEffectEngine();
-
     void triggered(const HbWidget* widget, Hb::InstantInteraction interaction, Hb::InteractionModifiers modifiers);
     void pressed(const HbWidget *widget);
     void released(const HbWidget *widget);
@@ -59,11 +58,20 @@
     void multitouchActivated(const HbWidget *widget);
     void continuousTriggered(const HbWidget *widget, Hb::ContinuousInteraction interaction, QPointF delta);
     void continuousStopped(const HbWidget *widget, Hb::ContinuousInteraction interaction);
-        
+
 protected:
-    void playInstantFeedback(const HbWidget* widget, HbFeedback::InstantEffect effect);
-    void playContinuousFeedback(const HbWidget* widget, HbFeedback::ContinuousEffect effect, int intensity);
+    void playInstantFeedback(const HbWidget* widget, HbFeedback::InstantEffect effect, HbFeedback::Modalities modalities = HbFeedback::All);
+    void playContinuousFeedback(const HbWidget* widget, HbFeedback::ContinuousEffect effect, int intensity, HbFeedback::Modalities modalities = HbFeedback::All);
     void cancelContinuousFeedback(const HbWidget* HbWidget);
+    inline bool widgetOverridesEffect(const HbWidget *widget, Hb::InstantInteraction interaction);
+    inline bool widgetOverridesEffect(const HbWidget *widget, Hb::ContinuousInteraction interaction);
+    inline bool widgetOverridesModalities(const HbWidget *widget,Hb::InstantInteraction interaction);
+    inline bool widgetOverridesModalities(const HbWidget *widget,Hb::ContinuousInteraction interaction);
+
+    QString effectOverrideProperty(Hb::InstantInteraction interaction);
+    QString effectOverrideProperty(Hb::ContinuousInteraction interaction);
+    QString modalitiesOverrideProperty(Hb::InstantInteraction interaction);
+    QString modalitiesOverrideProperty(Hb::ContinuousInteraction interaction);
 
 private:
     QMap<const HbWidget*, int> continuousFeedbacks;
@@ -71,6 +79,21 @@
     const HbWidget* activelyScrollingItemView;
     QList<const HbWidget*> boundaryWidgets;
 
+    struct Override {
+        const HbWidget* widget;
+        Hb::InstantInteraction instantInteraction;
+        Hb::ContinuousInteraction continuousInteraction;
+
+        bool overridesEffect;
+        HbFeedback::InstantEffect newInstantEffect;
+        HbFeedback::ContinuousEffect newContinuousEffect;
+
+        bool overridesModalities;
+        HbFeedback::Modalities newModalities;
+    };
+    Override overrider;
+
+
     int previousCursorPosition;
 };
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbplugins/feedback/feedbackeffectplugin/hbfeedbackeffectutils.cpp
--- a/src/hbplugins/feedback/feedbackeffectplugin/hbfeedbackeffectutils.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbplugins/feedback/feedbackeffectplugin/hbfeedbackeffectutils.cpp	Mon May 03 12:48:33 2010 +0300
@@ -133,6 +133,10 @@
 
         case HbPrivate::ItemType_GroupBoxHeadingWidget:
 
+        case HbPrivate::ItemType_GroupBoxContentWidget:
+
+        case HbPrivate::ItemType_DataGroupHeadingWidget:
+
             family = HbFeedbackEffectUtils::List;
             IF_INSTANCEOF_SET_FAMILY(HbGridView, Grid)
             break;
@@ -247,8 +251,9 @@
                 }
             }
 
-            if (widget->type() == HbPrivate::ItemType_NavigationButton ||
-                widget->type() == HbPrivate::ItemType_IndicatorButton) {
+            if (widget->type() == HbPrivate::ItemType_NavigationButton
+                // Commented out until use cases are clarified
+                /*|| widget->type() == HbPrivate::ItemType_IndicatorButton*/) {
                 effect = HbFeedback::BasicButton;
             }
             
@@ -272,7 +277,7 @@
             break;
 
         case HbFeedbackEffectUtils::List:
-            if (modifiers & Hb::ModifierCollapsedItem) {
+            if (modifiers & (Hb::ModifierExpandedItem | Hb::ModifierCollapsedItem)) {
                 effect = HbFeedback::BasicItem;
             }
             else {
@@ -372,16 +377,6 @@
                 }
             }
 
-            // Expandable or collapsible data form item gives BasicItem feedback
-            if (const HbDataFormViewItem* dataFormItem = qobject_cast<const HbDataFormViewItem *>(widget)) {
-                if (itemView->model()->rowCount(dataFormItem->modelIndex()) > 0) {
-                    effect = HbFeedback::BasicItem;
-                }
-                else {
-                    effect = HbFeedback::SensitiveItem;
-                }
-            }
-
             if (modifiers & Hb::ModifierScrolling) {
                 effect = HbFeedback::StopFlick;
             }
@@ -430,8 +425,9 @@
                 }
             }
 
-            if (widget->type() == HbPrivate::ItemType_NavigationButton ||
-                widget->type() == HbPrivate::ItemType_IndicatorButton) {
+            if (widget->type() == HbPrivate::ItemType_NavigationButton
+                // Commented out until use cases are clarified
+                /*|| widget->type() == HbPrivate::ItemType_IndicatorButton*/) {
                 effect = HbFeedback::BasicButton;
             }
 
@@ -457,7 +453,7 @@
             break;
 
         case HbFeedbackEffectUtils::List:
-            if (modifiers & Hb::ModifierCollapsedItem) {
+            if (modifiers & (Hb::ModifierExpandedItem | Hb::ModifierCollapsedItem)) {
                 effect = HbFeedback::BasicItem;
             }
             else {
@@ -490,7 +486,7 @@
             break;
 
         case HbFeedbackEffectUtils::Editor:
-            effect = HbFeedback::None;
+            effect = HbFeedback::Editor;
             break;
 
         default:
@@ -702,6 +698,9 @@
             feedbackAllowed = false;
         }
     }
+    else if (QString(widget->metaObject()->className()) == "HbComboDropDown") {
+        feedbackAllowed = true;
+    }
     return feedbackAllowed;
 }
 
@@ -717,7 +716,7 @@
 /*!
     Returns the instant feedback effect on selection changed events.
 */
-HbFeedback::InstantEffect HbFeedbackEffectUtils::instantOnSelectionChanged(const HbWidget *widget)
+HbFeedback::InstantEffect HbFeedbackEffectUtils::instantOnSelectionChanged(const HbWidget *widget, Hb::InteractionModifiers modifiers)
 {
     HbFeedback::InstantEffect effect = HbFeedback::None;
 
@@ -741,6 +740,9 @@
                 default:
                     break;
             }
+            if (modifiers == Hb::ModifierScrolling) {
+                effect = HbFeedback::StopFlick;
+            }
 		}
 	}
 
@@ -785,7 +787,10 @@
 int HbFeedbackEffectUtils::intensity(const HbWidget *widget, Hb::ContinuousInteraction interaction, QPointF delta)
 {
     Q_UNUSED(interaction);
-    int intensity = HbFeedback::IntensitySmooth;
+    Q_UNUSED(delta);
+
+    int intensity = HbFeedback::IntensityFull;
+
     if (const HbAbstractSliderControl *slider = qobject_cast<const HbAbstractSliderControl *>(widget)) {
         switch(parentItemType(slider)) {
             case HbPrivate::ItemType_ZoomSlider:
@@ -803,29 +808,14 @@
             default:
                 break;
        }
-     } else if (const HbProgressSlider *progressbar = qobject_cast<const HbProgressSlider *>(widget)) {
-        Q_UNUSED(progressbar);
-        intensity = HbFeedback::IntensitySmooth;
-     } else if (const HbScrollBar *scrollbar = qobject_cast<const HbScrollBar *>(widget)) {
+    }
+    else if (const HbScrollBar *scrollbar = qobject_cast<const HbScrollBar *>(widget)) {
         Q_UNUSED(scrollbar);
         intensity = HbFeedback::IntensitySmooth;
-    } else if (const HbGridView *gridView = qobject_cast<const HbGridView *>(widget)) {
-        Q_UNUSED(gridView);
-        intensity = HbFeedback::IntensitySmooth;
-    } else if (widget->type() == Hb::ItemType_VirtualTrackPoint) {
+    }
+    else {
+        // The default intensity for continuous effects
         intensity = HbFeedback::IntensityFull;
-    } else if (widget->type() == Hb::ItemType_WritingBox) {
-        intensity = HbFeedback::IntensitySmooth;
-    } else {
-        intensity = int((abs(25*HbFeedback::IntensityFull*delta.toPoint().y()) / widget->rect().height()) + (abs(25*HbFeedback::IntensityFull*delta.toPoint().x()) / widget->rect().width()));
-
-        if (intensity > HbFeedback::IntensityFull) {
-            intensity = HbFeedback::IntensityFull;
-        }
-    }
-
-    if (interaction == Hb::ContinuousRotated) {
-        intensity = HbFeedback::IntensitySmooth;
     }
 
     return intensity;
@@ -881,3 +871,52 @@
     return menuEmpty;
 }
 
+/*!
+  Returns the default modalities to be used when playing feedback effect asociated with this \a widget, \a interaction, \a modifiers.
+*/
+HbFeedback::Modalities HbFeedbackEffectUtils::modalities(const HbWidget *widget, Hb::InstantInteraction interaction, Hb::InteractionModifiers modifiers )
+{
+    Q_UNUSED(modifiers)
+
+    HbFeedback::Modalities modalities = 0;
+
+    switch( interaction ) {
+    case Hb::InstantPressed :
+    case Hb::InstantMultitouchActivated:
+        modalities |= HbFeedback::Tactile;
+        modalities |= HbFeedback::Audio;
+        break;
+    case Hb::InstantReleased:
+    case Hb::InstantLongPressed:
+    case Hb::InstantKeyRepeated:
+    case Hb::InstantDraggedOver:
+    case Hb::InstantFlicked:
+    case Hb::InstantRotated90Degrees:
+    case Hb::InstantPopupOpened:
+    case Hb::InstantPopupClosed:
+    case Hb::InstantSelectionChanged:
+        modalities =  HbFeedback::Tactile;
+        break;
+    case Hb::InstantClicked:
+        modalities = HbFeedback::Tactile;
+        if(widget->type() == Hb::ItemType_CheckBox) {
+            modalities |= HbFeedback::Audio;
+        }
+        break;
+    default:
+        modalities = HbFeedback::Tactile;
+        break;
+    }
+    return modalities;
+}
+
+/*!
+  Returns the default modalities to be used when playing feedback effect asociated with this \a widget, \a interaction, \a modifiers.
+*/
+HbFeedback::Modalities HbFeedbackEffectUtils::modalities(const HbWidget * widget, Hb::ContinuousInteraction interaction, Hb::InteractionModifiers modifiers )
+{
+    Q_UNUSED(widget)
+    Q_UNUSED(interaction)
+    Q_UNUSED(modifiers)
+    return HbFeedback::Tactile;
+}
diff -r 16d8024aca5e -r f7ac710697a9 src/hbplugins/feedback/feedbackeffectplugin/hbfeedbackeffectutils.h
--- a/src/hbplugins/feedback/feedbackeffectplugin/hbfeedbackeffectutils.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbplugins/feedback/feedbackeffectplugin/hbfeedbackeffectutils.h	Mon May 03 12:48:33 2010 +0300
@@ -64,8 +64,10 @@
     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);
-    static HbFeedback::InstantEffect instantOnSelectionChanged(const HbWidget *widget);
+    static HbFeedback::InstantEffect instantOnSelectionChanged(const HbWidget *widget, Hb::InteractionModifiers modifiers);
     static HbFeedback::ContinuousEffect continuousEffect(const HbWidget *widget, Hb::ContinuousInteraction interaction);
+    static HbFeedback::Modalities modalities(const HbWidget *widget, Hb::InstantInteraction interaction, Hb::InteractionModifiers modifiers );
+    static HbFeedback::Modalities modalities(const HbWidget *widget, Hb::ContinuousInteraction interaction, Hb::InteractionModifiers modifiers );
     static bool isFeedbackAllowedForPopup(const HbWidget *widget);
     static int intensity(const HbWidget *widget, Hb::ContinuousInteraction interaction, QPointF delta = QPointF());
     static bool isFeedbackAllowed(const HbWidget* widget);
diff -r 16d8024aca5e -r f7ac710697a9 src/hbplugins/inputengines/hbautocomplete/hbautocomplete.cpp
--- a/src/hbplugins/inputengines/hbautocomplete/hbautocomplete.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbplugins/inputengines/hbautocomplete/hbautocomplete.cpp	Mon May 03 12:48:33 2010 +0300
@@ -70,8 +70,7 @@
 }
 
 /*!
-Reuturns list of supported languages. This engine can be used with any input language so it just returns
-a list containing HbInputLanguageAny.
+\reimp
 */
 QList<HbInputLanguage> HbAutoComplete::languages() const
 {
@@ -80,7 +79,7 @@
 }
 
 /*!
-Handles delete key press. 
+\reimp
 */
 void HbAutoComplete::deleteKeyPress(HbPredictionCallback* callback)
 {
@@ -92,9 +91,7 @@
 }
 
 /*!
-Commits active word. Word is added to the dictionry (unless it isn't there already)
-and the use count is increased. In case of collection, the word is added to the first 
-dictionary in the collection unless it already exits in at least one of them.
+\reimp
 */
 void HbAutoComplete::commit(const QString &word)
 {
@@ -109,7 +106,7 @@
 }
 
 /*!
-Clears active word.
+\reimp
 */
 void HbAutoComplete::clear()
 {
@@ -120,8 +117,7 @@
 }
 
 /*!
-Adds word to active dictionary or collection if it doesn't already exits theer and increases the 
-use frequency counter. In case of a collection, word is added to the first enabled dictionary.
+\reimp
 */
 void HbAutoComplete::addUsedWord(const QString& word)
 {
@@ -150,7 +146,7 @@
 }
 
 /*!
-Handles key presses. Empty implementation, isn't used at the moment. 
+\reimp
 */
 void HbAutoComplete::appendKeyPress(const int keycode, const Qt::KeyboardModifiers modifiers, const HbTextCase textCase, HbPredictionCallback* callback)
 {
@@ -161,7 +157,7 @@
 }
 
 /*!
-Sets active word.
+\reimp
 */
 void HbAutoComplete::setWord(const QString& word, HbPredictionCallback* callback)
 {
@@ -174,6 +170,9 @@
     }
 }
 
+/*!
+\reimp
+*/
 void HbAutoComplete::updateCandidates(int& bestGuessLocation, bool& noMoreCandidates)
 {
     Q_D(HbAutoComplete);
@@ -192,15 +191,26 @@
 }
 
 /*!
-returns a bit vector of supported prediction features.
-*/ 
+\reimp
+*/
+bool HbAutoComplete::updateCandidates(int& bestGuessLocation)
+{
+    // The real implementation will be moved into this method after the deprecation period.
+    bool tmp = false;
+    updateCandidates(bestGuessLocation, tmp);
+    return tmp;
+}
+
+/*!
+\reimp
+*/
 HbInputPredictionFeature HbAutoComplete::features() const
 {
     return (HbInputPredictionFeature)(HbPredFeatureExtraDictionaries | HbPredFeatureWordCompletion);
 }
 
 /*!
-Returns vendor id string. 
+\reimp
 */
 QString HbAutoComplete::vendorIdString() const
 {
@@ -208,7 +218,7 @@
 }
 
 /*!
-Returns engine version string.
+\reimp
 */
 QString HbAutoComplete::engineVersion() const
 {
@@ -216,8 +226,7 @@
 }
 
 /*!
-Returns true if the engine supports given language / keyboard combination. In case of HbAutoCompletion,
-this method always returns true because the keyboard doesn't matter.
+\reimp
 */
 bool HbAutoComplete::supportsKeyboardType(const HbInputLanguage &language, HbKeyboardType keyboard) const
 {
@@ -229,9 +238,8 @@
     return true;
 }
 
-
 /*!
-Sets active dictionary. Previous active dictionary or collection is disabled.
+\reimp
 */
 void HbAutoComplete::setExtraUserDictionary(int aId)
 {
@@ -249,7 +257,7 @@
 }
 
 /*!
-Sets active dictionary collection. Previous active dictionary or collection is disabled.
+\reimp
 */
 void HbAutoComplete::setExtraUserDictionaries(const QList<int>& idList)
 {
@@ -264,7 +272,7 @@
 }
 
 /*!
-Returns the length of current input sequence.
+\reimp
 */
 int HbAutoComplete::inputLength()
 {
@@ -274,7 +282,7 @@
 }
 
 /*!
-An empty implementation. Not needed in HbAutoCompletion.
+\reimp
 */
 void HbAutoComplete::setCandidateList(QStringList* candidateList)
 {
@@ -282,7 +290,7 @@
 }
 
 /*!
-Returns current candidate list. Reconstructs the list only when it is out of date.
+\reimp
 */
 QStringList HbAutoComplete::candidateList()
 {
@@ -303,7 +311,16 @@
 }
 
 /*!
-Sets keyboard type. This method is not needed in HbAutoCompletion.
+\reimp
+*/
+QStringList HbAutoComplete::candidates()
+{
+    // Move the implementation here after the deprecation period.
+    return candidateList();
+}
+
+/*!
+\reimp
 */
 void HbAutoComplete::setKeyboard(HbKeyboardType aKeyboardType)
 {
@@ -311,8 +328,7 @@
 }
 
 /*!
-Appends new character to be used as part of the input sequence. The candidate list is flagged to be
-out of date.
+\reimp
 */
 void HbAutoComplete::appendCharacter(const QChar aChar, const HbTextCase textCase, HbPredictionCallback* callback)
 {
diff -r 16d8024aca5e -r f7ac710697a9 src/hbplugins/inputengines/hbautocomplete/hbautocomplete.h
--- a/src/hbplugins/inputengines/hbautocomplete/hbautocomplete.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbplugins/inputengines/hbautocomplete/hbautocomplete.h	Mon May 03 12:48:33 2010 +0300
@@ -51,6 +51,7 @@
     void appendKeyPress(const int keycode, const Qt::KeyboardModifiers modifiers, const HbTextCase textCase = HbTextCaseNone, HbPredictionCallback* callback = 0);
     void setWord(const QString& word, HbPredictionCallback* callback = 0);
     void updateCandidates(int& bestGuessLocation, bool& noMoreCandidates); 
+    bool updateCandidates(int& bestGuessLocation);
     HbInputPredictionFeature features() const;
     QString vendorIdString() const;
     QString engineVersion() const;
@@ -62,6 +63,7 @@
     int inputLength();
     void setCandidateList(QStringList* candidateList);
     QStringList candidateList();
+    QStringList candidates();
     void setKeyboard(HbKeyboardType aKeyboardType);
     void appendCharacter(const QChar aChar, const HbTextCase textCase = HbTextCaseNone, HbPredictionCallback* callback = 0);
  
diff -r 16d8024aca5e -r f7ac710697a9 src/hbplugins/inputmethods/common/hbinputabstractbase.cpp
--- a/src/hbplugins/inputmethods/common/hbinputabstractbase.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbplugins/inputmethods/common/hbinputabstractbase.cpp	Mon May 03 12:48:33 2010 +0300
@@ -164,4 +164,15 @@
         pos.setX(abs((int)viewport.width()) - size.width());
     }
 }
+
+void HbInputAbstractMethod::showThaiSpecialCharacters(uint buttonId)
+{
+	Q_UNUSED(buttonId);
+}
+
+bool HbInputAbstractMethod::isSctModeActive() const
+{
+	return false;
+}
+
    
diff -r 16d8024aca5e -r f7ac710697a9 src/hbplugins/inputmethods/common/hbinputabstractbase.h
--- a/src/hbplugins/inputmethods/common/hbinputabstractbase.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbplugins/inputmethods/common/hbinputabstractbase.h	Mon May 03 12:48:33 2010 +0300
@@ -50,9 +50,11 @@
     virtual void launchAutoCompletionPopup(const QStringList& candidates);
     virtual void closeAutoCompletionPopup();
     virtual void switchMode(int keyCode);
+	virtual void showThaiSpecialCharacters(uint buttonId);
     virtual void starKeySelected();
     virtual void getCandidatePositionAndSize(HbCandidateList *candidatePopup,
                     HbInputVkbWidget *currentKeypad, QPointF & pos,QSizeF & size);
+	virtual bool isSctModeActive() const;
 private:
     Q_DISABLE_COPY(HbInputAbstractMethod)
 };
diff -r 16d8024aca5e -r f7ac710697a9 src/hbplugins/inputmethods/common/hbinputmodehandler.cpp
--- a/src/hbplugins/inputmethods/common/hbinputmodehandler.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbplugins/inputmethods/common/hbinputmodehandler.cpp	Mon May 03 12:48:33 2010 +0300
@@ -176,14 +176,10 @@
 {
     if (event) {
         if (event->type() == QEvent::KeyPress || event->type() == QEvent::KeyRelease) {
-            const QKeyEvent *keyEvent = 0;
-            keyEvent = static_cast<const QKeyEvent *>(event);
-            if (keyEvent) {
-                return filterEvent(keyEvent);
-            }
-        }
-    }
-
+            const QKeyEvent *keyEvent = static_cast<const QKeyEvent *>(event);
+            return filterEvent(keyEvent);
+		}
+	}
     return false;
 }
 
@@ -280,12 +276,22 @@
 void HbInputModeHandler::commitFirstMappedNumber(int key)
 {
     Q_D(HbInputModeHandler);
+
+    HbInputLanguage language = d->mInputMethod->inputState().language();
     // This is long key press number shortcut functionality.
     if (!d->mKeymap) {
-        d->mKeymap = HbKeymapFactory::instance()->keymap(d->mInputMethod->inputState().language());
+        d->mKeymap = HbKeymapFactory::instance()->keymap(language);
     }
-    QChar numChr = HbInputUtils::findFirstNumberCharacterBoundToKey(d->mKeymap->keyForKeycode(d->mInputMethod->inputState().keyboard(), key),
-                                                                    d->mKeymap->language());
+	bool isNumericEditor = d->mInputMethod->focusObject()->editorInterface().isNumericEditor();
+	HbInputDigitType digitType = HbInputUtils::inputDigitType(language);
+	if (isNumericEditor) {
+        QLocale::Language systemLanguage = QLocale::system().language();		 
+		if (language.language() != systemLanguage) {
+            digitType = HbDigitTypeLatin;
+	 	}
+	}	
+    QChar numChr = HbInputUtils::findFirstNumberCharacterBoundToKey(
+		d->mKeymap->keyForKeycode(d->mInputMethod->inputState().keyboard(), key),language, digitType);
 	// when a number is to be entered, it should commit 
     // the previous string and then append the number to the string
     if (numChr != 0) {
@@ -305,23 +311,30 @@
     if (textCase == HbTextCaseUpper || textCase == HbTextCaseAutomatic) {
         modifiers |= HbModifierShiftPressed;
     }
+    HbInputLanguage language = d->mInputMethod->inputState().language();
+	
     if (!d->mKeymap) {
-        d->mKeymap = HbKeymapFactory::instance()->keymap(d->mInputMethod->inputState().language());
+        d->mKeymap = HbKeymapFactory::instance()->keymap(language);
     }
     const HbMappedKey* mappedKey = d->mKeymap->keyForKeycode(d->mInputMethod->inputState().keyboard(), 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;
+    QString allowedChars = chars;
     HbInputFocusObject *focusedObject = d->mInputMethod->focusObject();
     if(focusedObject) {
-        focusedObject->filterStringWithEditorFilter(mappedKey->characters(modifiers),allowedChars);
-    } else {
-        // we should not come here. Just for saftey.
-         allowedChars =  mappedKey->characters(modifiers);
-    }
+        focusedObject->filterStringWithEditorFilter(chars,allowedChars);
+    } 
     QChar character = 0;
     if (!allowedChars.isNull()) {
         if (index >= allowedChars.length() || index < 0) {
@@ -425,5 +438,22 @@
     Q_UNUSED(available);
 }
 
+/*!
+Toggles prediction after doing a check if the editor allows it.
+*/
+void HbInputModeHandler::togglePrediction()
+{
+    Q_D(HbInputModeHandler);
+    int currentStatus = HbInputSettingProxy::instance()->predictiveInputStatus();
+    HbInputFocusObject* focusedObject = 0;
+    focusedObject = d->mInputMethod->focusObject();
+    bool isPredictionAllowed = focusedObject->editorInterface().isPredictionAllowed();
+    if (currentStatus) {
+        HbInputSettingProxy::instance()->setPredictiveInputStatus(0);
+    } else if (isPredictionAllowed) {
+        HbInputSettingProxy::instance()->setPredictiveInputStatus(1);
+    }
+}
+
 #include "moc_hbinputmodehandler.cpp"
 // EOF
diff -r 16d8024aca5e -r f7ac710697a9 src/hbplugins/inputmethods/common/hbinputmodehandler.h
--- a/src/hbplugins/inputmethods/common/hbinputmodehandler.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbplugins/inputmethods/common/hbinputmodehandler.h	Mon May 03 12:48:33 2010 +0300
@@ -70,15 +70,15 @@
         // focus change
         HbInputModeActionFocusRecieved, // focus recived state
         HbInputModeActionFocusLost, // focus lost state
-        HbInputModeActionCancelButtonPress
-        // more..
+        HbInputModeActionCancelButtonPress,
+		HbInputModeActionCloseSpellQuery
+       // more..
     };
 
     virtual ~HbInputModeHandler();
 
     // HbInputMethod specific operations.
     virtual bool isComposing() const {return false;}
-    virtual void listInputModes(QVector<HbInputModeProperties>& modes) const = 0 ;
     virtual void mouseHandler(int x, QMouseEvent* mouseEvent);
     virtual bool filterEvent(const QEvent * event);
 
@@ -91,6 +91,7 @@
     void sendAndUpdate(QEvent &event);
     virtual void setKeymap(const HbKeymap* keymap);
     virtual void characterPreviewAvailable(bool available);
+	void togglePrediction();
 
 signals:
     // incase one mode handler is not capable of processing the events.
diff -r 16d8024aca5e -r f7ac710697a9 src/hbplugins/inputmethods/common/hbinputpredictionhandler.cpp
--- a/src/hbplugins/inputmethods/common/hbinputpredictionhandler.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbplugins/inputmethods/common/hbinputpredictionhandler.cpp	Mon May 03 12:48:33 2010 +0300
@@ -66,7 +66,7 @@
     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) || selectWord()) {
+    if ( mEngine->inputLength() >= 1 ) {
         //Only autocomplition part should be deleted when autocompliton part is enable and user pressed a delete key
         if(false == mTailShowing) {
             mEngine->deleteKeyPress( this );
@@ -74,31 +74,27 @@
         //To prevent showing autocompletion part while deleting the characters using backspace key
         mShowTail = false;
         mShowTooltip = false;
-		if (mEngine->inputLength() > 0) {
-            bool unused = false;
-            mEngine->updateCandidates(mBestGuessLocation, unused);
-            if (!mCandidates->count()) {
-                mCandidates->append(mEngine->currentWord());
-            }
-		}
+		bool unused = false;
+        mEngine->updateCandidates(mBestGuessLocation, unused);
+		//If Input length greater or equal to one then Append the current word to candidate 
+		if (!mCandidates->count() && mEngine->inputLength() >= 1) {
+			mCandidates->append(mEngine->currentWord());
+        }
 		mCanContinuePrediction = true;
 		// update the editor with the new preedit text.
         updateEditor();
         return;
-    }
-
-    HbInputFocusObject* focusedObject = 0;
-    focusedObject = mInputMethod->focusObject();
-    if (!focusedObject) {
+    } else {
+        // we come here if their is no data in engine.
+        // once the word is committed, we can not bring it back to inline edit.
+        // so if the engine does not have any data, we just send backspace event to the editor.
+        Q_Q(HbInputPredictionHandler);
+        QKeyEvent event = QKeyEvent(QEvent::KeyPress, Qt::Key_Backspace, Qt::NoModifier);		
+        q->sendAndUpdate(event);
+        event = QKeyEvent(QEvent::KeyRelease, Qt::Key_Backspace, Qt::NoModifier);
+        q->sendAndUpdate(event);
         return;
     }
-
-    if ((focusedObject->inputMethodQuery(Qt::ImCursorPosition).toInt() >= 0) || focusedObject->preEditString().length()) {
-        QList<QInputMethodEvent::Attribute> list;
-        QInputMethodEvent event(QString(), list);
-        event.setCommitString(QString(), -1, 1);
-        commit(event);
-    }
 }
 
 void HbInputPredictionHandlerPrivate::commitAndAppendCharacter(QChar character)
@@ -194,78 +190,6 @@
 }
 
 /*!
-This sets the selected candidate from the candidate list as the editor text.
-*/
-bool HbInputPredictionHandlerPrivate::selectWord(bool selectFromLeft)
-{
-    if (!mEngine) {
-        return false;
-    }
-    mShowTail = false;
-
-    HbInputFocusObject* focusedObject = 0;
-    focusedObject = mInputMethod->focusObject();
-    if(!focusedObject) {
-        return false;
-    }
-    // No word selected, if we move next to a word on left side, select it
-    int cursorPos = focusedObject->inputMethodQuery(Qt::ImCursorPosition).toInt();
-
-    QString text = focusedObject->inputMethodQuery(Qt::ImSurroundingText).toString();
-    if ((cursorPos > 0 && selectFromLeft) || (cursorPos < text.length() && !selectFromLeft)) {
-        int start;
-        int end;
-        if (selectFromLeft && cursorPos>=1 &&!text.at(cursorPos-1).isSpace()) {
-            // selecting word from left side of cursor
-            end = cursorPos;
-            for(start = end; start > 0; start--) {
-                if (text.at(start-1).isSpace()) {
-                    break;
-                }
-            }
-        } else if (!selectFromLeft && !text.at(cursorPos).isSpace()) {
-            // selecting word from right side of cursor
-            start = cursorPos;
-            for(end = start; end < text.length(); ++end) {
-                if (text.at(end).isSpace()) {
-                    break;
-                }
-            }
-        } else {
-            // no word in the direction where cursor is moving
-            return false;
-        }
-        int length = end-start;
-        // update internal state and editor
-        if(length > 0){
-            mEngine->setWord(text.mid(start, length), this);
-        }
-        bool unused = false;
-        mEngine->updateCandidates(mBestGuessLocation, unused);
-        //With selection we can always continue predicting, even when the selection 
-        //is not a well predicted word.
-        if (!mCandidates->count()) {
-            //Here we are making sure that even if the engine does not return any candidate
-            //for given input sequence, the candidate list is non-empty. In such a scenario
-            //the candidate list will contain the actual selection or the exact word.
-            mCandidates->append(mEngine->currentWord());
-        }
-        //
-        QTextCharFormat underlined;
-        QList<QInputMethodEvent::Attribute> list;
-        underlined.setFontUnderline(true);
-        QInputMethodEvent::Attribute textstyle(QInputMethodEvent::TextFormat, 0, mEngine->inputLength(), underlined);
-        list.append(textstyle);
-        QInputMethodEvent event(mCandidates->at(0), list);
-        event.setCommitString(QString(), (selectFromLeft ? -length : 0), length);
-        focusedObject->sendEvent(event);
-        return true;
-    } else {
-        return false;
-    }
-}
-
-/*!
 This method updates the editor contents based on the candidates available in the candidate list.
 */
 void HbInputPredictionHandlerPrivate::updateEditor()
@@ -293,7 +217,7 @@
             int taillength = mCandidates->at(mBestGuessLocation).length() - mEngine->inputLength();
             if (taillength > 0 && mShowTail) {
                 // TODO: Color from skin should be used
-				QColor col = HbColorScheme::color("qtc_editor_hint_normal");
+				QColor col = HbColorScheme::color("qtc_input_hint_normal");
                 QBrush brush(col);
                 QTextCharFormat gray;
                 gray.setForeground(brush);
@@ -509,9 +433,10 @@
 
 void HbInputPredictionHandlerPrivate::init()
 {
+    mEngine = NULL;
     HbInputLanguage language = HbInputSettingProxy::instance()->globalInputLanguage();
     mEngine = HbPredictionFactory::instance()->predictionEngineForLanguage(language.language());
-    if (mEngine) {
+    if (mEngine && !mCandidates) {
         mCandidates = new QStringList();
     }
 }
@@ -652,6 +577,7 @@
         mEngine->deleteKeyPress();
         mEngine->updateCandidates(mBestGuessLocation, isCustomWord);
         if (mCandidates->count()){
+			(*mCandidates)[mBestGuessLocation] = (*mCandidates)[mBestGuessLocation].left(mEngine->inputLength());
             (*mCandidates)[mBestGuessLocation].append("?");
         } else {
             //Should the mBestGuessLocation not be zero. 
@@ -755,7 +681,7 @@
             break;
         case HbInputModeActionPrimaryLanguageChanged:
             if(!d->mEngine) {
-                d->init();
+            d->init();
             }
             if (d->mEngine) {
                 d->mEngine->setLanguage(HbInputSettingProxy::instance()->globalInputLanguage());
diff -r 16d8024aca5e -r f7ac710697a9 src/hbplugins/inputmethods/common/hbinputpredictionhandler_p.h
--- a/src/hbplugins/inputmethods/common/hbinputpredictionhandler_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbplugins/inputmethods/common/hbinputpredictionhandler_p.h	Mon May 03 12:48:33 2010 +0300
@@ -68,7 +68,6 @@
     Qt::KeyboardModifiers mModifiers;
 
 public:
-    bool selectWord(bool selectFromLeft = true);
     void updateEditor();
 };
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbplugins/inputmethods/hardwareinput/hbhardware12key.cpp
--- a/src/hbplugins/inputmethods/hardwareinput/hbhardware12key.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbplugins/inputmethods/hardwareinput/hbhardware12key.cpp	Mon May 03 12:48:33 2010 +0300
@@ -292,21 +292,6 @@
     return mActiveModeHandler->filterEvent(event);
 }
 
-
-
-// ---------------------------------------------------------------------------
-// HbHardware12key::listInputModes
-//
-// ---------------------------------------------------------------------------
-//
-void HbHardware12key::listInputModes(QVector<HbInputModeProperties>& results)
-{   
-    mBasicModeHandler->listInputModes(results);
-    mPredictionModeHandler->listInputModes(results);
-    mNumericModeHandler->listInputModes(results);
-}
-
-
 // ---------------------------------------------------------------------------
 // HbHardware12key::focusReceived
 //
diff -r 16d8024aca5e -r f7ac710697a9 src/hbplugins/inputmethods/hardwareinput/hbhardware12key.h
--- a/src/hbplugins/inputmethods/hardwareinput/hbhardware12key.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbplugins/inputmethods/hardwareinput/hbhardware12key.h	Mon May 03 12:48:33 2010 +0300
@@ -59,8 +59,7 @@
     void reset();
     void mouseHandler(int cursorPosition, QMouseEvent* event);
     bool usePrediction() const;
-public: // From HbInputMethod
-    void listInputModes(QVector<HbInputModeProperties>& results);
+public: // From HbInputMethod    
     void focusReceived();
         void focusLost(bool focusSwitch);
     void inputLanguageChanged(int newLanguage); 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbplugins/inputmethods/hardwareinput/hbhardwareinputbasic12keyhandler.cpp
--- a/src/hbplugins/inputmethods/hardwareinput/hbhardwareinputbasic12keyhandler.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbplugins/inputmethods/hardwareinput/hbhardwareinputbasic12keyhandler.cpp	Mon May 03 12:48:33 2010 +0300
@@ -338,23 +338,6 @@
 }
 
 /*!
-list different input modes.
-*/
-void HbHardwareInputBasic12KeyHandler::listInputModes(QVector<HbInputModeProperties>& modes) const
-{
-	HbInputModeProperties binding;
-	binding.iMode = HbInputModeDefault;
-	binding.iKeyboard = HbKeyboard12Key;
-
-	QVector<int> languages;
-	HbKeyMapFactory::instance()->listLanguages(languages);
-	for (int i = 0; i < languages.count(); i++) {
-		binding.iLanguage = (QLocale::Language)languages.at(i);
-		modes.push_back(binding);
-	}
-}
-
-/*!
 Action Handler
 */
 bool HbHardwareInputBasic12KeyHandler::actionHandler(HbInputModeAction action)
diff -r 16d8024aca5e -r f7ac710697a9 src/hbplugins/inputmethods/hardwareinput/hbhardwareinputbasic12keyhandler.h
--- a/src/hbplugins/inputmethods/hardwareinput/hbhardwareinputbasic12keyhandler.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbplugins/inputmethods/hardwareinput/hbhardwareinputbasic12keyhandler.h	Mon May 03 12:48:33 2010 +0300
@@ -36,7 +36,6 @@
 	~HbHardwareInputBasic12KeyHandler();
 
 	bool isComposing() const;
-    void listInputModes(QVector<HbInputModeProperties>& modes) const;
 	bool actionHandler(HbInputModeAction action);
 	bool filterEvent(const QKeyEvent * event);
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbplugins/inputmethods/hardwareinput/hbhardwareinputbasicqwertyhandler.cpp
--- a/src/hbplugins/inputmethods/hardwareinput/hbhardwareinputbasicqwertyhandler.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbplugins/inputmethods/hardwareinput/hbhardwareinputbasicqwertyhandler.cpp	Mon May 03 12:48:33 2010 +0300
@@ -217,28 +217,6 @@
     d->q_ptr = this;
 }
 
-
-/*!
-This function lists different input modes.
-*/
-void HbHardwareInputBasicQwertyHandler::listInputModes(QVector<HbInputModeProperties>& modes) const
-{
-    HbInputModeProperties binding;
-	binding.iMode = HbInputModeDefault;
-	QList<HbKeyboardType> availableKeyBoards;
-	HbInputSettingProxy::instance()->availableHwKeyboard(availableKeyBoards);
-	foreach(HbKeyboardType keyboardType, availableKeyBoards) {
-		(keyboardType&HbQwertyKeyboardMask) ? binding.iKeyboard = keyboardType : binding.iKeyboard = HbKeyboardNone;
-		if (binding.iKeyboard != HbKeyboardNone) {
-			QList<HbInputLanguage> languages = HbKeymapFactory::availableLanguages();
-			foreach(HbInputLanguage lang, languages) {
-				binding.iLanguage = lang;        
-				modes.push_front(binding);
-			}
-		}
-	}
-}
-
 HbHardwareInputBasicQwertyHandler::~HbHardwareInputBasicQwertyHandler()
 {
 }
diff -r 16d8024aca5e -r f7ac710697a9 src/hbplugins/inputmethods/hardwareinput/hbhardwareinputbasicqwertyhandler.h
--- a/src/hbplugins/inputmethods/hardwareinput/hbhardwareinputbasicqwertyhandler.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbplugins/inputmethods/hardwareinput/hbhardwareinputbasicqwertyhandler.h	Mon May 03 12:48:33 2010 +0300
@@ -34,7 +34,6 @@
 public:
     HbHardwareInputBasicQwertyHandler(HbInputAbstractMethod* inputMethod);
     ~HbHardwareInputBasicQwertyHandler();
-    void listInputModes(QVector<HbInputModeProperties>& modes) const;
     bool isComposing() const;
     bool actionHandler(HbInputModeAction action);
     bool filterEvent(const QKeyEvent * event);
diff -r 16d8024aca5e -r f7ac710697a9 src/hbplugins/inputmethods/hardwareinput/hbhardwareinputnumeric12keyhandler.cpp
--- a/src/hbplugins/inputmethods/hardwareinput/hbhardwareinputnumeric12keyhandler.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbplugins/inputmethods/hardwareinput/hbhardwareinputnumeric12keyhandler.cpp	Mon May 03 12:48:33 2010 +0300
@@ -185,21 +185,4 @@
 	return ret;
 }
 
-/*!
-list different input modes.
-*/
-void HbHardwareInputNumeric12KeyHandler::listInputModes(QVector<HbInputModeProperties>& modes) const
-{
-	HbInputModeProperties binding;
-	binding.iMode = HbInputModeNumeric;
-	binding.iKeyboard = HbKeyboard12Key;
-
-	QVector<int> languages;
-	HbKeyMapFactory::instance()->listLanguages(languages);
-	for (int i = 0; i < languages.count(); i++) {
-		binding.iLanguage = (QLocale::Language)languages.at(i);
-		modes.push_back(binding);
-	}
-}
-
 // EOF
diff -r 16d8024aca5e -r f7ac710697a9 src/hbplugins/inputmethods/hardwareinput/hbhardwareinputnumeric12keyhandler.h
--- a/src/hbplugins/inputmethods/hardwareinput/hbhardwareinputnumeric12keyhandler.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbplugins/inputmethods/hardwareinput/hbhardwareinputnumeric12keyhandler.h	Mon May 03 12:48:33 2010 +0300
@@ -35,7 +35,6 @@
 	HbHardwareInputNumeric12KeyHandler(HbInputAbstractMethod* inputMethod);
 	~HbHardwareInputNumeric12KeyHandler();
 
-    void listInputModes(QVector<HbInputModeProperties>& modes) const;
 	bool actionHandler(HbInputModeAction action);
 	bool filterEvent(const QKeyEvent * event);
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbplugins/inputmethods/hardwareinput/hbhardwareinputnumericqwertyhandler.cpp
--- a/src/hbplugins/inputmethods/hardwareinput/hbhardwareinputnumericqwertyhandler.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbplugins/inputmethods/hardwareinput/hbhardwareinputnumericqwertyhandler.cpp	Mon May 03 12:48:33 2010 +0300
@@ -98,24 +98,6 @@
     d->q_ptr = this;
 }
 
-
-/*!
- This function lists different input modes.
-*/
-void HbHardwareInputNumericQwertyHandler::listInputModes(QVector<HbInputModeProperties>& modes) const
-{
-    HbInputModeProperties binding;
-    binding.iMode = HbInputModeNumeric;
-    binding.iKeyboard = HbKeyboardQwerty4x10;
-
-    QVector<int> languages;
-    HbKeyMapFactory::instance()->listLanguages(languages);
-    foreach (int languageCode, languages) {
-		binding.iLanguage = (QLocale::Language)languageCode;
-        modes.push_back(binding);
-    }
-}
-
 HbHardwareInputNumericQwertyHandler::~HbHardwareInputNumericQwertyHandler()
 {
 }
diff -r 16d8024aca5e -r f7ac710697a9 src/hbplugins/inputmethods/hardwareinput/hbhardwareinputnumericqwertyhandler.h
--- a/src/hbplugins/inputmethods/hardwareinput/hbhardwareinputnumericqwertyhandler.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbplugins/inputmethods/hardwareinput/hbhardwareinputnumericqwertyhandler.h	Mon May 03 12:48:33 2010 +0300
@@ -33,9 +33,8 @@
     Q_OBJECT
 public:
     HbHardwareInputNumericQwertyHandler(HbInputAbstractMethod* inputMethod);
-    ~HbHardwareInputNumericQwertyHandler();
-    
-    void listInputModes(QVector<HbInputModeProperties>& modes) const;
+    ~HbHardwareInputNumericQwertyHandler();    
+   
     bool actionHandler(HbInputModeAction action);
     bool filterEvent(const QKeyEvent * event);
    
diff -r 16d8024aca5e -r f7ac710697a9 src/hbplugins/inputmethods/hardwareinput/hbhardwareinputprediction12keyhandler.cpp
--- a/src/hbplugins/inputmethods/hardwareinput/hbhardwareinputprediction12keyhandler.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbplugins/inputmethods/hardwareinput/hbhardwareinputprediction12keyhandler.cpp	Mon May 03 12:48:33 2010 +0300
@@ -177,30 +177,6 @@
 }
 
 /*!
-this function lists different modes.
-*/
-void HbHardwareInputPrediction12KeyHandler::listInputModes(QVector<HbInputModeProperties>& modes) const
-{
-	  Q_UNUSED(modes); 
-    /*HbInputMode binding;
-    binding.iMode = HbInputModeLatinPredictive;
-    binding.iKeyboard = HbKeyboard12Key;
-    QVector<int> languages;
-    HbKeyMapFactory::instance()->listLanguages(languages);
-
-    const QVector<HbInputLanguage>* engineLanguages = supportedLanguages();
-    if (engineLanguages) {
-        binding.iMode = HbInputModeLatinPredictive;
-        foreach (const HbInputLanguage& languageCode, *engineLanguages) {
-            if (languages.contains(languageCode.language())) {
-                binding.iLanguage = languageCode;
-                modes.push_back(binding);
-            }
-        }
-    }*/
-}
-
-/*!
 filterEvent to handler keypress/release events.
 */
 bool HbHardwareInputPrediction12KeyHandler::filterEvent(const QKeyEvent * event)
diff -r 16d8024aca5e -r f7ac710697a9 src/hbplugins/inputmethods/hardwareinput/hbhardwareinputprediction12keyhandler.h
--- a/src/hbplugins/inputmethods/hardwareinput/hbhardwareinputprediction12keyhandler.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbplugins/inputmethods/hardwareinput/hbhardwareinputprediction12keyhandler.h	Mon May 03 12:48:33 2010 +0300
@@ -37,7 +37,6 @@
 
     bool actionHandler(HbInputModeAction action);
     bool filterEvent(const QKeyEvent * event);
-    void listInputModes(QVector<HbInputModeProperties>& aResults) const;
 	bool isActive() const;
     
 private:
diff -r 16d8024aca5e -r f7ac710697a9 src/hbplugins/inputmethods/hardwareinput/hbhardwareinputpredictionqwertyhandler.cpp
--- a/src/hbplugins/inputmethods/hardwareinput/hbhardwareinputpredictionqwertyhandler.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbplugins/inputmethods/hardwareinput/hbhardwareinputpredictionqwertyhandler.cpp	Mon May 03 12:48:33 2010 +0300
@@ -234,32 +234,6 @@
 }
 
 /*!
-lists different input mode bindings..
-*/
-void HbHardwareInputPredictionQwertyHandler::listInputModes(QVector<HbInputModeProperties>& modes) const
-{
-	Q_UNUSED(modes);
-    /*HbInputModeProperties binding;
-    binding.iMode = HbInputModeLatinPredictive;
-    QList<HbKeyboardType> availableKeyBoards;
-    HbInputSettingProxy::instance()->availableHwKeyboard(availableKeyBoards);
-    foreach(HbKeyboardType keyboardType, availableKeyBoards) {
-        (keyboardType&HbQwertyKeyboardMask) ? binding.iKeyboard = keyboardType : binding.iKeyboard = HbKeyboardNone;
-        if (binding.iKeyboard != HbKeyboardNone) {
-            QVector<int> languages;
-            HbKeyMapFactory::instance()->listLanguages(languages);
-
-            foreach(int lang, languages) {
-                if(HbKeyMapFactory::instance()->isKeyboardDataAvailableForLanguage(lang,binding.iKeyboard)){
-                    binding.iLanguage = (QLocale::Language)lang;        
-                    modes.push_front(binding);
-                }
-            }
-        }
-    }*/
-}
-
-/*!
 Action Handler.
 */
 bool HbHardwareInputPredictionQwertyHandler::actionHandler(HbInputModeAction action)
diff -r 16d8024aca5e -r f7ac710697a9 src/hbplugins/inputmethods/hardwareinput/hbhardwareinputpredictionqwertyhandler.h
--- a/src/hbplugins/inputmethods/hardwareinput/hbhardwareinputpredictionqwertyhandler.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbplugins/inputmethods/hardwareinput/hbhardwareinputpredictionqwertyhandler.h	Mon May 03 12:48:33 2010 +0300
@@ -35,8 +35,7 @@
     HbHardwareInputPredictionQwertyHandler(HbInputAbstractMethod *inputMethod);
     ~HbHardwareInputPredictionQwertyHandler();
 
-    bool filterEvent(const QKeyEvent * event);
-    void listInputModes(QVector<HbInputModeProperties>& aResults) const;
+    bool filterEvent(const QKeyEvent * event);    
     bool actionHandler(HbInputModeAction action);
     void processExactWord(QString exactWord);
     void sctCharacterSelected(QChar character);
diff -r 16d8024aca5e -r f7ac710697a9 src/hbplugins/inputmethods/hardwareinput/hbhardwareqwerty.cpp
--- a/src/hbplugins/inputmethods/hardwareinput/hbhardwareqwerty.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbplugins/inputmethods/hardwareinput/hbhardwareqwerty.cpp	Mon May 03 12:48:33 2010 +0300
@@ -173,20 +173,6 @@
 }
 
 // ---------------------------------------------------------------------------
-// HbHardwareQwerty::listInputModes
-//
-// ---------------------------------------------------------------------------
-//
-void HbHardwareQwerty::listInputModes(QVector<HbInputModeProperties>& results)
-{       
-        // list out each mode handlers.
-    mBasicModeHandler->listInputModes(results);
-    mPredictionModeHandler->listInputModes(results);
-    mNumericModeHandler->listInputModes(results);
-}
-
-
-// ---------------------------------------------------------------------------
 // HbHardwareQwerty::focusReceived
 //
 // ---------------------------------------------------------------------------
diff -r 16d8024aca5e -r f7ac710697a9 src/hbplugins/inputmethods/hardwareinput/hbhardwareqwerty.h
--- a/src/hbplugins/inputmethods/hardwareinput/hbhardwareqwerty.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbplugins/inputmethods/hardwareinput/hbhardwareqwerty.h	Mon May 03 12:48:33 2010 +0300
@@ -61,7 +61,6 @@
     bool filterEvent(const QEvent *event);
 
 public: // From HbInputMethod
-    void listInputModes(QVector<HbInputModeProperties>& results);
     void focusReceived();
     void focusLost(bool focusSwitch);
     void InputLanguageChanged(int newLanguage); 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbplugins/inputmethods/touchinput/hbinputbasic12keyhandler.cpp
--- a/src/hbplugins/inputmethods/touchinput/hbinputbasic12keyhandler.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbplugins/inputmethods/touchinput/hbinputbasic12keyhandler.cpp	Mon May 03 12:48:33 2010 +0300
@@ -32,32 +32,7 @@
 #include <hbinputpredictionfactory.h>
 #include "hbinputabstractbase.h"
 #include "hbinputbasic12keyhandler.h"
-#include "hbinputbasichandler_p.h"
-
-class HbInputBasic12KeyHandlerPrivate: public HbInputBasicHandlerPrivate
-{
-    Q_DECLARE_PUBLIC(HbInputBasic12KeyHandler)
-
-public:
-    HbInputBasic12KeyHandlerPrivate();
-    ~HbInputBasic12KeyHandlerPrivate();
-
-    void handleAlphaEvent(int buttonId);
-    bool buttonPressed(const QKeyEvent *keyEvent);
-    bool buttonReleased(const QKeyEvent *keyEvent);
-    bool actionHandler(HbInputModeHandler::HbInputModeAction action);
-
-    void _q_timeout();
-
-public:
-    int mLastKey;
-    QChar mCurrentChar;
-    int mNumChr;
-    int mDownKey;
-    HbInputFocusObject *mCurrentlyFocused;
-    bool mLongPressHappened;
-	bool mShiftKeyDoubleTapped;
-};
+#include "hbinputbasic12keyhandler_p.h"
 
 HbInputBasic12KeyHandlerPrivate::HbInputBasic12KeyHandlerPrivate()
 :    mLastKey(0),
@@ -83,9 +58,11 @@
     if (!focusObject) {
         return;
     }
-
-    mCurrentChar = q->getNthCharacterInKey(mNumChr, buttonId);
-
+	//This condition is to avoid get the characters mapped to Asterisk
+	//Especially for Thai language we have mapped character to Asterisk
+	if(buttonId != Qt::Key_Asterisk) {
+		mCurrentChar = q->getNthCharacterInKey(mNumChr, buttonId);
+	}
 
     if (mCurrentChar != 0) {
         QString str;
@@ -167,7 +144,7 @@
 			// Need to check for shift key : In empty editor, click on editor
 			// press shift, multitap on a button. The char is entered in upper case.
 			// It should be entered in lower case.
-            if (Qt::Key_Shift != mLastKey) {
+            if (mLastKey && (Qt::Key_Shift != mLastKey)) {
 			    mInputMethod->updateState();
             }
 			refreshAutoCompleter();
@@ -179,7 +156,9 @@
 			return true;
 		} else if (buttonId == Qt::Key_Shift) {
             // single tap of shift key toggles prediction status in case insensitive languages
-            if (!HbInputSettingProxy::instance()->globalInputLanguage().isCaseSensitiveLanguage() && 
+			// The Editor should not be Web or URL which allows only Latin Alphabet
+            if (!HbInputSettingProxy::instance()->globalInputLanguage().isCaseSensitiveLanguage() &&
+				((HbEditorConstraintLatinAlphabetOnly | HbEditorConstraintAutoCompletingField)!=focusObject->editorInterface().constraints()) &&
                 // when the language does not support prediction in that case we should not update the state and prediction
                 HbPredictionFactory::instance()->predictionEngineForLanguage(mInputMethod->inputState().language())) {
                 HbInputSettingProxy::instance()->togglePrediction();
@@ -190,14 +169,15 @@
                     mShiftKeyDoubleTapped = false;
                     mTimer->stop();
                     if( HbInputSettingProxy::instance()->globalInputLanguage() == mInputMethod->inputState().language() ||
-                        HbInputSettingProxy::instance()->globalSecondaryInputLanguage() == mInputMethod->inputState().language() ){
+                        HbInputSettingProxy::instance()->globalSecondaryInputLanguage() == mInputMethod->inputState().language() ||
+						((HbEditorConstraintLatinAlphabetOnly | HbEditorConstraintAutoCompletingField)==focusObject->editorInterface().constraints())){
                         // in latin variants , double tap of shift key toggles the prediction status	
                         // revert back to the old case as this is a double tap 
                         // (the case was changed on the single tap)
                         updateTextCase();
                         // when the language does not support prediction in that case we should not update the state and prediction
                         if(HbPredictionFactory::instance()->predictionEngineForLanguage(mInputMethod->inputState().language())) {
-                            HbInputSettingProxy::instance()->togglePrediction();
+                            q->togglePrediction();
                         }
                     } else {
 					    // if the global language is different from the input mode language, we should 
@@ -390,6 +370,14 @@
     d->q_ptr = this;
 }
 
+HbInputBasic12KeyHandler::HbInputBasic12KeyHandler(HbInputBasic12KeyHandlerPrivate &dd, HbInputAbstractMethod* inputMethod)
+:HbInputBasicHandler(dd, inputMethod)
+{
+    Q_D(HbInputBasic12KeyHandler);
+    d->q_ptr = this;
+    d->init();
+}
+
 HbInputBasic12KeyHandler::~HbInputBasic12KeyHandler()
 {
 }
@@ -418,22 +406,6 @@
 }
 
 /*!
- list different input modes.
-*/
-void HbInputBasic12KeyHandler::listInputModes(QVector<HbInputModeProperties>& modes) const
-{
-    HbInputModeProperties binding;
-    binding.iMode = HbInputModeDefault;
-    binding.iKeyboard = HbKeyboardVirtual12Key;
-
-    QList<HbInputLanguage> languages = HbKeymapFactory::availableLanguages();
-    foreach (HbInputLanguage language, languages) {
-        binding.iLanguage = language;
-        modes.push_back(binding);
-    }
-}
-
-/*!
 Action Handler
 */
 bool HbInputBasic12KeyHandler::actionHandler(HbInputModeAction action)
diff -r 16d8024aca5e -r f7ac710697a9 src/hbplugins/inputmethods/touchinput/hbinputbasic12keyhandler.h
--- a/src/hbplugins/inputmethods/touchinput/hbinputbasic12keyhandler.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbplugins/inputmethods/touchinput/hbinputbasic12keyhandler.h	Mon May 03 12:48:33 2010 +0300
@@ -36,13 +36,15 @@
     ~HbInputBasic12KeyHandler();
 
     bool isComposing() const;
-    void listInputModes(QVector<HbInputModeProperties>& modes) const;
     bool actionHandler(HbInputModeAction action);
     bool filterEvent(const QKeyEvent * event);
 
 public slots:
     void cursorPositionChanged(int oldPos, int newPos);
 
+protected:
+	HbInputBasic12KeyHandler(HbInputBasic12KeyHandlerPrivate &dd, HbInputAbstractMethod* inputMethod);
+
 private:
     Q_DECLARE_PRIVATE_D(d_ptr, HbInputBasic12KeyHandler)
     Q_DISABLE_COPY(HbInputBasic12KeyHandler)
diff -r 16d8024aca5e -r f7ac710697a9 src/hbplugins/inputmethods/touchinput/hbinputbasic12keyhandler_p.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbplugins/inputmethods/touchinput/hbinputbasic12keyhandler_p.h	Mon May 03 12:48:33 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 HbPlugins 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 "hbinputbasichandler_p.h"
+
+class HbInputBasic12KeyHandlerPrivate: public HbInputBasicHandlerPrivate
+{
+    Q_DECLARE_PUBLIC(HbInputBasic12KeyHandler)
+
+public:
+    HbInputBasic12KeyHandlerPrivate();
+    ~HbInputBasic12KeyHandlerPrivate();
+
+    void handleAlphaEvent(int buttonId);
+    bool buttonPressed(const QKeyEvent *keyEvent);
+    bool buttonReleased(const QKeyEvent *keyEvent);
+    bool actionHandler(HbInputModeHandler::HbInputModeAction action);
+
+    void _q_timeout();
+
+public:
+    int mLastKey;
+    QChar mCurrentChar;
+    int mNumChr;
+    int mDownKey;
+    HbInputFocusObject *mCurrentlyFocused;
+    bool mLongPressHappened;
+	bool mShiftKeyDoubleTapped;
+};
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbplugins/inputmethods/touchinput/hbinputbasic12keythaihandler.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbplugins/inputmethods/touchinput/hbinputbasic12keythaihandler.cpp	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,147 @@
+/****************************************************************************
+**
+** 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 HbPlugins 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 "virtual12key.h"
+#include <QTimer>
+#include "hbinputbasic12keythaihandler.h"
+#include "hbinputbasic12keyhandler_p.h"
+
+class HbInputBasic12KeyThaiHandlerPrivate: public HbInputBasic12KeyHandlerPrivate
+{
+    Q_DECLARE_PUBLIC(HbInputBasic12KeyThaiHandler)
+
+public:
+    HbInputBasic12KeyThaiHandlerPrivate();
+    ~HbInputBasic12KeyThaiHandlerPrivate();
+
+	void showThaiSpecialCharacters();
+    bool buttonReleased(const QKeyEvent *keyEvent);
+    void _q_timeout();
+
+};
+
+HbInputBasic12KeyThaiHandlerPrivate::HbInputBasic12KeyThaiHandlerPrivate()
+{
+
+}
+
+HbInputBasic12KeyThaiHandlerPrivate::~HbInputBasic12KeyThaiHandlerPrivate()
+{
+
+}
+
+
+/*!
+Handles the key release events from the VKB. Launches Thai special popup with key release event of
+asterisk and shift key.
+*/
+bool HbInputBasic12KeyThaiHandlerPrivate::buttonReleased(const QKeyEvent *keyEvent)
+{
+	Q_UNUSED(keyEvent);
+    HbInputVkbWidget::HbFlickDirection flickDir = static_cast<HbVirtual12Key*>(mInputMethod)->flickDirection();
+	if (mInputMethod && flickDir!=HbInputVkbWidget::HbFlickDirectionDown) {
+		int buttonId = keyEvent->key();
+		HbInputFocusObject *focusObject = 0;
+		focusObject = mInputMethod->focusObject();
+		if (!focusObject || !mDownKey) {
+			return false;
+		}
+		if ( mLongPressHappened ){
+			return false;
+		}
+		//Handle if Shift and Asterisk key release happen or else let's pass it to base class to handle
+		if (buttonId == Qt::Key_Shift) {
+			//For Thai Language Launch Special Characters popup 
+			mInputMethod->showThaiSpecialCharacters(buttonId);
+			mLastKey = buttonId;
+			mCurrentChar = 0;
+			mDownKey = 0;
+			return true;				
+		} else if (buttonId == Qt::Key_Asterisk && !mInputMethod->isSctModeActive()) {
+			//For Thai Language Launch Special Characters popup 
+			mInputMethod->showThaiSpecialCharacters(buttonId);
+			mLastKey = buttonId;
+			mCurrentChar = 0;
+			mDownKey = 0;
+			return true;			
+		} else {
+			HbInputBasic12KeyHandlerPrivate::buttonReleased(keyEvent);
+		}
+	}
+	return false;
+}
+/*!
+Launches Thai special popup with long key press event of asterisk 
+*/
+void HbInputBasic12KeyThaiHandlerPrivate::_q_timeout()
+{
+    mTimer->stop();
+    mNumChr = 0;
+
+    HbInputFocusObject *focusedObject = 0;
+    focusedObject = mInputMethod->focusObject();
+    if (!focusedObject) {
+        return;
+    }
+
+    //Long key press number key is applicable to all keys except Asterisk
+    if (mDownKey && mDownKey == Qt::Key_Asterisk) {
+		//For Thai Language Launch Special Characters popup 
+		mInputMethod->showThaiSpecialCharacters(mDownKey); 
+	} else {
+		HbInputBasic12KeyHandlerPrivate::_q_timeout();
+	}
+ 	mDownKey = 0;        
+    mCurrentChar = 0;
+    return;
+}
+
+HbInputBasic12KeyThaiHandler::HbInputBasic12KeyThaiHandler(HbInputAbstractMethod* inputMethod)
+:HbInputBasic12KeyHandler(*new HbInputBasic12KeyThaiHandlerPrivate, inputMethod)
+{
+    Q_D(HbInputBasic12KeyThaiHandler);
+    d->q_ptr = this;
+}
+
+HbInputBasic12KeyThaiHandler::~HbInputBasic12KeyThaiHandler()
+{
+}
+
+/*!
+ filterEvent function for handling different keyevents.
+*/
+bool HbInputBasic12KeyThaiHandler::filterEvent(const QKeyEvent * event)
+{
+    Q_D(HbInputBasic12KeyThaiHandler);
+
+    if (event->type() == QEvent::KeyRelease) {
+        return d->buttonReleased(event);
+    } else {
+        return d->buttonPressed(event);
+    }
+}
+
+//End of file
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbplugins/inputmethods/touchinput/hbinputbasic12keythaihandler.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbplugins/inputmethods/touchinput/hbinputbasic12keythaihandler.h	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,46 @@
+/****************************************************************************
+**
+** 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 HbPlugins 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_BASIC_12KEY_THAI_HANDLER
+#define HB_INPUT_BASIC_12KEY_THAI_HANDLER
+
+#include "hbinputbasic12keyhandler.h"
+
+class HbInputBasic12KeyThaiHandlerPrivate;
+class HbInputBasic12KeyThaiHandler: public HbInputBasic12KeyHandler
+{
+    Q_OBJECT
+public:
+    HbInputBasic12KeyThaiHandler(HbInputAbstractMethod* inputMethod);
+    ~HbInputBasic12KeyThaiHandler();
+
+    bool filterEvent(const QKeyEvent * event);
+
+private:
+    Q_DECLARE_PRIVATE_D(d_ptr, HbInputBasic12KeyThaiHandler)
+    Q_DISABLE_COPY(HbInputBasic12KeyThaiHandler)
+};
+
+#endif //HB_INPUT_BASIC_12KEY_THAI_HANDLER
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbplugins/inputmethods/touchinput/hbinputbasicqwertyhandler.cpp
--- a/src/hbplugins/inputmethods/touchinput/hbinputbasicqwertyhandler.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbplugins/inputmethods/touchinput/hbinputbasicqwertyhandler.cpp	Mon May 03 12:48:33 2010 +0300
@@ -262,22 +262,6 @@
 }
 
 
-/*!
-This function lists different input modes.
-*/
-void HbInputBasicQwertyHandler::listInputModes(QVector<HbInputModeProperties>& modes) const
-{
-    HbInputModeProperties binding;
-    binding.iMode = HbInputModeDefault;
-    binding.iKeyboard = HbKeyboardVirtualQwerty;
-
-    QList<HbInputLanguage> languages = HbKeymapFactory::availableLanguages();
-    foreach (HbInputLanguage language, languages) {
-        binding.iLanguage = language;
-        modes.push_back(binding);
-    }
-}
-
 HbInputBasicQwertyHandler::~HbInputBasicQwertyHandler()
 {
 }
diff -r 16d8024aca5e -r f7ac710697a9 src/hbplugins/inputmethods/touchinput/hbinputbasicqwertyhandler.h
--- a/src/hbplugins/inputmethods/touchinput/hbinputbasicqwertyhandler.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbplugins/inputmethods/touchinput/hbinputbasicqwertyhandler.h	Mon May 03 12:48:33 2010 +0300
@@ -34,7 +34,6 @@
 public:
     HbInputBasicQwertyHandler(HbInputAbstractMethod* inputMethod);
     ~HbInputBasicQwertyHandler();
-    void listInputModes(QVector<HbInputModeProperties>& modes) const;
     bool isComposing() const;
     bool actionHandler(HbInputModeAction action);
     bool filterEvent(const QKeyEvent * event);
diff -r 16d8024aca5e -r f7ac710697a9 src/hbplugins/inputmethods/touchinput/hbinputnumeric12keyhandler.cpp
--- a/src/hbplugins/inputmethods/touchinput/hbinputnumeric12keyhandler.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbplugins/inputmethods/touchinput/hbinputnumeric12keyhandler.cpp	Mon May 03 12:48:33 2010 +0300
@@ -40,17 +40,22 @@
     HbInputNumeric12KeyHandlerPrivate();
     ~HbInputNumeric12KeyHandlerPrivate();
 
+	void handleMultitapStarKey();
     bool buttonPressed(const QKeyEvent *keyEvent);
     bool buttonReleased(const QKeyEvent *keyEvent);
     void _q_timeout();
 public:
     int mLastKey;
-    bool mButtonDown;
+    int mButtonDown;
+	int mMultiTapNum;
+	QChar mCurrentMultitapChar;
 };
 
 HbInputNumeric12KeyHandlerPrivate::HbInputNumeric12KeyHandlerPrivate():
     mLastKey(0),
-    mButtonDown(false)
+    mButtonDown(0),
+	mMultiTapNum(0),
+	mCurrentMultitapChar(0)
 {
 }
 
@@ -58,20 +63,60 @@
 {
 }
 
+void HbInputNumeric12KeyHandlerPrivate::handleMultitapStarKey()
+{
+	HbInputFocusObject *focusObject = 0;
+	focusObject = mInputMethod->focusObject();
+	if (!focusObject) {
+		return;
+	}
+	QChar MultitapStarKeyArray[] = {'+','*','p','w','\0'};
+	mCurrentMultitapChar = MultitapStarKeyArray[mMultiTapNum];
+	
+	mMultiTapNum = (++mMultiTapNum)%4;
+	if (mCurrentMultitapChar != 0) {
+		QString str;
+		str += mCurrentMultitapChar;
+
+		QList<QInputMethodEvent::Attribute> list;
+		QInputMethodEvent event(str,list);
+		focusObject->sendEvent(event);
+	}
+}
 bool HbInputNumeric12KeyHandlerPrivate::buttonPressed(const QKeyEvent *keyEvent)
 {
+	Q_Q(HbInputNumeric12KeyHandler);
+	HbInputFocusObject *focusObject = 0;
+    focusObject = mInputMethod->focusObject();
+    if (!focusObject) {
+        return false;
+    }
 	int buttonId = keyEvent->key();
-	mButtonDown = true;
-	mLastKey = buttonId;
-    mTimer->stop();
-    if (buttonId == Qt::Key_Control) {
-        mLastKey = buttonId;        
+	mButtonDown = buttonId;
+    
+	if (buttonId == Qt::Key_Shift) {
         mTimer->start(HbLongPressTimerTimeout);
-        return true;
-    } else if (buttonId == Qt::Key_Shift) {
-        mTimer->start(HbLongPressTimerTimeout);
+		mLastKey = buttonId;
 		return true;
-	}		              
+	}		   
+	if (mInputMethod) {
+		if (mLastKey != buttonId) {
+			if (mCurrentMultitapChar !=0) {
+				if (!focusObject->characterAllowedInEditor(mCurrentMultitapChar))
+					focusObject->sendCommitString(QString());
+				else {
+					QChar commitChar(mCurrentMultitapChar);
+					mCurrentMultitapChar = 0;
+					q->commitAndUpdate(commitChar);
+				}
+			}
+		}
+		if (buttonId == Qt::Key_Asterisk) {
+			mTimer->stop();
+			mTimer->start(HbMultiTapTimerTimeout);
+		}
+		return false;
+	}           
     return false;
 }
 
@@ -88,24 +133,33 @@
         qDebug("HbInputModeHandler::buttonReleased no focusObject ... failed!!");
         return false;
     }
-	if(mTimer->isActive()) {
+	int buttonId = keyEvent->key();
+	if(mTimer->isActive() && buttonId == Qt::Key_Shift) {
 		mTimer->stop();
 	}
+    
+	if (mLastKey != buttonId)
+		mMultiTapNum = 0;
 
-	int buttonId = keyEvent->key();
-    
-	mButtonDown = false;
+	mButtonDown = 0;
 
-    if (buttonId == Qt::Key_Asterisk || buttonId == Qt::Key_Control) {
-        //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);
+    if (buttonId == Qt::Key_Asterisk) {
+        //Asterisk Key will multitap bettween *,+,p,w
+        //mInputMethod->switchMode(buttonId);
+		mLastKey = buttonId;
+		handleMultitapStarKey();
         return true;
-    } else if (buttonId == Qt::Key_Return) {
+	} else if (buttonId == Qt::Key_Control){
+		mInputMethod->switchMode(buttonId);
+		mLastKey = buttonId;
+		return true;
+	}
+	else if (buttonId == Qt::Key_Return) {
         mInputMethod->closeKeypad();
         return true;
-	} else if ( buttonId == Qt::Key_Shift && mLastKey == buttonId ) {
+	} else if ( buttonId == Qt::Key_Shift ) {
 		//Let's commit character "#" on single tap and double tap of shift Key
+		mLastKey = buttonId;
 		QChar qc(keyEvent->key());
 		qc = QChar('#');
 		q->commitAndUpdate(qc);
@@ -115,7 +169,7 @@
         if (q->HbInputNumericHandler::filterEvent(keyEvent)) {
             return true;
         }
-        
+        mLastKey = buttonId;
         q->commitFirstMappedNumber(buttonId);
         return true;
     }
@@ -126,6 +180,7 @@
 {
 	Q_Q(HbInputNumeric12KeyHandler);
     mTimer->stop();
+	mMultiTapNum = 0;
 
     HbInputFocusObject *focusedObject = 0;
     focusedObject = mInputMethod->focusObject();
@@ -136,8 +191,7 @@
     //switch to Alpha mode when Long key press of Shift key is received
     if (mButtonDown)
     {
-        mButtonDown = false;
-		if (mLastKey == Qt::Key_Shift) {
+		if (mButtonDown == Qt::Key_Shift) {
 			// If the editor is not a number only editor, then activate the alphanumeric keypad
             if( !focusedObject->editorInterface().isNumericEditor() ) {
 				mInputMethod->switchMode(mLastKey);
@@ -148,11 +202,17 @@
 				q->commitAndUpdate(QChar('#'));
 			}
         }
-		else if (mLastKey == Qt::Key_Control)
+		else if (mButtonDown == Qt::Key_Asterisk)
 		{
-			mInputMethod->switchMode(Qt::Key_Control);
+			q->commitAndUpdate(QChar('*'));
 		}
+		mButtonDown = 0;
     }
+	else {
+		if (mCurrentMultitapChar != 0)
+			focusedObject->filterAndCommitCharacter(mCurrentMultitapChar);
+	}
+	mCurrentMultitapChar = 0;
 }
 
 HbInputNumeric12KeyHandler::HbInputNumeric12KeyHandler(HbInputAbstractMethod* inputMethod)
@@ -193,7 +253,7 @@
 		case HbInputModeHandler::HbInputModeActionCancelButtonPress:
         case HbInputModeHandler::HbInputModeActionReset:
 			d->mLastKey = 0;
-        	d->mButtonDown = false;
+        	d->mButtonDown = 0;
 			d->mTimer->stop();
 			break;
         //In case of the numeric editor the character is already committed.
@@ -226,20 +286,4 @@
     return ret;
 }
 
-/*!
- list different input modes.
-*/
-void HbInputNumeric12KeyHandler::listInputModes(QVector<HbInputModeProperties>& modes) const
-{
-    HbInputModeProperties binding;
-    binding.iMode = HbInputModeNumeric;
-    binding.iKeyboard = HbKeyboardVirtual12Key;
-
-    QList<HbInputLanguage> languages = HbKeymapFactory::availableLanguages();
-    foreach (HbInputLanguage language, languages) {
-        binding.iLanguage = language;
-        modes.push_back(binding);
-    }
-}
-
 // EOF
diff -r 16d8024aca5e -r f7ac710697a9 src/hbplugins/inputmethods/touchinput/hbinputnumeric12keyhandler.h
--- a/src/hbplugins/inputmethods/touchinput/hbinputnumeric12keyhandler.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbplugins/inputmethods/touchinput/hbinputnumeric12keyhandler.h	Mon May 03 12:48:33 2010 +0300
@@ -35,7 +35,6 @@
     HbInputNumeric12KeyHandler(HbInputAbstractMethod* inputMethod);
     ~HbInputNumeric12KeyHandler();
     
-    void listInputModes(QVector<HbInputModeProperties>& modes) const;
     bool actionHandler(HbInputModeAction action);
     bool filterEvent(const QKeyEvent * event);
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbplugins/inputmethods/touchinput/hbinputnumericqwertyhandler.cpp
--- a/src/hbplugins/inputmethods/touchinput/hbinputnumericqwertyhandler.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbplugins/inputmethods/touchinput/hbinputnumericqwertyhandler.cpp	Mon May 03 12:48:33 2010 +0300
@@ -106,23 +106,6 @@
     d->q_ptr = this;
 }
 
-
-/*!
- This function lists different input modes.
-*/
-void HbInputNumericQwertyHandler::listInputModes(QVector<HbInputModeProperties>& modes) const
-{
-    HbInputModeProperties binding;
-    binding.iMode = HbInputModeNumeric;
-    binding.iKeyboard = HbKeyboardVirtualQwerty;
-
-    QList<HbInputLanguage> languages = HbKeymapFactory::availableLanguages();
-    foreach (HbInputLanguage language, languages) {
-        binding.iLanguage = language;
-        modes.push_back(binding);
-    }
-}
-
 HbInputNumericQwertyHandler::~HbInputNumericQwertyHandler()
 {
 }
diff -r 16d8024aca5e -r f7ac710697a9 src/hbplugins/inputmethods/touchinput/hbinputnumericqwertyhandler.h
--- a/src/hbplugins/inputmethods/touchinput/hbinputnumericqwertyhandler.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbplugins/inputmethods/touchinput/hbinputnumericqwertyhandler.h	Mon May 03 12:48:33 2010 +0300
@@ -35,7 +35,6 @@
     HbInputNumericQwertyHandler(HbInputAbstractMethod* inputMethod);
     ~HbInputNumericQwertyHandler();
     
-    void listInputModes(QVector<HbInputModeProperties>& modes) const;
     bool actionHandler(HbInputModeAction action);
     bool filterEvent(const QKeyEvent * event);
    
diff -r 16d8024aca5e -r f7ac710697a9 src/hbplugins/inputmethods/touchinput/hbinputprediction12keyhandler.cpp
--- a/src/hbplugins/inputmethods/touchinput/hbinputprediction12keyhandler.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbplugins/inputmethods/touchinput/hbinputprediction12keyhandler.cpp	Mon May 03 12:48:33 2010 +0300
@@ -32,48 +32,186 @@
 #include <hbinputvkbhost.h>
 #include <hbinputdialog.h>
 #include <hbaction.h>
+#include <hbmainwindow.h>
+#include <hbinstance.h>
+#include <hbeffect.h>
+
 #include "virtual12key.h"
 
 #include "hbinputprediction12keyhandler.h"
 #include "hbinputpredictionhandler_p.h"
 #include "hbinputabstractbase.h"
+#include "hbinputprediction12keyhandler_p.h"
 
 #define HbDeltaHeight 3.0
 #define MAXUDBWORDSIZE 64
 
-class HbInputPrediction12KeyHandlerPrivate: public HbInputPredictionHandlerPrivate
+HbInputSpellQuery::HbInputSpellQuery(HbInputPrediction12KeyHandlerPrivate *owner) : mOwner(owner)
+{
+}
+
+void HbInputSpellQuery::launch(QString editorText)
 {
-    Q_DECLARE_PUBLIC(HbInputPrediction12KeyHandler)
+    HbInputFocusObject *focusObject = mOwner->mInputMethod->focusObject();
+    if (!focusObject) {
+        return;
+    }
+    mSavedState = mOwner->mInputMethod->inputState();
+    mOwner->mEngine->clear();
+    mOwner->mCanContinuePrediction = true;
+    // close the keypad before showing the spell dialog
+    HbVkbHost *vkbHost = focusObject->editorInterface().vkbHost();
+    if (vkbHost && vkbHost->keypadStatus() != HbVkbHost::HbVkbStatusClosed) {
+        vkbHost->closeKeypad();
+    }
+    setInputMode(HbInputDialog::TextInput);
+    setPromptText(tr("Spell:"));
+    setValue(QVariant(editorText));
 
-public:
-    HbInputPrediction12KeyHandlerPrivate();
-    ~HbInputPrediction12KeyHandlerPrivate();
+    //set the spell dialog position
+    QSizeF  newSize; 
+    QPointF newPos;
+    QRectF newGeometry;
+    getPositionAndSize(newPos, newSize, newGeometry);
+    newGeometry.setHeight(newSize.height());
+    newGeometry.setWidth(newSize.width());
+    setGeometry(newGeometry);
+    setPos(newPos);
+
+    // change the focus to spell dialog editor
+    HbLineEdit *spellEdit = lineEdit();
+    if (spellEdit) {      
+        spellEdit->setMaxLength(MAXUDBWORDSIZE);
+        spellEdit->setSmileysEnabled(false);
+        HbEditorInterface eInt(spellEdit);
+        // we don't want prediction and automatic textcase in spell query dialog
+        spellEdit->setInputMethodHints(spellEdit->inputMethodHints() | Qt::ImhNoPredictiveText | Qt::ImhNoAutoUppercase);
+        eInt.setLastFocusedState(mSavedState);
+        spellEdit->setFocus();
+    }
+    
+    // execute the spell dialog
+    mSavedFocusObject = focusObject->object();
+    mSavedEditorText = editorText;
+    //setAttribute(Qt::WA_DeleteOnClose);
+    mDidHandleFinish = false;
+    open(this,SLOT(dialogClosed(HbAction*)));
+}
 
-    bool buttonReleased(const QKeyEvent *keyEvent);
-    bool buttonPressed(const QKeyEvent *keyEvent);
-    void _q_timeout();
-    void launchSpellDialog(QString customWord);
-    void getSpellDialogPositionAndSize(QPointF & pos,QSizeF & size,QRectF & geom);
-    void cancelButtonPress();
-public:
-    int mLastKey;
-    bool mButtonDown;
-    QChar mCurrentChar;
-    bool mLongPressHappened;
-    bool mShiftKeyDoubleTap;
-};
+void HbInputSpellQuery::dialogClosed(HbAction* action)
+{
+	//There are multiple dialog closed event received. This will make sure we handle finish
+	//only once
+	if(mDidHandleFinish) {
+        return;
+    } else {
+        mDidHandleFinish = true;
+    }
+	
+	bool isOk = false;
+	bool isCancel = false;
+	bool isExternalClose = false;
+	// action is null when input query is closed externally , for example by calling
+	// HbDialog::close() function.
+	if (action) {
+		isOk = (action->text() == primaryAction()->text())? true : false;
+		isCancel = (action->text() == secondaryAction()->text())? true:false;
+	} else {
+		isExternalClose = true;
+	}
+    
+	//Need to disable effects as asynchronous hide will commit the word otherwise.
+	HbEffect::disable(this);
+	hide();
+	HbEffect::enable(this);  
+	
+	HbInputFocusObject *newFocusObject = new HbInputFocusObject(mSavedFocusObject);
+    newFocusObject->releaseFocus();
+    newFocusObject->setFocus();
+    
+    HbAbstractEdit *abstractEdit = qobject_cast<HbAbstractEdit*>(mSavedFocusObject);
+    
+    if(abstractEdit) {
+        abstractEdit->setCursorPosition(abstractEdit->cursorPosition());
+    }
+    
+    mOwner->mInputMethod->setFocusObject(newFocusObject);
+    mOwner->mInputMethod->focusObject()->editorInterface().setTextCase(mSavedState.textCase());
+    
+    if (isOk) {
+		mOwner->commit(value().toString(), true, true);
+	} else if (isCancel) {
+        //update the editor with pre-edit text
+        mOwner->mEngine->setWord(mSavedEditorText);
+        bool used = false;	 
+        mOwner->mEngine->updateCandidates(mOwner->mBestGuessLocation, used);
+        mOwner->mShowTail = false;
+        mOwner->updateEditor();
+	} else if (isExternalClose) {
+		mOwner->commit(mSavedEditorText, true, true);
+	}
+	
+	mSavedEditorText.clear();
+}
+
+void HbInputSpellQuery::getPositionAndSize(QPointF &pos,QSizeF &size, QRectF &geom)
+{
+    pos = HbInputDialog::pos();
+    size = HbInputDialog::size();
+    geom = HbInputDialog::geometry();
+
+    QRectF cursorRect = mOwner->mInputMethod->focusObject()->microFocus(); // from the top of the screen
+    pos = QPointF(cursorRect.bottomLeft().x(),cursorRect.bottomLeft().y());
+    qreal heightOfTitlebar = 80.0; // Using magic number for now...
+    qreal screenHeight = (qreal)HbDeviceProfile::current().logicalSize().height();
+
+    if( ((screenHeight - cursorRect.bottomLeft().y()) > (cursorRect.y() - heightOfTitlebar))
+        || ((screenHeight - cursorRect.bottomLeft().y() + HbDeltaHeight ) > geom.height()) ) {
+        // this means there is amore space below inline text than at the top or we can fit spell Dialog
+        // below inline text
+        pos.setY(cursorRect.bottomLeft().y() + HbDeltaHeight);
+        size.setHeight(screenHeight - pos.y());
+   } else {
+        // this means there is amore space above inline text than below it
+        pos.setY(cursorRect.y() - geom.height() - HbDeltaHeight);
+        if (pos.y() < heightOfTitlebar) {
+            // this means that spell dialog can not be fit in from top of inline text, we need to trim it
+            pos.setY(heightOfTitlebar);
+        }
+        size.setHeight(cursorRect.y() - heightOfTitlebar - HbDeltaHeight);
+    }
+    if ( size.height() > geom.height()) {
+        size.setHeight(geom.height());
+    }
+    if ((pos.x() + size.width()) > (qreal)HbDeviceProfile::current().logicalSize().width()) {
+        // can not fit spell dialog to the right side of inline edit text.
+        pos.setX((qreal)HbDeviceProfile::current().logicalSize().width()- size.width());
+    }
+}
 
 HbInputPrediction12KeyHandlerPrivate::HbInputPrediction12KeyHandlerPrivate()
 :mLastKey(0),
 mButtonDown(false),
 mCurrentChar(0),
 mLongPressHappened(false),
-mShiftKeyDoubleTap(false)
+mShiftKeyDoubleTap(false),
+mInputSpellQuery(NULL)
 {
 }
 
 HbInputPrediction12KeyHandlerPrivate::~HbInputPrediction12KeyHandlerPrivate()
 {
+    delete mInputSpellQuery;
+	mInputSpellQuery = 0;
+}
+
+void HbInputPrediction12KeyHandlerPrivate::chopQMarkAndUpdateEditor()
+{
+    if(!mCanContinuePrediction && (*mCandidates)[mBestGuessLocation].endsWith('?')) {	
+        (*mCandidates)[mBestGuessLocation].chop(1);
+        updateEditor();
+        mCanContinuePrediction = true;
+    }
 }
 
 void HbInputPrediction12KeyHandlerPrivate::_q_timeout()
@@ -88,16 +226,14 @@
     if (mButtonDown) {	
         if (mLastKey == Qt::Key_Asterisk) {
 			//Remove the "?" mark if present
-			if(!mCanContinuePrediction && (*mCandidates)[mBestGuessLocation].endsWith('?')) {	
-                (*mCandidates)[mBestGuessLocation].chop(1);
-                updateEditor();
-                mCanContinuePrediction = true;
-			}
+            chopQMarkAndUpdateEditor();
             mInputMethod->switchMode(mLastKey);
         } else if (mLastKey == Qt::Key_Shift) {
             mInputMethod->switchMode(Qt::Key_Shift);
             mLongPressHappened = true;
         } else if (mLastKey == Qt::Key_Control) {
+            //Remove the "?" mark if present
+            chopQMarkAndUpdateEditor();
             mInputMethod->selectSpecialCharacterTableMode();
         } else {
             //With a long key press of a key, numbers are supposed to be entered.
@@ -181,8 +317,8 @@
     // Sym key is handled in this class it self, so not passing it to 
     // the base mode handlers.	
     if ( buttonId == Qt::Key_Control) {
-        //Same SYM 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.
+        //Remove the "?" mark if present
+        chopQMarkAndUpdateEditor();
         mInputMethod->switchMode(buttonId);
         return true;
     } 
@@ -222,7 +358,7 @@
                     // revert back to the old case as this is a double tap 
                     // (the case was changed on the single tap)
                     updateTextCase();				 
-                    HbInputSettingProxy::instance()->togglePrediction();
+                    q->togglePrediction();
                 } else {
                     // if the global language is different from the input mode language, we should 
                     // go back to the root state
@@ -249,112 +385,6 @@
     return false;
 }
 
-void HbInputPrediction12KeyHandlerPrivate::launchSpellDialog(QString editorText)
-{
-    HbInputFocusObject *focusObject = mInputMethod->focusObject();
-    if (!focusObject) {
-        return;
-    }
-        QPointer<QObject> focusedQObject = focusObject->object();
-	// store the current focused editor 
-			 
-    HbTextCase currentTextCase = focusObject->editorInterface().textCase();
-    mEngine->clear();
-    mCanContinuePrediction = true;
-    // close the keypad before showing the spell dialog
-	HbVkbHost *vkbHost = focusObject->editorInterface().vkbHost();
-    if (vkbHost && vkbHost->keypadStatus() != HbVkbHost::HbVkbStatusClosed) {
-        vkbHost->closeKeypad(true);
-    }
-    // create the spell dialog
-    HbInputDialog *spellDialog = new HbInputDialog();
-    spellDialog->setInputMode(HbInputDialog::TextInput);
-    spellDialog->setPromptText("");
-    spellDialog->setValue(QVariant(editorText));
-    QSizeF  dialogSize = spellDialog->size();
-    QPointF dialogPos = spellDialog->pos();
-    QRectF geom = spellDialog->geometry();
-    
-    //set the spell dialog position
-    getSpellDialogPositionAndSize(dialogPos,dialogSize, geom);
-    geom.setHeight(dialogSize.height());
-    geom.setWidth(dialogSize.width());
-    spellDialog->setGeometry(geom);
-    spellDialog->setPos(dialogPos);
-
-    // change the focus to spell dialog editor
-    HbLineEdit *spellEdit = spellDialog->lineEdit();
-
-    if (spellEdit) {
-        spellEdit->setFocus();
-        spellEdit->clearFocus();
-        spellEdit->setFocus();
-        spellEdit->setMaxLength(MAXUDBWORDSIZE);
-        spellEdit->setSmileysEnabled(false);
-        HbEditorInterface eInt(spellEdit);
-		spellEdit->setInputMethodHints(spellEdit->inputMethodHints() | Qt::ImhNoPredictiveText);
-        eInt.setTextCase(currentTextCase);
-    }
-    // execute the spell dialog
-    HbAction *act = spellDialog->exec();
- 
-        //create new focus object and set the focus back to main editor
-        HbInputFocusObject *newFocusObject = new HbInputFocusObject(focusedQObject);
-	   
-		
-        newFocusObject->releaseFocus();
-        newFocusObject->setFocus();
-
-	    HbAbstractEdit *abstractEdit = qobject_cast<HbAbstractEdit*>(focusedQObject);
-        if(abstractEdit) {
-            abstractEdit->setCursorPosition(abstractEdit->cursorPosition());
-        }
-
-        mInputMethod->setFocusObject(newFocusObject);
-        mInputMethod->focusObject()->editorInterface().setTextCase(currentTextCase);
-
-    if (act->text() == spellDialog->primaryAction()->text()) {
-        commit(spellDialog->value().toString() , true, true);
-    } else if (act->text() == spellDialog->secondaryAction()->text()) {
-    //update the editor with pre-edit text
-        mEngine->setWord(editorText);
-        bool used = false;	 
-        mEngine->updateCandidates(mBestGuessLocation, used);
-		mShowTail = false;
-		updateEditor();
-	}  
-    delete spellDialog;
-}
-
-void HbInputPrediction12KeyHandlerPrivate::getSpellDialogPositionAndSize(QPointF & pos,QSizeF & size, QRectF &geom)
-{
-    QRectF cursorRect = mInputMethod->focusObject()->microFocus(); // from the top of the screen
-    pos = QPointF(cursorRect.bottomLeft().x(),cursorRect.bottomLeft().y());
-    qreal heightOfTitlebar = 80.0; // Using magic number for now...
-    qreal screenHeight = (qreal)HbDeviceProfile::current().logicalSize().height();
-    if( ((screenHeight - cursorRect.bottomLeft().y()) > (cursorRect.y() - heightOfTitlebar))
-        || ((screenHeight - cursorRect.bottomLeft().y() + HbDeltaHeight ) > geom.height()) ) {
-        // this means there is amore space below inline text than at the top or we can fit spell Dialog
-        // below inline text
-        pos.setY(cursorRect.bottomLeft().y() + HbDeltaHeight);
-        size.setHeight(screenHeight - pos.y());
-    } else {
-        // this means there is amore space above inline text than below it
-        pos.setY(cursorRect.y() - geom.height() - HbDeltaHeight);
-        if (pos.y() < heightOfTitlebar) {
-            // this means that spell dialog can not be fit in from top of inline text, we need to trim it
-            pos.setY(heightOfTitlebar);
-        }
-        size.setHeight(cursorRect.y() - heightOfTitlebar - HbDeltaHeight);
-    }
-    if ( size.height() > geom.height()) {
-        size.setHeight(geom.height());
-    }
-    if ((pos.x() + size.width()) > (qreal)HbDeviceProfile::current().logicalSize().width()) {
-        // can not fit spell dialog to the right side of inline edit text.
-        pos.setX((qreal)HbDeviceProfile::current().logicalSize().width()- size.width());
-    }
-}
 
 void HbInputPrediction12KeyHandlerPrivate::cancelButtonPress()
 {
@@ -371,16 +401,16 @@
     d->q_ptr = this;
 }
 
-HbInputPrediction12KeyHandler::~HbInputPrediction12KeyHandler()
+HbInputPrediction12KeyHandler::HbInputPrediction12KeyHandler(HbInputPrediction12KeyHandlerPrivate &dd, HbInputAbstractMethod* inputMethod)
+:HbInputPredictionHandler(dd, inputMethod)
 {
+    Q_D(HbInputPrediction12KeyHandler);
+    d->q_ptr = this;
+    d->init();
 }
 
-/*!
-    this function lists different modes.
-*/
-void HbInputPrediction12KeyHandler::listInputModes(QVector<HbInputModeProperties>& modes) const
+HbInputPrediction12KeyHandler::~HbInputPrediction12KeyHandler()
 {
-    Q_UNUSED(modes); 
 }
 
 /*!
@@ -419,6 +449,7 @@
         case Qt::Key_Return:
         case Qt::Key_Enter:
 		case Qt::Key_Asterisk:
+        case Qt::Key_Control:
             break;
         /* Behavior for other keys i.e. from key1 to key9 - 
         To start the long press timer as we need to handle long press functionality i.e Enter corresponding number mapped to a key */
@@ -491,6 +522,11 @@
             HbInputPredictionHandler::actionHandler(HbInputModeActionSetKeypad);
             d->mTimer->stop();
             break;
+		case HbInputModeActionCloseSpellQuery:
+			if (d->mInputSpellQuery) {
+				d->mInputSpellQuery->close();
+		    }
+			break;
         default:
             ret = HbInputPredictionHandler::actionHandler(action);
             break;
@@ -524,7 +560,10 @@
 {
     Q_D(HbInputPrediction12KeyHandler);
     if (customWord.size()) {
-        d->launchSpellDialog(customWord);
+		if(!d->mInputSpellQuery) {
+			d->mInputSpellQuery = new HbInputSpellQuery(d);
+		}
+        d->mInputSpellQuery->launch(customWord);
     }
     return;	  
 }
diff -r 16d8024aca5e -r f7ac710697a9 src/hbplugins/inputmethods/touchinput/hbinputprediction12keyhandler.h
--- a/src/hbplugins/inputmethods/touchinput/hbinputprediction12keyhandler.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbplugins/inputmethods/touchinput/hbinputprediction12keyhandler.h	Mon May 03 12:48:33 2010 +0300
@@ -37,10 +37,11 @@
 
     bool actionHandler(HbInputModeAction action);
     bool filterEvent(const QKeyEvent * event);
-    void listInputModes(QVector<HbInputModeProperties>& aResults) const;
     bool isActive() const; 
     void processCustomWord(QString customWord);
 	void mouseHandler(int cursorPosition, QMouseEvent* mouseEvent);
+protected:
+	HbInputPrediction12KeyHandler(HbInputPrediction12KeyHandlerPrivate &dd, HbInputAbstractMethod* inputMethod);
 private:
     Q_DECLARE_PRIVATE_D(d_ptr, HbInputPrediction12KeyHandler)
     Q_DISABLE_COPY(HbInputPrediction12KeyHandler)
diff -r 16d8024aca5e -r f7ac710697a9 src/hbplugins/inputmethods/touchinput/hbinputprediction12keyhandler_p.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbplugins/inputmethods/touchinput/hbinputprediction12keyhandler_p.h	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,75 @@
+/****************************************************************************
+**
+** 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 HbPlugins 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_PREDICTION_12KEY_HANDLER_PRIVATE
+#define HB_INPUT_PREDICTION_12KEY_HANDLER_PRIVATE
+
+#include <hbinputdialog.h>
+#include <hbinputstate.h>
+
+#include "hbinputpredictionhandler_p.h"
+#include "hbinputprediction12keyhandler.h"
+
+class HbAction;
+class HbInputSpellQuery;
+
+class HbInputPrediction12KeyHandlerPrivate: public HbInputPredictionHandlerPrivate
+{
+    Q_DECLARE_PUBLIC(HbInputPrediction12KeyHandler)
+
+public:
+    HbInputPrediction12KeyHandlerPrivate();
+    ~HbInputPrediction12KeyHandlerPrivate();
+
+    bool buttonReleased(const QKeyEvent *keyEvent);
+    bool buttonPressed(const QKeyEvent *keyEvent);
+    void _q_timeout();
+    void cancelButtonPress();
+    void chopQMarkAndUpdateEditor();
+public:
+    int mLastKey;
+    bool mButtonDown;
+    QChar mCurrentChar;
+    bool mLongPressHappened;
+    bool mShiftKeyDoubleTap;
+    HbInputSpellQuery *mInputSpellQuery;
+};
+
+class HbInputSpellQuery : public HbInputDialog
+{
+Q_OBJECT
+public:
+    HbInputSpellQuery(HbInputPrediction12KeyHandlerPrivate *owner);
+	void getPositionAndSize(QPointF & pos,QSizeF & size, QRectF &geom);
+	void launch(QString editorText);
+public slots:
+    void dialogClosed(HbAction* action);    
+private:
+    HbInputState mSavedState;
+    bool mDidHandleFinish;
+    QPointer<QObject> mSavedFocusObject;
+    HbInputPrediction12KeyHandlerPrivate* mOwner;
+    QString mSavedEditorText;
+};
+#endif //HB_INPUT_PREDICTION_12KEY_HANDLER_PRIVATE
diff -r 16d8024aca5e -r f7ac710697a9 src/hbplugins/inputmethods/touchinput/hbinputprediction12keythaihandler.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbplugins/inputmethods/touchinput/hbinputprediction12keythaihandler.cpp	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,215 @@
+/****************************************************************************
+**
+** 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 HbPlugins 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 <QTimer>
+
+#include <hbinputsettingproxy.h>
+#include <hbinputkeymapfactory.h>
+#include <hbinputpredictionengine.h>
+
+#include "virtual12key.h"
+
+#include "hbinputprediction12keyhandler_p.h"
+#include "hbinputprediction12keythaihandler.h"
+
+class HbInputPrediction12KeyThaiHandlerPrivate: public HbInputPrediction12KeyHandlerPrivate
+{
+    Q_DECLARE_PUBLIC(HbInputPrediction12KeyThaiHandler)
+
+public:
+    HbInputPrediction12KeyThaiHandlerPrivate();
+    ~HbInputPrediction12KeyThaiHandlerPrivate();
+
+    bool buttonReleased(const QKeyEvent *keyEvent);
+    bool buttonPressed(const QKeyEvent *keyEvent);
+    void _q_timeout();
+};
+
+HbInputPrediction12KeyThaiHandlerPrivate::HbInputPrediction12KeyThaiHandlerPrivate()
+{
+}
+
+HbInputPrediction12KeyThaiHandlerPrivate::~HbInputPrediction12KeyThaiHandlerPrivate()
+{
+   
+}
+
+void HbInputPrediction12KeyThaiHandlerPrivate::_q_timeout()
+{
+	Q_Q(HbInputPrediction12KeyHandler);
+    // let's stop the timer first.
+    mTimer->stop();
+
+    if (mButtonDown) {
+		if(mLastKey == Qt::Key_0){
+			q->actionHandler(HbInputModeHandler::HbInputModeActionCommit);
+			q->commitFirstMappedNumber(mLastKey);		
+		} else if(mLastKey != Qt::Key_Asterisk) {
+			//Long key press number key is applicable to all keys so pass it to Base class
+			HbInputPrediction12KeyHandlerPrivate::_q_timeout();            
+        }
+    }
+}
+
+bool HbInputPrediction12KeyThaiHandlerPrivate::buttonPressed(const QKeyEvent *keyEvent)
+{
+    mLongPressHappened = false;
+    HbInputFocusObject *focusObject = 0;
+    focusObject = mInputMethod->focusObject();
+    if (!focusObject) {
+        return false;
+    }
+	
+    int buttonId = keyEvent->key();
+
+    //Pass the event to base class except Shift key
+	if (buttonId == Qt::Key_Shift ) {		
+	  mLastKey = buttonId;
+	  mButtonDown = true;
+	} else {
+		HbInputPrediction12KeyHandlerPrivate::buttonPressed(keyEvent);
+	}
+	// custom button should not start timer.
+    if ((buttonId & CUSTOM_INPUT_MASK) != CUSTOM_INPUT_MASK) {
+        mTimer->start(HbLongPressTimerTimeout);
+    }
+    return false;
+}
+
+/*!
+Handles the key release events from the VKB. Launches the SCT with key release event of
+asterisk.
+*/
+bool HbInputPrediction12KeyThaiHandlerPrivate::buttonReleased(const QKeyEvent *keyEvent)
+{
+    Q_Q(HbInputPrediction12KeyHandler);
+    
+    if(!mButtonDown || mLongPressHappened){
+        return false;
+    }
+
+    int buttonId = keyEvent->key(); 
+    // it was a long press on sct swith button. so just return form here.
+    if (!mTimer->isActive() && buttonId == Qt::Key_Control) {
+        return true;
+    }
+
+	if (buttonId == Qt::Key_Asterisk && !mInputMethod->isSctModeActive()) {
+		//Handle if key Asterisk pressed and SCT is not launched or else pass it to base handlers
+		if (q->HbInputPredictionHandler::filterEvent(keyEvent)) {
+			mButtonDown = false;
+			return true;
+		}
+    } else if ( buttonId == Qt::Key_Shift ) {
+		//As we can't map charatcers to Shift key in keymapping, making use of "#" key i.e. Qt::Key_NumberSign
+		//in keymapping and manipulating event to Qt::Key_NumberSign when shift key is pressed
+		const QKeyEvent *event = new QKeyEvent(QEvent::KeyPress, Qt::Key_NumberSign, Qt::NoModifier);
+		if (q->HbInputPredictionHandler::filterEvent(event)) {
+			mButtonDown = false;
+			return true;
+		}		
+	} else {
+		HbInputPrediction12KeyHandlerPrivate::buttonReleased(keyEvent);
+	}
+    return false;
+}
+
+
+HbInputPrediction12KeyThaiHandler::HbInputPrediction12KeyThaiHandler(HbInputAbstractMethod *inputMethod)
+    :HbInputPrediction12KeyHandler(* new HbInputPrediction12KeyThaiHandlerPrivate, inputMethod)
+{
+    Q_D(HbInputPrediction12KeyThaiHandler);
+    d->q_ptr = this;
+}
+
+HbInputPrediction12KeyThaiHandler::~HbInputPrediction12KeyThaiHandler()
+{
+}
+/*!
+    filterEvent to handler keypress/release events.
+*/
+
+bool HbInputPrediction12KeyThaiHandler::filterEvent(const QKeyEvent * event)
+{
+    Q_D(HbInputPrediction12KeyThaiHandler);
+    HbInputFocusObject *focusObject = 0;
+    focusObject = d->mInputMethod->focusObject();
+
+    //If there was a handling for empty candidate-list, i.e. the engine did not predict
+    //any meaningful word for the input sequence. 
+   
+	if(!d->mCanContinuePrediction) {
+		int eventKey = event->key();
+		//let's us return If engine did not predict any meaningful word for the input sequence 
+		//for Shift,Asterisk and Control
+		if(eventKey == Qt::Key_Control || eventKey == Qt::Key_0) {
+			if(d->mCandidates->size() && focusObject ) {
+				//Remove the "?" mark
+				(*d->mCandidates)[d->mBestGuessLocation].chop(1);
+				d->updateEditor();
+				d->mCanContinuePrediction = true;
+			}
+		} else if (eventKey != Qt::Key_Shift && eventKey != Qt::Key_Asterisk){
+			// For Shift key and Asterisk key Will handle it in button release Since we have character mapped to Shift and Asterisk
+			// or else pass it to Prediction12KeyHandler handler
+			HbInputPrediction12KeyHandler::filterEvent(event);
+		}
+    }	
+
+	// If the word is in inline edit First tap of Qt::Key_0 should commit the word in the editor
+	// For successive tap prediction mode can't handle Qt::Key_0, so we will emit a passFilterEvent
+    // this signal must be connected to by the plugin to a modehandler.
+    // which can handle it.
+
+	if (event->key() == Qt::Key_0 && d->mEngine->inputLength() >= 1 ) {
+		if(event->type() == QEvent::KeyPress) {
+			d->mButtonDown = true;
+			// start Long Press timer as zero key should be allowed to enter
+			d->mTimer->start(HbLongPressTimerTimeout);
+		} else if(event->type() == QEvent::KeyRelease) {
+			d->mTimer->stop();
+			d->mButtonDown = false;
+			actionHandler(HbInputModeHandler::HbInputModeActionCommit);
+		}
+		d->mLastKey = Qt::Key_0;
+		return true;
+	} else if (event->key() == Qt::Key_0) {
+		emit passFilterEvent(event);
+		d->mLastKey = Qt::Key_0;
+		return true;
+	} else {
+		if (d->mLastKey == Qt::Key_0) {
+			emit passActionHandler(HbInputModeActionCommit);
+		}
+		if (event->type() == QEvent::KeyRelease) {
+			return d->buttonReleased(event);
+		} else {
+			return d->buttonPressed(event);
+		}
+	}
+}
+
+
+//EOF
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbplugins/inputmethods/touchinput/hbinputprediction12keythaihandler.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbplugins/inputmethods/touchinput/hbinputprediction12keythaihandler.h	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,48 @@
+/****************************************************************************
+**
+** 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 HbPlugins 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_PREDICTION_12KEY_THAI_HANDLER
+#define HB_INPUT_PREDICTION_12KEY_THAI_HANDLER
+
+#include "hbinputprediction12keyhandler.h"
+
+class HbInputPrediction12KeyThaiHandlerPrivate;
+class HbInputPrediction12KeyThaiHandler: public HbInputPrediction12KeyHandler
+{
+    Q_OBJECT
+public:
+    HbInputPrediction12KeyThaiHandler(HbInputAbstractMethod *inputMethod);
+    ~HbInputPrediction12KeyThaiHandler();
+
+    bool filterEvent(const QKeyEvent * event);
+
+private:
+    Q_DECLARE_PRIVATE_D(d_ptr, HbInputPrediction12KeyThaiHandler)
+    Q_DISABLE_COPY(HbInputPrediction12KeyThaiHandler)
+};
+
+
+#endif //HB_INPUT_PREDICTION_12KEY_THAI_HANDLER
+
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbplugins/inputmethods/touchinput/hbinputpredictionqwertyhandler.cpp
--- a/src/hbplugins/inputmethods/touchinput/hbinputpredictionqwertyhandler.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbplugins/inputmethods/touchinput/hbinputpredictionqwertyhandler.cpp	Mon May 03 12:48:33 2010 +0300
@@ -201,14 +201,6 @@
 }
 
 /*!
-lists different input mode bindings..
-*/
-void HbInputPredictionQwertyHandler::listInputModes(QVector<HbInputModeProperties>& modes) const
-{
-    Q_UNUSED(modes); 
-}
-
-/*!
 Action Handler.
 */
 bool HbInputPredictionQwertyHandler::actionHandler(HbInputModeAction action)
@@ -349,7 +341,7 @@
     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) || selectWord()) {
+    if ( mEngine->inputLength() >= 1 ) {
         //Only autocomplition part should be deleted when autocompliton part is enable and user pressed a delete key
         //To prevent showing autocompletion part while deleting the characters using backspace key
         mShowTail = false;
@@ -359,15 +351,13 @@
         //we actually reduce ambiguity in the engine and hence we should have
         //some word getting predicted as a result to that.
         mCanContinuePrediction = true;
-        if (true == mExactPopupLaunched) {			
-			QString exactWord = mCandidates->at(0);
-			mEngine->setWord(exactWord);	
-			mCandidates->clear();
-			mCandidates->append(exactWord);
+ 
+		if(false == mTailShowing && true == mExactPopupLaunched) {
+				mEngine->deleteKeyPress();
+				mEngine->updateCandidates(mBestGuessLocation);
+		}
+		if (true == mExactPopupLaunched) {			
 			mBestGuessLocation = 0 ;
-		} 
-		if(false == mTailShowing && true == mExactPopupLaunched) {
-				mEngine->deleteKeyPress();				
 		}
         //When there is a deletion of key press, no need to update the candidate list
         //This is because deletion should not cause reprediction.
@@ -388,26 +378,24 @@
 		        commit(QString(""),false);
 		    }
 		        
-		} else if(!mCandidates->count()) {
-            mCandidates->append(mEngine->currentWord());
+		} 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());
         }
         // update the editor with the new preedit text.
         updateEditor();
         return;
-    }
-
-    HbInputFocusObject* focusedObject = 0;
-    focusedObject = mInputMethod->focusObject();
-    if (!focusedObject) {
+    } else {
+        // we come here if their is no data in engine.
+        // once the word is committed, we can not bring it back to inline edit.
+        // so if the engine does not have any data, we just send backspace event to the editor.
+        Q_Q(HbInputPredictionQwertyHandler);
+        QKeyEvent event = QKeyEvent(QEvent::KeyPress, Qt::Key_Backspace, Qt::NoModifier);		
+        q->sendAndUpdate(event);
+        event = QKeyEvent(QEvent::KeyRelease, Qt::Key_Backspace, Qt::NoModifier);
+        q->sendAndUpdate(event);
         return;
     }
-
-    if ((focusedObject->inputMethodQuery(Qt::ImCursorPosition).toInt() >= 0) || focusedObject->preEditString().length()) {
-        QList<QInputMethodEvent::Attribute> list;
-        QInputMethodEvent event(QString(), list);
-        event.setCommitString(QString(), -1, 1);
-        commit(event);
-    }
 }
 
 //EOF
diff -r 16d8024aca5e -r f7ac710697a9 src/hbplugins/inputmethods/touchinput/hbinputpredictionqwertyhandler.h
--- a/src/hbplugins/inputmethods/touchinput/hbinputpredictionqwertyhandler.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbplugins/inputmethods/touchinput/hbinputpredictionqwertyhandler.h	Mon May 03 12:48:33 2010 +0300
@@ -36,7 +36,6 @@
     ~HbInputPredictionQwertyHandler();
 
     bool filterEvent(const QKeyEvent * event);
-    void listInputModes(QVector<HbInputModeProperties>& aResults) const;
     bool actionHandler(HbInputModeAction action);
     void processExactWord(QString exactWord);
     void sctCharacterSelected(QString character);
diff -r 16d8024aca5e -r f7ac710697a9 src/hbplugins/inputmethods/touchinput/hbinputthaispecialpopup.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbplugins/inputmethods/touchinput/hbinputthaispecialpopup.cpp	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,534 @@
+/****************************************************************************
+**
+** 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 HbPlugins 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 <QGraphicsGridLayout>
+#include <QGraphicsWidget>
+#include <QString>
+#include <QSignalMapper>
+
+#include <HbMainWindow>
+#include <hbinputtouchkeypadbutton.h>
+#include <hbgridview.h>
+#include <hbwidget.h>
+#include <hbdialog_p.h>
+#include <HbPopup>
+
+#include "hbinputthaispecialpopup.h"
+
+const QString HbAbcButtonObjName = "Popup abc";
+
+const int HbPopupAsteriskColumns = 5;
+const int HbPopupAsteriskRows = 4;
+const int HbPopupShiftColumns = 4;
+const int HbPopupShiftRows = 3;
+
+
+const int HBPopupEmptyButtonSeven = 7;
+const int HBPopupEmptyButtonEight = 8;
+const int HBPopupEmptyButtonNine = 9;
+
+const QString HbPopupPortraitButtonTextLayout = "_hb_sctp_button_text_layout";
+const QString HbPopupPortraitButtonIconLayout = "_hb_sctp_button_icon_layout";
+
+/*!
+@proto
+@hbtouchinput
+\class HbInputThaiSpecialPopup
+\brief Implementation of Thai Special Popup.
+
+Implementation of Thai Special Popup.
+
+*/
+
+/// @cond
+
+class HbInputThaiSpecialPopupPrivate: public HbDialogPrivate
+{
+    Q_DECLARE_PUBLIC(HbInputThaiSpecialPopup)
+
+public:
+	//Character classes
+	enum ThaiGlyphTypes {
+		HbThaiCharNon = 0,	//Not a Thai letter
+		HbThaiCharCons,		//Thai consonant
+		HbThaiCharLV,		//Leading vowel
+		HbThaiCharFV1,		//Following vowel, type 1
+		HbThaiCharFV2,		//Following vowel, type 2
+		HbThaiCharFV3,		//Following vowel, type 3
+		HbThaiCharBV1,		//Below vowel, type 1
+		HbThaiCharBV2,		//Below vowel, type 2
+		HbThaiCharBD,		//Below diacritic
+		HbThaiCharTone,		//Tone mark
+		HbThaiCharAD1,		//Above diacritic, type 1
+		HbThaiCharAD2,		//Above diacritic, type 2
+		HbThaiCharAD3,		//Above diacritic, type 3
+		HbThaiCharAV1,		//Above vowel, type 1
+		HbThaiCharAV2,		//Above vowel, type 2
+		HbThaiCharAV3,		//Above vowel, type 3
+		HbThaiCharNonThai	//Not a Thai letter
+	};
+	QGraphicsGridLayout* mButtonLayout; 
+	QGraphicsWidget* mButtonWidget;
+	QList<HbTouchKeypadButton *> mPopupButtons;
+    QSignalMapper *mActionMapper;
+	QSignalMapper *mClickMapper;
+	QString mSpecialCharacterSet;
+	const HbKeymap *mKeymap;
+	QSizeF mSize;
+	int mButtonId;
+	int mPopupGridColumns;
+	int mPopupGridRows;
+	int mNumPopupButtons;
+	int mAbcButtonId;
+	uint mPrevChar;
+
+
+public:
+	HbInputThaiSpecialPopupPrivate();
+	~HbInputThaiSpecialPopupPrivate();
+	void setNumberOfKeys();
+	void createPopupButtons(int screenWidth, int screenHeight);
+	void setLayoutDimensions(QSizeF dimensions);
+	void getSpecialCharacters();
+	void setPopupButtons(const QString &aCharSet);
+	void applyEditorConstraints();
+	int thaiGlyphType(uint prevChar);	
+	void initializeAbcButton();	
+	void handleStandardButtonClick(int buttonId);
+	void _q_mappedKeyClick(int buttonid);	
+};
+
+HbInputThaiSpecialPopupPrivate::HbInputThaiSpecialPopupPrivate()
+{
+    // we should make sure that it comes above vkb
+    setPriority(HbPopupPrivate::VirtualKeyboard + 1);
+	mClickMapper = 0;
+	mSize = QSizeF();
+}
+
+HbInputThaiSpecialPopupPrivate::~HbInputThaiSpecialPopupPrivate()
+{
+}
+
+/*!
+Sets number of keys to layout
+*/
+void HbInputThaiSpecialPopupPrivate::setNumberOfKeys()
+{
+	//Manipulate number of keys on the layout depending on the Key_Asterisk and Qt::Key_Shift
+	if(Qt::Key_Asterisk == mButtonId) {
+		mPopupGridColumns = HbPopupAsteriskColumns;
+		mPopupGridRows = HbPopupAsteriskRows;
+	}else if (Qt::Key_Shift == mButtonId) {
+		mPopupGridColumns = HbPopupShiftColumns;
+		mPopupGridRows = HbPopupShiftRows;
+	}
+	mNumPopupButtons = mPopupGridColumns * mPopupGridRows;
+	mAbcButtonId = mPopupGridColumns*mPopupGridRows-1;
+}
+
+
+/*!
+Create Popup Buttons
+*/
+void HbInputThaiSpecialPopupPrivate::createPopupButtons(int screenWidth, int screenHeight)
+{
+	Q_Q(HbInputThaiSpecialPopup);
+	Q_UNUSED(q)
+	if (mPopupButtons.size() == 0) {
+        for (int i = 0; i < mNumPopupButtons; ++i) {
+			HbTouchKeypadButton *button = new HbTouchKeypadButton(0,QString(""),0);
+            q->connect(button, SIGNAL(clicked()), mClickMapper, SLOT(map()));
+            mClickMapper->setMapping(button, i);
+            mPopupButtons.append(button);
+            button->setProperty(HbStyleRulesCacheId::hbStyleRulesForNodeCache, HbPopupPortraitButtonTextLayout);
+        }
+
+        for (int i = 0; i < mNumPopupButtons; ++i) {
+			if(Qt::Key_Asterisk == mButtonId) {
+				//This check is for logical separation between Above below vowels , Diacritics and Tone marks 
+				//In Thai Language we have 7 Above and Below Vowels, 5 Diacritics and 4 Tone marks
+				if(!(i == HBPopupEmptyButtonSeven || i== HBPopupEmptyButtonEight || i == HBPopupEmptyButtonNine)) {		
+					mButtonLayout->addItem(mPopupButtons.at(i), i/mPopupGridColumns, i%mPopupGridColumns);
+				}
+			} else if (Qt::Key_Shift == mButtonId) {
+				mButtonLayout->addItem(mPopupButtons.at(i), i/mPopupGridColumns, i%mPopupGridColumns);
+			}
+        }
+    }
+	//Set the Layout Dimensions
+	setLayoutDimensions(QSizeF(screenWidth/mPopupGridColumns, screenHeight/mPopupGridRows));
+	//Assign button layout to widget
+	mButtonWidget->setLayout(mButtonLayout);	
+}
+
+/*!
+This function defines the layout porperties for popup.
+*/
+void HbInputThaiSpecialPopupPrivate::setLayoutDimensions(QSizeF dimensions)
+{
+    // only update the dimensions if they are not previously set
+    if (mSize == dimensions) {
+        return;
+    }
+    mSize = dimensions;
+
+    mButtonLayout->setContentsMargins(0.0, 0.0, 0.0, 0.0);
+
+    for (int i = 0; i < mPopupGridColumns; i++) {
+        mButtonLayout->setColumnFixedWidth(i, dimensions.width());
+    }
+    for (int i = 0; i < mPopupGridRows; i++) {
+        mButtonLayout->setRowFixedHeight(i, dimensions.height());
+    }
+
+    mButtonLayout->setHorizontalSpacing(0.0);
+    mButtonLayout->setVerticalSpacing(0.0);
+	foreach (HbTouchKeypadButton* button, mPopupButtons) {
+        if (button) {
+            button->setInitialSize(dimensions);
+        }
+    }
+}
+
+
+/*!
+Gets the special character sets from set keymapping.
+*/
+void HbInputThaiSpecialPopupPrivate::getSpecialCharacters()
+{
+    mSpecialCharacterSet.clear();
+    if (mKeymap) {
+		const HbKeyboardMap* keyboardMap = 0;
+		//Set keyboard map depending on Key_Asterisk and Key_Shift
+		if(Qt::Key_Asterisk == mButtonId) {
+			keyboardMap = mKeymap->keyboard(HbKeyboardThaiStarSctPortrait);
+		} else if(Qt::Key_Shift == mButtonId) {
+			keyboardMap = mKeymap->keyboard(HbKeyboardThaiHashSctPortrait);
+		}
+        if (keyboardMap) {
+            foreach (const HbMappedKey* mappedKey, keyboardMap->keys) {
+				//Creats character set through keyboard map
+                mSpecialCharacterSet.append(mappedKey->characters(HbModifierNone));
+            }
+        }
+    }
+}
+
+/*!
+Let's set Thai Special Character to Buttons
+*/
+void HbInputThaiSpecialPopupPrivate::setPopupButtons(const QString &aCharSet)
+{
+    int i = 0;
+    int j = 0;
+	for (; i < mPopupButtons.size()-1 && j < aCharSet.size(); ++i) {
+		if(Qt::Key_Asterisk == mButtonId) {
+			//This check is for logical separation between Above below Vowels , Diacritics and Tone marks 
+			//In Thai Language we have 7 Above and Below Vowels, 5 Diacritics and 4 Tone marks
+			if(!(i == HBPopupEmptyButtonSeven || i== HBPopupEmptyButtonEight || i == HBPopupEmptyButtonNine)) {
+				const QChar &character = aCharSet[j];
+				mPopupButtons.at(i)->setText(character);
+				mPopupButtons.at(i)->setObjectName("Thai Sct portrait " + QString(character));
+				j++;
+			}
+		} else if (Qt::Key_Shift == mButtonId) {
+			const QChar &character = aCharSet[j];
+			mPopupButtons.at(i)->setText(character);
+			mPopupButtons.at(i)->setObjectName("Thai Sct portrait " + QString(character));
+			j++;
+		}
+	}
+
+    for (; i < mPopupButtons.size()-1; ++i) {       
+            mPopupButtons.at(i)->setText("");       
+    }
+    applyEditorConstraints();
+	initializeAbcButton();
+}
+
+/*!
+Apply editor constraints on buttons
+*/
+void HbInputThaiSpecialPopupPrivate::applyEditorConstraints()
+{	
+	if (Qt::Key_Asterisk == mButtonId) {
+		//Get Character class
+		int glyphType = thaiGlyphType(mPrevChar);
+		//Set the rules to the editor to allow or disallow characters 
+		switch(glyphType) {
+		case HbThaiCharNonThai:
+		case HbThaiCharNon:
+		case HbThaiCharLV:
+		case HbThaiCharFV1:
+		case HbThaiCharFV2:
+		case HbThaiCharFV3:
+		case HbThaiCharBD:
+		case HbThaiCharTone:
+		case HbThaiCharAD1:
+		case HbThaiCharAD2:
+		case HbThaiCharAD3:
+			for (int i=0; i < mPopupButtons.size()-1; ++i) {					
+				mPopupButtons.at(i)->setFade(true);     
+			}
+			break;
+		case HbThaiCharCons:
+			for (int i=0; i < mPopupButtons.size()-1; ++i) {					
+				mPopupButtons.at(i)->setFade(false);     
+			}
+			break;
+		case HbThaiCharAV1:
+		case HbThaiCharBV1: {
+				static const QChar data[6] = { 0x0e48, 0x0e49, 0x0e4a, 0x0e4b, 0x0e4c, 0x0e4d };
+				QString allowChar(data, 6);
+
+				for (int i=0; i < mPopupButtons.size()-1; ++i) { 				
+					QString buttonText = mPopupButtons.at(i)->text();
+
+					if(buttonText.isEmpty()) {
+						mPopupButtons.at(i)->setFade(true);
+					} else {
+						if (allowChar.contains(buttonText)) {
+							mPopupButtons.at(i)->setFade(false);
+						} else {
+							mPopupButtons.at(i)->setFade(true);						
+						}
+					}
+				}
+			}
+			break;
+		case HbThaiCharAV2:
+		case HbThaiCharBV2: {				
+				static const QChar data[4] = { 0x0e48, 0x0e49, 0x0e4a, 0x0e4b };
+				QString allowChar(data, 4);
+
+				for (int i=0; i < mPopupButtons.size()-1; ++i) { 				
+					QString buttonText = mPopupButtons.at(i)->text();
+
+					if(buttonText.isEmpty()) {
+						mPopupButtons.at(i)->setFade(true);
+					} else {
+						if (allowChar.contains(buttonText)) {
+							mPopupButtons.at(i)->setFade(false);
+						} else {
+							mPopupButtons.at(i)->setFade(true);						
+						}
+					}
+
+				}
+			
+			}
+			break;
+
+		case HbThaiCharAV3: {				
+				static const QChar data[5] = { 0x0e48, 0x0e49, 0x0e4a, 0x0e4b, 0x0e47 };
+				QString allowChar(data, 5);
+
+				for (int i=0; i < mPopupButtons.size()-1; ++i) { 				
+					QString buttonText = mPopupButtons.at(i)->text();
+
+					if(buttonText.isEmpty()) {
+						mPopupButtons.at(i)->setFade(true);
+					} else {
+						if (allowChar.contains(buttonText)) {
+							mPopupButtons.at(i)->setFade(false);
+						} else {
+							mPopupButtons.at(i)->setFade(true);						
+						}
+					}
+				}
+			
+			}
+			break;
+		default:
+			break;
+
+		}
+	}
+
+}
+/*!
+Returns Character classes depending on the previous entered character
+*/
+int HbInputThaiSpecialPopupPrivate::thaiGlyphType(uint prevChar)
+{
+	if (prevChar >= 0x0E01 && prevChar <= 0x0E2E && prevChar != 0x0E24 && prevChar != 0x0E26 ) {
+		return(HbThaiCharCons);
+	} else if (prevChar >= 0x0E40 && prevChar <= 0x0E44) {
+		return(HbThaiCharLV);
+	} else if (prevChar == 0x0E30 || prevChar == 0x0E32 || prevChar == 0x0E33) {
+		return(HbThaiCharFV1);
+	} else if (prevChar == 0x0E45) {
+		return(HbThaiCharFV2);
+	} else if (prevChar == 0x0E24 || prevChar == 0x0E26) {
+		return(HbThaiCharFV3);
+	} else if (prevChar == 0x0E38) {
+		return(HbThaiCharBV1);
+	} else if (prevChar == 0x0E39) {
+		return(HbThaiCharBV2);
+	} else if (prevChar == 0x0E3A) {
+		return(HbThaiCharBD);
+	} else if (prevChar >= 0x0E48 && prevChar <= 0x0E4B) {
+		return(HbThaiCharTone);
+	} else if (prevChar == 0x0E4C || prevChar == 0x0E4D) {
+		return(HbThaiCharAD1);
+	} else if (prevChar == 0x0E47) {
+		return(HbThaiCharAD2);
+	} else if (prevChar == 0x0E4E) {
+		return(HbThaiCharAD3);
+	} else if (prevChar == 0x0E34) {
+		return(HbThaiCharAV1);
+	} else if (prevChar == 0x0E31 || prevChar == 0x0E36) {
+		return(HbThaiCharAV2);
+	} else if (prevChar == 0x0E35 || prevChar == 0x0E37) {
+		return(HbThaiCharAV3);
+	} else {
+		return(HbThaiCharNonThai);
+	}
+}
+
+/*!
+Initialize ABC button
+*/
+void HbInputThaiSpecialPopupPrivate::initializeAbcButton()
+{
+	mPopupButtons.at(mAbcButtonId)->setIcon(HbIcon("qtg_mono_alpha_mode"));
+    mPopupButtons.at(mAbcButtonId)->setObjectName(HbAbcButtonObjName); 
+    mPopupButtons.at(mAbcButtonId)->setObjectName(HbAbcButtonObjName); 
+    mPopupButtons.at(mAbcButtonId)->setProperty(HbStyleRulesCacheId::hbStyleRulesForNodeCache, HbPopupPortraitButtonIconLayout);
+	mPopupButtons.at(mAbcButtonId)->setButtonType(HbTouchKeypadButton::HbTouchButtonFunction);
+    mPopupButtons.at(mAbcButtonId)->setBackgroundAttributes(HbTouchKeypadButton::HbTouchButtonReleased);    
+}
+
+
+/*!
+Handles button clicks.
+*/
+void HbInputThaiSpecialPopupPrivate::handleStandardButtonClick(int buttonId)
+{
+   Q_Q(HbInputThaiSpecialPopup);
+
+   if (buttonId >= 0 && buttonId < mNumPopupButtons-1 ) {
+	   QString buttonText = mPopupButtons.at(buttonId)->text();
+		//Emit the signal when button is not faded and it has some text
+	   if (!mPopupButtons.at(buttonId)->isFaded() && buttonText.length() > 0) {
+		   emit q->chrSelected(buttonText.at(0));
+	   }
+   }
+   //It will hide popup for any click event
+   q->hide();
+
+}
+
+/*!
+Handles virtual key clicks
+*/
+void HbInputThaiSpecialPopupPrivate::_q_mappedKeyClick(int buttonid)
+{
+    handleStandardButtonClick(buttonid);
+}
+
+/// @endcond
+
+
+/*!
+Constructs the object. 
+*/
+
+HbInputThaiSpecialPopup::HbInputThaiSpecialPopup(int buttonId, uint prevChar, QGraphicsItem* parent)
+    : HbDialog(*new HbInputThaiSpecialPopupPrivate(), parent)
+{
+    Q_D(HbInputThaiSpecialPopup);
+	//Initialize member variable
+	d->mPrevChar = prevChar;
+	d->mButtonId = buttonId;
+#if QT_VERSION >= 0x040600
+    // Make sure the Thai special popup never steals focus.
+    setFlag(QGraphicsItem::ItemIsPanel, true);
+    setActive(false);
+#endif
+	// set dialog properties
+    setFocusPolicy(Qt::ClickFocus);
+    setBackgroundFaded(false);
+	setDismissPolicy(TapAnywhere);
+    setTimeout(NoTimeout);
+	
+	d->mButtonLayout = new QGraphicsGridLayout();
+    d->mButtonLayout->setSpacing(0.0);
+    d->mButtonLayout->setContentsMargins(0.0, 0.0, 0.0, 0.0);
+	
+	d->mButtonWidget =  new QGraphicsWidget();
+	//Create Signal mapper
+	d->mClickMapper = new QSignalMapper(this);
+
+	// let's connect buttons to handle click events  
+    connect(d->mClickMapper, SIGNAL(mapped(int)), this, SLOT(_q_mappedKeyClick(int)));
+}
+
+/*!
+Destructs the object.
+*/
+HbInputThaiSpecialPopup::~HbInputThaiSpecialPopup()
+{
+}
+
+/*!
+This function should be called when ever there is a Key_Asterisk and Key_Shift click happens.
+This create buttons, Set the layout dimensions and gets the special characters from the given keymappings and set it accordingly.
+*/
+void HbInputThaiSpecialPopup::setPopupLayout(const HbKeymap* keymap, uint prevChar, int buttonId, int screenWidth, int screenHeight)
+{
+    Q_D(HbInputThaiSpecialPopup);
+	if(d->mButtonId != buttonId) {
+		d->mButtonId = buttonId;
+		while (!d->mPopupButtons.isEmpty())
+			delete d->mPopupButtons.takeFirst();
+	}
+	d->mKeymap = keymap;
+	d->mPrevChar = prevChar;	
+	//Initialize Number of keys dependent on Key_Asterisk and Key_Shift
+	d->setNumberOfKeys();
+	//Create buttons.
+	d->createPopupButtons(screenWidth,screenHeight);
+	//Gets the special character sets from set keymapping.
+    d->getSpecialCharacters();
+	//Let's set Special Character Table Buttons
+	d->setPopupButtons(d->mSpecialCharacterSet);
+	setContentWidget(d->mButtonWidget);
+}
+
+/*!
+This a virtual functions in QGraphicsWidget. It is called whenever the Thai popup is shown. 
+
+*/
+void HbInputThaiSpecialPopup::showEvent( QShowEvent * event )
+{
+	HbDialog::showEvent(event);  
+}
+
+#include "moc_hbinputthaispecialpopup.cpp"
+
+//End of file
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbplugins/inputmethods/touchinput/hbinputthaispecialpopup.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbplugins/inputmethods/touchinput/hbinputthaispecialpopup.h	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,61 @@
+/****************************************************************************
+**
+** 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 HbPlugins 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_THAISPECIALPOPUP_H
+#define HB_INPUT_THAISPECIALPOPUP_H
+
+#include <QGraphicsItem>
+
+#include <hbinputdef.h> 
+#include <hbdialog.h>
+#include <HbInputMethod>
+#include <HbKeymap>
+
+
+class HbInputThaiSpecialPopupPrivate;
+
+class HbInputThaiSpecialPopup : public HbDialog
+{
+    Q_OBJECT
+public:
+    HbInputThaiSpecialPopup(int buttonId, uint prevChar, QGraphicsItem* parent = 0);
+    ~HbInputThaiSpecialPopup();
+
+    void showEvent( QShowEvent *event);
+	void setPopupLayout(const HbKeymap* keymap,uint prevChar,int buttonId, int screenWidth, int screenHeight );
+
+signals:
+    void chrSelected(QString sctText);
+private:
+    Q_DECLARE_PRIVATE_D(d_ptr, HbInputThaiSpecialPopup)
+    Q_DISABLE_COPY(HbInputThaiSpecialPopup)
+	Q_PRIVATE_SLOT(d_func(), void _q_mappedKeyClick(int ))
+};
+
+#endif // HB_INPUT_THAISPECIALPOPUP_H
+
+// End of file
+
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbplugins/inputmethods/touchinput/touchinput.pro
--- a/src/hbplugins/inputmethods/touchinput/touchinput.pro	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbplugins/inputmethods/touchinput/touchinput.pro	Mon May 03 12:48:33 2010 +0300
@@ -52,6 +52,12 @@
 HEADERS += hbinputnumericqwertyhandler.h
 HEADERS += hbinputnumeric12keyhandler.h
 HEADERS += ..\common\hbinputabstractbase.h
+HEADERS += hbinputprediction12keyhandler_p.h
+HEADERS += hbinputbasic12keyhandler_p.h
+HEADERS += hbinputbasic12keythaihandler.h
+HEADERS += hbinputprediction12keythaihandler.h
+HEADERS += hbinputthaispecialpopup.h
+
 
 SOURCES = virtual12key.cpp
 SOURCES += virtualqwerty.cpp
@@ -67,7 +73,9 @@
 SOURCES += hbinputnumericqwertyhandler.cpp
 SOURCES += hbinputnumeric12keyhandler.cpp
 SOURCES += ..\common\hbinputabstractbase.cpp
-
+SOURCES += hbinputbasic12keythaihandler.cpp
+SOURCES += hbinputprediction12keythaihandler.cpp
+SOURCES += hbinputthaispecialpopup.cpp
 symbian {
     TARGET.EPOCALLOWDLLDATA = 1
     TARGET.CAPABILITY = CAP_GENERAL_DLL
diff -r 16d8024aca5e -r f7ac710697a9 src/hbplugins/inputmethods/touchinput/virtual12key.cpp
--- a/src/hbplugins/inputmethods/touchinput/virtual12key.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbplugins/inputmethods/touchinput/virtual12key.cpp	Mon May 03 12:48:33 2010 +0300
@@ -42,11 +42,15 @@
 #include <hbview.h>
 #include <hbinputvkbhost.h>
 #include <hbinputcommondialogs.h>
+#include <hbdeviceprofile.h>
 
 //User includes
+#include "hbinputthaispecialpopup.h"
 #include "hbinputbasic12keyhandler.h"
 #include "hbinputprediction12keyhandler.h"
 #include "hbinputnumeric12keyhandler.h"
+#include "hbinputbasic12keythaihandler.h"
+#include "hbinputprediction12keythaihandler.h"
 
 const int HbSmileyNumberOfRows = 5;
 const int HbSmileyNumberOfColumns = 5;
@@ -65,6 +69,7 @@
               : mCurrentKeypad(0),
                 mItutKeypad(0),
                 mSctKeypad(0),
+				mThaiSpecialChar(0),
                 mKeymap(0),
                 mSctMode(HbInputVkbWidget::HbSctViewSpecialCharacter),
                 mOrientationAboutToChange(false),
@@ -81,16 +86,22 @@
     mBasicModeHandler = new HbInputBasic12KeyHandler(this);
     mPredictionModeHandler = new HbInputPrediction12KeyHandler(this);
     mNumericModeHandler = new HbInputNumeric12KeyHandler(this);
+	mBasic12keyThaiHandler = new HbInputBasic12KeyThaiHandler(this);
+	mPrediction12keyThaiHandler = new HbInputPrediction12KeyThaiHandler(this);
     mActiveModeHandler = mBasicModeHandler;
 
     mBasicModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionInit);
     mPredictionModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionInit);
     mNumericModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionInit);
+	mPrediction12keyThaiHandler->actionHandler(HbInputModeHandler::HbInputModeActionInit);
 
     // let's connect prediction mode handler with latin basic mode handler. It is required incase we Qt::key_0 is pressed in prediction mode
     // key
     connect(mPredictionModeHandler, SIGNAL(passFilterEvent(const QKeyEvent *)), mBasicModeHandler, SLOT(filterEvent(const QKeyEvent *)));
     connect(mPredictionModeHandler, SIGNAL(passActionHandler(HbInputModeAction )), mBasicModeHandler, SLOT(actionHandler(HbInputModeAction )));
+	connect(mPrediction12keyThaiHandler, SIGNAL(passFilterEvent(const QKeyEvent *)), mBasicModeHandler, SLOT(filterEvent(const QKeyEvent *)));
+    connect(mPrediction12keyThaiHandler, SIGNAL(passActionHandler(HbInputModeAction )), mBasicModeHandler, SLOT(actionHandler(HbInputModeAction )));
+
 }
 
 bool HbVirtual12Key::isSctModeActive() const
@@ -111,6 +122,8 @@
     mSctKeypad = 0;
     delete mCandidatePopup;
     mCandidatePopup = 0;
+	delete mThaiSpecialChar;
+	mThaiSpecialChar = 0;
 
     // free mode handlers
     delete mBasicModeHandler;
@@ -119,6 +132,10 @@
     mPredictionModeHandler = 0;
     delete mNumericModeHandler;
     mNumericModeHandler = 0;
+	delete mBasic12keyThaiHandler;
+	mBasic12keyThaiHandler = 0;
+	delete mPrediction12keyThaiHandler;
+	mPrediction12keyThaiHandler = 0;
 }
 
 /*!
@@ -175,6 +192,7 @@
     //FLICKDISABLED connect(tempKeypad, SIGNAL(flickEvent(HbInputVkbWidget::FlickDirection)), this, SLOT(flickEvent(HbInputVkbWidget::FlickDirection)));
     connect(tempKeypad, SIGNAL(smileySelected(QString)), this, SLOT(smileySelected(QString)));
     connect(tempKeypad, SIGNAL(mouseMovedOutOfButton()), this, SLOT(mouseMovedOutOfButton()));
+	connect(tempKeypad, SIGNAL(chrSelected(QString)), this, SLOT(thaiSctCharacterSelected(QString)));
     tempKeypad->setRockerVisible(true);
     return tempKeypad;
 }
@@ -279,6 +297,9 @@
         mVkbHost->closeKeypad(!stateChangeInProgress());
         // set mCurrentKeypad to null.
         mCurrentKeypad = 0;
+		if(mThaiSpecialChar) {
+			mThaiSpecialChar->hide();
+		}
         if (mCandidatePopup) {
             mCandidatePopup->hide();
         }
@@ -298,6 +319,7 @@
     if(!keypadToOpen) {
         return;
     }
+    bool wasKeypadOpen = false;
     // see if we are trying to open a different keypad than what is already opened.
     if (mCurrentKeypad != keypadToOpen) {
         // close currently open keypad. We always close keypad without animation
@@ -305,6 +327,9 @@
         // in focusLost function call.
         if (mVkbHost && mVkbHost->keypadStatus() != HbVkbHost::HbVkbStatusClosed) {
             mVkbHost->closeKeypad(false);
+            // when their is a keypad that needs to be closed before opening the new keypad, we don't
+            // want to animate the opening of new keypad.
+            wasKeypadOpen = true;
         }
     }
     // Close candidate popup if open
@@ -321,7 +346,7 @@
         if (inMinimizedMode) {
             mVkbHost->openMinimizedKeypad(mCurrentKeypad, this);
         } else {
-            mVkbHost->openKeypad(mCurrentKeypad, this, !stateChangeInProgress());
+            mVkbHost->openKeypad(mCurrentKeypad, this, (!stateChangeInProgress() && !wasKeypadOpen));
         }
         connect(&(focusObject()->editorInterface()), SIGNAL(cursorPositionChanged(int, int)), mVkbHost, SLOT(ensureCursorVisibility()));
     }
@@ -336,15 +361,28 @@
     mActiveModeHandler->mouseHandler(cursorPosition, mouseEvent);
 }
 
+/*!
+\deprecated HbVirtual12Key::predictiveInputStatusChanged(int newStatus)
+    is deprecated. Use predictiveInputStateChanged instead.
+*/
 void HbVirtual12Key::predictiveInputStatusChanged(int newStatus)
 {
+    predictiveInputStateChanged(HbKeyboardSetting12key, newStatus);
+}
+
+/*!
+The framework calls this method when the predictive input status changes.
+*/
+void HbVirtual12Key::predictiveInputStateChanged(HbKeyboardSettingFlags keyboardType, bool newStatus)
+{
     Q_UNUSED(newStatus);
 
-    HbInputFocusObject *focusedObject = focusObject();
-    if (focusedObject) {
-        // Just refresh the situation.
-        inputStateActivated(inputState());
-        return;
+    if (keyboardType & HbKeyboardSetting12key) {
+        HbInputFocusObject *focusedObject = focusObject();
+        if (focusedObject) {
+            // Just refresh the situation.
+            inputStateActivated(inputState());
+        }
     }
 }
 
@@ -353,10 +391,6 @@
 */
 void HbVirtual12Key::keypadClosed()
 {
-
-    // commit any character/word which is in inline edit.
-    mActiveModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionCommit);
-
     if (mOrientationAboutToChange) {
         mOrientationAboutToChange = false;
     }
@@ -378,10 +412,12 @@
     if (isActiveMethod()) {
         if (mVkbHost) {
             if (mVkbHost->keypadStatus() == HbVkbHost::HbVkbStatusOpened) {
-                mVkbHost->minimizeKeypad(!stateChangeInProgress());
+                // We need to commit the inline word when we minimize the keypad
+                mActiveModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionCommit);
                 if (mCandidatePopup) {
                     mCandidatePopup->hide();
                 }
+                mVkbHost->minimizeKeypad(!stateChangeInProgress());
             }
         }
     }
@@ -483,10 +519,7 @@
     if (mItutKeypad) {
         if (newState.inputMode() == HbInputModeNumeric) {
             // Numeric mode is activated, set numeric mode to itu-t keypad
-            if(mItutKeypad->mode() != EModeNumeric) {
-                // Editor is in numeric mode.
                 mItutKeypad->setMode(EModeNumeric, HbModifierNone);
-            }
         } else if (newState.inputMode() != HbInputModeNumeric) {
             if (newState.textCase() == HbTextCaseUpper || newState.textCase() == HbTextCaseAutomatic) {
                 mItutKeypad->setMode(EModeAbc, HbModifierShiftPressed);
@@ -497,7 +530,16 @@
     }
 
     HbInputModeHandler *previousModeHandler = mActiveModeHandler;
-    if (newState.inputMode() == HbInputModeDefault && usePrediction()) {
+	if(HbInputSettingProxy::instance()->globalInputLanguage() == QLocale::Thai && usePrediction() && newState.inputMode() != HbInputModeNumeric ) {
+		mActiveModeHandler = mPrediction12keyThaiHandler;
+		// by passing HbInputModeActionFocusRecieved we will be setting the candidate list and keypad
+        mActiveModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionFocusRecieved);
+	} else if (HbInputSettingProxy::instance()->globalInputLanguage() == QLocale::Thai && !usePrediction() && newState.inputMode() != HbInputModeNumeric 
+		&& ((HbEditorConstraintLatinAlphabetOnly | HbEditorConstraintAutoCompletingField)!=focusObject()->editorInterface().constraints())) {
+		mActiveModeHandler = mBasic12keyThaiHandler;
+		// by passing HbInputModeActionFocusRecieved we will be setting the candidate list and keypad
+        mActiveModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionFocusRecieved);
+	} else if (newState.inputMode() == HbInputModeDefault && usePrediction()) {
         mActiveModeHandler = mPredictionModeHandler;
         // by passing HbInputModeActionFocusRecieved we will be setting the candidate list and keypad
         mActiveModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionFocusRecieved);
@@ -522,7 +564,7 @@
         // Auto Completion part needs to be committed as well on mode change.
 
         previousModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionCommit);
-        if (mActiveModeHandler == mPredictionModeHandler) {
+        if (mActiveModeHandler == mPredictionModeHandler || mActiveModeHandler == mPrediction12keyThaiHandler) {
             // lets set candidate list and keypad type to the engine.
             mActiveModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionSetCandidateList);
             mActiveModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionSetKeypad);
@@ -558,7 +600,13 @@
             }
             if(mNumericModeHandler) {
                 mNumericModeHandler->setKeymap(mKeymap);
-            }
+            } 
+			if(mBasic12keyThaiHandler) {
+				mBasic12keyThaiHandler->setKeymap(mKeymap);
+			}
+			if (mPrediction12keyThaiHandler) {
+				mPrediction12keyThaiHandler->setKeymap(mKeymap);
+			}
         }
     }
 }
@@ -600,18 +648,55 @@
             displaySpecialCharacterTable(this);
         }
     } else if ( keyCode == Qt::Key_Shift) {
-           HbInputState inputState = this->inputState();
-        if (inputState.inputMode() != HbInputModeNumeric ) {
-            inputState.setInputMode( HbInputModeNumeric );
-            this->activateState(inputState);
+        HbInputState nextState = inputState();
+        if (nextState.inputMode() != HbInputModeNumeric ) {
+            nextState.setInputMode( HbInputModeNumeric );
         } else {
-            HbInputState rootState;
-            editorRootState(rootState);
-            activateState(rootState);
+            editorRootState(nextState);
         }
+        activateState(nextState);
         switchToAlphaMode();
     }
 }
+/*!
+Returns previous character from editor
+*/
+uint HbVirtual12Key::previousChar()
+{
+	if(focusObject()) {
+		int cursorPosition = focusObject()->editorCursorPosition();
+		if(cursorPosition) {
+			QString editorText = focusObject()->editorSurroundingText();
+			return((editorText.at(cursorPosition-1)).unicode());
+		}
+	}
+	return 0;
+}
+/*!
+Shows the Thai specific special characters 
+*/
+void HbVirtual12Key::showThaiSpecialCharacters(uint buttonId)
+{
+	uint prevChar = previousChar();
+	int screenWidth = 0;
+	int screenHeight = 0;
+	//Get the sceen size from device profile
+	if(mCurrentKeypad) {
+		screenWidth = HbDeviceProfile::profile(mCurrentKeypad).logicalSize().width();
+		screenHeight = HbDeviceProfile::profile(mCurrentKeypad).logicalSize().height();
+	}
+	//Create Thai special popup if not created 
+	if(!mThaiSpecialChar) {
+		mThaiSpecialChar = new HbInputThaiSpecialPopup(buttonId,prevChar,0);
+		connect(mThaiSpecialChar, SIGNAL(chrSelected(QString)), this, SLOT(thaiSctCharacterSelected(QString)));
+	}
+	//Set Geometry and Layout for popup 
+	if (mThaiSpecialChar) {
+		mThaiSpecialChar->setGeometry(QRectF(0,screenHeight/2,screenWidth,screenHeight/2));
+		mThaiSpecialChar->setPopupLayout(mKeymap,prevChar,buttonId,screenWidth,screenHeight/2);
+		mThaiSpecialChar->show();
+	}
+}
 
 /*!
 Shows the special character table. Re-implements the same method from HbInputMethod.
@@ -653,8 +738,11 @@
     HbInputMethod::orientationAboutToChange();
     if (isActiveMethod()) {
         mOrientationAboutToChange = true;
+        mPredictionModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionCloseSpellQuery);
+        // We need to commit the inline word before orientation change.
+        mActiveModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionCommit);
+        closeKeypad();
     }
-    closeKeypad();
 }
 
 /*!
@@ -728,6 +816,12 @@
      mActiveModeHandler->smileySelected(smiley);
 }
 
+void HbVirtual12Key::thaiSctCharacterSelected(QString sctChar)
+{
+     mActiveModeHandler->sctCharacterSelected(sctChar);
+}
+
+
 void HbVirtual12Key::selectSpecialCharacterTableMode()
 {
     if (mItutKeypad) {
@@ -782,7 +876,7 @@
 bool HbVirtual12Key::usePrediction() const
 {
     HbInputFocusObject *fo = focusObject();
-    if (HbInputSettingProxy::instance()->predictiveInputStatus() &&
+    if (HbInputSettingProxy::instance()->predictiveInputStatus(HbKeyboardSetting12key) &&
         fo &&
         fo->editorInterface().isPredictionAllowed() &&
         mPredictionModeHandler->isActive() &&
diff -r 16d8024aca5e -r f7ac710697a9 src/hbplugins/inputmethods/touchinput/virtual12key.h
--- a/src/hbplugins/inputmethods/touchinput/virtual12key.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbplugins/inputmethods/touchinput/virtual12key.h	Mon May 03 12:48:33 2010 +0300
@@ -36,6 +36,7 @@
 class HbInputVkbWidget;
 class Hb12KeyTouchKeypad;
 class HbInputSctPortrait;
+class HbInputThaiSpecialPopup;
 class HbCandidateList;
 class HbPredictionEngine;
 class HbAction;
@@ -45,6 +46,8 @@
 class HbInputPrediction12KeyHandler;
 class HbInputBasic12KeyHandler;
 class HbInputNumeric12KeyHandler;
+class HbInputBasic12KeyThaiHandler;
+class HbInputPrediction12KeyThaiHandler;
 
 class HbVirtual12Key : public HbInputAbstractMethod
 {
@@ -89,7 +92,10 @@
     void launchAutoCompletionPopup(const QStringList &candidates);
     void closeAutoCompletionPopup();
     void switchMode(int keyCode);
+	void showThaiSpecialCharacters(uint buttonId);
     void starKeySelected();
+	uint previousChar();
+	
 protected:
     void predictiveInputStatusChanged(int newStatus);
 private:
@@ -112,6 +118,8 @@
     void flickEvent(HbInputVkbWidget::HbFlickDirection direction);
     void mouseMovedOutOfButton();
     void smileySelected(QString smiley);
+    void predictiveInputStateChanged(HbKeyboardSettingFlags keyboardType, bool newState);
+	void thaiSctCharacterSelected(QString sctChar);
 
 private:
     // mCurrentKeypad contains currently active keypad, we dont need to have
@@ -121,6 +129,8 @@
     QPointer<Hb12KeyTouchKeypad> mItutKeypad;
     // contains sct keypad
     QPointer<HbInputSctPortrait> mSctKeypad;
+	// contains Thai special characters
+	QPointer<HbInputThaiSpecialPopup> mThaiSpecialChar;
 
     //Owned by the keymap factory
     const HbKeymap* mKeymap;
@@ -136,6 +146,8 @@
     HbInputPrediction12KeyHandler *mPredictionModeHandler;
     HbInputBasic12KeyHandler *mBasicModeHandler;
     HbInputNumeric12KeyHandler *mNumericModeHandler;
+	HbInputBasic12KeyThaiHandler *mBasic12keyThaiHandler;
+	HbInputPrediction12KeyThaiHandler *mPrediction12keyThaiHandler;
 
     QPointer<HbVkbHost> mVkbHost;
     bool mKeyboardChangeAlreadyInprogress;
diff -r 16d8024aca5e -r f7ac710697a9 src/hbplugins/inputmethods/touchinput/virtualqwerty.cpp
--- a/src/hbplugins/inputmethods/touchinput/virtualqwerty.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbplugins/inputmethods/touchinput/virtualqwerty.cpp	Mon May 03 12:48:33 2010 +0300
@@ -241,7 +241,7 @@
         mVkbHost->closeKeypad();
         // set mCurrentKeypad to null.
         mCurrentKeypad = 0;
-        if (mCandidatePopup && mCandidatePopup->isVisible()) {
+        if (mCandidatePopup) {
             mCandidatePopup->hide();
         }
     }
@@ -253,6 +253,7 @@
     if(!keypadToOpen) {
         return;
     }
+    bool wasKeypadOpen = false;
     // see if we are trying to open a different keypad than what is already opened.
     if (mCurrentKeypad != keypadToOpen) {
         // close currently open keypad. We always close keypad without animation
@@ -260,6 +261,9 @@
         // in focusLost function call.
         if (mVkbHost && mVkbHost->keypadStatus() != HbVkbHost::HbVkbStatusClosed) {
             mVkbHost->closeKeypad(false);
+            // when their is a keypad that needs to be closed before opening the new keypad, we don't
+            // want to animate the opening of new keypad.
+            wasKeypadOpen = true;
         }
     }
     // Close candidate popup if open
@@ -274,7 +278,7 @@
         if (inMinimizedMode) {
             mVkbHost->openMinimizedKeypad(mCurrentKeypad, this);
         } else {
-            mVkbHost->openKeypad(mCurrentKeypad, this);
+            mVkbHost->openKeypad(mCurrentKeypad, this, !wasKeypadOpen);
         }
 
         // If previous focused editor was numeric, prediction is disabled.
@@ -314,9 +318,6 @@
 
 void HbVirtualQwerty::keypadClosed()
 {
-    // by calling focuslost we will be committing the inline text.
-    mActiveModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionFocusLost);
-
     if (mOrientationAboutToChange) {
         mOrientationAboutToChange = false;
     }
@@ -327,10 +328,12 @@
     Q_UNUSED(vkbCloseMethod);
     if (isActiveMethod()) {
         if (mVkbHost && mVkbHost->keypadStatus() != HbVkbHost::HbVkbStatusMinimized) {
-            mVkbHost->minimizeKeypad(!stateChangeInProgress());
+            // We need to commit the inline word when we minimize the keypad
+            mActiveModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionCommit);
             if (mCandidatePopup) {
                 mCandidatePopup->hide();
             }
+            mVkbHost->minimizeKeypad(!stateChangeInProgress());
         }
     }
 }
@@ -607,8 +610,10 @@
 
     if (isActiveMethod()) {
         mOrientationAboutToChange = true;
+        // We need to commit the inline word before orientation change.
+        mActiveModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionCommit);
+        closeKeypad();
     }
-    closeKeypad();
 }
 
 /*!
@@ -687,15 +692,28 @@
     }
 }
 
+/*!
+\deprecated HbVirtualQwerty::predictiveInputStatusChanged(int newStatus)
+    is deprecated. Use predictiveInputStateChanged instead.
+*/
 void HbVirtualQwerty::predictiveInputStatusChanged(int newStatus)
 {
+    predictiveInputStateChanged(HbKeyboardSettingQwerty, newStatus);
+}
+
+/*!
+The framework calls this method when the predictive input status changes.
+*/
+void HbVirtualQwerty::predictiveInputStateChanged(HbKeyboardSettingFlags keyboardType, bool newStatus)
+{
     Q_UNUSED(newStatus);
 
-    HbInputFocusObject *focusedObject = focusObject();
-    if (focusedObject) {
-        // Just refresh the situation.
-        inputStateActivated(inputState());
-        return;
+    if (keyboardType & HbKeyboardSettingQwerty) {
+        HbInputFocusObject *focusedObject = focusObject();
+        if (focusedObject) {
+            // Just refresh the situation.
+            inputStateActivated(inputState());
+        }
     }
 }
 
@@ -747,12 +765,12 @@
 bool HbVirtualQwerty::usePrediction() const
 {
     HbInputFocusObject *fo = focusObject();
-    if (HbInputSettingProxy::instance()->predictiveInputStatus() &&
+    if (HbInputSettingProxy::instance()->predictiveInputStatus(HbKeyboardSettingQwerty) &&
         fo &&
         fo->editorInterface().isPredictionAllowed() &&
         mPredictionModeHandler->isActive() &&
         HbPredictionFactory::instance()->predictionEngineForLanguage(inputState().language())) {
-         return true;           
+        return true;           
     }
 
     return false;
diff -r 16d8024aca5e -r f7ac710697a9 src/hbplugins/inputmethods/touchinput/virtualqwerty.h
--- a/src/hbplugins/inputmethods/touchinput/virtualqwerty.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbplugins/inputmethods/touchinput/virtualqwerty.h	Mon May 03 12:48:33 2010 +0300
@@ -71,6 +71,7 @@
     void flickEvent(HbInputVkbWidget::HbFlickDirection direction);
     void mouseMovedOutOfButton();
     void smileySelected(QString smiley);
+    void predictiveInputStateChanged(HbKeyboardSettingFlags keyboardType, bool newState);
 
 public: // From HbInputMethod
     void focusReceived();
diff -r 16d8024aca5e -r f7ac710697a9 src/hbservers/hbdevicedialogappserver/hbddappfactorysymbian.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbservers/hbdevicedialogappserver/hbddappfactorysymbian.cpp	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,59 @@
+/****************************************************************************
+**
+** 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 "hbddappfactorysymbian.h"
+
+#include <qs60mainapplication.h>
+#include <qs60maindocument.h>
+#include <qs60mainappui.h>
+
+// In order to override CCoeAppUi::FrameworkCallsRendezvous() Application/Document/AppUi needs to be
+// derived from.
+
+class DeviceDialogMainAppUi : public QS60MainAppUi
+{
+public:
+    TBool FrameworkCallsRendezvous() const {return false;}
+};
+
+class DeviceDialogMainDocument : public QS60MainDocument
+{
+public:
+    DeviceDialogMainDocument(CEikApplication &mainApp) : QS60MainDocument(mainApp) {}
+    CEikAppUi *CreateAppUiL()
+        {return (static_cast <CEikAppUi*>(new (ELeave) DeviceDialogMainAppUi));}
+};
+
+class DeviceDialogMainApplication : public QS60MainApplication
+{
+protected:
+    CApaDocument *CreateDocumentL()
+      {return new (ELeave) DeviceDialogMainDocument(*this);}
+};
+
+CApaApplication *deviceDialogAppFactory()
+{
+    return new DeviceDialogMainApplication;
+}
diff -r 16d8024aca5e -r f7ac710697a9 src/hbservers/hbdevicedialogappserver/hbddappfactorysymbian.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbservers/hbdevicedialogappserver/hbddappfactorysymbian.h	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,38 @@
+/****************************************************************************
+**
+** 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 16d8024aca5e -r f7ac710697a9 src/hbservers/hbdevicedialogappserver/hbdevicedialogappserver.pro
--- a/src/hbservers/hbdevicedialogappserver/hbdevicedialogappserver.pro	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbservers/hbdevicedialogappserver/hbdevicedialogappserver.pro	Mon May 03 12:48:33 2010 +0300
@@ -37,15 +37,17 @@
 SOURCES += $$PWD/main.cpp
 
 symbian {
+    SOURCES += $$PWD/hbddappfactorysymbian.cpp
+
     TARGET.CAPABILITY = ProtServ SwEvent TrustedUI ReadDeviceData
     TARGET.UID3 = 0x20022FC5
-    LIBS += -lapgrfx -lws32 -lavkon -lcone -leikcore
+    LIBS += -lapgrfx -lws32 -lavkon -lcone -leikcore -lapparc -lefsrv
 
     myrssrules = \
     "hidden = KAppIsHidden;"
     RSS_RULES += myrssrules
-    MMP_RULES += "SYSTEMINCLUDE /epoc32/include/middleware"
-    MMP_RULES += "SYSTEMINCLUDE /epoc32/include/mw"
+    MMP_RULES += "SYSTEMINCLUDE $${EPOCROOT}epoc32/include/middleware"
+    MMP_RULES += "SYSTEMINCLUDE $${EPOCROOT}epoc32/include/mw"
 }
 
 include($${HB_SOURCE_DIR}/src/hbcore/devicedialogbase/devicedialogdebug/devicedialogtrace.pri)
diff -r 16d8024aca5e -r f7ac710697a9 src/hbservers/hbdevicedialogappserver/main.cpp
--- a/src/hbservers/hbdevicedialogappserver/main.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbservers/hbdevicedialogappserver/main.cpp	Mon May 03 12:48:33 2010 +0300
@@ -36,54 +36,125 @@
 #include <aknappui.h>
 #include <eikenv.h>
 #include <apgwgnam.h>
+#include <hbdevicedialogserverdefs_p.h>
+#include "hbddappfactorysymbian.h"
 #endif // Q_OS_SYMBIAN
 
-// QApplication calls RProcess::Rendezvous() before server has been created.
-// Semaphores are signaled when server initialization is done.
 #if defined (Q_OS_SYMBIAN)
-static void SignalClientSemaphores()
+class Lock
 {
-    // Initialisation complete, now signal client(s)
-    _LIT(KFindPattern, "hbdevdlgcli_?*");
-    TFindSemaphore find(KFindPattern);
-    RSemaphore sema;
-    TFullName findResult;
-    while(find.Next(findResult) == KErrNone) {
-        sema.Open(find);
-        sema.Signal();
-        sema.Close();
+public:
+    enum State {
+        Reserved,
+        Acquired,
+        Error
+    };
+    Lock();
+    ~Lock(){close();}
+    void close(){mFile.Close(); mFs.Close();}
+    State acquire();
+    static bool serverExists();
+
+private:
+    RFs mFs;
+    RFile mFile;
+};
+
+Lock::Lock()
+{
+    // Using a file for interprocess lock
+    const int NumMessageSlots = 1;
+    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);
+            }
+        }
     }
 }
+
+// Try to acquire lock
+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;
+        }
+    }
+    return state;
+}
+
+// Check if Symbian server exists
+bool Lock::serverExists()
+{
+    TFindServer findHbServer(KHbServerName);
+    TFullName name;
+    return findHbServer.Next(name) == KErrNone;
+}
+
 #endif // Q_OS_SYMBIAN
 
+#define USE_LOCKER 1
 int main(int arg, char *args[])
 {
     INSTALL_MESSAGE_HANDLER
 
 #if defined (Q_OS_SYMBIAN)
     // Guard against starting multiple copies of the server
-    RSemaphore serverExistsSema;
-    _LIT(KSemaName, "hbdevdlgsrv");
-    TInt error = serverExistsSema.CreateGlobal(KSemaName, 0);
-    if (error != KErrNone) {
-        RProcess::Rendezvous(error);
-        return error;
+    Lock lock;
+    Lock::State lockState;
+    for(;;) {
+        lockState = lock.acquire();
+        if (lockState == Lock::Acquired) {
+            break;
+        } else if (lockState == Lock::Reserved) {
+            // Process may be starting, wait for server object to be created
+            if (Lock::serverExists()) {
+                break;
+            } else {
+                const TInt KTimeout = 100000; // 100 ms
+                User::After(KTimeout);
+            }
+        } else {
+            break;
+        }
     }
+    if (lockState != Lock::Acquired) {
+        // With KErrAlreadyExists client should try to connect, otherwise bail out.
+        RProcess::Rendezvous(lockState == Lock::Reserved ? KErrAlreadyExists:KErrGeneral);
+        return KErrNone;
+    }
+    _LIT(KThreadName, "hbdevdlgsrvapp");
+    RThread().RenameMe(KThreadName); // nicer panic info
+
+    HbApplication app(deviceDialogAppFactory, arg, args, Hb::NoSplash);
+#else // Q_OS_SYMBIAN
+    HbApplication app(arg, args);
 #endif // Q_OS_SYMBIAN
 
-    HbApplication app(arg, args, Hb::NoSplash);
-
-    //QTranslator translator;
-    //QString lang_id = QLocale::system().name();
-    //translator.load(path_to + "common_" + lang_id);
-    //app.installTranslator(&translator);
-
     HbView* view = new HbView;
     view->hideItems(Hb::AllItems);
     view->setContentFullScreen();
 
-    // Workaround to get device dialogs visible until transparency works
-    HbMainWindow mainWindow(0); //, Hb::WindowFlagTransparent);
+    HbMainWindow mainWindow(0, Hb::WindowFlagTransparent);
+        
+#if defined (Q_OS_SYMBIAN)
+    CCoeControl *c = mainWindow.effectiveWinId();
+    RWindow *rw = static_cast<RWindow*>(c->DrawableWindow());
+    rw->SetRequiredDisplayMode( EColor16MA );
+    TInt err = rw->SetTransparencyAlphaChannel();
+    if ( err == KErrNone ) {
+        rw->SetBackgroundColor(~0);
+    }
+#endif // Q_OS_SYMBIAN
 
     HbTransparentWindow *transparentWindow = new HbTransparentWindow;
     HbStackedLayout *stackedLayout = new HbStackedLayout;
@@ -92,32 +163,31 @@
 
     mainWindow.addView(view);
 
-    HbDeviceDialogServer server;
-    server.setMainWindow(&mainWindow);
-
 #if defined (Q_OS_SYMBIAN)
     CEikonEnv* env = CEikonEnv::Static();
 
-    if ( env )
-        {
+    if (env) {
         CApaWindowGroupName* wgName = CApaWindowGroupName::NewLC(env->WsSession());
         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(_L("HbDeviceDialogAppServer"));
         wgName->SetAppUid(KNullUid);
         wgName->SetWindowGroupName(env->RootWin());
-        CleanupStack::PopAndDestroy();
+        CleanupStack::PopAndDestroy();       
+    }
+#endif // Q_OS_SYMBIAN
 
-        }
-    SignalClientSemaphores();
+    // HbApplication must be created before the server to have environment ready
+    HbDeviceDialogServer server;
+    server.setMainWindow(&mainWindow);
+
+#if defined (Q_OS_SYMBIAN)
+    // Server is created, client may connect
+    RProcess::Rendezvous(KErrNone);
 #endif // Q_OS_SYMBIAN
 
     int returnValue = app.exec();
 
-#if defined (Q_OS_SYMBIAN)
-    serverExistsSema.Close();
-#endif // Q_OS_SYMBIAN
-
     UNINSTALL_MESSAGE_HANDLER
 
     return returnValue;
diff -r 16d8024aca5e -r f7ac710697a9 src/hbservers/hbservers.pro
--- a/src/hbservers/hbservers.pro	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbservers/hbservers.pro	Mon May 03 12:48:33 2010 +0300
@@ -30,7 +30,9 @@
 SUBDIRS += hbdevicedialogappserver hbthemeserver themechanger hbsplashgenerator themeindexer
 
 symbian {
-    SUBDIRS += hbiconpreloader
+    SUBDIRS += hbiconpreloader 
+    SUBDIRS += hbthemeserveroogmplugin
 }
 
 include($${HB_SOURCE_DIR}/src/hbcommon.pri)
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbservers/hbsplashgenerator/hbsplashdirs_p.h
--- a/src/hbservers/hbsplashgenerator/hbsplashdirs_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbservers/hbsplashgenerator/hbsplashdirs_p.h	Mon May 03 12:48:33 2010 +0300
@@ -30,20 +30,46 @@
 
 #ifdef Q_OS_SYMBIAN
 #include <driveinfo.h>
+#include <coemain.h>
 #endif
 
 inline QString hbsplash_output_dir()
 {
 #if defined(Q_OS_SYMBIAN)
     QString path("c:/private/2002E68B");
-/*
-#ifndef __WINSCW__
+    TInt driveType = DriveInfo::EDefaultMassStorage;
+    TInt drive;
     TChar driveLetter;
-    if (DriveInfo::GetDefaultDrive(DriveInfo::EDefaultMassStorage, driveLetter) == KErrNone) {
-        path[0] = driveLetter;
+    if (DriveInfo::GetDefaultDrive(driveType, drive) == KErrNone
+        && DriveInfo::GetDefaultDrive(driveType, driveLetter) == KErrNone)
+    {
+        bool driveUsable = true;
+        CCoeEnv *env = CCoeEnv::Static();
+        if (env) {
+            TUint driveStatus;
+            qDebug("[hbsplash] dir selection: trying drive %d %c", drive, (char) driveLetter);
+            if (DriveInfo::GetDriveStatus(env->FsSession(), drive, driveStatus) == KErrNone) {
+                qDebug("[hbsplash] drive status is %x", driveStatus);
+                // Check if the drive is really internal (devices without internal mass
+                // storage will return the memory card which is not what we want here).
+                if (!(driveStatus & DriveInfo::EDriveInternal)
+                    || !(driveStatus & DriveInfo::EDrivePresent)
+                    || !(driveStatus & DriveInfo::EDriveFormatted)
+                    || (driveStatus & DriveInfo::EDriveCorrupt)
+                    || (driveStatus & DriveInfo::EDriveInUse))
+                {
+                    qDebug("[hbsplash] drive not usable, skipping");
+                    driveUsable = false;
+                }
+            } else {
+                qDebug("[hbsplash] GetDriveStatus failed, skipping");
+                driveUsable = false;
+            }
+        }
+        if (driveUsable) {
+            path[0] = driveLetter;
+        }
     }
-#endif
-*/
     return path;
 #else
     return QString("splashscreens");
@@ -62,6 +88,7 @@
     dirs.append("c:/resource/hb/splashml");
     dirs.append("e:/resource/hb/splashml");
     dirs.append("f:/resource/hb/splashml");
+    dirs.append("g:/resource/hb/splashml");
     dirs.append("z:/resource/hb/splashml");
 #else
     dirs.append("splashml");
@@ -76,6 +103,7 @@
     dirs.append("c:/resource/qt/translations");
     dirs.append("e:/resource/qt/translations");
     dirs.append("f:/resource/qt/translations");
+    dirs.append("g:/resource/qt/translations");
     dirs.append("z:/resource/qt/translations");
 #else
     dirs.append("splashml");
diff -r 16d8024aca5e -r f7ac710697a9 src/hbservers/hbsplashgenerator/hbsplashgen_server_symbian.cpp
--- a/src/hbservers/hbsplashgenerator/hbsplashgen_server_symbian.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbservers/hbsplashgenerator/hbsplashgen_server_symbian.cpp	Mon May 03 12:48:33 2010 +0300
@@ -25,6 +25,7 @@
 
 #include "hbsplashgen_server_symbian_p.h"
 #include "hbsplashgenerator_p.h"
+#include "hbsplashdirs_p.h"
 #include "hbsplashdefs_p.h"
 #include <e32base.h>
 #include <f32file.h>
@@ -33,6 +34,27 @@
 
 #define PRE "[hbsplashgenerator] [server]"
 
+TBool HbSplashGenAppUi::FrameworkCallsRendezvous() const
+{
+    return EFalse;
+}
+
+HbSplashGenDocument::HbSplashGenDocument(CEikApplication &app)
+    : QS60MainDocument(app)
+{
+}
+
+CEikAppUi *HbSplashGenDocument::CreateAppUiL()
+{
+    qDebug() << PRE << "using custom appui";
+    return new (ELeave) HbSplashGenAppUi;
+}
+
+CApaDocument *HbSplashGenApplication::CreateDocumentL()
+{
+    return new (ELeave) HbSplashGenDocument(*this);
+}
+
 class HbSplashGenServerSymbian : public CServer2
 {
 public:
@@ -57,6 +79,7 @@
 {
 public:
     HbSplashGenServerSession(HbSplashGenServerSymbian *server);
+    ~HbSplashGenServerSession();
     void ServiceL(const RMessage2 &message);
 
 private:
@@ -90,7 +113,6 @@
         mFs.ShareProtected();
     } else {
         qWarning() << PRE << "cannot connect to file server";
-        return;
     }
     TRAPD(err, StartL(hbsplash_server_name));
     if (err == KErrNone) {
@@ -98,6 +120,10 @@
     } else {
         qWarning() << PRE << "server start failed" << err;
     }
+    // Now it is the right time to do the rendezvous. By default it would be
+    // done too early so the custom appui disables FrameworkCallsRendezvous and
+    // it is done here instead.
+    RProcess::Rendezvous(KErrNone);
 }
 
 HbSplashGenServerSymbian::~HbSplashGenServerSymbian()
@@ -119,10 +145,11 @@
 {
     QDir splashScreenDir(mSplashScreenDir);
     QString nativeName = QDir::toNativeSeparators(splashScreenDir.filePath(fileName));
+    qDebug() << PRE << "trying to read" << nativeName;
     TPtrC nativeNameDes(static_cast<const TUint16 *>(nativeName.utf16()), nativeName.length());
     RFile f;
     if (f.Open(mFs, nativeNameDes, EFileRead | EFileShareReadersOrWriters) == KErrNone) {
-        TInt err = f.TransferToClient(message, 2); // completes the message with the fs handle
+        TInt err = f.TransferToClient(message, 3); // completes the message with the fs handle
         f.Close();
         if (err != KErrNone) {
             // the message is not yet completed if TransferToClient() failed
@@ -146,25 +173,32 @@
 
 bool HbSplashGenServerSymbian::processGetSplash(const RMessage2 &message)
 {
+    bool cachedEntryListValid = true;
     if (mSplashScreenDir.isEmpty() || mSplashScreenDirEntries.isEmpty()) {
-        qWarning() << PRE << "generator not up yet";
-        return false;
+        qWarning() << PRE << "getSplash: no contents received yet, using fallback";
+        mSplashScreenDir = hbsplash_output_dir();
+        cachedEntryListValid = false;
     }
 
     TBuf<16> orientationDes;
     if (!readParam(0, orientationDes, message)) {
         return false;
     }
-    TBuf<16> appIdDes;
+    TBuf<32> appIdDes;
     if (!readParam(1, appIdDes, message)) {
         return false;
     }
+    TBuf<64> screenIdDes;
+    if (!readParam(2, screenIdDes, message)) {
+        return false;
+    }
     QString orientation = QString::fromUtf16(orientationDes.Ptr(), orientationDes.Length());
     QString appId = QString::fromUtf16(appIdDes.Ptr(), appIdDes.Length());
-    qDebug() << PRE << "getSplash request" << orientation << appId;
+    QString screenId = QString::fromUtf16(screenIdDes.Ptr(), screenIdDes.Length());
+    qDebug() << PRE << "getSplash request" << orientation << appId << screenId;
 
     // Do not allow accessing app-specific splash screens of other applications.
-    if (!appId.isEmpty()) {
+    if (!appId.isEmpty() || !screenId.isEmpty()) {
         TUint32 clientId = message.SecureId().iId;
         bool ok;
         TUint32 requestedId = appId.toUInt(&ok, 16);
@@ -177,16 +211,29 @@
     // First check for file existence without filesystem access by using the directory
     // listing received from the generator. This prevents wasting time with unnecessary
     // Open() calls.
-    QString appSpecificName = QString("splash_%1_%2.spl").arg(orientation).arg(appId);
+    QString appSpecificName;
+    if (!screenId.isEmpty()) {
+        appSpecificName = QString("splash_%1_%2_%3.spl").arg(orientation).arg(appId).arg(screenId);
+    } else {
+        appSpecificName = QString("splash_%1_%2.spl").arg(orientation).arg(appId);
+    }
     bool usingAppSpecific = false;
     QString genericName = QString("splash_%1.spl").arg(orientation);
     QString name = genericName;
-    if (!appId.isEmpty() && mSplashScreenDirEntries.contains(appSpecificName)) {
+    if (cachedEntryListValid) {
+        if (!appId.isEmpty() && mSplashScreenDirEntries.contains(appSpecificName, Qt::CaseInsensitive)) {
+            name = appSpecificName;
+            usingAppSpecific = true;
+        } else if (!mSplashScreenDirEntries.contains(genericName)) {
+            qWarning() << PRE << "no suitable splash screens found" << orientation << appId;
+            return false;
+        }
+    } else {
+        // The generator has not yet sent any notification about the splash dir and its
+        // contents. Therefore just try the app-specific screen first and then fall back
+        // to the generic one if needed.
         name = appSpecificName;
         usingAppSpecific = true;
-    } else if (!mSplashScreenDirEntries.contains(genericName)) {
-        qWarning() << PRE << "no suitable splash screens found" << orientation << appId;
-        return false;
     }
 
     bool transferred = transferHandle(message, name);
@@ -205,12 +252,23 @@
     }
 
     qDebug() << PRE << "file handle transfered";
+    if (!cachedEntryListValid) {
+        // Set the splash dir back to empty so future invocations can also
+        // recognize that the generator has not notified us yet.
+        mSplashScreenDir.clear();
+    }
     return true;
 }
 
 HbSplashGenServerSession::HbSplashGenServerSession(HbSplashGenServerSymbian *server)
     : mServer(server)
 {
+    qDebug() << PRE << "new session";
+}
+
+HbSplashGenServerSession::~HbSplashGenServerSession()
+{
+    qDebug() << PRE << "session destroyed";
 }
 
 void HbSplashGenServerSession::ServiceL(const RMessage2 &message)
@@ -221,11 +279,12 @@
       EHbSplashSrvGetSplash
           param 0  [in] requested orientation ("prt" or "lsc")
           param 1  [in] empty or uid (currently ignored if does not match the client's secure id)
-          param 2 [out] RFile handle (file is open for read)
+          param 2  [in] empty or screen id
+          param 3 [out] RFile handle (file is open for read)
           Request is completed with RFs handle or KErrNotFound.
      */
 
-    //TInt requestResult = KErrNone;
+    qDebug() << PRE << "ServiceL" << message.Function() << QString::number(message.SecureId().iId, 16);
     switch (message.Function()) {
     case HbSplashSrvGetSplash:
         if (!mServer->processGetSplash(message)) {
diff -r 16d8024aca5e -r f7ac710697a9 src/hbservers/hbsplashgenerator/hbsplashgen_server_symbian_p.h
--- a/src/hbservers/hbsplashgenerator/hbsplashgen_server_symbian_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbservers/hbsplashgenerator/hbsplashgen_server_symbian_p.h	Mon May 03 12:48:33 2010 +0300
@@ -28,6 +28,9 @@
 
 #include <QObject>
 #include <QStringList>
+#include <qs60mainappui.h>
+#include <qs60maindocument.h>
+#include <qs60mainapplication.h>
 
 class HbSplashGenerator;
 class HbSplashGenServerSymbian;
@@ -47,4 +50,23 @@
     HbSplashGenServerSymbian *mServer;
 };
 
+class HbSplashGenAppUi : public QS60MainAppUi
+{
+public:
+    TBool FrameworkCallsRendezvous() const;
+};
+
+class HbSplashGenDocument : public QS60MainDocument
+{
+public:
+    HbSplashGenDocument(CEikApplication &app);
+    CEikAppUi *CreateAppUiL();
+};
+
+class HbSplashGenApplication : public QS60MainApplication
+{
+protected:
+    CApaDocument *CreateDocumentL();
+};
+
 #endif
diff -r 16d8024aca5e -r f7ac710697a9 src/hbservers/hbsplashgenerator/hbsplashgenerator.cpp
--- a/src/hbservers/hbsplashgenerator/hbsplashgenerator.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbservers/hbsplashgenerator/hbsplashgenerator.cpp	Mon May 03 12:48:33 2010 +0300
@@ -38,6 +38,7 @@
 #include "hbstatusbar_p.h"
 #include "hbstyle.h"
 #include "hbbackgrounditem_p.h"
+#include "hbframeitem.h"
 #include <QCoreApplication>
 #include <QPainter>
 #include <QDir>
@@ -45,6 +46,7 @@
 #include <QSet>
 #include <QTranslator>
 #include <QLocale>
+#include <QTimer>
 
 const char *last_theme_key = "lasttheme";
 const char *last_lang_key = "lastlang";
@@ -100,10 +102,21 @@
 
 void HbSplashGenerator::start(bool forceRegen)
 {
-    // Start listening to the theme-change-finished signal and
-    // generate screens for the current theme if needed.
+    // Start listening to the theme-change-finished signal.
     HbTheme *theme = hbInstance->theme();
     connect(theme, SIGNAL(changeFinished()), SLOT(regenerate()));
+
+    // Watch also the directories containing splashml files. Files may
+    // be added/updated at any time.
+    connect(&mFsWatcher, SIGNAL(directoryChanged(QString)), SLOT(onDirectoryChanged(QString)));
+    foreach (const QString &dir, hbsplash_splashml_dirs()) {
+        // Check for directory existence before calling addPath() to
+        // avoid printing warnings.
+        if (QDir(dir).exists()) {
+            mFsWatcher.addPath(dir);
+        }
+    }
+
     // Regenerate screens on startup only when the theme, the language, the
     // number of files in the splash screen directory, or the splash screen
     // directory path is different than the recorded values. (or when
@@ -226,6 +239,9 @@
             // The FixedVertical flag is used just to disable the sensor-based
             // orientation switching.
             mMainWindow = new HbMainWindow(0, Hb::WindowFlagFixedVertical);
+            // Make sure that at least the 1st phase of the delayed
+            // construction is done right now.
+            HbMainWindowPrivate::d_ptr(mMainWindow)->_q_delayedConstruction();
         }
         mMainWindow->setOrientation(mItem.mOrientation, false);
         qDebug() << PRE << "mainwindow init time (ms):" << mItemTime.elapsed();
@@ -302,10 +318,16 @@
             qWarning() << PRE << "mkdir failed for" << outDirName;
         }
     }
-    QString splashFile = dir.filePath("splash_%1").arg(orientationName(mItem.mOrientation));
+    // "splash_<orientation>_<appid>_<screenid>"
+    QString splashFile = dir.filePath("splash_");
+    splashFile.append(orientationName(mItem.mOrientation));
     if (!mItem.mAppId.isEmpty()) {
         splashFile.append('_');
         splashFile.append(mItem.mAppId);
+        if (!mItem.mScreenId.isEmpty()) {
+            splashFile.append('_');
+            splashFile.append(mItem.mScreenId);
+        }
     }
     return splashFile;
 }
@@ -351,6 +373,7 @@
     dbg << "["
         << item.mDocmlFileName
         << item.mAppId
+        << item.mScreenId
         << item.mDocmlWidgetName
         << item.mThemeName
         << orientationName(item.mOrientation)
@@ -471,6 +494,8 @@
             if (item.mAppId.startsWith("0x")) {
                 item.mAppId.remove(0, 2);
             }
+        } else if (name == QLatin1String("screenid")) {
+            item.mScreenId = xml.readElementText().trimmed();
         } else if (name == QLatin1String("tsappname")) {
             item.mTsAppName = xml.readElementText().trimmed();
         } else if (name == QLatin1String("view-flags")) {
@@ -507,6 +532,31 @@
             item.mCustomWidgetSubsts.insert(originalType, substitutedType);
         } else if (name == QLatin1String("fixed-orientation")) {
             item.mFixedOrientation = xml.readElementText().trimmed().toLower();
+        } else if (name == QLatin1String("item-bg-graphics")) {
+            QueueItem::ItemBgGraphicsRequest req;
+            req.mTargetWidgetName = xml.attributes().value("for").toString().trimmed();
+            QString type = xml.attributes().value("type").toString().trimmed();
+            req.mFrameGraphicsType = HbFrameDrawer::Undefined;
+            if (type == QLatin1String("1")) {
+                req.mFrameGraphicsType = HbFrameDrawer::OnePiece;
+            } else if (type == QLatin1String("3h")) {
+                req.mFrameGraphicsType = HbFrameDrawer::ThreePiecesHorizontal;
+            } else if (type == QLatin1String("3v")) {
+                req.mFrameGraphicsType = HbFrameDrawer::ThreePiecesVertical;
+            } else if (type == QLatin1String("9")) {
+                req.mFrameGraphicsType = HbFrameDrawer::NinePieces;
+            }                
+            QString z = xml.attributes().value("z").toString().trimmed();
+            if (z.isEmpty()) {
+                req.mZValue = -1;
+            } else {
+                req.mZValue = z.toFloat();
+            }
+            req.mOrientation = xml.attributes().value("when").toString().trimmed();
+            req.mFrameGraphicsName = xml.readElementText().trimmed();
+            if (!req.mTargetWidgetName.isEmpty() && !req.mFrameGraphicsName.isEmpty()) {
+                item.mItemBgGraphics.append(req);
+            }
         } else {
             qWarning() << PRE << "unknown element" << name;
         }
@@ -584,6 +634,9 @@
         }
     }
     if (ok) {
+        // Apply child widget settings.
+        setupNameBasedWidgetProps(loader);
+        // Find the root view and add it to the mainwindow.
         QGraphicsWidget *widget = loader.findWidget(mItem.mDocmlWidgetName);
         if (widget) {
             qDebug() << PRE << "widget created from" << mItem;
@@ -596,6 +649,27 @@
     }
 }
 
+void HbSplashGenerator::setupNameBasedWidgetProps(HbDocumentLoader &loader)
+{
+    // item-bg-graphics
+    for (int i = 0, ie = mItem.mItemBgGraphics.count(); i != ie; ++i) {
+        QueueItem::ItemBgGraphicsRequest req = mItem.mItemBgGraphics.at(i);
+        if ((req.mOrientation == QLatin1String("portrait") && mItem.mOrientation != Qt::Vertical)
+            || (req.mOrientation == QLatin1String("landscape") && mItem.mOrientation != Qt::Horizontal))
+        {
+            continue;
+        }
+        HbWidget *widget = qobject_cast<HbWidget *>(loader.findWidget(req.mTargetWidgetName));
+        if (widget) {
+            qDebug() << PRE << "setting background item" << req.mFrameGraphicsName
+                     << "for" << req.mTargetWidgetName;
+            widget->setBackgroundItem(
+                new HbFrameItem(req.mFrameGraphicsName, req.mFrameGraphicsType),
+                (int) req.mZValue);
+        }
+    }
+}
+
 void HbSplashGenerator::finishWindow()
 {
     // Process additional settings.
@@ -723,3 +797,12 @@
     qDeleteAll(mTranslators);
     mTranslators.clear();
 }
+
+void HbSplashGenerator::onDirectoryChanged(const QString &path)
+{
+    Q_UNUSED(path); // we are only watching directories containing splashml+docml
+    mParsedSplashmls.clear();
+    // Have some delay to avoid heavy system load in case of multiple
+    // directory-changed notifications.
+    QTimer::singleShot(1000, this, SLOT(regenerate()));
+}
diff -r 16d8024aca5e -r f7ac710697a9 src/hbservers/hbsplashgenerator/hbsplashgenerator.pro
--- a/src/hbservers/hbsplashgenerator/hbsplashgenerator.pro	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbservers/hbsplashgenerator/hbsplashgenerator.pro	Mon May 03 12:48:33 2010 +0300
@@ -52,6 +52,9 @@
     LIBS += -lefsrv
     LIBS += -lws32
     LIBS += -lcone
+    LIBS += -lavkon
+    LIBS += -leikcore
+    LIBS += -lapparc
 }
 
 hbAddLibrary(hbcore/HbCore)
diff -r 16d8024aca5e -r f7ac710697a9 src/hbservers/hbsplashgenerator/hbsplashgenerator_p.h
--- a/src/hbservers/hbsplashgenerator/hbsplashgenerator_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbservers/hbsplashgenerator/hbsplashgenerator_p.h	Mon May 03 12:48:33 2010 +0300
@@ -36,12 +36,15 @@
 #include <QSettings>
 #include <QDebug>
 #include <QXmlStreamReader>
+#include <QFileSystemWatcher>
+#include "hbframedrawer.h"
 
 QT_BEGIN_NAMESPACE
 class QTranslator;
 QT_END_NAMESPACE
 
 class HbMainWindow;
+class HbDocumentLoader;
 
 class HbSplashGenerator : public QObject
 {
@@ -62,6 +65,7 @@
 private slots:
     void processQueue();
     void processWindow();
+    void onDirectoryChanged(const QString &path);
 
 public:
     struct QueueItem {
@@ -70,6 +74,7 @@
         QString mThemeName;
         Qt::Orientation mOrientation;
         QString mAppId;
+        QString mScreenId;
         QString mDocmlFileName;
         QString mDocmlWidgetName;
         QString mTsAppName;
@@ -83,6 +88,14 @@
         QList<QString> mForcedSections;
         QHash<QString, QString> mCustomWidgetSubsts;
         QString mFixedOrientation;
+        struct ItemBgGraphicsRequest {
+            QString mTargetWidgetName;
+            HbFrameDrawer::FrameType mFrameGraphicsType;
+            QString mFrameGraphicsName;
+            qreal mZValue;
+            QString mOrientation;
+        };
+        QList<ItemBgGraphicsRequest> mItemBgGraphics;
     };
 
 private:
@@ -95,6 +108,7 @@
     void queueAppSpecificItems(const QString &themeName, Qt::Orientation orientation);
     void processSplashml(QXmlStreamReader &xml, QueueItem &item);
     void setupAppSpecificWindow();
+    void setupNameBasedWidgetProps(HbDocumentLoader &loader);
     void finishWindow();
     void addTranslator(const QString &name);
     void clearTranslators();
@@ -109,6 +123,7 @@
     bool mFirstRegenerate;
     QHash<QString, QueueItem> mParsedSplashmls;
     QSettings mSettings;
+    QFileSystemWatcher mFsWatcher;
 };
 
 QDebug operator<<(QDebug dbg, const HbSplashGenerator::QueueItem& item);
diff -r 16d8024aca5e -r f7ac710697a9 src/hbservers/hbsplashgenerator/main.cpp
--- a/src/hbservers/hbsplashgenerator/main.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbservers/hbsplashgenerator/main.cpp	Mon May 03 12:48:33 2010 +0300
@@ -27,30 +27,37 @@
 #include <QPushButton>
 #include <hbapplication.h>
 #include "hbsplashgenerator_p.h"
+#include "hbsplashdefs_p.h"
 
 #if defined(Q_OS_SYMBIAN)
 #include "hbsplashgen_server_symbian_p.h"
+#include <e32std.h>
 #include <eikenv.h>
 #include <apgwgnam.h>
+CApaApplication *appFactory()
+{
+    return new HbSplashGenApplication;
+}
 #endif
 
 int main(int argc, char **argv)
 {
-    HbApplication app(argc, argv, Hb::NoSplash);
-
 #if defined(Q_OS_SYMBIAN)
+    HbApplication app(appFactory, argc, argv, Hb::NoSplash);
     CEikonEnv *env = CEikonEnv::Static();
     if (env) {
         CApaWindowGroupName *wgName = CApaWindowGroupName::NewLC(env->WsSession());
         env->RootWin().SetOrdinalPosition(0, ECoeWinPriorityNeverAtFront); // avoid coming to foreground
         wgName->SetHidden(ETrue); // hide from FSW, OOM fw, GOOM fw, etc.
         wgName->SetSystem(ETrue); // allow only apps with PowerManagement cap to shut us down
-        _LIT(KCaption, "HbSplashGenerator");
-        wgName->SetCaptionL(KCaption);
+        wgName->SetCaptionL(hbsplash_server_name);
         wgName->SetAppUid(KNullUid);
         wgName->SetWindowGroupName(env->RootWin());
         CleanupStack::PopAndDestroy();
+        RThread::RenameMe(hbsplash_server_name);
     }
+#else
+    HbApplication app(argc, argv, Hb::NoSplash);
 #endif
 
     qDebug("[hbsplashgenerator] initializing generator");
diff -r 16d8024aca5e -r f7ac710697a9 src/hbservers/hbthemeserver/hbicondatacache_p.cpp
--- a/src/hbservers/hbthemeserver/hbicondatacache_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbservers/hbthemeserver/hbicondatacache_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -400,7 +400,7 @@
     \a key denotes the unique identifier for the cache item whose ref count is to be decremented in the cache.
 
  */
-bool HbIconDataCache::remove(const HbIconKey& key)
+bool HbIconDataCache::remove(const HbIconKey& key, bool keepInCache)
 {
     if (key.filename.isEmpty() || !cache->contains(key)) {
         return false;
@@ -415,13 +415,25 @@
 
     if (item->refCount == 0) {
         if (item->rasterIconData.type == SGIMAGE) {
-            gpuLruList.insertBack(item);
-            updateGpuLruSize(item->rasterIconDataCost);
+            if (keepInCache) {
+                gpuLruList.insertBack(item);
+                updateGpuLruSize(item->rasterIconDataCost);
+            } else {
+                releaseRasterItem(item);
+                removeFromCache(key, item);
+                return true;
+            }
         }
 
         if (item->rasterIconData.type == OTHER_SUPPORTED_FORMATS) {
-            cpuLruList.insertBack(item);
-            updateCpuLruSize(item->rasterIconDataCost);
+            if (keepInCache) {
+                cpuLruList.insertBack(item);
+                updateCpuLruSize(item->rasterIconDataCost);
+            } else {
+                releaseRasterItem(item);
+                removeFromCache(key, item);
+                return true;
+            }
         }
 
 
@@ -467,10 +479,14 @@
                 }
             } else {
 #endif
-
-                cpuLruList.insertBack(item);
-                updateCpuLruSize(item->vectorIconDataCost);
-
+                if (keepInCache) {
+                    cpuLruList.insertBack(item);
+                    updateCpuLruSize(item->vectorIconDataCost);
+                } else {
+                    releaseVectorItem(item);
+                    removeFromCache(key, item);
+                    return true;
+                }
                 //Debug Code for Test Purpose
 #ifdef HB_ICON_CACHE_DEBUG
                 vectorLruListCount++;
@@ -778,6 +794,22 @@
     }
 }
 
+QVector<const HbIconKey *> HbIconDataCache::getKeys(const QString &filename) const
+{
+    QVector<const HbIconKey *> keys;
+    QHash<HbIconKey, HbIconCacheItem*>::const_iterator itEnd(cache->constEnd());
+    for (QHash < HbIconKey,
+            HbIconCacheItem* >::const_iterator iter = cache->constBegin();
+            iter != itEnd;
+            ++iter) {
+        const HbIconKey *key = &iter.key();
+        if (key->filename == filename) {
+            keys.append(key);
+        }
+    }
+    return keys;
+}
+
 //Debug Code for Test Purpose
 #ifdef HB_ICON_CACHE_DEBUG
 void HbIconDataCache::cleanVectorLRUList()
@@ -813,6 +845,7 @@
         removeFromCache(cache->key(itemToRemove), itemToRemove);
     }
 }
+#endif // HB_ICON_CACHE_DEBUG
 
 void HbIconDataCache::releaseVectorItem(HbIconCacheItem* releaseItem)
 {
@@ -836,6 +869,7 @@
     releaseItem->cpuLink.setPrev(0);
 }
 
+#ifdef HB_ICON_CACHE_DEBUG
 void HbIconDataCache::cleanRasterLRUList()
 {
 
@@ -869,6 +903,7 @@
         removeFromCache(cache->key(itemToRemove), itemToRemove);
     }
 }
+#endif // HB_ICON_CACHE_DEBUG
 
 void HbIconDataCache::releaseRasterItem(HbIconCacheItem* releaseItem)
 {
@@ -894,6 +929,7 @@
     }
 }
 
+#ifdef HB_ICON_CACHE_DEBUG
 int HbIconDataCache::count() const
 {
     return cache->count();
diff -r 16d8024aca5e -r f7ac710697a9 src/hbservers/hbthemeserver/hbicondatacache_p.h
--- a/src/hbservers/hbthemeserver/hbicondatacache_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbservers/hbthemeserver/hbicondatacache_p.h	Mon May 03 12:48:33 2010 +0300
@@ -40,7 +40,7 @@
     HbIconCacheItem* getCacheItem(const HbIconKey &key ,
                                   bool isMultiIconPiece = false);
     bool insert(const HbIconKey &key,  HbIconCacheItem* item);
-    bool remove(const HbIconKey&  key);
+    bool remove(const HbIconKey&  key, bool keepInCache = true);
     void setMaxGpuCacheSize(int size);
     void setMaxCpuCacheSize(int size);
     bool contains(const HbIconKey &key) const;
@@ -49,6 +49,7 @@
     bool isItemCachableInCpu(const HbIconCacheItem* item)const;
     void memoryGood();
     void freeGpuRam(int bytes);
+    QVector<const HbIconKey *> getKeys(const QString &filename) const;
 
 //Debug Code for Test Purpose
 #ifdef HB_ICON_CACHE_DEBUG
@@ -75,12 +76,9 @@
     void createCpuCacheSpace(int itemCost);
     void updateGpuLruSize(int iconDataCost);
     void updateCpuLruSize(int iconDataCost);
-    //Debug Code for Test Purpose
-#ifdef HB_ICON_CACHE_DEBUG
     void removeFromCache(const HbIconKey &key, const HbIconCacheItem* releaseItem);
     void releaseVectorItem(HbIconCacheItem* releaseItem);
     void releaseRasterItem(HbIconCacheItem* releaseItem);
-#endif
 
 private:
     QHash<HbIconKey, HbIconCacheItem*> *cache;
diff -r 16d8024aca5e -r f7ac710697a9 src/hbservers/hbthemeserver/hbnvgiconprocessor_p.cpp
--- a/src/hbservers/hbthemeserver/hbnvgiconprocessor_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbservers/hbthemeserver/hbnvgiconprocessor_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -89,12 +89,16 @@
             renderSize.scale(iconKey.size, iconKey.aspectRatioMode);
         }
         if (domhandle) {
-            byteArray = (HbTlvWrapper::instance())->getTLVEncodedDataFromDom(domhandle, renderSize, iconKey.aspectRatioMode);
+            byteArray = (HbTlvWrapper::instance())->getTlvEncodedDataFromDom(domhandle, renderSize, iconKey.aspectRatioMode);
             size = renderSize.toSize();
         }
     } else {
         HbIconSource *source = HbThemeServerUtils::getIconSource(iconPath);
-        byteArray = *(source->byteArray());
+        QByteArray *sourceByteArray = source->byteArray();
+        if( !sourceByteArray ) {
+            return false;
+        }
+        byteArray = *sourceByteArray;
         QSizeF renderSize = source->defaultSize();
         defaultSize = renderSize.toSize();
         if (!isDefaultSize) {
diff -r 16d8024aca5e -r f7ac710697a9 src/hbservers/hbthemeserver/hbpixmapiconprocessor_p.cpp
--- a/src/hbservers/hbthemeserver/hbpixmapiconprocessor_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbservers/hbthemeserver/hbpixmapiconprocessor_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -36,6 +36,11 @@
 #include "hbiconsource_p.h"
 #include "hbthemeserverutils_p.h"
 
+#if defined (Q_OS_SYMBIAN)
+#include <VG/openvg.h>
+#include <VG/vgcontext_symbian.h>
+#endif //Q_OS_SYMBIAN
+
 /*!
     @hbserver
     \class HbPixmapIconProcessor
@@ -126,7 +131,9 @@
     } else if (iconType == "PIC") {
         isIconCreated = renderPicToPixmap(iconPath);
     } else if (iconType == "NVG") {
-        isIconCreated = storeNvgData(iconPath);
+#if defined (Q_OS_SYMBIAN)    
+		isIconCreated = renderNvgToPixmap(iconPath);
+#endif //Q_OS_SYMBIAN
     } else {
         isIconCreated = renderOtherFormatsToPixmap(iconPath);
     }
@@ -254,37 +261,6 @@
 }
 
 /*!
-    \fn HbPixmapIconProcessor::storeNvgData()
-    \a iconpath
- */
-bool HbPixmapIconProcessor::storeNvgData(const QString& iconPath)
-{
-    bool isIconCreated = false;
-    if (iconKey.size.isNull()) {
-        QSize dummySize(50, 50);
-        pixmap = QPixmap(dummySize);
-        pixmap.fill(Qt::transparent);
-        isIconCreated = true;
-        return isIconCreated;
-    }
-
-    QFile file(iconPath);
-    if (!file.open(QIODevice::NotOpen | QIODevice::ReadOnly))
-        return isIconCreated;
-    else {
-        // @ToDo
-        // QByteArray byteArray = file.readAll() ;
-
-        // Draw the nvg file on the offscreen eglsurface
-        // copy content from surface to pixmap
-        // createPixmapFromEglSurface(byteArray);
-        return isIconCreated;
-    }
-
-
-}
-
-/*!
     \fn HbPixmapIconProcessor::renderOtherFormatsToPixmap()
     \a iconpath
  */
@@ -391,3 +367,103 @@
     return true;
 }
 
+#if defined (Q_OS_SYMBIAN)
+/**
+ * HbNvgIconProcessor::renderNvgToPixmap()
+ * This is used to render NVG data to a pixmap using the Software OpenVG
+ * \a iconPath
+ */
+bool HbPixmapIconProcessor::renderNvgToPixmap(const QString& iconPath)
+{
+    bool isIconCreated = false;
+    bool isDefaultSize =  iconKey.size.isNull();
+    HbIconSource *source = HbThemeServerUtils::getIconSource(iconPath);
+    QByteArray *sourceByteArray = source->byteArray();
+    if( !sourceByteArray ) {
+        return false;
+    }
+    QByteArray byteArray = *sourceByteArray;
+    QSizeF renderSize = source->defaultSize();
+    defaultSize = renderSize.toSize();
+    if (!isDefaultSize) {
+        renderSize.scale(iconKey.size,iconKey.aspectRatioMode);
+    }
+    size = renderSize.toSize();          
+    TSize surfaceSize(TSize(size.width(), size.height()));
+
+    QScopedPointer<CFbsBitmap> bitmapData(new CFbsBitmap());    
+    
+    TInt err = bitmapData.data()->Create(surfaceSize, EColor16MA);    
+    if(err != KErrNone) {      
+        return isIconCreated;
+    }
+    
+    //Reset the surface incase already present
+    VGISymbianTerminate();
+    
+    // Surface creation
+    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);    
+    if(err !=KErrNone) {  
+        return isIconCreated;
+    }
+    
+    //Copy the data from the surface
+    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
+    VGISymbianTerminate();
+    return isIconCreated;
+}
+
+/*!
+    \fn HbPixmapIconProcessor::mapKeyAspectRatioToNvgAspectRatio()
+    \a aspectRatio
+ */
+HbNvgAspectRatioSettings HbPixmapIconProcessor::mapKeyAspectRatioToNvgAspectRatio(
+                                                Qt::AspectRatioMode aspectRatio) const
+{
+    HbNvgAspectRatioSettings settings;
+    switch(aspectRatio) {  
+    
+    case Qt::IgnoreAspectRatio: {
+        settings.nvgAlignStatusAndAspectRatio = ENvgPreserveAspectRatio_None;
+        settings.type = ENvgMeet; 
+        break;
+    }
+    case Qt::KeepAspectRatio: {
+        settings.nvgAlignStatusAndAspectRatio = ENvgPreserveAspectRatio_XmidYmid;
+        settings.type = ENvgMeet;
+        break;
+        }
+    case Qt::KeepAspectRatioByExpanding: {
+        settings.nvgAlignStatusAndAspectRatio = ENvgPreserveAspectRatio_XmidYmid;
+        settings.type = ENvgSlice;
+        break;
+        } 
+    default: {
+        settings.nvgAlignStatusAndAspectRatio = ENvgPreserveAspectRatio_XmidYmid;
+        settings.type = ENvgMeet;
+        break;
+        }        
+    }
+    return settings;
+}
+#endif //Q_OS_SYMBIAN
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbservers/hbthemeserver/hbpixmapiconprocessor_p.h
--- a/src/hbservers/hbthemeserver/hbpixmapiconprocessor_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbservers/hbthemeserver/hbpixmapiconprocessor_p.h	Mon May 03 12:48:33 2010 +0300
@@ -29,6 +29,10 @@
 #include "hbiconprocessor_p.h"
 #include <QPixmap>
 
+#if defined (Q_OS_SYMBIAN)
+#include <nvg.h>
+#endif //Q_OS_SYMBIAN
+
 QT_BEGIN_NAMESPACE
 class QSvgRenderer;
 class QPicture;
@@ -37,6 +41,14 @@
 
 class HbThemeServerSymbian;
 
+#if defined (Q_OS_SYMBIAN)
+struct HbNvgAspectRatioSettings
+{
+    TNvgAlignStatusType nvgAlignStatusAndAspectRatio;
+    TNvgMeetOrSliceType type;
+};
+#endif //Q_OS_SYMBIAN
+
 class HbPixmapIconProcessor : public HbIconProcessor
 {
 public :
@@ -57,9 +69,13 @@
 private :
     bool renderSvgToPixmap(const QString& iconPath);
     bool renderPicToPixmap(const QString& iconPath);
-    bool storeNvgData(const QString& iconPath);
     bool renderOtherFormatsToPixmap(const QString& iconPath);
 
+#if defined (Q_OS_SYMBIAN)
+    bool renderNvgToPixmap(const QString& iconPath);
+    HbNvgAspectRatioSettings mapKeyAspectRatioToNvgAspectRatio(
+	                                                Qt::AspectRatioMode aspectRatio) const;
+#endif //Q_OS_SYMBIAN
 private:
     QPixmap pixmap;
 };
diff -r 16d8024aca5e -r f7ac710697a9 src/hbservers/hbthemeserver/hbsgimageiconprocessor_p.cpp
--- a/src/hbservers/hbthemeserver/hbsgimageiconprocessor_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbservers/hbthemeserver/hbsgimageiconprocessor_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -104,7 +104,11 @@
     data.type = INVALID_FORMAT;
 
     HbIconSource *source = HbThemeServerUtils::getIconSource(iconPath);
-    byteArray = *(source->byteArray());
+    QByteArray *sourceByteArray = source->byteArray();
+    if( !sourceByteArray ) {
+        return false;
+    }
+    byteArray = *sourceByteArray;
     QSizeF size = source->defaultSize();
     defaultSize = size.toSize();
     QSizeF renderSize(defaultSize);
@@ -285,7 +289,11 @@
 
 
             HbIconSource *source = HbThemeServerUtils::getIconSource(multiPieceIconParams.multiPartIconList[i]);
-            byteArray = *(source->byteArray());
+            QByteArray *sourceByteArray = source->byteArray();
+            if( !sourceByteArray ) {
+                return false;
+            }
+            byteArray = *sourceByteArray;
             success = renderNvg(byteArray, QRect(position,
                                                  multiPieceIconParams.multiPartIconData.pixmapSizes[i]), (Qt::AspectRatioMode)multiPieceIconParams.aspectRatioMode,
                                 mirrored);
@@ -320,9 +328,9 @@
 
     NvgAspectRatioSettings settings = mapKeyAspectRatioToNvgAspectRatio(aspectRatioMode);
     nvgEngine.setPreserveAspectRatio(settings.nvgAlignStatusAndAspectRatio, settings.type);
-    nvgEngine.setMirroringMode(mirrored);
+    nvgEngine.enableMirroring(mirrored);
 
-    HbNvgEngine::NvgErrorType errorType = nvgEngine.drawNvg(byteArray, size);
+    HbNvgEngine::HbNvgErrorType errorType = nvgEngine.drawNvg(byteArray, size);
     return errorType == HbNvgEngine::NvgErrNone;
+}
 
-}
diff -r 16d8024aca5e -r f7ac710697a9 src/hbservers/hbthemeserver/hbsgimagerenderer_p.h
--- a/src/hbservers/hbthemeserver/hbsgimagerenderer_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbservers/hbthemeserver/hbsgimagerenderer_p.h	Mon May 03 12:48:33 2010 +0300
@@ -75,3 +75,4 @@
 };
 
 #endif
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbservers/hbthemeserver/hbthemeserver.pro
--- a/src/hbservers/hbthemeserver/hbthemeserver.pro	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbservers/hbthemeserver/hbthemeserver.pro	Mon May 03 12:48:33 2010 +0300
@@ -25,7 +25,7 @@
 
 TEMPLATE = app
 TARGET = hbthemeserver
-developer:DEFINES += BUILD_HB_INTERNAL
+CONFIG -= app_bundle
 DEFINES += HB_BUILD_DIR=\"\\\"$${HB_BUILD_DIR}\\\"\"
 
 # directories
@@ -69,13 +69,13 @@
                 HEADERS += $$PWD/hbnvgiconprocessor_p.h
                 LIBS += -llibopenvg -llibopenvgu -llibegl
         }
-        LIBS += -lapgrfx -lws32 -lavkon -lcone -leikcore
+        LIBS += -lapgrfx -lws32 -lavkon -lcone -leikcore -lNVGDecoder_SW -llibvgi -lfbscli
         sgimage {
         	HEADERS += $$PWD/hbsgimageiconprocessor_p.h
                 HEADERS += $$PWD/hbsgimagerenderer_p.h
                 SOURCES  += $$PWD/hbsgimageiconprocessor_p.cpp
                 SOURCES  += $$PWD/hbsgimagerenderer.cpp
-                INCLUDEPATH += /epoc32/include/platform #For SGImage Support
+                INCLUDEPATH += $${EPOCROOT}epoc32/include/platform #For SGImage Support
                 LIBS += -lsgresource #For SGImage Support
                 LIBS += -llibopenvg #For SGImage Support
                 LIBS += -llibopenvgu #For SGImage Support
@@ -85,9 +85,9 @@
     myrssrules = \
     "hidden = KAppIsHidden;"
     RSS_RULES += myrssrules
-    MMP_RULES += "SYSTEMINCLUDE /epoc32/include/middleware"
+    MMP_RULES += "SYSTEMINCLUDE $${EPOCROOT}epoc32/include/middleware"
     # FOR 9.2 FOR INCLUDING aknappui.h
-    MMP_RULES += "SYSTEMINCLUDE /epoc32/include/mw"
+    MMP_RULES += "SYSTEMINCLUDE $${EPOCROOT}epoc32/include/mw"
     TARGET.UID3 = 0x20022E82
     TARGET.EPOCHEAPSIZE = 0x20000 0xA00000
     
diff -r 16d8024aca5e -r f7ac710697a9 src/hbservers/hbthemeserver/hbthemeserver_generic.cpp
--- a/src/hbservers/hbthemeserver/hbthemeserver_generic.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbservers/hbthemeserver/hbthemeserver_generic.cpp	Mon May 03 12:48:33 2010 +0300
@@ -51,6 +51,8 @@
 #include "hbpixmapiconimpl_p.h"
 #include "hbpixmapiconprocessor_p.h"
 #include "hblayeredstyleloader_p.h"
+#include "hbthemesystemeffect_p.h"
+#include "hbsharedmemorymanager_p.h"
 
 /*!
   @hbserver
@@ -245,14 +247,26 @@
 #endif
     // Modify the QSettings to store the applied theme
     QSettings settings(QLatin1String(ORGANIZATION), QLatin1String(THEME_COMPONENT));
-    QString prevTheme = settings.value("currenttheme").toString();
+    QString prevTheme = settings.value(CURRENT_THEME_KEY).toString();
     if (prevTheme == newTheme) {
         // Theme did not change, return.
         return;
     }
+    // Clear cached icons and session data
+    clearIconCache();
+    HbThemeServerSession *session;
+    foreach(session, sessionList) {
+        session->clearSessionIconData();
+    }
+
     QString cleanThemeName = newTheme.trimmed();
-    settings.setValue("currenttheme", cleanThemeName);
+    settings.remove("currenttheme"); //temporary
+    settings.setValue(CURRENT_THEME_KEY, cleanThemeName);
     settings.sync();
+
+    // Register new system effects
+    HbThemeSystemEffect::handleThemeChange(cleanThemeName);
+
     HbThemeServerRequest requestType;
     requestType = EThemeSelection;
     QByteArray block;
@@ -262,6 +276,67 @@
     writeToClients(block);
 }
 
+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
@@ -577,11 +652,14 @@
             break;
         }
         case EThemeContentUpdate: {
-            iServer->clearIconCache();
+            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;
         }
@@ -720,11 +798,13 @@
             inputDataStream >> color;
 
 #ifdef THEME_SERVER_TRACES
-            qDebug() << "image req at server: " << filename;
+            qDebug() << "image req at server: " << fileList;
 #endif
             QByteArray output;
             for (int i = 0; i < fileList.count(); i++) {
-                HbIconKey key(fileList[i], sizeList[i], (Qt::AspectRatioMode)aspectRatioMode, (QIcon::Mode)mode, mirrored, color);
+                HbIconKey key(fileList[i], sizeList[i],
+                              static_cast<Qt::AspectRatioMode>(aspectRatioMode),
+                              static_cast<QIcon::Mode>(mode), mirrored, color);
                 output.append(handleIconLookup(key, data, options));
             }
 
@@ -732,6 +812,10 @@
 
             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: {
@@ -857,6 +941,25 @@
                 ((QLocalSocket *)sender())->write(outputByteArray);
                 break;
             }
+        case EFreeSharedMem: {
+            int freeSharedMem = iServer->freeSharedMemory();
+            QByteArray outputByteArray;
+            QDataStream outputDataStream(&outputByteArray, QIODevice::WriteOnly);
+            outputDataStream << requestType;
+            outputDataStream << freeSharedMem;
+            ((QLocalSocket *)sender())->write(outputByteArray);
+            break;
+        }
+        case EAllocatedSharedMem: {
+            int allocatedSharedMem = iServer->allocatedSharedMemory();
+            QByteArray outputByteArray;
+            QDataStream outputDataStream(&outputByteArray, QIODevice::WriteOnly);
+            outputDataStream << requestType;
+            outputDataStream << allocatedSharedMem;
+            ((QLocalSocket *)sender())->write(outputByteArray);
+            break;
+        }
+
         default:
             break;
         }
@@ -932,12 +1035,14 @@
     stitchedData.type = INVALID_FORMAT;
     QString format = HbThemeServerUtils::formatFromPath(params.multiPartIconList[0]);
 
-    QScopedPointer <HbPixmapIconProcessor> tempIconProcessor(new HbPixmapIconProcessor(finalIconKey, (HbIconLoader::IconLoaderOptions)params.options, format));
+    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, (HbIconLoader::IconLoaderOptions)params.options, format, false));
+    tempIconCacheItem.reset(HbIconCacheItemCreator::createCacheItem(finalIconKey,
+                                    static_cast<HbIconLoader::IconLoaderOptions>(params.options), format, false));
     cacheItem = tempIconCacheItem.data();
 
     cacheItem->rasterIconData = rasterIcon->sharedIconData();
@@ -952,7 +1057,6 @@
         }
     }
     tempIconCacheItem.take();
-    delete rasterIcon;
     return insertKeyIntoSessionList;
 }
 
@@ -972,27 +1076,31 @@
     bool insertKeyIntoSessionList = false;
     bool failedToCreateParts = false;
     QString format;
-
-
-    for (int i = 0; i < noOfPieces; i++) {
-        HbSharedIconInfo data;
-        bool iconPieceMirrored = false;
-        HbIconKey key(params.multiPartIconList.at(i), params.multiPartIconData.pixmapSizes[i], (Qt::AspectRatioMode)stichedKey.aspectRatioMode, (QIcon::Mode)stichedKey.mode, iconPieceMirrored, stichedKey.color);
-        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
+    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);
+            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
@@ -1005,8 +1113,11 @@
     }
 // Create a stitched icon of the available piece shared iconinfos
     if ((dataForParts.count() == noOfPieces) && (!failedToCreateParts)) {
-        if (createStichedIconInfoOfParts(dataForParts, params, stichedKey, stitchedData)) {
-            sessionIconData.append(stichedKey);
+        try {
+            if (createStichedIconInfoOfParts(dataForParts, params, stichedKey, stitchedData)) {
+                sessionIconData.append(stichedKey);
+            }
+        } catch(std::exception &) {
         }
     }
 // Move the keys created for pieces to unused state*/
@@ -1016,6 +1127,25 @@
 }
 
 /*!
+  \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.
 */
@@ -1168,6 +1298,9 @@
                     // 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();
@@ -1220,9 +1353,9 @@
         QString format = HbThemeServerUtils::formatFromPath(key.filename);
         QT_TRY {
             tempIconCacheItem.reset(HbIconCacheItemCreator::createCacheItem(key,
-            (HbIconLoader::IconLoaderOptions)options,
-            format,
-            false));
+                (HbIconLoader::IconLoaderOptions)options,
+                format,
+                false));
             cacheItem = tempIconCacheItem.data();
             if (cacheItem) {
                 if (cacheItem->rasterIconData.type != INVALID_FORMAT) {
@@ -1312,3 +1445,22 @@
     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 16d8024aca5e -r f7ac710697a9 src/hbservers/hbthemeserver/hbthemeserver_generic_p_p.h
--- a/src/hbservers/hbthemeserver/hbthemeserver_generic_p_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbservers/hbthemeserver/hbthemeserver_generic_p_p.h	Mon May 03 12:48:33 2010 +0300
@@ -63,6 +63,7 @@
     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);
@@ -77,6 +78,8 @@
     void doCleanup();
     int sessionListCount() const;
 
+    int freeSharedMemory() const;
+    int allocatedSharedMemory() const;
 
 //Debug Code for Test Purpose
 #ifdef HB_ICON_CACHE_DEBUG
@@ -102,6 +105,9 @@
     void newClientConnected();
     void removeFromList();
 
+public:
+    QHash<QString, HbCacheItem*> themePriorityItems;
+
 private:
 #ifdef QT_DEBUG
     QLabel statusLabel;
@@ -135,6 +141,9 @@
                                 int noOfPieces,
                                 HbIconKey &stichedKey,
                                 HbSharedIconInfo &stitchedData);
+    void clearSessionIconData();
+    void removeSessionIconItem(const HbIconKey &key);
+    void removeSessionCssItem(const QString &key);
 
 public slots:
     void readDataFromClient();
diff -r 16d8024aca5e -r f7ac710697a9 src/hbservers/hbthemeserver/hbthemeserver_symbian.cpp
--- a/src/hbservers/hbthemeserver/hbthemeserver_symbian.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbservers/hbthemeserver/hbthemeserver_symbian.cpp	Mon May 03 12:48:33 2010 +0300
@@ -29,15 +29,16 @@
 #include "hbiconsource_p.h"
 #include "hbthemeindex_p.h"
 #include "hbthemeutils_p.h"
+#include "hbsharedmemorymanager_p.h"
 
 #include <QHash>
 #include <QImage>
-#include <QSettings>
 #include <QSharedMemory>
 #include <QDebug>
 #include <QProcess>
 #include <QFile>
 #include <QPainter>
+#include <QSettings>
 #include <QSizeF>
 #include <e32property.h>
 #include <e32base.h>
@@ -47,6 +48,7 @@
 #include "hblayeredstyleloader_p.h"
 #include "hbmemoryutils_p.h"
 #include "hbdeviceprofiledatabase_p.h"
+#include "hbthemesystemeffect_p.h"
 #ifdef HB_SGIMAGE_ICON
 #include "hbsgimagerenderer_p.h"
 #endif
@@ -56,14 +58,16 @@
 // 5 MB  CPU cache size
 #define CPU_CACHE_SIZE 0x500000
 
-const TInt KThemeName = 0;
+static const TInt KThemeName = 0;
 
+// Publish/Subscribe themeRequestProp specific
+static _LIT_SECURITY_POLICY_PASS(KAllowAllPolicy);
+static _LIT_SECURITY_POLICY_C1(KThemeChangerPolicy,ECapabilityWriteDeviceData);
 
 
 static HbThemeServerPrivate *TheServer = 0;
 bool HbThemeServerPrivate::gpuGoodMemoryState = true;
 // This is used as parent theme always regardless of the active theme
-static const char *baseThemeName = "hbdefault";
 const int themeIndexFailed = -2; // error code to indicate failure in processing theme index
 
 //**********************************
@@ -100,27 +104,25 @@
     TInt error = iThemeProperty.Attach(KServerUid3, KThemeName );
     User::LeaveIfError(error);
     
-    QSettings settings(QLatin1String(ORGANIZATION), QLatin1String(THEME_COMPONENT));
     // Store the active theme name in a member string
-    iCurrentThemeName = settings.value("currenttheme").toString();
+    iCurrentThemeName = HbThemeUtils::getThemeSetting(HbThemeUtils::CurrentThemeSetting);
     
-    // HACK
     if (iCurrentThemeName.isEmpty()) {
-        iCurrentThemeName = "sfblacktheme";
+        iCurrentThemeName = HbThemeUtils::defaultTheme().name;
+        HbThemeUtils::setThemeSetting(HbThemeUtils::CurrentThemeSetting, iCurrentThemeName);
     }
+    // Register theme system effects in construction
+    HbThemeSystemEffect::handleThemeChange(iCurrentThemeName);
     
-    // TODO: Get default theme name if current theme setting does not return theme name
 
-/*
-    if (iCurrentThemeName.isEmpty()) {
-        iCurrentThemeName = HbThemeUtils::defaultTheme();
-        settings.setValue("currenttheme", iCurrentThemeName); 
-        settings.sync();
-        TPtrC name(reinterpret_cast<const TUint16 *>(iCurrentThemeName.constData()));
-        iThemeProperty.Set(name);
-    }
-*/
+    // Set the current theme also in the pubsub key that is used to notify clients.
+    TPtrC currentThemePtr(reinterpret_cast<const TUint16 *>(iCurrentThemeName.constData()));
+    iThemeProperty.Set(currentThemePtr);
 
+    // Resolve the drive letter of the current theme
+    resolveCurrentThemeDrive();
+    // Open index file to prevent uninstallation of the active theme
+    openCurrentIndexFile();
     cache = 0;
     cssCache = 0;
 
@@ -137,9 +139,10 @@
     setMaxGpuCacheSize(GPU_CACHE_SIZE);
     setMaxCpuCacheSize(CPU_CACHE_SIZE);
 
+    const QString &baseThemeName = HbThemeUtils::baseTheme().name;
     // Process base theme index, it is used as parent index also when the current theme is something else
     processThemeIndex(baseThemeName, QChar('Z'));
-    baseThemeIndexKey = themeIndexKey(baseThemeName, QChar('Z'));	
+    baseThemeIndexKey = themeIndexKey(baseThemeName, QChar('Z'));
 	
     // 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.)
@@ -147,6 +150,11 @@
     QProcess::startDetached("hbiconpreloader.exe");
 #endif
 
+    // Cache ROM theme(name)s
+    QString romPath = "Z:\\resource\\hb\\themes\\icons\\";
+    QDir dir(romPath);
+    romThemeNames = dir.entryList(QDir::Dirs);
+    
     // Start the splash screen generator app.
     //QProcess::startDetached("hbsplashgenerator.exe");
 }
@@ -167,6 +175,17 @@
 {
     // Set server pointer in static variable
     TheServer = this;
+	
+    // Set up the listener to listen for Publish events
+    TRAPD(err, iListener = CHbThemeChangeNotificationListener::NewL(*this));
+    if (err) {
+        qWarning( "HbThemeServerPrivate::HbThemeServerPrivate: CHbThemeChangeNotificationListener::NewL failed = %d", err );
+    } else {
+        TRAPD( err, iListener->startListening());
+        if (err) {
+             qWarning( "HbThemeServerPrivate::HbThemeServerPrivate: iListener->startListening failed = %d", err );
+         }
+    }
 }
 
 /**
@@ -178,6 +197,12 @@
     delete cssCache;
     cache = 0;      // so that HbThemeServerSession::~HbThemeServerSession can avoid using these pointers;
     cssCache = 0;   // it may be called inside HbThemeServerPrivate::~HbThemeServerPrivate
+    TInt err = RProperty::Delete(KServerUid3, KNewThemeForThemeChanger);
+    if(err != KErrNotFound) {
+        User::LeaveIfError(err);
+    }
+    // Delete the listener for Publish/Subscribe
+    delete iListener;
 }
 
 HbThemeServerPrivate *HbThemeServerPrivate::Instance()
@@ -207,24 +232,39 @@
     if (!iCurrentThemeName.isEmpty()) {
         // Check for the theme's icon directory in different drives.
         // ROM is checked first and then phone memory and memory card drives.
-
-        QString filename = "Z:\\resource\\hb\\themes\\icons\\";
-        filename.append(iCurrentThemeName);
-
-        if (QFile::exists(filename)) {
+    
+        // ROM theme names can't change after they have been cached in server
+        // construction time, so first check from there
+        if (romThemeNames.contains(iCurrentThemeName)) {
             currentThemeDrive = 'Z';
             return;
         }
-    
-        filename[0] = 'C';
-        if (QFile::exists(filename)) {
+
+        QString filename = "C:\\resource\\hb\\themes\\icons\\";
+        filename.append(iCurrentThemeName);
+        filename.append("\\index.theme");
+        QFile file;
+        
+        file.setFileName(filename);
+        if (file.open(QIODevice::ReadOnly)) {
             currentThemeDrive = 'C';
+            file.close();
             return;
         }
 
         filename[0] = 'E';
-        if (QFile::exists(filename)) {
+        file.setFileName(filename);        
+        if (file.open(QIODevice::ReadOnly)) {
             currentThemeDrive = 'E';
+            file.close();
+            return;
+        }
+
+        filename[0] = 'F';
+        file.setFileName(filename);
+        if (file.open(QIODevice::ReadOnly)) {
+            currentThemeDrive = 'F';
+            file.close();
             return;
         }
         
@@ -234,6 +274,54 @@
 }
 
 /**
+Handles theme selection
+*/
+void HbThemeServerPrivate::HandleThemeSelection( const QString& themeName)
+{
+    //Make a copy for ourselves
+	
+	
+    QString  cleanThemeName = themeName.trimmed();
+    
+    if (cleanThemeName == iCurrentThemeName) {
+        // Theme did not change, return.
+        return;
+    }
+    // ToDo: Validate the theme name somehow
+
+    #ifdef THEME_INDEX_TRACES
+    qDebug() << "ThemeIndex: theme change request, new theme =" << cleanThemeName.toUtf8();
+    #endif
+
+    iCurrentThemeName = cleanThemeName;
+    
+    // Resolve the drive letter of the current theme
+    resolveCurrentThemeDrive();
+
+    currentIndexfile.close();
+    // Open index file to prevent uninstallation of the active theme
+    openCurrentIndexFile();
+
+    // Clear cached icons and session data
+    clearIconCache();
+    iSessionIter.SetToFirst();
+    while(iSessionIter != NULL) {
+        HbThemeServerSession &session = reinterpret_cast<HbThemeServerSession &>(*iSessionIter);
+        session.ClearSessionData();
+        iSessionIter++;
+    }
+	
+    HbThemeSystemEffect::handleThemeChange(cleanThemeName);
+ 
+    QSettings settings(QLatin1String(ORGANIZATION), QLatin1String(THEME_COMPONENT));    
+    settings.setValue(CURRENT_THEME_KEY, cleanThemeName); 
+    settings.sync();
+    TPtrC name(reinterpret_cast<const TUint16 *>(cleanThemeName.constData()));
+    TInt err = iThemeProperty.Set(name);
+    User::LeaveIfError(err);
+}
+
+/**
 Creates a new session with the server.
 */
 CSession2* HbThemeServerPrivate::NewSessionL(const TVersion& aVersion, const RMessage2& /*aMessage*/) const
@@ -340,8 +428,28 @@
         Don't call any HbIconDataCache functions if HbThemeServerPrivate has already deleted it,
          which happens when ThemeServer is closed before the client(s).
     */
-    if (cache)
+    if (cache) {
         cache->remove(key);
+    }
+}
+
+/**
+ * HbThemeServerPrivate::IconTypeInCache
+ *
+ * Returns the Icon Format Type i.e SGIMAGE,NVG,SVG etc...if it is present in cache
+ * else returns INVALID_FORMAT
+ */
+ HbIconFormatType HbThemeServerPrivate::IconTypeInCache( const HbIconKey &key ) const
+{    
+    if ( key.filename.isEmpty() || !cache->contains(key) ) {
+         return INVALID_FORMAT;
+    }
+    HbIconCacheItem* item = cache->value(key);   
+    if ( item->rasterIconData.type != INVALID_FORMAT ) {
+        return item->rasterIconData.type;
+    } else {
+        return item->vectorIconData.type;
+    }   
 }
 
 /**
@@ -355,8 +463,9 @@
         Don't call any HbCache ( CssCache )  functions if HbThemeServerPrivate has already deleted it,
          which happens when ThemeServer is closed before the client(s).
     */
-    if (cssCache)
+    if (cssCache) {
         cssCache->remove(key);
+    }
 }
 
 /**
@@ -392,6 +501,24 @@
     return gpuGoodMemoryState;
 }
 
+int HbThemeServerPrivate::freeSharedMemory()
+{
+    GET_MEMORY_MANAGER(HbMemoryManager::SharedMemory);
+    return static_cast<HbSharedMemoryManager *>(manager)->freeSharedMemory();
+}
+
+int HbThemeServerPrivate::allocatedSharedMemory()
+{
+    GET_MEMORY_MANAGER(HbMemoryManager::SharedMemory);
+    return static_cast<HbSharedMemoryManager *>(manager)->allocatedSharedMemory();
+}
+
+int HbThemeServerPrivate::allocatedHeapMemory()
+{
+    TInt heapSize = 0;
+    User::AllocSize(heapSize);
+    return heapSize;
+}
 
 //Debug Code for Test Purpose
 #ifdef HB_ICON_CACHE_DEBUG
@@ -404,7 +531,7 @@
 {
 #ifdef HB_SGIMAGE_ICON
     qDebug() << "Inside  HbThemeServerSymbian::totalGPUMemory()  " ;
-    return HbSgImageRenderer::instance()->totalGPUMemory();
+    return HbSgImageRenderer::global()->totalGPUMemory();
 #else
     return 0;
 #endif
@@ -414,7 +541,7 @@
 {
 #ifdef HB_SGIMAGE_ICON
     qDebug() << "Inside  HbThemeServerSymbian::freeGPUMemory()  " ;
-    return HbSgImageRenderer::instance()->freeGPUMemory();
+    return HbSgImageRenderer::global()->freeGPUMemory();
 #else
     return 0;
 #endif
@@ -656,7 +783,8 @@
     
     tables.tables[0] = themeIndexes.value(key, -1);
     tables.drives[0] = currentThemeDrive;
-
+    
+    const QString &baseThemeName = HbThemeUtils::baseTheme().name;
     // Set base theme table as parent table if the current theme is not the base theme
     if (tables.tables[0] >= 0 && iCurrentThemeName != baseThemeName) {
         QString base(baseThemeName);
@@ -794,7 +922,11 @@
     case EUnloadMultiIcon:
         unloadMultiIcon(aMessage);
         break;
-
+    case ENotifyForegroundLost:
+#if defined(HB_SGIMAGE_ICON) || defined(HB_NVG_CS_ICON)
+        freeClientGpuResources();
+#endif
+        break;
         //Debug Code for Test Purpose
 #ifdef HB_ICON_CACHE_DEBUG
     case ECacheIconCount: {
@@ -949,7 +1081,6 @@
     }
 #endif
     case EMemoryGood: {
-
         iServer->MemoryGood();
         break;
     }
@@ -962,14 +1093,34 @@
         break;
     }
 
-        case EThemeIndex: {
-            // Using leave here because this function does not return a value
-            ThemeIndexTables tables;
-            iServer->getThemeIndexTables(tables);
-            TPckg<ThemeIndexTables> out(tables);
-            aMessage.WriteL(0, out);
-            break;
-        }
+    case EThemeIndex: {
+        // Using leave here because this function does not return a value
+        ThemeIndexTables tables;
+        iServer->getThemeIndexTables(tables);
+        TPckg<ThemeIndexTables> out(tables);
+        aMessage.WriteL(0, out);
+        break;
+    }
+
+    case EFreeSharedMem: {
+        int freeSharedMem = iServer->freeSharedMemory();
+        TPckg<int> out(freeSharedMem);
+        aMessage.WriteL(1, out);
+        break;
+    }
+    case EAllocatedSharedMem: {
+        int allocatedSharedMem = iServer->allocatedSharedMemory();
+        TPckg<int> out(allocatedSharedMem);
+        aMessage.WriteL(1, out);
+        break;
+    }
+    case EAllocatedHeapMem: {
+        int allocatedHeapMem = iServer->allocatedHeapMemory();
+        TPckg<int> out(allocatedHeapMem);
+        aMessage.WriteL(1, out);
+        break;
+    }
+
 
     // This is an example of a request that we know about, but don't support.
     // We cause KErrNotSupported to be returned to the client.
@@ -1038,7 +1189,9 @@
     if (insertKeyIntoSessionList) {
         //The session will only keep track of cssFiles that were either successfully found or were
         //successfully inserted in the cache.
-        sessionCssData.append(cssFileName);
+        if (!sessionCssData.contains(cssFileName)) {
+            sessionCssData.append(cssFileName);
+        }
     }
     TPckg<HbSharedStyleSheetInfo> data(offsetInfo);
     aMessage.WriteL(2, data);
@@ -1223,7 +1376,9 @@
             }
         } QT_CATCH(const std::bad_alloc &) {
             data.type = INVALID_FORMAT;
-            FreeDataFromCacheItem(cacheItem);
+            if (cacheItem) {
+                FreeDataFromCacheItem(cacheItem);
+            }
         }
     }
     if (insertKeyIntoSessionList) {
@@ -1256,33 +1411,12 @@
     QString newTheme((QChar*)buffer.Ptr(), buffer.Length());
     CleanupStack::PopAndDestroy(); // close the buffer
 
-    QString cleanThemeName = newTheme.trimmed();    
-    
-    if (cleanThemeName == iServer->iCurrentThemeName) {
-        // Theme did not change, return.
-        return;
+    QString cleanThemeName = newTheme.trimmed();
+	
+    if (cleanThemeName != iServer->iCurrentThemeName) {
+        iServer->HandleThemeSelection(cleanThemeName);
+        sessionData.clear();
     }
-    // ToDo: Validate the theme name somehow
-
-    #ifdef THEME_INDEX_TRACES
-    qDebug() << "ThemeIndex: theme change request, new theme =" << cleanThemeName.toUtf8();
-    #endif
-
-    iServer->iCurrentThemeName = cleanThemeName;
-    
-    // Resolve the drive letter of the current theme
-    iServer->resolveCurrentThemeDrive();
-
-    iServer->currentIndexfile.close();
-    // Open index file to prevent uninstallation of the active theme
-    iServer->openCurrentIndexFile();
-
-    QSettings settings(QLatin1String(ORGANIZATION), QLatin1String(THEME_COMPONENT));    
-    settings.setValue("currenttheme", cleanThemeName); 
-    settings.sync();
-    TPtrC name(reinterpret_cast<const TUint16 *>(cleanThemeName.constData()));
-    TInt err = iServer->iThemeProperty.Set(name);
-    User::LeaveIfError(err);
 }
 
 /**
@@ -1441,6 +1575,8 @@
         if (cacheItem->rasterIconData.type == INVALID_FORMAT) {
             return false;
         }
+    } else {
+        return false;
     }
 
     stitchedData = cacheItem->rasterIconData;
@@ -1479,28 +1615,32 @@
 
     int nvgPiecesCount = 0;
 
-    for (int i = 0; i < noOfPieces; i++) {
-        HbSharedIconInfo data;
-        bool iconPieceMirrored = false;
-        HbIconKey key(frameItemParams.multiPartIconList.at(i), frameItemParams.multiPartIconData.pixmapSizes[i], (Qt::AspectRatioMode)stichedKey.aspectRatioMode, (QIcon::Mode)stichedKey.mode, iconPieceMirrored, stichedKey.color);
-        insertKeyIntoSessionList = IconInfoFromSingleIcon(key, data);
-        if (!insertKeyIntoSessionList) {
-            insertKeyIntoSessionList = CreateCacheItemData(key, frameItemParams.options, data, true);
-        }
-        if ((data.type == INVALID_FORMAT) || (!insertKeyIntoSessionList)) {
-            failedToCreateParts = true;
-            break;
-        } else {
-            if (data.type == NVG) {
-                ++nvgPiecesCount;
+    try {
+        for (int i = 0; i < noOfPieces; i++) {
+            HbSharedIconInfo data;
+            bool iconPieceMirrored = false;
+            HbIconKey key(frameItemParams.multiPartIconList.at(i), frameItemParams.multiPartIconData.pixmapSizes[i], (Qt::AspectRatioMode)stichedKey.aspectRatioMode, (QIcon::Mode)stichedKey.mode, iconPieceMirrored, stichedKey.color);
+            insertKeyIntoSessionList = IconInfoFromSingleIcon(key, data);
+            if (!insertKeyIntoSessionList) {
+                insertKeyIntoSessionList = CreateCacheItemData(key, frameItemParams.options, data, true);
             }
-
-            //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);
-        }
-    }//end of for
+            if ((data.type == INVALID_FORMAT) || (!insertKeyIntoSessionList)) {
+                failedToCreateParts = true;
+                break;
+            } else {
+                if (data.type == NVG) {
+                    ++nvgPiecesCount;
+                }
+    
+                //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);
+            }
+        }//end of for
+    } catch (std::exception &) {
+        failedToCreateParts = true;
+    }
     bool allNvg = false;
 
     if (nvgPiecesCount == noOfPieces) {
@@ -1534,9 +1674,14 @@
         return;
     }
 // Create a stitched icon of the available piece shared iconinfos
-    if ((dataPartCount == noOfPieces) && (!failedToCreateParts) &&
-            (CreateStichedIconInfoOfParts(dataForParts, frameItemParams, stichedKey, stitchedData, allNvg))) {
-        sessionData.append(stichedKey);
+    if ((dataPartCount == noOfPieces) && (!failedToCreateParts)) {
+        try {
+            if (CreateStichedIconInfoOfParts(dataForParts, frameItemParams, stichedKey, stitchedData, allNvg)) {
+                sessionData.append(stichedKey);
+            }
+        } catch(std::exception &) {
+
+        }
     }
 
     QVector<HbIconKey>::const_iterator itEnd(keysInserted.constEnd());
@@ -1662,23 +1807,33 @@
     bool insertKeyIntoSessionList = false;
     QString format;
     QColor color = GetColorFromRgba(frameItemParams.rgba, frameItemParams.colorflag);
-    for (int i = 0; i < noOfPieces; i++) {
-        HbSharedIconInfo data;
-        QString pieceName((QChar*)frameItemParams.iconList[i].Ptr(), frameItemParams.iconList[i].Length());
-        HbIconKey key(pieceName, frameItemParams.sizeList[i],
-                      (Qt::AspectRatioMode)frameItemParams.aspectRatioMode, (QIcon::Mode)frameItemParams.mode,
-                      (bool)frameItemParams.mirrored, color);
-        insertKeyIntoSessionList = IconInfoFromSingleIcon(key, data);
-        if (!insertKeyIntoSessionList) {
-            insertKeyIntoSessionList = CreateCacheItemData(key, 0, data, false);
+    try {
+        for (int i = 0; i < noOfPieces; i++) {
+            HbSharedIconInfo data;
+            QString pieceName((QChar*)frameItemParams.iconList[i].Ptr(), frameItemParams.iconList[i].Length());
+            HbIconKey key(pieceName, frameItemParams.sizeList[i],
+                          (Qt::AspectRatioMode)frameItemParams.aspectRatioMode, (QIcon::Mode)frameItemParams.mode,
+                          (bool)frameItemParams.mirrored, color);
+            insertKeyIntoSessionList = IconInfoFromSingleIcon(key, data);
+            if (!insertKeyIntoSessionList) {
+                insertKeyIntoSessionList = CreateCacheItemData(key, 0, data, false);
+            }
+            if ((data.type != INVALID_FORMAT) || (insertKeyIntoSessionList)) {
+                //The session will only keep track of icons that were either successfully found or were
+                //successfully inserted in the cache.
+                keysInserted.append(key);
+                iconInfoList.icon[i] = data;
+            }
+        }//end of for
+    } catch (std::exception &) {
+        for (int i = 0; i < noOfPieces; i++) {
+            iconInfoList.icon[i].type = INVALID_FORMAT;
         }
-        if ((data.type != INVALID_FORMAT) || (insertKeyIntoSessionList)) {
-            //The session will only keep track of icons that were either successfully found or were
-            //successfully inserted in the cache.
-            keysInserted.append(key);
-            iconInfoList.icon[i] = data;
+        QVector<HbIconKey>::const_iterator itEnd(keysInserted.constEnd());
+        for (QVector<HbIconKey>::const_iterator iter = keysInserted.constBegin();iter != itEnd;++iter) {
+            iServer->CleanupSessionIconItem(*iter);
         }
-    }//end of for
+    }
 }
 
 void HbThemeServerSession::unLoadIcon(const RMessage2& aMessage)
@@ -1716,6 +1871,41 @@
     }
 }
 
+/**
+freeClientGpuResources - unloads all the GPU resources in the session
+
+Iterates all the keys in sessionData and if the Icon Format Type is SGIMage 
+or NVG then CleanUpSessionIConItem is called on that item, which will do the 
+cleanup based on the reference count.
+*/
+void HbThemeServerSession::freeClientGpuResources()
+{
+#if defined(HB_SGIMAGE_ICON) || defined(HB_NVG_CS_ICON)
+	QList<HbIconKey> tempSessionData(sessionData);
+    QList<HbIconKey>::const_iterator itEnd( tempSessionData.constEnd() );
+    for ( QList<HbIconKey>::const_iterator iter = tempSessionData.constBegin();
+            iter != itEnd;
+            ++iter ) {
+                if ( iServer->IconTypeInCache(*iter) == SGIMAGE 
+                    || iServer->IconTypeInCache(*iter) == NVG ) {
+                    iServer->CleanupSessionIconItem(*iter);
+                    // remove the item in the session data.
+                    sessionData.removeOne(*iter);
+                }
+    }
+#endif
+}
+
+/**
+ * HbThemeServerSession::ClearSessionData
+ *
+ * Clears the session data list. Items in the server should be deleted before clearing.
+ */
+void HbThemeServerSession::ClearSessionData()
+{
+    sessionData.clear();
+}
+
 #ifdef HB_ICON_CACHE_DEBUG
 /**
  * iconRefCount
@@ -1750,3 +1940,133 @@
 #endif
 
 #endif
+
+CHbThemeChangeNotificationListener* CHbThemeChangeNotificationListener::NewL(HbThemeServerPrivate& aObserver)
+{
+    CHbThemeChangeNotificationListener* self = new (ELeave) CHbThemeChangeNotificationListener(aObserver);
+    CleanupStack::PushL(self);
+    self->ConstructL();
+    CleanupStack::Pop();
+    return self;        
+}
+
+CHbThemeChangeNotificationListener::CHbThemeChangeNotificationListener(HbThemeServerPrivate& aObserver)
+    :CActive(EPriorityStandard),iObserver(aObserver)
+{
+    
+}
+
+void CHbThemeChangeNotificationListener::ConstructL()
+{
+    TInt err = RProperty::Define( KServerUid3, KNewThemeForThemeChanger, RProperty::ELargeText, KAllowAllPolicy, KThemeChangerPolicy );
+     if ( err != KErrAlreadyExists ) {
+         User::LeaveIfError( err );
+     }
+    err = themeRequestProp.Attach(KServerUid3, KNewThemeForThemeChanger );
+    User::LeaveIfError(err);
+             
+    CActiveScheduler::Add(this);
+}
+
+CHbThemeChangeNotificationListener::~CHbThemeChangeNotificationListener()
+{
+    // Close the handle since it is not needed anymore
+    themeRequestProp.Close();
+    Cancel(); 
+}
+
+void CHbThemeChangeNotificationListener::startListening()
+{
+    if (IsActive()) {
+         return; //do nothing if allready listening
+    }
+
+    User::LeaveIfError(themeRequestProp.Attach(KServerUid3,KNewThemeForThemeChanger));
+    //Subscribe for updates
+    themeRequestProp.Subscribe(iStatus);
+    
+    SetActive();
+     
+}
+
+void CHbThemeChangeNotificationListener::stopListening()
+{
+     Cancel(); // cancel 
+     if(IsActive()) { // only if already listening
+        themeRequestProp.Close(); // Close the handle since it is not needed anymore
+   }
+}
+
+/*
+ * Returns TRUE if parsing succeeded, FALSE otherwise
+ */
+bool CHbThemeChangeNotificationListener::parseData( TDesC& requestData, HbThemeServerRequest& etype, TDes& data)
+{
+    TInt result = 0;
+    const TChar delimiter = ':';
+    // initialize return value as failed
+    bool bSuccess = false;
+    
+    result = requestData.Locate( delimiter );
+    if( KErrNotFound != result ) {
+        TInt len = requestData.Length();
+        const TDesC& typestr = requestData.Mid( 0, result);
+        TLex atype ( typestr );
+        TInt iType;
+        atype.Val( iType );
+        etype = static_cast<HbThemeServerRequest>(iType);
+        data.Copy( requestData.Mid( result + 1, len - result - 1 ) );
+        bSuccess = true;
+    } else {
+        bSuccess = false;
+    }
+    
+    return bSuccess;
+}
+
+void CHbThemeChangeNotificationListener::RunL()
+{
+    // Subscribe first to make sure we don't miss any
+    // when handling this one.
+    themeRequestProp.Subscribe(iStatus);    
+    
+    SetActive();
+    
+    TBuf<256> requestData;
+    TInt ret = themeRequestProp.Get(requestData);
+    switch (ret) {
+        case KErrNone:
+            {
+                QString qrequestData((QChar*)requestData.Ptr(),requestData.Length());
+                HbThemeServerRequest etype = EInvalidServerRequest;
+                TBuf<256> data;
+                ///Parse the data from the Publisher
+                bool bSuccess = parseData( requestData, etype, data);
+                if( bSuccess && EThemeSelection == etype) {
+                    QString str((QChar*)data.Ptr(),data.Length());
+                    str = str.trimmed();
+                    iObserver.HandleThemeSelection( str );
+                }     
+            }
+            break;
+        case KErrPermissionDenied:
+            qDebug() << "KErrPermissionDenied";
+            break;
+        case KErrNotFound:
+            qDebug() << "KErrNotFound";
+            break;
+        case KErrArgument:
+            qDebug() << "KErrArgument";
+            break;
+        case KErrOverflow:
+            qDebug() << "KErrOverflow";
+            break;
+    }
+}
+
+void CHbThemeChangeNotificationListener::DoCancel()
+{
+    themeRequestProp.Cancel();
+}
+
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbservers/hbthemeserver/hbthemeserver_symbian_p_p.h
--- a/src/hbservers/hbthemeserver/hbthemeserver_symbian_p_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbservers/hbthemeserver/hbthemeserver_symbian_p_p.h	Mon May 03 12:48:33 2010 +0300
@@ -45,6 +45,7 @@
 struct HbIconKey;
 class HbIconSource;
 class ThemeIndexTables;
+class CHbThemeChangeNotificationListener;
 
 // reasons for server panic
 enum TPixmapServPanic {
@@ -73,6 +74,7 @@
     // implements the pure virtutal function
     // defined in class CServer2
     HbThemeServerPrivate(CActive::TPriority aActiveObjectPriority);
+    HbIconFormatType IconTypeInCache( const HbIconKey &key ) const;
     static HbThemeServerPrivate * NewL(CActive::TPriority aActiveObjectPriority);
     ~HbThemeServerPrivate();
     CSession2 * NewSessionL(const TVersion& aVersion, const RMessage2& aMessage) const;
@@ -105,6 +107,11 @@
     void getThemeIndexTables(ThemeIndexTables &tables);
     void openCurrentIndexFile();
     void resolveCurrentThemeDrive();	
+    void HandleThemeSelection( const QString& themeName);
+
+    int freeSharedMemory();
+    int allocatedSharedMemory();
+    int allocatedHeapMemory();
 
 //Debug Code for Test Purpose
 #ifdef HB_ICON_CACHE_DEBUG
@@ -155,6 +162,9 @@
     QString lastThemeIndexKey;
 	
     static bool gpuGoodMemoryState;	
+    
+    QStringList romThemeNames;
+    CHbThemeChangeNotificationListener * iListener;
 };
 
 //**********************************
@@ -202,6 +212,8 @@
                    HbSharedIconInfoList &iconInfoList);
     void unLoadIcon(const RMessage2& aMessage);
     void unloadMultiIcon(const RMessage2& aMessage);
+    void freeClientGpuResources();
+    void ClearSessionData();
 
 protected:
     TIconParams ReadMessageAndRetrieveParams(const RMessage2 & aMessage);
@@ -212,4 +224,37 @@
     QList<HbIconKey> sessionData;
     QList<QString> sessionCssData;
 };
+
+//**********************************
+//CHbThemeChangeNotificationListener
+//**********************************
+/**
+This class represents a listener for Pub/Sub events sent from the clients.
+Functions are provided to parse clients messages.
+*/
+class CHbThemeChangeNotificationListener : public CActive
+{
+public:
+    static CHbThemeChangeNotificationListener* NewL(HbThemeServerPrivate& aObserver);
+    virtual ~CHbThemeChangeNotificationListener();
+    void startListening();
+    void stopListening();
+
+protected: // From CActive
+    void RunL();
+    void DoCancel();
+    
+private:
+    CHbThemeChangeNotificationListener(HbThemeServerPrivate& aObserver);
+    void ConstructL();
+    bool parseData( TDesC& requestData, HbThemeServerRequest& etype, TDes& data);
+    
+        
+private: // data
+    RProperty themeRequestProp;
+    HbThemeServerPrivate& iObserver;
+};
+
+
 #endif // HBTHEMESERVER_SYMBIAN_P_H 
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbservers/hbthemeserver/hbthemeserversymbian.cpp
--- a/src/hbservers/hbthemeserver/hbthemeserversymbian.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1496 +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 "hbthemeserversymbian_p.h"
-#include "hbthemeserverutils_p.h"
-#include "hbmemorymanager_p.h"
-#include "hbiconsource_p.h"
-#include "hbthemeindex_p.h"
-#include "hbthemeutils_p.h"
-
-#include <QHash>
-#include <QImage>
-#include <QSettings>
-#include <QSharedMemory>
-#include <QDebug>
-#include <QProcess>
-#include <QFile>
-#include <QPainter>
-#include <QSizeF>
-#include <e32property.h>
-#include <e32base.h>
-#include <e32svr.h>
-#include "hbpixmapiconprocessor_p.h"
-#include "hbpixmapiconimpl_p.h"
-#include "hblayeredstyleloader_p.h"
-#include "hbmemoryutils_p.h"
-#include "hbdeviceprofiledatabase_p.h"
-// 5 MB GPU cache size
-#define GPU_CACHE_SIZE 0x500000
-
-// 5 MB  CPU cache size
-#define CPU_CACHE_SIZE 0x500000
-
-const TInt KThemeName = 0;
-
-
-
-static HbThemeServerSymbian *TheServer = 0;
-
-// This is used as parent theme always regardless of the active theme
-static const char *baseThemeName = "hbdefault";
-const int themeIndexFailed = -2; // error code to indicate failure in processing theme index
-
-//**********************************
-//HbThemeServerSymbian
-//**********************************
-/**
-Our server class - an active object - and therefore derived ultimately from CActive.
-It accepts requests from client threads and forwards
-them to the client session to be dealt with. It also handles the creation
-of the server-side client session.
-*/
-
-/**
-NewL
- */
-HbThemeServerSymbian * HbThemeServerSymbian::NewL(CActive::TPriority aActiveObjectPriority)
-{
-    HbThemeServerSymbian* self = new(ELeave) HbThemeServerSymbian(aActiveObjectPriority);
-    CleanupStack::PushL(self);
-    self->ConstructL();
-    CleanupStack::Pop(); // self
-    return self;
-}
-
-/**
-ConstructL
- */
-void HbThemeServerSymbian::ConstructL()
-{
-    TInt err = RProperty::Define(KServerUid3, KThemeName, RProperty::ELargeText);
-    if ( err != KErrAlreadyExists ) {
-        User::LeaveIfError( err );
-    }
-    TInt error = iThemeProperty.Attach(KServerUid3, KThemeName );
-    User::LeaveIfError(error);
-    
-    QSettings settings(QLatin1String(ORGANIZATION), QLatin1String(THEME_COMPONENT));
-    // Store the active theme name in a member string
-    iCurrentThemeName = settings.value("currenttheme").toString();
-    
-    // HACK
-    if (iCurrentThemeName.isEmpty()) {
-        iCurrentThemeName = "sfblacktheme";
-    }
-    
-    // TODO: Get default theme name if current theme setting does not return theme name
-
-/*
-    if (iCurrentThemeName.isEmpty()) {
-        iCurrentThemeName = HbThemeUtils::defaultTheme();
-        settings.setValue("currenttheme", iCurrentThemeName); 
-        settings.sync();
-        TPtrC name(reinterpret_cast<const TUint16 *>(iCurrentThemeName.constData()));
-        iThemeProperty.Set(name);
-    }
-*/
-
-    // Resolve the drive letter of the current theme
-    resolveCurrentThemeDrive();
-    // Open index file to prevent uninstallation of the active theme
-    openCurrentIndexFile();
-
-    //Create the Icon cache
-    cache = new HbIconDataCache();
-    setMaxGpuCacheSize(GPU_CACHE_SIZE);
-    setMaxCpuCacheSize(CPU_CACHE_SIZE);
-    
-    //Create the CSS cache
-    cssCache = new HbCache();
-    
-    // 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
-    
-    // Process base theme index, it is used as parent index also when the current theme is something else
-    processThemeIndex(baseThemeName, QChar('Z'));
-    baseThemeIndexKey = themeIndexKey(baseThemeName, QChar('Z'));
-}
-
-/**
-Constructor takes the server priority value. 
-
-The server is an active object, and the priority value is the priority
-of this active object.
-
-It passes the priority value to the base class in the Ctor list.
-By default, the session is not sharable, which is what we want here
-so no second parameter is passed to the CServer2 constructor.
-*/
-HbThemeServerSymbian::HbThemeServerSymbian( CActive::TPriority aActiveObjectPriority )
-    : CServer2( aActiveObjectPriority ),
-      currentThemeDrive('Z') // Assume default theme is in ROM
-{
-    // Set server pointer in static variable
-    TheServer = this;
-}
-
-/**
-Destructor
- */
-HbThemeServerSymbian::~HbThemeServerSymbian()
-{
-    delete cache;
-    delete cssCache;
-    cache = NULL;      // so that HbSymbianThemeServSession::~HbSymbianThemeServSession can avoid using these pointers;
-	cssCache = NULL;   // it may be called inside HbThemeServerSymbian::~HbThemeServerSymbian
-}
-
-HbThemeServerSymbian *HbThemeServerSymbian::Instance()
-{
-    return TheServer;
-}
-
-void HbThemeServerSymbian::openCurrentIndexFile()
-{
-    // Open index file to prevent uninstallation of the active theme
-    if (!iCurrentThemeName.isEmpty() && currentThemeDrive != 'Z') {
-        QString indexFileName;
-        indexFileName.append(currentThemeDrive);
-        indexFileName.append("\\resource\\hb\\themes\\icons\\");
-        indexFileName.append(iCurrentThemeName);
-        indexFileName.append("\\index.theme");
-
-        currentIndexfile.setFileName(indexFileName);
-        if(!currentIndexfile.open(QIODevice::ReadOnly)) {
-            qWarning()<< "HbSymbianThemeServer: No Index file found in the new theme, How did this happen ??";
-        }
-    }
-}
-
-void HbThemeServerSymbian::resolveCurrentThemeDrive()
-{
-    if (!iCurrentThemeName.isEmpty()) {
-        // Check for the theme's icon directory in different drives.
-        // ROM is checked first and then phone memory and memory card drives.
-
-        QString filename = "Z:\\resource\\hb\\themes\\icons\\";
-        filename.append(iCurrentThemeName);
-
-        if (QFile::exists(filename)) {
-            currentThemeDrive = 'Z';
-            return;
-        }
-    
-        filename[0] = 'C';
-        if (QFile::exists(filename)) {
-            currentThemeDrive = 'C';
-            return;
-        }
-
-        filename[0] = 'E';
-        if (QFile::exists(filename)) {
-            currentThemeDrive = 'E';
-            return;
-        }
-        
-        // Default to 'Z' if not found in any drive
-        currentThemeDrive = 'Z';
-    }
-}
-
-/**
-Creates a new session with the server.
-*/
-CSession2* HbThemeServerSymbian::NewSessionL(const TVersion& aVersion, const RMessage2& /*aMessage*/) const
-{
-#ifdef THEME_SERVER_TRACES 
-    qDebug() << "HbThemeServerSymbian::NewSessionL: entered";
-#endif    
-    // Check that the version is OK
-    TVersion v( KThemeServerMajorVersionNumber, KThemeServerMinorVersionNumber, KThemeServerBuildVersionNumber );
-    if (!User::QueryVersionSupported( v, aVersion ))
-        User::Leave( KErrNotSupported );  
-    // Create the session.
-    return new (ELeave) HbSymbianThemeServSession( const_cast<HbThemeServerSymbian*>(this) );
-}
-
-/**
-A utility function to panic the server.
-*/
-void HbThemeServerSymbian::PanicServer(TPixmapServPanic aPanic)
-{
-    _LIT(KTxtServerPanic, "Pixmap server panic");
-    User::Panic(KTxtServerPanic, aPanic);
-}
-
-/**
- * HbThemeServerSymbian::insertIconCacheItem
- * 
- * Inserts an icon-cache item along with its key into the icon-cache.
- */
-bool HbThemeServerSymbian::insertIconCacheItem ( const HbIconKey &key,  HbIconCacheItem* item )
-{
-    return (cache->insert(key, item));
-
-}
-
-/**
- * HbThemeServerSymbian::insertCssCacheItem
- * 
- * Inserts a css-cache item along with its key into the css-cache.
- */
-bool HbThemeServerSymbian::insertCssCacheItem ( const QString& key,  HbCacheItem* item )
-{
-    return (cssCache->insert(key, item));
-}
-
-/**
- * HbThemeServerSymbian::iconCacheItem
- * 
- * Retrieves a icon cache-item from the icon cache based on it's key.
- */
-HbIconCacheItem * HbThemeServerSymbian::iconCacheItem ( const HbIconKey &key , bool isMultiIconPiece )
-{
-    return(cache->getCacheItem(key, isMultiIconPiece));
-}
-
-/**
- * HbThemeServerSymbian::cssCacheItem
- * 
- * Retrieves a css-cache item from the css cache based on it's key.
- */
-HbCacheItem * HbThemeServerSymbian::cssCacheItem ( const QString &key)
-{
-    return(cssCache->cacheItem(key));
-}
-
-void HbThemeServerSymbian::insertIconDefaultSizeCacheItem(const QString &key, const QSizeF &item)
-{
-    iconDefaultSizes.insert(key, item);
-}
-
-QSizeF HbThemeServerSymbian::iconDefaultSizeCacheItem(const QString &key)
-{
-    return iconDefaultSizes.value(key);
-}
-
-/**
- * HbThemeServerSymbian::clearIconCache
- * 
- * Clears icon cache.
- */
-void HbThemeServerSymbian::clearIconCache()
-{
-    cache->clear();
-}
-
-/**
- * HbThemeServerSymbian::clearCssCache
- * 
- * Clears css cache.
- */
-void HbThemeServerSymbian::clearCssCache()
-{
-    cssCache->clear();
-}
-
-/**
- * HbThemeServerSymbian::CleanupSessionIconItem
- * 
- * Removes an icon cache-item from icon-cache based on it's key.
- */
-void HbThemeServerSymbian::CleanupSessionIconItem(HbIconKey key)
-{
-    /*
-	    Don't call any HbIconDataCache functions if HbThemeServerSymbian has already deleted it,
-	     which happens when ThemeServer is closed before the client(s).
-	*/
-    if(cache)
-        cache->remove(key); 
-}
-
-/**
- * HbThemeServerSymbian::CleanupSessionCssItem
- * 
- * Removes a css cache-item from css-cache based on it's key.
- */
-void HbThemeServerSymbian::CleanupSessionCssItem(QString key)
-{
-    /*
-	    Don't call any HbCache ( CssCache )  functions if HbThemeServerSymbian has already deleted it,
-	     which happens when ThemeServer is closed before the client(s).
-	*/
-    if(cssCache)
-        cssCache->remove(key); 
-}
-
-/**
-HbThemeServerSymbian::setMaxGpuCacheSize
- */
-void HbThemeServerSymbian::setMaxGpuCacheSize(int size)
-{
-    cache->setMaxGpuCacheSize(size);
-}
-
-/**
-HbThemeServerSymbian::setMaxGpuCacheSize
- */
-void HbThemeServerSymbian::setMaxCpuCacheSize(int size)
-{
-    cache->setMaxCpuCacheSize(size);
-}
-
-//Debug Code for Test Purpose
-#ifdef HB_ICON_CACHE_DEBUG
-int HbThemeServerSymbian ::cacheIconCount() const
-{
-    return cache->count();
-}
-
-int HbThemeServerSymbian::freeVectorMemory()
-{
-    return cache->freeVectorMemory();
-}
-
-int HbThemeServerSymbian::freeRasterMemory()
-{
-    return cache->freeRasterMemory();
-}
-
-int HbThemeServerSymbian::lastAddedRefCount()
-{
-    return cache->lastAddedRefCount();
-}
-
-int HbThemeServerSymbian::lastAddedItemMem()
-{
-    return cache->lastAddedItemMem();
-}
-
-int HbThemeServerSymbian::lastRemovedItemMem()
-{
-    return cache->lastRemovedItemMem();
-}
-
-int HbThemeServerSymbian::lastRemovedItemRfCount()
-{
-    return cache->lastRemovedItemRfCount();
-}
-
-bool HbThemeServerSymbian::enableCache(bool cacheIt)
-{
-    return cache->enableCache(cacheIt);
-}
-
-int HbThemeServerSymbian::cacheHitCount()
-{
-    return cache->cacheHitCount();
-}
-
-int HbThemeServerSymbian::cacheMissCount()
-{
-    return cache->cacheMissCount();
-}
-
-int HbThemeServerSymbian::serverHeapSize()
-{
-    TInt heapSize = 0; 
-    User::AllocSize(heapSize);
-    return heapSize;
-}
-
-void HbThemeServerSymbian::cleanVectorLRUList()
-{
-    cache->cleanVectorLRUList();
-}
-
-void HbThemeServerSymbian::cleanRasterLRUList()
-{
-    cache->cleanRasterLRUList();
-}
-
-int HbThemeServerSymbian::rasterLruCount()
-{
-    return cache->rasterLruCount();
-}
-
-int HbThemeServerSymbian::vectorLruCount()
-{
-    return cache->vectorLruCount();
-}
-#endif
-
-/**
- * HbThemeServerSymbian::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 LRU 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 HbThemeServerSymbian::doCleanup() 
-{
-    HbThemeServerUtils::cleanupUnusedCss(cssCache);
-}
-
-QString HbThemeServerSymbian::themeIndexKey(const QString &theme, const QChar drive)
-{
-    QString key(drive);
-    key.append(':');
-    key.append(theme);
-    return key;
-}
-
-void HbThemeServerSymbian::processThemeIndex(const QString &theme, const QChar drive)
-{
-    QString filename(drive);
-    filename.append(":\\resource\\hb\\themes\\");
-    filename.append(theme);
-    filename.append(".themeindex");
-    
-    QFile indexFile(filename);
-
-    bool indexOK = false;
-
-    if (indexFile.open(QIODevice::ReadOnly)) {
-
-        indexOK = true;
-
-        GET_MEMORY_MANAGER(HbMemoryManager::SharedMemory);
-
-        qint64 byteSize = indexFile.size();
-        
-        int offset = manager->alloc(byteSize);
-        if (offset >= 0) {        
-            // Read the theme index in the shared chunk
-            char *address = HbMemoryUtils::getAddress<char>(HbMemoryManager::SharedMemory, offset);
-
-            #ifdef THEME_INDEX_TRACES
-            qDebug() <<  "ThemeIndex: Reading themeindex for theme" << theme.toUtf8();
-            #endif
-
-            indexFile.read(address, byteSize);
-            indexFile.close();
-
-            #ifdef THEME_INDEX_TRACES
-            qDebug() <<  "ThemeIndex: Reading themeindex for theme" << theme.toUtf8() << "... Done!";
-            #endif
-
-            // Verify theme index contents if it is not located in ROM,
-            // so that it does not have over-indexing offsets which might
-            // crash all the clients trying to read from it.
-            
-            if (drive != 'Z') {
-                #ifdef THEME_INDEX_TRACES
-                qDebug() <<  "ThemeIndex: Validating themeindex for theme" << theme.toUtf8();
-                #endif
-
-                HbThemeIndex index(address);
-                int count = index.itemCount();
-                if (count * sizeof(HbThemeIndexItem) >= byteSize) {
-                    indexOK = false;
-                } else {
-                    const HbThemeIndexItem *itemArray = index.itemArray();
-                    int stringAreaStart = reinterpret_cast<int>(index.stringAreaStart()) - reinterpret_cast<int>(address);
-
-                    for (int i = 0; i<count; i++) {
-                        const HbThemeIndexItem *item = itemArray++;
-                        if (item->iconnameOffset < stringAreaStart || item->iconnameOffset >= byteSize ||
-                            item->folderOffset < stringAreaStart || item->folderOffset >= byteSize ||
-                            item->extOffset < stringAreaStart || item->extOffset >= byteSize ||
-                            item->mirroredExtOffset != -1 &&
-                            (item->mirroredExtOffset < stringAreaStart || item->mirroredExtOffset >= byteSize)) {
-                            
-                            indexOK = false;
-                            break;
-                        }
-                    }
-                    
-                }
-
-                #ifdef THEME_INDEX_TRACES
-                qDebug() <<  "ThemeIndex: Validating themeindex for theme" << theme.toUtf8() << "... Done!";
-                #endif
-            }
-
-            if (indexOK) {
-                // Clear some old indexes so the chunk does not get filled completely if
-                // the user switches themes a lot.
-                removeOldThemeIndexes();            
-                // Store offset to the index in chunk
-                lastThemeIndexKey = themeIndexKey(theme, drive);
-                themeIndexes.insert(lastThemeIndexKey, offset);                
-            } else {
-                // If the index contents were not OK, remove the index from the chunk
-                manager->free(offset);
-            }
-        }
-    }
-
-
-    if (!indexOK) {
-        // If there was a problem with the index, store error code so the index loading is not retried.
-        themeIndexes.insert(themeIndexKey(theme, drive), themeIndexFailed);
-    }
-}
-
-void HbThemeServerSymbian::removeOldThemeIndexes()
-{
-    // This function removes the previously used theme indexes from the shared chunk.
-    // The last index is not removed, because some clients might be still using it.
-    // Also the base theme index is never removed.
-    
-    QMap<QString, int>::const_iterator i = themeIndexes.constBegin();
-
-    GET_MEMORY_MANAGER(HbMemoryManager::SharedMemory);
-
-    while (i != themeIndexes.constEnd()) {
-        if (i.value() != themeIndexFailed && i.key() != baseThemeIndexKey && i.key() != lastThemeIndexKey) {
-            QString key = i.key();
-            // Advance iterator before removing the current item from the map.
-            i++;
-
-            // Remove the theme index table from the shared chunk and offset map
-            manager->free(i.value());        
-            themeIndexes.remove(key);
-        } else {
-            i++;
-        }
-    }
-}
-
-void HbThemeServerSymbian::getThemeIndexTables(ThemeIndexTables &tables)
-{
-    QString key = themeIndexKey(iCurrentThemeName, currentThemeDrive);
-    int offset = themeIndexes.value(key, -1);
-
-    // If the index has failed earlier, do not retry
-    if (offset == themeIndexFailed) {
-        return;
-    }
-
-    if (offset == -1) {
-        processThemeIndex(iCurrentThemeName, currentThemeDrive);
-    }
-    
-    tables.tables[0] = themeIndexes.value(key, -1);
-    tables.drives[0] = currentThemeDrive;
-
-    // Set base theme table as parent table if the current theme is not the base theme
-    if (tables.tables[0] >= 0 && iCurrentThemeName != baseThemeName) {
-        QString base(baseThemeName);
-        tables.tables[1] = themeIndexes.value(themeIndexKey(base, 'Z'), -1);
-        tables.drives[1] = 'Z';
-    }    
-}
-
-
-//**********************************
-//HbSymbianThemeServSession
-//**********************************
-/**
-This class represents a session with the  server.
-Functions are provided to respond appropriately to client messages.
-*/
-
-/**
-Constructor
-*/
-HbSymbianThemeServSession::HbSymbianThemeServSession(HbThemeServerSymbian *aServer):
-        iServer(aServer)        
-{
-
-}
-
-/**
-Destructor
-*/
-HbSymbianThemeServSession::~HbSymbianThemeServSession()
-{
-    //Clean up the icon related session-specific info
-  QList<HbIconKey>::const_iterator itEnd( sessionData.constEnd() );
-    for ( QList<HbIconKey>::const_iterator iter = sessionData.constBegin();
-            iter != itEnd;
-            ++iter ) {
-                iServer->CleanupSessionIconItem(*iter);
-    }   
-    //clean up css related session-specific info
-    QList<QString>::const_iterator iterEnd( sessionCssData.constEnd() );
-    for ( QList<QString>::const_iterator iter = sessionCssData.constBegin();
-            iter != iterEnd;
-            ++iter ) {
-                iServer->CleanupSessionCssItem(*iter);
-        }
-    
-    sessionData.clear();
-    sessionCssData.clear();
-}
-
-TIconParams HbSymbianThemeServSession::ReadMessageAndRetrieveParams(const RMessage2& aMessage)
-{
-    TInt deslen = aMessage.GetDesLength(0);
-    TIconParams params;
-    TPckg<TIconParams> paramPckg(params);
-    // Copy the client's descriptor data into our buffer.
-    aMessage.ReadL(0, paramPckg, 0);
-    return params;
-}
-
-/**
-Services a client request.
-*/
-void HbSymbianThemeServSession::ServiceL(const RMessage2& aMessage)
-{    
-#ifdef THEME_SERVER_TRACES 
-    qDebug() << "Just entered HbSymbianThemeServSession::ServiceL";
-#endif    
-    
-    TRAPD(err, DispatchMessageL(aMessage));
-    aMessage.Complete(err);
-    QString er;
-    er.setNum(err);
-    
-#ifdef THEME_SERVER_TRACES 
-    qDebug() << "completed DispatchMessageL error code is " + er;
-#endif    
-    
-}
-
-/**
-Called by ServiceL()
-
-It tests the function code and then delegates to
-the appropriate function.
-*/
-void HbSymbianThemeServSession::DispatchMessageL(const RMessage2& aMessage)
-{    
-#ifdef THEME_SERVER_TRACES 
-    qDebug() << "Just entered HbSymbianThemeServSession::DispatchMessageL";
-#endif       
-    
-    switch (aMessage.Function()) {
-    case EStyleSheetLookup:
-        HandleStyleSheetLookupL(aMessage);
-        break;   
-    case EWidgetMLLookup:
-        HandleWidgetMLLookupL(aMessage);
-        break;
-    case EDeviceProfileOffset:
-        HandleDeviceProfilesReqL(aMessage);
-        break;
-    case ESecondaryCacheOffset:
-        HandleSecondaryCacheOffsetReqL(aMessage);
-        break;
-    case EEffectAdd: // FALLTHROUGH
-    case EEffectLookupFilePath:
-        HandleEffectAddAndFileLookupL(aMessage);
-        break;
-
-    case EIconLookup:
-        GetSharedIconInfoL(aMessage);
-        break;
-        
-    case EIconDefaultSize:
-        GetSharedIconDefaultSizeInfoL(aMessage);
-        break;
-
-    case EThemeSelection:
-        HandleThemeSelectionL(aMessage);
-        break;
-        
-    case EMultiPieceIcon: 
-        GetSharedMultiIconInfoL(aMessage);
-        break;
-
-        //Debug Code for Test Purpose
-#ifdef HB_ICON_CACHE_DEBUG
-        case ECacheIconCount: {
-            TInt count = iServer->cacheIconCount();             
-            TPckg<TInt> out(count);
-            aMessage.WriteL(1, out);
-            break;
-        }
-        case ERasterMemLimit: {
-            TInt params = 0;
-            TPckg<TInt> paramPckg(params);      
-            aMessage.ReadL(0, paramPckg, 0);
-            
-            iServer->setMaxGpuCacheSize(params);
-            break;  
-        }
-        case EVectorMemLimit: {
-            TInt params = 0;
-            TPckg<TInt> paramPckg(params);      
-            aMessage.ReadL(0, paramPckg, 0);            
-            iServer->setMaxCpuCacheSize(params); 
-            break;
-        }
-        case EFreeRasterMem: {
-            TInt freeRastMem = iServer->freeRasterMemory();
-            TPckg<TInt> out(freeRastMem);
-            aMessage.WriteL(1, out);
-            break;
-        }
-        case EFreeVectorMem: {
-            TInt freeVectMem = iServer->freeVectorMemory();
-            TPckg<TInt> out(freeVectMem);
-            aMessage.WriteL(1, out);
-            break;
-        }
-        case ELastAddedItemMem: {
-            TInt lAddItemMem = iServer->lastAddedItemMem();
-            TPckg<TInt> out(lAddItemMem);
-            aMessage.WriteL(1, out);
-            break;
-        }
-        case ELastRemovedItemMem: {
-            TInt lRemItemMem = iServer->lastRemovedItemMem();
-            TPckg<TInt> out(lRemItemMem);
-            aMessage.WriteL(1, out);
-            break;
-        }
-        case ELastAddedItemRefCount: {
-            TInt lAddItemRfCnt = iServer->lastAddedRefCount();
-            TPckg<TInt> out(lAddItemRfCnt);
-            aMessage.WriteL(1, out);
-            break;
-        }
-        case EEnableCache: {
-            TBool params = 0;
-            TPckg<TBool> paramPckg(params);     
-            aMessage.ReadL(0, paramPckg, 0);
-            TBool success = iServer->enableCache(params);
-            TPckg<TBool> out(success);
-            aMessage.WriteL(1, out);
-            break;
-        }
-        case ECacheHit: {
-            int cacheHitCnt = iServer->cacheHitCount();
-            TPckg<TInt> out(cacheHitCnt);
-            aMessage.WriteL(1, out);
-            break;
-        }
-        case ECacheMiss: {
-            int cacheMissCnt = iServer->cacheMissCount();
-            TPckg<TInt> out(cacheMissCnt);
-            aMessage.WriteL(1, out);
-            break;
-        }
-        case ECleanRasterLRUList: {
-            iServer->cleanRasterLRUList();
-            break;
-        }
-        case ECleanVectorLRUList: {
-            iServer->cleanVectorLRUList();
-            break;
-        }
-        case EGpuLruCount: {
-            TInt rasterMissCount = iServer->rasterLruCount();
-            TPckg<TInt> out(rasterMissCount);
-            aMessage.WriteL(1, out);
-            break;
-        }
-        case ECpuLruCount: {
-            TInt vectorMissCount = iServer->vectorLruCount();
-            TPckg<TInt> out(vectorMissCount);
-            aMessage.WriteL(1, out);
-            break;
-        }
-        case EServerHeap: {
-            TInt heapSize = iServer->serverHeapSize();
-            TPckg<TInt> out(heapSize);
-            aMessage.WriteL(1, out);
-            break;
-        }
-        
-        case ELastRemovedItemRefCount: {
-            TInt lastItemRemovedRefCount = iServer->lastRemovedItemRfCount();
-            TPckg<TInt> out(lastItemRemovedRefCount);
-            aMessage.WriteL(1, out);
-            break;
-        }
-        
-        case EServerHeapMarkStart: {
-            __UHEAP_MARK;
-            break;
-        }
-
-        case EServerHeapMarkEnd: {
-            __UHEAP_MARKEND;
-            break;
-        }
-
-        case EServerAllocFail: {
-            //TODO
-            break;
-        }
-        
-        case EServerAllocReset: {
-            //TODO
-            break;
-        }
-#endif
-        case EUnloadIcon: {
-            TIconParams params = ReadMessageAndRetrieveParams(aMessage);
-            QString filename((QChar*)params.fileName.Ptr(),params.fileName.Length());
-            QColor color = GetColorFromRgba(params.rgba,params.colorflag);
-            HbIconKey key(filename, QSizeF(params.width, params.height), 
-                        (Qt::AspectRatioMode)params.aspectRatioMode,
-                        (QIcon::Mode)params.mode, params.mirrored, color);
-            iServer->CleanupSessionIconItem(key);
-            sessionData.removeOne(key);
-            break;
-
-        }
-
-        case EThemeIndex: {
-            // Using leave here because this function does not return a value
-            ThemeIndexTables tables;
-            iServer->getThemeIndexTables(tables);
-            TPckg<ThemeIndexTables> out(tables);
-            aMessage.WriteL(0, out);
-            break;
-        }
-
-        // This is an example of a request that we know about, but don't support.
-        // We cause KErrNotSupported to be returned to the client.
-        default:
-            PanicClient(aMessage, EBadRequest);
-            break;
-    }
-#ifdef THEME_SERVER_TRACES 
-    qDebug() << "Leave HbSymbianThemeServSession::DispatchMessageL";
-#endif  
-    
-}
-
-/**
- * HandleStyleSheetLookupL
- */
-void HbSymbianThemeServSession::HandleStyleSheetLookupL(const RMessage2& aMessage)
-{
-    if (aMessage.GetDesLength(0) == 0) {    
-#ifdef THEME_SERVER_TRACES 
-        qDebug() << "Empty Filename";
-#endif         
-        return;
-    }
-
-    TBuf<256> fileName;
-    aMessage.ReadL(0, fileName, 0);
-    TBuf<256> layerPriorityBuf;
-    aMessage.ReadL(1,layerPriorityBuf,0);
-    TLex lex(layerPriorityBuf);
-    TInt priorityValue;
-    lex.Val(priorityValue);
-
-    HbLayeredStyleLoader::LayerPriority layerPriority = ( HbLayeredStyleLoader::LayerPriority) priorityValue;
-
-    QString cssFileName((QChar*)fileName.Ptr(), fileName.Length()); 
-    HbSharedStyleSheetInfo offsetInfo;
-    HbCacheItem* cssCacheItem = iServer->cssCacheItem(cssFileName);
-    bool insertKeyIntoSessionList = false;
-    if ( cssCacheItem ) {
-        //The item was found in the cache and reference count was incremented
-        insertKeyIntoSessionList = true;
-        offsetInfo.offset = cssCacheItem->offset;
-    }
-    else{
-            bool tryAgain = false;
-            do{
-                offsetInfo.offset = HbThemeServerUtils::getSharedStylesheet(cssFileName,layerPriority);
-                if(offsetInfo.offset >= 0){
-                    HbCacheItem *cssItem =  new HbCacheItem(offsetInfo.offset,0,cssFileName);
-                    insertKeyIntoSessionList = iServer->insertCssCacheItem(cssFileName,cssItem);
-                    if(layerPriority == HbLayeredStyleLoader::Priority_Core && cssItem->refCount == 1) {
-                        // This will make sure the requested stylesheet will always remain
-                        // in the primary and secondary cache.
-                        cssItem->incrementRefCount();
-                    }
-                    break;
-                }else if(offsetInfo.offset == OUT_OF_MEMORY_ERROR && tryAgain == false){
-                    iServer->doCleanup();
-                    tryAgain = true;
-                }else if(offsetInfo.offset == OUT_OF_MEMORY_ERROR && tryAgain == true){
-                    //try only once to free up memory, else offset remains -2
-                    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(cssFileName);
-        }
-    TPckg<HbSharedStyleSheetInfo> data(offsetInfo);
-    aMessage.WriteL(2, data);
-}
-
-/**
- * HandleWidgetMLLookUp
- */
-void HbSymbianThemeServSession::HandleWidgetMLLookupL(const RMessage2& aMessage)
-{
-    if (aMessage.GetDesLength(0) == 0) {
-        return;
-    }
-
-    TBuf<256> fileName;
-    aMessage.ReadL(0, fileName, 0);
-    TBuf<256> layoutName;
-    aMessage.ReadL(1, layoutName, 0);
-    TBuf<256> sectionName;
-    aMessage.ReadL(2, sectionName, 0);
-
-    QString wmlFileName((QChar*)fileName.Ptr(), fileName.Length());
-    QString layout((QChar*)layoutName.Ptr(), layoutName.Length());
-    QString section((QChar*)sectionName.Ptr(), sectionName.Length());
-
-    HbSharedWMLInfo offsetInfo;
-    offsetInfo.offset = HbThemeServerUtils::getSharedLayoutDefinition(wmlFileName,layout,section);
-    TPckg<HbSharedWMLInfo> data(offsetInfo);
-    aMessage.WriteL(3, data);
-}
-
-
-/**
- * Handle DeviceProfiles Request.
- */
-void HbSymbianThemeServSession::HandleDeviceProfilesReqL(const RMessage2& aMessage)
-{
-    HbDeviceProfileInfo offsetInfo;
-    HbDeviceProfileDatabase *deviceProfileDatabase = HbDeviceProfileDatabase::instance(HbMemoryManager::SharedMemory);
-    if(deviceProfileDatabase) {
-    	offsetInfo.offset = deviceProfileDatabase->deviceProfilesOffset();
-    } else {
-    	offsetInfo.offset = -1;
-    }
-    TPckg<HbDeviceProfileInfo> data(offsetInfo);
-    aMessage.WriteL(0, data);
-}
-
-/**
- * Handle SecondaryCacheOffset Request.
- */
-void HbSymbianThemeServSession::HandleSecondaryCacheOffsetReqL(const RMessage2& aMessage)
-{
-    SecondaryCacheInfo offsetInfo;
-    offsetInfo.offset = HbThemeServerUtils::sharedCacheOffset();
-    TPckg<SecondaryCacheInfo> data(offsetInfo);
-    aMessage.WriteL(0, data);
-}
-
-/**
- * HandleEffectAddAndFileLookupL
- */
-void HbSymbianThemeServSession::HandleEffectAddAndFileLookupL(const RMessage2& aMessage)
-{
-    TInt fileNameLength = aMessage.GetDesLength(0);
-    if (fileNameLength == 0) {
-        return;
-    }
-
-    TFileName fileName;
-    aMessage.ReadL(0, fileName, 0);
-    QString effFileName((QChar*)fileName.Ptr(), fileName.Length()); 
-    HbSharedEffectInfo offsetInfo;
-    offsetInfo.offset = HbThemeServerUtils::getSharedEffect(effFileName);
-    TPckg<HbSharedEffectInfo> data(offsetInfo);
-    aMessage.WriteL(1, data);
-}
-
-void HbSymbianThemeServSession::GetSharedIconDefaultSizeInfoL(const RMessage2 &aMessage)
-{
-    TIconParams params = ReadMessageAndRetrieveParams(aMessage);
-
-    // Need to be allocated from heap or the leave in the end causes a crash
-    QScopedPointer<QString> filenamePtr(new QString((QChar*)params.fileName.Ptr(), params.fileName.Length()));
-    
-    // See if the icon's default size has been queried already earlier and
-    // can be found stored in the hash.
-
-    QSizeF defSize = iServer->iconDefaultSizeCacheItem(*filenamePtr.data());
-                    
-    if (!defSize.isValid()) {
-        defSize = RetrieveIconDefaultSize(*filenamePtr.data());
-
-        // If the default size was retrieved, insert it in the hash for further lookups
-        if (defSize.isValid()) {
-            iServer->insertIconDefaultSizeCacheItem(*filenamePtr.data(), defSize);
-        }
-    }
-    
-    // Return the default size back to the client if it was resolved
-    if (defSize.isValid()) {    
-        TPckg<QSizeF> returnData(defSize);
-        aMessage.WriteL(1, returnData);
-#ifdef THEME_SERVER_TRACES 
-        qDebug() << "Completed aMessage.WriteL";
-#endif
-    }
-    // Otherwise leave with error code
-    else {
-        User::Leave(KErrNotFound);
-    }
-}
-
-QSizeF HbSymbianThemeServSession::RetrieveIconDefaultSize(const QString &filename)
-{
-    QSizeF ret;
-
-    // Get icon source, previous icons sources are cached so if accessed again,
-    // they don't need to be loaded and parsed from a file always.
-    HbIconSource *source = HbThemeServerUtils::getIconSource(filename);
-    if (source) {
-        ret = source->defaultSize();
-    }
-
-    return ret;
-}
-
-/**
- * GetSharedIconInfoL
- */
-void HbSymbianThemeServSession::GetSharedIconInfoL(const RMessage2& aMessage)
-{
-    HbSharedIconInfo data;
-    TIconParams params = ReadMessageAndRetrieveParams(aMessage);
-
-    QString filename((QChar*)params.fileName.Ptr(), params.fileName.Length());
-    QColor color = GetColorFromRgba(params.rgba,params.colorflag);
-    HbIconKey key(filename, QSizeF(params.width, params.height), 
-                    (Qt::AspectRatioMode)params.aspectRatioMode,
-                    (QIcon::Mode)params.mode, params.mirrored, color);
-                    
-    HbIconCacheItem* cacheItem = iServer->iconCacheItem(key);
-    bool insertKeyIntoSessionList = false;  
-    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 );
-        cacheItem = HbIconCacheItemCreator::createCacheItem( key, 
-                          (HbIconLoader::IconLoaderOptions)params.options, format);
-        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);
-                if (!insertKeyIntoSessionList ) {
-                    FreeDataFromCacheItem(cacheItem);
-                    delete cacheItem; // do delete the item after gpu/cpu memory is freed
-                    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.       
-        sessionData.append(key);
-    }
-    // create dshared pixmap info from HbIconCacheItem  
-    TPckg<HbSharedIconInfo> pixdata(data);
-    aMessage.WriteL(1, pixdata);
-    
-#ifdef THEME_SERVER_TRACES 
-    qDebug() << "Completed  aMessage.WriteL";
-#endif
-}
-
-/**
- * handleThemeSelectionL
- */
-void HbSymbianThemeServSession::HandleThemeSelectionL(const RMessage2& aMessage)
-{
-    TInt deslen = aMessage.GetDesLength(0);
-    RBuf buffer;
-    buffer.CreateL(deslen);
-    buffer.CleanupClosePushL();
-    aMessage.ReadL(0, buffer, 0);
-    if (buffer.Length() == 0) {
-        User::Leave(ENonNumericString);
-    }
-    QString newTheme((QChar*)buffer.Ptr(), buffer.Length());
-    CleanupStack::PopAndDestroy(); // close the buffer
-
-    QString cleanThemeName = newTheme.trimmed();    
-    
-    if (cleanThemeName == iServer->iCurrentThemeName) {
-        // Theme did not change, return.
-        return;
-    }
-    // ToDo: Validate the theme name somehow
-
-    iServer->iCurrentThemeName = cleanThemeName;
-    
-    // Resolve the drive letter of the current theme
-    iServer->resolveCurrentThemeDrive();
-
-    iServer->currentIndexfile.close();
-    // Open index file to prevent uninstallation of the active theme
-    iServer->openCurrentIndexFile();
-
-    QSettings settings(QLatin1String(ORGANIZATION), QLatin1String(THEME_COMPONENT));    
-    settings.setValue("currenttheme", cleanThemeName); 
-    settings.sync();
-    TPtrC name(reinterpret_cast<const TUint16 *>(cleanThemeName.constData()));
-    TInt err = iServer->iThemeProperty.Set(name);
-    User::LeaveIfError(err);
-}
-
-/**
- * Panics the client
- */
-void HbSymbianThemeServSession::PanicClient(const RMessage2& aMessage, TInt aPanic) const
-{
-    _LIT(KTxtServer, "Theme server");
-    aMessage.Panic(KTxtServer, aPanic);
-}
-
-QColor HbSymbianThemeServSession::GetColorFromRgba(TUint32 aRgba,bool aColorFlag) 
-{
-    QColor color;
-    if(aColorFlag){
-        color.setRgba((QRgb)aRgba);
-    }
-    return color;
-}
-
-/**
- * HbThemeServerSymbian::GetSharedMultiIconInfoL
-  Creates a consolidated icon of the frame item pieces , 
-  if failed to do so creates a icons of the pieces provided 
-  there is enough space in the cache and shared memory.
- */
-void HbSymbianThemeServSession::GetSharedMultiIconInfoL(const RMessage2& aMessage)
-{
-    HbSharedIconInfo stitchedData;
-    stitchedData.type = INVALID_FORMAT;
-    QVector<HbIconKey> insertedKeys;
-    TMultiIconSymbParams params = ReadMessageAndRetrieveMultiIconParams(aMessage);
-
-    QColor color = GetColorFromRgba(params.rgba, params.colorflag);
-    QString iconId((QChar*)params.multiPartIconId.Ptr(), params.multiPartIconId.Length());
-    QString fullPath((QChar*)params.multiPartIconList[0].Ptr(), params.multiPartIconList[0].Length());
-    int index = fullPath.lastIndexOf("/");
-    fullPath = fullPath.left(index + 1);
-    iconId.prepend(fullPath);
-    HbIconKey finalIconKey(iconId,
-                   (QSizeF)params.size,
-                   (Qt::AspectRatioMode)params.aspectRatioMode,
-                   (QIcon::Mode)params.mode,
-                   (bool)params.mirrored,
-                   color);
-
-    if (!IconInfoFromSingleIcon( finalIconKey, stitchedData)) {
-        HbMultiIconParams frameItemParams;
-        int noOfPieces = 1;
-        if (iconId.contains("_3PV",Qt::CaseInsensitive) || iconId.contains("_3PH",Qt::CaseInsensitive)) {
-            noOfPieces = 3;
-        } else if (iconId.contains("_9P",Qt::CaseInsensitive)) {
-            noOfPieces = 9;
-        }
-
-        frameItemParams.multiPartIconId = iconId;
-        frameItemParams.aspectRatioMode = (Qt::AspectRatioMode)params.aspectRatioMode;
-        frameItemParams.colorflag = params.colorflag;
-        frameItemParams.mirrored = (bool)params.mirrored;
-        frameItemParams.options = params.options;
-        frameItemParams.rgba = params.rgba;
-        frameItemParams.mode = (QIcon::Mode)params.mode;
-        frameItemParams.size = (QSizeF)params.size;
-        frameItemParams.color = color;
-        for (int i = 0; i < noOfPieces; i++) {
-            frameItemParams.multiPartIconData.pixmapSizes[i] = (QSize &)params.pixmapSizes[i];
-        }
-
-        for (int i = 0; i < noOfPieces; i++) {
-            frameItemParams.multiPartIconData.targets[i] = (QRect &)params.targets[i];
-        }
-
-        for (int i = 0; i < noOfPieces; i++) {
-            frameItemParams.multiPartIconData.sources[i] = (QRect &)params.sources[i];
-        }
-
-        for (int i = 0; i < noOfPieces; i++) {
-            QString pieceName((QChar*)params.multiPartIconList[i].Ptr(), params.multiPartIconList[i].Length());
-            frameItemParams.multiPartIconList.append(pieceName);                
-        }
-
-        IconInfoFromMultiParts(frameItemParams, noOfPieces, finalIconKey, stitchedData);
-    }
-
-     // create dshared pixmap info from HbIconCacheItem  
-     TPckg<HbSharedIconInfo> pixdata(stitchedData);
-     aMessage.WriteL(1,pixdata);
-}
-
-/**
- * HbThemeServerSymbian::IconInfoFromSingleIcon
-  Checks for the cacheItem for a given key, if found gets the data relevant of the cacheItem.
- */
-
-bool HbSymbianThemeServSession::IconInfoFromSingleIcon(HbIconKey key,
-                HbSharedIconInfo &stitchedData)
-{
-    stitchedData.type = INVALID_FORMAT;
-    HbIconCacheItem * cacheItem = iServer->iconCacheItem(key, true);
-    if (cacheItem) {
-        GetDataFromCacheItem(cacheItem, stitchedData );
-        return true; //The item was found in the cache and ref count was incremented
-    } 
-    return false;
-}
-    
-/**
- * HbThemeServerSymbian::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 HbSymbianThemeServSession::CreateCacheItemData(HbIconKey key, int options ,HbSharedIconInfo &data, bool isMultiIcon)
-{
-    bool insertKeyIntoSessionList = false;
-    data.type = INVALID_FORMAT;
-    QString format = HbThemeServerUtils::formatFromPath( key.filename );
-    HbIconCacheItem * cacheItemOfPiece = iServer->iconCacheItem(key, isMultiIcon);
-    if (cacheItemOfPiece) {
-        GetDataFromCacheItem(cacheItemOfPiece, data);
-        insertKeyIntoSessionList = true;
-    }
-    else {
-    cacheItemOfPiece = HbIconCacheItemCreator::createCacheItem(key, 
-                                            (HbIconLoader::IconLoaderOptions)options, format, isMultiIcon);
-    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);
-                delete cacheItemOfPiece; // do delete the item after gpu/cpu memory is freed
-                data.type = INVALID_FORMAT;
-                }
-            }
-        }
-    }
-    return insertKeyIntoSessionList;
-}
-
-/**
- * HbThemeServerSymbian::CreateStichedIconInfoOfParts
-  Creates a consolidated icon of the availble piece iconInfo.
- */
-
-bool HbSymbianThemeServSession::CreateStichedIconInfoOfParts(QVector<HbSharedIconInfo> dataForParts,HbMultiIconParams params,
-                                                            HbIconKey &finalIconKey, HbSharedIconInfo &stitchedData)
-{
-    bool insertKeyIntoSessionList = false;
-    stitchedData.type = INVALID_FORMAT;
-    QString format = HbThemeServerUtils::formatFromPath( params.multiPartIconList[0] );
-    
-    HbIconCacheItem * cacheItem = HbIconCacheItemCreator::createMultiPieceCacheItem(finalIconKey, (HbIconLoader::IconLoaderOptions)params.options, format,dataForParts, params);
-    if( cacheItem) {
-        if( cacheItem->rasterIconData.type == INVALID_FORMAT) {
-            return false;
-        }
-    }    
-
-    stitchedData = cacheItem->rasterIconData;
-    if (stitchedData.type != INVALID_FORMAT) {
-        insertKeyIntoSessionList = iServer->insertIconCacheItem(finalIconKey, cacheItem);
-        if (!insertKeyIntoSessionList) {
-                //if insertion failed free the memory
-            FreeDataFromCacheItem(cacheItem);
-            delete cacheItem; // do delete the item after gpu/cpu memory is freed
-            stitchedData.type = INVALID_FORMAT;
-        }
-    }
-
-    return insertKeyIntoSessionList;
-}
-
-/**
- * HbThemeServerSymbian::iconInfoFromMultiParts
-  Creates a shared IconInfo of the piece files of a frame item and 
-  tries to create a stiched icon of the same.
- */
-
-void HbSymbianThemeServSession::IconInfoFromMultiParts(const HbMultiIconParams &frameItemParams,
-                const int noOfPieces,
-                HbIconKey &stichedKey,
-                HbSharedIconInfo &stitchedData)
-{
-    QVector<HbIconKey> keysInserted;
-    QVector<HbSharedIconInfo> dataForParts;
-    bool insertKeyIntoSessionList = false;
-    bool failedToCreateParts = false;
-    QString format;
-
-
-    for(int i = 0; i < noOfPieces;i++) {
-        HbSharedIconInfo data;
-        bool iconPieceMirrored = false;
-        HbIconKey key(frameItemParams.multiPartIconList.at(i), frameItemParams.multiPartIconData.pixmapSizes[i], (Qt::AspectRatioMode)stichedKey.aspectRatioMode, (QIcon::Mode)stichedKey.mode, iconPieceMirrored, stichedKey.color);
-        insertKeyIntoSessionList = IconInfoFromSingleIcon(key, data);
-        if (!insertKeyIntoSessionList) {
-            insertKeyIntoSessionList = CreateCacheItemData(key, frameItemParams.options, data, true);
-        }
-        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);
-        }
-    }//end of for
-    
-    int dataPartCount = dataForParts.count();
-    if ((failedToCreateParts) || (dataPartCount != noOfPieces)|| (!insertKeyIntoSessionList)) {
-        //atLeast one of the icon did'nt get constructed , so move the cached piece icons to unused state and return
-    QVector<HbIconKey>::const_iterator itEnd( keysInserted.constEnd() );
-            for ( QVector<HbIconKey>::const_iterator iter = keysInserted.constBegin();
-                    iter != itEnd;
-                    ++iter ) {
-                        iServer->CleanupSessionIconItem(*iter);
-            }          
-        stitchedData.type = INVALID_FORMAT;
-        return;
-    } 
-// Create a stitched icon of the available piece shared iconinfos
-    if ((dataPartCount == noOfPieces)&& (!failedToCreateParts) &&         
-        (CreateStichedIconInfoOfParts(dataForParts, frameItemParams, stichedKey, stitchedData))) {
-            sessionData.append(stichedKey);
-        }
-    
-    QVector<HbIconKey>::const_iterator itEnd( keysInserted.constEnd() );
-       for ( QVector<HbIconKey>::const_iterator iter = keysInserted.constBegin();
-               iter != itEnd;
-               ++iter ) {
-                   iServer->CleanupSessionIconItem(*iter);
-       }   
-}
-
-/**
- * HbThemeServerSymbian::FreeDataFromCacheItem
- *Frees data from the cached item when insertion to the list fails.
- */
-void HbSymbianThemeServSession::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);
-    }
-}
-
-/**
- * HbThemeServerSymbian::GetDataFromCacheItem
- * Gets data from the cache Item.
- */
-
-// Code to get data from the cached item
-void HbSymbianThemeServSession::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;
-        }
-    }
-}
-
-/**
- * HbThemeServerSymbian::ReadMessageAndRetrieveMultiIconParams
- * 
- * Reads all the information from client.
- */
-    
-TMultiIconSymbParams HbSymbianThemeServSession::ReadMessageAndRetrieveMultiIconParams(const RMessage2& aMessage)
-{
-    TInt deslen = aMessage.GetDesLength(0);
-    TMultiIconSymbParams params;
-    TPckg<TMultiIconSymbParams> paramPckg(params);
-    // Copy the client's descriptor data into our buffer.
-    aMessage.ReadL(0,paramPckg,0);
-    return params;
-}
diff -r 16d8024aca5e -r f7ac710697a9 src/hbservers/hbthemeserver/hbthemeserversymbian_p.h
--- a/src/hbservers/hbthemeserver/hbthemeserversymbian_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,194 +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 HBTHEMESERVERSYMBIAN_P_H
-#define HBTHEMESERVERSYMBIAN_P_H
-
-#include <QFile>
-#include <QColor>
-#include <QHash>
-#include <QList>
-#include <QSizeF>
-#include <QString>
-#include <QChar>
-
-#include "hbthemecommon_p.h"
-#include "hbthemesymbiancommon_p.h"
-#include "hbicondatacache_p.h"
-#include "hbcache_p.h"
-#include <e32property.h>
-#include <e32base.h>
-
-class HbSymbianThemeServSession;
-struct HbIconKey;
-class HbIconSource;
-class ThemeIndexTables;
-
-// reasons for server panic
-enum TPixmapServPanic{
-    EBadRequest = 1,
-    EBadDescriptor,
-    EMainSchedulerError,
-    ESvrCreateServer,
-    ESvrStartServer,
-    ECreateTrapCleanup,
-    ENotImplementedYet,
-    };
-
-//**********************************
-//HbThemeServerSymbian
-//**********************************
-/**
-Our server class - an active object - and therefore derived ultimately from CActive.
-It accepts requests from client threads and forwards
-them to the client session to be dealt with. It also handles the creation
-of the server-side client session.
-*/
-class HbThemeServerSymbian : public CServer2
-{
-public:
-    // Creates a new session with the server; the function
-    // implements the pure virtutal function 
-    // defined in class CServer2
-    HbThemeServerSymbian(CActive::TPriority aActiveObjectPriority);
-    static HbThemeServerSymbian * NewL(CActive::TPriority aActiveObjectPriority);
-    ~HbThemeServerSymbian();
-    CSession2 * NewSessionL(const TVersion& aVersion, const RMessage2& aMessage) const;
-
-    static HbThemeServerSymbian *Instance();
-
-public :
-    // Function to panic the server
-    static void PanicServer(TPixmapServPanic aPanic);
-    bool insertIconCacheItem ( const HbIconKey &key,  HbIconCacheItem * item );
-    HbIconCacheItem * iconCacheItem (const HbIconKey &key, bool isMultiPiece = false);
-    void setMaxGpuCacheSize(int size);
-    void setMaxCpuCacheSize(int size);
-    void CleanupSessionIconItem(HbIconKey key);
-    void clearIconCache();
-    
-    bool insertCssCacheItem ( const QString& key,  HbCacheItem * item );
-    HbCacheItem * cssCacheItem ( const QString &key);
-    void CleanupSessionCssItem(QString key);
-    void clearCssCache();
-    
-    void insertIconDefaultSizeCacheItem(const QString &key, const QSizeF &item);
-    QSizeF iconDefaultSizeCacheItem(const QString &key);
-
-    void doCleanup();
-    void getThemeIndexTables(ThemeIndexTables &tables);
-    void openCurrentIndexFile();
-    void resolveCurrentThemeDrive();
-
-//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:
-    void processThemeIndex(const QString &theme, const QChar drive);
-    QString themeIndexKey(const QString &theme, const QChar drive);
-    void removeOldThemeIndexes();
-
-public:
-    RProperty iThemeProperty;
-    QString iCurrentThemeName;
-    QChar currentThemeDrive;
-    QFile currentIndexfile;
-private:
-    void ConstructL();
-    HbIconDataCache * cache;
-    HbCache* cssCache;
-    QHash<QString, QSizeF> iconDefaultSizes;
-    // String key is in format "<drive_capitalized>:<themename>"
-    // E.g. "Z:hbdefault"
-    QMap<QString, int> themeIndexes;
-    QString baseThemeIndexKey;
-    QString lastThemeIndexKey;
-
-};
-
-//**********************************
-//HbSymbianThemeServSession
-//**********************************
-/**
-This class represents a session with the  server.
-Functions are provided to respond appropriately to client messages.
-*/
-class HbSymbianThemeServSession : public CSession2
-{
-public:
-    HbSymbianThemeServSession(HbThemeServerSymbian * aServer);
-    ~HbSymbianThemeServSession();
-    void ServiceL(const RMessage2 & aMessage);
-    void DispatchMessageL(const RMessage2 & aMessage);
-    void GetSharedIconInfoL(const RMessage2 & aMessage);
-    void GetSharedIconDefaultSizeInfoL(const RMessage2 &aMessage);
-    QSizeF RetrieveIconDefaultSize(const QString &filename);
-    void HandleStyleSheetLookupL(const RMessage2 & aMessage);
-    void HandleWidgetMLLookupL(const RMessage2& aMessage);
-    void HandleDeviceProfilesReqL(const RMessage2& aMessage);
-    void HandleSecondaryCacheOffsetReqL(const RMessage2& aMessage);
-    void HandleEffectAddAndFileLookupL(const RMessage2 &aMessage);
-    void HandleThemeSelectionL(const RMessage2 & aMessage);
-    QColor GetColorFromRgba(TUint32 aRgba, bool aColorFlag);    
-    void GetSharedMultiIconInfoL(const RMessage2& aMessage);
-    TMultiIconSymbParams ReadMessageAndRetrieveMultiIconParams(const RMessage2& aMessage);
-    void GetDataFromCacheItem(HbIconCacheItem* cacheItem, HbSharedIconInfo &data) const;
-    void FreeDataFromCacheItem(HbIconCacheItem* cacheItem);
-    bool IconInfoFromSingleIcon(HbIconKey key, HbSharedIconInfo &stitchedData);
-    bool CreateCacheItemData(HbIconKey key, int options, HbSharedIconInfo &data, bool isMultiPiece = false);
-    bool CreateStichedIconInfoOfParts(QVector<HbSharedIconInfo> dataForParts, HbMultiIconParams params,
-                                      HbIconKey &finalIconKey, HbSharedIconInfo &stitchedData);
-    void IconInfoFromMultiParts(const HbMultiIconParams &paramsCommon,
-                                const int noOfPieces,
-                                HbIconKey &stichedKey,
-                                HbSharedIconInfo &stitchedData);
-
-protected:
-    TIconParams ReadMessageAndRetrieveParams (const RMessage2 & aMessage);
-    void PanicClient(const RMessage2 & aMessage, TInt aPanic) const;
-        
-private:
-    HbThemeServerSymbian *iServer;
-    QList<HbIconKey> sessionData;
-    QList<QString> sessionCssData;
-};
-#endif // HBTHEMESERVERSYMBIAN_P_H 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbservers/hbthemeserver/hbthemeserverutils.cpp
--- a/src/hbservers/hbthemeserver/hbthemeserverutils.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbservers/hbthemeserver/hbthemeserverutils.cpp	Mon May 03 12:48:33 2010 +0300
@@ -38,7 +38,7 @@
 #include "hbthemeperf_p.h"
 #include "hbcache_p.h"
 #include "hbiconsource_p.h"
-#include "hbwidgetloadersyntax_p.h"
+#include "hbwidgetloader_p.h"
 #include "hbwidgetloaderactions_p.h"
 
 //Hash of fileName-offset
@@ -70,7 +70,7 @@
     HbIconSource *newSource = tempHbIconSource.data();
 
     if (iconSources.count() >= ICON_SOURCES_MAX_SIZE) {
-        iconSources.removeFirst();
+        delete iconSources.takeFirst();
     }
     iconSources.append(newSource);
     tempHbIconSource.take();
@@ -129,9 +129,7 @@
         try {
             HbSharedCacheItem cacheItem(fileName, cssOffset);
             sharedCache->append(cacheItem);
-        } catch (std::bad_alloc &badAlloc) {
-            Q_UNUSED(badAlloc)
-            // item is not appended .
+        } catch (std::exception &) {
         }
 
     }
@@ -154,30 +152,25 @@
     try {
         cssOffset = manager->alloc(sizeof(HbCss::StyleSheet));
         styleSheet = new((char*)manager->base() + cssOffset) HbCss::StyleSheet(HbMemoryManager::SharedMemory);
-    } catch (std::bad_alloc &badAlloc) {
-        Q_UNUSED(badAlloc)
-        // if manager->alloc in the previous try block suceeds but creation of
-        // HbCss::StyleSheet on shared memory failed
+    } catch (std::bad_alloc &) {
         if (cssOffset != -1) {
+            // if manager->alloc in the previous try block suceeds but creation of
+            // HbCss::StyleSheet on shared memory failed
             manager->free(cssOffset);
             cssOffset = -1;
         }
-        // if manager->alloc itself failed, in that case cssOffset will still be -1,
-        // just return offset as -1 to represent error
         return retVal;
     }
     // 2. Parse the required file into styleSheet.
     parser.init(fileName, true);
-
-    if (parser.parse(styleSheet)) {
-        retVal = true;
-    } else {
+    
+    retVal = parser.parse(styleSheet);
+    if (!retVal) {
         //parser::parse returns false in a number of scenarios
         // 1. css file has some error
         // 2. shared memory operations on HbVector/HbString/HbVariant threw an exception
         // in either case free the memory occupied by stylesheet
         HbMemoryUtils::release<HbCss::StyleSheet>(styleSheet);
-        manager->free(cssOffset);
         cssOffset = -1;
     }
     HB_END_SHAREDMEMORY_PRINT("");
@@ -198,8 +191,7 @@
         layoutDefOffset = layoutDefsCache()->value(key);
         return layoutDefOffset;
     }
-    HbWidgetLoaderActions loader(HbMemoryManager::SharedMemory);
-    HbWidgetLoaderSyntax widgetMLSyntax(&loader);
+    HbWidgetLoader loader;
 
     QFile file(fileName);
     if (!file.open(QFile::ReadOnly | QFile::Text)) {
@@ -210,23 +202,23 @@
     qDebug() << "Trying to load: " << fileName << "::" << layout << "::" << section;
 #endif // THEME_SERVER_TRACES
 
-    bool load = widgetMLSyntax.load(&file, layout, section);
-    if (load) {
-        layoutDefOffset = loader.getLayoutDefintionOffset();
-    } else {
-        // load() failed. free the memory
-        LayoutDefinition *layoutDef =
-            HbMemoryUtils::getAddress<LayoutDefinition>(HbMemoryManager::SharedMemory,
-                    loader.getLayoutDefintionOffset());
-        if (layoutDef) {
-            GET_MEMORY_MANAGER(HbMemoryManager::SharedMemory);
-            layoutDef->~LayoutDefinition();
-            manager->free(loader.getLayoutDefintionOffset());
-            loader.setLayoutDefintionOffset(-1);
+
+    HbWidgetLoader::LayoutDefinition *layoutDef(0);
+    GET_MEMORY_MANAGER(HbMemoryManager::SharedMemory);
+    try {
+        layoutDefOffset = manager->alloc(sizeof(HbWidgetLoader::LayoutDefinition));
+        layoutDef = new((char*)manager->base() + layoutDefOffset)
+            HbWidgetLoader::LayoutDefinition(HbMemoryManager::SharedMemory);
+    } catch (std::bad_alloc &badAlloc) {
+        Q_UNUSED(badAlloc)
+        if (layoutDefOffset != -1) {
+            manager->free(layoutDefOffset);
+            layoutDefOffset = -1;
         }
+        return layoutDefOffset;
     }
 
-    if (layoutDefOffset != -1) {
+    if (loader.loadLayoutDefinition(layoutDef, &file, layout, section)) {
         layoutDefsCache()->insert(key, layoutDefOffset);
         // add the filename and css offset to the secondary cache.
         if (sharedCache) {
@@ -241,8 +233,12 @@
                 Q_UNUSED(badAlloc)
             }
         }
+    } else {
+        // load failed
+        layoutDef->~LayoutDefinition();
+        manager->free(layoutDefOffset);
+        layoutDefOffset = -1;
     }
-
     return layoutDefOffset;
 }
 
@@ -270,13 +266,15 @@
             HbSharedCache(HbMemoryManager::SharedMemory);
             // reserving memory so that realloc calls will be minimized in future.
             sharedCache->reserve(NumberOfSharedCacheItems);
-        } catch (std::bad_alloc &exception) {
-            Q_UNUSED(exception)
+        } catch (std::exception &) {
             if (serverSecondaryCacheOffset != -1) {
+                if (sharedCache) {
+                    sharedCache->~HbSharedCache();
+                    sharedCache = 0;
+                }
                 manager->free(serverSecondaryCacheOffset);
+                serverSecondaryCacheOffset = -1;
             }
-            serverSecondaryCacheOffset = -1;
-            sharedCache = 0;
         }
     }
     return sharedCache;
@@ -292,6 +290,56 @@
 }
 
 /**
+ * Removes fxml document from the shared memory and effects cache
+ *
+ * \param fileName of the removed fxml file
+ * \return true if effect was found and removed, false otherwise
+ */
+bool HbThemeServerUtils::removeSharedEffect(const QString &fileName)
+{
+    if (effCache()->contains(fileName)) {
+        effCache()->remove(fileName);
+
+        if (sharedCache) {
+            int count = sharedCache->count();
+            for (int i = 0; i < count ; i++) {
+                QString cacheKey = sharedCache->at(i).key;
+                if (fileName == cacheKey) {
+                    sharedCache->remove(i,1);
+                    break;
+                }
+            }
+        }
+        return true;
+    }
+    return false;
+}
+
+/**
+ * Clears fxml documents from the shared memory and effects cache
+ *
+ */
+void HbThemeServerUtils::clearSharedEffects()
+{
+    HbServerCache::const_iterator iterEnd(effCache()->constEnd());
+    for (HbServerCache::const_iterator iter = effCache()->constBegin();
+            iter != iterEnd;
+            ++iter) {
+        if (sharedCache) {
+            int count = sharedCache->count();
+            for (int i = 0; i < count ; i++) {
+                QString cacheKey = sharedCache->at(i).key;
+                if (cacheKey == iter.key()) {
+                    sharedCache->remove(i,1);
+                    break;
+                }
+            }
+        }
+    }
+    effCache()->clear();
+}
+
+/**
  * getSharedEffect parses the requested fxml document into the shared
  * memory and returns the offset of the parsed data.
  *
@@ -325,23 +373,20 @@
         try {
             effOffset = manager->alloc(sizeof(HbEffectFxmlData));
             data = new((char*)manager->base() + effOffset) HbEffectFxmlData(HbMemoryManager::SharedMemory);
-        } catch (std::bad_alloc &badAlloc) {
-            Q_UNUSED(badAlloc)
-            // if manager->alloc in the previous try block suceeds but creation of
-            // HbEffectFxmlData on shared memory failed
+        } catch (std::exception &) {
             if (effOffset != -1) {
+                // if manager->alloc in the previous try block suceeds but creation of
+                // HbEffectFxmlData on shared memory failed
                 manager->free(effOffset);
                 effOffset = -1;
             }
-            // if manager->alloc itself failed, in that case effOffset will still be -1,
-            // just return offset as -1 to represent error
             return effOffset;
         }
         // 2. Parse the file.
         HbEffectXmlParser parser;
 
-
         QFile f(fileName);
+        bool fail = false;
         if (f.open(QIODevice::ReadOnly | QIODevice::Text)) {
             try {
                 parser.read(&f, data);
@@ -349,34 +394,31 @@
 
                 // 3. Mark an entry for this styleSheet into the table
                 effCache()->insert(fileName, effOffset);
-            } catch (std::bad_alloc &badAlloc) {
-                Q_UNUSED(badAlloc)
+            } catch (std::exception &) {
                 f.close();
-                //HbMemoryUtils::release<HbEffectFxmlData>(data);
-                manager->free(effOffset);
-                effOffset = -1;
+                fail = true;
             }
-
         } else {
 #ifdef THEME_SERVER_TRACES
             qWarning() << "Cannot open" << fileName;
 #endif // THEME_SERVER_TRACES
-            //-1 represents invalid offset
+            fail = true;
+        }
+        if (fail) {
+            data->~HbEffectFxmlData();
             manager->free(effOffset);
-            effOffset = -1;
+            return -1;
         }
 
         // add the filename and css offset to the secondary cache.
-        if (sharedCache && effOffset != -1) {
+        if (sharedCache) {
             // no need to check if this item is already present in the
             // cache as the parsing of the file happens only once
             // in the server side.
             try {
                 HbSharedCacheItem cacheItem(fileName, effOffset);
                 sharedCache->append(cacheItem);
-            } catch (std::bad_alloc &badAlloc) {
-                // item is not appended.
-                Q_UNUSED(badAlloc)
+            } catch (std::exception &) {
             }
         }
     }
@@ -408,7 +450,7 @@
         }
         //Since we are cleaning up css-resources whose ref-count is zero, these entries will be
         // removed from actual cache.
-        cache->cacheHandle().remove(itemToRemove->fileName);
+        delete cache->cacheHandle().take(itemToRemove->fileName);
     }
 }
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbservers/hbthemeserver/hbthemeserverutils_p.h
--- a/src/hbservers/hbthemeserver/hbthemeserverutils_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbservers/hbthemeserver/hbthemeserverutils_p.h	Mon May 03 12:48:33 2010 +0300
@@ -52,6 +52,9 @@
     static void createDeviceProfileDatabase();
     static HbSharedCache *createSharedCache();
     static int sharedCacheOffset();
+    static bool removeSharedEffect(const QString &fileName);
+    static void clearSharedEffects();
+
 private:
     static int sharedCacheItemOffset(const QString &key);
     static int serverSecondaryCacheOffset;
diff -r 16d8024aca5e -r f7ac710697a9 src/hbservers/hbthemeserver/main.cpp
--- a/src/hbservers/hbthemeserver/main.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbservers/hbthemeserver/main.cpp	Mon May 03 12:48:33 2010 +0300
@@ -29,7 +29,9 @@
 
 #include "hbthemeserver_p.h"
 #include "hbthemecommon_p.h"
+#include "hbtheme.h"
 #if defined (Q_OS_SYMBIAN)
+#include "hbthemecommon_symbian_p.h"
 #include <eikenv.h>
 #include <apgwgnam.h>
 #endif
@@ -41,6 +43,67 @@
 static const QLatin1String WIN32_DEBUG_SUFFIX("d");
 static const QLatin1String MAC_DEBUG_SUFFIX("_debug");
 
+#ifdef Q_OS_SYMBIAN
+class Lock
+{
+public:
+    enum State {
+        Reserved,
+        Acquired,
+        Error
+    };
+    Lock();
+    ~Lock(){close();}
+    void close(){mFile.Close(); mFs.Close();}
+    State acquire();
+    static bool serverExists();
+
+private:
+    RFs mFs;
+    RFile mFile;
+};
+
+Lock::Lock()
+{
+    // Using a file for interprocess lock
+    const int NumMessageSlots = 1;
+    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);
+            }
+        }
+    }
+}
+
+// Try to acquire lock
+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;
+        }
+    }
+    return state;
+}
+
+// Check if Symbian server exists
+bool Lock::serverExists()
+{
+    TFindServer findHbServer(KThemeServerName);
+    TFullName name;
+    return findHbServer.Next(name) == KErrNone;
+}
+
+#endif
 /* 
     This function loads library which keeps resources of default theme
 */
@@ -81,38 +144,105 @@
 #ifdef QT_DEBUG
     //temporary solution until Hb specific style is ready
     QApplication::setStyle( new QWindowsStyle );
+#endif // QT_DEBUG
+#if QT_VERSION >= 0x040601
+    QApplication::setAttribute(Qt::AA_S60DontConstructApplicationPanes);
+#endif // QT_VERSION
+#ifdef THEME_SERVER_TRACES
+        qDebug() << "HbThemeServer::main: START!!!";
 #endif
-	QtSingleApplication  app( argc, argv );
-	if (app.sendMessage("Am Alive"))
-         return 0;
-    
-    loadResourceLibrary(RESOURCE_LIB_NAME);
-#ifdef BUILD_HB_INTERNAL
-    loadResourceLibrary(TEST_RESOURCE_LIB_NAME);
+#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) {
+            // Process may be starting, wait for server object to be created
+            if (Lock::serverExists()) {
+#ifdef THEME_SERVER_TRACES
+        qDebug() << "HbThemeServer::main: serverExists!!!";
 #endif
-    HbThemeServer server;
-    bool success = server.startServer();
-    if ( !success ) {
-        return -1;
+                break;
+            } else {
+                const TInt KTimeout = 100000; // 100 ms
+                User::After(KTimeout);
+            }
+        } else {
+            break;
+        }
+    }
+    if (lockState != Lock::Acquired) {
+        // With KErrAlreadyExists client should try to connect, otherwise bail out.
+#ifdef THEME_SERVER_TRACES
+        qDebug() << "HbThemeServer::main: Lock not acquired!!!";
+#endif
+        RProcess::Rendezvous(lockState == Lock::Reserved ? KErrAlreadyExists:KErrGeneral);
+        return KErrNone;
+    }
+#endif // Q_OS_SYMBIAN
+#ifdef THEME_SERVER_TRACES
+        qDebug() << "HbThemeServer::main: start construction QtSingleApplication!!!";
+#endif
+    QtSingleApplication  app(argc, argv );
+
+    if (app.isRunning()) {
+#ifdef THEME_SERVER_TRACES
+        qDebug() << "HbThemeServer::main: first instance already running!!!";
+#endif
+        return 0;
     }
 
+#ifdef THEME_SERVER_TRACES
+    qDebug() << "HbThemeServer::main: I'm first instance!!!";
+#endif
+        
 #if defined (Q_OS_SYMBIAN)
     CEikonEnv * env = CEikonEnv::Static();
     if ( env ) {
         CApaWindowGroupName* wgName = CApaWindowGroupName::NewLC(env->WsSession());
+        env->RootWin().SetOrdinalPosition(0, ECoeWinPriorityNeverAtFront); // avoid coming to foreground
         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(_L("HbThemeServer"));
         wgName->SetAppUid(KNullUid);
-        RWindowGroup &rootWindowGroup = env->RootWin();
-        wgName->SetWindowGroupName(rootWindowGroup);
-        rootWindowGroup.SetOrdinalPosition(-1, ECoeWinPriorityNormal); //move to background.        
+        wgName->SetWindowGroupName(env->RootWin());
         CleanupStack::PopAndDestroy();
+        RThread::RenameMe(_L("HbThemeServer"));
     }
-#elif defined(QT_DEBUG)
+#endif
+    HbTheme::instance(); //for theme initialization, instance needs to be created before starting the server.
+    loadResourceLibrary(RESOURCE_LIB_NAME);
+#ifdef HB_DEVELOPER
+    loadResourceLibrary(TEST_RESOURCE_LIB_NAME);
+#endif
+
+    HbThemeServer server;
+
+    bool success = server.startServer();
+    
+    if ( !success ) {
+#ifdef THEME_SERVER_TRACES
+        qDebug() << "HbThemeServer::main: server not started!!!";
+#endif
+        return -1;
+    }
+    
+#ifdef THEME_SERVER_TRACES
+    qDebug() << "HbThemeServer::main: server started!!!";
+#endif
+
+#ifndef Q_OS_SYMBIAN
+#ifdef QT_DEBUG
     server.showMinimized();
 #endif
+#endif // Q_OS_SYMBIAN
 
-    return app.exec();
+    int result = app.exec();
+#ifdef THEME_SERVER_TRACES
+        qDebug() << "HbThemeServer::main: out from exec, with result code: " << result;
+#endif
+    return result; 
 }
-
diff -r 16d8024aca5e -r f7ac710697a9 src/hbservers/hbthemeserveroogmplugin/hbthemeclientoogm.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbservers/hbthemeserveroogmplugin/hbthemeclientoogm.cpp	Mon May 03 12:48:33 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 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 "hbthemeclientoogm_p.h"
+
+const TUint KDefaultMessageSlots=4;
+
+
+/*! 
+* Constructor
+*/
+HbThemeClientOogm::HbThemeClientOogm(): connected(false)
+{
+}
+
+
+/*! 
+* Connects to the  server using 4 message slots.
+* returns true if connection succeeds.
+*/
+bool HbThemeClientOogm::ConnectToServer()
+{
+    
+    TInt error = CreateSession(KThemeServerName, Version(), KDefaultMessageSlots);
+
+    if (KErrNone != error) {
+        RDebug::Print(_L("ThemeServerPlugin : Server Connection request failed"));
+        return false;
+    }
+    connected = true;
+    return connected; 
+}
+
+
+/*!
+* Returns the earliest version number of the server that we can talk to.
+*/
+TVersion HbThemeClientOogm::Version(void) const
+{
+    return(TVersion(KThemeServerMajorVersionNumber, KThemeServerMinorVersionNumber, KThemeServerBuildVersionNumber));
+}
+
+
+/*!
+* Closing the server and tidying up.
+*/
+void HbThemeClientOogm::Close()
+{
+    RSessionBase::Close();
+}
+
+/*!
+* Sends FreeRam request to HbThemeserver with the bytes to be freed.
+* see goomconfig.xml as what is the threshold that triggers a call to this API.
+*/
+
+void HbThemeClientOogm::FreeRam(int bytes)
+{
+    if (!connected) {
+        ConnectToServer();
+    }
+        
+    if (connected) {
+        TPckg<TInt> bytesToFree(bytes);
+        TIpcArgs args(&bytesToFree, 0);
+
+        TInt err = SendReceive(EFreeRam, args);
+        if (KErrNone != err) {
+            RDebug::Print(_L("ThemeServerPlugin: Free RAM notification sent to ThemeServer"));
+        }
+    }
+}
+
+/*!
+* Sends MemoryGood request to HbThemeserver.
+* see goomconfig.xml as what is the threshold that triggers a call to this API.
+*/
+
+void  HbThemeClientOogm::GoodMemory()
+{
+    if (!connected) {
+        ConnectToServer();
+    }
+
+    if (connected) {
+        TInt err = SendReceive(EMemoryGood);
+        if (KErrNone != err) {
+            RDebug::Print(_L("ThemeServerPlugin: Good Memory notification sent to ThemeServer"));
+        }
+    }
+}
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbservers/hbthemeserveroogmplugin/hbthemeclientoogm_p.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbservers/hbthemeserveroogmplugin/hbthemeclientoogm_p.h	Mon May 03 12:48:33 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 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 __HBTHEMECLIENTOOGM_H
+#define __HBTHEMECLIENTOOGM_H
+
+
+#include <e32base.h>
+#include <e32debug.h>
+#include "hbthemecommon_symbian_p.h"
+#include "hbthemecommon_p.h"
+
+class HbThemeClientOogm : public RSessionBase
+{
+public:
+    HbThemeClientOogm();
+    TVersion Version() const;
+    void Close();
+    void FreeRam(int bytes);
+    void GoodMemory();
+
+private:
+    bool ConnectToServer();
+
+private:
+    bool connected;
+};
+
+#endif /* __HBTHEMECLIENTOOGM_H */
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbservers/hbthemeserveroogmplugin/hbthemeserveroogmplugin.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbservers/hbthemeserveroogmplugin/hbthemeserveroogmplugin.cpp	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,108 @@
+/****************************************************************************
+**
+** 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 Files  
+
+#include "hbthemeserveroogmplugin_p.h"	// CThemeSrvOogmPlugin
+
+
+
+//  Member Functions
+
+// -----------------------------------------------------------------------------
+// C++ constructor.
+// -----------------------------------------------------------------------------
+//
+CThemeSrvOogmPlugin::CThemeSrvOogmPlugin():oogmClient(0)
+{
+}
+
+// -----------------------------------------------------------------------------
+// Destructor.
+// -----------------------------------------------------------------------------
+//
+CThemeSrvOogmPlugin::~CThemeSrvOogmPlugin()
+{
+
+    delete oogmClient;
+
+}
+
+// -----------------------------------------------------------------------------
+// Symbian two-phased constructor (2nd phase).
+// -----------------------------------------------------------------------------
+//
+void CThemeSrvOogmPlugin::ConstructL()
+{
+    CGOomMonitorPluginBase::ConstructL();
+    oogmClient = new(ELeave) HbThemeClientOogm();
+}
+
+
+// -----------------------------------------------------------------------------
+// Tries to free RAM.
+// -----------------------------------------------------------------------------
+//
+void CThemeSrvOogmPlugin::FreeRam(TInt aBytesToFree)
+{
+    if(aBytesToFree > 0) {
+        oogmClient->FreeRam(aBytesToFree);
+    }
+}
+
+void CThemeSrvOogmPlugin::FreeRam(TInt aBytesToFree, TBool)
+{
+    //TODO: support for renderer switch
+    FreeRam(aBytesToFree);
+}
+
+// -----------------------------------------------------------------------------
+// CThemeSrvOogmPlugin::MemoryGood
+// -----------------------------------------------------------------------------
+//
+void CThemeSrvOogmPlugin::MemoryGood()
+{
+    oogmClient->GoodMemory();
+}
+
+void CThemeSrvOogmPlugin::MemoryGood(TBool)
+{
+    //TODO: support for renderer switch
+    MemoryGood();
+}
+// -----------------------------------------------------------------------------
+// Creates plugin.
+// -----------------------------------------------------------------------------
+//
+CThemeSrvOogmPlugin* CThemeSrvOogmPlugin::NewL()
+{
+    CThemeSrvOogmPlugin* plugin = new(ELeave) CThemeSrvOogmPlugin;
+    CleanupStack::PushL(plugin);
+    plugin->ConstructL();
+    CleanupStack::Pop(plugin);
+    return plugin;
+}
+
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbservers/hbthemeserveroogmplugin/hbthemeserveroogmplugin.pan
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbservers/hbthemeserveroogmplugin/hbthemeserveroogmplugin.pan	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,41 @@
+/****************************************************************************
+**
+** 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 __HBTHEMESRVOOGMPLUGIN_PAN__
+#define __HBTHEMESRVOOGMPLUGIN_PAN__
+
+//  Data Types
+
+enum TThemeSrvOogmPluginPanic
+    {
+    EThemeSrvOogmPluginNullPointer
+    };
+
+//  Function Prototypes
+
+GLREF_C void Panic(TThemeSrvOogmPluginPanic aPanic);
+
+#endif  // __HBTHEMESRVOOGMPLUGIN_PAN__
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbservers/hbthemeserveroogmplugin/hbthemeserveroogmplugin.pro
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbservers/hbthemeserveroogmplugin/hbthemeserveroogmplugin.pro	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,65 @@
+#
+#############################################################################
+##
+## 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.
+##
+#############################################################################
+#
+
+CONFIG-=def_files
+CONFIG-=def_files_disabled
+
+INCLUDEPATH += .
+
+# dependencies
+hbAddLibrary(hbcore/HbCore)
+
+SOURCES += hbthemeserveroogmplugin.cpp
+SOURCES += hbthemeserveroogmpluginDllMain.cpp
+SOURCES += hbthemeclientoogm.cpp
+
+symbian {
+    
+    TEMPLATE = lib
+    MMP_RULES += "TARGETTYPE PLUGIN"
+    TARGET.CAPABILITY = CAP_ECOM_PLUGIN 
+    TARGET.EPOCALLOWDLLDATA = 1
+    TARGET.UID3 = 0x2002DC75
+    TARGET.UID2 = 0x10009d8d
+        
+    LIBS += -leuser
+    LIBS += -lecom
+    LIBS += -lgoommonitor
+  
+  
+    myrssrules = \
+     "START RESOURCE hbthemeserveroogmplugin.rss" \
+	 "TARGETPATH resource\plugins" \
+	 "TARGET     hbthemeserveroogmplugin.rsc" \
+	 "END"
+    
+    MMP_RULES += myrssrules
+
+
+}
+
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbservers/hbthemeserveroogmplugin/hbthemeserveroogmplugin.rss
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbservers/hbthemeserveroogmplugin/hbthemeserveroogmplugin.rss	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,60 @@
+//****************************************************************************
+//
+// 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 <ecom/registryinfov2.rh>
+#include <goommonitorplugin.hrh>
+
+
+
+
+// ---------------------------------------------------------------------------
+// Registration info for ECOM framework.
+// ---------------------------------------------------------------------------
+//
+RESOURCE REGISTRY_INFO theInfo
+    {
+    resource_format_version = RESOURCE_FORMAT_VERSION_2; 
+    dll_uid = 0x2002DC75;
+    interfaces = 
+        {
+        INTERFACE_INFO
+            {
+            interface_uid = KGOomPluginInterfaceUidValue;
+            implementations = 
+                {
+                IMPLEMENTATION_INFO
+                    {
+                    implementation_uid = 0x2002DC75;
+                    version_no = 1;
+                    display_name = "HbThemeServerOogmPlugin";
+                    default_data = "";
+                    opaque_data = "";
+                    }
+                };
+                        
+            }
+        };
+    }
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbservers/hbthemeserveroogmplugin/hbthemeserveroogmpluginDllMain.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbservers/hbthemeserveroogmplugin/hbthemeserveroogmpluginDllMain.cpp	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,50 @@
+/****************************************************************************
+**
+** 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 Files  
+#include "hbthemeserveroogmplugin_p.h"
+
+TAny* CreatePlugin()
+{
+    return CThemeSrvOogmPlugin::NewL();
+}
+// -----------------------------------------------------------------------------
+// Implementation table for plugin.
+// -----------------------------------------------------------------------------
+//
+const TImplementationProxy ImplementationTable[] =
+        {{{0x2002DC75}, ::CreatePlugin}};
+
+// -----------------------------------------------------------------------------
+// ImplementationGroupProxy
+// -----------------------------------------------------------------------------
+//
+EXPORT_C const TImplementationProxy* ImplementationGroupProxy(TInt& aTableCount)
+{
+    aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy) ;
+    return ImplementationTable;
+}
+
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbservers/hbthemeserveroogmplugin/hbthemeserveroogmplugin_p.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbservers/hbthemeserveroogmplugin/hbthemeserveroogmplugin_p.h	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,63 @@
+/****************************************************************************
+**
+** 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.
+**
+****************************************************************************/
+
+// This file defines the API for HbThemeSrvOogmPlugin.dll
+
+#ifndef __HBTHEMESRVOOGMPLUGIN_H__
+#define __HBTHEMESRVOOGMPLUGIN_H__
+
+//  Include Files
+
+#include <e32std.h>
+#include "hbthemeclientoogm_p.h"
+
+//  Global Functions
+
+#include <ecom/ecom.h>
+#include <ecom/implementationproxy.h>
+#include <goommonitorplugin.h>
+
+class CThemeSrvOogmPlugin : public CGOomMonitorPlugin
+{
+public:
+    CThemeSrvOogmPlugin();
+    ~CThemeSrvOogmPlugin();
+    void ConstructL();
+    static CThemeSrvOogmPlugin* NewL();
+    
+public:
+    void FreeRam(TInt aBytesToFree);
+    void MemoryGood();
+    
+    virtual void FreeRam(TInt aBytesToFree, TBool aUseSwRendering);
+    virtual void MemoryGood(TBool aUseSwRendering);
+
+private: //data members
+    HbThemeClientOogm* oogmClient; 
+};
+
+
+#endif  // __HBTHEMESRVOOGMPLUGIN_H__
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbservers/themechanger/themechanger.pro
--- a/src/hbservers/themechanger/themechanger.pro	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbservers/themechanger/themechanger.pro	Mon May 03 12:48:33 2010 +0300
@@ -44,11 +44,10 @@
 SOURCES += themechangermain.cpp
 
 symbian {
+    TARGET.CAPABILITY += WriteDeviceData
     HEADERS += themeclientsymbian.h
     SOURCES += themeclientsymbian.cpp
-}
-
-win32|linux-*|macx-* {
+} else {
     HEADERS += themeclientqt.h
     SOURCES += themeclientqt.cpp
 }
diff -r 16d8024aca5e -r f7ac710697a9 src/hbservers/themechanger/themechangerdefs.h
--- a/src/hbservers/themechanger/themechangerdefs.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbservers/themechanger/themechangerdefs.h	Mon May 03 12:48:33 2010 +0300
@@ -25,6 +25,10 @@
 #ifndef THEMECHANGERDEFS_H
 #define THEMECHANGERDEFS_H
 
+#ifdef Q_OS_SYMBIAN
+// Enable theme change timing logging
+#define THEME_CHANGER_TIMER_LOG
+#endif
 #undef THEME_CHANGER_TRACES
 
 #endif //THEMECHANGERDEFS_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbservers/themechanger/themechangermain.cpp
--- a/src/hbservers/themechanger/themechangermain.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbservers/themechanger/themechangermain.cpp	Mon May 03 12:48:33 2010 +0300
@@ -27,15 +27,42 @@
 #include <hbmainwindow.h>
 #include "themechangerdefs.h"
 #include "themeselectionlist.h"
-
+#include <QTextStream>
 #ifdef Q_OS_SYMBIAN
 #include "themeclientsymbian.h"
 #else
 #include "themeclientqt.h"
 #endif
 
+#ifdef THEME_CHANGER_TIMER_LOG
+void debugOutput(QtMsgType type, const char *msg)
+ {
+    QFile file("c:/data/logs/themechanger.txt");
+
+    if (!file.open(QIODevice::Append))
+        return;
+    QTextStream out(&file);
+
+    switch (type)
+    {
+    case QtDebugMsg:
+        out << msg << QChar::LineSeparator;
+        break;
+    case QtWarningMsg:
+        break;
+    case QtCriticalMsg:
+        break;
+    case QtFatalMsg:
+        break;
+    }
+ }
+#endif //THEME_CHANGER_TIMER_LOG
+
 int main(int argc, char *argv[])
 {
+#ifdef THEME_CHANGER_TIMER_LOG
+    qInstallMsgHandler(debugOutput);
+#endif
     // Initialization
     HbApplication app(argc, argv);
     app.setApplicationName("ThemeChanger");
diff -r 16d8024aca5e -r f7ac710697a9 src/hbservers/themechanger/themeclientsymbian.cpp
--- a/src/hbservers/themechanger/themeclientsymbian.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbservers/themechanger/themeclientsymbian.cpp	Mon May 03 12:48:33 2010 +0300
@@ -24,6 +24,7 @@
 ****************************************************************************/
 
 #include "themeclientsymbian.h"
+#include <e32property.h>
 #include <QDebug>
 
 
@@ -77,9 +78,17 @@
  */
 TInt ThemeClientSymbian::changeTheme(const QString& aString )
 {
-    TBuf<256> themeName(aString.utf16());
-    TIpcArgs args(&themeName);
-    TInt err = SendReceive(EThemeSelection, args);
+    TInt err = KErrGeneral;
+    RProperty themeRequestProp;
+    
+    User::LeaveIfError( themeRequestProp.Attach( KServerUid3, KNewThemeForThemeChanger ) );
+    
+    TBuf<256> newThemenameChangeRequest;
+    _LIT(KThemeRequestFormatter, "%d:%S");
+    TBuf<256> newThemename(aString.utf16());
+    newThemenameChangeRequest.Format( KThemeRequestFormatter, EThemeSelection, &newThemename);
+    err = themeRequestProp.Set(newThemenameChangeRequest);
+    themeRequestProp.Close();
     return err;
 }
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbservers/themechanger/themeselectionlist.cpp
--- a/src/hbservers/themechanger/themeselectionlist.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbservers/themechanger/themeselectionlist.cpp	Mon May 03 12:48:33 2010 +0300
@@ -25,11 +25,14 @@
 #include <QSettings>
 #include <QStringList>
 #include <QDir>
+#include <QTimer>
 #include <hbinstance.h>
 #include <hbmenu.h>
 #include <hbaction.h>
 #include <hbicon.h>
+#include <hblistwidgetitem.h>
 #include <QDebug>
+#include <QTime>
 
 #include "themeselectionlist.h"
 #include "themechangerdefs.h"
@@ -44,13 +47,13 @@
     ThemeClientQt* client
 #endif
                         ): 
-                        themelist(new HbListView(this)),
-                        model(new QStandardItemModel(this)),
+                        oldItemIndex(-1),
+                        themelist(new HbListWidget(this)),
                         rightMark(new HbIcon(QString("qtg_small_tick"))),
                         noMark(new HbIcon(QString(""))),
                         client(client)
 {
-    connect(themelist, SIGNAL(activated(const QModelIndex&)),this, SLOT(setChosen(const QModelIndex&)));
+    connect(themelist, SIGNAL(activated(HbListWidgetItem *)),this, SLOT(setChosen(HbListWidgetItem *)));
     setWidget(themelist);
 
     // Automatic updation of the themelist when some theme is installed or uninstalled
@@ -63,6 +66,12 @@
     }
     connect(watcher,SIGNAL(directoryChanged(const QString &)),this,SLOT(updateThemeList(const QString &)));
     QObject::connect(this,SIGNAL(newThemeSelected(QString)),this,SLOT(sendThemeName(QString)));    
+#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
 }
 
 /**
@@ -71,18 +80,13 @@
 ThemeSelectionList::~ThemeSelectionList()
 {
     // Set the theme to the applied theme before exiting.
-    setChosen(oldItemIndex);
+    setChosen(themelist->item(oldItemIndex));
     delete noMark;
 
     noMark=NULL;
     delete rightMark;
     rightMark=NULL;
 
-    // Remove all the items from model, then delete
-    model->clear();
-    delete model;
-    model=NULL;
-
     // Reset the item view
     themelist->reset();
     delete themelist;
@@ -100,7 +104,7 @@
     foreach(const QString &KThemeRootPath, rootPaths()){
         dir.setPath(KThemeRootPath) ;
         QStringList list = dir.entryList(QDir::AllDirs|QDir::NoDotAndDotDot,QDir::Name);
-        if(list.contains("themes",Qt::CaseSensitive )) {
+        if(list.contains("themes",Qt::CaseInsensitive )) {
             themePresent = true;
             QDir root = KThemeRootPath;
             dir.setPath(root.path()+"/themes/icons/") ;
@@ -128,16 +132,14 @@
             }
             list=iconthemeslist;
             for (int i=0; i <list.count();i++) {
-                // Items are populated to create the model
-                QStandardItem *item=new QStandardItem(list.at(i));
-                model->appendRow(item);
+                // populate theme list with existing themes
                 if((HbInstance::instance()->theme()->name())==(list.at(i))) { 
-                    item->setIcon(rightMark->qicon());
-                    oldItemIndex=item->index();
-                    themelist->setCurrentIndex(oldItemIndex,QItemSelectionModel::Select);
+                    themelist->addItem(*rightMark,list.at(i));
+                    oldItemIndex=themelist->count()-1;
+                    themelist->setCurrentRow(oldItemIndex);
                 }
                 else {
-                    item->setIcon(noMark->qicon());
+                    themelist->addItem(*noMark,list.at(i));
                 }
             }
         }
@@ -146,9 +148,7 @@
     if(!themePresent) {
             QStringList defaultList;
             defaultList.insert(0,"hbdefault"); //adding one default entry
-            QStandardItem *item=new QStandardItem(defaultList.at(0));
-            model->appendRow(item);
-            item->setIcon(rightMark->qicon());
+            themelist->addItem(*rightMark,defaultList.at(0));
             QString themeName=HbInstance::instance()->theme()->name();
             if (themeName != "hbdefault")
             {
@@ -164,24 +164,23 @@
             }
 
         }
-
-    // Set the this model for the list 
-    themelist->setModel(model);
 }
 
 /**
  * setChosen
  */
-void ThemeSelectionList::setChosen(const QModelIndex &index)
+void ThemeSelectionList::setChosen(HbListWidgetItem *item)
 {
-     // Extract the string from the model index
-    QVariant variant=index.data();
-    QString str=variant.toString();
+    QString str=item->text();
 
 #ifdef THEME_CHANGER_TRACES
     qDebug() << "ThemeSelectionList::Setchosen with ThemeName: "<<str;
 #endif
     if(iCurrentTheme != str ) {
+#ifdef THEME_CHANGER_TIMER_LOG
+        timer.start();
+        qDebug() << "Selected theme: " << str;
+#endif
         iCurrentTheme = str;
         if (!client->isConnected()) {
             bool success = client->connectToServer();
@@ -205,15 +204,13 @@
  */
 void ThemeSelectionList::applySelection()
 {
-    QModelIndex currentItemIndex = (themelist)->currentIndex();
-    if(oldItemIndex!=currentItemIndex) {
-        (model->itemFromIndex(currentItemIndex))->setIcon(rightMark->qicon());
-        if(oldItemIndex.isValid()) {
-            (model->itemFromIndex(oldItemIndex))->setIcon(noMark->qicon());
+    if(oldItemIndex!=themelist->currentRow()) {
+        themelist->setIcon(themelist->currentRow(),*rightMark);
+        if(oldItemIndex >= 0) {
+            themelist->setIcon(oldItemIndex,*noMark);
         }
-        oldItemIndex = currentItemIndex;
+        oldItemIndex = themelist->currentRow();
     }
-
 }
 
 
@@ -223,9 +220,10 @@
 bool ThemeSelectionList::event(QEvent *e)
 {
     if((e->type()==QEvent::ShortcutOverride)||(e->type()==QEvent::WindowDeactivate)) {        
-        themelist->setCurrentIndex(oldItemIndex,QItemSelectionModel::Select);
+        // save old applied theme
+        themelist->setCurrentRow(oldItemIndex);
         themelist->setFocus();
-        setChosen(oldItemIndex);
+        setChosen(themelist->item(oldItemIndex));
         return true;
     }
     return (HbView::event(e));
@@ -237,7 +235,7 @@
 void ThemeSelectionList::updateThemeList(const QString &path)
 {
     Q_UNUSED(path);
-    model->clear();
+    themelist->clear();
     this->displayThemes();
 }
 
@@ -258,7 +256,9 @@
     QStringList rootDirs;
 #if defined(Q_OS_SYMBIAN)
     rootDirs << "c:/resource/hb"
-             << "z:/resource/hb";
+             << "z:/resource/hb"
+             << "e:/resource/hb"
+             << "f:/resource/hb";
 #else
     QString envDir = qgetenv("HB_THEMES_DIR");
     if (!envDir.isEmpty())
@@ -271,3 +271,19 @@
 #endif
     return rootDirs;
 }
+
+#ifdef THEME_CHANGER_TIMER_LOG
+void ThemeSelectionList::processWhenIdle()
+{    
+    qDebug() << "Theme changed applied in " << timer.elapsed() << " msec";
+    idleTimer->stop();
+    if (!client->isConnected()) {
+        client->connectToServer();
+    }
+}
+
+void ThemeSelectionList::themeChanged()
+{
+    idleTimer->start(0);
+}
+#endif //THEME_CHANGER_TIMER_LOG
diff -r 16d8024aca5e -r f7ac710697a9 src/hbservers/themechanger/themeselectionlist.h
--- a/src/hbservers/themechanger/themeselectionlist.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbservers/themechanger/themeselectionlist.h	Mon May 03 12:48:33 2010 +0300
@@ -29,14 +29,16 @@
 #include <QModelIndex>
 #include <QStandardItemModel>
 #include <QFileSystemWatcher>
+#include <QTime>
 #include <hbview.h>
-#include <hblistview.h>
+#include <hblistwidget.h>
 
 #ifdef Q_OS_SYMBIAN
 #include "themeclientsymbian.h"
 #else
 #include "themeclientqt.h"
 #endif
+#include "themechangerdefs.h"
 
 class HbIcon;
 
@@ -56,10 +58,14 @@
     void newThemeSelected(const QString &newthemepath);
 public slots:
     void displayThemes();
-    void setChosen(const QModelIndex &index);
+    void setChosen(HbListWidgetItem *item);
     void applySelection();
     void updateThemeList(const QString &path);
     void sendThemeName(const QString& name);
+#ifdef THEME_CHANGER_TIMER_LOG
+    void processWhenIdle();
+    void themeChanged();
+#endif
 
 protected:
     bool event(QEvent *e);
@@ -67,9 +73,8 @@
 private:
     static QStringList rootPaths();
     QDir dir; 
-    QModelIndex oldItemIndex;
-    HbListView *themelist;
-    QStandardItemModel* model;
+    int oldItemIndex;
+    HbListWidget *themelist;
     HbIcon* rightMark;
     HbIcon* noMark;
     HbAction *action;
@@ -81,5 +86,9 @@
 
     QFileSystemWatcher *watcher;
     QString iCurrentTheme;
+#ifdef THEME_CHANGER_TIMER_LOG
+    QTime timer;
+    QTimer *idleTimer;
+#endif
 };
 #endif //THEMESELECTIONLIST_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbservers/themeindexer/main.cpp
--- a/src/hbservers/themeindexer/main.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbservers/themeindexer/main.cpp	Mon May 03 12:48:33 2010 +0300
@@ -25,9 +25,17 @@
 
 #include <hbiconsource_p.h>
 #include <hbthemeindex_p.h>
-#include <QtGui>
 #include <assert.h>
 #include <iostream>
+#include <QApplication>
+#include <QStringList>
+#include <QTextStream>
+#include <QFileInfo>
+#include <QLibrary>
+#include <QString>
+#include <QFile>
+#include <QMap>
+#include <QDir>
 
 #define RESOURCE_LIB_NAME "HbCore"
 #define WIN32_DEBUG_SUFFIX "d"
@@ -322,7 +330,7 @@
 
 int main(int argc, char *argv[])
 {
-    QApplication app(argc, argv);
+    QApplication app(argc, argv, false); // GUIenabled=false
 
     if (argc <= 2) {
         showHelp();
diff -r 16d8024aca5e -r f7ac710697a9 src/hbservers/themeindexer/themeindexer.pro
--- a/src/hbservers/themeindexer/themeindexer.pro	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbservers/themeindexer/themeindexer.pro	Mon May 03 12:48:33 2010 +0300
@@ -34,6 +34,7 @@
 DEFINES += HB_BOOTSTRAPPED
 QT = core gui svg
 CONFIG += console
+CONFIG -= app_bundle
 
 # directories
 DESTDIR = $${HB_BUILD_DIR}/bin
diff -r 16d8024aca5e -r f7ac710697a9 src/hbtools/docml2bin/docml2bin.pro
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbtools/docml2bin/docml2bin.pro	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,66 @@
+#############################################################################
+##
+## 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 = docml2bin
+
+#DEPENDPATH += .
+DEPENDPATH += $${HB_SOURCE_DIR}/src/hbutils/document
+DEPENDPATH += $${HB_SOURCE_DIR}/src/hbcore/core
+DEPENDPATH += $${HB_SOURCE_DIR}/src/hbcore/utils
+#INCLUDEPATH += .
+INCLUDEPATH += $${HB_SOURCE_DIR}/src/hbutils/document
+INCLUDEPATH += $${HB_SOURCE_DIR}/src/hbcore/core
+INCLUDEPATH += $${HB_SOURCE_DIR}/src/hbcore/utils
+DEFINES += HB_BOOTSTRAPPED
+CONFIG += console
+CONFIG -= app_bundle
+
+# directories
+DESTDIR = $${HB_BUILD_DIR}/bin
+
+# dependencies
+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
+SOURCES += $${HB_SOURCE_DIR}/src/hbcore/utils/hbxmlloaderabstractactions_p.cpp
+SOURCES += $${HB_SOURCE_DIR}/src/hbcore/utils/hbxmlloaderbinarysyntax_p.cpp
+SOURCES += $${HB_SOURCE_DIR}/src/hbcore/utils/hbxmlloaderbinaryactions_p.cpp
+SOURCES += $${HB_SOURCE_DIR}/src/hbcore/utils/hbxmlloaderbasesyntax_p.cpp
+HEADERS += $${HB_SOURCE_DIR}/src/hbutils/document/hbdocumentloader.h
+SOURCES += $${HB_SOURCE_DIR}/src/hbutils/document/hbdocumentloader.cpp
+SOURCES += $${HB_SOURCE_DIR}/src/hbutils/document/hbdocumentloader_p.cpp
+SOURCES += $${HB_SOURCE_DIR}/src/hbutils/document/hbdocumentloadersyntax_p.cpp
+
+# Input
+SOURCES += main.cpp
+
+# installation
+!local {
+    target.path = $${HB_BIN_DIR}
+    INSTALLS += target
+}
+
+include($${HB_SOURCE_DIR}/src/hbcommon.pri)
diff -r 16d8024aca5e -r f7ac710697a9 src/hbtools/docml2bin/main.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbtools/docml2bin/main.cpp	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,99 @@
+/****************************************************************************
+**
+** 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 HbTools 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 <hbdocumentloader.h>
+#include <QtGui>
+#include <assert.h>
+#include <iostream>
+
+
+void showHelp() {
+    std::cout << "docml2bin.exe usage:\n\n";
+
+    std::cout << "docml2bin -s sourceFile [-t targetFile]\n\n";
+
+    std::cout << "    Converts plain text docml file to a binary file.\n\n";
+
+    std::cout << "    If target file name is not given creates file named\n";
+    std::cout << "    <source file> + \".bin\".\n\n";
+
+    std::cout << "options:\n\n";
+
+    std::cout << " -s \t\tname of the source file (\"<filename.docml>\").\n";
+    std::cout << " -t \t\tname of the targe file (\"<binaryfile.bin>\").\n\n";
+
+    std::cout << "Example:\n";
+    std::cout << "docml2bin.exe -s myfile.docml -t c:/resouces/bin/mybinary.docml\n\n";
+}
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv, false); // GUIenabled=false
+
+    if (argc <= 2) {
+        showHelp();
+    } else {
+        QString source, target;
+        QStringList args(app.arguments());
+
+        for (int n = 0; n < args.count(); n++) {
+            if (args[n].toLower() == "-s") {
+                source = args[n+1];
+                n++;
+            } else if (args[n].toLower() == "-t") {
+                target = args[n+1];
+                n++;
+            } 
+        }
+
+        if (source.length() > 0) {
+            if (!QFile::exists(source)) {
+                std::cout << "Error: file " << source.toStdString() << " does not exist.\n";
+            } else {
+                // Open file and parse lines. Each line should have three value separated with:
+                QFile sourceFile(source);
+                if (sourceFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
+                    if (!target.length()) {
+                        target = source + ".bin";
+                    }
+                    if (QFile::exists(target)) {
+                        std::cout << "Error: target file already exists.\n";
+                    } else {
+                        QFile targetFile(target);
+                        if (targetFile.open(QIODevice::WriteOnly)) {
+                            HbDocumentLoader loader;
+                            loader.createBinary( &sourceFile, &targetFile );
+                            targetFile.close();
+                        }
+                    }
+                    sourceFile.close();
+                }
+            }
+        }
+    }
+
+    return 0;
+}
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbutils/document/document.pri
--- a/src/hbutils/document/document.pri	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbutils/document/document.pri	Mon May 03 12:48:33 2010 +0300
@@ -30,10 +30,10 @@
 PUBLIC_HEADERS += $$PWD/hbdocumentloader.h
 PUBLIC_HEADERS += $$PWD/hbdocumentloaderplugin.h
 
-INTERNAL_HEADERS += $$PWD/hbdocumentloader_p.h
-INTERNAL_HEADERS += $$PWD/hbdocumentloaderactions_p.h
-INTERNAL_HEADERS += $$PWD/hbdocumentloaderfactory_p.h
-INTERNAL_HEADERS += $$PWD/hbdocumentloadersyntax_p.h
+PRIVATE_HEADERS += $$PWD/hbdocumentloader_p.h
+PRIVATE_HEADERS += $$PWD/hbdocumentloaderactions_p.h
+PRIVATE_HEADERS += $$PWD/hbdocumentloaderfactory_p.h
+PRIVATE_HEADERS += $$PWD/hbdocumentloadersyntax_p.h
 
 SOURCES += $$PWD/hbdocumentloader.cpp
 SOURCES += $$PWD/hbdocumentloader_p.cpp
diff -r 16d8024aca5e -r f7ac710697a9 src/hbutils/document/hbdocumentloader.cpp
--- a/src/hbutils/document/hbdocumentloader.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbutils/document/hbdocumentloader.cpp	Mon May 03 12:48:33 2010 +0300
@@ -26,7 +26,7 @@
 #include "hbdocumentloader.h"
 #include "hbdocumentloader_p.h"
 #include "hbdocumentloaderactions_p.h"
-#include <hbmainwindow.h>
+#include "hbdocumentloadersyntax_p.h"
 
 #include <QString>
 #include <QGraphicsWidget>
@@ -160,6 +160,17 @@
     return load( device, QString(), ok );
 }
 
+/*!
+    Converts DocML document to binary document. 
+    \param srcDevice source IO device to be processed.
+    \param dstDevice destination IO device where to write to.
+    \return true if conversion was ok.
+*/
+bool HbDocumentLoader::createBinary( QIODevice *srcDevice, QIODevice *dstDevice )
+{
+    Q_D(HbDocumentLoader);
+    return d->createBinary( srcDevice, dstDevice );
+}
 
 /*!
     Retrieves widget of which object name equals to \a name.
@@ -208,8 +219,14 @@
 */
 QObject *HbDocumentLoader::createObject(const QString& type, const QString &name)
 {
+#ifdef HB_BOOTSTRAPPED
+    Q_UNUSED(type);
+    Q_UNUSED(name);
+    return 0;
+#else
     Q_D(HbDocumentLoader);
     return d->actions->createObjectWithFactory(type, name);
+#endif
 }
 
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbutils/document/hbdocumentloader.h
--- a/src/hbutils/document/hbdocumentloader.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbutils/document/hbdocumentloader.h	Mon May 03 12:48:33 2010 +0300
@@ -47,13 +47,14 @@
     HbDocumentLoader(const HbMainWindow *window);
     virtual ~HbDocumentLoader();
 
-
     QObjectList load( const QString &fileName, const QString &section , bool *ok = 0 );
     QObjectList load( QIODevice *device, const QString &section, bool *ok = 0 );
 
     QObjectList load( const QString &fileName, bool *ok = 0 );
     QObjectList load( QIODevice *device, bool *ok = 0 );
     
+    bool createBinary( QIODevice *srcDevice, QIODevice *dstDevice );
+
     QGraphicsWidget *findWidget(const QString &name) const;
     QObject *findObject(const QString &name) const;
     
diff -r 16d8024aca5e -r f7ac710697a9 src/hbutils/document/hbdocumentloader_p.cpp
--- a/src/hbutils/document/hbdocumentloader_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbutils/document/hbdocumentloader_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -28,14 +28,21 @@
 #include "hbdocumentloadersyntax_p.h"
 #include "hbdocumentloader.h"
 
+#include <hbxmlloaderbinaryactions_p.h>
+#include <hbxmlloaderbinarysyntax_p.h>
+
+#ifndef HB_BOOTSTRAPPED
+
 #include <QGraphicsWidget>
-
 #include <QCoreApplication>
 #include <QDir>
 #include <QPluginLoader>
 #include "hbdocumentloaderplugin.h"
 #include <hbmainwindow.h>
 #include <hbinstance.h>
+#include <QBuffer>
+
+#endif // HB_BOOTSTRAPPED
 
 /*
     \class HbDocumentLoaderPrivate
@@ -43,45 +50,175 @@
     \proto
 */
 
+//#define DEBUG_TIMES
+
+#ifdef DEBUG_TIMES
+#include <QTime>
+#include <QDebug>
+static QTime debugTime;
+
+#ifdef Q_OS_SYMBIAN
+#include <e32debug.h>
+#endif
+
+void doDebugPrintX(const char* text)
+{
+#ifdef Q_OS_SYMBIAN
+    RDebug::Printf(text);
+#else
+    qDebug() << text;
+#endif
+}
+
+// Takes standard c-format.
+void debugPrintX(const char* cformat, ...)
+{
+    va_list ap;
+    va_start(ap, cformat);
+    QString str = QString().vsprintf(cformat, ap);
+    va_end(ap);
+    doDebugPrintX(str.toAscii().constData());
+}
+
+#endif // DEBUG_TIMES
+
 
 HbDocumentLoaderPrivate::HbDocumentLoaderPrivate(const HbMainWindow *window)
 : q_ptr(0)
 {
-    actions = new HbDocumentLoaderActions(this);
-    syntax = new HbDocumentLoaderSyntax(actions, window);
+#ifdef HB_BOOTSTRAPPED
+    Q_UNUSED(window);
+#else
+    actions = new HbDocumentLoaderActions(this, window);
+    binarysyntax = new HbXmlLoaderBinarySyntax(actions);
     pluginManager = new HbDocumentLoaderPluginManager;
+#endif
+    binaryactions = new HbXmlLoaderBinaryActions();
+    syntax = new HbDocumentLoaderSyntax(binaryactions);
 }
 
 HbDocumentLoaderPrivate::~HbDocumentLoaderPrivate()
 {
-    delete pluginManager;
+    delete binaryactions;
     delete syntax;
+#ifndef HB_BOOTSTRAPPED
+    delete pluginManager;
     delete actions;
+    delete binarysyntax;
+#endif
+}
+
+bool HbDocumentLoaderPrivate::createBinary( QIODevice *srcDevice, QIODevice *dstDevice )
+{
+    bool result = true;
+    syntax->setActions( binaryactions );
+#ifdef DEBUG_TIMES
+    debugTime.restart();
+    debugPrintX("MYTRACE: DocML create binary, start");
+#endif
+    binaryactions->setOutputDevice( dstDevice );
+    // TODO: Has to process all sections!
+    QList<QString> sectionsList;
+    QHash< QString, qint64 > sectionsPositionList;
+    qint64 startPos = srcDevice->pos();
+    if( syntax->scanForSections( srcDevice, sectionsList ) ) {
+        srcDevice->seek( startPos );
+        result = syntax->load( srcDevice, "" );
+        if( !sectionsList.isEmpty() ) {
+            for( int i = 0; i < sectionsList.size(); i++ ) {
+                sectionsPositionList[ sectionsList.at( i ) ] = dstDevice->pos();
+                srcDevice->seek( startPos );
+                result &= syntax->load( srcDevice, sectionsList.at( i ) );
+            }
+        }
+    } else {
+        result = false;
+    }
+    qint64 sectionsMetaDataPos = dstDevice->pos();
+    QDataStream stream( dstDevice );
+    stream << sectionsPositionList;
+    stream << sectionsMetaDataPos;
+
+
+#ifdef DEBUG_TIMES
+    debugPrintX("MYTRACE: DocML create binary, end: %d", debugTime.elapsed());
+#endif
+    return result;
 }
 
 bool HbDocumentLoaderPrivate::load( QIODevice *device, const QString &section )
 {
-    return syntax->load( device, section );
+#ifdef HB_BOOTSTRAPPED
+    Q_UNUSED(device);
+    Q_UNUSED(section);
+    return false;
+#else
+    bool result(true);
+
+    if (binarysyntax->isBinary(device)) {
+        binarysyntax->setActions(actions);
+#ifdef DEBUG_TIMES
+        debugTime.restart();
+        debugPrintX("MYTRACE: DocML load binary, start");
+#endif
+        result = binarysyntax->load( device, section );
+#ifdef DEBUG_TIMES
+        debugPrintX("MYTRACE: DocML load binary, end: %d", debugTime.elapsed());
+#endif
+    } else {
+        syntax->setActions(actions);
+#ifdef DEBUG_TIMES
+        debugTime.restart();
+        debugPrintX("MYTRACE: DocML load plain text, start");
+#endif
+        result = syntax->load( device, section );
+#ifdef DEBUG_TIMES
+        debugPrintX("MYTRACE: DocML load plain text, end: %d", debugTime.elapsed());
+#endif
+    }
+    return result;
+#endif
 }
 
 QList<QObject *> HbDocumentLoaderPrivate::takeAll()
 {
+#ifdef HB_BOOTSTRAPPED
+    QList<QObject *> list;
+    return list;
+#else
     return actions->takeAll();
+#endif
 }
 
 QGraphicsWidget* HbDocumentLoaderPrivate::findWidget(const QString &name) const
 {
+#ifdef HB_BOOTSTRAPPED
+    Q_UNUSED(name);
+    return 0;
+#else
     return actions->findWidget( name );
+#endif
 }
 
 QObject* HbDocumentLoaderPrivate::findObject(const QString &name) const
 {
+#ifdef HB_BOOTSTRAPPED
+    Q_UNUSED(name);
+    return 0;
+#else
     return actions->findObject( name );
+#endif
 }
 
 
 QObject *HbDocumentLoaderPrivate::lookUp(const QString& type, const QString &name, const QString &plugin)
 {
+#ifdef HB_BOOTSTRAPPED
+    Q_UNUSED(type);
+    Q_UNUSED(name);
+    Q_UNUSED(plugin);
+    return 0;
+#else
     if ( plugin.isEmpty() ) {
         return q_ptr->createObject( type, name );
     } else {
@@ -92,24 +229,37 @@
         }
         return object;
     }
+#endif
 }
 
 void HbDocumentLoaderPrivate::reset()
 {
+#ifndef HB_BOOTSTRAPPED
     actions->reset();
+#endif
 }
 
 bool HbDocumentLoaderPrivate::setObjectTree( QList<QObject *> roots )
 {
+#ifdef HB_BOOTSTRAPPED
+    Q_UNUSED(roots);
+    return false;
+#else
     return actions->setObjectTree( roots );
+#endif
 }
 
 QString HbDocumentLoaderPrivate::version()
 {
+#ifdef HB_BOOTSTRAPPED
+    return QString();
+#else
     return HbDocumentLoaderSyntax::version();
+#endif
 }
 
 
+#ifndef HB_BOOTSTRAPPED
 HbDocumentLoaderPluginManager::HbDocumentLoaderPluginManager()
 {
 }
@@ -228,5 +378,7 @@
     return 0;
 }
 
+#endif // HB_BOOTSTRAPPED
+
 // end of file
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbutils/document/hbdocumentloader_p.h
--- a/src/hbutils/document/hbdocumentloader_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbutils/document/hbdocumentloader_p.h	Mon May 03 12:48:33 2010 +0300
@@ -36,6 +36,10 @@
 class HbDocumentLoader;
 class HbDocumentLoaderSyntax;
 class HbDocumentLoaderActions;
+class HbXmlLoaderBinaryActions;
+class HbXmlLoaderBinarySyntax;
+class HbXmlLoaderAbstractActions;
+
 class QPluginLoader;
 class HbDocumentLoaderPluginManager;
 class HbMainWindow;
@@ -55,6 +59,7 @@
     virtual ~HbDocumentLoaderPrivate();
     
     bool load( QIODevice *device, const QString &section );
+    bool createBinary( QIODevice *srcDevice, QIODevice *dstDevice );
     QList<QObject *> takeAll();
 
     QGraphicsWidget *findWidget(const QString &name) const;
@@ -75,12 +80,14 @@
     HbDocumentLoader *q_ptr;
     HbDocumentLoaderActions *actions;
     HbDocumentLoaderSyntax *syntax;
+    HbXmlLoaderBinaryActions *binaryactions;
+    HbXmlLoaderBinarySyntax *binarysyntax;
     HbDocumentLoaderPluginManager *pluginManager;
 };
 
 
 
-
+#ifndef HB_BOOTSTRAPPED
 
 class HbDocumentLoaderPluginManager
 {
@@ -100,4 +107,6 @@
     QList<QPluginLoader*> mPlugins;
 };
 
+#endif //HB_BOOTSTRAPPED
+
 #endif // HBDOCUMENTLOADER_P_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbutils/document/hbdocumentloaderactions_p.cpp
--- a/src/hbutils/document/hbdocumentloaderactions_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbutils/document/hbdocumentloaderactions_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -24,9 +24,10 @@
 ****************************************************************************/
 
 #include "hbdocumentloaderactions_p.h"
+#include <hbxmlloaderabstractsyntax_p.h>
 
 #include <QCoreApplication>
-#include <QGraphicsLinearLayout> 
+#include <QGraphicsLinearLayout>
 #include <QGraphicsGridLayout>
 
 #include <QMetaObject>
@@ -46,11 +47,11 @@
     public:
         int getEnumValue( const char *enumeration, const char *str )
             {
-                QMetaObject metaobject = staticQtMetaObject; 
+                QMetaObject metaobject = staticQtMetaObject;
                 QMetaEnum e = metaobject.enumerator( metaobject.indexOfEnumerator( enumeration ) );
                 return e.keysToValue( str );
             }
-    };        
+    };
 
 /*
     \class HbDocumentLoaderActions
@@ -58,15 +59,20 @@
     \proto
 */
 
-HbDocumentLoaderActions::HbDocumentLoaderActions( HbDocumentLoaderPrivate *ref ) : 
-    HbXmlLoaderAbstractActions(), 
+HbDocumentLoaderActions::HbDocumentLoaderActions( HbDocumentLoaderPrivate *ref, const HbMainWindow *window ) :
+    HbXmlLoaderBaseActions(),
     d( ref )
 {
+    if ( window ) {
+        mCurrentProfile = HbDeviceProfile::profile(window);
+    } else {
+        mCurrentProfile = HbDeviceProfile::current();
+    }
 }
 
 HbDocumentLoaderActions::~HbDocumentLoaderActions()
 {
-    reset();    
+    reset();
 }
 
 
@@ -79,7 +85,7 @@
 
 QObject* HbDocumentLoaderActions::createObjectWithFactory( const QString& type, const QString &name )
 {
-    return factory.create(type, name);
+    return mFactory.create(type, name);
 }
 
 
@@ -87,28 +93,28 @@
 bool HbDocumentLoaderActions::pushObject( const QString& type, const QString &name )
 {
     QObject *parent = findFromStack();
- 
+
     if ( !parent && name.isEmpty() ) {
         HB_DOCUMENTLOADER_PRINT( QString( "Top level object must have name" ) );
         return false;
     }
 
-    QObject *current = lookUp(type, name);
-    
+    QObject *current = lookUp(type, name).first.data();
+
     if( current == 0 ) {
         HB_DOCUMENTLOADER_PRINT( QString( "Not supported object: " ) + type );
         return false;
     }
-    
-    Element e;
-    e.type = OBJECT;
+
+    HbXml::Element e;
+    e.type = HbXml::OBJECT;
     e.data = current;
     mStack.append( e );
-    
+
     if (parent) {
         current->setParent(parent);
     }
-    
+
     HB_DOCUMENTLOADER_PRINT( QString( "ADD ELEMENT " ) + name );
 
     return true;
@@ -116,45 +122,52 @@
 
 bool HbDocumentLoaderActions::pushWidget( const QString& type, const QString &name, const QString &role, const QString &plugin )
 {
-    bool parentWidget = false;
-    QObject *parent = findFromStack(&parentWidget);
+    bool parentIsWidget = false;
+    QObject *parent = findFromStack(&parentIsWidget);
 
     if ( !parent && name.isEmpty() ) {
         HB_DOCUMENTLOADER_PRINT( QString( "Top level widget must have name" ) );
         return false;
     }
-    
-    if ( parent && !parentWidget ) {
+
+    if ( parent && !parentIsWidget ) {
         HB_DOCUMENTLOADER_PRINT( QString( "Object element cannot be parent of widget" ) );
         return false;
-    }    
+    }
 
-    QObject *current = lookUp(type, name, plugin);
-    
+    ObjectMapItem item = lookUp(type, name, plugin);
+    QObject *current = item.first.data();
+
     if( current == 0 ) {
         HB_DOCUMENTLOADER_PRINT( QString( "Not supported object: " ) + type );
         return false;
     }
-    
-    QGraphicsWidget *parentAsWidget = qobject_cast<QGraphicsWidget *>(parent);
-    QGraphicsWidget *asWidget = qobject_cast<QGraphicsWidget *>(current);
+
+    QGraphicsWidget *parentAsWidget(0);
+    if (parentIsWidget) {
+        parentAsWidget = static_cast<QGraphicsWidget *>(parent);
+    }
+    QGraphicsWidget *asWidget(0);
+    if (item.second == HbXml::WIDGET) {
+        asWidget = static_cast<QGraphicsWidget *>(current);
+    }
 
     if (!asWidget || (parent && !parentAsWidget)) {
         HB_DOCUMENTLOADER_PRINT( QString( "Not a widget" ) );
         return false;
-    } 
+    }
 
     if (parentAsWidget && !setWidgetRole(parentAsWidget, asWidget, role)) {
         HB_DOCUMENTLOADER_PRINT( QString( "Unable to set role" ) );
         return false;
     }
 
-    Element e;
-    e.type = WIDGET;
+    HbXml::Element e;
+    e.type = HbXml::WIDGET;
     e.data = current;
     mStack.append( e );
     HB_DOCUMENTLOADER_PRINT( QString( "ADD ELEMENT " ) + name );
-    
+
     return true;
 }
 
@@ -178,8 +191,11 @@
     } else if( !( mObjectMap.contains( widget ) ) ) {
         HB_DOCUMENTLOADER_PRINT( QString( "SPACERITEM: NO SUCH ITEM " ) + widget );
         return false;
-    } else {   
-        parent = qobject_cast<HbWidget *>( mObjectMap[ widget ].data() );
+    } else {
+        ObjectMapItem &item = mObjectMap[ widget ];
+        if (item.second == HbXml::WIDGET) {
+            parent = qobject_cast<HbWidget *>( item.first.data() );
+        }
         if( !parent ) {
             HB_DOCUMENTLOADER_PRINT( QString( "SPACERITEM: CANNOT SET SPACERITEM TO NON-HBWIDGET " ) );
             return false;
@@ -193,96 +209,93 @@
     }
 
     // add it onto stack for further processing
-    Element e;
-    e.type = SPACERITEM;
+    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, 
+bool HbDocumentLoaderActions::pushConnect( const QString &srcName, const QString &signalName,
                                             const QString &dstName, const QString &slotName )
 {
     if( srcName.isEmpty() || signalName.isEmpty() || dstName.isEmpty() || slotName.isEmpty() ) {
         HB_DOCUMENTLOADER_PRINT( QString( "Wrong parameters for signal/slot connection" ) );
         return false;
     }
-    
+
     if( ! mObjectMap.contains( srcName ) ) {
         HB_DOCUMENTLOADER_PRINT( QString( "Unable to establish signal/slot connection, no instance with name " ) + srcName );
-        return false;        
+        return false;
     }
     if( ! mObjectMap.contains( dstName ) ) {
         HB_DOCUMENTLOADER_PRINT( QString( "Unable to establish signal/slot connection, no instance with name " ) + dstName );
-        return false;   
+        return false;
     }
-    
-    QObject *src = mObjectMap[ srcName ];
+
+    QObject *src = mObjectMap[ srcName ].first;
 
     if( !src ) {
         HB_DOCUMENTLOADER_PRINT( QString( "Unable to establish signal/slot connection, already destroyed " ) + srcName );
-        return false;        
+        return false;
     }
 
-    QObject *dst = mObjectMap[ dstName ];
+    QObject *dst = mObjectMap[ dstName ].first;
 
     if( !dst ) {
         HB_DOCUMENTLOADER_PRINT( QString( "Unable to establish signal/slot connection, already destroyed " ) + dstName );
         return false;
     }
-    
+
     const QMetaObject *msrc = src->metaObject();
     const QMetaObject *mdst = dst->metaObject();
-    
+
     int signalIndex = msrc->indexOfSignal( QMetaObject::normalizedSignature( signalName.toLatin1() ) );
     int slotIndex = mdst->indexOfSlot( QMetaObject::normalizedSignature( slotName.toLatin1() ) );
-    
+
     if( signalIndex == -1 ) {
         HB_DOCUMENTLOADER_PRINT( QString( "Unable to establish signal/slot connection, no such signal " ) + signalName );
         return false;
     }
-    
+
     if( slotIndex == -1 ) {
         HB_DOCUMENTLOADER_PRINT( QString( "Unable to establish signal/slot connection, no such slot " ) + slotName );
         return false;
     }
-    
-    QMetaObject::connect(src, signalIndex, dst, slotIndex );    
-    
+
+    QMetaObject::connect(src, signalIndex, dst, slotIndex );
+
     return true;
 }
 
-bool HbDocumentLoaderActions::pushProperty( const QString &propertyName, const QVariant &value )
+bool HbDocumentLoaderActions::pushProperty( const char *propertyName, const HbXmlVariable &variable )
 {
     QObject *current = findFromStack();
-    
+
     if( current == 0 ) {
         HB_DOCUMENTLOADER_PRINT( QString( "Unable to set property " ) + propertyName );
         return false;
     }
-    
-        
-    if( propertyName.isEmpty() ) {
-        HB_DOCUMENTLOADER_PRINT( QString( "No property name for " ) + propertyName );
-        return false;
-    } 
-    
-    QByteArray asLatin1 = propertyName.toLatin1();    
-    current->setProperty( asLatin1, value );
-    return true;    
+
+    QVariant value;
+    bool ok = variableToQVariant(variable, value);
+    if (ok) {
+        current->setProperty( propertyName, value );
+    }
+    return ok;
 }
 
 bool HbDocumentLoaderActions::pushRef( const QString &name, const QString &role )
 {
     QObject *current = findFromStack();
-    QObject *ref = mObjectMap[ name ].data();
-    
+    QObject *ref = mObjectMap[ name ].first.data();
+
     if( ( current == 0 ) || ( ref == 0 ) ) {
         HB_DOCUMENTLOADER_PRINT( QString( "Wrong role name or role context" ) );
-        return false;        
+        return false;
     }
 
     if ( !setObjectRole(current, ref, role)) {
@@ -292,70 +305,139 @@
     return true;
 }
 
-bool HbDocumentLoaderActions::setContentsMargins( qreal left, qreal top, qreal right, qreal bottom )
+bool HbDocumentLoaderActions::pushContainer( const char *propertyName,
+                                             HbXmlLoaderAbstractSyntax::DocumentLexems type,
+                                             const QList<HbXmlVariable*> &container )
+{
+    bool result = true;
+    if ( type == HbXmlLoaderAbstractSyntax::CONTAINER_STRINGLIST ) {
+        QStringList list;
+        for ( int i=0; i<container.count(); i++ ) {
+            QVariant variant;
+            result = variableToQVariant(*(container.value(i)), variant);
+            if ( result ) {
+                list.append( variant.toString() );
+            }
+        }
+        if ( result ) {
+            QObject *current = findFromStack();
+
+            if (current == 0) {
+                HB_DOCUMENTLOADER_PRINT( QString( "Unable to set property " ) + propertyName );
+                result = false;
+            }
+
+            if (result) {
+                current->setProperty( propertyName, list );
+            }
+        }
+    } else {
+        result = false;
+    }
+
+    return result;
+}
+
+bool HbDocumentLoaderActions::setContentsMargins( const HbXmlLengthValue &left,
+                                                 const HbXmlLengthValue &top,
+                                                 const HbXmlLengthValue &right,
+                                                 const HbXmlLengthValue &bottom )
 {
     bool isWidget = false;
-    QGraphicsWidget *widget = qobject_cast<QGraphicsWidget *>(findFromStack(&isWidget));
-    if( !isWidget || !widget ) {
+    QObject* obj = findFromStack(&isWidget);
+    if( !obj || !isWidget ) {
         HB_DOCUMENTLOADER_PRINT( QString( "Cannot set contentsmargins for non-QGraphicsWidget" ) );
         return false;
     }
-    widget->setContentsMargins( left, top, right, bottom );
-    return true;
+    QGraphicsWidget *widget = static_cast<QGraphicsWidget *>(obj);
+
+    qreal leftVal=0, topVal=0, rightVal=0, bottomVal=0;
+    bool ok = true;
+    if (left.mType != HbXmlLengthValue::None) {
+        ok &= toPixels(left, leftVal);
+    }
+    if (top.mType != HbXmlLengthValue::None) {
+        ok &= toPixels(top, topVal);
+    }
+    if (right.mType != HbXmlLengthValue::None) {
+        ok &= toPixels(right, rightVal);
+    }
+    if (bottom.mType != HbXmlLengthValue::None) {
+        ok &= toPixels(bottom, bottomVal);
+    }
+    if ( ok ) {
+        widget->setContentsMargins( leftVal, topVal, rightVal, bottomVal );
+    }
+    return ok;
 }
 
 
-bool HbDocumentLoaderActions::setSizeHint(Qt::SizeHint hint, qreal *hintWidth, qreal *hintHeight, bool fixed)
+bool HbDocumentLoaderActions::setSizeHint(Qt::SizeHint hint, const HbXmlLengthValue &hintWidth, const HbXmlLengthValue &hintHeight, bool fixed)
 {
     QGraphicsLayoutItem *current = findSpacerItemFromStackTop();
     if (!current) {
         bool isWidget = false;
-        QGraphicsWidget *widget = qobject_cast<QGraphicsWidget *>(findFromStack(&isWidget));
-        if( !isWidget || !widget ) {
+        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;
     }
+    qreal hintWidthVal, hintHeightVal;
+
+    bool ok = true;
+    if ( hintWidth.mType != HbXmlLengthValue::None ) {
+        ok &= toPixels(hintWidth, hintWidthVal);
+    }
+    if ( hintHeight.mType != HbXmlLengthValue::None ) {
+        ok &= toPixels(hintHeight, hintHeightVal);
+    }
+    if (!ok) {
+        return false;
+    }
 
+    // TODO: Use set <Min/Pref/Max> Size if both declared. It's more efficient.
     switch (hint) {
-    case Qt::MinimumSize: 
-        if ( hintWidth ) {
-            current->setMinimumWidth(*hintWidth);
+    case Qt::MinimumSize:
+        if ( hintWidth.mType != HbXmlLengthValue::None ) {
+
+            current->setMinimumWidth(hintWidthVal);
         }
-        if ( hintHeight ) {
-            current->setMinimumHeight(*hintHeight);
+        if ( hintHeight.mType != HbXmlLengthValue::None ) {
+            current->setMinimumHeight(hintHeightVal);
         }
         break;
 
-    case Qt::PreferredSize: 
-        if ( hintWidth ) {
-            current->setPreferredWidth(*hintWidth);
+    case Qt::PreferredSize:
+        if ( hintWidth.mType != HbXmlLengthValue::None ) {
+            current->setPreferredWidth(hintWidthVal);
         }
-        if ( hintHeight ) {
-            current->setPreferredHeight(*hintHeight);
+        if ( hintHeight.mType != HbXmlLengthValue::None ) {
+            current->setPreferredHeight(hintHeightVal);
         }
         break;
 
-    case Qt::MaximumSize: 
-        if ( hintWidth ) {
-            current->setMaximumWidth(*hintWidth);
+    case Qt::MaximumSize:
+        if ( hintWidth.mType != HbXmlLengthValue::None ) {
+            current->setMaximumWidth(hintWidthVal);
         }
-        if ( hintHeight ) {
-            current->setMaximumHeight(*hintHeight);
+        if ( hintHeight.mType != HbXmlLengthValue::None ) {
+            current->setMaximumHeight(hintHeightVal);
         }
         break;
 
     default:
         break;
     }
-    
+
     if (fixed) {
         QSizePolicy policy = current->sizePolicy();
-        if ( hintWidth && *hintWidth >= 0) {
+        if ( hintWidth.mType != HbXmlLengthValue::None && hintWidthVal >= 0) {
             policy.setHorizontalPolicy(QSizePolicy::Fixed);
         }
-        if ( hintHeight && *hintHeight >= 0) {
+        if ( hintHeight.mType != HbXmlLengthValue::None && hintHeightVal >= 0) {
             policy.setVerticalPolicy(QSizePolicy::Fixed);
         }
         current->setSizePolicy(policy);
@@ -364,46 +446,39 @@
     return true;
 }
 
-bool HbDocumentLoaderActions::setZValue( qreal zValue )
+bool HbDocumentLoaderActions::setToolTip( const HbXmlVariable &tooltip )
 {
-    bool isWidget = false;
-    QGraphicsWidget *widget = qobject_cast<QGraphicsWidget *>(findFromStack(&isWidget));
-    if( !isWidget || !widget ) {
-        HB_DOCUMENTLOADER_PRINT( QString( "Cannot set z value for non-QGraphicsWidget" ) );
-        return false;
-    }
-
-    widget->setZValue( zValue );
-    return true;
-}
-
-bool HbDocumentLoaderActions::setToolTip( const QString &tooltip )
-{
-    bool isWidget = false;
-    QGraphicsWidget *widget = qobject_cast<QGraphicsWidget *>(findFromStack(&isWidget));
-    if( !isWidget || !widget ) {
+    bool isWidget;
+    QObject* obj = findFromStack(&isWidget);
+    if( !obj || !isWidget ) {
         HB_DOCUMENTLOADER_PRINT( QString( "Cannot set tooltip for non-QGraphicsWidget" ) );
         return false;
     }
+    QGraphicsWidget *widget = static_cast<QGraphicsWidget *>(obj);
 
-    widget->setToolTip( tooltip );
-    return true;
+    QVariant variant;
+    bool result = variableToQVariant( tooltip, variant );
+    if ( result ) {
+        widget->setToolTip( variant.toString() );
+    }
+    return result;
 }
 
-bool HbDocumentLoaderActions::setSizePolicy( 
-    const QSizePolicy::Policy *horizontalPolicy, 
-    const QSizePolicy::Policy *verticalPolicy, 
-    const int *horizontalStretch,
-    const int *verticalStretch )
+bool HbDocumentLoaderActions::setSizePolicy(
+    QSizePolicy::Policy *horizontalPolicy,
+    QSizePolicy::Policy *verticalPolicy,
+    int *horizontalStretch,
+    int *verticalStretch )
 {
     QGraphicsLayoutItem *current = findSpacerItemFromStackTop();
     if (!current) {
         bool isWidget = false;
-        QGraphicsWidget *widget = qobject_cast<QGraphicsWidget *>(findFromStack(&isWidget));
-        if( !isWidget || !widget ) {
+        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;
     }
 
@@ -440,29 +515,29 @@
 bool HbDocumentLoaderActions::createAnchorLayout( const QString &widget )
 {
     QGraphicsWidget *parent = 0;
-    
+
     if( widget.isEmpty() ) {
         bool isWidget = false;
-        parent = qobject_cast<QGraphicsWidget *>( findFromStack( &isWidget ) );
-        if( !isWidget ) {
-            HB_DOCUMENTLOADER_PRINT( QString( "ANCHORLAYOUT: CANNOT SET LAYOUT TO NON-QGRAPHICSWIDGET " ) );
-            return false;
+        QObject *parentObj = findFromStack( &isWidget );
+        if( isWidget ) {
+            parent = static_cast<QGraphicsWidget *>( parentObj );
         }
-    } else if( !( mObjectMap.contains( widget ) ) ) {
-        HB_DOCUMENTLOADER_PRINT( QString( "ANCHORLAYOUT: NO SUCH ITEM " ) + widget );
+    } else if ( mObjectMap.contains( widget ) && mObjectMap[ widget ].second == HbXml::WIDGET ) {
+        parent = static_cast<QGraphicsWidget *>( mObjectMap[ widget ].first.data() );
+    }
+    if ( !parent ) {
+        HB_DOCUMENTLOADER_PRINT( QString( "ANCHORLAYOUT: PARENT NOT FOUND" ) );
         return false;
-    } else {   
-        parent = qobject_cast<QGraphicsWidget *>( mObjectMap[ widget ].data() );
     }
-    
-    mCurrentLayout = new HbAnchorLayout();  
-    
+
+    mCurrentLayout = new HbAnchorLayout();
+
     parent->setLayout( mCurrentLayout );
-    
+
     return true;
 }
 
-QGraphicsLayoutItem *findLayoutItem( const QGraphicsLayout &layout, const QString &layoutItemName ) 
+QGraphicsLayoutItem *findLayoutItem( const QGraphicsLayout &layout, const QString &layoutItemName )
 {
     QGraphicsLayoutItem *result = 0;
     if ( layout.parentLayoutItem() ) {
@@ -477,8 +552,9 @@
     return result;
 }
 
-bool HbDocumentLoaderActions::addAnchorLayoutEdge( const QString &src, const QString &srcEdge, 
-                                                    const QString &dst, const QString &dstEdge, qreal spacing, const QString &spacer )
+bool HbDocumentLoaderActions::addAnchorLayoutEdge( const QString &src, Hb::Edge srcEdge,
+                                                   const QString &dst, Hb::Edge dstEdge,
+                                                   const HbXmlLengthValue &spacing, const QString &spacer )
 {
     if ( !spacer.isEmpty() ) {
         // spacer is added
@@ -486,547 +562,494 @@
         bool ok = true;
         if ( src.isEmpty() ) {
             // if the starting item is layout
-            // "layout --(spacing)--> item" 
-            // becomes 
+            // "layout --(spacing)--> item"
+            // becomes
             // "layout --(spacing)--> spacer --(0)--> item"
             ok &= addAnchorLayoutEdge( src, srcEdge, spacer, srcEdge, spacing );
-            ok &= addAnchorLayoutEdge( spacer, getAnchorOppositeEdge(srcEdge), dst, dstEdge, 0 );
+            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)--> item2"
+            // becomes
             // "item1 --(spacing)--> spacer --(0)--> item2"
             ok &= addAnchorLayoutEdge( src, srcEdge, spacer, getAnchorOppositeEdge(srcEdge), spacing );
-            ok &= addAnchorLayoutEdge( spacer, srcEdge, dst, dstEdge, 0 );
+            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() ) {
+
+    if ( src.isEmpty() ) {
         item1 = layout;
-    } else if( !( mObjectMap.contains( src ) ) ) {
+    } else if ( !( mObjectMap.contains( src ) ) ) {
         item1 = findLayoutItem( *layout, src );
-        if ( !item1 ) {
-            HB_DOCUMENTLOADER_PRINT( QString( "ANCHORLAYOUT: NO SUCH ITEM " ) + src );
-            return false;
+    } else {
+        if (mObjectMap[ src ].second == HbXml::WIDGET) {
+            item1 = static_cast<QGraphicsWidget *>( mObjectMap[ src ].first.data() );
         }
-    } else {
-        item1 = qobject_cast<QGraphicsWidget *>( mObjectMap[ src ].data() );
     }
-    
-    if( dst.isEmpty() ) {
+    if ( !item1 ) {
+        HB_DOCUMENTLOADER_PRINT( QString( "ANCHORLAYOUT: NO SUCH ITEM " ) + src );
+        return false;
+    }
+
+    if ( dst.isEmpty() ) {
         item2 = layout;
     } else if( !( mObjectMap.contains( dst ) ) ) {
         item2 = findLayoutItem( *layout, dst );
-        if ( !item2 ) {
-            HB_DOCUMENTLOADER_PRINT( QString( "ANCHORLAYOUT: NO SUCH ITEM " ) + dst );
-            return false;
+    } else {
+        if (mObjectMap[ dst ].second == HbXml::WIDGET) {
+            item2 = static_cast<QGraphicsWidget *>( mObjectMap[ dst ].first.data() );
         }
-    } else {
-        item2 = qobject_cast<QGraphicsWidget *>( mObjectMap[ dst ].data() );
-    }  
-    
-    int edge1 = getAnchorEdge( srcEdge );
-    int edge2 = getAnchorEdge( dstEdge );
-    
-    if( edge1 < 0 ) {
-        HB_DOCUMENTLOADER_PRINT( QString( "ANCHORLAYOUT: UNKNOWN EDGE " ) + srcEdge );
+    }
+    if ( !item2 ) {
+        HB_DOCUMENTLOADER_PRINT( QString( "ANCHORLAYOUT: NO SUCH ITEM " ) + dst );
         return false;
     }
 
-    if( edge2 < 0 ) {
-        HB_DOCUMENTLOADER_PRINT( QString( "ANCHORLAYOUT: UNKNOWN EDGE " ) + dstEdge );
+    qreal spacingVal(0);
+    if ( spacing.mType != HbXmlLengthValue::None && !toPixels(spacing, spacingVal) ) {
         return false;
     }
-
-    layout->setAnchor( item1, ( HbAnchorLayout::Edge )edge1, item2, ( HbAnchorLayout::Edge )edge2, spacing );    
+    layout->setAnchor( item1, srcEdge, item2, dstEdge, spacingVal );
     return true;
 }
 
 
-bool HbDocumentLoaderActions::createGridLayout( const QString &widget, qreal *spacing )
-{       
+bool HbDocumentLoaderActions::createGridLayout( const QString &widget, const HbXmlLengthValue &spacing )
+{
     QGraphicsWidget *parent = 0;
-    
+
     if( widget.isEmpty() ) {
         bool isWidget = false;
-        parent = qobject_cast<QGraphicsWidget *>( findFromStack( &isWidget ) );
-        if( !isWidget ) {
-            HB_DOCUMENTLOADER_PRINT( QString( "GRIDLAYOUT: CANNOT SET LAYOUT TO NON-QGRAPHICSWIDGET " ) );
+        QObject *parentObj = findFromStack( &isWidget );
+        if( isWidget ) {
+            parent = static_cast<QGraphicsWidget *>( parentObj );
+        }
+    } else if ( mObjectMap.contains( widget ) && mObjectMap[ widget ].second == HbXml::WIDGET ) {
+        parent = static_cast<QGraphicsWidget *>( mObjectMap[ widget ].first.data() );
+    }
+    if ( !parent ) {
+        HB_DOCUMENTLOADER_PRINT( QString( "GRIDLAYOUT: PARENT NOT FOUND" ) );
+        return false;
+    }
+
+    QGraphicsGridLayout* layout = new QGraphicsGridLayout();
+    if (spacing.mType != HbXmlLengthValue::None) {
+        qreal spacingVal;
+        if ( toPixels(spacing, spacingVal) ) {
+            layout->setSpacing(spacingVal);
+        } else {
+            delete layout;
             return false;
         }
-    } else if( !( mObjectMap.contains( widget ) ) ) {
-        HB_DOCUMENTLOADER_PRINT( QString( "GRIDLAYOUT: NO SUCH ITEM " ) + widget );
-        return false;
-    } else {   
-        parent = qobject_cast<QGraphicsWidget *>( mObjectMap[ widget ].data() );
-    }
-    
-    QGraphicsGridLayout* layout = new QGraphicsGridLayout();  
-    if (spacing) {
-        layout->setSpacing(*spacing);
     }
 
-    mCurrentLayout = layout;    
+    mCurrentLayout = layout;
     parent->setLayout( mCurrentLayout );
-    
+
     return true;
 }
 
-bool HbDocumentLoaderActions::addGridLayoutCell( const QString &src, const QString &row, 
-                                                 const QString &column, const QString &rowspan, const QString &columnspan,
-                                                 const QString &alignment )
+bool HbDocumentLoaderActions::addGridLayoutCell(
+    const QString &src,
+    int row,
+    int column,
+    int *rowspan,
+    int *columnspan,
+    Qt::Alignment *alignment )
 {
     QGraphicsLayoutItem *item = 0;
-    
+
     QGraphicsGridLayout *layout = static_cast<QGraphicsGridLayout *>( mCurrentLayout );
-    
+
     if( !layout ) {
         HB_DOCUMENTLOADER_PRINT( QString( "GRIDLAYOUT: INTERNAL ERROR " ) + src );
-        return false;        
+        return false;
     }
-    
+
     if( src.isEmpty() ) {
         HB_DOCUMENTLOADER_PRINT( QString( "GRIDLAYOUT: TRY TO ADD EMPTY ITEM " ) + src );
         return false;
-    } else if( !( mObjectMap.contains( src ) ) ) {
+    } else if ( mObjectMap.contains( src ) && mObjectMap[ src ].second == HbXml::WIDGET ) {
+        item = static_cast<QGraphicsWidget *>( mObjectMap[ src ].first.data() );
+    } else {
         HB_DOCUMENTLOADER_PRINT( QString( "GRIDLAYOUT: NO SUCH ITEM " ) + src );
         return false;
-    } else {
-        item = qobject_cast<QGraphicsWidget *>( mObjectMap[ src ].data() );
-    }
-    
-    bool ok = false;
-    int rownum = row.toInt( &ok );
-    if( !ok ) {
-        HB_DOCUMENTLOADER_PRINT( QString( "GRIDLAYOUT: NO ROW SPECIFIED" ) );
-        return false;                        
-    } 
-
-    int columnnum = column.toInt( &ok );
-    if( !ok ) {
-        HB_DOCUMENTLOADER_PRINT( QString( "GRIDLAYOUT: NO COLUMN SPECIFIED" ) );
-        return false;                    
-    } 
-    
-    int rowspannum = rowspan.toInt( &ok );
-    if( !ok ) {
-        rowspannum = 1;
-    }                  
-
-    int columnspannum = columnspan.toInt( &ok );
-    if( !ok ) {
-        columnspannum = 1;
-    }                   
-    
-    Qt::Alignment align = 0;
-    if( !alignment.isEmpty() ) {
-        AccessToMetadata myAccess;
-                
-        int value = myAccess.getEnumValue( "Alignment", alignment.toLatin1().data() );
-        if( value == -1 ) {
-            HB_DOCUMENTLOADER_PRINT( QString( "GRIDLAYOUT: NO SUCH ALIGNMENT " ) + alignment );
-            return false;            
-        } 
-        align = ( Qt::Alignment )value;
     }
 
-    layout->addItem( item, rownum, columnnum, rowspannum, columnspannum, align );
-    
+    int rowspannum = rowspan ? *rowspan : 1;
+    int columnspannum = columnspan ? *columnspan : 1;
+    Qt::Alignment align = alignment ? *alignment : (Qt::Alignment)0;
+
+    layout->addItem( item, row, column, rowspannum, columnspannum, align );
+
     return true;
 }
 
-bool HbDocumentLoaderActions::setGridLayoutRowProperties( const QString &row, const QString &rowStretchFactor, 
-                                                          const QString &alignment )
+bool HbDocumentLoaderActions::setGridLayoutRowProperties(
+    int row,
+    int *rowStretchFactor,
+    Qt::Alignment *alignment )
 {
     QGraphicsGridLayout *layout = static_cast<QGraphicsGridLayout *>( mCurrentLayout );
-    
-    if( !layout ) {
+
+    if (!layout) {
         HB_DOCUMENTLOADER_PRINT( QString( "GRIDLAYOUT: INTERNAL ERROR " ) );
-        return false;        
+        return false;
     }
 
-    bool ok = false;
-    const int rownum = row.toInt( &ok );
-    if( !ok ) {
-        HB_DOCUMENTLOADER_PRINT( QString( "GRIDLAYOUT: NO ROW NUMBER SPECIFIED FOR STRETCH FACTOR" ) );
-        return false;                        
-    } 
-
-    if( !rowStretchFactor.isEmpty() ) {
-        bool ok = false;
-        int rowStretch = rowStretchFactor.toInt( &ok );
-        if( !ok ) {
-            HB_DOCUMENTLOADER_PRINT( QString( "GRIDLAYOUT: UNABLE TO PARSE ROW STRETCH FACTOR VALUE" ) );
-            return false;                        
-        } 
-        layout->setRowStretchFactor( rownum, rowStretch );
+    if (rowStretchFactor) {
+        layout->setRowStretchFactor( row, *rowStretchFactor );
     }
 
-    if( !alignment.isEmpty() ) {
-        AccessToMetadata myAccess;
-                
-        int value = myAccess.getEnumValue( "Alignment", alignment.toLatin1().data() );
-        if( value == -1 ) {
-            HB_DOCUMENTLOADER_PRINT( QString( "GRIDLAYOUT: NO SUCH ROW ALIGNMENT " ) + alignment );
-            return false;            
-        } 
-        layout->setRowAlignment(rownum, ( Qt::Alignment )value );
+    if (alignment) {
+        layout->setRowAlignment( row, *alignment );
     }
 
     return true;
 }
 
-bool HbDocumentLoaderActions::setGridLayoutColumnProperties( const QString &column, const QString &columnStretchFactor,
-                                                          const QString &alignment )
+bool HbDocumentLoaderActions::setGridLayoutColumnProperties(
+    int column,
+    int *columnStretchFactor,
+    Qt::Alignment *alignment )
 {
     QGraphicsGridLayout *layout = static_cast<QGraphicsGridLayout *>( mCurrentLayout );
-    
+
     if( !layout ) {
         HB_DOCUMENTLOADER_PRINT( QString( "GRIDLAYOUT: INTERNAL ERROR " ) );
-        return false;        
+        return false;
     }
 
-    bool ok = false;
-    const int columnnum = column.toInt( &ok );
-    if( !ok ) {
-        HB_DOCUMENTLOADER_PRINT( QString( "GRIDLAYOUT: NO COLUMN NUMBER SPECIFIED FOR STRETCH FACTOR" ) );
-        return false;                        
-    } 
-
-    if( !columnStretchFactor.isEmpty() ) {
-        bool ok = false;
-        int columnStretch = columnStretchFactor.toInt( &ok );
-        if( !ok ) {
-            HB_DOCUMENTLOADER_PRINT( QString( "GRIDLAYOUT: UNABLE TO PARSE COLUMN STRETCH FACTOR VALUE" ) );
-            return false;                        
-        } 
-        layout->setColumnStretchFactor( columnnum, columnStretch );
+    if (columnStretchFactor) {
+        layout->setColumnStretchFactor( column, *columnStretchFactor );
     }
 
-    if( !alignment.isEmpty() ) {
-        AccessToMetadata myAccess;
-                
-        int value = myAccess.getEnumValue( "Alignment", alignment.toLatin1().data() );
-        if( value == -1 ) {
-            HB_DOCUMENTLOADER_PRINT( QString( "GRIDLAYOUT: NO SUCH COLUMN ALIGNMENT " ) + alignment );
-            return false;            
-        } 
-        layout->setColumnAlignment( columnnum, ( Qt::Alignment )value );
+    if (alignment) {
+        layout->setColumnAlignment( column, *alignment );
     }
 
     return true;
 }
 
-bool HbDocumentLoaderActions::setGridLayoutRowHeights( const QString &row, const qreal minHeight, 
-                                                       const qreal maxHeight, const qreal prefHeight,
-                                                       const qreal fixedHeight, const qreal rowSpacing, 
-                                                       const int flagsPropertyAvailable )
+bool HbDocumentLoaderActions::setGridLayoutRowHeights( int row,
+                                                       const HbXmlLengthValue &minHeight,
+                                                       const HbXmlLengthValue &maxHeight,
+                                                       const HbXmlLengthValue &prefHeight,
+                                                       const HbXmlLengthValue &fixedHeight,
+                                                       const HbXmlLengthValue &rowSpacing )
 {
     QGraphicsGridLayout *layout = static_cast<QGraphicsGridLayout *>( mCurrentLayout );
-    
+
     if( !layout ) {
         HB_DOCUMENTLOADER_PRINT( QString( "GRIDLAYOUT: INTERNAL ERROR " ) );
-        return false;        
+        return false;
+    }
+
+    if ( minHeight.mType != HbXmlLengthValue::None ) {
+        qreal minHeightVal;
+        if ( !toPixels(minHeight, minHeightVal) ) {
+            return false;
+        }
+        layout->setRowMinimumHeight( row, minHeightVal );
     }
 
-    bool ok = false;
-    const int rownum = row.toInt( &ok );
-    if( !ok ) {
-        HB_DOCUMENTLOADER_PRINT( QString( "GRIDLAYOUT: NO ROW NUMBER SPECIFIED FOR ROW HEIGHTS" ) );
-        return false;                        
-    } 
-
-    if ( flagsPropertyAvailable & HbDocumentLoaderActions::propertyMin ) {
-        layout->setRowMinimumHeight( rownum, minHeight );
+    if ( maxHeight.mType != HbXmlLengthValue::None ) {
+        qreal maxHeightVal;
+        if ( !toPixels(maxHeight, maxHeightVal) ) {
+            return false;
+        }
+        layout->setRowMaximumHeight( row, maxHeightVal );
     }
 
-    if ( flagsPropertyAvailable & HbDocumentLoaderActions::propertyMax ) {
-        layout->setRowMaximumHeight( rownum, maxHeight );
+    if ( prefHeight.mType != HbXmlLengthValue::None ) {
+        qreal prefHeightVal;
+        if ( !toPixels(prefHeight, prefHeightVal) ) {
+            return false;
+        }
+        layout->setRowPreferredHeight( row, prefHeightVal );
     }
 
-    if ( flagsPropertyAvailable & HbDocumentLoaderActions::propertyPref ) {
-        layout->setRowPreferredHeight( rownum, prefHeight );
+    if ( fixedHeight.mType != HbXmlLengthValue::None ) {
+        qreal fixedHeightVal;
+        if ( !toPixels(fixedHeight, fixedHeightVal) ) {
+            return false;
+        }
+        layout->setRowFixedHeight( row, fixedHeightVal );
     }
 
-    if ( flagsPropertyAvailable & HbDocumentLoaderActions::propertyFixed ) {
-        layout->setRowFixedHeight( rownum, fixedHeight );
-    }
-
-    if ( flagsPropertyAvailable & HbDocumentLoaderActions::propertySpacing ) {
-        layout->setRowSpacing( rownum, rowSpacing );
+    if ( rowSpacing.mType != HbXmlLengthValue::None ) {
+        qreal rowSpacingVal;
+        if ( !toPixels(rowSpacing, rowSpacingVal) ) {
+            return false;
+        }
+        layout->setRowSpacing( row, rowSpacingVal );
     }
 
     return true;
 
 }
 
-bool HbDocumentLoaderActions::setGridLayoutColumnWidths( const QString &column, const qreal minWidth, 
-                                                         const qreal maxWidth, const qreal prefWidth, 
-                                                         const qreal fixedWidth, const qreal columnSpacing,
-                                                         const int flagsPropertyAvailable )
+bool HbDocumentLoaderActions::setGridLayoutColumnWidths( int column,
+                                                         const HbXmlLengthValue &minWidth,
+                                                         const HbXmlLengthValue &maxWidth,
+                                                         const HbXmlLengthValue &prefWidth,
+                                                         const HbXmlLengthValue &fixedWidth,
+                                                         const HbXmlLengthValue &columnSpacing )
 {
     QGraphicsGridLayout *layout = static_cast<QGraphicsGridLayout *>( mCurrentLayout );
-    
+
     if( !layout ) {
         HB_DOCUMENTLOADER_PRINT( QString( "GRIDLAYOUT: INTERNAL ERROR " ) );
-        return false;        
+        return false;
+    }
+
+    if ( minWidth.mType != HbXmlLengthValue::None ) {
+        qreal minWidthVal;
+        if ( !toPixels(minWidth, minWidthVal) ) {
+            return false;
+        }
+        layout->setColumnMinimumWidth( column, minWidthVal );
     }
 
-    bool ok = false;
-    const int columnnum = column.toInt( &ok );
-    if( !ok ) {
-        HB_DOCUMENTLOADER_PRINT( QString( "GRIDLAYOUT: NO COLUMN NUMBER SPECIFIED FOR COLUMN WIDTHS" ) );
-        return false;                        
-    } 
-
-    if ( flagsPropertyAvailable & HbDocumentLoaderActions::propertyMin ) {
-        layout->setColumnMinimumWidth( columnnum, minWidth );
+    if ( maxWidth.mType != HbXmlLengthValue::None ) {
+        qreal maxWidthVal;
+        if ( !toPixels(maxWidth, maxWidthVal) ) {
+            return false;
+        }
+        layout->setColumnMaximumWidth( column, maxWidthVal );
     }
 
-    if ( flagsPropertyAvailable & HbDocumentLoaderActions::propertyMax ) {
-        layout->setColumnMaximumWidth( columnnum, maxWidth );
+    if ( prefWidth.mType != HbXmlLengthValue::None ) {
+        qreal prefWidthVal;
+        if ( !toPixels(prefWidth, prefWidthVal) ) {
+            return false;
+        }
+        layout->setColumnPreferredWidth( column, prefWidthVal );
     }
 
-    if ( flagsPropertyAvailable & HbDocumentLoaderActions::propertyPref ) {
-        layout->setColumnPreferredWidth( columnnum, prefWidth );
+    if ( fixedWidth.mType != HbXmlLengthValue::None ) {
+        qreal fixedWidthVal;
+        if ( !toPixels(fixedWidth, fixedWidthVal) ) {
+            return false;
+        }
+        layout->setColumnFixedWidth( column, fixedWidthVal );
     }
 
-    if ( flagsPropertyAvailable & HbDocumentLoaderActions::propertyFixed ) {
-        layout->setColumnFixedWidth( columnnum, fixedWidth );
-    }
-
-    if ( flagsPropertyAvailable & HbDocumentLoaderActions::propertySpacing ) {
-        layout->setColumnSpacing( columnnum, columnSpacing );
+    if ( columnSpacing.mType != HbXmlLengthValue::None ) {
+        qreal columnSpacingVal;
+        if ( !toPixels(columnSpacing, columnSpacingVal) ) {
+            return false;
+        }
+        layout->setColumnSpacing( column, columnSpacingVal );
     }
 
     return true;
 }
 
-bool HbDocumentLoaderActions::createLinearLayout( const QString &widget, const QString &orientation, qreal *spacing )
+bool HbDocumentLoaderActions::createLinearLayout(
+    const QString &widget,
+    Qt::Orientation *orientation,
+    const HbXmlLengthValue &spacing )
 {
     QGraphicsWidget *parent = 0;
     QGraphicsLinearLayout *layout = 0;
-    
+
     if( widget.isEmpty() ) {
         bool isWidget = false;
-        parent = qobject_cast<QGraphicsWidget *>( findFromStack( &isWidget ) );
-        if( !isWidget ) {
-            HB_DOCUMENTLOADER_PRINT( QString( "LINEARLAYOUT: CANNOT SET LAYOUT TO NON-QGRAPHICSWIDGET " ) );
+        QObject *parentObj = findFromStack( &isWidget );
+        if ( isWidget ) {
+            parent = static_cast<QGraphicsWidget *>( parentObj );
+        }
+    } else if ( mObjectMap.contains( widget ) && mObjectMap[ widget ].second == HbXml::WIDGET ) {
+        parent = static_cast<QGraphicsWidget *>( mObjectMap[ widget ].first.data() );
+    }
+    if ( !parent ) {
+        HB_DOCUMENTLOADER_PRINT( QString( "LINEARLAYOUT: PARENT NOT FOUND" ) );
+        return false;
+    }
+
+    if( orientation ) {
+        layout = new QGraphicsLinearLayout( *orientation );
+    } else {
+        layout = new QGraphicsLinearLayout();
+    }
+
+    if ( spacing.mType != HbXmlLengthValue::None ) {
+        qreal spacingVal;
+        if ( !toPixels(spacing, spacingVal) ) {
             return false;
         }
-    } else if( !( mObjectMap.contains( widget ) ) ) {
-        HB_DOCUMENTLOADER_PRINT( QString( "LINEARLAYOUT: NO SUCH ITEM " ) + widget );
-        return false;
-    } else {   
-        parent = qobject_cast<QGraphicsWidget *>( mObjectMap[ widget ].data() );
-    }
-    
-    Qt::Orientation orient = Qt::Horizontal;
-    
-    if( ! orientation.isEmpty() ) {
-        AccessToMetadata myAccess;
-                
-        int value = myAccess.getEnumValue( "Orientation", orientation.toLatin1().data() );
-        if( value == -1 ) {
-            HB_DOCUMENTLOADER_PRINT( QString( "LINEARLAYOUT: NO SUCH ORIENTATION " ) + orientation );
-            return false;            
-        } 
-        orient = ( Qt::Orientation )value;
-        layout = new QGraphicsLinearLayout( orient );
-    } else {
-        layout = new QGraphicsLinearLayout();
-    }  
-    
-    if ( spacing ) {
-        layout->setSpacing(*spacing);
+        layout->setSpacing(spacingVal);
     }
 
     mCurrentLayout = layout;
     parent->setLayout( mCurrentLayout );
-    
+
     return true;
 }
 
-bool HbDocumentLoaderActions::addLinearLayoutItem( const QString &itemname, const QString &index, 
-                                                   const QString &stretchfactor, const QString &alignment,
-                                                   qreal *spacing )
+bool HbDocumentLoaderActions::addLinearLayoutItem(
+    const QString &itemname,
+    int *index,
+    int *stretchfactor,
+    Qt::Alignment *alignment,
+    const HbXmlLengthValue &spacing )
 {
     QGraphicsLayoutItem *item = 0;
-    
+
     QGraphicsLinearLayout *layout = static_cast<QGraphicsLinearLayout *>( mCurrentLayout );
-    
-    if( !layout ) {
+
+    if ( !layout ) {
         HB_DOCUMENTLOADER_PRINT( QString( "LINEARLAYOUT: INTERNAL ERROR " ) );
-        return false;        
+        return false;
     }
-    
-    if( itemname.isEmpty() ) {
+
+    if ( itemname.isEmpty() ) {
         HB_DOCUMENTLOADER_PRINT( QString( "LINEARLAYOUT: TRY TO ADD EMPTY ITEM " ) + itemname );
         return false;
-    } else if( !( mObjectMap.contains( itemname ) ) ) {
+    } else if ( mObjectMap.contains( itemname ) && mObjectMap[ itemname ].second == HbXml::WIDGET ) {
+        item = static_cast<QGraphicsWidget *>( mObjectMap[ itemname ].first.data() );
+    } else {
         HB_DOCUMENTLOADER_PRINT( QString( "LINEARLAYOUT: NO SUCH ITEM " ) + itemname );
         return false;
-    } else {
-        item = qobject_cast<QGraphicsWidget *>( mObjectMap[ itemname ].data() );
     }
-    
-    int indexValue = -1;
-    
-    if( ! index.isEmpty() ) {
-        bool ok = false;
-        indexValue = index.toInt( &ok );
-        if( !ok ) {
-            HB_DOCUMENTLOADER_PRINT( QString( "LINEARLAYOUT: UNABLE TO PARSE ITEM INDEX" ) );
-            return false;                        
-        } 
-    }
-    
+
+    int indexValue = index ? *index : -1;
     layout->insertItem( indexValue, item );
-    if ( spacing ) {
+
+    if ( spacing.mType != HbXmlLengthValue::None ) {
+        qreal spacingVal;
+        if ( !toPixels(spacing, spacingVal) ) {
+            return false;
+        }
+
         // Need to resolve the item index for spacing
         int i = layout->count();
         while (i--) {
             if ( layout->itemAt(i) == item ) {
-                layout->setItemSpacing(i, *spacing);
+                layout->setItemSpacing(i, spacingVal);
                 break;
             }
         }
     }
-    
-    if( !stretchfactor.isEmpty() ) {
-        bool ok = false;
-        int stretch = stretchfactor.toInt( &ok );
-        if( !ok ) {
-            HB_DOCUMENTLOADER_PRINT( QString( "LINEARLAYOUT: UNABLE TO PARSE STRETCH VALUE" ) );
-            return false;                        
-        } 
-        layout->setStretchFactor( item, stretch );
+
+    if ( stretchfactor ) {
+        layout->setStretchFactor( item, *stretchfactor );
     }
-    
-    if( !alignment.isEmpty() ) {
-        AccessToMetadata myAccess;
-                
-        int value = myAccess.getEnumValue( "Alignment", alignment.toLatin1().data() );
-        if( value == -1 ) {
-            HB_DOCUMENTLOADER_PRINT( QString( "LINEARLAYOUT: NO SUCH ITEM ALIGNMENT " ) + alignment );
-            return false;            
-        } 
-        layout->setAlignment( item, ( Qt::Alignment )value );
+
+    if( alignment ) {
+        layout->setAlignment( item, *alignment );
     }
-    
+
     return true;
 }
 
-bool HbDocumentLoaderActions::addLinearLayoutStretch( const QString &index, const QString &stretchfactor )
+bool HbDocumentLoaderActions::addLinearLayoutStretch(
+    int *index,
+    int *stretchfactor )
 {
     QGraphicsLinearLayout *layout = static_cast<QGraphicsLinearLayout *>( mCurrentLayout );
-    
+
     if( !layout ) {
         HB_DOCUMENTLOADER_PRINT( QString( "LINEARLAYOUT: INTERNAL ERROR " ) );
-        return false;        
-    }
-    
-    int indexValue = -1;
-    int stretch = 1;
-    
-    if( ! index.isEmpty() ) {
-        bool ok = false;
-        indexValue = index.toInt( &ok );
-        if( !ok ) {
-            HB_DOCUMENTLOADER_PRINT( QString( "LINEARLAYOUT: UNABLE TO PARSE STRETCH INDEX" ) );
-            return false;                        
-        } 
+        return false;
     }
 
-    if( ! stretchfactor.isEmpty() ) {
-        bool ok = false;
-        stretch = stretchfactor.toInt( &ok );
-        if( !ok ) {
-            HB_DOCUMENTLOADER_PRINT( QString( "LINEARLAYOUT: UNABLE TO PARSE STRETCH VALUE" ) );
-            return false;                        
-        } 
-    }
-    
+    int indexValue = index ? *index : -1;
+    int stretch = stretchfactor ? * stretchfactor : 1;
+
     layout->insertStretch( indexValue, stretch );
-    
+
     return true;
 }
 
-bool HbDocumentLoaderActions::setLayoutContentsMargins( qreal left, qreal top, qreal right, qreal bottom )
+bool HbDocumentLoaderActions::setLayoutContentsMargins( const HbXmlLengthValue &left,
+                                                        const HbXmlLengthValue &top,
+                                                        const HbXmlLengthValue &right,
+                                                        const HbXmlLengthValue &bottom )
 {
     if( !mCurrentLayout ) {
         HB_DOCUMENTLOADER_PRINT( QString( "LAYOUT: INTERNAL ERROR " ) );
-        return false;        
+        return false;
+    }
+
+    qreal leftVal=0, topVal=0, rightVal=0, bottomVal=0;
+    bool ok = true;
+    if (left.mType != HbXmlLengthValue::None) {
+        ok &= toPixels(left, leftVal);
+    }
+    if (top.mType != HbXmlLengthValue::None) {
+        ok &= toPixels(top, topVal);
     }
-    mCurrentLayout->setContentsMargins( left, top, right, bottom );
-    return true;
+    if (right.mType != HbXmlLengthValue::None) {
+        ok &= toPixels(right, rightVal);
+    }
+    if (bottom.mType != HbXmlLengthValue::None) {
+        ok &= toPixels(bottom, bottomVal);
+    }
+    if ( ok ) {
+        mCurrentLayout->setContentsMargins( leftVal, topVal, rightVal, bottomVal );
+    }
+    return ok;
 }
 
 bool HbDocumentLoaderActions::createStackedLayout( const QString &widget )
 {
     QGraphicsWidget *parent = 0;
-    
+
     if( widget.isEmpty() ) {
         bool isWidget = false;
-        parent = qobject_cast<QGraphicsWidget *>( findFromStack( &isWidget ) );
-        if( !isWidget ) {
-            HB_DOCUMENTLOADER_PRINT( QString( "STACKEDLAYOUT: CANNOT SET LAYOUT TO NON-QGRAPHICSWIDGET " ) );
-            return false;
+        QObject *parentObj = findFromStack( &isWidget );
+        if( isWidget ) {
+            parent = static_cast<QGraphicsWidget *>( parentObj );
         }
-    } else if( !( mObjectMap.contains( widget ) ) ) {
-        HB_DOCUMENTLOADER_PRINT( QString( "STACKEDLAYOUT: NO SUCH ITEM " ) + widget );
+    } else if ( mObjectMap.contains( widget ) && mObjectMap[ widget ].second == HbXml::WIDGET ) {
+        parent = static_cast<QGraphicsWidget *>( mObjectMap[ widget ].first.data() );
+    }
+    if ( !parent ) {
+        HB_DOCUMENTLOADER_PRINT( QString( "STACKEDLAYOUT: PARENT NOT FOUND" ) );
         return false;
-    } else {   
-        parent = qobject_cast<QGraphicsWidget *>( mObjectMap[ widget ].data() );
     }
-    
+
     mCurrentLayout = new HbStackedLayout();
-    
+
     parent->setLayout( mCurrentLayout );
-    
+
     return true;
 }
 
-bool HbDocumentLoaderActions::addStackedLayoutItem( const QString &itemname, const QString &index )
+bool HbDocumentLoaderActions::addStackedLayoutItem( const QString &itemname, int *index )
 {
     QGraphicsLayoutItem *item = 0;
-    
+
     HbStackedLayout *layout = static_cast<HbStackedLayout *>( mCurrentLayout );
-    
+
     if( !layout ) {
         HB_DOCUMENTLOADER_PRINT( QString( "STACKEDLAYOUT: INTERNAL ERROR " ) );
-        return false;        
+        return false;
     }
-    
+
     if( itemname.isEmpty() ) {
         HB_DOCUMENTLOADER_PRINT( QString( "STACKEDLAYOUT: TRY TO ADD EMPTY ITEM " ) + itemname );
         return false;
-    } else if( !( mObjectMap.contains( itemname ) ) ) {
+    } else if ( mObjectMap.contains( itemname ) && mObjectMap[ itemname ].second == HbXml::WIDGET ) {
+        item = static_cast<QGraphicsWidget *>( mObjectMap[ itemname ].first.data() );
+    } else {
         HB_DOCUMENTLOADER_PRINT( QString( "STACKEDLAYOUT: NO SUCH ITEM " ) + itemname );
         return false;
-    } else {
-        item = qobject_cast<QGraphicsWidget *>( mObjectMap[ itemname ].data() );
     }
-    
-    int indexValue = -1;
-    
-    if( ! index.isEmpty() ) {
-        bool ok = false;
-        indexValue = index.toInt( &ok );
-        if( !ok ) {
-            HB_DOCUMENTLOADER_PRINT( QString( "STACKEDLAYOUT: UNABLE TO PARSE ITEM INDEX" ) );
-            return false;                        
-        } 
-    }
-    
+
+    int indexValue = index ? *index : -1;
     layout->insertItem( indexValue, item );
-    
+
     return true;
 }
 
@@ -1034,62 +1057,202 @@
 bool HbDocumentLoaderActions::createNullLayout( const QString &widget )
 {
     QGraphicsWidget *parent = 0;
-    
+
     if( widget.isEmpty() ) {
         bool isWidget = false;
-        parent = qobject_cast<QGraphicsWidget *>( findFromStack( &isWidget ) );
-        if( !isWidget ) {
-            HB_DOCUMENTLOADER_PRINT( QString( "NULL LAYOUT: CANNOT UNSET LAYOUT FROM NON-QGRAPHICSWIDGET " ) );
-            return false;
+        QObject *parentObj = findFromStack( &isWidget );
+        if( isWidget ) {
+            parent = static_cast<QGraphicsWidget *>( parentObj );
         }
-    } else if( !( mObjectMap.contains( widget ) ) ) {
-        HB_DOCUMENTLOADER_PRINT( QString( "NULL LAYOUT: NO SUCH ITEM " ) + widget );
+    } else if ( mObjectMap.contains( widget ) && mObjectMap[ widget ].second == HbXml::WIDGET ) {
+        parent = static_cast<QGraphicsWidget *>( mObjectMap[ widget ].first.data() );
+    }
+    if ( !parent ) {
+        HB_DOCUMENTLOADER_PRINT( QString( "NULL LAYOUT: PARENT NOT FOUND" ) );
         return false;
-    } else {   
-        parent = qobject_cast<QGraphicsWidget *>( mObjectMap[ widget ].data() );
     }
-    
-    mCurrentLayout = 0;  
-    
-    parent->setLayout( mCurrentLayout );
-    
-    return true;
-    
-}
 
-bool HbDocumentLoaderActions::createContainer()
-{
-    if (mCurrentContainer) {
-        delete mCurrentContainer;
-    }
-    mCurrentContainer = new QList<QVariant>();      
-    return true;
-}
+    mCurrentLayout = 0;
 
-bool HbDocumentLoaderActions::appendPropertyToContainer( const QVariant &value )
-{
-    bool result(false);
-    if (!mCurrentContainer) {
-        result = false;
-    } else {
-        // note that for a successful conversion later on, all of the appended items need
-        // to be of the same (appropriate type) e.g. String
-        mCurrentContainer->append(value);
-        result = true;
-    }
-    return result;
+    parent->setLayout( mCurrentLayout );
+
+    return true;
+
 }
 
 bool HbDocumentLoaderActions::setWidgetRole(
     QGraphicsWidget *parent, QGraphicsWidget *child, const QString &role)
 {
-    return factory.setWidgetRole(parent, child, role);
+    return mFactory.setWidgetRole(parent, child, role);
 }
 
 bool HbDocumentLoaderActions::setObjectRole(
     QObject *parent, QObject *child, const QString &role)
 {
-    return factory.setObjectRole(parent, child, role);
+    return mFactory.setObjectRole(parent, child, role);
+}
+
+bool HbDocumentLoaderActions::variableToQVariant( const HbXmlVariable& variable, QVariant &variant )
+{
+    Q_UNUSED(variable);
+    Q_UNUSED(variant);
+    bool result(true);
+
+    switch (variable.mType) {
+        case HbXmlVariable::INT:
+        {
+        qint16* int_b =(qint16*)variable.mParameters.at(0);
+        variant.setValue((int)(*int_b));
+        break;
+        }
+
+        case HbXmlVariable::REAL:
+        {
+        HbXmlLengthValue* realVal = (HbXmlLengthValue*)variable.mParameters.at(0);
+        qreal realNum;
+        result = toPixels(*realVal, realNum );
+        if (result) {
+            variant.setValue(realNum);
+        }
+        break;
+        }
+
+        case HbXmlVariable::LOCALIZED_STRING:
+        {
+        QString *value = (QString*)variable.mParameters.at(0);
+        QString *comment = (QString*)variable.mParameters.at(1);
+        const QString text = translate( *value, *comment );
+        variant.setValue( text );
+        break;
+        }
+
+        case HbXmlVariable::STRING:
+        {
+        QString *value = (QString*)variable.mParameters.at(0);
+        QString *locId = (QString*)variable.mParameters.at(1);
+        variant.setValue( locId->isEmpty() ? *value : hbTrId(locId->toUtf8()) );
+        break;
+        }
+
+        case HbXmlVariable::BOOL:
+        {
+        bool *bool_b = (bool*)variable.mParameters.at(0);
+        variant.setValue( *bool_b );
+        break;
+        }
+
+        case HbXmlVariable::ICON:
+        {
+        QString *iconName = (QString*)variable.mParameters.at(0);
+        HbXmlLengthValue* widthVal = (HbXmlLengthValue*)variable.mParameters.at(1);
+        HbXmlLengthValue* heightVal = (HbXmlLengthValue*)variable.mParameters.at(2);
+
+        HbIcon icon(*iconName);
+        qreal width, height;
+        if ( widthVal->mType != HbXmlLengthValue::None ) {
+            result = toPixels(*widthVal, width);
+        }
+        if ( result && heightVal->mType != HbXmlLengthValue::None ) {
+            result = toPixels(*heightVal, height);
+        }
+        if ( result ) {
+            if ( widthVal->mType != HbXmlLengthValue::None &&
+                 heightVal->mType != HbXmlLengthValue::None ) {
+                icon.setSize(QSizeF(width, height));
+            } else if ( widthVal->mType != HbXmlLengthValue::None ) {
+                icon.setWidth(width);
+            } else if ( heightVal->mType != HbXmlLengthValue::None ) {
+                icon.setHeight(height);
+            }
+            variant.setValue( icon );
+        }
+        break;
+        }
+
+        case HbXmlVariable::SIZE:
+        {
+        HbXmlLengthValue* widthVal = (HbXmlLengthValue*)variable.mParameters.at(0);
+        HbXmlLengthValue* heightVal = (HbXmlLengthValue*)variable.mParameters.at(1);
+        qreal width, height;
+        result &= toPixels(*widthVal, width);
+        result &= toPixels(*heightVal, height);
+        if ( result ) {
+            variant.setValue( QSizeF( width, height ) );
+        }
+        break;
+        }
+
+        case HbXmlVariable::RECT:
+        {
+        HbXmlLengthValue* widthVal = (HbXmlLengthValue*)variable.mParameters.at(0);
+        HbXmlLengthValue* heightVal = (HbXmlLengthValue*)variable.mParameters.at(1);
+        HbXmlLengthValue* posxVal = (HbXmlLengthValue*)variable.mParameters.at(2);
+        HbXmlLengthValue* posyVal = (HbXmlLengthValue*)variable.mParameters.at(3);
+        qreal width, height, posx, posy;
+        result &= toPixels(*widthVal, width);
+        result &= toPixels(*heightVal, height);
+        result &= toPixels(*posxVal, posx);
+        result &= toPixels(*posyVal, posy);
+        if ( result ) {
+            variant.setValue(QRectF(QPointF(posx, posy), QSizeF(width, height)));
+        }
+        break;
+        }
+
+        case HbXmlVariable::POINT:
+        {
+        HbXmlLengthValue* posxVal = (HbXmlLengthValue*)variable.mParameters.at(0);
+        HbXmlLengthValue* posyVal = (HbXmlLengthValue*)variable.mParameters.at(1);
+        qreal posx, posy;
+        result &= toPixels(*posxVal, posx);
+        result &= toPixels(*posyVal, posy);
+        if ( result ) {
+            variant.setValue(QPointF(posx, posy));
+        }
+        break;
+        }
+
+        case HbXmlVariable::ENUMS:
+        {
+        // Relies on implicit conversion.
+        QString *string = (QString*)variable.mParameters.at(0);
+        variant.setValue(*string);
+        break;
+        }
+
+        case HbXmlVariable::COLOR:
+        {
+        QColor *color = (QColor*)variable.mParameters.at(0);
+        variant.setValue(*color);
+        break;
+        }
+
+        case HbXmlVariable::FONTSPEC:
+        {
+        quint8* role_b = (quint8*)variable.mParameters.at(0);
+        HbXmlLengthValue* textHeightVal = (HbXmlLengthValue*)variable.mParameters.at(1);
+        qreal textHeight;
+        if ( textHeightVal->mType != HbXmlLengthValue::None ) {
+            result = toPixels(*textHeightVal, textHeight);
+        }
+        if (result) {
+            HbFontSpec fontSpec((HbFontSpec::Role)(*role_b));
+            if ( textHeightVal->mType != HbXmlLengthValue::None ) {
+                fontSpec.setTextHeight(textHeight);
+            }
+            variant.setValue(fontSpec);
+        }
+        break;
+        }
+
+        default:
+        {
+        result = false;
+        break;
+        }
+        }
+
+    return result;
 }
 
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbutils/document/hbdocumentloaderactions_p.h
--- a/src/hbutils/document/hbdocumentloaderactions_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbutils/document/hbdocumentloaderactions_p.h	Mon May 03 12:48:33 2010 +0300
@@ -37,7 +37,8 @@
 #include "hbdocumentloaderfactory_p.h"
 #include "hbdocumentloader_p.h"
 
-#include <hbxmlloaderabstractactions_p.h>
+#include <hbxmlloaderbaseactions_p.h>
+#include <hbxmlloaderabstractsyntax_p.h>
 
 // Uncomment the following in order to get additional debug prints
 //#define HB_DOCUMENTLOADER_DEBUG
@@ -51,84 +52,93 @@
 
 class HbDocumentLoaderPrivate;
 
-class HbDocumentLoaderActions : public HbXmlLoaderAbstractActions
+class HbDocumentLoaderActions : public HbXmlLoaderBaseActions
 {
     public:    
-    
-        enum PropertyAvailableFlag {
-            propertyMin     = 0x01,
-            propertyMax     = 0x02,
-            propertyPref    = 0x04,
-            propertyFixed   = 0x08,
-            propertySpacing = 0x10
-        };
 
-        HbDocumentLoaderActions( HbDocumentLoaderPrivate *ref );
+        HbDocumentLoaderActions( HbDocumentLoaderPrivate *ref, const HbMainWindow *window );
         virtual ~HbDocumentLoaderActions();
-                
-        
+
         QObject *createObject(const QString &type, const QString &name, const QString &plugin);
         QObject *createObjectWithFactory(const QString& type, const QString &name);
-        
+
         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 QString &propertyName, const QVariant &value );
+        bool pushProperty( const char *propertyName, const HbXmlVariable &variable );
         bool pushRef( const QString &name, const QString &role );
+        bool pushContainer( const char *propertyName,
+                            HbXmlLoaderAbstractSyntax::DocumentLexems type,
+                            const QList<HbXmlVariable*> &container );
         
-        bool setContentsMargins( qreal left, qreal top, qreal right, qreal bottom );
+        bool setContentsMargins( const HbXmlLengthValue &left,
+                                 const HbXmlLengthValue &top,
+                                 const HbXmlLengthValue &right,
+                                 const HbXmlLengthValue &bottom );
 
-        bool setSizePolicy( const QSizePolicy::Policy *horizontalPolicy, 
-                            const QSizePolicy::Policy *verticalPolicy, 
-                            const int *horizontalStretch,
-                            const int *verticalStretch );
+        bool setSizePolicy( QSizePolicy::Policy *horizontalPolicy, 
+                            QSizePolicy::Policy *verticalPolicy, 
+                            int *horizontalStretch,
+                            int *verticalStretch );
     
-        bool setSizeHint(Qt::SizeHint hint, qreal *hintWidth, qreal *hintHeight, bool fixed);
-        bool setZValue( qreal zValue );
-        bool setToolTip( const QString &tooltip );
+        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, const QString &srcEdge, 
-                                    const QString &dst, const QString &dstEdge, qreal spacing, const QString &spacer = QString() );
+        bool addAnchorLayoutEdge( const QString &src, Hb::Edge srcEdge, 
+                                  const QString &dst, Hb::Edge dstEdge,
+                                  const HbXmlLengthValue &spacing, const QString &spacer = QString() );
         
-        bool createGridLayout( const QString &widget, qreal *spacing );
-        bool addGridLayoutCell( const QString &src, const QString &row, 
-                                const QString &column, const QString &rowspan, const QString &columnspan,
-                                const QString &alignment );
-        bool setGridLayoutRowProperties( const QString &row, const QString &rowStretchFactor, const QString &alignment );
-        bool setGridLayoutColumnProperties( const QString &column, const QString &columnStretchFactor, const QString &alignment );
-        bool setGridLayoutRowHeights( const QString &row, const qreal minHeight, const qreal maxHeight, 
-                                      const qreal prefHeight, const qreal fixedHeight, 
-                                      const qreal rowSpacing,  const int flagsPropertyAvailable);
-        bool setGridLayoutColumnWidths( const QString &column, const qreal minWidth, const qreal maxWidth, 
-                                        const qreal prefWidth, const qreal fixedWidth,
-                                        const qreal columnSpacing, const int flagsPropertyAvailable);
+        bool createGridLayout( const QString &widget, const HbXmlLengthValue &spacing );
+        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 );
+        bool setGridLayoutColumnProperties( int column, int *columnStretchFactor, Qt::Alignment *alignment );
+        bool setGridLayoutRowHeights( int row,
+                                      const HbXmlLengthValue &minHeight,
+                                      const HbXmlLengthValue &maxHeight, 
+                                      const HbXmlLengthValue &prefHeight,
+                                      const HbXmlLengthValue &fixedHeight, 
+                                      const HbXmlLengthValue &rowSpacing );
+        bool setGridLayoutColumnWidths( int column,
+                                        const HbXmlLengthValue &minWidth,
+                                        const HbXmlLengthValue &maxWidth,
+                                        const HbXmlLengthValue &prefWidth,
+                                        const HbXmlLengthValue &fixedWidth,
+                                        const HbXmlLengthValue &columnSpacing );
 
-        bool createLinearLayout( const QString &widget, const QString &orientation, qreal *spacing );
-        bool addLinearLayoutItem( const QString &itemname, const QString &index, const QString &stretchfactor, 
-                                  const QString &alignment, qreal *spacing );
-        bool addLinearLayoutStretch( const QString &index, const QString &stretchfactor );
-        bool setLayoutContentsMargins( qreal left, qreal top, qreal right, qreal bottom );
+        bool createLinearLayout( const QString &widget,
+                                 Qt::Orientation *orientation, 
+                                 const HbXmlLengthValue &spacing );
+        bool addLinearLayoutItem( const QString &itemname,
+                                  int *index,
+                                  int *stretchfactor, 
+                                  Qt::Alignment *alignment,
+                                  const HbXmlLengthValue &spacing );
+        bool addLinearLayoutStretch( int *index,
+                                     int *stretchfactor );
+        bool setLayoutContentsMargins( const HbXmlLengthValue &left,
+                                       const HbXmlLengthValue &top,
+                                       const HbXmlLengthValue &right,
+                                       const HbXmlLengthValue &bottom );
 
         bool createStackedLayout( const QString &widget );
-        bool addStackedLayoutItem( const QString &itemname, const QString &index );
+        bool addStackedLayoutItem( const QString &itemname, int *index );
                                 
         bool createNullLayout( const QString &widget );
-
-        bool createContainer();
-        bool appendPropertyToContainer( const QVariant &value );
     
     private:
         Q_DISABLE_COPY(HbDocumentLoaderActions)
         bool setWidgetRole(QGraphicsWidget *parent, QGraphicsWidget *child, const QString &role);
         bool setObjectRole(QObject *parent, QObject *child, const QString &role);
         
+        bool variableToQVariant( const HbXmlVariable &variable, QVariant &variant );
 
     private:
 
         HbDocumentLoaderPrivate *d;
-        HbDocumentLoaderFactory factory;
+        HbDocumentLoaderFactory mFactory;
 };
 
 #endif // HBDOCUMENTLOADERACTIONS_P_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbutils/document/hbdocumentloaderfactory_p.cpp
--- a/src/hbutils/document/hbdocumentloaderfactory_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbutils/document/hbdocumentloaderfactory_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -89,15 +89,17 @@
     HbWidgetRoleListViewPrototype,  // deprecated
     HbWidgetRoleGroupBoxContentWidget,
     HbWidgetRoleAbstractViewPrototype,
+    HbWidgetRoleStackedContentWidget,
     HbWidgetRoleAmount // needs to be the last one
 };
 
 enum HbDocumentLoaderFactoryObjectRoles {
     HbObjectRoleUnknown, // needs to be the first one = 0
-    HbObjectRoleDialogPrimaryAction,
-    HbObjectRoleDialogSecondaryAction,
-    HbObjectRoleMenuAction,
-    HbObjectRoleToolBarAction,
+    HbObjectRoleDialogPrimaryAction, // deprecated
+    HbObjectRoleDialogSecondaryAction, // deprecated
+    HbObjectRoleMenuAction, // deprecated
+    HbObjectRoleToolBarAction, // deprecated
+    HbObjectRoleWidgetAction,
     HbObjectRoleAmount // needs to be the last one
 };
 
@@ -117,6 +119,7 @@
     { "HbListView:prototype", HbWidgetRoleListViewPrototype },  // deprecated
     { "HbMenu:menu", HbWidgetRoleMenuSubmenu },
     { "HbScrollArea:contents", HbWidgetRoleScrollAreaContents },
+    { "HbStackedWidget:contentWidget", HbWidgetRoleStackedContentWidget },
     { "HbView:menu", HbWidgetRoleViewMenu },
     { "HbView:toolBar", HbWidgetRoleViewToolBar },
     { "HbView:widget", HbWidgetRoleViewWidget }
@@ -125,10 +128,11 @@
 // Used in binary seacrh, so keep name fields in alphabetical order.
 const HbDocumentLoaderFactoryKnownValue objectRoles[HbObjectRoleAmount - 1] =
 {
-    { "HbDialog:primaryAction", HbObjectRoleDialogPrimaryAction },
-    { "HbDialog:secondaryAction", HbObjectRoleDialogSecondaryAction },
-    { "HbMenu:addAction", HbObjectRoleMenuAction },
-    { "HbToolBar:addAction", HbObjectRoleToolBarAction }
+    { "HbDialog:primaryAction", HbObjectRoleDialogPrimaryAction }, // deprecated
+    { "HbDialog:secondaryAction", HbObjectRoleDialogSecondaryAction }, // deprecated
+    { "HbMenu:addAction", HbObjectRoleMenuAction }, // deprecated
+    { "HbToolBar:addAction", HbObjectRoleToolBarAction }, // deprecated
+    { "HbWidget:addAction", HbObjectRoleWidgetAction }
 };
 
 inline bool operator<(
@@ -372,6 +376,16 @@
         }
         break;
 
+    case HbWidgetRoleStackedContentWidget:
+        {
+            HbStackedWidget *stacked= qobject_cast<HbStackedWidget *>(parent);
+            success = (stacked != 0);
+            if (stacked) {
+                stacked->addWidget(child);
+            }
+        }
+        break;
+
     case HbWidgetRoleUnknown:
     default:
         success = false;
@@ -393,41 +407,15 @@
 
     switch (findKnownValue(role, objectRoles, HbObjectRoleAmount)) {
     case HbObjectRoleDialogPrimaryAction:
-        {
-            HbDialog *popup = qobject_cast<HbDialog *>(parent);
-            success = (popup != 0);
-            if (popup) {
-                popup->setPrimaryAction(qobject_cast<HbAction *>(child));
-            }
-        }
-        break;
-
     case HbObjectRoleDialogSecondaryAction:
+    case HbObjectRoleMenuAction:
+    case HbObjectRoleToolBarAction:
+    case HbObjectRoleWidgetAction:
         {
-            HbDialog *popup = qobject_cast<HbDialog *>(parent);
-            success = (popup != 0);
-            if (popup) {
-                popup->setSecondaryAction(qobject_cast<HbAction *>(child));
-            }
-        }
-        break;
-    
-    case HbObjectRoleMenuAction:
-        {
-            HbMenu *menu = qobject_cast<HbMenu *>(parent);
-            success = (menu != 0);
-            if (menu) {
-                menu->addAction(qobject_cast<QAction *>(child));
-            }
-        }
-        break;
-
-    case HbObjectRoleToolBarAction:
-        {
-            HbToolBar *toolBar = qobject_cast<HbToolBar *>(parent);
-            success = (toolBar != 0);
-            if (toolBar) {
-                toolBar->addAction(qobject_cast<HbAction *>(child));
+            HbWidget *widget = qobject_cast<HbWidget*>(parent);
+            success = (widget != 0);
+            if (widget) {
+                widget->addAction(qobject_cast<HbAction *>(child));
             }
         }
         break;
diff -r 16d8024aca5e -r f7ac710697a9 src/hbutils/document/hbdocumentloadersyntax_p.cpp
--- a/src/hbutils/document/hbdocumentloadersyntax_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbutils/document/hbdocumentloadersyntax_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -28,30 +28,75 @@
 #include "hbdocumentloader_p.h"
 #include "hbdocumentloader.h"
 
-#include <hbicon.h>
 #include <hbfontspec.h>
-#include <QDebug>
+
 #include <QMetaEnum>
+#include <QTranslator>
+#include <QDataStream>
 
-#include <QTranslator>
-#include <hbmainwindow.h>
+#include <QDebug>
 
 
 // Document loader version number
 #define VERSION_MAJOR 1
-#define VERSION_MINOR 0
+#define VERSION_MINOR 1
 
 #define MIN_SUPPORTED_VERSION_MAJOR 0
 #define MIN_SUPPORTED_VERSION_MINOR 1
 
+
+//#define LINE_DEBUGGING
+
+#ifdef LINE_DEBUGGING
+#include <QTime>
+static QTime lineDebugTime;
+
+#ifdef Q_OS_SYMBIAN
+#include <e32debug.h>
+#endif
+
+void doDebugPrint(const char* text)
+{
+#ifdef Q_OS_SYMBIAN
+    RDebug::Printf(text);
+#else
+    qDebug() << text;
+#endif
+}
+
+// Takes standard c-format.
+void debugPrint(const char* cformat, ...)
+{
+    va_list ap;
+    va_start(ap, cformat);
+    QString str = QString().vsprintf(cformat, ap);
+    va_end(ap);
+    doDebugPrint(str.toAscii().constData());
+}
+
+#endif // LINE_DEBUGGING
+
+const char *ZValueProperty = "z";
+
+class AccessToMetadata : public QObject
+    {
+    public:
+        int getEnumValue( const char *enumeration, const char *str )
+            {
+                QMetaObject metaobject = staticQtMetaObject;
+                QMetaEnum e = metaobject.enumerator( metaobject.indexOfEnumerator( enumeration ) );
+                return e.keysToValue( str );
+            }
+    };
+
 /*
     \class HbDocumentLoaderSyntax
     \internal
     \proto
 */
 
-HbDocumentLoaderSyntax::HbDocumentLoaderSyntax( HbDocumentLoaderActions *actions, const HbMainWindow *window )
-: HbXmlLoaderAbstractSyntax( actions ), mRealActions( actions ), mMainWindow(window)
+HbDocumentLoaderSyntax::HbDocumentLoaderSyntax( HbXmlLoaderAbstractActions *actions )
+: HbXmlLoaderBaseSyntax( actions )
 {
 }
 
@@ -59,10 +104,30 @@
 {
 }
 
+bool HbDocumentLoaderSyntax::scanForSections( QIODevice *device, QList<QString> &sectionsList )
+{
+#ifdef LINE_DEBUGGING
+    lineDebugTime.restart();
+    debugPrint("MYTRACE: DocML scanForSections, start");
+#endif
+    bool ret = HbXmlLoaderBaseSyntax::scanForSections( device, sectionsList );
+#ifdef LINE_DEBUGGING
+    debugPrint("MYTRACE: DocML scanForSections, end: %d", lineDebugTime.elapsed());
+#endif
+    return ret;
+}
+
 bool HbDocumentLoaderSyntax::load( QIODevice *device, const QString &section )
 {
-    mCurrentProfile = HbDeviceProfile::profile(mMainWindow);
-    return HbXmlLoaderAbstractSyntax::loadDevice( device, section );
+#ifdef LINE_DEBUGGING
+    lineDebugTime.restart();
+    debugPrint("MYTRACE: DocML load, start");
+#endif
+    bool ret = HbXmlLoaderBaseSyntax::loadDevice( device, section );
+#ifdef LINE_DEBUGGING
+    debugPrint("MYTRACE: DocML load, end: %d", lineDebugTime.elapsed());
+#endif
+    return ret;
 }
 
 bool HbDocumentLoaderSyntax::readLayoutStartItem()
@@ -76,17 +141,20 @@
 
                 const QString src = attribute( AL_SRC_NAME );
                 const QString dst = attribute( AL_DST_NAME );
-                const QString srcEdge = attribute( AL_SRC_EDGE );
-                const QString dstEdge = attribute( AL_DST_EDGE );
+                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 );
-                qreal spacingVal = 0;
+                HbXmlLengthValue spacingVal;
                 result = true;
                 if( !spacing.isEmpty() ) {
-                    result = toPixels( spacing, spacingVal );
+                    result = toLengthValue( spacing, spacingVal );
                 }
-                if (result) {
-                    result = mRealActions->addAnchorLayoutEdge( src, srcEdge, dst, dstEdge, spacingVal, spacer );
+                Hb::Edge srcEdge, dstEdge;
+                result &= getAnchorEdge( srcEdgeStr, srcEdge );
+                result &= getAnchorEdge( dstEdgeStr, dstEdge );
+                if ( result ) {
+                    result = mActions->addAnchorLayoutEdge( src, srcEdge, dst, dstEdge, spacingVal, spacer );
                 }
             }
             break;
@@ -97,28 +165,148 @@
             if( mReader.name() == lexemValue( GL_GRIDCELL ) ) {
 
                 const QString src = attribute( GL_ITEMNAME );
-
                 const QString row = attribute( GL_ROW );
                 const QString column = attribute( GL_COLUMN );
                 const QString rowspan = attribute( GL_ROWSPAN );
                 const QString columnspan = attribute( GL_COLUMNSPAN );
                 const QString alignment = attribute( TYPE_ALIGNMENT );
-                result = mRealActions->addGridLayoutCell( src, row, column, rowspan, columnspan, alignment );
+
+                int rownum = row.toInt( &result );
+                if (!result) {
+                    HB_DOCUMENTLOADER_PRINT( QString( "GRIDLAYOUT: NO ROW SPECIFIED" ) );
+                    break;
+                }
+
+                int columnnum = column.toInt( &result );
+                if (!result) {
+                    HB_DOCUMENTLOADER_PRINT( QString( "GRIDLAYOUT: NO COLUMN SPECIFIED" ) );
+                    break;
+                }
+
+                int rowspannum;
+                int *rowspan_p = 0;
+                if (!rowspan.isEmpty()) {
+                    rowspannum = rowspan.toInt( &result );
+                    if (!result) {
+                        HB_DOCUMENTLOADER_PRINT( QString( "GRIDLAYOUT: INVALID ROWSPAN" ) );
+                        break;
+                    } else {
+                        rowspan_p = &rowspannum;
+                    }
+                }
+
+                int columnspannum;
+                int *columnspan_p = 0;
+                if (!columnspan.isEmpty()) {
+                    columnspannum = columnspan.toInt( &result );
+                    if (!result) {
+                        HB_DOCUMENTLOADER_PRINT( QString( "GRIDLAYOUT: INVALID ROWSPAN" ) );
+                        break;
+                    } else {
+                        columnspan_p = &columnspannum;
+                    }
+                }
+
+                Qt::Alignment align;
+                Qt::Alignment *align_p = 0;
+                if (!alignment.isEmpty()) {
+                    AccessToMetadata myAccess;
+                    int value = myAccess.getEnumValue( "Alignment", alignment.toLatin1().data() );
+                    if (value == -1) {
+                        HB_DOCUMENTLOADER_PRINT( QString( "GRIDLAYOUT: NO SUCH ALIGNMENT " ) + alignment );
+                        result = false;
+                        break;
+                    } else {
+                        align = (Qt::Alignment)value;
+                        align_p = &align;
+                    }
+                }
+                result = mActions->addGridLayoutCell( src, rownum, columnnum, rowspan_p, columnspan_p, align_p );
             } else if( mReader.name() == lexemValue( GL_GRIDROW ) ) {
                 const QString row = attribute( GL_ROW );
                 const QString stretchfactor = attribute( ATTR_STRETCHFACTOR );
                 const QString alignment = attribute( TYPE_ALIGNMENT );
-                result = mRealActions->setGridLayoutRowProperties( row, stretchfactor, alignment );
+
+                const int rownum = row.toInt( &result );
+                if (!result) {
+                    HB_DOCUMENTLOADER_PRINT( QString( "GRIDLAYOUT: NO ROW NUMBER SPECIFIED FOR STRETCH FACTOR" ) );
+                    break;
+                }
+
+                int stretchnum;
+                int *stretch_p = 0;
+                if( !stretchfactor.isEmpty() ) {
+                    stretchnum = stretchfactor.toInt( &result );
+                    if (!result) {
+                        HB_DOCUMENTLOADER_PRINT( QString( "GRIDLAYOUT: UNABLE TO PARSE ROW STRETCH FACTOR VALUE" ) );
+                        break;
+                    } else {
+                        stretch_p = &stretchnum;
+                    }
+                }
+
+                Qt::Alignment align;
+                Qt::Alignment *align_p = 0;
+                if( !alignment.isEmpty() ) {
+                    AccessToMetadata myAccess;
+
+                    int value = myAccess.getEnumValue( "Alignment", alignment.toLatin1().data() );
+                    if( value == -1 ) {
+                        HB_DOCUMENTLOADER_PRINT( QString( "GRIDLAYOUT: NO SUCH ROW ALIGNMENT " ) + alignment );
+                        result = false;
+                        break;
+                    } else {
+                        align = (Qt::Alignment)value;
+                        align_p = &align;
+                    }
+                }
+
+                result = mActions->setGridLayoutRowProperties( rownum, stretch_p, align_p );
                 if (result) {
-                    result = processRowHeights( row );
+                    result = processRowHeights( rownum );
                 }
             } else if( mReader.name() == lexemValue( GL_GRIDCOLUMN ) ) {
                 const QString column = attribute( GL_COLUMN );
                 const QString stretchfactor = attribute( ATTR_STRETCHFACTOR );
                 const QString alignment = attribute( TYPE_ALIGNMENT );
-                result = mRealActions->setGridLayoutColumnProperties( column, stretchfactor, alignment );
+
+                const int columnnum = column.toInt( &result );
+                if (!result) {
+                    HB_DOCUMENTLOADER_PRINT( QString( "GRIDLAYOUT: NO COLUMN NUMBER SPECIFIED FOR STRETCH FACTOR" ) );
+                    break;
+                }
+
+                int stretchnum;
+                int *stretch_p = 0;
+                if (!stretchfactor.isEmpty()) {
+                    stretchnum = stretchfactor.toInt( &result );
+                    if (!result) {
+                        HB_DOCUMENTLOADER_PRINT( QString( "GRIDLAYOUT: UNABLE TO PARSE COLUMN STRETCH FACTOR VALUE" ) );
+                        break;
+                    } else {
+                        stretch_p = &stretchnum;
+                    }
+                }
+
+                Qt::Alignment align;
+                Qt::Alignment *align_p = 0;
+                if (!alignment.isEmpty()) {
+                    AccessToMetadata myAccess;
+
+                    int value = myAccess.getEnumValue( "Alignment", alignment.toLatin1().data() );
+                    if (value == -1) {
+                        HB_DOCUMENTLOADER_PRINT( QString( "GRIDLAYOUT: NO SUCH COLUMN ALIGNMENT " ) + alignment );
+                        result = false;
+                        break;
+                    } else {
+                        align = (Qt::Alignment)value;
+                        align_p = &align;
+                    }
+                }
+
+                result = mActions->setGridLayoutColumnProperties( columnnum, stretch_p, align_p );
                 if (result) {
-                    result = processColumnWidths( column );
+                    result = processColumnWidths( columnnum );
                 }
             } else if( mReader.name() == lexemValue( TYPE_CONTENTSMARGINS ) ) {
                 result = processContentsMargins();
@@ -130,26 +318,88 @@
             HB_DOCUMENTLOADER_PRINT( "GENERAL LAYOUT START ITEM: LINEAR ITEM" );
             if( mReader.name() == lexemValue( LL_LINEARITEM ) ) {
                 result = true;
+                const QString itemname = attribute( LL_ITEMNAME );
                 const QString index = attribute( LL_INDEX );
-                const QString itemname = attribute( LL_ITEMNAME );
-                const QString spacing = attribute( LL_SPACING );
                 const QString stretchfactor = attribute( ATTR_STRETCHFACTOR );
                 const QString alignment = attribute( TYPE_ALIGNMENT );
-                
-                qreal spacingValue(0);
-                qreal *spacingPtr(0);
-                if( !spacing.isEmpty() ) {
-                    result = toPixels( spacing, spacingValue );
-                    spacingPtr = &spacingValue;
+                const QString spacing = attribute( LL_SPACING );
+
+                int indexnum;
+                int *index_p = 0;
+                if (!index.isEmpty()) {
+                    indexnum = index.toInt( &result );
+                    if (!result) {
+                        HB_DOCUMENTLOADER_PRINT( QString( "LINEARLAYOUT: UNABLE TO PARSE ITEM INDEX" ) );
+                        break;
+                    } else {
+                        index_p = &indexnum;
+                    }
+                }
+
+                int stretchnum;
+                int *stretch_p = 0;
+                if (!stretchfactor.isEmpty()) {
+                    stretchnum = stretchfactor.toInt( &result );
+                    if (!result) {
+                        HB_DOCUMENTLOADER_PRINT( QString( "LINEARLAYOUT: UNABLE TO PARSE STRETCH VALUE" ) );
+                        break;
+                    } else {
+                        stretch_p = &stretchnum;
+                    }
+                }
+
+                Qt::Alignment align;
+                Qt::Alignment *align_p = 0;
+                if (!alignment.isEmpty()) {
+                    AccessToMetadata myAccess;
+
+                    int value = myAccess.getEnumValue( "Alignment", alignment.toLatin1().data() );
+                    if (value == -1) {
+                        HB_DOCUMENTLOADER_PRINT( QString( "LINEARLAYOUT: NO SUCH ITEM ALIGNMENT " ) + alignment );
+                        result = false;
+                        break;
+                    } else {
+                        align = (Qt::Alignment)value;
+                        align_p = &align;
+                    }
+                }
+
+                HbXmlLengthValue spacingValue;
+                if (!spacing.isEmpty()) {
+                    result = toLengthValue( spacing, spacingValue );
                 }
                 if (result) {
-                    result = mRealActions->addLinearLayoutItem( itemname, index, stretchfactor, alignment, spacingPtr );
+                    result = mActions->addLinearLayoutItem( itemname, index_p, stretch_p, align_p, spacingValue );
                 }
             } else if( mReader.name() == lexemValue( LL_STRETCH ) ) {
                 const QString index = attribute( LL_INDEX );
                 const QString stretchfactor = attribute( ATTR_STRETCHFACTOR );
 
-                result = mRealActions->addLinearLayoutStretch( index, stretchfactor );
+                int indexnum;
+                int *index_p = 0;
+                if (!index.isEmpty()) {
+                    indexnum = index.toInt( &result );
+                    if (!result) {
+                        HB_DOCUMENTLOADER_PRINT( QString( "LINEARLAYOUT: UNABLE TO PARSE STRETCH INDEX" ) );
+                        break;
+                    } else {
+                        index_p = &indexnum;
+                    }
+                }
+
+                int stretchnum;
+                int *stretch_p = 0;
+                if (!stretchfactor.isEmpty()) {
+                    stretchnum = stretchfactor.toInt( &result );
+                    if (!result) {
+                        HB_DOCUMENTLOADER_PRINT( QString( "LINEARLAYOUT: UNABLE TO PARSE STRETCH VALUE" ) );
+                        break;
+                    } else {
+                        stretch_p = &stretchnum;
+                    }
+                }
+
+                result = mActions->addLinearLayoutStretch( index_p, stretch_p );
             } else if( mReader.name() == lexemValue( TYPE_CONTENTSMARGINS ) ) {
                 result = processContentsMargins();
             }
@@ -163,7 +413,18 @@
                 const QString index = attribute( SL_INDEX );
                 const QString itemname = attribute( SL_ITEMNAME );
 
-                result =  mRealActions->addStackedLayoutItem( itemname, index );
+                int indexnum;
+                int *index_p = 0;
+                if( !index.isEmpty() ) {
+                    indexnum = index.toInt( &result );
+                    if( !result ) {
+                        HB_DOCUMENTLOADER_PRINT( QString( "STACKEDLAYOUT: UNABLE TO PARSE ITEM INDEX" ) );
+                        break;
+                    } else {
+                        index_p = &indexnum;
+                    }
+                }
+                result = mActions->addStackedLayoutItem( itemname, index_p );
             }
             break;
 
@@ -178,6 +439,9 @@
             qWarning() << "Internal error, wrong layout type, line " << mReader.lineNumber();
         }
     }
+#ifdef LINE_DEBUGGING
+    debugPrint("MYTRACE: --- after line %d, time: %d", (int)mReader.lineNumber(), lineDebugTime.elapsed());
+#endif
     return result;
 }
 
@@ -189,22 +453,22 @@
     const QString bottomS = attribute( ATTR_BOTTOM );
 
     bool result = true;
-    qreal left = 0, top = 0, right = 0, bottom = 0;
+    HbXmlLengthValue left, top, right, bottom;
     if ( !leftS.isEmpty() ) {
-        result = toPixels(leftS, left);
+        result = toLengthValue(leftS, left);
     }
     if ( result && !topS.isEmpty() ) {
-        result = toPixels(topS, top);
+        result = toLengthValue(topS, top);
     }
     if ( result && !rightS.isEmpty() ) {
-        result = toPixels(rightS, right);
+        result = toLengthValue(rightS, right);
     }
     if ( result && !bottomS.isEmpty() ) {
-        result = toPixels(bottomS, bottom);
+        result = toLengthValue(bottomS, bottom);
     }
 
     if ( result ) {
-        result = mRealActions->setLayoutContentsMargins( left, top, right, bottom );
+        result = mActions->setLayoutContentsMargins( left, top, right, bottom );
     }
 
     if (!result) {
@@ -214,111 +478,96 @@
     return result;
 }
 
-bool HbDocumentLoaderSyntax::processRowHeights( const QString &row )
+bool HbDocumentLoaderSyntax::processRowHeights( int row )
 {
     const QString minHeightS = attribute( GL_MINHEIGHT );
     const QString maxHeightS = attribute( GL_MAXHEIGHT );
     const QString prefHeightS = attribute( GL_PREFHEIGHT );
     const QString fixedHeightS = attribute( GL_FIXEDHEIGHT );
     const QString rowSpacingS = attribute( GL_SPACING );
-    qreal minHeight = -1;
-    qreal maxHeight = -1;
-    qreal prefHeight = -1;
-    qreal fixedHeight = -1;
-    qreal rowSpacing = -1;
+    HbXmlLengthValue minHeight, maxHeight, prefHeight, fixedHeight, rowSpacing;
 
     bool result = true;
-    int propertyAvailable = 0;
 
     if ( !minHeightS.isEmpty() ) {
-        result = toPixels(minHeightS, minHeight);
-        propertyAvailable |= HbDocumentLoaderActions::propertyMin;
+        result = toLengthValue(minHeightS, minHeight);
     }
 
     if ( result && !maxHeightS.isEmpty() ) {
-        result = toPixels(maxHeightS, maxHeight);
-        propertyAvailable |= HbDocumentLoaderActions::propertyMax;
+        result = toLengthValue(maxHeightS, maxHeight);
     }
 
     if ( result && !prefHeightS.isEmpty() ) {
-        result = toPixels(prefHeightS, prefHeight);
-        propertyAvailable |= HbDocumentLoaderActions::propertyPref;
+        result = toLengthValue(prefHeightS, prefHeight);
     }
 
     if ( result && !fixedHeightS.isEmpty() ) {
-        result = toPixels(fixedHeightS, fixedHeight);
-        propertyAvailable |= HbDocumentLoaderActions::propertyFixed;
+        result = toLengthValue(fixedHeightS, fixedHeight);
     }
 
     if ( result && !rowSpacingS.isEmpty() ) {
-        result = toPixels(rowSpacingS, rowSpacing);
-        propertyAvailable |= HbDocumentLoaderActions::propertySpacing;
+        result = toLengthValue(rowSpacingS, rowSpacing);
     }
 
-    if ( result && propertyAvailable ) {
-        result = mRealActions->setGridLayoutRowHeights( row, minHeight, maxHeight, 
-                                                        prefHeight, fixedHeight, 
-                                                        rowSpacing, propertyAvailable);
+    if ( result ) {
+        result = mActions->setGridLayoutRowHeights(
+            row, minHeight, maxHeight, prefHeight, fixedHeight, rowSpacing);
     }
 
     return result;
 }
 
-bool HbDocumentLoaderSyntax::processColumnWidths( const QString &column )
+bool HbDocumentLoaderSyntax::processColumnWidths( int column )
 {
     const QString minWidthS = attribute( GL_MINWIDTH );
     const QString maxWidthS = attribute( GL_MAXWIDTH );
     const QString prefWidthS = attribute( GL_PREFWIDTH );
     const QString fixedWidthS = attribute( GL_FIXEDWIDTH );
     const QString columnSpacingS = attribute( GL_SPACING );
-    qreal minWidth = -1;
-    qreal maxWidth = -1;
-    qreal prefWidth = -1;
-    qreal fixedWidth = -1;
-    qreal columnSpacing = -1;
+    HbXmlLengthValue minWidth, maxWidth, prefWidth, fixedWidth, columnSpacing;
 
     bool result = true;
-    int propertyAvailable = 0;
 
     if ( !minWidthS.isEmpty() ) {
-        result = toPixels(minWidthS, minWidth);
-        propertyAvailable |= HbDocumentLoaderActions::propertyMin;
+        result = toLengthValue(minWidthS, minWidth);
     }
 
     if ( result && !maxWidthS.isEmpty() ) {
-        result = toPixels(maxWidthS, maxWidth);
-        propertyAvailable |= HbDocumentLoaderActions::propertyMax;
+        result = toLengthValue(maxWidthS, maxWidth);
     }
 
     if ( result && !prefWidthS.isEmpty() ) {
-        result = toPixels(prefWidthS, prefWidth);
-        propertyAvailable |= HbDocumentLoaderActions::propertyPref;
+        result = toLengthValue(prefWidthS, prefWidth);
     }
 
     if ( result && !fixedWidthS.isEmpty() ) {
-        result = toPixels(fixedWidthS, fixedWidth);
-        propertyAvailable |= HbDocumentLoaderActions::propertyFixed;
+        result = toLengthValue(fixedWidthS, fixedWidth);
     }
 
     if ( result && !columnSpacingS.isEmpty() ) {
-        result = toPixels(columnSpacingS, columnSpacing);
-        propertyAvailable |= HbDocumentLoaderActions::propertySpacing;
+        result = toLengthValue(columnSpacingS, columnSpacing);
     }
 
-    if ( result && propertyAvailable ) {
-        result = mRealActions->setGridLayoutColumnWidths( column, minWidth, maxWidth, 
-                                                          prefWidth, fixedWidth, 
-                                                          columnSpacing, propertyAvailable);
+    if ( result ) {
+        result = mActions->setGridLayoutColumnWidths(
+            column, minWidth, maxWidth, prefWidth, fixedWidth, columnSpacing);
     }
 
     return result;
 }
 
+bool HbDocumentLoaderSyntax::checkEndElementCorrectness()
+{
+    return HbXmlLoaderBaseSyntax::checkEndElementCorrectness();
+}
+
+
+
 bool HbDocumentLoaderSyntax::readContainerStartItem()
 {
     bool result = false;
     switch ( mCurrentElementType ) {
-         case PROPERTY:
+         case HbXml::PROPERTY:
          {
             HB_DOCUMENTLOADER_PRINT( "CONTAINER START ITEM: PROPERTY" );
 
@@ -359,47 +608,26 @@
 
 bool HbDocumentLoaderSyntax::readContainerEndItem()
 {
+
     bool result = false;
     QString currentPropertyName;
     QVariant variant;
 
     switch( mCurrentElementType ) {
-        case CONTAINER:
+        case HbXml::CONTAINER:
         {
-            currentPropertyName = mCurrentContainer.back();
-            mCurrentContainer.removeLast();
+            currentPropertyName = mCurrentContainerNames.back();
+            mCurrentContainerNames.removeLast();
 
-            if (mRealActions->mCurrentContainer) {
-                // in order for the conversion to work, all of the contained types need to be suitable and equivalent, e.g. strings
-                QVariant variantContainer = QVariant(*(mRealActions->mCurrentContainer));
-                if (variantContainer.isValid()) {
-                    switch(mCurrentContainerType) {
-                        case CONTAINER_STRINGLIST:
-                        {
-                            QStringList list = variantContainer.toStringList();
-                            variant = QVariant(list);
-                            break;
-                        }
-                        default:
-                        {
-                            variant = variantContainer;
-                            break;
-                        }
-                    }
-                }
-            }
-
-            result = mRealActions->pushProperty(currentPropertyName, variant);
+            result = mActions->pushContainer(currentPropertyName.toLatin1(), mCurrentContainerType, mCurrentContainer);
 
             HB_DOCUMENTLOADER_PRINT( "CONTAINER END ITEM : SWITCHING TO GENERAL ITEM PROCESSING MODE" );
             mElementState = ES_GENERAL_ITEM;
-
-            result = true;
             break;
         }
         default:
         {
-            result = HbXmlLoaderAbstractSyntax::readGeneralEndItem();
+            result = HbXmlLoaderBaseSyntax::readGeneralEndItem();
             break;
         }
     }
@@ -410,49 +638,49 @@
 {
     bool result = false;
     switch( mCurrentElementType ) {
-         case OBJECT:
+         case HbXml::OBJECT:
          {
             HB_DOCUMENTLOADER_PRINT( "GENERAL START ITEM: OBJECT" );
             result = processObject();
             break;
          }
-         case WIDGET:
+         case HbXml::WIDGET:
          {
             HB_DOCUMENTLOADER_PRINT( "GENERAL START ITEM: WIDGET" );
             result = processWidget();
             break;
          }
-         case SPACERITEM:
+         case HbXml::SPACERITEM:
          {
             HB_DOCUMENTLOADER_PRINT( "GENERAL START ITEM: SPACERITEM" );
             result = processSpacerItem();
             break;
          }
-         case CONNECT:
+         case HbXml::CONNECT:
          {
             HB_DOCUMENTLOADER_PRINT( "GENERAL START ITEM: CONNECT" );
             result = processConnect();
             break;
          }
-         case PROPERTY:
+         case HbXml::PROPERTY:
          {
             HB_DOCUMENTLOADER_PRINT( "GENERAL START ITEM: PROPERTY" );
             result = processProperty();
             break;
          }
-         case REF:
+         case HbXml::REF:
          {
             HB_DOCUMENTLOADER_PRINT( "GENERAL START ITEM: REF" );
             result = processRef();
             break;
          }
-         case VARIABLE:
+         case HbXml::VARIABLE:
          {
             HB_DOCUMENTLOADER_PRINT( "GENERAL START ITEM: VARIABLE" );
             result = processVariable();
             break;
          }
-         case DEPRECATED:
+         case HbXml::DEPRECATED:
          {
              HB_DOCUMENTLOADER_PRINT( "GENERAL START ITEM: DEPRECATED" );
              result = true;
@@ -460,9 +688,12 @@
          }
          default:
          {
-              result = HbXmlLoaderAbstractSyntax::readGeneralStartItem();
+              result = HbXmlLoaderBaseSyntax::readGeneralStartItem();
          }
     }
+#ifdef LINE_DEBUGGING
+    debugPrint("MYTRACE: --- after line %d, time: %d", (int)mReader.lineNumber(), lineDebugTime.elapsed());
+#endif
     return result;
 }
 
@@ -501,7 +732,7 @@
         return false;
 
     }
-    return mRealActions->pushDocument( attribute( ATTR_CONTEXT ) );
+    return mActions->pushDocument( attribute( ATTR_CONTEXT ) );
 }
 
 bool HbDocumentLoaderSyntax::processObject()
@@ -509,7 +740,8 @@
     const QString type = attribute( ATTR_TYPE );
     const QString name = attribute( ATTR_NAME );
 
-    if( !mRealActions->pushObject( type, name ) ) {
+    bool pushOK = mActions->pushObject( type, name );
+    if( !pushOK ) {
         qWarning() << "Error in object processing, line " << mReader.lineNumber();
         return false;
     }
@@ -522,7 +754,8 @@
     const QString name = attribute( ATTR_NAME );
     const QString role = attribute( ATTR_ROLE );
     const QString plugin = attribute( ATTR_PLUGIN );
-    if( !mRealActions->pushWidget( type, name, role, plugin) ) {
+    bool pushOK = mActions->pushWidget( type, name, role, plugin);
+    if( !pushOK ) {
         qWarning() << "Error in widget processing, line " << mReader.lineNumber();
         return false;
     }
@@ -534,7 +767,8 @@
     const QString name = attribute( ATTR_NAME );
     const QString widget = attribute( ATTR_WIDGET );
 
-    if( !mRealActions->pushSpacerItem( name, widget ) ) {
+    bool pushOK = mActions->pushSpacerItem( name, widget );
+    if( !pushOK ) {
         qWarning() << "Error in object processing, line " << mReader.lineNumber();
         return false;
     }
@@ -550,21 +784,19 @@
     if( layout_type == lexemValue( LAYOUT_ANCHOR ) ) {
 
         mCurrentLayoutType = LAYOUT_ANCHOR;
-        result = mRealActions->createAnchorLayout( widget );
+        result = mActions->createAnchorLayout( widget );
 
     } else if( layout_type == lexemValue( LAYOUT_GRID ) ) {
 
         result = true;
         mCurrentLayoutType = LAYOUT_GRID;
         const QString spacing = attribute( GL_SPACING );
-        qreal spacingValue(0);
-        qreal *spacingPtr(0);
+        HbXmlLengthValue spacingValue;
         if( !spacing.isEmpty() ) {
-            result = toPixels( spacing, spacingValue );
-            spacingPtr = &spacingValue;
+            result = toLengthValue( spacing, spacingValue );
         }
         if (result) {
-            result = mRealActions->createGridLayout( widget, spacingPtr );
+            result = mActions->createGridLayout( widget, spacingValue );
         }
 
     } else if( layout_type == lexemValue( LAYOUT_LINEAR ) ) {
@@ -572,29 +804,43 @@
         result = true;
         mCurrentLayoutType = LAYOUT_LINEAR;
         const QString orientation = attribute( LL_ORIENTATION );
+
+
+        Qt::Orientation orient;
+        Qt::Orientation *orient_p = 0;
+        if (!orientation.isEmpty()) {
+            AccessToMetadata myAccess;
+            int value = myAccess.getEnumValue( "Orientation", orientation.toLatin1().data() );
+            if (value == -1) {
+                HB_DOCUMENTLOADER_PRINT( QString( "LINEARLAYOUT: NO SUCH ORIENTATION " ) + orientation );
+                result = false;
+            } else {
+                orient = (Qt::Orientation)value;
+                orient_p = &orient;
+            }
+        }
+
         const QString spacing = attribute( LL_SPACING );
-        qreal spacingValue(0);
-        qreal *spacingPtr(0);
-        if( !spacing.isEmpty() ) {
-            result = toPixels( spacing, spacingValue );
-            spacingPtr = &spacingValue;
+        HbXmlLengthValue spacingValue;
+        if( result && !spacing.isEmpty() ) {
+            result = toLengthValue( spacing, spacingValue );
         }
         if (result) {
-            result = mRealActions->createLinearLayout( widget, orientation, spacingPtr );
+            result = mActions->createLinearLayout( widget, orient_p, spacingValue );
         }
 
     } else if( layout_type == lexemValue( LAYOUT_STACK ) ) {
 
         mCurrentLayoutType = LAYOUT_STACK;
-        result = mRealActions->createStackedLayout( widget );
+        result = mActions->createStackedLayout( widget );
 
     } else if( layout_type == lexemValue( LAYOUT_NULL ) ) {
 
         mCurrentLayoutType = LAYOUT_NULL;
-        result = mRealActions->createNullLayout( widget );
+        result = mActions->createNullLayout( widget );
 
     } else {
-        return HbXmlLoaderAbstractSyntax::processLayout();
+        return HbXmlLoaderBaseSyntax::processLayout();
     }
 
     if( !result ) {
@@ -611,7 +857,8 @@
     const QString dstName = attribute( ATTR_DST );
     const QString slotName = attribute( ATTR_SLOT );
 
-    if( !mRealActions->pushConnect( srcName, signalName, dstName, slotName ) ) {
+    bool pushOK = mActions->pushConnect( srcName, signalName, dstName, slotName );
+    if( !pushOK ) {
         qWarning() << "Error in connect processing, line " << mReader.lineNumber();
         return false;
 
@@ -621,7 +868,7 @@
 
 bool HbDocumentLoaderSyntax::processContainer()
 {
-    bool result = false;
+    bool result = true;
     const QString container_type = attribute( ATTR_TYPE );
 
     if( container_type == lexemValue( CONTAINER_STRINGLIST ) ) {
@@ -629,46 +876,54 @@
         mCurrentContainerType = CONTAINER_STRINGLIST;
 
         const QString propertyName = attribute ( ATTR_NAME );
-        mCurrentContainer << propertyName;
-        result = mRealActions->createContainer();
-
+        if (propertyName.isEmpty()) {
+            qWarning() << "No property name defined, line " << mReader.lineNumber();
+            result = false;
+        }
+        if (result) {
+            mCurrentContainerNames << propertyName;
+            mCurrentContainer.clear();
+        }
     } else {
-        return HbXmlLoaderAbstractSyntax::processContainer();
+        result = HbXmlLoaderBaseSyntax::processContainer();
+        if( !result ) {
+            qWarning() << "Unable to create container, line " << mReader.lineNumber();
+            return false;
+        }
     }
-
-    if( !result ) {
-        qWarning() << "Unable to create container, line " << mReader.lineNumber();
-        return false;
-    }
-    return true;
+    return result;
 }
 
 bool HbDocumentLoaderSyntax::processContainedProperty()
 {
-    const QVariant value = decodeValue();
-    if( ! value.isValid() ) {
+    HbXmlVariable *variable = new HbXmlVariable();
+    if ( !createVariable(*variable) ) {
         qWarning() << "Invalid property, line " << mReader.lineNumber();
+        delete variable;
         return false;
     }
 
-    if( !mRealActions->appendPropertyToContainer( value ) ) {
-        qWarning() << "Unable to set property, line " << mReader.lineNumber();
-        return false;
-    }
+    mCurrentContainer.append(variable);
     return true;
 }
 
 bool HbDocumentLoaderSyntax::processProperty()
 {
-    const QVariant value = decodeValue();
-    if( ! value.isValid() ) {
+    HbXmlVariable variable;
+    if ( !createVariable(variable) ) {
         qWarning() << "Invalid property, line " << mReader.lineNumber();
         return false;
     }
 
     const QString propertyName = attribute( ATTR_NAME );
 
-    if( !mRealActions->pushProperty( propertyName, value ) ) {
+    if( propertyName.isEmpty() ) {
+        qWarning() << "No property name defined, line " << mReader.lineNumber();
+        return false;
+    }
+
+    bool pushOK = mActions->pushProperty( propertyName.toLatin1(), variable );
+    if( !pushOK ) {
         qWarning() << "Unable to set property, line " << mReader.lineNumber();
         return false;
     }
@@ -680,7 +935,8 @@
     const QString objectName = attribute( ATTR_OBJECT );
     const QString role = attribute( ATTR_ROLE );
 
-    if( !mRealActions->pushRef( objectName, role ) ) {
+    bool pushOK = mActions->pushRef( objectName, role );
+    if( !pushOK ) {
         qWarning() << "Error in reference processing, line " << mReader.lineNumber();
         return false;
     }
@@ -721,22 +977,22 @@
         const QString bottomS = attribute( ATTR_BOTTOM );
 
         result = true;
-        qreal left = 0, top = 0, right = 0, bottom = 0;
+        HbXmlLengthValue left, top, right, bottom;
         if ( !leftS.isEmpty() ) {
-            result = toPixels(leftS, left);
+            result = toLengthValue(leftS, left);
         }
         if ( result && !topS.isEmpty() ) {
-            result = toPixels(topS, top);
+            result = toLengthValue(topS, top);
         }
         if ( result && !rightS.isEmpty() ) {
-            result = toPixels(rightS, right);
+            result = toLengthValue(rightS, right);
         }
         if ( result && !bottomS.isEmpty() ) {
-            result = toPixels(bottomS, bottom);
+            result = toLengthValue(bottomS, bottom);
         }
 
         if ( result ) {
-            result = mRealActions->setContentsMargins( left, top, right, bottom );
+            result = mActions->setContentsMargins( left, top, right, bottom );
         }
 
         if (!result) {
@@ -786,7 +1042,7 @@
         }
 
         if ( result ) {
-            result = mRealActions->setSizePolicy( hPol, vPol, hStretch, vStretch );
+            result = mActions->setSizePolicy( hPol, vPol, hStretch, vStretch );
         }
         delete hPol;
         delete vPol;
@@ -806,30 +1062,20 @@
 
             result = true;
 
-            qreal *sizeHintWidth = 0;
+            HbXmlLengthValue sizeHintWidth;
             const QString width = attribute( ATTR_WIDTH );
             if (!width.isEmpty()) {
-                qreal widthInPixels;
-                result = toPixels(width, widthInPixels);
-                if (result) {
-                    sizeHintWidth = new qreal;
-                    *sizeHintWidth = widthInPixels;
-                }
+                result = toLengthValue(width, sizeHintWidth);
             }
 
-            qreal *sizeHintHeight = 0;
+            HbXmlLengthValue sizeHintHeight;
             const QString height = attribute( ATTR_HEIGHT );
             if (result && !height.isEmpty()) {
-                qreal heightInPixels;
-                result = toPixels(height, heightInPixels);
-                if (result) {
-                    sizeHintHeight = new qreal;
-                    *sizeHintHeight = heightInPixels;
-                }
+                result = toLengthValue(height, sizeHintHeight);
             }
 
             if (result) {
-                result = mRealActions->setSizeHint(hint, sizeHintWidth, sizeHintHeight, fixed);
+                result = mActions->setSizeHint(hint, sizeHintWidth, sizeHintHeight, fixed);
             }
         }
 
@@ -837,12 +1083,17 @@
             qWarning() << "Invalid size hint, line " << mReader.lineNumber();
         }
     } else if ( type == lexemValue( TYPE_ZVALUE ) ) {
-        const QString zValueAsString = attribute( ATTR_VALUE );
-        if (!zValueAsString.isEmpty()) {
-            qreal zValueAsReal;
-            result = toReal(zValueAsString, zValueAsReal);
-            if ( result ) {
-                result = mRealActions->setZValue( zValueAsReal );
+        const QString value = attribute( ATTR_VALUE );
+        if (!value.isEmpty()) {
+            HbXmlLengthValue *value_res = new HbXmlLengthValue();
+            result = toLengthValue( value, *value_res );
+            if( result ) {
+                HbXmlVariable variable;
+                variable.mType = HbXmlVariable::REAL;
+                variable.mParameters.append( value_res );
+                result = mActions->pushProperty( ZValueProperty, variable );
+            } else {
+                delete value_res;
             }
         }
 
@@ -854,14 +1105,24 @@
         const QString comment = attribute( ATTR_COMMENT );
         const QString locId = attribute( ATTR_LOCID );
 
+        HbXmlVariable variable;
+
+        QString *param1 = new QString();
+        QString *param2 = new QString();
+
         if (!locId.isEmpty()) {
-            QByteArray locIdUtf8(locId.toUtf8());
-            const QString translated = hbTrId(locIdUtf8);
-            result = mRealActions->setToolTip( translated );
+            variable.mType = HbXmlVariable::STRING;
+            *param1 = value;
+            *param2 = locId;
         } else {
-            const QString translated = mRealActions->translate( value, comment );
-            result = mRealActions->setToolTip( translated );
+            variable.mType = HbXmlVariable::LOCALIZED_STRING;
+            *param1 = value;
+            *param2 = comment;
         }
+        variable.mParameters.append(param1);
+        variable.mParameters.append(param2);
+
+        result = mActions->setToolTip(variable);
 
         if (!result) {
             qWarning() << "Invalid tooltip, line " << mReader.lineNumber();
@@ -871,97 +1132,106 @@
     return result;
 }
 
-ElementType
+HbXml::ElementType
     HbDocumentLoaderSyntax::elementType( QStringRef name ) const
 {
     const QString stringName = name.toString();
 
     if( stringName == lexemValue(TYPE_DOCUMENT) ){
-        return DOCUMENT;
+        return HbXml::DOCUMENT;
     }
-    return HbXmlLoaderAbstractSyntax::elementType( name );
+    return HbXmlLoaderBaseSyntax::elementType( name );
 }
 
-QVariant HbDocumentLoaderSyntax::decodeValue()
+bool HbDocumentLoaderSyntax::createVariable( HbXmlVariable& variable )
 {
-    QVariant result = QVariant::Invalid;
+    const QString type = mReader.name().toString();
+    bool ok = true;
 
-    const QString type = mReader.name().toString();
-
-    bool ok = false;
     if( type == lexemValue( TYPE_INT ) ) {
         const QString value = attribute( ATTR_VALUE );
-        int int_res = value.toInt( &ok );
-        if( ok ) {
-            result = int_res;
+        qint16 *int_res = new qint16();
+        *int_res = value.toInt( &ok );
+        if ( ok ) {
+            variable.mType = HbXmlVariable::INT;
+            variable.mParameters.append(int_res);
+        } else {
+            delete int_res;
         }
     } else if( type == lexemValue( TYPE_REAL ) ) {
         const QString value = attribute( ATTR_VALUE );
-        qreal qreal_res;
-        ok = toPixels( value, qreal_res );
+        HbXmlLengthValue *value_res = new HbXmlLengthValue();
+        ok = toLengthValue( value, *value_res );
         if( ok ) {
-            result = qreal_res;
+            variable.mType = HbXmlVariable::REAL;
+            variable.mParameters.append(value_res);
+        } else {
+            delete value_res;
         }
     } else if( type == lexemValue( TYPE_LOCALIZED_STRING ) ) {
-        const QString value =
-            mRealActions->translate( attribute( ATTR_VALUE ), attribute( ATTR_COMMENT ) );
-        result = value;
+        QString *value = new QString();
+        QString *attr = new QString();
+        *value = attribute( ATTR_VALUE );
+        *attr = attribute( ATTR_COMMENT );
+        variable.mType = HbXmlVariable::LOCALIZED_STRING;
+        variable.mParameters.append(value);
+        variable.mParameters.append(attr);
     } else if( type == lexemValue( TYPE_STRING ) ) {
-        const QString value = attribute( ATTR_VALUE );
-        const QString locId = attribute( ATTR_LOCID );
-        if (!locId.isEmpty()) {
-            QByteArray locIdUtf8(locId.toUtf8());
-            result = hbTrId(locIdUtf8);
-        } else {
-            result = value;
-        }
-    } else if( type == lexemValue( TYPE_ENUMS ) ) {
-        result = attribute( ATTR_VALUE );
+        QString *value = new QString();
+        QString *locId = new QString();
+        *value = attribute( ATTR_VALUE );
+        *locId = attribute( ATTR_LOCID );
+        variable.mType = HbXmlVariable::STRING;
+        variable.mParameters.append(value);
+        variable.mParameters.append(locId);
+    } else if( type == lexemValue( TYPE_ENUMS ) || type == lexemValue(TYPE_ALIGNMENT) || type == lexemValue(LL_ORIENTATION) ) {
+        QString *value = new QString();
+        *value = attribute( ATTR_VALUE );
+        variable.mType = HbXmlVariable::ENUMS;
+        variable.mParameters.append(value);
     } else if ( type == lexemValue( TYPE_BOOL ) ) {
+        bool *boolVal = new bool();
         const QString value = attribute( ATTR_VALUE );
         if (value == lexemValue( VALUE_BOOL_TRUE ) ) {
-            result = QVariant(true);
+            *boolVal = true;
         } else if (value == lexemValue( VALUE_BOOL_FALSE ) ) {
-            result = QVariant(false);
+            *boolVal = false;
+        } else {
+            ok = false;
+        }
+        if (ok) {
+            variable.mType = HbXmlVariable::BOOL;
+            variable.mParameters.append(boolVal);
+        } else {
+            delete boolVal;
         }
     } else if ( type == lexemValue( TYPE_ICON ) ) {
 
-        HbIcon icon;
-        ok = true;
-
-        // Read optional iconName attribute (if not given, it's null icon)
-        const QString iconName = attribute( ATTR_ICONNAME );
-        if ( !iconName.isEmpty() ) {
-            icon.setIconName( iconName );
-        }
-
-        qreal desiredWidth = 0;
-        qreal desiredHeight = 0;
+        QString *iconName = new QString(attribute( ATTR_ICONNAME ));
+        HbXmlLengthValue *desiredWidth = new HbXmlLengthValue();
+        HbXmlLengthValue *desiredHeight = new HbXmlLengthValue();
 
         // Read optional width attribute
         const QString width = attribute( ATTR_WIDTH );
         if (!width.isEmpty()) {
-            ok = toPixels( width, desiredWidth );
+            ok = toLengthValue( width, *desiredWidth );
         }
 
         // Read optional height attribute
         const QString height = attribute( ATTR_HEIGHT );
         if (ok && !height.isEmpty()) {
-            ok = toPixels( height, desiredHeight );
+            ok = toLengthValue( height, *desiredHeight );
         }
 
         if (ok) {
-            if (!width.isEmpty() && !height.isEmpty()) {
-                icon.setSize(QSizeF(desiredWidth, desiredHeight));
-            } else if (!width.isEmpty()) {
-                icon.setWidth(desiredWidth);
-            } else if (!height.isEmpty()) {
-                icon.setHeight(desiredHeight);
-            } else {
-                // neither defined.
-            }
-
-            result = icon;
+            variable.mType = HbXmlVariable::ICON;
+            variable.mParameters.append(iconName);
+            variable.mParameters.append(desiredWidth);
+            variable.mParameters.append(desiredHeight);
+        } else {
+            delete iconName;
+            delete desiredWidth;
+            delete desiredHeight;
         }
     } else if ( type == lexemValue(TYPE_SIZE) ) {
 
@@ -969,18 +1239,22 @@
         const QString height = attribute( ATTR_HEIGHT );
 
         if (!width.isEmpty() && !height.isEmpty()) {
-            ok = true;
-            QSizeF size;
-            qreal widthVal, heightVal;
-            ok = toPixels(width, widthVal);
+            HbXmlLengthValue *widthVal = new HbXmlLengthValue();
+            HbXmlLengthValue *heightVal = new HbXmlLengthValue();
+            ok = toLengthValue(width, *widthVal);
             if (ok) {
-                size.setWidth(widthVal);
-                ok = toPixels(height, heightVal);
+                ok = toLengthValue(height, *heightVal);
             }
             if (ok) {
-                size.setHeight(heightVal);
-                result = size;
+                variable.mType = HbXmlVariable::SIZE;
+                variable.mParameters.append(widthVal);
+                variable.mParameters.append(heightVal);
+            } else {
+                delete widthVal;
+                delete heightVal;
             }
+        } else {
+            ok = false;
         }
 
     } else if ( type == lexemValue(TYPE_RECT) ) {
@@ -991,27 +1265,34 @@
         const QString height = attribute( ATTR_HEIGHT );
 
         if (!width.isEmpty() && !height.isEmpty() && !posx.isEmpty() && !posy.isEmpty()) {
-            ok = true;
-            QSizeF size;
-            QPointF point;
-            qreal widthVal, heightVal, posxVal, posyVal;
-            ok = toPixels(width, widthVal);
+            HbXmlLengthValue *widthVal = new HbXmlLengthValue();
+            HbXmlLengthValue *heightVal = new HbXmlLengthValue();
+            HbXmlLengthValue *posxVal = new HbXmlLengthValue();
+            HbXmlLengthValue *posyVal = new HbXmlLengthValue();
+            ok = toLengthValue(width, *widthVal);
             if (ok) {
-                size.setWidth(widthVal);
-                ok = toPixels(height, heightVal);
+                ok = toLengthValue(height, *heightVal);
+            }
+            if (ok) {
+                ok = toLengthValue(posx, *posxVal);
             }
             if (ok) {
-                size.setHeight(heightVal);
-                ok = toPixels(posx, posxVal);
+                ok = toLengthValue(posy, *posyVal);
             }
             if (ok) {
-                point.setX(posxVal);
-                ok = toPixels(posy, posyVal);
+                variable.mType = HbXmlVariable::RECT;
+                variable.mParameters.append(widthVal);
+                variable.mParameters.append(heightVal);
+                variable.mParameters.append(posxVal);
+                variable.mParameters.append(posyVal);
+            } else {
+                delete widthVal;
+                delete heightVal;
+                delete posxVal;
+                delete posyVal;
             }
-            if (ok) {
-                point.setY(posyVal);
-                result = QRectF(point, size);
-            }
+        } else {
+            ok = false;
         }
 
     } else if ( type == lexemValue(TYPE_POINT) ) {
@@ -1019,74 +1300,69 @@
         const QString posx = attribute( ATTR_X );
         const QString posy = attribute( ATTR_Y );
         if (!posx.isEmpty() && !posy.isEmpty()) {
-            ok = true;
-            QPointF point;
-            qreal posxVal, posyVal;
-            ok = toPixels(posx, posxVal);
+            HbXmlLengthValue *posxVal = new HbXmlLengthValue();
+            HbXmlLengthValue *posyVal = new HbXmlLengthValue();
+            ok = toLengthValue(posx, *posxVal);
             if (ok) {
-                point.setX(posxVal);
-                ok = toPixels(posy, posyVal);
+                ok = toLengthValue(posy, *posyVal);
             }
             if (ok) {
-                point.setY(posyVal);
-                result = point;
+                variable.mType = HbXmlVariable::POINT;
+                variable.mParameters.append(posxVal);
+                variable.mParameters.append(posyVal);
+            } else {
+                delete posxVal;
+                delete posyVal;
             }
-        }
-
-    } else if ( type == lexemValue(TYPE_ALIGNMENT) ) {
-
-        const QString alignment = attribute( ATTR_VALUE );
-        if (!alignment.isEmpty() ) {
-            result = alignment;
-        }
-
-    } else if ( type == lexemValue(LL_ORIENTATION) ) {
-
-        const QString orientation = attribute( ATTR_VALUE );
-        if (!orientation.isEmpty() ) {
-            result = orientation;
+        } else {
+            ok = false;
         }
 
     } else if ( type == lexemValue(TYPE_COLOR) ) {
 
         const QString curColor = attribute( ATTR_VALUE  );
         if (!curColor.isEmpty() ) {
-            ok = true;
-            result = QColor(curColor);
+            QColor *colorVal = new QColor(curColor);
+            variable.mType = HbXmlVariable::COLOR;
+            variable.mParameters.append(colorVal);
+        } else {
+            ok = false;
         }
 
     } else if ( type == lexemValue(TYPE_FONTSPEC) ) {
         QString roleString = attribute( ATTR_FONTSPECROLE );
         HbFontSpec::Role role(HbFontSpec::Undefined);
-        ok = true;
         if (!roleString.isEmpty()) {
             ok = toFontSpecRole(roleString, role); // sets role if ok
         }
         if (ok) {
-            HbFontSpec spec(role);
+            quint8 *role_b = new quint8();
+            *role_b = (quint8)role;
+            HbXmlLengthValue *height = new HbXmlLengthValue();
             QString textHeightString = attribute( ATTR_TEXTHEIGHT );
             if (textHeightString.isEmpty()) {
                 // Deprecated.
                 textHeightString = attribute( ATTR_TEXTPANEHEIGHT );
             }
             if (!textHeightString.isEmpty()) {
-                qreal height(0);
-                ok = toPixels(textHeightString, height);
-                if (ok) {
-                    spec.setTextHeight(qRound(height));
-                }
+                ok = toLengthValue(textHeightString, *height);
             }
             if (ok) {
-                result = spec;
+                variable.mType = HbXmlVariable::FONTSPEC;
+                variable.mParameters.append(role_b);
+                variable.mParameters.append(height);
+            } else {
+                delete role_b;
+                delete height;
             }
         }
     }
 
     else {
         // unknown property.
+        ok = false;
     }
-
-    return result;
+    return ok;
 }
 
 bool HbDocumentLoaderSyntax::convertSizeHintType(
diff -r 16d8024aca5e -r f7ac710697a9 src/hbutils/document/hbdocumentloadersyntax_p.h
--- a/src/hbutils/document/hbdocumentloadersyntax_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbutils/document/hbdocumentloadersyntax_p.h	Mon May 03 12:48:33 2010 +0300
@@ -26,8 +26,7 @@
 #ifndef HBDOCUMENTLOADERSYNTAX_P_H
 #define HBDOCUMENTLOADERSYNTAX_P_H
 
-#include "hbxmlloaderabstractsyntax_p.h"
-#include "hbxmlloaderabstractactions_p.h"
+#include <hbxmlloaderbasesyntax_p.h>
 
 #include <hbglobal.h>
 #include <hbfontspec.h> // Needed for the Role enum
@@ -36,23 +35,27 @@
 #include <QList>
 #include <QXmlStreamReader>
 #include <QPointer>
+#include <QByteArray>
 
 class HbDocumentLoaderActions;
 class HbMainWindow;
 
-class HbDocumentLoaderSyntax : public HbXmlLoaderAbstractSyntax
-{ 
+class HbDocumentLoaderSyntax : public HbXmlLoaderBaseSyntax
+{
 public:
 
-    HbDocumentLoaderSyntax( HbDocumentLoaderActions *actions,
-                            const HbMainWindow *window );
+    HbDocumentLoaderSyntax( HbXmlLoaderAbstractActions *actions );
     virtual ~HbDocumentLoaderSyntax();
 
+    void setParseOnly( bool parseOnly );
+
     bool load( QIODevice *device, const QString &section );
 
+    bool scanForSections( QIODevice *device, QList<QString> &sectionsList );
+
     static QString version();
-    
-private:    
+
+private:
     Q_DISABLE_COPY(HbDocumentLoaderSyntax)
 
     bool processDocument();
@@ -67,29 +70,24 @@
     bool processRef();
     bool processVariable();
     bool processContentsMargins();
-    bool processRowHeights( const QString &row );
-    bool processColumnWidths( const QString &column );
-        
-    ElementType elementType( QStringRef name ) const;    
-    
-    QVariant decodeValue();
-    
-    
+    bool processRowHeights( int row );
+    bool processColumnWidths( int column );
+    bool checkEndElementCorrectness();
+
+    HbXml::ElementType elementType( QStringRef name ) const;
+
+    bool createVariable( HbXmlVariable& variable );
+
     static bool convertSizeHintType(
         const QString &type, Qt::SizeHint &resultHint, bool &resultFixed);
-        
-    
+
     bool readGeneralStartItem();
-    bool readLayoutStartItem();    
+    bool readLayoutStartItem();
     bool readContainerStartItem();
     bool readContainerEndItem();
-    
+
     static bool toFontSpecRole(const QString &roleString, HbFontSpec::Role &role);
 
-private:
-
-    HbDocumentLoaderActions *mRealActions;
-    const HbMainWindow *mMainWindow;
 };
 
 #endif // HBDOCUMENTLOADERSYNTAX_P_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbutils/hbutils.pro
--- a/src/hbutils/hbutils.pro	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbutils/hbutils.pro	Mon May 03 12:48:33 2010 +0300
@@ -34,7 +34,6 @@
 }
 
 DEFINES += BUILD_HB_TOOLS HB_PLUGINS_DIR=\"\\\"$${HB_PLUGINS_DIR}\\\"\"
-developer:DEFINES += BUILD_HB_INTERNAL
 
 INCLUDEPATH += .
 DEPENDPATH += .
@@ -48,7 +47,7 @@
 
 CONVENIENCE_HEADERS += $${HB_BUILD_DIR}/include/hbutils/hbutils.h
 CONVENIENCE_HEADERS += $$files($${HB_BUILD_DIR}/include/hbutils/Hb*)
-HEADERS += $$PUBLIC_HEADERS $$INTERNAL_HEADERS $$CONVENIENCE_HEADERS
+HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS $$CONVENIENCE_HEADERS
 
 # dependencies
 hbAddLibrary(hbcore/HbCore)
@@ -73,14 +72,15 @@
 #QMAKE_DISTCLEAN += $$hbNativePath($${HB_BUILD_DIR}/include/hbutils/private/*)
 
 symbian {
-    defFilePath = ..
     TARGET.EPOCALLOWDLLDATA = 1
     TARGET.CAPABILITY = CAP_GENERAL_DLL
     TARGET.UID3=0x20022F34
     #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?
 
-    INCLUDEPATH += /epoc32/include/osextensions/stdapis/stlport # TODO: depends on S60 version?
+    INCLUDEPATH += $${EPOCROOT}epoc32/include/osextensions/stdapis/stlport # TODO: depends on S60 version?
+
+    load(symbian_i18n.prf):TRANSLATIONS += common.ts
 
     hbExportHeaders(hbutils)
 }
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/dataform/dataform.pri
--- a/src/hbwidgets/dataform/dataform.pri	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/dataform/dataform.pri	Mon May 03 12:48:33 2010 +0300
@@ -34,15 +34,15 @@
 PUBLIC_HEADERS += $$PWD/hbdataformmodel.h
 #PUBLIC_HEADERS += $$PWD/hbdataitemcontainer.h
 
-#INTERNAL_HEADERS += $$PWD/hbdataformitemcontainer_p.h
-INTERNAL_HEADERS += $$PWD/hbdatagroup_p.h
-INTERNAL_HEADERS += $$PWD/hbdataformviewitem_p.h
-INTERNAL_HEADERS += $$PWD/hbdataformmodel_p.h
-INTERNAL_HEADERS += $$PWD/hbdataitemcontainer_p.h
-INTERNAL_HEADERS += $$PWD/hbdataform_p.h
-INTERNAL_HEADERS += $$PWD/hbdataformheadingwidget_p.h
-INTERNAL_HEADERS += $$PWD/hbdatagroupheadingwidget_p.h
-INTERNAL_HEADERS += $$PWD/hbdataformmodelitem_p.h
+#PRIVATE_HEADERS += $$PWD/hbdataformitemcontainer_p.h
+PRIVATE_HEADERS += $$PWD/hbdatagroup_p.h
+PRIVATE_HEADERS += $$PWD/hbdataformviewitem_p.h
+PRIVATE_HEADERS += $$PWD/hbdataformmodel_p.h
+PRIVATE_HEADERS += $$PWD/hbdataitemcontainer_p.h
+PRIVATE_HEADERS += $$PWD/hbdataform_p.h
+PRIVATE_HEADERS += $$PWD/hbdataformheadingwidget_p.h
+PRIVATE_HEADERS += $$PWD/hbdatagroupheadingwidget_p.h
+PRIVATE_HEADERS += $$PWD/hbdataformmodelitem_p.h
 
 SOURCES += $$PWD/hbdataform.cpp
 SOURCES += $$PWD/hbdataformviewitem.cpp
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/dataform/hbdataform.cpp
--- a/src/hbwidgets/dataform/hbdataform.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/dataform/hbdataform.cpp	Mon May 03 12:48:33 2010 +0300
@@ -33,8 +33,12 @@
 #include "hbdatagroup_p_p.h"
 #include <hbcombobox.h>
 #include "hbdataformheadingwidget_p.h"
+#include "hbdataformmodelitem_p.h"
 #include "hbtreemodeliterator_p.h"
 
+// For QMAP_INT__ITEM_STATE_DEPRECATED's sake. Removed when QMap<int,QVariant> based state item system is removed
+#include <hbabstractviewitem_p.h>
+
 #include <QGraphicsSceneMouseEvent>
 #include <QCoreApplication>
 
@@ -345,7 +349,7 @@
     Q_D(HbDataForm);
 
     if (isExpanded(index) != expanded) {
-        d->treeModelIterator()->itemStateChanged(index, HbDataFormViewItem::ExpansionKey);
+        d->treeModelIterator()->itemExpansionChanged(index);
 
         HbDataFormViewItem *item =
             static_cast<HbDataFormViewItem *>(d->mContainer->itemByIndex(index));
@@ -353,7 +357,10 @@
             item->setExpanded(expanded);
         }
 
-        d->mContainer->setItemStateValue(index, HbDataFormViewItem::ExpansionKey, expanded);
+#ifndef QMAP_INT__ITEM_STATE_DEPRECATED
+       d->mContainer->setItemStateValue(index, HbDataFormViewItem::ExpansionKey, expanded);
+#endif
+        d->mContainer->setItemTransientStateValue(index, "expanded", expanded);
         d->mContainer->setModelIndexes();
     }
 }
@@ -368,7 +375,7 @@
 bool HbDataForm::isExpanded(const QModelIndex &index) const
 {
     Q_D(const HbDataForm);
-    QVariant flags = d->mContainer->itemState(index).value(HbDataFormViewItem::ExpansionKey);
+    QVariant flags = d->mContainer->itemTransientState(index).value("expanded");
     if (flags.isValid() && flags.toBool() == true) {
         return true;
     } else {
@@ -484,12 +491,13 @@
 }
 
 /*!
+
+    \deprecated HbDataForm::primitive(HbStyle::Primitive)
+         is deprecated.
+
     \reimp
 
     Returns the style primitive of HbDataForm depending upon the type \a primitive.
-    If primitive passed is P_DataForm_background then NULL is returned.
-    User cannot customize background of data form.
-
     \sa primitive
 */
 QGraphicsItem* HbDataForm::primitive(HbStyle::Primitive primitive) const
@@ -497,6 +505,8 @@
     Q_D(const HbDataForm);
 
     switch (primitive) {
+        case HbStyle::P_DataForm_heading_background:
+            return d->mHeadingWidget->mBackgroundItem;
         case HbStyle::P_DataForm_heading:
             return d->mHeadingWidget->mHeadingItem;
         case HbStyle::P_DataForm_description:
@@ -508,7 +518,7 @@
 
 /*!
     
-    \deprecated HbDataForm::dataFormViewItem(const QModelIndex &index) const
+    \deprecated HbDataForm::dataFormViewItem(const QModelIndex&) const
         is deprecated. Please use HbAbstractItemView::itemByIndex instead.
 
     Returns HbDataFormViewItem for the correspoding \a index passed. Returns
@@ -597,12 +607,23 @@
 void HbDataForm::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight)
 {
     Q_UNUSED(bottomRight);
-    if(topLeft.isValid()) {       
+    if(topLeft.isValid()) {
+
             HbDataFormViewItem* item = static_cast<HbDataFormViewItem*>(dataFormViewItem(topLeft));
+            HbDataFormModelItem *modelItem = 
+                        static_cast<HbDataFormModel *>(model())->itemFromIndex(topLeft);           
+            HbDataFormModelItemPrivate *modelItem_priv = HbDataFormModelItemPrivate::d_ptr(modelItem);
+
             if(item){
-                item->load();
-                HbDataFormModelItem *modelItem = 
-                        static_cast<HbDataFormModel *>(model())->itemFromIndex(topLeft);
+                if( modelItem_priv->dirtyProperty() == "LabelRole"      ||
+                    modelItem_priv->dirtyProperty() == "DecorationRole" || 
+                    modelItem_priv->dirtyProperty() == "DescriptionRole" ) {
+
+                         HbDataFormViewItemPrivate::d_ptr(item)->updateData();
+                         return;
+                }
+
+                item->load();                
                 HbDataFormViewItemPrivate::d_ptr(item)->setEnabled( modelItem->isEnabled() );          
             }
     }
@@ -618,22 +639,6 @@
     d->mHeadingWidget->initStyleOption(option);
 }
 
-/*!
-    \reimp
-*/
-void HbDataForm::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
-{
-    Q_D(HbDataForm);
-    HbDataFormViewItem *hitItem = qobject_cast<HbDataFormViewItem*>(d->itemAt(event->scenePos()));
-
-    if ( d->mHitItem
-        && d->mHitItem == hitItem 
-        && !d->mWasScrolling ) {
-            hitItem->setExpanded(!hitItem->isExpanded());
-            d->mInstantClickedModifiers |= Hb::ModifierExpandedItem;
-    }
-    HbAbstractItemView::mouseReleaseEvent( event );
-}
 
 /*!
     \reimp
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/dataform/hbdataform.h
--- a/src/hbwidgets/dataform/hbdataform.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/dataform/hbdataform.h	Mon May 03 12:48:33 2010 +0300
@@ -97,7 +97,6 @@
         QGraphicsItem * parent);
 
     void initStyleOption(HbStyleOptionDataForm *option);
-    virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
 
 private:
     Q_DECLARE_PRIVATE_D(d_ptr, HbDataForm)
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/dataform/hbdataform_p.cpp
--- a/src/hbwidgets/dataform/hbdataform_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/dataform/hbdataform_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -75,7 +75,7 @@
     q->setItemPrototypes(protos);
     q->setClampingStyle(HbScrollArea::BounceBackClamping);
     q->setItemRecycling(true);
-    treeModelIterator()->setItemContainer(mContainer, HbDataFormViewItem::ExpansionKey);
+    treeModelIterator()->setItemContainer(mContainer);
 }
 
 void  HbDataFormPrivate::_q_page_changed(int index)
@@ -177,6 +177,7 @@
             q,SLOT(_q_page_changed(int)));
 
         mHeadingWidget->mPageCombo->removeItem(mHeadingWidget->mPageCombo->findText(page));
+        mHeadingWidget->mActivePage = mHeadingWidget->mPageCombo->currentIndex();
         
          QObject::connect(mHeadingWidget->mPageCombo,SIGNAL(currentIndexChanged(int)),
             q,SLOT(_q_page_changed(int)));
@@ -213,8 +214,10 @@
                             QString signalName = signal.signal;
                             QString slot = signal.slot;
                             // Make connection
-                            QObject::connect(contentWidget, signalName.toAscii().data(), 
-                                objct,slot.toAscii().data());
+                            if(objct) { 
+                                QObject::connect(contentWidget, signalName.toAscii().data(), 
+                                    objct,slot.toAscii().data());
+                            }
                             
                         }
                     }
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/dataform/hbdataformheadingwidget_p.cpp
--- a/src/hbwidgets/dataform/hbdataformheadingwidget_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/dataform/hbdataformheadingwidget_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -54,9 +54,11 @@
     }
     if(!mHeading.isEmpty()) {
         if(!mHeadingItem){
+            setProperty( "hasHeading", true );
             mHeadingItem = style()->createPrimitive(HbStyle::P_DataForm_heading, this);
         }
     } else {
+        setProperty( "hasHeading", false );
         if(mHeadingItem){
             delete mHeadingItem;
             mHeadingItem = 0;
@@ -64,10 +66,12 @@
     }
 
     if(!mDescription.isEmpty()) {
-        if(!mDescriptionItem) {
+        if(!mDescriptionItem) {            
+            setProperty( "hasDescription", true );
             mDescriptionItem = style()->createPrimitive(HbStyle::P_DataForm_description, this);
         }
-    } else {
+    } else {                  
+        setProperty( "hasDescription", false );
         if(mDescriptionItem) {
             delete mDescriptionItem;
             mDescriptionItem = 0;
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/dataform/hbdataformmodel.cpp
--- a/src/hbwidgets/dataform/hbdataformmodel.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/dataform/hbdataformmodel.cpp	Mon May 03 12:48:33 2010 +0300
@@ -369,7 +369,7 @@
 
 
 /*!
-   \deprecated  HbDataFormModel::insertRows(int row, int count, const QModelIndex &index)
+   \deprecated  HbDataFormModel::insertRows(int, int, const QModelIndex&)
         is deprecated. Please use other insert and additem API's in HbDataFormModel instead.
 */
 bool HbDataFormModel::insertRows(int row, int count, const QModelIndex &index)
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/dataform/hbdataformmodelitem.cpp
--- a/src/hbwidgets/dataform/hbdataformmodelitem.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/dataform/hbdataformmodelitem.cpp	Mon May 03 12:48:33 2010 +0300
@@ -89,6 +89,9 @@
  */
 
 /*!
+    \deprecated HbDataFormModelItem::KeyRole
+        is deprecated.Please remove the reference to this Role.
+
     \var HbDataFormModelItem::KeyRole
     KeyRole: This Role is used for the key string for the data item. This will be used 
     for storing and loading the data from central repository.
@@ -162,6 +165,7 @@
  */
 
 /*!
+
     \var HbDataFormModelItem::VolumeSliderItem
     VolumeSliderItem:  This itemType is for volume slider type of data item
     
@@ -232,13 +236,45 @@
     \var HbDataFormModelItem::RadioButtonListItem
     RadioButtonListItem:  This itemType is for radio button list type of data item
     
+    RadioButtonListItem will appear in three display modes
+
+    automatic : radioButtonList item appear as embedded( inline) if it contains less than four items and 
+    if more than three items then selected items are displayed as text on a PushButton and when pushbutton 
+    clicked it lunches popup. Automatic mode is set as the default mode.
+    
+    embedded : Application can set these items as always embedded(inline) by setting the property "displayMode" 
+    with value of property as "embedded"
+    
+    popup : Application can set these items as always popup by setting the property "displayMode" 
+    with value of property as "popup"
+    HbDataFormModelItem *radioItem = model->appendDataItem(HbDataFormModelItem::RadioButtonListItem, 
+        QString("Caller Tone"));
+    radioItem->setContentWidgetData(QString("displayMode"),QString("embedded"));
+    radioItem->setContentWidgetData(QString("displayMode"),QString("automatic"));
+    radioItem->setContentWidgetData(QString("displayMode"),QString("popup"));
+    
  */
 
 /*!
     \var HbDataFormModelItem::MultiselectionItem
     MultiselectionItem:  This itemType is for multi selection type of data item.
-    MultiSelectionItem launches a pop-up list dialog.
+    
+    MultiSelectionListItem will appear in three display modes
+
+    automatic : radioButtonList item appear as embedded( inline) if it contains less than four items and 
+    if more than three items then selected items are displayed as text on a PushButton and when pushbutton 
+    clicked it lunches popup. Automatic mode is set as the default mode.
     
+    embedded : Application can set these items as always embedded(inline) by setting the property "displayMode" 
+    with value of property as "embedded"
+    
+    popup : Application can set these items as always popup by setting the property "displayMode" 
+    with value of property as "popup"
+    HbDataFormModelItem *radioItem = model->appendDataItem(HbDataFormModelItem::MultiSelectionListItem, 
+        QString("Caller Tone"));
+    radioItem->setContentWidgetData(QString("displayMode"),QString("embedded"));
+    radioItem->setContentWidgetData(QString("displayMode"),QString("automatic"));
+    radioItem->setContentWidgetData(QString("displayMode"),QString("popup"));
  */
 
 /*!
@@ -422,7 +458,11 @@
      HbDataFormModel* model = static_cast<HbDataFormModel*>(d->mModel);
      model->d_func()->rowsAboutToBeRemoved(this, startIndex, startIndex + count -1); 
      for(int index = 0; index < count ;index++) {
-         removeChild(startIndex);
+        HbDataFormModelItem *item = d->mChildItems.takeAt(0);
+        if ( item ) {
+            delete item;
+            item = 0;
+        }
      }
      model->d_func()->rowsRemoved();
 }
@@ -665,7 +705,7 @@
 
 
 /*!
-    \deprecated HbDataFormModelItem::setModel(const QAbstractItemModel *model)
+    \deprecated HbDataFormModelItem::setModel(const QAbstractItemModel*)
         is deprecated. Please remove all refernces to this API.
 
     Sets the given \a model to the item's model. Also sets the Model to Child Items.
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/dataform/hbdataformviewitem.cpp
--- a/src/hbwidgets/dataform/hbdataformviewitem.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/dataform/hbdataformviewitem.cpp	Mon May 03 12:48:33 2010 +0300
@@ -32,6 +32,8 @@
 #include "hbdataform_p.h"
 #include "hbdatagroup_p.h"
 
+#include "hbtapgesture.h"
+
 #ifdef HB_EFFECTS
 #include "hbeffect.h"
 #include "hbeffectinternal_p.h"
@@ -131,16 +133,37 @@
 
     The signals emitted by this class are:
     \li itemShown(const QModelIndex&) This signal is emitted when ever this item becomes visible.
-    \deprecated itemDestroyed(QPersistentModelIndex) This signal is deprecated.
-    \deprecated itemModified(QPersistentModelIndex, QVariant) This signal is deprecated . Use
-    dataChanged(QModelIndex,QModelIndex) signal of model instead and fetch the new value from 
-    corresponding modelItem.
+    \deprecated HbDataFormViewItem::itemDestroyed(QPersistentModelIndex)
+        This signal is deprecated.
+
+    \deprecated HbDataFormViewItem::itemModified(QPersistentModelIndex, QVariant)
+        This signal is deprecated . Use dataChanged(QModelIndex,QModelIndex) signal of model instead 
+        and fetch the new value from corresponding modelItem.
 
     Refer HbDataForm documentation for sample code.
 
     \sa HbDataForm, HbDataFormModel, HbDataFormModelItem
 */
 
+/*!
+    \deprecated HbDataFormViewItem::StateKey
+        is deprecated. Please use string based state keys.
+
+    \enum HbDataFormViewItem::StateKey
+
+    HbDataFormViewItem's user defined state keys.
+
+    \sa HbAbstractViewItem::transientState()
+*/
+
+/*!
+    \deprecated HbDataFormViewItem::ExpansionKey
+        is deprecated. Please use string based state keys. This key is replaced by "expanded".
+
+    \var HbDataFormViewItem::ExpansionKey
+    Predefined key for expansion/collapsion state of a view item. Default state is collapsed.
+*/
+
 
 /*!
     Constructs HbDataFormViewItem with given \a parent.
@@ -253,6 +276,7 @@
 {
     Q_D(HbDataFormViewItem);
     d->q_ptr = this;
+    setProperty( "hasIcon", false );
 }
 
 /*!
@@ -263,6 +287,7 @@
 {
     Q_D(HbDataFormViewItem);
     d->q_ptr = this;
+    setProperty( "hasIcon", false );
 }
 
 /*!
@@ -272,6 +297,7 @@
 {
     Q_D(HbDataFormViewItem);
     *d = *source.d_func();
+    setProperty( "hasIcon", false );
     return *this;
 }
 
@@ -315,17 +341,8 @@
 */
 void HbDataFormViewItem::restore()
 {
-    Q_D( HbDataFormViewItem );
-    HbDataFormModel* data_model = static_cast<HbDataFormModel*>(itemView()->model());
-    HbDataFormModelItem *model_item = static_cast<HbDataFormModelItem*>(data_model->itemFromIndex(d->mIndex));
-    HbDataFormModelItemPrivate *modelItem_priv = HbDataFormModelItemPrivate::d_ptr(model_item);
-    
-    if(modelItem_priv->dirtyProperty() == "LabelRole") {
-        d->updateLabel(model_item->label());
-        return;
-    }
+    Q_D( HbDataFormViewItem );    
 
-    //CRC: revisit this logic
     if( d->mType < HbDataFormModelItem::CustomItemBase ) {
         if( d->mContentWidget ) {   
             QVariant newValue;
@@ -446,6 +463,9 @@
 }
 
 /*!
+     \deprecated HbDataFormViewItem::state() 
+        is deprecated. 
+    
     \reimp
 */
 QMap<int,QVariant> HbDataFormViewItem::state() const
@@ -454,6 +474,9 @@
 }
 
 /*!
+    \deprecated HbDataFormViewItem::setState(const QMap<int, QVariant>&)
+        is deprecated. 
+
     \reimp
 */
 void HbDataFormViewItem::setState(const QMap<int,QVariant> &state)
@@ -462,8 +485,8 @@
 }
 
 /*!
-    \deprecated HbDataFormViewItem::contentWidget() const
-        is deprecated. This API is not needed and not be used from applications.
+    \deprecated  HbDataFormViewItem::contentWidget() const
+        is deprecated. Use dataItemContentWidget() instead
 
     Return the content widget of HbDataFormViewItem.    
     \sa dataItemContentWidget
@@ -489,13 +512,11 @@
     switch( d->mType ) {
         case HbDataFormModelItem::RadioButtonListItem:
             {
-                widget = static_cast<HbRadioItem*>(d->mContentWidget)->contentWidget();
+                widget = static_cast<HbRadioItem*>(d->mContentWidget)->createRadioButton();
             }
             break;
-            //CRC: it should return NULL(done)
         case HbDataFormModelItem::MultiselectionItem:
             {
-                //widget = static_cast<HbMultiSelectionItem*>(d->mContentWidget)->contentWidget();
                 widget = NULL;
             }
             break;
@@ -537,12 +558,10 @@
     Q_D( const HbDataFormViewItem );
 
     HbWidget::showEvent( event );
-    //CRC: this check might not be rerequired
     if( d->mIndex.isValid( ) ) {
         emit itemShown( d->mIndex.operator const QModelIndex & ( ) );
-        //CRC : Deprecate this (done)
-        emit itemModified( d->mIndex, d->mCurrentValue );
     }
 }
+
 #include "moc_hbdataformviewitem.cpp"
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/dataform/hbdataformviewitem.h
--- a/src/hbwidgets/dataform/hbdataformviewitem.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/dataform/hbdataformviewitem.h	Mon May 03 12:48:33 2010 +0300
@@ -37,6 +37,7 @@
 class HB_WIDGETS_EXPORT HbDataFormViewItem : public HbAbstractViewItem
 {
     Q_OBJECT
+    Q_PROPERTY(bool expanded READ isExpanded WRITE setExpanded)
     
 public:
 
@@ -88,6 +89,7 @@
     void initStyleOption(HbStyleOptionDataFormViewItem *option) const;
 
     void showEvent(QShowEvent * event);
+
 private:
     Q_DECLARE_PRIVATE_D(d_ptr, HbDataFormViewItem)
 };
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/dataform/hbdataformviewitem_p.cpp
--- a/src/hbwidgets/dataform/hbdataformviewitem_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/dataform/hbdataformviewitem_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -29,22 +29,29 @@
 #include "hbdataform_p.h"
 #include "hbdataformheadingwidget_p.h"
 #include "hbdatagroup_p.h"
+#include "hbdataformmodelitem_p.h"
 #include "hbdatagroup_p_p.h"
 
 #include <hbslider.h>
 #include <hbcheckbox.h>
+#include <hblistwidget.h>
 #include <hblabel.h>
 #include <hblineedit.h>
 #include <hbradiobuttonlist.h>
 #include <hbcombobox.h>
 #include <hbstyleoptiondataformviewitem.h>
-#include <hblistdialog.h>
+#include <hbselectiondialog.h>
 #include <hbpushbutton.h>
 #include <hbaction.h>
 
 #include <QGraphicsLinearLayout>
 #include <QCoreApplication>
 
+#ifdef HB_GESTURE_FW
+#include <hbtapgesture.h>
+#endif
+#define MAX_INLINE_ITEM_COUNT 3
+
 HbToggleItem::HbToggleItem( QGraphicsItem* parent ): HbWidget( parent )
 {
     // Toggle item uses button as the content widget and toggles the text when item is clicked
@@ -120,53 +127,55 @@
  */
 HbRadioItem::HbRadioItem( QGraphicsItem* parent ):
     HbWidget( parent ),
-    mRadioButton( 0 )
+    mRadioButtonList( 0 ),
+    mButton(0), 
+    mDialog(0),
+    layout(0),
+    mSelected(-1)
 {
-    // Create label by default . RadioButtonList is created created at runtime 
-    // when clicked on the item
-    mViewItem = static_cast<HbDataFormViewItem*>( parent );
 
-    mButton = new HbPushButton();
-    QObject::connect(mButton, SIGNAL(released()), this, SLOT(buttonClicked()));
-    QGraphicsLinearLayout* layout = new QGraphicsLinearLayout( Qt::Vertical );
-    layout->addItem( mButton );
-    setLayout( layout );
-    
-    mButtonVisible = true;
-    mSelected = 0;
+    mViewItem = static_cast<HbDataFormViewItem*>( parent );
     mModel = static_cast<HbDataFormModel*>(
             HbDataFormViewItemPrivate::d_ptr(mViewItem)->mSharedData->mItemView->model());
     mModelItem = static_cast<HbDataFormModelItem*>(
             mModel->itemFromIndex(mViewItem->modelIndex()));
+    QString displayMode = mModelItem->contentWidgetData(QString("displayMode")).toString();
+     
+    // set displayMode to automatic if not already set by application
+    if(displayMode.isEmpty()) {
+        mModelItem->setContentWidgetData(QString("displayMode"), "automatic");
+    }
     QObject::connect(this,SIGNAL(valueChanged(QPersistentModelIndex, QVariant)),mViewItem, 
         SIGNAL(itemModified(QPersistentModelIndex, QVariant)));
+    if(!layout) {
+        layout = new QGraphicsLinearLayout( Qt::Vertical );
+    }
+    setLayout( layout );
 }
 
 HbRadioItem::~HbRadioItem()
 {
-    // delete the widget which is not currently visible. The visible will be deleted by layout hierarchy
-    if( mButtonVisible ) {
-        if( mRadioButton ) {
-            delete mRadioButton;
-        }
-    } else {
-        delete mButton;
-    }
 }
 
-HbWidget* HbRadioItem::contentWidget()
+HbWidget* HbRadioItem::createRadioButton()
 {
     // If not created create and set properties and return the widget
-    if(!mRadioButton) {
-        mRadioButton = new HbRadioButtonList();        
-        mRadioButton->setItems( mItems );        
-        mRadioButton->setVisible(false);
-        mRadioButton->setSelected(mSelected);
-
-        QObject::connect( mRadioButton, SIGNAL(itemSelected(int)), this, SLOT(itemSelected(int)) );
+    if(!mRadioButtonList) {
+        mRadioButtonList = new HbRadioButtonList();      
+        mRadioButtonList->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred));
+        //mRadioButtonList->setClampingStyle(HbScrollArea::StrictClamping);
+        mRadioButtonList->setItems( mItems );
+        if( mSelected != -1 ) {
+            mRadioButtonList->setSelected( mSelected );
+        }
+        // model need to be updated when selection changes
+        // in popup case this connection will be removed since model will be updated 
+        // only when dialog closed
+        QObject::connect( mRadioButtonList, SIGNAL(itemSelected(int)), 
+            this, SLOT(updateModel(int)) );
         
     }
-    return mRadioButton;
+    return mRadioButtonList;
 }
 
 /*  This function is evoked when Dynamic property is set on HbRadioItem , then 
@@ -176,103 +185,304 @@
 {
     switch( e->type() ){
         case QEvent::DynamicPropertyChange: {
-                QDynamicPropertyChangeEvent *changeEvent = static_cast<QDynamicPropertyChangeEvent*>( e );
-                QString name = changeEvent->propertyName().data();
-                if( mRadioButton ) {
-                    mRadioButton->setProperty( 
-                        changeEvent->propertyName().data() ,property( changeEvent->propertyName().data()) );
+                QDynamicPropertyChangeEvent *changeEvent = 
+                    static_cast<QDynamicPropertyChangeEvent*>( e );
+                QString dynamicPropertyName = changeEvent->propertyName().data();
+                if( mRadioButtonList ) {
+                    //Set the property on radiobutton list if already created 
+                    mRadioButtonList->setProperty( 
+                        changeEvent->propertyName().data() ,
+                        property( changeEvent->propertyName().data()) );
                 }
-                if( name == "items" ) {
-                    mItems = property("items").toStringList();
-                } else if( name == "selected" ) {
+                if( dynamicPropertyName == "items" || dynamicPropertyName == "displayMode" ) {
+                    // store the items locally
                     mItems = property("items").toStringList();
+                    // in case of automatic, displayMode (embedded, automatic or popup) will change 
+                    // if new items are populated or mode should be changed if mode is set
+                    //  explicitly by application at runtime
+                    changeMode();
+                } else if(dynamicPropertyName == "selected") {
+                    // store the new selection 
                     mSelected = property("selected").toInt();
-                    mButton->setText(mItems.at(mSelected));
-                    mButton->setTextAlignment(Qt::AlignLeft);
+                    // fine tune the new selection if it goes beyond range. This happens when new
+                    // items are populated or selection index is changed by application in to the model
+                    // which can be out of range
+                    resetSelection();
+                    selectItem();
                 }
                 break;
             }
         default:
             break;
     }
-
     HbWidget::event(e);
     return false;
 }
 
-
-void HbRadioItem::buttonClicked()
+void HbRadioItem::makeEmbedded()
 {
-    // launch popup only if number of items are more than 5
-    if(!mRadioButton) {
-            contentWidget();
-        } 
-    
-    
-        
-        mButton->setVisible( false );  
-        static_cast<QGraphicsLinearLayout*>( layout() )->addItem( mRadioButton );   
-        mRadioButton->setVisible( true );
-        mButtonVisible = false;
-        layout()->removeAt( 0 );
-        
+    // button need to be deleted when mode is changed from popup to embedded
+    if(mButton) {
+        layout->removeItem(mButton);
+        delete mButton;
+        mButton = 0;
+    }
+    createRadioButton();
+    layout->addItem(mRadioButtonList);
+    mRadioButtonList->setScrollDirections(0);
+}
 
+void HbRadioItem::makePopup()
+{
+    if(mRadioButtonList) {
+        layout->removeItem(mRadioButtonList);
+        // RadioButton will not be shown unless button is clicked so delete it
+        delete mRadioButtonList;
+        mRadioButtonList = 0;
+    }
+    initilizeButton();
 }
 
 
-void HbRadioItem::itemSelected( int index )
+void HbRadioItem::resetSelection()
 {
-    //update the label with the selected index text
-    //mLabel->clear( );
-    mButton->setText( mRadioButton->items().at(index) );
-    emit valueChanged(mViewItem->modelIndex(), mRadioButton->items().at(index));
-    
+    if((mItems.count() > 0 && mSelected == -1) || 
+        (mItems.count() > 0 && (mItems.count() <= mSelected ))) {
+        // if selection is beyond range then set it to 0. 
+        // This happens when new items are populated and 
+        // application does not set selection explicitly
+        mSelected = 0;
+    } else if(mItems.count() == 0) {
+        mSelected = -1;
+    }
+}
+
+/*
+changeMode() will change the mode of visualization( embedded, automatic and popup) depending
+on the number of items in case of automatic mode or change it to correspoding if not automatic.
+In popup the selected item will be displayed as the text of the button otherwise RadioButtonList
+is placed inline.
+*/
+void HbRadioItem::changeMode()
+{
+    QString displayMode = mModelItem->contentWidgetData(QString("displayMode")).toString();
     
-    static_cast<QGraphicsLinearLayout*>( layout() )->addItem( mButton );
+    if(displayMode == "embedded") {
+        makeEmbedded();
+    } else if(displayMode == "popup") {
+        makePopup();
+    }
+    else if(displayMode == "automatic") {
+        if(mItems.count() <= MAX_INLINE_ITEM_COUNT  && mItems.count() > 0  ) {
+            makeEmbedded();
+        } else if(mItems.count() >= MAX_INLINE_ITEM_COUNT){
+            makePopup();
+        }
+    }
+    resetSelection();
+    selectItem();
+}
+
+void HbRadioItem::selectItem()
+{
+    //Set Text if button is valid
+    if(mSelected != -1) {
+        if(mButton ) {
+            mButton->setText(mItems.at(mSelected));
+        } 
+        // change selection of radiobutton list
+        if(mRadioButtonList && mRadioButtonList->selected() != mSelected) {
+            mRadioButtonList->setSelected(mSelected);
+        }
+    } else if( mButton ) {
+        // clear the text on the button if items are cleared 
+        mButton->setText(QString(""));
+    }
+}
 
-    mRadioButton->setVisible( false );
-    mButton->setVisible( true );
-    mButtonVisible = true;
-    layout()->removeAt( 0 );
-    
-    //update the model
+void HbRadioItem::initilizeButton()
+{
+    if(!mButton) {
+        mButton = new HbPushButton();
+        mButton->setTextAlignment(Qt::AlignLeft);
+        QObject::connect(mButton, SIGNAL(clicked()), this, SLOT(buttonClicked()));
+        layout->addItem( mButton ); 
+    }
+}
+
+void HbRadioItem::buttonClicked()
+{
+    if(mItems.count() > 0) {
+        if(!mRadioButtonList) {
+            createRadioButton();
+        } 
+        mRadioButtonList->setScrollDirections(Qt::Vertical);
+        QObject::disconnect( mRadioButtonList, SIGNAL(itemSelected(int)), 
+            this, SLOT(updateModel(int)) );
+        selectItem();
+        mDialog = new HbDialog();
+        mDialog->setTimeout(HbPopup::NoTimeout);    
+        mDialog->setAttribute(Qt::WA_DeleteOnClose);
+        mDialog->setContentWidget(mRadioButtonList);    
+        mDialog->addAction(new HbAction(QString("Ok")));
+        mDialog->addAction(new HbAction(QString("Cancel")));
+        mDialog->open(this,SLOT(dialogClosed(HbAction*)));  
+        mRadioButtonList->setSelected(mSelected);
+    }
+}
+
+
+void HbRadioItem::updateModel( int index )
+{
+    mSelected = index;
+    emit valueChanged(mViewItem->modelIndex(), mItems.at(index));
+    // Disconnect modelchanged signal since visualization is already updated by user
+    // so if not disconnected , this will trigger visualization change again
     disconnect( mModel, SIGNAL(dataChanged(QModelIndex,QModelIndex)),
                   HbDataFormViewItemPrivate::d_ptr(mViewItem)->mSharedData->mItemView, 
                   SLOT( dataChanged(QModelIndex,QModelIndex)) );
-    mModelItem->setContentWidgetData("selected", mRadioButton->property("selected"));
+    //update the model
+    mModelItem->setContentWidgetData("selected", mSelected);
+    // establish the connection back
     connect( mModel, SIGNAL(dataChanged(QModelIndex,QModelIndex)),
                   HbDataFormViewItemPrivate::d_ptr(mViewItem)->mSharedData->mItemView, 
                   SLOT( dataChanged(QModelIndex,QModelIndex)) );
+    // select the item . The selection is already stored in to the model above
+    selectItem();
+}
+
+
+void HbRadioItem::dialogClosed(HbAction* action)
+{
+    if(action->text() == "Ok") {
+        // store the selected item to model
+        updateModel(mRadioButtonList->selected());        
+    }
+    // dont change selection incase of "Cancel" button click .
+    mRadioButtonList = 0;
+    mDialog = 0;
 }
 
 HbMultiSelectionItem::HbMultiSelectionItem( QGraphicsItem* parent ):
     HbWidget(parent),
-    mQuery(0)
+    mSelectionDialog(0),
+    mButton(0),
+    mMultiListWidget(0)
 {
     // Create label by default . RadioButtonList is created created at runtime 
     // when clicked on the item        
     mViewItem = static_cast<HbDataFormViewItem*>(parent);
-
-    mButton = new HbPushButton();
-    QObject::connect(mButton, SIGNAL(released()), this, SLOT(launchMultiSelectionList()));
-    QGraphicsLinearLayout* layout = new QGraphicsLinearLayout(Qt::Horizontal);
-    layout->addItem(mButton);
+    layout = new QGraphicsLinearLayout(Qt::Horizontal);
     setLayout(layout);
     
     mModel = static_cast<HbDataFormModel*>(
             HbDataFormViewItemPrivate::d_ptr(mViewItem)->mSharedData->mItemView->model());
     mModelItem = static_cast<HbDataFormModelItem*>(
-            mModel->itemFromIndex(mViewItem->modelIndex()));
-    QObject::connect(this,SIGNAL(valueChanged(QPersistentModelIndex, QVariant)),mViewItem, SIGNAL(itemModified(QPersistentModelIndex, QVariant)));
+            mModel->itemFromIndex(mViewItem->modelIndex()));    
+    // set displayMode to automatic if not already set by application
+    QString displayMode = mModelItem->contentWidgetData(QString("displayMode")).toString();
+    if(displayMode.isEmpty()) {
+        mModelItem->setContentWidgetData(QString("displayMode"), "automatic");
+    }
+    QObject::connect(this,SIGNAL(valueChanged(QPersistentModelIndex, QVariant)),
+        mViewItem, SIGNAL(itemModified(QPersistentModelIndex, QVariant)));
 }
 
 HbMultiSelectionItem::~HbMultiSelectionItem()
 {
 }
 
-HbWidget* HbMultiSelectionItem::contentWidget() const
+
+void HbMultiSelectionItem::makeSelection()
+{
+    QItemSelectionModel *model = 0;
+    if(mMultiListWidget) {// embedded case
+        // get selection model
+        model = mMultiListWidget->selectionModel();
+        if(model) {
+            // disconnect so that the visualization does not get changed when selction 
+            // model changes
+            QObject::disconnect(model, 
+                SIGNAL(selectionChanged( const QItemSelection , const QItemSelection  )), 
+                this, SLOT(updateModel( const QItemSelection , const QItemSelection  )));
+            model->clearSelection();
+            for( int i = 0; i < mSelectedItems.count() ; i++ ) {
+                model->select( model->model()->index(mSelectedItems.at( i ).toInt(),0),
+                    QItemSelectionModel::Select);
+            }
+            QObject::connect(model, 
+                SIGNAL(selectionChanged( const QItemSelection , const QItemSelection  )), 
+                this, SLOT(updateModel( const QItemSelection , const QItemSelection  )));
+        }
+    } else if(mButton) { // update text on button
+        QString newValue("");
+        // create sting to be set on button
+        for ( int i = 0; i < mSelectedItems.count() ; i++ ) {
+            int selectionindex = mSelectedItems.at( i ).toInt();
+            if( selectionindex< mItems.count()) {
+                if( i > 0) {// dont add ; in the starting of the string
+                    newValue.append( ";" );
+                }
+                newValue.append( mItems.at( mSelectedItems.at( i ).toInt() ) );
+            } 
+        }
+        mButton->setText( newValue );
+    }
+}
+
+void HbMultiSelectionItem::makeEmbedded()
 {
-    return mButton;
+    
+    // delete button if displaymode change has happened at runtime 
+    if(mButton){
+        layout->removeItem(mButton);
+        delete mButton;
+        mButton = 0;
+    }
+    // create ListWidget if not yet created 
+    if(!mMultiListWidget) {
+        mMultiListWidget = new HbListWidget();
+        layout->addItem(mMultiListWidget);
+    }
+    
+    mMultiListWidget->setSelectionMode(HbAbstractItemView::MultiSelection);
+    
+    mMultiListWidget->clear();
+    // update the listwidget with new items
+    for (int index = 0; index < mItems.count(); ++index) {
+        mMultiListWidget->addItem(mItems.at(index));
+    }
+    mMultiListWidget->setScrollDirections(0);
+}
+
+void HbMultiSelectionItem::makePopup()
+{
+    // Delete ListWidget if mode change happened at runtime from embedded to popup
+    if(mMultiListWidget) {
+        layout->removeItem(mMultiListWidget);
+        delete mMultiListWidget;
+        mMultiListWidget = 0;
+    }
+    // create button since we need to display selected item on button
+    // and popup will be launched when button is clicked
+    if(!mButton) {
+        mButton = new HbPushButton();
+        mButton->setTextAlignment(Qt::AlignLeft);
+        layout->addItem(mButton);
+    }
+    QObject::connect(mButton, SIGNAL(released()), this, SLOT(launchMultiSelectionList()));
+}
+
+void HbMultiSelectionItem::changeMode()
+{
+    QString displayMode = mModelItem->contentWidgetData(QString("displayMode")).toString();
+    if((mItems.count() <= MAX_INLINE_ITEM_COUNT && displayMode == "automatic") || 
+        displayMode == "embedded" ) {
+        makeEmbedded();
+    } else{
+        makePopup();
+    }
+    makeSelection();
 }
 
 bool HbMultiSelectionItem::event( QEvent * e )
@@ -280,33 +490,19 @@
     switch( e->type() ) {
         case QEvent::DynamicPropertyChange: {
                 QDynamicPropertyChangeEvent *eve = static_cast<QDynamicPropertyChangeEvent*>( e );
-                QString name = eve->propertyName( ).data( );
-                
-                if ( name == "text" ) {
-                    mButton->setProperty(
-                        eve->propertyName().data(), property(eve->propertyName().data()) );
-                }
-                if ( name == "items" ) {
+                QString dynamicPropertyName = eve->propertyName( ).data( );                
+                if ( dynamicPropertyName == "items" || dynamicPropertyName == "displayMode" ) {
+                    int prevCount = mItems.count();
+                    mItems.clear();
                     mItems = property("items").toStringList();
-                } else if ( name == "selectedItems" ) {
-                     mItems = property("items").toStringList();
-                     QList<QVariant> selected = property("selectedItems").toList();
-                     
-                     for( int i = 0; i < selected.count() ; i++ ) {
-                         if ( !mSelectedItems.contains( selected.at( i ).toInt( ) ) ) {
-                            mSelectedItems.append( selected.at( i ).toInt( ) );
-                         }
-                     }
-                }
-                if ( mSelectedItems.count() > 0 && mItems.count() > 0 ) {
-                    QString newValue("");
-                    for ( int i = 0; i < mSelectedItems.count() ; i++ ) {
-                        newValue.append( mItems.at( mSelectedItems.at( i ) ) );
-                        newValue.append( ";" );
+                    if ( mItems.count() != prevCount || dynamicPropertyName == "displayMode") {
+                        changeMode();
                     }
-                    //mButton->clear( );
-                    mButton->setText( newValue );                    
-                    mButton->setTextAlignment(Qt::AlignLeft);
+                    
+                } else if ( dynamicPropertyName == "selectedItems" ) {                    
+                    mItems = property("items").toStringList();
+                    mSelectedItems = property("selectedItems").toList();
+                    makeSelection();
                 }
                 break;
             }
@@ -319,53 +515,86 @@
 }
 
 
+void HbMultiSelectionItem::updateModel( const QItemSelection &selected, 
+    const QItemSelection  &deselected)
+{
+
+    // This function gets called when selection changes in HbListWidget model
+    disconnect( mModel, SIGNAL( dataChanged( QModelIndex, QModelIndex ) ),
+        HbDataFormViewItemPrivate::d_ptr(mViewItem)->mSharedData->mItemView, 
+        SLOT( dataChanged(QModelIndex,QModelIndex)));
+    QModelIndexList selectList = selected.indexes();    
+    QModelIndexList deselectList = deselected.indexes();
+    // Add newly selected item to selected list
+    for(int i = 0;i<selectList.count(); i++) {
+       if(!mSelectedItems.contains(selectList.at(i).row())) {
+            mSelectedItems.append(selectList.at(i).row());
+       }
+    }
+    // remove selection from selection list
+    for(int i = 0;i<deselectList.count(); i++) {
+        mSelectedItems.removeOne(deselectList.at(i).row());
+    }
+    //update the model with the selected items
+    
+    mModelItem->setContentWidgetData("selectedItems", mSelectedItems);
+
+    connect(mModel, SIGNAL(dataChanged(QModelIndex,QModelIndex)),
+                  HbDataFormViewItemPrivate::d_ptr(mViewItem)->mSharedData->mItemView, 
+                  SLOT( dataChanged(QModelIndex,QModelIndex)));
+}
+
 void HbMultiSelectionItem::launchMultiSelectionList()
 {
-    mQuery = 0;
-    mQuery = new HbListDialog();
-    mQuery->setSelectionMode( HbAbstractItemView::MultiSelection );
-    mQuery->setStringItems( mItems, mItems.count() + 1 );    
-    mQuery->setSelectedItems( mSelectedItems );
-    mQuery->setAttribute(Qt::WA_DeleteOnClose);
-
-    mQuery->open(this,SLOT(dialogClosed(HbAction*)));   
+    if(!mSelectionDialog ) {
+        mSelectionDialog = new HbSelectionDialog();
+        mSelectionDialog->setSelectionMode( HbAbstractItemView::MultiSelection );
+        mSelectionDialog->setStringItems( mItems, -1 ); 
+        mSelectionDialog->setSelectedItems( mSelectedItems );
+        mSelectionDialog->setAttribute(Qt::WA_DeleteOnClose);
+        mSelectionDialog->open(this,SLOT(dialogClosed(HbAction*)));   
+    }
 }
 
 void HbMultiSelectionItem::dialogClosed(HbAction* action)
 {
-    if( action == mQuery->primaryAction( )) {
+    if( action->text() == "Ok") {
         //fetch the selected items
-        mSelectedItems = mQuery->selectedItems();
+        mSelectedItems = mSelectionDialog->selectedItems();
         QString newValue("");
-
-        qSort( mSelectedItems.begin(), mSelectedItems.end( ) );
+        QList<int> selection;
         for( int i = 0; i < mSelectedItems.count(); i++ ) {
-            newValue.append(mQuery->stringItems().at(mSelectedItems.at(i)));
-            if( i != mSelectedItems.count() - 1 ) {
+            selection.append(mSelectedItems.at(i).toInt());
+        }
+        qSort( selection.begin(), selection.end( ) );
+        mSelectedItems.clear();
+        for( int i = 0; i < selection.count(); i++ ) {
+            mSelectedItems.append(selection.at(i));
+            newValue.append(mSelectionDialog->stringItems().at(selection.at(i)));
+            if( i != selection.count() - 1 ) {
                 newValue.append( ";" );
             }
-        }
-        
+        }        
         mButton->setText( newValue );
         emit valueChanged(mViewItem->modelIndex(), newValue);
 
         disconnect( mModel, SIGNAL( dataChanged( QModelIndex, QModelIndex ) ),
                       HbDataFormViewItemPrivate::d_ptr(mViewItem)->mSharedData->mItemView, 
                       SLOT( dataChanged(QModelIndex,QModelIndex)));
+        if(mModelItem) {
+            mModelItem->setContentWidgetData(QString("text"), newValue);
+        }
         
         mModelItem->setContentWidgetData( "items", mItems );
 
         //update the model with the selected items
-        QList<QVariant> items;
-        for( int i = 0; i < mSelectedItems.count(); i++ ) {
-            items.append( mSelectedItems.at( i ) );
-        }
-        mModelItem->setContentWidgetData("selectedItems", items);
+        mModelItem->setContentWidgetData("selectedItems", mSelectedItems);
 
         connect(mModel, SIGNAL(dataChanged(QModelIndex,QModelIndex)),
                       HbDataFormViewItemPrivate::d_ptr(mViewItem)->mSharedData->mItemView, 
                       SLOT( dataChanged(QModelIndex,QModelIndex)));
     }
+    mSelectionDialog = 0;
 }
 
 
@@ -431,6 +660,13 @@
         if( !mLabelItem ) {
             mLabelItem = q->style()->createPrimitive( HbStyle::P_DataItem_label, q );
         }
+    } else {
+        if( mLabelItem ) {
+            HbStyle::setItemName( mLabelItem, NULL );
+            delete mLabelItem;
+            mLabelItem = 0;
+
+        }
     }
 
     if( !mIcon.isEmpty() ) {
@@ -440,12 +676,24 @@
         }
     } else {
         q->setProperty( "hasIcon", false );
+        if( mIconItem ) {
+            HbStyle::setItemName( mIconItem, NULL );
+            delete mIconItem;
+            mIconItem = 0;
+        }
     }
 
     if(!mDescription.isEmpty()) {
         if(!mDescriptionItem) {
             mDescriptionItem = q->style()->createPrimitive(HbStyle::P_DataItem_description, q);
         }
+    } else {
+        if( mDescriptionItem ) {
+            HbStyle::setItemName( mDescriptionItem, NULL );
+            delete mDescriptionItem;
+            mDescriptionItem = 0;
+
+        }
     }
 }
 
@@ -454,9 +702,26 @@
 */
 void HbDataFormViewItemPrivate::setDescription( const QString& description )
 {
-    mDescription = description; 
+    Q_Q( HbDataFormViewItem );
+
+    if ( mDescription == description ) {
+        return;
+    }
+    
+    bool doRepolish = false;
+
+    if ( ( mDescription.isEmpty() && !description.isEmpty() ) || 
+        ( !mDescription.isEmpty() && description.isEmpty() )) {
+            doRepolish = true;
+    }
+
+    mDescription = description;
     createPrimitives();
+    if ( doRepolish ) {
+        q->repolish();
+    }
     updatePrimitives();
+    
 }
 
 /*
@@ -500,53 +765,84 @@
 */
 void HbDataFormViewItemPrivate::setLabel( const QString& label )
 {
+    Q_Q( HbDataFormViewItem );
+
+    if (  mLabel == label ) {
+        return;
+    }
+
+    bool doRepolish = false;
+
+    if ( ( mLabel.isEmpty() && !label.isEmpty() ) || 
+        ( !mLabel.isEmpty() && label.isEmpty() )) {
+            doRepolish = true;
+    }
+
     mLabel = label; 
     createPrimitives();
+    if ( doRepolish ) {
+        q->repolish();
+    }
     updatePrimitives();
 }
-void HbDataFormViewItemPrivate::updateLabel(const QString& label)
+
+void HbDataFormViewItemPrivate::updateData()
 {
     Q_Q(HbDataFormViewItem);
     
     HbDataFormModelItem::DataItemType type = static_cast< HbDataFormModelItem::DataItemType>(
                 q->modelIndex().data(HbDataFormModelItem::ItemTypeRole).toInt());
     HbDataFormModel* data_model = static_cast<HbDataFormModel*>(q->itemView()->model());
-    HbDataFormModelItem *model_item = static_cast<HbDataFormModelItem*>(data_model->itemFromIndex(mIndex));   
-    
-    
-    if(type == HbDataFormModelItem::FormPageItem) {
+    HbDataFormModelItem *model_item = static_cast<HbDataFormModelItem*>(data_model->itemFromIndex(mIndex));
+    HbDataFormModelItemPrivate *modelItem_priv = HbDataFormModelItemPrivate::d_ptr(model_item);    
+
+    //update label
+    if( modelItem_priv->dirtyProperty() == "LabelRole" ) {
+        QString label = model_item->label();
+        if(type == HbDataFormModelItem::FormPageItem) {
 
-        int index = data_model->invisibleRootItem()->indexOf(model_item);
-        HbDataFormPrivate* form_priv = HbDataFormPrivate::d_ptr(
-                                    static_cast<HbDataForm*>(q->itemView()));        
-        if(index >= 0) {
-            form_priv->mHeadingWidget->updatePageName(index ,label);
-        }
+            int index = data_model->invisibleRootItem()->indexOf(model_item);
+            HbDataFormPrivate* form_priv = HbDataFormPrivate::d_ptr(
+                                        static_cast<HbDataForm*>(q->itemView()));        
+            if(index >= 0) {
+                form_priv->mHeadingWidget->updatePageName(index ,label);
+            }
+
+        } else if(type == HbDataFormModelItem::GroupItem) {
+
+            HbDataGroupPrivate::d_ptr(static_cast<HbDataGroup*>(q))->setHeading(label);
 
-    } else if(type == HbDataFormModelItem::GroupItem) {
-        
-        
-        HbDataGroupPrivate::d_ptr(static_cast<HbDataGroup*>(q))->setHeading(label);            
+        } else if(type == HbDataFormModelItem::GroupPageItem) {
+           
+            QModelIndex groupIndex = data_model->parent(mIndex);
+            int index = (data_model->itemFromIndex(groupIndex))->indexOf(model_item);       
+            HbDataGroup* groupItem = static_cast<HbDataGroup*>(
+                            q->itemView()->itemByIndex(groupIndex));
+            groupItem->updateGroupPageName(index,label);
 
-    } else if(type == HbDataFormModelItem::GroupPageItem) {
-       
-        QModelIndex groupIndex = data_model->parent(mIndex);
-        int index = (data_model->itemFromIndex(groupIndex))->indexOf(model_item);       
-        HbDataGroup* groupItem = static_cast<HbDataGroup*>(
-                        q->itemView()->itemByIndex(groupIndex));
-        groupItem->updateGroupPageName(index,label);
-
-    } else if (type > HbDataFormModelItem::GroupPageItem ) {
-        setLabel(label);        
+        } else if (type > HbDataFormModelItem::GroupPageItem ) {
+            setLabel(label);        
+        }
+    } else if ( modelItem_priv->dirtyProperty() == "DescriptionRole" ) {
+        //update description of either data item or data group
+        QString description = model_item->description();
+        if( type == HbDataFormModelItem::GroupItem ) {
+            HbDataGroupPrivate::d_ptr(static_cast<HbDataGroup*>(q))->setDescription(description);
+        } else if ( type > HbDataFormModelItem::GroupPageItem ) {
+            setDescription(description);
+        }
+    } else if ( modelItem_priv->dirtyProperty() == "DecorationRole" ){
+        //update data item icon
+        if ( type > HbDataFormModelItem::GroupPageItem ) {
+            setIcon(model_item->icon());
+        }
     }
-    
 }
 
 void HbDataFormViewItemPrivate::setEnabled(bool enabled)
 {
     Q_Q(HbDataFormViewItem);
 
-
     QGraphicsItem::GraphicsItemFlags itemFlags = q->flags();
     Qt::ItemFlags indexFlags = mIndex.flags();
 
@@ -555,12 +851,14 @@
             itemFlags |= QGraphicsItem::ItemIsFocusable;
             q->setFocusPolicy(q->prototype()->focusPolicy());
             q->setProperty("state", "normal");
+            q->grabGesture(Qt::TapGesture);
         }
     } else {
         if (itemFlags & QGraphicsItem::ItemIsFocusable) {
             itemFlags &= ~QGraphicsItem::ItemIsFocusable;
             q->setFocusPolicy(Qt::NoFocus);
             q->setProperty("state", "disabled");
+            q->ungrabGesture(Qt::TapGesture);
         }
     }
 
@@ -583,8 +881,24 @@
 */
 void HbDataFormViewItemPrivate::setIcon( const QString& icon )
 {
+    Q_Q(HbDataFormViewItem);
+    if ( mIcon == icon ) {
+        return;
+    }
+
+    bool doRepolish = false;
+
+    if ( ( mIcon.isEmpty() && !icon.isEmpty() ) || 
+        ( !mIcon.isEmpty() && icon.isEmpty() )) {
+            doRepolish = true;
+    }
+
     mIcon = icon;
     createPrimitives();
+    if ( doRepolish ) {
+        q->repolish();
+    }
+
     updatePrimitives();
 }
 
@@ -610,7 +924,7 @@
         case HbDataFormModelItem::VolumeSliderItem: {
                 mContentWidget = new HbSlider( Qt::Horizontal, q );
                 mProperty.append( "sliderPosition" );            
-                QObject::connect( mContentWidget, SIGNAL(sliderReleased()), q,SLOT(save()) );
+                QObject::connect( mContentWidget, SIGNAL(valueChanged(int)), q,SLOT(save()) );
                 HbStyle::setItemName( mContentWidget, "dataItem_ContentWidget" );                
             }
             break;
@@ -669,6 +983,9 @@
             }
             break;
     }
+    //background primitive should get created.
+    createPrimitives();
+    updatePrimitives();
     if ( mContentWidget ) {
         QEvent polishEvent( QEvent::Polish );
         QCoreApplication::sendEvent( mContentWidget, &polishEvent );
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/dataform/hbdataformviewitem_p.h
--- a/src/hbwidgets/dataform/hbdataformviewitem_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/dataform/hbdataformviewitem_p.h	Mon May 03 12:48:33 2010 +0300
@@ -34,8 +34,12 @@
 class HbPushButton;
 class HbRadioButtonList;
 class HbLabel;
-class HbListDialog;
+class HbSelectionDialog;
 class HbAction;
+class HbDialog;
+class HbListWidget;
+class QGraphicsLinearLayout;
+class QItemSelection;
 
 QT_FORWARD_DECLARE_CLASS(QGraphicsLinearLayout)
 
@@ -63,7 +67,6 @@
 
 private:
     HbPushButton* mButton;
-    //CRC: we can have thse variables in some common base class
     HbDataFormViewItem* mViewItem;
     HbDataFormModelItem* mModelItem;
     HbDataFormModel * mModel;
@@ -77,7 +80,8 @@
 public:
     HbRadioItem( QGraphicsItem* parent = 0 );
     ~HbRadioItem( );
-    HbWidget* contentWidget( );
+    HbWidget* createRadioButton( );
+    void initilizeButton();
 
     //void setItemEnabled(bool enable);
 
@@ -85,20 +89,28 @@
     virtual bool event( QEvent * e ); 
 
 public slots:
-    void itemSelected( int index );
+    void updateModel( int index );
     void buttonClicked();
+    void dialogClosed(HbAction* action);
+    void makeEmbedded();
+    void makePopup();
+    void changeMode();
+    void selectItem();
+    void resetSelection();
 signals:
     void valueChanged(QPersistentModelIndex, QVariant);
 
 private:
-    HbRadioButtonList* mRadioButton;
+    HbRadioButtonList* mRadioButtonList;
     HbPushButton* mButton;
-    bool mButtonVisible;
     QStringList mItems;
-    int mSelected;
     HbDataFormViewItem *mViewItem;
     HbDataFormModelItem* mModelItem;
     HbDataFormModel * mModel;
+    HbDialog *mDialog;
+    QGraphicsLinearLayout* layout;
+    bool mPopup;
+    int mSelected;
 };
 
 //multi selectio item class declaration
@@ -109,7 +121,6 @@
 public:
     HbMultiSelectionItem( QGraphicsItem* parent = 0 );
     ~HbMultiSelectionItem( );
-    HbWidget* contentWidget( ) const;
 
 protected:
     virtual bool event( QEvent * e ); 
@@ -117,18 +128,25 @@
 public slots:
     void launchMultiSelectionList( );
     void dialogClosed(HbAction*);
-
+    void updateModel( const QItemSelection & selected, const QItemSelection &deselected );
+    void makeEmbedded();
+    void makePopup();
+    void changeMode();
+    void makeSelection();
 signals:
     void valueChanged(QPersistentModelIndex, QVariant);
 
 private:
-    HbPushButton* mButton;
+
     QStringList mItems;
-    QList<int> mSelectedItems;
+    QList<QVariant> mSelectedItems;
     HbDataFormViewItem *mViewItem;
     HbDataFormModelItem* mModelItem;
     HbDataFormModel * mModel;
-    HbListDialog* mQuery;
+    HbSelectionDialog* mSelectionDialog;
+    HbPushButton* mButton;
+    HbListWidget *mMultiListWidget;
+    QGraphicsLinearLayout* layout;
 
 };
 
@@ -158,7 +176,7 @@
     QString icon( ) const;
     void setDescription( const QString& description );
     QString description() const;
-    void updateLabel(const QString& label);
+    void updateData();
 
     void setEnabled(bool enabled);
 public:
@@ -177,7 +195,6 @@
     QGraphicsItem *mLabelItem;
     QGraphicsItem *mIconItem;
     QGraphicsItem *mDescriptionItem;
-    QVariant mCurrentValue;//CRC why is this required
     bool mSetAllProperty;
     HbDataFormModel* mModel;
     HbDataFormModelItem *mModelItem;
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/dataform/hbdatagroup_p.cpp
--- a/src/hbwidgets/dataform/hbdatagroup_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/dataform/hbdatagroup_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -32,6 +32,9 @@
 #include "hbdataform_p.h"
 #include "hbdatagroup_p_p.h"
 
+// For QMAP_INT__ITEM_STATE_DEPRECATED's sake. Removed when QMap<int,QVariant> based state item system is removed
+#include <hbabstractviewitem_p.h>
+
 #include <QStringListModel>
 #include <QCoreApplication>
 
@@ -39,7 +42,6 @@
 HbDataGroupPrivate::HbDataGroupPrivate( HbDataGroup* item ):
     HbDataFormViewItemPrivate( item ),
     mPageCombo( 0 ),
-    mGroupDescriptionItem( 0 ),
     mGroupHeading( 0 ),
     mPageComboBackgroundItem( 0 )
 {
@@ -47,7 +49,6 @@
 HbDataGroupPrivate::HbDataGroupPrivate( const HbDataGroupPrivate &source ):
     HbDataFormViewItemPrivate( source ),
     mPageCombo( source.mPageCombo ),
-    mGroupDescriptionItem( source.mGroupDescriptionItem ),
     mGroupHeading( source.mGroupHeading ),
     mPageComboBackgroundItem( source.mPageComboBackgroundItem )
 {
@@ -67,8 +68,7 @@
     HbDataFormModelItem::DataItemType itemType = static_cast<HbDataFormModelItem::DataItemType>(
             ( mIndex.operator const QModelIndex & ( )).data( HbDataFormModelItem::ItemTypeRole).toInt( ) );
 
-    if(container->itemState(
-            mIndex.operator const QModelIndex & ( )).value( HbDataFormViewItem::ExpansionKey ) == expanded ) {
+    if(container->itemTransientState(mIndex).value( "expanded" ) == expanded ) {
         return;
     }
 
@@ -118,7 +118,10 @@
                 //get the group page index
                 QModelIndex groupPageIndex = mIndex.child(activePage,0);
                 if(groupPageIndex.isValid()) {                    
-                    container->setItemStateValue(groupPageIndex, HbDataFormViewItem::ExpansionKey, true);
+#ifndef QMAP_INT__ITEM_STATE_DEPRECATED
+                   container->setItemStateValue(groupPageIndex, HbDataFormViewItem::ExpansionKey, true);
+#endif
+                    container->setItemTransientStateValue(groupPageIndex, "expanded", true);
                 }
             }
             if (mGroupHeading )  {
@@ -127,7 +130,10 @@
         }
     }
 
+#ifndef QMAP_INT__ITEM_STATE_DEPRECATED
     container->setItemStateValue(mIndex.operator const QModelIndex & (), HbDataFormViewItem::ExpansionKey, expanded);
+#endif
+    container->setItemTransientStateValue(mIndex, "expanded", expanded);
 }
 
 
@@ -152,13 +158,6 @@
             HbStyle::setItemName(mPageComboBackgroundItem,"dataGroup_ComboBackground");
         }
 
-        if( !mGroupDescription.isEmpty() ) {
-            if( !mGroupDescriptionItem ) {
-                mGroupDescriptionItem = q->style()->createPrimitive(HbStyle::P_DataGroup_description, q);
-                HbStyle::setItemName(mGroupDescriptionItem, "dataGroup_Description");
-            }
-        }
-        
         QEvent polishEvent(QEvent::Polish);
         QCoreApplication::sendEvent(q, &polishEvent);
     }
@@ -210,7 +209,6 @@
     QObject::disconnect( mSharedData->mItemView->model(), SIGNAL( dataChanged( QModelIndex,QModelIndex ) ),
         mSharedData->mItemView, SLOT( dataChanged( QModelIndex,QModelIndex ) ) );
 
-    // CRC : Is it reqired here to disconnect and connect signals. ( done)
     modelItem->setContentWidgetData(QString("currentPage"),pageindex);
 
     QObject::connect( mSharedData->mItemView->model(), SIGNAL( dataChanged( QModelIndex,QModelIndex ) ),
@@ -250,32 +248,24 @@
 
 void HbDataGroup::initStyleOption(HbStyleOptionDataGroup *option)
 {
-    Q_D(HbDataGroup);
+    //Q_D(HbDataGroup);
     HbWidget::initStyleOption(option);
-    option->description = d->mGroupDescription;
 }
 
 void HbDataGroup::setDescription( const QString &description )
 {
-    Q_D(HbDataGroup);
-    d->mGroupDescription = description;
-    if( !d->mGroupDescription.isEmpty() ) {
-        if( !d->mGroupDescriptionItem ) {
-            d->mGroupDescriptionItem = style()->createPrimitive(HbStyle::P_DataGroup_description, this);
-        }
-    } else {
-        if( d->mGroupDescriptionItem ) {
-            delete d->mGroupDescriptionItem;
-            d->mGroupDescriptionItem = 0;
-        }
-    }
+     
+    Q_D( HbDataGroup );
+    d->mGroupHeading->mDescription = description;
+    d->mGroupHeading->createPrimitives( );    
+    d->mGroupHeading->updatePrimitives( );
 }
 
 
 QString HbDataGroup::description() const
 {
     Q_D(const HbDataGroup);
-    return d->mGroupDescription;
+    return d->mGroupHeading->mDescription;
 }
 
 bool HbDataGroup::setExpanded( bool expanded )
@@ -287,8 +277,7 @@
     if(d->mSharedData->mItemView) {
         container = qobject_cast<HbAbstractItemContainer *>(
             static_cast<QGraphicsWidget *>(d->mSharedData->mItemView->contentWidget()));
-        if(container->itemState(d->mIndex).value(HbDataFormViewItem::ExpansionKey) 
-                == expanded || !sd->mItemView) {
+        if(container->itemTransientState(d->mIndex).value("expanded")  == expanded || !sd->mItemView) {
             return true;
         }    
         d->expand(expanded);
@@ -305,21 +294,21 @@
 
                     HbStyle::setItemName(d->mPageCombo,"dataGroup_Combo");
                     HbStyle::setItemName(d->mPageComboBackgroundItem,"dataGroup_ComboBackground");
-                    HbStyle::setItemName(d->mGroupDescriptionItem, "dataGroup_Description");
+                    //HbStyle::setItemName(d->mGroupDescriptionItem, "dataGroup_Description");
 
                 } else {
 
                     HbStyle::setItemName(d->mPageCombo,"");
                     HbStyle::setItemName(d->mPageComboBackgroundItem,"");
-                    HbStyle::setItemName(d->mGroupDescriptionItem, "");
+                    //HbStyle::setItemName(d->mGroupDescriptionItem, "");
                     setProperty("groupPage", "");
                     d->mPageString.clear();
                     delete d->mPageCombo;
                     d->mPageCombo = 0;
                     delete d->mPageComboBackgroundItem;
                     d->mPageComboBackgroundItem = 0;
-                    delete d->mGroupDescriptionItem;
-                    d->mGroupDescriptionItem = 0;
+                    //delete d->mGroupDescriptionItem;
+                    //d->mGroupDescriptionItem = 0;
 
                     QEvent polishEvent(QEvent::Polish);
                     QCoreApplication::sendEvent(this, &polishEvent);
@@ -370,10 +359,10 @@
             }
 
             //update the data group description
-            if(d->mGroupDescriptionItem) {
+            /*if(d->mGroupDescriptionItem) {
                 style()->updatePrimitive( 
                     d->mGroupDescriptionItem, HbStyle::P_DataGroup_description, &opt);
-            }
+            }*/
         }
     }
 }
@@ -448,7 +437,9 @@
         //set the heading of data group
         QString groupDescription = d->mIndex.data(
             HbDataFormModelItem::DescriptionRole).toString();
-        setDescription(groupDescription);
+        if(!groupDescription.isEmpty()) {
+            setDescription(groupDescription);
+        }
   
     } 
     else if( contentWidgetType == HbDataFormModelItem::GroupPageItem){
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/dataform/hbdatagroup_p.h
--- a/src/hbwidgets/dataform/hbdatagroup_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/dataform/hbdatagroup_p.h	Mon May 03 12:48:33 2010 +0300
@@ -47,7 +47,6 @@
     bool setExpanded( bool expanded );
     bool isExpanded( ) const;   
 
-    //CRC: Is this required here ?
     void updateGroupPageName(int index , const QString &page);    
     QGraphicsItem* primitive( HbStyle::Primitive primitive );
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/dataform/hbdatagroup_p_p.h
--- a/src/hbwidgets/dataform/hbdatagroup_p_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/dataform/hbdatagroup_p_p.h	Mon May 03 12:48:33 2010 +0300
@@ -61,8 +61,6 @@
 
 public:   
     HbComboBox *mPageCombo;
-    QGraphicsItem *mGroupDescriptionItem;
-    QString mGroupDescription;
     QString mPageString;
     HbDataGroupHeadingWidget *mGroupHeading;
     QGraphicsItem *mPageComboBackgroundItem;
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/dataform/hbdatagroupheadingwidget_p.cpp
--- a/src/hbwidgets/dataform/hbdatagroupheadingwidget_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/dataform/hbdatagroupheadingwidget_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -28,20 +28,33 @@
 #include <hbstyleoptiondatagroupheadingwidget_p.h>
 #include <hbdatagroup_p.h>
 #include <QGraphicsItem>
+#include <hbwidgetfeedback.h>
+
+#ifdef HB_GESTURE_FW
+#include <hbtapgesture.h>
+#include <hbpangesture.h>
+#endif
 
 HbDataGroupHeadingWidget::HbDataGroupHeadingWidget(QGraphicsItem *parent ) :
     HbWidget(parent),
     mBackgroundItem(0),
     mHeadingItem(0),
     mIconItem(0),
+    mDescriptionItem(0),
     mParent(0),
     mExpanded(false),
     mDown(false)
 {
+#ifdef HB_GESTURE_FW
+    grabGesture( Qt::TapGesture );
+#endif
 }
 
 HbDataGroupHeadingWidget::~HbDataGroupHeadingWidget()
 {
+#ifdef HB_GESTURE_FW
+    ungrabGesture( Qt::TapGesture );
+#endif
 }
 
 void HbDataGroupHeadingWidget::createPrimitives()
@@ -53,6 +66,7 @@
     if(!mHeading.isEmpty()) {
         if(!mHeadingItem) {
             mHeadingItem = style()->createPrimitive(HbStyle::P_DataGroup_heading, this);
+            setProperty("state","normal");
         }
     } else {
         if(mHeadingItem) {
@@ -60,6 +74,17 @@
             mHeadingItem = 0;
         }
     }
+    if(!mDescription.isEmpty()) {
+        if(!mDescriptionItem) {
+            mDescriptionItem = style()->createPrimitive(HbStyle::P_DataGroup_description, this);
+            setProperty("state","normal");
+        }
+    } else {
+        if(mDescriptionItem) {
+            delete mDescriptionItem;
+            mDescriptionItem = 0;
+        }
+    }
 
     if(!mIconItem) {
         mIconItem = style()->createPrimitive(HbStyle::P_DataGroup_icon, this);
@@ -77,7 +102,11 @@
         style()->updatePrimitive( 
             mHeadingItem, HbStyle::P_DataGroup_heading, &settingGroupOption);
     }
-
+    
+    if(mDescriptionItem) {
+        style()->updatePrimitive( 
+            mDescriptionItem, HbStyle::P_DataGroup_description, &settingGroupOption);
+    }
     if(mIconItem) {
         style()->updatePrimitive( mIconItem, HbStyle::P_DataGroup_icon, &settingGroupOption);
     }
@@ -92,11 +121,12 @@
 {
     HbWidget::initStyleOption(option);
     option->heading = mHeading;
+    option->description = mDescription;
     option->expanded = mExpanded;
     option->pressed = mDown;
 }
 
-
+#ifndef HB_GESTURE_FW
 void HbDataGroupHeadingWidget::mousePressEvent(QGraphicsSceneMouseEvent *event)
 {
     if (event->button() != Qt::LeftButton) {
@@ -111,18 +141,24 @@
         style()->updatePrimitive(
             mBackgroundItem, HbStyle::P_DataGroup_background, &settingGroupOption);
     }
- }
+
+    Hb::InteractionModifiers modifiers = Hb::ModifierExpandedItem;
+    HbWidgetFeedback::triggered(this, Hb::InstantPressed, modifiers);
+}
 
 void HbDataGroupHeadingWidget::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
 {
+    Hb::InteractionModifiers modifiers = 0;
+
     if (event->button() != Qt::LeftButton) {
         event->ignore();
         return;
     }
     
-    if(mDown && rect().contains(event->pos())) {        
+    if(mDown && rect().contains(event->pos())) {
         static_cast<HbDataGroup*>(mParent)->setExpanded(
                 !static_cast<HbDataGroup*>(mParent)->isExpanded());
+        modifiers |= Hb::ModifierExpandedItem;
     }
     mDown = false;
 
@@ -132,5 +168,72 @@
         style()->updatePrimitive(
             mBackgroundItem, HbStyle::P_DataGroup_background, &settingGroupOption);
     }
+
+    HbWidgetFeedback::triggered(this, Hb::InstantReleased, modifiers);
 }
+#endif
 
+#ifdef HB_GESTURE_FW
+void HbDataGroupHeadingWidget::gestureEvent(QGestureEvent *event)
+{
+    Hb::InteractionModifiers modifiers = 0;
+
+    if (HbTapGesture *tap = qobject_cast<HbTapGesture *>(event->gesture(Qt::TapGesture))) {
+        switch(tap->state()) {
+
+        case Qt::GestureStarted:
+            {
+                mDown = true;
+                HbStyleOptionDataGroupHeadingWidget settingGroupOption;
+                initStyleOption(&settingGroupOption);
+                if(mBackgroundItem) {
+                style()->updatePrimitive(
+                mBackgroundItem, HbStyle::P_DataGroup_background, &settingGroupOption);
+            }
+                modifiers = Hb::ModifierExpandedItem;
+                HbWidgetFeedback::triggered(this, Hb::InstantPressed, modifiers);
+                break;
+            }
+
+        case Qt::GestureFinished:
+            {
+                modifiers = 0;
+
+                if(mDown && rect().contains(mapFromScene(event->mapToGraphicsScene(tap->position())))) {        
+                static_cast<HbDataGroup*>(mParent)->setExpanded(
+                    !static_cast<HbDataGroup*>(mParent)->isExpanded());
+                    modifiers |= Hb::ModifierExpandedItem;
+                    mDown = false;
+                }
+                HbStyleOptionDataGroupHeadingWidget settingGroupOption;
+                initStyleOption(&settingGroupOption);
+                if(mBackgroundItem) {
+                    style()->updatePrimitive(
+                    mBackgroundItem, HbStyle::P_DataGroup_background, &settingGroupOption);
+                }
+
+                HbWidgetFeedback::triggered(this, Hb::InstantReleased, modifiers);
+                break;
+            }
+        case Qt::GestureCanceled:
+        {
+            modifiers = 0;
+            mDown = false;
+            HbStyleOptionDataGroupHeadingWidget settingGroupOption;
+            initStyleOption(&settingGroupOption);
+            if(mBackgroundItem) {
+                style()->updatePrimitive(
+                mBackgroundItem, HbStyle::P_DataGroup_background, &settingGroupOption);
+            }
+
+            HbWidgetFeedback::triggered(this, Hb::InstantReleased, modifiers);
+            break;
+
+         }
+            
+        default:
+            break;
+        }
+    }
+}
+#endif
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/dataform/hbdatagroupheadingwidget_p.h
--- a/src/hbwidgets/dataform/hbdatagroupheadingwidget_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/dataform/hbdatagroupheadingwidget_p.h	Mon May 03 12:48:33 2010 +0300
@@ -51,18 +51,25 @@
     enum { Type = HbPrivate::ItemType_DataGroupHeadingWidget };
     int type() const { return Type; }
 
-    virtual void mousePressEvent(QGraphicsSceneMouseEvent *event);
-    virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
+#ifndef HB_GESTURE_FW
+    void mousePressEvent(QGraphicsSceneMouseEvent *event);
+    void mouseReleaseEvent( QGraphicsSceneMouseEvent * event );
+#endif
+#ifdef HB_GESTURE_FW
+    virtual void gestureEvent(QGestureEvent *event);
+#endif
 
 
 public:
     QGraphicsItem *mBackgroundItem;
     QGraphicsItem *mHeadingItem;
-    QGraphicsItem *mIconItem;
+    QGraphicsItem *mIconItem;    
+    QGraphicsItem *mDescriptionItem;
     HbDataFormViewItem* mParent;
     bool mExpanded;
     bool mDown;
     QString mHeading;
+    QString mDescription;
 };
 
 #endif // HBDATAGROUPHEADINGWIDGET_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/devicedialogs/devicedialogs.pri
--- a/src/hbwidgets/devicedialogs/devicedialogs.pri	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/devicedialogs/devicedialogs.pri	Mon May 03 12:48:33 2010 +0300
@@ -35,7 +35,7 @@
 PUBLIC_HEADERS += $$PWD/hbdevicemessageboxsymbian.h
 PUBLIC_HEADERS += $$PWD/hbdeviceprogressdialogsymbian.h
 
-INTERNAL_HEADERS += $$PWD/hbdevicenotificationdialog_p.h $$PWD/hbdeviceprogressdialog_p.h $$PWD/hbdevicemessagebox_p.h
+PRIVATE_HEADERS += $$PWD/hbdevicenotificationdialog_p.h $$PWD/hbdeviceprogressdialog_p.h $$PWD/hbdevicemessagebox_p.h
 
 SOURCES += $$PWD/hbdevicenotificationdialog.cpp
 SOURCES += $$PWD/hbdeviceprogressdialog.cpp
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/devicedialogs/hbdevicemessagebox.cpp
--- a/src/hbwidgets/devicedialogs/hbdevicemessagebox.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/devicedialogs/hbdevicemessagebox.cpp	Mon May 03 12:48:33 2010 +0300
@@ -574,7 +574,7 @@
     asynchronous show().
 
     \deprecated HbDeviceMessageBox::exec()
-    is deprecated. Replaced by const QAction *HbDeviceMessageBox::exec() const.
+        is deprecated. Replaced by const QAction *HbDeviceMessageBox::exec() const.
 
 */
 HbAction *HbDeviceMessageBox::exec()
@@ -762,8 +762,8 @@
 
     \sa setPrimaryAction()
 
-    \deprecated HbDeviceMessageBox::primaryAction()
-    is deprecated. Replaced by HbDeviceMessageBox::action(ActionRole role) const.
+    \deprecated HbDeviceMessageBox::primaryAction() const
+        is deprecated. Replaced by HbDeviceMessageBox::action(ActionRole role) const.
 
 */
 HbAction* HbDeviceMessageBox::primaryAction() const
@@ -788,8 +788,8 @@
 
     \sa primaryAction()
 
-    \deprecated HbDeviceMessageBox::setPrimaryAction(HbAction *action)
-    is deprecated. HbDeviceMessageBox::setAction(QAction *action, ActionRole role).
+    \deprecated HbDeviceMessageBox::setPrimaryAction(HbAction*)
+        is deprecated. HbDeviceMessageBox::setAction(QAction *action, ActionRole role).
 
 */
 void HbDeviceMessageBox::setPrimaryAction(HbAction *action)
@@ -806,8 +806,8 @@
 
     \sa setSecondaryAction()
 
-    \deprecated HbDeviceMessageBox::secondaryAction()
-    is deprecated. Replaced by HbDeviceMessageBox::action(ActionRole role) const.
+    \deprecated HbDeviceMessageBox::secondaryAction() const
+        is deprecated. Replaced by HbDeviceMessageBox::action(ActionRole role) const.
 
 */
 HbAction* HbDeviceMessageBox::secondaryAction() const
@@ -833,8 +833,8 @@
 
     \sa secondaryAction()
 
-    \deprecated HbDeviceMessageBox::setSecondaryAction(HbAction *action)
-    is deprecated. HbDeviceMessageBox::setAction(QAction *action, ActionRole role).
+    \deprecated HbDeviceMessageBox::setSecondaryAction(HbAction*)
+        is deprecated. HbDeviceMessageBox::setAction(QAction *action, ActionRole role).
 */
 void HbDeviceMessageBox::setSecondaryAction(HbAction *action)
 {
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/devicedialogs/hbdevicemessageboxsymbian.cpp
--- a/src/hbwidgets/devicedialogs/hbdevicemessageboxsymbian.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/devicedialogs/hbdevicemessageboxsymbian.cpp	Mon May 03 12:48:33 2010 +0300
@@ -913,9 +913,8 @@
     \sa Qt::Alignment, IconAlignment()
 */
 /*!
-    \deprecated void CHbDeviceMessageBoxSymbian::SetIconAlignmentL(TInt aQtAlignment)
-    is deprecated. Replaced by
-    void CHbDeviceMessageBoxSymbian::SetIconAlignment(TInt aQtAlignment).
+    \deprecated CHbDeviceMessageBoxSymbian::SetIconAlignmentL(int)
+        is deprecated. Replaced by CHbDeviceMessageBoxSymbian::SetIconAlignment(TInt aQtAlignment).
 
 */
 EXPORT_C void CHbDeviceMessageBoxSymbian::SetIconAlignmentL(TInt aQtAlignment)
@@ -978,9 +977,8 @@
     \sa Timeout()
 */
 /*!
-    \deprecated void CHbDeviceMessageBoxSymbian::SetTimeoutL(TInt aTimeout)
-    is deprecated. Replaced by
-    void CHbDeviceMessageBoxSymbian::SetTimeout(TInt aTimeout).
+    \deprecated CHbDeviceMessageBoxSymbian::SetTimeoutL(int)
+        is deprecated. Replaced by CHbDeviceMessageBoxSymbian::SetTimeout(TInt aTimeout).
 
 */
 EXPORT_C void CHbDeviceMessageBoxSymbian::SetTimeoutL(TInt aTimeout)
@@ -1020,9 +1018,8 @@
     \sa HbPopup::DismissPolicy, DismissPolicy()
 */
 /*!
-    \deprecated void CHbDeviceMessageBoxSymbian::SetDismissPolicyL(TInt aHbPopupDismissPolicy)
-    is deprecated. Replaced by
-    void CHbDeviceMessageBoxSymbian::SetDismissPolicy(TInt aHbPopupDismissPolicy).
+    \deprecated CHbDeviceMessageBoxSymbian::SetDismissPolicyL(int)
+        is deprecated. Replaced by CHbDeviceMessageBoxSymbian::SetDismissPolicy(TInt aHbPopupDismissPolicy).
 
 */
 EXPORT_C void CHbDeviceMessageBoxSymbian::SetDismissPolicyL(TInt aHbPopupDismissPolicy)
@@ -1094,9 +1091,8 @@
     \sa HasButton()
 */
 /*!
-    \deprecated void CHbDeviceMessageBoxSymbian::SetButtonL(TButtonId aButton, TBool aEnable)
-    is deprecated. Replaced by
-    void CHbDeviceMessageBoxSymbian::SetButton(TButtonId aButton, TBool aEnable).
+    \deprecated CHbDeviceMessageBoxSymbian::SetButtonL(CHbDeviceMessageBoxSymbian::TButtonId, int)
+        is deprecated. Replaced by CHbDeviceMessageBoxSymbian::SetButton(TButtonId aButton, TBool aEnable).
 
 */
 EXPORT_C void CHbDeviceMessageBoxSymbian::SetButtonL(TButtonId aButton, TBool aEnable)
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/devicedialogs/hbdevicenotificationdialogsymbian.cpp
--- a/src/hbwidgets/devicedialogs/hbdevicenotificationdialogsymbian.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/devicedialogs/hbdevicenotificationdialogsymbian.cpp	Mon May 03 12:48:33 2010 +0300
@@ -449,9 +449,8 @@
     }
     
 /*!
-    \deprecated void CHbDeviceNotificationDialogSymbian::EnableTouchActivationL(TBool aEnable)
-    is deprecated. Use CHbDeviceNotificationDialogSymbian::EnableTouchActivation(TBool aEnable)
-    instead.
+    \deprecated CHbDeviceNotificationDialogSymbian::EnableTouchActivationL(int)
+        is deprecated. Use CHbDeviceNotificationDialogSymbian::EnableTouchActivation(TBool aEnable) instead.
 */
 EXPORT_C void CHbDeviceNotificationDialogSymbian::EnableTouchActivationL(TBool aEnable)
     {
@@ -482,9 +481,8 @@
     }
 
 /*!
-    \deprecated void CHbDeviceNotificationDialogSymbian::SetTimeoutL(TInt aTimeout)
-    is deprecated. Use CHbDeviceNotificationDialogSymbian::SetTimeout(TInt aTimeout)
-    instead.
+    \deprecated CHbDeviceNotificationDialogSymbian::SetTimeoutL(int)
+        is deprecated. Use CHbDeviceNotificationDialogSymbian::SetTimeout(TInt aTimeout) instead.
 */
 EXPORT_C void CHbDeviceNotificationDialogSymbian::SetTimeoutL(TInt aTimeout)
     {
@@ -515,10 +513,9 @@
     }
 
 /*!
-    \deprecated void CHbDeviceNotificationDialogSymbian::SetTitleTextWrappingL(
-    TextWrapping aWrapping) is deprecated. Use CHbDeviceNotificationDialogSymbian::SetTitleTextWrapping(
-    TextWrapping aWrapping) instead.
-    instead.
+    \deprecated CHbDeviceNotificationDialogSymbian::SetTitleTextWrappingL(CHbDeviceNotificationDialogSymbian::TextWrapping)
+        is deprecated. Use CHbDeviceNotificationDialogSymbian::SetTitleTextWrapping(TextWrapping aWrapping) instead.
+
 */
 EXPORT_C void CHbDeviceNotificationDialogSymbian::SetTitleTextWrappingL(
     TextWrapping aWrapping)
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/devicedialogs/hbdeviceprogressdialog.cpp
--- a/src/hbwidgets/devicedialogs/hbdeviceprogressdialog.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/devicedialogs/hbdeviceprogressdialog.cpp	Mon May 03 12:48:33 2010 +0300
@@ -459,7 +459,7 @@
     Closes the dialog.
 
     \deprecated HbDeviceProgressDialog::cancel()
-    is deprecated. Replaced by HbDeviceProgressDialog::close().
+        is deprecated. Replaced by HbDeviceProgressDialog::close().
 
 */
 void HbDeviceProgressDialog::cancel()
@@ -692,8 +692,8 @@
 
     \sa textWrapping()
 
-    \deprecated HbDeviceProgressDialog::setTextWrapping()
-    is deprecated. Will be removed.
+    \deprecated HbDeviceProgressDialog::setTextWrapping(bool)
+        is deprecated. Will be removed.
 */
 void HbDeviceProgressDialog::setTextWrapping(bool wrap)
 {
@@ -707,8 +707,8 @@
 
     \sa setTextWrapping()
 
-    \deprecated HbDeviceProgressDialog::textWrapping()
-    is deprecated. Will be removed.
+    \deprecated HbDeviceProgressDialog::textWrapping() const
+        is deprecated. Will be removed.
 */
 bool HbDeviceProgressDialog::textWrapping() const
 {
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/devicedialogs/hbdeviceprogressdialogsymbian.cpp
--- a/src/hbwidgets/devicedialogs/hbdeviceprogressdialogsymbian.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/devicedialogs/hbdeviceprogressdialogsymbian.cpp	Mon May 03 12:48:33 2010 +0300
@@ -507,7 +507,7 @@
     Cancels and closes the dialog.
 
     \deprecated CHbDeviceProgressDialogSymbian::Cancel()
-    is deprecated. Replaced by CHbDeviceProgressDialogSymbian::Close().
+        is deprecated. Replaced by CHbDeviceProgressDialogSymbian::Close().
 
 */
 EXPORT_C void CHbDeviceProgressDialogSymbian::Cancel()
@@ -785,8 +785,8 @@
     lines breaks are at appropriate point, e.g. at word boundaries.
     \sa TextWrapping()
 
-    \deprecated CHbDeviceProgressDialogSymbian::SetTextWrapping()
-    is deprecated. Will be removed.
+    \deprecated CHbDeviceProgressDialogSymbian::SetTextWrapping(int)
+        is deprecated. Will be removed.
 
 */
 EXPORT_C void CHbDeviceProgressDialogSymbian::SetTextWrapping(TBool aWrap)
@@ -800,8 +800,8 @@
     The default value is true.
     \sa SetTextWrapping()
 
-    \deprecated CHbDeviceProgressDialogSymbian::TextWrapping()
-    is deprecated. Will be removed.
+    \deprecated CHbDeviceProgressDialogSymbian::TextWrapping() const
+        is deprecated. Will be removed.
 */
 EXPORT_C TBool CHbDeviceProgressDialogSymbian::TextWrapping() const
     {
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/editors/editors.pri
--- a/src/hbwidgets/editors/editors.pri	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/editors/editors.pri	Mon May 03 12:48:33 2010 +0300
@@ -32,17 +32,17 @@
 PUBLIC_HEADERS += $$PWD/hbvalidatorfield.h
 PUBLIC_HEADERS += $$PWD/hbformatdialog.h
 
-PUBLIC_HEADERS += $$PWD/hbsmileyengine.h
-INTERNAL_HEADERS += $$PWD/hbabstractedit_p.h
-INTERNAL_HEADERS += $$PWD/hbdatetimeedit_p.h
-INTERNAL_HEADERS += $$PWD/hbdatetimevalidator_p.h
-INTERNAL_HEADERS += $$PWD/hbdatetimevalidator_p_p.h
-INTERNAL_HEADERS += $$PWD/hblineedit_p.h
-INTERNAL_HEADERS += $$PWD/hbtextedit_p.h
-INTERNAL_HEADERS += $$PWD/hbvalidator_p.h
-INTERNAL_HEADERS += $$PWD/hbselectioncontrol_p.h
-INTERNAL_HEADERS += $$PWD/hbformatdialog_p.h
-INTERNAL_HEADERS += $$PWD/hbsmileyengine_p.h
+PRIVATE_HEADERS += $$PWD/hbabstractedit_p.h
+PRIVATE_HEADERS += $$PWD/hbdatetimeedit_p.h
+PRIVATE_HEADERS += $$PWD/hbdatetimevalidator_p.h
+PRIVATE_HEADERS += $$PWD/hbdatetimevalidator_p_p.h
+PRIVATE_HEADERS += $$PWD/hblineedit_p.h
+PRIVATE_HEADERS += $$PWD/hbtextedit_p.h
+PRIVATE_HEADERS += $$PWD/hbvalidator_p.h
+PRIVATE_HEADERS += $$PWD/hbselectioncontrol_p.h
+PRIVATE_HEADERS += $$PWD/hbformatdialog_p.h
+PRIVATE_HEADERS += $$PWD/hbsmileyengine_p.h
+PRIVATE_HEADERS += $$PWD/hbsmileyengine_p_p.h
 
 SOURCES += $$PWD/hbabstractedit.cpp
 SOURCES += $$PWD/hbabstractedit_p.cpp
@@ -58,5 +58,5 @@
 SOURCES += $$PWD/hbselectioncontrol_p.cpp
 SOURCES += $$PWD/hbformatdialog.cpp
 SOURCES += $$PWD/hbformatdialog_p.cpp
-SOURCES += $$PWD/hbsmileyengine.cpp
+SOURCES += $$PWD/hbsmileyengine_p.cpp
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/editors/hbabstractedit.cpp
--- a/src/hbwidgets/editors/hbabstractedit.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/editors/hbabstractedit.cpp	Mon May 03 12:48:33 2010 +0300
@@ -32,20 +32,23 @@
 #include "hbwidget.h"
 #include "hbscrollarea.h"
 #include "hbevent.h"
-#include <hbwidgetfeedback.h>
+#include "hbwidgetfeedback.h"
 #include "hbmenu.h"
 #include "hbaction.h"
 #include "hbselectioncontrol_p.h"
 #include "hbmeshlayout_p.h"
-#include "hbsmileyengine.h"
+#include "hbsmileyengine_p.h"
 #include "hbinputeditorinterface.h"
+#include "hbfeaturemanager_p.h"
+#include "hbtextmeasurementutility_p.h"
+#include "hbtapgesture.h"
+#include "hbpangesture.h"
 
 #include <QApplication>
 #include "hbpopup.h"
 #include "hbformatdialog.h"
 #include <QTextList>
 #include <QFontMetrics>
-#include <QGraphicsSceneMouseEvent>
 #include <QPainter>
 #include <QTextBlock>
 #include <QAbstractTextDocumentLayout>
@@ -171,6 +174,10 @@
 */
 HbAbstractEdit::~HbAbstractEdit()
 {
+    Q_D(HbAbstractEdit);
+    if (d->selectionControl) {
+        d->selectionControl->detachEditor();
+    }
 }
 
 /*!
@@ -213,30 +220,6 @@
     return HbWidget::event(event);
 }
 
-/*!
-    \reimp
-*/
-bool HbAbstractEdit::eventFilter(QObject *obj, QEvent *e)
-{
-    Q_D(HbAbstractEdit);
-
-    if (obj == d->scrollArea
-        && (e->type() == QEvent::GraphicsSceneMousePress
-        || e->type() == QEvent::GraphicsSceneMouseMove
-        || e->type() == QEvent::GraphicsSceneMouseRelease)) {
-
-        // map e->pos to the editor's coordinate system
-        QGraphicsSceneMouseEvent *event = static_cast<QGraphicsSceneMouseEvent*>(e);
-        QPointF oldPos = event->pos();
-        event->setPos(mapFromItem(d->scrollArea,oldPos));
-        bool ret = sceneEvent(e);
-        event->setPos(oldPos);
-        return ret;
-    }
-
-    return false;
-}
-
 QVariant HbAbstractEdit::inputMethodQuery (Qt::InputMethodQuery query) const
 {
     Q_D(const HbAbstractEdit);
@@ -479,106 +462,13 @@
 /*!
     \reimp
 */
-void HbAbstractEdit::mousePressEvent(QGraphicsSceneMouseEvent *event)
-{
-    Q_D(HbAbstractEdit);
-
-    if (d->selectionControl) {
-        d->selectionControl->panStarted();
-    }
-
-    if (d->interactionFlags & Qt::NoTextInteraction)
-        return;
-
-    if (!(event->button() & Qt::LeftButton))
-        return;
-
-    if (!((d->interactionFlags & Qt::TextSelectableByMouse) || (d->interactionFlags & Qt::TextEditable)))
-        return;
-
-    d->mousePressPos = event->pos();
-    d->wasGesture = false;
-
-    HbWidgetFeedback::triggered(this, Hb::InstantPressed);
-
-//    d->minimizeInputPanel();
-
-    event->accept();
-}
-
-/*!
-    \reimp
-*/
-void HbAbstractEdit::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
-{
-    Q_UNUSED(event)
-}
-
-/*!
-    \reimp
-*/
-void HbAbstractEdit::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
+void HbAbstractEdit::focusInEvent(QFocusEvent *event)
 {
     Q_D(HbAbstractEdit);
 
-    if (d->selectionControl) {
-        d->selectionControl->panFinished();
-    }
-    if (d->wasGesture) return;
-
-    if (d->interactionFlags & Qt::NoTextInteraction)
-        return;
-
-    if (d->mousePressPos != Hb_Invalid_Position) {
-        d->mousePressPos = Hb_Invalid_Position;
-
-        bool removeSelection = (d->hitTest(event->pos(), Qt::ExactHit) == -1);
-
-        if (removeSelection && d->cursor.hasSelection()) {
-            const QTextCursor oldCursor = d->cursor;
-            d->cursor.clearSelection();
-            d->repaintOldAndNewSelection(oldCursor);
-            emit selectionChanged(oldCursor, d->cursor);
-        }
-
-        int newCursorPos = d->hitTest(event->pos(), Qt::FuzzyHit);
-
-        if (d->cursor.hasSelection() &&
-            newCursorPos >= d->cursor.selectionStart() &&
-            newCursorPos <= d->cursor.selectionEnd()){
-            // we have a selection under mouse click
-            if (d->contextMenuShownOn.testFlag(Hb::ShowTextContextMenuOnSelectionClicked)) {
-                showContextMenu(mapToScene(event->pos()));
-            }
-        } else {
-
-            // Currently focused widget to listen to InputContext before updating the cursor position
-            d->sendMouseEventToInputContext(event);
-            setCursorPosition(newCursorPos);
-
-            HbWidgetFeedback::triggered(this, Hb::InstantReleased);
-
-            if (d->interactionFlags & Qt::TextEditable) {
-                d->updateCurrentCharFormat();
-            }
-            d->cursorChanged(HbValidator::CursorChangeFromMouse);
-        }
-    }
-
-    d->openInputPanel();
-
-    event->accept();
-}
-
-
-/*!
-    \reimp
-*/
-void HbAbstractEdit::focusInEvent(QFocusEvent *event)
-{
     HbWidget::focusInEvent(event);
 
-    Q_D(HbAbstractEdit);
+    d->selectionControl = HbSelectionControl::attachEditor(this);
 
     if (d->interactionFlags & Qt::NoTextInteraction)
         return;
@@ -591,7 +481,7 @@
         d->cursorOn = (d->interactionFlags & Qt::TextSelectableByKeyboard);
     }
 
-    d->openInputPanel();
+    d->openInputPanel();        
 
     event->accept();
 }
@@ -624,7 +514,7 @@
 
     switch (event->type()) {
         case QEvent::FontChange: {
-            d->doc->setDefaultFont(font());
+            d->updatePlaceholderDocProperties();
             updateGeometry();
             break;
         }
@@ -635,6 +525,7 @@
             if (d->selectionControl) {
                 d->selectionControl->updatePrimitives();
             }
+            d->updatePlaceholderDocProperties();
             break;
         }
         default: {
@@ -655,19 +546,14 @@
  */
 void HbAbstractEdit::hideEvent(QHideEvent *event)
 {
+    Q_D(HbAbstractEdit);
     HbWidget::hideEvent(event);
 
     deselect();
 
-#if QT_VERSION >= 0x040600
-    // Send close input panel event.
-    QInputContext *ic = qApp->inputContext();
-    if (ic && !panel()) {
-        QEvent *closeEvent = new QEvent(QEvent::CloseSoftwareInputPanel);
-        ic->filterEvent(closeEvent);
-        delete closeEvent;
+    if(hasFocus() && !isReadOnly() && !panel()) {
+        d->closeInputPanel();
     }
-#endif
 }
 
 
@@ -769,6 +655,10 @@
 }
 
 /*!
+
+    \deprecated HbAbstractEdit::primitive(HbStyle::Primitive)
+         is deprecated.
+
     Returns pointer to a \a primitive of HbAbstractEdit.
 
     Available primitive is HbStyle::P_Edit_text.
@@ -797,16 +687,22 @@
 
     if (d->scrollArea) {
         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()));
-    if(d->scrollArea && canvasGeom.height()<d->scrollArea->size().height()) {
-        canvasGeom.setHeight(d->scrollArea->size().height());
+    if(d->scrollArea) {
+        canvasGeom.setHeight(qMax(d->scrollArea->size().height(), d->doc->size().height()));
     }
-    d->canvas->setGeometry(canvasGeom);
-    if (d->scrollArea) {
-        d->scrollArea->updateScrollMetrics();
+    //Changed from setGeometry() to setPreferredSize() because it causes
+    //weird input behavior otherwise.
+    d->canvas->setPreferredSize(canvasGeom.size());
+    d->ensureCursorVisible();
+    if (d->selectionControl) {
+        d->selectionControl->updatePrimitives();
     }
-    d->ensureCursorVisible();
+
 }
 
 /*!
@@ -1017,7 +913,7 @@
 {
     Q_D(HbAbstractEdit);
 
-    int cursorPos = d->hitTest(d->mousePressPos, Qt::FuzzyHit);
+    int cursorPos = d->hitTest(d->tapPosition, Qt::FuzzyHit);
 
     if (cursorPos == -1)
         return;
@@ -1308,12 +1204,38 @@
     painter->setOpacity(1.0);
 #endif
 
+    QRectF viewRect = d->viewPortRect();
+    QRectF intersected = option.exposedRect.intersected(mapRectToItem(d->canvas, viewRect));
+
+
     QAbstractTextDocumentLayout::PaintContext ctx = d->getPaintContext();
-    if (option.exposedRect.isValid())
-        painter->setClipRect(option.exposedRect, Qt::IntersectClip);
-    ctx.clip = option.exposedRect;
+    // Save painter state that will be modified
+    QRegion clipRegion = painter->clipRegion();
+
+    if (option.exposedRect.isValid()){
+        painter->setClipRect(intersected, Qt::IntersectClip);
+    }
+    ctx.clip = intersected;
 
     d->drawContentBackground(painter, option);
+
+    if(document()->isEmpty() && d->placeholderDoc && !d->placeholderDoc->isEmpty()) {
+        QTextBlock block = d->cursor.block();
+        QTextLayout *layout = block.layout();
+
+        if(!layout->preeditAreaText().length()) {
+            QColor textColor(ctx.palette.color(QPalette::Text));
+            QColor hintText(ctx.palette.color(QPalette::NoRole));
+            int cursorPos = ctx.cursorPosition;
+            ctx.cursorPosition = -1;
+            ctx.palette.setColor(QPalette::Text, hintText);
+
+            d->placeholderDoc->documentLayout()->draw(painter, ctx);
+
+            ctx.palette.setColor(QPalette::Text, textColor);
+            ctx.cursorPosition = cursorPos;
+        }
+    }
     document()->documentLayout()->draw(painter, ctx);
     // Draw the pins for the selection handle
     d->drawSelectionEdges(painter, ctx);
@@ -1329,6 +1251,8 @@
     painter->setPen(Qt::red);
     painter->drawRect(d->cursorRect());
 #endif
+    // Restore state
+    painter->setClipRegion(clipRegion);
 }
 
 /*!
@@ -1367,15 +1291,17 @@
 
     menu->setAttribute(Hb::InputMethodNeutral);
 
-    if (d->cursor.hasSelection() && d->canCopy()) {
+    if (d->cursor.hasSelection() && d->canCut()) {
         connect(
             menu->addAction("Cut"), SIGNAL(triggered()),
-            this, SLOT(cut()));
+            this, SLOT(cut()));       
+    }
+    if (d->cursor.hasSelection() && d->canCopy()) {
         connect(
             menu->addAction("Copy"), SIGNAL(triggered()),
             this, SLOT(copy()));
     }
-    else if (!d->doc->isEmpty() && d->canCopy()){
+    if (!d->cursor.hasSelection() && !d->doc->isEmpty() && d->canCopy()){
         connect(
             menu->addAction("Select"), SIGNAL(triggered()),
             this, SLOT(selectClickedWord()));
@@ -1399,7 +1325,7 @@
             this, SLOT(format()));
     }
 
-    emit aboutToShowContextMenu(menu, d->mousePressPos);
+    emit aboutToShowContextMenu(menu, d->tapPosition);
 
     d->minimizeInputPanel();
 
@@ -1437,34 +1363,40 @@
     d->updateEditingSize();
     HbWidget::updateGeometry();
 }
+
 /*!
-    Sets text alignment to \a alignment to the current text cursor.
+    Sets text default alignment to \a alignment.
+
+    \note This has impact only on those paragraphs (text blocks) for which
+    alignment was not set. This sets only a default value.
 
-    \sa alignment textCursor setTextCursor
+    If Qt::AlingAbsolute flag is not used then layoutDirection is
+    taken into account.
+
+    \sa alignment
 */
 void HbAbstractEdit::setAlignment(Qt::Alignment alignment)
 {
     Q_D(HbAbstractEdit);
     d->acceptSignalContentsChanged = false; // no text content changes.
-    QTextBlockFormat fmt;
-    fmt.setAlignment(alignment);
-    QTextCursor cursor = d->cursor;
-    cursor.mergeBlockFormat(fmt);
+    QTextOption option = document()->defaultTextOption();
+    option.setAlignment(alignment);
+    document()->setDefaultTextOption(option);
+    if (d->selectionControl) {
+        d->selectionControl->updatePrimitives();
+    }
     d->acceptSignalContentsChanged = true;
-    setTextCursor(cursor);
     d->mApiProtectionFlags |= HbWidgetBasePrivate::AC_TextAlign;
 }
 
 /*!
-    Returns text alignment at the current text cursor.
+    Returns text default alignment.
 
     \sa setAlignment()
 */
 Qt::Alignment HbAbstractEdit::alignment() const
 {
-    Q_D(const HbAbstractEdit);
-    return d->cursor.blockFormat().alignment();
-
+    return document()->defaultTextOption().alignment();
 }
 
 /*!
@@ -1511,6 +1443,60 @@
     d->contextMenuShownOn&=~flag;
 }
 
+
+/*!
+    \property HbAbstractEdit::placeholderText
+    \brief the editor's placeholder text
+
+    Setting this property makes the editor display a grayed-out
+    placeholder text as long as the text is empty.
+    By default, this property contains an empty string.
+*/
+QString HbAbstractEdit::placeholderText() const
+{
+    Q_D(const HbAbstractEdit);
+    if(d->placeholderDoc){
+        return d->placeholderDoc->toPlainText();
+    } else {
+        return QString();
+    }
+}
+
+/*!
+    \sa placeholderText()
+*/
+void HbAbstractEdit::setPlaceholderText(const QString& placeholderText)
+{
+    Q_D(HbAbstractEdit);
+
+    if(!d->placeholderDoc) {
+        d->placeholderDoc = new QTextDocument(this);
+        d->updatePlaceholderDocProperties();
+    }
+
+    QString txt( placeholderText );
+#ifdef HB_TEXT_MEASUREMENT_UTILITY
+    if ( HbFeatureManager::instance()->featureStatus( HbFeatureManager::TextMeasurement ) ) {
+        if (placeholderText.endsWith(QChar(LOC_TEST_END))) {
+            int index = placeholderText.indexOf(QChar(LOC_TEST_START));
+            setProperty( HbTextMeasurementUtilityNameSpace::textIdPropertyName,  placeholderText.mid(index + 1, placeholderText.indexOf(QChar(LOC_TEST_END)) - index - 1) );
+            setProperty( HbTextMeasurementUtilityNameSpace::textMaxLines, -1 );
+            txt = placeholderText.left(index);
+        } else {
+            setProperty( HbTextMeasurementUtilityNameSpace::textIdPropertyName,  QVariant::Invalid );
+        }
+    }
+#endif //HB_TEXT_MEASUREMENT_UTILITY
+
+
+    if (d->placeholderDoc->toPlainText() != txt) {
+        d->placeholderDoc->setPlainText(txt);
+        if (d->doc->isEmpty()) {
+            update();
+        }
+    }
+}
+
 /*!
     Returns the reference of the anchor at the given position,
     or an empty string if no anchor exists at that point.
@@ -1625,37 +1611,42 @@
 void HbAbstractEdit::polish( HbStyleParameters& params )
 {
     Q_D(HbAbstractEdit);
-    const QString KTextAlignmentCSSName = "text-align";
-    const QString KTextColorCSSName = "color";
+
+    if (isVisible()) {
+        const QString KTextAlignmentCSSName = "text-align";
+        const QString KTextColorCSSName = "color";
 
-    // ------ adding css parameters ------
-    params.addParameter(KTextAlignmentCSSName);
+        // ------ adding css parameters ------
+        params.addParameter(KTextAlignmentCSSName);
 
-    QPalette cssPalette = palette();
-    params.addParameter(KTextColorCSSName, cssPalette.color(QPalette::Text));
+        QPalette cssPalette = palette();
+        params.addParameter(KTextColorCSSName, cssPalette.color(QPalette::Text));
 
-    HbWidget::polish(params);
+        HbWidget::polish(params);
 
-    // ------ interpreting css parameters ------
-    QVariant param = params.value(KTextAlignmentCSSName);
-    if(param.canConvert(QVariant::String)) {
-        Qt::Alignment align = HbAbstractEditPrivate::alignmentFromString(param.toString());
-        if( align != 0 ) {
-            if (!(d->mApiProtectionFlags & HbWidgetBasePrivate::AC_TextAlign)) {
-                setAlignment(align);
-                d->mApiProtectionFlags &= ~HbWidgetBasePrivate::AC_TextAlign;
+        // ------ interpreting css parameters ------
+        QVariant param = params.value(KTextAlignmentCSSName);
+        if(param.canConvert(QVariant::String)) {
+            Qt::Alignment align = HbAbstractEditPrivate::alignmentFromString(param.toString());
+            if( align != 0 ) {
+                if (!(d->mApiProtectionFlags & HbWidgetBasePrivate::AC_TextAlign)) {
+                    setAlignment(align);
+                    d->mApiProtectionFlags &= ~HbWidgetBasePrivate::AC_TextAlign;
+                }
+            } else {
+                qWarning("Unable to read CSS parameter \"text-alignment\" in editor");
             }
-        } else {
-            qWarning("Unable to read CSS parameter \"text-alignment\" in editor");
         }
-    }
 
-    param = params.value(KTextColorCSSName);
-    if(param.canConvert(QVariant::Color)) {
-        cssPalette.setColor(QPalette::Text, param.value<QColor>());
+        param = params.value(KTextColorCSSName);
+        if(param.canConvert(QVariant::Color)) {
+            cssPalette.setColor(QPalette::Text, param.value<QColor>());
+        }
+
+        setPalette(cssPalette);
+    } else {
+        HbWidget::polish(params);
     }
-
-    setPalette(cssPalette);
 }
 
 /*!
@@ -1679,3 +1670,44 @@
 {
     return document()->characterAt(pos);
 }
+
+void HbAbstractEdit::gestureEvent(QGestureEvent* event) {
+    Q_D(HbAbstractEdit);
+
+    if(HbTapGesture *tap = qobject_cast<HbTapGesture*>(event->gesture(Qt::TapGesture))) {
+        // QTapGesture::position() is in screen coordinates and thus
+        // needs to be transformed into items own coordinate system.
+        // The QGestureEvent knows the viewport through which the gesture
+        // was triggered.
+        QPointF pos = mapFromScene(event->mapToGraphicsScene(tap->position()));
+        switch(tap->state()) {
+        case Qt::GestureStarted:
+            d->tapPosition = pos;
+            HbWidgetFeedback::triggered(this, Hb::InstantPressed);
+            break;
+        case Qt::GestureUpdated:
+            if(tap->tapStyleHint() == HbTapGesture::TapAndHold) {
+                d->longTapGesture(pos);
+            }
+            break;
+      case Qt::GestureFinished:
+            if(tap->tapStyleHint() == HbTapGesture::TapAndHold) {
+            } else {
+                d->tapGesture(pos);
+            }
+
+            HbWidgetFeedback::triggered(this, Hb::InstantReleased);
+
+            d->openInputPanel();
+            
+            break;
+      case Qt::GestureCanceled:
+            break;
+      default:
+            break;
+        }
+        event->accept();
+    } else {
+        event->ignore();
+    }
+}
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/editors/hbabstractedit.h
--- a/src/hbwidgets/editors/hbabstractedit.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/editors/hbabstractedit.h	Mon May 03 12:48:33 2010 +0300
@@ -55,6 +55,7 @@
     Q_PROPERTY(Hb::TextContextMenuFlags contextMenuFlags
                READ contextMenuFlags
                WRITE setContextMenuFlags)
+    Q_PROPERTY(QString placeholderText READ placeholderText WRITE setPlaceholderText)
 
 public:
     virtual ~HbAbstractEdit();
@@ -74,7 +75,6 @@
     QGraphicsItem *primitive(HbStyle::Primitive primitive) const;
 
     bool event(QEvent* event);
-    bool eventFilter(QObject *obj, QEvent *event);
 
     enum { Type = Hb::ItemType_AbstractEdit };
     int type() const;
@@ -87,6 +87,9 @@
     void setContextMenuFlag(Hb::TextContextMenuFlag flag);
     void clearContextMenuFlag(Hb::TextContextMenuFlag flag);
 
+    QString placeholderText() const;
+    void setPlaceholderText(const QString &text);
+
     QString anchorAt(const QPointF &pos) const;
     QString anchorAt(int pos) const;
 
@@ -133,10 +136,6 @@
     void keyPressEvent(QKeyEvent *event);
     void keyReleaseEvent(QKeyEvent *event);
 
-    void mousePressEvent(QGraphicsSceneMouseEvent *event);
-    void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
-    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
-
     void focusInEvent(QFocusEvent *event);
     void focusOutEvent(QFocusEvent *event);
 
@@ -173,6 +172,7 @@
 
     void polish( HbStyleParameters& params );
     QVariant itemChange(GraphicsItemChange change, const QVariant &value);
+    void gestureEvent(QGestureEvent* e);
 
 protected slots:
     void setPlainText(const QString &text);
@@ -193,6 +193,9 @@
     Q_PRIVATE_SLOT(d_func(), void _q_contentsChanged())
     Q_PRIVATE_SLOT(d_func(), void _q_contentsChange(int, int, int))
     Q_PRIVATE_SLOT(d_func(), void _q_selectionChanged())
+    Q_PRIVATE_SLOT(d_func(), void _q_scrollStarted())
+    Q_PRIVATE_SLOT(d_func(), void _q_scrollEnded())
+
 
     friend class HbEditItem;
     friend class HbEditorFocusObject;
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/editors/hbabstractedit_p.cpp
--- a/src/hbwidgets/editors/hbabstractedit_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/editors/hbabstractedit_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -43,7 +43,7 @@
 #include "hbmenu.h"
 #include "hbselectioncontrol_p.h"
 #include "hbcolorscheme.h"
-#include "hbsmileyengine.h"
+#include "hbsmileyengine_p.h"
 #include "hbtextmeasurementutility_p.h"
 #include "hbfeaturemanager_p.h"
 #include "hbinputeditorinterface.h"
@@ -113,7 +113,20 @@
         }
 
         painter->restore();
-    };
+    }
+
+    void changeEvent(QEvent *event)
+    {
+        HbWidget::changeEvent(event);
+
+        switch (event->type()) {
+        case QEvent::FontChange:
+            edit->document()->setDefaultFont(font());
+            break;
+        default:
+            ;
+        }
+    }
 
     HbAbstractEdit *edit;
 };
@@ -133,72 +146,6 @@
 }
 
 
-/*
- * HbEditScrollArea
- */
-
-HbEditScrollArea::HbEditScrollArea(HbAbstractEdit* edit, QGraphicsItem* parent)
-    : HbScrollArea(parent),
-      mEdit(edit)
-{
-    setFlag(QGraphicsItem::ItemIsFocusable, false);
-}
-
-void HbEditScrollArea::updateScrollMetrics() {
-    Q_D(HbScrollArea);
-    d->updateScrollMetrics();
-}
-
-void HbEditScrollArea::resizeEvent(QGraphicsSceneResizeEvent *event) {
-    HbScrollArea::resizeEvent(event);
-    emit scrollAreaSizeChanged();
-}
-
-#ifdef HB_DEBUG_EDITOR_DRAW_RECTS
-void HbEditScrollArea::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0)
-{
-    Q_UNUSED(widget);
-    Q_UNUSED(option);
-
-    painter->save();
-    painter->setPen(Qt::red);
-    painter->drawRect(boundingRect().adjusted(1,1,-1,-1));
-
-    painter->restore();
-}
-#endif//HB_DEBUG_EDITOR_DRAW_RECTS
-
-
-void HbEditScrollArea::longPressGesture(const QPointF &point)
-{
-    HbAbstractEditPrivate::d_ptr(mEdit)->gestureReceived();
-    HbAbstractEditPrivate::d_ptr(mEdit)->longPressGesture(point);
-}
-
-void HbEditScrollArea::upGesture(int value){
-    HbScrollArea::upGesture(value);
-    HbAbstractEditPrivate::d_ptr(mEdit)->gestureReceived();
-}
-
-void HbEditScrollArea::downGesture(int value){
-    HbScrollArea::downGesture(value);
-    HbAbstractEditPrivate::d_ptr(mEdit)->gestureReceived();
-}
-
-void HbEditScrollArea::leftGesture(int value){
-    HbScrollArea::leftGesture(value);
-    HbAbstractEditPrivate::d_ptr(mEdit)->gestureReceived();
-}
-
-void HbEditScrollArea::rightGesture(int value){
-    HbScrollArea::rightGesture(value);
-    HbAbstractEditPrivate::d_ptr(mEdit)->gestureReceived();
-}
-
-void HbEditScrollArea::panGesture(const QPointF &point){
-    HbScrollArea::panGesture(point);
-    HbAbstractEditPrivate::d_ptr(mEdit)->gestureReceived();
-}
 
 QStringList HbAbstractEditMimeData::formats() const
 {
@@ -228,13 +175,14 @@
 HbAbstractEditPrivate::HbAbstractEditPrivate () :
     HbWidgetPrivate(),
     doc(0),
+    placeholderDoc(0),
     validator(0),
     imEditInProgress(false),
     imPosition(0),
     imAdded(0),
     imRemoved(0),
     interactionFlags(Qt::TextEditorInteraction),
-    mousePressPos(-1, -1),
+    tapPosition(-1, -1),
     cursorOn(false),
     preeditCursor(0),
     preeditCursorVisible(true),
@@ -273,17 +221,15 @@
 
     updatePaletteFromTheme();
 
-    scrollArea = new HbEditScrollArea(q, q);
-    //scrollArea->setFlag(QGraphicsItem::ItemClipsChildrenToShape, true);
+    scrollArea = new HbScrollArea(q);
     scrollArea->setClampingStyle(HbScrollArea::StrictClamping);
     scrollArea->setFrictionEnabled(true);
     scrollArea->setScrollDirections(Qt::Vertical);
     scrollArea->setVerticalScrollBarPolicy(HbScrollArea::ScrollBarAlwaysOff);
     scrollArea->setContentWidget(canvas);
-    scrollArea->installEventFilter(q);
-    scrollArea->setLongPressEnabled(true);
     scrollArea->setFlag(QGraphicsItem::ItemIsFocusable, false);
-    QObject::connect(scrollArea, SIGNAL(scrollAreaSizeChanged()), q, SLOT(updatePrimitives()));
+    QObject::connect(scrollArea, SIGNAL(scrollingStarted()), q, SLOT(_q_scrollStarted()));
+    QObject::connect(scrollArea, SIGNAL(scrollingEnded()), q, SLOT(_q_scrollEnded()));
     QObject::connect(q, SIGNAL(selectionChanged(QTextCursor,QTextCursor)), q, SLOT(_q_selectionChanged()));
     HbStyle::setItemName(scrollArea, QString("text"));
 
@@ -297,6 +243,7 @@
 
     contextMenuShownOn = Hb::ShowTextContextMenuOnSelectionClicked | Hb::ShowTextContextMenuOnLongPress;
 
+    q->grabGesture(Qt::TapGesture);
 }
 
 void HbAbstractEditPrivate::updatePaletteFromTheme()
@@ -359,8 +306,6 @@
     // set char format then.
     const QTextCharFormat charFormatForInsertion = cursor.charFormat();
 
-    const QTextCursor oldSelection = cursor;
-
     bool clearDocument = true;
     if (!doc) {
         connectToNewDocument(new QTextDocument(q));
@@ -578,7 +523,6 @@
 
 void HbAbstractEditPrivate::repaintOldAndNewSelection(const QTextCursor &oldSelection)
 {
-    //Q_Q(HbAbstractEdit);
     if (cursor.hasSelection()
         && oldSelection.hasSelection()
         && cursor.currentFrame() == oldSelection.currentFrame()
@@ -633,6 +577,7 @@
 {
     if (scrollArea && scrollable) {
         QRectF rect = rectForPositionInCanvasCoords(position, QTextLine::Leading);
+        rect.adjust(0, -doc->documentMargin(), 0, doc->documentMargin());
         // TODO: it seems that scrollArea->ensureVisible() expects the point
         //       in its content coordinates. Probably it should use viewport
         //       coordinates i.e. its own item coordinate system
@@ -644,6 +589,9 @@
 void HbAbstractEditPrivate::ensureCursorVisible()
 {
     ensurePositionVisible(cursor.position());
+    if(selectionControl) {
+        selectionControl->updatePrimitives();
+    }
 }
 
 void HbAbstractEditPrivate::setTextInteractionFlags(Qt::TextInteractionFlags flags)
@@ -700,18 +648,33 @@
 {
     Q_Q(HbAbstractEdit);
 
-    if (cursor.hasSelection()) {
-        if (!selectionControl) {
-            selectionControl = new HbSelectionControl(q);
-        }
-        selectionControl->showHandles();
-        q->update();
+    if (cursor.hasSelection()) {   
+        if (selectionControl) {
+            selectionControl->showHandles();
+            q->update();
+        }      
     } else if (selectionControl){
         selectionControl->hideHandles();
         q->update();
     }
 }
 
+void HbAbstractEditPrivate::_q_scrollStarted()
+{
+    if (selectionControl) {
+        selectionControl->scrollStarted();
+    }
+}
+
+
+void HbAbstractEditPrivate::_q_scrollEnded()
+{
+    if (selectionControl) {
+        selectionControl->scrollFinished();
+    }
+}
+
+
 void HbAbstractEditPrivate::validateAndCorrect()
 {
     if (validator && !imEditInProgress) {
@@ -953,9 +916,24 @@
         r = QRectF(layoutPos.x(), layoutPos.y(), cursorWidth, 10); // #### correct height
     }
 
+    if(layout->preeditAreaText().length()) {
+        r.adjust(0,0,q->blockBoundingRect(block).width()/2,0);
+    }
+
     return r;
 }
 
+/*
+  Returns the viewport rectangle in editor coordinate system.
+*/
+QRectF HbAbstractEditPrivate::viewPortRect() const
+{
+    QRectF viewRect = scrollArea->geometry();
+    qreal margin = doc->documentMargin();
+    viewRect.adjust(0,margin,0,-margin);
+    return viewRect;
+}
+
 int HbAbstractEditPrivate::contentLength() const
 {
     QTextBlock block = doc->lastBlock();
@@ -993,6 +971,13 @@
 #endif//QT_NO_CLIPBOARD
 }
 
+
+bool HbAbstractEditPrivate::canCut() const
+{
+    return (canCopy() && (interactionFlags & Qt::TextEditable));
+}
+
+
 bool HbAbstractEditPrivate::canFormat() const
 {
     return formatDialog != 0;
@@ -1003,24 +988,26 @@
     return preeditCursorVisible && apiCursorVisible;
 }
 
-void HbAbstractEditPrivate::sendMouseEventToInputContext(const QGraphicsSceneMouseEvent *e) const
+void HbAbstractEditPrivate::sendMouseEventToInputContext(const QPointF &tapPos) const
 {
-    QPointF pos = e->pos();
-    int cursorPos = hitTest(pos, Qt::FuzzyHit);
-    if (cursorPos == -1)
-        return;
+    Q_Q(const HbAbstractEdit);
 
     QTextLayout *layout = cursor.block().layout();
+    int cursorPos = hitTest(tapPos, Qt::ExactHit);
+
+    if (cursorPos == -1) {
+            cursorPos = cursor.position() + layout->preeditAreaText().length();
+    }
+
     if (layout && !layout->preeditAreaText().isEmpty()) {
         QInputContext *ctx = qApp->inputContext();
         if (ctx) {
-            QMouseEvent ev(QEvent::MouseButtonPress, pos.toPoint(), e->scenePos().toPoint(),
-                           e->button(), e->buttons(), e->modifiers());
+            QMouseEvent ev(QEvent::MouseButtonPress, tapPos.toPoint(), q->mapToScene(tapPos).toPoint(),
+                           Qt::NoButton, Qt::NoButton, Qt::NoModifier);
             ctx->mouseHandler(cursorPos - cursor.position(), &ev);
         }
     }
 }
-
 void HbAbstractEditPrivate::updateEditingSize()
 {
 }
@@ -1051,10 +1038,7 @@
 
     QObject::connect(doc, SIGNAL(contentsChanged()), q, SLOT(_q_contentsChanged()));
     QObject::connect(doc, SIGNAL(contentsChange(int, int, int)), q, SLOT(_q_contentsChange(int, int, int)));
-
-    //QObject::connect(doc, SIGNAL(cursorPositionChanged(QTextCursor)), q, SLOT(emitCursorPosChanged(QTextCursor)));
     QObject::connect(doc, SIGNAL(documentLayoutChanged()), q, SLOT(documentLayoutChanged()));
-
     QObject::connect(doc, SIGNAL(blockCountChanged(int)), q, SLOT(blockCountChanged(int)));
 
     doc->setModified(false);
@@ -1062,14 +1046,13 @@
     q->documentLayoutChanged();
 }
 
-void HbAbstractEditPrivate::longPressGesture(const QPointF &point)
+void HbAbstractEditPrivate::longTapGesture(const QPointF &point)
 {
     Q_Q(HbAbstractEdit);
 
     if(contextMenuShownOn.testFlag(Hb::ShowTextContextMenuOnLongPress)) {
-        mousePressPos = q->mapFromScene(point);
 
-        int cursorPos = hitTest(mousePressPos, Qt::FuzzyHit);
+        int cursorPos = hitTest(point, Qt::FuzzyHit);
         if (cursorPos == -1)
             return;
 
@@ -1079,34 +1062,57 @@
             && cursorPos <= cursor.selectionEnd()){
             return;
         }
-        q->showContextMenu(point);
+        q->showContextMenu(q->mapToScene(point));
+    }
+}
+
+void HbAbstractEditPrivate::tapGesture(const QPointF &point)
+{
+    Q_Q(HbAbstractEdit);
+
+    if (interactionFlags & Qt::NoTextInteraction)
+        return;
+
+    bool removeSelection = (hitTest(point, Qt::ExactHit) == -1);
+
+    if (removeSelection && cursor.hasSelection()) {
+        const QTextCursor oldCursor = cursor;
+        cursor.clearSelection();
+        repaintOldAndNewSelection(oldCursor);
+        emit q->selectionChanged(oldCursor, cursor);
     }
 
-    //TODO:
-    // this call is needed because now the panStarted is called in mousePressEvent
-    // and panFinished is called in mouseReleaseEvent, but in longPress case the mouseRelease is not called
-    // Once the this gesture bug is fixed this needs to be removed!
-    if (selectionControl) {
-        selectionControl->panFinished();
+    int newCursorPos = hitTest(point, Qt::FuzzyHit);
+
+    if (cursor.hasSelection() &&
+        newCursorPos >= cursor.selectionStart() &&
+        newCursorPos <= cursor.selectionEnd()){
+        // we have a selection under mouse click
+        if (contextMenuShownOn.testFlag(Hb::ShowTextContextMenuOnSelectionClicked)) {
+            q->showContextMenu(q->mapToScene(point));
+        }
+    } else {
+        // Currently focused widget to listen to InputContext before updating the cursor position
+        sendMouseEventToInputContext(point);
+        // need to get the cursor position again since input context can change the document
+        newCursorPos = hitTest(point, Qt::FuzzyHit);
+        setCursorPosition(newCursorPos);
+
+        if (interactionFlags & Qt::TextEditable) {
+            updateCurrentCharFormat();
+        }
+        cursorChanged(HbValidator::CursorChangeFromMouse);
     }
 }
 
+
+
 void HbAbstractEditPrivate::gestureReceived()
 {
     wasGesture = true;
 }
 
 
-void HbAbstractEditPrivate::hideSelectionHandles()
-{
-    Q_Q(HbAbstractEdit);
-    if (selectionControl){
-        selectionControl->hideHandles();
-    }
-    q->update();
-}
-
-
 void HbAbstractEditPrivate::drawSelectionEdges(QPainter *painter, QAbstractTextDocumentLayout::PaintContext ctx)
 {
     if (cursor.hasSelection() && selectionControl && selectionControl->isVisible()){
@@ -1155,6 +1161,17 @@
     return smileyEngine;
 }
 
+void HbAbstractEditPrivate::updatePlaceholderDocProperties()
+{
+
+    if(placeholderDoc) {
+        placeholderDoc->setDocumentMargin(doc->documentMargin());
+        placeholderDoc->setDefaultTextOption(doc->defaultTextOption());
+        placeholderDoc->setDefaultFont(doc->defaultFont());
+        placeholderDoc->setTextWidth(doc->textWidth());
+    }
+}
+
 Qt::Alignment HbAbstractEditPrivate::alignmentFromString(const QString &text)
 {
     Qt::Alignment align(0);
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/editors/hbabstractedit_p.h
--- a/src/hbwidgets/editors/hbabstractedit_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/editors/hbabstractedit_p.h	Mon May 03 12:48:33 2010 +0300
@@ -66,38 +66,6 @@
 class HbSmileyEngine;
 class HbFormatDialog;
 
-class HbEditScrollArea: public HbScrollArea
-{
-    Q_OBJECT
-
-public:
-    explicit HbEditScrollArea(HbAbstractEdit* edit, QGraphicsItem* parent = 0);
-    virtual ~HbEditScrollArea() {};
-
-    void updateScrollMetrics();
-    void resizeEvent(QGraphicsSceneResizeEvent *event);
-
-#ifdef HB_DEBUG_EDITOR_DRAW_RECTS
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
-#endif//HB_DEBUG_EDITOR_DRAW_RECTS
-
-signals:
-    void scrollAreaSizeChanged();
-
-public slots:
-    void longPressGesture(const QPointF &point);
-
-    void upGesture(int value);
-    void downGesture(int value);
-    void leftGesture(int value);
-    void rightGesture(int value);
-    void panGesture(const QPointF &point);
-
-private:
-    Q_DECLARE_PRIVATE_D( d_ptr, HbScrollArea )
-    HbAbstractEdit* mEdit;
-};
-
 class HbAbstractEditMimeData : public QMimeData
 {
 public:
@@ -151,16 +119,19 @@
     QRectF selectionRect(const QTextCursor &cursor) const;
     QRectF selectionRect() const;
     QRectF rectForPositionInCanvasCoords(int position, QTextLine::Edge edge) const;
+    QRectF viewPortRect() const;
     QValidator::State validateContent(int position, int charsRemoved, int charsAdded);
     void initValidator();
     bool undo();
     virtual bool canPaste() const;
     virtual bool canCopy() const;
+    virtual bool canCut() const;
     virtual void prepDocForPaste();
     bool canFormat() const;
     virtual bool isCursorVisible() const;
 
-    void longPressGesture(const QPointF &point);
+    void longTapGesture(const QPointF &point);
+    void tapGesture(const QPointF &point);
     void gestureReceived();
 
     void sendInputPanelEvent(QEvent::Type type);
@@ -170,25 +141,30 @@
 
     int contentLength() const;
     bool hasAcceptableInput() const;
-    void sendMouseEventToInputContext(const QGraphicsSceneMouseEvent *e) const;
+    void sendMouseEventToInputContext(const QPointF &tapPos) const;
     virtual void updateEditingSize();
-    void hideSelectionHandles();
     void drawSelectionEdges(QPainter *painter, QAbstractTextDocumentLayout::PaintContext);
     HbSmileyEngine* smileyEngineInstance() const;
 
     virtual void drawContentBackground(QPainter *painter,
                                        const QStyleOptionGraphicsItem &option) const;
 
+    void updatePlaceholderDocProperties();
+
     void _q_updateRequest(QRectF rect);
     void _q_updateBlock(QTextBlock block);
     void _q_contentsChanged();
     void _q_contentsChange(int position, int charsRemoved, int charsAdded);
     void _q_selectionChanged();
+    void _q_scrollStarted();
+    void _q_scrollEnded();
     static Qt::Alignment alignmentFromString(const QString &text);
 
     void validateAndCorrect();
 
     QTextDocument *doc;
+    QTextDocument *placeholderDoc;
+
     int previousCursorAnchor;
     int previousCursorPosition;
     QTextCursor cursor;
@@ -201,7 +177,7 @@
     int imRemoved;
 
     Qt::TextInteractionFlags interactionFlags;
-    QPointF mousePressPos;
+    QPointF tapPosition;
     bool cursorOn;
 
     QTextCharFormat lastCharFormat;
@@ -212,7 +188,7 @@
     bool apiCursorVisible;
 
     HbWidget *canvas;
-    HbEditScrollArea *scrollArea;
+    HbScrollArea *scrollArea;
 
     bool scrollable;
     bool hadSelectionOnMousePress;
@@ -233,6 +209,7 @@
     HbFormatDialogPointer formatDialog;
     QTextCursor nextCharCursor;
 
+
 private:
     static HbAbstractEditPrivate *d_ptr(HbAbstractEdit *edit) {
         Q_ASSERT(edit);
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/editors/hbformatdialog.cpp
--- a/src/hbwidgets/editors/hbformatdialog.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/editors/hbformatdialog.cpp	Mon May 03 12:48:33 2010 +0300
@@ -139,53 +139,53 @@
         d->layout->addItem(d->buttonColor, 0, 3, 1, 1);
 
         d->buttonAlignLeft = new HbPushButton(container);
-        d->buttonAlignLeft->setIcon(HbIcon("qtg_mono_text_align_left.svg"));
+        d->buttonAlignLeft->setIcon(HbIcon("qtg_mono_text_align_left"));
         d->buttonAlignLeft->setCheckable(true);
         connect(d->buttonAlignLeft, SIGNAL(toggled(bool)), SLOT(setAlignmentLeft(bool))); 
         connect(d->buttonAlignLeft, SIGNAL(toggled(bool)), SLOT(_q_setAlignment(bool))); 
         d->layout->addItem(d->buttonAlignLeft, 1, 0);
 
         d->buttonAlignCenter = new HbPushButton(container);
-        d->buttonAlignCenter->setIcon(HbIcon("qtg_mono_text_align_center.svg"));
+        d->buttonAlignCenter->setIcon(HbIcon("qtg_mono_text_align_center"));
         d->buttonAlignCenter->setCheckable(true);
         connect(d->buttonAlignCenter, SIGNAL(toggled(bool)), SLOT(setAlignmentCenter(bool)));
         connect(d->buttonAlignCenter, SIGNAL(toggled(bool)), SLOT(_q_setAlignment(bool)));
         d->layout->addItem(d->buttonAlignCenter, 1, 1);
 
         d->buttonAlignRight = new HbPushButton(container);
-        d->buttonAlignRight->setIcon(HbIcon("qtg_mono_text_align_right.svg"));
+        d->buttonAlignRight->setIcon(HbIcon("qtg_mono_text_align_right"));
         d->buttonAlignRight->setCheckable(true);
         connect(d->buttonAlignRight, SIGNAL(toggled(bool)), SLOT(setAlignmentRight(bool)));
         connect(d->buttonAlignRight, SIGNAL(toggled(bool)), SLOT(_q_setAlignment(bool)));
         d->layout->addItem(d->buttonAlignRight, 1, 2);
 
         d->buttonAlignJustify = new HbPushButton(container);
-        d->buttonAlignJustify->setIcon(HbIcon("qtg_mono_text_align_justify.svg"));
+        d->buttonAlignJustify->setIcon(HbIcon("qtg_mono_text_align_justify"));
         d->buttonAlignJustify->setCheckable(true);
         connect(d->buttonAlignJustify, SIGNAL(toggled(bool)), SLOT(setAlignmentJustify(bool)));
         connect(d->buttonAlignJustify, SIGNAL(toggled(bool)), SLOT(_q_setAlignment(bool)));
         d->layout->addItem(d->buttonAlignJustify, 1, 3);
 
         d->buttonBold = new HbPushButton(container);
-        d->buttonBold->setIcon(HbIcon("qtg_mono_bold.svg")); 
+        d->buttonBold->setIcon(HbIcon("qtg_mono_bold"));
         d->buttonBold->setCheckable(true);
         connect(d->buttonBold, SIGNAL(toggled(bool)), SLOT(setStyleBold(bool)));
         d->layout->addItem(d->buttonBold, 2, 0);
 
         d->buttonItalic = new HbPushButton(container);
-        d->buttonItalic->setIcon(HbIcon("qtg_mono_italic.svg"));
+        d->buttonItalic->setIcon(HbIcon("qtg_mono_italic"));
         d->buttonItalic->setCheckable(true);
         connect(d->buttonItalic, SIGNAL(toggled(bool)), SLOT(setStyleItalic(bool)));
         d->layout->addItem(d->buttonItalic, 2, 1);
 
         d->buttonUnderline = new HbPushButton(container);
-        d->buttonUnderline->setIcon(HbIcon("qtg_mono_underline.svg"));
+        d->buttonUnderline->setIcon(HbIcon("qtg_mono_underline"));
         d->buttonUnderline->setCheckable(true);
         connect(d->buttonUnderline, SIGNAL(toggled(bool)), SLOT(setStyleUnderline(bool)));
         d->layout->addItem(d->buttonUnderline, 2, 2);
 
         d->buttonBullet = new HbPushButton(container);
-        d->buttonBullet->setIcon(HbIcon("qtg_mono_bullet.svg"));
+        d->buttonBullet->setIcon(HbIcon("qtg_mono_bullet"));
         d->buttonBullet->setCheckable(true);
         connect(d->buttonBullet, SIGNAL(toggled(bool)), SLOT(setStyleBullet(bool)));
         d->layout->addItem(d->buttonBullet, 2, 3);
@@ -197,8 +197,7 @@
 
     // Update content
     d->comboSize->setCurrentIndex(d->comboSize->findText(QString::number(format.font().pointSize())));
-
-    d->colorChanged(format.foreground().color());
+    d->colorChanged(currentCharColor());
 
     d->buttonAlignLeft->setChecked(cursor.blockFormat().alignment() == Qt::AlignLeft);
     d->buttonAlignCenter->setChecked(cursor.blockFormat().alignment() == Qt::AlignCenter);
@@ -262,8 +261,8 @@
         cursor.select(QTextCursor::WordUnderCursor);
         int selectionStart = cursor.selectionStart();
         int selectionEnd = cursor.selectionEnd();
-        if (position == selectionStart || position == selectionEnd || currentChar.isSpace()) {
-            HbAbstractEditPrivate::d_ptr(d->editor)->nextCharCursor.mergeCharFormat(format);
+        if (position == selectionStart || position == selectionEnd || currentChar.isSpace()) {            
+            HbAbstractEditPrivate::d_ptr(d->editor)->nextCharCursor.mergeCharFormat(format);            
         } else {
             cursor.mergeCharFormat(format); 
         }
@@ -271,6 +270,23 @@
 }
 
 /*!
+   Gets current character color, which can be either default or user changed.
+ */
+QColor HbFormatDialog::currentCharColor() const
+{
+    Q_D(const HbFormatDialog);
+
+    if (!d->editor) return QColor().convertTo(QColor::Invalid);
+    QTextCharFormat format = d->editor->textCursor().charFormat();
+    QVariant property = format.property(QTextFormat::ForegroundBrush);   
+    bool isBrush = (property.userType() == QVariant::Brush);
+    QColor color = format.colorProperty(QTextFormat::ForegroundBrush);
+    QColor foregoundColor = format.foreground().color();
+    QColor defaultColor = d->editor->palette().color(QPalette::Text);
+    return (isBrush && !color.isValid()) ? foregoundColor : defaultColor;
+}
+
+/*!
    Sets font size as \a size for a selection, word under cursor or new chars after cursor position 
  */
 void HbFormatDialog::setFontPointSize(const QString &size)
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/editors/hbformatdialog.h
--- a/src/hbwidgets/editors/hbformatdialog.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/editors/hbformatdialog.h	Mon May 03 12:48:33 2010 +0300
@@ -62,6 +62,7 @@
     void setStyleBullet(bool toggled);
 
 protected:
+    QColor currentCharColor() const;
     virtual void setContent(QTextCursor cursor);
     virtual void polish(HbStyleParameters& params);
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/editors/hbformatdialog_p.cpp
--- a/src/hbwidgets/editors/hbformatdialog_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/editors/hbformatdialog_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -45,7 +45,8 @@
 #include <QTextCursor>
 #include <QPainter>
 
-HbFormatDialogPrivate::HbFormatDialogPrivate()
+HbFormatDialogPrivate::HbFormatDialogPrivate() :
+    editor(0)
 {}
 
 HbFormatDialogPrivate::~HbFormatDialogPrivate()
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/editors/hblineedit.cpp
--- a/src/hbwidgets/editors/hblineedit.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/editors/hblineedit.cpp	Mon May 03 12:48:33 2010 +0300
@@ -34,10 +34,10 @@
 #endif //HB_TEXT_MEASUREMENT_UTILITY
 
 #include <QFontMetrics>
-#include <QGraphicsSceneMouseEvent>
 #include <QPainter>
 #include <QTextBlock>
 #include <QTextDocument>
+#include <QGraphicsSceneResizeEvent>
 
 /*!
  \class HbLineEdit
@@ -180,17 +180,26 @@
     Q_D(HbLineEdit);
     d->setApiProtectionFlag(HbWidgetBasePrivate::AC_TextLinesMin, true);
 
-    if (rows > 0) {
+    if (rows<=0) {
+        qWarning("HbLineEdit::setMinRows wrong argument, value \"%d\" has been ignored.",
+                 rows);
+        return;
+    }
+
+    if (rows != d->minimumRows) {
         d->minimumRows = rows;
 
         if (d->minimumRows > d->maximumRows) {
             d->maximumRows = d->minimumRows;
         }
-        d->expandable = isExpandable();
 
         d->updateWrappingMode();
 
-        updateGeometry();
+        if (d->adjustFontSizeToFitHeight) {
+            d->readjustStretchFont();
+        } else {
+            updateGeometry();
+        }
     }
 }
 
@@ -226,18 +235,26 @@
     Q_D(HbLineEdit);
     d->setApiProtectionFlag(HbWidgetBasePrivate::AC_TextLinesMax, true);
 
-    if (rows > 0) {
+    if (rows<=0) {
+        qWarning("HbLineEdit::setMaxRows wrong argument, value \"%d\" has been ignored.",
+                 rows);
+        return;
+    }
+
+    if (rows != d->maximumRows) {
         d->maximumRows = rows;
 
         if (d->maximumRows  < d->minimumRows) {
             d->minimumRows = d->maximumRows;
         }
 
-        d->expandable = isExpandable();
-
         d->updateWrappingMode();
 
-        updateGeometry();
+        if (d->adjustFontSizeToFitHeight) {
+            d->readjustStretchFont();
+        } else {
+            updateGeometry();
+        }
 
 #ifdef HB_TEXT_MEASUREMENT_UTILITY
         if ( HbFeatureManager::instance()->featureStatus( HbFeatureManager::TextMeasurement ) ) {
@@ -575,16 +592,6 @@
 /*!
     \reimp
  */
-void HbLineEdit::resizeEvent(QGraphicsSceneResizeEvent *event)
-{
-    HbAbstractEdit::resizeEvent(event);
-
-    document()->setTextWidth(primitive(HbStyle::P_Edit_text)->boundingRect().width());
-}
-
-/*!
-    \reimp
- */
 bool HbLineEdit::canInsertFromMimeData(const QMimeData *source) const
 {
     return source->hasText() && !source->text().isEmpty();
@@ -620,7 +627,6 @@
 void HbLineEdit::focusOutEvent(QFocusEvent * event)
 {
     Q_D(HbLineEdit);
-    setBackgroundItem(HbStyle::P_LineEdit_frame_normal);
 
     if(echoMode() == HbLineEdit::PasswordEchoOnEdit) {
         setPlainText(d->passwordString(d->passwordText));
@@ -637,7 +643,6 @@
 void HbLineEdit::focusInEvent(QFocusEvent * event)
 {
     Q_D(HbLineEdit);
-    setBackgroundItem(HbStyle::P_LineEdit_frame_highlight);
 
     if(echoMode() == HbLineEdit::PasswordEchoOnEdit) {
         // we need to clear the editor when typing starts
@@ -646,3 +651,58 @@
 
     HbAbstractEdit::focusInEvent(event);
 }
+
+/*!
+    @proto
+
+    Enables or disables vertical font stretch mode.
+
+    In this mode font size is depending on editor size and number of rows.
+    Font is adjusted in such way to show as much text as possible and as big
+    as possible and still have visible number of rows in range defined by
+    \l{HbLineEdit::setMinRows}{minimum} and \l{HbLineEdit::setMaxRows}{maximum}
+    number of rows.
+
+    \sa HbLineEdit::setMinRows(int)
+    \sa HbLineEdit::setMaxRows(int)
+    \sa HbLineEdit::adjustFontSizeToFitHeight()
+ */
+void HbLineEdit::setAdjustFontSizeToFitHeight(bool active)
+{
+    Q_D(HbLineEdit);
+    if (d->adjustFontSizeToFitHeight != active) {
+        d->adjustFontSizeToFitHeight = active;
+        if(!active) {
+            // clear font stretch
+            d->canvas->setFont(QFont());
+        }
+        updateGeometry();
+    }
+}
+
+/*!
+    @proto
+
+    Returns true if vertical font streach mode is active.
+    See HbLineEdit::setAdjustFontSizeToFitHeight for details.
+
+    \sa HbLineEdit::setAdjustFontSizeToFitHeight(bool)
+ */
+bool HbLineEdit::adjustFontSizeToFitHeight() const
+{
+    return d_func()->adjustFontSizeToFitHeight;
+}
+
+/*!
+    \reimp
+ */
+bool HbLineEdit::eventFilter(QObject *obj, QEvent *event)
+{
+    Q_D(HbLineEdit);
+
+    if (obj == d->scrollArea && event->type()==QEvent::GraphicsSceneResize) {
+        document()->setTextWidth(d->scrollArea->size().width());
+        d->onResizeFontChange();
+    }
+    return HbAbstractEdit::eventFilter(obj, event);
+}
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/editors/hblineedit.h
--- a/src/hbwidgets/editors/hblineedit.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/editors/hblineedit.h	Mon May 03 12:48:33 2010 +0300
@@ -49,6 +49,7 @@
     Q_PROPERTY(int minRows READ minRows WRITE setMinRows)
     Q_PROPERTY(bool expandable READ isExpandable)
     Q_PROPERTY(EchoMode echoMode READ echoMode WRITE setEchoMode)
+    Q_PROPERTY(bool adjustFontSizeToFitHeight READ adjustFontSizeToFitHeight WRITE setAdjustFontSizeToFitHeight)
 
 public:
 
@@ -90,6 +91,9 @@
     void setCapitalization ( QFont::Capitalization caps );
     QFont::Capitalization capitalization () const;
 
+    bool adjustFontSizeToFitHeight() const;
+    void setAdjustFontSizeToFitHeight(bool active);
+
 public slots:
     void setText(const QString &text);
 
@@ -105,13 +109,14 @@
     void keyPressEvent(QKeyEvent *event);
     void keyReleaseEvent(QKeyEvent *event);
 
-    void resizeEvent(QGraphicsSceneResizeEvent *event);
-
     bool canInsertFromMimeData(const QMimeData *source) const;
     void insertFromMimeData(const QMimeData *source);
 
     void focusOutEvent ( QFocusEvent * event );
     void focusInEvent ( QFocusEvent * event );
+
+    bool eventFilter(QObject *, QEvent *);
+
 private:
     Q_DISABLE_COPY(HbLineEdit)
     Q_DECLARE_PRIVATE_D(d_ptr, HbLineEdit)
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/editors/hblineedit_p.cpp
--- a/src/hbwidgets/editors/hblineedit_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/editors/hblineedit_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -41,16 +41,24 @@
 
 #include <QTextDocument>
 #include <QTextBlock>
+#include <math.h>
+
+// value used if no maximum lines is set
+const int DefaulMaximumVisibleLines = 30;
+
+// minimum font size when using stretch font mode
+const qreal KMinimumLineHeight = 4.0;
 
 HbLineEditPrivate::HbLineEditPrivate () :
     HbAbstractEditPrivate(),
     maxLength(-1),
-    expandable(false),
     minimumRows(1),
     maximumRows(1),
     echoMode(HbLineEdit::Normal),
     clearOnEdit(false),
-    emitTextChanged(true)
+    emitTextChanged(true),
+    adjustFontSizeToFitHeight(false),
+    stretchedToLineCount(-1)
 {
 }
 
@@ -71,9 +79,12 @@
     scrollArea->setHorizontalScrollBarPolicy(HbScrollArea::ScrollBarAlwaysOff); 
     defaultWrapMode = doc->defaultTextOption().wrapMode(); // cannot be changed.
     q->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
-    doc->documentLayout()->document()->setDocumentMargin(0);
     q->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
 }
 
 void HbLineEditPrivate::updatePaletteFromTheme()
@@ -84,6 +95,7 @@
     QColor textColor = HbColorScheme::color("qtc_lineedit_normal");
     QColor selectedColor = HbColorScheme::color("qtc_lineedit_selected");
     QColor selectedBackground = HbColorScheme::color("qtc_lineedit_marker_normal");
+    QColor hintText = HbColorScheme::color("qtc_lineedit_hint_normal");
     QPalette pal = q->palette();
 
     if (textColor.isValid()) {
@@ -97,6 +109,11 @@
     if (selectedBackground.isValid()) {
         pal.setColor(QPalette::Highlight, selectedBackground);
     }
+
+    if (hintText.isValid()) {
+        pal.setColor(QPalette::NoRole, hintText);
+    }
+
     q->setPalette(pal);
 }
 bool HbLineEditPrivate::forwardKeyEvent (QKeyEvent *event)
@@ -156,6 +173,10 @@
     if(emitTextChanged && !isPasswordMode()) {
         emit q->textChanged(q->text());
     }
+
+    if(adjustFontSizeToFitHeight) {
+        readjustStretchFont();
+    }
 }
 
 void HbLineEditPrivate::_q_textChange(int position, int charsRemoved,int charsAdded)
@@ -170,21 +191,38 @@
     emitTextChanged = true;
 }
 
-
 void HbLineEditPrivate::updateEditingSize()
 {
     Q_Q(HbLineEdit);
     if (scrollArea) {
-        const int fontHeight = QFontMetrics(q->font()).height();
-        scrollArea->setMinimumHeight(fontHeight * minimumRows);
-        if (maximumRows == 1) {
-            scrollArea->setPreferredHeight(fontHeight);
-            scrollArea->setScrollDirections(Qt::Horizontal);
+        if(!adjustFontSizeToFitHeight) {
+            const int fontHeight = QFontMetrics(q->font()).height();
+            scrollArea->setMinimumHeight(fontHeight * minimumRows + 2 * doc->documentMargin());
+            if (maximumRows == 1) {
+                scrollArea->setPreferredHeight(fontHeight);
+                scrollArea->setScrollDirections(Qt::Horizontal);
+            } else {
+                scrollArea->setPreferredHeight(doc->documentLayout()->documentSize().height());
+                scrollArea->setScrollDirections(Qt::Vertical);
+            }
+            scrollArea->setMaximumHeight(fontHeight * maximumRows + 2 * doc->documentMargin());
         } else {
-            scrollArea->setPreferredHeight(doc->documentLayout()->documentSize().height());
-            scrollArea->setScrollDirections(Qt::Vertical);
+            qreal prefLineHeight = q->fontSpec().textHeight();
+            if (prefLineHeight<0) {
+                QFontMetricsF metrics(q->font());
+                prefLineHeight = metrics.lineSpacing();
+            }
+
+            const qreal marginBonus = 2*doc->documentMargin();
+            scrollArea->setMinimumHeight(qMax(minimumRows,1)*KMinimumLineHeight
+                                         +marginBonus);
+
+            // minimumRows is used here because it is expected that
+            // text will be short in most use cases
+            scrollArea->setPreferredHeight(prefLineHeight*minimumRows+marginBonus);
+
+            scrollArea->setMaximumHeight(QWIDGETSIZE_MAX);
         }
-        scrollArea->setMaximumHeight(fontHeight * maximumRows);
     }
 }
 
@@ -283,4 +321,78 @@
     doc->setDefaultTextOption(option);
 }
 
+int HbLineEditPrivate::linesToBeVisible() const
+{
+    int docLineCount = 0;
+    QTextBlock block = doc->firstBlock();
+    for (int i=0; i<doc->blockCount(); ++i) {
+        docLineCount += block.layout()->lineCount();
+        block.next();
+    }
+    return qBound(minimumRows, docLineCount, maximumRows);
+}
+
+void HbLineEditPrivate::readjustStretchFont()
+{
+    int desiredLineCount=linesToBeVisible();
+
+    if (desiredLineCount==stretchedToLineCount) {
+        return;
+    }
+
+    setVisibleRows(desiredLineCount);
+
+    if (desiredLineCount<stretchedToLineCount
+        && desiredLineCount<linesToBeVisible()) {
+        do {
+            ++desiredLineCount;
+            setVisibleRows(desiredLineCount);
+        } while(desiredLineCount<linesToBeVisible());
+    }
+    stretchedToLineCount = desiredLineCount;
+}
+
+void HbLineEditPrivate::onResizeFontChange()
+{
+    if (!adjustFontSizeToFitHeight) {
+        return;
+    }
+
+    const int maxRows = (maximumRows>0)?maximumRows:DefaulMaximumVisibleLines;
+    for (int i=minimumRows; i<=maxRows; ++i) {
+        setVisibleRows(i);
+        if(linesToBeVisible()<=i) {
+            stretchedToLineCount = i;
+            break;
+        }
+    }
+}
+
+void HbLineEditPrivate::setVisibleRows(int rowCount)
+{
+    Q_Q(HbLineEdit);
+
+    qreal singleLineHeight = scrollArea->size().height()
+                             -2*doc->documentMargin();
+    if(singleLineHeight<=0) {
+        return;
+    }
+    singleLineHeight/=rowCount;
+
+    HbFontSpec fSpec(q->fontSpec());
+    if (fSpec.role()!=HbFontSpec::Undefined) {
+        fSpec.setTextHeight(singleLineHeight);
+        canvas->setFontSpec(fSpec);
+    } else {
+        QFont deltaFont;
+        deltaFont.setPixelSize(static_cast<int>(singleLineHeight+0.5));
+        QFont oldFont = q->font();
+        QFontMetricsF metrics(deltaFont.resolve(oldFont));
+        //recalculate pixels size to line height
+        singleLineHeight = singleLineHeight * singleLineHeight / metrics.lineSpacing();
+        deltaFont.setPixelSize(static_cast<int>(singleLineHeight));
+        canvas->setFont(deltaFont);
+    }
+}
+
 #include "moc_hblineedit.cpp"
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/editors/hblineedit_p.h
--- a/src/hbwidgets/editors/hblineedit_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/editors/hblineedit_p.h	Mon May 03 12:48:33 2010 +0300
@@ -69,8 +69,12 @@
     virtual void _q_textChanged();
     virtual void _q_textChange(int position, int charsRemoved,int charsAdded);
 
+    void readjustStretchFont();
+    int linesToBeVisible() const;
+    void onResizeFontChange();
+    void setVisibleRows(int rowCount);
+
     int maxLength;
-    bool expandable;
     int minimumRows;
     int maximumRows;
     HbLineEdit::EchoMode echoMode;
@@ -78,6 +82,9 @@
     bool clearOnEdit;
     bool emitTextChanged;
     QTextOption::WrapMode defaultWrapMode;
+
+    bool adjustFontSizeToFitHeight;
+    int stretchedToLineCount;
 };
 
 #endif // HBLINEEDIT_P_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/editors/hbselectioncontrol_p.cpp
--- a/src/hbwidgets/editors/hbselectioncontrol_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/editors/hbselectioncontrol_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -41,6 +41,12 @@
 #include "hbabstractedit.h"
 #include "hbabstractedit_p.h"
 #include "hbtoucharea.h"
+#include "hbpangesture.h"
+#include "hbtapgesture.h"
+#include "hbevent.h"
+#include "hbpopup.h"
+#include "hbnamespace_p.h"
+#include "hbmainwindow.h"
 
 
 #include <QTextCursor>
@@ -50,9 +56,14 @@
 #include <QBasicTimer>
 #include <QSizeF>
 #include <QPointF>
+#include <QHash>
+#include <QGraphicsScene>
 
 #include <hbwidgetfeedback.h>
 
+typedef QHash<HbMainWindow*,HbSelectionControl*> HbSelectionControlHash;
+Q_GLOBAL_STATIC(HbSelectionControlHash, globalSelectionControlHash)
+
 namespace {
     static const int SNAP_DELAY = 300;
 }
@@ -63,7 +74,7 @@
     Q_DECLARE_PUBLIC(HbSelectionControl)
 
 public:
-    HbSelectionControlPrivate(HbAbstractEdit *edit);
+    HbSelectionControlPrivate();
     void init();
     void createPrimitives();
     void updateHandle(int newHandlePos,
@@ -74,10 +85,17 @@
     QGraphicsItem * reparent(QGraphicsItem *item);
     void reparent(QGraphicsItem *item, QGraphicsItem *newParent);
     void reparentHandles(QGraphicsItem *newParent);
+    void tapGestureFinished (const QPointF& point);
+    void panGestureStarted (HbPanGesture *gesture);
+    void panGestureUpdated (HbPanGesture *gesture);
+    void panGestureFinished (HbPanGesture *gesture);
+    void show();
+    void _q_aboutToChangeView();
 
 public:
 
     HbAbstractEdit *mEdit;
+    QGraphicsItem *mTopLevelAncestor;
     QPointF mMouseOffset;
 
     QGraphicsItem *mSelectionStartHandle;
@@ -86,24 +104,21 @@
     HbTouchArea* mSelectionEndTouchArea;
 
     HbSelectionControl::HandleType mPressed;
-    bool mHandlesDisabled;
     bool mPanInProgress;
-    bool mHandlesMoved;
     QBasicTimer mWordSnapTimer;
 };
 
 
-HbSelectionControlPrivate::HbSelectionControlPrivate(HbAbstractEdit *edit):
-    mEdit(edit),
+HbSelectionControlPrivate::HbSelectionControlPrivate():
+    mEdit(0),
+    mTopLevelAncestor(0),
     mSelectionStartHandle(0),
     mSelectionEndHandle(0),
     mSelectionStartTouchArea(0),
     mSelectionEndTouchArea(0),
     mPressed(HbSelectionControl::HandleType(0)),
-    mHandlesDisabled(true),
-    mPanInProgress(false),
-    mHandlesMoved(false)
-{
+    mPanInProgress(false)
+{    
 }
 
 void HbSelectionControlPrivate::init()
@@ -111,55 +126,51 @@
     Q_Q(HbSelectionControl);
     createPrimitives();
 
-    q->setBackgroundItem(HbStyle::P_None);
+    q->setVisible(false);
+    q->setFlag(QGraphicsItem::ItemIsFocusable,false);
+    q->setFlag(QGraphicsItem::ItemIsPanel,true);
     q->setFocusPolicy(Qt::NoFocus);
-    q->setTimeout(HbPopup::NoTimeout);
-    q->setBackgroundFaded(false);
-    q->setVisible(false);
-    q->setDismissPolicy(HbPopup::NoDismiss);
-    q->setModal(false);
-
-    #ifdef HB_EFFECTS
-    HbEffect::disable(q);
-    #endif    
-
-    q->setParent(mEdit);
+    q->setActive(false);
 
     // Control will handle all events going to different handlers.
     q->setHandlesChildEvents(true);
-
-    QObject::connect(mEdit, SIGNAL(cursorPositionChanged(int, int)), q, SLOT(updatePrimitives()));
-    QObject::connect(mEdit, SIGNAL(selectionChanged(const QTextCursor&, const QTextCursor&)), q, SLOT(updatePrimitives()));
-    QObject::connect(mEdit, SIGNAL(contentsChanged()), q, SLOT(updatePrimitives()));
-
-    q->updatePrimitives();
-
 }
 
 void HbSelectionControlPrivate::createPrimitives()
 {
     Q_Q(HbSelectionControl);
     if (!mSelectionStartHandle) {
-        mSelectionStartHandle = mEdit->style()->createPrimitive(HbStyle::P_SelectionControl_selectionstart, q);
-        mSelectionStartHandle->hide();
+        mSelectionStartHandle = q->style()->createPrimitive(HbStyle::P_SelectionControl_selectionstart, q);
+        mSelectionStartHandle->setFlag(QGraphicsItem::ItemIsPanel);
+        mSelectionStartHandle->setFlag(QGraphicsItem::ItemIsFocusable,false);
+        mSelectionStartHandle->setActive(false);
     }
 
     if (!mSelectionEndHandle) {
-        mSelectionEndHandle = mEdit->style()->createPrimitive(HbStyle::P_SelectionControl_selectionend, q);
-        mSelectionEndHandle->hide();
+        mSelectionEndHandle = q->style()->createPrimitive(HbStyle::P_SelectionControl_selectionend, q);
+        mSelectionEndHandle->setFlag(QGraphicsItem::ItemIsPanel);
+        mSelectionEndHandle->setFlag(QGraphicsItem::ItemIsFocusable,false);
+        mSelectionEndHandle->setActive(false);
     }
 
     if (!mSelectionStartTouchArea) {
         mSelectionStartTouchArea = new HbTouchArea(q);
-        mSelectionStartTouchArea->hide();
+        mSelectionStartTouchArea->setFlag(QGraphicsItem::ItemIsPanel);
+        mSelectionStartTouchArea->setFlag(QGraphicsItem::ItemIsFocusable,false);
+        mSelectionStartTouchArea->setActive(false);
         HbStyle::setItemName(mSelectionStartTouchArea, "handle-toucharea");
-
+        mSelectionStartTouchArea->grabGesture(Qt::TapGesture);
+        mSelectionStartTouchArea->grabGesture(Qt::PanGesture);
     }
 
     if (!mSelectionEndTouchArea) {
         mSelectionEndTouchArea = new HbTouchArea(q);
-        mSelectionEndTouchArea->hide();
+        mSelectionEndTouchArea->setFlag(QGraphicsItem::ItemIsPanel);
+        mSelectionEndTouchArea->setFlag(QGraphicsItem::ItemIsFocusable,false);
+        mSelectionEndTouchArea->setActive(false);
         HbStyle::setItemName(mSelectionEndTouchArea, "handle-toucharea");
+        mSelectionEndTouchArea->grabGesture(Qt::TapGesture);
+        mSelectionEndTouchArea->grabGesture(Qt::PanGesture);
     }
 }
 
@@ -209,15 +220,12 @@
         QGraphicsItem * newParent = reparent(handle);
         reparent(handleTouchArea, newParent);
     }
-
-    handle->show();
-    handleTouchArea->show() ;
 }
 
 
 
 /*
-   Reparents item to q if item's bounding rect intersects mEdit bounding rectangle or otherwise to
+   Reparents item to q if item's bounding rect intersects mEdit's viewPort rectangle or otherwise to
    HbAbstractEditPrivate::d_ptr(d->mEdit)->canvas.
    Returns new parent.
 */
@@ -231,7 +239,9 @@
     QRectF rect = item->boundingRect();
     rect = item->mapRectToItem(mEdit,rect);
 
-    if (mEdit->contains(rect.topLeft()) || mEdit->contains(rect.bottomRight())) {
+    QRectF scrollAreaRect = HbAbstractEditPrivate::d_ptr(mEdit)->scrollArea->geometry();
+
+    if (rect.intersects(scrollAreaRect)) {
         newParent = q;
     }
 
@@ -241,11 +251,20 @@
 
 void HbSelectionControlPrivate::reparent(QGraphicsItem *item, QGraphicsItem *newParent)
 {
+    Q_Q(HbSelectionControl);
+
     if (item && newParent && newParent != item->parentItem()) {
 
         // Reparent handle items to newParent
         QPointF pos = newParent->mapFromItem(item->parentItem(),item->pos());
 
+        // If the item is parented to other then q we have to
+        // turn off the QGraphicsItem::ItemIsPanel flag because
+        // otherwise the new parent loses its activeness.
+        bool enablePanel = (newParent == q);
+
+        item->setFlag(QGraphicsItem::ItemIsPanel,enablePanel);
+
         // TODO: This is a workaround for a Qt bug when reparenting from a clipping parent to a
         //       non-clipping parent
         item->setParentItem(0);
@@ -264,8 +283,171 @@
 }
 
 
-HbSelectionControl::HbSelectionControl(HbAbstractEdit *edit) :
-    HbPopup(*new HbSelectionControlPrivate(edit),0)
+void HbSelectionControlPrivate::tapGestureFinished(const QPointF &pos)
+{
+    if (mEdit->contextMenuFlags().testFlag(Hb::ShowTextContextMenuOnSelectionClicked)) {
+        mEdit->showContextMenu(pos);
+    }
+}
+
+void HbSelectionControlPrivate::panGestureStarted(HbPanGesture *gesture)
+{
+    Q_Q(HbSelectionControl);
+
+    QPointF point = q->mapFromScene(gesture->sceneStartPos());
+    mPressed = HbSelectionControl::DummyHandle;
+
+    // Find out which handle is being moved
+    if (mSelectionStartTouchArea->contains(q->mapToItem(mSelectionStartTouchArea, point))) {
+        mPressed = HbSelectionControl::SelectionStartHandle;
+        mMouseOffset = mSelectionStartHandle->pos() - point;
+    }
+    if (mSelectionEndTouchArea->contains(q->mapToItem(mSelectionEndTouchArea, point))) {
+        bool useArea = true;
+        if(mPressed != HbSelectionControl::DummyHandle) {
+
+            // The press point was inside in both of the touch areas
+            // choose the touch area whose center is closer to the press point
+            QRectF rect = mSelectionStartTouchArea->boundingRect();
+            rect.moveTopLeft(mSelectionStartTouchArea->pos());
+            QLineF  lineEventPosSelStartCenter(point,rect.center());
+
+            rect = mSelectionEndTouchArea->boundingRect();
+            rect.moveTopLeft(mSelectionEndTouchArea->pos());
+            QLineF  lineEventPosSelEndCenter(point,rect.center());
+
+            if (lineEventPosSelStartCenter.length() < lineEventPosSelEndCenter.length()) {
+                useArea = false;
+            }
+        }
+        if (useArea) {
+            mPressed = HbSelectionControl::SelectionEndHandle;
+            mMouseOffset = mSelectionEndHandle->pos() - point;
+        }
+    }
+
+    if (mPressed == HbSelectionControl::DummyHandle) {
+        // Hit is outside touch areas, ignore
+        return;
+    }
+
+    // Position cursor at the pressed selection handle
+
+    QTextCursor cursor = mEdit->textCursor();
+    int selStartPos = qMin(mEdit->textCursor().anchor(),mEdit->textCursor().position());
+    int selEndPos = qMax(mEdit->textCursor().anchor(),mEdit->textCursor().position());
+
+    if (mPressed == HbSelectionControl::SelectionStartHandle) {
+        cursor.setPosition(selEndPos);
+        cursor.setPosition(selStartPos, QTextCursor::KeepAnchor);
+    } else {
+        cursor.setPosition(selStartPos);
+        cursor.setPosition(selEndPos, QTextCursor::KeepAnchor);
+    }
+    mEdit->setTextCursor(cursor);
+
+}
+
+
+void HbSelectionControlPrivate::panGestureFinished(HbPanGesture *gesture)
+{
+    Q_Q(HbSelectionControl);
+    Q_UNUSED(gesture)
+
+    if (mWordSnapTimer.isActive()) {
+
+        // Snap selection to word beginning or end
+        QTextCursor cursor = mEdit->textCursor();
+        int curPos = mEdit->textCursor().position();
+        int anchPos = mEdit->textCursor().anchor();
+        cursor.select(QTextCursor::WordUnderCursor);
+
+        // Snap direction depends on cursor position
+        curPos = ((curPos > anchPos)?cursor.position():cursor.anchor());
+
+        cursor.setPosition(anchPos);
+        cursor.setPosition(curPos, QTextCursor::KeepAnchor);
+        mEdit->setTextCursor(cursor);
+    }
+
+    mPressed = HbSelectionControl::DummyHandle;
+    q->updatePrimitives();
+}
+
+
+void HbSelectionControlPrivate::panGestureUpdated(HbPanGesture *gesture)
+{
+    Q_Q(HbSelectionControl);
+
+    QPointF editPos = mEdit->mapFromScene(gesture->sceneStartPos() + gesture->sceneOffset());
+
+    QRectF handleRect = mSelectionStartHandle->boundingRect();
+    handleRect.moveTopLeft(editPos + mMouseOffset);
+
+    QPointF hitTestPos = handleRect.center();
+
+    if (mPressed == HbSelectionControl::SelectionStartHandle) {
+        hitTestPos.setY(handleRect.bottom()+1);
+    } else {
+        hitTestPos.setY(handleRect.top()-1);
+    }
+
+    QTextCursor cursor = mEdit->textCursor();
+    // Hit test for the center of current selection touch area
+    int hitPos = HbAbstractEditPrivate::d_ptr(mEdit)->hitTest(hitTestPos,Qt::FuzzyHit);
+    if (hitPos == -1 || hitPos == cursor.anchor()) {
+        return;
+    }
+
+
+    bool handlesMoved(false);
+    if (hitPos != cursor.position()) {
+        handlesMoved = true;
+    }
+    cursor.setPosition(hitPos, QTextCursor::KeepAnchor);
+    if (handlesMoved) {
+        if (mEdit) {
+            HbWidgetFeedback::triggered(mEdit, Hb::InstantDraggedOver);
+        }
+        // Restart timer every time when a selection handle moved
+        mWordSnapTimer.start(SNAP_DELAY, q);
+        mEdit->setTextCursor(cursor);
+    }
+
+    // Ensure that the hitPos is visible
+    HbAbstractEditPrivate::d_ptr(mEdit)->ensurePositionVisible(hitPos);
+    q->updatePrimitives();
+}
+
+void HbSelectionControlPrivate::show() {
+    Q_Q(HbSelectionControl);
+
+    // Set the z-value of the selection control above its top-level ancestor
+    if (mTopLevelAncestor) {
+        qreal zValue = mTopLevelAncestor->zValue() + HbPrivate::SelectionControlHandlesValueUnit;
+
+        q->setZValue(zValue);
+    }
+
+    if (q->scene() != mEdit->scene() && mEdit->scene()) {
+        mEdit->scene()->addItem(q);
+    }
+    q->show();    
+    q->updatePrimitives();
+}
+
+
+void HbSelectionControlPrivate::_q_aboutToChangeView()
+{
+    Q_Q(HbSelectionControl);
+
+    if (mEdit && q->isVisible()) {
+        mEdit->deselect();
+    }
+}
+
+
+HbSelectionControl::HbSelectionControl() : HbWidget(*new HbSelectionControlPrivate(),0)
 
 {
     Q_D(HbSelectionControl);
@@ -275,34 +457,55 @@
     //      since only one selection control is used at a time
 }
 
+HbSelectionControl* HbSelectionControl::attachEditor(HbAbstractEdit *edit)
+{
+    if(!edit || !edit->mainWindow()) {
+        qWarning("HbSelectionControl: attempting to attach to null editor pointer!");
+    }
 
-void HbSelectionControl::updatePrimitives()
+    HbSelectionControl *control = globalSelectionControlHash()->value(edit->mainWindow());
+
+    if (!control) {
+        control = new HbSelectionControl();
+        globalSelectionControlHash()->insert(edit->mainWindow(),control);
+        QObject::connect(edit->mainWindow(), SIGNAL(aboutToChangeView(HbView *, HbView *)), control, SLOT(_q_aboutToChangeView()));
+    }
+
+    HbSelectionControlPrivate *d = control->d_func();
+
+    if (edit != d->mEdit) {
+        control->detachEditor();
+        d->mEdit = edit;        
+        QObject::connect(d->mEdit, SIGNAL(cursorPositionChanged(int, int)), control, SLOT(updatePrimitives()));
+        QObject::connect(d->mEdit, SIGNAL(contentsChanged()), control, SLOT(updatePrimitives()));
+
+        // find first top-level ancestor of d->mEdit
+        for(d->mTopLevelAncestor = d->mEdit;
+            d->mTopLevelAncestor->parentItem();
+            d->mTopLevelAncestor = d->mTopLevelAncestor->parentItem()){};
+    }
+    return control;
+}
+
+void HbSelectionControl::detachEditor()
 {
     Q_D(HbSelectionControl);
-    if (!d->mHandlesDisabled && d->polished) {
-        if (d->mEdit->textCursor().hasSelection() ||
-            (!d->mEdit->textCursor().hasSelection() && (d->mPressed == SelectionStartHandle || d->mPressed == SelectionEndHandle))) {
-
-            int selStartPos = qMin(d->mEdit->textCursor().anchor(),d->mEdit->textCursor().position());
-            int selEndPos = qMax(d->mEdit->textCursor().anchor(),d->mEdit->textCursor().position());
-
-            d->updateHandle(selStartPos,Qt::AlignTop,d->mSelectionStartHandle,d->mSelectionStartTouchArea,HbStyle::P_SelectionControl_selectionstart);
-            d->updateHandle(selEndPos,Qt::AlignBottom,d->mSelectionEndHandle,d->mSelectionEndTouchArea,HbStyle::P_SelectionControl_selectionend);
-        }
-        else {
-            d->mSelectionStartHandle->hide();
-            d->mSelectionStartTouchArea->hide() ;
-            d->mSelectionEndHandle->hide();
-            d->mSelectionEndTouchArea->hide() ;
-        }
+    if (d->mEdit) {
+        hideHandles();
+        d->reparentHandles(this);
+        d->mEdit->disconnect(this);
+        d->mEdit->d_func()->selectionControl = 0;        
+        d->mEdit->deselect();
+        d->mEdit = 0;
+        d->mTopLevelAncestor = 0;
     }
 }
 
+
 void HbSelectionControl::hideHandles()
 {
     Q_D(HbSelectionControl);
-    if (!d->mHandlesDisabled) {
-        d->mHandlesDisabled = true;
+    if (isVisible() && d->mEdit) {
         hide();
         d->reparentHandles(this);
     }
@@ -311,169 +514,27 @@
 void HbSelectionControl::showHandles()
 {
     Q_D(HbSelectionControl);
-    if (d->mHandlesDisabled) {
-        d->mHandlesDisabled = false;
-        show();
+    if (!isVisible() && d->mEdit) {
+        d->show();
     }
 }
 
-void HbSelectionControl::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
-{
-    Q_D(HbSelectionControl);
-
-    QPointF editPos = d->mEdit->mapFromScene(event->scenePos());
-
-    QRectF handleRect = d->mSelectionStartHandle->boundingRect();
-    handleRect.moveTopLeft(editPos + d->mMouseOffset);
-
-    QPointF hitTestPos = handleRect.center();
-
-    if (d->mPressed == SelectionStartHandle) {
-        hitTestPos.setY(handleRect.bottom()+1);
-    } else {
-        hitTestPos.setY(handleRect.top()-1);
-    }
-
-    // Hit test for the center of current selection touch area
-    int hitPos = HbAbstractEditPrivate::d_ptr(d->mEdit)->hitTest(hitTestPos,Qt::FuzzyHit);
-    if (hitPos == -1) {
-        return;
-    }
-
-    QTextCursor cursor = d->mEdit->textCursor();
-
-    if (hitPos != cursor.position()) {
-        d->mHandlesMoved = true;
-    }
-    cursor.setPosition(hitPos, QTextCursor::KeepAnchor);
-    if (d->mHandlesMoved) {
-        if (d->mEdit) {
-            HbWidgetFeedback::triggered(d->mEdit, Hb::InstantDraggedOver);
-        }
-        // Restart timer every time when a selection handle moved
-        d->mWordSnapTimer.start(SNAP_DELAY, this);
-        d->mEdit->setTextCursor(cursor);
-    }
-
-    // Ensure that the hitPos is visible
-    HbAbstractEditPrivate::d_ptr(d->mEdit)->ensurePositionVisible(hitPos);
-    updatePrimitives();
-}
-
-void HbSelectionControl::mousePressEvent (QGraphicsSceneMouseEvent *event)
+void HbSelectionControl::scrollStarted()
 {
     Q_D(HbSelectionControl);
 
-    if (d->mEdit) {
-        HbWidgetFeedback::triggered(d->mEdit, Hb::InstantPressed);
-    }
-
-    d->mPressed = DummyHandle;
-
-    // Find out which handle is being moved
-    if (d->mSelectionStartTouchArea->contains(mapToItem(d->mSelectionStartTouchArea, event->pos()))) {
-        d->mPressed = SelectionStartHandle;
-        d->mMouseOffset = d->mSelectionStartHandle->pos() - event->pos();
-    }
-    if (d->mSelectionEndTouchArea->contains(mapToItem(d->mSelectionEndTouchArea, event->pos()))) {
-        bool useArea = true;
-        if(d->mPressed != DummyHandle) {
-
-            // The press point was inside in both of the touch areas
-            // choose the touch area whose center is closer to the press point
-            QRectF rect = d->mSelectionStartTouchArea->boundingRect();
-            rect.moveTopLeft(d->mSelectionStartTouchArea->pos());
-            QLineF  lineEventPosSelStartCenter(event->pos(),rect.center());
-
-            rect = d->mSelectionEndTouchArea->boundingRect();
-            rect.moveTopLeft(d->mSelectionEndTouchArea->pos());
-            QLineF  lineEventPosSelEndCenter(event->pos(),rect.center());
-
-            if (lineEventPosSelStartCenter.length() < lineEventPosSelEndCenter.length()) {
-                useArea = false;
-            }
-        }
-        if (useArea) {
-            d->mPressed = SelectionEndHandle;
-            d->mMouseOffset = d->mSelectionEndHandle->pos() - event->pos();
-        }
-    }
-
-    if (d->mPressed == DummyHandle) {
-        // Hit is outside touch areas, ignore
-        event->ignore();
-        return;
-    }
-
-    // Position cursor at the pressed selection handle
-
-    QTextCursor cursor = d->mEdit->textCursor();
-    int selStartPos = qMin(d->mEdit->textCursor().anchor(),d->mEdit->textCursor().position());
-    int selEndPos = qMax(d->mEdit->textCursor().anchor(),d->mEdit->textCursor().position());
-
-    if (d->mPressed == SelectionStartHandle) {
-        cursor.setPosition(selEndPos);
-        cursor.setPosition(selStartPos, QTextCursor::KeepAnchor);
-    } else {
-        cursor.setPosition(selStartPos);
-        cursor.setPosition(selEndPos, QTextCursor::KeepAnchor);
-    }
-    d->mEdit->setTextCursor(cursor);
-
-}
-
-void HbSelectionControl::mouseReleaseEvent (QGraphicsSceneMouseEvent *event)
-{
-    Q_D(HbSelectionControl);
-    Q_UNUSED(event);
-
-    if (d->mEdit) {
-        HbWidgetFeedback::triggered(d->mEdit, Hb::InstantReleased);
-    }
-
-    if (d->mWordSnapTimer.isActive()) {
-
-        // Snap selection to word beginning or end
-        QTextCursor cursor = d->mEdit->textCursor();
-        int curPos = d->mEdit->textCursor().position();
-        int anchPos = d->mEdit->textCursor().anchor();
-        cursor.select(QTextCursor::WordUnderCursor);
-
-        // Snap direction depends on cursor position
-        curPos = ((curPos > anchPos)?cursor.position():cursor.anchor());
-
-        cursor.setPosition(anchPos);
-        cursor.setPosition(curPos, QTextCursor::KeepAnchor);
-        d->mEdit->setTextCursor(cursor);
-    }
-
-    d->mPressed = DummyHandle;
-    updatePrimitives();
-
-    if (!d->mHandlesMoved) {
-        if (d->mEdit->contextMenuFlags().testFlag(Hb::ShowTextContextMenuOnSelectionClicked)) {
-            d->mEdit->showContextMenu(event->scenePos());
-        }
-    }
-    d->mHandlesMoved = false;
-}
-
-void HbSelectionControl::panStarted()
-{
-    Q_D(HbSelectionControl);
-
-    if (!d->mHandlesDisabled) {
+    if (isVisible() && d->mEdit) {
         d->mPanInProgress = true;
         // Reparent handle items to editor canvas on pan start
         d->reparentHandles(HbAbstractEditPrivate::d_ptr(d->mEdit)->canvas);
     }
 }
 
-void HbSelectionControl::panFinished()
+void HbSelectionControl::scrollFinished()
 {
     Q_D(HbSelectionControl);
 
-    if (!d->mHandlesDisabled) {
+    if (isVisible() && d->mEdit) {
         d->mPanInProgress = false;
         updatePrimitives();
     }
@@ -493,19 +554,102 @@
 {
     Q_D(HbSelectionControl);
 
-    HbPopup::polish(params);
+    HbWidget::polish(params);
     QSizeF size = d->mSelectionStartTouchArea->preferredSize();
     d->mSelectionStartTouchArea->resize(size);
     d->mSelectionEndTouchArea->resize(size);
+    updatePrimitives();
 }
 
 QVariant HbSelectionControl::itemChange(GraphicsItemChange change, const QVariant &value)
 {
     if (change == QGraphicsItem::ItemPositionChange) {
         return qVariantFromValue(QPointF(0,0));
-    } else if (change == QGraphicsItem::ItemVisibleChange) {        
-        updatePrimitives();
+    }
+
+    return HbWidget::itemChange(change, value);
+}
+
+void HbSelectionControl::gestureEvent(QGestureEvent* event) {
+    Q_D(HbSelectionControl);
+    if(HbTapGesture *tap = qobject_cast<HbTapGesture*>(event->gesture(Qt::TapGesture))) {
+        QPointF pos = event->mapToGraphicsScene(tap->position());
+        switch(tap->state()) {
+        case Qt::GestureStarted:
+            if (d->mEdit) {
+                HbWidgetFeedback::triggered(d->mEdit, Hb::InstantPressed);
+            }
+            break;
+        case Qt::GestureUpdated:
+            break;
+      case Qt::GestureFinished:
+            if (d->mEdit) {
+                d->tapGestureFinished(pos);
+                HbWidgetFeedback::triggered(d->mEdit, Hb::InstantReleased);
+            }
+            break;
+      case Qt::GestureCanceled:
+            break;
+      default:
+            break;
+        }
     }
 
-    return HbPopup::itemChange(change, value);
+    if(HbPanGesture *pan = qobject_cast<HbPanGesture*>(event->gesture(Qt::PanGesture))) {
+        switch(pan->state()) {
+        case Qt::GestureStarted:
+            if (d->mEdit) {
+                d->panGestureStarted(pan);
+            }
+            break;
+        case Qt::GestureUpdated:
+            if (d->mEdit) {
+                d->panGestureUpdated(pan);
+            }
+            break;
+        case Qt::GestureFinished:
+            if (d->mEdit) {
+                d->panGestureFinished(pan);
+                HbWidgetFeedback::triggered(d->mEdit, Hb::InstantReleased);
+            }
+            break;
+      case Qt::GestureCanceled:
+            break;
+      default:
+            break;
+        }
+    }
 }
+
+bool HbSelectionControl::event(QEvent *event)
+{
+    Q_D(HbSelectionControl);
+
+    if (event->type() == HbEvent::DeviceProfileChanged && d->mEdit) {
+        HbDeviceProfileChangedEvent* dpEvent = static_cast<HbDeviceProfileChangedEvent*>(event);
+        if ( dpEvent->profile().alternateProfileName() == dpEvent->oldProfile().name() ) {
+            updatePrimitives();
+        }
+    }
+    return HbWidget::event(event);
+}
+
+void HbSelectionControl::updatePrimitives()
+{
+    Q_D(HbSelectionControl);
+
+    if (isVisible() && d->polished && d->mEdit) {
+        if (d->mEdit->textCursor().hasSelection() ) {
+           
+            int selStartPos = qMin(d->mEdit->textCursor().anchor(),d->mEdit->textCursor().position());
+            int selEndPos = qMax(d->mEdit->textCursor().anchor(),d->mEdit->textCursor().position());
+
+            d->updateHandle(selStartPos,Qt::AlignTop,d->mSelectionStartHandle,d->mSelectionStartTouchArea,HbStyle::P_SelectionControl_selectionstart);
+            d->updateHandle(selEndPos,Qt::AlignBottom,d->mSelectionEndHandle,d->mSelectionEndTouchArea,HbStyle::P_SelectionControl_selectionend);
+        }
+        else {
+            hide();
+        }
+    }
+}
+#include "moc_hbselectioncontrol_p.cpp"
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/editors/hbselectioncontrol_p.h
--- a/src/hbwidgets/editors/hbselectioncontrol_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/editors/hbselectioncontrol_p.h	Mon May 03 12:48:33 2010 +0300
@@ -37,13 +37,13 @@
 #ifndef HBSELECTIONCONTROL_P_H
 #define HBSELECTIONCONTROL_P_H
 
-#include "hbpopup.h"
+#include "hbwidget.h"
 
 class HbSelectionControlPrivate;
 class HbAbstractEdit;
 QT_FORWARD_DECLARE_CLASS(QGraphicsSceneMouseEvent)
 
-class HbSelectionControl : public HbPopup
+class HbSelectionControl : public HbWidget
 {
 
     Q_OBJECT
@@ -56,28 +56,29 @@
         SelectionEndHandle
     };
 
-    explicit HbSelectionControl(HbAbstractEdit *edit);
-
+    static HbSelectionControl* attachEditor(HbAbstractEdit *edit);
+    void detachEditor();
     void hideHandles();
     void showHandles();
+    bool event(QEvent *event);
 
 public slots:
-    void panStarted();
-    void panFinished();
+    void scrollStarted();
+    void scrollFinished();
     void updatePrimitives();
 
-protected:    
+protected:
     
-    void mousePressEvent (QGraphicsSceneMouseEvent *event);
-    void mouseMoveEvent (QGraphicsSceneMouseEvent *event);
-    void mouseReleaseEvent (QGraphicsSceneMouseEvent *event);    
     void timerEvent (QTimerEvent *event);
     void polish( HbStyleParameters& params );
     QVariant itemChange(GraphicsItemChange change, const QVariant &value);
+    void gestureEvent(QGestureEvent* event);
 
 private:
+    HbSelectionControl();
     Q_DECLARE_PRIVATE_D(d_ptr, HbSelectionControl)
     Q_DISABLE_COPY(HbSelectionControl)
+    Q_PRIVATE_SLOT(d_func(), void _q_aboutToChangeView())
 };
 
 #endif // HBSELECTIONCONTROL_P_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/editors/hbselectionhandle_p.cpp
--- a/src/hbwidgets/editors/hbselectionhandle_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,270 +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 HbWidgets 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.
-**
-****************************************************************************/
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Hb API.  It exists purely as an
-// implementation detail.  This file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "hbselectionhandle_p.h"
-#include "hbstyleoption.h"
-
-#include "hbicon.h"
-#include "hbmenu.h"
-#include "hbaction.h"
-
-#include "hbinstance.h"
-
-#include <QtDebug>
-
-#include <QTextCursor>
-#include <QTextDocument>
-#include <QTextBlock>
-#include <QGraphicsItem>
-#include <QGraphicsSceneMouseEvent>
-#include <QPointF>
-#include <QPainter>
-#include <QApplication>
-#include <QClipboard>
-
-const QSizeF HandleSize = QSizeF(10, 10);
-const QRectF MouseTreshold = QRectF(-5, -5, 5, 5);
-const QPointF MenuOffset = QPointF(10, 50);
-
-HbSelectionHandle::HbSelectionHandle (HandleType type, HbTextControl *control, QGraphicsItem *parent) :
-    QGraphicsItem(parent), mControl(control), mType(type)
-{
-    hide(); // defaults to hidden
-
-    if (mType == Cursor) {
-        mIcon = HbIcon("qtg_graf_editor_handle_end.svg");
-    } else {
-        mIcon = HbIcon("qtg_graf_editor_handle_begin.svg");
-    }
-
-    connect(mControl, SIGNAL(selectionChanged()), this, SLOT(cursorChanged()));
-
-    cursorChanged();
-}
-
-void HbSelectionHandle::paint (QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
-{
-    Q_UNUSED(widget);
-    Q_UNUSED(option);
-
-    painter->save();
-    mIcon.setSize(HandleSize);
-    mIcon.paint(painter, boundingRect());
-    painter->restore();
-}
-
-QRectF HbSelectionHandle::boundingRect() const
-{
-    return QRectF(QPointF(0, 0), HandleSize);
-}
-
-void HbSelectionHandle::mouseMoveEvent (QGraphicsSceneMouseEvent *event)
-{
-    float x1 = event->scenePos().x();
-    float x2 = mMousePos.x();
-
-    if (qAbs(x1 - x2) > HandleSize.width()) {
-        mMousePos = event->scenePos();
-        if (x1 > x2) {
-            movePosition(QTextCursor::NextCharacter);
-        } else if(x1 < x2) {
-            movePosition(QTextCursor::PreviousCharacter);
-        }
-    }
-
-    float y1 = event->scenePos().y();
-    float y2 = mMousePos.y();
-
-    if (qAbs(y1 - y2) > HandleSize.height()) {
-        mMousePos = event->scenePos();
-        if (y1 > y2) {
-            movePosition(QTextCursor::Down);
-        } else if(y1 < y2) {
-            movePosition(QTextCursor::Up);
-        }
-    }
-}
-
-void HbSelectionHandle::movePosition(QTextCursor::MoveOperation op)
-{
-    if (mType == Cursor) {
-        QTextCursor cursor = mControl->textCursor();
-        cursor.movePosition(op, QTextCursor::KeepAnchor);
-        mControl->setTextCursor(cursor);
-    } else {
-        QTextCursor cursor = mControl->textCursor();
-        QTextCursor c = QTextCursor(mControl->document());
-        c.setPosition(cursor.position());
-        c.setPosition(cursor.anchor(), QTextCursor::KeepAnchor);
-        c.movePosition(op, QTextCursor::KeepAnchor);
-        cursor.setPosition(c.position());
-        cursor.setPosition(c.anchor(), QTextCursor::KeepAnchor);
-        mControl->setTextCursor(cursor);
-    }
-}
-
-void HbSelectionHandle::mousePressEvent (QGraphicsSceneMouseEvent *event)
-{
-    mMousePressPos = mMousePos = event->scenePos();
-    event->accept();
-}
-
-void HbSelectionHandle::mouseReleaseEvent (QGraphicsSceneMouseEvent *event)
-{
-    event->accept();
-    if (MouseTreshold.contains(mMousePressPos - event->scenePos())) {
-        showMenu(event->scenePos() + MenuOffset);
-    }
-}
-
-void HbSelectionHandle::cursorChanged ()
-{
-    QRectF r;
-    QPointF p;
-
-    int c = mControl->textCursor().position();
-    int a = mControl->textCursor().anchor();
-
-    if (mType == Cursor) {
-        r = rectForPosition(c);
-        p = r.topRight();
-        if (c < a) {
-            p.rx() -= HandleSize.width();
-        }
-    } else {
-        r = rectForPosition(mControl->textCursor().anchor());
-        p = r.topLeft();
-        if (c >= a) {
-            p.rx() -= HandleSize.width();
-        }
-    }
-
-    if (c >= a) {
-        mIcon.setMirroringMode(HbIcon::Prevented);
-    } else {
-        mIcon.setMirroringMode(HbIcon::Forced);
-    }
-
-    if (QApplication::layoutDirection() == Qt::RightToLeft) {
-        p.rx() = parentItem()->boundingRect().right() - p.x();
-    }
-    setPos(p);
-}
-
-void HbSelectionHandle::showMenu(QPointF position)
-{
-    HbMenu *menu = new HbMenu();
-    HbMenuItem *mi;
-
-    mi = menu->addAction("Cut");
-    connect(mi->action(), SIGNAL(triggered()), SLOT(cut()));
-
-    mi = menu->addAction("Copy");
-    connect(mi->action(), SIGNAL(triggered()), SLOT(copy()));
-
-    mi = menu->addAction("Paste");
-    connect(mi->action(), SIGNAL(triggered()), SLOT(paste()));
-
-    menu->setMenuType(HbMenu::MenuContext);
-    menu->exec(position);
-}
-
-void HbSelectionHandle::copy ()
-{
-   QString selectedText = mControl->textCursor().selectedText();
-#ifndef QT_NO_CLIPBOARD
-   QClipboard *clipboard = QApplication::clipboard();
-   clipboard->setText(selectedText);
-#else
-   mClipboard = selectedText;
-#endif
-}
-
-void HbSelectionHandle::cut ()
-{
-    copy();
-    mControl->textCursor().removeSelectedText();
-}
-
-void HbSelectionHandle::paste ()
-{
-#ifndef QT_NO_CLIPBOARD
-   QClipboard *clipboard = QApplication::clipboard();
-   QString clipText = clipboard->text();
-#else
-   QString clipText = mClipboard;
-#endif
-   mControl->textCursor().removeSelectedText();
-   mControl->textCursor().insertText(clipText);
-}
-
-#include <QAbstractTextDocumentLayout>
-#include <QTextLayout>
-#include <QTextLine>
-
-QRectF HbSelectionHandle::rectForPosition(int position) const
-{
-    const QTextBlock block = mControl->document()->findBlock(position);
-
-    if (!block.isValid())
-        return QRectF();
-
-    const QTextLayout *layout = block.layout();
-
-    const QPointF layoutPos = blockBoundingRect(block).topLeft();
-
-    int relativePos = position - block.position();
-
-    QTextLine line = layout->lineForTextPosition(relativePos);
-
-    QRectF r;
-    qreal w = 1;
-
-    if (line.isValid()) {
-        qreal x = line.cursorToX(relativePos);
-        r = QRectF(layoutPos.x() + x, layoutPos.y() + line.y(),
-                   w, line.height());
-    } else {
-        r = QRectF(layoutPos.x(), layoutPos.y(), w, HandleSize.height()); // #### correct height
-    }
-
-    return r;
-}
-
-QRectF HbSelectionHandle::blockBoundingRect(const QTextBlock &block) const
-{
-    return mControl->document()->documentLayout()->blockBoundingRect(block);
-}
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/editors/hbselectionhandle_p.h
--- a/src/hbwidgets/editors/hbselectionhandle_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,102 +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 HbWidgets 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.
-**
-****************************************************************************/
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Hb API.  It exists purely as an
-// implementation detail.  This file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#ifndef HBSELECTIONHANDLE_P_H
-#define HBSELECTIONHANDLE_P_H
-
-#include "hbglobal.h"
-#include "hbstyle.h"
-#include "hbwidget_p.h"
-#include "hbtextcontrol_p.h"
-
-#include <QObject>
-#include <QGraphicsItem>
-#include <QTextCursor>
-#include <QTextDocument>
-
-class QPainter;
-
-class HbSelectionHandle: public QObject, public QGraphicsItem {
-
-    Q_OBJECT
-
-public:
-
-    enum HandleType {
-        Anchor = 1,
-        Cursor
-    };
-
-    explicit HbSelectionHandle (HandleType type, HbTextControl *control, QGraphicsItem *parent);
-
-    void mousePressEvent (QGraphicsSceneMouseEvent *event);
-    void mouseMoveEvent (QGraphicsSceneMouseEvent *event);
-    void mouseReleaseEvent (QGraphicsSceneMouseEvent *event);
-
-    void paint (QPainter *painter,
-            const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
-
-    void showMenu(QPointF position);
-
-public slots:
-    void copy ();
-    void cut ();
-    void paste ();
-    void cursorChanged ();
-
-protected:
-
-    QRectF boundingRect() const;
-
-private:
-
-    void movePosition(QTextCursor::MoveOperation op);
-
-    QRectF rectForPosition (int position) const;
-    QRectF blockBoundingRect (const QTextBlock &block) const;
-
-    HbTextControl *mControl;
-    HandleType mType;
-    HbIcon mIcon;
-    QPointF mMousePos;
-    QPointF mMousePressPos;
-
-#ifdef QT_NO_CLIPBOARD
-    QString mClipboard;
-#endif
-};
-
-#endif // HBSELECTIONHANDLE_P_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/editors/hbsmileyengine.cpp
--- a/src/hbwidgets/editors/hbsmileyengine.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,385 +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 HbWidgets 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 "hbsmileyengine.h"
-#include "hbsmileyengine_p.h"
-#include <hbiconanimator.h>
-#include <hbicon.h>
-#include <QTextDocument>
-#include <QFontMetricsF>
-#include <QChar>
-
-namespace {
-    const qreal ICON_SCALE_FACTOR = 1.5;
-}
-
-HbSmileyTheme HbSmileyEnginePrivate::mDefaultTheme = HbSmileyTheme();
-
-QSizeF HbIconTextObject::intrinsicSize(QTextDocument *doc, int posInDocument,
-                                    const QTextFormat &format)
-{
-    Q_UNUSED(doc)
-    Q_UNUSED(posInDocument)
-
-    HbSmileyDataType smiley = qVariantValue<HbSmileyDataType>(format.property(HbSmileyData));
-    HbIconAnimator *animator = smiley.second;
-    Q_ASSERT(animator);
-
-    QFont f = static_cast<const QTextCharFormat&>(format).font();
-    QFontMetricsF fm(f);
-
-    // TODO: optimize this
-    HbIcon icon = animator->icon();
-    qreal iconHeight = fm.height() * ICON_SCALE_FACTOR;
-    if(icon.height() != iconHeight) {
-        icon.setHeight(iconHeight);
-        animator->setIcon(icon);
-    }
-    return icon.size();
-}
-
-void HbIconTextObject::drawObject(QPainter *painter, const QRectF &rect,
-                               QTextDocument *doc, int posInDocument,
-                               const QTextFormat &format)
-{
-    Q_UNUSED(doc)
-    Q_UNUSED(posInDocument)
-
-    HbSmileyDataType smiley = qVariantValue<HbSmileyDataType>(format.property(HbSmileyData));
-    HbIconAnimator *animator = smiley.second;
-    animator->paint(painter,rect);
-}
-
-HbSmileyEnginePrivate::HbSmileyEnginePrivate()
-    :mDocument(0),
-     mEdited(true),
-     mIconTextObject(new HbIconTextObject)
-{
-    q_ptr = 0;
-}
-
-HbSmileyEnginePrivate::~HbSmileyEnginePrivate()
-{
-    cleanUp();
-    delete mIconTextObject;
-}
-
-
-void HbSmileyEnginePrivate::init()
-{
-    // Load default smiley theme
-    if(mDefaultTheme.isNull()) {
-        HbSmileyEnginePrivate::mDefaultTheme.load(":smileys/smileys_theme.sml");
-        //
-        //TODO: uncomment the lines below if animation definition file is provided for
-        //      default smiley theme.
-        //HbIconAnimationManager* m = HbIconAnimationManager::global();
-        //m->addDefinitionFile(":smileys/smileys_animations.xml");
-    }
-    mSmileyTheme = HbSmileyEnginePrivate::mDefaultTheme;
-}
-
-void HbSmileyEnginePrivate::cleanUp()
-{
-    QList<QTextCursor*> cursors = mCursorToAnimator.keys();
-    qDeleteAll(cursors);
-
-    QList<HbIconAnimator*> animators = mAnimatorToCursors.keys();
-    qDeleteAll(animators);
-
-    mAnimatorToCursors.clear();
-    mCursorToAnimator.clear();
-    mSmileyAnimator.clear();
-}
-
-void HbSmileyEnginePrivate::setDocument(QTextDocument *doc)
-{
-    Q_Q(HbSmileyEngine);
-    mDocument = doc;
-    mDocument->documentLayout()->registerHandler(HbIconTextFormat, mIconTextObject);
-    q->connect(mDocument, SIGNAL(contentsChange(int,int,int)), q, SLOT(_q_documentContentsChanged(int,int,int)));
-    cleanUp();
-}
-
-void HbSmileyEnginePrivate::insertSmiley( QTextCursor cursor, const QString& name)
-{
-    QTextCharFormat hbiconFormat;
-    QTextCursor *tmpCursor = new QTextCursor(cursor);
-    hbiconFormat.setObjectType(HbIconTextFormat);
-
-    HbIconTextObject::HbSmileyDataType smiley;
-    HbIconAnimator *animator = lookupAnimator(name);
-    smiley.first = tmpCursor;
-    smiley.second = animator;
-
-    hbiconFormat.setProperty(HbIconTextObject::HbSmileyData, qVariantFromValue(smiley));
-
-    mEdited = false;
-    tmpCursor->insertText(QString(QChar::ObjectReplacementCharacter), hbiconFormat);
-    mEdited = true;
-    tmpCursor->setPosition(tmpCursor->position()-1);
-    mAnimatorToCursors[animator] << tmpCursor;
-    mCursorToAnimator[tmpCursor] = animator;
-}
-
-void HbSmileyEnginePrivate::insertSmileys( QTextCursor cursor, bool insertOne)
-{
-    QString regexpStr;
-    foreach (QString pattern, mSmileyTheme.patterns()) {
-        regexpStr += QRegExp::escape(pattern) + "|";
-    }
-    regexpStr.remove(regexpStr.count()-1, 1);
-
-    QRegExp rx(regexpStr);
-    cursor = mDocument->find(rx, cursor);
-    while ( !cursor.isNull()){
-        insertSmiley(cursor, mSmileyTheme.smiley(cursor.selectedText()));
-        if (insertOne) {
-            break;
-        }
-        cursor = mDocument->find(rx, cursor);
-    }
-}
-
-
-HbIconAnimator* HbSmileyEnginePrivate::lookupAnimator(const QString& name)
-{
-    Q_Q(HbSmileyEngine);
-    HbIconAnimator *animator = mSmileyAnimator.value(name);
-
-    // Init icon if it doesn't already exits
-    if (!animator) {
-        HbIconAnimator *newAnimator = new HbIconAnimator();
-        animator = newAnimator;
-        HbIcon icon = HbIcon(name);
-        icon.setFlags(HbIcon::NoAutoStartAnimation);
-        animator->setIcon(icon);
-        q->connect(animator,SIGNAL(animationProgressed()),q,SLOT(_q_animationProgressed()));
-        animator->startAnimation();
-        mSmileyAnimator[name] = animator;
-    }
-
-    return animator;
-}
-
-
-bool HbSmileyEnginePrivate::isCursorValid(QTextCursor* cursor) const
-{
-    bool ret = true;
-
-    if (cursor) {
-        if (mDocument->characterAt(cursor->position()) != QChar::ObjectReplacementCharacter) {
-            ret = false;
-         } else {
-             QTextCursor tmpCursor(*cursor);
-             tmpCursor.setPosition(tmpCursor.position()+1);
-             QTextCharFormat format = tmpCursor.charFormat();
-
-             HbIconTextObject::HbSmileyDataType smiley =
-                     qVariantValue<HbIconTextObject::HbSmileyDataType>(format.property(HbIconTextObject::HbSmileyData));
-             if (cursor != smiley.first) {
-                ret = false;
-             }
-         }
-     } else {
-        ret = false;
-     }
-    return ret;
-}
-
-void HbSmileyEnginePrivate::convertToText(QTextDocument *copyDoc) const
-{
-    QList<QTextCursor> cursors;
-    // copy the cursors to copy document so that the positions get automatically updated
-    foreach(QTextCursor *cursor, mCursorToAnimator.keys()) {
-        if(isCursorValid(cursor)) {
-            QTextCursor copyCursor(copyDoc);
-            copyCursor.setPosition(cursor->position());
-            cursors << copyCursor;
-        }
-    }
-
-    foreach(QTextCursor copyCursor, cursors) {
-        copyCursor.setPosition(copyCursor.position()+1, QTextCursor::KeepAnchor);
-        QTextFormat format = copyCursor.charFormat();
-        HbIconTextObject::HbSmileyDataType smiley =
-                qVariantValue<HbIconTextObject::HbSmileyDataType>(format.property(HbIconTextObject::HbSmileyData));
-        HbIconAnimator *animator = smiley.second;
-        Q_ASSERT(animator);
-
-        QString pattern = mSmileyTheme.patterns(mSmileyAnimator.key(animator)).first();
-        copyCursor.deleteChar();
-        copyCursor.insertText(pattern);
-    }
-}
-
-void HbSmileyEnginePrivate::_q_animationProgressed()
-{
-    Q_Q(HbSmileyEngine);
-    HbIconAnimator *animator = qobject_cast<HbIconAnimator *>(q->sender());
-    Q_ASSERT(animator);
-
-    foreach(QTextCursor *cursor, mAnimatorToCursors.value(animator)) {
-        QTextCursor tmpCursor(*cursor);
-        tmpCursor.setPosition(tmpCursor.position()+1, QTextCursor::KeepAnchor);
-
-        // update a bogus property, which will trigger a paint
-        QTextCharFormat format;
-        format.setProperty(HbIconTextObject::HbSmileyData+1, QString("Dummy"));
-        mEdited = false;
-        tmpCursor.mergeCharFormat(format);
-        mEdited = true;
-    }
-}
-
-void HbSmileyEnginePrivate::_q_documentContentsChanged(int position, int charsRemoved, int charsAdded)
-{
-    Q_UNUSED(position);
-    Q_UNUSED(charsRemoved);
-    Q_UNUSED(charsAdded);
-
-    if(charsRemoved > 0 && mEdited) {
-        foreach (QTextCursor* cursor, mCursorToAnimator.keys()) {          
-            if (!isCursorValid(cursor)) {
-                HbIconAnimator * animator = mCursorToAnimator.value(cursor);
-                mCursorToAnimator.remove(cursor);
-                QList<QTextCursor*> & cursorList = mAnimatorToCursors[animator];
-                cursorList.removeFirst();
-                if (!cursorList.count()) {
-                    mAnimatorToCursors.remove(animator);
-                    mSmileyAnimator.remove(mSmileyAnimator.key(animator));
-                    animator->deleteLater();
-                }
-                delete cursor;
-            }
-        }
-    }
-}
-
-
-HbSmileyEngine::HbSmileyEngine(QObject *parent)
-    :QObject(parent),
-    d_ptr(new HbSmileyEnginePrivate)
-
-{
-    Q_D(HbSmileyEngine);
-    d->q_ptr = this;
-    d->init();
-}
-
-HbSmileyEngine::HbSmileyEngine(HbSmileyEnginePrivate &dd, QObject *parent)
-    :QObject(parent),
-    d_ptr(&dd)
-{
-    Q_D(HbSmileyEngine);
-    d->q_ptr = this;
-    d->init();
-}
-
-HbSmileyEngine::~HbSmileyEngine()
-{
-    delete d_ptr;
-}
-
-void HbSmileyEngine::setDocument(QTextDocument *doc)
-{
-    Q_D(HbSmileyEngine);
-    d->setDocument(doc);
-}
-
-void HbSmileyEngine::setTheme(const HbSmileyTheme& theme)
-{
-    Q_D(HbSmileyEngine);
-    d->mSmileyTheme = theme;
-}
-
-HbSmileyTheme HbSmileyEngine::theme() const
-{
-    Q_D(const HbSmileyEngine);
-    return d->mSmileyTheme;
-}
-
-HbSmileyTheme HbSmileyEngine::defaultTheme() const
-{
-    return HbSmileyEnginePrivate::mDefaultTheme;
-}
-
-
-QString HbSmileyEngine::toPlainText() const
-{
-    Q_D(const HbSmileyEngine);
-    QTextDocument *copyDoc = d->mDocument->clone();
-    d->convertToText(copyDoc);
-    QString plainText = copyDoc->toPlainText();
-    delete copyDoc;
-    return plainText;
-}
-
-QString HbSmileyEngine::toHtml() const
-{
-    Q_D(const HbSmileyEngine);
-    QTextDocument *copyDoc = d->mDocument->clone();
-    d->convertToText(copyDoc);
-    QString htmlString = copyDoc->toHtml();
-    return htmlString;
-}
-
-void HbSmileyEngine::startAnimation()
-{
-    Q_D(HbSmileyEngine);
-    foreach (HbIconAnimator *animator, d->mAnimatorToCursors.keys()) {
-        animator->startAnimation();
-    }
-}
-
-void HbSmileyEngine::stopAnimation()
-{
-    Q_D(HbSmileyEngine);
-    foreach (HbIconAnimator *animator, d->mAnimatorToCursors.keys()) {
-        animator->stopAnimation();
-    }
-}
-
-void HbSmileyEngine::insertSmileys()
-{
-    Q_D(HbSmileyEngine);
-
-    QTextCursor cursor(d->mDocument);
-    d->insertSmileys(cursor);
-}
-
-void HbSmileyEngine::insertSmileys(const QTextCursor& cursor)
-{
-    Q_D(HbSmileyEngine);
-    d->insertSmileys(cursor);
-}
-
-void HbSmileyEngine::insertSmiley(const QTextCursor& cursor)
-{
-    Q_D(HbSmileyEngine);
-    d->insertSmileys(cursor,true);
-}
-
-#include "moc_hbsmileyengine.cpp"
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/editors/hbsmileyengine.h
--- a/src/hbwidgets/editors/hbsmileyengine.h	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +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 HbWidgets 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 HBSMILEYENGINE_H
-#define HBSMILEYENGINE_H
-
-#include <hbglobal.h>
-#include <hbsmileytheme.h>
-
-#include <QObject>
-
-class HbSmileyEnginePrivate;
-QT_FORWARD_DECLARE_CLASS(QTextDocument);
-QT_FORWARD_DECLARE_CLASS(QTextCursor);
-
-class HB_WIDGETS_EXPORT HbSmileyEngine : public QObject
-{
-    Q_OBJECT
-public:
-    explicit HbSmileyEngine(QObject *parent = 0);
-    ~HbSmileyEngine();
-
-    void setDocument(QTextDocument *doc);
-    void startAnimation();
-    void stopAnimation();
-    void setTheme(const HbSmileyTheme& theme);
-    HbSmileyTheme theme() const;
-    HbSmileyTheme defaultTheme() const;
-
-    QString toPlainText() const;
-    QString toHtml() const;
-
-public slots:
-    void insertSmileys();
-    void insertSmileys(const QTextCursor& cursor);
-    void insertSmiley(const QTextCursor& cursor);
-
-
-protected:
-    HbSmileyEnginePrivate * const d_ptr;
-    explicit HbSmileyEngine(HbSmileyEnginePrivate &dd, QObject *parent = 0);
-
-private:
-    Q_DECLARE_PRIVATE_D(d_ptr, HbSmileyEngine)
-    Q_DISABLE_COPY(HbSmileyEngine)
-    Q_PRIVATE_SLOT(d_func(), void _q_animationProgressed())
-    Q_PRIVATE_SLOT(d_func(), void _q_documentContentsChanged(int position, int charsRemoved, int charsAdded))
-
-};
-
-Q_DECLARE_METATYPE(HbSmileyEngine*)
-#endif // HBSMILEYENGINE_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/editors/hbsmileyengine_p.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbwidgets/editors/hbsmileyengine_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,403 @@
+/****************************************************************************
+**
+** 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 HbWidgets 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 "hbsmileyengine_p.h"
+#include "hbsmileyengine_p_p.h"
+#include <hbiconanimator.h>
+#include <hbicon.h>
+#include <QTextDocument>
+#include <QFontMetricsF>
+#include <QChar>
+#include <QPainter>
+
+HbSmileyTheme HbSmileyEnginePrivate::mDefaultTheme = HbSmileyTheme();
+
+QSizeF HbIconTextObject::intrinsicSize(QTextDocument *doc, int posInDocument,
+                                    const QTextFormat &format)
+{
+    Q_UNUSED(doc)
+    Q_UNUSED(posInDocument)
+
+    HbSmileyDataType smiley = qVariantValue<HbSmileyDataType>(format.property(HbSmileyData));
+    HbIconAnimator *animator = smiley.animator;
+    Q_ASSERT(animator);
+
+    QFont f = static_cast<const QTextCharFormat&>(format).font();
+    QFontMetricsF fm(f);
+
+    // TODO: optimize this
+    HbIcon icon = animator->icon();
+    qreal iconHeight = fm.height() * smiley.scaleFactor;
+
+    if(icon.height() != iconHeight) {
+        icon.setHeight(iconHeight);
+        animator->setIcon(icon);
+    }
+    // We are going to draw the smiley on the descent line not on the baseline
+    // therefore the size needs to be adjusted accordingly.
+    return (icon.size()-QSizeF(0,fm.descent()));
+}
+
+void HbIconTextObject::drawObject(QPainter *painter, const QRectF &rect,
+                               QTextDocument *doc, int posInDocument,
+                               const QTextFormat &format)
+{
+    Q_UNUSED(doc)
+    Q_UNUSED(posInDocument)
+
+    HbSmileyDataType smiley = qVariantValue<HbSmileyDataType>(format.property(HbSmileyData));
+
+    QFont f = static_cast<const QTextCharFormat&>(format).font();
+    QFontMetricsF fm(f);
+
+    // Draw smiley on descent line
+    QTransform matrix = painter->transform();
+    painter->translate(0,fm.descent()-1);
+
+    HbIconAnimator *animator = smiley.animator;
+    animator->paint(painter,rect);
+    painter->setTransform(matrix);
+}
+
+HbSmileyEnginePrivate::HbSmileyEnginePrivate()
+    :mDocument(0),
+     mEdited(true),
+     mIconTextObject(new HbIconTextObject),
+     mScaleFactor(1)
+{
+    q_ptr = 0;
+}
+
+HbSmileyEnginePrivate::~HbSmileyEnginePrivate()
+{
+    cleanUp();
+    delete mIconTextObject;
+}
+
+
+void HbSmileyEnginePrivate::init()
+{
+    // Load default smiley theme
+    if(mDefaultTheme.isNull()) {
+        HbSmileyEnginePrivate::mDefaultTheme.load(":smileys/smileys_theme.sml");
+        //
+        //TODO: uncomment the lines below if animation definition file is provided for
+        //      default smiley theme.
+        //HbIconAnimationManager* m = HbIconAnimationManager::global();
+        //m->addDefinitionFile(":smileys/smileys_animations.xml");
+    }
+    mSmileyTheme = HbSmileyEnginePrivate::mDefaultTheme;
+}
+
+void HbSmileyEnginePrivate::cleanUp()
+{
+    QList<QTextCursor*> cursors = mCursorToAnimator.keys();
+    qDeleteAll(cursors);
+
+    QList<HbIconAnimator*> animators = mAnimatorToCursors.keys();
+    qDeleteAll(animators);
+
+    mAnimatorToCursors.clear();
+    mCursorToAnimator.clear();
+    mSmileyAnimator.clear();
+}
+
+void HbSmileyEnginePrivate::setDocument(QTextDocument *doc)
+{
+    Q_Q(HbSmileyEngine);
+    mDocument = doc;
+    mDocument->documentLayout()->registerHandler(HbIconTextFormat, mIconTextObject);
+    q->connect(mDocument, SIGNAL(contentsChange(int,int,int)), q, SLOT(_q_documentContentsChanged(int,int,int)));
+    cleanUp();
+}
+
+void HbSmileyEnginePrivate::insertSmiley( QTextCursor cursor, const QString& name)
+{
+    QTextCharFormat hbiconFormat;
+    QTextCursor *tmpCursor = new QTextCursor(cursor);
+    hbiconFormat.setObjectType(HbIconTextFormat);
+
+    HbSmileyDataType smiley;
+    HbIconAnimator *animator = lookupAnimator(name);
+    smiley.cursor = tmpCursor;
+    smiley.animator = animator;
+    smiley.scaleFactor = mScaleFactor;
+
+    hbiconFormat.setProperty(HbIconTextObject::HbSmileyData, qVariantFromValue(smiley));
+
+    mEdited = false;
+    tmpCursor->insertText(QString(QChar::ObjectReplacementCharacter), hbiconFormat);
+    mEdited = true;
+    tmpCursor->setPosition(tmpCursor->position()-1);
+    mAnimatorToCursors[animator] << tmpCursor;
+    mCursorToAnimator[tmpCursor] = animator;
+}
+
+void HbSmileyEnginePrivate::insertSmileys( QTextCursor cursor, bool insertOne)
+{
+    QString regexpStr;
+    foreach (QString pattern, mSmileyTheme.patterns()) {
+        regexpStr += QRegExp::escape(pattern) + "|";
+    }
+    regexpStr.remove(regexpStr.count()-1, 1);
+
+    QRegExp rx(regexpStr);
+    cursor = mDocument->find(rx, cursor);
+    while ( !cursor.isNull()){
+        insertSmiley(cursor, mSmileyTheme.smiley(cursor.selectedText()));
+        if (insertOne) {
+            break;
+        }
+        cursor = mDocument->find(rx, cursor);
+    }
+}
+
+
+HbIconAnimator* HbSmileyEnginePrivate::lookupAnimator(const QString& name)
+{
+    Q_Q(HbSmileyEngine);
+    HbIconAnimator *animator = mSmileyAnimator.value(name);
+
+    // Init icon if it doesn't already exits
+    if (!animator) {
+        HbIconAnimator *newAnimator = new HbIconAnimator();
+        animator = newAnimator;
+        HbIcon icon = HbIcon(name);
+        icon.setFlags(HbIcon::NoAutoStartAnimation);
+        animator->setIcon(icon);
+        q->connect(animator,SIGNAL(animationProgressed()),q,SLOT(_q_animationProgressed()));
+        animator->startAnimation();
+        mSmileyAnimator[name] = animator;
+    }
+
+    return animator;
+}
+
+
+bool HbSmileyEnginePrivate::isCursorValid(QTextCursor* cursor) const
+{
+    bool ret = true;
+
+    if (cursor) {
+        if (mDocument->characterAt(cursor->position()) != QChar::ObjectReplacementCharacter) {
+            ret = false;
+         } else {
+             QTextCursor tmpCursor(*cursor);
+             tmpCursor.setPosition(tmpCursor.position()+1);
+             QTextCharFormat format = tmpCursor.charFormat();
+
+             HbSmileyDataType smiley = qVariantValue<HbSmileyDataType>(format.property(HbIconTextObject::HbSmileyData));
+             if (cursor != smiley.cursor) {
+                ret = false;
+             }
+         }
+     } else {
+        ret = false;
+     }
+    return ret;
+}
+
+void HbSmileyEnginePrivate::convertToText(QTextDocument *copyDoc) const
+{
+    QList<QTextCursor> cursors;
+    // copy the cursors to copy document so that the positions get automatically updated
+    foreach(QTextCursor *cursor, mCursorToAnimator.keys()) {
+        if(isCursorValid(cursor)) {
+            QTextCursor copyCursor(copyDoc);
+            copyCursor.setPosition(cursor->position());
+            cursors << copyCursor;
+        }
+    }
+
+    foreach(QTextCursor copyCursor, cursors) {
+        copyCursor.setPosition(copyCursor.position()+1, QTextCursor::KeepAnchor);
+        QTextFormat format = copyCursor.charFormat();
+        HbSmileyDataType smiley = qVariantValue<HbSmileyDataType>(format.property(HbIconTextObject::HbSmileyData));
+        HbIconAnimator *animator = smiley.animator;
+        Q_ASSERT(animator);
+
+        QString pattern = mSmileyTheme.patterns(mSmileyAnimator.key(animator)).first();
+        copyCursor.deleteChar();
+        copyCursor.insertText(pattern);
+    }
+}
+
+void HbSmileyEnginePrivate::_q_animationProgressed()
+{
+    Q_Q(HbSmileyEngine);
+    HbIconAnimator *animator = qobject_cast<HbIconAnimator *>(q->sender());
+    Q_ASSERT(animator);
+
+    foreach(QTextCursor *cursor, mAnimatorToCursors.value(animator)) {
+        QTextCursor tmpCursor(*cursor);
+        tmpCursor.setPosition(tmpCursor.position()+1, QTextCursor::KeepAnchor);
+
+        // update a bogus property, which will trigger a paint
+        QTextCharFormat format;
+        format.setProperty(HbIconTextObject::HbSmileyData+1, QString("Dummy"));
+        mEdited = false;
+        tmpCursor.mergeCharFormat(format);
+        mEdited = true;
+    }
+}
+
+void HbSmileyEnginePrivate::_q_documentContentsChanged(int position, int charsRemoved, int charsAdded)
+{
+    Q_UNUSED(position);
+    Q_UNUSED(charsRemoved);
+    Q_UNUSED(charsAdded);
+
+    if(charsRemoved > 0 && mEdited) {
+        foreach (QTextCursor* cursor, mCursorToAnimator.keys()) {          
+            if (!isCursorValid(cursor)) {
+                HbIconAnimator * animator = mCursorToAnimator.value(cursor);
+                mCursorToAnimator.remove(cursor);
+                QList<QTextCursor*> & cursorList = mAnimatorToCursors[animator];
+                cursorList.removeFirst();
+                if (!cursorList.count()) {
+                    mAnimatorToCursors.remove(animator);
+                    mSmileyAnimator.remove(mSmileyAnimator.key(animator));
+                    animator->deleteLater();
+                }
+                delete cursor;
+            }
+        }
+    }
+}
+
+
+HbSmileyEngine::HbSmileyEngine(QObject *parent)
+    :QObject(parent),
+    d_ptr(new HbSmileyEnginePrivate)
+
+{
+    Q_D(HbSmileyEngine);
+    d->q_ptr = this;
+    d->init();
+}
+
+HbSmileyEngine::HbSmileyEngine(HbSmileyEnginePrivate &dd, QObject *parent)
+    :QObject(parent),
+    d_ptr(&dd)
+{
+    Q_D(HbSmileyEngine);
+    d->q_ptr = this;
+    d->init();
+}
+
+HbSmileyEngine::~HbSmileyEngine()
+{
+    delete d_ptr;
+}
+
+void HbSmileyEngine::setDocument(QTextDocument *doc)
+{
+    Q_D(HbSmileyEngine);
+    d->setDocument(doc);
+}
+
+void HbSmileyEngine::setTheme(const HbSmileyTheme& theme)
+{
+    Q_D(HbSmileyEngine);
+    d->mSmileyTheme = theme;
+}
+
+HbSmileyTheme HbSmileyEngine::theme() const
+{
+    Q_D(const HbSmileyEngine);
+    return d->mSmileyTheme;
+}
+
+HbSmileyTheme HbSmileyEngine::defaultTheme() const
+{
+    return HbSmileyEnginePrivate::mDefaultTheme;
+}
+
+
+QString HbSmileyEngine::toPlainText() const
+{
+    Q_D(const HbSmileyEngine);
+    QTextDocument *copyDoc = d->mDocument->clone();
+    d->convertToText(copyDoc);
+    QString plainText = copyDoc->toPlainText();
+    delete copyDoc;
+    return plainText;
+}
+
+QString HbSmileyEngine::toHtml() const
+{
+    Q_D(const HbSmileyEngine);
+    QTextDocument *copyDoc = d->mDocument->clone();
+    d->convertToText(copyDoc);
+    QString htmlString = copyDoc->toHtml();
+    return htmlString;
+}
+
+void HbSmileyEngine::setSmileyScaleFactor(qreal scaleFactor)
+{
+    Q_D(HbSmileyEngine);
+    if (d->mScaleFactor != scaleFactor) {
+        // Note: it is assumed that the scale factor is not changed on the fly hence we do not need to redraw the smileyes.
+        d->mScaleFactor = scaleFactor;
+    }
+}
+
+void HbSmileyEngine::startAnimation()
+{
+    Q_D(HbSmileyEngine);
+    foreach (HbIconAnimator *animator, d->mAnimatorToCursors.keys()) {
+        animator->startAnimation();
+    }
+}
+
+void HbSmileyEngine::stopAnimation()
+{
+    Q_D(HbSmileyEngine);
+    foreach (HbIconAnimator *animator, d->mAnimatorToCursors.keys()) {
+        animator->stopAnimation();
+    }
+}
+
+void HbSmileyEngine::insertSmileys()
+{
+    Q_D(HbSmileyEngine);
+
+    QTextCursor cursor(d->mDocument);
+    d->insertSmileys(cursor);
+}
+
+void HbSmileyEngine::insertSmileys(const QTextCursor& cursor)
+{
+    Q_D(HbSmileyEngine);
+    d->insertSmileys(cursor);
+}
+
+void HbSmileyEngine::insertSmiley(const QTextCursor& cursor)
+{
+    Q_D(HbSmileyEngine);
+    d->insertSmileys(cursor,true);
+}
+
+#include "moc_hbsmileyengine_p.cpp"
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/editors/hbsmileyengine_p.h
--- a/src/hbwidgets/editors/hbsmileyengine_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/editors/hbsmileyengine_p.h	Mon May 03 12:48:33 2010 +0300
@@ -25,70 +25,50 @@
 #ifndef HBSMILEYENGINE_P_H
 #define HBSMILEYENGINE_P_H
 
+#include <hbglobal.h>
 #include <hbsmileytheme.h>
-#include <hbsmileyengine.h>
-#include <QTextCursor>
-#include <QTextObjectInterface>
+
 #include <QObject>
-#include <QPair>
 
-class HbIconAnimator;
+class HbSmileyEnginePrivate;
 QT_FORWARD_DECLARE_CLASS(QTextDocument);
+QT_FORWARD_DECLARE_CLASS(QTextCursor);
 
-class HbIconTextObject : public QObject, public QTextObjectInterface
+class HB_AUTOTEST_EXPORT HbSmileyEngine : public QObject
 {
     Q_OBJECT
-    Q_INTERFACES(QTextObjectInterface)
 public:
-    enum Properties { HbSmileyData = 1 };
-    typedef QPair<QTextCursor*, HbIconAnimator*> HbSmileyDataType;
+    explicit HbSmileyEngine(QObject *parent = 0);
+    ~HbSmileyEngine();
+
+    void setDocument(QTextDocument *doc);
+    void startAnimation();
+    void stopAnimation();
+    void setTheme(const HbSmileyTheme& theme);
+    HbSmileyTheme theme() const;
+    HbSmileyTheme defaultTheme() const;
+
+    QString toPlainText() const;
+    QString toHtml() const;
+    void setSmileyScaleFactor(qreal scaleFactor);
 
-public:
-    QSizeF intrinsicSize(QTextDocument *doc, int posInDocument,
-                         const QTextFormat &format);
-    void drawObject(QPainter *painter, const QRectF &rect, QTextDocument *doc,
-                    int posInDocument, const QTextFormat &format);
+public slots:
+    void insertSmileys();
+    void insertSmileys(const QTextCursor& cursor);
+    void insertSmiley(const QTextCursor& cursor);
+
+
+protected:
+    HbSmileyEnginePrivate * const d_ptr;
+    explicit HbSmileyEngine(HbSmileyEnginePrivate &dd, QObject *parent = 0);
+
+private:
+    Q_DECLARE_PRIVATE_D(d_ptr, HbSmileyEngine)
+    Q_DISABLE_COPY(HbSmileyEngine)
+    Q_PRIVATE_SLOT(d_func(), void _q_animationProgressed())
+    Q_PRIVATE_SLOT(d_func(), void _q_documentContentsChanged(int position, int charsRemoved, int charsAdded))
+
 };
 
-class HbSmileyEnginePrivate
-{
-    Q_DECLARE_PUBLIC(HbSmileyEngine)
-public:
-    enum { HbIconTextFormat = QTextFormat::UserObject + 1 };
-    HbSmileyEnginePrivate();
-    virtual ~HbSmileyEnginePrivate();
-    void init();
-    void cleanUp();
-    void setDocument(QTextDocument *doc);
-    void insertSmiley( QTextCursor cursor, const QString& name);
-    void insertSmileys( QTextCursor cursor, bool insertOne = false);
-    HbIconAnimator* lookupAnimator(const QString& name);
-    bool isCursorValid(QTextCursor* cursor) const;
-
-    HbIconAnimator* animatorForCursor(const QTextCursor& cursor);
-    void removeCursor(const QTextCursor &cursor, HbIconAnimator* animator);
-    void convertToText(QTextDocument *copyDoc) const;
-
-    void _q_animationProgressed();
-    void _q_documentContentsChanged(int position, int charsRemoved, int charsAdded);
-
-    HbSmileyEngine *q_ptr;
-
-    QTextDocument *mDocument;
-    HbSmileyTheme mSmileyTheme;
-    bool mEdited;
-    QObject *mIconTextObject;
-
-
-    QHash<HbIconAnimator*, QList<QTextCursor*> > mAnimatorToCursors;
-    QHash<QTextCursor*,HbIconAnimator*> mCursorToAnimator;
-    QHash<QString, HbIconAnimator*> mSmileyAnimator;
-
-    static HbSmileyTheme mDefaultTheme;
-};
-
-Q_DECLARE_METATYPE(HbIconAnimator*)
-Q_DECLARE_METATYPE(HbIconTextObject::HbSmileyDataType)
-
-
+Q_DECLARE_METATYPE(HbSmileyEngine*)
 #endif // HBSMILEYENGINE_P_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/editors/hbsmileyengine_p_p.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbwidgets/editors/hbsmileyengine_p_p.h	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,103 @@
+/****************************************************************************
+**
+** 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 HbWidgets 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 HBSMILEYENGINE_P_P_H
+#define HBSMILEYENGINE_P_P_H
+
+#include <hbsmileytheme.h>
+#include <hbsmileyengine_p.h>
+#include <QTextCursor>
+#include <QTextObjectInterface>
+#include <QObject>
+#include <QPair>
+
+class HbIconAnimator;
+QT_FORWARD_DECLARE_CLASS(QTextDocument);
+
+struct HbSmileyDataType {
+    HbSmileyDataType():cursor(0),animator(0),scaleFactor(1){}
+    QTextCursor* cursor;
+    HbIconAnimator* animator;
+    qreal scaleFactor;
+};
+
+
+class HbIconTextObject : public QObject, public QTextObjectInterface
+{
+    Q_OBJECT
+    Q_INTERFACES(QTextObjectInterface)
+public:
+    enum Properties { HbSmileyData = 1 };
+    //typedef QPair<QTextCursor*, HbIconAnimator*> HbSmileyDataType;
+
+public:
+    QSizeF intrinsicSize(QTextDocument *doc, int posInDocument,
+                         const QTextFormat &format);
+    void drawObject(QPainter *painter, const QRectF &rect, QTextDocument *doc,
+                    int posInDocument, const QTextFormat &format);
+};
+
+class HbSmileyEnginePrivate
+{
+    Q_DECLARE_PUBLIC(HbSmileyEngine)
+public:
+    enum { HbIconTextFormat = QTextFormat::UserObject + 1 };
+    HbSmileyEnginePrivate();
+    virtual ~HbSmileyEnginePrivate();
+    void init();
+    void cleanUp();
+    void setDocument(QTextDocument *doc);
+    void insertSmiley( QTextCursor cursor, const QString& name);
+    void insertSmileys( QTextCursor cursor, bool insertOne = false);
+    HbIconAnimator* lookupAnimator(const QString& name);
+    bool isCursorValid(QTextCursor* cursor) const;
+
+    HbIconAnimator* animatorForCursor(const QTextCursor& cursor);
+    void removeCursor(const QTextCursor &cursor, HbIconAnimator* animator);
+    void convertToText(QTextDocument *copyDoc) const;
+
+    void _q_animationProgressed();
+    void _q_documentContentsChanged(int position, int charsRemoved, int charsAdded);
+
+    HbSmileyEngine *q_ptr;
+
+    QTextDocument *mDocument;
+    HbSmileyTheme mSmileyTheme;
+    bool mEdited;
+    QObject *mIconTextObject;
+    qreal mScaleFactor;
+
+
+    QHash<HbIconAnimator*, QList<QTextCursor*> > mAnimatorToCursors;
+    QHash<QTextCursor*,HbIconAnimator*> mCursorToAnimator;
+    QHash<QString, HbIconAnimator*> mSmileyAnimator;
+
+    static HbSmileyTheme mDefaultTheme;
+};
+
+Q_DECLARE_METATYPE(HbIconAnimator*)
+Q_DECLARE_METATYPE(HbSmileyDataType)
+
+
+#endif // HBSMILEYENGINE_P_P_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/editors/hbtextedit.cpp
--- a/src/hbwidgets/editors/hbtextedit.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/editors/hbtextedit.cpp	Mon May 03 12:48:33 2010 +0300
@@ -25,6 +25,7 @@
 
 #include "hbtextedit.h"
 #include "hbtextedit_p.h"
+#include "hbsmileyengine_p.h"
 
 #include <QTextCursor>
 
@@ -185,47 +186,75 @@
 {
     Q_D(HbTextEdit);
 
-    const QString KTextRowLinesColorCSSName   = "line-color";
-    const QString KTextRowLinesWidthCSSName   = "line-width";
-    const QString KTextRowLinesEnabledCSSName = "line-enabled";
+    if (isVisible()) {
+
+//        const QString KTextRowLinesColorCSSName   = "line-color";
+        const QString KTextRowLinesWidthCSSName   = "line-width";
+        const QString KSmileyScaleCSSName         = "smiley-scale";
+        const QString KTextRowLinesStyleCSSName   = "line-style";
+
+        // ------ adding css parameters ------
+//        params.addParameter(KTextRowLinesColorCSSName, Qt::black);
+        params.addParameter(KTextRowLinesWidthCSSName, 0.0);
+        params.addParameter(KSmileyScaleCSSName);
+        params.addParameter(KTextRowLinesStyleCSSName);
 
-    // ------ adding css parameters ------
-    params.addParameter(KTextRowLinesColorCSSName, Qt::magenta);
-    params.addParameter(KTextRowLinesWidthCSSName, 0.0);
-    params.addParameter(KTextRowLinesEnabledCSSName);
+        HbAbstractEdit::polish(params);
 
-    HbAbstractEdit::polish(params);
+        // ------ interpreting css parameters ------
+//        QVariant param = params.value(KTextRowLinesColorCSSName);
+//        if(param.canConvert(QVariant::Color)) {
+//            d->mTextBaseLinePen.setColor(param.value<QColor>());
+//        }
+
+        QVariant param = params.value(KTextRowLinesWidthCSSName);
+        if(param.canConvert(QVariant::Double)) {
+            d->mTextBaseLinePen.setWidthF(qMax(param.toDouble(), 0.0));
+        }
 
-    // ------ interpreting css parameters ------
-    QVariant param = params.value( KTextRowLinesEnabledCSSName );
-    d->mShowTextBaseLine = param.toBool();
+        param = params.value(KSmileyScaleCSSName);
+        if(param.canConvert(QVariant::Double)) {
+            d->smileyEngineInstance()->setSmileyScaleFactor(param.toDouble());
+        }
+
+        param = params.value(KTextRowLinesStyleCSSName);
+        if(param.canConvert(QVariant::String)) {
+            d->setBaseLineStyleFromString(param.toString());
+        }
+    } else {
+        HbAbstractEdit::polish(params);
+    }
+}
+
 
-    param = params.value(KTextRowLinesColorCSSName);
-    if(param.canConvert(QVariant::Color)) {
-        d->mTextBaseLinePen.setColor(param.value<QColor>());
-    }
+/*!
+    @proto
+
+    Sets if row lines to be visible or not.
 
-    param = params.value(KTextRowLinesWidthCSSName);
-    if(param.canConvert(QVariant::Double)) {
-        d->mTextBaseLinePen.setWidthF(qMax(param.toDouble(), 0.0));
+    \sa HbTextEdit::isLined() const
+ */
+void HbTextEdit::setLined(bool visible)
+{
+    Q_D(HbTextEdit);
+
+    if (d->mShowTextBaseLine!=visible) {
+        d->mShowTextBaseLine=visible;
+        d->mShowTextBaseLineApiProtectionFlag = true;
+        update();
     }
 }
 
 /*!
-    \reimp
- */
-void HbTextEdit::focusOutEvent(QFocusEvent * event)
-{
-    HbAbstractEdit::focusOutEvent(event);
-    setBackgroundItem(HbStyle::P_TextEdit_frame_normal);
-}
+    @proto
+
+    Returns true if row lines are visble.
 
-/*!
-    \reimp
+    \sa HbTextEdit::setLined(bool)
  */
-void HbTextEdit::focusInEvent(QFocusEvent * event)
+bool HbTextEdit::isLined() const
 {
-    HbAbstractEdit::focusInEvent(event);
-    setBackgroundItem(HbStyle::P_TextEdit_frame_highlight);
+    Q_D(const HbTextEdit);
+
+    return d->mShowTextBaseLine;
 }
-
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/editors/hbtextedit.h
--- a/src/hbwidgets/editors/hbtextedit.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/editors/hbtextedit.h	Mon May 03 12:48:33 2010 +0300
@@ -37,6 +37,9 @@
     Q_OBJECT
 
     Q_PROPERTY(QString plainText READ toPlainText WRITE setPlainText USER true)
+    Q_PROPERTY(bool lined
+               READ isLined
+               WRITE setLined)
 
 public:
 
@@ -58,6 +61,9 @@
     QString toPlainText() const;
     QString toHtml() const;
 
+    void setLined(bool visible=true);
+    bool isLined() const;
+
 public slots:
     void setPlainText(const QString &text);
     void setHtml(const QString &text);
@@ -66,8 +72,6 @@
     HbTextEdit (HbTextEditPrivate &dd, QGraphicsItem *parent);
     void resizeEvent(QGraphicsSceneResizeEvent *event);
     void polish( HbStyleParameters& params );
-    void focusOutEvent ( QFocusEvent * event );
-    void focusInEvent ( QFocusEvent * event );
 
 private:
     Q_DISABLE_COPY(HbTextEdit)
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/editors/hbtextedit_p.cpp
--- a/src/hbwidgets/editors/hbtextedit_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/editors/hbtextedit_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -37,11 +37,11 @@
 #include "hbtextedit_p.h"
 #include "hbtextedit.h"
 #include "hbcolorscheme.h"
-#include <QtDebug>
 
 HbTextEditPrivate::HbTextEditPrivate () :
     HbAbstractEditPrivate(),
-    mShowTextBaseLine(true)
+    mShowTextBaseLine(false),
+    mShowTextBaseLineApiProtectionFlag(false)
 {
 }
 
@@ -53,13 +53,13 @@
 {
     Q_Q(HbTextEdit);
 
-    mTextBaseLinePen.setColor(Qt::magenta);
+//    mTextBaseLinePen.setColor(Qt::magenta);
     mTextBaseLinePen.setCapStyle(Qt::RoundCap);
     mTextBaseLinePen.setWidthF((qreal)1.0);
 
     q->setScrollable(true);
-    doc->documentLayout()->document()->setDocumentMargin(0);
     q->setBackgroundItem(HbStyle::P_TextEdit_frame_normal);
+    q->setFocusHighlight(HbStyle::P_TextEdit_frame_highlight,HbWidget::FocusHighlightActive);
 }
 
 void HbTextEditPrivate::updatePaletteFromTheme()
@@ -70,6 +70,8 @@
     QColor textColor = HbColorScheme::color("qtc_textedit_normal");
     QColor selectedColor = HbColorScheme::color("qtc_textedit_selected");
     QColor selectedBackground = HbColorScheme::color("qtc_textedit_marker_normal");
+    QColor hintText = HbColorScheme::color("qtc_textedit_hint_normal");
+    mTextBaseLinePen.setColor(HbColorScheme::color("qtc_textedit_normal"));
     QPalette pal = q->palette();
 
     if (textColor.isValid()) {
@@ -83,6 +85,11 @@
     if (selectedBackground.isValid()) {
         pal.setColor(QPalette::Highlight, selectedBackground);
     }
+
+    if (hintText.isValid()) {
+        pal.setColor(QPalette::NoRole, hintText);
+    }
+
     q->setPalette(pal);
 }
 
@@ -90,7 +97,7 @@
 {
     Q_Q(HbTextEdit);
     if (scrollArea) {
-        scrollArea->setMinimumHeight(QFontMetrics(q->font()).height());
+        scrollArea->setMinimumHeight(QFontMetrics(q->font()).height() + 2 * doc->documentMargin());
         scrollArea->setPreferredHeight(doc->documentLayout()->documentSize().height());
         scrollArea->setMaximumHeight(QWIDGETSIZE_MAX);
     }
@@ -114,6 +121,9 @@
  */
 void HbTextEditPrivate::drawTextBaseLines(QPainter *painter) const
 {
+    // Save painter's state
+    QPen oldPen = painter->pen();
+
     const QRegion clipReg = painter->clipRegion();
 
     painter->setPen(mTextBaseLinePen);
@@ -152,6 +162,9 @@
             lineRect.translate(0,lineRect.height());
         }
     }
+
+    // Restore painter's state
+    painter->setPen(oldPen);
 }
 
 /*
@@ -163,3 +176,30 @@
 {
     painter->drawLine(QPointF(x1,y), QPointF(x2,y));
 }
+
+void HbTextEditPrivate::setBaseLineStyleFromString(const QString &str)
+{
+    // if parsing is failed then set solid line
+    mTextBaseLinePen.setStyle(Qt::SolidLine);
+
+    if(!str.isEmpty()) {
+        static const char *const suportedLineStyles[] = {
+            "Solid",
+            "Dash",
+            "Dot",
+            "DashDot",
+            "DashDotDot"
+        };
+
+        static const int LineStyleCount = sizeof(suportedLineStyles)
+                                          /sizeof(suportedLineStyles[0]);
+
+        for (int i=0;i<LineStyleCount; ++i) {
+            if (str==suportedLineStyles[i]) {
+                mTextBaseLinePen.setStyle(
+                        static_cast<Qt::PenStyle>(Qt::SolidLine+i));
+                break;
+            }
+        }
+    }
+}
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/editors/hbtextedit_p.h
--- a/src/hbwidgets/editors/hbtextedit_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/editors/hbtextedit_p.h	Mon May 03 12:48:33 2010 +0300
@@ -57,7 +57,10 @@
     void drawTextBaseLines(QPainter *painter) const;
     void drawBaseLineAt(QPainter *painter, qreal x1, qreal x2, qreal y) const;
 
+    void setBaseLineStyleFromString(const QString &str);
+
     bool mShowTextBaseLine;
+    bool mShowTextBaseLineApiProtectionFlag;
     QPen mTextBaseLinePen;
 };
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/editors/hbvalidator.cpp
--- a/src/hbwidgets/editors/hbvalidator.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/editors/hbvalidator.cpp	Mon May 03 12:48:33 2010 +0300
@@ -307,7 +307,9 @@
 }
 
 /*!
-    DEPRECATED
+   \deprecated HbValidator::addSeparator(const QString&)
+        is deprecated. You can use addDefaultSeparator or addField with separator parameter instead of this.
+
  */
 void HbValidator::addSeparator(const QString &str)
 {
@@ -316,7 +318,9 @@
 }
 
 /*!
-    DEPRECATED
+   \deprecated HbValidator::setMasterValidator(QValidator*)
+        is deprecated. Master validator is not needed anymore. Use only addField.
+
  */
 void HbValidator::setMasterValidator(QValidator *validator)
 {
@@ -327,7 +331,9 @@
 }
 
 /*!
-    DEPRECATED
+   \deprecated HbValidator::masterValidator() const
+        is deprecated. Master validator is not needed anymore. Use only addField.
+
  */
 const QValidator *HbValidator::masterValidator() const
 {
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/hbwidgets.pro
--- a/src/hbwidgets/hbwidgets.pro	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/hbwidgets.pro	Mon May 03 12:48:33 2010 +0300
@@ -29,7 +29,6 @@
     svg \
     network
 DEFINES += BUILD_HB_WIDGETS
-developer:DEFINES += BUILD_HB_INTERNAL
 
 # directories
 DESTDIR = $${HB_BUILD_DIR}/lib
@@ -46,7 +45,7 @@
 CONVENIENCE_HEADERS += $${HB_BUILD_DIR}/include/hbwidgets/hbwidgets.h
 CONVENIENCE_HEADERS += $$files($${HB_BUILD_DIR}/include/hbwidgets/Hb*)
 HEADERS += $$PUBLIC_HEADERS \
-    $$INTERNAL_HEADERS \
+    $$PRIVATE_HEADERS \
     $$CONVENIENCE_HEADERS
 
 # dependencies
@@ -70,14 +69,13 @@
 #QMAKE_DISTCLEAN += $$hbNativePath($${HB_BUILD_DIR}/include/hbwidgets/private/*)
 
 symbian {
-    defFilePath = ..
     TARGET.EPOCALLOWDLLDATA = 1
     TARGET.CAPABILITY = CAP_GENERAL_DLL
     TARGET.UID3 = 0x20022FCC
 
     # 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?
-    INCLUDEPATH += /epoc32/include/osextensions/stdapis/stlport # TODO: depends on S60 version?
+    INCLUDEPATH += $${EPOCROOT}epoc32/include/osextensions/stdapis/stlport # TODO: depends on S60 version?
     hbExportHeaders(hbwidgets)
 }
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/itemviews/hbabstractitemcontainer.cpp
--- a/src/hbwidgets/itemviews/hbabstractitemcontainer.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/itemviews/hbabstractitemcontainer.cpp	Mon May 03 12:48:33 2010 +0300
@@ -36,10 +36,22 @@
 #include <QEvent>
 #include <QDebug>
 
+
+// For QMAP_INT__ITEM_STATE_DEPRECATED's sake. Removed when QMap<int,QVariant> based state item system is removed
+#include <hbabstractviewitem_p.h>
+
+#ifdef QMAP_INT__ITEM_STATE_DEPRECATED
+#define HB_ITEM_STATE_ASSERT Q_ASSERT_X(0, "", "QMap<int,QVariant> based view item state system is deprecated. Use QHash<QString, QVariant> based instead" )
+#else
+#define HB_ITEM_STATE_ASSERT
+#endif
+
 /*!
     @alpha
     @hbwidgets
     \class HbAbstractItemContainer
+    \deprecated HbAbstractItemContainer
+        is deprecated from public API. This class will be made private.
     \brief HbAbstractItemContainer represents container for HbAbstractViewItem derived items.
 
     
@@ -50,6 +62,8 @@
 
 /*!
     \fn void HbAbstractItemContainer::itemAdded(int index, HbAbstractViewItem *item)
+    \deprecated HbAbstractItemContainer::itemAdded(int, HbAbstractViewItem *)
+        is deprecated from public API. Class HbAbstractItemContainer will be made private.
 
     Function is called after new \a item was added into \a index position into
     container.
@@ -57,18 +71,24 @@
 
 /*!
     \fn void HbAbstractItemContainer::itemRemoved(HbAbstractViewItem *item)
+    \deprecated HbAbstractItemContainer::itemRemoved(HbAbstractViewItem *)
+        is deprecated from public API. Class HbAbstractItemContainer will be made private.
 
     Function is called after the \a item was removed from the container. 
 */
 
 /*!
     \fn void HbAbstractItemContainer::viewResized(const QSizeF &size)
+    \deprecated HbAbstractItemContainer::viewResized(const QSizeF &)
+        is deprecated from public API. Class HbAbstractItemContainer will be made private.
 
     Function is called when container needs to be resized.
 */
 
 /*!
     \fn HbAbstractViewItem *createDefaultPrototype() const
+    \deprecated HbAbstractItemContainer::createDefaultPrototype() const
+        is deprecated from public API. Class HbAbstractItemContainer will be made private.
 
     Returns the default prototype.
 
@@ -98,6 +118,10 @@
  */
 QRectF HbAbstractItemContainerPrivate::itemBoundingRect(const QGraphicsItem *item) const
 {
+    Q_Q(const HbAbstractItemContainer);
+    if (q->layout()) {
+        q->layout()->activate();
+    }
     return item->mapToItem(mItemView, item->boundingRect()).boundingRect();
 }
 
@@ -192,6 +216,8 @@
         result = prototype->createItem();
         Q_ASSERT_X(result && result->prototype() == prototype, "HbAbstractItemContainerPrivate::createItem", "Copy constructor must be used for creating concrete view items in createItem(). Create your custom view item with 'new YourCustomViewItem(*this)' instead of 'new YourCustomViewItem(this)'");
         result->setParentItem(q);
+
+        emit q->itemCreated(result);
     }
     return result;
 }
@@ -255,24 +281,7 @@
         decreaseBufferSize(itemCount - targetCount);
     }
 
-    QGraphicsLayout *layout = q->layout();
-    if (layout && !layout->isActivated()) {
-        layout->activate();
-    }
-
-    // Restore the first item position related to view if it has changed.
-    if (firstItem) {
-        QPointF delta = itemBoundingRect(firstItem).topLeft() - firstItemPos;
-        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();
-            }
-        }
-    }
+    restoreItemPosition(firstItem, firstItemPos);
 }
 
 /*!
@@ -351,7 +360,7 @@
 
     int firstVisible = 0;
     int lastVisible = 0;
-    firstAndLastVisibleBufferIndex(firstVisible, lastVisible, itemBoundingRect(mItemView), false);
+    firstAndLastVisibleBufferIndex(firstVisible, lastVisible, mItemView->geometry(), false);
 
     int deletableItemsOnTop = firstVisible - 1;
     int deletableItemsOnBottom = mItems.count() - lastVisible - 1;
@@ -418,11 +427,15 @@
 */
 void HbAbstractItemContainerPrivate::doRemoveItem(HbAbstractViewItem *item, const QModelIndex &index, bool animate)
 {
-    Q_Q(HbAbstractItemContainer);
-    
     if (item) {
         deleteItem(item, animate);
+#ifndef QMAP_INT__ITEM_STATE_DEPRECATED
+        Q_Q(HbAbstractItemContainer);
         q->setItemState(index, QMap<int, QVariant>());
+#endif
+        if (!index.isValid()) {
+            mItemStates.remove(index);
+        }
     }
 }
 
@@ -436,15 +449,18 @@
 {
     Q_Q(HbAbstractItemContainer);
 
-    q->setItemState(item->modelIndex(), item->state());
-
+#ifndef QMAP_INT__ITEM_STATE_DEPRECATED
+	q->setItemState(item->modelIndex(), item->state());
+#endif
+    q->setItemTransientState(item->modelIndex(), item->transientState());
     mItems.removeOne(item);
     q->itemRemoved(item, animate);
 
 #ifndef HB_EFFECTS
     delete item;
 #else
-    if (!HbEffect::effectRunning(item, "disappear")) {
+    if (!HbEffect::effectRunning(item, "disappear") 
+        && !HbEffect::effectRunning(item, "collapse")) {
         delete item;
     }
 #endif
@@ -452,25 +468,22 @@
 
 /*
     \private
-    The previous and the next index must be in the buffer. We cannot assume in this base class 
+    The previous or the next index must be in the buffer. We cannot assume in this base class 
     that the container is a list we just have to loop through the items and find if the previous
-    and next exist in the buffer
-
+    or next exist in the buffer. Next index should not be the first one in the buffer and the
+    previous index should not be the last one in the buffer in order this index to the buffer.
 */
 bool HbAbstractItemContainerPrivate::intoContainerBuffer(const QModelIndex &index) const
 {    
     QModelIndex nextIndex = mItemView->modelIterator()->nextIndex(index);
     QModelIndex previousIndex = mItemView->modelIterator()->previousIndex(index);
-    bool nextFound = false;
-    bool previousFound = false;
 
-    foreach (const HbAbstractViewItem *bufferItem, mItems) {
-        if (bufferItem->modelIndex() == nextIndex){
-            nextFound=true;
-        } else if (bufferItem->modelIndex() == previousIndex) {
-            previousFound=true;
-        }
-        if (previousFound && nextFound) {
+    int itemCount = mItems.count();
+    for (int i = 0; i < itemCount; ++i) {
+        QModelIndex currentIndex = mItems.at(i)->modelIndex();
+        if (currentIndex == nextIndex && i != 0){
+            return true;
+        } else if (currentIndex == previousIndex && i != (itemCount - 1)) {
             return true;
         }
     }
@@ -481,16 +494,82 @@
 {   
     int bufferIndex = 0;
     QModelIndex nextIndex = mItemView->modelIterator()->nextIndex(index);
+    QModelIndex previousIndex = mItemView->modelIterator()->previousIndex(index);
+
     while (bufferIndex < mItems.count()) {
-        if (mItems.at(bufferIndex)->modelIndex() == nextIndex) {
+        QModelIndex currentIndex = mItems.at(bufferIndex)->modelIndex();
+        if (currentIndex == nextIndex) {
             break;
         }
+
         ++bufferIndex;
+
+        if (currentIndex == previousIndex) {
+            break;
+        }
     }
     return bufferIndex;
 }
 
+void HbAbstractItemContainerPrivate::restoreItemPosition(HbAbstractViewItem *item, const QPointF &position)
+{
+    Q_Q(HbAbstractItemContainer);
+
+    if (item) {
+        QPointF delta = itemBoundingRect(item).topLeft() - position;
+        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();
+            }
+        }
+    }
+}
+
+void HbAbstractItemContainerPrivate::insertItem(HbAbstractViewItem *item, int pos, const QModelIndex &index, bool animate)
+{
+    Q_Q(HbAbstractItemContainer);
+
+    if (item) {
+        mItems.insert(pos, item);
+        q->itemAdded(pos, item, animate);
+
+        q->setItemModelIndex(item, index);
+    }
+}
+
+qreal HbAbstractItemContainerPrivate::getDiffWithoutScrollareaCompensation(const QPointF &delta) const
+{
+    Q_Q( const HbAbstractItemContainer);
+    const QSizeF containerSize(q->size());
+    const QPointF containerPos(q->pos());
+    qreal diff = 0.0;
+    qreal invisibleArea = 0.0;
+    if (delta.y() > 0) {
+        // space at the bottom
+        QSizeF viewSize = mItemView->size();
+        invisibleArea = containerSize.height() - viewSize.height() + containerPos.y();
+        if (invisibleArea < delta.y()) {
+            diff = delta.y() - invisibleArea;
+        }
+    } else {
+        // space at the top
+        invisibleArea = -containerPos.y();
+        if (containerPos.y() > delta.y()) {
+            diff = delta.y() + invisibleArea;
+        }
+    }
+
+    return diff;
+}
+
 /*!
+    \deprecated HbAbstractItemContainer::HbAbstractItemContainer__sub_object(QGraphicsItem*)
+        is deprecated from public API. Class HbAbstractItemContainer will be made private.
+    
     Constructs a new HbAbstractItemContainer with \a parent.
 */
 HbAbstractItemContainer::HbAbstractItemContainer(QGraphicsItem *parent) : 
@@ -501,6 +580,9 @@
 }
 
 /*!
+    \deprecated HbAbstractItemContainer::HbAbstractItemContainer__sub_object(HbAbstractItemContainerPrivate&, QGraphicsItem*)
+        is deprecated from public API. Class HbAbstractItemContainer will be made private.
+
     Constructs an item with private class object \a dd and \a parent. 
 */
 HbAbstractItemContainer::HbAbstractItemContainer(HbAbstractItemContainerPrivate &dd, QGraphicsItem *parent) :
@@ -512,6 +594,9 @@
 }
 
 /*!
+    \deprecated HbAbstractItemContainer::~HbAbstractItemContainer()
+        is deprecated from public API. Class HbAbstractItemContainer will be made private.
+
     Destroys the container.
 */
 HbAbstractItemContainer::~HbAbstractItemContainer()
@@ -519,6 +604,9 @@
 }
 
 /*!
+    \deprecated HbAbstractItemContainer::event(QEvent*)
+        is deprecated from public API. Class HbAbstractItemContainer will be made private.
+
     \reimp
 */
 bool HbAbstractItemContainer::event(QEvent *e)
@@ -534,12 +622,15 @@
     } else if (e->type() == UpdateItemBufferEvent) {
         Q_D(HbAbstractItemContainer);
         d->updateItemBuffer();
-   }
+    }
 
     return HbWidget::event(e);
 }
 
 /*!
+    \deprecated HbAbstractItemContainer::itemByIndex(const QModelIndex&) const
+        is deprecated from public API. Class HbAbstractItemContainer will be made private.
+
     Returns view item object corresponding given model \a index. This might be 0 pointer if
     there is no view item representing given index or given \a index is invalid.
 */
@@ -554,6 +645,9 @@
 }
 
 /*!
+    \deprecated HbAbstractItemContainer::removeItems()
+        is deprecated from public API. Class HbAbstractItemContainer will be made private.
+
     This function is provided for convenience. 
     
     It removes all the items from the container and clears the internal state model.
@@ -565,9 +659,13 @@
     qDeleteAll(d->mItems);
     d->mItems.clear();
     d->mItemStateList.clear();
+   d->mItemStates.clear();
 }
 
 /*!
+    \deprecated HbAbstractItemContainer::itemView() const
+        is deprecated from public API. Class HbAbstractItemContainer will be made private.
+
     Returns the item view that container is connected.
 */
 HbAbstractItemView *HbAbstractItemContainer::itemView() const
@@ -577,6 +675,9 @@
 }
 
 /*!
+    \deprecated HbAbstractItemContainer::setItemView(HbAbstractItemView*)
+        is deprecated from public API. Class HbAbstractItemContainer will be made private.
+
     Sets item \a view that container is connected.
 */
 void HbAbstractItemContainer::setItemView(HbAbstractItemView *view)
@@ -602,6 +703,9 @@
 }
 
 /*!
+    \deprecated HbAbstractItemContainer::setItemModelIndex(HbAbstractViewItem*, const QModelIndex&)
+        is deprecated from public API. Class HbAbstractItemContainer will be made private.
+
     Assigns new model \a index to the given \a item. Item's current state is saved
     and state for \a index is restored to item.
 */
@@ -610,21 +714,29 @@
 
     if (item && item->modelIndex() != index) { 
 
+#ifndef QMAP_INT__ITEM_STATE_DEPRECATED
         setItemState(item->modelIndex(), item->state());
+#endif
+        setItemTransientState(item->modelIndex(), item->transientState());
 
         // Transfer the state from item currently representing index to new item, if such exists.
         HbAbstractViewItem *oldItem = itemByIndex(index);
+
         if (oldItem) {
-            item->setState(oldItem->state());
+            item->setTransientState(oldItem->transientState());
         } else {
-            item->setState(itemState(index));
+            item->setTransientState(itemTransientState(index));
         }
 
+
         item->setModelIndex(index);
     }
 }
 
 /*!
+    \deprecated HbAbstractItemContainer::setModelIndexes(const QModelIndex&)
+        is deprecated from public API. Class HbAbstractItemContainer will be made private.
+
     Sets item's model indexes starting from given \a startIndex. If \a startIndex is
     QModelIndex() then startIndex is taken from the first item. 
 
@@ -769,6 +881,9 @@
 }
 
 /*!
+    \deprecated HbAbstractItemContainer::items() const
+        is deprecated from public API. Class HbAbstractItemContainer will be made private.
+
     Returns list of items inside item buffer.
 */
 QList<HbAbstractViewItem *> HbAbstractItemContainer::items() const
@@ -778,6 +893,9 @@
 }
 
 /*!
+    \deprecated HbAbstractItemContainer::addItem(const QModelIndex&, bool)
+        is deprecated from public API. Class HbAbstractItemContainer will be made private.
+
     Adds item for model \a index to container.
 */
 void HbAbstractItemContainer::addItem(const QModelIndex &index, bool animate)
@@ -786,27 +904,66 @@
 
     // Add new item if maximum item count allows it or item falls within the range of
     // item buffer items. 
-    if (d->mItems.count() < maxItemCount() 
-        || (d->mItems.count() > 0
-           && d->intoContainerBuffer(index))) {
-
-        int bufferIndex = 0;
-        if (d->mItems.count() != 0) {
-            bufferIndex = d->containerBufferIndexForModelIndex(index); 
-        }
+    if (d->intoContainerBuffer(index)) {
+        int bufferIndex = d->containerBufferIndexForModelIndex(index); 
 
         if (bufferIndex >= d->mItems.count()
             || d->mItems.at(bufferIndex)->modelIndex() != index) {
-            insertItem(bufferIndex, index, animate);
+            // Store the second item position related to view.
+            HbAbstractViewItem *referenceItem = d->mItems.value(1);
+            QPointF referenceItemPos;
+            if (referenceItem) {
+                referenceItemPos = d->itemBoundingRect(referenceItem).topLeft();
+            }
+
+            HbAbstractViewItem *recycledItem = 0;
+            QRectF viewRect = d->itemBoundingRect(d->mItemView);
+
+            if (d->mItemRecycling && !viewRect.isEmpty()) {
+                // Recycling allowed. Try recycling the items from buffer.
+                int firstVisible = 0;
+                int lastVisible = 0;
+                d->firstAndLastVisibleBufferIndex(firstVisible, lastVisible, viewRect, false);
+
+                int itemsOnTop = firstVisible - 1;
+                int itemsOnBottom = d->mItems.count() - lastVisible - 1;
 
-            if (d->mItemRecycling) {
+                if (itemsOnBottom > 0) {
+                    recycledItem = d->mItems.takeLast();
+                } else if (itemsOnTop > 0) {
+                    recycledItem = d->mItems.takeFirst();
+                    bufferIndex--;
+                    bufferIndex = qMax(0, bufferIndex);
+                }
+
+                if (recycledItem) {
+                    itemRemoved(recycledItem, false);
+                    d->insertItem(recycledItem, bufferIndex, index, animate);
+                }
+            }
+
+            if (!recycledItem) {
+                // No recycling has happened. Insert completely new item.
+                insertItem(bufferIndex, index, animate);
+            }
+
+            // Restore second item position.
+            d->restoreItemPosition(referenceItem, referenceItemPos);
+            
+            if (!recycledItem && d->mItemRecycling) {
+                // Resize the buffer.
                 d->updateItemBuffer();
             }
         }
-    }  
+    } else if (d->mItems.count() < maxItemCount()) {
+        d->updateItemBuffer();
+    }
 }
 
 /*!
+    \deprecated HbAbstractItemContainer::removeItem(const QModelIndex&, bool)
+        is deprecated from public API. Class HbAbstractItemContainer will be made private.
+
     Removes item representing \a index from container.
 */
 void HbAbstractItemContainer::removeItem(const QModelIndex &index, bool animate)
@@ -818,6 +975,9 @@
 }
 
 /*!
+    \deprecated HbAbstractItemContainer::removeItem(int, bool)
+        is deprecated from public API. Class HbAbstractItemContainer will be made private.
+
     Removes item from \a pos.
 */
 void HbAbstractItemContainer::removeItem(int pos, bool animate)
@@ -832,6 +992,9 @@
 }
 
 /*!
+    \deprecated HbAbstractItemContainer::recycleItems(const QPointF&)
+        is deprecated from public API. Class HbAbstractItemContainer will be made private.
+
     Derived class should implement this function to perform item recycling based on container \a delta.
     Given \a delta is the distance between container's current position and desired new position. Recycling
     should be done based on the new position and function should return the actual delta. Actual delta could
@@ -846,6 +1009,9 @@
 }
 
 /*!
+    \deprecated HbAbstractItemContainer::eventFilter(QObject*, QEvent*)
+        is deprecated from public API. Class HbAbstractItemContainer will be made private.
+
     \reimp
 */
 bool HbAbstractItemContainer::eventFilter(QObject *obj, QEvent *event)
@@ -868,6 +1034,9 @@
 }
 
 /*!
+    \deprecated HbAbstractItemContainer::maxItemCount() const
+        is deprecated from public API. Class HbAbstractItemContainer will be made private.
+
     Returns maximum amount of items that item buffer can hold. 
 
     Default implementation returns the total number of indexes that can
@@ -890,6 +1059,9 @@
 }
 
 /*!
+    \deprecated HbAbstractItemContainer::setItemPrototype(HbAbstractViewItem*)
+        is deprecated from public API. Class HbAbstractItemContainer will be made private.
+
     Deletes other prototypes and sets \a prototype as only prototype.
 
     Returns true if the prototype list was changed; otherwise returns false.
@@ -902,6 +1074,9 @@
 }
 
 /*!
+    \deprecated HbAbstractItemContainer::itemPrototypes() const
+        is deprecated from public API. Class HbAbstractItemContainer will be made private.
+
     Returns the list of item prototypes.
 */
 QList<HbAbstractViewItem *> HbAbstractItemContainer::itemPrototypes() const
@@ -921,6 +1096,9 @@
 }
 
 /*!
+    \deprecated HbAbstractItemContainer::setItemPrototypes(const QList<HbAbstractViewItem*>&)
+        is deprecated from public API. Class HbAbstractItemContainer will be made private.
+
     Sets the list of prototypes. 
     
     Returns true if the prototype list was changed; otherwise returns false.
@@ -955,12 +1133,16 @@
 }
 
 /*!
+     \deprecated HbAbstractItemContainer::itemState(const QModelIndex&) const
+        is deprecated. Please use HbAbstractItemContainer::itemTransientState() instead. 
+
     Returns state of view item with \a index.
 */
 QMap<int,QVariant> HbAbstractItemContainer::itemState(const QModelIndex &index) const
 {
+    qWarning("HbAbstractViewItem::itemState(const QModelIndex &index) const is deprecated");
+    HB_ITEM_STATE_ASSERT;
     Q_D(const HbAbstractItemContainer);
-
     QMap<int,QVariant> result;
 
     if (index.isValid()) {
@@ -974,12 +1156,29 @@
 }
 
 /*!
+    \deprecated HbAbstractItemContainer::itemTransientState(const QModelIndex &) const
+        is deprecated from public API. Class HbAbstractItemContainer will be made private.
+
+    Returns transient state of view item with \a index.
+*/
+QHash<QString, QVariant> HbAbstractItemContainer::itemTransientState(const QModelIndex &index) const
+{
+    Q_D(const HbAbstractItemContainer);
+    return d->mItemStates.value(index);
+}
+
+/*!
+     \deprecated HbAbstractItemContainer::setItemStateValue(const QModelIndex&, int, QVariant)
+        is deprecated. Please use HbAbstractItemContainer::setItemTransientStateValue(const QModelIndex &index, const QString &key, const QVariant &value) instead. 
+
    This is an overloaded member function, provided for convenience.
 
    Sets single state \a key to \a value for a view item with \a index.
 */
 void HbAbstractItemContainer::setItemStateValue(const QModelIndex &index, int key, QVariant value)
 {
+    qWarning("HbAbstractViewItem::setItemStateValue(const QModelIndex &index, int key, QVariant value) const is deprecated");
+    HB_ITEM_STATE_ASSERT;
     Q_D(HbAbstractItemContainer);
     if (index.isValid()) {
         int listIndex = d->findStateItem(index);
@@ -994,12 +1193,48 @@
         }
     }
 }
+/*!
+    \deprecated HbAbstractItemContainer::setItemTransientStateValue(const QModelIndex &, const QString &, const QVariant &)
+        is deprecated from public API. Class HbAbstractItemContainer will be made private.
+
+    This is an overloaded member function, provided for convenience.
+
+    Stores \a key with \a value of a view item with \a index into state model.
+    \a key is usually name of a Qt property. If \a value is invalid, state item with the \a key is removed.
+
+    Default values of properties should not be added.
+*/
+void HbAbstractItemContainer::setItemTransientStateValue(const QModelIndex &index, const QString &key, const QVariant &value)
+{
+    Q_D(HbAbstractItemContainer);
+    if (index.isValid()) {
+        QHash<QString, QVariant> stateItem = d->mItemStates.value(index);
+        if (!value.isValid()) {
+            stateItem.remove(key);
+        } else {
+            stateItem.insert(key, value);
+        }
+        if (stateItem.count()) {
+            d->mItemStates.insert(index, stateItem);
+        } else {
+            d->mItemStates.remove(index);
+        }
+    } else {
+        d->mItemStates.remove(index);
+    }
+}
+
 
 /*!
-    Sets state of a view item with \a index to a \a map.
+    \deprecated HbAbstractItemContainer::setItemState(const QModelIndex&, QMap<int, QVariant>)
+        is deprecated from public API. Class HbAbstractItemContainer will be made private.
+
+    Sets state of a view item with \a index.
 */
 void HbAbstractItemContainer::setItemState(const QModelIndex &index, QMap<int,QVariant> state)
 {
+    qWarning("HbAbstractViewItem::setItemState(const QModelIndex &index, QMap<int,QVariant> state) is deprecated");
+    HB_ITEM_STATE_ASSERT;
     Q_D(HbAbstractItemContainer);
     if (index.isValid() && !state.isEmpty()) {
         int listIndex = d->findStateItem(index);
@@ -1016,6 +1251,31 @@
 }
 
 /*!
+    \deprecated HbAbstractItemContainer::setItemTransientState(const QModelIndex &, QHash<QString,QVariant>)
+        is deprecated from public API. Class HbAbstractItemContainer will be made private.
+
+    Stores state of a view item with \a index into item state model. State of the view item is usually 
+    retrieved by calling HbAbstractViewItem::transientState().
+    
+    Existing state is replaced. If \a state is empty, existing state is removed. 
+    Default values of state items should not be added into \a state.
+
+    \sa HbAbstractViewItem::transientState()
+*/
+void HbAbstractItemContainer::setItemTransientState(const QModelIndex &index, QHash<QString,QVariant> state)
+{
+    Q_D(HbAbstractItemContainer);
+    if (index.isValid() && state.count()) {
+        d->mItemStates.insert(index, state);
+    } else {
+        d->mItemStates.remove(index);
+    }
+}
+
+/*!
+    \deprecated HbAbstractItemContainer::itemChange(QGraphicsItem::GraphicsItemChange, const QVariant&)
+        is deprecated from public API. Class HbAbstractItemContainer will be made private.
+
     \reimp
 */
 QVariant HbAbstractItemContainer::itemChange(GraphicsItemChange change, const QVariant & value)
@@ -1024,6 +1284,9 @@
 }
 
 /*!
+    \deprecated HbAbstractItemContainer::firstAndLastVisibleModelIndex(QModelIndex&, QModelIndex&, bool) const
+        is deprecated from public API. Class HbAbstractItemContainer will be made private.
+
     Returns the model indexes of items that are located on top left and bottom right corners
     of visible area.
 */
@@ -1048,15 +1311,36 @@
 }
 
 /*!
+    \deprecated HbAbstractItemContainer::removeItemTransientStates()
+        is deprecated from public API. Class HbAbstractItemContainer will be made private.
+
+    Clears the state model.
+*/
+void HbAbstractItemContainer::removeItemTransientStates()
+{
+    Q_D(HbAbstractItemContainer);
+    d->mItemStateList.clear();
+    d->mItemStates.clear();
+}
+
+/*!
+    \deprecated HbAbstractItemContainer::removeItemStates()
+        is deprecated. Please use HbAbstractItemContainer::removeTransientItemStates() instead. 
+
     Clears the state model.
 */
 void HbAbstractItemContainer::removeItemStates()
 {
+    qWarning("HbAbstractItemContainer::removeItemStates is deprecated");
     Q_D(HbAbstractItemContainer);
     d->mItemStateList.clear();
+    d->mItemStates.clear();
 }
 
 /*!
+    \deprecated HbAbstractItemContainer::setItemRecycling(bool)
+        is deprecated from public API. Class HbAbstractItemContainer will be made private.
+
     Sets item recycling to \a enabled.
     By default recycling is off.
  */
@@ -1066,7 +1350,7 @@
     if (d->mItemRecycling != enabled) {
         d->mItemRecycling = enabled;
         if (!enabled) {
-            removeItemStates();
+            removeItemTransientStates();
         }
 
         d->updateItemBuffer();
@@ -1074,6 +1358,9 @@
 }
 
 /*!
+    \deprecated HbAbstractItemContainer::itemRecycling() const
+        is deprecated from public API. Class HbAbstractItemContainer will be made private.
+
     Returns whether item recycling feature is in use.
  */
 bool HbAbstractItemContainer::itemRecycling() const
@@ -1083,6 +1370,9 @@
 }
 
 /*!
+    \deprecated HbAbstractItemContainer::setUniformItemSizes(bool)
+        is deprecated from public API. Class HbAbstractItemContainer will be made private.
+
     Sets the feature informing whether all items in the item view have the same size.
     In case all the items have the same size, the item view can do some 
     optimizations for performance purposes.
@@ -1094,6 +1384,9 @@
 }
 
 /*!
+    \deprecated HbAbstractItemContainer::uniformItemSizes() const
+        is deprecated from public API. Class HbAbstractItemContainer will be made private.
+
     Returns whether the uniform item sizes feature is in use.
  */
 bool HbAbstractItemContainer::uniformItemSizes() const
@@ -1103,26 +1396,28 @@
 }
 
 /*!
+    \deprecated HbAbstractItemContainer::insertItem(int, const QModelIndex&, bool)
+        is deprecated from public API. Class HbAbstractItemContainer will be made private.
+
     Inserts item for \a index to \a pos.
 */
 void HbAbstractItemContainer::insertItem(int pos, const QModelIndex &index, bool animate)
 {
     Q_D(HbAbstractItemContainer);
     HbAbstractViewItem *item = d->createItem(index);
-
-    if (item) {
-        d->mItems.insert(pos, item);
-        itemAdded(pos, item, animate);
-
-        setItemModelIndex(item, index);
-    }
+    d->insertItem(item, pos, index, animate);
 }
 
 /*!
+    \deprecated HbAbstractItemContainer::reset()
+        is deprecated from public API. Class HbAbstractItemContainer will be made private.
+
     Reset the internal state of the container.
 */
 void HbAbstractItemContainer::reset()
 {
+    // position need to be reseted while changing model
+    setPos(0.0, 0.0);
     removeItems(); 
     QCoreApplication::postEvent(this, new QEvent((QEvent::Type)UpdateItemBufferEvent));
 }
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/itemviews/hbabstractitemcontainer.h
--- a/src/hbwidgets/itemviews/hbabstractitemcontainer.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/itemviews/hbabstractitemcontainer.h	Mon May 03 12:48:33 2010 +0300
@@ -68,17 +68,22 @@
     bool setItemPrototype(HbAbstractViewItem *prototype);
     bool setItemPrototypes(const QList<HbAbstractViewItem *> &prototypes);
 
+    void setItemTransientState(const QModelIndex &index, QHash<QString,QVariant> state);
+    void setItemTransientStateValue(const QModelIndex &index, const QString &key, const QVariant &value);
+
     void setItemState(const QModelIndex &index, QMap<int,QVariant> state);
     void setItemStateValue(const QModelIndex &index, int key, QVariant value);
 
     QMap<int,QVariant> itemState(const QModelIndex &index) const;
+    QHash<QString, QVariant> itemTransientState(const QModelIndex &index) const;
 
     void removeItemStates();
+    void removeItemTransientStates();
 
     void setItemRecycling(bool enabled);
     bool itemRecycling() const;
 
-    void setUniformItemSizes(bool enable);
+    virtual void setUniformItemSizes(bool enable);
     bool uniformItemSizes() const;
 
     virtual bool eventFilter(QObject *obj, QEvent *event);
@@ -86,6 +91,10 @@
     enum { Type = Hb::ItemType_AbstractItemContainer };
     int type() const;
 
+signals:
+
+    void itemCreated(HbAbstractViewItem *item);
+
 protected:
 
     HbAbstractItemContainer(HbAbstractItemContainerPrivate &dd, QGraphicsItem *parent);
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/itemviews/hbabstractitemcontainer_p.h
--- a/src/hbwidgets/itemviews/hbabstractitemcontainer_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/itemviews/hbabstractitemcontainer_p.h	Mon May 03 12:48:33 2010 +0300
@@ -28,12 +28,15 @@
 
 #include "hbwidget_p.h"
 #include "hbabstractitemcontainer.h"
+#include "hbabstractviewitem.h"
 
 #include <QPersistentModelIndex>
 
 class HbAbstractViewItem;
 class HbAbstractItemView;
 
+#include <QHash>
+
 class HbAbstractItemContainerPrivate : public HbWidgetPrivate
 {
     Q_DECLARE_PUBLIC(HbAbstractItemContainer)
@@ -80,8 +83,15 @@
     virtual bool intoContainerBuffer(const QModelIndex &index) const; 
     virtual int containerBufferIndexForModelIndex(const QModelIndex &index) const;
 
+    virtual qreal getDiffWithoutScrollareaCompensation(const QPointF &delta) const;
+
+    void restoreItemPosition(HbAbstractViewItem *item, const QPointF &position);
+
+    void insertItem(HbAbstractViewItem *item, int pos, const QModelIndex &index, bool animate);
+
     mutable QList<HbAbstractViewItem*>  mPrototypes;
     QList<StateItem> mItemStateList;
+    QHash<QPersistentModelIndex, QHash<QString, QVariant> > mItemStates;
 
     QList<HbAbstractViewItem*>  mItems;
     HbAbstractItemView *mItemView;
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/itemviews/hbabstractitemview.cpp
--- a/src/hbwidgets/itemviews/hbabstractitemview.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/itemviews/hbabstractitemview.cpp	Mon May 03 12:48:33 2010 +0300
@@ -28,7 +28,6 @@
 
 #include <hbabstractitemview.h>
 #include <hbabstractviewitem.h>
-#include <hbgesturefilter.h>
 #include <hbevent.h>
 #include <hbabstractitemcontainer.h>
 #include <hbwidgetfeedback.h>
@@ -39,6 +38,13 @@
 #include <QGraphicsSceneMouseEvent>
 #include <QGraphicsScene>
 #include <QDebug>
+// For QMAP_INT__ITEM_STATE_DEPRECATED's sake. Removed when QMap<int,QVariant> based state item system is removed
+#include <hbabstractviewitem_p.h>
+
+#include <QGesture>
+#include <QGestureEvent>
+#include <QPanGesture>
+
 
 /*!
     @alpha
@@ -171,6 +177,18 @@
 */
 
 /*!
+    \var HbAbstractItemView::Expand
+
+    Animation related to setting item expand.
+*/
+
+/*!
+    \var HbAbstractItemView::Collapse
+
+    Animation related to setting item collapsed.
+*/
+
+/*!
     Here are the main properties of the class:
 
     \li HbAbstractItemView::itemRecycling: ItemRecycling.
@@ -499,14 +517,7 @@
 {
     Q_D(HbAbstractItemView);
 
-    bool result = false;
-
-    if (e->type() == HbEvent::ChildFocusOut) {
-        d->mWasScrolling = isScrolling();
-        result = true;
-    }
-
-    result |= HbScrollArea::event(e);
+    bool result = HbScrollArea::event(e);
 
     // The two above statements have to be executed before these
     if (e->type() == HbEvent::ChildFocusIn) {
@@ -540,190 +551,7 @@
 
 /*!
     \reimp
-*/
-void HbAbstractItemView::mousePressEvent(QGraphicsSceneMouseEvent *event)
-{
-    Q_D(HbAbstractItemView);
-    d->mPostponedScrollIndex = QPersistentModelIndex();
-    d->mPreviousSelectedIndex = QModelIndex();
-    d->mPreviousSelectedCommand = QItemSelectionModel::NoUpdate;
-    d->mInstantClickedModifiers = 0;
 
-    d->mHitItem = d->itemAt(event->scenePos());
-
-    if (d->mHitItem && d->mHitItem->modelIndex().isValid()) {
-        QGraphicsItem::GraphicsItemFlags flags = d->mHitItem->flags();
-        if (!flags.testFlag(QGraphicsItem::ItemIsFocusable)){
-            d->mHitItem = 0;
-        }
-    }
-
-    if (d->mHitItem) {
-        if (d->mHitItem->modelIndex().isValid()) {
-            Hb::InteractionModifiers modifiers = 0;
-            if (d->mWasScrolling) {
-                modifiers |= Hb::ModifierScrolling;
-            }
-            HbWidgetFeedback::triggered(d->mHitItem, Hb::InstantPressed, modifiers);
-
-            if (!d->mWasScrolling) {
-                d->mHitItem->setPressed(true);
-            }
-        }
-    }
-
-    if (isScrolling()) {
-        // Needed when focus does not change. Otherwise mWasScrolling updating is done on 
-        // focusOutEvent or event function.
-        d->mWasScrolling = true;
-    }
-
-    HbScrollArea::mousePressEvent(event);
-    
-    if (d->mHitItem) {
-        emitPressed(d->mHitItem->modelIndex());
-        if (d->mSelectionModel) {
-            QItemSelectionModel::SelectionFlags flags = selectionCommand(d->mHitItem, event);
-            d->mSelectionModel->select(d->mHitItem->modelIndex(), flags);
-        }
-    } else if (d->mGestureFilter) {
-        d->mGestureFilter->setLongpressAnimation(false);
-    }
-
-    event->accept();
-}
-
-/*!
-    \reimp
-*/
-void HbAbstractItemView::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
-{
-    Q_D(HbAbstractItemView);
-
-    HbScrollArea::mouseReleaseEvent(event);
-
-    if (d->mGestureFilter) {
-        d->mGestureFilter->setLongpressAnimation(true);
-    }
-
-    HbAbstractViewItem* hitItem = d->itemAt(event->scenePos());
-    if (hitItem) {
-        QGraphicsItem::GraphicsItemFlags flags = hitItem->flags();
-        if (!flags.testFlag(QGraphicsItem::ItemIsFocusable)){
-            hitItem = 0;
-        }
-    }
-
-    if (d->mHitItem) {
-        d->mHitItem->setPressed(false);
-    }
-
-    if (hitItem) {
-        if (hitItem->modelIndex().isValid()) {
-            Hb::InteractionModifiers modifiers = 0;
-            if (d->mWasScrolling) {
-                modifiers |= Hb::ModifierScrolling;
-            }
-            HbWidgetFeedback::triggered(hitItem, Hb::InstantReleased, modifiers);
-        }
-        emitReleased(hitItem->modelIndex());
-    }
-
-    if (d->mWasScrolling || d->mOptions.testFlag(HbAbstractItemViewPrivate::PanningActive)) {
-        d->mOptions &= ~HbAbstractItemViewPrivate::PanningActive;
-        if (d->mSelectionSettings.testFlag(HbAbstractItemViewPrivate::Selection)) {
-            d->mSelectionSettings &= ~HbAbstractItemViewPrivate::Selection;
-            d->mContSelectionAction = QItemSelectionModel::NoUpdate;
-        }
-    } else if (hitItem) {
-        if (d->mSelectionModel) {
-            d->mSelectionModel->setCurrentIndex(hitItem->modelIndex(), QItemSelectionModel::NoUpdate);
-
-            QItemSelectionModel::SelectionFlags flags = selectionCommand(hitItem, event);
-            d->mSelectionModel->select(hitItem->modelIndex(), flags);
-        }
-
-        if (    d->mHitItem == hitItem
-            &&  hitItem->modelIndex().isValid()){
-            HbWidgetFeedback::triggered(hitItem, Hb::InstantClicked, d->mInstantClickedModifiers);
-            emitActivated(hitItem->modelIndex());
-        }
-
-        HbAbstractViewItem *item = d->currentItem();
-        if (item) {
-            d->revealItem(item, EnsureVisible);
-        }
-    } 
-    d->mWasScrolling = false;
-    event->accept(); 
-}
-
-/*!
-    \reimp
-*/
-void HbAbstractItemView::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
-{
-    HbScrollArea::mouseMoveEvent( event );
-
-    Q_D(HbAbstractItemView);
-
-    // contiguous selection handling.
-    if (d->mSelectionSettings.testFlag(HbAbstractItemViewPrivate::Selection)
-        && d->mSelectionModel
-        && d->mSelectionMode == HbAbstractItemView::ContiguousSelection
-        && geometry().contains(event->pos())) {
-
-        QModelIndex firstIndex;
-        QModelIndex lastIndex;
-        d->mContainer->firstAndLastVisibleModelIndex(firstIndex, lastIndex);
-        qreal scenePosY = event->scenePos().y();
-        qreal lastScenePosY = event->lastScenePos().y();
-        QPolygonF polygon;
-        polygon << event->lastScenePos() << event->scenePos();
-
-        QList<QGraphicsItem *> items = scene()->items(polygon);
-        int itemCount = items.count();
-
-        // loop through the items in the scene
-        for (int current = 0; current < itemCount ; ++current) {
-            HbAbstractViewItem *item = d->viewItem(items.at(current));
-            if (item) {
-                if (d->mHitItem && item != d->mHitItem) {
-                    d->mHitItem->setPressed(false);
-                }
-
-                QModelIndex itemIndex(item->modelIndex());
-                QItemSelectionModel::SelectionFlags command = selectionCommand(item, event);
-                if (    itemIndex != d->mPreviousSelectedIndex
-                    ||  command != d->mPreviousSelectedCommand) {
-                    d->mPreviousSelectedIndex = itemIndex;
-                    d->mPreviousSelectedCommand = command;
-                    d->mSelectionModel->select(itemIndex, command);
-
-                    // Scroll up/down when needed
-                    HbAbstractViewItem *scrollItem = 0;
-                    if (itemIndex == firstIndex
-                        && lastScenePosY > scenePosY) {
-                        scrollItem = d->mContainer->itemByIndex(d->mModelIterator->previousIndex(itemIndex));
-                    } else if (itemIndex == lastIndex
-                        && lastScenePosY < scenePosY) {
-                        scrollItem = d->mContainer->itemByIndex(d->mModelIterator->nextIndex(itemIndex));
-                    }
-
-                    if (scrollItem) {
-                        QPointF delta = d->pixelsToScroll(scrollItem, EnsureVisible);
-                        d->scrollByAmount(delta);
-                    }
-                    break;
-                }
-            }
-        }
-    }
-
-    event->accept();
-}
-
-/*!
     This slot is called when orientation is changed.
     \a newOrientation has the currentOrientation mode.
     Note: Currently platform dependent orientation support is not available
@@ -734,6 +562,7 @@
 
     Q_D(HbAbstractItemView);
 
+
     //Setting the uniform ites sizes to container again resets size caches.
     d->mContainer->setUniformItemSizes(d->mContainer->uniformItemSizes());
     d->mContainer->setPos(0,0);
@@ -741,6 +570,7 @@
 
     d->updateScrollMetrics();
 
+    d->stopAnimating();
     scrollTo(d->mVisibleIndex, HbAbstractItemView::PositionAtTop);
 
     d->mVisibleIndex = QModelIndex();
@@ -884,10 +714,13 @@
     Returns SelectionFlags to be used when updating selection of a item.
     The event is a user input event, such as a mouse or keyboard event.
     contiguousArea is true, if selectiontype is not single or no selection and
-    user has pressed on contiguousArea of viewItemi.e CheckBox.
+    user has pressed on contiguousArea of viewItem i.e CheckBox.
     By default this is false.
     Subclasses should overide this function to define their own selection behavior.
 
+    Note: The \a event parameter is not necessary a full event. For mouse events
+    it is quaranteed to contain the event type and position.
+
     \sa HbAbstractViewItem::selectionAreaContains(const QPointF &scenePosition) const
 */
 QItemSelectionModel::SelectionFlags HbAbstractItemView::selectionCommand(const HbAbstractViewItem *item,
@@ -972,7 +805,10 @@
         } 
         
         if (previous.isValid()) {
-            d->mContainer->setItemStateValue(previous, HbAbstractViewItem::FocusKey, false);
+#ifndef QMAP_INT__ITEM_STATE_DEPRECATED
+           d->mContainer->setItemStateValue(previous, HbAbstractViewItem::FocusKey, false);
+#endif
+           d->mContainer->setItemTransientStateValue(previous, "focused", false);
         }
 
         if (newItem) {
@@ -980,7 +816,10 @@
         } 
         
         if (d->mCurrentIndex.isValid()) {
+#ifndef QMAP_INT__ITEM_STATE_DEPRECATED
             d->mContainer->setItemStateValue(d->mCurrentIndex, HbAbstractViewItem::FocusKey, true);
+#endif
+            d->mContainer->setItemTransientStateValue(d->mCurrentIndex, "focused", true);
         }
 
     }
@@ -1002,12 +841,21 @@
         if (item) {
             item->setCheckState(Qt::Checked);
             if (!d->mClearingSelection) {
-                HbWidgetFeedback::triggered(item, Hb::InstantSelectionChanged);
+                Hb::InteractionModifiers modifiers = 0;
+                if (d->mIsScrolling) {
+                    modifiers |= Hb::ModifierScrolling;
+                }
+                HbWidgetFeedback::triggered(item, Hb::InstantSelectionChanged, modifiers); 
             }
         } 
+#ifndef QMAP_INT__ITEM_STATE_DEPRECATED
         d->mContainer->setItemStateValue(selectedIndexes.at(i),
                                          HbAbstractViewItem::CheckStateKey,
                                          Qt::Checked);
+#endif
+        d->mContainer->setItemTransientStateValue(selectedIndexes.at(i),
+                                         "checkState",
+                                         Qt::Checked);
     }
 
     QModelIndexList deselectedIndexes(deselected.indexes());
@@ -1020,9 +868,14 @@
                 HbWidgetFeedback::triggered(item, Hb::InstantSelectionChanged);
             }
         } 
+#ifndef QMAP_INT__ITEM_STATE_DEPRECATED
         d->mContainer->setItemStateValue(deselectedIndexes.at(i),
                                          HbAbstractViewItem::CheckStateKey,
                                          Qt::Unchecked);
+#endif
+        d->mContainer->setItemTransientStateValue(deselectedIndexes.at(i),
+                                         "checkState",
+                                         Qt::Unchecked);
     }
 }
 
@@ -1040,8 +893,7 @@
 
     for (int current = start; current <= end; current++) {
         QModelIndex index = model()->index(current, 0, parent);
-        bool animate = d->mEnabledAnimations & HbAbstractItemView::Appear ? d->mAnimateItems : false;
-        d->mContainer->addItem(index, animate);
+        d->mContainer->addItem(index, d->animationEnabled(true));
     }
     
 
@@ -1147,57 +999,6 @@
     Q_UNUSED(end);
 }
 
-
-/*!
-    \reimp
-*/
-void HbAbstractItemView::panGesture(const QPointF &point)
-{
-    Q_D( HbAbstractItemView );
-    d->mPostponedScrollIndex = QPersistentModelIndex();
-    d->mOptions |= d->PanningActive;
-    
-    if (d->mHitItem) {
-        d->mHitItem->setPressed(false, false);
-    }
-
-    HbScrollArea::panGesture(point);
-    
-}
-
-/*!
-    \reimp
-*/
-void HbAbstractItemView::longPressGesture(const QPointF &point)
-{
-    Q_D( HbAbstractItemView );
-    d->mPostponedScrollIndex = QPersistentModelIndex();
-    HbScrollArea::longPressGesture(point);
-
-    if (d->mHitItem) {
-        if (d->mHitItem->modelIndex().isValid()) {
-            HbWidgetFeedback::triggered(d->mHitItem, Hb::InstantLongPressed);
-        }
-        if (d->mHitItem) {
-            d->mHitItem->setPressed(false);
-        }
-        emit longPressed(d->mHitItem, point);
-    }
-}
-
-/*!
-    \reimp
-*/
-void HbAbstractItemView::focusOutEvent(QFocusEvent *event)
-{
-    HbScrollArea::focusOutEvent(event);
-
-    Q_D( HbAbstractItemView );
-
-    d->mWasScrolling = isScrolling();
-    d->stopScrolling();
-}
-
 /*!
     Emits the activated signal.
 */
@@ -1293,7 +1094,8 @@
 
     QPointF newDelta(delta);
 
-    if (d->mContainer->itemRecycling()) {
+    if (d->mContainer->itemRecycling()
+        && !d->mContainer->items().isEmpty()) {
         newDelta = d->mContainer->recycleItems(delta);
         d->mAnimationInitialPosition = d->mAnimationInitialPosition + newDelta - delta; 
         d->refreshContainerGeometry();
@@ -1303,10 +1105,14 @@
 }
 
 /*!
+    \deprecated HbAbstractItemView::container() const
+        is deprecated, because class HbAbstractItemContainer will be made private.
+
     Returns the container widget.
 */
 HbAbstractItemContainer *HbAbstractItemView::container() const
 {
+    qWarning("HbAbstractItemView::container() const is deprecated, because class HbAbstractItemContainer will be made private.");
     Q_D(const HbAbstractItemView);
     return d->mContainer;
 }
@@ -1450,74 +1256,81 @@
 
 /*!
     \reimp
-
-    Sets the pressed item non-pressed.
 */
-void HbAbstractItemView::upGesture(int value)
+void HbAbstractItemView::gestureEvent(QGestureEvent *event)
 {
-    Q_D(HbAbstractItemView);
-
-    d->mPostponedScrollIndex = QPersistentModelIndex();
-
-    if (d->mHitItem) {
-        d->mHitItem->setPressed(false, false);
+    if (event->gesture(Qt::PanGesture)) {
+        Q_D(HbAbstractItemView);
+        if (d->panTriggered(event)) {
+            event->accept();
+        } else {
+            HbScrollArea::gestureEvent(event);
+        }
+    } else {
+        HbScrollArea::gestureEvent(event);
     }
-
-    HbScrollArea::upGesture(value);
 }
 
-/*!
-    \reimp
-
-    Sets the pressed item non-pressed.
-*/
-void HbAbstractItemView::downGesture(int value)
+void HbAbstractItemView::itemPressed(const QPointF &pos)
 {
     Q_D(HbAbstractItemView);
 
     d->mPostponedScrollIndex = QPersistentModelIndex();
+    d->mPreviousSelectedIndex = QModelIndex();
+    d->mPreviousSelectedCommand = QItemSelectionModel::NoUpdate;
+    d->mSelectionSettings &= ~HbAbstractItemViewPrivate::Selection;
+    d->mContSelectionAction = QItemSelectionModel::NoUpdate;
 
-    if (d->mHitItem) {
-        d->mHitItem->setPressed(false, false);
+    HbAbstractViewItem *item = qobject_cast<HbAbstractViewItem *>(sender()); 
+    QModelIndex index = item->modelIndex();
+
+    if (d->mSelectionMode != HbAbstractItemView::NoSelection) {
+        QGraphicsSceneMouseEvent mousePressEvent(QEvent::GraphicsSceneMousePress);
+        mousePressEvent.setPos(pos);
+        d->mSelectionModel->select(index, selectionCommand(item, &mousePressEvent));
     }
 
-    HbScrollArea::downGesture(value);
+    emitPressed(item->modelIndex());
 }
 
-/*!
-    \reimp
+void HbAbstractItemView::itemReleased(const QPointF &pos)
+{
+    Q_UNUSED(pos);
 
-    Sets the pressed item non-pressed.
-*/
-void HbAbstractItemView::leftGesture(int value)
+    HbAbstractViewItem *item = qobject_cast<HbAbstractViewItem *>(sender()); 
+    emitReleased(item->modelIndex());
+}
+
+void HbAbstractItemView::itemActivated(const QPointF &pos)
 {
     Q_D(HbAbstractItemView);
 
-    d->mPostponedScrollIndex = QPersistentModelIndex();
+    HbAbstractViewItem *item = qobject_cast<HbAbstractViewItem *>(sender()); 
+    QModelIndex index = item->modelIndex();
+
+    d->mSelectionModel->setCurrentIndex(index, QItemSelectionModel::NoUpdate);
 
-    if (d->mHitItem) {
-        d->mHitItem->setPressed(false, false);
+    if (d->mSelectionMode != HbAbstractItemView::NoSelection) {
+        QGraphicsSceneMouseEvent mouseReleaseEvent(QEvent::GraphicsSceneMouseRelease);
+        mouseReleaseEvent.setPos(pos);
+        d->mSelectionModel->select(index, selectionCommand(item, &mouseReleaseEvent));
     }
 
-    HbScrollArea::leftGesture(value);
+    emitActivated(index);
 }
 
-/*!
-    \reimp
-
-    Sets the pressed item non-pressed.
-*/
-void HbAbstractItemView::rightGesture(int value)
+void HbAbstractItemView::itemLongPressed(const QPointF &pos)
 {
-    Q_D(HbAbstractItemView);
-
-    d->mPostponedScrollIndex = QPersistentModelIndex();
+    HbAbstractViewItem *item = qobject_cast<HbAbstractViewItem *>(sender()); 
+    emit longPressed(item, item->mapToScene(pos));
+}
 
-    if (d->mHitItem) {
-        d->mHitItem->setPressed(false, false);
-    }
-
-    HbScrollArea::rightGesture(value);
+void HbAbstractItemView::itemCreated(HbAbstractViewItem *item)
+{
+    QObject::connect(item, SIGNAL(pressed(QPointF)), this, SLOT(itemPressed(QPointF)));
+    QObject::connect(item, SIGNAL(released(QPointF)), this, SLOT(itemReleased(QPointF)));
+    QObject::connect(item, SIGNAL(activated(QPointF)), this, SLOT(itemActivated(QPointF)));
+    QObject::connect(item, SIGNAL(longPressed(QPointF)), this, SLOT(itemLongPressed(QPointF))); 
 }
 
 /*!
@@ -1535,6 +1348,45 @@
     return false;
 }
 
+/*!
+ * Sets the value of the longPressEnabled property.  This value is set
+ * to true if the widget is to respond to long press gestures, false otherwise.
+ *
+ * The default value is true.
+ *
+ * \sa HbAbstractItemView::longPressEnabled()
+ */
+void HbAbstractItemView::setLongPressEnabled(bool enabled)
+{
+    Q_D(HbAbstractItemView);
+    d->mLongPressEnabled = enabled;
+}
+
+/*!
+    Returns true if the item view handles long press gestures, false otherwise
+ 
+    \sa HbAbstractItemView::setLongPressEnabled()
+ */
+bool HbAbstractItemView::longPressEnabled() const
+{
+    Q_D(const HbAbstractItemView);
+    return d->mLongPressEnabled;
+}
+
+/*!
+    Slot handles QAbstractItemModel::layoutChanged() signal. 
+    Default implementation sets first model item visible as first view item. 
+*/
+void HbAbstractItemView::modelLayoutChanged()
+{
+    Q_D(HbAbstractItemView);
+    d->mContainer->d_func()->updateItemBuffer();
+    d->mContainer->setModelIndexes(d->mModelIterator->nextIndex(QModelIndex()));
+    if (d->mContainer->items().count() > 0) {
+        scrollTo(d->mContainer->items().at(0)->modelIndex(), PositionAtTop);
+    }
+}
+
 #include "moc_hbabstractitemview.cpp"
 
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/itemviews/hbabstractitemview.h
--- a/src/hbwidgets/itemviews/hbabstractitemview.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/itemviews/hbabstractitemview.h	Mon May 03 12:48:33 2010 +0300
@@ -34,6 +34,7 @@
 
 class HbAbstractItemViewPrivate;
 class HbAbstractViewItem;
+class HbAbstractViewItemPrivate;
 class HbAbstractItemContainer;
 class HbModelIterator;
 
@@ -49,6 +50,7 @@
     Q_PROPERTY(QString layoutName READ layoutName WRITE setLayoutName)
     Q_PROPERTY(bool uniformItemSizes READ uniformItemSizes WRITE setUniformItemSizes)
     Q_PROPERTY(ItemAnimations enabledAnimations READ enabledAnimations WRITE setEnabledAnimations)
+    Q_PROPERTY(bool longPressEnabled  READ longPressEnabled  WRITE setLongPressEnabled )
 
 public:
 
@@ -74,6 +76,8 @@
         Appear             = 0x00001,
         Disappear          = 0x00002,
         TouchDown          = 0x00004,
+        Expand             = 0x00008,
+        Collapse           = 0x00010,
         All                = 0xFFFFF
     };
 
@@ -108,8 +112,10 @@
     void setItemRecycling(bool enabled);
     bool itemRecycling() const;
 
+    using HbScrollArea::isVisible;
     bool isVisible(const QModelIndex &index) const;
     bool isVisible(HbAbstractViewItem *item) const;  
+
     HbAbstractViewItem *currentViewItem() const;
 
     HbAbstractViewItem *itemByIndex(const QModelIndex &index) const;
@@ -136,6 +142,9 @@
     void setEnabledAnimations(ItemAnimations flags);
     ItemAnimations enabledAnimations() const;
 
+    void setLongPressEnabled(bool enabled);
+    bool longPressEnabled() const;
+
 public slots:
     void setCurrentIndex(const QModelIndex &index,
                          QItemSelectionModel::SelectionFlags selectionFlag
@@ -164,15 +173,7 @@
                                                     const HbAbstractViewItem *item, 
                                                     const QEvent *event);
     bool event(QEvent *e);
-    void mousePressEvent(QGraphicsSceneMouseEvent *event);
-    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
-    void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
-    void focusOutEvent(QFocusEvent *event);
-
-    virtual void upGesture(int value);
-    virtual void downGesture(int value);
-    virtual void leftGesture(int value);
-    virtual void rightGesture(int value);
+    void gestureEvent(QGestureEvent *event);
 
     virtual void emitActivated(const QModelIndex &modelIndex);
     virtual void emitPressed(const QModelIndex &modelIndex);
@@ -207,18 +208,27 @@
     virtual void columnsAboutToBeRemoved(const QModelIndex &index, int start, int end);
     virtual void columnsRemoved(const QModelIndex &parent, int start, int end);
 
-    virtual void panGesture(const QPointF &point);
-    virtual void longPressGesture(const QPointF &point);
+    virtual void itemPressed(const QPointF &pos);
+    virtual void itemReleased(const QPointF &pos);
+    virtual void itemActivated(const QPointF &pos);
+    virtual void itemLongPressed(const QPointF &pos);
+
+    virtual void itemCreated(HbAbstractViewItem *item);
+
+    virtual void modelLayoutChanged();
 
 private:
     Q_DECLARE_PRIVATE_D(d_ptr, HbAbstractItemView)
     Q_DISABLE_COPY(HbAbstractItemView)
     Q_PRIVATE_SLOT(d_func(), void _q_modelDestroyed())
-    Q_PRIVATE_SLOT(d_func(), void _q_layoutChanged())
     Q_PRIVATE_SLOT(d_func(), void _q_animationEnabled())
     Q_PRIVATE_SLOT(d_func(), void _q_animationFinished(const HbEffect::EffectStatus &status))
+    Q_PRIVATE_SLOT(d_func(), void _q_scrolling(QPointF newPosition))
+    Q_PRIVATE_SLOT(d_func(), void _q_scrollingEnded())
+    Q_PRIVATE_SLOT(d_func(), void _q_scrollingStarted())
 
     friend class HbAbstractItemContainer;
+    friend class HbAbstractViewItemPrivate;
 };
 
 Q_DECLARE_METATYPE(HbAbstractItemView::SelectionMode)
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/itemviews/hbabstractitemview_p.cpp
--- a/src/hbwidgets/itemviews/hbabstractitemview_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/itemviews/hbabstractitemview_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -29,11 +29,11 @@
 #include "hbabstractitemcontainer.h"
 #include "hbmodeliterator.h"
 
-#include <hbgesturefilter.h>
 #include <hbinstance.h>
 #include <hbscrollbar.h>
 #include <hbapplication.h>
 #include <hbeffect.h>
+#include <hbpangesture.h>
 
 #include <QGraphicsSceneMouseEvent>
 #include <QEvent>
@@ -41,26 +41,28 @@
 #include <QGraphicsScene>
 #include <QGraphicsLayout>
 #include <QTimer>
+#include <QGestureEvent>
 #include <QDebug>
 
+static const qreal CONTIGUOUS_SELECTION_SCROLL_SPEED = 0.2;
+static const qreal CONTIGUOUS_SELECTION_AREA_THRESHOLD = 0.2;
+
 HbAbstractItemViewPrivate::HbAbstractItemViewPrivate() :
     mSelectionMode(HbAbstractItemView::NoSelection),
     mOptions(NoOptions),
     mSelectionSettings(None),
-    mHitItem(0),
     mContainer(0),
     mSelectionModel(0),
     mContSelectionAction(QItemSelectionModel::NoUpdate),
-    mWasScrolling(false),
-    mFilterRemoved(false),
     mClearingSelection(false),
     mAnimateItems(false),
     mPostponedScrollHint(HbAbstractItemView::PositionAtTop),
     mPreviousSelectedCommand(QItemSelectionModel::NoUpdate),
-    mInstantClickedModifiers(0),
     mAnimationTimer(0),
 	mModelIterator(0),
-    mEnabledAnimations(HbAbstractItemView::All)
+    mEnabledAnimations(HbAbstractItemView::All),
+    mLongPressEnabled(true),
+	mDoingContiguousSelection(false)
 {
 }
 
@@ -85,11 +87,18 @@
     
     q->setContentWidget(container);
 
+    q->grabGesture(Qt::PanGesture);
+
+    //mAlignment = 0; // no alignment - there is no sense with recycling
+
     mContainer = container;
     mContainer->setItemView(q);
 
     mModelIterator = modelIterator;
 
+    q->connect(mContainer, SIGNAL(itemCreated(HbAbstractViewItem *)),
+            q, SLOT(itemCreated(HbAbstractViewItem *)));
+
     HbMainWindow *window = q->mainWindow();
     if (window
         && q->scene()) { // added to scene
@@ -166,7 +175,7 @@
         q->disconnect(model, SIGNAL(columnsAboutToBeRemoved(QModelIndex,int,int)),
                         q, SLOT(columnsAboutToBeRemoved(QModelIndex,int,int)));
         q->disconnect(model, SIGNAL(modelReset()), q, SLOT(reset()));
-        q->disconnect(model, SIGNAL(layoutChanged()), q, SLOT(_q_layoutChanged()));
+        q->disconnect(model, SIGNAL(layoutChanged()), q, SLOT(modelLayoutChanged()));
 
         mModelIterator->setModel(0);
     }
@@ -252,7 +261,7 @@
         q->connect(model, SIGNAL(columnsAboutToBeRemoved(QModelIndex,int,int)),
                    q, SLOT(columnsAboutToBeRemoved(QModelIndex,int,int)));
         q->connect(model, SIGNAL(modelReset()), q, SLOT(reset()));
-        q->connect(model, SIGNAL(layoutChanged()), q, SLOT(_q_layoutChanged()));
+        q->connect(model, SIGNAL(layoutChanged()), q, SLOT(modelLayoutChanged()));
 
         setSelectionModel(new QItemSelectionModel(model, q));
     }   
@@ -274,16 +283,6 @@
     q->reset();
 }
 
-/*!
-    \private
-
-    Slot is called whenever the model layout changes. This resets the container.
-*/
-void HbAbstractItemViewPrivate::_q_layoutChanged()
-{
-    mContainer->setModelIndexes(mModelIterator->nextIndex(QModelIndex()));
-}
-
 void HbAbstractItemViewPrivate::_q_animationEnabled()
 {
     mAnimateItems = true;
@@ -292,7 +291,7 @@
 void HbAbstractItemViewPrivate::_q_animationFinished(const HbEffect::EffectStatus &status)
 {
     Q_UNUSED(status);
-    if ( status.effectEvent == "appear") {
+    if (status.effectEvent == "appear") {
         if (mPostponedScrollIndex.isValid()) { 
             int count = mAppearAnimationIndexes.count();
             for (int i=0; i<count; i++) {
@@ -302,17 +301,199 @@
                 }
             }
         } 
+
+        status.item->setFlag(QGraphicsItem::ItemSendsGeometryChanges, false);
         mAppearAnimationIndexes.clear();
     }
 }
 
 /*!
+    \reimp
+*/
+void HbAbstractItemViewPrivate::setContentPosition(qreal value, Qt::Orientation orientation, bool animate)
+{
+    Q_Q(HbAbstractItemView);
+
+    if (handleScrollBar(orientation)) {
+        if (mContainer->layout() && !mContainer->layout()->isActivated()) {
+            mContainer->layout()->activate();
+        }
+
+        HbAbstractViewItem *firstItem = mContainer->items().first();
+        qreal itemHeight;
+        if (mContainer->uniformItemSizes()) {
+            itemHeight = firstItem->size().height();
+        } else {
+            // avarrage height based on container content
+            itemHeight = mContainer->size().height() / mContainer->items().size();
+        }
+        qreal visiblePos = -mContainer->pos().y()
+                           + mModelIterator->indexPosition(firstItem->modelIndex()) * itemHeight;
+        qreal viewHeight = q->boundingRect().height();
+        qreal modelHeight = itemHeight * mModelIterator->indexCount() - viewHeight;
+        qreal thumbPos = visiblePos / modelHeight;
+
+        qreal diff = (value - thumbPos) * modelHeight;
+
+        q->scrollByAmount(QPointF(0, diff));
+    } else {
+        HbScrollAreaPrivate::setContentPosition(value, orientation, animate);
+    }
+
+    if (animate) {
+        updateScrollBar(orientation);
+    }
+}
+
+bool HbAbstractItemViewPrivate::panTriggered(QGestureEvent *event)
+{
+    Q_Q(HbAbstractItemView);
+
+    HbPanGesture *gesture = static_cast<HbPanGesture *>(event->gesture(Qt::PanGesture));
+
+    switch (gesture->state()) {
+        case Qt::GestureStarted:
+            mOptions |= PanningActive;
+            // Fallthrough
+        case Qt::GestureUpdated: {
+            QPointF scenePos = event->mapToGraphicsScene(gesture->hotSpot());
+            if (mDoingContiguousSelection) {
+                int retVal = false;
+
+                // loop through the items in the scene
+                qreal scenePosY = scenePos.y();
+                QPointF lastScenePos = scenePos + gesture->lastOffset() - gesture->offset();
+                qreal lastScenePosY = lastScenePos.y();
+                QPolygonF polygon;
+                polygon << lastScenePos << scenePos;
+                QList<QGraphicsItem *> items = q->scene()->items(polygon);
+                int itemCount = items.count();
+                for (int current = 0; current < itemCount ; ++current) {
+                    HbAbstractViewItem *item = viewItem(items.at(current));
+                    if (item && item->itemView() == q) {
+                        QModelIndex itemIndex(item->modelIndex());
+                        QGraphicsSceneMouseEvent mouseMoveEvent(QEvent::GraphicsSceneMouseMove);
+                        QPointF scenePosInItemCoordinates = item->mapFromScene(scenePos);
+                        QPointF position(qBound((qreal)0.0, scenePosInItemCoordinates.x(), item->size().width()), 
+                                         qBound((qreal)0.0, scenePosInItemCoordinates.y(), item->size().height()));
+                        mouseMoveEvent.setPos(position);
+                        QItemSelectionModel::SelectionFlags command = q->selectionCommand(item, &mouseMoveEvent);
+
+						// in contiguousselectionarea there shall be no panning from HbScrollArea, thus return true
+                        if (command != QItemSelectionModel::NoUpdate) {
+                            retVal = true;
+                        }
+
+                        if ( itemIndex != mPreviousSelectedIndex
+                          || command != mPreviousSelectedCommand) {
+                            mPreviousSelectedIndex = itemIndex;
+                            mPreviousSelectedCommand = command;
+                            mSelectionModel->select(itemIndex, command);
+                        }
+
+                        // check if we need to start or keep on scrolling
+                        int scrollDirection = 0;
+                        QPointF pos = q->mapFromScene(scenePos);
+                        if (pos.y() < (q->size().height() * CONTIGUOUS_SELECTION_AREA_THRESHOLD)) {
+                             if (q->isScrolling()
+                                 || (!q->isScrolling()
+                                     && lastScenePosY >= scenePosY)) {                                
+                                 scrollDirection = 1;
+                             }
+                        } else if (pos.y() > (q->size().height() * (1 - CONTIGUOUS_SELECTION_AREA_THRESHOLD))) {
+                             if (q->isScrolling()
+                                 || (!q->isScrolling()
+                                     && lastScenePosY <= scenePosY)) {
+                                 scrollDirection = -1;
+                             }                        
+                        }
+
+                        // Start scrolling if needed. 
+                        if (scrollDirection != 0) {
+                            if (!mIsAnimating) {
+                                mPositionInContiguousSelection = scenePos;
+                                QObject::connect(q, SIGNAL(scrollPositionChanged(QPointF)), q, SLOT(_q_scrolling(QPointF)));    
+                                QObject::connect(q, SIGNAL(scrollingEnded()), q, SLOT(_q_scrollingEnded()));    
+                                QObject::connect(q, SIGNAL(scrollingStarted()), q, SLOT(_q_scrollingStarted()));    
+                                animateScroll(QPointF (0.0f, scrollDirection * CONTIGUOUS_SELECTION_SCROLL_SPEED));
+                                retVal = true;
+                            }
+                        } else if (q->isScrolling()) {
+                            stopAnimating();
+                            retVal = true;
+                        }
+                        break;
+                    }
+                }
+                return retVal;
+            }
+            break;
+        }
+        case Qt::GestureFinished: 
+        case Qt::GestureCanceled: {
+            mOptions &= ~PanningActive;
+            if (mDoingContiguousSelection) {
+                stopAnimating();
+                mDoingContiguousSelection = false;
+                return true;
+            }               
+            break;
+        }
+        default:
+            break;
+    }
+
+    return false;
+}
+
+/*!
+    This slot is called when the view is scrolling doing countinuousselection. It does the item 
+    selection/deselection 
+*/
+void HbAbstractItemViewPrivate::_q_scrolling(QPointF newPosition)
+{
+    Q_UNUSED(newPosition);
+
+    HbAbstractViewItem* hitItem = itemAt(mPositionInContiguousSelection);
+    if (hitItem) {
+        QModelIndex itemIndex(hitItem->modelIndex());
+        if ( itemIndex != mPreviousSelectedIndex) {
+            mPreviousSelectedIndex = itemIndex;
+            mSelectionModel->select(itemIndex, mPreviousSelectedCommand);
+        }
+    }
+}
+
+/*!
+    This slot is called when scrolling during continuousselction ends. It restores the original scrolling parameters 
+*/
+void HbAbstractItemViewPrivate::_q_scrollingEnded()
+{
+    Q_Q(HbAbstractItemView);
+
+    mFrictionEnabled = mOrigFriction;
+
+    QObject::disconnect(q, SIGNAL(scrollPositionChanged(QPointF)), q, SLOT(_q_scrollingI(QPointF)));    
+    QObject::disconnect(q, SIGNAL(scrollingEnded()), q, SLOT(_q_scrollingEnded()));    
+    QObject::disconnect(q, SIGNAL(scrollingStarted()), q, SLOT(_q_scrollingStarted()));    
+}
+
+/*!
+    This slot is called when scrolling during continuousselction starts. It saves the original scrolling parameters 
+*/
+void HbAbstractItemViewPrivate::_q_scrollingStarted()
+{
+    mOrigFriction = mFrictionEnabled;
+    mFrictionEnabled = false;
+}
+
+/*!
     \private
 
     When orientation switch occurs, 1) or 2) is applied to view after layout switch:
-          1) if current item is wholly visible, it will be visible
-          2) if current item is not wholly visible, first visible item before layout switch is made visible
-          In either case the visible item is at top of the view or as near as possible
+          1) if last item is wholly visible, it will be visible
+          2) if last item is not fully visible, the first fully visible item before layout switch is made the 
+		     first fully visible item
  */
 void HbAbstractItemViewPrivate::saveIndexMadeVisibleAfterMetricsChange()
 {
@@ -320,18 +501,12 @@
     QModelIndex lastVisibleModelIndex;
     mContainer->firstAndLastVisibleModelIndex(firstVisibleModelIndex, lastVisibleModelIndex);
 
-    int firstVisibleRow = firstVisibleModelIndex.isValid() ? firstVisibleModelIndex.row() : 0;
-    int lastVisibleRow = lastVisibleModelIndex.isValid() ? lastVisibleModelIndex.row() : 0;
-
-    // save current, if it is visible
-    firstVisibleRow = qMax(0, firstVisibleRow);
-    lastVisibleRow = qMax(0, lastVisibleRow);
-
-    if (mCurrentIndex.row() >= firstVisibleRow 
-        && mCurrentIndex.row() <= lastVisibleRow) {
-        mVisibleIndex = mCurrentIndex;
-    } else if (mModelIterator->model()) {
-        mVisibleIndex = mModelIterator->index(firstVisibleRow);
+    if (mModelIterator->model()) {
+        if (lastVisibleModelIndex == mModelIterator->index(mModelIterator->indexCount() - 1)) {
+            mVisibleIndex = lastVisibleModelIndex;
+        } else {
+            mVisibleIndex = firstVisibleModelIndex;
+        }
     }
 }
 
@@ -406,8 +581,7 @@
                     result.setX(itemRect.right() - viewRect.right());
                 }
             }
-        }
-        else if (mScrollDirections & Qt::Horizontal) {
+        } else if (mScrollDirections & Qt::Horizontal) {
             switch (hint) {
                 case HbAbstractItemView::PositionAtTop: {    // left
                     result.setX(itemRect.right() - viewRect.left() - sizeOffset.width());
@@ -452,14 +626,12 @@
         switch (event->type())  {
         case QEvent::GraphicsSceneMousePress: 
         case QEvent::GraphicsSceneMouseDoubleClick:
-            if (item->selectionAreaContains(static_cast<const QGraphicsSceneMouseEvent *>(event)->scenePos())) {
+            if (item->selectionAreaContains(static_cast<const QGraphicsSceneMouseEvent *>(event)->pos(), HbAbstractViewItem::SingleSelection)) {
                 mSelectionSettings |= Selection;
             }
             break;
         case QEvent::GraphicsSceneMouseRelease:
-            if (    mHitItem
-                &&  item->modelIndex() == mHitItem->modelIndex()
-                &&  mSelectionSettings.testFlag(Selection)) {
+            if (mSelectionSettings.testFlag(Selection)) {
                 mSelectionSettings &= ~Selection;
                 return QItemSelectionModel::ClearAndSelect;
             }
@@ -477,53 +649,32 @@
         const HbAbstractViewItem *item,
         const QEvent *event)
 {
-    if (item) {
-        switch (event->type())  {
-        case QEvent::GraphicsSceneMousePress: 
-        case QEvent::GraphicsSceneMouseDoubleClick:
-            if (item->selectionAreaContains(static_cast<const QGraphicsSceneMouseEvent *>(event)->scenePos())) {
-                mSelectionSettings |= Selection;
-            }
-            break;
-        case QEvent::GraphicsSceneMouseRelease:
-            if (mHitItem
-                && item->modelIndex() == mHitItem->modelIndex() 
-                && mSelectionSettings.testFlag(Selection)) {
-                mSelectionSettings &= ~Selection;
-                return QItemSelectionModel::Toggle;
-            }
-            break;
-        default:
-            break;
-        }
-    }
-    return QItemSelectionModel::NoUpdate;
-}
-
-QItemSelectionModel::SelectionFlags HbAbstractItemViewPrivate::contiguousSelectionCommand(
-        const HbAbstractViewItem *item,
-        const QEvent *event )
-{
     Q_Q(HbAbstractItemView);
     if (item) {
         switch (event->type()) {
         case QEvent::GraphicsSceneMousePress: 
         case QEvent::GraphicsSceneMouseDoubleClick: {
-            if (item->selectionAreaContains(static_cast<const QGraphicsSceneMouseEvent *>(event)->scenePos())) {
-                mSelectionSettings |= Selection;
 
+            // check if the mouse click is in the multiselectionarea
+		    if (item->selectionAreaContains(static_cast<const QGraphicsSceneMouseEvent *>(event)->pos(), HbAbstractViewItem::MultiSelection)) {
+		        mSelectionSettings |= Selection;
                 if (mSelectionModel && mSelectionModel->isSelected(item->modelIndex())) {
                     mContSelectionAction = QItemSelectionModel::Deselect;
                 } else {
                     mContSelectionAction = QItemSelectionModel::Select;
                 }
+            }
 
-                // TODO: This should be changed to changing the gesture area of effect when that is possible...
-                // Gesture filter does not reset all of its internals: workaround is to delete and create the filter
+            // check if the mouse click is in the "contiguousselectionarea"
+            if (item->selectionAreaContains(static_cast<const QGraphicsSceneMouseEvent *>(event)->pos(), 
+                                            HbAbstractViewItem::ContiguousSelection)) {
+                // it is assumed that the "contiguousselectionarea" is in the multiselectionarea
                 q->setLongPressEnabled(false);
-                q->removeSceneEventFilter(mGestureFilter);
-                mFilterRemoved = true;
+                mDoingContiguousSelection = true;
+            } else {
+                mDoingContiguousSelection = false;
             }
+
             break;
             }
         case QEvent::GraphicsSceneMouseRelease: {
@@ -534,15 +685,15 @@
                 mContSelectionAction = QItemSelectionModel::NoUpdate;
             } 
             
-            if (mFilterRemoved) {
-                // setLongPressEnabled installs filter
-                q->setLongPressEnabled(true);
-                mFilterRemoved = false;
-            }
+            q->setLongPressEnabled(true);
             return flags;
             }
         case QEvent::GraphicsSceneMouseMove:
-            return mContSelectionAction;
+            if (mDoingContiguousSelection) {
+                return mContSelectionAction;
+            } else {
+                return QItemSelectionModel::NoUpdate;
+            }
         default:
             break;
         }
@@ -550,27 +701,6 @@
     return QItemSelectionModel::NoUpdate;
 }
 
-/*!
-    Overwrites the default scroll area scrollbar updating algorithm when
-    recycling is used. On recycling the scrollbar position & size is calculated
-    using rows and their pixel size is not used.
-*/
-void HbAbstractItemViewPrivate::updateScrollBar(Qt::Orientation orientation)
-{
-    if (!handleScrollBar(orientation)) {
-        HbScrollAreaPrivate::updateScrollBar(orientation);
-    } else {
-        if (mContainer->layout() && !mContainer->layout()->isActivated()) {
-            mContainer->layout()->activate();
-        }
-
-        if (mContainer->uniformItemSizes()) {
-            updateScrollBarForUniformSizedItems();
-        } else {
-            updateScrollBarForVariableSizedItems();
-        }
-    } 
-}
 
 /*!
     Returns the abstract view item from given scene position, if there is any.
@@ -623,18 +753,18 @@
 
 
 QRectF HbAbstractItemViewPrivate::itemBoundingRect(const QGraphicsItem *item) const
-    {
-        Q_Q(const HbAbstractItemView);
+{
+    Q_Q(const HbAbstractItemView);
 
-        if (mContainer) {
-            QGraphicsLayout *containerLayout = mContainer->layout();
-            if (containerLayout) {
-                containerLayout->activate();
-            }
+    if (mContainer) {
+        QGraphicsLayout *containerLayout = mContainer->layout();
+        if (containerLayout) {
+            containerLayout->activate();
         }
+    }
 
-        return item->mapToItem(q, item->boundingRect()).boundingRect();
-    }
+    return item->mapToItem(q, item->boundingRect()).boundingRect();
+}
 
 /*!
     Returns true if given item is located within viewport (i.e.  view), otherwise
@@ -720,7 +850,8 @@
     if (delta != QPointF()) {
         QPointF newPos = -mContainer->pos() + delta;
         checkBoundaries(newPos);
-        // scroll area logic is oposite to real position
+
+        // scroll area logic is opposite to real position.
         q->scrollContentsTo(newPos);
     }
 }
@@ -752,45 +883,28 @@
     }
 }
 
-void HbAbstractItemViewPrivate::updateScrollBarForUniformSizedItems()
+void HbAbstractItemViewPrivate::setScrollBarMetrics(Qt::Orientation orientation)
 {
-    Q_Q(const HbAbstractItemView);
-    
-    HbAbstractViewItem *firstItem = mContainer->items().first();
-    qreal uniformItemHeight = firstItem->size().height();
-    qreal containerVirtualHeight = uniformItemHeight *  (mModelIterator->indexCount());
-    qreal thumbPosition(0);
-    int firstBufferItemRowNumber = mModelIterator->indexPosition(firstItem->modelIndex());
-     
-    QRectF itemRect = itemBoundingRect(firstItem);
-    qreal realTopBoundary = itemRect.top();   
-    qreal virtualTopBoundary = realTopBoundary - (firstBufferItemRowNumber*uniformItemHeight); 
-   
-    if ((containerVirtualHeight - q->boundingRect().height()) != 0) {
-        thumbPosition = 
-            (-virtualTopBoundary) / (containerVirtualHeight - q->boundingRect().height());
-    }  
- 
-    thumbPosition = qBound((qreal)0.0, thumbPosition, (qreal)1.0);
- 
-    if (mVerticalScrollBar) {
-        if (containerVirtualHeight!=0) {
-            mVerticalScrollBar->setPageSize(qBound ( (qreal)0.0,
-                                     q->boundingRect().height() / containerVirtualHeight,
-                                      (qreal)1.0));
-        }
-        mVerticalScrollBar->setValue(thumbPosition); 
-    }    
-}
-
-void HbAbstractItemViewPrivate::setScrollBarMetrics(Qt::Orientation orientation)
-{   
     if (!handleScrollBar(orientation) ) {
         HbScrollAreaPrivate::setScrollBarMetrics(orientation);
     } else {
-        //We just make sure that the base clas is not called
-        //It set the page size wrongly
-        updateScrollBar(orientation); 
+        Q_Q(HbAbstractItemView);
+
+        if (mContainer->layout() && !mContainer->layout()->isActivated()) {
+            mContainer->layout()->activate();
+        }
+
+        qreal itemHeight;
+        if (mContainer->uniformItemSizes()) {
+            itemHeight = mContainer->items().first()->size().height();
+        } else {
+            // avarrage height based on container content
+            itemHeight = mContainer->size().height() / mContainer->items().size();
+        }
+        qreal rowCount = q->boundingRect().height() / itemHeight;
+        qreal modelRowCount = mModelIterator->indexCount();
+        qreal thumbSize = rowCount / modelRowCount;
+        mVerticalScrollBar->setPageSize(thumbSize);
     }
 }
 
@@ -798,86 +912,56 @@
     This function combines the conditions to solve whether the scroll bar calcultion should be handled in
     this class or is the base class calculation sufficient
 */
-bool  HbAbstractItemViewPrivate::handleScrollBar(Qt::Orientation orientation)
+bool HbAbstractItemViewPrivate::handleScrollBar(Qt::Orientation orientation)
 {
     if (!mContainer->itemRecycling()
-        || mContainer->itemPrototypes().count() != 1 
-        || orientation == Qt::Horizontal
-        || mContainer->items().count() == 0) {
-            return false;
+        || !(orientation & mScrollDirections)
+        || mContainer->itemPrototypes().count() != 1
+        || mContainer->items().isEmpty()
+        || (!mVerticalScrollBar && orientation == Qt::Vertical)
+        || (!mHorizontalScrollBar && orientation == Qt::Horizontal)) {
+        return false;
     } else {
         return true;
     }
 }
 
-void HbAbstractItemViewPrivate::updateScrollBarForVariableSizedItems()
+/*!
+    Overwrites the default scroll area scrollbar updating algorithm when
+    recycling is used. While recycling is on scrollbar position & size 
+    are calculated using rows and their pixel sizes are not used (in fact only 
+    container position is interesting to determine partially visible items
+    - when container contain small amount of items it is important).
+*/
+void HbAbstractItemViewPrivate::updateScrollBar(Qt::Orientation orientation)
 {
-    Q_Q(const HbAbstractItemView);
-    HbAbstractViewItem *firstItem = mContainer->items().first();
- 
-    // View position is the amount of hidden (fully or partially)
-    // rows above the view area.
-    int position = mModelIterator->indexPosition(firstItem->modelIndex());
-    if (position == -1) {
-        return; 
-    }
-    qreal viewY = (qreal)(position);
-
-    // View area height is the amount of rows within the view area.
-    qreal viewH = 0;
-
-    //Index count calculation is time consuming with tree
-    int indexCount = mModelIterator->indexCount();
-
-    // Total height is the amount of rows in the model.
-    qreal totalH = indexCount;
-
-    qreal itemTop = firstItem->mapToItem(q, firstItem->pos()).y();
-    qreal viewHeight = q->size().height();
-    int itemCount = mContainer->items().count();
-    
-    for (int i=0; i < itemCount; ++i) {
-        qreal itemHeight = mContainer->items().at(i)->size().height();
-        qreal itemBottom = itemTop + itemHeight;
-        if (itemTop < 0) {
-            // Some part of the item is above the view area.
-            if (itemBottom < 0) {
-                // Fully above the view area
-                viewY += 1;
-            } else {
-                // Partially at the view area and partially above the view area.
-                viewY += (1.0 - itemBottom / itemHeight);
-                viewH += itemBottom / itemHeight;
-            }
-        } else if (itemTop < viewHeight) {
-            // So part of the item is at the view area.
-            if (itemBottom < viewHeight) {
-                // Fully at the view area
-                viewH += 1;
-            } else {
-                // Partially at the view area and partially below the view area.
-                viewH += (viewHeight - itemTop) / itemHeight;
-            }
-        } else {
-            break;
+    if (!handleScrollBar(orientation)) {
+        HbScrollAreaPrivate::updateScrollBar(orientation);
+    } else {
+        if (mContainer->layout() && !mContainer->layout()->isActivated()) {
+            mContainer->layout()->activate();
         }
 
-        itemTop += itemHeight;
-    }
-
-    // Shifting the values to scrollbar range that is from 0.0-1.0. 
-    qreal pos = viewY / (totalH - viewH);
-    pos = qBound((qreal)0.0, pos, (qreal)1.0);
+        Q_Q(const HbAbstractItemView);
 
-    if (mVerticalScrollBar) {
-        if (indexCount!=0) {
-            mVerticalScrollBar->setPageSize(viewH / (qreal)(indexCount));
+        qreal containerPos = mContainer->pos().y();
+        qreal itemHeight;
+        if (mContainer->uniformItemSizes()) {
+            itemHeight = mContainer->items().first()->size().height();
+        } else {
+            // avarrage height based on container content
+            itemHeight = mContainer->size().height() / mContainer->items().size();
         }
-        mVerticalScrollBar->setValue(pos);
-    }    
+        qreal rowCount = q->boundingRect().height() / itemHeight;
+        qreal modelRowCount = mModelIterator->indexCount() - rowCount;
+        qreal firstVisibleRow = mModelIterator->indexPosition(mContainer->items().first()->modelIndex());
+        firstVisibleRow += -containerPos / itemHeight;
+        qreal thumbPos = firstVisibleRow / (qreal)modelRowCount;
+        mVerticalScrollBar->setValue(thumbPos);
+    }
 }
 
-void HbAbstractItemViewPrivate::rowsRemoved(const QModelIndex &parent,int start,int end)
+void HbAbstractItemViewPrivate::rowsRemoved(const QModelIndex &parent, int start, int end)
 {
     if (mModelIterator->model()->columnCount(parent) == 0) {
         return;
@@ -900,8 +984,7 @@
     for (int current = end; current >= start; --current) {
         //The items are already removed from the model. That's why their indexes are already invalid.
         //Here we loop the items in container and call removeItem() with QModelIndex().
-        bool animate = mEnabledAnimations & HbAbstractItemView::Disappear ? mAnimateItems : false;
-        mContainer->removeItem(QModelIndex(), animate);
+        mContainer->removeItem(QModelIndex(), animationEnabled(false));
     }
 }
 
@@ -913,16 +996,14 @@
         return QItemSelectionModel::NoUpdate;
 
     QItemSelectionModel::SelectionFlags flags = QItemSelectionModel::NoUpdate;
-    if (item && mHitItem && event){
+    if (item && event){
         switch (mSelectionMode) {
         case HbAbstractItemView::SingleSelection: 
             flags =  singleSelectionCommand(item, event);
             break;
         case HbAbstractItemView::MultiSelection:
-            flags =  multiSelectionCommand(item, event);
-            break;
         case HbAbstractItemView::ContiguousSelection: {
-            flags = contiguousSelectionCommand(item, event);
+            flags = multiSelectionCommand(item, event);
             break;
         }
         case HbAbstractItemView::NoSelection: // Never update selection model
@@ -939,7 +1020,7 @@
     mContainer->reset();
 }
 
-void HbAbstractItemViewPrivate::startAppearEffect(const QModelIndex &parent, int start, int end)
+void HbAbstractItemViewPrivate::startAppearEffect(const QString &itemType, const QString &effectEvent, const QModelIndex &parent, int start, int end)
 {
     Q_Q(HbAbstractItemView);
     if( mAppearAnimationIndexes.count()) {
@@ -951,13 +1032,15 @@
         HbAbstractViewItem *item = q->itemByIndex(index);
         if (item) {
             items.append(item);
+            item->setFlag(QGraphicsItem::ItemSendsGeometryChanges, true);
+
             mAppearAnimationIndexes.append(index);
         }
     }
 
     refreshContainerGeometry();
 
-    HbEffect::start(items, "viewitem", "appear", q, "_q_animationFinished");
+    HbEffect::start(items, itemType, effectEvent, q, "_q_animationFinished");
 }
 
 void HbAbstractItemViewPrivate::ensureVisible(QPointF position, qreal xMargin, qreal yMargin)
@@ -966,4 +1049,11 @@
     HbScrollAreaPrivate::ensureVisible(position, xMargin, yMargin);
 }
 
-
+bool HbAbstractItemViewPrivate::animationEnabled(bool insertOperation)
+{
+    if (insertOperation) {
+        return mEnabledAnimations & HbAbstractItemView::Appear ? mAnimateItems : false;
+    } else {
+        return mEnabledAnimations & HbAbstractItemView::Disappear ? mAnimateItems : false;
+    }
+}
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/itemviews/hbabstractitemview_p.h
--- a/src/hbwidgets/itemviews/hbabstractitemview_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/itemviews/hbabstractitemview_p.h	Mon May 03 12:48:33 2010 +0300
@@ -49,6 +49,7 @@
 class QModelIndex;
 class QEvent;
 class QTimer;
+class QGestureEvent;
 QT_END_NAMESPACE
 
 class HbAbstractItemContainer;
@@ -89,8 +90,6 @@
 
     void saveIndexMadeVisibleAfterMetricsChange();
 
-    QItemSelectionModel::SelectionFlags  contiguousSelectionCommand(
-            const HbAbstractViewItem *item, const QEvent *event );
     QItemSelectionModel::SelectionFlags multiSelectionCommand(
             const HbAbstractViewItem *item, const QEvent *event );
     QItemSelectionModel::SelectionFlags singleSelectionCommand(
@@ -103,8 +102,6 @@
     HbAbstractViewItem* currentItem() const;
     
     HbAbstractViewItem* viewItem(QGraphicsItem *item) const;
-    
-    void updateScrollBar(Qt::Orientation orientation);
 
     void refreshContainerGeometry();
 
@@ -116,10 +113,9 @@
     void revealItem(const HbAbstractViewItem *item, HbAbstractItemView::ScrollHint hint);
     void checkBoundaries(QPointF &newPos);
 
-    void updateScrollBarForUniformSizedItems();
-    void updateScrollBarForVariableSizedItems();
     void setScrollBarMetrics(Qt::Orientation orientation);
-    bool handleScrollBar(Qt::Orientation orientation);
+    virtual bool handleScrollBar(Qt::Orientation orientation);
+    void updateScrollBar(Qt::Orientation orientation);
 
     void rowsRemoved(const QModelIndex &parent, int start, int end);
 
@@ -127,13 +123,22 @@
                                                     const HbAbstractViewItem *item, 
                                                     const QEvent *event);
     void resetContainer();
-    void startAppearEffect(const QModelIndex &parent, int start, int end);
+    void startAppearEffect(const QString &itemType, const QString &effectEvent, const QModelIndex &parent, int start, int end);
+
+    virtual bool animationEnabled(bool insertOperation);
+
     virtual void ensureVisible(QPointF position, qreal xMargin, qreal yMargin);
 
     void _q_modelDestroyed();
-    void _q_layoutChanged();
     void _q_animationEnabled();
     void _q_animationFinished(const HbEffect::EffectStatus &status);
+    void _q_scrolling(QPointF newPosition);
+    void _q_scrollingEnded();
+    void _q_scrollingStarted();
+
+    void setContentPosition(qreal value, Qt::Orientation orientation, bool animate);
+
+    virtual bool panTriggered(QGestureEvent *event);
 
 public:
     QPersistentModelIndex mCurrentIndex;
@@ -144,8 +149,6 @@
 
     SelectionSettings mSelectionSettings;
 
-    QPointer<HbAbstractViewItem> mHitItem;
-
     // mContainer can always be assumed to be valid in the code
     HbAbstractItemContainer *mContainer;
 
@@ -154,9 +157,7 @@
     QItemSelectionModel *mSelectionModel;
     QItemSelectionModel::SelectionFlag mContSelectionAction;
 
-    bool mWasScrolling;
     QString mLayoutOptionName;
-    bool mFilterRemoved;
     bool mClearingSelection;
 
     bool mAnimateItems;
@@ -167,7 +168,6 @@
     HbAbstractItemView::ScrollHint mPostponedScrollHint;
     QModelIndex mPreviousSelectedIndex;
     QItemSelectionModel::SelectionFlags mPreviousSelectedCommand;
-    Hb::InteractionModifiers mInstantClickedModifiers;
 
     QTimer *mAnimationTimer;
     QList< QPersistentModelIndex > mAppearAnimationIndexes;
@@ -175,6 +175,12 @@
     HbModelIterator *mModelIterator;
     HbAbstractItemView::ItemAnimations mEnabledAnimations;
 
+    bool mLongPressEnabled;
+
+    bool mOrigFriction;
+    bool mDoingContiguousSelection;
+    QPointF mPositionInContiguousSelection;
+
 private:
     static HbAbstractItemViewPrivate *d_ptr(HbAbstractItemView *abstractItemView) {
         Q_ASSERT(abstractItemView);
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/itemviews/hbabstractviewitem.cpp
--- a/src/hbwidgets/itemviews/hbabstractviewitem.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/itemviews/hbabstractviewitem.cpp	Mon May 03 12:48:33 2010 +0300
@@ -32,16 +32,26 @@
 #include <hbstyle.h>
 #include <hbiconitem.h>
 #include <hbframebackground.h>
-#include <hbtextitem.h>
+#include <hbabstractitemview_p.h>
+#include <hbwidgetfeedback.h>
+#include <hbtapgesture.h>
 
 #include <QPersistentModelIndex>
-#include <QGraphicsSceneMouseEvent>
-#include <QGraphicsLinearLayout>
+#include <QGraphicsLayout>
 #include <QVariant>
 #include <QCoreApplication>
 #include <QEvent>
 #include <QDebug>
 
+#include <QGesture>
+#include <QGestureEvent>
+
+#ifdef QMAP_INT__ITEM_STATE_DEPRECATED
+#define HB_ITEM_STATE_ASSERT Q_ASSERT_X(0, "", "QMap<int,QVariant> based view item state system is deprecated. Use QHash<QString, QVariant> based instead" )
+#else
+#define HB_ITEM_STATE_ASSERT
+#endif
+
 const QString KDefaultLayoutOption = "default";
 const int HbAbstractViewItemShared::ViewItemDeferredDeleteEvent = QEvent::registerEventType();
 
@@ -67,28 +77,89 @@
 
     If derived abstract view item has transient state information that is not meaningful to store within model index (child item cursor 
     position selection areas etc.) view item can use abstract views internal state model to store this information. This feature can
-    be taken into use by implementing state() and setState() functions in derived class.
+    be taken into use by implementing transientState() and setTransientState() functions in derived class.
 */
 
 /*!
+    \deprecated HbAbstractViewItem::StateKey
+        is deprecated. Please use string based state keys.
+
     \enum HbAbstractViewItem::StateKey
 
     HbAbstractViewItem's predefined set of state keys.
 
     This enum describes state keys for HbAbstractViewItem state values. State value can be accessed using this key.
+
+    \sa HbAbstractViewItem::transientState()
 */
 
 /*!
+    \deprecated HbAbstractViewItem::FocusKey
+        is deprecated. Please use string based state keys. This key is replaced by "focused".
+
     \var HbAbstractViewItem::FocusKey
          Predefined key for focus state value.
 */
 
 /*!
+    \deprecated HbAbstractViewItem::CheckStateKey
+        is deprecated. Please use string based state keys. This key is replaced by "checkState".
+
+    \var HbAbstractViewItem::CheckStateKey
+        Predefined key for check state value. Default value is Qt::Unchecked.
+*/
+
+/*!
+    \deprecated HbAbstractViewItem::UserKey
+        is deprecated. Please use string based state keys.
+
     \var HbAbstractViewItem::UserKey
          First key that can be used by the derived class for it's own purposes.
 */
 
 /*!
+    \fn void HbAbstractViewItem::pressed(const QPointF &position)
+
+    This signal is emitted when a touch down event is received for this view item.
+    \a position is position of touch event in view item coordinates.
+
+    \sa HbAbstractViewItem::released(const QPointF &position)
+    \sa HbAbstractViewItem::activated(const QPointF &position)
+*/
+
+/*!
+    \fn void HbAbstractViewItem::released(const QPointF &position)
+
+    This signal is emitted when a touch release event is received for this view item.
+    \a position is position of touch event in view item coordinates.
+
+    \sa HbAbstractViewItem::pressed(const QPointF &position)
+    \sa HbAbstractViewItem::activated(const QPointF &position)
+*/
+
+/*!
+    \fn void HbAbstractViewItem::activated(const QPointF &position)
+
+    This signal is emitted when view item is activated by the user.
+    How to activate items depends on the input method; e.g., with mouse by clicking the item
+    or with touch input by tapping the item.
+    \a position is position of touch event in view item coordinates.
+
+    \sa HbAbstractViewItem::pressed(const QPointF &position)
+    \sa HbAbstractViewItem::released(const QPointF &position)
+*/
+
+/*!
+    \fn void HbAbstractViewItem::longPressed(const QPointF &position)
+
+    This signal is emitted when long press event is received for this view item and long press is enabled in itemview.
+    \a position is position of touch event in view item coordinates.
+
+    \sa HbAbstractItemView::longPressEnabled()
+*/
+
+
+/*!
     \fn HbAbstractViewItem::createItem 
 
     Creates a new item. 
@@ -98,7 +169,6 @@
     \snippet{ultimatecodesnippet/customlistviewitem.cpp,1}
 */
 
-
 void HbAbstractViewItemPrivate::init()
 {
     Q_Q(HbAbstractViewItem);
@@ -108,6 +178,7 @@
     if (isPrototype()) {
         q->setFocusPolicy(Qt::ClickFocus);
     } else {
+        q->grabGesture(Qt::TapGesture);
         QGraphicsItem::GraphicsItemFlags itemFlags = q->flags();
         itemFlags |= QGraphicsItem::ItemIsFocusable;
         q->setFlags(itemFlags);
@@ -141,11 +212,15 @@
     }
 }
 
-void HbAbstractViewItemPrivate::updateCloneItems()
+void HbAbstractViewItemPrivate::updateCloneItems(bool updateChildItems)
 {
     int count(mSharedData->mCloneItems.count());
     for (int i = 0; i < count; ++i) {
-        mSharedData->mCloneItems.at(i)->updatePrimitives();
+        if (updateChildItems) {
+            mSharedData->mCloneItems.at(i)->updateChildItems();
+        } else {
+            mSharedData->mCloneItems.at(i)->updatePrimitives();
+        }
     }
 }
 
@@ -161,6 +236,75 @@
     }
 }
 
+void HbAbstractViewItemPrivate::tapTriggered(QGestureEvent *event)
+{
+    Q_Q(HbAbstractViewItem);
+
+    HbTapGesture *gesture = static_cast<HbTapGesture *>(event->gesture(Qt::TapGesture));
+    QPointF position = event->mapToGraphicsScene(gesture->hotSpot());
+    position = q->mapFromScene(position);
+
+    switch (gesture->state()) {
+        case Qt::GestureStarted: {
+            HbWidgetFeedback::triggered(q, Hb::InstantPressed, 0);
+            q->setPressed(true);
+            emit q->pressed(position);
+
+            break;
+        }
+        case Qt::GestureUpdated: {
+            if (gesture->tapStyleHint() == HbTapGesture::TapAndHold 
+                && mSharedData->mItemView
+                && mSharedData->mItemView->longPressEnabled()) {
+                q->setPressed(false);
+                emit q->longPressed(position);
+                revealItem();
+            }
+            break;
+        }
+        case Qt::GestureFinished: {
+            HbWidgetFeedback::triggered(q, Hb::InstantReleased, 0);
+
+            if (gesture->tapStyleHint() == HbTapGesture::Tap 
+			    || (mSharedData->mItemView
+                && !mSharedData->mItemView->longPressEnabled())) {
+                q->setPressed(false);
+
+                HbWidgetFeedback::triggered(q, Hb::InstantClicked);
+                emit q->activated(position);
+                emit q->released(position);
+                revealItem();
+            } else {
+                emit q->released(position);
+            }
+
+            break;
+        }
+        case Qt::GestureCanceled: {
+            HbWidgetFeedback::triggered(q, Hb::InstantReleased, 0);
+
+            // hides focus immediately
+            q->setPressed(false, false);
+
+            emit q->released(position);
+            break;
+        }
+        default:
+            break;
+    }
+
+    event->accept();
+}
+
+void HbAbstractViewItemPrivate::revealItem()
+{
+    Q_Q(HbAbstractViewItem);
+
+    if (mSharedData->mItemView) {
+        static_cast<HbAbstractItemViewPrivate *>(mSharedData->mItemView->d_func())->revealItem(q, HbAbstractItemView::EnsureVisible);
+    }
+}
+
 /*!
     Constructs an abstract view item with the given parent.
 */
@@ -269,6 +413,7 @@
     Q_D( HbAbstractViewItem );
     if (d->mIndex != index) {
         d->mIndex = index;
+
         updateChildItems();
     }
 }
@@ -320,9 +465,52 @@
     wanted to be preserved but it not meaningful to be stored inside model index because of it's
     momentary nature. States will be saved inside AbstractItemview and restored when current model index is
     assigned to certain Abstract view item.
+
+    String in the returned table is usually name of a Qt property.
+    Default values of properties should not be added into returned table.
+
+    Derived class should first call base class implementation. After that it adds its own
+    state items into returned table.
+*/
+QHash<QString, QVariant> HbAbstractViewItem::transientState() const
+{
+    Q_D( const HbAbstractViewItem );
+    QHash<QString,QVariant> state;
+    
+    if (d->mFocused) {
+        state.insert("focused", d->mFocused);
+    }
+    if (d->mCheckState != Qt::Unchecked) {
+        state.insert("checkState", d->mCheckState);
+    }
+
+    return state;
+}
+
+/*!
+    Sets the item's transient state using given \a state data.
+*/
+void HbAbstractViewItem::setTransientState(const QHash<QString, QVariant> &state)
+{
+    Q_D( HbAbstractViewItem );
+    d->mFocused = state.value("focused").toBool();
+    d->mCheckState = (Qt::CheckState)state.value("checkState").toInt();
+}
+
+
+/*!
+     \deprecated HbAbstractViewItem::state() const
+        is deprecated. Please use HbAbstractViewItem::transientState() instead. 
+
+    Returns the saved item's transient state. Transient state can be seen as a state data that is 
+    wanted to be preserved but it not meaningful to be stored inside model index because of it's
+    momentary nature. States will be saved inside AbstractItemview and restored when current model index is
+    assigned to certain Abstract view item.
 */
 QMap<int,QVariant> HbAbstractViewItem::state() const
 {
+    qWarning("HbAbstractViewItem::state() const is deprecated");
+    HB_ITEM_STATE_ASSERT;
     Q_D( const HbAbstractViewItem );
     QMap<int,QVariant> state;
 
@@ -333,10 +521,15 @@
 }
 
 /*!
+     \deprecated HbAbstractViewItem::setState(const QMap<int,QVariant> &)
+        is deprecated. Please use HbAbstractViewItem::setTransientState(const QHash<QString, QVariant> &state) instead. 
+
     Restores the item's transient state using given \a state data.
 */
 void HbAbstractViewItem::setState(const QMap<int,QVariant> &state)
 {
+    qWarning("HbAbstractViewItem::setState(const QMap<int,QVariant> &state) is deprecated");
+    HB_ITEM_STATE_ASSERT;
     Q_D( HbAbstractViewItem );
     if (state.contains(FocusKey)) {
         d->mFocused = state.value(FocusKey).toBool();
@@ -413,44 +606,37 @@
 }
 
 /*!
-    Check whether \a scenePosition of pressed down is inside selection area of view item in current selection mode.
+    Check whether \a position is inside the selection area of the given selectionAreaType in the view item.
 
     Default selection areas are for
-    \li HbAbstractItemView::SingleSelection mode: whole item
-    \li HbAbstractItemView::MultiSelection mode: touch area of selection icon. 
-        Touch are is represented by primitive HbStyle::P_ItemViewItem_touchmultiselection.
-    \li HbAbstractItemView::ContiguousSelection mode: touch area of selection icon. 
-        Touch are is represented by primitive HbStyle::P_ItemViewItem_touchmultiselection.
+    \li HbAbstractViewItem::SingleSelection mode: whole item
+    \li HbAbstractViewItem::MultiSelection mode: whole item.
+    \li HbAbstractItemView::ContiguousSelection mode: whole item. (Note: HbAbstractItemView::ContiguousSelection is deprecated.)
     \li HbAbstractItemView::NoSelection mode: none
+
+    The \a selectionAreaType tells what kind of selection area is requested.  The parameter value ContiguousSelection returns 
+	the area where mouse movement will extend the selection to new items. By default this contiguous selection area is 
+	the HbStyle::P_ItemViewItem_touchmultiselection.
+    
 */
-bool HbAbstractViewItem::selectionAreaContains(const QPointF &scenePosition) const
+bool HbAbstractViewItem::selectionAreaContains(const QPointF &position, SelectionAreaType selectionAreaType) const
 {
-    HB_SDD(const HbAbstractViewItem);
+    Q_D(const HbAbstractViewItem);
     bool contains = false;
-    if (sd->mItemView) {
-        switch (sd->mItemView->selectionMode()) {
-            case HbAbstractItemView::SingleSelection: 
+    if (selectionAreaType == ContiguousSelection) {
+        if(     d->mMultiSelectionTouchArea 
+            &&  !d->mMultiSelectionTouchArea->boundingRect().isEmpty()) {
+                contains = d->mMultiSelectionTouchArea->boundingRect().contains(mapToItem(d->mMultiSelectionTouchArea, position));
+            } else if (d->mSelectionItem) {
+                contains = d->mSelectionItem->boundingRect().contains(mapToItem(d->mMultiSelectionTouchArea, position));
+            }
+    } else {
+        switch (selectionAreaType) {
+            case SingleSelection: 
+            case MultiSelection: 
+            case ContiguousSelection: 
                 contains = true;
                 break;
-            case HbAbstractItemView::MultiSelection: 
-                // fall through
-            case HbAbstractItemView::ContiguousSelection: {
-                // TODO: put assert back in action, when official layouts in use
-                /*Q_ASSERT_X(     d->mMultiSelectionTouchArea 
-                            &&  d->mMultiSelectionTouchArea->boundingRect().size().width() > 0 
-                            &&  d->mMultiSelectionTouchArea->boundingRect().size().height() > 0, "", "HbAbstractViewItem::selectionAreaContains(): d->mMultiSelectionTouchArea should exist");
-                */
-                if(     d->mMultiSelectionTouchArea 
-                    &&  d->mMultiSelectionTouchArea->boundingRect().size().width() > 0 
-                    &&  d->mMultiSelectionTouchArea->boundingRect().size().height() > 0) {
-                    contains = d->mMultiSelectionTouchArea->boundingRect().contains(
-                                    d->mMultiSelectionTouchArea->mapFromScene(scenePosition));
-                } else {
-                    contains = d->mSelectionItem->boundingRect().contains(
-                                    d->mSelectionItem->mapFromScene(scenePosition));
-                }
-                break;
-            }
             default:
                 break;
         }
@@ -474,6 +660,14 @@
                     if (d->mFocusItem) {
                         style()->updatePrimitive(d->mFocusItem, HbStyle::P_ItemViewItem_focus, &styleOption);
                     }
+
+                    if (d->mFrame) {
+                        style()->updatePrimitive(d->mFrame, HbStyle::P_ItemViewItem_frame, &styleOption);
+                    }
+
+                    if (d->mBackgroundItem) {
+                        style()->updatePrimitive(d->mBackgroundItem, HbStyle::P_ItemViewItem_background, &styleOption);
+                    }
                 }
                 break;
             }
@@ -499,6 +693,33 @@
 }
 
 /*!
+    \reimp
+
+    Invalidates parent layout when ItemTransformHasChanged is received.
+*/
+QVariant HbAbstractViewItem::itemChange(GraphicsItemChange change, const QVariant &value)
+{
+    switch (change) {
+        case ItemTransformHasChanged: {
+            QGraphicsLayoutItem *parentLayoutItem = this->parentLayoutItem();
+            if (parentLayoutItem && parentLayoutItem->isLayout()) {
+                QGraphicsLayout *parentLayout = static_cast<QGraphicsLayout *>(parentLayoutItem);
+                parentLayout->invalidate();
+            }
+            break;
+        }
+        default:
+            break;
+    }
+
+    return HbWidget::itemChange(change, value);
+}
+
+/*!
+
+    \deprecated HbAbstractViewItem::primitive(HbStyle::Primitive)
+       is deprecated.
+
   Provides access to primitives of HbAbstractViewItem.
   \param primitive is the type of the requested primitive. The available primitives are 
   \c P_ItemViewItem_background
@@ -625,6 +846,15 @@
         d->themingPending = true;
     }
 
+    /* Summary of background and frame handling:
+         d->mBackground is read from Qt::BackgroundRole of model
+         d->mBackgroundItem is created from d-mBackground (Qt::BackgroundRole), if this is HbIcon or QBrush.
+
+         If d->mBackgroundItem does not exist, d->mFrame is created from d-mBackground (Qt::BackgroundRole), 
+         if this is HbFrameBackground otherwise it either is created from sd->mDefaultFrame, 
+         not created at all or from system default.
+    */
+ 
     // background
     QVariant currentBackground = d->mIndex.data(Qt::BackgroundRole);
     if (currentBackground != d->mBackground) {
@@ -634,32 +864,41 @@
             if (!d->mBackgroundItem) {  
                 d->mItemsChanged = true;
                 d->mBackgroundItem = style()->createPrimitive(HbStyle::P_ItemViewItem_background, this);
+                delete d->mFrame;
+                d->mFrame = 0;
             }
-        } 
-        else if (currentBackground.canConvert<HbFrameBackground>()) {
+        } else if (currentBackground.canConvert<HbFrameBackground>()) {
+            if (!d->mFrame) {
+                d->mItemsChanged = true;
+                d->mFrame = style()->createPrimitive(HbStyle::P_ItemViewItem_frame, this);
+                delete d->mBackgroundItem;
+                d->mBackgroundItem = 0;
+            }
+        } else if (d->mBackgroundItem) {
+            d->mItemsChanged = true;
+            delete d->mBackgroundItem;
+            d->mBackgroundItem = 0;
+        }
+    }
+
+    // frame
+    if (!d->mBackgroundItem) {
+        if (    d->mModelItemType == Hb::ParentItem
+            ||  d->mModelItemType == Hb::SeparatorItem
+            ||  (   d->mModelItemType == Hb::StandardItem
+                &&  (   d->mBackground.canConvert<HbFrameBackground>()
+                    ||  sd->mDefaultFrame.frameGraphicsName().length() > 0    
+                    ||  sd->mDefaultFrame.isNull()))) { 
             if (!d->mFrame) {
                 d->mItemsChanged = true;
                 d->mFrame = style()->createPrimitive(HbStyle::P_ItemViewItem_frame, this);
             }
-            if (d->mBackgroundItem) {
-                d->mItemsChanged = true;
-                delete d->mBackgroundItem;
-                d->mBackgroundItem = 0;
-            }
+        } else if (d->mFrame) {
+            d->mItemsChanged = true;
+            delete d->mFrame;
+            d->mFrame = 0;
         }
-        else {
-            if (d->mBackgroundItem) {
-                d->mItemsChanged = true;
-                delete d->mBackgroundItem;
-                d->mBackgroundItem = 0;
-            }
-        }
-    }
-    
-    if (!d->mFrame) { // frame should always exists
-        d->mItemsChanged = true;
-        d->mFrame = style()->createPrimitive(HbStyle::P_ItemViewItem_frame, this);
-    }
+    } 
 
     GraphicsItemFlags itemFlags = flags();
     Qt::ItemFlags indexFlags = d->mIndex.flags();
@@ -669,12 +908,14 @@
             itemFlags |= QGraphicsItem::ItemIsFocusable;
             setFocusPolicy(sd->mPrototype->focusPolicy());
             setProperty("state", "normal");
+        grabGesture(Qt::TapGesture);
         }
     } else {
         if (itemFlags & QGraphicsItem::ItemIsFocusable) {
             itemFlags &= ~QGraphicsItem::ItemIsFocusable;
             setFocusPolicy(Qt::NoFocus);
             setProperty("state", "disabled");
+        ungrabGesture(Qt::TapGesture);
         }
     }
 
@@ -834,7 +1075,13 @@
             HbEffect::start(this, sd->mItemType, "released");
             HbEffect::start(d->mFocusItem, sd->mItemType + QString("-focus"), "released", this, "_q_animationFinished");
         } else {
-            QCoreApplication::postEvent(this, new QEvent((QEvent::Type)HbAbstractViewItemShared::ViewItemDeferredDeleteEvent));
+            HbEffect::cancel(this, "pressed");
+            HbEffect::start(this, sd->mItemType, "released");
+            if (d->mFocusItem) {
+                HbEffect::cancel(d->mFocusItem, "pressed");
+                HbEffect::start(d->mFocusItem, sd->mItemType + QString("-focus"), "released", this, "_q_animationFinished");
+                QCoreApplication::postEvent(this, new QEvent((QEvent::Type)HbAbstractViewItemShared::ViewItemDeferredDeleteEvent));
+            }
         }
     }
 }
@@ -900,35 +1147,19 @@
     }
 }
 
-
-/*!
-    \reimp
-
-    The default implementation ignores all mouse press events.
-*/
 void HbAbstractViewItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
 {
-    event->ignore();
+    HbWidget::mousePressEvent(event);
 }
 
-/*!
-    \reimp
-
-    The default implementation ignores all mouse move events.
-*/
 void HbAbstractViewItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
 {
-    event->ignore();
+    HbWidget::mouseMoveEvent(event);
 }
 
-/*!
-    \reimp
-
-    The default implementation ignores all mouse release events.
-*/
 void HbAbstractViewItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
 {
-    event->ignore();
+    HbWidget::mouseReleaseEvent(event);
 }
 
 /*!
@@ -955,11 +1186,15 @@
 /*!
     Sets the default frame for standard view items as \a frame.  
     
-    This method will change the used frame for
-    all view items that represent model index with Hb::StandardItem type.
+    This method will change the used frame for all view items that represent model index with Hb::StandardItem type.
+
+    Input parameter with empty but non-null graphicsName string will remove the default frame.
+    Input parameter with null graphicsName string will restore the system default frame.
 
-    Input parameter with empty graphicsName string will remove the frame.
-    Input parameter with null graphicsName string will restore the default frame.
+    This method has not immediate effect, if Qt::BackgroundRole includes HbFrameBackground object. Qt::BackgroundRole of model
+    has higher priority than any other frame type.
+
+    Default frame is system default frame.
 
     \sa defaultFrame
 */
@@ -971,7 +1206,7 @@
         
         int count(sd->mCloneItems.count());
         for (int i = 0; i < count; ++i) {
-            sd->mCloneItems.at(i)->updatePrimitives();
+            sd->mCloneItems.at(i)->updateChildItems();
         }
     }
 }
@@ -987,6 +1222,19 @@
     return sd->mDefaultFrame;
 }
 
+/*!
+    \reimp
+*/
+void HbAbstractViewItem::gestureEvent(QGestureEvent *event)
+{
+    if (event->gesture(Qt::TapGesture)) {
+        Q_D(HbAbstractViewItem);
+        d->tapTriggered(event);
+    } else {
+        HbWidget::gestureEvent(event);
+    }
+}
+
 
 #include "moc_hbabstractviewitem.cpp"
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/itemviews/hbabstractviewitem.h
--- a/src/hbwidgets/itemviews/hbabstractviewitem.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/itemviews/hbabstractviewitem.h	Mon May 03 12:48:33 2010 +0300
@@ -30,6 +30,8 @@
 #include <hbnamespace.h>
 #include <hbeffect.h>
 
+#include <QHash>
+
 QT_BEGIN_NAMESPACE
 class QModelIndex;
 QT_END_NAMESPACE
@@ -45,9 +47,17 @@
     Q_OBJECT
 
     Q_PROPERTY(Hb::ModelItemType modelItemType READ modelItemType)
+    Q_PROPERTY(Qt::CheckState checkState READ checkState WRITE setCheckState)
 
 public:
 
+    enum SelectionAreaType
+    {
+        SingleSelection,
+        MultiSelection,
+        ContiguousSelection
+    };
+
     enum StateKey
     { 
         FocusKey,
@@ -77,9 +87,12 @@
     virtual void receivedFocus();
     virtual void lostFocus();
 
+    virtual QHash<QString, QVariant> transientState() const;
+    virtual void setTransientState(const QHash<QString, QVariant> &state);
+
     virtual QMap<int,QVariant> state() const;
     virtual void setState(const QMap<int,QVariant> &state);
-    virtual bool selectionAreaContains(const QPointF &scenePosition) const;
+    virtual bool selectionAreaContains(const QPointF &position, SelectionAreaType selectionAreaType) const;
 
     virtual QGraphicsItem *primitive(HbStyle::Primitive primitive) const;
 
@@ -97,6 +110,12 @@
 public slots:
     void updatePrimitives();
 
+signals:
+    void pressed(const QPointF &position);
+    void released(const QPointF &position);
+    void activated(const QPointF &position);
+    void longPressed(const QPointF &position);
+
 protected:
 
     HbAbstractViewItem(const HbAbstractViewItem &source);
@@ -106,6 +125,7 @@
     void initStyleOption(HbStyleOptionAbstractViewItem *option) const;
     virtual void polish(HbStyleParameters& params);
 
+    virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value);
     virtual bool event(QEvent *e);
 
     virtual void mousePressEvent(QGraphicsSceneMouseEvent *event);
@@ -116,6 +136,8 @@
 
     virtual void pressStateChanged(bool value, bool animate);
 
+    virtual void gestureEvent(QGestureEvent *event);
+
 private:
     Q_DECLARE_PRIVATE_D( d_ptr, HbAbstractViewItem )
     Q_PRIVATE_SLOT(d_func(), void _q_animationFinished(const HbEffect::EffectStatus &status))
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/itemviews/hbabstractviewitem_p.h
--- a/src/hbwidgets/itemviews/hbabstractviewitem_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/itemviews/hbabstractviewitem_p.h	Mon May 03 12:48:33 2010 +0300
@@ -30,6 +30,7 @@
 #include <hbwidget_p.h>
 #include <hbeffect.h>
 #include <hbframebackground.h>
+#include <hbnamespace.h>
 
 #include <QPersistentModelIndex>
 #include <QPointer>
@@ -39,6 +40,8 @@
 class HbAbstractItemView;
 class QGraphicsItem;
 
+class QGestureEvent;
+
 #define HB_SD(Class) Class##Shared * sd = (Class##Shared *)(d->mSharedData.data())
 #define HB_SDD(Class) Q_D(Class); Class##Shared * sd = (Class##Shared *)(d->mSharedData.data())
 
@@ -49,7 +52,7 @@
         HbAbstractViewItemShared() :
           mPrototype(0),
           mItemView(0),
-          mDefaultFrame("", HbFrameDrawer::Undefined),
+          mDefaultFrame(),
           mItemType("viewitem")
         {
         }
@@ -64,7 +67,9 @@
         static const int ViewItemDeferredDeleteEvent;
 };
 
-class HbAbstractViewItemPrivate : public HbWidgetPrivate
+// Note! Temporary HB_AUTOTEST_EXPORT. Removed when QMAP_INT__ITEM_STATE_DEPRECATED when QMap<int,QVariant> based state item system is removed 
+//#define QMAP_INT__ITEM_STATE_DEPRECATED
+class HB_AUTOTEST_EXPORT HbAbstractViewItemPrivate : public HbWidgetPrivate
 {
     Q_DECLARE_PUBLIC( HbAbstractViewItem )
 
@@ -84,7 +89,7 @@
           mSizeHintPolish(false),
           mPressed(false),
           mFocusItem(0),
-          mMultiSelectionTouchArea(0),
+          mMultiSelectionTouchArea(0),                    
           mSharedData(shared)
         {
             if (!mSharedData) {
@@ -149,10 +154,14 @@
         void _q_animationFinished(const HbEffect::EffectStatus &status);
 
         void repolishCloneItems();
-        void updateCloneItems();
+        void updateCloneItems(bool updateChildItems);
 
         virtual void setInsidePopup(bool insidePopup);
 
+        virtual void tapTriggered(QGestureEvent *event);
+
+        void revealItem();
+public:
         QPersistentModelIndex mIndex;
         bool mFocused;
         
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/itemviews/hbgriditemcontainer_p.cpp
--- a/src/hbwidgets/itemviews/hbgriditemcontainer_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/itemviews/hbgriditemcontainer_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -88,24 +88,32 @@
         return;
 
     int bufferIndex = 0;
-    if (d->mItems.count() != 0) {
-        bufferIndex = qMax(0, index.row() - d->mItems.first()->modelIndex().row());
+    QModelIndex firstInBuffer;
+    int firstInBufferPosition = -1;
+    int indexPosition = d->mItemView->modelIterator()->indexPosition(index);
+    if (!d->mItems.isEmpty()) {
+        firstInBuffer = d->mItems.first()->modelIndex();
+        firstInBufferPosition = d->mItemView->modelIterator()->indexPosition(firstInBuffer);
+        bufferIndex = qMax(0, indexPosition - firstInBufferPosition);
     }
     // inserting new item because of buffer size
-    if (d->mItems.count() == 0
+    if (d->mItems.isEmpty()
         || d->mItems.count() < maxItemCount()) {
         insertItem(bufferIndex, index, animate);
         viewLayout()->invalidate();
     }
     // special case - only for grid, if added item is above the 
     // visible region we need to shift all visible items by one!
-    else if (d->mItems.count() > 0
-        && d->mItems.first()->modelIndex().row() > index.row()) {
+    else if (!d->mItems.isEmpty()
+        && firstInBufferPosition > indexPosition) {
         d->shiftUpItem(animate); // shift up in this case always return something
         viewLayout()->invalidate();
     }
     // new item is in visible range
     else if (bufferIndex < d->mItems.count()) {
+        // new added item comes to buffer - it will be
+        // recycled from last item in buffer (it is also ok
+        // when that last item was invalid)
         HbAbstractViewItem *last = d->mItems.last();
         if (animate) {
             last->setOpacity(0.0);
@@ -160,30 +168,51 @@
         return;
     }
 
+    HbModelIterator *modelIterator = d->mItemView->modelIterator();
     QModelIndex index = startIndex;
     if (!index.isValid()) {
-        index = d->mItemView->model()->index(0, 0);
-        if (!index.isValid())
+        index = modelIterator->nextIndex(QModelIndex());
+        if (!index.isValid()) {
+            // this mean model is empty
             return;
+        }
     }
-    index = d->mItemView->model()->index(
-                d->alignIndexToClosestFirstInRow(index.row()), 0);
+
+    int indexPosition = modelIterator->indexPosition(index);
+    indexPosition = d->alignIndexToClosestFirstInRow(indexPosition);
+    index = modelIterator->index(indexPosition);
 
-    int modelItemsCount = d->mItemView->model()->rowCount();
+    int modelItemsCount = modelIterator->indexCount();
     int itemsCount = d->mItems.count();
-    int diff = index.row() + itemsCount - modelItemsCount;
+    int diff = indexPosition + itemsCount - modelItemsCount;
     if (diff >= d->mItemsPerRow) {
-        diff = modelItemsCount - itemsCount;
-        if (diff % d->mItemsPerRow) diff = diff + d->mItemsPerRow - diff % d->mItemsPerRow;
-        index = d->mItemView->model()->index(diff, 0);
-        if (!index.isValid())
-            index = d->mItemView->model()->index(0, 0);
+        // starting from index do not fill the buffer
+        // so new starting index need to be calculated
+        // to fill the buffer with items
+        int newStartIndex = modelItemsCount - itemsCount;
+        int remainder = newStartIndex % d->mItemsPerRow;;
+        if (remainder) {
+            // move newStartIndex forward to contain
+            // last row and empty items
+            newStartIndex += d->mItemsPerRow - remainder;
+        }
+        index = modelIterator->index(newStartIndex);
+        if (!index.isValid()) {
+            // if invalid get first item from model
+            index = modelIterator->nextIndex(QModelIndex());
+        }
+        indexPosition = modelIterator->indexPosition(index);
+    }
+
+    if (d->mItems.first()->modelIndex() == index) {
+        // container already contain right items
+        return;
     }
 
     int i = 0;
     for (; i < itemsCount && index.isValid(); ++i) {
         setItemModelIndex(d->mItems.at(i), index);
-        index = d->mItemView->modelIterator()->nextIndex(index);
+        index = modelIterator->nextIndex(index);
     }
 
     if (i < itemsCount) {
@@ -191,6 +220,11 @@
             setItemModelIndex(d->mItems.at(i), index);
         }
         if (i < itemsCount) {
+            // somehow model size was change
+            // this is almost impossible do get there -
+            // means that items were removed but view 
+            // was not noticed about that - or setModelIndexes
+            // was call before model has noticed view
             while (i > d->mItems.count()) {
                 d->mItems.removeLast();
             }
@@ -210,18 +244,10 @@
 /*!
     \reimp
 */
-void HbGridItemContainer::viewResized(const QSizeF &size)
+void HbGridItemContainer::viewResized(const QSizeF &)
 {
     Q_D(HbGridItemContainer);
-    if (!(qFuzzyCompare(d->mViewSize.height(), size.height())
-            && qFuzzyCompare(d->mViewSize.width(), size.width()))) {
-        QPointF p = pos();
-        p.setY(p.y() *  size.height() / d->mViewSize.height());
-        p.setX(p.x() * size.width() / d->mViewSize.width());
-        setPos(p);
-        d->mViewSize = size;
-        d->resetBuffer();
-    }
+    d->resetBuffer();
 }
 
 /*!
@@ -250,68 +276,56 @@
 /*!
     \reimp
 */
-
 QPointF HbGridItemContainer::recycleItems(const QPointF &delta)
 {
     Q_D(HbGridItemContainer);
 
-    if (!d->mItemRecycling || d->mItemsPerRow <=0) {
+    if (d->mPrototypes.count() != 1) {
         return delta;
     }
 
-    QRectF viewRect(d->itemBoundingRect(d->mItemView));
-    QSizeF itemsCanvas(layout()->preferredSize());
-    qreal invisibleArea = 0;
+    // current invisible space can be scrolled by base class
+    // recycling need only do the rest
+    const qreal diff = d->getDiffWithoutScrollareaCompensation(delta);
 
-    qreal diff = 0.0;
-    if (Qt::Vertical == d->mScrollDirection) {
-        invisibleArea = itemsCanvas.height() - viewRect.height();
-        diff = pos().y() - delta.y();
-        if ((delta.y() < 0.0 && diff > 0) 
-            || (delta.y() > 0.0 && invisibleArea + diff < 0)) {
-            diff = delta.y();
+    if (diff != 0.0) {
+        HbModelIterator *modelIterator = d->mItemView->modelIterator();
+        qreal result = 0.0;
+        qreal containerSize = (d->mScrollDirection == Qt::Vertical)
+            ? size().height() : size().width();
+        bool doFarJump = false;
+        if (qAbs(diff) > containerSize) {
+            // if huge diff - current buffer does not containt any item that should
+            // be there after jump - because of that use setModelIndexes instead of
+            // recycling items - faster
+            // but it is possible that even if far jump was requested (huge delta) 
+            // it can't be done because of model size and current position (at the end)
+            if (diff > 0) {
+                // scrolling down
+                int indexPos = modelIterator->indexPosition(d->lastValidItemIndex())
+                                + d->mItems.count();
+                doFarJump = (indexPos < modelIterator->indexCount());
+            } else {
+                // scrolling up
+                int indexPos = modelIterator->indexPosition(d->mItems.first()->modelIndex())
+                                - d->mItems.count();
+                doFarJump = (indexPos >= 0);
+            }
         }
-        else {
-            diff = 0.0;   
-        }
-    }
-    else {
-        invisibleArea = itemsCanvas.width() - viewRect.width();
-        diff = pos().x() - delta.x();
-        if ((delta.x() < 0.0 && diff > 0) 
-            || (delta.x() > 0.0 && invisibleArea + diff < 0)) {
-            diff = delta.x();
+        if (doFarJump) {
+            // start calculations for far jump
+            // take back into account real delta (do jump as far as possible
+            // without leaving it for scroll area)
+            result = d->farRecycling(delta);
         }
         else {
-            diff = 0.0;   
-        }
-    }
-
-    if (diff != 0.0) {
-        if (HbAbstractItemViewPrivate::d_ptr(d->mItemView)->mOptions & HbAbstractItemViewPrivate::PanningActive) {
-            // jump is almost in the middle of fetched buffer - in most of cases
-            // after scrolling was stopped panning should be done without fetching 
-            // items
-            // in case when buffer == 1 below lines do not change diff
-            qreal extraDiff = invisibleArea/2 - d->mCachedItemHeight;
-            if (extraDiff < 0.0) {
-                extraDiff = 0.0; // impossible because this mean that bufferSize == 0
-            }
-
-            if (diff < 0.0) {
-                diff -= extraDiff; 
-            }
-            else {
-                diff += extraDiff;
-            }   
+            result = d->recycling(diff);
         }
 
-        qreal result = (d->recycling(diff));
+        QPointF newDelta(Qt::Vertical == d->mScrollDirection
+                ? QPointF(0.0, delta.y() - result) 
+                : QPointF(delta.x() - result, 0.0));
 
-        QPointF newDelta(Qt::Vertical == d->mScrollDirection
-                ?QPointF(0.0, delta.y() - result) 
-                : QPointF(delta.x() - result, 0.0));
-        
         return newDelta;
     }
 
@@ -460,7 +474,7 @@
 {
     Q_D(HbGridItemContainer);
 
-    if (!index.isValid() || d->mItems.count() <= 0)
+    if (!index.isValid() || d->mItems.isEmpty())
         return;
     
     switch (hint) {
@@ -512,6 +526,15 @@
     }
 }
 
+/*!
+    \reimp
+    In grid case items are allways same size
+*/
+void HbGridItemContainer::setUniformItemSizes(bool enable)
+{
+    Q_UNUSED(enable);
+    // d->mUniformItemSizes - allways true
+}
 
 #include "moc_hbgriditemcontainer_p.cpp"
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/itemviews/hbgriditemcontainer_p.h
--- a/src/hbwidgets/itemviews/hbgriditemcontainer_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/itemviews/hbgriditemcontainer_p.h	Mon May 03 12:48:33 2010 +0300
@@ -59,6 +59,7 @@
     virtual int maxItemCount() const;
     void scrollTo(const QModelIndex &index, HbAbstractItemView::ScrollHint hint = HbAbstractItemView::EnsureVisible);
     QModelIndex lastValidItemIndex() const;
+    void setUniformItemSizes(bool enable);
 
 protected:
     HbGridItemContainer( HbGridItemContainerPrivate &dd, QGraphicsItem *parent = 0 );
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/itemviews/hbgriditemcontainer_p_p.cpp
--- a/src/hbwidgets/itemviews/hbgriditemcontainer_p_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/itemviews/hbgriditemcontainer_p_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -33,12 +33,10 @@
 
 HbGridItemContainerPrivate::HbGridItemContainerPrivate()
                              : mLayout(0),
-                             mViewSize(QSizeF()),
                              mMinCount(0),
                              mRowCount(4),
                              mColumnCount(3),
                              mItemsPerRow(3),
-                             mCachedItemHeight(0.0),
                              mScrollDirection(Qt::Vertical),
                              mOldItemsPerRow(0)
 {
@@ -57,23 +55,68 @@
         q, SLOT(layoutAnimationFinished(QGraphicsLayoutItem *, HbGridLayout::AnimationType)));
 
     mItemRecycling = false;
+    mUniformItemSizes = true;
     q->setLayout(mLayout);
     mLayout->setRowCount(mRowCount);
     mLayout->setColumnCount(mColumnCount);
 }
 
+qreal HbGridItemContainerPrivate::getDiffWithoutScrollareaCompensation(const QPointF &delta) const
+{
+    // substract invisible space from delta - part of scrolling that can
+    // be done by scroll area
+    Q_Q(const HbGridItemContainer);
+    const QSizeF containerSize(q->size());
+    const QPointF containerPos(q->pos());
+    qreal diff = 0.0;
+    qreal invisibleArea = 0.0;
+    QSizeF viewSize = mItemView->size();
+    if (Qt::Vertical == mScrollDirection) {
+        if (delta.y() > 0) {
+            // space at the bottom
+            invisibleArea = containerSize.height() - viewSize.height() + containerPos.y();
+            if (invisibleArea < delta.y()) {
+                diff = delta.y() - invisibleArea;
+            }
+        } else {
+            // space at the top
+            invisibleArea = -containerPos.y();
+            if (containerPos.y() > delta.y()) {
+                diff = delta.y() + invisibleArea;
+            }
+        }
+    }
+    else {
+        if (delta.x() > 0) {
+            // space at the right
+            invisibleArea = containerSize.width() - viewSize.width() + containerPos.x();
+            if (invisibleArea < delta.x()) {
+                diff = delta.x() - invisibleArea;
+            }
+        } else {
+            // space at the left
+            invisibleArea = -containerPos.x();
+            if (containerPos.x() > delta.x()) {
+                diff = delta.x() + invisibleArea;
+            }
+        }
+    }
+
+    return diff;
+}
+
 qreal HbGridItemContainerPrivate::recycling(qreal diff)
 {
     qreal result(0.0);
     bool resetLayout(false);
-
+    qreal itemSize = getScrollDirectionItemSize();
     if (diff < 0.0) {
         while (result > diff) {
             HbAbstractViewItem *item = shiftUp(false);
             if (!item) {
                 break;
             }
-            result -= mCachedItemHeight;
+            result -= itemSize;
             resetLayout = true;
         }
     }
@@ -83,7 +126,7 @@
             if (!item) {
                 break;
             }
-            result += mCachedItemHeight;
+            result += itemSize;
             resetLayout = true;
         }
     }
@@ -94,6 +137,47 @@
     return result;
 }
 
+qreal HbGridItemContainerPrivate::farRecycling(const QPointF &delta)
+{
+    const qreal jumpDiff = (Qt::Vertical == mScrollDirection)
+                           ? delta.y() : delta.x();
+    qreal itemSize = getScrollDirectionItemSize();
+    int rowDiff = (int)(jumpDiff / itemSize);
+    QPointF deltaAfterJump = (Qt::Vertical == mScrollDirection)
+                             ? QPointF(delta.x(), delta.y() - (qreal)rowDiff * itemSize)
+                                 : QPointF(delta.x() - (qreal)rowDiff * itemSize, delta.y());
+    // after setModelIndexes will be used it will still be some delta - deltaAfterJump
+    // bottom lines check if those delta can be consumed by scrollArea, if not then
+    // corrections to new index need to be done (otherwise it is possible that scrollArea
+    // will do the rest of scrolling but leave some empty space)
+    qreal diffAfterJump = getDiffWithoutScrollareaCompensation(deltaAfterJump);
+    if (diffAfterJump != 0.0) {
+        // this mean that rest of delta can not be handled by scroll area
+        // so jump one row more
+        if (rowDiff < 0.0) {
+            rowDiff--;
+        } else {
+            rowDiff++;
+        }
+    }
+    QModelIndex currentIndex = mItems.first()->modelIndex();
+    HbModelIterator *modelIterator = mItemView->modelIterator();
+    int jumpIndexPos = modelIterator->indexPosition(currentIndex)
+                       + rowDiff * mItemsPerRow;
+    QModelIndex jumpIndex = modelIterator->index(jumpIndexPos);
+    if (!jumpIndex.isValid()) {
+        // get first or last valid index depending on scroll directions
+        if (rowDiff < 0) { // first index
+            jumpIndex = modelIterator->nextIndex(jumpIndex);
+        } else { // last index
+            jumpIndex = modelIterator->previousIndex(jumpIndex);
+        }
+    }
+    scrollToPositionAtTop(jumpIndex);
+
+    return (qreal)rowDiff * itemSize;
+}
+
 /*!
     First item is moved to the end of the buffer and it gets 
     next item index after last item in buffer.
@@ -103,8 +187,6 @@
 */
 HbAbstractViewItem *HbGridItemContainerPrivate::shiftDownItem(bool doEvenBadIndex, bool animate)
 {
-    if (mItems.count() <= 0) return 0;
-
     Q_Q(HbGridItemContainer);
 
     HbAbstractViewItem *item = 0;
@@ -193,8 +275,6 @@
 */
 HbAbstractViewItem *HbGridItemContainerPrivate::shiftUpItem(bool animate)
 {
-    if (mItems.count() <= 0) return 0;
-
     Q_Q(HbGridItemContainer);
 
     HbAbstractViewItem *firstItem = mItems.first();
@@ -232,16 +312,15 @@
 */
 void HbGridItemContainerPrivate::resetBuffer()
 {
-    if(!mViewSize.isValid() || !mItemView || !mItemView->model()) {
+    if(!mItemView || !mItemView->model()) {
         return;
     }
     mMinCount = 0;
     Q_ASSERT(mLayout);
-    mLayout->setSize(mViewSize, mMinCount);
+    QRectF viewRect = itemBoundingRect(mItemView);
+    mLayout->setSize(viewRect.size(), mMinCount);
     mLayout->invalidate();
     QSizeF itemSize = mLayout->effectiveSizeHint(Qt::MinimumSize);
-    mCachedItemHeight = (Qt::Vertical == mScrollDirection)
-        ? itemSize.height() : itemSize.width();
     mItemsPerRow = (Qt::Vertical == mScrollDirection)
         ? mLayout->columnCount() : mLayout->rowCount();
     mMinCount += mBufferSize * mItemsPerRow;
@@ -300,13 +379,14 @@
         QRectF viewRect(itemBoundingRect(mItemView));
         QSizeF itemsCanvas(q->layout()->preferredSize());
         QPointF pos = q->pos();
+        qreal itemSize = getScrollDirectionItemSize();
         if (Qt::Vertical == mScrollDirection) {
-            pos.setY(q->pos().y() - mCachedItemHeight); 
+            pos.setY(q->pos().y() - itemSize); 
             if (pos.y() < viewRect.height() - itemsCanvas.height()) {
                 pos.setY(viewRect.height() - itemsCanvas.height()); 
             }
         } else {
-            pos.setX(q->pos().x() - mCachedItemHeight);
+            pos.setX(q->pos().x() - itemSize);
             if (pos.x() < viewRect.width() - itemsCanvas.width()) {
                 pos.setX(viewRect.width() - itemsCanvas.width()); 
             }
@@ -346,15 +426,17 @@
 void HbGridItemContainerPrivate::scrollToPositionAtBottom(const QModelIndex &index)
 {
     Q_Q(HbGridItemContainer);
-    q->setModelIndexes(mItemView->model()->index(
-        index.row() - mItems.count() + mItemsPerRow, 0));
+    HbModelIterator *modelIterator = mItemView->modelIterator();
+    q->setModelIndexes(modelIterator->index(
+            modelIterator->indexPosition(index) - mItems.count() + mItemsPerRow));
 }
 
 void HbGridItemContainerPrivate::scrollToPositionAtCenter(const QModelIndex &index)
 {
     Q_Q(HbGridItemContainer);
-    q->setModelIndexes(mItemView->model()->index(
-            index.row() - mItems.count()/2, 0));
+    HbModelIterator *modelIterator = mItemView->modelIterator();
+    q->setModelIndexes(modelIterator->index(
+            modelIterator->indexPosition(index)- mItems.count()/2));
 }
 
 QModelIndex HbGridItemContainerPrivate::lastValidItemIndex() const
@@ -362,7 +444,7 @@
     int lastIndex = mItems.count() - 1;
     // it always find some valid item - buffer should contain
     // some items
-    while (!mItems[lastIndex]->modelIndex().isValid()) {
+    while(!mItems[lastIndex]->modelIndex().isValid()) {
         --lastIndex;
         if (lastIndex < 0) {
             return QModelIndex();
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/itemviews/hbgriditemcontainer_p_p.h
--- a/src/hbwidgets/itemviews/hbgriditemcontainer_p_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/itemviews/hbgriditemcontainer_p_p.h	Mon May 03 12:48:33 2010 +0300
@@ -41,13 +41,17 @@
     HbGridItemContainerPrivate();
     virtual ~HbGridItemContainerPrivate();
     void init();
+    qreal getDiffWithoutScrollareaCompensation(const QPointF &delta) const;
+    qreal recycling(qreal diff);
+    qreal farRecycling(const QPointF &delta);
     HbAbstractViewItem *shiftDownItem(bool doEvenBadIndex, bool animate);
     bool shiftDownItem(int pos, bool animate);
     HbAbstractViewItem *shiftDown(bool animate);
     HbAbstractViewItem *shiftUpItem(bool animate);
     HbAbstractViewItem *shiftUp(bool animate);
-    qreal recycling(qreal diff);
+
     void resetBuffer();
+    inline qreal getScrollDirectionItemSize();
     void removeItem(const QModelIndex &index, bool animate);
     void scrollToEnsureVisible(const QModelIndex &index);
     void scrollToPositionAtTop(const QModelIndex &index);
@@ -64,12 +68,10 @@
     int mapToLayoutIndex(int index) const;
 
     HbGridLayout *mLayout;
-    QSizeF mViewSize;
     mutable int mMinCount;
     mutable int mRowCount;
     mutable int mColumnCount;
     mutable int mItemsPerRow;
-    qreal mCachedItemHeight;
     Qt::Orientations mScrollDirection;
     // used by updateItemBuffer to obtain what change and what kind of update is needed
     int mOldItemsPerRow;
@@ -77,4 +79,11 @@
     QList< QPair<HbAbstractViewItem *, int> > mAnimatedItems;
 };
 
+qreal HbGridItemContainerPrivate::getScrollDirectionItemSize()
+{
+    // return item size depending on scrolling direction
+    return (mScrollDirection == Qt::Vertical) ?
+        mLayout->effectiveSizeHint(Qt::MinimumSize).height() 
+        : mLayout->effectiveSizeHint(Qt::MinimumSize).width();
+}
 #endif /*HBGRIDITEMCONTAINER_P_P_H*/
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/itemviews/hbgridlayout_p.h
--- a/src/hbwidgets/itemviews/hbgridlayout_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/itemviews/hbgridlayout_p.h	Mon May 03 12:48:33 2010 +0300
@@ -41,7 +41,7 @@
     Q_ENUMS(layoutDirection)
     Q_INTERFACES(QGraphicsLayout)
 
-    Q_PROPERTY(int spacing READ spacing WRITE setSpacing)
+    Q_PROPERTY(qreal spacing READ spacing WRITE setSpacing)
 
 public:
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/itemviews/hbgridlayout_p_p.h
--- a/src/hbwidgets/itemviews/hbgridlayout_p_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/itemviews/hbgridlayout_p_p.h	Mon May 03 12:48:33 2010 +0300
@@ -45,7 +45,7 @@
         
         qreal originalM31;
         qreal originalM32;
-        int originalZValue;
+        qreal originalZValue;
         
         HbGridLayout::AnimationType type;
         QGraphicsLayoutItem *startItem;
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/itemviews/hbgridview.cpp
--- a/src/hbwidgets/itemviews/hbgridview.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/itemviews/hbgridview.cpp	Mon May 03 12:48:33 2010 +0300
@@ -64,7 +64,12 @@
   See also  HbAbstractItemView,HbAbstractViewitem,HbGridViewItem,HbScrollArea
  */
 
-     
+/*!
+ \fn void HbGridView::setUniformItemSizes(bool enabled) is public from HbAbstractItemView but for HbGridView
+ Calling this method make no sense - in grid case it is reimplemented and do not change
+ anything (items are always same size).
+*/
+
 /*!
  Constructs a new HbGridView with \a parent.
  */
@@ -270,7 +275,8 @@
     d->mContainer->setPos(0,0);
     d->itemContainer()->orientationChanged(newOrientation);
 
-    scrollTo(d->mVisibleIndex, HbAbstractItemView::PositionAtCenter);
+    // abstract part is enought - container update buffer
+    HbAbstractItemView::scrollTo(d->mVisibleIndex, HbAbstractItemView::PositionAtCenter);
 
     d->mVisibleIndex = QModelIndex();
 }
@@ -376,7 +382,8 @@
     d->mContainer->setPos(0,0);
     d->itemContainer()->scrollDirectionChanged(scrollDirection);
 
-    scrollTo(d->mVisibleIndex, HbAbstractItemView::PositionAtCenter);
+    // abstract part is enought - container update buffer
+    HbAbstractItemView::scrollTo(d->mVisibleIndex, HbAbstractItemView::PositionAtCenter);
 
     d->mVisibleIndex = QModelIndex();
 }
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/itemviews/hbgridview_p.cpp
--- a/src/hbwidgets/itemviews/hbgridview_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/itemviews/hbgridview_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -25,7 +25,6 @@
 #include <hbgridview_p.h>
 #include <hbgridlayout_p.h>
 #include <hbgriditemcontainer_p.h>
-#include <hbgridviewitem_p.h>
 
 #include <hbgesturefilter.h>
 #include <hbgridviewitem.h>
@@ -36,7 +35,6 @@
 #include <QDebug>
 #include <QGraphicsView>
 
-
 const QString KDefaultLayoutOption = "default";
 
 HbGridViewPrivate::HbGridViewPrivate() : 
@@ -52,14 +50,8 @@
 void HbGridViewPrivate::init()
 {
     Q_Q(HbGridView);
-    q->setClampingStyle(q->BounceBackClamping);
-    q->setScrollingStyle(q->PanOrFlick);
-    q->setVerticalScrollBarPolicy(HbScrollArea::ScrollBarAlwaysOff);
-    q->setHorizontalScrollBarPolicy(HbScrollArea::ScrollBarAlwaysOff);
-    q->setFrictionEnabled(false);
-    q->setFlag(QGraphicsItem::ItemClipsToShape);
-    QObject::connect(q, SIGNAL(scrollDirectionsChanged(Qt::Orientations)),
-                      q, SLOT(scrollDirectionChanged(Qt::Orientations)));
+    q->connect(q, SIGNAL(scrollDirectionsChanged(Qt::Orientations)),
+               q, SLOT(scrollDirectionChanged(Qt::Orientations)));
     mLayoutOptionName = KDefaultLayoutOption;
 }
 
@@ -125,6 +117,44 @@
     }
 }
 
+qreal HbGridViewPrivate::calculateScrollBarPos() const
+{
+    // calculate thumb size and position
+    Q_Q(const HbGridView);
+
+    qreal thumbPos = 0.0;
+    int columnCount = getScrollDirectionColumnCount();
+    int rowCount = getScrollDirectionRowCount();
+    qreal containerPos = getScrollDirectionContainerPos();
+    qreal itemSize = getScrollDirectionItemSize();
+
+    // add coulmnCount-1 to indexCount to get remainder included in result (rounding up)
+    int modelRowCount = (mModelIterator->indexCount() + columnCount - 1) / columnCount;
+    modelRowCount -= rowCount;
+    QModelIndex firstItem = mContainer->items().first()->modelIndex();
+    qreal firstVisibleRow = (qreal)(q->modelIterator()->indexPosition(firstItem)) / columnCount;
+    firstVisibleRow += -containerPos / itemSize; // applying container pos to get trully visible row 
+    thumbPos = firstVisibleRow / (qreal)modelRowCount;
+    thumbPos = qBound((qreal)0.0, thumbPos, (qreal)1.0);
+
+    return thumbPos;
+}
+
+qreal HbGridViewPrivate::calculateScrollBarThumbSize() const
+{
+    // calculate thumb size and position
+    qreal thumbSize = 0.0;
+    int columnCount = getScrollDirectionColumnCount();
+    int rowCount = getScrollDirectionRowCount();
+
+    // add coulmnCount-1 to indexCount to get remainder included in result (rounding up)
+    int modelRowCount = (mModelIterator->indexCount() + columnCount - 1) / columnCount;
+    thumbSize = (qreal)rowCount / (qreal)modelRowCount;
+    thumbSize = qBound((qreal)0.0, thumbSize, (qreal)1.0);
+
+    return thumbSize;
+}
+
 /*!
     Overwrites the default scroll area scrollbar updating algorithm when
     recycling is used. On recycling the scrollbar position & size is calculated
@@ -132,136 +162,41 @@
 */
 void HbGridViewPrivate::updateScrollBar(Qt::Orientation orientation)
 {
-    if (!mContainer->itemRecycling()
-        || mContainer->itemPrototypes().count() != 1 
-        || mContainer->items().count() == 0) {
+    if (!handleScrollBar(orientation)) {
         HbScrollAreaPrivate::updateScrollBar(orientation);
     } else {
         if (mContainer->layout() && !mContainer->layout()->isActivated()) {
             mContainer->layout()->activate();
         }
-        if (orientation == Qt::Vertical) {
-            updateVerticalScrollBar();
-        } else {
-            updateHorizontalScrollBar();
-        }
-    }
-} 
 
-void HbGridViewPrivate::updateHorizontalScrollBar()
-{    
-    Q_Q(const HbGridView);
-    
-    HbAbstractViewItem *firstItem = mContainer->items().first();
-    qreal uniformItemWidth = firstItem->size().width();
-
-    int rowCount = q->rowCount();
-    int indexCount = mModelIterator->indexCount();
-
-    int virtualColumnCount = indexCount / rowCount;
-    int remainder = indexCount % rowCount;
-    if (remainder != 0) {
-        virtualColumnCount++;
-    }
-
-    int firstItemModelRowNumber = mModelIterator->indexPosition(firstItem->modelIndex());
-    int firstBufferItemRowNumber = firstItemModelRowNumber / rowCount; 
-
-    QRectF itemRect = itemBoundingRect(firstItem);
-    qreal realLeftBoundary = itemRect.left();   
-    qreal virtualLeftBoundary = realLeftBoundary - (firstBufferItemRowNumber*uniformItemWidth); 
-
-    qreal containerVirtualWidth = uniformItemWidth *  virtualColumnCount;
-    qreal thumbPosition(0);
-
-    // The scrollbar "thumb" position is the current position of the contents widget divided
-    // by the difference between the width of the contents widget and the width of the scroll area.
-    // This formula assumes that the "thumb" of the the scroll bar is sized proportionately to
-    // the width of the contents widget.
-    qreal hiddenVirtualWidth = containerVirtualWidth - q->boundingRect().width();
-    if (hiddenVirtualWidth != 0) {
-        thumbPosition = (-virtualLeftBoundary)  / hiddenVirtualWidth;
-    }
-
-    if (thumbPosition < 0.0)
-        thumbPosition = 0.0;
-    else if (thumbPosition > 1.0)
-        thumbPosition = 1.0;
-
-    if (mHorizontalScrollBar) {
-        if (containerVirtualWidth!=0) {
-            mHorizontalScrollBar->setPageSize(qBound ( (qreal)0.0,
-                                     q->boundingRect().width() / containerVirtualWidth,
-                                      (qreal)1.0));
-        }
-        mHorizontalScrollBar->setValue(thumbPosition); 
+        qreal thumbPos = calculateScrollBarPos();
+        HbScrollBar *scrollBar = getScrollDirectionScrollBar();
+        scrollBar->setValue(thumbPos);
     }
 }
 
-void HbGridViewPrivate::updateVerticalScrollBar()
+/*!
+    \reimp
+*/
+void HbGridViewPrivate::setScrollBarMetrics(Qt::Orientation orientation)
 {
-    Q_Q(const HbGridView);
-
-    HbAbstractViewItem *firstItem = mContainer->items().first();
-    qreal uniformItemHeight = firstItem->size().height();
-
-    int columnCount = q->columnCount();
-    int indexCount = mModelIterator->indexCount();
-
-    int virtualRowCount = indexCount / columnCount;
-    int remainder = indexCount % columnCount;
-    if (remainder != 0) {  //even one item requires the whole row
-        virtualRowCount++;
-    }
-
-    int firstItemModelRowNumber = mModelIterator->indexPosition(firstItem->modelIndex());
-    int firstBufferItemRowNumber = firstItemModelRowNumber / columnCount; 
-
-    QRectF itemRect = itemBoundingRect(firstItem);
-    qreal realTopBoundary = itemRect.top();
-    qreal virtualTopBoundary = realTopBoundary - (firstBufferItemRowNumber*uniformItemHeight); 
+    if (!handleScrollBar(orientation)) {
+        HbScrollAreaPrivate::setScrollBarMetrics(orientation);
+    } else {
+        if (mContainer->layout() && !mContainer->layout()->isActivated()) {
+            mContainer->layout()->activate();
+        }
 
-    qreal containerVirtualHeight = uniformItemHeight *  virtualRowCount;
-    qreal thumbPosition = 0;
-
-    // The scrollbar "thumb" position is the current position of the contents widget divided
-    // by the difference between the height of the contents widget and the height of the scroll area.
-    // This formula assumes that the "thumb" of the the scroll bar is sized proportionately to
-    // the height of the contents widget.
-    qreal hiddenVirtualHeight = containerVirtualHeight - q->boundingRect().height();
-    if (hiddenVirtualHeight != 0) {
-        thumbPosition = (-virtualTopBoundary) / hiddenVirtualHeight;
-    } 
-
-    if (thumbPosition < 0.0)
-        thumbPosition = 0.0;
-    else if (thumbPosition > 1.0)
-        thumbPosition = 1.0;
-
-    if (mVerticalScrollBar) {
-        if (containerVirtualHeight!=0) {
-            mVerticalScrollBar->setPageSize(qBound ( (qreal)0.0,
-                                     q->boundingRect().height() / containerVirtualHeight,
-                                      (qreal)1.0));
-        }
-        mVerticalScrollBar->setValue(thumbPosition); 
-    }    
+        qreal thumbSize = calculateScrollBarThumbSize();
+        HbScrollBar *scrollBar = getScrollDirectionScrollBar();
+        scrollBar->setPageSize(thumbSize);
+    }
 }
 
-void HbGridViewPrivate::setScrollBarMetrics(Qt::Orientation orientation)
-{   
-    if (!mContainer->itemRecycling()
-        || mContainer->itemPrototypes().count() != 1 
-        || mContainer->items().count() == 0)  {
-        HbScrollAreaPrivate::setScrollBarMetrics(orientation);
-    } else {
-        //We just make sure that the base clas is not called
-        //It set the page size wrongly
-        updateScrollBar(orientation); 
-    }
-} 
-
-void HbGridViewPrivate::setContentPosition( qreal value, Qt::Orientation orientation, bool animate )
+/*!
+    \reimp
+*/
+void HbGridViewPrivate::setContentPosition(qreal value, Qt::Orientation orientation, bool animate)
 {
     Q_Q( HbGridView );
 
@@ -270,78 +205,22 @@
             mContainer->layout()->activate();
         }
 
-        qreal filteredValue = (int)(value * 1000) / 1000.0;        
-
-        HbAbstractViewItem *firstItem = mContainer->items().first();
-
-        qreal uniformItemDimension = 0; // width or height of item
-        qreal dimension = 0; // width or height of view
-        int dimensionCount = 0; // rowcount or columncount
-        qreal posInBeginning = 0; // top or left position of first item in buffer
+        int columnCount = getScrollDirectionColumnCount();
+        int rowCount = getScrollDirectionRowCount();
+        int modelRowCount = (mModelIterator->indexCount() + columnCount - 1) / columnCount;
+        modelRowCount -= rowCount;
+        qreal thumbPos = calculateScrollBarPos();
+        qreal itemSize = getScrollDirectionItemSize();
+        qreal diff = (value - thumbPos) * itemSize * modelRowCount;
 
         if (orientation == Qt::Vertical) {
-            posInBeginning = itemBoundingRect(firstItem).top();
-            uniformItemDimension = firstItem->size().height();
-            dimension = q->boundingRect().height();
-            dimensionCount = q->columnCount();
+            q->scrollByAmount(QPointF(0, diff));
         } else {
-            posInBeginning = itemBoundingRect(firstItem).left();
-            uniformItemDimension = firstItem->size().width();
-            dimension = q->boundingRect().width();
-            dimensionCount = q->rowCount();
-        }
-
-        int indexCount = mModelIterator->indexCount();
-        int virtualCount = indexCount / dimensionCount; // amount of rows/columns in "complete" grid
-        int remainder = indexCount % dimensionCount;
-        if (remainder != 0) {  //even one item requires the whole row
-            virtualCount++;
-        }
-
-        qreal target = virtualCount * filteredValue;  // target position in "complete" grid (in rows/columns)
-        int virtualItemCount = virtualCount * dimensionCount; // item count when all the "empty" items are also counted in
-        qreal posToBeInView = dimension * filteredValue; 
-
-        QModelIndex newIndex = mModelIterator->index(qMin((int)(virtualItemCount * filteredValue), indexCount - 1));
-
-        if (!mContainer->itemByIndex(newIndex)) {
-            //jump
-            int itemsInBuffer = mContainer->items().count();
-
-            int newBufferStartItem = (int)(virtualItemCount * filteredValue) - qMin(itemsInBuffer - 1, (int)(itemsInBuffer * filteredValue));
-            mContainer->setModelIndexes(mModelIterator->index(newBufferStartItem));
-            int newBufferStartRow = newBufferStartItem / dimensionCount;
-
-            qreal posToBeInBuffer = ((target - newBufferStartRow) * uniformItemDimension);
-
-            qreal posToBe = posToBeInView - posToBeInBuffer;
-
-            if (orientation == Qt::Vertical) {
-                HbScrollAreaPrivate::setContentPosition(QPointF(0, posToBe)); 
-            } else {
-                HbScrollAreaPrivate::setContentPosition(QPointF(posToBe, 0)); 
-            }
-        } else {
-            // scroll
-            int firstItemRow = mContainer->items().first()->modelIndex().row() / dimensionCount;
-
-            qreal posToBeInBuffer = (target - firstItemRow) * uniformItemDimension;
-            
-            qreal posToBe = posToBeInView - posToBeInBuffer;
-
-            if (orientation == Qt::Vertical) {
-                q->scrollByAmount(QPointF(0, posInBeginning - posToBe));
-            } else {
-                q->scrollByAmount(QPointF(posInBeginning - posToBe, 0));
-            }
+            q->scrollByAmount(QPointF(diff, 0));
         }
     } else {
         HbScrollAreaPrivate::setContentPosition(value, orientation, animate);
     }
-       
-    if (animate) {
-        updateScrollBar(orientation);
-    }
 }
 
 QModelIndex HbGridViewPrivate::indexInTheCenter(Qt::Orientations scrollDirection) const
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/itemviews/hbgridview_p.h
--- a/src/hbwidgets/itemviews/hbgridview_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/itemviews/hbgridview_p.h	Mon May 03 12:48:33 2010 +0300
@@ -28,6 +28,7 @@
 #include <hbabstractitemview_p.h>
 #include <hbgriditemcontainer_p.h>
 #include <hbgridview.h>
+#include <hbgridviewitem_p.h>
 
 class HbGridViewParams;
 class HbGridViewPrivate: public HbAbstractItemViewPrivate
@@ -43,17 +44,20 @@
 
     bool visible(HbAbstractViewItem* item, bool fullyVisible = true) const;
 
-    inline HbGridItemContainer *itemContainer() const
-    {
-        return static_cast<HbGridItemContainer *> (mContainer);
-    }
+    inline HbGridItemContainer *itemContainer() const;
 
+    qreal calculateScrollBarPos() const;
+    qreal calculateScrollBarThumbSize() const;
     void updateScrollBar(Qt::Orientation orientation);
-    void updateVerticalScrollBar();
-    void updateHorizontalScrollBar();
     void setScrollBarMetrics(Qt::Orientation orientation);
 
-    void setContentPosition( qreal value, Qt::Orientation orientation, bool animate );
+    void setContentPosition(qreal value, Qt::Orientation orientation, bool animate);
+
+    inline int getScrollDirectionColumnCount() const;
+    inline int getScrollDirectionRowCount() const;
+    inline HbScrollBar *getScrollDirectionScrollBar() const;
+    inline qreal getScrollDirectionContainerPos() const;
+    inline qreal getScrollDirectionItemSize() const;
 
     inline QModelIndex indexInTheCenter() const;
     QModelIndex indexInTheCenter(Qt::Orientations scrollDirection) const;
@@ -75,8 +79,44 @@
     }
 
     friend class HbGridViewItem;
+};
 
-};
+inline HbGridItemContainer *HbGridViewPrivate::itemContainer() const
+{
+    return qobject_cast<HbGridItemContainer *> (mContainer);
+}
+
+inline int HbGridViewPrivate::getScrollDirectionColumnCount() const
+{
+    return (mScrollDirections == Qt::Vertical) ?
+        itemContainer()->columnCount() : itemContainer()->rowCount();
+}
+
+inline int HbGridViewPrivate::getScrollDirectionRowCount() const
+{
+    return (mScrollDirections == Qt::Vertical) ?
+        itemContainer()->rowCount() : itemContainer()->columnCount();
+}
+
+inline HbScrollBar *HbGridViewPrivate::getScrollDirectionScrollBar() const
+{
+    return (mScrollDirections == Qt::Vertical) ?
+        mVerticalScrollBar : mHorizontalScrollBar;
+}
+
+inline qreal HbGridViewPrivate::getScrollDirectionContainerPos() const
+{
+    return (mScrollDirections == Qt::Vertical) ?
+        mContainer->pos().y() : mContainer->pos().x();
+}
+
+inline qreal HbGridViewPrivate::getScrollDirectionItemSize() const
+{
+    // caller responsibility to check if container has any item
+    return (mScrollDirections == Qt::Vertical) ?
+        mContainer->items().first()->size().height()
+        : mContainer->items().first()->size().width();
+}
 
 QModelIndex HbGridViewPrivate::indexInTheCenter() const
 {
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/itemviews/hbgridviewitem.cpp
--- a/src/hbwidgets/itemviews/hbgridviewitem.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/itemviews/hbgridviewitem.cpp	Mon May 03 12:48:33 2010 +0300
@@ -178,6 +178,10 @@
 }
 
 /*!
+
+    \deprecated HbGridViewItem::primitive(HbStyle::Primitive)
+        is deprecated.
+
   Provides access to primitives of HbGridViewItem. 
   \param primitive is the type of the requested primitive. The available primitives are 
   \c P_GridViewItem_text, \c P_GridViewItem_icon, \c P_ItemViewItem_checkbox and
@@ -198,7 +202,7 @@
 }
 
 /*!
-    \deprecated QRectF HbGridViewItem::contiguousSelectionArea() const
+    \deprecated HbGridViewItem::contiguousSelectionArea() const
         is deprecated.
 
     \reimp
@@ -213,14 +217,13 @@
 /*!
  \reimp
  */
-bool HbGridViewItem::selectionAreaContains(const QPointF &scenePosition) const
+bool HbGridViewItem::selectionAreaContains(const QPointF &position, 
+                                       SelectionAreaType selectionAreaType) const
 {
-    HB_SDD(const HbAbstractViewItem);
-    if (    sd->mItemView
-        &&  sd->mItemView->selectionMode() == HbAbstractItemView::ContiguousSelection) {
+    if (selectionAreaType == ContiguousSelection ) {
         return false;
     } 
-    return HbAbstractViewItem::selectionAreaContains(scenePosition);
+    return HbAbstractViewItem::selectionAreaContains(position, selectionAreaType);
 }
 
 /*!
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/itemviews/hbgridviewitem.h
--- a/src/hbwidgets/itemviews/hbgridviewitem.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/itemviews/hbgridviewitem.h	Mon May 03 12:48:33 2010 +0300
@@ -53,7 +53,7 @@
     QGraphicsItem *primitive(HbStyle::Primitive primitive) const;
 
     virtual QRectF contiguousSelectionArea() const;
-    virtual bool selectionAreaContains(const QPointF &scenePosition) const;
+    virtual bool selectionAreaContains(const QPointF &position, SelectionAreaType selectionAreaType) const;
 
 public slots:
     void updatePrimitives();
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/itemviews/hbindexfeedback.cpp
--- a/src/hbwidgets/itemviews/hbindexfeedback.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/itemviews/hbindexfeedback.cpp	Mon May 03 12:48:33 2010 +0300
@@ -237,6 +237,10 @@
 }
 
 /*!
+
+    \deprecated HbIndexFeedback::primitive(HbStyle::Primitive)
+        is deprecated.
+
     Returns the primitives used in HbIndexFeedback.
 
     \param primitive The primitive type requested.
@@ -351,23 +355,23 @@
         case IndexFeedbackSingleCharacter:
             {
                 fontSpec = HbFontSpec(HbFontSpec::Primary);
-                fontSpec.setTextPaneHeight(d->textHeight());
+                fontSpec.setTextHeight(d->textHeight());
             }
             break;
             
         case IndexFeedbackThreeCharacter:
             {
                 fontSpec = HbFontSpec(HbFontSpec::Primary);
-                fontSpec.setTextPaneHeight(d->textHeight());
+                fontSpec.setTextHeight(d->textHeight());
             }
             break;
 
         case IndexFeedbackString:
             {
                 fontSpec = HbFontSpec(HbFontSpec::Primary);
-                qreal textPaneHeight = 0;
-                style()->parameter(QLatin1String("hb-param-text-height-primary"), textPaneHeight);
-                fontSpec.setTextPaneHeight( textPaneHeight );
+                qreal textHeight = 0;
+                style()->parameter(QLatin1String("hb-param-text-height-primary"), textHeight);
+                fontSpec.setTextHeight( textHeight );
             }
             break;
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/itemviews/hbindexfeedback_p.cpp
--- a/src/hbwidgets/itemviews/hbindexfeedback_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/itemviews/hbindexfeedback_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -164,7 +164,7 @@
                 updatePrimitives();
             }
 
-            if (mTextItem->opacity() == 0.0) {
+            if (mTextItem && mTextItem->opacity() == 0.0) {
                 HbEffect::start(mPopupItemList, HB_INDEXFEEDBACK_TYPE, EFFECT_IFAPPEAR);
             }
             if (mTextItem) {
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/itemviews/hblistitemcontainer_p.cpp
--- a/src/hbwidgets/itemviews/hblistitemcontainer_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/itemviews/hblistitemcontainer_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -30,7 +30,6 @@
 #include "hbabstractitemcontainer.h"
 #include "hbabstractitemview.h"
 #include "hblistviewitem.h"
-#include "hblistview.h"
 #include "hbmodeliterator.h"
 
 #include <qmath.h>
@@ -75,15 +74,15 @@
     if (nextIndex.isValid()) {
         item = mItems.takeFirst();
 
-        q->itemRemoved(item);
+        delta.setY(delta.y() - item->size().height());
 
-        delta.setY(delta.y() - item->size().height());
+        q->itemRemoved(item);
 
         mItems.append(item);
 
-        q->setItemModelIndex(item, nextIndex);
+        q->itemAdded(mItems.count() - 1, item);
 
-        q->itemAdded(mItems.count() - 1, item);
+        q->setItemModelIndex(item, nextIndex);
     }
 
     return item;
@@ -109,8 +108,10 @@
 
         mItems.insert(0, item);
 
+        q->itemAdded(0, item);
+
         q->setItemModelIndex(item, previousIndex);
-        
+
         qreal itemHeight=0;
         if (q->uniformItemSizes()) {
             itemHeight = mItems.last()->preferredHeight();
@@ -119,17 +120,16 @@
             //The sizehint of the item is dirty.
             itemHeight = item->preferredHeight();
         }
-        
         delta.setY(delta.y() + itemHeight);
+    }
 
-        q->itemAdded(0, item);
-    }
     return item;
 }
 
 bool HbListItemContainerPrivate::intoContainerBuffer(const QModelIndex &index) const
 {   
-    if (mItems.first()->modelIndex().row() <= index.row()   
+    if (!mItems.isEmpty() 
+        && mItems.first()->modelIndex().row() <= index.row()   
         && mItems.last()->modelIndex().row() >= index.row()){
         return true;
     } else {
@@ -142,16 +142,30 @@
     return qMax(0, index.row() - mItems.first()->modelIndex().row());
 }
 
+qreal HbListItemContainerPrivate::itemHeight() const
+{
+    qreal minHeight = 0.0;
+    if (mItems.count() > 0) {
+        minHeight = mLayout->sizeHint(Qt::PreferredSize).height() / mItems.count();
+    }
+
+    if (minHeight == 0.0) {
+        minHeight = getSmallestItemHeight();
+    }
+
+    return minHeight;
+}
+
 qreal HbListItemContainerPrivate::getSmallestItemHeight() const
 {
     Q_Q(const HbListItemContainer);
 
-    qreal minHeight = 0;
+    qreal minHeight = 0.0;
     if (mItems.count() > 0) {
         minHeight = mLayout->smallestItemHeight();
     }
 
-    if (minHeight == 0) {
+    if (minHeight == 0.0) {
         QModelIndex index;
         while (mItems.isEmpty()) {
             // in practise following conditions must apply: itemview is empty and scrollTo() has been called.
@@ -175,6 +189,21 @@
     return minHeight;
 }
 
+int HbListItemContainerPrivate::mapToLayoutIndex(int index) const
+{
+    int layoutIndex = index;
+
+    int itemCount = mAnimatedItems.count();
+    for (int i = 0; i < itemCount; ++i) {
+        QPair<HbAbstractViewItem *, int> animatedItem = mAnimatedItems.at(i);
+        if (animatedItem.second <= index) {
+            layoutIndex++;
+        }
+    }
+
+    return layoutIndex;
+}
+
 HbListItemContainer::HbListItemContainer(QGraphicsItem *parent) :
     HbAbstractItemContainer(*new HbListItemContainerPrivate, parent)
 {
@@ -203,15 +232,36 @@
 /*!
     \reimp
 */
+void HbListItemContainer::removeItem(const QModelIndex &index, bool animate)
+{
+    if (animate) {
+        Q_D(HbListItemContainer);
+
+        int itemCount = d->mItems.count();
+        HbAbstractViewItem *item = 0;
+        for (int i = 0; i < itemCount; ++i) {
+            item = d->mItems.at(i);
+            if (item->modelIndex() == index) {
+                QPair<HbAbstractViewItem *, int> pair(item, i);
+                d->mAnimatedItems.append(pair);
+            }
+        }
+
+        if (!item) {
+            return;
+        }
+    }
+
+    HbAbstractItemContainer::removeItem(index, animate);
+}
+
+/*!
+    \reimp
+*/
 void HbListItemContainer::itemRemoved( HbAbstractViewItem *item, bool animate )
 {
     Q_D(HbListItemContainer);
-
-    if (static_cast<HbListView *>(d->mItemView)->arrangeMode()) {
-        d->mLayout->removeItem(item, false);
-    } else {
-        d->mLayout->removeItem(item, animate);
-    }
+    d->mLayout->removeItem(item, animate);
 }
 
 /*!
@@ -220,13 +270,7 @@
 void HbListItemContainer::itemAdded(int index, HbAbstractViewItem *item, bool animate)
 {
     Q_D(HbListItemContainer);
-
-    if (static_cast<HbListView *>(d->mItemView)->arrangeMode()) {
-        d->mLayout->insertItem(index,item, false);
-    } else {
-        d->mLayout->insertItem(index,item, animate);
-    }
-
+    d->mLayout->insertItem(d->mapToLayoutIndex(index),item, animate);
 }
 
 /*!
@@ -234,8 +278,6 @@
 */
 void HbListItemContainer::viewResized(const QSizeF &viewSize)
 {
-//    Q_D(HbListItemContainer);
-    //d->mLayout->setPreferredWidth(size.width());
     QSizeF newSize = size();
     newSize.setWidth( viewSize.width() );
     resize( newSize );
@@ -252,60 +294,123 @@
         return delta;
     }
 
-    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;
+    // current invisible area can be scrolled by base class
+    // calculation for that need to be done
+    const qreal diff = d->getDiffWithoutScrollareaCompensation(delta);
 
-    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 (diff != 0.0) {
+        HbModelIterator *modelIterator = d->mItemView->modelIterator();
+        qreal result = 0.0;
+        bool doFarJump = false;
+        if (qAbs(diff) > size().height()) {
+            // if huge diff - current buffer does not containt any item that should
+            // be there after jump - because of that use setModelIndexes instead of
+            // recycling items - faster
+            // but it is possible that even if far jump was requested (huge delta) 
+            // it can't be done because of model size and current position (at the end)
+            if (diff > 0) {
+                // scrolling down
+                int indexPos = modelIterator->indexPosition(d->mItems.last()->modelIndex())
+                                + d->mItems.count();
+                doFarJump = (indexPos < modelIterator->indexCount());
+            } else {
+                // scrolling up
+                int indexPos = modelIterator->indexPosition(d->mItems.first()->modelIndex())
+                                - d->mItems.count();
+                doFarJump = (indexPos >= 0);
+            }
         }
+        if (doFarJump) {
+            // start calculations for far jump
+            // take back into account real delta (do jump as far as possible
+            // without leaving it for scroll area) - use delta.y() instead 
+            // of calculated diff
+            qreal itemHeight = d->itemHeight();
+            int rowDiff = (int)(delta.y() / itemHeight);
+            QPointF deltaAfterJump(delta.x(), delta.y() - (qreal)rowDiff * itemHeight);
+            // after setModelIndexes will be used it will still be some delta - deltaAfterJump
+            // bottom lines check if those delta can be consumed by scrollArea, if not then
+            // corrections to new index need to be done (otherwise it is possible that scrollArea
+            // will do the rest of scrolling but leave some empty space)
+            qreal diffAfterJump = d->getDiffWithoutScrollareaCompensation(deltaAfterJump);
+            if (diffAfterJump != 0.0) {
+                // this mean that rest of delta can not be handled by scroll area
+                // so jump one item more
+                if (rowDiff < 0.0) {
+                    rowDiff--;
+                } else {
+                    rowDiff++;
+                }
+            }
+            int firstIndexPos = modelIterator->indexPosition(d->mItems.first()->modelIndex());
+            int jumpIndexPos = firstIndexPos + rowDiff;
+            QModelIndex jumpIndex = modelIterator->index(jumpIndexPos);
+            if (!jumpIndex.isValid()) {
+                // get first or last valid index depending on scroll directions
+                if (rowDiff < 0) {// first index
+                    jumpIndex = modelIterator->nextIndex(jumpIndex);
+                } else {// last index
+                    jumpIndex = modelIterator->previousIndex(jumpIndex);
+                }
+            }
+            setModelIndexes(jumpIndex);
+
+            result = -(qreal)rowDiff * itemHeight;
+        }
+        else {
+            QPointF newDelta(0.0, 0.0);
+            HbAbstractViewItem *item = 0;
+            if (diff < 0.0) {
+                while (-newDelta.y() > diff) {
+                    item = d->shiftUpItem(newDelta);
+                    if (!item) {
+                        break;
+                    }
+                }
+            }
+            else {
+                while (-newDelta.y() < diff) {
+                    item = d->shiftDownItem(newDelta);
+                    if (!item) {
+                        break;
+                    }
+                }
+            }
+            qreal layoutPreferredHeight = layout()->preferredHeight();
+            if (layoutPreferredHeight < size().height()) {
+                // in non uniform item list container can change size
+                // while recycling, to catch that layoutPreferredHeight
+                // need to be checked - important case is only when new
+                // containerHeight is smaller than old containerHeight
+                // because only then container can go out of bounds
+                qreal viewSize = itemView()->boundingRect().size().height();
+                if (layoutPreferredHeight + pos().y() < viewSize) {
+                    // position is allways negative
+                    // view out of bounds
+                    if (diff > 0.0) {
+                        QPointF posDiff(pos().x(), 0.0);
+                        while (item
+                               && layoutPreferredHeight - d->mItems.at(0)->size().height() > viewSize
+                               && layoutPreferredHeight + pos().y() - posDiff.y() < viewSize) {
+                            // try to shiftDownMoreItems
+                            item = d->shiftDownItem(posDiff);
+                            layoutPreferredHeight = layout()->preferredHeight();
+                        }
+                        setPos(pos() - posDiff);
+                    }
+                }
+            }
+
+            result = newDelta.y();
+        }
+        QPointF newDelta(delta.x(), delta.y() + result);
+
+        return newDelta;
     }
 
-    QPointF newDelta(delta);
-
-    while (hiddenAbove > hiddenBelow + 1) {
-        HbAbstractViewItem *item = d->shiftDownItem(newDelta);
-        if (!item){
-            break;
-        }
-
-        if (!d->visible(item, viewRect)) {
-            hiddenBelow++;
-        }
-        hiddenAbove--;
-    }
-
-    while (hiddenBelow > hiddenAbove + 1) {
-        HbAbstractViewItem *item = d->shiftUpItem(newDelta);
-        if (!item) {
-            break;
-        }
-
-        if (!d->visible( item, viewRect)) {
-            hiddenAbove++;
-        }
-        hiddenBelow--;
-    }
-
-    return newDelta;
+    return delta;
 }
 
-
 /*!
     Calculates the optimal view item buffer size. When recycling is turned off
     returned buffer same is same as the amount of rows within the model. When 
@@ -337,6 +442,10 @@
                 }
             }
 
+            if (!d->mAnimatedItems.isEmpty()) {
+                targetCount = currentCount;
+            }
+
             // This limits the targetCount not to be larger
             // than row count inside model.
             targetCount = qMin(targetCount, countEstimate);
@@ -357,8 +466,49 @@
     Q_D(HbListItemContainer);
 
     HbAbstractViewItem *item = static_cast<HbAbstractViewItem *>(status.item);
+    item->setFlag(QGraphicsItem::ItemSendsGeometryChanges, false);
+
+    // Remove item from mAnimatedItems list.
+    int itemCount = d->mAnimatedItems.count();
+    for (int i = 0; i < itemCount; ++i) {
+        QPair<HbAbstractViewItem *, int> animatedItem = d->mAnimatedItems.at(i);
+        if (animatedItem.first == item) {
+            d->mAnimatedItems.removeAt(i);
+            break;
+        }
+    }
+
+    d->mItems.removeOne(item);
     d->mLayout->removeAt(d->mLayout->indexOf(item));
-    item->deleteLater();
+
+    item->resetTransform();
+    item->setOpacity(1.0);
+
+    QModelIndex index;
+    int bufferIndex;
+    if (d->mItems.isEmpty()) {
+        index = d->mItemView->modelIterator()->nextIndex(QModelIndex());
+        bufferIndex = 0;
+    } else {
+        index = d->mItemView->modelIterator()->nextIndex(d->mItems.last()->modelIndex());
+        bufferIndex = d->mItems.count();
+        if (!index.isValid()) {
+            index = d->mItemView->modelIterator()->previousIndex(d->mItems.first()->modelIndex());
+            bufferIndex = 0;
+        } 
+    }
+
+    if (index.isValid()) {
+        d->insertItem(item, bufferIndex, index, false);
+
+        if (bufferIndex == 0) {
+            QPointF newPos = pos();
+            newPos.setY(newPos.y() - item->preferredHeight());
+            setPos(newPos);
+        }
+    } else {
+        item->deleteLater();
+    }
 }
 
 #include "moc_hblistitemcontainer_p.cpp"
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/itemviews/hblistitemcontainer_p.h
--- a/src/hbwidgets/itemviews/hblistitemcontainer_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/itemviews/hblistitemcontainer_p.h	Mon May 03 12:48:33 2010 +0300
@@ -38,6 +38,8 @@
     explicit HbListItemContainer(QGraphicsItem *parent=0);
     virtual ~HbListItemContainer();
 
+    void removeItem(const QModelIndex &index, bool animate);
+
 protected:
 
     HbListItemContainer(HbListItemContainerPrivate &dd, QGraphicsItem *parent);
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/itemviews/hblistitemcontainer_p_p.h
--- a/src/hbwidgets/itemviews/hblistitemcontainer_p_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/itemviews/hblistitemcontainer_p_p.h	Mon May 03 12:48:33 2010 +0300
@@ -47,8 +47,15 @@
     virtual bool intoContainerBuffer(const QModelIndex &index) const; 
     virtual int containerBufferIndexForModelIndex(const QModelIndex &index) const;
 
-    qreal getSmallestItemHeight() const; 
+    qreal itemHeight() const; 
+    qreal getSmallestItemHeight() const;
+
+    int mapToLayoutIndex(int index) const;
+
+public:
 
     HbListLayout *mLayout;
+
+    QList< QPair<HbAbstractViewItem *, int> > mAnimatedItems;
 };
 #endif /* HBLISTITEMCONTAINER_P_P_H */
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/itemviews/hblistlayout_p.cpp
--- a/src/hbwidgets/itemviews/hblistlayout_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/itemviews/hblistlayout_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -29,10 +29,8 @@
 
 #include "hbwidgetbase.h"
 #include "hbabstractitemcontainer.h"
-#include <hbeffect.h>
 
 #include <QWidget> // for QWIDGETSIZE_MAX
-#include <QTimer>
 #include <QDebug>
 
 /*
@@ -46,7 +44,6 @@
 
 HbListLayoutPrivate::HbListLayoutPrivate(HbListLayout *q_ptr) :
     q(q_ptr),
-    mTimer(0),
     mSmallestItemHeight(INVALID_ITEM_HEIGHT)
 {
 }
@@ -142,39 +139,6 @@
 }
 
 /*!
-    Updates the animation progress.
-*/
-void HbListLayoutPrivate::update()
-{
-    QMapIterator<QGraphicsLayoutItem*, bool> i(mShrinkingItems);
-    while (i.hasNext()) {
-        i.next();
-        mShrinkingItems[i.key()] = true;
-
-        if (!HbEffect::effectRunning(i.key()->graphicsItem(), "disappear")) {
-            mShrinkingItems.remove(i.key());
-        }
-    }
-
-    QMapIterator<QGraphicsLayoutItem*, bool> j(mGrowingItems);
-    while (j.hasNext()) {
-        j.next();
-        mGrowingItems[j.key()] = true;
-
-        if (!HbEffect::effectRunning(j.key()->graphicsItem(), "appear")) {
-            mGrowingItems.remove(j.key());
-        }
-    }   
-
-    q->invalidate();
-
-    if (mGrowingItems.size() == 0 && mShrinkingItems.size() == 0) {
-        delete mTimer;
-        mTimer = 0;
-    }
-}
-
-/*!
     Constructor.
     \param parent parent layout item.
  */
@@ -192,7 +156,7 @@
 HbListLayout::~HbListLayout()
 {
     if (d) {
-        for (int i = count() - 1; i >= 0; --i) {
+         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 
@@ -237,26 +201,7 @@
  */
 void HbListLayout::insertItem(int index, QGraphicsLayoutItem *item, bool animate)
 {
-    if (animate) {
-        d->mGrowingItems[item] = false;
-        if (!d->mTimer) {
-            d->mTimer = new QTimer(d);
-            QObject::connect(d->mTimer, SIGNAL(timeout()), d, SLOT(update()));
-            d->mTimer->start(25);
-        }
-    }
-
-    // If some items are shrinking while the item is being inserted, the container's
-    // item list and the layout's item list may not be at sync.
-    // The following code block checks if any item *before* the index is shrinking and
-    // thus not apparent in the container index passed as a parameter.
-    if (!d->mShrinkingItems.isEmpty()) {
-        for (int i = 0; i < index; i++) {
-            if (d->mShrinkingItems.contains(d->mItems.at(i))) {
-                index++;
-            }
-        }
-    }
+    Q_UNUSED(animate);
 
     index = qMin(index, d->mItems.count());
     if (index < 0) {
@@ -295,25 +240,10 @@
 void HbListLayout::removeItem( QGraphicsLayoutItem *item, bool animate )
 {
     if (animate) {
-        d->mShrinkingItems[item] = false;
-        if (d->mGrowingItems.contains(item)) {
-            d->mShrinkingItems[item] = d->mGrowingItems[item];
-        }
-
-        if (!d->mTimer) {
-            d->mTimer = new QTimer(d);
-            QObject::connect(d->mTimer, SIGNAL(timeout()), d, SLOT(update()));
-            d->mTimer->start(25);
-        }
         invalidate();
     } else {
         removeAt(indexOf(item));
     }
-
-    if (d->mGrowingItems.contains(item)) {
-        d->mGrowingItems.remove(item);
-    }
-
 }
 
 /*!
@@ -366,10 +296,6 @@
         d->mItems.removeAt(index);
         item->setParentLayoutItem(0);
         invalidate();
-
-        if (d->mShrinkingItems.contains(item)) {
-            d->mShrinkingItems.remove(item);
-        }
     }
 }
 
@@ -395,10 +321,6 @@
             itemHeight *= item->graphicsItem()->transform().m22();
         }
 
-        if (d->mGrowingItems.contains(item) && d->mGrowingItems[item] == false) {
-            itemHeight = 0;
-        }
-
         QRectF itemRect(effectiveRect.x(), y, effectiveRect.width(), itemHeight);
         item->setGeometry(itemRect);
         y += itemHeight;
@@ -451,5 +373,3 @@
 
 }
 
-#include "moc_hblistlayout_p_p.cpp"
-
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/itemviews/hblistlayout_p_p.h
--- a/src/hbwidgets/itemviews/hblistlayout_p_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/itemviews/hblistlayout_p_p.h	Mon May 03 12:48:33 2010 +0300
@@ -27,11 +27,8 @@
 
 #include "hblistlayout_p.h"
 
-#include <QTimer>
-
-class HbListLayoutPrivate : public QObject
+class HbListLayoutPrivate
 {
-    Q_OBJECT
 public:
     HbListLayoutPrivate(HbListLayout *q_ptr);
 
@@ -43,13 +40,8 @@
 
     QList<QGraphicsLayoutItem*> mItems;
     HbListLayout *q;
-    QMap<QGraphicsLayoutItem*, bool> mGrowingItems;
-    QMap<QGraphicsLayoutItem*, bool> mShrinkingItems;
-    QTimer *mTimer;
+
     mutable qreal mSmallestItemHeight;
-
-public slots: 
-    void update();
 };
 
 #endif /* HBLISTLAYOUT_P_P_H */
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/itemviews/hblistview.cpp
--- a/src/hbwidgets/itemviews/hblistview.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/itemviews/hblistview.cpp	Mon May 03 12:48:33 2010 +0300
@@ -30,7 +30,6 @@
 #include "hblistviewitem.h"
 #include "hblistitemcontainer_p.h"
 #include "hblistitemcontainer_p.h"
-#include "hbgesturefilter.h"
 #include "hbscrollbar.h"
 #include <hbwidgetfeedback.h>
 #include "hbmodeliterator.h"
@@ -39,6 +38,8 @@
 #include <QGraphicsScene>
 #include <QAbstractItemModel>
 
+#include <QPanGesture>
+
 #include <qdebug.h>
 /*!
     @beta
@@ -73,11 +74,6 @@
     More information about this can be found from HbListViewItem documentation.
 */
 
-static const qreal DRAGGED_ITEM_SCROLL_SPEED = 0.2;
-static const int FLICKMINDISTANCE = 50;
-static const qreal FLICK_TIMEOUT = 200;
-static const qreal SCROLLSPEED_FACTOR = 0.0004;
-
 /*!
     Constructs a list view with \a parent.
  */
@@ -140,9 +136,8 @@
     //This is always the case if recycling is off 
     //and sometimes the case when recycling is on
     if (itemRecycling()) {
-        if (!   (    d->mContainer->itemByIndex(index)
-                &&  (   hint == PositionAtTop
-                    ||  hint == EnsureVisible))) {
+        if (    !d->mContainer->itemByIndex(index)
+            ||  hint != EnsureVisible) {
             //Now the item is not in the buffer.
             //We must first set the item to be in the buffer
             //If the item is above let's put it first and if it is below put it last
@@ -244,135 +239,28 @@
                 || !(d->mModelIterator->model()->supportedDropActions().testFlag(Qt::MoveAction))) {
                 return false;
             }
-            if (d->mGestureFilter) {
-                removeSceneEventFilter(d->mGestureFilter);
-                d->mFilterRemoved = true;
-            }
             verticalScrollBar()->setInteractive(true);
-
         } else {
-            if (d->mFilterRemoved) {
-                installSceneEventFilter(d->mGestureFilter);
-                d->mFilterRemoved = false;
-            }
             verticalScrollBar()->setInteractive(false);
         }
         d->mArrangeMode = arrangeMode;
         d->mAnimateItems = !d->mArrangeMode;
+
+        if (d->mArrangeMode == true) {
+            d->mOriginalFriction = d->mFrictionEnabled;
+            setFrictionEnabled(false);
+        } else {
+            setFrictionEnabled(d->mOriginalFriction);
+        }
     }
     return true;
 }
 
 /*!
-    \reimp
-*/
-void HbListView::mousePressEvent(QGraphicsSceneMouseEvent *event)
-{
-    Q_D(HbListView);
-    if (d->mArrangeMode 
-        && d->mSelectionMode == HbAbstractItemView::NoSelection
-        && !d->mDraggedItem) {
-
-        if (d->mFilterRemoved == false && d->mGestureFilter) {
-            removeSceneEventFilter(d->mGestureFilter);
-            d->mFilterRemoved = true;
-        }
-
-        d->mDraggedItem = d->itemAt(event->scenePos());
-        if(d->mDraggedItem) {
-            d->mDraggedItemIndex = d->mDraggedItem->modelIndex();
-
-            if (d->mDraggedItemIndex.isValid()) {
-                setCurrentIndex(d->mDraggedItemIndex);
-                d->mMousePressTimer.restart();
-                d->mMousePressPos = event->scenePos();
-                d->mOriginalTransform = d->mDraggedItem->transform();
-                d->mDraggedItem->setZValue(d->mDraggedItem->zValue() + 1);
-                d->mDraggedItem->setPressed(true);
-
-                connect(this, SIGNAL(scrollPositionChanged(QPointF)), this, SLOT(scrolling(QPointF)));    
-                Hb::InteractionModifiers modifiers = 0;
-                if (d->mWasScrolling) {
-                    modifiers |= Hb::ModifierScrolling;
-                }
-                HbWidgetFeedback::triggered(d->mDraggedItem,Hb::InstantPressed,modifiers);
-            } else {
-                d->mDraggedItem = 0;
-            }
-        }
-    } else {
-        if (!d->mDraggedItem) {
-            HbAbstractItemView::mousePressEvent(event);
-        }
-    }
-}
-
-/*!
-    \reimp
-*/
-void HbListView::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
-{
-    Q_D(HbListView);
-
-    if (d->mArrangeMode
-        && d->mSelectionMode == HbAbstractItemView::NoSelection
-        && d->mDraggedItem) {
-
-        if (!isScrolling()) {
-            // move the item with the cursor to indicate the move
-            d->mDraggedItem->translate(0, event->scenePos().y() - event->lastScenePos().y());
-
-            if (d->mMousePressTimer.elapsed() >= FLICK_TIMEOUT) {
-                d->moveDraggedItemTo(event->scenePos());
-            }
-        }
-
-        // in case we are "dragging" an item and at the top/bottom of
-        // the view the view is scrolled to reveal more items in
-        // that direction
-        QModelIndex firstVisible;
-        QModelIndex lastVisible;        
-        d->mContainer->firstAndLastVisibleModelIndex(firstVisible, lastVisible);
-        if (firstVisible.isValid() && lastVisible.isValid()) {
-            // above indexes are valid so container contain at least one item - so it is
-            // safe to call first and last
-            QModelIndex firstItemIndex = d->mContainer->items().first()->modelIndex();
-            QModelIndex lastItemIndex = d->mContainer->items().last()->modelIndex();
-            // If the item is dragged up in the list (and there are more items to show), scroll up
-            if (!isScrolling()
-                && !isVisible(firstItemIndex)
-                && event->scenePos().y() < d->mMousePressPos.y()
-                && event->pos().y() < itemByIndex(firstVisible)->size().height()) {
-                d->mScrollStartMousePos = event->scenePos();
-                d->mLastScrollPos = QPointF(0,0);
-                d->animateScroll(QPointF(0.0f , DRAGGED_ITEM_SCROLL_SPEED));
-            }
-            // If the item is dragged down in the list (and there are more items to show), scroll down
-            else if (!isScrolling()
-                       && !isVisible(lastItemIndex)
-                       && event->scenePos().y() > d->mMousePressPos.y()
-                       && event->pos().y() > (size().height() - itemByIndex(lastVisible)->size().height())) {
-                d->mScrollStartMousePos = event->scenePos();
-                d->mLastScrollPos = QPointF(0,0);
-                d->animateScroll(QPointF(0.0f , (-1 * DRAGGED_ITEM_SCROLL_SPEED)));
-            }
-            // If the view is scrolling and the drag event is inside the view, we need to stop the scrolling
-            else if (event->pos().y() < (size().height() - itemByIndex(lastVisible)->size().height())
-                       && event->pos().y() > itemByIndex(firstVisible)->size().height()
-                       && isScrolling()) {
-                d->stopAnimating();
-            }
-        }
-    } else {
-        HbAbstractItemView::mouseMoveEvent(event);
-    }
-}
-
-
-/*!
     This slot is called when the arrangeMode is true, user is dragging an item 
     and the underlying scrollarea is moving. 
-*/void HbListView::scrolling(QPointF newPosition)
+*/
+void HbListView::scrolling(QPointF newPosition)
 {
     Q_UNUSED(newPosition);
 
@@ -397,54 +285,6 @@
     }
 }
 
-
-
-/*!
-    \reimp
-*/
-void HbListView::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
-{
-    Q_D(HbListView);
-
-    if (d->mArrangeMode 
-        && d->mSelectionMode == HbAbstractItemView::NoSelection
-        && d->mDraggedItem) {
-
-        disconnect(this, SIGNAL(scrollPositionChanged(QPointF)), this, SLOT(scrolling(QPointF)));
-
-        if (isScrolling()) {
-            d->stopAnimating();
-        }
-
-        // remove item's drag indications
-        d->mDraggedItem->setOpacity(1.0);
-        d->mDraggedItem->setTransform(d->mOriginalTransform);
-        d->mDraggedItem->setZValue(d->mDraggedItem->zValue() - 1);
-        d->mDraggedItem->setPressed(false);
-
-        if (d->itemAt(event->scenePos())) {
-            int downTime = d->mMousePressTimer.elapsed();
-            // this seems to be a flick rather than item move, so start 
-            // scrolling
-            qreal distance = event->scenePos().y() - d->mMousePressPos.y();
-            if (downTime > 0 && downTime < FLICK_TIMEOUT 
-                && qAbs(distance) > FLICKMINDISTANCE ) {
-                d->animateScroll(QPointF (0.0f, (distance * 1000 / downTime) * SCROLLSPEED_FACTOR));
-            }
-        }
-
-        Hb::InteractionModifiers modifiers = 0;
-        if (d->mWasScrolling) {
-            modifiers |= Hb::ModifierScrolling;
-        }
-        HbWidgetFeedback::triggered(d->mDraggedItem,Hb::InstantReleased,modifiers);
-        d->mDraggedItem = 0;
-
-    } else {
-        HbAbstractItemView::mouseReleaseEvent(event);
-    }
-}
-
 /*!
     Moves the item in row \a from to row \a to. 
 */
@@ -484,9 +324,8 @@
 
     if (parent == d->mModelIterator->rootIndex()) {
         HbAbstractItemView::rowsInserted(parent, start, end);
-        bool animate = d->mEnabledAnimations & HbAbstractItemView::Appear ? d->mAnimateItems : false;
-        if (!d->mArrangeMode && animate) {
-            d->startAppearEffect(parent, start, end);
+        if (!d->mArrangeMode && d->animationEnabled(true)) {
+            d->startAppearEffect("viewitem", "appear", parent, start, end);
         }
     }
 }
@@ -505,8 +344,8 @@
                 if (d->mDraggedItem == item) {
                    d->mDraggedItem = 0;
                 }
-                bool animate = d->mEnabledAnimations & HbAbstractItemView::Disappear ? d->mAnimateItems : false;
-                if (!d->mArrangeMode && animate) {
+
+                if (!d->mArrangeMode && d->animationEnabled(false)) {
                     d->mItemsAboutToBeDeleted.append(item);
                 }
             }
@@ -518,14 +357,17 @@
 {
     Q_D(HbListView);
     if (parent == d->mModelIterator->rootIndex()) {
-        bool animate = d->mEnabledAnimations & HbAbstractItemView::Disappear ? d->mAnimateItems: false;
-        if (animate) {
+        if (d->animationEnabled(false)) {
             for (int i = 0; i < d->mItemsAboutToBeDeleted.count(); i++) {
-                HbEffect::start(d->mItemsAboutToBeDeleted.at(i), 
+                QGraphicsItem *item = d->mItemsAboutToBeDeleted.at(i);
+                HbEffect::cancel(item, "appear");
+
+                item->setFlag(QGraphicsItem::ItemSendsGeometryChanges, true);
+                HbEffect::start(item, 
                                 "viewitem", 
                                 "disappear",
                                 d->mContainer,
-                                "animationFinished");    
+                                "animationFinished");  
             }
             d->mItemsAboutToBeDeleted.clear();
         }
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/itemviews/hblistview.h
--- a/src/hbwidgets/itemviews/hblistview.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/itemviews/hblistview.h	Mon May 03 12:48:33 2010 +0300
@@ -65,15 +65,10 @@
     void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight);
     void orientationChanged(Qt::Orientation newOrientation);
 
-    void mousePressEvent(QGraphicsSceneMouseEvent *event);
-    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
-    void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
-
     virtual void move(const QModelIndex &from, const QModelIndex &to);
 
 protected slots:
     void scrolling(QPointF newPosition);
-
 private:
     Q_DECLARE_PRIVATE_D(d_ptr, HbListView)
     Q_DISABLE_COPY(HbListView)
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/itemviews/hblistview_p.cpp
--- a/src/hbwidgets/itemviews/hblistview_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/itemviews/hblistview_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -26,26 +26,22 @@
 #include "hblistview_p.h"
 #include "hblistview.h"
 
-#include "hbinstance.h"
-#include "hblistlayout_p.h"
 #include "hblistviewitem.h"
-#include "hbapplication.h"
-#include "hbscrollbar.h"
-#include "hbgesturefilter.h"
-#include "hbgesture.h"
 #include "hbabstractitemcontainer.h"
 #include <hbwidgetfeedback.h>
 #include "hbmodeliterator.h"
+#include <hbpangesture.h>
 
-#include <QTimeLine>
-#include <QGraphicsSceneMouseEvent>
-#include <QGraphicsLinearLayout>
-#include <QDebug>
-#include <QItemSelectionModel>
 #include <QGraphicsScene>
 
-static const qreal DRAGGED_ITEM_OPACITY = 0.75;
-const QString KDefaultLayoutOption = "default";
+namespace {
+    static const int FLICKMINDISTANCE = 50;
+    static const qreal SCROLLSPEED_FACTOR = 0.0004;
+    static const qreal FLICK_TIMEOUT = 200;
+    static const qreal DRAGGED_ITEM_SCROLL_SPEED = 0.2;
+    static const qreal DRAGGED_ITEM_OPACITY = 0.75;
+    const QString KDefaultLayoutOption = "default";
+}
 
 HbListViewPrivate::HbListViewPrivate() :
     HbAbstractItemViewPrivate(),
@@ -67,9 +63,6 @@
 void HbListViewPrivate::init()
 {
     Q_Q(HbListView);
-
-    q->setClampingStyle(HbScrollArea::StrictClamping);
-    q->setFrictionEnabled(0);
     q->setItemRecycling(true);
     mLayoutOptionName = KDefaultLayoutOption;
 }
@@ -125,7 +118,7 @@
             mDraggedItem->setOpacity(1.0);
             mDraggedItem->setTransform(mOriginalTransform);
             mDraggedItem->setZValue(mDraggedItem->zValue() - 1);
-            mDraggedItem->setPressed(false, false);
+            //mDraggedItem->setPressed(false, false);
 
             int targetRow = targetIndex.row();
             q->move(mDraggedItemIndex, targetIndex);
@@ -144,7 +137,7 @@
                     mDraggedItem->setOpacity(DRAGGED_ITEM_OPACITY);
                     mDraggedItem->setZValue(mDraggedItem->zValue() + 1);
 
-                    mDraggedItem->setPressed(true, false);
+                    //mDraggedItem->setPressed(true, false);
 
                     q->setCurrentIndex(mDraggedItemIndex);
                 }
@@ -153,64 +146,138 @@
     }
 }
 
-void HbListViewPrivate::setContentPosition( qreal value, Qt::Orientation orientation, bool animate )
+bool HbListViewPrivate::panTriggered(QGestureEvent *event)
 {
-    Q_Q( HbListView );
+    Q_Q(HbListView);
+
+    bool arrangeModeEnabled = false;
+    if (mArrangeMode && mSelectionMode == HbAbstractItemView::NoSelection) {
+        arrangeModeEnabled = true;
+    }
 
-    if (mContainer->itemRecycling()
-        && mModelIterator->model()) {
+    HbPanGesture *gesture = static_cast<HbPanGesture *>(event->gesture(Qt::PanGesture));
+    switch (gesture->state()) {
+        case Qt::GestureStarted: {
+            if (arrangeModeEnabled && !mDraggedItem) {
+                QPointF scenePos = event->mapToGraphicsScene(gesture->startPos());
+                mDraggedItem = itemAt(scenePos);
+                if (mDraggedItem) {
+                    mDraggedItemIndex = mDraggedItem->modelIndex();
 
-        if (mContainer->layout() && !mContainer->layout()->isActivated()) {
-            mContainer->layout()->activate();
-        }
-
-        qreal filteredValue = (int)(value * 1000) / 1000.0;        
+                    if (mDraggedItemIndex.isValid()) {
+                        mMousePressTimer.restart();
+                        mMousePressPos = scenePos;
+                        mOriginalTransform = mDraggedItem->transform();
+                        mDraggedItem->setZValue(mDraggedItem->zValue() + 1);
 
-        qreal itemHeight = mContainer->items().first()->size().height();
-        if (!mContainer->uniformItemSizes()) {
-            // add here the wisdom to get a proper item size in case they are all
-            // not of the same size
+                        QObject::connect(q, SIGNAL(scrollPositionChanged(QPointF)), q, SLOT(scrolling(QPointF)));    
+                    } else {
+                        mDraggedItem = 0;
+                    }
+                }
+                return true;
+            }
         }
+        case Qt::GestureUpdated: {
+            if (arrangeModeEnabled && mDraggedItem) {
+                QPointF scenePos = event->mapToGraphicsScene(gesture->hotSpot());
+                QPointF pos = q->mapFromScene(scenePos);
 
-        int indexCount = mModelIterator->indexCount();
-        qreal containerVirtualHeight = itemHeight * indexCount;
-        qreal target = (containerVirtualHeight * filteredValue) / itemHeight;
+                if (!q->isScrolling()) {
+                    // move the item with the cursor to indicate the move
+                    //qDebug() << "ScenePos: " << scenePos;
+                    //qDebug() << "Offset: " << event->mapToGraphicsScene(gesture->offset()).y() << " lastOffset: " <<  event->mapToGraphicsScene(gesture->lastOffset()).y();
+                    mDraggedItem->translate(0, event->mapToGraphicsScene(gesture->offset()).y() -
+                                               event->mapToGraphicsScene(gesture->lastOffset()).y());
 
-        qreal posToBeInView = q->size().height() * filteredValue;
-
-        int newRow = (int)(indexCount * filteredValue);
-        newRow = qMin(newRow, indexCount - 1);
-        QModelIndex newIndex = mModelIterator->index(newRow);
+                    if (mMousePressTimer.elapsed() >= FLICK_TIMEOUT) {
+                        moveDraggedItemTo(scenePos);
+                    }
+                }
 
-        if (!mContainer->itemByIndex(newIndex)) {
-
-            int itemsInBuffer = mContainer->items().count();
-            int newBufferStartRow = newRow - qMin(itemsInBuffer - 1, (int)(itemsInBuffer * filteredValue));
-            mContainer->setModelIndexes(mModelIterator->index(newBufferStartRow));
-
-            qreal posToBeInBuffer = (target - newBufferStartRow) * itemHeight;
-
-            qreal topToBe = posToBeInView - posToBeInBuffer;
-
-            HbScrollAreaPrivate::setContentPosition(QPointF(0, topToBe)); 
-
-        } else {
-            qreal topInBeginning = itemBoundingRect(mContainer->items().first()).top();
+                // in case we are "dragging" an item and at the top/bottom of
+                // the view the view is scrolled to reveal more items in
+                // that direction
+                QModelIndex firstVisible;
+                QModelIndex lastVisible;
+                mContainer->firstAndLastVisibleModelIndex(firstVisible, lastVisible);
+                if (firstVisible.isValid() && lastVisible.isValid()) {
+                    // above indexes are valid so container contain at least one item - so it is
+                    // safe to call first and last
+                    QModelIndex firstItemIndex = mContainer->items().first()->modelIndex();
+                    QModelIndex lastItemIndex = mContainer->items().last()->modelIndex();
+                    // If the item is dragged up in the list (and there are more items to show), scroll up
+                    if (!q->isScrolling()
+                        && !q->isVisible(firstItemIndex)
+                        && scenePos.y() < mMousePressPos.y()
+                        && pos.y() < q->itemByIndex(firstVisible)->size().height()) {
+                        mScrollStartMousePos = scenePos;
+                        mLastScrollPos = QPointF(0,0);
+                        animateScroll(QPointF(0.0f , DRAGGED_ITEM_SCROLL_SPEED));
+                    }
+                    // If the item is dragged down in the list (and there are more items to show), scroll down
+                    else if (!q->isScrolling()
+                               && !q->isVisible(lastItemIndex)
+                               && scenePos.y() > mMousePressPos.y()
+                               && pos.y() > (q->size().height() - q->itemByIndex(lastVisible)->size().height())) {
+                        mScrollStartMousePos = scenePos;
+                        mLastScrollPos = QPointF(0,0);
+                        animateScroll(QPointF(0.0f , (-1 * DRAGGED_ITEM_SCROLL_SPEED)));
+                    }
+                    // If the view is scrolling and the drag event is inside the view, we need to stop the scrolling
+                    else if (pos.y() < (q->size().height() - q->itemByIndex(lastVisible)->size().height())
+                               && pos.y() > q->itemByIndex(firstVisible)->size().height()
+                               && q->isScrolling()) {
+                        stopAnimating();
+                    }
+                }
+                return true;
+            }
+        }
+        case Qt::GestureFinished: 
+		case Qt::GestureCanceled: {
+            if (arrangeModeEnabled && mDraggedItem) {
+                QObject::disconnect(q, SIGNAL(scrollPositionChanged(QPointF)), q, SLOT(scrolling(QPointF)));
 
-            int firstRow = mContainer->items().first()->modelIndex().row();
-            qreal posToBeInBuffer = (target - firstRow) * itemHeight;
-            
-            qreal topToBe = posToBeInView - posToBeInBuffer;
+                if (q->isScrolling()) {
+                    stopAnimating();
+                }
 
+                // remove item's drag indications
+                mDraggedItem->setOpacity(1.0);
+                mDraggedItem->setTransform(mOriginalTransform);
+                mDraggedItem->setZValue(mDraggedItem->zValue() - 1);
+                //mDraggedItem->setPressed(false);
 
-            q->scrollByAmount(QPointF(0, topInBeginning - topToBe));
+                QPointF scenePos = event->mapToGraphicsScene(gesture->hotSpot());
+                if (itemAt(scenePos)) {
+                    int downTime = mMousePressTimer.elapsed();
+                    // this seems to be a flick rather than item move, so start 
+                    // scrolling
+                    qreal distance = scenePos.y() - mMousePressPos.y();
+                    if (downTime > 0 && downTime < FLICK_TIMEOUT 
+                        && qAbs(distance) > FLICKMINDISTANCE ) {
+                        animateScroll(QPointF (0.0f, (distance * 1000 / downTime) * SCROLLSPEED_FACTOR));
+                    }
+                }
+
+                mDraggedItem = 0;
+                return true;
+            }
         }
+        default:
+            break;
+    }
+
+    return HbAbstractItemViewPrivate::panTriggered(event);
+}
+
+bool HbListViewPrivate::animationEnabled(bool insertOperation)
+{
+    if (mArrangeMode) {
+        return false;
     } else {
-        HbScrollAreaPrivate::setContentPosition(value, orientation, animate);
-    }
-    
-    if (animate) {
-        updateScrollBar(orientation);
+        return HbAbstractItemViewPrivate::animationEnabled(insertOperation);
     }
 }
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/itemviews/hblistview_p.h
--- a/src/hbwidgets/itemviews/hblistview_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/itemviews/hblistview_p.h	Mon May 03 12:48:33 2010 +0300
@@ -45,6 +45,7 @@
 class QAbstractItemModel;
 class QTimeLine;
 class QGraphicsLinearLayout;
+class QPanGesture;
 QT_END_NAMESPACE
 
 class HbListView;
@@ -67,8 +68,9 @@
     void init();
     void moveDraggedItemTo(const QPointF &mousePosition);
 
-    void setContentPosition( qreal value, Qt::Orientation orientation, bool animate );
+    virtual bool panTriggered(QGestureEvent *event);
 
+    virtual bool animationEnabled(bool insertOperation);
 public:
     bool mArrangeMode;
     QPersistentModelIndex mDraggedItemIndex;
@@ -78,7 +80,8 @@
     QPointF mScrollStartMousePos;
     QPointF mLastScrollPos;
     QTransform mOriginalTransform;
-    
+
+    bool mOriginalFriction;    
 };
 
 #endif // HBLISTVIEW_PRIVATE_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/itemviews/hblistviewitem.cpp
--- a/src/hbwidgets/itemviews/hblistviewitem.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/itemviews/hblistviewitem.cpp	Mon May 03 12:48:33 2010 +0300
@@ -167,6 +167,11 @@
     HbAbstractViewItemPrivate(prototype, new HbListViewItemShared)
 {
 }
+
+HbListViewItemPrivate::HbListViewItemPrivate(HbListViewItem *prototype, HbListViewItemShared *shared) :
+    HbAbstractViewItemPrivate(prototype, shared)
+{
+}
  
 HbListViewItemPrivate::HbListViewItemPrivate(const HbListViewItemPrivate &source) :
     HbAbstractViewItemPrivate(source)
@@ -238,7 +243,7 @@
     Q_Q( HbListViewItem );
 
     // create text item  and set it to layout
-    if (!value.isEmpty()) {
+    if (!value.isNull()) {
         QGraphicsItem *textItem = mDisplayRoleTextItems.value(index);
 
         HbStyle::Primitive primitive = displayPrimitive();
@@ -253,10 +258,13 @@
             }
         }
     } else {
-        mItemsChanged = true;
         if (index < mDisplayRoleTextItems.count()) {
-            delete mDisplayRoleTextItems.at(index);
-            mDisplayRoleTextItems.replace(index, 0);
+            QGraphicsItem *item = mDisplayRoleTextItems.at(index);
+            if (item) {
+                mItemsChanged = true;
+                delete item;
+                mDisplayRoleTextItems.replace(index, 0);
+            }
         } else {
             mDisplayRoleTextItems.insert(index, 0);
         }
@@ -512,7 +520,7 @@
         sd->mStretchingStyle = style;
         if (d->isLandscape()) {
             // secondary text multiline change!
-            d->updateCloneItems();
+            d->updateCloneItems(false);
             d->repolishCloneItems();
         }
     }
@@ -549,7 +557,7 @@
         if (   thumbnailChange
             && !d->isStretching()) {
             // secondary text multiline change!
-            d->updateCloneItems();
+            d->updateCloneItems(false);
         }
         d->repolishCloneItems();
     }
@@ -607,7 +615,7 @@
 
     if (    update
         &&  d->isMultilineSupported()) {
-        d->updateCloneItems();
+        d->updateCloneItems(false);
     }
 }
 
@@ -619,8 +627,12 @@
     HB_SDD(HbListViewItem);
 
     setProperty("icon-1", (bool)d->mDecorationRoleItems.value(0));
+    setProperty("icon-2", (bool)d->mDecorationRoleItems.value(1));
+
+    setProperty("text-1", (bool)d->mDisplayRoleTextItems.value(0));
     setProperty("text-2", (bool)d->mDisplayRoleTextItems.value(1));
     setProperty("text-3", (bool)d->mDisplayRoleTextItems.value(2));
+
     setProperty("maximumSecondaryTextRowCount", sd->mMaximumSecondaryTextRowCount);
     if (itemView() && itemView()->selectionMode() != HbListView::NoSelection) {
         setProperty("selectionMode", true);
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/itemviews/hblistviewitem_p.h
--- a/src/hbwidgets/itemviews/hblistviewitem_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/itemviews/hblistviewitem_p.h	Mon May 03 12:48:33 2010 +0300
@@ -64,6 +64,8 @@
 public:
 
     HbListViewItemPrivate(HbListViewItem *prototype);
+
+    HbListViewItemPrivate(HbListViewItem *prototype, HbListViewItemShared *shared);
     
     HbListViewItemPrivate(const HbListViewItemPrivate &source);
     
@@ -107,7 +109,9 @@
     }
 
     inline bool isMultilineSupported() const {
-        return !(   static_cast<const HbListViewItemShared*>(mSharedData.constData())->mGraphicsSize == HbListViewItem::Thumbnail
+        HbListViewItem::GraphicsSize graphicsSize = static_cast<const HbListViewItemShared*>(mSharedData.constData())->mGraphicsSize;
+        return !(   graphicsSize == HbListViewItem::Thumbnail
+                ||  graphicsSize == HbListViewItem::WideThumbnail
                 ||  isStretching()); 
     }
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/itemviews/hblistwidget.cpp
--- a/src/hbwidgets/itemviews/hblistwidget.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/itemviews/hblistwidget.cpp	Mon May 03 12:48:33 2010 +0300
@@ -30,7 +30,6 @@
 #include <hblistviewitem.h>
 #include <hblistwidgetitem.h>
 #include "hblistitemcontainer_p.h"
-#include <hbgesturefilter.h>
 #include "hbmodeliterator.h"
 
 #include <QModelIndex>
@@ -346,21 +345,20 @@
             if (d->mSelectionMode != HbAbstractItemView::NoSelection) {
                 return false;
             }
-              if (d->mGestureFilter) {
-                removeSceneEventFilter(d->mGestureFilter);
-                d->mFilterRemoved = true;
-            }
             verticalScrollBar()->setInteractive(true);
         } else {
-            if (d->mFilterRemoved) {
-                installSceneEventFilter(d->mGestureFilter);
-                d->mFilterRemoved = true;
-            }
             verticalScrollBar()->setInteractive(false);
         }
 
         d->mArrangeMode = arrangeMode;
         d->mAnimateItems = !d->mArrangeMode;
+
+        if (d->mArrangeMode == true) {
+            d->mOriginalFriction = d->mFrictionEnabled;
+            setFrictionEnabled(false);
+        } else {
+            setFrictionEnabled(d->mOriginalFriction);
+        }
     }
     return true;
 }
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/itemviews/hblistwidgetitem.cpp
--- a/src/hbwidgets/itemviews/hblistwidgetitem.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/itemviews/hblistwidgetitem.cpp	Mon May 03 12:48:33 2010 +0300
@@ -93,7 +93,7 @@
         }
     }
 
-    setText(QString());
+    setText(QString(""));
 }
 
 /*!
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/itemviews/hbmodeliterator.h
--- a/src/hbwidgets/itemviews/hbmodeliterator.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/itemviews/hbmodeliterator.h	Mon May 03 12:48:33 2010 +0300
@@ -66,7 +66,6 @@
 private:
     Q_DECLARE_PRIVATE_D(d, HbModelIterator)
     Q_DISABLE_COPY(HbModelIterator)
-
 };
 
 #endif // HBMODELITERATOR_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/itemviews/hbradiobuttonlist.cpp
--- a/src/hbwidgets/itemviews/hbradiobuttonlist.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/itemviews/hbradiobuttonlist.cpp	Mon May 03 12:48:33 2010 +0300
@@ -153,7 +153,7 @@
 void HbRadioButtonListPrivate::_q_itemActivationTimerExpired()
 {
     Q_Q(HbRadioButtonList);
-    emit q->activated(mCurrentIndex);
+    q->HbListView::emitActivated(mCurrentIndex);
 }
 
 void HbRadioButtonListPrivate::_q_itemPreviewTimerExpired()
@@ -376,18 +376,15 @@
     Q_D(HbRadioButtonList);
 
     if (!item->modelIndex().isValid() 
-        || selectionMode()!=SingleSelection
-        || !d->mHitItem
-        ||event->type() != QEvent::GraphicsSceneMouseRelease){
+        || selectionMode() != SingleSelection
+        || event->type() != QEvent::GraphicsSceneMouseRelease){
             return QItemSelectionModel::NoUpdate;
-    } else if (item->modelIndex() == d->mHitItem->modelIndex()) {
+    } else {
         if(d->mPreviewGoingOn==true) {
             return QItemSelectionModel::NoUpdate;
         } else {
             return QItemSelectionModel::ClearAndSelect;
         }
-    } else {
-        return QItemSelectionModel::NoUpdate;
     }
 }
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/itemviews/hbtreeitemcontainer_p.cpp
--- a/src/hbwidgets/itemviews/hbtreeitemcontainer_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/itemviews/hbtreeitemcontainer_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -32,8 +32,13 @@
 #include "hbapplication.h"
 #include "hbmodeliterator.h"
 
+// For QMAP_INT__ITEM_STATE_DEPRECATED's sake. Removed when QMap<int,QVariant> based state item system is removed
+#include <hbabstractviewitem_p.h>
+
 #include <qmath.h>
 
+#include <QDebug>
+
 const int Hb_Recycle_Buffer_Shrink_Threshold = 2;
 
 HbTreeItemContainerPrivate::HbTreeItemContainerPrivate() :
@@ -89,15 +94,15 @@
     if (nextIndex.isValid()) {
         item = mItems.takeFirst();
 
-        q->itemRemoved(item);
+        delta.setY(delta.y() - item->size().height());
 
-        delta.setY(delta.y() - item->size().height());
+        q->itemRemoved(item);
 
         mItems.append(item);
 
-        q->setItemModelIndex(item, nextIndex);
+        q->itemAdded(mItems.count() - 1, item);
 
-        q->itemAdded(mItems.count() - 1, item);
+        q->setItemModelIndex(item, nextIndex);
     }
 
     return item;
@@ -123,6 +128,8 @@
 
         mItems.insert(0, item);
 
+        q->itemAdded(0, item);
+
         q->setItemModelIndex(item, previousIndex);
 
         qreal itemHeight=0;
@@ -133,11 +140,9 @@
             //The sizehint of the item is dirty.
             itemHeight = item->preferredHeight();
         }
-        
         delta.setY(delta.y() + itemHeight);
+    }
 
-        q->itemAdded(0, item);
-    }
     return item;
 }
 
@@ -156,16 +161,33 @@
     mLayout->setIndentation(indentation);
 }
 
+/*
+    Calculates avarage item height
+*/
+qreal HbTreeItemContainerPrivate::itemHeight() const
+{
+    qreal minHeight = 0.0;
+    if (mItems.count() > 0) {
+        minHeight = mLayout->sizeHint(Qt::PreferredSize).height() / mItems.count();
+    }
+
+    if (minHeight == 0.0) {
+        minHeight = getSmallestItemHeight();
+    }
+
+    return minHeight;
+}
+
 qreal HbTreeItemContainerPrivate::getSmallestItemHeight() const
 {
     Q_Q(const HbTreeItemContainer);
 
-    qreal minHeight = 0;
+    qreal minHeight = 0.0;
     if (mItems.count() > 0) {
         minHeight = mLayout->smallestItemHeight();
     }
 
-    if (minHeight == 0) {
+    if (minHeight == 0.0) {
         QModelIndex index;
         while (mItems.isEmpty()) {
             // in practise following conditions must apply: itemview is empty and scrollTo() has been called.
@@ -189,6 +211,22 @@
     return minHeight;
 }
 
+int HbTreeItemContainerPrivate::mapToLayoutIndex(int index) const
+{
+    int layoutIndex = index;
+
+    int itemCount = mAnimatedItems.count();
+    for (int i = 0; i < itemCount; ++i) {
+        QPair<HbAbstractViewItem *, int> animatedItem = mAnimatedItems.at(i);
+        if (animatedItem.second <= index) {
+            layoutIndex++;
+        }
+    }
+
+    return layoutIndex;
+}
+
+
 
 HbTreeItemContainer::HbTreeItemContainer(QGraphicsItem *parent) :
     HbAbstractItemContainer(*new HbTreeItemContainerPrivate, parent)
@@ -215,15 +253,46 @@
 {
 }
 
+void HbTreeItemContainer::addItem(const QModelIndex &index, bool animate)
+{
+    Q_D(HbTreeItemContainer);
+   
+    // Cancel the collapse & disappear effect if such is ongoing for the given index.
+    int itemCount = d->mAnimatedItems.count();
+    for (int i = 0; i < itemCount; ++i) {
+        QPair<HbAbstractViewItem *, int> animatedItem = d->mAnimatedItems.at(i);
+        if (animatedItem.first->modelIndex() == index) {
+            HbEffect::cancel(animatedItem.first, "collapse");
+            HbEffect::cancel(animatedItem.first, "disappear");
+            break;
+        }
+    }
+
+    HbAbstractItemContainer::addItem(index, animate);
+}
+
+/*!
+    \reimp
+*/
+void HbTreeItemContainer::removeItem(int pos, bool animate)
+{
+    if (animate) {
+        Q_D(HbTreeItemContainer);
+
+        QPair<HbAbstractViewItem *, int> pair(d->mItems.at(pos), pos);
+        d->mAnimatedItems.append(pair);
+    }
+
+    HbAbstractItemContainer::removeItem(pos, animate);
+}
+
 /*!
     \reimp
 */
 void HbTreeItemContainer::itemRemoved(HbAbstractViewItem *item, bool animate)
 {
-    Q_UNUSED(animate);
     Q_D(HbTreeItemContainer);
-
-    d->mLayout->removeItem(item);
+    d->mLayout->removeItem(item, animate);
 }
 
 /*!
@@ -231,10 +300,9 @@
 */
 void HbTreeItemContainer::itemAdded(int index, HbAbstractViewItem *item, bool animate)
 {
-    Q_UNUSED(animate);
     Q_D(HbTreeItemContainer);
 
-    d->mLayout->insertItem(index, item, d->levelForItem(item));
+    d->mLayout->insertItem(d->mapToLayoutIndex(index), item, d->levelForItem(item), animate);
 }
 
 /*!
@@ -256,13 +324,137 @@
     }
 }
 
-
 qreal HbTreeItemContainer::indentation() const
 {
     Q_D(const HbTreeItemContainer);
     return d->mUserIndentation;
 }
 
+QPointF HbTreeItemContainer::recycleItems(const QPointF &delta)
+{
+    Q_D(HbTreeItemContainer);
+
+    if (d->mPrototypes.count() != 1) {
+        return delta;
+    }
+
+    // current invisible area can be scrolled by base class
+    // calculation for that need to be done
+    const qreal diff = d->getDiffWithoutScrollareaCompensation(delta);
+
+    if (diff != 0.0) {
+        HbModelIterator *modelIterator = d->mItemView->modelIterator();
+        qreal result = 0.0;
+        bool doFarJump = false;
+        if (qAbs(diff) > size().height()) {
+            // if huge diff - current buffer does not containt any item that should
+            // be there after jump - because of that use setModelIndexes instead of
+            // recycling items - faster
+            // but it is possible that even if far jump was requested (huge delta)
+            // it can't be done because of model size and current position (at the end)
+            if (diff > 0) {
+                // scrolling down
+                int indexPos = modelIterator->indexPosition(d->mItems.last()->modelIndex())
+                                + d->mItems.count();
+                doFarJump = (indexPos < modelIterator->indexCount());
+            } else {
+                // scrolling up
+                int indexPos = modelIterator->indexPosition(d->mItems.first()->modelIndex())
+                                - d->mItems.count();
+                doFarJump = (indexPos >= 0);
+            }
+        }
+        if (doFarJump) {
+            // start calculations for far jump
+            // take back into account real delta (do jump as far as possible
+            // without leaving it for scroll area) - use delta.y() instead
+            // of calculated diff
+            qreal itemHeight = d->itemHeight();
+            int rowDiff = (int)(delta.y() / itemHeight);
+            QPointF deltaAfterJump(delta.x(), delta.y() - (qreal)rowDiff * itemHeight);
+            // after setModelIndexes will be used it will still be some delta - deltaAfterJump
+            // bottom lines check if those delta can be consumed by scrollArea, if not then
+            // corrections to new index need to be done (otherwise it is possible that scrollArea
+            // will do the rest of scrolling but leave some empty space)
+            qreal diffAfterJump = d->getDiffWithoutScrollareaCompensation(deltaAfterJump);
+            if (diffAfterJump != 0.0) {
+                // this mean that rest of delta can not be handled by scroll area
+                // so jump one item more
+                if (rowDiff < 0.0) {
+                    rowDiff--;
+                } else {
+                    rowDiff++;
+                }
+            }
+            int firstIndexPos = modelIterator->indexPosition(d->mItems.first()->modelIndex());
+            int jumpIndexPos = firstIndexPos + rowDiff;
+            QModelIndex jumpIndex = modelIterator->index(jumpIndexPos);
+            if (!jumpIndex.isValid()) {
+                // get first or last valid index depending on scroll directions
+                if (rowDiff < 0) {// first index
+                    jumpIndex = modelIterator->nextIndex(jumpIndex);
+                } else {// last index
+                    jumpIndex = modelIterator->previousIndex(jumpIndex);
+                }
+            }
+            setModelIndexes(jumpIndex);
+
+            result = -(qreal)rowDiff * itemHeight;
+        }
+        else {
+            QPointF newDelta(0.0, 0.0);
+            HbAbstractViewItem *item = 0;
+            if (diff < 0.0) {
+                while (-newDelta.y() > diff) {
+                    item = d->shiftUpItem(newDelta);
+                    if (!item) {
+                        break;
+                    }
+                }
+            }
+            else {
+                while (-newDelta.y() < diff) {
+                    item = d->shiftDownItem(newDelta);
+                    if (!item) {
+                        break;
+                    }
+                }
+            }
+            qreal layoutPreferredHeight = layout()->preferredHeight();
+            if (layoutPreferredHeight < size().height()) {
+                // in non uniform item list container can change size
+                // while recycling, to catch that layoutPreferredHeight
+                // need to be checked - important case is only when new
+                // containerHeight is smaller than old containerHeight
+                // because only then container can go out of bounds
+                qreal viewSize = itemView()->boundingRect().size().height();
+                if (layoutPreferredHeight + pos().y() < viewSize) {
+                    // position is allways negative
+                    // view out of bounds
+                    if (diff > 0.0) {
+                        QPointF posDiff(pos().x(), 0.0);
+                        while (item
+                               && layoutPreferredHeight - d->mItems.at(0)->size().height() > viewSize
+                               && layoutPreferredHeight + pos().y() - posDiff.y() < viewSize) {
+                            // try to shiftDownMoreItems
+                            item = d->shiftDownItem(posDiff);
+                            layoutPreferredHeight = layout()->preferredHeight();
+                        }
+                        setPos(pos() - posDiff);
+                    }
+                }
+            }
+
+            result = newDelta.y();
+        }
+        QPointF newDelta(delta.x(), delta.y() + result);
+
+        return newDelta;
+    }
+
+    return delta;
+}
+
 void HbTreeItemContainer::setIndentation(qreal indentation)
 {
     Q_D(HbTreeItemContainer);
@@ -273,91 +465,6 @@
 }
 
 /*!
-    \reimp
-*/
-QPointF HbTreeItemContainer::recycleItems(const QPointF &delta)
-{
-    Q_D(HbTreeItemContainer);
-
-    if (d->mPrototypes.count() != 1) {
-        return delta;
-    }
-
-    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();
-        }
-    }
-
-    QPointF newDelta(delta);
-
-    while (hiddenAbove > hiddenBelow + 1) {
-        HbAbstractViewItem *item = d->shiftDownItem(newDelta);
-        if (!item){
-            break;
-        }
-
-        if (!d->visible(item, viewRect)) {
-            hiddenBelow++;
-        }
-        hiddenAbove--;
-    }
-
-    while (hiddenBelow > hiddenAbove + 1) {
-        HbAbstractViewItem *item = d->shiftUpItem(newDelta);
-        if (!item) {
-            break;
-        }
-
-        if (!d->visible( item, viewRect)) {
-            hiddenAbove++;
-        }
-        hiddenBelow--;
-    }
-
-    // during scrolling the x-coordinate of the container is moved to match the 
-    // indentation level of the visible items. 
-    if (!itemView()->isDragging() ) {
-        int minIndent = d->levelForItem(d->mItems[hiddenAbove]);
-        for (int i = hiddenAbove + 1; i < d->mItems.count() - hiddenBelow - 1; i++) {
-            minIndent = qMin(minIndent,d->levelForItem(d->mItems[i]));
-        }
-        // if the indentation level is bigger than the current position, container is moved to right.
-        // pixel amount of one indentation is added to the current position, in deep indentation 
-        // levels this will make the container to show some empty on the left side to indicate that 
-        // the items are not on the root level. This is just a visual trick
-        if (HbApplication::layoutDirection() == Qt::LeftToRight) {
-            if ( minIndent * d->mLayout->indentation() > -pos().x() + d->mLayout->indentation() + 1) {
-                newDelta.setX( newDelta.x() + 1 );
-            } else if ( minIndent * d->mLayout->indentation() < -pos().x() + d->mLayout->indentation()){
-                newDelta.setX( newDelta.x() - 1 );
-            }
-        } 
-    }
-
-    return newDelta;
-}
-
-
-/*!
     Calculates the optimal view item buffer size. When recycling is turned off
     returned buffer same is same as the amount of rows within the model. When 
     recycling is enabled the amount is calculated by dividing the view area with
@@ -387,6 +494,10 @@
                 }
             }
 
+            if (!d->mAnimatedItems.isEmpty()) {
+                targetCount = currentCount;
+            }
+
             // This limits the targetCount not to be larger
             // than row count inside model.
             targetCount = qMin(targetCount, countEstimate);
@@ -413,28 +524,54 @@
     return new HbTreeViewItem();
 }
 
-bool HbTreeItemContainer::isExpanded(const QModelIndex &index) const
-{
-    QVariant flags = itemState(index).value(HbTreeViewItem::ExpansionKey);
-    if (flags.isValid() && flags.toBool() == true) {
-        return true;
-    } else {
-        return false;
-    }
-}
-
-void HbTreeItemContainer::setExpanded(const QModelIndex &index, bool expanded) 
+void HbTreeItemContainer::animationFinished(const HbEffect::EffectStatus &status)
 {
     Q_D(HbTreeItemContainer);
 
-    HbTreeViewItem *item = qobject_cast<HbTreeViewItem *>(itemByIndex(index));
-    if (item) {
-        item->setExpanded(expanded);
-    } 
+    HbAbstractViewItem *item = static_cast<HbAbstractViewItem *>(status.item);
+    item->setFlag(QGraphicsItem::ItemSendsGeometryChanges, false);
+   
+    // Remove item from mAnimatedItems list.
+    int itemCount = d->mAnimatedItems.count();
+    for (int i = 0; i < itemCount; ++i) {
+        QPair<HbAbstractViewItem *, int> animatedItem = d->mAnimatedItems.at(i);
+        if (animatedItem.first == item) {
+            d->mAnimatedItems.removeAt(i);
+            break;
+        }
+    }
+    
+    d->mItems.removeOne(item);
+    d->mLayout->removeAt(d->mLayout->indexOf(item));
+
+    item->resetTransform();
+    item->setOpacity(1.0);
 
-    setItemStateValue(index, HbTreeViewItem::ExpansionKey, expanded);
-    setModelIndexes();
-    d->updateItemBuffer(); // Expanding/Collapsing might resize the buffer.
+    QModelIndex index;
+    int bufferIndex;
+    if (d->mItems.isEmpty()) {
+        index = d->mItemView->modelIterator()->nextIndex(QModelIndex());
+        bufferIndex = 0;
+    } else {
+        index = d->mItemView->modelIterator()->nextIndex(d->mItems.last()->modelIndex());
+        bufferIndex = d->mItems.count();
+        if (!index.isValid()) {
+            index = d->mItemView->modelIterator()->previousIndex(d->mItems.first()->modelIndex());
+            bufferIndex = 0;
+        } 
+    }
+
+    if (index.isValid()) {
+        d->insertItem(item, bufferIndex, index, false);
+
+        if (bufferIndex == 0) {
+            QPointF newPos = pos();
+            newPos.setY(newPos.y() - item->preferredHeight());
+            setPos(newPos);
+        }
+    } else {
+        item->deleteLater();
+    }
 }
 
 #include "moc_hbtreeitemcontainer_p.cpp"
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/itemviews/hbtreeitemcontainer_p.h
--- a/src/hbwidgets/itemviews/hbtreeitemcontainer_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/itemviews/hbtreeitemcontainer_p.h	Mon May 03 12:48:33 2010 +0300
@@ -39,15 +39,15 @@
     explicit HbTreeItemContainer(QGraphicsItem *parent=0);
     virtual ~HbTreeItemContainer();
 
+    virtual void addItem(const QModelIndex &index, bool animate = false);
+    virtual void removeItem(int pos, bool animate = false);
+
     void setIndentation(qreal indentation);
     qreal indentation() const;
 
     QPointF recycleItems(const QPointF &delta);
     int maxItemCount() const;
 
-    bool isExpanded(const QModelIndex &index) const;
-    void setExpanded(const QModelIndex &index, bool expanded);
-
 protected:
 
     HbTreeItemContainer(HbTreeItemContainerPrivate &dd, QGraphicsItem *parent);
@@ -62,6 +62,9 @@
 
     virtual HbAbstractViewItem *createDefaultPrototype() const;
 
+protected slots:
+    void animationFinished(const HbEffect::EffectStatus &status);
+
 private:
     Q_DECLARE_PRIVATE_D(d_ptr, HbTreeItemContainer)
     Q_DISABLE_COPY(HbTreeItemContainer)
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/itemviews/hbtreeitemcontainer_p_p.h
--- a/src/hbwidgets/itemviews/hbtreeitemcontainer_p_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/itemviews/hbtreeitemcontainer_p_p.h	Mon May 03 12:48:33 2010 +0300
@@ -46,10 +46,15 @@
     HbAbstractViewItem *shiftDownItem(QPointF& delta);
     void resolveIndentation();
 
-    qreal getSmallestItemHeight() const; 
+    qreal itemHeight() const;
+    qreal getSmallestItemHeight() const;
+
+    int mapToLayoutIndex(int index) const;
 
     HbTreeLayout *mLayout;
     qreal mUserIndentation;
     qreal mStyleIndentation;
+
+    QList< QPair<HbAbstractViewItem *, int> > mAnimatedItems;
 };
 #endif /* HBTREEITEMCONTAINER_H */
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/itemviews/hbtreeitemselectionmodel_p.cpp
--- a/src/hbwidgets/itemviews/hbtreeitemselectionmodel_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/itemviews/hbtreeitemselectionmodel_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -36,6 +36,9 @@
 
 #include <QDebug>
 
+// For QMAP_INT__ITEM_STATE_DEPRECATED's sake. Removed when QMap<int,QVariant> based state item system is removed
+#include <hbabstractviewitem_p.h>
+
 HbTreeItemSelectionModel::HbTreeItemSelectionModel( QAbstractItemModel          *model, 
                                                     HbAbstractItemViewPrivate   *viewPrivate,
                                                     QObject                     *parent) :
@@ -117,7 +120,10 @@
                         if (item) {
                             item->setCheckState(Qt::PartiallyChecked);
                         } 
+#ifndef QMAP_INT__ITEM_STATE_DEPRECATED
                         mViewPrivate->mContainer->setItemStateValue(parentIndex, HbAbstractViewItem::CheckStateKey, Qt::PartiallyChecked);
+#endif
+                        mViewPrivate->mContainer->setItemTransientStateValue(parentIndex, "checkState", Qt::PartiallyChecked);
                     }
                     parentIndex = parentIndex.parent();
                 }
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/itemviews/hbtreelayout_p.cpp
--- a/src/hbwidgets/itemviews/hbtreelayout_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/itemviews/hbtreelayout_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -24,92 +24,21 @@
 ****************************************************************************/
 
 #include "hbtreelayout_p.h"
+#include "hbtreelayout_p_p.h"
 #include "hblayoututils_p.h"
 
 #include "hbabstractitemcontainer.h"
-#include "hbapplication.h"
-
-#include <QWidget> // for QWIDGETSIZE_MAX
-
-namespace
-{
-static const qreal INVALID_ITEM_HEIGHT = -1.0;
-}
-
-
-/*
-    \private
-    \class HbTreeLayout
-    \brief HbTreeLayout manages geometries of hierarchical tree view contents.
-*/
-
-class HbTreeLayoutPrivate
-{
-public:
-
-    struct TreeItem 
-    {
-        QGraphicsLayoutItem* mItem;
-        int mLevel;
-    };
-
-    HbTreeLayoutPrivate(HbTreeLayout *q_ptr);
-    bool uniformSizedItems() const;
-    qreal calculateSmallestItemHeight() const;
-
-    QList<TreeItem> mItems;
-    HbTreeLayout *q;
-    qreal mIndentation;
-    qreal mSmallestItemHeight;
-};
-
-HbTreeLayoutPrivate::HbTreeLayoutPrivate(HbTreeLayout *q_ptr) :
-    q(q_ptr),
-    mIndentation(15.0),
-    mSmallestItemHeight(INVALID_ITEM_HEIGHT)
-{
-}
-
-bool HbTreeLayoutPrivate::uniformSizedItems() const
-{
-    if (q->parentLayoutItem() && (static_cast<HbAbstractItemContainer *>(q->parentLayoutItem()))->uniformItemSizes() ) {
-        return true;
-    } else {
-        return false;
-    }      
-}
-
-/*!
-    Calculates the smallest item height from all items.
-*/
-qreal HbTreeLayoutPrivate::calculateSmallestItemHeight() const
-{
-    qreal smallestHeight(0);
-    if (uniformSizedItems()) {
-        QGraphicsLayoutItem *firstItem = mItems.value(0).mItem;
-        if (firstItem) {
-            smallestHeight = firstItem->preferredHeight();  
-        } 
-    } else {  
-        int itemCount = mItems.count();
-        if (itemCount > 0) {
-            smallestHeight = mItems.first().mItem->preferredHeight();
-        }
-        for (int i = 1; i < itemCount; ++i) {       
-            smallestHeight = qMin(smallestHeight, mItems.at(i).mItem->preferredHeight());
-        }
-    }
-    return smallestHeight;
-}
-
+#include <hbapplication.h>
+#include <QDebug>
 
 /*!
     Constructor.
     \param parent parent layout item.
  */
 HbTreeLayout::HbTreeLayout(QGraphicsLayoutItem *parent)
-    : QGraphicsLayout(parent), d(new HbTreeLayoutPrivate(this))
+    : QGraphicsLayout(parent), d(new HbTreeLayoutPrivate())
 {
+    d->q_ptr = this;
 }
 
 /*!
@@ -130,9 +59,9 @@
 
     \param item layout item to be added to list.
  */
-void HbTreeLayout::addItem(QGraphicsLayoutItem *item, int level)
+void HbTreeLayout::addItem(QGraphicsLayoutItem *item, int level, bool animate)
 {
-    insertItem( -1, item, level );
+    d->insertItem(-1, item, level, animate);
 }
 
 /*!
@@ -146,20 +75,9 @@
     \param  index position where to insert the layout.
     \param  item layout item to be inserted to stack.
  */
-void HbTreeLayout::insertItem(int index, QGraphicsLayoutItem *item, int level)
+void HbTreeLayout::insertItem(int index, QGraphicsLayoutItem *item, int level, bool animate)
 {
-    index = qMin(index, d->mItems.count());
-    if (index < 0) {
-        index = d->mItems.count();
-    }
-    HbLayoutUtils::addChildItem(this, item);
-
-    HbTreeLayoutPrivate::TreeItem listItem;
-    listItem.mItem = item;
-    listItem.mLevel = level;
-
-    d->mItems.insert( index, listItem);
-    invalidate();
+    d->insertItem(index, item, level, animate);
 }
 
 /*!
@@ -167,10 +85,10 @@
     \param item item to look for.
     \return position of layout item, or -1 if not found.
  */
-int HbTreeLayout::indexOf( QGraphicsLayoutItem *item ) const
+int HbTreeLayout::indexOf(QGraphicsLayoutItem *item) const
 {
-    for ( int i = 0; i < count(); ++i ) {
-        if ( itemAt( i ) == item ) {
+    for (int i = 0; i < count(); ++i) {
+        if (itemAt( i ) == item) {
             return i;
         }
     }
@@ -185,9 +103,13 @@
     \param item item to be removed.
     \sa removeAt
  */
-void HbTreeLayout::removeItem( QGraphicsLayoutItem *item )
+void HbTreeLayout::removeItem(QGraphicsLayoutItem *item, bool animate)
 {
-    removeAt(indexOf(item));
+    if (animate) {
+        invalidate();
+    } else {
+        removeAt(indexOf(item));
+    }
 }
 
 /*!
@@ -241,9 +163,10 @@
     int itemCount = count();
     for (int i = 0; i < itemCount; ++i) {
         HbTreeLayoutPrivate::TreeItem listItem = d->mItems.at(i);
+        QGraphicsLayoutItem *item = listItem.mItem;
 
-        qreal itemHeight = listItem.mItem->preferredHeight();
-        qreal itemWidth = listItem.mItem->preferredWidth();
+        qreal itemHeight = item->preferredHeight();
+        qreal itemWidth = item->preferredWidth();
 
         qreal viewWidth = minimumWidth();
         if (viewWidth > 0.0) {
@@ -261,7 +184,11 @@
             x = d->mIndentation * listItem.mLevel + effectiveRect.left();
         }
 
-        listItem.mItem->setGeometry( QRectF(x, y, itemWidth, itemHeight ) );
+        if (item->graphicsItem()->transform().isScaling()) {
+            itemHeight *= item->graphicsItem()->transform().m22();
+        }
+
+        item->setGeometry( QRectF(x, y, itemWidth, itemHeight ) );
         y += itemHeight;
     }
 }
@@ -381,7 +308,7 @@
 */
 qreal HbTreeLayout::smallestItemHeight() const
 {
-    if (d->mSmallestItemHeight == INVALID_ITEM_HEIGHT) {
+    if (d->mSmallestItemHeight == d->INVALID_ITEM_HEIGHT) {
         d->mSmallestItemHeight = d->calculateSmallestItemHeight();
     }
     return d->mSmallestItemHeight;
@@ -396,7 +323,7 @@
 {
     QGraphicsLayout::invalidate();
 
-    d->mSmallestItemHeight = INVALID_ITEM_HEIGHT;
+    d->mSmallestItemHeight = d->INVALID_ITEM_HEIGHT;
 }
 
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/itemviews/hbtreelayout_p.h
--- a/src/hbwidgets/itemviews/hbtreelayout_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/itemviews/hbtreelayout_p.h	Mon May 03 12:48:33 2010 +0300
@@ -23,25 +23,25 @@
 **
 ****************************************************************************/
 
-#ifndef HBTREELAYOUT_H
-#define HBTREELAYOUT_H
+#ifndef HBTREELAYOUT_P_H
+#define HBTREELAYOUT_P_H
 
 #include <QGraphicsLayout>
 #include <hbglobal.h>
 
+class HbTreeView;
 class HbTreeLayoutPrivate;
-class HbTreeView;
 
 class HB_AUTOTEST_EXPORT HbTreeLayout : public QGraphicsLayout
 {
 public:
-    HbTreeLayout( QGraphicsLayoutItem *parent = 0 );
+    HbTreeLayout(QGraphicsLayoutItem *parent = 0);
     virtual ~HbTreeLayout();
 
-    void addItem(QGraphicsLayoutItem *item, int level);
-    void insertItem(int index, QGraphicsLayoutItem *item, int level);
+    void addItem(QGraphicsLayoutItem *item, int level, bool animate);
+    void insertItem(int index, QGraphicsLayoutItem *item, int level, bool animate);
     int indexOf(QGraphicsLayoutItem *item) const;
-    void removeItem( QGraphicsLayoutItem *item );
+    void removeItem( QGraphicsLayoutItem *item, bool animate );
     void setItemLevel(QGraphicsLayoutItem *item, int level);
     void setIndentation(qreal indentation);
     qreal indentation() const;
@@ -62,5 +62,5 @@
     HbTreeLayoutPrivate *d;
 };
 
-#endif // HBTREELAYOUT_H
+#endif // HBTREELAYOUT_P_H
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/itemviews/hbtreelayout_p_p.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbwidgets/itemviews/hbtreelayout_p_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,128 @@
+/****************************************************************************
+**
+** 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 HbWidgets 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 "hbtreelayout_p.h"
+#include "hbtreelayout_p_p.h"
+#include "hbabstractitemcontainer.h"
+
+#include <hblayoututils_p.h>
+#include <hbabstractviewitem.h>
+#include <hbtreeview.h>
+#include <hbmodeliterator.h>
+
+#include <QWidget> // for QWIDGETSIZE_MAX
+#include <QDebug>
+
+const qreal HbTreeLayoutPrivate::INVALID_ITEM_HEIGHT = -1.0;
+
+HbTreeLayoutPrivate::HbTreeLayoutPrivate()
+    : q_ptr(0),
+    mIndentation(15.0),
+    mSmallestItemHeight(INVALID_ITEM_HEIGHT)
+{
+}
+
+HbTreeLayoutPrivate::~HbTreeLayoutPrivate()
+{
+}
+
+bool HbTreeLayoutPrivate::uniformSizedItems() const
+{
+    if (q_ptr->parentLayoutItem() && (static_cast<HbAbstractItemContainer *>(q_ptr->parentLayoutItem()))->uniformItemSizes() ) {
+        return true;
+    } else {
+        return false;
+    }
+}
+
+/*!
+    Calculates the smallest item height from all items.
+    Calculations don't consider if there is ongoing animation for items
+*/
+qreal HbTreeLayoutPrivate::calculateSmallestItemHeight() const
+{
+    qreal smallestHeight(0);
+    if (uniformSizedItems()) {
+        QGraphicsLayoutItem *firstItem = mItems.value(0).mItem;
+        if (firstItem) {
+            smallestHeight = firstItem->preferredHeight();
+        }
+    } else {
+        int itemCount = mItems.count();
+        if (itemCount > 0) {
+            smallestHeight = mItems.first().mItem->preferredHeight();
+        }
+        for (int i = 1; i < itemCount; ++i) {
+            smallestHeight = qMin(smallestHeight, mItems.at(i).mItem->preferredHeight());
+        }
+    }
+    return smallestHeight;
+}
+
+void HbTreeLayoutPrivate::insertItem(int index, QGraphicsLayoutItem *item, int level, bool animate)
+{
+    Q_UNUSED(animate);
+
+    index = qMin(index, mItems.count());
+    if (index < 0) {
+        index = mItems.count();
+    }
+    HbLayoutUtils::addChildItem(q_ptr, item);
+
+    HbTreeLayoutPrivate::TreeItem listItem;
+    listItem.mItem = item;
+    listItem.mLevel = level;
+
+    mItems.insert(index, listItem);
+    q_ptr->invalidate();
+}
+
+/*
+// For debugging purposes
+void HbTreeLayoutPrivate::checkItemListIntegrity()
+{
+    Q_Q(HbTreeLayout);
+
+    if (!mItems.isEmpty()) {
+        HbModelIterator *iterator = qobject_cast<HbTreeView *>(static_cast<QGraphicsWidget *>(q->parentLayoutItem()->graphicsItem())->parentWidget())->modelIterator();
+
+        int previousItemPosition = -1;
+        for (int i = 0; i < mItems.count(); ++i) {
+            HbAbstractViewItem * item = qobject_cast<HbAbstractViewItem *>(static_cast<QGraphicsWidget *>(mItems.at(i).mItem->graphicsItem()));
+            QModelIndex index = item->modelIndex();
+            if (index.isValid()) {
+                int currentItemPosition = iterator->indexPosition(index);
+                if (previousItemPosition != -1 && currentItemPosition != -1) {
+                    Q_ASSERT((currentItemPosition == (previousItemPosition + 1)));
+                    qDebug() << i << " item model position: " << currentItemPosition;
+                }
+
+                previousItemPosition = currentItemPosition;
+            }
+        }
+    }
+}
+*/
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/itemviews/hbtreelayout_p_p.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbwidgets/itemviews/hbtreelayout_p_p.h	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,68 @@
+/****************************************************************************
+**
+** 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 HbWidgets 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 HBTREELAYOUTPRIVATE_P_P_H
+#define HBTREELAYOUTPRIVATE_P_P_H
+
+#include <QList>
+
+QT_BEGIN_NAMESPACE
+class QGraphicsLayoutItem;
+QT_END_NAMESPACE
+
+class HbTreeLayout;
+
+/*
+    \private
+    \class HbTreeLayout
+    \brief HbTreeLayout manages geometries of hierarchical tree view contents.
+*/
+
+class HbTreeLayoutPrivate
+{
+public:
+    struct TreeItem
+    {
+        QGraphicsLayoutItem* mItem;
+        int mLevel;
+    };
+
+    HbTreeLayoutPrivate();
+    ~HbTreeLayoutPrivate();
+
+    bool uniformSizedItems() const;
+    qreal calculateSmallestItemHeight() const;
+
+    void insertItem(int index, QGraphicsLayoutItem *item, int level, bool animate);
+
+public:
+    QList<TreeItem> mItems;
+    HbTreeLayout *q_ptr;
+    qreal mIndentation;
+    mutable qreal mSmallestItemHeight;
+    static const qreal INVALID_ITEM_HEIGHT;
+};
+
+#endif // HBTREELAYOUTPRIVATE_P_P_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/itemviews/hbtreemodeliterator_p.cpp
--- a/src/hbwidgets/itemviews/hbtreemodeliterator_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/itemviews/hbtreemodeliterator_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -307,12 +307,10 @@
     }
 }
 
-void HbTreeModelIterator::setItemContainer(HbAbstractItemContainer *itemContainer,
-                                           int expansionKey)
+void HbTreeModelIterator::setItemContainer(HbAbstractItemContainer *itemContainer)
 {
     Q_D(HbTreeModelIterator);
     d->mItemContainer = itemContainer;
-    d->mExpansionKey = expansionKey;
 }
 
 bool HbTreeModelIterator::lessThan(const QModelIndex &index1,
@@ -349,13 +347,11 @@
     return (list1Count < list2Count);
 }
 
-void HbTreeModelIterator::itemStateChanged(const QModelIndex &index, int stateKey)
+void HbTreeModelIterator::itemExpansionChanged(const QModelIndex &index)
 {
     Q_UNUSED(index);
     Q_D(HbTreeModelIterator);
-    if (stateKey & d->mExpansionKey) {
-        d->resetCache();
-    }
+    d->resetCache();
 }
 
 void HbTreeModelIterator::rowsInserted(const QModelIndex &parent, int start, int end)
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/itemviews/hbtreemodeliterator_p.h
--- a/src/hbwidgets/itemviews/hbtreemodeliterator_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/itemviews/hbtreemodeliterator_p.h	Mon May 03 12:48:33 2010 +0300
@@ -49,17 +49,15 @@
     QModelIndex nextIndex(const QModelIndex &index) const;
     QModelIndex previousIndex(const QModelIndex &index) const;
 
-    void setItemContainer(HbAbstractItemContainer *itemContainer, int expansionKey);
+    bool lessThan(const QModelIndex &index1, const QModelIndex &index2) const;
 
-    bool lessThan(const QModelIndex &index1, const QModelIndex &index2) const;
+    void setItemContainer(HbAbstractItemContainer *itemContainer);
+    void itemExpansionChanged(const QModelIndex &index);
 
 private:
     void setModel(QAbstractItemModel *model, QModelIndex rootIndex = QModelIndex());
     void setRootIndex(QModelIndex rootIndex);
 
-public slots:
-    void itemStateChanged(const QModelIndex &index, int stateKey);
-
 private slots:
     void rowsInserted(const QModelIndex &parent, int start, int end);
     void rowsRemoved(const QModelIndex &parent, int start, int end);
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/itemviews/hbtreemodeliterator_p_p.cpp
--- a/src/hbwidgets/itemviews/hbtreemodeliterator_p_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/itemviews/hbtreemodeliterator_p_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -30,7 +30,7 @@
 HbTreeModelIteratorPrivate::HbTreeModelIteratorPrivate()
     : HbModelIteratorPrivate(),
     mCachedCount(CachedIndexCount()), mCachedPosition(CachedIndexCount()),
-    mItemContainer(0), mExpansionKey(0), mUseCache(true)
+    mItemContainer(0), mUseCache(true)
 {
 }
 
@@ -152,7 +152,7 @@
 {
     Q_ASSERT(mItemContainer);
     //if (index == mRootIndex) return true; // must be expanded, otherwise mean empty view
-    QVariant flags = mItemContainer->itemState(index).value(mExpansionKey);
+    QVariant flags = mItemContainer->itemTransientState(index).value("expanded");
     if (flags.isValid() && flags.toBool() == true) {
         return true;
     } else {
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/itemviews/hbtreemodeliterator_p_p.h
--- a/src/hbwidgets/itemviews/hbtreemodeliterator_p_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/itemviews/hbtreemodeliterator_p_p.h	Mon May 03 12:48:33 2010 +0300
@@ -68,7 +68,6 @@
     mutable struct CachedIndexCount mCachedPosition;
 
     HbAbstractItemContainer *mItemContainer;
-    int mExpansionKey;
     bool mUseCache;
 };
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/itemviews/hbtreeview.cpp
--- a/src/hbwidgets/itemviews/hbtreeview.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/itemviews/hbtreeview.cpp	Mon May 03 12:48:33 2010 +0300
@@ -34,6 +34,9 @@
 #include <QItemSelection>
 #include <QGraphicsSceneMouseEvent>
 
+// for QMAP_INT__ITEM_STATE_DEPRECATED's sake
+#include <hbabstractviewitem.h>
+
 /*!
     @alpha
     @hbwidgets
@@ -126,9 +129,8 @@
     }
 
     if ( itemRecycling()) {
-        bool itemBuffered = d->mContainer->itemByIndex(newIndex);
-        if (! (     itemBuffered
-                &&  hint == PositionAtTop)) {
+        if (    !d->mContainer->itemByIndex(newIndex)
+            ||  hint != EnsureVisible) {
             if ( hint != PositionAtTop ) {
                 // Following two variable applies only for hint EnsureVisible.
                 // It is position relative to the view
@@ -248,13 +250,32 @@
 
     if (d->isParentValid(parent)) {
         if (isExpanded(parent) || parent == d->mModelIterator->rootIndex()) {
-            HbAbstractItemView::rowsInserted(parent, start, end);
+            int lastStartPoint = 0;
+            for (int i = start; i <= end; ++i) {
+                QModelIndex newParent = d->treeModelIterator()->index(i, parent);
+                int childCount = d->treeModelIterator()->childCount(newParent);
+                if (childCount > 0 && isExpanded(newParent)) {
+                    HbAbstractItemView::rowsInserted(parent, lastStartPoint, i);
+                    lastStartPoint = i;
+                    rowsInserted(newParent, 0, childCount - 1);
+                }
+            }
+
+            HbAbstractItemView::rowsInserted(parent, lastStartPoint, end);
+
+            if (d->animationEnabled(true)) {
+                if (d->mInSetExpanded) {
+                    d->startAppearEffect("treeviewitem", "expand", parent, start, end);
+                } else {
+                    d->startAppearEffect("viewitem", "appear", parent, start, end);
+                }
+            }
         }
 
         HbAbstractViewItem *parentItem = d->mContainer->itemByIndex(parent);
         if (parentItem) {
             parentItem->updateChildItems();
-        }            
+        }
     }
 }
 
@@ -282,10 +303,43 @@
             } 
         }  
 
-        if (isExpanded(parent) || parent == d->mModelIterator->rootIndex()) {
+        if (isExpanded(parent) || parent == d->mModelIterator->rootIndex() || d->mInSetExpanded) {
+            bool animate = d->animationEnabled(false);
+
+            QList<HbAbstractViewItem *> items = d->mContainer->items();
             for (int i = d->mItemsToBeDeleted.count() - 1; i >= 0; --i) {
                 int pos = d->mItemsToBeDeleted.at(i);
-                d->mContainer->removeItem(pos);
+                
+                HbAbstractViewItem *item = items.at(pos);
+                if (item) {
+                    if (animate) {
+                        HbEffect::cancel(item, "appear");
+                        HbEffect::cancel(item, "expand");
+                        
+                        QString effectType;
+                        QString itemType;
+                        if (d->mInSetExpanded) {
+                            effectType = "collapse";
+                            itemType = "treeviewitem";
+                        } else {
+                            effectType = "disappear";
+                            itemType = "viewitem";
+                        }
+
+                        item->setFlag(QGraphicsItem::ItemSendsGeometryChanges, true);
+                        HbEffect::start(item,
+                                itemType,
+                                effectType,
+                                d->mContainer,
+                                "animationFinished");
+                        
+                        if (HbEffect::effectRunning(item, effectType)) {
+                            d->mContainer->removeItem(pos, animate);
+                        }
+                    } else {
+                        d->mContainer->removeItem(pos, animate);
+                    }
+                }
             }
         }
 
@@ -294,8 +348,6 @@
             parentItem->updateChildItems();
         }
     }
-
-    d->mItemsToBeDeleted.clear();
 }
 
 /*!
@@ -305,19 +357,21 @@
 {
     Q_D(HbTreeView);
 
-    d->mItemsToBeDeleted.clear();
+    if (d->isParentValid(index)) {
+        d->mItemsToBeDeleted.clear();
         
-    QList <HbAbstractViewItem *> items = d->mContainer->items();
-    int itemCount = items.count();
+        QList <HbAbstractViewItem *> items = d->mContainer->items();
+        int itemCount = items.count();
 
-    // Add the view items given as parameters and all their child items to a list for deletion.    
-    for (int i = start; i <= end; ++i) {
-        QModelIndex parent = model()->index(i, 0, index);
-        
-        for (int j = 0; j < itemCount; ++j) {
-            QModelIndex itemIndex = items.at(j)->modelIndex();
-            if (itemIndex == parent || d->isChild(itemIndex, parent)) {
-                d->mItemsToBeDeleted.append(j);
+        // Add the view items given as parameters and all their child items to a list for deletion.
+        for (int i = start; i <= end; ++i) {
+            QModelIndex parent = model()->index(i, 0, index);
+
+            for (int j = 0; j < itemCount; ++j) {
+                QModelIndex itemIndex = items.at(j)->modelIndex();
+                if (itemIndex == parent || d->isChild(itemIndex, parent)) {
+                    d->mItemsToBeDeleted.append(j);
+                }
             }
         }
     }
@@ -442,7 +496,7 @@
                             // When node1 will be handled, node2 is unchecked in the map but not yet in the view item
                             childCheckState = parentItems.value(childIndex);
                         } else {
-                            QVariant value = d->mContainer->itemState(childIndex).value(HbTreeViewItem::CheckStateKey);
+                            QVariant value = d->mContainer->itemTransientState(childIndex).value("checkState");
                             if (value.isValid()) {
                                 childCheckState = (Qt::CheckState)value.toInt();
                             }
@@ -478,7 +532,10 @@
                 item->setCheckState(iterator.value());
             } 
 
+#ifndef QMAP_INT__ITEM_STATE_DEPRECATED
             d->mContainer->setItemStateValue(iterator.key(), HbAbstractViewItem::CheckStateKey, iterator.value());
+#endif
+            d->mContainer->setItemTransientStateValue(iterator.key(), "checkState", iterator.value());
             iterator++;
         }
 
@@ -496,9 +553,30 @@
     Q_D(HbTreeView);
 
     if (isExpanded(index) != expanded) {
-        d->treeModelIterator()->itemStateChanged(index, HbTreeViewItem::ExpansionKey);
-        HbTreeItemContainer *container = qobject_cast<HbTreeItemContainer *>(d->mContainer);
-        container->setExpanded(index, expanded);
+        d->mInSetExpanded = true;
+        d->treeModelIterator()->itemExpansionChanged(index);
+
+#ifndef QMAP_INT__ITEM_STATE_DEPRECATED
+        d->mContainer->setItemStateValue(index, HbTreeViewItem::ExpansionKey, expanded);
+#endif
+        d->mContainer->setItemTransientStateValue(index, "expanded", expanded);
+
+        int childCount = d->treeModelIterator()->childCount(index) - 1;
+
+        if (expanded) {
+            rowsAboutToBeInserted(index, 0, childCount);
+            rowsInserted(index, 0, childCount);
+        } else {
+            rowsAboutToBeRemoved(index, 0, childCount);
+            rowsRemoved(index, 0, childCount);
+        }
+
+        HbTreeViewItem *item = qobject_cast<HbTreeViewItem *>(itemByIndex(index));
+        if (item) {
+            item->setExpanded(expanded);
+        } 
+
+        d->mInSetExpanded = false;
     }
 }
 
@@ -511,8 +589,12 @@
 {
     Q_D(const HbTreeView);
 
-    HbTreeItemContainer *container = qobject_cast<HbTreeItemContainer *>(d->mContainer);
-    return container->isExpanded(index);
+    QVariant flags = d->mContainer->itemTransientState(index).value("expanded");
+    if (flags.isValid() && flags.toBool() == true) {
+        return true;
+    } else {
+        return false;
+    }
 }
 /*!
     Overrides default indentation of tree view items defined in style sheet.
@@ -564,41 +646,6 @@
 }
 
 /*!
-    This function handles expanding and collapsing parent items in tree view. 
-    Parent item expands and collapses, when pressed down is released
-    exluding following use cases:
-    \li HbTreeViewItem::selectionAreaContains() has returned true for pressed down
-    \li view is panned or scrolled 
-
-    \sa HbTreeViewItem::selectionAreaContains() 
-*/
-void HbTreeView::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
-{
-    Q_D(HbTreeView);
-
-    HbTreeViewItem* hitItem = qobject_cast<HbTreeViewItem*>(d->itemAt(event->scenePos()));
-
-    // check whether expansion collapsion can be done
-    if (    d->mHitItem
-        &&  d->mHitItem == hitItem
-        &&  hitItem->primitive(HbStyle::P_TreeViewItem_expandicon)
-        &&  hitItem->flags().testFlag(QGraphicsItem::ItemIsFocusable)
-        &&  !d->mWasScrolling
-        &&  (   d->mSelectionMode == SingleSelection
-            || !d->mSelectionSettings.testFlag(HbAbstractItemViewPrivate::Selection))) {
-        Hb::InteractionModifiers modifiers = 0;
-        if (hitItem->isExpanded()) {
-            d->mInstantClickedModifiers |= Hb::ModifierExpandedItem;
-        } else {
-            d->mInstantClickedModifiers |= Hb::ModifierCollapsedItem;
-        }
-        hitItem->setExpanded(!hitItem->isExpanded());
-    }
-
-    HbAbstractItemView::mouseReleaseEvent(event);
-}
-
-/*!
     \reimp
     Tree view has its internal selection model. Implementation of this virtual function is needed
     to take it into use with new model..
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/itemviews/hbtreeview.h
--- a/src/hbwidgets/itemviews/hbtreeview.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/itemviews/hbtreeview.h	Mon May 03 12:48:33 2010 +0300
@@ -73,8 +73,6 @@
 protected:
     HbTreeView(HbTreeViewPrivate &dd, HbAbstractItemContainer *container, QGraphicsItem *parent);
 
-    virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
-
     virtual void currentSelectionChanged(const QItemSelection &selected, const QItemSelection &deselected);
 
     virtual void rowsInserted(const QModelIndex &parent, int start, int end);
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/itemviews/hbtreeview_p.cpp
--- a/src/hbwidgets/itemviews/hbtreeview_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/itemviews/hbtreeview_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -26,15 +26,14 @@
 #include "hbtreeview_p.h"
 #include "hbtreeview.h"
 
-#include "hbtreeviewitem.h"
-#include "hbtreeitemselectionmodel_p.h"
-#include "hbtreemodeliterator_p.h"
+#include "hbabstractitemcontainer.h"
 
 const QString KDefaultLayoutOption = "default";
 
 HbTreeViewPrivate::HbTreeViewPrivate() :
     HbAbstractItemViewPrivate(),
-    mSelectionStarted(false)
+    mSelectionStarted(false),
+    mInSetExpanded(false)
 {
 }
 
@@ -45,13 +44,10 @@
 void HbTreeViewPrivate::init()
 {
     Q_Q(HbTreeView);
-
-    q->setClampingStyle(HbScrollArea::StrictClamping);
-    q->setFrictionEnabled(0);
     q->setItemRecycling(true);
     q->setScrollDirections(Qt::Horizontal | Qt::Vertical);
     mLayoutOptionName = KDefaultLayoutOption;
-    treeModelIterator()->setItemContainer(mContainer, HbTreeViewItem::ExpansionKey);
+    treeModelIterator()->setItemContainer(mContainer);
 }
 
 bool HbTreeViewPrivate::isParentValid(const QModelIndex &parent) const
@@ -107,3 +103,39 @@
     }
     return previousIndex;
 }
+
+/*!
+    \reimp
+*/
+bool HbTreeViewPrivate::handleScrollBar(Qt::Orientation orientation)
+{
+    if (!mContainer->itemRecycling()
+        || orientation == Qt::Horizontal
+        || mContainer->itemPrototypes().count() != 1
+        || mContainer->items().isEmpty()
+        || !mVerticalScrollBar) {
+        return false;
+    } else {
+        return true;
+    }
+}
+
+bool HbTreeViewPrivate::animationEnabled(bool insertOperation)
+{
+    if (mInSetExpanded) {
+        if (insertOperation) {
+            if (mEnabledAnimations & HbAbstractItemView::Expand) {
+                return true;
+            }
+        } else {
+            if (mEnabledAnimations & HbAbstractItemView::Collapse) {
+                return true;
+            }
+        }
+        return false;
+    } else {
+        return HbAbstractItemViewPrivate::animationEnabled(insertOperation);
+
+    }
+}
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/itemviews/hbtreeview_p.h
--- a/src/hbwidgets/itemviews/hbtreeview_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/itemviews/hbtreeview_p.h	Mon May 03 12:48:33 2010 +0300
@@ -54,10 +54,16 @@
     QModelIndex searchIndexUp(const QModelIndex &index,
                                 int  maxStepCount) const;
 
+    bool handleScrollBar(Qt::Orientation orientation);
+
     inline HbTreeModelIterator *treeModelIterator();
 
+    virtual bool animationEnabled(bool insertOperation);
+
     bool mSelectionStarted;
     QList<int> mItemsToBeDeleted;
+
+    bool mInSetExpanded;
 };
 
 HbTreeModelIterator *HbTreeViewPrivate::treeModelIterator()
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/itemviews/hbtreeviewitem.cpp
--- a/src/hbwidgets/itemviews/hbtreeviewitem.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/itemviews/hbtreeviewitem.cpp	Mon May 03 12:48:33 2010 +0300
@@ -26,12 +26,16 @@
 
 #include "hbtreeviewitem.h"
 #include "hbtreeview.h"
-#include "hbnamespace.h"
 #include "hbabstractitemview.h"
-#include "hbstyle.h"
-#include "hbstyleoptiontreeviewitem.h"
 #include "hbabstractitemcontainer.h"
 
+#include <hbnamespace.h>
+#include <hbstyle.h>
+#include <hbstyleoptiontreeviewitem.h>
+#include <hbwidgetfeedback.h>
+#include <hbtapgesture.h>
+#include <hbeffect.h>
+
 #include <QPersistentModelIndex>
 #include <QVariant>
 #include <QDebug>
@@ -54,11 +58,33 @@
 
 */
 
+/*!
+    \deprecated HbTreeViewItem::StateKey
+        is deprecated. Please use string based state keys.
+
+    \enum HbTreeViewItem::StateKey
+
+    HbTreeViewItem's user defined state keys.
+
+    \sa HbAbstractViewItem::transientState()
+*/
+
+/*!
+    \deprecated HbTreeViewItem::ExpansionKey
+        is deprecated. Please use string based state keys. This key is replaced by "expanded".
+
+    \var HbTreeViewItem::ExpansionKey
+    Predefined key for expansion/collapsion state of a view item. Default state is collapsed. 
+*/
+
+
+
 HbTreeViewItemPrivate::HbTreeViewItemPrivate(HbTreeViewItem *prototype) :
-    HbListViewItemPrivate(prototype),
+    HbListViewItemPrivate(prototype, new HbTreeViewItemShared),
     mExpandItem(0),
     mExpanded(false)
 {
+
 }
 
 HbTreeViewItemPrivate::HbTreeViewItemPrivate(const HbTreeViewItemPrivate &source) :
@@ -80,6 +106,14 @@
 {
 }
 
+void HbTreeViewItemPrivate::init()
+{
+    if (isPrototype()) {
+        HbEffect::add("treeviewitem", "treeviewitem_expand", "expand");
+        HbEffect::add("treeviewitem", "treeviewitem_collapse", "collapse");
+    }
+}
+
 int HbTreeViewItemPrivate::modelItemType() const
 {
     const QAbstractItemModel *model = mIndex.model();
@@ -91,24 +125,63 @@
     }
 }
 
-QGraphicsItem *HbTreeViewItemPrivate::updateExpandItem()
+void HbTreeViewItemPrivate::updateExpandItem()
 {
     Q_Q(HbTreeViewItem);
-    QGraphicsItem *item = mExpandItem;
-
-    if (!item) {
-        mItemsChanged = true;
-        item = q->style()->createPrimitive(HbStyle::P_TreeViewItem_expandicon, q);
-    }
 
     HbStyleOptionTreeViewItem styleOption;
     q->initStyleOption(&styleOption);
 
-    q->style()->updatePrimitive(item, HbStyle::P_TreeViewItem_expandicon, &styleOption);
-
-    return item;
+    q->style()->updatePrimitive(mExpandItem, HbStyle::P_TreeViewItem_expandicon, &styleOption);
 }
 
+void HbTreeViewItemPrivate::tapTriggered(QGestureEvent *event)
+{
+    Q_Q(HbTreeViewItem);
+
+    HbTapGesture *gesture = static_cast<HbTapGesture *>(event->gesture(Qt::TapGesture));
+
+    if (gesture->state() == Qt::GestureFinished 
+        && gesture->tapStyleHint() == HbTapGesture::Tap) {
+
+        QPointF position = event->mapToGraphicsScene(gesture->hotSpot());
+        position = q->mapFromScene(position);
+
+        bool inSelectionArea = false;
+        if (mSharedData->mItemView->selectionMode() == HbAbstractItemView::SingleSelection) {
+            inSelectionArea = q->selectionAreaContains(position, HbAbstractViewItem::SingleSelection);
+        } else if (   mSharedData->mItemView->selectionMode() == HbAbstractItemView::MultiSelection
+                   || mSharedData->mItemView->selectionMode() == HbAbstractItemView::ContiguousSelection) {
+            inSelectionArea = q->selectionAreaContains(position, HbAbstractViewItem::MultiSelection);
+        }
+
+        Hb::InteractionModifiers modifiers = 0;
+        if (mExpandItem 
+            && mSharedData->mItemView
+            && (mSharedData->mItemView->selectionMode() == HbAbstractItemView::SingleSelection
+                || !inSelectionArea)) {
+            if (q->isExpanded()) {
+                modifiers |= Hb::ModifierExpandedItem;
+                q->setExpanded(false);
+            } else {
+                modifiers |= Hb::ModifierCollapsedItem;
+                q->setExpanded(true);
+            }
+        }
+
+        HbWidgetFeedback::triggered(q, Hb::InstantReleased, modifiers);
+        q->setPressed(false);
+
+        emit q->activated(position);
+        emit q->released(position);
+        revealItem();
+
+        event->accept();
+    } else {
+        HbListViewItemPrivate::tapTriggered(event);
+    }
+
+}
 
 /*!
     Constructs an tree view item with the given parent.
@@ -118,6 +191,8 @@
 {
     Q_D( HbTreeViewItem );
     d->q_ptr = this;
+
+    d->init();
 }
 
 /*!
@@ -128,6 +203,8 @@
 {
     Q_D( HbTreeViewItem );
     d->q_ptr = this;
+
+    d->init();
 }
 
 /*!
@@ -138,6 +215,8 @@
 {
     Q_D( HbTreeViewItem );
     d->q_ptr = this;
+
+    d->init();
 }
 
 /*!
@@ -171,16 +250,21 @@
 */
 void HbTreeViewItem::updateChildItems()
 {
-    Q_D(HbTreeViewItem);
+    HB_SDD(HbTreeViewItem);
 
     const QAbstractItemModel *model = d->mIndex.model();
 
-    if (model && model->hasChildren(d->mIndex)) {
-        d->mExpandItem = d->updateExpandItem();
-    } else if (d->mExpandItem) {
-        d->mItemsChanged = true;
-        delete d->mExpandItem;
-        d->mExpandItem = 0;
+    if (model && model->hasChildren(d->mIndex) && sd->mUserExpandable) {
+        if (!d->mExpandItem) {
+            d->mExpandItem = style()->createPrimitive(HbStyle::P_TreeViewItem_expandicon, this);
+            d->mItemsChanged = true;
+        }
+    } else {
+        if (d->mExpandItem) {
+            d->mItemsChanged = true;
+            delete d->mExpandItem;
+            d->mExpandItem = 0;
+        }
     }
 
     HbListViewItem::updateChildItems();
@@ -192,7 +276,7 @@
 void HbTreeViewItem::updatePrimitives()
 {
     Q_D(HbTreeViewItem);
-    if(d->mExpandItem) {
+    if (d->mExpandItem) {
         d->updateExpandItem();
     }
     HbListViewItem::updatePrimitives();
@@ -245,6 +329,9 @@
 }
 
 /*!
+     \deprecated HbTreeViewItem::state() const
+        is deprecated. Please use HbTreeViewItem::transientState() instead. 
+
     \reimp
 */
 QMap<int,QVariant> HbTreeViewItem::state() const
@@ -260,6 +347,34 @@
 /*!
     \reimp
 */
+QHash<QString, QVariant> HbTreeViewItem::transientState() const
+{
+    Q_D(const HbTreeViewItem);
+    QHash<QString, QVariant> state = HbListViewItem::transientState();
+    if (d->mExpanded) {
+        state.insert("expanded", d->mExpanded);
+    }
+    return state;
+}
+
+
+/*!
+    \reimp
+*/
+void HbTreeViewItem::setTransientState(const QHash<QString, QVariant> &state)
+{
+    Q_D(HbTreeViewItem);
+
+    HbListViewItem::setTransientState(state);
+    d->mExpanded = state.value("expanded").toBool();
+}
+
+/*!
+     \deprecated HbTreeViewItem::setState(const QMap<int,QVariant> &)
+        is deprecated. Please use HbTreeViewItem::setState(const QHash<QString, QVariant> &state) instead. 
+
+    \reimp
+*/
 void HbTreeViewItem::setState(const QMap<int,QVariant> &state)
 {
     Q_D(HbTreeViewItem);
@@ -289,9 +404,13 @@
 }
 
 /*!
-  Provides access to primitives of HbTreeViewItem.
-  \param primitive is the type of the requested primitive. The available primitives are 
-  \c P_TreeViewItem_expandicon
+
+    \deprecated HbTreeViewItem::primitive(HbStyle::Primitive)
+        is deprecated.
+
+    Provides access to primitives of HbTreeViewItem.
+    \param primitive is the type of the requested primitive. The available primitives are 
+    \c P_TreeViewItem_expandicon
  */
 QGraphicsItem *HbTreeViewItem::primitive(HbStyle::Primitive primitive) const
 {
@@ -303,5 +422,57 @@
     }
 }
 
+/*!
+    Sets items either expandable or non-expandable by the user, depending on the value of \a expandable.
+
+    This method will change the user expandable value for all view items.
+
+    \sa isUserExpandable
+*/
+void HbTreeViewItem::setUserExpandable(bool expandable)
+{
+    HB_SDD(HbTreeViewItem);
+    if (sd->mUserExpandable != expandable) {
+        sd->mUserExpandable = expandable;
+        d->updateCloneItems(true);
+    }
+}
+
+/*!
+    Returns true if the items are expandable by the user; otherwise returns false.
+
+    \sa setUserExpandable
+*/
+bool HbTreeViewItem::isUserExpandable() const
+{
+    HB_SDD(const HbTreeViewItem);
+    return sd->mUserExpandable;
+}
+
+/*!
+    \reimp
+    
+    In the base class the multiselection mode selection area is the whole item. In HbTreeView this is not
+    possible because of the expansion icon. For the HbTreeView the selection area in multiselection mode is 
+    defined by the primitive HbStyle::P_ItemViewItem_touchmultiselection
+*/
+bool HbTreeViewItem::selectionAreaContains(const QPointF &position, SelectionAreaType selectionAreaType) const
+{
+    Q_D(const HbTreeViewItem);
+    if (   selectionAreaType == HbAbstractViewItem::MultiSelection 
+        || selectionAreaType == HbAbstractViewItem::ContiguousSelection) {
+
+        if(     d->mMultiSelectionTouchArea 
+            &&  !d->mMultiSelectionTouchArea->boundingRect().isEmpty()) {
+            return d->mMultiSelectionTouchArea->boundingRect().contains(mapToItem(d->mMultiSelectionTouchArea,position));
+        } else if (d->mSelectionItem) {
+            return d->mSelectionItem->boundingRect().contains(mapToItem(d->mSelectionItem, position));
+        } else {
+            return false;
+        }
+    }
+    return HbAbstractViewItem::selectionAreaContains(position, selectionAreaType);
+}
+
 #include "moc_hbtreeviewitem.cpp"
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/itemviews/hbtreeviewitem.h
--- a/src/hbwidgets/itemviews/hbtreeviewitem.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/itemviews/hbtreeviewitem.h	Mon May 03 12:48:33 2010 +0300
@@ -44,6 +44,7 @@
     Q_OBJECT
 
     Q_PROPERTY(bool expanded READ isExpanded WRITE setExpanded)
+    Q_PROPERTY(bool userExpandable READ isUserExpandable WRITE setUserExpandable)
 
 public:
 
@@ -62,6 +63,9 @@
 
     virtual void updateChildItems();
 
+    virtual QHash<QString, QVariant> transientState() const;
+    virtual void setTransientState(const QHash<QString, QVariant> &state);
+
     virtual QMap<int,QVariant> state() const;
     virtual void setState(const QMap<int,QVariant> &state);
 
@@ -70,6 +74,11 @@
 
     virtual QGraphicsItem *primitive(HbStyle::Primitive primitive) const;
 
+    void setUserExpandable(bool expandable);
+    bool isUserExpandable() const;
+
+    virtual bool selectionAreaContains(const QPointF &position, SelectionAreaType selectionAreaType) const;
+
 public slots:
     void updatePrimitives();
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/itemviews/hbtreeviewitem_p.h
--- a/src/hbwidgets/itemviews/hbtreeviewitem_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/itemviews/hbtreeviewitem_p.h	Mon May 03 12:48:33 2010 +0300
@@ -31,6 +31,20 @@
 
 class QGraphicsItem;
 
+class HbTreeViewItemShared : public HbListViewItemShared
+{
+    public:
+
+        HbTreeViewItemShared() :
+            HbListViewItemShared(),
+            mUserExpandable(true)
+        {
+        }
+
+        bool mUserExpandable;
+};
+
+
 class HbTreeViewItemPrivate : public HbListViewItemPrivate
 {
     Q_DECLARE_PUBLIC(HbTreeViewItem)
@@ -45,11 +59,17 @@
 
     virtual ~HbTreeViewItemPrivate();
 
+    void init();
+
     virtual int modelItemType() const;
 
-    QGraphicsItem *updateExpandItem();
+    void updateExpandItem();
 
+    virtual void tapTriggered(QGestureEvent *event);
     QGraphicsItem *mExpandItem;
+
+public:
+
     bool mExpanded;
 };
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/itemviews/hbtumbleview.cpp
--- a/src/hbwidgets/itemviews/hbtumbleview.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/itemviews/hbtumbleview.cpp	Mon May 03 12:48:33 2010 +0300
@@ -24,12 +24,12 @@
 ****************************************************************************/
 
 #include "hblistview_p.h"
-#include <hbtumbleview.h>
-#include <hbtumbleviewitem.h>
 #include "hblistitemcontainer_p.h"
 #include "hblistitemcontainer_p_p.h"
 #include "hbmodeliterator.h"
 
+#include <hbtumbleview.h>
+#include <hbtumbleviewitem.h>
 #include <hbevent.h>
 #include <hbstyleoption.h>
 
@@ -38,12 +38,15 @@
 
 #define HB_TUMBLE_ITEM_ANIMATION_TIME 500
 #define HB_TUMBLE_PREFERRED_ITEMS 3
+#define DELAYED_SELECT_INTERVAL 100
 
 #define HBTUMBLE_DEBUG
 #ifdef HBTUMBLE_DEBUG
 #include <QDebug>
 #endif
+
 class HbTumbleViewItemContainerPrivate;
+
 class HbTumbleViewItemContainer:public HbListItemContainer
 {
     Q_DECLARE_PRIVATE(HbTumbleViewItemContainer)
@@ -85,26 +88,34 @@
     void selectMiddleItem();
 
     void createPrimitives();
-    void createBackground();
+
+    void delayedSelectCurrent(const QModelIndex& index);
 
     void _q_scrollingStarted();//private slot
     void _q_scrollingEnded();//private slot
+    void _q_delayedSelectCurrent();//private slot
+
+    void setPressedState(HbAbstractViewItem *item);
 
 private:
     qreal mHeight;
-    HbAbstractViewItem *mPrevSelectedItem;
+    QPointer<HbAbstractViewItem> mPrevSelectedItem;
     bool mInternalScroll;
     bool mStartup;//needed for layout request
 
     //geometry prob, some how loop setGeometry call is happening
     QRectF mPrevSetGeometryRect;
 
+    QModelIndex mDelayedSelectIndex;
+    QTimer mDelayedSelectTimer;
+
     //primitives
     QGraphicsItem   *mBackground;
     QGraphicsItem   *mFrame;//overlay
     QGraphicsItem   *mHighlight;
     int             mSelected;
     bool mNeedScrolling;
+    QGraphicsItem   *mDivider;
 };
 
 
@@ -184,8 +195,8 @@
 }
 
 HbTumbleViewItemContainerPrivate::HbTumbleViewItemContainerPrivate()
-    : mIsLooped(false) //TODO: make this true once issues are fixed.
-{ //issues, initial loop creation
+    : mIsLooped(false) 
+{ 
 }
 
 
@@ -259,10 +270,14 @@
     ,mPrevSelectedItem(0)
     ,mInternalScroll(false)
     ,mStartup(true)
+    ,mDelayedSelectIndex()
+    ,mDelayedSelectTimer(0)
     ,mBackground(0)
     ,mFrame(0)
     ,mHighlight(0)
     ,mSelected(-1)
+    ,mNeedScrolling(true)
+    ,mDivider(0)
 {
 }
 
@@ -299,11 +314,12 @@
     q->setVerticalScrollBarPolicy(HbScrollArea::ScrollBarAlwaysOff);
     q->setHorizontalScrollBarPolicy(HbScrollArea::ScrollBarAlwaysOff);
     q->setFrictionEnabled(true);
-
+    mDelayedSelectTimer.setSingleShot(true);
     bool b = q->connect(q,SIGNAL(scrollingStarted()),q,SLOT(_q_scrollingStarted()));
     Q_ASSERT(b);
     b = q->connect(q,SIGNAL(scrollingEnded()),q,SLOT(_q_scrollingEnded()));
     Q_ASSERT(b);
+    b = q->connect(&mDelayedSelectTimer,SIGNAL(timeout()),q,SLOT(_q_delayedSelectCurrent()));
     Q_UNUSED(b);
     createPrimitives();
 }
@@ -322,19 +338,32 @@
 #ifdef HBTUMBLE_DEBUG  
     qDebug() << "HbTumbleViewPrivate::selectMiddleItem - " << item->modelIndex().row() ;
 #endif
-        //clampScroll(item);
-        q->setCurrentIndex(item->modelIndex(),QItemSelectionModel::SelectCurrent);
-        mSelected = item->modelIndex().row();
+            delayedSelectCurrent(item->modelIndex());
+            mSelected = item->modelIndex().row();
+        }
     }
-}
 
 void HbTumbleViewPrivate::scrollTo(const QModelIndex &index, HbAbstractItemView::ScrollHint hint)
 {
+    Q_Q(HbTumbleView);
 #ifdef HBTUMBLE_DEBUG  
     qDebug() << "HbTumbleViewPrivate::scrollTo(" << index.row() << "," << hint << " )";
 #endif
+    if(!q->scene()) {
+        return;
+    }
     
     HbListViewPrivate::scrollTo(index, hint);
+
+    HbAbstractViewItem *item = mContainer->itemByIndex(index);
+    if(item) {
+        setPressedState(item); 
+    } 
+#ifdef HBTUMBLE_DEBUG  
+    else {
+        qDebug() << "HbTumbleViewPrivate::scrollTo(" << index.row() << ",failed to get itembyindex";
+    }
+#endif
 }
 
 void HbTumbleView::scrollTo(const QModelIndex &index, ScrollHint)
@@ -353,25 +382,15 @@
     if(!mHighlight) {
         mHighlight = q->style()->createPrimitive(HbStyle::P_TumbleView_highlight,q);
         q->style()->setItemName(mHighlight,"highlight");
-    } 
+    }
+    if(!mDivider){
+        mDivider = q->style()->createPrimitive(HbStyle::P_DateTimePicker_separator,q);
+        q->style()->setItemName(mDivider,"separator");
+        mDivider->hide();
+    }
 
-    //createBackground(); //done in derived class
-    //the parent item adds multiple tumbleviews and has only one bg.so this is commented
 }
 
-void HbTumbleViewPrivate::createBackground()
-{
-    Q_Q(HbTumbleView);
-    //not called, but used in derived classes to get a bg/frame for single specialized tumbleview
-    if(!mBackground) {
-        mBackground = q->style()->createPrimitive(HbStyle::P_TumbleView_background,q);
-        q->style()->setItemName(mBackground,"background");
-    }
-    if(!mFrame) {
-        mFrame = q->style()->createPrimitive(HbStyle::P_TumbleView_frame,q);
-        q->style()->setItemName(mFrame,"frame");//stays on top of background
-    }
-}
 
 void HbTumbleViewPrivate::calculateItemHeight()
 {
@@ -399,7 +418,30 @@
 
 /*!
     @proto
-    Tumbler Widget. used by datetimepicker. lot of changes to come.
+    \class HbTumbleView 
+    \this is a tumbler widget which lets the user select alphanumeric values from a predefined list of 
+    values via vertical flicking and dragging. Typically widgets such as date picker and time picker use the 
+    Tumbler. The Tumbler could also be used to change other values such as number code sequence, 
+    landmark coordinates, country selection, and currency.
+
+    Only strings can be accepted as HbTumbleView's items.
+
+    \this can be used like this:
+    \snippet{ultimatecodesnippet/ultimatecodesnippet.cpp,52}
+*/
+
+/*!
+    \fn void itemSelected(int index)
+
+    This signal is emitted when an item is selected in date time picker.
+    \param index  selected item.
+
+*/
+
+/*!
+    HbTumbleView's default constructor.
+
+    \param parent item to set as parent.
 */
 HbTumbleView::HbTumbleView(QGraphicsItem *parent)
     :HbListView(*new HbTumbleViewPrivate,
@@ -413,8 +455,10 @@
 }
 
 /*!
-    @proto
-    Tumbler Widget. used by datetimepicker. lot of changes to come.
+    HbTumbleView's constructor.
+
+    \param list to be set as data to QStringListModel.
+    \parent item to set as parent.
 */
 HbTumbleView::HbTumbleView(const QStringList &list,QGraphicsItem *parent)
     :HbListView(*new HbTumbleViewPrivate,
@@ -429,8 +473,7 @@
 }
 
 /*!
-    @proto
-    Tumbler Widget. used by datetimepicker. lot of changes to come.
+    Protected constructor.
 */
 HbTumbleView::HbTumbleView(HbTumbleViewPrivate &dd, QGraphicsItem *parent):
     HbListView(dd,
@@ -443,18 +486,19 @@
 
     d->calculateItemHeight();
 }
+
 /*!
-    @proto
-    Tumbler Widget. used by datetimepicker. lot of changes to come.
+   Destructor
 */
- 
 HbTumbleView::~HbTumbleView()
 {
 }
 
 /*!
-    @proto
-    Tumbler Widget. used by datetimepicker. lot of changes to come.
+    Sets the HbTumbleView's items to the given string \a list.
+
+    \param list Items to be set as tumble view's model.
+
 */
 void HbTumbleView::setItems(const QStringList &list)
 {
@@ -468,8 +512,9 @@
 }
 
 /*!
-    @proto
-    Tumbler Widget. used by datetimepicker. lot of changes to come.
+    Returns items in QStringList format.
+
+    \return list of items in tumbleview's model in QStringList format.
 */
 QStringList HbTumbleView::items() const
 {
@@ -479,9 +524,12 @@
     }
     return QStringList();
 }
+
 /*!
-    @proto
-    Tumbler Widget. used by datetimepicker. lot of changes to come.
+    Sets the selection to the item at \a index.
+
+    \param index to be selected in the tumble view.
+
 */
 void HbTumbleView::setSelected(int index)
 {
@@ -493,24 +541,28 @@
 
     QModelIndex modelIndex = d->mModelIterator->index(index, rootIndex());
     if(modelIndex.isValid()) {
-        setCurrentIndex(modelIndex,QItemSelectionModel::SelectCurrent);
+        d->delayedSelectCurrent(modelIndex);
         emitActivated(modelIndex);
     } 
 }
  
 /*!
-    @proto
-    Tumbler Widget. used by datetimepicker. lot of changes to come.
+    Returns the index of the current selected item in integer format.
+
+    \return current index selected in tumble view.
 */
 int HbTumbleView::selected() const
 {
     return currentIndex().row();
 }
+
 /*!
-    @proto
-    Tumbler Widget. used by datetimepicker. lot of changes to come.
+
+    \deprecated HbTumbleView::primitive(HbStyle::Primitive)
+        is deprecated.
+
+    \reimp
 */
-
 QGraphicsItem *HbTumbleView::primitive(HbStyle::Primitive id) const
 {
     Q_D(const HbTumbleView);
@@ -528,8 +580,15 @@
 }
 
 /*!
-    @proto
-    Tumbler Widget. used by datetimepicker. lot of changes to come.
+    \reimp
+*/
+QGraphicsItem *HbTumbleView::primitive(const QString &itemName) const
+{
+    return HbListView::primitive(itemName);
+}
+
+/*!
+    \reimp
 */
 void HbTumbleView::currentIndexChanged(const QModelIndex &current, const QModelIndex &previous)
 {
@@ -537,16 +596,22 @@
     Q_D(HbTumbleView);
     HbListView::currentIndexChanged(current,previous);
     if(d->mNeedScrolling && current.isValid()){
+        //scrolling
         d->mInternalScroll = true;
         scrollTo(current,PositionAtCenter);
         emit itemSelected(current.row());
         d->mInternalScroll = false;
+
+        //below code should be after scrolling. setModelIndexes should have finished.
+        HbAbstractViewItem *item=d->mContainer->itemByIndex(current);
+        if(item) {
+            d->setPressedState(item);
+        } 
     }
 }
 
 /*!
-    @proto
-    Tumbler Widget. used by datetimepicker. lot of changes to come.
+    \reimp
 */
 void HbTumbleView::updatePrimitives()
 {                   
@@ -563,14 +628,16 @@
     } 
     if(d->mHighlight) {
         style()->updatePrimitive(d->mHighlight,HbStyle::P_TumbleView_highlight,&opt);
-    }   
+    }
+    if(d->mDivider){
+        style()->updatePrimitive(d->mDivider, HbStyle::P_DateTimePicker_separator, &opt);
+    }
     HbListView::updatePrimitives();
 
 }
 
 /*!
-    @proto
-    Tumbler Widget. used by datetimepicker. lot of changes to come.
+   \reimp
 */
 QVariant HbTumbleView::itemChange(GraphicsItemChange change,const QVariant &value)
 {
@@ -582,19 +649,33 @@
 }
 
 /*!
-    @proto
-    Tumbler Widget. used by datetimepicker. lot of changes to come.
+    \reimp
 */
 void HbTumbleView::rowsInserted(const QModelIndex &parent,int start,int end)
 {
-   // Q_D(HbTumbleView);
     HbListView::rowsInserted(parent,start,end);
     scrollTo(currentIndex(),PositionAtCenter);
 }
 
+void HbTumbleViewPrivate::_q_delayedSelectCurrent()
+{
+    Q_Q(HbTumbleView);
+    if(!mIsAnimating && !mIsScrolling) {
+         if(mDelayedSelectIndex == q->currentIndex()){
+             HbAbstractViewItem *item =q->itemByIndex(mDelayedSelectIndex);
+             QPointF delta = pixelsToScroll(item,HbAbstractItemView::PositionAtCenter );
+             QPointF newPos = -mContainer->pos() + delta;
+             checkBoundaries(newPos);
+             scrollByAmount(newPos - (-mContents->pos()));
+         }
+         else{
+            q->setCurrentIndex(mDelayedSelectIndex);
+        }
+    }
+}
+
 /*!
-    @proto
-    Tumbler Widget. used by datetimepicker. lot of changes to come.
+    \reimp
 */
 void HbTumbleView::rowsAboutToBeInserted(const QModelIndex &index, int start, int end)
 {
@@ -602,8 +683,7 @@
 }
 
 /*!
-    @proto
-    Tumbler Widget. used by datetimepicker. lot of changes to come.
+    \reimp
 */
 bool HbTumbleView::event(QEvent *e)
 {
@@ -621,8 +701,7 @@
 }
 
 /*!
-    @proto
-    Tumbler Widget. used by datetimepicker. lot of changes to come.
+    \reimp
 */
 void HbTumbleView::setGeometry(const QRectF &rect)
 {
@@ -648,8 +727,11 @@
 }
 
 /*!
-    @proto
-    Tumbler Widget. used by datetimepicker. lot of changes to come.
+    Sets the looping enabled flag to eith true or false, which makes the tumbleview to scroll in a circular way.
+
+    \param looped flag to enable curcular view.
+
+    \sa isLoopingEnabled
 */
 void HbTumbleView::setLoopingEnabled(bool looped) 
 {
@@ -661,8 +743,12 @@
 }
 
 /*!
-    @proto
-    Tumbler Widget. used by datetimepicker. lot of changes to come.
+    Returns looping enabled flag.
+
+    \return looping enabled flag.
+
+    \sa setLoopingEnabled
+
 */
 bool HbTumbleView::isLoopingEnabled() const
 {
@@ -675,49 +761,29 @@
 }
 
 /*!
-    @proto
-    Tumbler Widget. used by datetimepicker. lot of changes to come.
+    \reimp
 */
 void HbTumbleView::mousePressEvent(QGraphicsSceneMouseEvent *event)
 {
 #ifdef HBTUMBLE_DEBUG
     qDebug() << "HbTumbleView::mousePressEvent";
 #endif
-    Q_D(HbTumbleView);
-    QPointF pt = mapToScene(event->pos());
-    d->mPrevSelectedItem = d->itemAt(pt);
-
     HbListView::mousePressEvent(event);
 }
 
 /*!
-    @proto
-    Tumbler Widget. used by datetimepicker. lot of changes to come.
+    \reimp
 */
 void HbTumbleView::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
 {
 #ifdef HBTUMBLE_DEBUG
     qDebug() << "HbTumbleView::mouseReleaseEvent";
 #endif
-    //Q_D(HbTumbleView);
-    //if(d->mPrevSelectedItem) {
-        //d->mInternalScroll = true;
-    //}
     HbListView::mouseReleaseEvent(event);
-    //TODO: add functinality in HbAbstractItemView or HbScrollArea to stop revealItem
-    //which happens for half visible item tap.
-
-    /*if(d->mPrevSelectedItem) {
-        d->stopAnimating();
-        d->mInternalScroll = false;
-        d->clampScroll(d->mPrevSelectedItem);
-    }*/
-    
 }
 
 /*!
-    @proto
-    Tumbler Widget. used by datetimepicker. lot of changes to come.
+    \reimp
 */
 QSizeF HbTumbleView::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
 {
@@ -730,6 +796,7 @@
             break;
         case Qt::PreferredSize:
             sh = QSizeF(sh.width(),HB_TUMBLE_PREFERRED_ITEMS*d->mHeight);
+            sh.setWidth(HbWidget::sizeHint(which, constraint).width());
             break;
         case Qt::MaximumSize:
             break;
@@ -738,11 +805,8 @@
             break;
     }
     return sh;
-     //TODO:fix sizeHinting.
-    //return HbListView::sizeHint(which,constraint);
 }
  
-
 void HbTumbleViewPrivate::_q_scrollingStarted()
 {
 #ifdef HBTUMBLE_DEBUG
@@ -751,8 +815,8 @@
     if(mInternalScroll) {
         return;
     }
-    mPrevSelectedItem = 0;
 
+    setPressedState(0);//disable current selected item
 }
 
 void HbTumbleViewPrivate::_q_scrollingEnded()
@@ -772,14 +836,31 @@
     QPointF pt = q->mapToScene(q->boundingRect().center());
     HbAbstractViewItem *centerItem=itemAt(pt);
     if(centerItem) {
+        setPressedState(centerItem);
+
         if(centerItem->modelIndex().isValid()) {
-            q->setCurrentIndex(centerItem->modelIndex(),QItemSelectionModel::SelectCurrent);
-            //emit q->itemSelected(centerItem->modelIndex().row());
+            delayedSelectCurrent(centerItem->modelIndex());
             q->emitActivated(centerItem->modelIndex());
         } 
     }
 }
+void HbTumbleViewPrivate::setPressedState(HbAbstractViewItem *item)
+{
+    //set state
+    if(mPrevSelectedItem) {
+        mPrevSelectedItem->setProperty("state","normal");
+    }
 
+    mPrevSelectedItem = item;
+
+    if(mPrevSelectedItem) {
+        mPrevSelectedItem->setProperty("state","selected");
+    }
+}
+
+/*!
+    \reimp
+*/
 void HbTumbleView::rowsAboutToBeRemoved(const QModelIndex &index, int start, int end)
 {
     Q_D(HbTumbleView);
@@ -787,6 +868,9 @@
     HbListView::rowsAboutToBeInserted(index,start,end);
 }
 
+/*!
+    \reimp
+*/
 void HbTumbleView::rowsRemoved(const QModelIndex &parent, int start, int end)
 {
     Q_D(HbTumbleView);
@@ -794,5 +878,10 @@
     HbListView::rowsRemoved(parent,start,end);
     scrollTo(currentIndex(),PositionAtCenter);
 }
+void HbTumbleViewPrivate::delayedSelectCurrent(const QModelIndex& index)
+{
+    mDelayedSelectIndex = index;
+    mDelayedSelectTimer.start(DELAYED_SELECT_INTERVAL);
+}
 
 #include "moc_hbtumbleview.cpp"
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/itemviews/hbtumbleview.h
--- a/src/hbwidgets/itemviews/hbtumbleview.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/itemviews/hbtumbleview.h	Mon May 03 12:48:33 2010 +0300
@@ -37,6 +37,7 @@
     Q_OBJECT
     Q_PROPERTY(QStringList items READ items WRITE setItems)
     Q_PROPERTY(int selected READ selected WRITE setSelected)
+    Q_PROPERTY(bool isLoopingEnabled READ isLoopingEnabled WRITE setLoopingEnabled)
 
 public:
     explicit HbTumbleView(QGraphicsItem *parent=0);
@@ -58,19 +59,21 @@
     int type() const { return Type; }
 
     QGraphicsItem *primitive(HbStyle::Primitive) const;
+    QGraphicsItem *primitive(const QString &itemName) const;
 
 public slots:
-
     void updatePrimitives();
 
 signals:
     void itemSelected(int index);
+
 protected slots:
     void currentIndexChanged(const QModelIndex &current, const QModelIndex &previous);
     void rowsAboutToBeRemoved(const QModelIndex &index, int start, int end);
     void rowsRemoved(const QModelIndex &parent, int start, int end);
     void rowsAboutToBeInserted(const QModelIndex &index, int start, int end);
     void rowsInserted(const QModelIndex &parent, int start, int end);
+
 protected:
     HbTumbleView(HbTumbleViewPrivate &dd, QGraphicsItem *parent = 0);
     void scrollTo(const QModelIndex &index, ScrollHint);
@@ -86,6 +89,7 @@
     Q_DISABLE_COPY(HbTumbleView)
     Q_PRIVATE_SLOT(d_func(), void _q_scrollingStarted())
     Q_PRIVATE_SLOT(d_func(), void _q_scrollingEnded())
+    Q_PRIVATE_SLOT(d_func(), void _q_delayedSelectCurrent())
 };
 
 #endif
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/itemviews/itemviews.pri
--- a/src/hbwidgets/itemviews/itemviews.pri	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/itemviews/itemviews.pri	Mon May 03 12:48:33 2010 +0300
@@ -44,35 +44,36 @@
 PUBLIC_HEADERS += $$PWD/hbtumbleviewitem.h
 PUBLIC_HEADERS += $$PWD/hbmodeliterator.h
 
-INTERNAL_HEADERS += $$PWD/hbabstractitemview_p.h
-INTERNAL_HEADERS += $$PWD/hbabstractitemcontainer_p.h
-INTERNAL_HEADERS += $$PWD/hbabstractviewitem_p.h
-INTERNAL_HEADERS += $$PWD/hbgriditemcontainer_p.h
-INTERNAL_HEADERS += $$PWD/hbgriditemcontainer_p_p.h
-INTERNAL_HEADERS += $$PWD/hbgridlayout_p.h
-INTERNAL_HEADERS += $$PWD/hbgridlayout_p_p.h
-INTERNAL_HEADERS += $$PWD/hbgridview_p.h
-INTERNAL_HEADERS += $$PWD/hbgridviewitem_p.h
-INTERNAL_HEADERS += $$PWD/hbindexfeedback_p.h
-INTERNAL_HEADERS += $$PWD/hblistitemcontainer_p.h
-INTERNAL_HEADERS += $$PWD/hblistitemcontainer_p_p.h
-INTERNAL_HEADERS += $$PWD/hblistlayout_p_p.h
-INTERNAL_HEADERS += $$PWD/hblistlayout_p.h
-INTERNAL_HEADERS += $$PWD/hblistmodel_p.h
-INTERNAL_HEADERS += $$PWD/hblistview_p.h
-INTERNAL_HEADERS += $$PWD/hblistviewitem_p.h
-INTERNAL_HEADERS += $$PWD/hblistwidget_p.h
-INTERNAL_HEADERS += $$PWD/hblistwidgetitem_p.h
-INTERNAL_HEADERS += $$PWD/hbradiobuttonlistviewitem_p.h
-INTERNAL_HEADERS += $$PWD/hbtreeitemcontainer_p.h
-INTERNAL_HEADERS += $$PWD/hbtreeitemcontainer_p_p.h
-INTERNAL_HEADERS += $$PWD/hbtreelayout_p.h
-INTERNAL_HEADERS += $$PWD/hbtreeview_p.h
-INTERNAL_HEADERS += $$PWD/hbtreeviewitem_p.h
-INTERNAL_HEADERS += $$PWD/hbtreeitemselectionmodel_p.h
-INTERNAL_HEADERS += $$PWD/hbmodeliterator_p.h
-INTERNAL_HEADERS += $$PWD/hbtreemodeliterator_p.h
-INTERNAL_HEADERS += $$PWD/hbtreemodeliterator_p_p.h
+PRIVATE_HEADERS += $$PWD/hbabstractitemview_p.h
+PRIVATE_HEADERS += $$PWD/hbabstractitemcontainer_p.h
+PRIVATE_HEADERS += $$PWD/hbabstractviewitem_p.h
+PRIVATE_HEADERS += $$PWD/hbgriditemcontainer_p.h
+PRIVATE_HEADERS += $$PWD/hbgriditemcontainer_p_p.h
+PRIVATE_HEADERS += $$PWD/hbgridlayout_p.h
+PRIVATE_HEADERS += $$PWD/hbgridlayout_p_p.h
+PRIVATE_HEADERS += $$PWD/hbgridview_p.h
+PRIVATE_HEADERS += $$PWD/hbgridviewitem_p.h
+PRIVATE_HEADERS += $$PWD/hbindexfeedback_p.h
+PRIVATE_HEADERS += $$PWD/hblistitemcontainer_p.h
+PRIVATE_HEADERS += $$PWD/hblistitemcontainer_p_p.h
+PRIVATE_HEADERS += $$PWD/hblistlayout_p_p.h
+PRIVATE_HEADERS += $$PWD/hblistlayout_p.h
+PRIVATE_HEADERS += $$PWD/hblistmodel_p.h
+PRIVATE_HEADERS += $$PWD/hblistview_p.h
+PRIVATE_HEADERS += $$PWD/hblistviewitem_p.h
+PRIVATE_HEADERS += $$PWD/hblistwidget_p.h
+PRIVATE_HEADERS += $$PWD/hblistwidgetitem_p.h
+PRIVATE_HEADERS += $$PWD/hbradiobuttonlistviewitem_p.h
+PRIVATE_HEADERS += $$PWD/hbtreeitemcontainer_p.h
+PRIVATE_HEADERS += $$PWD/hbtreeitemcontainer_p_p.h
+PRIVATE_HEADERS += $$PWD/hbtreelayout_p.h
+PRIVATE_HEADERS += $$PWD/hbtreelayout_p_p.h
+PRIVATE_HEADERS += $$PWD/hbtreeview_p.h
+PRIVATE_HEADERS += $$PWD/hbtreeviewitem_p.h
+PRIVATE_HEADERS += $$PWD/hbtreeitemselectionmodel_p.h
+PRIVATE_HEADERS += $$PWD/hbmodeliterator_p.h
+PRIVATE_HEADERS += $$PWD/hbtreemodeliterator_p.h
+PRIVATE_HEADERS += $$PWD/hbtreemodeliterator_p_p.h
 SOURCES += $$PWD/hbabstractitemcontainer.cpp
 SOURCES += $$PWD/hbabstractitemview.cpp
 SOURCES += $$PWD/hbabstractitemview_p.cpp
@@ -101,6 +102,7 @@
 SOURCES += $$PWD/hbradiobuttonlistviewitem_p.cpp
 SOURCES += $$PWD/hbtreeitemcontainer_p.cpp
 SOURCES += $$PWD/hbtreelayout_p.cpp
+SOURCES += $$PWD/hbtreelayout_p_p.cpp
 SOURCES += $$PWD/hbtreeview.cpp
 SOURCES += $$PWD/hbtreeview_p.cpp
 SOURCES += $$PWD/hbtreeviewitem.cpp
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/popups/hbcolordialog.cpp
--- a/src/hbwidgets/popups/hbcolordialog.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/popups/hbcolordialog.cpp	Mon May 03 12:48:33 2010 +0300
@@ -408,8 +408,7 @@
 }
 
 /*!
-  \deprecated HbColorDialog::getColor(const QList<QColor> &colorList, const QColor &initialColor,
-  bool isNoneBlockVisible, bool *isNoneSelected, QGraphicsScene *scene, QGraphicsItem *parent) 
+  \deprecated HbColorDialog::getColor(const QList<QColor>&, const QColor&, bool, bool*, QGraphicsScene*, QGraphicsItem*)
   is deprecated. Please use void HbColorDialog::getColor( const QList<QColor> &colorList, 
   const QColor &initialColor, QObject* receiver, const char* member, bool isNoneBlockVisible, 
   QGraphicsScene *scene, QGraphicsItem *parent ) instead.
@@ -451,8 +450,8 @@
 }
 
 /*!
-  \deprecated QColor HbColorDialog::getColor(bool isNoneBlockVisible, bool *isNoneSelected, QGraphicsScene *scene, QGraphicsItem *parent)
-  is deprecated. Please use 
+  \deprecated HbColorDialog::getColor(bool, bool*, QGraphicsScene*, QGraphicsItem*)
+        is deprecated. Please use
     
   void HbColorDialog::getColor( const QList<QColor> &colorList, 
   const QColor &initialColor,
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/popups/hbcolorgridviewitem.cpp
--- a/src/hbwidgets/popups/hbcolorgridviewitem.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/popups/hbcolorgridviewitem.cpp	Mon May 03 12:48:33 2010 +0300
@@ -49,6 +49,8 @@
     QGraphicsItem *mBorderItem;
     // selection indication
     QGraphicsItem *mCheckMarkItem;
+    // background frame, "grid"
+    HbFrameBackground* mFrameBackGround;
 
 private:
     static HbColorGridViewItemPrivate *d_ptr(HbColorGridViewItem *item)
@@ -63,7 +65,8 @@
     : HbGridViewItemPrivate(prototype),
       mColorItem(0),
       mBorderItem(0),
-      mCheckMarkItem(0)
+      mCheckMarkItem(0),
+      mFrameBackGround(0)
 {
 }
 
@@ -99,6 +102,13 @@
             mCheckMarkItem = q->style()->createPrimitive(HbStyle::P_ColorGridViewItem_checkIcon, q);
             q->style()->setItemName( mCheckMarkItem, "cg-selection-icon" );
     }
+
+    if (!mFrameBackGround) {
+        mFrameBackGround = new HbFrameBackground();
+        mFrameBackGround->setFrameGraphicsName("qtg_fr_popup_grid_normal");
+        mFrameBackGround->setFrameType(HbFrameDrawer::NinePieces);
+        q->setDefaultFrame( *mFrameBackGround );
+    }
 }
 
 void HbColorGridViewItemPrivate::updatePrimitives()
@@ -206,6 +216,7 @@
 void HbColorGridViewItem::initStyleOption(HbStyleOptionColorGridViewItem *option) const
 {
     Q_D( const HbColorGridViewItem ); 
+    HbGridViewItem::initStyleOption(option);
 
     if( d->isNoneBlock() && d->mBorderItem ) {
         option->borderIcon = "qtg_graf_colorpicker_empty";
@@ -215,7 +226,7 @@
     
     option->color = d->mIndex.data(HbColorGridViewItem::ColorRole).value<QColor>(); 
     option->borderColor = HbColorScheme::color("qtc_popup_grid_normal");
-    HbGridViewItem::initStyleOption(option);
+    //    option->background = ;
 }
 
 void HbColorGridViewItem::resizeEvent ( QGraphicsSceneResizeEvent * event )
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/popups/hbinputdialog.cpp
--- a/src/hbwidgets/popups/hbinputdialog.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/popups/hbinputdialog.cpp	Mon May 03 12:48:33 2010 +0300
@@ -26,6 +26,7 @@
 
 #include <hbinputdialog.h>
 #include "hbinputdialog_p.h"
+#include "hbglobal_p.h"
 #include <hblineedit.h>
 #include <hbaction.h>
 #include "hbinputdialogcontent_p.h"
@@ -42,11 +43,26 @@
 /*!
     @beta
     @hbwidgets
+
     \class HbInputDialog
-    \brief Class used to get information from the user.
+    \brief A class used to get information from the user.
+
+    the input value can be a text, int, double or ip address.
 
-    input value can be a text, int, double or ip address. 
+    example code example:
+    \code
+    HbInputDialog *object = new HbInputDialog(parent);
+    object->show();
+    \endcode
+    
+    Four static convenience API's are provided: getText(), getInteger(), getDouble(), and getIp()
     static API's can be used to quickly get an input from user.
+ */
+
+
+/*!
+    Constructor of HbInputDialog
+    \param parent. Parent widget
 */
 HbInputDialog::HbInputDialog(QGraphicsItem* parent) :
                                 HbDialog(*new HbInputDialogPrivate, parent)
@@ -55,6 +71,9 @@
     d->init();
 }
 
+/*!
+    \internal
+*/
 HbInputDialog::HbInputDialog(HbDialogPrivate &dd, QGraphicsItem *parent) :
     HbDialog(dd, parent)
 {
@@ -63,6 +82,9 @@
     d->init();
 }
 
+/*!
+    Destructs the HbInputDialog.
+ */
 HbInputDialog::~HbInputDialog()
 {
 }
@@ -71,8 +93,13 @@
 /*!
     @beta
     Sets the input mode of the primary(Top/default)line edit in the query widget.
-    this can be TextMode, IntMode, RealMode. each mode will affect how the line
-    edit filters its input.
+    
+    \param mode. InputMode can be TextMode, IntMode, RealMode and Ip address mode.
+    each mode will affect how the line edit filters its input.
+    
+    \param row. value 0 or 1
+    
+    \sa inputMode() 
 */	
 void HbInputDialog::setInputMode(InputMode mode ,int row)
 {
@@ -84,6 +111,10 @@
 /*!
     @beta
     Returns input mode for top/default line edit.
+    The default InputMode is TextInput
+    \param row. value 0 or 1
+
+    \sa setInputMode()
 */
 HbInputDialog::InputMode HbInputDialog::inputMode(int row) const
 {
@@ -103,6 +134,11 @@
 /*!
     @beta
     Sets the prompt \a text for top/default line edit.
+
+    \param text. user defined text
+    \param row. value 0 or 1
+
+    \sa promtText()
 */
 void HbInputDialog::setPromptText(const QString &text, int row)
 {
@@ -114,6 +150,10 @@
 /*!
     @beta
     Returns prompt text for top/default line edit.
+    the default is null string.
+    \param row. value 0 or 1
+
+    \sa setPromptText()
 */
 QString HbInputDialog::promptText(int row) const
 {
@@ -124,6 +164,11 @@
 /*!
     @beta
     Sets the top/default line edit value in \a text format.
+
+    \param value. user defined value
+    \param row. value 0 or 1
+
+    \sa value()
 */
 void HbInputDialog::setValue(const QVariant &value,int row)
 {
@@ -134,6 +179,10 @@
 /*!
     @beta
     Returns top/default line edit value as QVariant object.
+
+    \param row. value 0 or 1
+
+    \sa setValue()
 */
 QVariant HbInputDialog::value(int row) const
 {
@@ -144,6 +193,10 @@
 /*!
     @beta
     Sets the visibility of bottom line edit and prompt text.
+
+    \param visible true or false.
+
+    \sa isAdditionalRowVisible()
 */
 void HbInputDialog::setAdditionalRowVisible(bool visible)
 {
@@ -153,7 +206,9 @@
 
 /*!
     @beta
-    Returns the visibility of secondary(bottom line edit and prompt text).
+    Returns the visibility of secondary row(bottom line edit and prompt text).
+    the default is false
+    \sa setAdditionalRowVisible()
 */
 bool HbInputDialog::isAdditionalRowVisible()
 {
@@ -166,8 +221,9 @@
     @beta
     Validator is used to validate the content and cursor movements.
 
-    \note Validator uses undo stack to back out invalid changes. Therefore undo
+    \param validator. Validator uses undo stack to back out invalid changes. Therefore undo
     is enabled when validator is set.
+
     \sa HbAbstractEdit::setValidator
 */
 void HbInputDialog::setValidator(HbValidator *validator,int row)
@@ -183,7 +239,11 @@
 
 /*!
     @beta
-  returns the validator of the inputDialog's line edit.
+    returns the validator of the inputDialog's line edit.
+
+    \param row. A value 0 or 1
+
+    \sa setValidator()
 */
 HbValidator * HbInputDialog::validator(int row) const
 {
@@ -199,7 +259,9 @@
 
 /*!
     @beta
-  returns the lineEdit pointer. will return NULL if row is greater than 2.
+    returns the lineEdit pointer. will return NULL if row is greater than 2.
+
+    \param row. A value 0 or 1
 */
 HbLineEdit* HbInputDialog::lineEdit(int row) const
 {
@@ -214,9 +276,12 @@
 
 /*!
     @beta
-  sets the echo mode for the given row.
+    sets the echo mode for the given row.
 
-  \sa HbLineEdit::setEchoMode
+    \param echoMode
+    \param row. A value 0 or 1
+
+    \sa HbLineEdit::setEchoMode
 */
 void HbInputDialog::setEchoMode(HbLineEdit::EchoMode echoMode,int row)
 {
@@ -233,10 +298,13 @@
 
 
 /*!
-    @beta
+
+    \deprecated HbInputDialog::primitive(HbStyle::Primitive)
+        is deprecated.
+    
     Provides access to primitives of HbInputDialog. 
     \param primitive is the type of the requested primitive. The available 
-    primitives are P_InputDialog_text, and P_InputDialog_additional_text.
+    primitives are P_InputDialog_text, and P_InputDialog_additionaltext.
 
 */
 QGraphicsItem* HbInputDialog::primitive(HbStyle::Primitive primitive) const
@@ -245,7 +313,7 @@
     switch (primitive) {
     case HbStyle::P_InputDialog_text:
         return d->mContentWidget->mLabel1;
-    case HbStyle::P_InputDialog_additional_text:
+    case HbStyle::P_InputDialog_additionaltext:
         return d->mContentWidget->mLabel2;
     default:
         return 0;
@@ -269,7 +337,6 @@
 /*!
     @beta
     updatePrimitives.
-
 */
 void HbInputDialog::updatePrimitives()
 {
@@ -282,14 +349,18 @@
     }
 
     if (d->mContentWidget->mLabel2 && d->mContentWidget->mAdditionalRowVisible) {
-        style()->updatePrimitive(d->mContentWidget->mLabel2, HbStyle::P_InputDialog_additional_text, &option);
+        style()->updatePrimitive(d->mContentWidget->mLabel2, HbStyle::P_InputDialog_additionaltext, &option);
     }
 }
 
 
 /*!
     @beta
-  returns the echoMode of line edit. returns -1 if row is more than 2.
+    returns the echoMode of line edit. returns -1 if row is more than 2.
+
+    \param row. A value 0 or 1
+
+    \sa setEchoMode()
   */
 HbLineEdit::EchoMode HbInputDialog::echoMode(int row) const
 {
@@ -336,7 +407,9 @@
 }
 
 /*!
-    @deprecated HbInputDialog::getText(const QString&,const QString&,bool*,QGraphicsScene*,QGraphicsItem*)
+    \deprecated HbInputDialog::getText(const QString&,const QString&,bool*,QGraphicsScene*,QGraphicsItem*)
+        is deprecated. Please use the other available getText API.
+
     Static convenience function to get a string from the user. \a
     label is the text which is shown to the user (it should
     say what should be entered). \a text is the default text which is
@@ -353,6 +426,7 @@
 QString HbInputDialog::getText(const QString &label,const QString &text,
                                 bool *ok, QGraphicsScene *scene, QGraphicsItem *parent)
 {
+    HB_DEPRECATED("HbInputDialog::getText is deprecated. Please use HbInputDialog::getText((const QString&, QObject*, const char*, const QString&, QGraphicsScene*, QGraphicsItem*) instead.");
     Q_UNUSED(parent);//this is a bug in popup framework, cannot set parent will affect fading
 
     HbInputDialog *dlg = new HbInputDialog();
@@ -411,7 +485,9 @@
     dlg->open(receiver,member);
 }
 /*!
-    @deprecated HbInputDialog::getInteger(const QString&,int,bool*,QGraphicsScene*,QGraphicsItem*)
+     \deprecated HbInputDialog::getInteger(const QString&,int,bool*,QGraphicsScene*,QGraphicsItem*)
+        is deprecated. Please use the other available HbInputDialog::getInteger API.
+
     Static convenience function to get an integer input from the
     user.\a label is the text which is shown to the user
     (it should say what should be entered). \a value is the default
@@ -427,6 +503,8 @@
 int HbInputDialog::getInteger(const QString &label, int value,
                             bool *ok,QGraphicsScene *scene,QGraphicsItem *parent)
 {
+    HB_DEPRECATED("HbInputDialog::getInteger is deprecated. Please use HbInputDialog::getInteger(const QString&, QObject*, const char*,int,QGraphicsScene*,QGraphicsItem *) instead.");
+
     Q_UNUSED(parent)
 
     HbInputDialog *dlg = new HbInputDialog();
@@ -457,7 +535,6 @@
 
 
 /*!
-    @beta
     Static convenience function to get a floating point number from
     the user.\a label is the text which is shown to the user
     (it should say what should be entered). \a value is the default
@@ -490,7 +567,9 @@
 
 
 /*!
-    @deprecated HbInputDialog::getDouble(const QString &,double,bool*,QGraphicsScene*,QGraphicsItem*)
+    \deprecated HbInputDialog::getDouble(const QString &,double,bool*,QGraphicsScene*,QGraphicsItem*)
+        is deprecated. Please use the other available HbInputDialog::getDouble(...) API.
+
     Static convenience function to get a floating point number from
     the user.\a label is the text which is shown to the user
     (it should say what should be entered). \a value is the default
@@ -508,6 +587,8 @@
 double HbInputDialog::getDouble(const QString &label, double value, 
                                 bool *ok, QGraphicsScene *scene, QGraphicsItem *parent)
 {
+    HB_DEPRECATED("HbInputDialog::getDouble is deprecated.Please use HbInputDialog::getDouble(const QString&, QObject*,const char*,double, QGraphicsItem*) instead.");
+
     Q_UNUSED(parent)
 
     HbInputDialog *dlg = new HbInputDialog();
@@ -570,7 +651,9 @@
 
 
 /*!
-    @deprecated HbInputDialog::getIp(const QString &,const QString&, bool *,QGraphicsScene*,QGraphicsItem*)
+    \deprecated HbInputDialog::getIp(const QString &,const QString&, bool *,QGraphicsScene*,QGraphicsItem*)
+        is deprecated. Please use the other available HbInputDialog::getIp API.
+
     Static convenience function to get a ip address from
     the user.\a label is the text which is shown to the user
     (it should say what should be entered). \a address is the default
@@ -588,6 +671,8 @@
 QString HbInputDialog::getIp(const QString &label, const QString &ipaddress, bool *ok, QGraphicsScene *scene, 
                                     QGraphicsItem *parent)
 {
+    HB_DEPRECATED("HbInputDialog::getIp is deprecated. Please use HbInputDialog::getIp(const QString &,QObject *,const char *,const QString &, QGraphicsScene *, QGraphicsItem *)");
+
     Q_UNUSED(parent)
 
     HbInputDialog *dlg = new HbInputDialog();
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/popups/hbinputdialog_p.cpp
--- a/src/hbwidgets/popups/hbinputdialog_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/popups/hbinputdialog_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -61,7 +61,7 @@
     mAdditionalRowVisible = visible;
 
     if(!mLabel2 && visible) {
-        mLabel2 = style()->createPrimitive(HbStyle::P_InputDialog_additional_text,this);
+        mLabel2 = style()->createPrimitive(HbStyle::P_InputDialog_additionaltext,this);
     }
 
     if(!mEdit2 && visible) {
@@ -143,95 +143,58 @@
 void HbInputDialogPrivate::setInputMode(HbLineEdit *pEdit, HbInputDialog::InputMode mode)
 {
     Q_Q(HbInputDialog);
-#ifdef HBINPUTDIALOG_DEBUG
-    qDebug()<<"Entering setInputMode";
-#endif
-    HbEditorInterface eInt(pEdit);
+
     switch(mode) {
     case HbInputDialog::TextInput:
-#ifdef HBINPUTDIALOG_DEBUG
-        qDebug()<<"TextInputMode";
-#endif
-        eInt.setConstraints(HbEditorConstraintNone);
         break;
+
     case HbInputDialog::IntInput: 
-    {
-#ifdef HBINPUTDIALOG_DEBUG
-        qDebug()<<"IntInputMode";
-#endif
-        //set the validator
-        if(mValid) {
-            // NOTE:This validation is for readability. mValid is being deleted 
-            // when setValidator is called on editor.
-            mValid = 0;
+        {
+            //set the validator
+            if(mValid) {
+                // NOTE:This validation is for readability. mValid is being deleted 
+                // when setValidator is called on editor.
+                mValid = 0;
+            }
+            mValid = new HbValidator();
+            QValidator *intValidator = new QIntValidator(q);
+            mValid->addField(intValidator, "0");
+            pEdit->setValidator(mValid);
+
+            pEdit->setInputMethodHints(Qt::ImhDigitsOnly);
+
+            break;
         }
-        mValid = new HbValidator();
-        QValidator *intValidator = new QIntValidator(q);
-        mValid->addField(intValidator, "0");
-        pEdit->setValidator(mValid);
-
-        eInt.setConstraints(HbEditorConstraintFixedInputMode);
-        eInt.setInputMode(HbInputModeNumeric);
-        //eInt.setFilter(HbConverterNumberFilter::instance());
-/*          Old custom button API has been deprecated for some time now. Commented out to prevent a build break.
-             customButtonBank = HbInputCustomButtonStore::instance()->newBank();
-        1, intValidator->locale().negativeSign(), intValidator->locale().negativeSign());
-        mCustomButtonBank->addButton(mDashButton);
-            dashButton = new HbInputCustomButton(HbInputCustomButton::HbCustomButtonShortcut,
-                1, intValidator->locale().negativeSign(), intValidator->locale().negativeSign());
-            customButtonBank->addButton(dashButton);
-            eInt.setCustomButtonBank(customButtonBank->id());  */
-
-        break;
-    }
     case HbInputDialog::RealInput:
-    {
-#ifdef HBINPUTDIALOG_DEBUG
-        qDebug()<<"RealInputMode";
-#endif
-        //set the validator
-        if(mValid) {
-            mValid = 0;
-        }
-            
-        mValid = new HbValidator();
-        QValidator *doubleValidator = new QDoubleValidator(q);
-        mValid->addField(doubleValidator, "0");
-        pEdit->setValidator(mValid);
-        
-        eInt.setConstraints(HbEditorConstraintFixedInputMode);
-        eInt.setInputMode(HbInputModeNumeric);
-        //eInt.setFilter(HbConverterNumberFilter::instance());
-/*          Old custom button API has been deprecated for some time now. Commented out to prevent a build break.
-            customButtonBank = HbInputCustomButtonStore::instance()->newBank();
-            dotButton = new HbInputCustomButton(HbInputCustomButton::HbCustomButtonShortcut,
-                0, doubleValidator->locale().decimalPoint(), doubleValidator->locale().decimalPoint());
-            customButtonBank->addButton(dotButton);
-            dashButton = new HbInputCustomButton(HbInputCustomButton::HbCustomButtonShortcut,
-                1, doubleValidator->locale().negativeSign(), doubleValidator->locale().negativeSign());
-            customButtonBank->addButton(dashButton);
-            eInt.setCustomButtonBank(customButtonBank->id()); */
-            
-        break;
-    }                     
+        {
+            //set the validator
+            if(mValid) {
+                mValid = 0;
+            }
+
+            mValid = new HbValidator();
+            QValidator *doubleValidator = new QDoubleValidator(q);
+            mValid->addField(doubleValidator, "0");
+            pEdit->setValidator(mValid);
+
+            pEdit->setInputMethodHints(Qt::ImhFormattedNumbersOnly);
+
+            break;
+        }                     
     case HbInputDialog::IpInput:
-    {
-        mValid = new HbValidator;
-        QRegExp r("\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}");
-        mValid->setMasterValidator(new QRegExpValidator(r,0));
-        mValid->addField(new QIntValidator(0,255,0),"127");
-        mValid->addSeparator(QString("."));
-        mValid->addField(new QIntValidator(0,255,0),"0");
-        mValid->addSeparator(QString("."));
-        mValid->addField(new QIntValidator(0,255,0),"0");
-        mValid->addSeparator(QString("."));
-        mValid->addField(new QIntValidator(0,255,0),"1");
+        {
+            mValid = new HbValidator;
+            mValid->setDefaultSeparator(".");
+            mValid->addField(new QIntValidator(0, 255, 0), "127");
+            mValid->addField(new QIntValidator(0, 255, 0), "0");
+            mValid->addField(new QIntValidator(0, 255, 0), "0");
+            mValid->addField(new QIntValidator(0, 255, 0), "1");
 
-        pEdit->setValidator(mValid);
-        eInt.setInputMode(HbInputModeNumeric);
+            pEdit->setValidator(mValid);
+            pEdit->setInputMethodHints(Qt::ImhDigitsOnly);
 
-        break;
-    }  
+            break;
+        }  
     default:
         break;
     }
@@ -270,7 +233,7 @@
         mPromptAdditionalText = text;
         q->initStyleOption(&option);
         if(mContentWidget->mAdditionalRowVisible) {
-           q->style()->updatePrimitive(mContentWidget->mLabel2,HbStyle::P_InputDialog_additional_text,&option);
+           q->style()->updatePrimitive(mContentWidget->mLabel2,HbStyle::P_InputDialog_additionaltext,&option);
         }
     }
 }
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/popups/hblistdialog.cpp
--- a/src/hbwidgets/popups/hblistdialog.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/popups/hblistdialog.cpp	Mon May 03 12:48:33 2010 +0300
@@ -29,20 +29,29 @@
 #include "hbaction.h"
 #include "hbabstractviewitem.h"
 #include <hbinstance.h>
+#include "hbglobal_p.h"
 
-#include <QtGui>
 #include <QtDebug>
 #include <QGraphicsScene>
 #include <hblistwidgetitem.h>
 #include <hblistwidget.h>
 #include <hbradiobuttonlist.h>
 /*!
-  @beta
+  \this class is deprecated. Use HbSelectionDialog.
+*/
+
+/*!
+  \deprecated HbListDialog(QGraphicsItem*)
+	is deprecated. \this is deprecated, use HbSelectionDialog.
+
   Constructor	
 */
+
 HbListDialog::HbListDialog(QGraphicsItem* parent): 
                                 HbDialog(*new HbListDialogPrivate, parent)
 {
+	HB_DEPRECATED("HbListDialog class is deprecated. Use HbSelectionDialog");
+
     Q_D(HbListDialog);
     d->init();
     setDismissPolicy(NoDismiss);
@@ -195,8 +204,7 @@
 	Q_D(const HbListDialog);
 	return d->model();
 }
-/*!
-    @beta
+/*!                                  
     Static convenience function to let the user select item(s) from a
     string list. \a label is the text which is shown to the user (it
     should say what should be entered). \a list is the string list which 
@@ -239,8 +247,7 @@
 }
 
 /*!
-    @beta
-    Static convenience function to let the user select item(s) from a
+   Static convenience function to let the user select item(s) from a
     list of user defined items. \a label is the text which is shown to the 
     user (it should say what should be entered). \a list is the list 
     of user defined items shown to the user.Ownership is not transferred.
@@ -282,7 +289,6 @@
 }
 
 /*!
-    @beta
     Static convenience function to let the user select item(s) from a
     list of items defined by a user set model.\a label is the text which 
     is shown to the user (it should say what should be entered). \a model 
@@ -318,8 +324,10 @@
 
 
 /*!
-    @deprecated HbListDialog::getStringItems(const QString&,const QStringList,int,bool*,HbAbstractItemView::SelectionMode,QGraphicsScene*,QGraphicsItem*)
-    Static convenience function to let the user select item(s) from a
+    \deprecated HbListDialog::getStringItems(const QString&,const QStringList,int,bool*,HbAbstractItemView::SelectionMode,QGraphicsScene*,QGraphicsItem*)
+        is deprecated. Please use the other available HbListDialog::getStringItems(...) API.
+    
+	Static convenience function to let the user select item(s) from a
     string list. \a label is the text which is shown to the user (it
     should say what should be entered). \a list is the string list which 
     is inserted into the list and \a current is 
@@ -338,6 +346,8 @@
 QStringList HbListDialog::getStringItems(const QString &label, const QStringList &list,int current,
                                                 bool *ok,HbAbstractItemView::SelectionMode mode, QGraphicsScene *scene, QGraphicsItem *parent)
 {
+    HB_DEPRECATED("HbListDialog::getStringItems is deprecated. Use HbListDialog::getStringItems(const QString &,const QStringList &,QObject *receiver,const char *,int,HbAbstractItemView::SelectionMode, QGraphicsScene *, QGraphicsItem *)");
+
 	Q_UNUSED(parent)
 	
 	HbListDialog *dlg = new HbListDialog();
@@ -370,7 +380,9 @@
 }
 
 /*!
-    @deprecated HbListDialog::getWidgetItems(const QString &, QList<HbListWidgetItem*> &,int,bool *,HbAbstractItemView::SelectionMode, QGraphicsScene *, QGraphicsItem *)
+    \deprecated HbListDialog::getWidgetItems(const QString &, QList<HbListWidgetItem*> &,int,bool *,HbAbstractItemView::SelectionMode, QGraphicsScene *, QGraphicsItem *)
+        is deprecated. Use the other available HbListDialog::getWidgetItems(...) API.
+
     Static convenience function to let the user select item(s) from a
     list of user defined items. \a label is the text which is shown to the 
     user (it should say what should be entered). \a list is the list 
@@ -390,6 +402,8 @@
 QList<HbListWidgetItem*> HbListDialog::getWidgetItems(const QString &label, QList<HbListWidgetItem*> &list,int current,
                                                         bool *ok,HbAbstractItemView::SelectionMode mode, QGraphicsScene *scene, QGraphicsItem *parent)
 {
+    HB_DEPRECATED("HbListDialog::getWidgetItems is deprecated. Use HbListDialog::getWidgetItems(const QString &, QList<HbListWidgetItem*> &list,QObject *,const char *,int,HbAbstractItemView::SelectionMode, QGraphicsScene *, QGraphicsItem *)");
+
     Q_UNUSED(parent)
     HbListDialog *dlg = new HbListDialog();
     if (scene) {
@@ -423,7 +437,9 @@
 }
 
 /*!
-    @deprecated HbListDialog::getModelIndexes(const QString &, QAbstractItemModel* ,bool *,HbAbstractItemView::SelectionMode , QGraphicsScene *, QGraphicsItem *)
+    \deprecated HbListDialog::getModelIndexes(const QString &, QAbstractItemModel* ,bool *,HbAbstractItemView::SelectionMode , QGraphicsScene *, QGraphicsItem *)
+        is deprecated. Use the other available HbListDialog::getModexIndexes(...) API.
+
     Static convenience function to let the user select item(s) from a
     list of items defined by a user set model.\a label is the text which 
     is shown to the user (it should say what should be entered). \a model 
@@ -441,6 +457,8 @@
 */
 QModelIndexList HbListDialog::getModelIndexes(const QString &label, QAbstractItemModel* model,bool *ok,HbAbstractItemView::SelectionMode mode, QGraphicsScene *scene, QGraphicsItem *parent)
 {
+    HB_DEPRECATED("HbListDialog::getModelIndexes is deprecated. Use HbListDialog::getModelIndexes(const QString &, QAbstractItemModel*,QObject *,const char *,HbAbstractItemView::SelectionMode, QGraphicsScene *, QGraphicsItem *)");
+
     Q_UNUSED(parent)
     HbListDialog *dlg = new HbListDialog();
     if (scene) {
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/popups/hblistdialog_p.cpp
--- a/src/hbwidgets/popups/hblistdialog_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/popups/hblistdialog_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -153,15 +153,6 @@
     q->setTimeout(0);
     q->setModal(true);
 
-    createPrimitives();
-}
-
-void HbListDialogPrivate::createPrimitives()
-{
-}
-
-void HbListDialogPrivate::updatePrimitives()
-{
 }
 
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/popups/hblistdialog_p.h
--- a/src/hbwidgets/popups/hblistdialog_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/popups/hblistdialog_p.h	Mon May 03 12:48:33 2010 +0300
@@ -69,8 +69,6 @@
 	HbAbstractItemView::SelectionMode mSelectionMode;
     int mSelectedIndex; //for noselection mode
     QModelIndex mSelectedModelIndex;
-	void createPrimitives();
-    void updatePrimitives();
     void close();
 };
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/popups/hbmessagebox.cpp
--- a/src/hbwidgets/popups/hbmessagebox.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/popups/hbmessagebox.cpp	Mon May 03 12:48:33 2010 +0300
@@ -32,6 +32,7 @@
 #include <hblineedit.h>
 #include <hbscrollbar.h>
 #include <hbscrollarea.h>
+#include "hbglobal_p.h"
 #include <QGraphicsItem>
 #include <QGraphicsSceneMouseEvent>
 #include <QTimer>
@@ -51,6 +52,7 @@
 		clearContextMenuFlag(Hb::ShowTextContextMenuOnLongPress);
 		clearContextMenuFlag(Hb::ShowTextContextMenuOnSelectionClicked);
 		primitive(HbStyle::P_LineEdit_frame_normal)->setVisible(false);		
+		primitive(HbStyle::P_LineEdit_frame_highlight)->setVisible(false);		
 	}
 
 	HbScrollBar * getScrollBar() const
@@ -61,9 +63,12 @@
 
 	void focusInEvent(QFocusEvent * event)
 	{
-		 HbAbstractEdit::focusInEvent(event);
+		Q_UNUSED(event);		 
 	}
-
+	void focusOutEvent(QFocusEvent * event)
+	{
+		Q_UNUSED(event);
+	}
 
 };
 
@@ -99,12 +104,13 @@
     mIconAlignment(Qt::AlignCenter),
 	mMessageBoxContentWidget(0),
 	mMessageBoxType(HbMessageBox::MessageTypeInformation),
-	mIconVisible(true),
-	gestureFilter(0),
-	gesture(0)
+	mIconVisible(true)
 {
 }
 
+void HbMessageBoxPrivate::_q_closeOnGesture()
+{
+}
 
 /*
     destructor
@@ -123,11 +129,10 @@
     switch(mMessageBoxType) {
     case HbMessageBox::MessageTypeInformation:
 	case HbMessageBox::MessageTypeWarning:
-        q->setTimeout(0);
 		mMessageBoxContentWidget = new HbMessageBoxContentWidget( this );
         q->setContentWidget( mMessageBoxContentWidget );
-        q->setDismissPolicy(HbPopup::TapAnywhere);
-        q->setTimeout( timeoutValue( HbPopup::StandardTimeout ) );
+		q->setDismissPolicy(HbPopup::NoDismiss);
+		q->setTimeout(HbPopup::NoTimeout);      
 		q->setPrimaryAction(new HbAction(q->tr("OK"), q));
         break;
 
@@ -141,23 +146,8 @@
         break;
     }
 
-	gestureFilter = new HbGestureSceneFilter(Qt::LeftButton, q); 
-	gesture = new HbGesture(HbGesture::pan,20);
-	// Add gestures to gestureFilter for panning 
-	gestureFilter->addGesture(gesture);
-	QObject::connect(gesture, SIGNAL(panned(QPointF)),
-			q, SLOT(_q_closeOnGesture()));
-	// Install sceneEvent filter
-	q->installSceneEventFilter(gestureFilter);
-
 }
 
-void HbMessageBoxPrivate::_q_closeOnGesture()
-{
-    Q_Q(HbMessageBox);
-    if(dismissPolicy != HbPopup::NoDismiss)
-        q->close();
-}
 
 /*!
     @beta
@@ -168,6 +158,48 @@
     HbMessageBox is derived from HbDialog that provides most of functionality such as
     modality, and timeouts.
 
+	HbMessageBox can used to show dialogs which contains a question ,information and warning.
+	By default HbMessageBox launches a information dialog.
+
+	example code to show a information messagebox:
+    \code
+    HbMessageBox *box = new HbMessageBox("This is a information note");
+	box->setAttribute(Qt::WA_DeleteOnClose);
+	box->open();
+    \endcode
+
+	example code to show a information messagebox with two action keys:
+    \code
+    HbMessageBox *box = new HbMessageBox("This will delete XX . Continue ? ");
+	box->setSecondaryAction(new HbAction("Cancel"));
+	box->setAttribute(Qt::WA_DeleteOnClose);
+	box->open();
+    \endcode
+
+	example code to show a qustion messagebox with a return value based action
+    \code
+    HbMessageBox *box = new HbMessageBox(" Delete file IC0002 ? ",HbMessageBox::MessageTypeQuestion);
+	box->setAttribute(Qt::WA_DeleteOnClose);
+	box->open(this,SLOT(dialogClosed(HbAction*)));
+    \endcode
+
+	The declaration of SLOT is as shown below
+
+	\code
+	void dialogClosed(HbAction *action)
+    {
+        HbMessageBox *dlg = static_cast<HbMessageBox*>(sender());
+        if(action == dlg->primaryAction())
+        {
+            // Delete file 
+        }
+        else
+        {
+           // Cancellation is done.Dont delete the file
+        }
+     }
+	 \endcode
+
     \enum HbMessageBox::MessageBoxType
 
     \value \b MessageTypeInformation creates a dialog which will have some information for the user.
@@ -183,10 +215,11 @@
 */
 
 
+
 /*!
     @beta
     Constructor.
-
+	\param type An optional parameter.The type of messagebox.information/warning/question
     \param parent An optional parameter.
 
 */
@@ -203,6 +236,9 @@
 /*!
     @beta
     Constructs a new HbMessageBox with \a text and \a parent.
+	\param text The text for the MessageBox.
+	\param type An optional parameter.The type of messagebox.information/warning/question
+	\param parent An optional parameter.
  */
 HbMessageBox::HbMessageBox(const QString &text,MessageBoxType type, QGraphicsItem *parent)
     : HbDialog(*new HbMessageBoxPrivate, parent)
@@ -222,9 +258,6 @@
 */
 HbMessageBox::~HbMessageBox()
 {
-	Q_D(HbMessageBox);
-	if(d->gestureFilter)
-        removeSceneEventFilter(d->gestureFilter);
 
 }
 
@@ -242,22 +275,23 @@
 
 
 /*!
-    @beta
+
+    \deprecated HbMessageBox::primitive(HbStyle::Primitive)
+        is deprecated.
+
     Provides access to primitives of HbMessageBox. 
     \param primitive is the type of the requested primitive. The available 
-    primitives are P_Popup_background, and P_MessageBox_icon.
+    primitives are P_MessageBox_icon.
 
 */
 QGraphicsItem *HbMessageBox::primitive(HbStyle::Primitive primitive) const
 {
     Q_D(const HbMessageBox);
     switch (primitive) {
-    case HbStyle::P_Popup_background:
-            return HbDialog::primitive(primitive);
-    case HbStyle::P_MessageBox_icon:
-        return d->mMessageBoxContentWidget->mIconItem;
-    default:
-        return 0;
+        case HbStyle::P_MessageBox_icon:
+            return d->mMessageBoxContentWidget->mIconItem;
+        default:
+            return 0;
     }
 }
 
@@ -299,7 +333,8 @@
 /*!
     @beta
     Sets text of the messagebox.
-    \sa text()
+    \param text This is the text for the MessageBox
+	\sa text()
 */
 void HbMessageBox::setText(const QString &text)
 {
@@ -309,12 +344,12 @@
     }
 }
 
-
 /*!
     @beta
     Returns text of the messagebox.
     \sa setText()
 */
+
 QString HbMessageBox::text() const
 {
     Q_D(const HbMessageBox);
@@ -324,8 +359,9 @@
 
 /*!
     @beta
-    Sets icon for the messagebox.
-    \sa icon()
+    Sets a custon Icon for the MessageBox. Not recommended to change the icon unless there is a real use case.
+    \icon An icon instance
+	\sa icon()
 */
 void HbMessageBox::setIcon(const HbIcon &icon)
 {
@@ -352,18 +388,16 @@
     return d->mIcon;
 }
 /*!
-    @beta
-    Sets the icon alignment.
 
-    \param align Qt defined alignment options can used.
+    \deprecated HbMessageBox::setIconAlignment(Qt::Alignment)
+        is deprecated.   
 
-    The default value is Qt::AlignCenter.
-
-    \sa mIconAlignment()
+    There is no icon alignment support
 */
 void HbMessageBox::setIconAlignment( Qt::Alignment align )
 {
     Q_D(HbMessageBox);
+	HB_DEPRECATED("HbMessageBox::setIconAlignment is deprecated.");
     if (align != d->mIconAlignment){
         d->mIconAlignment = align;
         if (d->mMessageBoxContentWidget->mIconItem) {
@@ -375,11 +409,10 @@
 }
 /*!
     @beta
-    Sets wheather icon is visible or not .
+    Sets wheather icon is visible or not.By default the icon is visible.
 
     \param visible the visibility flag
-
-    By default the icon is visible
+	\sa iconVisible()
 
 */
 void HbMessageBox::setIconVisible(bool visible)
@@ -402,103 +435,51 @@
 /*!
     @beta
     Returns the icon visibilty flag
+	\sa setIconVisible()
 */   
+
 bool  HbMessageBox::iconVisible() const
 {
 	Q_D(const HbMessageBox);
 	return d->mIconVisible;
 
 }
+
 /*!
-    @beta
-    Returns the icon alignment.
+
+    \deprecated HbMessageBox::iconAlignment() const
+        is deprecated.   
 
-    \sa setIconAlignment()
+	There is no icon alignment support
 */
+
 Qt::Alignment HbMessageBox::iconAlignment() const
 {
     Q_D(const HbMessageBox);
+	HB_DEPRECATED("HbMessageBox::iconAlignment is deprecated.");
     return d->mIconAlignment;
 }
 /*!
-    reimp.
+    \deprecated HbMessageBox::mousePressEvent(QGraphicsSceneMouseEvent *)
+        is deprecated.
 
 */
 void HbMessageBox::mousePressEvent(QGraphicsSceneMouseEvent *event )
 {
-    Q_D(HbMessageBox);
+    HB_DEPRECATED("HbMessageBox::mousePressEvent is deprecated.");
     HbDialog::mousePressEvent(event);
-    // disconnecting popups timeline signal slot
-    if (d->timeout > 0) {
-        QObject::disconnect(d->timeoutTimer(), SIGNAL(timeout()), this, SLOT(_q_timeoutFinished()));
-    }	
+    event->accept();
 }
 
+
 /*!
-    \deprecated HbMessageBox::launchQuestionMessageBox(const QString&, const QString&, const QString&, QGraphicsWidget*, QGraphicsScene*, QGraphicsItem*)
-        is deprecated. Please use asynchronous launching.
+    \deprecated HbMessageBox::question(const QString &,const QString &,const QString &,QGraphicsWidget *,QGraphicsScene *,QGraphicsItem*)
+        is deprecated. Deprecating due to migration from exec() to open call. Please use the other available question API.
 
     This is a convenient function to show a default message box with the question and buttons specified.
     this will return true when first button is clicked. false on the second.
     a heading widget can be set ex:
     \code
-        HbMessageBox::launchQuestionMessageBox("are you sure?","yes","no",new HbLabel("Delete Confirm"));
-    \endcode
-*/
-bool HbMessageBox::launchQuestionMessageBox(const QString &questionText,
-                                            const QString &primaryButtonText,
-                                            const QString &secondaryButtonText,
-                                            QGraphicsWidget *headWidget,
-                                            QGraphicsScene *scene,
-                                            QGraphicsItem *parent)
-{
-    return question( questionText, primaryButtonText, secondaryButtonText, headWidget, scene, parent );
-}
-     
-/*!
-    \deprecated HbMessageBox::launchInformationMessageBox(const QString&, QGraphicsWidget*, QGraphicsScene*, QGraphicsItem*)
-        is deprecated. Please use asynchronous launching.
-        
-    This is a convenient function to show a default message box with the with informationText.
-    optionally a heading widget can be set ex:
-    \code
-        HbMessageBox::launchInformationMessageBox("new message received",new HbLabel("incoming message"));
-    \endcode
-*/       
-void HbMessageBox::launchInformationMessageBox(const QString &informationText,
-                                               QGraphicsWidget *headWidget,
-                                               QGraphicsScene *scene,
-                                               QGraphicsItem *parent)
-{
-    information( informationText, headWidget, scene, parent );
-}
-                                                                                              
-/*!
-    \deprecated HbMessageBox::launchWarningMessageBox(const QString&, QGraphicsWidget*, QGraphicsScene*, QGraphicsItem*)
-        is deprecated. Please use asynchronous launching.
-    
-    This is a convenient function to show a warning message box.
-    optionally a heading widget can be set ex:
-    \code
-        HbMessageBox::launchWarningMessageBox("charge the phone",new HbLabel("battery low!"));
-    \endcode
-*/                                                                                            
-void HbMessageBox::launchWarningMessageBox(const QString &warningText,
-                                           QGraphicsWidget *headWidget,
-                                           QGraphicsScene *scene,
-                                           QGraphicsItem *parent)
-{
-    warning( warningText, headWidget, scene, parent );
-}
-
-/*!
-    \deprecated HbMessageBox::question(const QString&, const QString&, const QString&, QGraphicsWidget*, QGraphicsScene*, QGraphicsItem*)
-        is deprecated. Please use asynchronous launching.
-    
-    This is a convenient function to show a default message box with the question and buttons specified.
-    this will return true when first button is clicked. false on the second.
-    a heading widget can be set ex:
-    \code
         HbMessageBox::question("are you sure?","yes","no",new HbLabel("Delete Confirm"));
     \endcode
 */
@@ -509,6 +490,8 @@
                                             QGraphicsScene *scene,
                                             QGraphicsItem *parent)
 {	
+    HB_DEPRECATED("HbMessageBox::question is deprecated. Please use HbMessageBox::question(const QString&,const QString&,QGraphicsWidget*,QGraphicsScene*,QGraphicsItem*) instead");
+    
     HbMessageBox *messageBox = new HbMessageBox(HbMessageBox::MessageTypeQuestion, parent);
     if (scene) {
         scene->addItem(messageBox);
@@ -535,8 +518,8 @@
      
 /*!
     \deprecated HbMessageBox::information(const QString &,QGraphicsWidget*,QGraphicsScene*,QGraphicsItem*)
-        is deprecated. Please use asynchronous launching instead.
-        
+        is deprecated. Please use the other available HbMessageBox::information(...) API.
+
     This is a convenient function to show a default message box with the with informationText.
     optionally a heading widget can be set ex:
     \code
@@ -548,6 +531,8 @@
                                                QGraphicsScene *scene,
                                                QGraphicsItem *parent)
 {
+    HB_DEPRECATED("HbMessageBox::information is deprecated. Please use HbMessageBox::information(const QString&, QObject*, const char*, QGraphicsWidget*,QGraphicsScene*, QGraphicsItem*) instead.");
+
     HbMessageBox *messageBox = new HbMessageBox(HbMessageBox::MessageTypeInformation, parent);
     if (scene) {
         scene->addItem(messageBox);
@@ -561,8 +546,8 @@
                                                                                               
 /*!
     \deprecated HbMessageBox::warning(const QString &,QGraphicsWidget *,QGraphicsScene*,QGraphicsItem*)
-        is deprecated. Please use asynchronous launching instead.
-        
+        is deprecated. Deprecated as part of moving exec to open call. Please use the other warning API.
+
     This is a convenient function to show a warning message box.
     optionally a heading widget can be set ex:
     \code
@@ -574,6 +559,8 @@
                                            QGraphicsScene *scene,
                                            QGraphicsItem *parent)
 {
+    HB_DEPRECATED("HbMessageBox::warning is deprecated. Use HbMessageBox::warning(const QString&, QObject*, const char*,QGraphicsWidget*, QGraphicsScene*, QGraphicsItem *) ");
+
     HbMessageBox *messageBox = new HbMessageBox(HbMessageBox::MessageTypeWarning, parent);
     if (scene) {
         scene->addItem(messageBox);
@@ -588,11 +575,16 @@
     @beta
     This is a convenient function to show a default message box with the question and buttons specified.
     this will return true when first button is clicked. false on the second.
-    a heading widget can be set ex:
-    \code
-        HbMessageBox::question("are you sure?","yes","no",new HbLabel("Delete Confirm"));
-    \endcode
+    \param questionText the text for the messagebox
+	\param receiver the reciever of the slot
+	\param member the slot
+	\param primaryButtonText string for the primary button text
+	\param secondaryButtonText string for the secondary button text
+	\param headWidget the heading widget
+	\param scene the scene 
+	\param parent the parent widget
 */
+
 void HbMessageBox::question(const QString &questionText,
                                             QObject *receiver,
                                             const char *member,
@@ -621,13 +613,17 @@
 }
      
 /*!
-     @beta
-    This is a convenient function to show a default message box with the with informationText.
-    optionally a heading widget can be set ex:
-    \code
-        HbMessageBox::information("new message received",new HbLabel("incoming message"));
-    \endcode
-*/       
+    @beta
+    This is a convenient function to show a default message box with the information and buttons specified.
+    this will return true when first button is clicked. false on the second.
+    \param informationText the text for the messagebox
+	\param receiver the reciever of the slot
+	\param member the slot
+	\param headWidget the heading widget
+	\param scene the scene 
+	\param parent the parent widget
+*/
+     
 void HbMessageBox::information(const QString &informationText,
                                                QObject *receiver,
                                                const char *member,
@@ -649,12 +645,16 @@
                                                                                               
 /*!
     @beta
-    This is a convenient function to show a warning message box.
-    optionally a heading widget can be set ex:
-    \code
-        HbMessageBox::warning("charge the phone",new HbLabel("battery low!"));
-    \endcode
-*/                                                                                            
+    This is a convenient function to show a default message box with the information and buttons specified.
+    this will return true when first button is clicked. false on the second.
+    \param warningText the text for the messagebox
+	\param receiver the reciever of the slot
+	\param member the slot
+	\param headWidget the heading widget
+	\param scene the scene 
+	\param parent the parent widget
+*/
+                                                                                          
 void HbMessageBox::warning(const QString &warningText,
                                            QObject *receiver,
                                            const char *member,
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/popups/hbmessagebox.h
--- a/src/hbwidgets/popups/hbmessagebox.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/popups/hbmessagebox.h	Mon May 03 12:48:33 2010 +0300
@@ -67,23 +67,6 @@
     int type() const { return Type; }
 
 public:
-    static bool launchQuestionMessageBox(const QString &questionText,
-                                         const QString &primaryButtonText = tr("Yes"),
-                                         const QString &secondaryButtonText = tr("No"),
-                                         QGraphicsWidget *headWidget = 0,
-                                         QGraphicsScene *scene = 0,
-                                         QGraphicsItem *parent = 0 );
-	 
-    static void launchInformationMessageBox(const QString &informationText,
-                                            QGraphicsWidget *headWidget = 0,
-                                            QGraphicsScene *scene = 0,
-                                            QGraphicsItem *parent = 0 );
-
-    static void launchWarningMessageBox(const QString &warningText,
-                                        QGraphicsWidget *headWidget = 0,
-                                        QGraphicsScene *scene = 0,
-                                        QGraphicsItem *parent = 0 );
-
 	static bool question(const QString &questionText,
                                          const QString &primaryButtonText = tr("Yes"),
                                          const QString &secondaryButtonText = tr("No"),
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/popups/hbmessagebox_p.h
--- a/src/hbwidgets/popups/hbmessagebox_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/popups/hbmessagebox_p.h	Mon May 03 12:48:33 2010 +0300
@@ -49,9 +49,6 @@
     HbMessageBoxContentWidget *mMessageBoxContentWidget;
     HbMessageBox::MessageBoxType mMessageBoxType;
   	bool mIconVisible;
-	HbGestureSceneFilter *gestureFilter;
-    HbGesture *gesture;  
-
 public slots:
     void _q_closeOnGesture();
 };
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/popups/hbnotificationdialog.cpp
--- a/src/hbwidgets/popups/hbnotificationdialog.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/popups/hbnotificationdialog.cpp	Mon May 03 12:48:33 2010 +0300
@@ -28,12 +28,17 @@
 #include <QGraphicsScene>
 #include <QCoreApplication>
 #include <QtGlobal>
+#include <QGesture>
+#include <QGestureEvent>
+
 #include <hbnotificationdialog.h>
 #include <hbnotificationdialog_p.h>
 #include <hblabel.h>
 #include <hbmainwindow.h>
 #include <hbwidgetsequentialshow_p.h>
 #include <hbdevicedialogserverstatus_p.h>
+#include <hbtapgesture.h>
+#include <hbpangesture.h>
 
 #ifdef HB_EFFECTS
 #include "hbeffectinternal_p.h"
@@ -148,6 +153,9 @@
     setTimeout(HbPopup::StandardTimeout);
     d->setBackgroundStyle();
 
+    grabGesture(Qt::PanGesture);
+    grabGesture(Qt::TapGesture);
+
 #ifdef HB_EFFECTS
     HbEffectInternal::add(this, "notificationdialog_appear", "appear");
     HbEffectInternal::add(this, "notificationdialog_disappear", "disappear");
@@ -205,8 +213,9 @@
 /*!
  Convenience method for using HbNotificationDialog. Shows a notification dialog with
  the given parameters. The dialog is owned by NotificationDialog.
- \deprecated HbNotificationDialog::launchDialog(const HbIcon &icon, QGraphicsScene* scene) is deprecated.
-    Showing only icon is not supported by the layout. Use other launchDialog-methods instead.
+
+ \deprecated HbNotificationDialog::launchDialog(const HbIcon&, QGraphicsScene*)
+     is deprecated. Showing only icon is not supported by the layout. Use other launchDialog-methods instead.
 */
 void HbNotificationDialog::launchDialog(const HbIcon &icon, QGraphicsScene* scene)
 {
@@ -349,10 +358,8 @@
 }
 
 /*!
-\deprecated HbNotificationDialog::setWrapMode(int mode)
-      is deprecated. Please use setTitleTextWrapping(Hb::TextWrapping wrapping) instead.
-
-Deprecated.
+\deprecated HbNotificationDialog::setWrapMode(int)
+    is deprecated. Please use setTitleTextWrapping(Hb::TextWrapping wrapping) instead.
 */
 void HbNotificationDialog::setWrapMode(int mode)
 {
@@ -431,9 +438,7 @@
 
 /*!
 \deprecated HbNotificationDialog::wrapMode() const
-      is deprecated. Please use titleTextWrapping() const instead.
-
-Deprecated.
+    is deprecated. Please use titleTextWrapping() const instead.
 */
 int HbNotificationDialog::wrapMode() const
 {
@@ -448,35 +453,23 @@
 {
 }
 
-/*!
-    \reimp
- */
-void HbNotificationDialog::mousePressEvent(QGraphicsSceneMouseEvent *event)
+void HbNotificationDialog::gestureEvent(QGestureEvent *event)
 {
     Q_D(HbNotificationDialog);
-    d->pointerDownPoint = event->pos();
-    // "Pop-up is visible as long as the user holds the finger on top of it."
-    d->stopTimeout();
-    event->accept();
-}
-
-/*!
-    \reimp
- */
-void HbNotificationDialog::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
-{
-    Q_D(HbNotificationDialog);
-    // Touch release => Inactive or application specific functionality
-
-    if (d->isTouchActivating) {
-        QPointF point = event->pos() - d->pointerDownPoint;
-        qreal manhattanLength = qAbs(point.x()) + qAbs(point.y());
-        if (manhattanLength < 20)
-        {
-            emit activated();
+    if(HbTapGesture *tap = qobject_cast<HbTapGesture*>(event->gesture(Qt::TapGesture))) {
+        if(tap->state() == Qt::GestureStarted) {
+            d->stopTimeout();
+        } else if(tap->state() == Qt::GestureFinished) {
+            if (d->isTouchActivating) {
+                emit activated();
+            }
+            close();
+        }
+    } else if( HbPanGesture *pan = qobject_cast<HbPanGesture*>(event->gesture(Qt::PanGesture))) {
+        if(pan->state() == Qt::GestureFinished){
+            close();
         }
     }
-    close();
 }
 
 // Widget is about to hide. Closing effect has ended,
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/popups/hbnotificationdialog.h
--- a/src/hbwidgets/popups/hbnotificationdialog.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/popups/hbnotificationdialog.h	Mon May 03 12:48:33 2010 +0300
@@ -30,6 +30,7 @@
 
 class HbNotificationDialogPrivate;
 class HbIcon;
+class QGestureEvent;
 
 class HB_WIDGETS_EXPORT HbNotificationDialog : public HbDialog
 {
@@ -93,8 +94,7 @@
 
 protected:
     HbNotificationDialog( HbNotificationDialogPrivate &dd, QGraphicsItem *parent);
-    void mousePressEvent(QGraphicsSceneMouseEvent *event);
-    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
+    void gestureEvent(QGestureEvent *event);
     void hideEvent(QHideEvent *event);
     void showEvent(QShowEvent *event);
     QVariant itemChange(GraphicsItemChange change, const QVariant &value);
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/popups/hbprogressdialog.cpp
--- a/src/hbwidgets/popups/hbprogressdialog.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/popups/hbprogressdialog.cpp	Mon May 03 12:48:33 2010 +0300
@@ -23,147 +23,207 @@
 **
 ****************************************************************************/
 
-#include <hbnamespace_p.h>
-#include <hbiconitem.h>
-#include <hbaction.h>
 #include <hbprogressdialog.h>
 #include <hbprogressdialog_p.h>
 #include <hbstyleoptionprogressdialog.h>
-#include <hbstyleoptionprogressbar.h>
-#include <hbinstance.h>
+
+#include <hbnamespace_p.h>
+#include <hbaction.h>
+#include <hbpopup.h>
 #include <hbtextitem.h>
 #include <QGraphicsItem>
-#include <QDebug>
+
+/*
+    internal
+    HbProgressDialogContentWidget class
 
+    HbProgressDialogContentWidget is internal to HbProgressDialog and is the content widget to progressDialog
+
+    HbProgressDialogContentWidget holds the text, icon and progressbar.
+
+*/
 class HbProgressDialogContentWidget : public HbWidget
 {
     Q_OBJECT
-	public:
-	QGraphicsItem* mIconItem;
-	HbProgressBar* mPb;
-	QGraphicsItem *mText;// This will be HbTextItem and creation will delegate to style when it fixes the layout issue...
-	HbProgressDialogPrivate *d;
+    
+    public:
+    
+    QGraphicsItem *mIconItem;
+    HbProgressBar *mProgressBar;
+    QGraphicsItem *mTextItem;
+    HbProgressDialogPrivate *d;
+    
     enum { Type = HbPrivate::ItemType_ProgressDialogContentWidget };
     int type() const { return Type; }
-	HbProgressDialogContentWidget(HbProgressDialogPrivate *priv,QGraphicsItem* parent =0 ):HbWidget(parent),
-		mIconItem(0),mPb(0),mText(0),d(priv)
-	{
-       
-	    if( !mPb ){
-		    mPb = new HbProgressBar(HbProgressBar::SimpleProgressBar,this);
-	    }
-        
-		mText = style()->createPrimitive(HbStyle::P_ProgressDialog_text,this);
-        mIconItem = style()->createPrimitive(HbStyle::P_ProgressDialog_icon, this);
-		mIconItem->hide();
-        HbStyle::setItemName(mText, "text");
-        HbStyle::setItemName(mIconItem, "icon");
-        HbStyle::setItemName(mPb, "pbar");
     
-		setProperty("hasText",true);
-        setProperty("hasIcon",false);
-	    
-	}
-
-	void repolishContent()
-	{
-		repolish();
-	}
+    HbProgressDialogContentWidget(HbProgressDialogPrivate *priv,QGraphicsItem* parent =0 ):HbWidget(parent),
+        mIconItem(0),mProgressBar(0),mTextItem(0),d(priv)
+    {
+        setProperty("text",QVariant(true));
+        setProperty("icon",QVariant(false));
+    }
+  
+    void repolishContent()
+    {
+        repolish();
+    }
 };
 
-
+/*!
+    internal
 
-HbProgressDialogPrivate::HbProgressDialogPrivate() :
-mAction(0),mTimer(0),mContentWidget(0),mTextWrapping(true),mMinDuration(0),mDelayTime(0),mTextString(QString()),mAlign(Qt::AlignTop|Qt::AlignLeft)
+    HbProgressDialogPrivate class constructor
+*/
+HbProgressDialogPrivate::HbProgressDialogPrivate() :mAction(0),mTimer(0),mIcon(0),mContentWidget(0),
+                                                    mMinDuration(0),mDelayTime(0),mTextString(QString()),
+                                                    mAlign(Qt::AlignTop|Qt::AlignLeft)
 {
-	
 }
 
+/*!
+    internal
+
+    HbProgressDialogPrivate class destructor
+*/
 HbProgressDialogPrivate::~HbProgressDialogPrivate()
-{
-    
+{  
 }
 
+/*!
+    internal
 
+    initialises HbProgressDialogPrivate class 
+*/
 void HbProgressDialogPrivate::init(HbProgressDialog::ProgressDialogType type)
 {
     Q_Q(HbProgressDialog);
-   	mContentWidget = new HbProgressDialogContentWidget(this);
+    
+    mContentWidget = new HbProgressDialogContentWidget(this);
     q->setContentWidget(mContentWidget);
-	mNoteType = type ;
-   	
-	if(mNoteType == HbProgressDialog::WaitDialog){
-		mContentWidget->mPb->setRange(0,0);
-	}
-	else{
-		mContentWidget->mPb->setRange(0,100);
-	}
-	mAction = new HbAction(q->tr("Cancel"),q);
+    mNoteType = type ;
+        
+    createPrimitives();
+
+    if(mNoteType == HbProgressDialog::WaitDialog){
+        mContentWidget->mProgressBar->setRange(0,0);
+    }
+    else{
+        mContentWidget->mProgressBar->setRange(0,100);
+    }
+    
+    mAction = new HbAction(q->tr("Cancel"));
     QObject::connect(mAction, SIGNAL(triggered()), q, SLOT(_q_userCancel()));
     q->setPrimaryAction(mAction);
-	mMinDuration = 1500;
-	mDelayTime = 1000;
+    
+    mMinDuration = 1500;
+    mDelayTime = 1000;
 
     mTimer = new QTimeLine(mDelayTime, q);
-    mTimer->setFrameRange(0, 100);
-   
-	
+    mTimer->setFrameRange(0, 100);  
     QObject::connect(mTimer, SIGNAL(finished()), q, SLOT(_q_finished()));
+
     q->setTimeout(HbPopup::NoTimeout);
     q->setDismissPolicy(HbPopup::NoDismiss);
     q->setModal(false);
-    q->setBackgroundFaded(false);
     q->hide();
-	
-
-    
 }
 
+/*
+    internal
+
+    createPrimitives.
+ */
+void HbProgressDialogPrivate::createPrimitives()
+{
+    Q_Q(HbProgressDialog);
+
+    if( !mContentWidget->mProgressBar ){
+            mContentWidget->mProgressBar = new HbProgressBar(HbProgressBar::SimpleProgressBar,mContentWidget);
+            HbStyle::setItemName(mContentWidget->mProgressBar, "pbar");
+    }
+
+    if ( !mContentWidget->mTextItem ) {
+        mContentWidget->mTextItem = q->style()->createPrimitive(HbStyle::P_ProgressDialog_text,mContentWidget);
+        HbStyle::setItemName(mContentWidget->mTextItem, "text");
+    }
+
+    if ( !mIcon.isNull() ) {
+        if ( !mContentWidget->mIconItem ) {
+            mContentWidget->mIconItem = q->style()->createPrimitive(HbStyle::P_ProgressDialog_icon, mContentWidget); 
+            HbStyle::setItemName(mContentWidget->mIconItem, "icon");
+        }
+    } else {
+        if( mContentWidget->mIconItem ){
+            delete mContentWidget->mIconItem;
+        }
+        mContentWidget->mIconItem = 0;
+    }
+}
+
+/*!
+    internal
+
+    private slot which stops the timer and 
+    dismisses the dialog
+*/
 void HbProgressDialogPrivate::_q_userCancel()
 {
     Q_Q(HbProgressDialog);
-	flags &= ~HbProgressDialogPrivate::Closetimer;
-	mTimer->stop();
+    
+    flags &= ~HbProgressDialogPrivate::Closetimer;
+    mTimer->stop();
     q->cancel();
-	
 }
 
+/*!
+    internal
+
+    private slot which stops the timer and 
+    dismisses the dialog
+*/
 void HbProgressDialogPrivate::_q_finished()
 {
     Q_Q(HbProgressDialog);
 
-	if(flags.testFlag(HbProgressDialogPrivate::Showtimer)){
-            mTimer->stop();
-                        q->HbDialog::show();
-			mTimer->setDuration(mMinDuration);
-            mTimer->setCurrentTime(0);
-			mTimer->start();
-			flags &= ~HbProgressDialogPrivate::Showtimer;
-			flags |= HbProgressDialogPrivate::Closetimer;
-	}
-	else if(flags.testFlag(HbProgressDialogPrivate::Closetimer)){
-		flags &= ~HbProgressDialogPrivate::Closetimer;
-		if(flags.testFlag(HbProgressDialogPrivate::Closepending)){
-			q->close();
-		}
-	}
+    if(flags.testFlag(HbProgressDialogPrivate::Showtimer)){
+        mTimer->stop();
+        q->HbDialog::show();
+        mTimer->setDuration(mMinDuration);
+        mTimer->setCurrentTime(0);
+        mTimer->start();
+        flags &= ~HbProgressDialogPrivate::Showtimer;
+        flags |= HbProgressDialogPrivate::Closetimer;
+    }
+    else if(flags.testFlag(HbProgressDialogPrivate::Closetimer)){
+        flags &= ~HbProgressDialogPrivate::Closetimer;
+        if(flags.testFlag(HbProgressDialogPrivate::Closepending)){
+            q->close();
+        }
+    }
 }
 
+/*!
+    internal
+
+    private slot which stops the timer and 
+    dismisses the dialog
+*/
 void HbProgressDialogPrivate::_q_progressValueChanged(int value)
 {
-	 Q_Q(HbProgressDialog);
-	 if(value >= mContentWidget->mPb->maximum() && q->autoClose()){
-		 if(flags.testFlag(HbProgressDialogPrivate::Closetimer)){
-			flags |= HbProgressDialogPrivate::Closepending;
-			flags &= ~HbProgressDialogPrivate::Showtimer;
-		 }
-		 else if(!flags.testFlag(HbProgressDialogPrivate::Showtimer)){
-			 q->close();
-		 }
-		 else{
-			 flags &= ~HbProgressDialogPrivate::Showtimer;
-		 }		 
-	 }
+    Q_Q(HbProgressDialog);
+    
+    if(value >= mContentWidget->mProgressBar->maximum() && q->autoClose()){
+        if(flags.testFlag(HbProgressDialogPrivate::Closetimer)){
+            flags |= HbProgressDialogPrivate::Closepending;
+            flags &= ~HbProgressDialogPrivate::Showtimer;
+        }
+        else if(!flags.testFlag(HbProgressDialogPrivate::Showtimer)){
+            q->close();
+        }
+        else{
+            flags &= ~HbProgressDialogPrivate::Showtimer;
+        }
+    }
 }
 
 
@@ -171,87 +231,143 @@
     @beta
     @hbwidgets
     \class HbProgressDialog
-    \brief HbProgressDialog is a notification widget that combines test, icon, and a progress bar.
-    
-    \image html hbprogressdialog.png A progress note.
+    \brief HbProgressDialog provides feedback on the progress of a slow operation.
+
+    \image html hbprogressnote.png  A progress dialog.
 
-    HbProgressDialog provides several types of notifications. The supported  types are:
+    ProgressDialog widget displays that a process is active and also the completion level of the process to the user.
+
+    A progress dialog is used to give the user an indication of how long an operation is going to take, and 
+    to demonstrate that the application has not frozen. It can also give the user an opportunity to abort the operation.
+
+    Progress dialog provides several types of notifications. The supported  types are:
     
     \code
     enum ProgressDialogType { ProgressDialog, WaitDialog };
     \endcode
 
-    \sa HbDialog
+    Progress dialog has the following mandatory elements:
+    \li Progress bar (Determinate type) 
+    \li Description
+    \li Cancel button (for canceling the process) 
 
-    Progress dialog has a number of use cases. Depending on the use case, either the value of the progress bar
-    is updated  manually or waiting progress bar will be shown. The former case is used when displaying a download note.
-    The latter case is used when connecting to network or opening a web page. The examples below demonstrate the use
-    cases.
+    Optionally, progress dialog may also includes:
+    \li  Icon
+    \li  Heading
+    \li  Close button (same as ‘Cancel’ button during active process, closes the dialog after successful process)
+
+    Progress dialog is modal and requires user intervention to dismiss it. 
+    \sa HbDialog
 
     The first example is a dialog  displayed when the application is connecting
     to network. As the delay is unknown the waiting progressbar will be shown indefinitely. 
-    The note disappears if the user clicks Cancel button or
-    after the connection is established in which case the application closes the progress note.
+    The dialog disappears if the user clicks Cancel button or
+    after the connection is established in which case the application closes the progress dialog.
 
-    Here is an example of using the infinite progress note:
+    Here is an example of using the infinite progress dialog(wait dialog):
     
     \code
-    HbProgressDialog *note = new HbProgressDialog(HbProgressDialog::WaitDialog);
-    note->show();
+    HbProgressDialog *pDialog = new HbProgressDialog(HbProgressDialog::WaitDialog);
+    pDialog->show();
     \endcode
 
-    The progress note is closed explicitly when the user clicks Cancel button or the application calls cancel().
+    The progress note is closed explicitly when the user clicks Cancel button or the application 
+    calls cancel().
 
     Another use case is an application downloading a file. 
     \code
-    HbProgressDialog *note = new HbProgressDialog(HbProgressDialog::ProgressDialog);
-    note->setMinimum(0);
-    note->setMaximum(1000);
-    note->show();
+    HbProgressDialog *pDialog = new HbProgressDialog(HbProgressDialog::ProgressDialog);
+    pDialog->setMinimum(0);
+    pDialog->setMaximum(1000);
+    pDialog->show();
     for (int i=0;i<1000;i+=100) 
     {
-      note->setProgressValue(i);
-      note->setText(QString("Downloaded %1/1000 KB").arg(i));
+      pDialog->setProgressValue(i);
+      pDialog->setText(QString("Downloaded %1/1000 KB").arg(i));
     }
 
     \endcode
 */
 
 /*!
-    @beta
-    Constructor.
+    \fn void HbProgressDialog::cancelled()
+
+    This signal is emitted when the user clicks the cancel action.
+ */
+
+/*!
+    \enum HbProgressDialog::ProgressDialogType
+
+    This enum defines available progress dialog type values.
+
+ */
+
+/*!
+    \var HbProgressDialog::ProgressDialog
+
+    This enum describes the type value as ProgressDialog.
+ */
 
-    \param type Must be one of the defined ProgressDialogType enumerations.
-    \param parent An optional parameter.
+/*!
+    \var HbProgressDialog::WaitDialog
+
+    TThis enum describes the type value as WaitDialog.
+ */
+
 
+/*!
+    @beta
+    Constructs a new HbProgressDialog with \a type and \a parent.
+
+    \param type ProgressDialogType.
+    \param parent  progress dialog's parent.
+    
+    Default settings:
+    \li The text is empty.
+    \li The icon is null.
+    \li The cancel button text is (translated) "Cancel".
 */
-
 HbProgressDialog::HbProgressDialog(ProgressDialogType type, QGraphicsItem *parent) :
     HbDialog(*new HbProgressDialogPrivate, parent)
 {
     Q_D(HbProgressDialog);
+
     d->init(type);
-	setAutoClose(true);
+    setAutoClose(true);
 }
 
 /*!
     @beta
-    Constructor.
-
-    \param parent An optional parameter.
-
+    Constructs a new HbProgressDialog with \a parent.
+    
+    Default settings:
+    \li The text is empty.
+    \li The icon is null.
+    \li The cancel button text is (translated) "Cancel".
+    \li minimum is 0;
+    \li maximum is 100
+    
+    The parent argument is dialog's parent widget.
 */
 HbProgressDialog::HbProgressDialog(QGraphicsItem *parent) :
     HbDialog(*new HbProgressDialogPrivate, parent)
 {
     Q_D(HbProgressDialog);
+
     d->init(ProgressDialog);
     setAutoClose(true);
 }
 
 /*!
+    Destructs the progressDialog.
+*/
+HbProgressDialog::~HbProgressDialog()
+{
+}
+
+/*!
     @beta
-    Returns the maximum value of the progressbar within the note.
+    Returns the maximum value of the progressbar within the progressdialog.
 
     The default value is \c 100.
 
@@ -261,13 +377,12 @@
 {
     Q_D(const HbProgressDialog);
 
-    return d->mContentWidget->mPb->maximum();
+    return d->mContentWidget->mProgressBar->maximum();
 }
 
-
 /*!
     @beta
-    Sets the maximum value of the progressbar within the note.
+    Sets the maximum value of the progressbar within the progressdialog.
 
     \sa maximum()
 */
@@ -275,12 +390,12 @@
 {
     Q_D(HbProgressDialog);
 
-    d->mContentWidget->mPb->setMaximum(max);
+    d->mContentWidget->mProgressBar->setMaximum(max);
 }
 
 /*!
     @beta
-    Returns the minimum value of the progressbar within the note.
+    Returns the minimum value of the progressbar within the progressdialog.
 
     The default value is \c 0.
 
@@ -289,12 +404,15 @@
 int HbProgressDialog::minimum() const
 {
     Q_D(const HbProgressDialog);
-    return d->mContentWidget->mPb->minimum();
+
+    return d->mContentWidget->mProgressBar->minimum();
 }
 
 /*!
     @beta
-    Sets the minimum value of the progressbar within the note.
+    Sets the minimum value of the progressbar within the progressdialog.
+
+    \param min minimum value of the progressbar.
 
     \sa minimum()
 */
@@ -302,12 +420,17 @@
 {
     Q_D(HbProgressDialog);
 
-    d->mContentWidget->mPb->setMinimum(min);
+    d->mContentWidget->mProgressBar->setMinimum(min);
 }
 
 /*!
     @beta
-    Sets the minimum and maximum value of the progressbar within the note.
+    Sets the progress dialog's minimum and maximum values to minimum and maximum, respectively.
+
+    If maximum is smaller than minimum, minimum becomes the only legal value.
+
+    \param min minimum value of the progressbar within the progressdialog
+    \param max maximum value of the progressbar within the progressdialog
 
     \sa minimum()
     \sa maximum()
@@ -315,51 +438,51 @@
 void HbProgressDialog::setRange(int min,int max)
 {
     Q_D(HbProgressDialog);
-    d->mContentWidget->mPb->setRange(min,max);
+    
+    d->mContentWidget->mProgressBar->setRange(min,max);
 }
 
 /*!
     @beta
-  Returns the value of the progressbar within the note.
+    Returns the value of the progressbar within the note.
 
-  This value is constrained as follows:
-  \b minimum <= \c value <= \b maximum.
+    This value is constrained as follows:
+    \b minimum <= \c value <= \b maximum.
 
-  \sa setValue()
-
+    \sa setValue()
  */
 int HbProgressDialog::progressValue() const
 {
     Q_D(const HbProgressDialog);
 
-    return d->mContentWidget->mPb->progressValue();
+    return d->mContentWidget->mProgressBar->progressValue();
 }
 
 /*!
     @beta
-  Sets the value of the progressbar within the note.
-  After the timeline has been started the value is updated automatically.
-  Use this function only if the timer is not used.
+    Sets the value of the progressbar within the progress dialog.
+    After the timeline has been started the value is updated automatically.
+    Use this function only if the timer is not used.
 
-  This value is constrained as follows:
-  \b minimum <= \c value <= \b maximum.
+    This value is constrained as follows:
+    \b minimum <= \c value <= \b maximum.
 
- \sa value()
+    \param value progressbar value
 
+    \sa value()
 */
 void HbProgressDialog::setProgressValue(int value)
 {
     Q_D(HbProgressDialog);
 
-    d->mContentWidget->mPb->setProgressValue(value);
-	d->_q_progressValueChanged(value);
+    d->mContentWidget->mProgressBar->setProgressValue(value);
+    d->_q_progressValueChanged(value);
 }
 
 /*!
     @beta
-  Closes the popup while emitting the cancelled() signal. This function is called when 
-  user presses the Cancel button or then the timer expires.
-
+    Closes the dialog while emitting the cancelled() signal. This function is called when 
+    user presses the Cancel button or then the timer expires.
  */
 void HbProgressDialog::cancel() 
 {
@@ -367,110 +490,140 @@
     close();
 }
 
+/*!
+
+    \deprecated HbProgressDialog::primitive(HbStyle::Primitive)
+        is deprecated.
+
+    Returns the pointer for \a primitive passed.
+    Will return NULL if \a primitive passed is invalid
+*/
 QGraphicsItem* HbProgressDialog::primitive(HbStyle::Primitive primitive) const
 {
     Q_D(const HbProgressDialog);
+
     switch (primitive) {
-        case HbStyle::P_Popup_background:
-            return HbDialog::primitive(primitive);
         case HbStyle::P_ProgressDialog_icon:
             return d->mContentWidget->mIconItem;
+        case HbStyle::P_ProgressDialog_text:
+            return d->mContentWidget->mTextItem;
         default:
             return 0;
-        }    
+        }
 }
 
 /*!
     @beta
-  Sets the progressdialog type. 
-  \sa progressDialogType()
+    Sets the progressdialog type. 
+
+    The type of the progress dialog can be specified with one of the values:
+    \li HbProgressDialog::ProgressDialog
+    \li HbProgressDialog::WaitDialog
+    \sa progressDialogType()
  */
 void HbProgressDialog::setProgressDialogType(HbProgressDialog::ProgressDialogType type)
 {
     Q_D(HbProgressDialog);
-	if(d->mNoteType != type) {
-		d->mNoteType = type;
-		if(type == WaitDialog){
-			d->mContentWidget->mPb->setRange(0,0);
-		}
-		else {
-			d->mContentWidget->mPb->setRange(0,100);
-		}
-	}
+    
+    if(d->mNoteType != type) {
+        d->mNoteType = type;
+        if(type == WaitDialog){
+            d->mContentWidget->mProgressBar->setRange(0,0);
+        }
+        else {
+            d->mContentWidget->mProgressBar->setRange(0,100);
+        }
+    }
 }
 
 /*!
     @beta
-  returns progressDialog type;
-   \sa setProgressDialogType()
+    Returns progressDialog type.
+    \sa setProgressDialogType()
  */
 HbProgressDialog::ProgressDialogType HbProgressDialog::progressDialogType() const
 {
     Q_D(const HbProgressDialog);
+    
     return d->mNoteType;
 }
-  
-
-void HbProgressDialog::showEvent(QShowEvent *event)
-{
-    Q_D(HbProgressDialog);
-	d->mContentWidget->mPb->show();
-        HbDialog::showEvent(event);
-}
 
 /*!
     @beta
-  Shows the Note after a delay(say 1sec). This is a convenient slot
-  if user cancels note before delay expired note wont be shown at all 
+    Shows the progress dialog after a delay(say 1sec). This is a convenient slot.
+    if user cancels progress dialog before delay getting expired, then progress dialog wont be shown at all 
  */
 void HbProgressDialog::delayedShow()
 {
-		Q_D(HbProgressDialog);
-		d->flags |= HbProgressDialogPrivate::Showtimer;
-		d->mTimer->setDuration(d->mDelayTime);
-		d->mTimer->start();		
+    Q_D(HbProgressDialog);
+    
+    d->flags |= HbProgressDialogPrivate::Showtimer;
+    d->mTimer->setDuration(d->mDelayTime);
+    d->mTimer->start();     
+}
+
+/*!
+    @beta
+    Returns the auto close flag.
+    \sa setAutoClose()
+ */
+bool HbProgressDialog::autoClose () const 
+{
+    Q_D(const HbProgressDialog);
+    
+    return d->flags.testFlag(HbProgressDialogPrivate::Autoclose);
 }
 
 /*!
     @beta
-  Returns the auto close flag.
+    Sets the auto close flag.
+    \sa autoClose()
  */
-bool HbProgressDialog::autoClose () const 
+void HbProgressDialog::setAutoClose ( bool close )
 {
-	Q_D(const HbProgressDialog);	
-	return d->flags.testFlag(HbProgressDialogPrivate::Autoclose);
+    Q_D(HbProgressDialog);
+    
+    close?d->flags 
+        |= HbProgressDialogPrivate::Autoclose : d->flags &= ~HbProgressDialogPrivate::Autoclose;
 }
 
 /*!
-    @beta
-  Sets the auto close flag.
+    Initializes \a option with the values from this HbProgressDialog. 
+    This method is useful for subclasses when they need a HbStyleOptionProgressDialog,
+    but don't want to fill in all the information themselves.
  */
-void HbProgressDialog::setAutoClose ( bool b )
+void HbProgressDialog::initStyleOption(HbStyleOptionProgressDialog *option) const
 {
-    Q_D(HbProgressDialog);
-	b?d->flags 
-		|= HbProgressDialogPrivate::Autoclose : d->flags &= ~HbProgressDialogPrivate::Autoclose;
+    Q_D(const HbProgressDialog);
+
+    HbDialog::initStyleOption(option);
+
+    option->progressBarSize = d->mContentWidget->mProgressBar->minimumSize();
+    option->icon = d->mIcon;
+    option->iconAlignment = d->mIconAlignment;
+    option->text = d->mTextString;
+    option->textAlignment = d->mAlign;
 }
 
-void HbProgressDialog::initStyleOption(HbStyleOption *option) const
+/*!
+    \reimp
+ */
+void HbProgressDialog::showEvent(QShowEvent *event)
 {
-	Q_D(const HbProgressDialog);
-	HbStyleOptionProgressDialog* progressDialogOption 
-		= qstyleoption_cast< HbStyleOptionProgressDialog *>(option);
-	
-    HbDialog::initStyleOption(progressDialogOption);
-	progressDialogOption->progressBarSize = d->mContentWidget->mPb->minimumSize();
-    progressDialogOption->icon = d->mIcon;
-    progressDialogOption->iconAlignment = d->mIconAlignment;
-	progressDialogOption->text = d->mTextString;
-	progressDialogOption->wrap = d->mTextWrapping;
-	progressDialogOption->textAlignment = d->mAlign;
+    Q_D(HbProgressDialog);
+    
+    d->mContentWidget->mProgressBar->show();
+    HbDialog::showEvent(event);   
+}
 
-}
+/*!
+    \reimp
+ */
 void HbProgressDialog::closeEvent ( QCloseEvent * event )
 {
     Q_D(HbProgressDialog);
-	d->mAction->setToolTip("");
+    
+    d->mAction->setToolTip("");
     if(d->flags.testFlag(HbProgressDialogPrivate::Closetimer)){
         d->flags |= HbProgressDialogPrivate::Closepending;
         event->setAccepted(false);
@@ -480,76 +633,98 @@
         d->mTimer->stop();
         d->flags &= ~HbProgressDialogPrivate::Showtimer;
     }
-    d->mContentWidget->mPb->close();
-    HbDialog::closeEvent(event);
-	
+    d->mContentWidget->mProgressBar->close();
+    HbDialog::closeEvent(event);    
 }
 
 /*!
     @beta
-    Sets text of the note.
+    Sets the text to be shown on progress dialog.
+    
+    \param text user defined text.
+
     \sa text()
 */
 void HbProgressDialog::setText(const QString &text)
 {
     Q_D(HbProgressDialog);
-	if ( text != d->mTextString) {
-		d->mTextString = text;
-		HbStyleOptionProgressDialog progressDialogOption;
-        initStyleOption(&progressDialogOption);
-		style()->updatePrimitive(d->mContentWidget->mText, HbStyle::P_ProgressDialog_text, &progressDialogOption);
-	}
+    
+    if ( text != d->mTextString) {
+        d->mTextString = text;
+        d->createPrimitives();
+
+        if(d->mContentWidget->mTextItem)
+        {
+            HbStyleOptionProgressDialog progressDialogOption;
+            initStyleOption(&progressDialogOption);
+            style()->updatePrimitive(d->mContentWidget->mTextItem, HbStyle::P_ProgressDialog_text, &progressDialogOption);
+        }
+    }
 }
+
 /*!
     @beta
-    Returns text of the note.
+    Returns the  text shown on progress dialog.
+
+    The default text is an empty string.
     \sa setText()
 */
 QString HbProgressDialog::text() const
 {
     Q_D(const HbProgressDialog);
-	return d->mTextString;
+
+    return d->mTextString;
 }
 
-
 /*!
     @beta
-    Sets icon for the note.
+    Sets  the icon to be shown on progress dialog.
+
+    \param icon user defined icon.
     \sa icon()
 */
 void HbProgressDialog::setIcon(const HbIcon &icon)
 {
     Q_D(HbProgressDialog);
+    
     if (icon != d->mIcon){
         d->mIcon = icon;
+        d->createPrimitives();
+
         if (d->mContentWidget->mIconItem) {
-			d->mContentWidget->mIconItem->show();
-			d->mContentWidget->setProperty("hasIcon",true);
+            d->mContentWidget->setProperty("icon",true);
+
             HbStyleOptionProgressDialog progressDialogOption;
             initStyleOption(&progressDialogOption);
             style()->updatePrimitive(d->mContentWidget->mIconItem, HbStyle::P_ProgressDialog_icon, &progressDialogOption);
-			d->mContentWidget->repolishContent();
         }
-
-		
-	}
+        else
+        {
+            d->mContentWidget->setProperty("icon",false);
+        }
+        d->mContentWidget->repolishContent();
+    }
 }
 
-
 /*!
     @beta
-    Returns icon of the note.
+    Returns the  icon shown on progress dialog.
+
+    The default icon is a null icon.
     \sa setIcon()
 */
 HbIcon HbProgressDialog::icon() const
 {
     Q_D(const HbProgressDialog);
+
     return d->mIcon;
 }
 
 
 /*!
-    @deprecated
+    \deprecated HbProgressDialog::setTextAlignment( Qt::Alignment )
+        is deprecated.
+
     Sets the text alignment.
     \param align Qt defined alignment options can used.
 
@@ -559,32 +734,38 @@
 */
 void HbProgressDialog::setTextAlignment( Qt::Alignment align )
 {
-	
     Q_D(HbProgressDialog);
-	if (align != d->mAlign ) {
-		d->mAlign = align;
-	    HbStyleOptionProgressDialog progressDialogOption;
-        initStyleOption(&progressDialogOption);
-		style()->updatePrimitive(d->mContentWidget->mText, HbStyle::P_ProgressDialog_text, &progressDialogOption);
-       
-   }
+    
+    if (align != d->mAlign ){
+        d->mAlign = align;
+        if(d->mContentWidget->mTextItem)
+        {
+            HbStyleOptionProgressDialog progressDialogOption;
+            initStyleOption(&progressDialogOption);
+            style()->updatePrimitive(d->mContentWidget->mTextItem, HbStyle::P_ProgressDialog_text, &progressDialogOption); 
+        }
+    }
 }
 
 /*!
-    @deprecated
+    \deprecated HbProgressDialog::textAlignment() const
+        is deprecated.
+
     Returns the text alignment.
 
     \sa setTextAlignment()
 */
 Qt::Alignment HbProgressDialog::textAlignment() const
 {
-	Q_D(const HbProgressDialog);
-	return d->mAlign;
+    Q_D(const HbProgressDialog);
+    
+    return d->mAlign;
 }
 
+/*!
+   \deprecated HbProgressDialog::setIconAlignment( Qt::Alignment )
+        is deprecated.
 
-/*!
-    @deprecated
     Sets the icon alignment.
 
     \param align Qt defined alignment options can used.
@@ -596,6 +777,7 @@
 void HbProgressDialog::setIconAlignment( Qt::Alignment align )
 {
     Q_D(HbProgressDialog);
+    
     if (align != d->mIconAlignment){
         d->mIconAlignment = align;
         if (d->mContentWidget->mIconItem) {
@@ -608,7 +790,9 @@
 
 
 /*!
-    @deprecated
+    \deprecated HbProgressDialog::iconAlignment() const
+        is deprecated.
+
     Returns the icon alignment.
 
     \sa setIconAlignment()
@@ -616,6 +800,7 @@
 Qt::Alignment HbProgressDialog::iconAlignment() const
 {
     Q_D(const HbProgressDialog);
+
     return d->mIconAlignment;
 }
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/popups/hbprogressdialog.h
--- a/src/hbwidgets/popups/hbprogressdialog.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/popups/hbprogressdialog.h	Mon May 03 12:48:33 2010 +0300
@@ -23,13 +23,13 @@
 **
 ****************************************************************************/
 
-
 #ifndef HBPROGRESSDIALOG_H
 #define HBPROGRESSDIALOG_H
 
 #include <hbdialog.h>
 
 class HbProgressDialogPrivate;
+class HbStyleOptionProgressDialog;
 
 class HB_WIDGETS_EXPORT HbProgressDialog : public HbDialog
 {
@@ -39,69 +39,77 @@
     Q_PROPERTY( int minimum READ minimum WRITE setMinimum )
     Q_PROPERTY( int value READ progressValue WRITE setProgressValue )
     Q_PROPERTY( bool autoClose READ autoClose WRITE setAutoClose )
-    Q_PROPERTY( ProgressDialogType progressDialogType READ progressDialogType WRITE setProgressDialogType)
     Q_PROPERTY( QString text READ text WRITE setText )
     Q_PROPERTY( HbIcon icon READ icon WRITE setIcon )
+    Q_PROPERTY( ProgressDialogType progressDialogType READ progressDialogType WRITE setProgressDialogType )
+
+    /*  Deprecated */
     Q_PROPERTY( Qt::Alignment textAlignment READ textAlignment WRITE setTextAlignment )
+    /*  Deprecated */
     Q_PROPERTY( Qt::Alignment iconAlignment READ iconAlignment WRITE setIconAlignment )
 
 public:
 
-    enum ProgressDialogType { ProgressDialog,WaitDialog };
+    enum ProgressDialogType { ProgressDialog, WaitDialog };
+
+    explicit HbProgressDialog(QGraphicsItem *parent = 0);
+    HbProgressDialog(ProgressDialogType type, QGraphicsItem *parent = 0);
+    ~HbProgressDialog();
+
+    int maximum() const;
+    int minimum() const;
+
+    void setRange(int min,int max);
+    int progressValue() const;
 
-    HbProgressDialog(ProgressDialogType type , QGraphicsItem *parent = 0);
-    explicit HbProgressDialog(QGraphicsItem *parent = 0);
+    void setAutoClose (bool close);
+    bool autoClose () const;
+
+    void setText(const QString &text);
+    QString text() const;
+
+    void setIcon(const HbIcon &icon);
+    HbIcon icon() const;
+
+    void setProgressDialogType(HbProgressDialog::ProgressDialogType type );
+    HbProgressDialog::ProgressDialogType progressDialogType() const;
 
     enum { Type = Hb::ItemType_ProgressDialog };
     int type() const { return Type; }
 
-    int maximum() const;
-    int minimum() const;
-   
-	void setRange(int min,int max);
-    int progressValue() const;
-    
-	bool autoClose () const ;
-    void setAutoClose ( bool b ) ;
+    QGraphicsItem* primitive(HbStyle::Primitive primitive) const;
+
+    /*  Deprecated */
+    void setTextAlignment(Qt::Alignment align);
+    /*  Deprecated */
+    Qt::Alignment textAlignment() const;
 
-	void setText(const QString &text);
-	QString text() const;
-    
-	void setIcon(const HbIcon &icon);
-	HbIcon icon() const;
-    
-	void setTextAlignment(Qt::Alignment align);
-	Qt::Alignment textAlignment() const;
-    
-	void setIconAlignment(Qt::Alignment align);
-	Qt::Alignment iconAlignment() const;
-    
-    void setProgressDialogType(HbProgressDialog::ProgressDialogType type );
-    HbProgressDialog::ProgressDialogType progressDialogType() const;
-    
-    QGraphicsItem* primitive(HbStyle::Primitive primitive) const;
-    
+    /*  Deprecated */
+    void setIconAlignment(Qt::Alignment align);
+    /*  Deprecated */
+    Qt::Alignment iconAlignment() const;
+
+signals:
+    void cancelled();
+
 public slots:
     void cancel();
     void setProgressValue(int progressValue);
     void setMinimum(int min);
-	void setMaximum(int max);
+    void setMaximum(int max);
     void delayedShow();
 
-signals:
-    void cancelled();
-
 protected:
-	void showEvent(QShowEvent *event);
-	void initStyleOption(HbStyleOption *option) const;
-    void closeEvent ( QCloseEvent * event );
+    void initStyleOption(HbStyleOptionProgressDialog *option) const;
+    void showEvent(QShowEvent *event);
+    void closeEvent(QCloseEvent *event);
 
 private:
     Q_DECLARE_PRIVATE_D(d_ptr, HbProgressDialog)
     Q_DISABLE_COPY(HbProgressDialog)
     Q_PRIVATE_SLOT(d_func(), void _q_finished())
-	Q_PRIVATE_SLOT(d_func(), void _q_progressValueChanged(int))
-	Q_PRIVATE_SLOT(d_func(), void _q_userCancel())
+    Q_PRIVATE_SLOT(d_func(), void _q_progressValueChanged(int))
+    Q_PRIVATE_SLOT(d_func(), void _q_userCancel())
 };
 
 #endif // HBPROGRESSDIALOG_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/popups/hbprogressdialog_p.h
--- a/src/hbwidgets/popups/hbprogressdialog_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/popups/hbprogressdialog_p.h	Mon May 03 12:48:33 2010 +0300
@@ -44,36 +44,36 @@
     ~HbProgressDialogPrivate();
 
     void init(HbProgressDialog::ProgressDialogType noteType);
+    void createPrimitives();
     void _q_finished();
     void _q_progressValueChanged(int);
-	void _q_userCancel();
+    void _q_userCancel();
 
-	enum StateFlag {
-         Autoreset = 0x1,
-         Autoclose = 0x2,
-		 Showtimer = 0x4,
-		 Closetimer = 0x8,
-		 Closepending = 0x10
+    enum StateFlag {
+        Autoreset = 0x1,
+        Autoclose = 0x2,
+        Showtimer = 0x4,
+        Closetimer = 0x8,
+        Closepending = 0x10
      };
+
      Q_DECLARE_FLAGS(StateFlags, StateFlag)
      StateFlags flags;
 
-
     static HbProgressDialogPrivate *d_ptr(HbProgressDialog *note) {
         Q_ASSERT(note);
         return note->d_func();
     }
-	HbAction *mAction;
+    HbAction *mAction;
     QTimeLine *mTimer;
     HbIcon mIcon;
-	HbProgressDialogContentWidget* mContentWidget;
-	Qt::Alignment mIconAlignment;
-    bool mTextWrapping;
-	int mMinDuration;
-	int mDelayTime;
-	HbProgressDialog::ProgressDialogType mNoteType;
-	QString mTextString;
-	Qt::Alignment mAlign;
+    HbProgressDialogContentWidget* mContentWidget;
+    Qt::Alignment mIconAlignment;
+    int mMinDuration;
+    int mDelayTime;
+    HbProgressDialog::ProgressDialogType mNoteType;
+    QString mTextString;
+    Qt::Alignment mAlign;
 };
 
 #endif
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/popups/hbprogressnote.cpp
--- a/src/hbwidgets/popups/hbprogressnote.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,645 +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 HbWidgets 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 <hbnamespace_p.h>
-#include <hbiconitem.h>
-#include <hbaction.h>
-#include <hbprogressnote.h>
-#include <hbprogressnote_p.h>
-#include <hbstyleoptionprogressdialog.h>
-#include <hbstyleoptionprogressbar.h>
-#include <hbinstance.h>
-
-#include <QGraphicsItem>
-#include <QDebug>
-
-class HbProgressNoteContentWidget:public HbWidget
-{
-    Q_OBJECT
-	public:
-	QGraphicsItem* mIconItem;
-	HbProgressBar* mPb;
-	HbLabel *mText;// This will be HbTextItem and creation will delegate to style when it fixes the layout issue...
-	HbProgressNotePrivate *d;
-    enum { Type = HbPrivate::ItemType_ProgressNoteContentWidget };
-    int type() const { return Type; }
-	HbProgressNoteContentWidget(HbProgressNotePrivate *priv,QGraphicsItem* parent =0 ):HbWidget(parent),
-		mIconItem(0),mPb(0),mText(0),d(priv)
-	{
-       
-	    if( !mPb ){
-		    mPb = new HbProgressBar(HbProgressBar::SimpleProgressBar,this);
-	    }
-        
-		// Unfortunately i cant create the textitem via Style...
-		/*mTextItem = style()->createPrimitive(HbStyle::P_Note_text, this);
-		*/
-
-		mText     = new HbLabel(this); // This will be HbTextItem and creation will delegate to style 
-		// when it fixes the layout issue...
-		mIconItem = style()->createPrimitive(HbStyle::P_MessageBox_icon, this);
-
-        mText->setTextWrapping(Hb::TextWrapAnywhere);
-        HbStyle::setItemName(mText, "text");
-        HbStyle::setItemName(mIconItem, "icon");
-        HbStyle::setItemName(mPb, "pbar");
-        HbStyle::setItemName(this, "this");
-
-		setProperty("hasText",true);
-        setProperty("hasIcon",true);
-	    
-	}
-    void polish( HbStyleParameters& params ) {
-
-		if( ((HbIconItem*)mIconItem)->isNull()){
-			HbStyle::setItemName(mIconItem,QString());
-			setProperty("hasIcon",false);
-		 }
-        HbWidget::polish(params);
-        //hack for popups resize issue
-        if(parentLayoutItem()->parentLayoutItem()) {
-           HbWidget* parentWidget = (HbWidget*) parentLayoutItem()->parentLayoutItem();
-           parentWidget->resize(parentWidget->preferredSize());
-        }
-    }
-	
-};
-
-HbProgressNotePrivate::HbProgressNotePrivate() :
-    mAction(0),mTimer(0),mContentWidget(0),mTextWrapping(true),mMinDuration(0),mDelayTime(0)
-{
-	
-}
-
-HbProgressNotePrivate::~HbProgressNotePrivate()
-{
-    
-}
-
-
-void HbProgressNotePrivate::init(HbProgressNote::ProgressNoteType type)
-{
-    Q_Q(HbProgressNote);
-   	mContentWidget = new HbProgressNoteContentWidget(this);
-    q->setContentWidget(mContentWidget);
-	mNoteType = type ;
-   	
-	if(mNoteType == HbProgressNote::WaitNote){
-		mContentWidget->mPb->setRange(0,0);
-	}
-	else{
-		mContentWidget->mPb->setRange(0,100);
-	}
-	mAction = new HbAction(q->tr("Cancel"));
-    QObject::connect(mAction, SIGNAL(triggered()), q, SLOT(_q_userCancel()));
-    q->setPrimaryAction(mAction);
-	mMinDuration = 1500;
-	mDelayTime = 1000;
-
-    mTimer = new QTimeLine(mDelayTime, q);
-    mTimer->setFrameRange(0, 100);
-   
-	
-    QObject::connect(mTimer, SIGNAL(finished()), q, SLOT(_q_finished()));
-    q->setTimeout(HbPopup::NoTimeout);
-    q->setDismissPolicy(HbPopup::NoDismiss);
-    q->setModal(false);
-    q->setBackgroundFaded(false);
-    q->hide();
-	
-
-    
-}
-
-void HbProgressNotePrivate::_q_userCancel()
-{
-    Q_Q(HbProgressNote);
-	flags &= ~HbProgressNotePrivate::Closetimer;
-	mTimer->stop();
-    q->cancel();
-	
-}
-
-void HbProgressNotePrivate::_q_finished()
-{
-    Q_Q(HbProgressNote);
-
-	if(flags.testFlag(HbProgressNotePrivate::Showtimer)){
-            mTimer->stop();
-                        q->HbDialog::show();
-			mTimer->setDuration(mMinDuration);
-            mTimer->setCurrentTime(0);
-			mTimer->start();
-			flags &= ~HbProgressNotePrivate::Showtimer;
-			flags |= HbProgressNotePrivate::Closetimer;
-	}
-	else if(flags.testFlag(HbProgressNotePrivate::Closetimer)){
-		flags &= ~HbProgressNotePrivate::Closetimer;
-		if(flags.testFlag(HbProgressNotePrivate::Closepending)){
-			q->close();
-		}
-	}
-}
-
-void HbProgressNotePrivate::_q_progressValueChanged(int value)
-{
-	 Q_Q(HbProgressNote);
-	 if(value >= mContentWidget->mPb->maximum() && q->autoClose()){
-		 if(flags.testFlag(HbProgressNotePrivate::Closetimer)){
-			flags |= HbProgressNotePrivate::Closepending;
-			flags &= ~HbProgressNotePrivate::Showtimer;
-		 }
-		 else if(!flags.testFlag(HbProgressNotePrivate::Showtimer)){
-			 q->close();
-		 }
-		 else{
-			 flags &= ~HbProgressNotePrivate::Showtimer;
-		 }		 
-	 }
-}
-
-
-/*!
-    @deprecated
-    @hbwidgets
-
-    \this is deprecated class, use HbPrgoressDialog.
-
-    \class HbProgressNote
-    \brief HbProgressNote is a notification widget that combines test, icon, and a progress bar.
-    
-    \image html hbprogressnote.png A progress note.
-
-    HbProgressNote provides several types of notifications. The supported  types are:
-    
-    \code
-    enum ProgressNoteType { ProgressNote, WaitNote };
-    \endcode
-
-    \sa HbDialog
-
-    Progress note has a number of use cases. Depending on the use case, either the value of the progress bar
-    is updated  manually or waiting progress bar will be shown. The former case is used when displaying a download note.
-    The latter case is used when connecting to network or opening a web page. The examples below demonstrate the use
-    cases.
-
-    The first example is a note  displayed when the application is connecting
-    to network. As the delay is unknown the waiting progressbar will be shown indefinitely. 
-    The note disappears if the user clicks Cancel button or
-    after the connection is established in which case the application closes the progress note.
-
-    Here is an example of using the infinite progress note:
-    
-    \code
-    HbProgressNote *note = new HbProgressNote(HbProgressNote::WaitNote);
-    note->show();
-    \endcode
-
-    The progress note is closed explicitly when the user clicks Cancel button or the application calls cancel().
-
-    Another use case is an application downloading a file. 
-    \code
-    HbProgressNote *note = new HbProgressNote(HbProgressNote::ProgressNote);
-    note->setMinimum(0);
-    note->setMaximum(1000);
-    note->show();
-    for (int i=0;i<1000;i+=100) 
-    {
-      note->setProgressValue(i);
-      note->setText(QString("Downloaded %1/1000 KB").arg(i));
-    }
-
-    \endcode
-*/
-
-/*!
-    Constructor.
-
-    \param type Must be one of the defined ProgressNoteType enumerations.
-    \param parent An optional parameter.
-
-    \deprecated HbProgressNote::HbProgressNote(HbProgressNote::ProgressNoteType, QGraphicsItem*)
-        is deprecated.
-*/
-
-HbProgressNote::HbProgressNote(ProgressNoteType type, QGraphicsItem *parent) :
-    HbDialog(*new HbProgressNotePrivate, parent)
-{
-    Q_D(HbProgressNote);
-    d->init(type);
-	setAutoClose(true);
-}
-
-/*!
-    Constructor.
-
-    \param parent An optional parameter.
-    
-    \deprecated HbProgressNote::HbProgressNote(QGraphicsItem*)
-        is deprecated.
-
-*/
-HbProgressNote::HbProgressNote(QGraphicsItem *parent) :
-    HbDialog(*new HbProgressNotePrivate, parent)
-{
-    Q_D(HbProgressNote);
-    d->init(ProgressNote);
-    setAutoClose(true);
-}
-
-/*!
-    Returns the maximum value of the progressbar within the note.
-
-    The default value is \c 100.
-
-    \sa setMaximum()
-*/
-int HbProgressNote::maximum() const
-{
-    Q_D(const HbProgressNote);
-
-    return d->mContentWidget->mPb->maximum();
-}
-
-
-/*!
-    Sets the maximum value of the progressbar within the note.
-
-    \sa maximum()
-*/
-void HbProgressNote::setMaximum(int max)
-{
-    Q_D(HbProgressNote);
-
-    d->mContentWidget->mPb->setMaximum(max);
-}
-
-/*!
-    Returns the minimum value of the progressbar within the note.
-
-    The default value is \c 0.
-
-    \sa setMinimum()
-*/
-int HbProgressNote::minimum() const
-{
-    Q_D(const HbProgressNote);
-    return d->mContentWidget->mPb->minimum();
-}
-
-/*!
-    Sets the minimum value of the progressbar within the note.
-
-    \sa minimum()
-*/
-void HbProgressNote::setMinimum(int min)
-{
-    Q_D(HbProgressNote);
-
-    d->mContentWidget->mPb->setMinimum(min);
-}
-
-/*!
-    Sets the minimum and maximum value of the progressbar within the note.
-
-    \sa minimum()
-    \sa maximum()
-*/
-void HbProgressNote::setRange(int min,int max)
-{
-    Q_D(HbProgressNote);
-    d->mContentWidget->mPb->setRange(min,max);
-}
-
-/*!
-  Returns the value of the progressbar within the note.
-
-  This value is constrained as follows:
-  \b minimum <= \c value <= \b maximum.
-
-  \sa setValue()
-
- */
-int HbProgressNote::progressValue() const
-{
-    Q_D(const HbProgressNote);
-
-    return d->mContentWidget->mPb->progressValue();
-}
-
-/*!
-  Sets the value of the progressbar within the note.
-  After the timeline has been started the value is updated automatically.
-  Use this function only if the timer is not used.
-
-  This value is constrained as follows:
-  \b minimum <= \c value <= \b maximum.
-
- \sa value()
-
-*/
-void HbProgressNote::setProgressValue(int value)
-{
-    Q_D(HbProgressNote);
-
-    d->mContentWidget->mPb->setProgressValue(value);
-	d->_q_progressValueChanged(value);
-}
-
-/*!
-  Closes the popup while emitting the cancelled() signal. This function is called when 
-  user presses the Cancel button or then the timer expires.
-
- */
-void HbProgressNote::cancel() 
-{
-   // Q_D(HbProgressNote);
-
-    emit cancelled();
-    close();
-}
-
-QGraphicsItem* HbProgressNote::primitive(HbStyle::Primitive primitive) const
-{
-    Q_D(const HbProgressNote);
-    switch (primitive) {
-        case HbStyle::P_Popup_background:
-            return HbDialog::primitive(primitive);
-        case HbStyle::P_ProgressDialog_icon:
-            return d->mContentWidget->mIconItem;
-        default:
-            return 0;
-        }    
-}
-
-/*!
-  Sets the progressnote type. 
-  \sa progressNoteType()
- */
-void HbProgressNote::setProgressNoteType(HbProgressNote::ProgressNoteType type)
-{
-    Q_D(HbProgressNote);
-	if(d->mNoteType != type) {
-		d->mNoteType = type;
-		if(type == WaitNote){
-			d->mContentWidget->mPb->setRange(0,0);
-		}
-		else {
-			d->mContentWidget->mPb->setRange(0,100);
-		}
-	}
-}
-
-/*!
-  returns progressnote type;
-   \sa setProgressNoteType()
- */
-HbProgressNote::ProgressNoteType HbProgressNote::progressNoteType() const
-{
-    Q_D(const HbProgressNote);
-    return d->mNoteType;
-}
-  
-
-void HbProgressNote::showEvent(QShowEvent *event)
-{
-    Q_D(HbProgressNote);
-	d->mContentWidget->mPb->show();
-        HbDialog::showEvent(event);
-}
-
-/*!
-  Shows the Note after a delay(say 1sec). This is a convenient slot
-  if user cancels note before delay expired note wont be shown at all 
- */
-void HbProgressNote::delayedShow()
-{
-		Q_D(HbProgressNote);
-		d->flags |= HbProgressNotePrivate::Showtimer;
-		d->mTimer->setDuration(d->mDelayTime);
-		d->mTimer->start();		
-}
-
-bool HbProgressNote::autoClose () const 
-{
-	Q_D(const HbProgressNote);	
-	return d->flags.testFlag(HbProgressNotePrivate::Autoclose);
-}
-
-void HbProgressNote::setAutoClose ( bool b )
-{
-    Q_D(HbProgressNote);
-	b?d->flags 
-		|= HbProgressNotePrivate::Autoclose : d->flags &= ~HbProgressNotePrivate::Autoclose;
-}
-
-void HbProgressNote::initStyleOption(HbStyleOption *option) const
-{
-	Q_D(const HbProgressNote);
-	HbStyleOptionProgressDialog* progressNoteOption 
-		= qstyleoption_cast< HbStyleOptionProgressDialog *>(option);
-	
-        HbDialog::initStyleOption(progressNoteOption);
-	progressNoteOption->progressBarSize = d->mContentWidget->mPb->minimumSize();
-    progressNoteOption->icon = d->mIcon;
-    progressNoteOption->iconAlignment = d->mIconAlignment;
-}
-void HbProgressNote::closeEvent ( QCloseEvent * event )
-{
-    Q_D(HbProgressNote);
-	d->mAction->setToolTip("");
-    if(d->flags.testFlag(HbProgressNotePrivate::Closetimer)){
-        d->flags |= HbProgressNotePrivate::Closepending;
-        event->setAccepted(false);
-        return;
-    }
-    if(d->flags.testFlag(HbProgressNotePrivate::Showtimer)){
-        d->mTimer->stop();
-        d->flags &= ~HbProgressNotePrivate::Showtimer;
-    }
-    d->mContentWidget->mPb->close();
-    HbDialog::closeEvent(event);
-	
-}
-
-/*!
-    Sets text of the note.
-    \sa text()
-*/
-void HbProgressNote::setText(const QString &text)
-{
-    Q_D(HbProgressNote);
-    if ( text != d->mContentWidget->mText->plainText() ) {
-        d->mContentWidget->mText->setPlainText(text);
-	}
-}
-/*!
-    Returns text of the note.
-    \sa setText()
-*/
-QString HbProgressNote::text() const
-{
-    Q_D(const HbProgressNote);
-    return d->mContentWidget->mText->plainText();
-}
-
-
-/*!
-    Sets icon for the note.
-    \sa icon()
-*/
-void HbProgressNote::setIcon(const HbIcon &icon)
-{
-    Q_D(HbProgressNote);
-    if (icon != d->mIcon){
-        d->mIcon = icon;
-        if (d->mContentWidget->mIconItem) {
-            HbStyleOptionProgressDialog progressNoteOption;
-            initStyleOption(&progressNoteOption);
-            style()->updatePrimitive(d->mContentWidget->mIconItem, HbStyle::P_ProgressDialog_icon, &progressNoteOption);
-        }
-	}
-}
-
-
-/*!
-    Returns icon of the note.
-    \sa setIcon()
-*/
-HbIcon HbProgressNote::icon() const
-{
-    Q_D(const HbProgressNote);
-    return d->mIcon;
-}
-
-
-/*!
-    Sets the text alignment.
-    \param align Qt defined alignment options can used.
-
-    The default value is Qt::AlignLeft|Qt::AlignVCenter
-
-    \sa mTextAlignment()
-*/
-void HbProgressNote::setTextAlignment( Qt::Alignment align )
-{
-    Q_D(HbProgressNote);
-
-    if (align != d->mContentWidget->mText->alignment()) {
-		d->mContentWidget->mText->setAlignment(align);
-       
-    }
-}
-
-
-/*!
-    Returns the text alignment.
-
-    \sa setTextAlignment()
-*/
-Qt::Alignment HbProgressNote::textAlignment() const
-{
-    Q_D(const HbProgressNote);
-	return d->mContentWidget->mText->alignment();
-}
-
-
-/*!
-    Sets the icon alignment.
-
-    \param align Qt defined alignment options can used.
-
-    The default value is Qt::AlignCenter.
-
-    \sa mIconAlignment()
-*/
-void HbProgressNote::setIconAlignment( Qt::Alignment align )
-{
-    Q_D(HbProgressNote);
-    if (align != d->mIconAlignment){
-        d->mIconAlignment = align;
-        if (d->mContentWidget->mIconItem) {
-            HbStyleOptionProgressDialog progressNoteOption;
-            initStyleOption(&progressNoteOption);
-            style()->updatePrimitive(d->mContentWidget->mIconItem, HbStyle::P_ProgressDialog_icon, &progressNoteOption);
-        }
-    }
-}
-
-
-/*!
-    Returns the icon alignment.
-
-    \sa setIconAlignment()
-*/
-Qt::Alignment HbProgressNote::iconAlignment() const
-{
-    Q_D(const HbProgressNote);
-    return d->mIconAlignment;
-}
-
-
-/*!
-    Sets the text wrapping.
-    \param wrap When set, the text is drawn with Qt::TextWordWrap enabled
-     meaning that lines breaks are at appropriate point,
-     e.g. at word boundaries.
-
-    The default value is true;
-
-    \sa textWrapping()
-*/
-void HbProgressNote::setTextWrapping(bool wrap)
-{
-    Q_D(HbProgressNote);
-    if (wrap != d->mTextWrapping){
-			d->mTextWrapping = wrap;
-			if(wrap) {
-				d->mContentWidget->mText->setTextWrapping(Hb::TextWordWrap);
-			}
-			else{
-				d->mContentWidget->mText->setTextWrapping(Hb::TextNoWrap);
-			}
-    }
-}
-
-/*!
-    Returns the text wrapping setting.
-
-    \sa setTextWrapping()
-*/
-bool HbProgressNote::textWrapping() const
-{
-    Q_D(const HbProgressNote);
-    return d->mTextWrapping;
-}
-
-
-#include "moc_hbprogressnote.cpp"
-#include "hbprogressnote.moc"
-
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/popups/hbprogressnote.h
--- a/src/hbwidgets/popups/hbprogressnote.h	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,110 +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 HbWidgets 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 HBPROGRESSNOTE_H
-#define HBPROGRESSNOTE_H
-
-#include <hbdialog.h>
-
-class HbProgressNotePrivate;
-
-class HB_WIDGETS_EXPORT HbProgressNote : public HbDialog
-{
-    Q_OBJECT
-    Q_ENUMS(ProgressNoteType)
-    Q_PROPERTY( int maximum READ maximum WRITE setMaximum )
-    Q_PROPERTY( int minimum READ minimum WRITE setMinimum )
-    Q_PROPERTY( int value READ progressValue WRITE setProgressValue )
-    Q_PROPERTY( bool autoClose READ autoClose WRITE setAutoClose )
-    Q_PROPERTY( ProgressNoteType progressNoteType READ progressNoteType WRITE setProgressNoteType)
-    Q_PROPERTY( QString text READ text WRITE setText )
-    Q_PROPERTY( HbIcon icon READ icon WRITE setIcon )
-    Q_PROPERTY( Qt::Alignment textAlignment READ textAlignment WRITE setTextAlignment )
-    Q_PROPERTY( Qt::Alignment iconAlignment READ iconAlignment WRITE setIconAlignment )
-    Q_PROPERTY( bool textWrapping READ textWrapping WRITE setTextWrapping )
-public:
-
-    enum ProgressNoteType { ProgressNote,WaitNote };
-
-    HbProgressNote(ProgressNoteType type , QGraphicsItem *parent = 0);
-    explicit HbProgressNote(QGraphicsItem *parent = 0);
-
-    enum { Type = Hb::ItemType_ProgressNote };
-    int type() const { return Type; }
-
-    int maximum() const;
-    int minimum() const;
-   
-	void setRange(int min,int max);
-    int progressValue() const;
-    
-	bool autoClose () const ;
-    void setAutoClose ( bool b ) ;
-
-	void setText(const QString &text);
-	QString text() const;
-    
-	void setIcon(const HbIcon &icon);
-	HbIcon icon() const;
-    
-	void setTextAlignment(Qt::Alignment align);
-	Qt::Alignment textAlignment() const;
-    
-	void setIconAlignment(Qt::Alignment align);
-	Qt::Alignment iconAlignment() const;
-    
-	void setTextWrapping(bool wrap);
-    bool textWrapping() const;
-    
-    void setProgressNoteType(HbProgressNote::ProgressNoteType type );
-    HbProgressNote::ProgressNoteType progressNoteType() const;
-    
-    QGraphicsItem* primitive(HbStyle::Primitive primitive) const;
-    
-public slots:
-    void cancel();
-    void setProgressValue(int progressValue);
-    void setMinimum(int min);
-	void setMaximum(int max);
-    void delayedShow();
-
-signals:
-    void cancelled();
-
-protected:
-	void showEvent(QShowEvent *event);
-	void initStyleOption(HbStyleOption *option) const;
-    void closeEvent ( QCloseEvent * event );
-
-private:
-    Q_DECLARE_PRIVATE_D(d_ptr, HbProgressNote)
-    Q_DISABLE_COPY(HbProgressNote)
-    Q_PRIVATE_SLOT(d_func(), void _q_finished())
-	Q_PRIVATE_SLOT(d_func(), void _q_progressValueChanged(int))
-	Q_PRIVATE_SLOT(d_func(), void _q_userCancel())
-};
-
-#endif // HBPROGRESSNOTE_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/popups/hbprogressnote_p.h
--- a/src/hbwidgets/popups/hbprogressnote_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +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 HbWidgets 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 HBPROGRESSNOTEPRIVATE_H
-#define HBPROGRESSNOTEPRIVATE_H
-
-#include <hbprogressbar.h>
-#include <hbprogressnote.h>
-#include <hbdialog_p.h>
-#include <hblabel.h>
-
-#include <QFlags>
-#include <QTimeLine>
-
-class HbProgressNoteContentWidget;
-
-class HbProgressNotePrivate :public HbDialogPrivate
-{
-    Q_DECLARE_PUBLIC(HbProgressNote)
-public:
-    HbProgressNotePrivate();
-    ~HbProgressNotePrivate();
-
-    void init(HbProgressNote::ProgressNoteType noteType);
-    void _q_finished();
-    void _q_progressValueChanged(int);
-	void _q_userCancel();
-
-	enum StateFlag {
-         Autoreset = 0x1,
-         Autoclose = 0x2,
-		 Showtimer = 0x4,
-		 Closetimer = 0x8,
-		 Closepending = 0x10
-     };
-     Q_DECLARE_FLAGS(StateFlags, StateFlag)
-     StateFlags flags;
-
-
-    static HbProgressNotePrivate *d_ptr(HbProgressNote *note) {
-        Q_ASSERT(note);
-        return note->d_func();
-    }
-	HbAction *mAction;
-    QTimeLine *mTimer;
-    HbIcon mIcon;
-	HbProgressNoteContentWidget* mContentWidget;
-	Qt::Alignment mIconAlignment;
-    bool mTextWrapping;
-	int mMinDuration;
-	int mDelayTime;
-	HbProgressNote::ProgressNoteType mNoteType;
-};
-
-#endif
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/popups/hbselectiondialog.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbwidgets/popups/hbselectiondialog.cpp	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,250 @@
+/****************************************************************************
+**
+** 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 HbWidgets 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 "hbselectiondialog.h"
+#include "hbwidget_p.h"
+#include "hbselectiondialog_p.h"
+#include "hblabel.h"
+#include "hbaction.h"
+#include "hbabstractviewitem.h"
+#include <hbinstance.h>
+
+#include <QtDebug>
+#include <QGraphicsScene>
+#include <hblistwidgetitem.h>
+#include <hblistwidget.h>
+#include <hbradiobuttonlist.h>
+
+
+/*!
+    @beta
+    @hbwidgets
+    \class HbSelectionDialog
+    \brief HbSelectionDialog class allows user create a list of options out of which one or more can be selected.  
+    
+    HbSelectionDialog is a modal dialog which means once it is displayed, user can not perform any action
+    untill dialog is closed.
+
+    There can be 2 modes of selection. SingleSelection or MultiSelection. If it is SingleSelection, dialog is closed
+    as soon as user clicks one of the options.In case of MultiSelection, user has to explicitly press "OK" button to
+    close it after selecting the item(s). User can anytime press "Cancel" button to close the dialog without selecting 
+    anything.
+
+    User can provide the data for options in different forms. It can be simple list of strings, list of custom 
+    items or a model itself.
+*/
+
+
+/*!
+    @beta
+    Constructor of HbSelectionDialog
+
+    \param parent. Parent widget
+*/
+HbSelectionDialog::HbSelectionDialog(QGraphicsItem* parent): 
+                                HbDialog(*new HbSelectionDialogPrivate, parent)
+{
+    Q_D(HbSelectionDialog);
+    d->init();
+    setDismissPolicy(NoDismiss);
+}
+
+/*!
+    @beta
+    Destructor 
+ */
+HbSelectionDialog::~HbSelectionDialog()
+{
+}
+
+/*!
+   @beta
+
+   \reimp
+ */
+void HbSelectionDialog::showEvent(QShowEvent *event)
+{    
+    HbDialog::showEvent(event);
+}
+
+/*!
+    @beta
+    Sets the \a SelectionMode of the list.
+    
+    \param mode. It can be SingleSelection or MultiSelection .Default value is \a NoSelection.
+
+    \sa selectionMode()
+*/
+void HbSelectionDialog::setSelectionMode(HbAbstractItemView::SelectionMode mode)
+{
+	Q_D(HbSelectionDialog);
+	
+	d->setSelectionMode(mode);
+}
+
+/*!
+    @beta
+    Returns current SelectionMode of the list.Default value is \a NoSelection.
+
+    \sa setSelectionMode()
+*/	
+HbAbstractItemView::SelectionMode HbSelectionDialog::selectionMode() const
+{
+	Q_D(const HbSelectionDialog);
+	return d->mSelectionMode;
+}
+
+/*!
+    @beta
+    Sets the string list items to be displayed.
+
+    \param items. A items is the list of strings
+    \param currentIndex. A currentIndex is the index of default selection
+
+    \sa stringItems()
+*/	
+void HbSelectionDialog::setStringItems(const QStringList &items,int currentIndex)
+{
+	Q_D(HbSelectionDialog);
+	d->setStringItems(items,currentIndex);
+}
+
+/*!
+    @beta
+    Returns list of string list items earlier set by setStringItems().
+
+    \sa setStringItems()
+*/	
+QStringList HbSelectionDialog::stringItems() const
+{
+	Q_D(const HbSelectionDialog);
+	return d->stringItems();
+}
+
+/*!
+    @beta
+    Returns list of selected indexes. List contains only one item if
+    \a SelectionMode is \a NoSelection or \a SingleSelection. It may 
+    contain more items if \a SelectionMode is \a MultiSelection.
+   
+    \sa setSelectionMode(), 
+    \sa selectionMode()
+ */
+QList<QVariant> HbSelectionDialog::selectedItems() const
+{
+	Q_D(const HbSelectionDialog);
+	return d->selectedItems();
+}
+
+/*!
+    @beta
+    set the item selected.
+    It can select one item if \a Selection mode is \a SingleSelection
+    it can select more item if \a SelectionMode is \a MultiSelection.
+
+    \param items.
+
+    \sa selectedItems
+*/
+void HbSelectionDialog::setSelectedItems(const QList<QVariant> items) 
+{
+	Q_D(HbSelectionDialog);
+	d->setSelectedItems(items);
+}
+
+/*!
+    @beta
+    Returns list of selected model indexes. List contains only one item if
+    \a SelectionMode is \a NoSelection or \a SingleSelection. It may 
+    contain more items if \a SelectionMode is \a MultiSelection.
+    
+    \sa setSelectionMode(),
+    \sa selectionMode()
+ */
+QModelIndexList HbSelectionDialog::selectedModelIndexes() const
+{
+	Q_D(const HbSelectionDialog);
+	return d->selectedModelIndexes();
+}
+
+/*!
+    @beta
+    Sets the list of custom list items to be displayed.\a items is the
+    list of custom items.\a bTransferOwnership is a flag defining the owner
+    of the items. If \a true, items will be deleted when dialog is deleted else
+    user is responsible for deleting the items.Default value is \a false.
+    \a current is the index of default selection.
+
+    \param items. items is the list of custom items
+    \param transferOwnership. true or false
+    \param currentIndex
+
+    \sa widgetItems();
+*/	
+void HbSelectionDialog::setWidgetItems(const QList<HbListWidgetItem*> &items,bool transferOwnership,int currentIndex)
+{
+	Q_D(HbSelectionDialog);
+	d->setWidgetItems(items,transferOwnership,currentIndex);
+}
+
+/*!
+    @beta
+    Returns list of custom list items earlier set by setWidgetItems().
+    
+    \sa setWidgetItems().
+*/	
+QList<HbListWidgetItem*> HbSelectionDialog::widgetItems() const
+{
+	Q_D(const HbSelectionDialog);
+	return d->widgetItems();
+}
+
+/*!
+    @beta
+    Sets the Model containing data for the list items.
+
+    \param model. 
+
+    \sa model()
+*/	
+void HbSelectionDialog::setModel(QAbstractItemModel* model)
+{
+	Q_D(HbSelectionDialog);
+	d->setModel(model);
+}
+
+/*!
+    @beta
+    Returns model eariler set by setModel().
+
+    \sa setModel()
+*/	
+QAbstractItemModel* HbSelectionDialog::model() const
+{
+	Q_D(const HbSelectionDialog);
+	return d->model();
+}
+
+
+#include "moc_hbselectiondialog.cpp"
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/popups/hbselectiondialog.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbwidgets/popups/hbselectiondialog.h	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,81 @@
+/****************************************************************************
+**
+** 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 HbWidgets 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 HBSELECTIONDIALOG_H
+#define HBSELECTIONDIALOG_H
+
+#include <QAbstractItemView>
+#include <hbdialog.h>
+#include <hbabstractitemview.h>
+
+class HbSelectionDialogPrivate;
+class HbListWidgetItem;
+
+QT_BEGIN_NAMESPACE
+
+class QAbstractItemModel;
+
+QT_END_NAMESPACE
+
+class HB_WIDGETS_EXPORT HbSelectionDialog : public HbDialog
+{
+	Q_OBJECT
+    Q_PROPERTY(HbAbstractItemView::SelectionMode selectionMode READ selectionMode WRITE setSelectionMode)
+    Q_PROPERTY(QStringList items READ stringItems WRITE setStringItems)
+    Q_PROPERTY(QList<QVariant> selectedItems READ selectedItems WRITE setSelectedItems)
+    
+public:
+	enum { Type = Hb::ItemType_SelectionDialog };
+	int type() const { return Type; }
+	
+	explicit HbSelectionDialog(QGraphicsItem* parent=0);
+    ~HbSelectionDialog();
+        
+    void setSelectionMode(HbAbstractItemView::SelectionMode mode);
+    HbAbstractItemView::SelectionMode selectionMode() const;
+    
+	void setStringItems(const QStringList &items,int currentIndex = 0);
+    QStringList stringItems() const;
+	
+    void setWidgetItems(const QList<HbListWidgetItem*> &items,bool transferOwnership = false,int currentIndex = 0);
+	QList<HbListWidgetItem*> widgetItems() const;
+    
+	void setModel(QAbstractItemModel* model);
+	QAbstractItemModel* model() const;
+	
+    QList<QVariant> selectedItems() const;
+    void setSelectedItems(const QList<QVariant> items);
+
+    QModelIndexList selectedModelIndexes() const;
+
+protected:
+    void showEvent(QShowEvent *event);
+
+private:
+    Q_DISABLE_COPY(HbSelectionDialog)
+    Q_DECLARE_PRIVATE_D(d_ptr, HbSelectionDialog)
+};
+
+#endif //HBSELECTIONDIALOG_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/popups/hbselectiondialog_p.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbwidgets/popups/hbselectiondialog_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,390 @@
+/****************************************************************************
+**
+** 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 HbWidgets 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 <QGraphicsLinearLayout>
+#include <qglobal.h>
+#include "hbabstractviewitem.h"
+#include "hbselectiondialog_p.h"
+#include <hblabel.h>
+#include <hblistwidget.h>
+#include <hblistwidgetitem.h>
+#include <QtDebug>
+#include <hbcheckbox.h>
+#include <hbaction.h>
+
+
+HbSelectionDialogContentWidget::HbSelectionDialogContentWidget(HbSelectionDialogPrivate *priv):HbWidget(),
+						mListWidget(0),d(priv),chkMark(0),lbCounter(0)
+{
+    mListWidget = new HbListWidget(this);
+	HbStyle::setItemName(mListWidget, "list");
+    QObject::connect(mListWidget,SIGNAL(activated(const QModelIndex&)),this,SLOT(_q_listItemSelected(QModelIndex)));
+    QObject::connect(mListWidget,SIGNAL(activated(HbListWidgetItem *)),this,SLOT(_q_listWidgetItemSelected(HbListWidgetItem *)));
+}
+
+
+void HbSelectionDialogContentWidget::_q_listWidgetItemSelected(HbListWidgetItem *item)
+{
+	if(item){
+		updateCounter();
+	}
+}
+
+
+void HbSelectionDialogContentWidget::_q_listItemSelected(QModelIndex index)
+{
+	Q_UNUSED(index)
+	if(mListWidget->selectionMode()== HbAbstractItemView::SingleSelection ||
+	   mListWidget->selectionMode()== HbAbstractItemView::NoSelection){
+	   d->close();   
+	}
+	updateCounter();
+}
+
+int HbSelectionDialogContentWidget::selectedItemCount() const
+{
+	int selectedItems = 0;
+	QItemSelectionModel* selectionModel = mListWidget->selectionModel();
+	if(selectionModel){
+		selectedItems = selectionModel->selectedRows().count();
+	}
+	return selectedItems;
+}
+
+int HbSelectionDialogContentWidget::totalItemCount() const
+{
+	return mListWidget->count();
+}
+
+void HbSelectionDialogContentWidget::updateCounter()
+{
+	if(mListWidget->selectionMode()!= HbAbstractItemView::MultiSelection) return;
+	if(chkMark && lbCounter){
+		int totalItems = totalItemCount();
+		int selectedItems = selectedItemCount();
+
+		lbCounter->setText(QString(QString::number(selectedItems) + "/" + QString::number(totalItems)));
+		//update checked state of "MarkAll" checkbox 
+		if (selectedItems == totalItems){
+			chkMark->blockSignals(true); //should not call _q_checkboxclicked()
+			chkMark->setChecked(true);
+			chkMark->blockSignals(false);
+		}
+		else{
+			chkMark->blockSignals(true); //should not call _q_checkboxclicked()
+			chkMark->setChecked(false);
+			chkMark->blockSignals(false);
+		}
+	}
+}
+
+void HbSelectionDialogContentWidget::_q_checkboxclicked(int value)
+{
+	int totalItems = 0;
+	int selectedItems = 0;
+	QAbstractItemModel* itemModel = mListWidget->model();
+	QModelIndex indexStart,indexEnd;
+	if(itemModel){
+		indexStart = itemModel->index(0,0);
+		indexEnd = itemModel->index(itemModel->rowCount()-1,0);
+		totalItems = itemModel->rowCount();
+	}
+
+	QItemSelectionModel* selectionModel = mListWidget->selectionModel();
+	if(selectionModel){
+		selectedItems = selectionModel->selectedRows().count();
+		if(value){ //Select All
+			selectionModel->select(QItemSelection(indexStart,indexEnd),QItemSelectionModel::Select);
+		}
+		else{ //Select None
+			selectionModel->clear();
+		}
+	}
+	updateCounter();
+}
+
+
+void HbSelectionDialogContentWidget::showMarkWidget(bool bShow)
+{
+	if(bShow){
+			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)));
+			updateCounter();
+	}
+	else{
+		delete chkMark;chkMark=0;
+		delete lbCounter;lbCounter=0;
+		HbStyle::setItemName(chkMark,"");
+		HbStyle::setItemName(lbCounter,"");
+		setProperty("multiSelection",false);
+	}
+}
+
+HbSelectionDialogPrivate::HbSelectionDialogPrivate()
+    :HbDialogPrivate()
+{
+	bOwnItems = false;
+}
+
+
+HbSelectionDialogPrivate::~HbSelectionDialogPrivate()
+{
+	if(!bOwnItems){
+			Q_Q(HbSelectionDialog);
+			HbSelectionDialogContentWidget* cWidget = qobject_cast<HbSelectionDialogContentWidget*>(q->contentWidget());
+			if(cWidget){
+				if(cWidget->mListWidget){
+                    int nRows = 0;
+                    QAbstractItemModel* itemModel = cWidget->mListWidget->model();
+                    if(itemModel){
+                        nRows = itemModel->rowCount();
+                        while(nRows){
+                            cWidget->mListWidget->takeItem(0);
+                            nRows = itemModel->rowCount();
+                        }
+                    }
+				}
+			}
+	}
+}
+void HbSelectionDialogPrivate::init()
+{
+    qDebug()<<" Entering init()";
+    Q_Q(HbSelectionDialog);
+
+    bOwnItems = false;
+
+    HbSelectionDialogContentWidget* contentWidget = new HbSelectionDialogContentWidget(this);
+    q->setContentWidget(contentWidget);
+
+    q->setPrimaryAction(new HbAction(QString(q->tr("Ok"))));
+
+    q->setSecondaryAction(new HbAction(QString(q->tr("Cancel"))));
+    q->setTimeout(0);
+    q->setModal(true);
+
+
+}
+
+
+
+void HbSelectionDialogPrivate::setSelectionMode(HbAbstractItemView::SelectionMode mode)
+{
+	Q_Q(HbSelectionDialog);
+
+	mSelectionMode = mode;
+	switch(mode)
+	{
+	case HbAbstractItemView::SingleSelection:
+	case HbAbstractItemView::MultiSelection:
+	case HbAbstractItemView::NoSelection:
+	{
+		HbSelectionDialogContentWidget* cWidget = qobject_cast<HbSelectionDialogContentWidget*>(q->contentWidget());
+		if(cWidget){
+			cWidget->mListWidget->setSelectionMode(mode);
+		}
+		if(mode == HbAbstractItemView::MultiSelection)
+			cWidget->showMarkWidget(true);	
+		else
+			cWidget->showMarkWidget(false);	
+	}
+	break;
+	case HbAbstractItemView::ContiguousSelection:
+		break;
+	}
+}
+
+QList<HbListWidgetItem*> HbSelectionDialogPrivate::widgetItems() const
+{
+	Q_Q(const HbSelectionDialog);
+
+	QList<HbListWidgetItem*> rows;
+	HbSelectionDialogContentWidget* cWidget = qobject_cast<HbSelectionDialogContentWidget*>(q->contentWidget());
+	if(cWidget){
+		HbListWidget* widget = qobject_cast<HbListWidget*>(cWidget->mListWidget);
+		if(widget){
+            int count = 0;
+            QAbstractItemModel* itemModel = widget->model();
+            if(itemModel)
+                count = itemModel->rowCount();
+			for(int i = 0; i < count; i++){
+				rows.append(widget->item(i));
+			}
+		}
+	}
+	return rows;
+}
+
+void HbSelectionDialogPrivate::setStringItems(const QStringList &items, int currentIndex)
+{
+	Q_Q(HbSelectionDialog);
+
+	HbSelectionDialogContentWidget* cWidget = qobject_cast<HbSelectionDialogContentWidget*>(q->contentWidget());
+	if(!cWidget) return;
+	
+    int nRows = 0;
+
+	if(cWidget->mListWidget){
+		int count = items.size();
+		for (int i = 0; i < count; ++i) {
+			HbListWidgetItem* modelItem = new HbListWidgetItem();
+			QString str = items.at(i);
+			modelItem->setText(str);
+			cWidget->mListWidget->addItem(modelItem);
+			
+            QAbstractItemModel* itemModel = cWidget->mListWidget->model();
+            if(itemModel)
+                nRows = itemModel->rowCount();
+		}
+		if(nRows > 0){ //if addition of rows was correct.
+            QList<QVariant> currentRow;
+            currentRow.append(QVariant(currentIndex));
+            setSelectedItems(currentRow);
+		}
+		
+	}
+}
+
+QStringList HbSelectionDialogPrivate::stringItems() const
+{
+	QStringList list;
+	QList<HbListWidgetItem*> items = widgetItems();
+	int count = items.count();
+	for(int i = 0; i < count; i++){
+                QString text = items[i]->text();
+                if(!text.isEmpty()){
+			list += text;
+		}
+	}
+	return list;
+}
+
+void HbSelectionDialogPrivate::setModel(QAbstractItemModel* model)
+{
+	Q_Q(HbSelectionDialog);
+
+	HbSelectionDialogContentWidget* cWidget = qobject_cast<HbSelectionDialogContentWidget*>(q->contentWidget());
+	if(cWidget){
+		cWidget->mListWidget->HbListView::setModel(model); //HbListView's implementation of setModel()
+	}
+}
+
+void HbSelectionDialogPrivate::setWidgetItems(const QList<HbListWidgetItem*> &items,bool transferOwnership,int currentIndex)
+{
+	Q_Q(HbSelectionDialog);
+
+	HbSelectionDialogContentWidget* cWidget = qobject_cast<HbSelectionDialogContentWidget*>(q->contentWidget());
+	if(cWidget){
+		if(cWidget->mListWidget){
+			int count = items.count();
+			for(int i = 0; i < count; i++){
+				cWidget->mListWidget->addItem(items[i]);
+			}
+			cWidget->mListWidget->setCurrentRow(currentIndex);
+			
+		}
+		bOwnItems = transferOwnership;
+	}
+}
+
+QAbstractItemModel* HbSelectionDialogPrivate::model() const
+{
+	Q_Q(const HbSelectionDialog);
+	
+	HbSelectionDialogContentWidget* cWidget = qobject_cast<HbSelectionDialogContentWidget*>(q->contentWidget());
+	if(cWidget){
+		return cWidget->mListWidget->HbListView::model(); //HbListView's implementation of model()
+	}
+	return 0;
+}
+
+QItemSelectionModel* HbSelectionDialogPrivate::selectionModel() const
+{
+	Q_Q(const HbSelectionDialog);
+	
+	HbSelectionDialogContentWidget* cWidget = qobject_cast<HbSelectionDialogContentWidget*>(q->contentWidget());
+	if(cWidget){
+		return cWidget->mListWidget->selectionModel();
+	}
+	return 0;
+}
+
+void HbSelectionDialogPrivate::setSelectedItems(const QList<QVariant> items)
+{
+	Q_Q(const HbSelectionDialog);
+    QItemSelectionModel *model = 0;
+    model = selectionModel();
+    if(model){
+        Q_FOREACH(QVariant i,items) {
+                model->select(model->model()->index(i.toInt(),0),
+                    QItemSelectionModel::Select);
+        }
+    }
+	HbSelectionDialogContentWidget* cWidget = qobject_cast<HbSelectionDialogContentWidget*>(q->contentWidget());
+	if(cWidget){
+		cWidget->updateCounter();
+	}
+}
+
+QList<QVariant> HbSelectionDialogPrivate::selectedItems() const
+{
+    QItemSelectionModel *model = 0;
+    QList<QVariant> selIndexes;
+    model = selectionModel();
+    if(model){
+        QModelIndexList indexes = model->selectedIndexes();
+        int count = indexes.count();
+        QModelIndex index;
+        for(int i = 0 ; i < count ; i++){
+            index = indexes[i];
+            selIndexes.append(QVariant(index.row()));
+        }
+    }
+    return selIndexes;
+
+}
+
+QModelIndexList HbSelectionDialogPrivate::selectedModelIndexes() const
+{
+    QItemSelectionModel *model = 0;
+    QModelIndexList selIndexes;
+    model = selectionModel();
+    if(model){
+        selIndexes =  model->selectedIndexes();
+    }
+    return selIndexes;
+}
+
+void HbSelectionDialogPrivate::close()
+{
+	Q_Q(HbSelectionDialog);
+	q->close();
+}
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/popups/hbselectiondialog_p.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbwidgets/popups/hbselectiondialog_p.h	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,101 @@
+/****************************************************************************
+**
+** 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 HbWidgets 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 HBSELECTIONDIALOGPRIVATE_H
+#define HBSELECTIONDIALOGPRIVATE_H
+
+#include <QGraphicsGridLayout>
+#include <QGraphicsWidget>
+
+#include <hbselectiondialog.h>
+#include "hbdialog_p.h"
+#include <hbabstractitemview.h>
+#include <hbtextitem.h>
+#include <hbglobal.h>
+
+class HbLabel;
+class HbListWidgetItem;
+class HbListWidget;
+class HbCheckBox;
+
+class HbSelectionDialogPrivate : public HbDialogPrivate
+{
+	Q_DECLARE_PUBLIC(HbSelectionDialog)
+public:
+    HbSelectionDialogPrivate();
+    ~HbSelectionDialogPrivate();
+    void setSelectionMode(HbAbstractItemView::SelectionMode mode);
+
+private:
+    void init();
+
+	void setStringItems(const QStringList &items,int currentIndex);
+    QStringList stringItems() const;
+
+	void setWidgetItems(const QList<HbListWidgetItem*> &items,bool transferOwnership,int currentIndex);
+    QList<HbListWidgetItem*> widgetItems() const;
+
+    void setSelectedItems(const QList<QVariant> items);
+    QList<QVariant> selectedItems() const;
+
+	void setModel(QAbstractItemModel* model);
+	QAbstractItemModel* model() const;
+    QItemSelectionModel* selectionModel() const;
+    QModelIndexList selectedModelIndexes() const;
+public:
+    bool bOwnItems;
+	HbAbstractItemView::SelectionMode mSelectionMode;
+    void close();
+};
+
+class HB_AUTOTEST_EXPORT HbSelectionDialogContentWidget :public HbWidget
+{
+	Q_OBJECT
+	Q_PROPERTY( bool multiSelection READ multiSelection WRITE setMultiSelection )
+private:
+	int selectedItemCount() const;
+	int totalItemCount() const;
+public:
+    HbListWidget* mListWidget;
+    HbSelectionDialogPrivate* d;
+    HbSelectionDialogContentWidget(HbSelectionDialogPrivate *priv);
+    enum { Type = Hb::ItemType_SelectionDialogContentWidget };
+    int type() const { return Type; }
+	void showMarkWidget(bool bShow);
+	bool multiSelection(){return bMultiSelection;};
+	void setMultiSelection(bool bValue){bMultiSelection = bValue;};
+	bool bMultiSelection;
+	void updateCounter();
+private:
+    HbCheckBox* chkMark;
+	HbTextItem* lbCounter;
+private slots:    
+	void _q_listWidgetItemSelected(HbListWidgetItem *item);
+	void _q_listItemSelected(QModelIndex index);
+	void _q_checkboxclicked(int value);
+};
+
+
+#endif //HBSELECTIONDIALOGPRIVATE_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/popups/hbsliderpopup.cpp
--- a/src/hbwidgets/popups/hbsliderpopup.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/popups/hbsliderpopup.cpp	Mon May 03 12:48:33 2010 +0300
@@ -464,7 +464,9 @@
 }
 
 /*!
-    \deprecated
+    \deprecated HbSliderPopup::icon(HbSlider::SliderElement)
+        is deprecated.Please use elementIcons() instead.
+
     Returns the icon of the \a element.
 
     returns NULL if element does not exist or icon was not set for this element
@@ -479,7 +481,9 @@
 }
 
 /*!
-    \deprecated
+    \deprecated HbSliderPopup::setIcon(HbSlider::SliderElement, const HbIcon&)
+        is deprecated.Please use setElementIcons() instead.
+
     Sets the \a icon if the \a element.
 
     Supported elements:
@@ -607,7 +611,9 @@
  }
 
 /*!
-    \deprecated
+    \deprecated HbSliderPopup::elements() const
+        is deprecated.Please use sliderElements() instead.
+
     Returns the elements of the slider.
 
     The slider contains only track element by default.
@@ -622,7 +628,9 @@
 }
 
 /*!
-    \deprecated
+    \deprecated HbSliderPopup::setElements(const QList<HbSlider::SliderElement>&)
+        is deprecated.Please use setSliderElements instead.
+
     Sets the elements of the slider.
 
     \note Duplicate elements will be ignored.
@@ -1060,6 +1068,10 @@
 
 
 /*!
+
+    \deprecated HbSliderPopup::primitive(HbStyle::Primitive)
+        is deprecated.
+
     \reimp
  */
 QGraphicsItem * HbSliderPopup::primitive(HbStyle::Primitive primitive) const
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/popups/hbsliderpopup.h
--- a/src/hbwidgets/popups/hbsliderpopup.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/popups/hbsliderpopup.h	Mon May 03 12:48:33 2010 +0300
@@ -53,8 +53,8 @@
     Q_PROPERTY(bool toolTipVisible READ isToolTipVisible WRITE setToolTipVisible)
     Q_PROPERTY(Qt::Alignment toolTipAlignment READ toolTipAlignment WRITE setToolTipAlignment)
     Q_PROPERTY(bool trackFilled READ isTrackFilled WRITE setTrackFilled)
-    Q_PROPERTY(QList<QVariant> sliderElements READ sliderElements WRITE setSliderElements);
-    Q_PROPERTY(QMap elementIcons READ elementIcons WRITE setElementIcons);
+    Q_PROPERTY(QList<QVariant> sliderElements READ sliderElements WRITE setSliderElements)
+    Q_PROPERTY(QMap elementIcons READ elementIcons WRITE setElementIcons)
  
  public:
     explicit HbSliderPopup(QGraphicsItem *parent = 0);
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/popups/popups.pri
--- a/src/hbwidgets/popups/popups.pri	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/popups/popups.pri	Mon May 03 12:48:33 2010 +0300
@@ -30,23 +30,26 @@
 PUBLIC_HEADERS += $$PWD/hbnotificationdialog.h
 PUBLIC_HEADERS += $$PWD/hbinputdialog.h
 PUBLIC_HEADERS += $$PWD/hblistdialog.h
-PUBLIC_HEADERS += $$PWD/hbprogressnote.h
 PUBLIC_HEADERS += $$PWD/hbprogressdialog.h
 PUBLIC_HEADERS += $$PWD/hbsliderpopup.h
 PUBLIC_HEADERS += $$PWD/hbvolumesliderpopup.h
 PUBLIC_HEADERS += $$PWD/hbzoomsliderpopup.h
 PUBLIC_HEADERS += $$PWD/hbmessagebox.h
+PUBLIC_HEADERS += $$PWD/hbselectiondialog.h
 
-INTERNAL_HEADERS += $$PWD/hbcolordialog_p.h
-INTERNAL_HEADERS += $$PWD/hbcolorgridviewitem_p.h
-INTERNAL_HEADERS += $$PWD/hbnotificationdialog_p.h
-INTERNAL_HEADERS += $$PWD/hbnotificationdialogcontent_p.h
-INTERNAL_HEADERS += $$PWD/hbinputdialog_p.h
-INTERNAL_HEADERS += $$PWD/hbinputdialogcontent_p.h
-INTERNAL_HEADERS += $$PWD/hblistdialog_p.h
-INTERNAL_HEADERS += $$PWD/hbprogressdialog_p.h
-INTERNAL_HEADERS += $$PWD/hbsliderpopup_p.h
-INTERNAL_HEADERS += $$PWD/hbmessagebox_p.h
+
+PRIVATE_HEADERS += $$PWD/hbcolordialog_p.h
+PRIVATE_HEADERS += $$PWD/hbcolorgridviewitem_p.h
+PRIVATE_HEADERS += $$PWD/hbnotificationdialog_p.h
+PRIVATE_HEADERS += $$PWD/hbnotificationdialogcontent_p.h
+PRIVATE_HEADERS += $$PWD/hbinputdialog_p.h
+PRIVATE_HEADERS += $$PWD/hbinputdialogcontent_p.h
+PRIVATE_HEADERS += $$PWD/hblistdialog_p.h
+PRIVATE_HEADERS += $$PWD/hbprogressdialog_p.h
+PRIVATE_HEADERS += $$PWD/hbsliderpopup_p.h
+PRIVATE_HEADERS += $$PWD/hbmessagebox_p.h
+PRIVATE_HEADERS += $$PWD/hbselectiondialog_p.h
+
 
 SOURCES += $$PWD/hbcolordialog.cpp
 SOURCES += $$PWD/hbcolorgridviewitem.cpp
@@ -56,9 +59,10 @@
 SOURCES += $$PWD/hbinputdialog.cpp
 SOURCES += $$PWD/hblistdialog.cpp
 SOURCES += $$PWD/hblistdialog_p.cpp
-SOURCES += $$PWD/hbprogressnote.cpp
 SOURCES += $$PWD/hbprogressdialog.cpp
 SOURCES += $$PWD/hbsliderpopup.cpp
 SOURCES += $$PWD/hbvolumesliderpopup.cpp
 SOURCES += $$PWD/hbzoomsliderpopup.cpp
 SOURCES += $$PWD/hbmessagebox.cpp
+SOURCES += $$PWD/hbselectiondialog_p.cpp
+SOURCES += $$PWD/hbselectiondialog.cpp
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/sliders/hbprogressbar.cpp
--- a/src/hbwidgets/sliders/hbprogressbar.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/sliders/hbprogressbar.cpp	Mon May 03 12:48:33 2010 +0300
@@ -27,6 +27,7 @@
 #include <hbprogressbar.h>
 #include <hbstyleoptionprogressbar.h>
 #include "hbprogressbar_p.h"
+#include "hbglobal_p.h"
 
 #ifdef HB_EFFECTS
 #include <hbeffect.h>
@@ -110,7 +111,8 @@
     mMinText(QString()),
     mMaxText(QString()),
     mOrientation(Qt::Horizontal),
-    mDelayHideInProgress(true)
+    mDelayHideInProgress(true),
+    mShowEffectInProgress(false)
 {
 }
 
@@ -159,8 +161,47 @@
     mMinTextItem = q->style()->createPrimitive(HbStyle::P_ProgressBar_mintext,q);
     mMaxTextItem = q->style()->createPrimitive(HbStyle::P_ProgressBar_maxtext,q);
 }
+void HbProgressBarPrivate::setProgressValue(int value)
+{
+   Q_Q(HbProgressBar);
+   if (mProgressValue == value) {
+        return;
+    }
+    if (value >= mMaximum) {
+        value = mMaximum;
+#ifdef HB_EFFECTS
+        HbEffect::start(mTrack, HB_PRGRESSBAR_ITEM_TYPE, "progressbar_progress_complete");
+#endif
+    }
+    else if (value < mMinimum) {
+        value = mMinimum;
+    }
+    
+    mProgressValue=value;
 
-/*!
+    //redraw track
+    HbStyleOptionProgressBar progressBarOption;
+    q->initStyleOption(&progressBarOption);
+    if(mTrack) {
+        q->style()->updatePrimitive(mTrack, HbStyle::P_ProgressBar_track, &progressBarOption);
+    }
+
+    emit q->valueChanged(value);
+    
+}
+/*
+    \internal
+    Sets the progressbar enabling/disabling
+*/
+void HbProgressBarPrivate::setEnableFlag(bool flag)
+{
+    Q_Q(HbProgressBar);
+    if(!flag) {
+        q->setProgressValue(q->minimum());
+
+    }
+}
+/*
     \internal
     Sets the progressbar range
 */
@@ -219,6 +260,16 @@
         q->setVisible(false);
     } 
 }
+
+/*!
+    \internal
+    Private slot which delays the show effect.
+*/
+void HbProgressBarPrivate::_q_delayedShow(HbEffect::EffectStatus status)
+{
+    Q_UNUSED(status);
+    mShowEffectInProgress = false;
+}
 #endif
 
 /*!
@@ -226,10 +277,13 @@
 
     \deprecated HbProgressBar::HbProgressBar(HbProgressBar::ProgressBarType, QGraphicsItem*)
         is deprecated. Please use HbProgressBar::HbProgressBar(QGraphicsItem *parent) instead.
+
 */
 HbProgressBar::HbProgressBar(ProgressBarType type, QGraphicsItem *parent) : 
     HbWidget(*new HbProgressBarPrivate, parent)
 {    
+    HB_DEPRECATED("HbProgressBar::HbProgressBar(HbProgressBar::ProgressBarType, QGraphicsItem*) is deprecated. Use HbProgressBar::HbProgressBar(QGraphicsItem *parent) instead.");
+
     Q_D( HbProgressBar );
     d->q_ptr = this;
     d->init();
@@ -238,7 +292,9 @@
 
 /*!
     @beta
-    Constructs a progressbar of a given \a parent.
+    Constructor of  Progressbar.
+    \param parent. Parent widget
+
 */
 HbProgressBar::HbProgressBar(QGraphicsItem *parent) : 
     HbWidget(*new HbProgressBarPrivate, parent)
@@ -251,10 +307,13 @@
 /*!
     \deprecated HbProgressBar::HbProgressBar(HbProgressBarPrivate&, HbProgressBar::ProgressBarType, QGraphicsItem*)
         is deprecated. Please use HbProgressBar::HbProgressBar(HbProgressBarPrivate &dd, QGraphicsItem *parent) instead.
+
 */
 HbProgressBar::HbProgressBar(HbProgressBarPrivate &dd, ProgressBarType type, QGraphicsItem *parent) : 
     HbWidget( dd, parent)
 {   
+    HB_DEPRECATED("HbProgressBar::HbProgressBar(HbProgressBarPrivate&, HbProgressBar::ProgressBarType, QGraphicsItem*) is deprecated. Use HbProgressBar::HbProgressBar(HbProgressBarPrivate &dd, QGraphicsItem *parent) instead.");
+
     Q_D( HbProgressBar );
     d->init();
     d->mType = type;
@@ -279,13 +338,10 @@
 
 /*!
     @beta
-   This property holds whether or not a progress bar shows its progress inverted. The function
-   returns the value of this property.
+    Return the inverted appearence property. 
 
-   Not implemented yet.
-
-   \sa setInvertedAppearance()
- */
+    \sa setInvertedAppearance()
+*/
 bool HbProgressBar::invertedAppearance() const 
 {
     Q_D( const HbProgressBar );
@@ -294,13 +350,13 @@
 
 /*!
     @beta
-   This property holds whether or not a progress bar shows its progress inverted. The function
-   sets the property to the \a inverted value.
+    Sets the inverted appearence. If this is true progress grows from right to 
+    left otherwise left to right.
 
-   Not implemented yet.
+    \param inverted true or false.
 
-   \sa invertedAppearance()
- */
+    \sa invertedAppearance()
+*/
 void HbProgressBar::setInvertedAppearance(bool inverted)
 {
     Q_D( HbProgressBar );
@@ -310,9 +366,7 @@
 
 /*!
     @beta
-    Returns the maximum value of the progress bar.
-
-    The default value is \c 100.
+    Returns the maximum value of the progressbar. By default it is 100. 
 
     \sa setMaximum()
 */
@@ -324,11 +378,11 @@
 
 /*!
     @beta
-    Sets the maximum value of the progress bar.
-    when setting this property, the minimum is adjusted to ensure
-    that the range remains valid.
+    Sets the maximum value of the progressbar. By default it is 100. 
 
-    \sa maximum(),minimum(),setMinimum()
+    \param maximum the max value
+
+    \sa maximum()
 */
 void HbProgressBar::setMaximum(int maximum)
 {
@@ -338,9 +392,7 @@
 
 /*!
     @beta
-    Returns the minimum value of the progress bar.
-
-    The default value is \c 0.
+    Returns the minimum value of the progressbar. By default it is 0. 
 
     \sa setMinimum()
 */
@@ -352,12 +404,11 @@
 
 /*!
     @beta
-    Sets the minimum value of the progress bar.
-    when setting this property, the maximum is adjusted to ensure
-    that the range remains valid.
+    Sets the minimum value of the progressbar. By default it is 0. 
 
-    \sa maximum(),minimum(),setMaximum()
+    \param maximum the max value
 
+    \sa minimum()
 */
 void HbProgressBar::setMinimum(int minimum)
 {
@@ -368,8 +419,7 @@
 /*!
     @beta
     Returns the current value of the progress bar.
-
-    The default progressValue is \c 0.
+    \sa setProgressValue()
 */
 int HbProgressBar::progressValue() const
 {
@@ -379,50 +429,29 @@
 
 /*!
     @beta
-    Sets the current value of the progress bar.
+    Sets the progress value of the progressbar. 
 
-    The progress bar forces the value to be within the legal range: \b
-    minimum <= \c value <= \b maximum.
+    \param value the progress value
 
     \sa progressValue()
 */
 void HbProgressBar::setProgressValue(int value)
 {
     Q_D( HbProgressBar );
-    if (d->mProgressValue == value) {
-        return;
-    }
-    if (value >= d->mMaximum) {
-        value = d->mMaximum;
-#ifdef HB_EFFECTS
-        HbEffect::start(d->mTrack, HB_PRGRESSBAR_ITEM_TYPE, "progressbar_progress_complete");
-#endif
-    }
-    else if (value<d->mMinimum) {
-        value = d->mMinimum;
-    }
-    d->mProgressValue=value;
-
-    //redraw track
-    HbStyleOptionProgressBar progressBarOption;
-    initStyleOption(&progressBarOption);
-    if(d->mTrack) {
-        style()->updatePrimitive(d->mTrack, HbStyle::P_ProgressBar_track, &progressBarOption);
-    }
-
-    emit valueChanged(value);
+    d->setProgressValue(value);
 }
 
 /*!
     @beta
     This function is provided for convenience.
 
-    Sets the progress bar's minimum to \a minimum and its maximum to \a max.
+    Sets the progress bar's minimum and its maximum.
 
-    If \a maximum is smaller than minimum, minimum becomes the only valid legal
+    If  maximum is smaller than minimum, minimum becomes the only valid legal
     value.
 
-    \sa setMinimum(), setMaximum()
+     \param minimum the minimum value
+     \param maximum the maximum value
 */
 void HbProgressBar::setRange(int minimum, int maximum) 
 {
@@ -432,8 +461,11 @@
 
 /*!
     @beta
-    Set the \a Min text shown on the progressbar.
-    \sa text()
+    Sets the min text string. 
+
+    \param text mintext string
+
+    \sa minText()
 */
 void HbProgressBar::setMinText(const QString &text)
 {
@@ -449,8 +481,7 @@
 /*!
     @beta
     Returns the Min Text of the progress bar.
-
-    The default progressValue is \c 0.
+    \sa setMinText()
 */
 QString HbProgressBar::minText() const
 {
@@ -460,12 +491,15 @@
 
 /*!
     @beta
-    Set the \a Max text shown on the progressbar.
-    \sa text()
+    Sets the max text string. 
+
+    \param text max text string
+
+    \sa maxText()
 */
 void HbProgressBar::setMaxText(const QString &text)
 {
-  	Q_D(HbProgressBar);
+    Q_D(HbProgressBar);
     if (d->mMaxText != text) {
         d->mMaxText = text;
         HbStyleOptionProgressBar progressBarOption;
@@ -477,8 +511,7 @@
 /*!
     @beta
     Returns the Max Text of the progress bar.
-
-    The default progressValue is \c 0.
+    \sa setMaxText()
 */
 QString HbProgressBar::maxText() const
 {
@@ -488,8 +521,9 @@
 
 /*!
     @beta 
-    Set the MinMaxtext visibility \a true for showing text,false for hiding the text.
-    The default is \c false. Min Max text doesnt have a background and would have a transparent background.
+    Set the MinMaxtext visibility. true for showing text,false for hiding the text.
+    The default is  false. Min Max text doesnt have a background and would have a transparent background.
+    \param visible true or false.
     \sa isMinMaxTextVisible().
 */
 void HbProgressBar::setMinMaxTextVisible(bool visible)
@@ -517,10 +551,8 @@
 
 /*!
     @beta
-    This property holds whether the MinMax text should be displayed.
-    Return the value of this property.
-
-    \sa setMinMaxTextVisibile()
+    Returns the MinMax visibility.
+    \sa setMinMaxTextVisible()
 */
 bool HbProgressBar::isMinMaxTextVisible() const
 {
@@ -531,26 +563,29 @@
 /*!
     @beta
     Sets the Min-Max text alignment
-	
-	Supportted alignments are (in both horizontal and vertical orientations)
-	Qt::AlignTop
-	Qt::AlignBottom
-	Qt::AlignCenter
+    
+    Supportted alignments are (in both horizontal and vertical orientations)
+    Qt::AlignTop
+    Qt::AlignBottom
+    Qt::AlignCenter
 
     In Vertical orienatation,     
     AlignTop is equivalent to Left
     AlignBottom is equivalent to Right
 
+    \param alignment alignement for the min max text
+    \sa isMinMaxTextVisible().
+
 */
 void HbProgressBar::setMinMaxTextAlignment(Qt::Alignment alignment)
 {
-	Q_D(HbProgressBar);
-	if( (alignment != Qt::AlignBottom) && (alignment != Qt::AlignTop) && (alignment != Qt::AlignCenter) ) {
-		return;
-	}
-	if (d->mMinMaxTextAlignment != alignment) {
+    Q_D(HbProgressBar);
+    if( (alignment != Qt::AlignBottom) && (alignment != Qt::AlignTop) && (alignment != Qt::AlignCenter) ) {
+        return;
+    }
+    if (d->mMinMaxTextAlignment != alignment) {
         d->mMinMaxTextAlignment = alignment;
-		if (d->mMinMaxTextVisible) {
+        if (d->mMinMaxTextVisible) {
             repolish();
         }
         updatePrimitives();
@@ -560,17 +595,20 @@
 /*!
     @beta
     Returns the minmax Text alignment.
+    \sa setMinMaxTextAlignment().
    
 */
 Qt::Alignment HbProgressBar::minMaxTextAlignment() const
 {
-	Q_D(const HbProgressBar);
-	return d->mMinMaxTextAlignment;
+    Q_D(const HbProgressBar);
+    return d->mMinMaxTextAlignment;
 }
 
 /*!
     @beta
     sets the orientation of the progressbar.It can be vertical or horizontal.
+    \param orientation Horizontal or Vertical
+    \sa orientation().
 */
 void HbProgressBar::setOrientation(Qt::Orientation orientation)
 {
@@ -582,6 +620,7 @@
 /*!
     @beta
     Returns the orientation of the progressbar.It can be vertical or horizontal.
+    \sa setOrientation().
 */
 Qt::Orientation HbProgressBar::orientation() const
 {
@@ -625,7 +664,7 @@
         HbStyleOptionProgressBar progressBarOption;
         initStyleOption(&progressBarOption);
         if (d->mFrame) {
-            style()->updatePrimitive(d->mFrame, HbStyle::P_ProgressBar_frame, &progressBarOption);			
+            style()->updatePrimitive(d->mFrame, HbStyle::P_ProgressBar_frame, &progressBarOption);          
         }
      
         if (d->mTrack) {
@@ -637,11 +676,11 @@
         }
         
         if(d->mMinTextItem && d->mMinMaxTextVisible) {
-            style()->updatePrimitive(d->mMinTextItem,HbStyle::P_ProgressBar_mintext,&progressBarOption);	
+            style()->updatePrimitive(d->mMinTextItem,HbStyle::P_ProgressBar_mintext,&progressBarOption);    
         }
 
         if(d->mMaxTextItem && d->mMinMaxTextVisible) {
-            style()->updatePrimitive(d->mMaxTextItem,HbStyle::P_ProgressBar_maxtext,&progressBarOption);	
+            style()->updatePrimitive(d->mMaxTextItem,HbStyle::P_ProgressBar_maxtext,&progressBarOption);    
         }
     }
     HbWidget::updatePrimitives();
@@ -653,29 +692,25 @@
     want to fill in all the information themselves.
  */
 
-void HbProgressBar::initStyleOption(HbStyleOption *hboption) const
+void HbProgressBar::initStyleOption(HbStyleOptionProgressBar *option) const
 {
     Q_D( const HbProgressBar );
-    Q_ASSERT(hboption);
+
+    HbWidget::initStyleOption(option);
 
-    HbWidget::initStyleOption(hboption);
-    HbStyleOptionProgressBar *option = 0;
-    if ((option = qstyleoption_cast< HbStyleOptionProgressBar *>(hboption)) != 0) {
-        
-        option->progressValue = d->mProgressValue;
-        option->maximum = d->mMaximum;
-        option->minimum = d->mMinimum;
-        option->minText = d->mMinText;
-        option->maxText = d->mMaxText;
-        option->orientation = d->mOrientation;
-        option->isSlider=d->mType == HbProgressBar::RatingProgressBar;
-        option->inverted = d->mInvertedAppearance;
-        option->stopWaitAnimation = false;
-        option->minMaxTextAlignment = d->mMinMaxTextAlignment;
-		QRect rect(d->mFrame->boundingRect().x(),d->mFrame->boundingRect().y(),d->mFrame->boundingRect().width(),
-		d->mFrame->boundingRect().height());
-		option->rect = rect;
-    }
+    option->progressValue = d->mProgressValue;
+    option->maximum = d->mMaximum;
+    option->minimum = d->mMinimum;
+    option->minText = d->mMinText;
+    option->maxText = d->mMaxText;
+    option->orientation = d->mOrientation;
+    option->isSlider=d->mType == HbProgressBar::RatingProgressBar;
+    option->inverted = d->mInvertedAppearance;
+    option->stopWaitAnimation = false;
+    option->minMaxTextAlignment = d->mMinMaxTextAlignment;
+    QRect rect((int)d->mFrame->boundingRect().x(),(int)d->mFrame->boundingRect().y(),(int)d->mFrame->boundingRect().width(),
+    (int)d->mFrame->boundingRect().height());
+    option->rect = rect;
 }
 
 /*!
@@ -706,7 +741,10 @@
     if(change == QGraphicsItem::ItemVisibleChange){
         if(value.toBool()) {
 
-            HbEffect::start(this, HB_PRGRESSBAR_ITEM_TYPE, "progressbar_appear");
+            if(!d->mShowEffectInProgress) {
+                HbEffect::start(this, HB_PRGRESSBAR_ITEM_TYPE, "progressbar_appear",this,"_q_delayedShow");
+                d->mShowEffectInProgress = true;
+            }
 
             d->mDelayHideInProgress  = false;
         }
@@ -731,20 +769,31 @@
  */
 void HbProgressBar::changeEvent(QEvent *event)
 {
-    HbWidget::changeEvent(event);
-    
+    Q_D(HbProgressBar);
     switch (event->type()) {
-    case QEvent::LayoutDirectionChange:
-	    if(layoutDirection() == Qt::RightToLeft) {
-            setInvertedAppearance(true);
-        }
-        else {
-            setInvertedAppearance(false);
-        }
-        break;
-    default:
-        break;
+        case QEvent::LayoutDirectionChange:
+            if(layoutDirection() == Qt::RightToLeft) {
+                setInvertedAppearance(true);
+            }
+            else {
+                setInvertedAppearance(false);
+            }
+            break;
+        case QEvent::EnabledChange:
+            {
+                if (!isEnabled()) {
+                   d->setEnableFlag(false);
+                }
+                else
+                {
+                    d->setEnableFlag(true);
+                }
+            }
+        default:
+            break;
     }
+
+    HbWidget::changeEvent(event);
 }
 
 #include "moc_hbprogressbar.cpp"
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/sliders/hbprogressbar.h
--- a/src/hbwidgets/sliders/hbprogressbar.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/sliders/hbprogressbar.h	Mon May 03 12:48:33 2010 +0300
@@ -30,6 +30,7 @@
 #include <hbwidget.h>
 
 class HbProgressBarPrivate;
+class HbStyleOptionProgressBar;
 
 class HB_WIDGETS_EXPORT HbProgressBar : public HbWidget
 {
@@ -43,7 +44,7 @@
     Q_PROPERTY(QString maxText READ maxText WRITE setMaxText)
     Q_PROPERTY(bool minMaxTextVisible READ isMinMaxTextVisible WRITE setMinMaxTextVisible)
     Q_PROPERTY(Qt::Orientation orientation READ orientation WRITE setOrientation)
-	Q_PROPERTY(Qt::Alignment minMaxTextAlignment READ minMaxTextAlignment WRITE setMinMaxTextAlignment)
+    Q_PROPERTY(Qt::Alignment minMaxTextAlignment READ minMaxTextAlignment WRITE setMinMaxTextAlignment)
 
 public:
     enum ProgressBarType {SimpleProgressBar, RatingProgressBar };
@@ -63,14 +64,14 @@
 
     void setMinText(const QString &text);
     QString minText() const;
-	
+    
     void setMaxText(const QString &text);
     QString maxText() const;
 
     void setMinMaxTextVisible(bool visible);
     bool isMinMaxTextVisible() const;
 
-	void setMinMaxTextAlignment(Qt::Alignment alignment);
+    void setMinMaxTextAlignment(Qt::Alignment alignment);
     Qt::Alignment minMaxTextAlignment() const;
 
     Qt::Orientation orientation() const;
@@ -79,7 +80,7 @@
     int type() const { return Type; }  
 
     QGraphicsItem* primitive(HbStyle::Primitive primitive) const; 
-	
+    
 public slots:
     void setProgressValue(int value);
     void setMaximum(int maximum);
@@ -93,7 +94,7 @@
 protected:
     HbProgressBar(HbProgressBarPrivate &dd, ProgressBarType type=SimpleProgressBar, QGraphicsItem *parent = 0);
     HbProgressBar(HbProgressBarPrivate &dd, QGraphicsItem *parent);
-    virtual void initStyleOption(HbStyleOption *option) const;
+    void initStyleOption(HbStyleOptionProgressBar *option) const;
     void closeEvent ( QCloseEvent * event );
     QVariant itemChange(GraphicsItemChange change, const QVariant &value);
     void changeEvent(QEvent *event);
@@ -104,6 +105,7 @@
 
 #ifdef HB_EFFECTS
     Q_PRIVATE_SLOT(d_func(), void _q_delayedHide(HbEffect::EffectStatus status))
+    Q_PRIVATE_SLOT(d_func(), void _q_delayedShow(HbEffect::EffectStatus status))
 #endif
 
 };
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/sliders/hbprogressbar_p.h
--- a/src/hbwidgets/sliders/hbprogressbar_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/sliders/hbprogressbar_p.h	Mon May 03 12:48:33 2010 +0300
@@ -47,9 +47,12 @@
     void createTextPrimitives();
     virtual void setRange(int minimum, int maximum);
     virtual void setOrientation(Qt::Orientation orientation);
+	virtual void setProgressValue(int value);
+	virtual void setEnableFlag(bool flag);
 
 #ifdef HB_EFFECTS
     void _q_delayedHide(HbEffect::EffectStatus status);
+    void _q_delayedShow(HbEffect::EffectStatus status);
 #endif
 
 public:
@@ -77,6 +80,7 @@
     Qt::Orientation mOrientation;
 
     uint mDelayHideInProgress : 1;
+    uint mShowEffectInProgress : 1;
 };
 
 #endif  //HBPROGRESSBARPRIVATE_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/sliders/hbprogressiveslider.cpp
--- a/src/hbwidgets/sliders/hbprogressiveslider.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/sliders/hbprogressiveslider.cpp	Mon May 03 12:48:33 2010 +0300
@@ -27,6 +27,7 @@
 #include "hbprogressiveslider_p.h"
 #include "hbprogressslidercontrol_p.h"
 #include "hbstyleoption.h"
+#include "hbglobal_p.h"
 
 HbProgressiveSliderPrivate::HbProgressiveSliderPrivate()
     :mControl(0)
@@ -49,26 +50,42 @@
     HbProgressBarPrivate::setOrientation(orientation);
 }
 
+/*!
+    \deprecated 
+	
+	This class is deprecated and please use HbProgressSlider instead.
+
+*/
+
+/*!
+    \deprecated HbProgressiveSlider::HbProgressiveSlider(QGraphicsItem *)
+        is deprecated.
+
+    Constructs a progressslider  of a given \a parent.
+    
+    \sa HbRatingSlider
+*/
 HbProgressiveSlider::HbProgressiveSlider(QGraphicsItem *parent) :
     HbProgressBar(*new HbProgressiveSliderPrivate,HbProgressBar::SimpleProgressBar,parent)
 {
+    HB_DEPRECATED("HbProgressiveSlider(QGraphicsItem *parent) is deprecated.");
     Q_D( HbProgressiveSlider );
     d->q_ptr = this;
     d->init();
 }
 
 /*!
-    @deprecated
-    \class HbProgressiveSlider
+    \deprecated HbProgressiveSlider::HbProgressiveSlider(HbProgressiveSliderPrivate &,QGraphicsItem *)
+        is deprecated.
+
+    Constructs a progressslider  of a given \a parent.
+
     \sa HbRatingSlider
 */
-
-/*!
-    Constructs a progressslider  of a given \a parent.
-*/
 HbProgressiveSlider::HbProgressiveSlider(HbProgressiveSliderPrivate &dd,QGraphicsItem *parent) : 
     HbProgressBar( dd,HbProgressBar::SimpleProgressBar,parent)
 {
+    HB_DEPRECATED("HbProgressiveSlider(HbProgressiveSliderPrivate &,QGraphicsItem *) is deprecated.");
     Q_D( HbProgressiveSlider );
     d->init();
 }
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/sliders/hbprogressslider.cpp
--- a/src/hbwidgets/sliders/hbprogressslider.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/sliders/hbprogressslider.cpp	Mon May 03 12:48:33 2010 +0300
@@ -26,9 +26,10 @@
 #include <hbprogressslider.h>
 #include "hbprogressslider_p.h"
 
-#include <hbstyleoptionprogressbar.h>
+#include <hbstyleoptionprogressslider.h>
 #include <hbtooltip.h>
 #include <hbwidgetfeedback.h>
+#include "hbglobal_p.h"
 
 #include <QGraphicsSceneMouseEvent>
 #include <QApplication>
@@ -41,14 +42,14 @@
 
 HbProgressSliderPrivate::HbProgressSliderPrivate()
 {
-    downState=false;
+    mDownState=false;
     handle = 0;
     mSliderValue = 0;
     thumbIcon = HbIcon();
     state = HbProgressSlider::SliderStatePlayNormal;
+    mHandlePath = QString();
 }
 
-
 HbProgressSliderPrivate::~HbProgressSliderPrivate()
 {
     if (handle) {
@@ -56,18 +57,62 @@
     }
 }
 
+void HbProgressSliderPrivate::setProgressValue(int value)
+{
+   Q_Q(HbProgressSlider);
+   if (mProgressValue == value) {
+        return;
+    }
+    if (value >= mMaximum) {
+        value = mMaximum;
+#ifdef HB_EFFECTS
+       // HbEffect::start(mTrack, HB_PRGRESSSLIDER_ITEM_TYPE, "progressbar_progress_complete");
+#endif
+    }
+    else if (value < mMinimum) {
+        value = mMinimum;
+    }
+    
+    mProgressValue=value;
+
+    //redraw track
+    HbStyleOptionProgressSlider sliderOption;
+    q->initStyleOption(&sliderOption);
+    if(mTrack) {
+        q->style()->updatePrimitive(mTrack, HbStyle::P_ProgressSlider_track, &sliderOption);
+    }
+
+    emit q->valueChanged(value);
+}
+
+void HbProgressSliderPrivate::setEnableFlag(bool flag)
+{
+    Q_Q(HbProgressSlider);
+    if(!flag) {
+        q->setProgressValue(q->minimum());
+        q->setSliderValue(q->minimum());
+    }
+}
 
 void HbProgressSliderPrivate::init()
 {
     Q_Q(HbProgressSlider);
-    mSliderGraphicItem  = q->style()->createPrimitive(HbStyle::P_ProgressBar_slidertrack,mFrame);
-	   	// Show the touch area which is created in ProgressBar//
-    mTouchAreaItem = q->style()->createPrimitive(HbStyle::P_ProgressBar_toucharea,q);
-	mFrame->setZValue(mTouchAreaItem->zValue()+1);
+
+    mSliderGraphicItem  = q->style()->createPrimitive(HbStyle::P_ProgressSlider_slidertrack,mFrame);
+    // Show the touch area which is created in ProgressBar//
+    mTouchAreaItem = q->style()->createPrimitive(HbStyle::P_ProgressSlider_toucharea,q);
+    mFrame->setZValue(mTouchAreaItem->zValue()+1);
+
 #ifdef HB_EFFECTS
     HbEffectInternal::add(HB_PRGRESSSLIDER_ITEM_TYPE,"progressslider_trackpress", "progressslider_trackpress");
     HbEffectInternal::add(HB_PRGRESSSLIDER_ITEM_TYPE,"progressslider_trackrelease", "progressslider_trackrelease");
 #endif
+
+    q->grabGesture(Qt::TapGesture);
+
+    if(QGraphicsObject *touchArea = mTouchAreaItem->toGraphicsObject()) {
+        touchArea->grabGesture(Qt::TapGesture);
+    }
 }
 
 void HbProgressSliderPrivate::emitSliderPressed()
@@ -76,7 +121,6 @@
     emit q->sliderPressed();
 }
 
-
 void HbProgressSliderPrivate::emitSliderReleased()
 {
     Q_Q(HbProgressSlider);
@@ -152,18 +196,6 @@
     return mOrientation;
 }
 
-void HbProgressSliderPrivate::updateMaskWidth(qreal width)
-{
-    Q_Q( HbProgressSlider );
-    HbStyleOptionProgressBar progressBarOption;
-    q->initStyleOption(&progressBarOption);
-    progressBarOption.maskWidth = width;
-
-    if(mTrack) {
-        q->style()->updatePrimitive(mTrack, HbStyle::P_ProgressBar_slidertrack, &progressBarOption);
-    }
-}
-
 void HbProgressSliderPrivate::setRange(int minimum, int maximum)
 {
     Q_Q( HbProgressSlider );
@@ -183,16 +215,40 @@
     progressValue as the buffered amount.
 
     HbProgressSlider is derived from HbProgressBar so it supports all the features supported by HbProgressBar.
-    infinite and rating progress bar feature is disabled in HbProgressSlider.
-    \sa HbProgressBar
+
+    HbProgressSlider emits below signals 
+
+    void sliderPressed();
+    void sliderReleased();
+    void sliderMoved(int value);
+
+    sliderPressed is emits when the track is pressed. 
+    sliderReleased is emits when the track is released.
+    sliderMoved is emits when the handle is moved in any direction.
+
+
+    sample code showing how this can be connected. If the Application has different use case based on 
+    Slider press and slider release they can customize the behaviour.
+
+    \code
+    HbProgressSlider *object = new HbProgressSlider(parent);
+    connect(mySlider,SIGNAL(sliderMoved(int)), mySlider ,SLOT(setSliderValue(int)));
+    \endcode
+    
 */
+
+/*!
+    @beta
+    Constructs a progressslider with a  parent.
+*/
+
 HbProgressSlider::HbProgressSlider(QGraphicsItem *parent) :
     HbProgressBar(*new HbProgressSliderPrivate,HbProgressBar::SimpleProgressBar,parent)
 {
     Q_D( HbProgressSlider );
     d->q_ptr = this;
     d->init();
-
+    setMinMaxTextVisible(true);
 
     setFocusPolicy(Qt::FocusPolicy(qApp->style()->styleHint(QStyle::SH_Button_FocusPolicy)));
     d->handle =new HbProgressSliderHandle(d);
@@ -200,9 +256,9 @@
         d->handle->setVisible(false);
     }
     if(d->mOrientation == Qt::Horizontal){
-		qreal x = boundingRect().height();
-		qreal y = d->handle->size().height();
-		qreal a = qreal (x-y)/2;
+        qreal x = boundingRect().height();
+        qreal y = d->handle->size().height();
+        qreal a = qreal (x-y)/2;
         d->handle->setPos(0,a);
 
     }
@@ -214,7 +270,7 @@
 
 /*!
     @beta
-    Constructs a progressslider  of a given \a parent.
+    Constructs a progressslider with a  parent.
 */
 HbProgressSlider::HbProgressSlider(HbProgressSliderPrivate &dd,QGraphicsItem *parent) : 
     HbProgressBar( dd,HbProgressBar::SimpleProgressBar,parent)
@@ -222,11 +278,11 @@
     Q_D( HbProgressSlider );
     d->init();
 
-	setFocusPolicy(Qt::FocusPolicy(qApp->style()->styleHint(QStyle::SH_Button_FocusPolicy)));
+    setFocusPolicy(Qt::FocusPolicy(qApp->style()->styleHint(QStyle::SH_Button_FocusPolicy)));
     d->handle =new HbProgressSliderHandle(d);
-	d->handle->setZValue(1010);
+    d->handle->setZValue(1010);
     if(d->mOrientation == Qt::Horizontal){
-		qreal posY = qreal (boundingRect().height()-d->handle->size().height())/2;
+        qreal posY = qreal (boundingRect().height()-d->handle->size().height())/2;
         d->handle->setPos(0,posY);
     }
     else{
@@ -250,7 +306,9 @@
     The progress slider forces the value to be within the legal range: \b
     minimum <= \c value <= \b maximum.
 
-    \sa value()
+    \param value slider value.
+
+    \sa sliderValue()
 */
 void HbProgressSlider::setSliderValue(int value)
 {
@@ -268,13 +326,11 @@
     }
     d->mSliderValue = value;
 
-    HbStyleOptionProgressBar progressBarOption;
-    initStyleOption(&progressBarOption);
+    HbStyleOptionProgressSlider option;
+    initStyleOption(&option);
+
     if (d->mSliderGraphicItem) {
-        style()->updatePrimitive(d->mSliderGraphicItem, HbStyle::P_ProgressBar_slidertrack, &progressBarOption);
-       /* if( value == d->mMaximum ) {
-            d->handle->changeIcon();
-        }*/
+        style()->updatePrimitive(d->mSliderGraphicItem, HbStyle::P_ProgressSlider_slidertrack, &option);
     }
     d->handle->setHandlePosForValue(sliderValue());
 }
@@ -296,7 +352,7 @@
 
 /*!
     @beta
-    Returns \c true whether the slider is pressed down.
+    Returns true of false depending on whether the slider is pressed down or not.
 */
 
 bool HbProgressSlider::isSliderDown() const
@@ -308,7 +364,12 @@
 
 /*!
     @beta
-    Sets the inverted appearance flag. 
+    Sets the inverted appearence of the slider.
+    If inverted the slider increases from right to left.
+
+    \param inverted true or false
+
+    \sa invertedAppearance()
 */
 void HbProgressSlider::setInvertedAppearance(bool inverted)
 {
@@ -321,26 +382,30 @@
 }
 
 
-/*!
-    Sets the Icon for the progressslider thumb.
+/*!    
+    \deprecated HbProgressSlider::setThumbIcon(const HbIcon&)
+        is deprecated. Use setHandleIcon instead of this
 
-    \deprecated HbProgressSlider::setThumbIcon(const HbIcon&)
-        is deprecated. 
+    Sets the Icon for the progressslider thumb.
 */
 void HbProgressSlider::setThumbIcon(const HbIcon &icon)
 {
+    HB_DEPRECATED("HbProgressSlider::setThumbIcon is deprecated.");
+
     Q_D( HbProgressSlider );
-    d->handle->setThumbIcon(icon);
+    d->handle->setHandleIcon(icon);
 }
 
 /*!
-    Returns the Icon for the progressslider thumb.
-
     \deprecated HbProgressSlider::thumbIcon() const
         is deprecated. 
+
+    Returns the Icon for the progressslider thumb.
 */
 HbIcon HbProgressSlider::thumbIcon() const
 {
+    HB_DEPRECATED("HbProgressSlider::thumbIcon is deprecated.");
+
     Q_D( const HbProgressSlider );
     return d->handle->thumbIcon();
 }
@@ -349,9 +414,15 @@
 {
     Q_D(HbProgressSlider);
     if(flags().testFlag(ItemIsFocusable)) {
+        d->mDownState = true;
+        HbStyleOptionProgressSlider option;
+        initStyleOption(&option);
+        if (d->mFrame) {
+            style()->updatePrimitive(d->mFrame, HbStyle::P_ProgressSlider_frame, &option);          
+        }
         qreal temp = event->scenePos().x();
         if((d->mMinMaxTextVisible) && (d->mMinMaxTextAlignment== Qt::AlignCenter)) {
-		    temp -=  d->mMinTextItem->boundingRect().width();
+            temp -=  d->mMinTextItem->boundingRect().width();
         }
         if( (temp > d->handle->pos().x()) && (temp < (d->handle->boundingRect().width()+d->handle->pos().x())) ) {
             event->ignore();
@@ -361,19 +432,26 @@
         HbWidgetFeedback::triggered(this, Hb::InstantPressed);
         d->handle->handleTrackPress(event);
         event->accept();
-		#ifdef HB_EFFECTS
-	        HbEffect::start(this, HB_PRGRESSSLIDER_ITEM_TYPE, "progressslider_trackpress");
+        #ifdef HB_EFFECTS
+            HbEffect::start(this, HB_PRGRESSSLIDER_ITEM_TYPE, "progressslider_trackpress");
         #endif
     } else {
         event->ignore();
     }
 }
 
-
 void HbProgressSlider::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) 
 {
     Q_D(HbProgressSlider);
     if(flags().testFlag(ItemIsFocusable)) {
+        d->mDownState = false;
+
+        HbStyleOptionProgressSlider option;
+        initStyleOption(&option);
+        if (d->mFrame) {
+            style()->updatePrimitive(d->mFrame, HbStyle::P_ProgressSlider_frame, &option);          
+        }
+
         HbWidgetFeedback::triggered(this, Hb::InstantReleased);
         d->handle->handleTrackRelease(event);
         event->accept();
@@ -383,7 +461,6 @@
     } else {
         event->ignore();
     }
-  
 }
 
 void HbProgressSlider::setGeometry(const QRectF & rect)
@@ -394,47 +471,60 @@
     updatePrimitives();
 }
 
-
-void HbProgressSlider::initStyleOption(HbStyleOption *hboption) const
+/*!
+    Initializes \a option with the values from this HbProgressSlider. 
+    This method is useful for subclasses when they need a HbStyleOptionProgressSlider,
+    but don't want to fill in all the information themselves.
+ */
+void HbProgressSlider::initStyleOption( HbStyleOptionProgressSlider *option ) const
 {
-    Q_ASSERT(hboption);
     Q_D(const HbProgressSlider);
-    HbProgressBar::initStyleOption(hboption);
-    HbStyleOptionProgressBar *option = 0;
-    if ((option = qstyleoption_cast< HbStyleOptionProgressBar *>(hboption)) != 0){
-        option->secondoryType = true;
-        option->sliderValue = d->mSliderValue;
-        option->inverted = d->mInvertedAppearance;
-        option->maximum = d->mMaximum;
-        option->minimum = d->mMinimum;        
-    }
+    HbProgressBar::initStyleOption(option);
+
+    option->secondaryType = true;
+    option->progressSliderValue = d->mSliderValue;  
+    option->pressedState = d->mDownState;
 }
 
-
 void HbProgressSlider::updatePrimitives()
 {
-    HbProgressBar::updatePrimitives();
-
     Q_D(HbProgressSlider);
     if(isVisible()){
         d->mWaitTrack->setVisible(false);
         d->mTrack->setVisible(true);
-        HbStyleOptionProgressBar progressBarOption;
-        initStyleOption(&progressBarOption);
+
+        HbStyleOptionProgressSlider option;
+        initStyleOption(&option);
+
         if (d->mSliderGraphicItem) {
-            style()->updatePrimitive(d->mSliderGraphicItem, HbStyle::P_ProgressBar_slidertrack, &progressBarOption);
+            style()->updatePrimitive(d->mSliderGraphicItem, HbStyle::P_ProgressSlider_slidertrack, &option);
         }
 
         if(d->handle)
               d->handle->setHandlePosForValue(sliderValue());
+    
+        if (d->mFrame) {
+            style()->updatePrimitive(d->mFrame, HbStyle::P_ProgressSlider_frame, &option);          
+        }
+     
+        if (d->mTrack) {
+                style()->updatePrimitive(d->mTrack, HbStyle::P_ProgressSlider_track, &option);
+        }
+                
+        if(d->mMinTextItem && d->mMinMaxTextVisible) {
+            style()->updatePrimitive(d->mMinTextItem,HbStyle::P_ProgressBar_mintext,&option);    
+        }
+
+        if(d->mMaxTextItem && d->mMinMaxTextVisible) {
+            style()->updatePrimitive(d->mMaxTextItem,HbStyle::P_ProgressBar_maxtext,&option);    
+        }
     }
-    
 }
 
 void HbProgressSlider::showEvent( QShowEvent * event )
 {
-	Q_D(const HbProgressSlider);
-	if(d->mTouchAreaItem && scene()) {
+    Q_D(const HbProgressSlider);
+    if(d->mTouchAreaItem && scene()) {
         d->mTouchAreaItem->removeSceneEventFilter(this);
         d->mTouchAreaItem->installSceneEventFilter(this);
     }
@@ -448,7 +538,6 @@
         if(value.toInt() & ItemIsFocusable) {
             if(!flags().testFlag(ItemIsFocusable) && d->handle) {
                 d->handle->setVisible(true);
-
             }
         } else {
             if(flags().testFlag(ItemIsFocusable) && d->handle) {
@@ -463,76 +552,89 @@
 bool HbProgressSlider::sceneEventFilter(QGraphicsItem *obj,QEvent *event)
 {
     Q_D(HbProgressSlider);
-	if( obj == d->mTouchAreaItem) {
+    if( obj == d->mTouchAreaItem) {
        if (!isEnabled() ) {
             return false;
         }
-		if (event->type() == QEvent::GraphicsSceneMousePress){
-			mousePressEvent((QGraphicsSceneMouseEvent *) event);
+        if (event->type() == QEvent::GraphicsSceneMousePress){
+            mousePressEvent((QGraphicsSceneMouseEvent *) event);
              return true;
-		}
-		else if (event->type() == QEvent::GraphicsSceneMouseRelease){
-			mouseReleaseEvent((QGraphicsSceneMouseEvent *) event);
+        }
+        else if (event->type() == QEvent::GraphicsSceneMouseRelease){
+            mouseReleaseEvent((QGraphicsSceneMouseEvent *) event);
             return true;
-		}
-	} 
-	return false;
+        }
+    } 
+    return false;
 }
 
 /*!
-    set the tooltip text . 
-    
     \deprecated HbProgressSlider::setHandleToolTip(const QString&)
         is deprecated. Please use HbProgressSlider::setSliderToolTip(const QString &text) instead.
 
+    set the tooltip text . 
+    
     \sa handleToolTip()
 */
 void HbProgressSlider::setHandleToolTip(const QString &text)
 {
+    HB_DEPRECATED("HbProgressSlider::setHandleToolTip is deprecated. Use HbProgressSlider::setSliderToolTip(const QString &text) instead.");
+
     setSliderToolTip(text);
 }
 
 
 /*!
-    Returns the current tooltip text value.
-    
     \deprecated HbProgressSlider::handleToolTip() const
         is deprecated. Please use HbProgressSlider::sliderToolTip() const instead.
 
+    Returns the current tooltip text value.
+    
     \sa setHandleToolTip()
 */
 QString HbProgressSlider::handleToolTip() const
 {
+    HB_DEPRECATED("HbProgressSlider::handleToolTip is deprecated. Use HbProgressSlider::sliderToolTip() instead.");
+
     return sliderToolTip();
 }
 
 /*!
-    Sets the state of the handle as normal play,pressed play,normal pause,pressed pause etc. 
-
     \deprecated HbProgressSlider::setHandleState(HbProgressSlider::HandleState)
         is deprecated. Please use HbProgressSlider::setSliderState(HbProgressSlider::SliderState state) instead.
 
+    Sets the state of the handle as normal play,pressed play,normal pause,pressed pause etc. 
 */
 void HbProgressSlider::setHandleState(HbProgressSlider::HandleState state)
 {
+    HB_DEPRECATED("HbProgressSlider::setHandleState is deprecated. Use HbProgressSlider::setSliderState instead.");
+
     setSliderState((HbProgressSlider::SliderState)state);
 }
+
 /*!
-    Returns the state of the handle. 
 
     \deprecated HbProgressSlider::handleState() const
         is deprecated. Please use HbProgressSlider::sliderState() const instead.
+
+    Returns the state of the handle. 
 */
 HbProgressSlider::HandleState HbProgressSlider::handleState() const
 {
+    HB_DEPRECATED("HbProgressSlider::handleState is deprecated. Use HbProgressSlider::handleState() instead.");
+
     return (HbProgressSlider::HandleState)sliderState();
 }
 
 
 /*!
     @beta
+    Sets the tooltip for the handle. By default it shows the slider value.
+    If the Application wants to configure this they use setSliderToolTip for 
+    setting the new tooltip text.
 
-    Sets the tooltip text . 
+    \param text tooltip text
+
     \sa sliderToolTip()
 */
 void HbProgressSlider::setSliderToolTip(const QString &text)
@@ -555,62 +657,90 @@
 }
 
 /*!
-    @beta
-    
-    Sets the state of the handle as SliderStatePlayNormal, SliderStatePlayPressed,
-    SliderStatePauseNormal, SliderStatePausePressed.
+    \deprecated HbProgressSlider::setSliderState(HbProgressSlider::SliderState)
+        is deprecated.
 
-    \sa sliderState()
-
+    Sets the state of the handle as normal play,pressed play,normal pause,pressed pause etc. 
 */
 void HbProgressSlider::setSliderState(HbProgressSlider::SliderState state)
 {
-	Q_D(HbProgressSlider);
-	if(d->state != state) {
-		d->state = state;
-		if (d->handle) {
-			d->handle->mSliderState = state;
+    Q_D(HbProgressSlider);
+    if(d->state != state) {
+        d->state = state;
+        if (d->handle) {
+            d->handle->mSliderHandleState = state;
 
-            switch(d->handle->mSliderState) {
-               
+            switch(d->handle->mSliderHandleState) {
                case HbProgressSlider::SliderStatePlayNormal:
                    d->handle->setProperty("state","normal");
                    break;
-               
                case HbProgressSlider::SliderStatePlayPressed:
                    d->handle->setProperty("state","pressed");
                    break;
-               
                case HbProgressSlider::SliderStatePauseNormal:
                     d->handle->setProperty("state","normal");
                    break;
-               
                case HbProgressSlider::SliderStatePausePressed:
                     d->handle->setProperty("state","pressed");
                    break;
+               default:
+                    break;
             }
 
-			d->handle->updatePrimitives();
-			
-		}
-	}
+            d->handle->updatePrimitives();
+            
+        }
+    }
+}
+/*!
+    \deprecated HbProgressSlider::sliderState() const
+        is deprecated.
+
+    Sets the state of the handle as normal play,pressed play,normal pause,pressed pause etc. 
+*/
+HbProgressSlider::SliderState HbProgressSlider::sliderState() const
+{
+    Q_D(const HbProgressSlider);
+    return d->state;
 }
+
+/*!
+    @beta
+    Sets the icon for handle. By default it has theme based icon. Application 
+    can configure this icon via this API
+
+    \param handlePath path of the graphics
+
+    \sa handleIcon()
+*/
+void HbProgressSlider::setHandleIcon(const QString& handlePath )
+{
+    
+    Q_D( HbProgressSlider );
+    if(handlePath != d->mHandlePath) {
+        d->mHandlePath =handlePath;
+        d->handle->setHandleIcon(HbIcon(handlePath));
+    }
+}
+
 /*!
     @beta
 
-    Returns the state of the handle. 
+    Returns the icon  handle path
 
-    \sa setSliderState()
+    \sa setHandleIcon()
 */
-HbProgressSlider::SliderState HbProgressSlider::sliderState() const
+QString HbProgressSlider::handleIcon() const
 {
-	Q_D(const HbProgressSlider);
-	return d->state;
-
+    Q_D(const HbProgressSlider);
+    return d->mHandlePath;
 }
 
+/*!
 
-/*!
+    \deprecated HbProgressSlider::primitive(HbStyle::Primitive)
+        is deprecated.
+
     Returns the pointer for \a primitive passed.
     Will return NULL if \a primitive passed is invalid
 */
@@ -619,11 +749,19 @@
     Q_D(const HbProgressSlider);
 
     switch (primitive) {
-        case HbStyle::P_ProgressBar_slidertrack:
+        case HbStyle::P_ProgressSlider_frame:
+            return d->mFrame;
+        case HbStyle::P_ProgressSlider_track:
+            return d->mTrack;
+        case HbStyle::P_ProgressSlider_slidertrack:
             return d->mSliderGraphicItem;
-        case HbStyle::P_ProgressBar_toucharea:
-            return d->mTouchAreaItem;  
+        case HbStyle::P_ProgressSlider_toucharea:
+            return d->mTouchAreaItem; 
+        case HbStyle::P_ProgressSliderHandle_icon:
+        case HbStyle::P_ProgressSliderHandle_toucharea:
+            return d->handle->primitive(primitive);
         default:
             return 0;
     }
 }
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/sliders/hbprogressslider.h
--- a/src/hbwidgets/sliders/hbprogressslider.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/sliders/hbprogressslider.h	Mon May 03 12:48:33 2010 +0300
@@ -30,14 +30,17 @@
 #include <hbicon.h>
 
 class HbProgressSliderPrivate;
+class HbStyleOptionProgressSlider;
 
 class HB_WIDGETS_EXPORT HbProgressSlider : public HbProgressBar
 {
     Q_OBJECT
     Q_PROPERTY(int sliderValue READ sliderValue WRITE setSliderValue)
+     /* Deprecated */
     Q_PROPERTY(HbIcon thumbIcon READ thumbIcon WRITE setThumbIcon)
     Q_PROPERTY(QString sliderToolTip READ sliderToolTip WRITE setSliderToolTip)
     Q_PROPERTY(SliderState state READ sliderState WRITE setSliderState)
+    Q_PROPERTY(QString handleIcon READ handleIcon WRITE setHandleIcon)
     Q_ENUMS(SliderState)
 
     /* Deprecated */
@@ -55,6 +58,7 @@
         PausePressed
     };
 
+    /* Deprecated */
     enum SliderState
     {
         SliderStatePlayNormal,
@@ -66,7 +70,9 @@
     HbProgressSlider(QGraphicsItem *parent = 0);
     ~HbProgressSlider();
 
+    /* Deprecated */
     void setThumbIcon(const HbIcon &icon);
+    /* Deprecated */
     HbIcon thumbIcon() const;
 
     enum { Type = Hb::ItemType_ProgressSlider };
@@ -81,10 +87,12 @@
 
     /* Deprecated*/
     void setHandleToolTip(const QString &text);
+    /* Deprecated*/
     QString handleToolTip() const;
 
     /* Deprecated*/
     void setHandleState(HbProgressSlider::HandleState state);
+    /* Deprecated*/
     HbProgressSlider::HandleState handleState() const;
 
     void setSliderToolTip(const QString &text);
@@ -93,6 +101,9 @@
     void setSliderState(HbProgressSlider::SliderState state);
     HbProgressSlider::SliderState sliderState() const;
 
+    void setHandleIcon(const QString& handlePath );
+    QString handleIcon() const;
+
     QGraphicsItem* primitive(HbStyle::Primitive primitive) const; 
 
 signals:
@@ -109,9 +120,10 @@
     void mousePressEvent(QGraphicsSceneMouseEvent *event);
     void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
     void showEvent( QShowEvent * event );
-    virtual void initStyleOption(HbStyleOption *option) const;
+
     QVariant itemChange(GraphicsItemChange change,const QVariant & value);
     bool sceneEventFilter(QGraphicsItem *obj,QEvent *event);
+    void initStyleOption( HbStyleOptionProgressSlider *option ) const;
 
 private:
     Q_DECLARE_PRIVATE_D( d_ptr, HbProgressSlider)
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/sliders/hbprogressslider_p.h
--- a/src/hbwidgets/sliders/hbprogressslider_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/sliders/hbprogressslider_p.h	Mon May 03 12:48:33 2010 +0300
@@ -42,7 +42,9 @@
     //inherited from HbHandleParent
     void emitSliderPressed();
     void emitSliderReleased();
+    void setProgressValue(int value);
     void emitSliderMoved(int newValue);
+	void setEnableFlag(bool flag);
     QRectF boundingRect() const;
     HbStyle* style() const;
     QGraphicsItem* parentGraphicsItem() const;
@@ -54,16 +56,17 @@
     QString toolTipText() const;
     Qt::Alignment textAlignment() const;
     bool textVisible()const{ return (mTooltipText=="")? false:true ;};
-    void updateMaskWidth(qreal width);
+
     Qt::Orientation orientation();
     void setRange(int minimum, int maximum);
 private:
     QGraphicsItem *mSliderGraphicItem;
     int mSliderValue;
-    bool downState;
+    bool mDownState;
     HbIcon thumbIcon;
     QString mTooltipText;
-	HbProgressSlider::SliderState state;
+    HbProgressSlider::SliderState state;
+    QString mHandlePath;
 };
 
 #endif //HBPROGRESSSLIDER_P_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/sliders/hbprogressslidercontrol.cpp
--- a/src/hbwidgets/sliders/hbprogressslidercontrol.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/sliders/hbprogressslidercontrol.cpp	Mon May 03 12:48:33 2010 +0300
@@ -26,6 +26,7 @@
 #include "hbprogressslidercontrol_p.h"
 #include "hbslidercontrol_p.h"
 #include "hbslidercontrol_p_p.h"
+#include "hbglobal_p.h"
 //#include "hbstyleoptionslider.h"
 
 
@@ -62,20 +63,34 @@
 }
 
 /*!
-    @deprecated
+    \this is a deprecated class.
     \class HbProgressSliderControl
 */
+/*!
+    \deprecated HbProgressSliderControl::HbProgressSliderControl(QGraphicsItem *)
+        is deprecated.
+
+    Constructor for HbProgressSliderControl.
+*/
 HbProgressSliderControl::HbProgressSliderControl(QGraphicsItem *parent)
 	:HbSliderControl(*new HbProgressSliderControlPrivate,parent)
 {
+    HB_DEPRECATED("HbProgressSliderControl::HbProgressSliderControl(QGraphicsItem *) is deprecated as part of HbProgressSliderControl class deprecation.");
 	Q_D(HbProgressSliderControl);
 	d->q_ptr = this;
 	d->init();
 }
 
+/*!
+    \deprecated HbProgressSliderControl::HbProgressSliderControl(Qt::Orientation, QGraphicsItem *)
+        is deprecated.
+
+    Constructor for HbProgressSliderControl.
+*/
 HbProgressSliderControl::HbProgressSliderControl(Qt::Orientation orientation, QGraphicsItem *parent)
 	:HbSliderControl(*new HbProgressSliderControlPrivate,parent)
 {
+    HB_DEPRECATED("HbProgressSliderControl::HbProgressSliderControl(Qt::Orientation,QGraphicsItem *) is deprecated as part of HbProgressSliderControl class deprecation.");
 	Q_D(HbProgressSliderControl);
 	d->q_ptr = this;
 	d->init();      
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/sliders/hbprogresssliderhandle_p.cpp
--- a/src/hbwidgets/sliders/hbprogresssliderhandle_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/sliders/hbprogresssliderhandle_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -25,6 +25,8 @@
 
 #include "hbprogresssliderhandle_p.h"
 #include <hbtooltip.h>
+#include <hbstyleoptionprogresssliderhandle_p.h>
+#include <hbextendedlocale.h>
 #include <QGraphicsSceneMouseEvent>
 
 #define HBPROGRESSSLIDERHANDLE_TRACES
@@ -40,6 +42,11 @@
 #define HB_PRGRESSSLIDERHANDLE_ITEM_TYPE "HB_PROGRESSSLIDERHANDLE"
 #endif
 
+#ifdef HB_GESTURE_FW
+#include <hbtapgesture.h>
+#include <hbpangesture.h>
+#endif
+
 #define   HandleMargin 0
 
 /*!
@@ -50,7 +57,7 @@
 HbProgressSliderHandle::HbProgressSliderHandle(HbHandleParent *parent) 
     :HbWidget(parent->parentGraphicsItem()),
     q(parent),
-    mThumbIcon(),
+    mHandleIcon(),
     mPlayThumb(true),
     mThumbEnabled(false)
 {
@@ -58,13 +65,10 @@
     mFlags |= TextVisible;
     mHandleSize = QSizeF(0,0);
 
-    mSliderState = HbProgressSlider::SliderStatePlayNormal;
+    mSliderHandleState = HbProgressSlider::SliderStatePlayNormal;
     HbStyle *style = static_cast<HbStyle*>(q->style());
 
-    mHandleItem = style->createPrimitive(HbStyle::P_ProgressSlider_handle,this);
-    HbStyle::setItemName(mHandleItem , "handle");
-
-    mHandleIconItem = style->createPrimitive(HbStyle::P_ProgressSlider_handleicon,this);
+    mHandleIconItem = style->createPrimitive(HbStyle::P_ProgressSliderHandle_icon,this);
     HbStyle::setItemName(mHandleIconItem , "icon");
 
     mTouchItem = style->createPrimitive(HbStyle::P_ProgressSliderHandle_toucharea, this); 
@@ -76,29 +80,46 @@
     HbEffectInternal::add(HB_PRGRESSSLIDERHANDLE_ITEM_TYPE,"progressslider_handlerelease", "progressslider_handlerelease");
     HbEffectInternal::add(HB_PRGRESSSLIDERHANDLE_ITEM_TYPE,"progressslider_handleoutofbound", "progressslider_handleoutofbound");
 #endif
+
+#ifdef HB_GESTURE_FW
+    grabGesture(Qt::TapGesture);
+    grabGesture(Qt::PanGesture);
+
+    if(QGraphicsObject *touchArea = mTouchItem->toGraphicsObject()) {
+        touchArea->grabGesture(Qt::TapGesture);
+        touchArea->grabGesture(Qt::PanGesture);
+    }
+#endif 
 }
 
 HbProgressSliderHandle::~HbProgressSliderHandle() 
 {
 }
 
-void HbProgressSliderHandle::setThumbIcon(const HbIcon& icon)
+void HbProgressSliderHandle::setHandleIcon(const HbIcon& icon)
 {
     if(icon.isNull()) {
         return;
     }
     HbStyle *style = qobject_cast<HbStyle*>(q->style());
-    mThumbIcon= icon;
-    HbStyleOptionProgressBar option;
-    option.handleRect = boundingRect();
-    option.thumbIcon = mThumbIcon;
-    style->updatePrimitive(mHandleIconItem,HbStyle::P_ProgressSlider_handleicon,&option);
+    mHandleIcon= icon;
+
+    HbStyleOptionProgressSliderHandle option;
+    initStyleOption(&option);
+
+    style->updatePrimitive(mHandleIconItem, HbStyle::P_ProgressSliderHandle_icon, &option);
     mThumbEnabled = true;
 }
 
 HbIcon HbProgressSliderHandle::thumbIcon() const
 {
-    return mThumbIcon;    
+    return mHandleIcon;    
+}
+
+void HbProgressSliderHandle::gestureEvent(QGestureEvent *event)
+{
+    Q_UNUSED(event);
+    // HbWidgetBase::gestureEvent() ignores, overriding to accept
 }
 
 void HbProgressSliderHandle::mousePressEvent(QGraphicsSceneMouseEvent *event) 
@@ -110,11 +131,22 @@
 #endif
     mFlags |= HbProgressSliderHandle::MousePressed;
 
+    HbStyleOptionProgressSliderHandle option;
+	initStyleOption(&option);
+    option.pressedState = true;
+    if (mHandleIconItem) {
+        style()->updatePrimitive(mHandleIconItem, HbStyle::P_ProgressSliderHandle_icon, &option);
+    }
+
     mMousePressPos = event->scenePos();
     mItemPosAtPress = pos();
     if(q->textVisible()) {
         HbToolTip::showText(q->toolTipText(),this, QRectF(mItemPosAtPress,QSize(0,0)),q->textAlignment());
     }
+	else {
+		HbExtendedLocale locale;
+		HbToolTip::showText(locale.toString(q->progressValue()),this, QRectF(mItemCurPos,QSize(0,0)),q->textAlignment());
+	}
 
     HbWidgetFeedback::triggered(q->parentGraphicsWidget(), Hb::InstantPressed, Hb::ModifierSliderHandle);
 
@@ -125,6 +157,14 @@
 void HbProgressSliderHandle::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) 
 {
     HbWidget::mouseReleaseEvent(event);
+
+    HbStyleOptionProgressSliderHandle option;
+	initStyleOption(&option);
+    option.pressedState = false;
+    if (mHandleIconItem) {
+        style()->updatePrimitive(mHandleIconItem, HbStyle::P_ProgressSliderHandle_icon, &option);
+    }
+
     if (isHandleMoving()) {
       HbWidgetFeedback::continuousStopped(q->parentGraphicsWidget(), Hb::ContinuousDragged);
     }
@@ -136,6 +176,7 @@
     mFlags &= ~HbProgressSliderHandle::MousePressed;
     mFlags &=~HandleMoving;
     event->accept();
+	setHandlePosForValue(q->progressValue());   
     q->emitSliderReleased();
 }
 
@@ -188,6 +229,10 @@
     if(q->textVisible()) {
         HbToolTip::showText(q->toolTipText(),this, QRectF(mItemCurPos,QSize(0,0)),q->textAlignment());
     }
+    else {
+		HbExtendedLocale locale;
+		HbToolTip::showText(locale.toString(q->progressValue()),this, QRectF(mItemCurPos,QSize(0,0)),q->textAlignment());
+	}
     event->accept();
 
     q->emitSliderMoved(pointToValue(mItemCurPos));
@@ -338,17 +383,41 @@
 
 void  HbProgressSliderHandle::updatePrimitives()
 {    
-    HbStyleOptionProgressBar option;
-    option.thumbIcon = mThumbIcon;
-    option.sliderState = (HbStyleOptionProgressBar::SliderState) mSliderState;
-    
-    if (mHandleItem) {
-        style()->updatePrimitive(mHandleItem, HbStyle::P_ProgressSlider_handle, &option);
-    }
+    HbStyleOptionProgressSliderHandle option;
+    initStyleOption(&option);
 
     if (mHandleIconItem) {
-        style()->updatePrimitive(mHandleIconItem, HbStyle::P_ProgressSlider_handleicon, &option);
+        style()->updatePrimitive(mHandleIconItem, HbStyle::P_ProgressSliderHandle_icon, &option);
     }
 
 }
 
+/*!
+    Returns the pointer for \a primitive passed.
+    Will return NULL if \a primitive passed is invalid
+*/
+QGraphicsItem* HbProgressSliderHandle::primitive(HbStyle::Primitive primitive) const
+{
+    switch (primitive) {
+        case HbStyle::P_ProgressSliderHandle_icon:
+            return mHandleIconItem;
+        case HbStyle::P_ProgressSliderHandle_toucharea:
+            return mTouchItem;
+        default:
+            return 0;
+    }
+}
+
+/*!
+    Initializes \a option with the values from this HbProgressSliderHandle. 
+    This method is useful for subclasses when they need a HbStyleOptionProgressSliderHandle,
+    but don't want to fill in all the information themselves.
+ */
+void HbProgressSliderHandle::initStyleOption(HbStyleOptionProgressSliderHandle *option) const
+{
+    HbWidget::initStyleOption(option);
+    option->handleIcon = mHandleIcon;
+    option->pressedState = false;
+    option->sliderHandleState = (HbStyleOptionProgressSliderHandle::SliderState) mSliderHandleState;
+}
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/sliders/hbprogresssliderhandle_p.h
--- a/src/hbwidgets/sliders/hbprogresssliderhandle_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/sliders/hbprogresssliderhandle_p.h	Mon May 03 12:48:33 2010 +0300
@@ -27,10 +27,11 @@
 #define HBPROGRESSSLIDERHANDLE_P_H
 
 #include "hbnamespace_p.h"
-#include "hbstyleoptionprogressbar.h"
 #include <hbwidget.h>
 #include <hbprogressslider.h>
 
+class HbStyleOptionProgressSliderHandle;
+
 class HbHandleParent
 {
 public:
@@ -75,7 +76,7 @@
     QPointF valueToHandlePos(int value) const;
     enum { Type = HbPrivate::ItemType_ProgressSliderHandle };
     int type() const { return Type; }
-    void setThumbIcon(const HbIcon &icon);
+    void setHandleIcon(const HbIcon &icon);
     HbIcon thumbIcon() const;
     void handleTrackRelease(QGraphicsSceneMouseEvent * event);
     void handleTrackPress(QGraphicsSceneMouseEvent * event);
@@ -84,8 +85,9 @@
     QPointF normalizedPos(const QPointF&  pos,bool inverted) const;
     bool isHandlePressed() const;
     bool isHandleMoving() const;
-    //HbProgressSlider::HandleState mHandleState;
-    HbProgressSlider::SliderState mSliderState;
+    HbProgressSlider::SliderState mSliderHandleState;
+
+    QGraphicsItem* primitive(HbStyle::Primitive primitive) const;
 
 public slots:
     void updatePrimitives();
@@ -94,6 +96,8 @@
     virtual void mousePressEvent(QGraphicsSceneMouseEvent *event);
     virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
     virtual void mouseMoveEvent ( QGraphicsSceneMouseEvent * event );
+    virtual void gestureEvent(QGestureEvent *event);
+    void initStyleOption( HbStyleOptionProgressSliderHandle *option ) const;
 
 private:
     StateFlags mFlags;
@@ -102,10 +106,9 @@
     QPointF mItemPosAtPress;
     QPointF mItemCurPos;
     QSizeF mHandleSize;
-    QGraphicsItem *mHandleItem; 
     QGraphicsItem *mHandleIconItem; 
     QGraphicsItem *mTouchItem;
-    HbIcon mThumbIcon;
+    HbIcon mHandleIcon;
     uint mPlayThumb : 1;
     uint mThumbEnabled;
 };
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/sliders/hbratingslider.cpp
--- a/src/hbwidgets/sliders/hbratingslider.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/sliders/hbratingslider.cpp	Mon May 03 12:48:33 2010 +0300
@@ -30,6 +30,12 @@
 #include <hbstyleoptionratingslider.h>
 #include <QGraphicsItem>
 #include <QGraphicsSceneMouseEvent>
+#include <hbtoucharea.h>
+
+#ifdef HB_GESTURE_FW
+#include <hbtapgesture.h>
+#include <hbpangesture.h>
+#endif 
 
 #ifdef HB_EFFECTS
 #include <hbeffect.h>
@@ -71,8 +77,6 @@
     mTrack = q->style()->createPrimitive(HbStyle::P_RatingSlider_track,mFrame);
     mTouchArea = q->style()->createPrimitive(HbStyle::P_RatingSlider_toucharea, q);
 
-	HbStyle::setItemName(mLayoutItem, "frame");
-	HbStyle::setItemName(mTouchArea, "toucharea");
 	q->updatePrimitives();
 
 	#ifdef HB_EFFECTS
@@ -80,6 +84,16 @@
     HbEffectInternal::add(HB_RATINGSLIDER_ITEM_TYPE,"ratingslider_disappear", "ratingslider_disappear");
     #endif
 
+    #ifdef HB_GESTURE_FW
+    q->grabGesture(Qt::TapGesture);
+    q->grabGesture(Qt::PanGesture);
+
+    if(QGraphicsObject *touchArea = mTouchArea->toGraphicsObject()) {
+        touchArea->grabGesture(Qt::TapGesture);
+        touchArea->grabGesture(Qt::PanGesture);
+    }
+    #endif 
+
 }
 
 void HbRatingSliderPrivate::createLookupTable()
@@ -115,31 +129,59 @@
         
 		count++;
 	}
+
+	if (pos > mLookupValues[mStepCount-1]) {
+		return -1;
+	}
 	
 	return count;
 	
 }
 
 /*!
-    @beta
-    @HbWidgets
     \class HbRatingSlider
-    \brief HbRatingSlider widget provides a Rating control.
+    \brief A control for user to do rating.
+
+    This is a general rating widget where user will be able to do different 
+	ratings for things like Music ,Video etc. 
+
+	By default there are 5 ratings ( 5 stars ). This can be configured also.
+	The interval , number of icons etc can be configured.
+
+	Apart from rating the this can used for showing cumulative rating also.
+
+    example code example:
+    \code
+    HbRatingSlider *object = new HbRatingSlider(parent);
+    \endcode
 
-    A HbRatingSlider is used to rate a particular movie or a song.The user can drag over the 
-	slider to rate. As soon as he releases the pointer from within the area of slider the rating is done.
-	The Application can configure the RatingSlider to be ReadOnly/ReadWrite at any point using setReadOnly. 
-	The Application can configure a tooltip for rating assistance.
+    The below  code can be used to show some rating e.g. 2.5/5
+	by default the  stepcount =5
+    
+	\code
+	HbRatingSlider *slider = new HbRatingSlider();
+	slider->setStepCount(100); //5 *20//
+	slider->setCurrentRating(50); //2.5*20 it shows 50 / 100 which is same as 2.5/5
+    \endcode
+	
+	This will show as 2.5/5. Now if one the same ratingslider 
+	if the Application wants to configure a rating slider with range 1-5
+	on emitting the signal rating changed it can set to 
+	slider->setStepCount(5);
+	slider->setCurrentRating(0)
+	
+	When the rating is done it emits a signal called ratingDone and when rating is 
+	changed by the user by draging the pointer ratingChanged signal is emitted.   
+	
+ */
 
-	By default there are 5 stars.User can rate in the range 1-5. By changinng the maximum it is possible to 
-	attain any number of ratings. Once the rating is done the HbRatingSlider emits the signal ratingChanged. 
-	Parameter of this signal is the new rating value. Which lies in the range min-max.
-*/
 
 
 /*!
     @beta
-    Constructs a RatingSlider  a \a parent.
+	Constructor of  RatingSlider.
+    \param parent. Parent widget
+
 */
 
 HbRatingSlider::HbRatingSlider(QGraphicsItem *parent) :
@@ -153,9 +195,8 @@
 
 /*!
     @beta
-    @HbWidgets
-    \class HbRatingSlider
-    \brief Constructs a basic Rating Slider
+	Constructor of  RatingSlider.
+    \param parent. Parent widget
 */
 HbRatingSlider::HbRatingSlider(HbRatingSliderPrivate &dd,QGraphicsItem *parent) : 
     HbWidget( dd,parent)
@@ -175,23 +216,29 @@
 
 /*!
     @beta
-    Sets  the read only flag of the Rating slider. If the ReadOnly flag is true then Rating slider is not 
-	interactive.Once the Rating is done The application can decide it to allow rating again or not by setting this 
-	flag.
+    Sets the read only property. It disables the interaction with widget
+
+    \param value true or false.
 
+    \sa readOnly()
 */
+
 void HbRatingSlider::setReadOnly(bool value)
 {
 	Q_D(HbRatingSlider);
 	d->mReadOnly = value;
 }
 
-/*!
-    @beta
+/*!	
+	
+	@beta  
     Sets the number of icons. In a Rating scenario you may have number of repeated icons. This API can be used to set 
 	the number of icons required. For Example the default image is "*" and you have 5 stars. You can set the number of 
 	stars  using this. By default this value is 5.
 
+    \param number. A value between 1 and 10 
+
+    \sa numberOfIcons()
 */
 
 void HbRatingSlider::setNumberOfIcons(int number)
@@ -205,11 +252,14 @@
 	d->createLookupTable();
 }
 
-/*!
-    @beta
+
+/*!		
+	@beta  
     Returns the number of icons set.
 
+    \sa setNumberOfIcons()
 */
+
 int HbRatingSlider::numberOfIcons() const
 {
 	Q_D(const HbRatingSlider);
@@ -221,12 +271,16 @@
     Sets the step count for the rating slider. If the number of icons is 5 and step count is 10 then it is possible to have 10 ratings.
 	one rating will be half star (by default). If the number of icons is 5 and step count is 5 then 5 ratings are possible. In this 
 	case one rating will be one complete star. By default this value is 5.
+	
+	\param count. A value between 1 and 100. This can be considerd as the maximum rating possible. 
+
+    \sa numberOfIcons()
 
 */
 void HbRatingSlider::setStepCount(int count)
 {
 	Q_D(HbRatingSlider);
-	if( (count <= 0) || (count >= 20) ) {
+	if( (count <= 0) || (count > 100) ) {
 		return;
 	}
 	d->mStepCount = count;
@@ -263,7 +317,9 @@
 
 /*!
     @beta
-    Sets the current rating value.In future this will be qreal value :).
+    It sets the current rating value.
+	\param count. A value between 1 and stepcount. 
+	\sa currentRating()
 
 */
 void  HbRatingSlider::setCurrentRating(int rating)
@@ -297,7 +353,13 @@
 
 /*!
     @beta
-    It sets the unrated graphics name.This is the graphics shown when rating slider is displayed.
+    
+	It sets the unrated graphics name.This is the graphics shown when rating slider is displayed.
+	the grpahics can be a single star kind of or multi star image. If it is single star then use setNumberOfIcons for 
+	setting number of stars.
+	
+	\param name. The graphics name along with the path. 
+	\sa unRatedIconName()
 */
 void HbRatingSlider::setUnRatedIconName(const QString name)
 {
@@ -325,7 +387,13 @@
 
 /*!
     @beta
-    It sets the rated graphics name.This is the graphics shown when rating is done. 
+    
+	It sets the rated graphics name.This is the graphics shown when rating is on going.
+	the grpahics can be a single star kind of or multi star image. If it is single star then use setNumberOfIcons for 
+	setting number of stars.
+	
+	\param name. The graphics name along with the path. 
+	\sa unRatedIconName()
 */
 void HbRatingSlider::setRatedIconName(const QString name)
 {
@@ -348,6 +416,7 @@
 	return d->mRatedIconName;
 }
 
+#ifndef HB_GESTURE_FW
 /*!
     \reimp
 */
@@ -450,8 +519,148 @@
 		}
 	
 	}		
+}
+#else
+void HbRatingSlider::mousePressEvent(QGraphicsSceneMouseEvent *event)
+{
+    Q_UNUSED(event)
+}
+#endif
 
+#ifdef HB_GESTURE_FW
+void HbRatingSlider::gestureEvent(QGestureEvent *event)
+{
+    Q_D (HbRatingSlider);
+    if(event->gesture(Qt::TapGesture)) {
+            HbTapGesture *tap = qobject_cast<HbTapGesture *>(event->gesture(Qt::TapGesture));
+            switch(tap->state()) {
+            case Qt::GestureStarted:
+				{
+				qreal xVal = mapFromScene(event->mapToGraphicsScene(tap->position( ))).x();
+				int rating = d->calculateProgressValue(xVal);
+				if(rating == -1) {
+					return;
+				}
+                if(d->mReadOnly) {	
+                    event->ignore();
+                    return;
+                }
+
+                d->mMousePressed = true;
+                event->accept();
+				}
+                break;
+ 
+            case Qt::GestureFinished: // Reset state 
+                {
+            qreal xVal = mapFromScene(event->mapToGraphicsScene(tap->position( ))).x();
+            QRectF rect = d->mTouchArea->boundingRect();
+            int rating=0;
+            if(rect.contains(xVal,0 )) {
+                if(d->mReadOnly) {
+                    event->ignore();
+                    return;
+                }
+
+				if(!d->mMousePressed){
+					return;
+				}
+
+                if(xVal <0) {	
+                    setCurrentRating(0);
+					emit ratingDone (d->mCurrentValue);
+                    return;
+                }
+
+               rating = d->calculateProgressValue(xVal);
+		
+			   if(toolTip() != QString()) {
+                    HbToolTip::showText(toolTip(),this);
+                }	
+                setCurrentRating(rating);
+                if(d->mCurrentValue) {
+                    emit ratingDone (d->mCurrentValue);
+                }
+                event->accept();
+                d->mMousePressed = false;
+                }
+            }
+            break;
+            default: break;
+            } 
+    }else if(event->gesture(Qt::PanGesture)) {
+                HbPanGesture *pan = qobject_cast<HbPanGesture *>(event->gesture(Qt::PanGesture));
+                switch(pan->state()) {
+                    case Qt::GestureUpdated:
+                        {
+                        if(!d->mMousePressed) {
+		                    return;
+	                    }
+                        qreal xVal = mapFromScene(event->mapToGraphicsScene( pan->startPos()+pan->offset())).x();
+		                    QRectF rect = d->mTouchArea->boundingRect();
+		                    int rating=0;
+		                    if(rect.contains(xVal,0 )) {
+                                if(d->mReadOnly) {
+			                    event->ignore();
+			                    return;
+		                    }
+                    		
+		                    if(xVal <0) {	
+			                    setCurrentRating(0);
+								return;
+		                    }
+
+			                    rating = d->calculateProgressValue(xVal);
+								
+			                    if(toolTip() != QString()) {
+				                    HbToolTip::showText(toolTip(),this);
+			                    }	
+			                    setCurrentRating(rating);
+			                    emit ratingChanged (d->mCurrentValue);
+			                    event->accept();
+		                    }
+	                        else {
+			                    setCurrentRating(0);
+		                    }
+                        }
+                        break;
+				    case Qt::GestureFinished: // Reset state 
+					{						  
+						 qreal xVal = mapFromScene(event->mapToGraphicsScene( pan->startPos()+pan->offset())).x();
+                         QRectF rect = d->mTouchArea->boundingRect();
+                         int rating=0;
+                         if(rect.contains(xVal,0 )) {
+                            if(d->mReadOnly) {
+                               event->ignore();
+                               return;
+                             }
+						}
+
+						if(!d->mMousePressed) {
+							 return;
+						}
+
+                       if(xVal <0) {	
+                          setCurrentRating(0);
+						  emit ratingDone (d->mCurrentValue);
+                          return;
+                        }
+
+                        rating = d->calculateProgressValue(xVal);
+					    setCurrentRating(rating);
+                        if(d->mCurrentValue) {
+                           emit ratingDone (d->mCurrentValue);
+                        }
+					    d->mMousePressed = false;
+                        event->accept();
+					 }
+                     default:
+                     break;
+                }
+    }
 }
+#endif 
+
 /*!
     \reimp
 */
@@ -478,8 +687,14 @@
 }
 
 /*!
-    @beta
-    Returns the primitives.
+
+    \deprecated HbRatingSlider::primitive(HbStyle::Primitive)
+        is deprecated.
+
+    Provides access to primitives of HbRatingSlider. 
+    \param primitive is the type of the requested primitive. The available 
+    primitives are P_RatingSlider_frame,P_RatingSlider_track and P_RatingSlider_layout.
+
 */
 QGraphicsItem* HbRatingSlider::primitive(HbStyle::Primitive primitive) const
 {
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/sliders/hbratingslider.h
--- a/src/hbwidgets/sliders/hbratingslider.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/sliders/hbratingslider.h	Mon May 03 12:48:33 2010 +0300
@@ -78,9 +78,14 @@
 
 protected:
     HbRatingSlider(HbRatingSliderPrivate &dd,QGraphicsItem *parent = 0);
+
     void mousePressEvent(QGraphicsSceneMouseEvent *event);
+#ifndef HB_GESTURE_FW
     void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
     void mouseMoveEvent (QGraphicsSceneMouseEvent *event) ;    
+#else
+    virtual void gestureEvent(QGestureEvent *event);
+#endif
     void initStyleOption(HbStyleOption *option) const;
     void changeEvent(QEvent *event);
 	QVariant itemChange(GraphicsItemChange change, const QVariant &value);
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/sliders/hbslider.cpp
--- a/src/hbwidgets/sliders/hbslider.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/sliders/hbslider.cpp	Mon May 03 12:48:33 2010 +0300
@@ -46,6 +46,7 @@
 #endif
 
 
+
 /*!
     @beta
     @hbwidgets
@@ -269,7 +270,6 @@
     HbStyle::setItemName( q,"this" );
     q->setFlags( QGraphicsItem::ItemIsFocusable );
     q->setProperty("TickLabelPresent",false);
-
 }
 
 void HbSliderPrivate::setElements( QList<HbSlider::SliderElement> elementList)
@@ -551,7 +551,8 @@
 }
 
 /*!
-    \deprecated
+    \deprecated HbSlider::elements() const
+        is deprecated. Please use sliderElements() instead
     Returns the elements of the slider.
 
     The slider contains only track element by default.
@@ -566,7 +567,8 @@
 }
 
 /*!
-    \deprecated
+    \deprecated HbSlider::setElements(const QList<HbSlider::SliderElement>&)
+        is deprecated. Please use setSliderElements instead.
     Sets the elements of the slider.
 
     \note Duplicate elements will be ignored.
@@ -783,7 +785,9 @@
 }
 
 /*!
-    \deprecated
+    \deprecated HbSlider::icon(HbSlider::SliderElement) const
+        is deprecated. Please use elementIcons() instead.
+    
     Returns the icon of the \a element.
 
     returns NULL if element does not exist or icon was not set for this element
@@ -798,7 +802,9 @@
 }
 
 /*!
-    \deprecated
+    \deprecated HbSlider::setIcon(HbSlider::SliderElement, const HbIcon&)
+        is deprecated. Please use setElementIcons() instead.
+    
     Sets the \a icon if the \a element.
 
     Supported elements:
@@ -916,7 +922,7 @@
     @beta
     Returns \c true if tooltip is visible.
 
-    The default value is \c false.
+    The default value is \c true.
 
     \sa setToolTipVisible( )
 */
@@ -1603,6 +1609,10 @@
 
 
 /*!
+
+    \deprecated HbSlider::primitive(HbStyle::Primitive)
+        is deprecated.
+
     \reimp
  */
 QGraphicsItem *HbSlider::primitive( HbStyle::Primitive primitive ) const
@@ -1773,4 +1783,5 @@
 }
 
 
+
 #include "moc_hbslider.cpp"
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/sliders/hbslidercontrol.cpp
--- a/src/hbwidgets/sliders/hbslidercontrol.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/sliders/hbslidercontrol.cpp	Mon May 03 12:48:33 2010 +0300
@@ -38,6 +38,10 @@
 #include <hbgraphicsscene.h>
 #include <QGraphicsItem>
 #include <QGraphicsSceneMouseEvent>
+#ifdef HB_GESTURE_FW
+#include "hbtapgesture.h"
+#include "hbpangesture.h"
+#endif 
 
 #ifdef HB_EFFECTS
 #include "hbeffect.h"
@@ -46,6 +50,7 @@
 #endif
 
 
+
 /*!
     private class  
 */
@@ -61,7 +66,7 @@
     tickmarksRight( 0 ),// slider right/bottom tick mark item
     tickmarkslabelLeft( 0 ),// slider left/above tick mark label
     tickmarkslabelRight ( 0 ),// slider right/bottom tick mark label
-    displayCurrValueToolTip( false ), // holds whether to show current value tooltip or not
+    displayCurrValueToolTip( true ), // holds whether to show current value tooltip or not
     toolTipAlignment( Qt::AlignTop|Qt::AlignRight ), // tooltip alignment
     groovePressed( false ), // hold whether groove is pressed or not
     setDefault( false ), // holds whther default value for track press is set
@@ -95,7 +100,11 @@
     Q_Q( HbSliderControl );
    
     q->enableTrackEventHandling( true );
-   
+#ifdef HB_GESTURE_FW
+    q->grabGesture(Qt::TapGesture);
+    q->grabGesture(Qt::PanGesture,Qt::ReceivePartialGestures);
+    q->setFiltersChildEvents(true) ;
+#endif    
     // creating handle
     handle = createHandle();
     if(handle) {
@@ -251,7 +260,7 @@
 bool HbSliderControlPrivate::onHandle( QPointF pos )
 {
     Q_Q( HbSliderControl );
-    QRectF handleRect = handle->sceneBoundingRect( );
+    QRectF handleRect = handle->touchItem->sceneBoundingRect( );
     bool result = false;
     switch ( q->orientation( ) ) {
         case Qt::Horizontal:
@@ -820,7 +829,8 @@
 
 */
 void HbSliderControl::mousePressEvent( QGraphicsSceneMouseEvent *event )
-{   
+{ 
+#ifndef HB_GESTURE_FW
     Q_D( HbSliderControl );
     HbAbstractSliderControl::mousePressEvent( event );
     if ( !d->trackHandlingEnable ) {
@@ -916,6 +926,9 @@
             setRepeatAction( SliderNoAction, pressValue );
         }
     }
+#else
+    Q_UNUSED(event)
+#endif
     
 }
 
@@ -925,6 +938,7 @@
 */
 void HbSliderControl::mouseReleaseEvent( QGraphicsSceneMouseEvent *event )
 {
+#ifndef HB_GESTURE_FW
     HbAbstractSliderControl::mouseReleaseEvent( event );
     Q_D( HbSliderControl );
     d->handleMoving = false;
@@ -976,9 +990,182 @@
     setSliderDown( false );
     d->handle->updatePrimitives( );
     HbToolTip::hideText( qobject_cast<HbGraphicsScene *>( scene( ) ) );
+#else
+    Q_UNUSED(event);
+#endif 
 }
 
 
+#ifdef HB_GESTURE_FW
+void HbSliderControl::gestureEvent(QGestureEvent *event)
+{
+    Q_D(HbSliderControl);
+    if(HbTapGesture *tap = qobject_cast<HbTapGesture *>(event->gesture(Qt::TapGesture))) {
+            if( d->onHandle( event->mapToGraphicsScene(tap->position( ) ) ) ){
+                event->ignore();
+                return;
+            }
+        switch(tap->state()) {
+        case Qt::GestureStarted: {
+            QRectF eventRect = d->grooveTouchArea->sceneBoundingRect( );
+            if ( !d->trackHandlingEnable  || maximum( ) == minimum( ) || 
+                !eventRect.contains( event->mapToGraphicsScene(tap->position( ) ) ) ){
+                event->ignore( );
+                return;
+            }
+            
+#if defined( QT_KEYPAD_NAVIGATION ) && !defined( Q_OS_SYMBIAN )
+            if ( QApplication::keypadNavigationEnabled( ) ) {
+                setEditFocus( true );
+            }
+#endif
+            event->accept( );
+        // effect
+#ifdef HB_EFFECTS
+            if( orientation( ) == Qt::Horizontal ) {   
+            // effect for horizontal track press
+                HbEffectInternal::add( HB_SLIDERCONTROL_TYPE,"slider_h_trackpress", "h_trackpress" );
+                HbEffect::start( d->groove, HB_SLIDERCONTROL_TYPE, "h_trackrpress" );
+            }
+            else {
+                HbEffectInternal::add( HB_SLIDERCONTROL_TYPE,"slider_v_trackpress", "v_trackpress" );
+                HbEffect::start( d->groove, HB_SLIDERCONTROL_TYPE, "v_trackpress" );
+            }  
+    
+#endif
+            HbStyleOptionSlider opt;
+            d->groovePressed = true;
+            initStyleOption( &opt );
+            style( )->updatePrimitive( d->groove, HbStyle::P_Slider_groove, &opt );  
+            HbWidgetFeedback::triggered( this, Hb::InstantPressed );
+        }
+        break;
+        case Qt::GestureFinished:{
+            if ( !d->trackHandlingEnable ) {
+                event->ignore( );
+                return;
+            }
+            qreal handlePos = 0;
+            qreal span = 0;
+            QRectF bounds = boundingRect( );
+            QRectF handleBounds = d->handle->boundingRect( );
+            bounds.adjust( 0, 0, -handleBounds.width( ), -handleBounds.height( ) );
+            QPointF relativePos = mapFromScene( event->mapToGraphicsScene(tap->position( ) ) );
+            // calculate handle position and span
+            switch ( orientation( ) ) {
+                case Qt::Horizontal:
+                    handlePos = relativePos.x( ) - handleBounds.width( ) / 2;
+                    span = bounds.width( );
+                    break;
+                case Qt::Vertical:
+                    handlePos = relativePos.y( ) - handleBounds.height( ) / 2;
+                    span = bounds.height( );
+                    break;
+                default:
+                    break;
+            }
+            HbStyleOptionSlider opt;
+            initStyleOption( &opt );
+
+            int pressValue = QStyle::sliderValueFromPosition( opt.minimum, opt.maximum,
+                static_cast<int>( handlePos ),static_cast<int>( span ),opt.upsideDown );
+
+
+            // if default is set then dont increment or decrement slider value
+            // just set default value to slider
+            setSliderPosition( pressValue );
+            triggerAction( SliderMove );
+            setRepeatAction( SliderNoAction, pressValue );
+            }
+        case Qt::GestureCanceled: {
+            if ( d->groovePressed ) {
+#ifdef HB_EFFECTS    
+                if( orientation( ) == Qt::Horizontal ) {   
+                    HbEffectInternal::add( HB_SLIDERCONTROL_TYPE,"slider_h_trackrelease", "h_trackrelease" );
+                    HbEffect::start( d->groove, HB_SLIDERCONTROL_TYPE, "h_trackrelease" );
+                }  else {
+                    HbEffectInternal::add( HB_SLIDERCONTROL_TYPE,"slider_v_trackrelease", "v_trackrelease" );
+                    HbEffect::start( d->groove, HB_SLIDERCONTROL_TYPE, "v_trackrelease" );
+                }    
+#endif
+                HbStyleOptionSlider opt;
+                d->groovePressed = false;
+                initStyleOption( &opt );    
+                // update primitive from press to normal
+                style( )->updatePrimitive( d->groove, HbStyle::P_Slider_groove, &opt );
+            }
+        }
+        default:
+            break;
+        }
+    }
+    if (HbPanGesture *panGesture = qobject_cast<HbPanGesture*>(event->gesture(Qt::PanGesture))) {
+        switch(panGesture->state( )) {
+            case Qt::GestureStarted: 
+            case Qt::GestureUpdated:{
+                QPointF startPoint = event->mapToGraphicsScene(panGesture->offset()+panGesture->startPos( ) );
+                if( d->onHandle( startPoint)||isSliderDown( ) ) {
+                    qreal handlePos = 0;
+                    qreal span = 0;
+                    QRectF bounds = boundingRect( );
+                    QRectF handleBounds = d->handle->boundingRect( );
+                    bounds.adjust( 0, 0, -handleBounds.width( ), -handleBounds.height( ) );
+                    QPointF relativePos = mapFromScene( event->mapToGraphicsScene(panGesture->startPos( ) + panGesture->offset()) );
+                    // calculate handle position and span
+                    switch ( orientation( ) ) {
+                        case Qt::Horizontal:
+                            handlePos = relativePos.x( ) - handleBounds.width( ) / 2;
+                            span = bounds.width( );
+                            break;
+                        case Qt::Vertical:
+                            handlePos = relativePos.y( ) - handleBounds.height( ) / 2;
+                            span = bounds.height( );
+                            break;
+                        default:
+                            break;
+                    }
+                    HbStyleOptionSlider opt;
+                    initStyleOption( &opt );
+
+                    int pressValue = QStyle::sliderValueFromPosition( opt.minimum, opt.maximum,
+                        static_cast<int>( handlePos ),static_cast<int>( span ),opt.upsideDown ); 
+                    setRepeatAction( SliderNoAction,static_cast<int>( pressValue ) );
+                    setSliderDown( true );
+                    setSliderPosition( pressValue );
+                    showToolTip( );
+                    d->groovePressed = false;
+                    updatePrimitives();
+                    d->handleMoving = true ;
+                    break;
+                } else if(d->grooveTouchArea->sceneBoundingRect().contains(startPoint) ){
+                    HbStyleOptionSlider opt;
+                    d->groovePressed = true;
+                    initStyleOption( &opt );
+                    style( )->updatePrimitive( d->groove, HbStyle::P_Slider_groove, &opt );  
+                    HbWidgetFeedback::triggered( this, Hb::InstantPressed );
+                    event->ignore();
+                    break;
+                }
+            }
+            case Qt::GestureFinished:
+            case Qt::GestureCanceled: {
+                setSliderDown( false );
+                d->groovePressed = false;
+                updatePrimitives( );
+                d->handle->updatePrimitives();
+                d->handleMoving = false;
+                event->ignore();
+            }
+            default:
+                break;
+        }
+    }
+
+  //  HbAbstractSliderControl::gestureEvent(event);
+}
+#endif
+
+
 bool HbSliderControl::sceneEventFilter(QGraphicsItem *obj,QEvent *event)
 {
     Q_D(HbSliderControl);
@@ -986,18 +1173,18 @@
         if (!isEnabled() ) {
             return false;
         }
-	    if (event->type() == QEvent::GraphicsSceneMousePress){
-			mousePressEvent((QGraphicsSceneMouseEvent *) event);
-             return true;
-		}
-		else if (event->type() == QEvent::GraphicsSceneMouseRelease){
-			mouseReleaseEvent((QGraphicsSceneMouseEvent *) event);
+	    if (event->type() == QEvent::Gesture){
+            gestureEvent( (QGestureEvent *) (event));
             return true;
-		}
-	} 
+        }
+    }
+    else if ( obj == d->handle) {
+        event->ignore();
+    }
 	return false;
 }
 
+
 /*!
   
 */
@@ -1032,10 +1219,12 @@
     Q_D( HbSliderControl );
     HbStyleOptionSlider option;
     initStyleOption( &option );
-    updatePrimitives( );
     HbAbstractSliderControl::polish( params );
     d->adjustHandle( );
     d->updateTickAndLabel();
+    updatePrimitives( );
+
+
 }
 
 /*!
@@ -1249,11 +1438,6 @@
             }
         break;
         case ItemSceneHasChanged: {
-            // scene event filter for gestures can be installed
-            // once the widget has been added to the scene
-            if(!value.isNull() && d->grooveTouchArea) {
-                d->grooveTouchArea->installSceneEventFilter(this);
-            }
             updatePrimitives();
         }
         break;
@@ -1295,19 +1479,10 @@
         style( )->updatePrimitive( d->groove, HbStyle::P_Slider_groove, &opt );
     }
 
-    if ( d->enableProgressTrack ) {
-        if ( !d->progressGroove ) {
-            d->progressGroove = d->createProgressGroove();  
-            if(d->progressGroove) {
-                HbStyle::setItemName( d->progressGroove, "progressgroove");
-                repolish();
-            }  
-        }
-        style( )->updatePrimitive( d->progressGroove, HbStyle::P_Slider_progressgroove, &opt );
-    }else if ( d->progressGroove ) {
-        delete d->progressGroove;
-        d->progressGroove = 0 ;
+    if( d->progressGroove ) {
+            style( )->updatePrimitive( d->progressGroove, HbStyle::P_Slider_progressgroove, &opt );
     }
+
 }
 
 /*!
@@ -1371,15 +1546,15 @@
         if ( d->grooveTouchArea ) {
             HbStyle::setItemName( d->grooveTouchArea, "groovetoucharea" );
         }
-        if( scene()) {
-            d->grooveTouchArea->installSceneEventFilter(this);
-        }
+        if(QGraphicsObject *touchArea = d->grooveTouchArea->toGraphicsObject()) {
 
-    }
-    else if ( d->grooveTouchArea ) {
-        d->grooveTouchArea->removeSceneEventFilter( this );
-        delete d->grooveTouchArea;
-        d->grooveTouchArea = NULL;
+#ifdef HB_GESTURE_FW
+            ungrabGesture(Qt::TapGesture);
+            ungrabGesture(Qt::PanGesture);
+            touchArea->grabGesture(Qt::TapGesture);
+            touchArea->grabGesture(Qt::PanGesture,Qt::ReceivePartialGestures);
+#endif 
+        }
     }
     d->trackHandlingEnable = enable ;
 }
@@ -1399,7 +1574,19 @@
     Q_D( HbSliderControl );
     if ( d->enableProgressTrack != trackVisible ) {
         d->enableProgressTrack = trackVisible;
-        updatePrimitives();        
+        if ( d->enableProgressTrack ) {
+            if ( !d->progressGroove ) {
+                d->progressGroove = d->createProgressGroove();  
+            }
+            if(d->progressGroove) {
+                d->progressGroove->setVisible( true );
+                HbStyle::setItemName( d->progressGroove, "progressgroove");
+            }
+                   
+        }else if ( d->progressGroove ) {
+            d->progressGroove->setVisible( false );
+            HbStyle::setItemName( d->progressGroove, QString());
+        }
     }
 
 }
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/sliders/hbslidercontrol_p.h
--- a/src/hbwidgets/sliders/hbslidercontrol_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/sliders/hbslidercontrol_p.h	Mon May 03 12:48:33 2010 +0300
@@ -113,6 +113,9 @@
     virtual void changeEvent(QEvent *event);
     virtual void mousePressEvent(QGraphicsSceneMouseEvent *event);
     virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
+#ifdef HB_GESTURE_FW
+    virtual void gestureEvent(QGestureEvent *event);
+#endif 
     bool sceneEventFilter(QGraphicsItem *obj,QEvent *event);
     virtual void resizeEvent(QGraphicsSceneResizeEvent *event);
     virtual QGraphicsItem *primitive(HbStyle::Primitive primitive) const;
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/sliders/hbsliderhandle.cpp
--- a/src/hbwidgets/sliders/hbsliderhandle.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/sliders/hbsliderhandle.cpp	Mon May 03 12:48:33 2010 +0300
@@ -37,7 +37,10 @@
 #include "hbeffectinternal_p.h"
 #define HB_SLIDERHANDLE_TYPE "HB_SLIDERHANDLE"
 #endif
-
+#ifdef HB_GESTURE_FW
+#include <hbtapgesture.h>
+#include <hbpangesture.h>
+#endif
 /*!
     This is internal class for HbSlider
     this created slider handle
@@ -66,8 +69,17 @@
     HbStyle::setItemName(touchItem , "toucharea");
 
     setZValue(slider->zValue() + 1);
-    
-
+#ifdef HB_GESTURE_FW    
+    grabGesture(Qt::TapGesture);
+    grabGesture(Qt::PanGesture);
+    if(touchItem) {
+        if(QGraphicsObject *touchArea = touchItem->toGraphicsObject()) {
+            Q_UNUSED(touchArea);
+               touchArea->grabGesture(Qt::PanGesture);
+               touchArea->grabGesture(Qt::TapGesture);
+        }
+    }
+#endif 
 #ifdef HB_EFFECTS
     // horizontal thumb press
    // HbEffectInternal::add(HB_SLIDERHANDLE_TYPE,"sliderhandle_h_press", "h_thumbpress");
@@ -306,6 +318,16 @@
   reimp
 
 */
+void HbSliderHandle::gestureEvent(QGestureEvent *event)
+{
+    Q_UNUSED(event);
+    // HbWidgetBase::gestureEvent() ignores, overriding to accept
+}
+
+/*!
+  reimp
+
+*/
 void HbSliderHandle::updatePrimitives()
 {
     HbStyleOptionSlider opt;
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/sliders/hbsliderhandle_p.h
--- a/src/hbwidgets/sliders/hbsliderhandle_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/sliders/hbsliderhandle_p.h	Mon May 03 12:48:33 2010 +0300
@@ -33,9 +33,9 @@
 class HbSliderControl;
 class QGraphicsItem;
 
-QT_BEGIN_NAMESPACE;
+QT_BEGIN_NAMESPACE
 class QGraphicsWidget;
-QT_END_NAMESPACE;
+QT_END_NAMESPACE
 
 
 class HB_AUTOTEST_EXPORT HbSliderHandle : public HbWidget
@@ -70,6 +70,7 @@
     virtual void mousePressEvent(QGraphicsSceneMouseEvent *event);
     virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
     virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
+    virtual void gestureEvent(QGestureEvent *event);
     //void updatePrimitive();
     //virtual void polish( HbStyleParameters& params );
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/sliders/hbvolumeslider_p.cpp
--- a/src/hbwidgets/sliders/hbvolumeslider_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/sliders/hbvolumeslider_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -36,8 +36,8 @@
 #include <hbwidgetfeedback.h>
 
 /*!
-    \depricated
-    This class will be depricated
+    \deprecated
+    This class will be deprecated
     Use HbSlider instead
     Example usage:
     \code
@@ -252,7 +252,7 @@
 
 
 /*!
-    \deprecated HbVolumeSlider::HbVolumeSlider( bool currentValueVisible,QGraphicsItem *parent )
+    \deprecated HbVolumeSlider::HbVolumeSlider(bool, QGraphicsItem*)
         is deprecated. Please use HbSlider instead
 
     The orientation is \b Qt::Vertical and the slider contains increase, track,
@@ -288,7 +288,7 @@
 
 
 /*!
-    \deprecated HbVolumeSlider::setCurrentValueVisible( bool visible )
+    \deprecated HbVolumeSlider::setCurrentValueVisible(bool)
         is deprecated. Please use HbSlider instead
     Sets whether the text element is visible.
 
@@ -336,7 +336,7 @@
 }
 
 /*!
-    \deprecated HbVolumeSlider::setToolTipVisible( bool b )
+    \deprecated HbVolumeSlider::setToolTipVisible(bool)
         is deprecated. Please use HbSlider instead
     \reimp
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/sliders/hbzoomslider_p.cpp
--- a/src/hbwidgets/sliders/hbzoomslider_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/sliders/hbzoomslider_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -33,8 +33,8 @@
 #include <QGraphicsScene>
 
 /*!
-    \depricated
-    This class will be depricated
+    \deprecated
+    This class will be deprecated
     Use HbSlider instead
     Example usage:
     \code
@@ -176,7 +176,7 @@
 
 
 /*!
-    \deprecated HbZoomSlider::HbZoomSlider( QGraphicsItem *parent )
+    \deprecated HbZoomSlider::HbZoomSlider(QGraphicsItem*)
         is deprecated. Please use HbSlider instead
     
     Constructs a zoom slider with \a parent.
@@ -225,7 +225,7 @@
 
 
 /*!
-    \deprecated HbZoomSlider::setDefaultZoomLevel( int value )
+    \deprecated HbZoomSlider::setDefaultZoomLevel(int)
         is deprecated. Please use HbSlider instead
     
     sets the default Zoom Level of the zoom slider with \a value.
@@ -245,7 +245,7 @@
 
 
 /*!
-    \deprecated HbZoomSlider::setToolTipVisible( bool b )
+    \deprecated HbZoomSlider::setToolTipVisible(bool)
         is deprecated. Please use HbSlider instead
     
     \reimp
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/sliders/sliders.pri
--- a/src/hbwidgets/sliders/sliders.pri	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/sliders/sliders.pri	Mon May 03 12:48:33 2010 +0300
@@ -36,21 +36,21 @@
 PUBLIC_HEADERS += $$PWD/hbratingslider.h
 
 
-INTERNAL_HEADERS += $$PWD/hbabstractslidercontrol_p.h
-INTERNAL_HEADERS += $$PWD/hbprogresssliderhandle_p.h
-INTERNAL_HEADERS += $$PWD/hbprogressbar_p.h
-INTERNAL_HEADERS += $$PWD/hbprogressslider_p.h
-INTERNAL_HEADERS += $$PWD/hbprogressiveslider_p.h
-INTERNAL_HEADERS += $$PWD/hbslider_p.h
-INTERNAL_HEADERS += $$PWD/hbslidercontrol_p.h
-INTERNAL_HEADERS += $$PWD/hbprogressslidercontrol_p.h
-INTERNAL_HEADERS += $$PWD/hbslidercontrol_p_p.h
-INTERNAL_HEADERS += $$PWD/hbsliderhandle_p.h
-INTERNAL_HEADERS += $$PWD/hbratingslider_p.h
-INTERNAL_HEADERS += $$PWD/hbslidertickmarks_p.h
-INTERNAL_HEADERS += $$PWD/hbslidertickmarkslabel_p.h
-INTERNAL_HEADERS += $$PWD/hbvolumeslider_p.h
-INTERNAL_HEADERS += $$PWD/hbzoomslider_p.h
+PRIVATE_HEADERS += $$PWD/hbabstractslidercontrol_p.h
+PRIVATE_HEADERS += $$PWD/hbprogresssliderhandle_p.h
+PRIVATE_HEADERS += $$PWD/hbprogressbar_p.h
+PRIVATE_HEADERS += $$PWD/hbprogressslider_p.h
+PRIVATE_HEADERS += $$PWD/hbprogressiveslider_p.h
+PRIVATE_HEADERS += $$PWD/hbslider_p.h
+PRIVATE_HEADERS += $$PWD/hbslidercontrol_p.h
+PRIVATE_HEADERS += $$PWD/hbprogressslidercontrol_p.h
+PRIVATE_HEADERS += $$PWD/hbslidercontrol_p_p.h
+PRIVATE_HEADERS += $$PWD/hbsliderhandle_p.h
+PRIVATE_HEADERS += $$PWD/hbratingslider_p.h
+PRIVATE_HEADERS += $$PWD/hbslidertickmarks_p.h
+PRIVATE_HEADERS += $$PWD/hbslidertickmarkslabel_p.h
+PRIVATE_HEADERS += $$PWD/hbvolumeslider_p.h
+PRIVATE_HEADERS += $$PWD/hbzoomslider_p.h
 
 
 SOURCES += $$PWD/hbabstractslidercontrol.cpp
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/widgets/hbcheckbox.cpp
--- a/src/hbwidgets/widgets/hbcheckbox.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/widgets/hbcheckbox.cpp	Mon May 03 12:48:33 2010 +0300
@@ -36,6 +36,11 @@
 #include "hbeffectinternal_p.h"
 #endif
 
+#ifdef HB_GESTURE_FW
+#include <hbtapgesture.h>
+#endif
+
+
 /*
     Spacer class.
 */
@@ -121,6 +126,9 @@
     Q_Q(HbCheckBox);
     if(!mTouchArea) {
         mTouchArea = q->style()->createPrimitive(HbStyle::P_CheckBox_toucharea, q);
+        if(QGraphicsObject *ta = qgraphicsitem_cast<QGraphicsObject*>(mTouchArea)) {
+            ta->grabGesture(Qt::TapGesture);
+        }
     }
     if (!mTextItem) {
         mTextItem = q->style()->createPrimitive(HbStyle::P_CheckBox_text, q);
@@ -196,6 +204,9 @@
     // creattion of top and bottom spacer.
     HbStyle::setItemName( new HbCheckBoxSpacer(this), "topSpacer" );
     HbStyle::setItemName( new HbCheckBoxSpacer(this), "bottomSpacer" );
+#ifdef HB_GESTURE_FW
+    grabGesture(Qt::TapGesture);
+#endif
 
 }
 
@@ -294,6 +305,10 @@
 }
 
 /*!
+
+    \deprecated HbCheckBox::primitive(HbStyle::Primitive)
+        is deprecated.
+
     Returns the pointer for \a primitive passed.
     Will return NULL if \a primitive passed is icon because user cannot
     configure the check and unchecked icons. Style needs to be changed if
@@ -429,6 +444,7 @@
     HbCheckBox::checkStateSet();
 }
 
+#ifndef HB_GESTURE_FW
 /*!
     \reimp.
 */
@@ -451,7 +467,14 @@
         HbToolTip::showText(toolTip(), this);
     }   
 }
+#endif
 
+#ifdef HB_GESTURE_FW
+void HbCheckBox::gestureEvent(QGestureEvent *event)
+{
+    HbAbstractButton::gestureEvent( event );
+}
+#endif
 /*!
     \reimp.
 */
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/widgets/hbcheckbox.h
--- a/src/hbwidgets/widgets/hbcheckbox.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/widgets/hbcheckbox.h	Mon May 03 12:48:33 2010 +0300
@@ -70,9 +70,13 @@
     virtual bool hitButton( const QPointF &pos ) const;
     virtual void checkStateSet( );
     virtual void nextCheckState( );
-
+#ifndef HB_GESTURE_FW
     void mouseReleaseEvent( QGraphicsSceneMouseEvent *event );
     void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
+#endif
+#ifdef HB_GESTURE_FW
+    virtual void gestureEvent(QGestureEvent *event);
+#endif
     void keyPressEvent(QKeyEvent *keyEvent);
     QVariant itemChange( GraphicsItemChange change, const QVariant &value );
 
@@ -82,6 +86,7 @@
 private:
     Q_DECLARE_PRIVATE_D(d_ptr, HbCheckBox)
     Q_DISABLE_COPY(HbCheckBox)
+    
 
 };
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/widgets/hbcombobox.cpp
--- a/src/hbwidgets/widgets/hbcombobox.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/widgets/hbcombobox.cpp	Mon May 03 12:48:33 2010 +0300
@@ -30,11 +30,12 @@
 #include <hbtoucharea.h>
 #include <hbtextitem.h>
 #include <hbstyleoptioncombobox.h>
-
-#include <QGraphicsSceneMouseEvent>
 #include <QStandardItemModel>
 #include <QDebug>
 
+#include <hbtapgesture.h>
+
+
 /*!
     @beta
     @hbwidgets
@@ -568,6 +569,10 @@
 }
 
 /*!
+
+    \deprecated HbComboBox::primitive(HbStyle::Primitive)
+        is deprecated.
+
     \reimp
  */
 QGraphicsItem* HbComboBox::primitive( HbStyle::Primitive primitive ) const
@@ -575,8 +580,12 @@
     Q_D( const HbComboBox );
 
     switch( primitive ){
+        case HbStyle::P_ComboBox_text:
+            return d->mTextItem;
         case HbStyle::P_ComboBox_background:
             return d->mBackgroundItem;
+        case HbStyle::P_ComboBox_button:
+            return d->mButton;
         case HbStyle::P_ComboBoxButton_toucharea:
             return d->mButtonTouchAreaItem;
         default:
@@ -957,27 +966,44 @@
 /*!
     reimplementation. 
 */
-bool HbComboBox::eventFilter( QObject *obj, QEvent *event )
+bool HbComboBox::eventFilter( QObject* obj, QEvent* event )
 {
     Q_D( HbComboBox );
-    bool accepted = false;  
+    bool accepted = false;
+    if ( !isEnabled() ) {
+        return false ;
+    }
     if(obj == static_cast<HbTouchArea*>(d->mButtonTouchAreaItem)) {
-        if( (event->type() == QEvent::GraphicsSceneMousePress ) || 
-                (event->type() == QEvent::GraphicsSceneMouseDoubleClick ) ) {
-            if( static_cast<HbTouchArea*>(d->mButtonTouchAreaItem)->rect( ).contains( 
-                        static_cast<QGraphicsSceneMouseEvent *>( event )->pos( ) ) ){
-                d->touchAreaPressEvent( );
-                accepted = true;
+        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();
+                        setProperty("state", "normal");
+                        accepted = true;
+                        break;
+                    }
+                case Qt::GestureFinished:
+                    {
+                        d->touchAreaReleaseEvent( );
+                        accepted = true;
+                        break;
+                        //TODO :: move else part here
+                    }
+                default:
+                    break;
+                }
             }
-        }else if( event->type() == QEvent::GraphicsSceneMouseRelease ) {
-             if( static_cast<HbTouchArea*>(d->mButtonTouchAreaItem)->rect( ).contains(
-                        static_cast<QGraphicsSceneMouseEvent *>( event )->pos( ) ) ){
-                    d->touchAreaReleaseEvent( );
-                    accepted = true;
-             } else if (d->mIsDown) {
-                 d->mIsDown = false;
-                 updatePrimitives( );
-             }
         }
     }
     return accepted;
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/widgets/hbcombobox_p.cpp
--- a/src/hbwidgets/widgets/hbcombobox_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/widgets/hbcombobox_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -45,6 +45,8 @@
 #define HB_DROPD0WN_ITEM_TYPE "HB_DROPDOWN"
 #endif
 
+#include <hbtapgesture.h>
+
 HbComboBoxPrivate::HbComboBoxPrivate( ):
     HbWidgetPrivate (  ),
     mLineEdit ( 0 ),
@@ -90,6 +92,7 @@
 {
     Q_Q( HbComboBox );
 
+
     mTextItem = q->style()->createPrimitive( HbStyle::P_ComboBox_text, q );
     HbStyle::setItemName( mTextItem, "combobox_labelfield" );
 
@@ -103,10 +106,12 @@
                                             HbStyle::P_ComboBoxButton_toucharea, q );
     static_cast<HbTouchArea*>(mButtonTouchAreaItem)->installEventFilter( q );
     q->setHandlesChildEvents(true);
+
+    static_cast<HbTouchArea*>(mButtonTouchAreaItem)->grabGesture( Qt::TapGesture );
 }
 
 void HbComboBoxPrivate::touchAreaPressEvent( )
-{
+{    
     Q_Q( HbComboBox );
     if (q->count() > 0) {
         HbWidgetFeedback::triggered(q, Hb::InstantPressed);
@@ -134,6 +139,7 @@
     Q_Q( HbComboBox );
     if ( mModel && mModel->rowCount( ) ) {
         addDropDownToScene();
+        mDropDown->setVisible( true );
         if( !mDropDown->mList ) {
             mDropDown->createList( );
             mDropDown->mList->setModel( mModel );            
@@ -156,8 +162,7 @@
         #ifdef HB_EFFECTS
                HbEffect::start(mDropDown, HB_DROPD0WN_ITEM_TYPE, "appear");
         #endif
-        positionDropDown( );
-        mDropDown->setVisible( true );
+        positionDropDown( );        
     }
 }
 
@@ -184,6 +189,7 @@
             mDropDown->createList();            
             q->connect( mDropDown->mList, SIGNAL( activated( QModelIndex ) ), q,
                         SLOT( _q_textChanged( QModelIndex ) ) );
+            
         }
         mDropDown->mList->setModel( aModel );
         if ( aIndex.isValid( ) ) {
@@ -544,6 +550,7 @@
         if( scene1 )
         {
             scene1->installEventFilter( mDropDown );
+            //scene1->grabGesture( Qt::TapGesture );
         }
         mIsDropwnToSceneAdded = true;
     }
@@ -575,7 +582,7 @@
 }
 
 void HbComboBoxPrivate::currentIndexChanged( const QModelIndex &index )
-{
+{    
     Q_Q( HbComboBox );
     emit q->currentIndexChanged( index.row( ) );    
     emit q->currentIndexChanged( q->itemText ( mCurrentIndex.row( ) ) );
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/widgets/hbcombodropdown_p.cpp
--- a/src/hbwidgets/widgets/hbcombodropdown_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/widgets/hbcombodropdown_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -26,6 +26,12 @@
 #include "hbcombodropdown_p.h"
 #include "hbcombobox_p.h"
 #include <hblistview.h>
+#include <hbwidgetfeedback.h>
+
+#ifdef HB_GESTURE_FW
+#include <hbtapgesture.h>
+#endif
+
 
 HbComboDropDown::HbComboDropDown( HbComboBoxPrivate *comboBoxPrivate, QGraphicsItem *parent )
         :HbWidget( parent ),
@@ -40,10 +46,13 @@
         setFlag( QGraphicsItem::ItemIsPanel, true );
         setActive( false );
     #endif
+        //setFlag(QGraphicsItem::ItemIsPanel);
+        //setPanelModality(PanelModal);
 }
 
 HbComboDropDown::~HbComboDropDown( )
 {
+
 }
 
 void HbComboDropDown::createList( )
@@ -73,6 +82,7 @@
 {
     Q_UNUSED( obj );
     bool accepted = false;
+
     if ( isVisible( ) && !vkbOpened ) {
         switch( event->type( ) )
         {
@@ -88,17 +98,27 @@
         case QEvent::GraphicsSceneMouseRelease:
             {
                 if( !( this->isUnderMouse( ) ) && backgroundPressed ) {
+                    HbWidgetFeedback::triggered(this, Hb::InstantPopupClosed);
                     setVisible( false );
                     backgroundPressed = false;
                     accepted = true;
                 }
             }
             break;
+        case QEvent::Gesture:
+            {
+                if(!this->isUnderMouse()) {
+                    accepted = true;
+                }
+            }
+            break;
         default:
             break;
         }
     }
-        return accepted;
+
+    return accepted;
 }
+
 #include "moc_hbcombodropdown_p.cpp"
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/widgets/hbdatetimepicker.cpp
--- a/src/hbwidgets/widgets/hbdatetimepicker.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/widgets/hbdatetimepicker.cpp	Mon May 03 12:48:33 2010 +0300
@@ -28,12 +28,11 @@
 #include "hbstyleoption.h"
 
 /*!
-    @alpha
-    @hbwidgets
+    @beta
     \class HbDateTimePicker
     \brief HbDateTimePicker class provides a widget for picking the date, time, date and time. 
-    By default datetime picker will be created, with date functionality only.
-    For exclusive time or date picker creation, use QTime or QDate variable as parameter for the constructor.
+    By default date picker will be created, with date functionality only.
+    For exclusive time or datetime picker creation, use QTime or QDateTime variable as parameter for the constructor.
     \li Date and Time
     \li Date
     \li Time
@@ -54,7 +53,8 @@
     \fn void dateChanged(const QDate &date)
 
     This signal is emitted when item selection changes in any of the date pickers in the datetimepicker widget.
-    \a date  selected by the user.
+    
+    \param date  selected by the user.
 
 */
 
@@ -62,7 +62,7 @@
     \fn void timeChanged(const QTime &time)
 
     This signal is emitted when item selection changes in any of the time pickers in the datetimepicker widget.
-    \a time  selected by the user.
+    \param time  selected by the user.
 
 */
 
@@ -70,12 +70,14 @@
     \fn void dateTimeChanged(const QDateTime &datetime)
 
     This signal is emitted when item selection changes in any of the pickers in the datetimepicker widget.
-    \a datetime  selected by the user.
+    \param datetime  selected by the user.
 
 */
 
 /*!
     Constructs date picker widget by default.
+
+    \param parent parent item.
 */
 HbDateTimePicker::HbDateTimePicker( QGraphicsItem *parent ):
 HbWidget(*new HbDateTimePickerPrivate, parent)
@@ -90,6 +92,8 @@
 
 /*!
     Constructs datetime picker widget.
+
+    \param datetime QDateTime value.
 */
 HbDateTimePicker::HbDateTimePicker(const QDateTime &datetime, QGraphicsItem *parent ):
 HbWidget(*new HbDateTimePickerPrivate, parent)
@@ -102,6 +106,8 @@
 
 /*!
     Constructs date picker widget with default locale's date format.
+    
+    \param date QDate value.
 */
 HbDateTimePicker::HbDateTimePicker(const QDate &date, QGraphicsItem *parent ):
 HbWidget(*new HbDateTimePickerPrivate, parent)
@@ -114,6 +120,8 @@
 
 /*!
     Constructs time picker widget with default locale's time format.
+    
+    \param time QTime value.
 */
 HbDateTimePicker::HbDateTimePicker(const QTime &time, QGraphicsItem *pParent ):
 HbWidget(*new HbDateTimePickerPrivate, pParent)
@@ -139,13 +147,14 @@
 	d->init(QVariant::DateTime);
 }
 
+/*!
+    \reimp
+*/
 bool HbDateTimePicker::event(QEvent *e)
 {    
-    Q_D(HbDateTimePicker);
     bool result = HbWidget::event(e);
     if (e->type()==QEvent::LayoutRequest) {
         updatePrimitives();
-        d->updateDividers();
     }
     return result;
 }
@@ -160,6 +169,8 @@
 /*!
     Returns current display format as QString value.
 
+    \return display format.
+
     \sa setDisplayFormat()
  */
 QString HbDateTimePicker::displayFormat() const
@@ -199,6 +210,8 @@
     NOTE:setDisplayFormat works only when the seperators 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 in QString format.
+
     \sa displayFormat()
 */
 void HbDateTimePicker::setDisplayFormat(const QString &format)
@@ -216,6 +229,8 @@
 /*!
     Returns the current date in QDate format.
 
+    \return Date Picker's current date.
+
     \sa setDate
 */
 QDate HbDateTimePicker::date() const
@@ -228,6 +243,8 @@
 /*!
     Sets the current \a date in the form of QDate.
 
+    \param date date in QDate format
+
     \sa date
 */
 void HbDateTimePicker::setDate(const QDate& date)
@@ -239,6 +256,8 @@
 /*!
     Returns minimum date in QDate format.
 
+    \return Minimum date in QDate format.
+
     \sa setMinimumDate
 */
 QDate HbDateTimePicker::minimumDate()const
@@ -249,6 +268,8 @@
 
 /*!
     Sets minimum \a date in QDate format.
+
+    \param Minimum date in QDate format.
     
     \sa minimumDate
 */
@@ -261,6 +282,8 @@
 /*!
     Returns maximum date in QDate format.
 
+    \return Maximum Date in QDate format.
+
     \sa setMaximumDate
 */
 QDate HbDateTimePicker::maximumDate()const
@@ -272,6 +295,8 @@
 /*!
     Sets maximum \a date in QDate format.
 
+    \param date Maximum date in QDate format.
+
     \sa maximumDate
 */
 void HbDateTimePicker::setMaximumDate(const QDate& date)
@@ -283,6 +308,9 @@
 /*!
     Sets minimum \a minDate and maximum \a maxDate dates in QDate format.
 
+    \param minDate Minimum date in QDate format.
+    \param maxDate Maximum date in QDate format.
+
     \sa setMinimumDate \sa setMaximumDate
 */
 void HbDateTimePicker::setDateRange(const QDate &minDate, const QDate &maxDate)
@@ -295,6 +323,8 @@
 /*!
     Returns the current datetime in QDateTime format.
 
+    \return date and time value in QDateTime format.
+
     \sa setDateTime
 */
 QDateTime HbDateTimePicker::dateTime()const
@@ -306,6 +336,8 @@
 /*!
     Sets the current \a datetime in the form of QDateTime.
 
+    \param datetime in QDateTime format.
+
     \sa dateTime
 */
 void HbDateTimePicker::setDateTime(const QDateTime &datetime)
@@ -317,6 +349,8 @@
 /*!
     Returns minimum date time in QDateTime format.
 
+    \return Minimum date and minimum time in QDateTime format.
+
     \sa setMinimumDateTime
 */
 QDateTime HbDateTimePicker::minimumDateTime()const
@@ -330,6 +364,8 @@
 	<b><i>Note:</i></b> There's no link between Date and time in this API, using this API as of now
 	would be similar to using combination of \sa setMinimumDate and \sa setMinimumTime
 
+    \param datetime minimum date and minimum time in QDateTime format.
+
     \sa minimumDateTime \sa setMinimumDate \sa setMinimumTime
 */
 void HbDateTimePicker::setMinimumDateTime(const QDateTime& datetime)
@@ -341,6 +377,8 @@
 /*!
     Returns maximum date time in QDateTime format.
 
+    \return Maximum date and maximum time in QDateTime format.
+
     \sa setMaximumDate
 */
 QDateTime HbDateTimePicker::maximumDateTime()const
@@ -355,6 +393,8 @@
 	<b><i>Note:</i></b> There's no link between Date and time in this API, using this API as of now
 	would be similar to using combination of \sa setMaximumDate and \sa setMaximumTime
 
+    \param date Maximum date and maximum time in QDateTime format.
+
     \sa maximumDateTime \sa setMaximumDate \sa setMaximumTime
 */
 void HbDateTimePicker::setMaximumDateTime(const QDateTime& date)
@@ -368,7 +408,10 @@
 
 	<b><i>Note:</i></b> There's no link between Date and time in this API, using this API as of now
 	would be similar to using combination of \sa setMinimumDate \sa setMaximumTime and 
-	\sa setMinimumTime, \sa setMaximumTime
+	\sa setMinimumTime, \sa setMaximumTime.
+
+    \param minDateTime minimum date and time in QDateTime format.
+    \param maxDateTime maximum date and time in QDateTime format.
 
     \sa setMinimumDateTime \sa setMaximumDateTime \sa setMinimumDate \sa setMaximumDate
 	\sa setMinimumTime \sa setMaximumTime
@@ -382,6 +425,8 @@
 /*!
     Returns the current time in QTime format.
 
+    \return time in QTime format.
+
     \sa setTime
 */
 QTime HbDateTimePicker::time() const
@@ -393,6 +438,8 @@
 /*!
     Sets the current \a time in the form of QTime.
 
+    \param time in QTime format.
+
     \sa time
 */
 void HbDateTimePicker::setTime(const QTime &time)
@@ -404,6 +451,8 @@
 /*!
     Returns minimum time in QTime format.
 
+    \return Minimum time in QTime format.
+
     \sa setMinimumTime
 */
 QTime HbDateTimePicker::minimumTime()const
@@ -415,6 +464,8 @@
 /*!
     Sets minimum \a time in QTime format.
 
+    \param time minimum time in QTime format.
+
     \sa minimumTime
 */
 void HbDateTimePicker::setMinimumTime(const QTime& time)
@@ -426,6 +477,8 @@
 /*!
     Returns maximum time in QTime format.
 
+    \return maximum time in QTime format.
+
     \sa setMaximumTime
 */
 QTime HbDateTimePicker::maximumTime()const
@@ -437,6 +490,8 @@
 /*!
     Sets maximum \a time in QTime format.
 
+    \param time maximum time in QTime format
+
     \sa maximumTime
 */
 void HbDateTimePicker::setMaximumTime(const QTime& time)
@@ -448,6 +503,9 @@
 /*!
     Sets minimum \a minTime and maximum \a maxTime in QTime format.
 
+    \param minTime minimum time in QTime format.
+    \param maxTime maximum time in QTime format.
+
     \sa setMinimumTime \sa setMaximumTime
 */
 void HbDateTimePicker::setTimeRange(const QTime &minTime, const QTime &maxTime)
@@ -457,25 +515,87 @@
                      QDateTime(d->mMinimumDate.date(), maxTime));
 }
 
+/*!
+  sets the \a interval for the corresponding \a section.
+
+  Note: Only MinuteSection is supported at this time.
+
+  \param section can be a MinuteSection.
+  \param interval to be set on each picker.
+*/
+void HbDateTimePicker::setInterval(QDateTimeEdit::Section section,int interval)
+{
+    Q_D(HbDateTimePicker);
+
+    //Currently supporting interval for minute section. If other sections should be enabled in future,remove the 
+    //below validation for minute section.
+    if(section != QDateTimeEdit::MinuteSection){
+        d->mIntervals[section] = 1;
+        return;
+    }
+
+    d->mIntervals[section] = interval;
+
+    if((section == QDateTimeEdit::MinuteSection) && (d->mMinuteModel)){
+
+        d->mMinuteModel->removeRows(0, d->mMinuteModel->rowCount());
+
+        d->resizeModel(d->mMinuteModel, d->mMinimumDate.time().minute(), d->mMaximumDate.time().minute(),
+            d->mMinimumDate.time().minute(), d->mMaximumDate.time().minute(),&HbDateTimePickerPrivate::localeMinute, interval);
+    }
+}
+
+/*!
+  returns the \a interval for the corresponding \a section.
+
+  Note: Only MinuteSection is supported at this time.
+
+  \return interval or duration set on a particular \a section.
+*/
+int HbDateTimePicker::interval(QDateTimeEdit::Section section) const
+{
+    Q_D(const HbDateTimePicker);
+
+    return d->mIntervals[section];
+}
+
+/*!
+
+    \deprecated HbDateTimePicker::primitive(HbStyle::Primitive)
+        is deprecated.
+
+    \reimp
+*/
 QGraphicsItem *HbDateTimePicker::primitive(HbStyle::Primitive primitive) const
 {
     Q_D(const HbDateTimePicker);
     switch(primitive) {
         case HbStyle::P_DateTimePicker_background:
             return d->mBackground;
+
         case HbStyle::P_DateTimePicker_frame:
             return d->mFrame;
+
+        case HbStyle::P_TumbleView_highlight:
+            return d->mHighlight;
+
         default:
             return HbWidget::primitive(primitive);
     }
 }
 
+/*!
+    \reimp
+*/
 void HbDateTimePicker::setGeometry(const QRectF &rect) 
 {
     HbWidget::setGeometry(rect);
     updatePrimitives();
 }
 
+/*!
+    \reimp
+*/
 void HbDateTimePicker::updatePrimitives()
 {
     Q_D(HbDateTimePicker);
@@ -487,6 +607,10 @@
     if(d->mFrame) {
         style()->updatePrimitive(d->mFrame,HbStyle::P_DateTimePicker_frame,&option);
     }
+
+    if(d->mHighlight) {
+        style()->updatePrimitive(d->mHighlight,HbStyle::P_TumbleView_highlight,&option);
+    }
 }
 
 #include "moc_hbdatetimepicker.cpp"
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/widgets/hbdatetimepicker.h
--- a/src/hbwidgets/widgets/hbdatetimepicker.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/widgets/hbdatetimepicker.h	Mon May 03 12:48:33 2010 +0300
@@ -29,6 +29,7 @@
 #include <hbwidget.h>
 
 #include <QString>
+#include <QDateTimeEdit>
 
 class HbDateTimePickerPrivate;
 
@@ -86,6 +87,9 @@
 
     void setTimeRange(const QTime &minTime, const QTime &maxTime);
 
+    void setInterval(QDateTimeEdit::Section section,int difference);
+    int interval(QDateTimeEdit::Section section) const;
+
     enum { Type = Hb::ItemType_DateTimePicker };
     int type() const { return Type; }
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/widgets/hbdatetimepicker_p.cpp
--- a/src/hbwidgets/widgets/hbdatetimepicker_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/widgets/hbdatetimepicker_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -317,6 +317,8 @@
     ,mBackground(0)
     ,mFrame(0)
     ,mContent(0)
+    ,mIntervals()
+    ,mHighlight(0)
 {
     mMinimumDate = HBDATETIMEPICKER_DATETIME_MIN;
     mMaximumDate = HBDATETIMEPICKER_DATETIME_MAX;
@@ -325,12 +327,6 @@
 
 HbDateTimePickerPrivate::~HbDateTimePickerPrivate()
 {
-    QGraphicsLayoutItem *item;
-    foreach(item,mDividers)
-    {
-        mLayout->removeItem(item);
-        delete item;
-    }
 }
 
 /*
@@ -344,7 +340,7 @@
     //create base content widget which contains the tumble views
     mContent=new HbWidget(q);
     mLayout = new QGraphicsLinearLayout(Qt::Horizontal);
-    mLayout->setSpacing(0);
+    mLayout->setSpacing(1);
     mLayout->setContentsMargins(0,0,0,0);
     mContent->setLayout(mLayout);
     q->style()->setItemName(mContent,"content");
@@ -357,9 +353,7 @@
     //parse the format and set the sections in order
     parseDisplayFormat(mFormat);
 
-    mDividers.clear();
-
-    //create the dividers used in rearrangeTumbleViews
+    //create primitives
     createPrimitives();
 
     //recreate and rearrange depending on the format
@@ -475,85 +469,104 @@
     mMinuteOffset = -1;
     mSecondOffset = -1;
 
-    createDividers();
-
-    //divider stuff
-    //TODO: improve the divider addition and removal
-    foreach(QGraphicsItem *item, mDividers) {
-        HbFrameItem *fame = qgraphicsitem_cast<HbFrameItem *>(item);
-        Q_ASSERT(fame); // WRONG USE OF PRIMITIVES - Please fix it
-        mLayout->removeItem(fame);
-        fame->setVisible(false);
-    }
-
-
-    //TODO: improve the divider addition and removal
-    bool hasSeparator = mParser.mSectionNodes.count() > 1;
+    QPointer<HbTumbleView> lastAdded;
 
     for(int i=0;i<mParser.mSectionNodes.count();i++) {
-
-        if(hasSeparator && (mLayout->count()>0)) {
-            //TODO: improve the divider addition and removal
-            HbFrameItem *f=static_cast<HbFrameItem*>(mDividers.at(i - 1));
-            if(f) {
-                f->setVisible(true);
-            }
-            mLayout->addItem(mDividers.at(i - 1));
-        }
-
         switch(mParser.mSectionNodes[i].type) {
             case HbDateTimeParser::AmPmSection:
                 mAmPmPicker = new HbTumbleView(q);
                 mAmPmModel = new QStringListModel(q);
                 mAmPmPicker->setModel(mAmPmModel);
+                //mAmPmPicker->setLoopingEnabled(true);
                 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);
                 mLayout->addItem(mDayPicker);
+                mDayPicker->primitive("highlight")->hide();
+                mDayPicker->primitive("separator")->show();
+                lastAdded = mDayPicker;
                 break;
+
             case HbDateTimeParser::MonthSection:
                 mMonthPicker = new HbTumbleView(q);
                 mMonthModel = new QStringListModel(q);
                 mMonthPicker->setModel(mMonthModel);
+                //mMonthPicker->setLoopingEnabled(true);
                 mLayout->addItem(mMonthPicker);
+                mMonthPicker->primitive("highlight")->hide();
+                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);
                 mLayout->addItem(mYearPicker);
+                mYearPicker->primitive("highlight")->hide();
+                mYearPicker->primitive("separator")->show();
+                lastAdded = mYearPicker;
                 break;
+
             case HbDateTimeParser::SecondSection:
                 mSecondPicker = new HbTumbleView(q);
                 mSecondModel = new QStringListModel(q);
                 mSecondPicker->setModel(mSecondModel);
+                //mSecondPicker->setLoopingEnabled(false);
                 mLayout->addItem(mSecondPicker);
+                mSecondPicker->primitive("highlight")->hide();
+                mSecondPicker->primitive("separator")->show();
+                lastAdded = mSecondPicker;
                 break;
+
             case HbDateTimeParser::MinuteSection:
                 mMinutePicker = new HbTumbleView(q);
                 mMinuteModel = new QStringListModel(q);
                 mMinutePicker->setModel(mMinuteModel);
+                //mMinutePicker->setLoopingEnabled(false);
                 mLayout->addItem(mMinutePicker);
+                mMinutePicker->primitive("highlight")->hide();
+                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);
                 mLayout->addItem(mHourPicker);
+                mHourPicker->primitive("highlight")->hide();
+                mHourPicker->primitive("separator")->show();
+                lastAdded = mHourPicker;
                 break;
-            default:break;
+
+            default:
+                break;
         }
     }
+
+    //For the last added tumble view, hide the separator.
+    if(lastAdded){
+        lastAdded->primitive("separator")->hide();
+    }
+
     setRanges();
     makeConnections();
     syncVisualDate();
- //TODO:what to do with current date, should reset ?
+    //TODO:what to do with current date, should reset ?
 }
 
 void HbDateTimePickerPrivate::makeConnections()
@@ -817,6 +830,15 @@
             qDebug() << "setDateTime after: secondOffset=" << mSecondOffset << " time=" << newDateTime.time();
 #endif
         }
+        if(mAmPmPicker){
+            if(newDate.time().hour() >= 12){
+                mAmPmPicker->setSelected(1);
+            }
+            else{
+                mAmPmPicker->setSelected(0);
+            }
+        }
+
         mDateTime = newDateTime;
 
     }
@@ -994,7 +1016,7 @@
     resizeModel(mMinuteModel,
             mMinuteOffset,mMinuteOffset+mMinuteModel->rowCount()-1,
             start,end,
-            &HbDateTimePickerPrivate::localeMinute);
+            &HbDateTimePickerPrivate::localeMinute, mIntervals[QDateTimeEdit::MinuteSection]);
     mMinuteOffset = start;
 
     mMinutePicker->setSelected(newIndex);
@@ -1121,27 +1143,46 @@
 void HbDateTimePickerPrivate::resizeModel(QStringListModel *model,
             int oldStart, int oldEnd,
             int newStart, int newEnd,
-            QString (HbDateTimePickerPrivate::*localeFunc)(int))
+            QString (HbDateTimePickerPrivate::*localeFunc)(int), int interval)
 {
-    //if row count is zero, then insert from newEnd to newStart
+    if(interval > 1){
+        model->removeRows(0, model->rowCount());
+    }
+
     if((model->rowCount() == 0) && (newEnd-newStart>=0)) {
         //initialize condition
-        model->insertRows(0,newEnd-newStart+1);
+
         for(int i=0;i<=newEnd-newStart;i++) {
-            QModelIndex index=model->index(i,0);
-            if(index.isValid()) {
-                //model->setData(index,(this->*localeFunc)(i+newStart));//TODO:add a readable typedef
-                QString text = (this->*localeFunc)(i+newStart);
+            //model->setData(index,(this->*localeFunc)(i+newStart));//TODO:add a readable typedef
+            QString text;
+
+            if(interval > 1){
+                if(((newStart + interval) * i) <= newEnd){
+                    model->insertRow(i);
+                    text = (this->*localeFunc)(!((newStart + interval)*i) ? newStart : (newStart + interval)*i);
+                }
+                else{
+                    break;
+                }
+            }
+            else{
+                model->insertRow(i);
+                text = (this->*localeFunc)(i+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
             }
+
         }
         return;
     }
@@ -1186,51 +1227,11 @@
         mFrame = q->style()->createPrimitive(HbStyle::P_DateTimePicker_frame,q);
         q->style()->setItemName(mFrame,"frame");
     }
-    createDividers();
-}
 
-void HbDateTimePickerPrivate::createDividers()
-{
-    Q_Q(HbDateTimePicker);
-    
-    if( mParser.mSectionNodes.count() == mDividers.count() ){
-        return;
-    }
-
-    if( mParser.mSectionNodes.count() < mDividers.count() ){
-        for( int i = mParser.mSectionNodes.count() - 1; i > mDividers.count(); i--)
-        {
-            QPointer<QGraphicsWidget> item = mDividers.at(i);
-            mDividers.removeAt(i);
-            delete item;
-        }
-
-        return;
+    if(!mHighlight){
+        mHighlight = q->style()->createPrimitive(HbStyle::P_TumbleView_highlight,q);
+        q->style()->setItemName(mHighlight,"highlight");
     }
-    else if( mParser.mSectionNodes.count() > mDividers.count() ){
-
-        for(int i = mDividers.count();i < mParser.mSectionNodes.count(); i++) { //TODO: optimally create when required
-            QGraphicsItem *item=q->style()->createPrimitive(HbStyle::P_DateTimePicker_separator, mContent);
-            Q_ASSERT(item->isWidget());
-            q->style()->setItemName(item,"separator");
-            mDividers.append(static_cast<QGraphicsWidget *>(item));
-        }
-    }
-}
-
-void HbDateTimePickerPrivate::updateDividers()
-{
-    /*Q_Q(HbDateTimePicker);
-    HbStyleOption option;
-    q->initStyleOption(&option);
-    for(int i=0;i<qMin(mDividers.count(),mDividerIndex);i++) {
-        q->style()->updatePrimitive((QGraphicsItem*)mDividers.at(i),HbStyle::P_DateTimePicker_separator,&option);
-    }*/
-
-    //TODO: improve the divider addition and removal
-
-    //using the style update primitive crashes. need to investigate why
-
 }
 
 void HbDateTimePickerPrivate::_q_dayChanged(int index)
@@ -1484,7 +1485,7 @@
 #ifdef HBDATETIMEPICKER_DEBUG
     qDebug() << "_q_minutesChanged:" << index;
 #endif
-    QTime newTime(mDateTime.time().hour(),mMinuteOffset+index,mDateTime.time().second());
+	QTime newTime(mDateTime.time().hour(),mLocale.toInt(mMinuteModel->index(mMinuteOffset+index,0).data().toString()),mDateTime.time().second());
     if(newTime.isValid()) {
         mDateTime.setTime(newTime);
     }
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/widgets/hbdatetimepicker_p.h
--- a/src/hbwidgets/widgets/hbdatetimepicker_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/widgets/hbdatetimepicker_p.h	Mon May 03 12:48:33 2010 +0300
@@ -37,6 +37,7 @@
 #include <QDateTime>
 #include <QGraphicsWidget>
 #include <QList>
+#include <QHash>
 
 
 #define HBDATETIMEPICKER_TIME_MIN QTime(0, 0, 0, 0)
@@ -160,12 +161,10 @@
     void resizeModel(QStringListModel *model,
         int oldStart, int oldEnd,
         int newStart, int newEnd,
-        QString (HbDateTimePickerPrivate::*localeFuncPtr)(int));
+        QString (HbDateTimePickerPrivate::*localeFuncPtr)(int), int interval = 1);
 
 
     void createPrimitives();
-    void createDividers();
-    void updateDividers();
     void deleteAndNull(HbTumbleView*& t) {
         delete t;t=0;
     }
@@ -231,7 +230,8 @@
     QGraphicsItem *mBackground;
     QGraphicsItem *mFrame;
     HbWidget *mContent;
-    QList<QGraphicsWidget *> mDividers;
+    QHash<QDateTimeEdit::Section, int> mIntervals;
+    QGraphicsItem   *mHighlight;
 };
 
 #endif //HBDATETIMEPICKER_P_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/widgets/hbgroupbox.cpp
--- a/src/hbwidgets/widgets/hbgroupbox.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/widgets/hbgroupbox.cpp	Mon May 03 12:48:33 2010 +0300
@@ -459,7 +459,6 @@
                 d->mContentWidget->setVisible(true);
             }
             d->mHeadingWidget->updatePrimitives();
-            repolish();
             emit toggled( d->mHeadingWidget->collapsed );
         }
     }
@@ -590,6 +589,10 @@
 }
 
 /*!
+
+    \deprecated HbGroupBox::primitive(HbStyle::Primitive)
+        is deprecated.
+
     Returns the pointer for \a primitive passed.
     Will return NULL if \a primitive passed is invalid
 */
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/widgets/hbgroupboxcontentwidget_p.cpp
--- a/src/hbwidgets/widgets/hbgroupboxcontentwidget_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/widgets/hbgroupboxcontentwidget_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -29,6 +29,12 @@
 #include <hbgesturefilter.h>
 #include <hbgesture.h>
 #include <QGraphicsSceneMouseEvent>
+#include <hbwidgetfeedback.h>
+#ifdef HB_GESTURE_FW
+#include <hbtapgesture.h>
+#include <hbtapandholdgesture.h>
+#include <QGesture>
+#endif 
 
 /*
     internal
@@ -44,14 +50,16 @@
     HbWidget(parent),
     mContent(0),
     mBackgroundItem(0),
-    contentPressed(false),
-    gestureFilter(0),
-    gestureLongpressed(0)
+    contentPressed(false)
+  
 {
     groupBox = qgraphicsitem_cast<HbGroupBox*>( parent );
 
     createPrimitives();
-    createConnection();    
+    createConnection();   
+#ifdef HB_GESTURE_FW
+    grabGesture(Qt::TapGesture);
+#endif 
 }
 
 /*
@@ -61,9 +69,6 @@
 */
 HbGroupBoxContentWidget::~HbGroupBoxContentWidget()
 {
-    if( gestureFilter ) {
-        removeSceneEventFilter( gestureFilter );
-    }
 }
 
 /*
@@ -101,20 +106,12 @@
 */
 void HbGroupBoxContentWidget::createConnection()
 {
-    // Create gesture filter
-    gestureFilter = new HbGestureSceneFilter( Qt::LeftButton, this );
-    // Add gestures for longpress
-    gestureLongpressed = new HbGesture( HbGesture::longpress,5 );
-    gestureFilter->addGesture( gestureLongpressed );
-
-    installSceneEventFilter( gestureFilter );
-
     // to avoid duplicate signals getting emitted from groupBox contentWidget
     disconnect( this , SIGNAL ( clicked() ) , groupBox , SIGNAL ( clicked() ));
-    disconnect ( gestureLongpressed , SIGNAL( longPress( QPointF ) ) , groupBox , SIGNAL( longPress( QPointF ) ));
+    disconnect ( this , SIGNAL( longPress( QPointF ) ) , groupBox , SIGNAL( longPress( QPointF ) ));
 
     connect ( this , SIGNAL ( clicked() ) , groupBox , SIGNAL ( clicked() ));
-    connect ( gestureLongpressed , SIGNAL( longPress( QPointF ) ) , groupBox , SIGNAL( longPress( QPointF ) ));
+    connect ( this , SIGNAL( longPress( QPointF ) ) , groupBox , SIGNAL( longPress( QPointF ) ));
 }
 
 /*!
@@ -216,24 +213,37 @@
  */
 void HbGroupBoxContentWidget::mousePressEvent( QGraphicsSceneMouseEvent *event )
 {
+#ifdef HB_GESTURE_FW
+    Q_UNUSED(event)
+#else 
     HbWidget::mousePressEvent(event);
 
+    HbWidgetFeedback::triggered(this, Hb::InstantPressed);
+
     contentPressed=!contentPressed;
     updatePrimitives();
     event->accept(); 
+#endif 
 }
-
 /*!
     \reimp
  */
 void HbGroupBoxContentWidget::mouseReleaseEvent( QGraphicsSceneMouseEvent *event )
 {
+#ifdef HB_GESTURE_FW
+    Q_UNUSED(event)
+#else 
+
     HbWidget::mouseReleaseEvent(event);
 
+    HbWidgetFeedback::triggered(this, Hb::InstantReleased);
+
     contentPressed=!contentPressed;    
     updatePrimitives();
     
     emit clicked();
+#endif 
+
 }
 
 /*!
@@ -255,3 +265,38 @@
 }
 
 
+
+#ifdef HB_GESTURE_FW
+void HbGroupBoxContentWidget::gestureEvent(QGestureEvent *event)
+{
+    if(HbTapGesture *tap = qobject_cast<HbTapGesture *>(event->gesture(Qt::TapGesture))) {
+        switch(tap->state()) {
+        case Qt::GestureStarted:  //
+            contentPressed=true;
+            updatePrimitives();
+            break;
+        case Qt::GestureCanceled: // Reset state
+            contentPressed=false;
+            updatePrimitives();
+            break;
+        case Qt::GestureUpdated:
+            if(tap->tapStyleHint() == HbTapGesture::TapAndHold) {
+                emit longPress(event->mapToGraphicsScene(tap->position()));
+            }
+            break;
+        case Qt::GestureFinished: // emit clicked
+            contentPressed=false;
+            updatePrimitives();
+            if(tap->tapStyleHint() == HbTapGesture::Tap) {
+                emit clicked();
+            }
+            break;
+        default:
+            break;
+        }
+    } 
+}
+#endif 
+
+
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/widgets/hbgroupboxcontentwidget_p.h
--- a/src/hbwidgets/widgets/hbgroupboxcontentwidget_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/widgets/hbgroupboxcontentwidget_p.h	Mon May 03 12:48:33 2010 +0300
@@ -33,6 +33,7 @@
 
 class HbGestureSceneFilter;
 class HbGesture;
+class QGestureEvent;
 
 class HB_AUTOTEST_EXPORT HbGroupBoxContentWidget : public HbWidget
 {
@@ -56,6 +57,7 @@
 
 signals:
     void clicked();
+    void longPress(QPointF point);
 
 protected:
     void initStyleOption( HbStyleOption *option ) const;
@@ -63,6 +65,9 @@
     void mousePressEvent( QGraphicsSceneMouseEvent *event );
     void mouseReleaseEvent( QGraphicsSceneMouseEvent *event );
     void polish( HbStyleParameters& params );
+#ifdef HB_GESTURE_FW
+    void gestureEvent(QGestureEvent *event);
+#endif 
 
 public:
     HbWidget *mContent;
@@ -70,8 +75,6 @@
 
     GroupBoxType groupBoxType;
     bool contentPressed;            
-    HbGestureSceneFilter *gestureFilter;
-    HbGesture *gestureLongpressed;
     HbGroupBox *groupBox;
 };
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/widgets/hbgroupboxheadingwidget_p.cpp
--- a/src/hbwidgets/widgets/hbgroupboxheadingwidget_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/widgets/hbgroupboxheadingwidget_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -33,6 +33,10 @@
 #include "hbeffectinternal_p.h"
 #define HB_GROUPBOX_HEADING_TYPE "HB_GROUPBOX_HEADING"
 #endif
+#ifdef HB_GESTURE_FW
+#include <hbtapgesture.h>
+#include <QGesture>
+#endif 
 
 #include <QGraphicsSceneMouseEvent>
 
@@ -75,11 +79,15 @@
 */
 void HbGroupBoxHeadingWidget::init()
 {
+
     createPrimitives();
 	
     if(groupBoxType == GroupBoxCollapsingContainer){
         createConnection();    
     }
+#ifdef HB_GESTURE_FW
+    grabGesture(Qt::TapGesture);
+#endif 
 }
 
 /*
@@ -224,6 +232,10 @@
 }
 
 /*!
+
+    \deprecated HbGroupBoxHeadingWidget::primitive(HbStyle::Primitive)
+        is deprecated.
+
     Returns the pointer for \a primitive passed.
     Will return NULL if \a primitive passed is invalid
 */
@@ -306,13 +318,16 @@
  */
 void HbGroupBoxHeadingWidget::mousePressEvent(QGraphicsSceneMouseEvent *event)
 {
+#ifdef HB_GESTURE_FW
+    Q_UNUSED(event)
+#else 
     HbWidget::mousePressEvent( event );
     if ( !collapsable ){
         event->ignore();
         return;
     }
 
-    if (collapsable) {
+    if (groupBoxType == GroupBoxCollapsingContainer) {
         HbWidgetFeedback::triggered(this, Hb::InstantPressed, Hb::ModifierCollapsedItem);
     }
     else {
@@ -328,6 +343,7 @@
     style()->updatePrimitive( mBackgroundItem , HbStyle::P_GroupBoxHeading_background , &groupBoxOption );
 
     setProperty("state", "pressed");
+#endif  
 }
 
 /*!
@@ -335,9 +351,12 @@
  */
 void HbGroupBoxHeadingWidget::mouseReleaseEvent( QGraphicsSceneMouseEvent *event )
 {
+#ifdef HB_GESTURE_FW
+    Q_UNUSED(event)
+#else 
     HbWidget::mouseReleaseEvent( event );
 
-    if (collapsable) {
+    if (groupBoxType == GroupBoxCollapsingContainer) {
         HbWidgetFeedback::triggered(this, Hb::InstantReleased, Hb::ModifierCollapsedItem);
     }
     else {
@@ -360,5 +379,80 @@
     style()->updatePrimitive( mBackgroundItem , HbStyle::P_GroupBoxHeading_background , &groupBoxOption );
 
     setProperty("state", "normal");
+#endif 
 }
 
+#ifdef HB_GESTURE_FW
+void HbGroupBoxHeadingWidget::gestureEvent(QGestureEvent *event)
+{
+    if(HbTapGesture *tap = qobject_cast<HbTapGesture *>(event->gesture(Qt::TapGesture))) {
+        switch(tap->state()) {
+        case Qt::GestureStarted:  //
+            {
+                if ( !collapsable ){
+                    event->ignore(tap);
+                    return;
+                }
+                if (collapsable) {
+                    HbWidgetFeedback::triggered(this, Hb::InstantPressed, Hb::ModifierCollapsedItem);
+                }
+                else {
+                    HbWidgetFeedback::triggered(this, Hb::InstantPressed);
+                }
+
+                // background primitive updation, upon mouse press
+                headingPressed = true;
+
+                HbStyleOptionGroupBox groupBoxOption;
+                initStyleOption(&groupBoxOption);
+                style()->updatePrimitive( mBackgroundItem , HbStyle::P_GroupBoxHeading_background , &groupBoxOption );
+
+                setProperty("state", "pressed");
+            }
+
+            break;
+        case Qt::GestureCanceled: // Reset state
+            {
+                headingPressed = false;
+
+                HbStyleOptionGroupBox groupBoxOption;
+                initStyleOption(&groupBoxOption);
+                style()->updatePrimitive( mBackgroundItem , HbStyle::P_GroupBoxHeading_background , &groupBoxOption );
+
+                setProperty("state", "normal");
+                break;
+            }
+        case Qt::GestureFinished: // emit clicked
+            {
+                if (collapsable) {
+                    HbWidgetFeedback::triggered(this, Hb::InstantReleased, Hb::ModifierCollapsedItem);
+                } else {
+                    HbWidgetFeedback::triggered(this, Hb::InstantReleased);
+                }
+
+                if ( this->isUnderMouse() ) {
+                    if ( mIconItem && mIconItem->isUnderMouse() ) {
+#ifdef HB_EFFECTS
+                        HbEffect::start( mIconItem, HB_GROUPBOX_HEADING_TYPE, "iconclick");
+#endif
+                    }
+                    emit clicked(!collapsed);
+                }
+                // background primitive updation, upon mouse release
+                headingPressed = false;
+
+                HbStyleOptionGroupBox groupBoxOption;
+                initStyleOption(&groupBoxOption);
+                style()->updatePrimitive( mBackgroundItem , HbStyle::P_GroupBoxHeading_background , &groupBoxOption );
+
+                setProperty("state", "normal");
+            }
+            break;
+        default:
+            break;
+        }
+    }
+}
+#endif 
+
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/widgets/hbgroupboxheadingwidget_p.h
--- a/src/hbwidgets/widgets/hbgroupboxheadingwidget_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/widgets/hbgroupboxheadingwidget_p.h	Mon May 03 12:48:33 2010 +0300
@@ -32,6 +32,8 @@
 #include "hbgroupbox_p.h"
 
 class HbStyleOptionGroupBox;
+class QGestureEvent;
+
 
 class HB_AUTOTEST_EXPORT HbGroupBoxHeadingWidget : public HbWidget
 {
@@ -76,6 +78,9 @@
     QVariant itemChange(GraphicsItemChange change, const QVariant &value);
     void mousePressEvent(QGraphicsSceneMouseEvent *event);
     void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
+#ifdef HB_GESTURE_FW
+    void gestureEvent(QGestureEvent *event);
+#endif 
 };
 
 #endif // HBGROUPBOXHEADINGWIDGET_H
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/widgets/hblabel.cpp
--- a/src/hbwidgets/widgets/hblabel.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/widgets/hblabel.cpp	Mon May 03 12:48:33 2010 +0300
@@ -494,6 +494,10 @@
 }
 
 /*!
+
+    \deprecated HbLabel::primitive(HbStyle::Primitive)
+        is deprecated.
+
     Returns a pointer to the QGraphicsItem primitive used by this label.
     \param primitive - the type of graphics primitive required.
     HbLabel supports HbStyle::P_Label_text and HbStyle::P_Label_icon.
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/widgets/hbpushbutton.cpp
--- a/src/hbwidgets/widgets/hbpushbutton.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/widgets/hbpushbutton.cpp	Mon May 03 12:48:33 2010 +0300
@@ -27,8 +27,6 @@
 #include "hbpushbutton_p.h"
 #include "hbstyle.h"
 #include "hbstyleoptionpushbutton.h"
-#include "hbgesturefilter.h"
-#include "hbgesture.h"
 #include "hbframedrawerpool_p.h"
 #include "hbnamespace.h"
 #ifdef HB_EFFECTS
@@ -36,6 +34,10 @@
 #include "hbeffectinternal_p.h"
 #endif
 
+#ifdef HB_GESTURE_FW
+#include <hbtapgesture.h>
+#endif
+
 #include <QGraphicsSceneMouseEvent>
 #include <QTimer>
 #include <QGraphicsItem>
@@ -133,8 +135,6 @@
     focusItem(0),
     orientation(Qt::Vertical),
     backgroundFrameDrawer(0),
-    gestureFilter(0),
-    gestureLongpressed(0),
     longPressTimer(0),
     textAlignment(Qt::AlignHCenter | Qt::AlignVCenter ),
     additionalTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter ),
@@ -155,10 +155,7 @@
  */
 HbPushButtonPrivate::~HbPushButtonPrivate()
 {
-    if(gestureFilter){
-        delete gestureFilter;
-        gestureFilter = NULL;
-    }
+
 }
 
 /*
@@ -205,6 +202,12 @@
 
     if( !touchArea ) {
         touchArea = q->style()->createPrimitive( HbStyle::P_PushButton_toucharea, q );
+        if(QGraphicsObject *ta = qgraphicsitem_cast<QGraphicsObject*>(touchArea)) {
+            ta->grabGesture(Qt::TapGesture);
+            q->ungrabGesture(Qt::TapGesture);
+        } else {
+            q->grabGesture(Qt::TapGesture);
+        }
     }
 
     if( !focusItem ) {
@@ -215,28 +218,7 @@
     }
 }
 
-/*
-  initGesture.
- */
-void HbPushButtonPrivate::initGesture()
-{
-    Q_Q(HbPushButton);
-    // Create gesture filter
-    gestureFilter = new HbGestureSceneFilter( Qt::LeftButton, q );
-    // Add gestures for longpress
-    gestureLongpressed = new HbGesture( HbGesture::longpress,5 );
-    gestureFilter->addGesture( gestureLongpressed );
 
-    // scene event filter for gesture can be installed
-    // if widget is already added to scene
-    if (q->scene()) {
-        q->installSceneEventFilter(gestureFilter);
-        if (touchArea) {
-            touchArea->installSceneEventFilter(gestureFilter);
-        }
-    }
-
-}
 
 void HbPushButtonPrivate::_q_handleLongPress(QPointF point)
 {
@@ -261,8 +243,6 @@
     Q_Q(HbPushButton);
     q_ptr = q;
     createPrimitives();
-    initGesture();
-
 }
 
 /*!
@@ -274,8 +254,7 @@
 {
     Q_D(HbPushButton);
     d->initialize();
-    connect( d->gestureLongpressed, SIGNAL(longPress(QPointF)),
-        this, SLOT(_q_handleLongPress(QPointF)));
+
     setProperty("state", "normal");
      
 }
@@ -290,8 +269,7 @@
     Q_D(HbPushButton);
     d->text = text;
     d->initialize();
-    connect( d->gestureLongpressed, SIGNAL(longPress(QPointF)),
-        this, SLOT(_q_handleLongPress(QPointF)) );
+
     setProperty("state", "normal");
      
 
@@ -308,8 +286,7 @@
     d->icon = icon;
     d->text = text;
     d->initialize();
-    connect( d->gestureLongpressed, SIGNAL(longPress(QPointF)),
-        this, SLOT(_q_handleLongPress(QPointF)) );
+
     setProperty("state", "normal");
 
 }
@@ -328,8 +305,7 @@
     d->text = text;
     d->initialize();
     d->orientation = orientation;
-    connect( d->gestureLongpressed, SIGNAL(longPress(QPointF)),
-        this, SLOT(_q_handleLongPress(QPointF)) );
+
     setProperty("state", "normal");
             
 }
@@ -339,10 +315,7 @@
  */
 HbPushButton::~HbPushButton()
 {
-    Q_D(HbPushButton);
-    if( d->gestureFilter ) {
-        removeSceneEventFilter( d->gestureFilter );
-    }
+
 }
 
 /*!
@@ -685,6 +658,10 @@
 }
 
 /*!
+
+    \deprecated HbPushButton::primitive(HbStyle::Primitive)
+        is deprecated.
+
     \reimp
  */
 QGraphicsItem* HbPushButton::primitive( HbStyle::Primitive primitive ) const
@@ -771,10 +748,6 @@
 HbPushButton::HbPushButton(HbPushButtonPrivate &dd, QGraphicsItem * parent) :
     HbAbstractButton(dd, parent)
 {
-    Q_D(HbPushButton);
-    d->initGesture();
-    connect( d->gestureLongpressed, SIGNAL(longPress(QPointF)),
-        this, SLOT(_q_handleLongPress(QPointF)) );
 }
 
 /*!
@@ -876,6 +849,7 @@
  */
 void HbPushButton::mousePressEvent( QGraphicsSceneMouseEvent *event )
 {
+#ifndef HB_GESTURE_FW
     Q_D(HbPushButton);
     HbAbstractButton::mousePressEvent(event);
     HbStyleOptionPushButton buttonOption;
@@ -889,8 +863,12 @@
     }
 #endif
     setProperty("state", "pressed");    
+#else
+    Q_UNUSED(event)
+#endif
 }
 
+#ifndef HB_GESTURE_FW
 /*!
     \reimp
  */
@@ -924,11 +902,61 @@
         style()->updatePrimitive( d->frameItem, HbStyle::P_PushButton_background, &buttonOption );
     }
     if (d->down) {
-        setProperty("state", "pressed"); 
+        setProperty("state", "pressed");
     } else {
-        setProperty("state", "normal"); 
+        setProperty("state", "normal");
     }
 }
+#endif
+
+
+#ifdef HB_GESTURE_FW
+void HbPushButton::gestureEvent(QGestureEvent *event)
+{
+    Q_D(HbPushButton);
+    if(HbTapGesture *tap = qobject_cast<HbTapGesture *>(event->gesture(Qt::TapGesture))) {
+        switch(tap->state()) {
+        case Qt::GestureStarted:{
+#ifdef HB_EFFECTS
+                HbEffect::start( this, HB_PUSHBUTTON_TYPE, "pressed" );
+#endif
+                if(d->checkable && !d->checked){
+                    setProperty("state", "latched");
+                }else if(!d->checkable){
+                    setProperty("state", "pressed");
+                }
+            }
+            break;
+        case Qt::GestureUpdated:
+            if(tap->tapStyleHint() == HbTapGesture::TapAndHold) {
+                d->longPress = true;
+                emit longPress(event->mapToGraphicsScene(tap->position()));
+            }
+            break;
+        case Qt::GestureCanceled:
+            setProperty("state", "normal");
+            break;
+        case Qt::GestureFinished:{
+#ifdef HB_EFFECTS
+                HbEffect::start( this, HB_PUSHBUTTON_TYPE, "released" );
+#endif
+                if( d->checkable && !d->checked){
+                    setProperty("state", "latched");
+                }else {                    
+                    setProperty("state", "normal");
+                }
+
+            }
+            break;
+        default:
+            break;
+        }
+    }
+
+    HbAbstractButton::gestureEvent(event);
+
+}
+#endif
 
 
 /*!
@@ -992,8 +1020,6 @@
  */
 QVariant HbPushButton::itemChange(GraphicsItemChange change, const QVariant &value)
 {
-    Q_D(HbPushButton);
-
     switch ( change ) {
         case ItemEnabledHasChanged:
         case ItemVisibleChange: {
@@ -1001,14 +1027,6 @@
             }
             break;
         case ItemSceneHasChanged: {
-                // scene event filter for gestures can be installed
-                // once the widget has been added to the scene
-                if(!value.isNull() && d->gestureFilter) {
-                    installSceneEventFilter(d->gestureFilter);
-                    if (d->touchArea) {
-                        d->touchArea->installSceneEventFilter(d->gestureFilter);
-                    }
-                }
                 updatePrimitives();
             }
             break;
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/widgets/hbpushbutton.h
--- a/src/hbwidgets/widgets/hbpushbutton.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/widgets/hbpushbutton.h	Mon May 03 12:48:33 2010 +0300
@@ -99,10 +99,14 @@
 
     void keyPressEvent( QKeyEvent *event );
     void keyReleaseEvent( QKeyEvent *event );
-
     void mousePressEvent( QGraphicsSceneMouseEvent *event );
+#ifndef HB_GESTURE_FW
     void mouseReleaseEvent( QGraphicsSceneMouseEvent *event );
     void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
+#endif
+
+    void gestureEvent(QGestureEvent *event);
+
     void resizeEvent( QGraphicsSceneResizeEvent *event );
     virtual void polish( HbStyleParameters& params );
 
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/widgets/hbpushbutton_p.h
--- a/src/hbwidgets/widgets/hbpushbutton_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/widgets/hbpushbutton_p.h	Mon May 03 12:48:33 2010 +0300
@@ -47,8 +47,6 @@
 class QGraphicsItem;
 QT_END_NAMESPACE
 
-class HbGestureSceneFilter;
-class HbGesture;
 class HbFrameDrawer;
 class QGraphicsItem;
 
@@ -61,7 +59,6 @@
     virtual ~HbPushButtonPrivate();
 
     void createPrimitives();
-    void initGesture();
     void initialize();
     void _q_handleLongPress(QPointF point);
     void _q_handleLongKeyPress( );
@@ -79,8 +76,6 @@
     HbIcon background;
     Qt::Orientation orientation;
     HbFrameDrawer *backgroundFrameDrawer;
-    HbGestureSceneFilter *gestureFilter;
-    HbGesture *gestureLongpressed;
     QTimer *longPressTimer;
     Qt::Alignment textAlignment;
     Qt::Alignment additionalTextAlignment;
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/widgets/hbsearchpanel.cpp
--- a/src/hbwidgets/widgets/hbsearchpanel.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/widgets/hbsearchpanel.cpp	Mon May 03 12:48:33 2010 +0300
@@ -25,6 +25,7 @@
 
 #include "hbsearchpanel.h"
 #include "hbsearchpanel_p.h"
+#include "hblineedit.h"
 
 
 /*!
@@ -128,15 +129,48 @@
 {
     Q_D( HbSearchPanel );
 
-    if( progressive && !isProgressive( ) ) {
-        d->removeProgressButton();
-    }
-    else if ( !progressive && isProgressive( ) ) {
-        d->addProgressButton();
+    if( progressive != isProgressive( ) ) {
+        if(progressive) {
+            d->removeProgressButton();
+        } else {
+            d->addProgressButton();
+        }
     }
 }
 
 /*!
+    \property HbSearchPanel::cancelEnabled
+    True, there is a cancel button in the search panel.
+    False, there is not a cancel button in the search panel.
+
+    \sa setCancelEnabled
+ */
+bool HbSearchPanel::isCancelEnabled( ) const
+{
+    Q_D( const HbSearchPanel );
+    return d->mCancelEnabled;
+}
+
+/*!
+    Set cancelEnabled property of the search panel. Parameter \a enabled is the new value of the
+    property.
+
+    \sa isCancelEnabled
+ */
+void HbSearchPanel::setCancelEnabled( bool enabled )
+{
+    Q_D( HbSearchPanel );
+    if( enabled != isCancelEnabled( ) ) {
+        if(enabled) {
+            d->addCancelButton();
+        } else {
+            d->removeCancelButton();
+        }
+    }
+}
+
+
+/*!
     \property HbSearchPanel::searchOptions
     True, there is a search options button in the search panel.
     False, there is not a search options button in the search panel.
@@ -158,11 +192,62 @@
 void HbSearchPanel::setSearchOptionsEnabled( bool enabled )
 {
     Q_D( HbSearchPanel );
-    if( enabled && !isSearchOptionsEnabled( ) ) {
-        d->addSearchOptionsButton();
-    }
-    else if ( !enabled && isSearchOptionsEnabled( ) ) {
-        d->removeSearchOptionsButton();
+    if( enabled != isSearchOptionsEnabled( ) ) {
+        if(enabled) {
+            d->addSearchOptionsButton();
+        } else {
+            d->removeSearchOptionsButton();
+        }
     }
 }
 
+
+/*!
+    \property HbSearchPanel::placeholderText
+    \brief the search panel's placeholder text
+
+    Setting this property makes the editor in search panel display a grayed-out
+    placeholder text as long as the criteria() is empty.
+    By default, this property contains an empty string.
+
+    \sa criteria()
+*/
+
+QString HbSearchPanel::placeholderText() const
+{
+    Q_D(const HbSearchPanel);
+    return d->mLineEdit->placeholderText();
+}
+
+/*!
+    \sa placeholderText()
+*/
+void HbSearchPanel::setPlaceholderText(const QString &text)
+{
+    Q_D(HbSearchPanel);
+    d->mLineEdit->setPlaceholderText(text);
+}
+
+/*!
+    Returns the search criteria.
+
+    \sa setCriteria()
+*/
+QString HbSearchPanel::criteria() const
+{
+    Q_D(const HbSearchPanel);
+    return d->mLineEdit->text();
+}
+
+/*!
+    Sets the search criteria to the search panel.
+
+    \sa criteria()
+*/
+void HbSearchPanel::setCriteria(const QString &text)
+{
+    Q_D(HbSearchPanel);
+    d->mLineEdit->setText(text);
+}
+
+
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/widgets/hbsearchpanel.h
--- a/src/hbwidgets/widgets/hbsearchpanel.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/widgets/hbsearchpanel.h	Mon May 03 12:48:33 2010 +0300
@@ -36,6 +36,9 @@
 
     Q_PROPERTY( bool progressive READ isProgressive WRITE setProgressive )
     Q_PROPERTY( bool searchOptions READ isSearchOptionsEnabled WRITE setSearchOptionsEnabled )
+    Q_PROPERTY( bool cancel READ isCancelEnabled WRITE setCancelEnabled )
+    Q_PROPERTY(QString criteria READ criteria WRITE setCriteria USER true)
+    Q_PROPERTY(QString placeholderText READ placeholderText WRITE setPlaceholderText)
 
 public:
     explicit HbSearchPanel(QGraphicsItem *parent = 0);
@@ -47,6 +50,16 @@
     void setSearchOptionsEnabled(bool enabled);
     bool isSearchOptionsEnabled() const;
 
+    void setCancelEnabled(bool enabled);
+    bool isCancelEnabled() const;
+
+    QString placeholderText() const;
+    void setPlaceholderText(const QString &text);
+
+    QString criteria() const;
+    void setCriteria(const QString &text);
+
+
 signals:
     void searchOptionsClicked();
     void criteriaChanged(const QString &criteria);
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/widgets/hbsearchpanel_p.cpp
--- a/src/hbwidgets/widgets/hbsearchpanel_p.cpp	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/widgets/hbsearchpanel_p.cpp	Mon May 03 12:48:33 2010 +0300
@@ -47,6 +47,7 @@
     HbWidgetPrivate (  ),
     mProgressive ( true ),
     mSearchOptions ( false ),
+    mCancelEnabled(true),
     mSearchOptionsButton(0),
     mLineEdit(0),
     mProgressButton(0),
@@ -68,7 +69,6 @@
     q->setFlag(QGraphicsItem::ItemIsFocusable);
 
     // connect initial state signals
-    QObject::connect(mCancelButton, SIGNAL(clicked()), q, SLOT(_q_hideClicked()));
     QObject::connect(mLineEdit, SIGNAL(textChanged(QString)), q, SIGNAL(criteriaChanged(QString)));
 
 }
@@ -127,6 +127,31 @@
     q->repolish();
 }
 
+void HbSearchPanelPrivate::addCancelButton()
+{
+    Q_Q( HbSearchPanel );
+    mCancelEnabled = true;
+    mCancelButton = new HbPushButton(q);
+    mCancelButton->setObjectName("cancelbutton");
+    mCancelButton->setIcon(HbIcon(cancelIcon));
+    mCancelButton->setFlag(QGraphicsItem::ItemIsPanel, true);
+    mCancelButton->setActive(false);
+    HbStyle::setItemName( mCancelButton, "cancelbutton" );
+    QObject::connect(mCancelButton, SIGNAL(clicked()), q, SLOT(_q_hideClicked()));
+    q->repolish();
+}
+
+void HbSearchPanelPrivate::removeCancelButton()
+{
+    Q_Q( HbSearchPanel );
+    mCancelEnabled = false;
+    HbStyle::setItemName( mCancelButton, "" );
+    mCancelButton->deleteLater();
+    mCancelButton = 0;
+    q->repolish();
+}
+
+
 void HbSearchPanelPrivate::constructUi()
 {
     Q_Q( HbSearchPanel );
@@ -134,17 +159,10 @@
     //construct default ui.
     mLineEdit = new HbLineEdit(q);
     mLineEdit->setObjectName("lineedit");
-    mLineEdit->setFontSpec(HbFontSpec(HbFontSpec::Secondary));
     HbStyle::setItemName( mLineEdit, "lineedit" );
-	
-    mCancelButton = new HbPushButton(q);
-    mCancelButton->setObjectName("cancelbutton");
-    mCancelButton->setIcon(cancelIcon);
-#if QT_VERSION >= 0x040600
-    mCancelButton->setFlag(QGraphicsItem::ItemIsPanel, true);
-    mCancelButton->setActive(false);
-#endif
-    HbStyle::setItemName( mCancelButton, "cancelbutton" );
+    if(mCancelEnabled) {
+        addCancelButton();
+    }
 }
 
 void HbSearchPanelPrivate::_q_hideClicked()
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/widgets/hbsearchpanel_p.h
--- a/src/hbwidgets/widgets/hbsearchpanel_p.h	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/widgets/hbsearchpanel_p.h	Mon May 03 12:48:33 2010 +0300
@@ -51,11 +51,15 @@
     void addProgressButton();
     void removeProgressButton();
 
+    void addCancelButton();
+    void removeCancelButton();
+
     void constructUi();
 
 public:
     bool mProgressive;
     bool mSearchOptions;
+    bool mCancelEnabled;
     HbPushButton *mSearchOptionsButton;
     HbLineEdit *mLineEdit;
     HbPushButton *mProgressButton;
diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/widgets/widgets.pri
--- a/src/hbwidgets/widgets/widgets.pri	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbwidgets/widgets/widgets.pri	Mon May 03 12:48:33 2010 +0300
@@ -37,14 +37,14 @@
 PUBLIC_HEADERS += $$PWD/hbtransparentwindow.h
 PUBLIC_HEADERS += $$PWD/hbdatetimepicker.h
 
-INTERNAL_HEADERS += $$PWD/hbcombobox_p.h
-INTERNAL_HEADERS += $$PWD/hbgroupbox_p.h
-INTERNAL_HEADERS += $$PWD/hbgroupboxheadingwidget_p.h
-INTERNAL_HEADERS += $$PWD/hbgroupboxcontentwidget_p.h
-INTERNAL_HEADERS += $$PWD/hbpushbutton_p.h
-INTERNAL_HEADERS += $$PWD/hbsearchpanel_p.h
-INTERNAL_HEADERS += $$PWD/hbdatetimepicker_p.h
-INTERNAL_HEADERS += $$PWD/hbcombodropdown_p.h
+PRIVATE_HEADERS += $$PWD/hbcombobox_p.h
+PRIVATE_HEADERS += $$PWD/hbgroupbox_p.h
+PRIVATE_HEADERS += $$PWD/hbgroupboxheadingwidget_p.h
+PRIVATE_HEADERS += $$PWD/hbgroupboxcontentwidget_p.h
+PRIVATE_HEADERS += $$PWD/hbpushbutton_p.h
+PRIVATE_HEADERS += $$PWD/hbsearchpanel_p.h
+PRIVATE_HEADERS += $$PWD/hbdatetimepicker_p.h
+PRIVATE_HEADERS += $$PWD/hbcombodropdown_p.h
 SOURCES += $$PWD/hbcheckbox.cpp
 SOURCES += $$PWD/hbcombodropdown_p.cpp
 SOURCES += $$PWD/hbcombobox.cpp
diff -r 16d8024aca5e -r f7ac710697a9 tsrc/resources/mywidget/mywidget.qrc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tsrc/resources/mywidget/mywidget.qrc	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/themes/style/hbdefault/rules/widgets/mywidget/">
+        <file>mywidget_color.css</file>
+    </qresource>
+</RCC>
diff -r 16d8024aca5e -r f7ac710697a9 tsrc/resources/mywidget/mywidget_color.css
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tsrc/resources/mywidget/mywidget_color.css	Mon May 03 12:48:33 2010 +0300
@@ -0,0 +1,14 @@
+MyWidget::text_1
+{
+color:var(testforeground_focused);
+}
+
+MyWidget[pressed]
+{
+background:var(my_widget_background_pressed);
+}
+
+MyWidget[!pressed]
+{
+background:var(my_widget_background_notpressed);
+}