Merge "Add icons to the main static storage setting prefs."