merged layouts and added own icons