Merge "Removing wallpapers tab, adding shop icon back."