Merge branch 'minor-works' into rails-3_2 (Add UI state icons - fate#312928)