For photovoltaic (PV) systems to become fully integrated into networks, efficient and cost-effective energy storage systems must be utilized together with intelligent demand side management. As the global solar photovoltaic market grows beyond 76 GW, increasing onsite consumption of power generated by PV technology will become important to maintain electricity grid stability. This review paper provides the first detailed breakdown of all types of energy storage systems that can be integrated with PV encompassing electrical and thermal energy storage systems. The integration of PV-energy storage in smart buildings is discussed together with the role of energy storage for PV in the context of future energy storage developments.