merged most mainline ammendments (not done steamburn yet) and testing small shortcut icon