diff --git a/voxygen/src/hud/img_ids.rs b/voxygen/src/hud/img_ids.rs
index a773a977e6..3acd09b085 100644
--- a/voxygen/src/hud/img_ids.rs
+++ b/voxygen/src/hud/img_ids.rs
@@ -3,152 +3,152 @@ use crate::ui::{BlankGraphic, ImageGraphic, VoxelGraphic};
 image_ids! {
     pub struct Imgs {
         <VoxelGraphic>
-            // Bag
-            bag_contents: "/voxygen/element/frames/bag.vox",
-            inv_grid: "/voxygen/element/frames/inv_grid.vox",
-            inv_slot: "/voxygen/element/buttons/inv_slot.vox",
+        // Bag
+        bag_contents: "/voxygen/element/frames/bag.vox",
+        inv_grid: "/voxygen/element/frames/inv_grid.vox",
+        inv_slot: "/voxygen/element/buttons/inv_slot.vox",
 
-            // Buttons
-            mmap_closed: "/voxygen/element/buttons/button_mmap_closed.vox",
-            mmap_closed_hover: "/voxygen/element/buttons/button_mmap_closed_hover.vox",
-            mmap_closed_press: "/voxygen/element/buttons/button_mmap_closed_press.vox",
-            mmap_open: "/voxygen/element/buttons/button_mmap_open.vox",
-            mmap_open_hover: "/voxygen/element/buttons/button_mmap_open_hover.vox",
-            mmap_open_press: "/voxygen/element/buttons/button_mmap_open_press.vox",
+        // Buttons
+        mmap_closed: "/voxygen/element/buttons/button_mmap_closed.vox",
+        mmap_closed_hover: "/voxygen/element/buttons/button_mmap_closed_hover.vox",
+        mmap_closed_press: "/voxygen/element/buttons/button_mmap_closed_press.vox",
+        mmap_open: "/voxygen/element/buttons/button_mmap_open.vox",
+        mmap_open_hover: "/voxygen/element/buttons/button_mmap_open_hover.vox",
+        mmap_open_press: "/voxygen/element/buttons/button_mmap_open_press.vox",
 
-            settings: "/voxygen/element/buttons/settings.vox",
-            settings_hover: "/voxygen/element/buttons/settings_hover.vox",
-            settings_press: "/voxygen/element/buttons/settings_press.vox",
+        settings: "/voxygen/element/buttons/settings.vox",
+        settings_hover: "/voxygen/element/buttons/settings_hover.vox",
+        settings_press: "/voxygen/element/buttons/settings_press.vox",
 
-            social_button: "/voxygen/element/buttons/social.vox",
-            social_hover: "/voxygen/element/buttons/social_hover.vox",
-            social_press: "/voxygen/element/buttons/social_press.vox",
+        social_button: "/voxygen/element/buttons/social.vox",
+        social_hover: "/voxygen/element/buttons/social_hover.vox",
+        social_press: "/voxygen/element/buttons/social_press.vox",
 
-            map_button: "/voxygen/element/buttons/map.vox",
-            map_hover: "/voxygen/element/buttons/map_hover.vox",
-            map_press: "/voxygen/element/buttons/map_press.vox",
+        map_button: "/voxygen/element/buttons/map.vox",
+        map_hover: "/voxygen/element/buttons/map_hover.vox",
+        map_press: "/voxygen/element/buttons/map_press.vox",
 
-            spellbook_button: "/voxygen/element/buttons/spellbook.vox",
-            spellbook_hover: "/voxygen/element/buttons/spellbook_hover.vox",
-            spellbook_press: "/voxygen/element/buttons/spellbook_press.vox",
+        spellbook_button: "/voxygen/element/buttons/spellbook.vox",
+        spellbook_hover: "/voxygen/element/buttons/spellbook_hover.vox",
+        spellbook_press: "/voxygen/element/buttons/spellbook_press.vox",
 
-            character_button: "/voxygen/element/buttons/character.vox",
-            character_hover: "/voxygen/element/buttons/character_hover.vox",
-            character_press: "/voxygen/element/buttons/character_press.vox",
+        character_button: "/voxygen/element/buttons/character.vox",
+        character_hover: "/voxygen/element/buttons/character_hover.vox",
+        character_press: "/voxygen/element/buttons/character_press.vox",
 
-            qlog_button: "/voxygen/element/buttons/qlog.vox",
-            qlog_hover: "/voxygen/element/buttons/qlog_hover.vox",
-            qlog_press: "/voxygen/element/buttons/qlog_press.vox",
+        qlog_button: "/voxygen/element/buttons/qlog.vox",
+        qlog_hover: "/voxygen/element/buttons/qlog_hover.vox",
+        qlog_press: "/voxygen/element/buttons/qlog_press.vox",
 
 
-            // Close button
-            close_button: "/voxygen/element/buttons/x.vox",
-            close_button_hover: "/voxygen/element/buttons/x_hover.vox",
-            close_button_press: "/voxygen/element/buttons/x_press.vox",
+        // Close button
+        close_button: "/voxygen/element/buttons/x.vox",
+        close_button_hover: "/voxygen/element/buttons/x_hover.vox",
+        close_button_press: "/voxygen/element/buttons/x_press.vox",
 
-            // Esc-Menu
-            fireplace: "/voxygen/element/misc_bg/fireplace.vox",
-            button: "/voxygen/element/buttons/button.vox",
-            button_hover: "/voxygen/element/buttons/button_hover.vox",
-            button_press: "/voxygen/element/buttons/button_press.vox",
+        // Esc-Menu
+        fireplace: "/voxygen/element/misc_bg/fireplace.vox",
+        button: "/voxygen/element/buttons/button.vox",
+        button_hover: "/voxygen/element/buttons/button_hover.vox",
+        button_press: "/voxygen/element/buttons/button_press.vox",
 
-            // MiniMap
-            mmap_frame: "/voxygen/element/frames/mmap.vox",
-            mmap_frame_closed: "/voxygen/element/frames/mmap_closed.vox",
+        // MiniMap
+        mmap_frame: "/voxygen/element/frames/mmap.vox",
+        mmap_frame_closed: "/voxygen/element/frames/mmap_closed.vox",
 
 
-            // Missing: Buff Frame Animation .gif ?! we could do animation in ui.maintain, or in shader?
-            window_frame: "/voxygen/element/frames/window2.vox",
+        // Missing: Buff Frame Animation .gif ?! we could do animation in ui.maintain, or in shader?
+        window_frame: "/voxygen/element/frames/window2.vox",
 
-            // Settings Window
-            settings_frame_r: "/voxygen/element/frames/settings_r.vox",
-            settings_frame_l: "/voxygen/element/frames/settings_l.vox",
-            settings_button: "/voxygen/element/buttons/settings_button.vox",
-            settings_button_pressed: "/voxygen/element/buttons/settings_button_pressed.vox",
-            settings_button_hover: "/voxygen/element/buttons/settings_button_hover.vox",
-            settings_button_press: "/voxygen/element/buttons/settings_button_press.vox",
-            check: "/voxygen/element/buttons/check/no.vox",
-            check_mo: "/voxygen/element/buttons/check/no_mo.vox",
-            check_press: "/voxygen/element/buttons/check/press.vox",
-            check_checked: "/voxygen/element/buttons/check/yes.vox",
-            check_checked_mo: "/voxygen/element/buttons/check/yes_mo.vox",
-            slider: "/voxygen/element/slider/track.vox",
-            slider_indicator: "/voxygen/element/slider/indicator.vox",
+        // Settings Window
+        settings_frame_r: "/voxygen/element/frames/settings_r.vox",
+        settings_frame_l: "/voxygen/element/frames/settings_l.vox",
+        settings_button: "/voxygen/element/buttons/settings_button.vox",
+        settings_button_pressed: "/voxygen/element/buttons/settings_button_pressed.vox",
+        settings_button_hover: "/voxygen/element/buttons/settings_button_hover.vox",
+        settings_button_press: "/voxygen/element/buttons/settings_button_press.vox",
+        check: "/voxygen/element/buttons/check/no.vox",
+        check_mo: "/voxygen/element/buttons/check/no_mo.vox",
+        check_press: "/voxygen/element/buttons/check/press.vox",
+        check_checked: "/voxygen/element/buttons/check/yes.vox",
+        check_checked_mo: "/voxygen/element/buttons/check/yes_mo.vox",
+        slider: "/voxygen/element/slider/track.vox",
+        slider_indicator: "/voxygen/element/slider/indicator.vox",
 
 
-            // Map Window
-            map_frame_l: "/voxygen/element/frames/map_l.vox",
-            map_frame_r: "/voxygen/element/frames/map_r.vox",
-            map_frame_bl: "/voxygen/element/frames/map_bl.vox",
-            map_frame_br: "/voxygen/element/frames/map_br.vox",
+        // Map Window
+        map_frame_l: "/voxygen/element/frames/map_l.vox",
+        map_frame_r: "/voxygen/element/frames/map_r.vox",
+        map_frame_bl: "/voxygen/element/frames/map_bl.vox",
+        map_frame_br: "/voxygen/element/frames/map_br.vox",
 
 
-            // Chat-Arrows
-            chat_arrow: "/voxygen/element/buttons/arrow_down.vox",
-            chat_arrow_mo: "/voxygen/element/buttons/arrow_down_hover.vox",
-            chat_arrow_press: "/voxygen/element/buttons/arrow_down_press.vox",
+        // Chat-Arrows
+        chat_arrow: "/voxygen/element/buttons/arrow_down.vox",
+        chat_arrow_mo: "/voxygen/element/buttons/arrow_down_hover.vox",
+        chat_arrow_press: "/voxygen/element/buttons/arrow_down_press.vox",
 
-            <ImageGraphic>
+        <ImageGraphic>
 
-             // Spell Book Window
-            spellbook_bg: "/voxygen/element/misc_bg/small_bg.png",
-            spellbook_icon: "/voxygen/element/icons/spellbook.png",
+         // Spell Book Window
+        spellbook_bg: "/voxygen/element/misc_bg/small_bg.png",
+        spellbook_icon: "/voxygen/element/icons/spellbook.png",
 
-            // Bag
-            bag: "/voxygen/element/buttons/bag/closed.png",
-            bag_hover: "/voxygen/element/buttons/bag/closed_hover.png",
-            bag_press: "/voxygen/element/buttons/bag/closed_press.png",
-            bag_open: "/voxygen/element/buttons/bag/open.png",
-            bag_open_hover: "/voxygen/element/buttons/bag/open_hover.png",
-            bag_open_press: "/voxygen/element/buttons/bag/open_press.png",
+        // Bag
+        bag: "/voxygen/element/buttons/bag/closed.png",
+        bag_hover: "/voxygen/element/buttons/bag/closed_hover.png",
+        bag_press: "/voxygen/element/buttons/bag/closed_press.png",
+        bag_open: "/voxygen/element/buttons/bag/open.png",
+        bag_open_hover: "/voxygen/element/buttons/bag/open_hover.png",
+        bag_open_press: "/voxygen/element/buttons/bag/open_press.png",
 
-            map_bg: "/voxygen/element/misc_bg/small_bg.png",
-            map_icon: "/voxygen/element/icons/map.png",
+        map_bg: "/voxygen/element/misc_bg/small_bg.png",
+        map_icon: "/voxygen/element/icons/map.png",
 
-            grid_button: "/voxygen/element/buttons/border.png",
-            grid_button_hover: "/voxygen/element/buttons/border_mo.png",
-            grid_button_press: "/voxygen/element/buttons/border_press.png",
-            grid_button_open: "/voxygen/element/buttons/border_pressed.png",
+        grid_button: "/voxygen/element/buttons/border.png",
+        grid_button_hover: "/voxygen/element/buttons/border_mo.png",
+        grid_button_press: "/voxygen/element/buttons/border_press.png",
+        grid_button_open: "/voxygen/element/buttons/border_pressed.png",
 
-            // Skillbar Module
-            sb_grid: "/voxygen/element/skill_bar/sbar_grid.png",
-            sb_grid_bg: "/voxygen/element/skill_bar/sbar_grid_bg.png",
-            l_click: "/voxygen/element/skill_bar/l.png",
-            r_click: "/voxygen/element/skill_bar/r.png",
-            mana_bar: "/voxygen/element/skill_bar/mana_bar.png",
-            health_bar: "/voxygen/element/skill_bar/health_bar.png",
-            xp_bar: "/voxygen/element/skill_bar/xp_bar.png",
+        // Skillbar Module
+        sb_grid: "/voxygen/element/skill_bar/sbar_grid.png",
+        sb_grid_bg: "/voxygen/element/skill_bar/sbar_grid_bg.png",
+        l_click: "/voxygen/element/skill_bar/l.png",
+        r_click: "/voxygen/element/skill_bar/r.png",
+        mana_bar: "/voxygen/element/skill_bar/mana_bar.png",
+        health_bar: "/voxygen/element/skill_bar/health_bar.png",
+        xp_bar: "/voxygen/element/skill_bar/xp_bar.png",
 
-            esc_bg: "/voxygen/element/frames/menu.png",
+        esc_bg: "/voxygen/element/frames/menu.png",
 
-            window_frame_2: "/voxygen/element/frames/window_2.png",
+        window_frame_2: "/voxygen/element/frames/window_2.png",
 
-            settings_bg: "/voxygen/element/frames/settings.png",
-            settings_icon: "/voxygen/element/icons/settings.png",
-            settings_button_mo: "/voxygen/element/buttons/blue_mo.png",
+        settings_bg: "/voxygen/element/frames/settings.png",
+        settings_icon: "/voxygen/element/icons/settings.png",
+        settings_button_mo: "/voxygen/element/buttons/blue_mo.png",
 
-            // Char Window
-            charwindow: "/voxygen/element/misc_bg/charwindow.png",
-            charwindow_icon: "/voxygen/element/icons/charwindow.png",
-            charwindow_tab_bg: "/voxygen/element/frames/tab.png",
-            charwindow_tab: "/voxygen/element/buttons/tab.png",
-            charwindow_expbar: "/voxygen/element/misc_bg/small_bg.png",
-            progress_frame: "/voxygen/element/frames/progress_bar.png",
-            progress: "/voxygen/element/misc_bg/progress.png",
+        // Char Window
+        charwindow: "/voxygen/element/misc_bg/charwindow.png",
+        charwindow_icon: "/voxygen/element/icons/charwindow.png",
+        charwindow_tab_bg: "/voxygen/element/frames/tab.png",
+        charwindow_tab: "/voxygen/element/buttons/tab.png",
+        charwindow_expbar: "/voxygen/element/misc_bg/small_bg.png",
+        progress_frame: "/voxygen/element/frames/progress_bar.png",
+        progress: "/voxygen/element/misc_bg/progress.png",
 
-            // Quest-Log Window
-            questlog_bg: "/voxygen/element/misc_bg/small_bg.png",
-            questlog_icon: "/voxygen/element/icons/questlog.png",
+        // Quest-Log Window
+        questlog_bg: "/voxygen/element/misc_bg/small_bg.png",
+        questlog_icon: "/voxygen/element/icons/questlog.png",
 
-            button_blue_mo: "/voxygen/element/buttons/blue_mo.png",
-            button_blue_press: "/voxygen/element/buttons/blue_press.png",
+        button_blue_mo: "/voxygen/element/buttons/blue_mo.png",
+        button_blue_press: "/voxygen/element/buttons/blue_press.png",
 
-            // Window BG
-            window_bg: "/voxygen/element/misc_bg/window_bg.png",
+        // Window BG
+        window_bg: "/voxygen/element/misc_bg/window_bg.png",
 
-            // Social Window
-            social_bg: "/voxygen/element/misc_bg/small_bg.png",
-            social_icon: "/voxygen/element/icons/social.png",
+        // Social Window
+        social_bg: "/voxygen/element/misc_bg/small_bg.png",
+        social_icon: "/voxygen/element/icons/social.png",
 
 
         <BlankGraphic>