Fix and improve part 4

Fix build, fix crashes in Archive view, fix some toolbar icons.