The self-assembly behavior of a light-sensitive azobenzene-based surfactant, both in pure surfactant solutions and in the presence of a hydrophobically modified, water-soluble polymer, has been investigated using small-angle neutron scattering (SANS), light scattering, and UV-vis absorption techniques. The surfactant undergoes reversible photo-isomerization upon exposure to the appropriate wavelength of light, with the trails form predominant under visible light being more hydrophobic than the cis isomer under UV-light. As a result, the trails form exhibits lower critical micelle concentration than does the cis Form of the surfactant, allowing photoreversible control of micelle formation. The SANS measurements reveal that micelle formation in pure surfactant solutions with the trails surfactant proceeds as commonly observed in traditional alkyl-based surfactants. Fully developed micelles were observed with aggregation numbers >50, whereas the micelle shapes are consistent with triaxial ellipsoids with axes R-a, R-b, and R-c approximately equal to 20, 30, and 30-35 angstrom, respectively. In contrast, with the surfactant in the cis conformation disk-shaped premicellar aggregates were observed at low surfactant concentrations with aggregation numbers <10, thicknesses of 6-10 angstrom, and radii of 10-20 angstrom whereas elevated cis-azo TAB concentrations eventually gave rise to fully developed micelles akin to the trails micelles. This stark difference between the self-assembly behavior of the two azobenzene isomers is ascribed to the different geometries of the surfactant in the trans (planar) and cis (bent) conformation. In the presence of the hydrophobically modified polymer, however, both surfactant isomers resulted in well-developed micelles at the respective critical aggregation concentrations (cac's), presumably because of the effect of the dodecyl side chains attached to the polymer on the conformation of the mixed alkyl-azobenzene micelles.