The recently introduced approach for Encrypted Image Folding is generalized to make it self-contained. The goal is achieved by enlarging the folded image so as to embed all the necessary information for the image recovery. The need for extra size is somewhat compensated by considering a transformation with higher folding capacity. Numerical examples show that the size of the resulting cipher image may be significantly smaller than the plain text one. The implementation of the approach is further extended to deal also with color images.Instituto de Física La Plat