scrollbar change
dd icon
flag updates (thx to frodo)
Merge remote-tracking branch 'upstream/master'