--- a/mpxplugins/viewplugins/views/collectionviewhg/src/mpxcollectionviewhglistboxarray.cpp	Wed Jun 09 09:38:28 2010 +0300
+++ b/mpxplugins/viewplugins/views/collectionviewhg/src/mpxcollectionviewhglistboxarray.cpp	Mon Jun 21 15:37:19 2010 +0300
@@ -383,33 +383,27 @@
         flags = entry->ValueTObjectL<TUint>( KMPXMediaGeneralFlags );
         }
 
-    // reorder icon
-    if ( ( iReorder ) && ( aIndex == iMovedIndex ) )
+  
+    // All icons should also be visible even in reorder mode.
+    // playback status icon
+    if ( iIndex == index )
         {
-        iconIndices.Append( GetReorderIcon() );
-        }
-    else if ( !iReorderActivated )
-        {
-        // playback status icon
-        if ( iIndex == index )
+        switch ( iPbState )
             {
-            switch ( iPbState )
+            case EPbStatePlaying:
                 {
-                case EPbStatePlaying:
-                    {
-                    iconIndices.Append( EMPXClvIconPlay );
-                    break;
-                    }
-                case EPbStatePaused:
-                    {
-                    iconIndices.Append( EMPXClvIconPause );
-                    break;
-                    }
-                default:
-                    {
-                    // other playback states, not handled
-                    break;
-                    }
+                iconIndices.Append( EMPXClvIconPlay );
+                break;
+                }
+            case EPbStatePaused:
+                {
+                iconIndices.Append( EMPXClvIconPause );
+                break;
+                }
+            default:
+                {
+                // other playback states, not handled
+                break;
                 }
             }
         }
@@ -1056,51 +1050,40 @@
         ptr.Format( KMPXCommonListboxFormatString, iconID, &title );
 
         iconID = EMPXClvIconNone;
-        // reorder icon
-        if ( ( iReorder ) && ( aIndex == iMovedIndex ) )
+        // All icons should also be visible even in reorder mode. 
+        // playback status icon
+        if ( iIndex == index )
             {
-            iconID = GetReorderIcon();
-            }
-        else if ( !iReorderActivated )
-            {
-            // playback status icon
-            if ( iIndex == index )
+            switch ( iPbState )
                 {
-                switch ( iPbState )
+                case EPbStatePlaying:
+                    {
+                    iconID = EMPXClvIconPlay;
+                    break;
+                    }
+                case EPbStatePaused:
                     {
-                    case EPbStatePlaying:
-                        {
-                        iconID = EMPXClvIconPlay;
-                        break;
-                        }
-                    case EPbStatePaused:
-                        {
-                        iconID = EMPXClvIconPause;
-                        break;
-                        }
-                    case EPbStateSeekingForward:
-                        {
-                        iconID = EMPXClvIconForward;
-                        break;
-                        }
-                    case EPbStateSeekingBackward:
-                        {
-                        iconID = EMPXClvIconRewind;
-                        break;
-                        }
-                    default:
-                        {
-                        // other playback states, not handled
-                        break;
-                        }
+                    iconID = EMPXClvIconPause;
+                    break;
+                    }
+                case EPbStateSeekingForward:
+                    {
+                    iconID = EMPXClvIconForward;
+                    break;
+                    }
+                case EPbStateSeekingBackward:
+                    {
+                    iconID = EMPXClvIconRewind;
+                    break;
+                    }
+                default:
+                    {
+                    // other playback states, not handled
+                    break;
                     }
                 }
             }
-        else
-            {
-            // Do nothing
-            }
-
+       
         if ( iconID != EMPXClvIconNone )
             {
             ptr.Append( KMPXTab );