diff -r f3930dda3342 -r cd9e40a08dda musicwidgetplugin/resource/music_widget.docml
--- a/musicwidgetplugin/resource/music_widget.docml	Fri Sep 03 19:58:01 2010 -0500
+++ b/musicwidgetplugin/resource/music_widget.docml	Tue Sep 21 11:40:39 2010 -0500
@@ -1,21 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <hbdocument version="0.9">
     <widget name="containerWidget" type="HbWidget">
-        <widget name="shortcut_icon_background" type="HbLabel">
-            <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
-            <enums name="aspectRatioMode" value="IgnoreAspectRatio"/>
-            <real name="z" value="3"/>
-            <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
-            <sizehint height="12un" type="FIXED" width="12un"/>
-        </widget>
-        <widget name="shortcut_icon" type="HbPushButton">
-            <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
-            <!--  <icon iconName="qtg_large_music" name="icon" width="11un" height="11un"/>  -->
-            <enums name="aspectRatioMode" value="IgnoreAspectRatio"/>
-            <real name="z" value="4"/>
-            <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
-            <sizehint height="11un" type="FIXED" width="11un"/>
-        </widget>
         <widget name="widget_background_icon" type="HbLabel">
             <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
             <enums name="aspectRatioMode" value="IgnoreAspectRatio"/>
@@ -29,37 +14,29 @@
             <sizehint height="27.5un" type="FIXED" width="27.5un"/>
         </widget>
         <widget name="text_bg" type="HbLabel">
-            <real name="z" value="4"/>
-            <sizehint height="4.5un" type="PREFERRED" width="27.5un"/>
+            <real name="z" value="3"/>
+            <sizehint height="expr(var(hb-param-text-height-tiny)+2*var(hb-param-margin-gene-middle-vertical))" type="PREFERRED" width="27.5un"/>
         </widget>
-        <widget name="scrolling_text" type="HbLabel">
-            <real name="z" value="5"/>
+        <widget name="scrolling_text" type="HbMarqueeItem">
+            <real name="z" value="4"/>
             <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
-            <sizehint height="var(hb-param-text-height-tiny)" type="PREFERRED" width="26un"/>
+            <sizehint height="var(hb-param-text-height-tiny)" type="PREFERRED" width="expr(27.5un-2*var(hb-param-margin-gene-middle-horizontal))"/>
+            <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
             <string name="textColor" value="var(qtg_fr_multimedia_trans)"/>
-            <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
-        </widget>
+            </widget>
         <widget name="button_group_container" type="HbWidget">
             <widget name="btn_previous" type="HbPushButton">
                 <icon iconName="qtg_mono_previous" name="icon"/>            
-            		<sizepolicy horizontalPolicy="Preferred" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
-                <sizehint height="8un" type="PREFERRED" width="11un"/>                               
-                <string name="text"/>
             </widget>        
             <widget name="btn_play" type="HbPushButton">
-								<icon iconName="qtg_mono_play" name="icon"/>            
-            		<sizepolicy horizontalPolicy="Preferred" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
-                <sizehint height="8un" type="PREFERRED" width="11un"/>          
-                <string name="text"/>
+                <icon iconName="qtg_mono_play" name="icon"/>            
             </widget>
             <widget name="btn_next" type="HbPushButton">
                 <icon iconName="qtg_mono_next" name="icon"/>            
-            		<sizepolicy horizontalPolicy="Preferred" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
-                <sizehint height="8un" type="PREFERRED" width="11un"/>            
-                <string name="text"/>
             </widget>
-            <real name="z" value="5"/>
-            <sizehint height="8un" type="PREFERRED" width="33un"/>
+            <real name="z" value="4"/>
+            <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
+            <sizehint height="8un" type="FIXED" width="33un"/>
             <layout orientation="Horizontal" spacing="0un" type="linear">
                 <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
                 <linearitem itemname="btn_previous" spacing="0un"/>
@@ -68,22 +45,21 @@
             </layout>
         </widget>
         <real name="z" value="1"/>
-        <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
-        <sizehint height="38.25un" type="PREFERRED" width="33un"/>
+        <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
+        <sizehint height="expr(37un-var(hb-param-margin-gene-middle-vertical))" type="FIXED" width="33un"/>
         <layout type="anchor">
-            <anchoritem dst="shortcut_icon_background" dstEdge="RIGHT" spacing="0un" src="" srcEdge="RIGHT"/>
-            <anchoritem dst="shortcut_icon" dstEdge="RIGHT" spacing="-0.5un" src="" srcEdge="RIGHT"/>
-            <anchoritem dst="shortcut_icon" dstEdge="TOP" spacing="0.5un" src="" srcEdge="TOP"/>
             <anchoritem dst="widget_background_icon" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-right)" src="" srcEdge="RIGHT"/>
-            <anchoritem dst="widget_background_icon" dstEdge="TOP" spacing="var(hb-param-margin-gene-top)" src="" srcEdge="TOP"/>
+            <anchoritem dst="widget_background_icon" dstEdge="TOP" spacing="0un" src="" srcEdge="TOP"/>
             <anchoritem dst="album_art_image" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-middle-horizontal)" src="widget_background_icon" srcEdge="RIGHT"/>
             <anchoritem dst="album_art_image" dstEdge="TOP" spacing="var(hb-param-margin-gene-middle-vertical)" src="widget_background_icon" srcEdge="TOP"/>
             <anchoritem dst="text_bg" dstEdge="RIGHT" spacing="0un" src="album_art_image" srcEdge="RIGHT"/>
             <anchoritem dst="text_bg" dstEdge="BOTTOM" spacing="0un" src="album_art_image" srcEdge="BOTTOM"/>
             <anchoritem dst="scrolling_text" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-middle-horizontal)" src="text_bg" srcEdge="RIGHT"/>
             <anchoritem dst="scrolling_text" dstEdge="BOTTOM" spacing="-var(hb-param-margin-gene-middle-vertical)" src="text_bg" srcEdge="BOTTOM"/>
+            <anchoritem dst="scrolling_text" dstEdge="LEFT" spacing="var(hb-param-margin-gene-middle-horizontal)" src="text_bg" srcEdge="LEFT"/>
+            <anchoritem dst="scrolling_text" dstEdge="TOP" spacing="var(hb-param-margin-gene-middle-vertical)" src="text_bg" srcEdge="TOP"/>
             <anchoritem dst="button_group_container" dstEdge="LEFT" spacing="0un" src="" srcEdge="LEFT"/>
-            <anchoritem dst="button_group_container" dstEdge="TOP" spacing="0un" src="album_art_image" srcEdge="BOTTOM"/>
+            <anchoritem dst="button_group_container" dstEdge="TOP" spacing="0un" src="text_bg" srcEdge="BOTTOM"/>
         </layout>
     </widget>
     <metadata activeUIState="Common ui state" display="NHD portrait" unit="un">