--- a/homescreenapp/widgetplugins/hsshortcutwidgetplugin/src/hsshortcutwidget.cpp	Fri Jun 11 13:30:16 2010 +0300
+++ b/homescreenapp/widgetplugins/hsshortcutwidgetplugin/src/hsshortcutwidget.cpp	Wed Jun 23 18:03:36 2010 +0300
@@ -232,7 +232,7 @@
         return;
     }
 
-    HbInstantFeedback::play(HsConfiguration::shortcutWidgetTapFeedbackType());
+    HbInstantFeedback::play(HSCONFIGURATION_GET(shortcutWidgetTapFeedbackEffect));
     
     if (mCaEntryRole == ItemEntryRole) {
         CaService::instance()->executeCommand(mCaEntryId);
@@ -261,7 +261,7 @@
     }
 
     // Text
-    if ( HsConfiguration::shortcutLabelsVisible() && !mText ) {
+    if (HSCONFIGURATION_GET(isShortcutLabelVisible) && !mText ) {
         mText = new HbTextItem(this);
         HbStyle::setItemName(mText, QLatin1String("text"));
         }
@@ -283,8 +283,12 @@
     mCaEntryTypeName = caEntry.entryTypeName();
     mIcon->setIcon(caEntry.makeIcon());
     if (mText) {
-        mText->setText(caEntry.text());
-        }
+        if(caEntry.attribute(entryShortName()).length()) {
+            mText->setText(caEntry.attribute(entryShortName()));
+        } else {
+            mText->setText(caEntry.text());
+        }        
+    }
 }
 
 /*!
@@ -345,3 +349,4 @@
 }
 
 
+