Merge "Fixing regression in shop icon and widget pane."