<<<<<<< HEAD (9eeaff tdf#137897 scRetypePassInputDlg: re-allow password removal) ======= /&amp;amp;gt; >>>>>>> CHANGE (644d32 Colibre: Update image/picture/graphic icons)