A surface cleaning apparatus adapted for movement across a surface to be cleaned. The surface cleaning apparatus can dock within a storage tray and charge a power supply. Electrical contacts on the surface cleaning apparatus and the storage tray can be shielded when the surface cleaning apparatus is not docked within the storage tray. Furthermore, the storage tray can include a reservoir for a self-cleaning mode.