The way I get a border:
1. Merge your photo/icon (ctrl-shift-E)
2. You then have the background image in your layers. Unlock this if it is locked (double click)
3. Edit --> Stroke
4. Make the width as large as you want. I usually select 1px
5. Then select your color that you would like the...