Merge "Keep a mirror of the system icons while expanding the panel"