diff --git a/icons/README.MD b/icons/README.MD
index ff44c34..1ed5b61 100644
--- a/icons/README.MD
+++ b/icons/README.MD
@@ -1,9 +1,6 @@
 # Icons
 This directory contains the source files used to generate icon themes.
 
-## Under Construction
-Icon themes are still under construction - checkout branch `feat-72` if you would like to be *cutting edge* and use the latest work (until that work is done and merged into `master`, at least).
-
 ## Structure
 Within each directory (eg. `luna`) these are the contents:
 
@@ -16,10 +13,12 @@ Within each directory (eg. `luna`) these are the contents:
 `mappings` - since there are lots of Freedesktop icon names that map to the same icon, the mappings file maps those Freedesktop icon names to the icons found under `/res` (formatted as `(freedesktop icon name)-->(icon filename minus extension)`)
 
 ## Installation
-If you would like to install the icon theme (bearing in mind it's incomplete!) you should:
-- `git checkout feat-72` (to get yourself on the feature branch with the icons)
+If you would like to install the icon theme you should:
 - `cd` over to the `/packaging/deb/icons` directory
-- `./packicon.sh luna` (to build the Luna icon package)
+- `./packicon.sh <theme>` (eg. `./packicon.sh luna` to build the Luna icon package)
 - `sudo dpkg -i <the package>.deb` (to install the package)
 
-Sorry this is very rough, it will be updated once I finish the `feat-72` branch. Which may be some time because there are a LOT of icons to get through...
+## Developing Icon Themes
+All that you need to do to add icons (or change icons is):
+- Place your icons in the appropriate directory under `/res`
+- Update the `mappings` file as per the format mentioned above
diff --git a/icons/luna/16x16/apps/firefox-esr.png b/icons/luna/16x16/apps/firefox-esr.png
deleted file mode 100644
index 7fe4b4c..0000000
Binary files a/icons/luna/16x16/apps/firefox-esr.png and /dev/null differ
diff --git a/icons/luna/16x16/categories/applications-other.png b/icons/luna/16x16/categories/applications-other.png
deleted file mode 100644
index e1f1c4f..0000000
Binary files a/icons/luna/16x16/categories/applications-other.png and /dev/null differ
diff --git a/icons/luna/16x16/places/user-home.png b/icons/luna/16x16/places/user-home.png
deleted file mode 100644
index ccbb8a8..0000000
Binary files a/icons/luna/16x16/places/user-home.png and /dev/null differ
diff --git a/icons/luna/24x24/apps/firefox-esr.png b/icons/luna/24x24/apps/firefox-esr.png
deleted file mode 100644
index d4fc936..0000000
Binary files a/icons/luna/24x24/apps/firefox-esr.png and /dev/null differ
diff --git a/icons/luna/24x24/apps/system-software-install.png b/icons/luna/24x24/apps/system-software-install.png
deleted file mode 100644
index de35a82..0000000
Binary files a/icons/luna/24x24/apps/system-software-install.png and /dev/null differ
diff --git a/icons/luna/24x24/places/folder.png b/icons/luna/24x24/places/folder.png
deleted file mode 100644
index 7240036..0000000
Binary files a/icons/luna/24x24/places/folder.png and /dev/null differ
diff --git a/icons/luna/24x24/places/user-home.png b/icons/luna/24x24/places/user-home.png
deleted file mode 100644
index 7240036..0000000
Binary files a/icons/luna/24x24/places/user-home.png and /dev/null differ
diff --git a/icons/luna/32x32/apps/firefox-esr.png b/icons/luna/32x32/apps/firefox-esr.png
deleted file mode 100644
index 2086217..0000000
Binary files a/icons/luna/32x32/apps/firefox-esr.png and /dev/null differ
diff --git a/icons/luna/32x32/categories/applications-other.png b/icons/luna/32x32/categories/applications-other.png
deleted file mode 100644
index 44b6fbe..0000000
Binary files a/icons/luna/32x32/categories/applications-other.png and /dev/null differ
diff --git a/icons/luna/32x32/places/user-home.png b/icons/luna/32x32/places/user-home.png
deleted file mode 100644
index 68f2266..0000000
Binary files a/icons/luna/32x32/places/user-home.png and /dev/null differ
diff --git a/icons/luna/48x48/apps/firefox-esr.png b/icons/luna/48x48/apps/firefox-esr.png
deleted file mode 100644
index 5ae2a41..0000000
Binary files a/icons/luna/48x48/apps/firefox-esr.png and /dev/null differ
diff --git a/icons/luna/48x48/categories/applications-other.png b/icons/luna/48x48/categories/applications-other.png
deleted file mode 100644
index dc21097..0000000
Binary files a/icons/luna/48x48/categories/applications-other.png and /dev/null differ
diff --git a/icons/luna/48x48/places/user-home.png b/icons/luna/48x48/places/user-home.png
deleted file mode 100644
index 4ef3157..0000000
Binary files a/icons/luna/48x48/places/user-home.png and /dev/null differ
diff --git a/icons/luna/README.MD b/icons/luna/README.MD
new file mode 100644
index 0000000..a324339
--- /dev/null
+++ b/icons/luna/README.MD
@@ -0,0 +1,5 @@
+# Windows XP Icon Theme
+This directory contains the source files for the Windows XP icon theme.
+
+## Preview
+<img src="https://raw.githubusercontent.com/rozniak/xfce-winxp-tc/master/icons/luna/res/32x32/computer.png"> <img src="https://raw.githubusercontent.com/rozniak/xfce-winxp-tc/master/icons/luna/res/32x32/net_places.png"> <img src="https://raw.githubusercontent.com/rozniak/xfce-winxp-tc/master/icons/luna/res/32x32/desktop.png"> <img src="https://raw.githubusercontent.com/rozniak/xfce-winxp-tc/master/icons/luna/res/32x32/dialog-info.png"> <img src="https://raw.githubusercontent.com/rozniak/xfce-winxp-tc/master/icons/luna/res/32x32/dialog-warning.png"> <img src="https://raw.githubusercontent.com/rozniak/xfce-winxp-tc/master/icons/luna/res/32x32/dialog-error.png"> <img src="https://raw.githubusercontent.com/rozniak/xfce-winxp-tc/master/icons/luna/res/32x32/fave.png"> <img src="https://raw.githubusercontent.com/rozniak/xfce-winxp-tc/master/icons/luna/res/32x32/bin.png">
diff --git a/icons/luna/debian-control b/icons/luna/debian-control
new file mode 100644
index 0000000..1558f76
--- /dev/null
+++ b/icons/luna/debian-control
@@ -0,0 +1,6 @@
+Package: icon-theme-luna
+Version: 0.0.1
+Maintainer: Rory Fewell <roryf@oddmatics.uk>
+Architecture: all
+Section: non-free
+Description: The Windows XP icon theme.
diff --git a/icons/luna/mappings b/icons/luna/mappings
new file mode 100644
index 0000000..cf4ba75
--- /dev/null
+++ b/icons/luna/mappings
@@ -0,0 +1,314 @@
+actions/add-->add
+actions/address-book-new-->address_book_new
+actions/application-exit-->close
+actions/appointment-->calendar
+actions/appointment-new-->calendar
+actions/back-->left
+actions/bookmark-add-->fave
+actions/bookmark-new-->fave
+actions/bookmark-list-add-->fave
+actions/call-start-->call
+actions/call-stop-->call_end
+actions/centrejust-->align_centre
+actions/contact-new-->contact_new
+actions/document-new-->new
+actions/document-open-->open
+actions/document-open-recent-->recent_docs
+actions/document-page-setup-->page_setup
+actions/document-print-->print
+actions/document-print-preview-->print_preview
+actions/document-properties-->document_properties
+actions/document-revert-->revert
+actions/document-revert-rtl-->revert_rtl
+actions/document-save-->save
+actions/document-save-as-->save_as
+actions/document-send-->send
+actions/edit-clear-->clear
+actions/editclear-->clear
+actions/edit-copy-->copy
+actions/editcopy-->copy
+actions/edit-cut-->cut
+actions/editcut-->cut
+actions/edit-delete-->delete
+actions/editdelete-->delete
+actions/edit-find-->find
+actions/edit-find-replace-->find
+actions/edit-paste-->paste
+actions/editpaste-->paste
+actions/edit-redo-->redo
+actions/edit-redo-rtl-->undo
+actions/edit-select-all-->select_all
+actions/edit-undo-->undo
+actions/edit-undo-rtl-->redo
+actions/exit-->close
+actions/filefind-->find
+actions/filenew-->new
+actions/fileopen-->open
+actions/fileprint-->print
+actions/filequickprint-->print
+actions/filesave-->save
+actions/filesaveas-->save_as
+actions/find-->find
+actions/folder-new-->folder_new
+actions/folder_new-->folder_new
+actions/format-indent-less-->indent_decrease
+actions/format-indent-less-rtl-->indent_increase
+actions/format-indent-more-->indent_increase
+actions/format-indent-more-rtl-->indent_decrease
+actions/format-justify-center-->align_center
+actions/format-justify-fill-->align_justify
+actions/format-justify-left-->align_left
+actions/format-justify-right-->align_right
+actions/format-text-bold-->bold
+actions/format-text-direction-ltr-->text_dir_ltr
+actions/format-text-direction-rtl-->text_dir_rtl
+actions/format-text-italic-->italic
+actions/format-text-strikethrough-->strikethrough
+actions/format-text-underline-->underline
+actions/go-home-->home
+actions/go-next-->nav_forward
+actions/go-next-rtl-->nav_back
+actions/go-previous-->nav_back
+actions/go-previous-rtl-->nav_forward
+actions/help-about-->null
+actions/next-->nav_forward
+actions/previous-->nav_back
+actions/system-log-out-->logoff
+actions/system-run-->run
+actions/system-search-->search
+actions/system-shutdown-->shutdown
+apps/firefox-->firefox
+apps/firefox-esr-->firefox
+apps/help-browser-->help
+apps/preferences-desktop-->desktop
+apps/preferences-desktop-accessibility-->accessibility
+apps/preferences-desktop-default-applications-->mimetypes
+apps/preferences-desktop-display-->control_display
+apps/preferences-desktop-font-->folder_fonts
+apps/preferences-desktop-keyboard-->keyboard
+apps/preferences-desktop-keyboard-shortcuts-->keyboard_shortcuts
+apps/preferences-desktop-locale-->net_wan
+apps/preferences-desktop-peripherals-->hardware
+apps/preferences-desktop-personal-->personal
+apps/preferences-desktop-remote-desktop-->net_remote
+apps/preferences-desktop-screensaver-->screensaver
+apps/preferences-desktop-theme-->control_appearance
+apps/preferences-desktop-wallpaper-->control_display
+apps/preferences-other-->control_panel
+apps/preferences-system-->settings
+apps/preferences-system-network-->net_connections
+apps/preferences-system-notifications-->control_notifications
+apps/preferences-system-privacy-->lock
+apps/preferences-system-search-->folder_search
+apps/preferences-system-sharing-->folder_shared
+apps/preferences-system-windows-->file_generic_executable
+apps/system-software-install-->folder_programs
+apps/thunderbird-->thunderbird
+apps/utilities-terminal-->cli
+categories/applications-other-->folder_programs
+devices/computer-->computer
+devices/drive-harddisk-->drive_disk
+devices/drive-optical-->drive_optical
+devices/drive-removable-media-->drive_external
+devices/printer-->printer
+mimetypes/application-certificate-->certificate
+mimetypes/application-ecmascript-->file_js
+mimetypes/application-gzip-->folder_compressed
+mimetypes/application-illustrator-->file_generic_vector_drawing
+mimetypes/application-javascript-->file_js
+mimetypes/application-json-->file_generic_markup
+mimetypes/application-msword-->file_doc
+mimetypes/application-msword-template-->file_dot
+mimetypes/application-ogg-->file_generic_media
+mimetypes/application-pdf-->file_pdf
+mimetypes/application-postscript-->file_generic_script
+mimetypes/application-rtf-->file_rtf
+mimetypes/application-vnd.adobe.flash.movie-->file_swf
+mimetypes/application-vnd.ms-access-->file_mdb
+mimetypes/application-vnd.ms-excel-->file_xls
+mimetypes/application-vnd.ms-powerpoint-->file_ppt
+mimetypes/application-vnd.ms-publisher-->file_pub
+mimetypes/application-vnd.ms-visio.drawing.main-->file_vsd
+mimetypes/application-vnd.ms-word-->file_doc
+mimetypes/application-vnd.openxmlformats-officedocument.presentationml.presentation-->file_ppt
+mimetypes/application-vnd.openxmlformats-officedocument.presentationml.slideshow-->file_pps
+mimetypes/application-vnd.openxmlformats-officedocument.presentationml.slide-->file_ppt
+mimetypes/application-vnd.openxmlformats-officedocument.presentationml.template-->file_pot
+mimetypes/application-vnd.openxmlformats-officedocument.spreadsheetml.sheet-->file_xls
+mimetypes/application-vnd.openxmlformats-officedocument.spreadsheetml.template-->file_xlt
+mimetypes/application-vnd.openxmlformats-officedocument.wordprocessingml.document-->file_doc
+mimetypes/application-vnd.openxmlformats-officedocument.wordprocessingml.template-->file_dot
+mimetypes/application-vnd.rar-->folder_compressed
+mimetypes/application-vnd.sqlite3-->file_generic_database
+mimetypes/application-vnd.visio-->file_vsd
+mimetypes/application-winhlp-->help
+mimetypes/application-x-7z-compressed-->folder_compressed
+mimetypes/application-x-addon-->file_generic_library
+mimetypes/application-x-arc-->folder_compressed
+mimetypes/application-x-archive-->folder_compressed
+mimetypes/application-x-asax-->file_asax
+mimetypes/application-x-ascx-->file_ascx
+mimetypes/application-x-ashx-->file_ashx
+mimetypes/application-x-asmx-->file_asmx
+mimetypes/application-x-asp-->file_generic_markup
+mimetypes/application-x-aspx-->file_aspx
+mimetypes/application-x-awk-->file_generic_script
+mimetypes/application-x-bittorrent-->file_empty
+mimetypes/application-x-bzip-compressed-tar-->folder_compressed
+mimetypes/application-x-bzip-->folder_compressed
+mimetypes/application-x-cd-image-->disc
+mimetypes/application-x-compressed-tar-->folder_compressed
+mimetypes/application-x-compress-->folder_compressed
+mimetypes/application-x-config-->file_generic_config
+mimetypes/application-x-designer-->file_generic_markup
+mimetypes/application-x-desktop-->file_generic_markup
+mimetypes/application-x-dia-diagram-->file_generic_vector_drawing
+mimetypes/application-x-dia-shape-->file_generic_vector_drawing
+mimetypes/application-x-dotnet-csharp-project-->file_csproj
+mimetypes/application-x-dotnet-solution-->file_sln
+mimetypes/application-x-dotnet-vb-project-->file_vbproj
+mimetypes/application-x-executable-->file_generic_executable
+mimetypes/application-x-firmware-->file_generic_library
+mimetypes/application-x-generic-->file_unknown
+mimetypes/application-x-glade-->file_generic_markup
+mimetypes/application-x-gtk-builder-->file_generic_markup
+mimetypes/application-xml-->file_generic_markup
+mimetypes/application-x-ms-dos-executable-->file_generic_executable
+mimetypes/application-x-msi-->file_msi
+mimetypes/application-x-mswrite-->file_rtf
+mimetypes/application-x-object-->file_obj
+mimetypes/application-x-pak-->folder_compressed
+mimetypes/application-x-perl-->file_generic_script
+mimetypes/application-x-php-->file_generic_markup
+mimetypes/application-x-resources-->file_resx
+mimetypes/application-x-resourcesx-->file_resx
+mimetypes/application-x-ruby-->file_generic_script
+mimetypes/application-xsd-->file_generic_markup
+mimetypes/application-x-shared-library-la-->file_generic_library
+mimetypes/application-x-sharedlib-->file_generic_library
+mimetypes/application-x-shellscript-->file_generic_shell
+mimetypes/application-x-smb-server-->net_places
+mimetypes/application-x-smb-workgroup-->net_lan
+mimetypes/application-x-source-rpm-->folder_compressed
+mimetypes/application-x-tar-->folder_compressed
+mimetypes/application-x-tarz-->folder_compressed
+mimetypes/application-x-theme-->file_msstyles
+mimetypes/application-x-vbproj-->file_vbproj
+mimetypes/application-x-vbscript-->file_vbs
+mimetypes/application-x-web-config-->file_web_config
+mimetypes/application-x-xz-compressed-tar-->folder_compressed
+mimetypes/application-x-yaml-->file_generic_markup
+mimetypes/application-x-zip-compressed-fb2-->folder_compressed
+mimetypes/application-zip-->folder_compressed
+mimetypes/audio-aac-->file_generic_media
+mimetypes/audio-flac-->file_generic_media
+mimetypes/audio-midi-->file_generic_media
+mimetypes/audio-mpeg-->file_generic_media
+mimetypes/audio-x-generic-->file_generic_media
+mimetypes/font-collection-->file_generic_font
+mimetypes/font-otf-->file_otf
+mimetypes/font-ttf-->file_ttf
+mimetypes/font-woff2-->file_otf
+mimetypes/font-woff-->file_otf
+mimetypes/font-x-generic-->file_ttf
+mimetypes/image-bmp-->file_bmp
+mimetypes/image-gif-->file_generic_vector_drawing
+mimetypes/image-jpeg-->file_jpg
+mimetypes/image-png-->file_generic_vector_drawing
+mimetypes/image-svg+xml-compressed-->file_generic_vector_drawing
+mimetypes/image-svg+xml-->file_generic_vector_drawing
+mimetypes/image-tiff-->file_tiff
+mimetypes/image-x-generic-->file_jpg
+mimetypes/inode-directory-->folder
+mimetypes/empty-->file_unknown
+mimetypes/message-rfc822-->file_msg
+mimetypes/package-x-generic-->file_generic_installer
+mimetypes/text-css-->file_generic_markup
+mimetypes/text-csv-->file_generic_markup
+mimetypes/text-enriched-->file_rtf
+mimetypes/text-htmlh-->file_generic_markup
+mimetypes/text-html-->file_generic_markup
+mimetypes/text-markdown-->file_generic_markup
+mimetypes/text-plain-->file_txt
+mimetypes/text-richtext-->file_rtf
+mimetypes/text-rtf-->file_rtf
+mimetypes/text-rust-->file_generic_script
+mimetypes/text-vbscript-->file_vbs
+mimetypes/text-x-c++hdr-->file_h
+mimetypes/text-x-c++src-->file_cpp
+mimetypes/text-x-chdr-->file_h
+mimetypes/text-x-cmake-->file_generic_config
+mimetypes/text-x-csharp-->file_cs
+mimetypes/text-x-csrc-->file_c
+mimetypes/text-x-generic-->file_txt
+mimetypes/text-x-generic-template-->file_unknown
+mimetypes/text-x-makefile-->file_generic_config
+mimetypes/text-x-preview-->file_unknown
+mimetypes/text-x-python-->file_generic_script
+mimetypes/text-x-python3-->file_generic_script
+mimetypes/text-x-script-->file_generic_script
+mimetypes/text-x-sql-->file_sql
+mimetypes/text-x-vb-->file_vb
+mimetypes/text-x-vbdotnet-->file_vb
+mimetypes/video-mp4-->file_generic_media
+mimetypes/video-x-generic-->file_generic_media
+mimetypes/x-office-address-book-->address_book
+mimetypes/x-office-calendar-->calendar
+mimetypes/x-office-document-->file_doc
+mimetypes/x-office-document-template-->file_dot
+mimetypes/x-office-drawing-->file_vsd
+mimetypes/x-office-drawing-template-->file_vst
+mimetypes/x-office-presentation-->file_ppt
+mimetypes/x-office-presentation-template-->file_pot
+mimetypes/x-office-spreadsheet-->file_xls
+mimetypes/x-office-spreadsheet-template-->file_xlt
+mimetypes/x-package-repository-->internet_software
+places/folder-->folder
+places/folder-documents-->folder_documents
+places/folder-download-->folder
+places/folder-drag-accept-->folder
+places/folder-music-->folder_music
+places/folder-open-->folder_open
+places/folder-pictures-->folder_pictures
+places/folder-publicshare-->folder_shared
+places/folder-remote-->folder_network
+places/folder-saved-search-->folder
+places/folder-templates-->folder
+places/folder-videos-->folder_videos
+places/network-server-->network_share
+places/network-workgroup-->net_lan
+places/start-here-->computer
+places/user-bookmarks-->fave
+places/user-desktop-->desktop
+places/user-home-->folder
+places/user-trash-->bin
+status/ac-adapter-->ac_power
+status/battery-caution-->battery_critical
+status/battery-caution-charging-->battery_low_charging
+status/battery-empty-->battery_empty
+status/battery-empty-charging-->battery_low_charging
+status/battery-full-->battery_full
+status/battery-full-charged-->battery_full_on_ac
+status/battery-full-charging-->battery_full_on_ac
+status/battery-good-->battery_medium
+status/battery-good-charging-->battery_medium_charging
+status/battery-low-->battery_low
+status/battery-low-charging-->battery_low_charging
+status/battery-missing-->battery_unknown
+status/dialog-error-->dialog_error
+status/dialog-information-->dialog_info
+status/dialog-warning-->dialog_warning
+status/error-->dialog_error
+status/gtk-dialog-error-->dialog_error
+status/gtk-dialog-information-->dialog_info
+status/gtk-dialog-warning-->dialog_warning
+status/image-missing-->file_unknown
+status/important-->dialog_warning
+status/info-->dialog_info
+status/messagebox-critical-->dialog_error
+status/messagebox-info-->dialog_info
+status/messagebox-warning-->dialog_warning
+status/stock-dialog-error-->dialog_error
+status/stock-dialog-info-->dialog_info
+status/stock-dialog-warning-->dialog_warning
+status/user-trash-full-->bin_full
diff --git a/icons/luna/res/16x16/ac_power.png b/icons/luna/res/16x16/ac_power.png
new file mode 100644
index 0000000..e48ec5c
Binary files /dev/null and b/icons/luna/res/16x16/ac_power.png differ
diff --git a/icons/luna/res/16x16/accessibility.png b/icons/luna/res/16x16/accessibility.png
new file mode 100644
index 0000000..d969eee
Binary files /dev/null and b/icons/luna/res/16x16/accessibility.png differ
diff --git a/icons/luna/res/16x16/add.png b/icons/luna/res/16x16/add.png
new file mode 100644
index 0000000..21cf138
Binary files /dev/null and b/icons/luna/res/16x16/add.png differ
diff --git a/icons/luna/res/16x16/address_book.png b/icons/luna/res/16x16/address_book.png
new file mode 100644
index 0000000..2c21b56
Binary files /dev/null and b/icons/luna/res/16x16/address_book.png differ
diff --git a/icons/luna/res/16x16/address_book_new.png b/icons/luna/res/16x16/address_book_new.png
new file mode 100644
index 0000000..bc6d485
Binary files /dev/null and b/icons/luna/res/16x16/address_book_new.png differ
diff --git a/icons/luna/res/16x16/align_centre.png b/icons/luna/res/16x16/align_centre.png
new file mode 100644
index 0000000..c4cb503
Binary files /dev/null and b/icons/luna/res/16x16/align_centre.png differ
diff --git a/icons/luna/res/16x16/align_justify.png b/icons/luna/res/16x16/align_justify.png
new file mode 100644
index 0000000..60f8afd
Binary files /dev/null and b/icons/luna/res/16x16/align_justify.png differ
diff --git a/icons/luna/res/16x16/align_left.png b/icons/luna/res/16x16/align_left.png
new file mode 100644
index 0000000..c227f6c
Binary files /dev/null and b/icons/luna/res/16x16/align_left.png differ
diff --git a/icons/luna/res/16x16/align_right.png b/icons/luna/res/16x16/align_right.png
new file mode 100644
index 0000000..2fa24c1
Binary files /dev/null and b/icons/luna/res/16x16/align_right.png differ
diff --git a/icons/luna/res/16x16/auth.png b/icons/luna/res/16x16/auth.png
new file mode 100644
index 0000000..7301302
Binary files /dev/null and b/icons/luna/res/16x16/auth.png differ
diff --git a/icons/luna/res/16x16/battery_charging.png b/icons/luna/res/16x16/battery_charging.png
new file mode 100644
index 0000000..a0af31d
Binary files /dev/null and b/icons/luna/res/16x16/battery_charging.png differ
diff --git a/icons/luna/res/16x16/battery_critical.png b/icons/luna/res/16x16/battery_critical.png
new file mode 100644
index 0000000..9e6bbab
Binary files /dev/null and b/icons/luna/res/16x16/battery_critical.png differ
diff --git a/icons/luna/res/16x16/battery_empty.png b/icons/luna/res/16x16/battery_empty.png
new file mode 100644
index 0000000..6e48cc8
Binary files /dev/null and b/icons/luna/res/16x16/battery_empty.png differ
diff --git a/icons/luna/res/16x16/battery_full.png b/icons/luna/res/16x16/battery_full.png
new file mode 100644
index 0000000..69b0370
Binary files /dev/null and b/icons/luna/res/16x16/battery_full.png differ
diff --git a/icons/luna/res/16x16/battery_full_on_ac.png b/icons/luna/res/16x16/battery_full_on_ac.png
new file mode 120000
index 0000000..dd50eb7
--- /dev/null
+++ b/icons/luna/res/16x16/battery_full_on_ac.png
@@ -0,0 +1 @@
+ac_power.png
\ No newline at end of file
diff --git a/icons/luna/res/16x16/battery_low.png b/icons/luna/res/16x16/battery_low.png
new file mode 100644
index 0000000..43296a1
Binary files /dev/null and b/icons/luna/res/16x16/battery_low.png differ
diff --git a/icons/luna/res/16x16/battery_low_charging.png b/icons/luna/res/16x16/battery_low_charging.png
new file mode 120000
index 0000000..b925467
--- /dev/null
+++ b/icons/luna/res/16x16/battery_low_charging.png
@@ -0,0 +1 @@
+battery_charging.png
\ No newline at end of file
diff --git a/icons/luna/res/16x16/battery_medium.png b/icons/luna/res/16x16/battery_medium.png
new file mode 100644
index 0000000..0f6fdc0
Binary files /dev/null and b/icons/luna/res/16x16/battery_medium.png differ
diff --git a/icons/luna/res/16x16/battery_medium_charging.png b/icons/luna/res/16x16/battery_medium_charging.png
new file mode 120000
index 0000000..b925467
--- /dev/null
+++ b/icons/luna/res/16x16/battery_medium_charging.png
@@ -0,0 +1 @@
+battery_charging.png
\ No newline at end of file
diff --git a/icons/luna/res/16x16/battery_unknown.png b/icons/luna/res/16x16/battery_unknown.png
new file mode 100644
index 0000000..12b3ea7
Binary files /dev/null and b/icons/luna/res/16x16/battery_unknown.png differ
diff --git a/icons/luna/16x16/places/user-trash.png b/icons/luna/res/16x16/bin.png
similarity index 100%
rename from icons/luna/16x16/places/user-trash.png
rename to icons/luna/res/16x16/bin.png
diff --git a/icons/luna/16x16/status/user-trash-full.png b/icons/luna/res/16x16/bin_full.png
similarity index 100%
rename from icons/luna/16x16/status/user-trash-full.png
rename to icons/luna/res/16x16/bin_full.png
diff --git a/icons/luna/res/16x16/bluetooth.png b/icons/luna/res/16x16/bluetooth.png
new file mode 100644
index 0000000..194001e
Binary files /dev/null and b/icons/luna/res/16x16/bluetooth.png differ
diff --git a/icons/luna/res/16x16/bold.png b/icons/luna/res/16x16/bold.png
new file mode 100644
index 0000000..5d5e800
Binary files /dev/null and b/icons/luna/res/16x16/bold.png differ
diff --git a/icons/luna/res/16x16/calendar.png b/icons/luna/res/16x16/calendar.png
new file mode 100644
index 0000000..d4840b4
Binary files /dev/null and b/icons/luna/res/16x16/calendar.png differ
diff --git a/icons/luna/res/16x16/call.png b/icons/luna/res/16x16/call.png
new file mode 100644
index 0000000..e194d07
Binary files /dev/null and b/icons/luna/res/16x16/call.png differ
diff --git a/icons/luna/res/16x16/call_end.png b/icons/luna/res/16x16/call_end.png
new file mode 100644
index 0000000..30bbaa0
Binary files /dev/null and b/icons/luna/res/16x16/call_end.png differ
diff --git a/icons/luna/res/16x16/camcorder.png b/icons/luna/res/16x16/camcorder.png
new file mode 100644
index 0000000..9005dbb
Binary files /dev/null and b/icons/luna/res/16x16/camcorder.png differ
diff --git a/icons/luna/res/16x16/camera.png b/icons/luna/res/16x16/camera.png
new file mode 100644
index 0000000..b231ffd
Binary files /dev/null and b/icons/luna/res/16x16/camera.png differ
diff --git a/icons/luna/res/16x16/certificate.png b/icons/luna/res/16x16/certificate.png
new file mode 100644
index 0000000..6987608
Binary files /dev/null and b/icons/luna/res/16x16/certificate.png differ
diff --git a/icons/luna/res/16x16/clear.png b/icons/luna/res/16x16/clear.png
new file mode 100644
index 0000000..a0459e5
Binary files /dev/null and b/icons/luna/res/16x16/clear.png differ
diff --git a/icons/luna/res/16x16/cli.png b/icons/luna/res/16x16/cli.png
new file mode 100644
index 0000000..4d865c2
Binary files /dev/null and b/icons/luna/res/16x16/cli.png differ
diff --git a/icons/luna/res/16x16/close.png b/icons/luna/res/16x16/close.png
new file mode 100644
index 0000000..8a58c24
Binary files /dev/null and b/icons/luna/res/16x16/close.png differ
diff --git a/icons/luna/16x16/devices/computer.png b/icons/luna/res/16x16/computer.png
similarity index 100%
rename from icons/luna/16x16/devices/computer.png
rename to icons/luna/res/16x16/computer.png
diff --git a/icons/luna/res/16x16/contact.png b/icons/luna/res/16x16/contact.png
new file mode 100644
index 0000000..1fccee9
Binary files /dev/null and b/icons/luna/res/16x16/contact.png differ
diff --git a/icons/luna/res/16x16/contact_new.png b/icons/luna/res/16x16/contact_new.png
new file mode 100644
index 0000000..a9832a3
Binary files /dev/null and b/icons/luna/res/16x16/contact_new.png differ
diff --git a/icons/luna/res/16x16/control_appearance.png b/icons/luna/res/16x16/control_appearance.png
new file mode 100644
index 0000000..fbe4fd0
Binary files /dev/null and b/icons/luna/res/16x16/control_appearance.png differ
diff --git a/icons/luna/res/16x16/control_display.png b/icons/luna/res/16x16/control_display.png
new file mode 100644
index 0000000..af628d7
Binary files /dev/null and b/icons/luna/res/16x16/control_display.png differ
diff --git a/icons/luna/res/16x16/control_notifications.png b/icons/luna/res/16x16/control_notifications.png
new file mode 100644
index 0000000..ba9d498
Binary files /dev/null and b/icons/luna/res/16x16/control_notifications.png differ
diff --git a/icons/luna/16x16/apps/preferences-other.png b/icons/luna/res/16x16/control_panel.png
similarity index 100%
rename from icons/luna/16x16/apps/preferences-other.png
rename to icons/luna/res/16x16/control_panel.png
diff --git a/icons/luna/res/16x16/copy.png b/icons/luna/res/16x16/copy.png
new file mode 100644
index 0000000..08316bd
Binary files /dev/null and b/icons/luna/res/16x16/copy.png differ
diff --git a/icons/luna/res/16x16/cut.png b/icons/luna/res/16x16/cut.png
new file mode 100644
index 0000000..ceb3d94
Binary files /dev/null and b/icons/luna/res/16x16/cut.png differ
diff --git a/icons/luna/res/16x16/delete.png b/icons/luna/res/16x16/delete.png
new file mode 100644
index 0000000..e9f2742
Binary files /dev/null and b/icons/luna/res/16x16/delete.png differ
diff --git a/icons/luna/16x16/places/user-desktop.png b/icons/luna/res/16x16/desktop.png
similarity index 100%
rename from icons/luna/16x16/places/user-desktop.png
rename to icons/luna/res/16x16/desktop.png
diff --git a/icons/luna/res/16x16/dialog_error.png b/icons/luna/res/16x16/dialog_error.png
new file mode 100644
index 0000000..3d4f195
Binary files /dev/null and b/icons/luna/res/16x16/dialog_error.png differ
diff --git a/icons/luna/res/16x16/dialog_info.png b/icons/luna/res/16x16/dialog_info.png
new file mode 100644
index 0000000..2cd47cd
Binary files /dev/null and b/icons/luna/res/16x16/dialog_info.png differ
diff --git a/icons/luna/res/16x16/dialog_warning.png b/icons/luna/res/16x16/dialog_warning.png
new file mode 100644
index 0000000..d7b9cec
Binary files /dev/null and b/icons/luna/res/16x16/dialog_warning.png differ
diff --git a/icons/luna/res/16x16/disc.png b/icons/luna/res/16x16/disc.png
new file mode 100644
index 0000000..19131db
Binary files /dev/null and b/icons/luna/res/16x16/disc.png differ
diff --git a/icons/luna/res/16x16/document_properties.png b/icons/luna/res/16x16/document_properties.png
new file mode 100644
index 0000000..d61fa01
Binary files /dev/null and b/icons/luna/res/16x16/document_properties.png differ
diff --git a/icons/luna/16x16/devices/drive-harddisk.png b/icons/luna/res/16x16/drive_disk.png
similarity index 100%
rename from icons/luna/16x16/devices/drive-harddisk.png
rename to icons/luna/res/16x16/drive_disk.png
diff --git a/icons/luna/16x16/devices/drive-removable-media.png b/icons/luna/res/16x16/drive_external.png
similarity index 100%
rename from icons/luna/16x16/devices/drive-removable-media.png
rename to icons/luna/res/16x16/drive_external.png
diff --git a/icons/luna/res/16x16/drive_floppy.png b/icons/luna/res/16x16/drive_floppy.png
new file mode 100644
index 0000000..9fb8a09
Binary files /dev/null and b/icons/luna/res/16x16/drive_floppy.png differ
diff --git a/icons/luna/16x16/devices/drive-optical.png b/icons/luna/res/16x16/drive_optical.png
similarity index 100%
rename from icons/luna/16x16/devices/drive-optical.png
rename to icons/luna/res/16x16/drive_optical.png
diff --git a/icons/luna/res/16x16/email_forward.png b/icons/luna/res/16x16/email_forward.png
new file mode 100644
index 0000000..365ce22
Binary files /dev/null and b/icons/luna/res/16x16/email_forward.png differ
diff --git a/icons/luna/res/16x16/email_reply.png b/icons/luna/res/16x16/email_reply.png
new file mode 100644
index 0000000..72ba159
Binary files /dev/null and b/icons/luna/res/16x16/email_reply.png differ
diff --git a/icons/luna/res/16x16/email_reply_all.png b/icons/luna/res/16x16/email_reply_all.png
new file mode 100644
index 0000000..a0040ee
Binary files /dev/null and b/icons/luna/res/16x16/email_reply_all.png differ
diff --git a/icons/luna/res/16x16/email_send.png b/icons/luna/res/16x16/email_send.png
new file mode 100644
index 0000000..0735c98
Binary files /dev/null and b/icons/luna/res/16x16/email_send.png differ
diff --git a/icons/luna/res/16x16/fave.png b/icons/luna/res/16x16/fave.png
new file mode 100644
index 0000000..fe9e6a1
Binary files /dev/null and b/icons/luna/res/16x16/fave.png differ
diff --git a/icons/luna/res/16x16/file_asax.png b/icons/luna/res/16x16/file_asax.png
new file mode 100644
index 0000000..f97374c
Binary files /dev/null and b/icons/luna/res/16x16/file_asax.png differ
diff --git a/icons/luna/res/16x16/file_ascx.png b/icons/luna/res/16x16/file_ascx.png
new file mode 100644
index 0000000..a090638
Binary files /dev/null and b/icons/luna/res/16x16/file_ascx.png differ
diff --git a/icons/luna/res/16x16/file_ashx.png b/icons/luna/res/16x16/file_ashx.png
new file mode 100644
index 0000000..365d3b9
Binary files /dev/null and b/icons/luna/res/16x16/file_ashx.png differ
diff --git a/icons/luna/res/16x16/file_asm.png b/icons/luna/res/16x16/file_asm.png
new file mode 100644
index 0000000..2166883
Binary files /dev/null and b/icons/luna/res/16x16/file_asm.png differ
diff --git a/icons/luna/res/16x16/file_asmx.png b/icons/luna/res/16x16/file_asmx.png
new file mode 100644
index 0000000..6067a34
Binary files /dev/null and b/icons/luna/res/16x16/file_asmx.png differ
diff --git a/icons/luna/res/16x16/file_aspx.png b/icons/luna/res/16x16/file_aspx.png
new file mode 100644
index 0000000..63fec48
Binary files /dev/null and b/icons/luna/res/16x16/file_aspx.png differ
diff --git a/icons/luna/res/16x16/file_bmp.png b/icons/luna/res/16x16/file_bmp.png
new file mode 100644
index 0000000..8a5fb5b
Binary files /dev/null and b/icons/luna/res/16x16/file_bmp.png differ
diff --git a/icons/luna/res/16x16/file_c.png b/icons/luna/res/16x16/file_c.png
new file mode 100644
index 0000000..18c0a40
Binary files /dev/null and b/icons/luna/res/16x16/file_c.png differ
diff --git a/icons/luna/res/16x16/file_cab.png b/icons/luna/res/16x16/file_cab.png
new file mode 100644
index 0000000..1131e64
Binary files /dev/null and b/icons/luna/res/16x16/file_cab.png differ
diff --git a/icons/luna/res/16x16/file_cpp.png b/icons/luna/res/16x16/file_cpp.png
new file mode 100644
index 0000000..09a0e99
Binary files /dev/null and b/icons/luna/res/16x16/file_cpp.png differ
diff --git a/icons/luna/res/16x16/file_cs.png b/icons/luna/res/16x16/file_cs.png
new file mode 100644
index 0000000..a0c8910
Binary files /dev/null and b/icons/luna/res/16x16/file_cs.png differ
diff --git a/icons/luna/res/16x16/file_csproj.png b/icons/luna/res/16x16/file_csproj.png
new file mode 100644
index 0000000..450deba
Binary files /dev/null and b/icons/luna/res/16x16/file_csproj.png differ
diff --git a/icons/luna/res/16x16/file_dcr.png b/icons/luna/res/16x16/file_dcr.png
new file mode 100644
index 0000000..17bf944
Binary files /dev/null and b/icons/luna/res/16x16/file_dcr.png differ
diff --git a/icons/luna/res/16x16/file_doc.png b/icons/luna/res/16x16/file_doc.png
new file mode 100644
index 0000000..e144647
Binary files /dev/null and b/icons/luna/res/16x16/file_doc.png differ
diff --git a/icons/luna/res/16x16/file_dot.png b/icons/luna/res/16x16/file_dot.png
new file mode 100644
index 0000000..c0d1e92
Binary files /dev/null and b/icons/luna/res/16x16/file_dot.png differ
diff --git a/icons/luna/res/16x16/file_generic.png b/icons/luna/res/16x16/file_generic.png
new file mode 100644
index 0000000..6f4b628
Binary files /dev/null and b/icons/luna/res/16x16/file_generic.png differ
diff --git a/icons/luna/res/16x16/file_generic_audio_project.png b/icons/luna/res/16x16/file_generic_audio_project.png
new file mode 100644
index 0000000..f71d9ae
Binary files /dev/null and b/icons/luna/res/16x16/file_generic_audio_project.png differ
diff --git a/icons/luna/res/16x16/file_generic_config.png b/icons/luna/res/16x16/file_generic_config.png
new file mode 100644
index 0000000..9a4db03
Binary files /dev/null and b/icons/luna/res/16x16/file_generic_config.png differ
diff --git a/icons/luna/res/16x16/file_generic_database.png b/icons/luna/res/16x16/file_generic_database.png
new file mode 100644
index 0000000..118c653
Binary files /dev/null and b/icons/luna/res/16x16/file_generic_database.png differ
diff --git a/icons/luna/res/16x16/file_generic_executable.png b/icons/luna/res/16x16/file_generic_executable.png
new file mode 100644
index 0000000..c03ac06
Binary files /dev/null and b/icons/luna/res/16x16/file_generic_executable.png differ
diff --git a/icons/luna/res/16x16/file_generic_font.png b/icons/luna/res/16x16/file_generic_font.png
new file mode 100644
index 0000000..b092470
Binary files /dev/null and b/icons/luna/res/16x16/file_generic_font.png differ
diff --git a/icons/luna/res/16x16/file_generic_installer.png b/icons/luna/res/16x16/file_generic_installer.png
new file mode 100644
index 0000000..6734e46
Binary files /dev/null and b/icons/luna/res/16x16/file_generic_installer.png differ
diff --git a/icons/luna/res/16x16/file_generic_library.png b/icons/luna/res/16x16/file_generic_library.png
new file mode 100644
index 0000000..f796d8d
Binary files /dev/null and b/icons/luna/res/16x16/file_generic_library.png differ
diff --git a/icons/luna/res/16x16/file_generic_markup.png b/icons/luna/res/16x16/file_generic_markup.png
new file mode 100644
index 0000000..4957e3e
Binary files /dev/null and b/icons/luna/res/16x16/file_generic_markup.png differ
diff --git a/icons/luna/res/16x16/file_generic_media.png b/icons/luna/res/16x16/file_generic_media.png
new file mode 100644
index 0000000..c777e8a
Binary files /dev/null and b/icons/luna/res/16x16/file_generic_media.png differ
diff --git a/icons/luna/res/16x16/file_generic_script.png b/icons/luna/res/16x16/file_generic_script.png
new file mode 100644
index 0000000..7351683
Binary files /dev/null and b/icons/luna/res/16x16/file_generic_script.png differ
diff --git a/icons/luna/res/16x16/file_generic_shell.png b/icons/luna/res/16x16/file_generic_shell.png
new file mode 100644
index 0000000..6dd5d95
Binary files /dev/null and b/icons/luna/res/16x16/file_generic_shell.png differ
diff --git a/icons/luna/res/16x16/file_generic_vector_drawing.png b/icons/luna/res/16x16/file_generic_vector_drawing.png
new file mode 100644
index 0000000..ce74419
Binary files /dev/null and b/icons/luna/res/16x16/file_generic_vector_drawing.png differ
diff --git a/icons/luna/res/16x16/file_generic_video_project.png b/icons/luna/res/16x16/file_generic_video_project.png
new file mode 100644
index 0000000..6ff5cd0
Binary files /dev/null and b/icons/luna/res/16x16/file_generic_video_project.png differ
diff --git a/icons/luna/res/16x16/file_h.png b/icons/luna/res/16x16/file_h.png
new file mode 100644
index 0000000..c27f919
Binary files /dev/null and b/icons/luna/res/16x16/file_h.png differ
diff --git a/icons/luna/res/16x16/file_jpg.png b/icons/luna/res/16x16/file_jpg.png
new file mode 100644
index 0000000..ce12ed3
Binary files /dev/null and b/icons/luna/res/16x16/file_jpg.png differ
diff --git a/icons/luna/res/16x16/file_js.png b/icons/luna/res/16x16/file_js.png
new file mode 100644
index 0000000..9286d1b
Binary files /dev/null and b/icons/luna/res/16x16/file_js.png differ
diff --git a/icons/luna/res/16x16/file_mdb.png b/icons/luna/res/16x16/file_mdb.png
new file mode 100644
index 0000000..c35433b
Binary files /dev/null and b/icons/luna/res/16x16/file_mdb.png differ
diff --git a/icons/luna/res/16x16/file_msg.png b/icons/luna/res/16x16/file_msg.png
new file mode 100644
index 0000000..e6a8c07
Binary files /dev/null and b/icons/luna/res/16x16/file_msg.png differ
diff --git a/icons/luna/res/16x16/file_msi.png b/icons/luna/res/16x16/file_msi.png
new file mode 100644
index 0000000..19a397d
Binary files /dev/null and b/icons/luna/res/16x16/file_msi.png differ
diff --git a/icons/luna/res/16x16/file_msstyles.png b/icons/luna/res/16x16/file_msstyles.png
new file mode 100644
index 0000000..02fd04c
Binary files /dev/null and b/icons/luna/res/16x16/file_msstyles.png differ
diff --git a/icons/luna/res/16x16/file_obj.png b/icons/luna/res/16x16/file_obj.png
new file mode 100644
index 0000000..d6fbe29
Binary files /dev/null and b/icons/luna/res/16x16/file_obj.png differ
diff --git a/icons/luna/res/16x16/file_otf.png b/icons/luna/res/16x16/file_otf.png
new file mode 100644
index 0000000..8f613a3
Binary files /dev/null and b/icons/luna/res/16x16/file_otf.png differ
diff --git a/icons/luna/res/16x16/file_pdf.png b/icons/luna/res/16x16/file_pdf.png
new file mode 100644
index 0000000..c74bb4c
Binary files /dev/null and b/icons/luna/res/16x16/file_pdf.png differ
diff --git a/icons/luna/res/16x16/file_pot.png b/icons/luna/res/16x16/file_pot.png
new file mode 100644
index 0000000..9ec321e
Binary files /dev/null and b/icons/luna/res/16x16/file_pot.png differ
diff --git a/icons/luna/res/16x16/file_pps.png b/icons/luna/res/16x16/file_pps.png
new file mode 100644
index 0000000..6060cb4
Binary files /dev/null and b/icons/luna/res/16x16/file_pps.png differ
diff --git a/icons/luna/res/16x16/file_ppt.png b/icons/luna/res/16x16/file_ppt.png
new file mode 100644
index 0000000..6e11675
Binary files /dev/null and b/icons/luna/res/16x16/file_ppt.png differ
diff --git a/icons/luna/res/16x16/file_pub.png b/icons/luna/res/16x16/file_pub.png
new file mode 100644
index 0000000..3a7745b
Binary files /dev/null and b/icons/luna/res/16x16/file_pub.png differ
diff --git a/icons/luna/res/16x16/file_resx.png b/icons/luna/res/16x16/file_resx.png
new file mode 100644
index 0000000..0c785b2
Binary files /dev/null and b/icons/luna/res/16x16/file_resx.png differ
diff --git a/icons/luna/res/16x16/file_rtf.png b/icons/luna/res/16x16/file_rtf.png
new file mode 100644
index 0000000..311c181
Binary files /dev/null and b/icons/luna/res/16x16/file_rtf.png differ
diff --git a/icons/luna/res/16x16/file_sln.png b/icons/luna/res/16x16/file_sln.png
new file mode 100644
index 0000000..a7667ae
Binary files /dev/null and b/icons/luna/res/16x16/file_sln.png differ
diff --git a/icons/luna/res/16x16/file_sql.png b/icons/luna/res/16x16/file_sql.png
new file mode 100644
index 0000000..1d59c21
Binary files /dev/null and b/icons/luna/res/16x16/file_sql.png differ
diff --git a/icons/luna/res/16x16/file_swf.png b/icons/luna/res/16x16/file_swf.png
new file mode 100644
index 0000000..585a932
Binary files /dev/null and b/icons/luna/res/16x16/file_swf.png differ
diff --git a/icons/luna/res/16x16/file_tiff.png b/icons/luna/res/16x16/file_tiff.png
new file mode 100644
index 0000000..a614392
Binary files /dev/null and b/icons/luna/res/16x16/file_tiff.png differ
diff --git a/icons/luna/res/16x16/file_ttf.png b/icons/luna/res/16x16/file_ttf.png
new file mode 100644
index 0000000..b0fb03f
Binary files /dev/null and b/icons/luna/res/16x16/file_ttf.png differ
diff --git a/icons/luna/res/16x16/file_txt.png b/icons/luna/res/16x16/file_txt.png
new file mode 100644
index 0000000..5f77694
Binary files /dev/null and b/icons/luna/res/16x16/file_txt.png differ
diff --git a/icons/luna/res/16x16/file_unknown.png b/icons/luna/res/16x16/file_unknown.png
new file mode 100644
index 0000000..b8911f6
Binary files /dev/null and b/icons/luna/res/16x16/file_unknown.png differ
diff --git a/icons/luna/res/16x16/file_vb.png b/icons/luna/res/16x16/file_vb.png
new file mode 100644
index 0000000..5bb2646
Binary files /dev/null and b/icons/luna/res/16x16/file_vb.png differ
diff --git a/icons/luna/res/16x16/file_vbproj.png b/icons/luna/res/16x16/file_vbproj.png
new file mode 100644
index 0000000..f5e3dfd
Binary files /dev/null and b/icons/luna/res/16x16/file_vbproj.png differ
diff --git a/icons/luna/res/16x16/file_vbs.png b/icons/luna/res/16x16/file_vbs.png
new file mode 100644
index 0000000..bb22f89
Binary files /dev/null and b/icons/luna/res/16x16/file_vbs.png differ
diff --git a/icons/luna/res/16x16/file_vsd.png b/icons/luna/res/16x16/file_vsd.png
new file mode 100644
index 0000000..ad7cd15
Binary files /dev/null and b/icons/luna/res/16x16/file_vsd.png differ
diff --git a/icons/luna/res/16x16/file_vst.png b/icons/luna/res/16x16/file_vst.png
new file mode 100644
index 0000000..64c566e
Binary files /dev/null and b/icons/luna/res/16x16/file_vst.png differ
diff --git a/icons/luna/res/16x16/file_web_config.png b/icons/luna/res/16x16/file_web_config.png
new file mode 100644
index 0000000..cb28517
Binary files /dev/null and b/icons/luna/res/16x16/file_web_config.png differ
diff --git a/icons/luna/res/16x16/file_xls.png b/icons/luna/res/16x16/file_xls.png
new file mode 100644
index 0000000..d9e76aa
Binary files /dev/null and b/icons/luna/res/16x16/file_xls.png differ
diff --git a/icons/luna/res/16x16/file_xlt.png b/icons/luna/res/16x16/file_xlt.png
new file mode 100644
index 0000000..89d5ee0
Binary files /dev/null and b/icons/luna/res/16x16/file_xlt.png differ
diff --git a/icons/luna/res/16x16/find.png b/icons/luna/res/16x16/find.png
new file mode 100644
index 0000000..27c33a6
Binary files /dev/null and b/icons/luna/res/16x16/find.png differ
diff --git a/icons/luna/16x16/apps/firefox.png b/icons/luna/res/16x16/firefox.png
similarity index 100%
rename from icons/luna/16x16/apps/firefox.png
rename to icons/luna/res/16x16/firefox.png
diff --git a/icons/luna/16x16/places/folder.png b/icons/luna/res/16x16/folder.png
similarity index 100%
rename from icons/luna/16x16/places/folder.png
rename to icons/luna/res/16x16/folder.png
diff --git a/icons/luna/res/16x16/folder_compressed.png b/icons/luna/res/16x16/folder_compressed.png
new file mode 100644
index 0000000..d32d81d
Binary files /dev/null and b/icons/luna/res/16x16/folder_compressed.png differ
diff --git a/icons/luna/16x16/places/folder-documents.png b/icons/luna/res/16x16/folder_documents.png
similarity index 100%
rename from icons/luna/16x16/places/folder-documents.png
rename to icons/luna/res/16x16/folder_documents.png
diff --git a/icons/luna/res/16x16/folder_fonts.png b/icons/luna/res/16x16/folder_fonts.png
new file mode 100644
index 0000000..a9170ad
Binary files /dev/null and b/icons/luna/res/16x16/folder_fonts.png differ
diff --git a/icons/luna/16x16/places/folder-music.png b/icons/luna/res/16x16/folder_music.png
similarity index 100%
rename from icons/luna/16x16/places/folder-music.png
rename to icons/luna/res/16x16/folder_music.png
diff --git a/icons/luna/res/16x16/folder_network.png b/icons/luna/res/16x16/folder_network.png
new file mode 100644
index 0000000..8f6018a
Binary files /dev/null and b/icons/luna/res/16x16/folder_network.png differ
diff --git a/icons/luna/res/16x16/folder_new.png b/icons/luna/res/16x16/folder_new.png
new file mode 100644
index 0000000..370ec13
Binary files /dev/null and b/icons/luna/res/16x16/folder_new.png differ
diff --git a/icons/luna/res/16x16/folder_open.png b/icons/luna/res/16x16/folder_open.png
new file mode 100644
index 0000000..8aa4c0c
Binary files /dev/null and b/icons/luna/res/16x16/folder_open.png differ
diff --git a/icons/luna/16x16/places/folder-pictures.png b/icons/luna/res/16x16/folder_pictures.png
similarity index 100%
rename from icons/luna/16x16/places/folder-pictures.png
rename to icons/luna/res/16x16/folder_pictures.png
diff --git a/icons/luna/16x16/apps/system-software-install.png b/icons/luna/res/16x16/folder_programs.png
similarity index 100%
rename from icons/luna/16x16/apps/system-software-install.png
rename to icons/luna/res/16x16/folder_programs.png
diff --git a/icons/luna/res/16x16/folder_search.png b/icons/luna/res/16x16/folder_search.png
new file mode 100644
index 0000000..2758c5d
Binary files /dev/null and b/icons/luna/res/16x16/folder_search.png differ
diff --git a/icons/luna/res/16x16/folder_shared.png b/icons/luna/res/16x16/folder_shared.png
new file mode 100644
index 0000000..026d592
Binary files /dev/null and b/icons/luna/res/16x16/folder_shared.png differ
diff --git a/icons/luna/16x16/places/folder-videos.png b/icons/luna/res/16x16/folder_videos.png
similarity index 100%
rename from icons/luna/16x16/places/folder-videos.png
rename to icons/luna/res/16x16/folder_videos.png
diff --git a/icons/luna/res/16x16/full_screen.png b/icons/luna/res/16x16/full_screen.png
new file mode 100644
index 0000000..dcf1082
Binary files /dev/null and b/icons/luna/res/16x16/full_screen.png differ
diff --git a/icons/luna/res/16x16/gamepad.png b/icons/luna/res/16x16/gamepad.png
new file mode 100644
index 0000000..164f665
Binary files /dev/null and b/icons/luna/res/16x16/gamepad.png differ
diff --git a/icons/luna/res/16x16/hardware.png b/icons/luna/res/16x16/hardware.png
new file mode 100644
index 0000000..a394a92
Binary files /dev/null and b/icons/luna/res/16x16/hardware.png differ
diff --git a/icons/luna/16x16/apps/help-browser.png b/icons/luna/res/16x16/help.png
similarity index 100%
rename from icons/luna/16x16/apps/help-browser.png
rename to icons/luna/res/16x16/help.png
diff --git a/icons/luna/res/16x16/home.png b/icons/luna/res/16x16/home.png
new file mode 100644
index 0000000..d0dd988
Binary files /dev/null and b/icons/luna/res/16x16/home.png differ
diff --git a/icons/luna/res/16x16/indent_decrease.png b/icons/luna/res/16x16/indent_decrease.png
new file mode 100644
index 0000000..86e88de
Binary files /dev/null and b/icons/luna/res/16x16/indent_decrease.png differ
diff --git a/icons/luna/res/16x16/indent_increase.png b/icons/luna/res/16x16/indent_increase.png
new file mode 100644
index 0000000..5915a91
Binary files /dev/null and b/icons/luna/res/16x16/indent_increase.png differ
diff --git a/icons/luna/res/16x16/internet_software.png b/icons/luna/res/16x16/internet_software.png
new file mode 100644
index 0000000..659fd4e
Binary files /dev/null and b/icons/luna/res/16x16/internet_software.png differ
diff --git a/icons/luna/res/16x16/italic.png b/icons/luna/res/16x16/italic.png
new file mode 100644
index 0000000..5417adb
Binary files /dev/null and b/icons/luna/res/16x16/italic.png differ
diff --git a/icons/luna/res/16x16/keyboard.png b/icons/luna/res/16x16/keyboard.png
new file mode 100644
index 0000000..0bdcaa4
Binary files /dev/null and b/icons/luna/res/16x16/keyboard.png differ
diff --git a/icons/luna/res/16x16/keyboard_shortcuts.png b/icons/luna/res/16x16/keyboard_shortcuts.png
new file mode 100644
index 0000000..8ad09f6
Binary files /dev/null and b/icons/luna/res/16x16/keyboard_shortcuts.png differ
diff --git a/icons/luna/res/16x16/left.png b/icons/luna/res/16x16/left.png
new file mode 100644
index 0000000..fb2edfc
Binary files /dev/null and b/icons/luna/res/16x16/left.png differ
diff --git a/icons/luna/res/16x16/lock.png b/icons/luna/res/16x16/lock.png
new file mode 100644
index 0000000..6267e1c
Binary files /dev/null and b/icons/luna/res/16x16/lock.png differ
diff --git a/icons/luna/16x16/actions/system-log-out.png b/icons/luna/res/16x16/logoff.png
similarity index 100%
rename from icons/luna/16x16/actions/system-log-out.png
rename to icons/luna/res/16x16/logoff.png
diff --git a/icons/luna/res/16x16/media_player.png b/icons/luna/res/16x16/media_player.png
new file mode 100644
index 0000000..152da78
Binary files /dev/null and b/icons/luna/res/16x16/media_player.png differ
diff --git a/icons/luna/16x16/apps/preferences-desktop-default-applications.png b/icons/luna/res/16x16/mimetypes.png
similarity index 100%
rename from icons/luna/16x16/apps/preferences-desktop-default-applications.png
rename to icons/luna/res/16x16/mimetypes.png
diff --git a/icons/luna/res/16x16/mouse.png b/icons/luna/res/16x16/mouse.png
new file mode 100644
index 0000000..7489494
Binary files /dev/null and b/icons/luna/res/16x16/mouse.png differ
diff --git a/icons/luna/res/16x16/nav_back.png b/icons/luna/res/16x16/nav_back.png
new file mode 100644
index 0000000..453ea91
Binary files /dev/null and b/icons/luna/res/16x16/nav_back.png differ
diff --git a/icons/luna/res/16x16/nav_forward.png b/icons/luna/res/16x16/nav_forward.png
new file mode 100644
index 0000000..48fadcf
Binary files /dev/null and b/icons/luna/res/16x16/nav_forward.png differ
diff --git a/icons/luna/16x16/apps/preferences-system-network.png b/icons/luna/res/16x16/net_connections.png
similarity index 100%
rename from icons/luna/16x16/apps/preferences-system-network.png
rename to icons/luna/res/16x16/net_connections.png
diff --git a/icons/luna/res/16x16/net_internet.png b/icons/luna/res/16x16/net_internet.png
new file mode 100644
index 0000000..3233a54
Binary files /dev/null and b/icons/luna/res/16x16/net_internet.png differ
diff --git a/icons/luna/res/16x16/net_lan.png b/icons/luna/res/16x16/net_lan.png
new file mode 100644
index 0000000..c82474d
Binary files /dev/null and b/icons/luna/res/16x16/net_lan.png differ
diff --git a/icons/luna/res/16x16/net_places.png b/icons/luna/res/16x16/net_places.png
new file mode 100644
index 0000000..87ab059
Binary files /dev/null and b/icons/luna/res/16x16/net_places.png differ
diff --git a/icons/luna/res/16x16/net_remote.png b/icons/luna/res/16x16/net_remote.png
new file mode 100644
index 0000000..69c770f
Binary files /dev/null and b/icons/luna/res/16x16/net_remote.png differ
diff --git a/icons/luna/res/16x16/net_search.png b/icons/luna/res/16x16/net_search.png
new file mode 100644
index 0000000..4112cf4
Binary files /dev/null and b/icons/luna/res/16x16/net_search.png differ
diff --git a/icons/luna/res/16x16/net_upload.png b/icons/luna/res/16x16/net_upload.png
new file mode 100644
index 0000000..5f2f86f
Binary files /dev/null and b/icons/luna/res/16x16/net_upload.png differ
diff --git a/icons/luna/res/16x16/net_wan.png b/icons/luna/res/16x16/net_wan.png
new file mode 100644
index 0000000..e5117b8
Binary files /dev/null and b/icons/luna/res/16x16/net_wan.png differ
diff --git a/icons/luna/16x16/places/folder-remote.png b/icons/luna/res/16x16/network_share.png
similarity index 100%
rename from icons/luna/16x16/places/folder-remote.png
rename to icons/luna/res/16x16/network_share.png
diff --git a/icons/luna/res/16x16/network_share_disconnected.png b/icons/luna/res/16x16/network_share_disconnected.png
new file mode 100644
index 0000000..603444a
Binary files /dev/null and b/icons/luna/res/16x16/network_share_disconnected.png differ
diff --git a/icons/luna/res/16x16/new.png b/icons/luna/res/16x16/new.png
new file mode 100644
index 0000000..345b657
Binary files /dev/null and b/icons/luna/res/16x16/new.png differ
diff --git a/icons/luna/res/16x16/null.png b/icons/luna/res/16x16/null.png
new file mode 100644
index 0000000..c924c7c
Binary files /dev/null and b/icons/luna/res/16x16/null.png differ
diff --git a/icons/luna/res/16x16/open.png b/icons/luna/res/16x16/open.png
new file mode 100644
index 0000000..6cec686
Binary files /dev/null and b/icons/luna/res/16x16/open.png differ
diff --git a/icons/luna/res/16x16/page_setup.png b/icons/luna/res/16x16/page_setup.png
new file mode 100644
index 0000000..8bbb0d5
Binary files /dev/null and b/icons/luna/res/16x16/page_setup.png differ
diff --git a/icons/luna/res/16x16/paste.png b/icons/luna/res/16x16/paste.png
new file mode 100644
index 0000000..c40aa86
Binary files /dev/null and b/icons/luna/res/16x16/paste.png differ
diff --git a/icons/luna/res/16x16/pda.png b/icons/luna/res/16x16/pda.png
new file mode 100644
index 0000000..662c754
Binary files /dev/null and b/icons/luna/res/16x16/pda.png differ
diff --git a/icons/luna/res/16x16/people.png b/icons/luna/res/16x16/people.png
new file mode 100644
index 0000000..8071579
Binary files /dev/null and b/icons/luna/res/16x16/people.png differ
diff --git a/icons/luna/res/16x16/personal.png b/icons/luna/res/16x16/personal.png
new file mode 100644
index 0000000..ef7fb26
Binary files /dev/null and b/icons/luna/res/16x16/personal.png differ
diff --git a/icons/luna/res/16x16/print.png b/icons/luna/res/16x16/print.png
new file mode 100644
index 0000000..1bd45b5
Binary files /dev/null and b/icons/luna/res/16x16/print.png differ
diff --git a/icons/luna/res/16x16/print_preview.png b/icons/luna/res/16x16/print_preview.png
new file mode 100644
index 0000000..da70f3b
Binary files /dev/null and b/icons/luna/res/16x16/print_preview.png differ
diff --git a/icons/luna/16x16/devices/printer.png b/icons/luna/res/16x16/printer.png
similarity index 100%
rename from icons/luna/16x16/devices/printer.png
rename to icons/luna/res/16x16/printer.png
diff --git a/icons/luna/16x16/actions/document-open-recent.png b/icons/luna/res/16x16/recent_docs.png
similarity index 100%
rename from icons/luna/16x16/actions/document-open-recent.png
rename to icons/luna/res/16x16/recent_docs.png
diff --git a/icons/luna/res/16x16/redo.png b/icons/luna/res/16x16/redo.png
new file mode 100644
index 0000000..f45765b
Binary files /dev/null and b/icons/luna/res/16x16/redo.png differ
diff --git a/icons/luna/res/16x16/refresh.png b/icons/luna/res/16x16/refresh.png
new file mode 100644
index 0000000..7a4ddf9
Binary files /dev/null and b/icons/luna/res/16x16/refresh.png differ
diff --git a/icons/luna/res/16x16/refresh_all.png b/icons/luna/res/16x16/refresh_all.png
new file mode 100644
index 0000000..9b6e7ba
Binary files /dev/null and b/icons/luna/res/16x16/refresh_all.png differ
diff --git a/icons/luna/res/16x16/remove.png b/icons/luna/res/16x16/remove.png
new file mode 100644
index 0000000..b645b6a
Binary files /dev/null and b/icons/luna/res/16x16/remove.png differ
diff --git a/icons/luna/res/16x16/revert.png b/icons/luna/res/16x16/revert.png
new file mode 100644
index 0000000..d7e8fac
Binary files /dev/null and b/icons/luna/res/16x16/revert.png differ
diff --git a/icons/luna/res/16x16/revert_rtl.png b/icons/luna/res/16x16/revert_rtl.png
new file mode 100644
index 0000000..c8c88a5
Binary files /dev/null and b/icons/luna/res/16x16/revert_rtl.png differ
diff --git a/icons/luna/res/16x16/right.png b/icons/luna/res/16x16/right.png
new file mode 100644
index 0000000..4ef3b02
Binary files /dev/null and b/icons/luna/res/16x16/right.png differ
diff --git a/icons/luna/16x16/actions/system-run.png b/icons/luna/res/16x16/run.png
similarity index 100%
rename from icons/luna/16x16/actions/system-run.png
rename to icons/luna/res/16x16/run.png
diff --git a/icons/luna/res/16x16/save.png b/icons/luna/res/16x16/save.png
new file mode 100644
index 0000000..230d068
Binary files /dev/null and b/icons/luna/res/16x16/save.png differ
diff --git a/icons/luna/res/16x16/save_as.png b/icons/luna/res/16x16/save_as.png
new file mode 100644
index 0000000..5c1c127
Binary files /dev/null and b/icons/luna/res/16x16/save_as.png differ
diff --git a/icons/luna/res/16x16/scanner.png b/icons/luna/res/16x16/scanner.png
new file mode 100644
index 0000000..66d0fb4
Binary files /dev/null and b/icons/luna/res/16x16/scanner.png differ
diff --git a/icons/luna/16x16/actions/system-search.png b/icons/luna/res/16x16/search.png
similarity index 100%
rename from icons/luna/16x16/actions/system-search.png
rename to icons/luna/res/16x16/search.png
diff --git a/icons/luna/res/16x16/select_all.png b/icons/luna/res/16x16/select_all.png
new file mode 100644
index 0000000..3d65693
Binary files /dev/null and b/icons/luna/res/16x16/select_all.png differ
diff --git a/icons/luna/res/16x16/settings.png b/icons/luna/res/16x16/settings.png
new file mode 100644
index 0000000..c990e64
Binary files /dev/null and b/icons/luna/res/16x16/settings.png differ
diff --git a/icons/luna/16x16/actions/system-shutdown.png b/icons/luna/res/16x16/shutdown.png
similarity index 100%
rename from icons/luna/16x16/actions/system-shutdown.png
rename to icons/luna/res/16x16/shutdown.png
diff --git a/icons/luna/res/16x16/strikethrough.png b/icons/luna/res/16x16/strikethrough.png
new file mode 100644
index 0000000..230dc3e
Binary files /dev/null and b/icons/luna/res/16x16/strikethrough.png differ
diff --git a/icons/luna/res/16x16/tablet_pc.png b/icons/luna/res/16x16/tablet_pc.png
new file mode 100644
index 0000000..a77ebc1
Binary files /dev/null and b/icons/luna/res/16x16/tablet_pc.png differ
diff --git a/icons/luna/res/16x16/text_dir_ltr.png b/icons/luna/res/16x16/text_dir_ltr.png
new file mode 100644
index 0000000..78eb105
Binary files /dev/null and b/icons/luna/res/16x16/text_dir_ltr.png differ
diff --git a/icons/luna/res/16x16/text_dir_rtl.png b/icons/luna/res/16x16/text_dir_rtl.png
new file mode 100644
index 0000000..2ce4c82
Binary files /dev/null and b/icons/luna/res/16x16/text_dir_rtl.png differ
diff --git a/icons/luna/16x16/apps/thunderbird.png b/icons/luna/res/16x16/thunderbird.png
similarity index 100%
rename from icons/luna/16x16/apps/thunderbird.png
rename to icons/luna/res/16x16/thunderbird.png
diff --git a/icons/luna/res/16x16/underline.png b/icons/luna/res/16x16/underline.png
new file mode 100644
index 0000000..f8f98aa
Binary files /dev/null and b/icons/luna/res/16x16/underline.png differ
diff --git a/icons/luna/res/16x16/undo.png b/icons/luna/res/16x16/undo.png
new file mode 100644
index 0000000..61733f9
Binary files /dev/null and b/icons/luna/res/16x16/undo.png differ
diff --git a/icons/luna/res/16x16/volume_off.png b/icons/luna/res/16x16/volume_off.png
new file mode 100644
index 0000000..548be91
Binary files /dev/null and b/icons/luna/res/16x16/volume_off.png differ
diff --git a/icons/luna/res/16x16/volume_on.png b/icons/luna/res/16x16/volume_on.png
new file mode 100644
index 0000000..a107f8e
Binary files /dev/null and b/icons/luna/res/16x16/volume_on.png differ
diff --git a/icons/luna/24x24/places/user-trash.png b/icons/luna/res/24x24/bin.png
similarity index 100%
rename from icons/luna/24x24/places/user-trash.png
rename to icons/luna/res/24x24/bin.png
diff --git a/icons/luna/24x24/status/user-trash-full.png b/icons/luna/res/24x24/bin_full.png
similarity index 100%
rename from icons/luna/24x24/status/user-trash-full.png
rename to icons/luna/res/24x24/bin_full.png
diff --git a/icons/luna/24x24/devices/computer.png b/icons/luna/res/24x24/computer.png
similarity index 100%
rename from icons/luna/24x24/devices/computer.png
rename to icons/luna/res/24x24/computer.png
diff --git a/icons/luna/24x24/apps/preferences-other.png b/icons/luna/res/24x24/control_panel.png
similarity index 100%
rename from icons/luna/24x24/apps/preferences-other.png
rename to icons/luna/res/24x24/control_panel.png
diff --git a/icons/luna/24x24/places/user-desktop.png b/icons/luna/res/24x24/desktop.png
similarity index 100%
rename from icons/luna/24x24/places/user-desktop.png
rename to icons/luna/res/24x24/desktop.png
diff --git a/icons/luna/res/24x24/dialog_error.png b/icons/luna/res/24x24/dialog_error.png
new file mode 100644
index 0000000..79485b9
Binary files /dev/null and b/icons/luna/res/24x24/dialog_error.png differ
diff --git a/icons/luna/res/24x24/dialog_info.png b/icons/luna/res/24x24/dialog_info.png
new file mode 100644
index 0000000..024a8bb
Binary files /dev/null and b/icons/luna/res/24x24/dialog_info.png differ
diff --git a/icons/luna/res/24x24/dialog_warning.png b/icons/luna/res/24x24/dialog_warning.png
new file mode 100644
index 0000000..8f6cbda
Binary files /dev/null and b/icons/luna/res/24x24/dialog_warning.png differ
diff --git a/icons/luna/24x24/devices/drive-harddisk.png b/icons/luna/res/24x24/drive_disk.png
similarity index 100%
rename from icons/luna/24x24/devices/drive-harddisk.png
rename to icons/luna/res/24x24/drive_disk.png
diff --git a/icons/luna/24x24/devices/drive-removable-media.png b/icons/luna/res/24x24/drive_external.png
similarity index 100%
rename from icons/luna/24x24/devices/drive-removable-media.png
rename to icons/luna/res/24x24/drive_external.png
diff --git a/icons/luna/24x24/devices/drive-optical.png b/icons/luna/res/24x24/drive_optical.png
similarity index 100%
rename from icons/luna/24x24/devices/drive-optical.png
rename to icons/luna/res/24x24/drive_optical.png
diff --git a/icons/luna/res/24x24/fave.png b/icons/luna/res/24x24/fave.png
new file mode 100644
index 0000000..1083b64
Binary files /dev/null and b/icons/luna/res/24x24/fave.png differ
diff --git a/icons/luna/res/24x24/file_c.png b/icons/luna/res/24x24/file_c.png
new file mode 100644
index 0000000..5788595
Binary files /dev/null and b/icons/luna/res/24x24/file_c.png differ
diff --git a/icons/luna/res/24x24/file_cpp.png b/icons/luna/res/24x24/file_cpp.png
new file mode 100644
index 0000000..3177980
Binary files /dev/null and b/icons/luna/res/24x24/file_cpp.png differ
diff --git a/icons/luna/res/24x24/file_cs.png b/icons/luna/res/24x24/file_cs.png
new file mode 100644
index 0000000..7ed094d
Binary files /dev/null and b/icons/luna/res/24x24/file_cs.png differ
diff --git a/icons/luna/res/24x24/file_csproj.png b/icons/luna/res/24x24/file_csproj.png
new file mode 100644
index 0000000..6f85f96
Binary files /dev/null and b/icons/luna/res/24x24/file_csproj.png differ
diff --git a/icons/luna/res/24x24/file_h.png b/icons/luna/res/24x24/file_h.png
new file mode 100644
index 0000000..389d2c1
Binary files /dev/null and b/icons/luna/res/24x24/file_h.png differ
diff --git a/icons/luna/res/24x24/file_sln.png b/icons/luna/res/24x24/file_sln.png
new file mode 100644
index 0000000..3de03a1
Binary files /dev/null and b/icons/luna/res/24x24/file_sln.png differ
diff --git a/icons/luna/res/24x24/file_vb.png b/icons/luna/res/24x24/file_vb.png
new file mode 100644
index 0000000..1af0d8c
Binary files /dev/null and b/icons/luna/res/24x24/file_vb.png differ
diff --git a/icons/luna/res/24x24/file_vbproj.png b/icons/luna/res/24x24/file_vbproj.png
new file mode 100644
index 0000000..25a1d2e
Binary files /dev/null and b/icons/luna/res/24x24/file_vbproj.png differ
diff --git a/icons/luna/24x24/apps/firefox.png b/icons/luna/res/24x24/firefox.png
similarity index 100%
rename from icons/luna/24x24/apps/firefox.png
rename to icons/luna/res/24x24/firefox.png
diff --git a/icons/luna/res/24x24/folder.png b/icons/luna/res/24x24/folder.png
new file mode 100644
index 0000000..7036b83
Binary files /dev/null and b/icons/luna/res/24x24/folder.png differ
diff --git a/icons/luna/24x24/places/folder-documents.png b/icons/luna/res/24x24/folder_documents.png
similarity index 100%
rename from icons/luna/24x24/places/folder-documents.png
rename to icons/luna/res/24x24/folder_documents.png
diff --git a/icons/luna/24x24/places/folder-music.png b/icons/luna/res/24x24/folder_music.png
similarity index 100%
rename from icons/luna/24x24/places/folder-music.png
rename to icons/luna/res/24x24/folder_music.png
diff --git a/icons/luna/24x24/places/folder-pictures.png b/icons/luna/res/24x24/folder_pictures.png
similarity index 100%
rename from icons/luna/24x24/places/folder-pictures.png
rename to icons/luna/res/24x24/folder_pictures.png
diff --git a/icons/luna/24x24/categories/applications-other.png b/icons/luna/res/24x24/folder_programs.png
similarity index 100%
rename from icons/luna/24x24/categories/applications-other.png
rename to icons/luna/res/24x24/folder_programs.png
diff --git a/icons/luna/24x24/places/folder-videos.png b/icons/luna/res/24x24/folder_videos.png
similarity index 100%
rename from icons/luna/24x24/places/folder-videos.png
rename to icons/luna/res/24x24/folder_videos.png
diff --git a/icons/luna/24x24/apps/help-browser.png b/icons/luna/res/24x24/help.png
similarity index 100%
rename from icons/luna/24x24/apps/help-browser.png
rename to icons/luna/res/24x24/help.png
diff --git a/icons/luna/res/24x24/home.png b/icons/luna/res/24x24/home.png
new file mode 100644
index 0000000..b127f22
Binary files /dev/null and b/icons/luna/res/24x24/home.png differ
diff --git a/icons/luna/res/24x24/lock.png b/icons/luna/res/24x24/lock.png
new file mode 100644
index 0000000..3c855ac
Binary files /dev/null and b/icons/luna/res/24x24/lock.png differ
diff --git a/icons/luna/24x24/actions/system-log-out.png b/icons/luna/res/24x24/logoff.png
similarity index 100%
rename from icons/luna/24x24/actions/system-log-out.png
rename to icons/luna/res/24x24/logoff.png
diff --git a/icons/luna/24x24/apps/preferences-desktop-default-applications.png b/icons/luna/res/24x24/mimetypes.png
similarity index 100%
rename from icons/luna/24x24/apps/preferences-desktop-default-applications.png
rename to icons/luna/res/24x24/mimetypes.png
diff --git a/icons/luna/res/24x24/nav_back.png b/icons/luna/res/24x24/nav_back.png
new file mode 100644
index 0000000..30364fd
Binary files /dev/null and b/icons/luna/res/24x24/nav_back.png differ
diff --git a/icons/luna/res/24x24/nav_forward.png b/icons/luna/res/24x24/nav_forward.png
new file mode 100644
index 0000000..c2fb59b
Binary files /dev/null and b/icons/luna/res/24x24/nav_forward.png differ
diff --git a/icons/luna/24x24/apps/preferences-system-network.png b/icons/luna/res/24x24/net_connections.png
similarity index 100%
rename from icons/luna/24x24/apps/preferences-system-network.png
rename to icons/luna/res/24x24/net_connections.png
diff --git a/icons/luna/res/24x24/net_places.png b/icons/luna/res/24x24/net_places.png
new file mode 100644
index 0000000..bdd81c7
Binary files /dev/null and b/icons/luna/res/24x24/net_places.png differ
diff --git a/icons/luna/res/24x24/net_search.png b/icons/luna/res/24x24/net_search.png
new file mode 100644
index 0000000..38d1ea2
Binary files /dev/null and b/icons/luna/res/24x24/net_search.png differ
diff --git a/icons/luna/24x24/places/folder-remote.png b/icons/luna/res/24x24/network_share.png
similarity index 100%
rename from icons/luna/24x24/places/folder-remote.png
rename to icons/luna/res/24x24/network_share.png
diff --git a/icons/luna/res/24x24/null.png b/icons/luna/res/24x24/null.png
new file mode 100644
index 0000000..685a1b4
Binary files /dev/null and b/icons/luna/res/24x24/null.png differ
diff --git a/icons/luna/24x24/devices/printer.png b/icons/luna/res/24x24/printer.png
similarity index 100%
rename from icons/luna/24x24/devices/printer.png
rename to icons/luna/res/24x24/printer.png
diff --git a/icons/luna/24x24/actions/document-open-recent.png b/icons/luna/res/24x24/recent_docs.png
similarity index 100%
rename from icons/luna/24x24/actions/document-open-recent.png
rename to icons/luna/res/24x24/recent_docs.png
diff --git a/icons/luna/24x24/actions/system-run.png b/icons/luna/res/24x24/run.png
similarity index 100%
rename from icons/luna/24x24/actions/system-run.png
rename to icons/luna/res/24x24/run.png
diff --git a/icons/luna/24x24/actions/system-search.png b/icons/luna/res/24x24/search.png
similarity index 100%
rename from icons/luna/24x24/actions/system-search.png
rename to icons/luna/res/24x24/search.png
diff --git a/icons/luna/24x24/actions/system-shutdown.png b/icons/luna/res/24x24/shutdown.png
similarity index 100%
rename from icons/luna/24x24/actions/system-shutdown.png
rename to icons/luna/res/24x24/shutdown.png
diff --git a/icons/luna/24x24/apps/thunderbird.png b/icons/luna/res/24x24/thunderbird.png
similarity index 100%
rename from icons/luna/24x24/apps/thunderbird.png
rename to icons/luna/res/24x24/thunderbird.png
diff --git a/icons/luna/res/32x32/ac_power.png b/icons/luna/res/32x32/ac_power.png
new file mode 100644
index 0000000..2f4b6b7
Binary files /dev/null and b/icons/luna/res/32x32/ac_power.png differ
diff --git a/icons/luna/res/32x32/accessibility.png b/icons/luna/res/32x32/accessibility.png
new file mode 100644
index 0000000..c2a6a48
Binary files /dev/null and b/icons/luna/res/32x32/accessibility.png differ
diff --git a/icons/luna/res/32x32/add.png b/icons/luna/res/32x32/add.png
new file mode 100644
index 0000000..22d4f39
Binary files /dev/null and b/icons/luna/res/32x32/add.png differ
diff --git a/icons/luna/res/32x32/address_book.png b/icons/luna/res/32x32/address_book.png
new file mode 100644
index 0000000..c68e453
Binary files /dev/null and b/icons/luna/res/32x32/address_book.png differ
diff --git a/icons/luna/res/32x32/address_book_new.png b/icons/luna/res/32x32/address_book_new.png
new file mode 100644
index 0000000..f75132d
Binary files /dev/null and b/icons/luna/res/32x32/address_book_new.png differ
diff --git a/icons/luna/res/32x32/align_centre.png b/icons/luna/res/32x32/align_centre.png
new file mode 100644
index 0000000..90c7e7d
Binary files /dev/null and b/icons/luna/res/32x32/align_centre.png differ
diff --git a/icons/luna/res/32x32/align_justify.png b/icons/luna/res/32x32/align_justify.png
new file mode 100644
index 0000000..0cec658
Binary files /dev/null and b/icons/luna/res/32x32/align_justify.png differ
diff --git a/icons/luna/res/32x32/align_left.png b/icons/luna/res/32x32/align_left.png
new file mode 100644
index 0000000..8d76dc4
Binary files /dev/null and b/icons/luna/res/32x32/align_left.png differ
diff --git a/icons/luna/res/32x32/align_right.png b/icons/luna/res/32x32/align_right.png
new file mode 100644
index 0000000..e24ceb2
Binary files /dev/null and b/icons/luna/res/32x32/align_right.png differ
diff --git a/icons/luna/res/32x32/auth.png b/icons/luna/res/32x32/auth.png
new file mode 100644
index 0000000..4665f56
Binary files /dev/null and b/icons/luna/res/32x32/auth.png differ
diff --git a/icons/luna/res/32x32/battery_critical.png b/icons/luna/res/32x32/battery_critical.png
new file mode 100644
index 0000000..c2a4c8e
Binary files /dev/null and b/icons/luna/res/32x32/battery_critical.png differ
diff --git a/icons/luna/res/32x32/battery_empty.png b/icons/luna/res/32x32/battery_empty.png
new file mode 100644
index 0000000..4dd2f77
Binary files /dev/null and b/icons/luna/res/32x32/battery_empty.png differ
diff --git a/icons/luna/res/32x32/battery_full.png b/icons/luna/res/32x32/battery_full.png
new file mode 100644
index 0000000..1217767
Binary files /dev/null and b/icons/luna/res/32x32/battery_full.png differ
diff --git a/icons/luna/res/32x32/battery_full_on_ac.png b/icons/luna/res/32x32/battery_full_on_ac.png
new file mode 120000
index 0000000..863d127
--- /dev/null
+++ b/icons/luna/res/32x32/battery_full_on_ac.png
@@ -0,0 +1 @@
+battery_full.png
\ No newline at end of file
diff --git a/icons/luna/res/32x32/battery_low.png b/icons/luna/res/32x32/battery_low.png
new file mode 100644
index 0000000..68136db
Binary files /dev/null and b/icons/luna/res/32x32/battery_low.png differ
diff --git a/icons/luna/res/32x32/battery_low_charging.png b/icons/luna/res/32x32/battery_low_charging.png
new file mode 100644
index 0000000..0484922
Binary files /dev/null and b/icons/luna/res/32x32/battery_low_charging.png differ
diff --git a/icons/luna/res/32x32/battery_medium.png b/icons/luna/res/32x32/battery_medium.png
new file mode 100644
index 0000000..1fedbd8
Binary files /dev/null and b/icons/luna/res/32x32/battery_medium.png differ
diff --git a/icons/luna/res/32x32/battery_medium_charging.png b/icons/luna/res/32x32/battery_medium_charging.png
new file mode 100644
index 0000000..ab4f442
Binary files /dev/null and b/icons/luna/res/32x32/battery_medium_charging.png differ
diff --git a/icons/luna/res/32x32/battery_unknown.png b/icons/luna/res/32x32/battery_unknown.png
new file mode 100644
index 0000000..d7af4ea
Binary files /dev/null and b/icons/luna/res/32x32/battery_unknown.png differ
diff --git a/icons/luna/32x32/places/user-trash.png b/icons/luna/res/32x32/bin.png
similarity index 100%
rename from icons/luna/32x32/places/user-trash.png
rename to icons/luna/res/32x32/bin.png
diff --git a/icons/luna/32x32/status/user-trash-full.png b/icons/luna/res/32x32/bin_full.png
similarity index 100%
rename from icons/luna/32x32/status/user-trash-full.png
rename to icons/luna/res/32x32/bin_full.png
diff --git a/icons/luna/res/32x32/bluetooth.png b/icons/luna/res/32x32/bluetooth.png
new file mode 100644
index 0000000..a9c05ca
Binary files /dev/null and b/icons/luna/res/32x32/bluetooth.png differ
diff --git a/icons/luna/res/32x32/bold.png b/icons/luna/res/32x32/bold.png
new file mode 100644
index 0000000..030644b
Binary files /dev/null and b/icons/luna/res/32x32/bold.png differ
diff --git a/icons/luna/res/32x32/calendar.png b/icons/luna/res/32x32/calendar.png
new file mode 100644
index 0000000..0b528f9
Binary files /dev/null and b/icons/luna/res/32x32/calendar.png differ
diff --git a/icons/luna/res/32x32/call.png b/icons/luna/res/32x32/call.png
new file mode 100644
index 0000000..bd17e35
Binary files /dev/null and b/icons/luna/res/32x32/call.png differ
diff --git a/icons/luna/res/32x32/call_end.png b/icons/luna/res/32x32/call_end.png
new file mode 100644
index 0000000..4d49b94
Binary files /dev/null and b/icons/luna/res/32x32/call_end.png differ
diff --git a/icons/luna/res/32x32/camcorder.png b/icons/luna/res/32x32/camcorder.png
new file mode 100644
index 0000000..17eed06
Binary files /dev/null and b/icons/luna/res/32x32/camcorder.png differ
diff --git a/icons/luna/res/32x32/camera.png b/icons/luna/res/32x32/camera.png
new file mode 100644
index 0000000..ac839b9
Binary files /dev/null and b/icons/luna/res/32x32/camera.png differ
diff --git a/icons/luna/res/32x32/certificate.png b/icons/luna/res/32x32/certificate.png
new file mode 100644
index 0000000..2fbc592
Binary files /dev/null and b/icons/luna/res/32x32/certificate.png differ
diff --git a/icons/luna/res/32x32/clear.png b/icons/luna/res/32x32/clear.png
new file mode 100644
index 0000000..8c1ddb8
Binary files /dev/null and b/icons/luna/res/32x32/clear.png differ
diff --git a/icons/luna/res/32x32/cli.png b/icons/luna/res/32x32/cli.png
new file mode 100644
index 0000000..5da4121
Binary files /dev/null and b/icons/luna/res/32x32/cli.png differ
diff --git a/icons/luna/res/32x32/close.png b/icons/luna/res/32x32/close.png
new file mode 100644
index 0000000..7e47883
Binary files /dev/null and b/icons/luna/res/32x32/close.png differ
diff --git a/icons/luna/32x32/devices/computer.png b/icons/luna/res/32x32/computer.png
similarity index 100%
rename from icons/luna/32x32/devices/computer.png
rename to icons/luna/res/32x32/computer.png
diff --git a/icons/luna/res/32x32/contact.png b/icons/luna/res/32x32/contact.png
new file mode 100644
index 0000000..d4dd828
Binary files /dev/null and b/icons/luna/res/32x32/contact.png differ
diff --git a/icons/luna/res/32x32/contact_new.png b/icons/luna/res/32x32/contact_new.png
new file mode 100644
index 0000000..7dbc994
Binary files /dev/null and b/icons/luna/res/32x32/contact_new.png differ
diff --git a/icons/luna/res/32x32/control_appearance.png b/icons/luna/res/32x32/control_appearance.png
new file mode 100644
index 0000000..99137af
Binary files /dev/null and b/icons/luna/res/32x32/control_appearance.png differ
diff --git a/icons/luna/res/32x32/control_display.png b/icons/luna/res/32x32/control_display.png
new file mode 100644
index 0000000..65e9739
Binary files /dev/null and b/icons/luna/res/32x32/control_display.png differ
diff --git a/icons/luna/res/32x32/control_notifications.png b/icons/luna/res/32x32/control_notifications.png
new file mode 100644
index 0000000..69b36e1
Binary files /dev/null and b/icons/luna/res/32x32/control_notifications.png differ
diff --git a/icons/luna/32x32/apps/preferences-other.png b/icons/luna/res/32x32/control_panel.png
similarity index 100%
rename from icons/luna/32x32/apps/preferences-other.png
rename to icons/luna/res/32x32/control_panel.png
diff --git a/icons/luna/res/32x32/copy.png b/icons/luna/res/32x32/copy.png
new file mode 100644
index 0000000..dbbc3bd
Binary files /dev/null and b/icons/luna/res/32x32/copy.png differ
diff --git a/icons/luna/res/32x32/delete.png b/icons/luna/res/32x32/delete.png
new file mode 100644
index 0000000..883a0c4
Binary files /dev/null and b/icons/luna/res/32x32/delete.png differ
diff --git a/icons/luna/32x32/places/user-desktop.png b/icons/luna/res/32x32/desktop.png
similarity index 100%
rename from icons/luna/32x32/places/user-desktop.png
rename to icons/luna/res/32x32/desktop.png
diff --git a/icons/luna/res/32x32/dialog_error.png b/icons/luna/res/32x32/dialog_error.png
new file mode 100644
index 0000000..55a1cfc
Binary files /dev/null and b/icons/luna/res/32x32/dialog_error.png differ
diff --git a/icons/luna/res/32x32/dialog_info.png b/icons/luna/res/32x32/dialog_info.png
new file mode 100644
index 0000000..c7ded21
Binary files /dev/null and b/icons/luna/res/32x32/dialog_info.png differ
diff --git a/icons/luna/res/32x32/dialog_warning.png b/icons/luna/res/32x32/dialog_warning.png
new file mode 100644
index 0000000..d54a5e3
Binary files /dev/null and b/icons/luna/res/32x32/dialog_warning.png differ
diff --git a/icons/luna/res/32x32/disc.png b/icons/luna/res/32x32/disc.png
new file mode 100644
index 0000000..112c9df
Binary files /dev/null and b/icons/luna/res/32x32/disc.png differ
diff --git a/icons/luna/res/32x32/document_properties.png b/icons/luna/res/32x32/document_properties.png
new file mode 100644
index 0000000..aef4cb1
Binary files /dev/null and b/icons/luna/res/32x32/document_properties.png differ
diff --git a/icons/luna/32x32/devices/drive-harddisk.png b/icons/luna/res/32x32/drive_disk.png
similarity index 100%
rename from icons/luna/32x32/devices/drive-harddisk.png
rename to icons/luna/res/32x32/drive_disk.png
diff --git a/icons/luna/32x32/devices/drive-removable-media.png b/icons/luna/res/32x32/drive_external.png
similarity index 100%
rename from icons/luna/32x32/devices/drive-removable-media.png
rename to icons/luna/res/32x32/drive_external.png
diff --git a/icons/luna/res/32x32/drive_floppy.png b/icons/luna/res/32x32/drive_floppy.png
new file mode 100644
index 0000000..335bc02
Binary files /dev/null and b/icons/luna/res/32x32/drive_floppy.png differ
diff --git a/icons/luna/32x32/devices/drive-optical.png b/icons/luna/res/32x32/drive_optical.png
similarity index 100%
rename from icons/luna/32x32/devices/drive-optical.png
rename to icons/luna/res/32x32/drive_optical.png
diff --git a/icons/luna/res/32x32/email_forward.png b/icons/luna/res/32x32/email_forward.png
new file mode 100644
index 0000000..dadf504
Binary files /dev/null and b/icons/luna/res/32x32/email_forward.png differ
diff --git a/icons/luna/res/32x32/email_reply.png b/icons/luna/res/32x32/email_reply.png
new file mode 100644
index 0000000..e2a2dc5
Binary files /dev/null and b/icons/luna/res/32x32/email_reply.png differ
diff --git a/icons/luna/res/32x32/email_reply_all.png b/icons/luna/res/32x32/email_reply_all.png
new file mode 100644
index 0000000..1d2726d
Binary files /dev/null and b/icons/luna/res/32x32/email_reply_all.png differ
diff --git a/icons/luna/res/32x32/email_send.png b/icons/luna/res/32x32/email_send.png
new file mode 100644
index 0000000..14bfffb
Binary files /dev/null and b/icons/luna/res/32x32/email_send.png differ
diff --git a/icons/luna/res/32x32/fave.png b/icons/luna/res/32x32/fave.png
new file mode 100644
index 0000000..13cc6c9
Binary files /dev/null and b/icons/luna/res/32x32/fave.png differ
diff --git a/icons/luna/res/32x32/file_asax.png b/icons/luna/res/32x32/file_asax.png
new file mode 100644
index 0000000..92aac20
Binary files /dev/null and b/icons/luna/res/32x32/file_asax.png differ
diff --git a/icons/luna/res/32x32/file_ascx.png b/icons/luna/res/32x32/file_ascx.png
new file mode 100644
index 0000000..e30080a
Binary files /dev/null and b/icons/luna/res/32x32/file_ascx.png differ
diff --git a/icons/luna/res/32x32/file_ashx.png b/icons/luna/res/32x32/file_ashx.png
new file mode 100644
index 0000000..8564856
Binary files /dev/null and b/icons/luna/res/32x32/file_ashx.png differ
diff --git a/icons/luna/res/32x32/file_asm.png b/icons/luna/res/32x32/file_asm.png
new file mode 100644
index 0000000..9d6898d
Binary files /dev/null and b/icons/luna/res/32x32/file_asm.png differ
diff --git a/icons/luna/res/32x32/file_asmx.png b/icons/luna/res/32x32/file_asmx.png
new file mode 100644
index 0000000..5e3c109
Binary files /dev/null and b/icons/luna/res/32x32/file_asmx.png differ
diff --git a/icons/luna/res/32x32/file_aspx.png b/icons/luna/res/32x32/file_aspx.png
new file mode 100644
index 0000000..08dd0d3
Binary files /dev/null and b/icons/luna/res/32x32/file_aspx.png differ
diff --git a/icons/luna/res/32x32/file_bmp.png b/icons/luna/res/32x32/file_bmp.png
new file mode 100644
index 0000000..601b63e
Binary files /dev/null and b/icons/luna/res/32x32/file_bmp.png differ
diff --git a/icons/luna/res/32x32/file_c.png b/icons/luna/res/32x32/file_c.png
new file mode 100644
index 0000000..21483ea
Binary files /dev/null and b/icons/luna/res/32x32/file_c.png differ
diff --git a/icons/luna/res/32x32/file_cab.png b/icons/luna/res/32x32/file_cab.png
new file mode 100644
index 0000000..6681d33
Binary files /dev/null and b/icons/luna/res/32x32/file_cab.png differ
diff --git a/icons/luna/res/32x32/file_cpp.png b/icons/luna/res/32x32/file_cpp.png
new file mode 100644
index 0000000..133acb3
Binary files /dev/null and b/icons/luna/res/32x32/file_cpp.png differ
diff --git a/icons/luna/res/32x32/file_cs.png b/icons/luna/res/32x32/file_cs.png
new file mode 100644
index 0000000..9ae5ce2
Binary files /dev/null and b/icons/luna/res/32x32/file_cs.png differ
diff --git a/icons/luna/res/32x32/file_csproj.png b/icons/luna/res/32x32/file_csproj.png
new file mode 100644
index 0000000..8f418f6
Binary files /dev/null and b/icons/luna/res/32x32/file_csproj.png differ
diff --git a/icons/luna/res/32x32/file_dcr.png b/icons/luna/res/32x32/file_dcr.png
new file mode 100644
index 0000000..1aa4552
Binary files /dev/null and b/icons/luna/res/32x32/file_dcr.png differ
diff --git a/icons/luna/res/32x32/file_doc.png b/icons/luna/res/32x32/file_doc.png
new file mode 100644
index 0000000..fff6268
Binary files /dev/null and b/icons/luna/res/32x32/file_doc.png differ
diff --git a/icons/luna/res/32x32/file_dot.png b/icons/luna/res/32x32/file_dot.png
new file mode 100644
index 0000000..3379efb
Binary files /dev/null and b/icons/luna/res/32x32/file_dot.png differ
diff --git a/icons/luna/res/32x32/file_generic.png b/icons/luna/res/32x32/file_generic.png
new file mode 100644
index 0000000..7f93eb2
Binary files /dev/null and b/icons/luna/res/32x32/file_generic.png differ
diff --git a/icons/luna/res/32x32/file_generic_audio_project.png b/icons/luna/res/32x32/file_generic_audio_project.png
new file mode 100644
index 0000000..83f86eb
Binary files /dev/null and b/icons/luna/res/32x32/file_generic_audio_project.png differ
diff --git a/icons/luna/res/32x32/file_generic_config.png b/icons/luna/res/32x32/file_generic_config.png
new file mode 100644
index 0000000..3741c3a
Binary files /dev/null and b/icons/luna/res/32x32/file_generic_config.png differ
diff --git a/icons/luna/res/32x32/file_generic_database.png b/icons/luna/res/32x32/file_generic_database.png
new file mode 100644
index 0000000..22a977d
Binary files /dev/null and b/icons/luna/res/32x32/file_generic_database.png differ
diff --git a/icons/luna/res/32x32/file_generic_executable.png b/icons/luna/res/32x32/file_generic_executable.png
new file mode 100644
index 0000000..6949d39
Binary files /dev/null and b/icons/luna/res/32x32/file_generic_executable.png differ
diff --git a/icons/luna/res/32x32/file_generic_font.png b/icons/luna/res/32x32/file_generic_font.png
new file mode 100644
index 0000000..c6f4ef6
Binary files /dev/null and b/icons/luna/res/32x32/file_generic_font.png differ
diff --git a/icons/luna/res/32x32/file_generic_installer.png b/icons/luna/res/32x32/file_generic_installer.png
new file mode 100644
index 0000000..0ac9084
Binary files /dev/null and b/icons/luna/res/32x32/file_generic_installer.png differ
diff --git a/icons/luna/res/32x32/file_generic_library.png b/icons/luna/res/32x32/file_generic_library.png
new file mode 100644
index 0000000..e3cd3f6
Binary files /dev/null and b/icons/luna/res/32x32/file_generic_library.png differ
diff --git a/icons/luna/res/32x32/file_generic_markup.png b/icons/luna/res/32x32/file_generic_markup.png
new file mode 100644
index 0000000..47c8244
Binary files /dev/null and b/icons/luna/res/32x32/file_generic_markup.png differ
diff --git a/icons/luna/res/32x32/file_generic_media.png b/icons/luna/res/32x32/file_generic_media.png
new file mode 100644
index 0000000..84d4629
Binary files /dev/null and b/icons/luna/res/32x32/file_generic_media.png differ
diff --git a/icons/luna/res/32x32/file_generic_script.png b/icons/luna/res/32x32/file_generic_script.png
new file mode 100644
index 0000000..7b0a283
Binary files /dev/null and b/icons/luna/res/32x32/file_generic_script.png differ
diff --git a/icons/luna/res/32x32/file_generic_shell.png b/icons/luna/res/32x32/file_generic_shell.png
new file mode 100644
index 0000000..5361928
Binary files /dev/null and b/icons/luna/res/32x32/file_generic_shell.png differ
diff --git a/icons/luna/res/32x32/file_generic_vector_drawing.png b/icons/luna/res/32x32/file_generic_vector_drawing.png
new file mode 100644
index 0000000..0979731
Binary files /dev/null and b/icons/luna/res/32x32/file_generic_vector_drawing.png differ
diff --git a/icons/luna/res/32x32/file_generic_video_project.png b/icons/luna/res/32x32/file_generic_video_project.png
new file mode 100644
index 0000000..d739b8d
Binary files /dev/null and b/icons/luna/res/32x32/file_generic_video_project.png differ
diff --git a/icons/luna/res/32x32/file_h.png b/icons/luna/res/32x32/file_h.png
new file mode 100644
index 0000000..8874c54
Binary files /dev/null and b/icons/luna/res/32x32/file_h.png differ
diff --git a/icons/luna/res/32x32/file_jpg.png b/icons/luna/res/32x32/file_jpg.png
new file mode 100644
index 0000000..f767aa5
Binary files /dev/null and b/icons/luna/res/32x32/file_jpg.png differ
diff --git a/icons/luna/res/32x32/file_js.png b/icons/luna/res/32x32/file_js.png
new file mode 100644
index 0000000..7b3c761
Binary files /dev/null and b/icons/luna/res/32x32/file_js.png differ
diff --git a/icons/luna/res/32x32/file_mdb.png b/icons/luna/res/32x32/file_mdb.png
new file mode 100644
index 0000000..a81758b
Binary files /dev/null and b/icons/luna/res/32x32/file_mdb.png differ
diff --git a/icons/luna/res/32x32/file_msg.png b/icons/luna/res/32x32/file_msg.png
new file mode 100644
index 0000000..ed4810a
Binary files /dev/null and b/icons/luna/res/32x32/file_msg.png differ
diff --git a/icons/luna/res/32x32/file_msi.png b/icons/luna/res/32x32/file_msi.png
new file mode 100644
index 0000000..dc4a546
Binary files /dev/null and b/icons/luna/res/32x32/file_msi.png differ
diff --git a/icons/luna/res/32x32/file_msstyles.png b/icons/luna/res/32x32/file_msstyles.png
new file mode 100644
index 0000000..eb8d2ce
Binary files /dev/null and b/icons/luna/res/32x32/file_msstyles.png differ
diff --git a/icons/luna/res/32x32/file_obj.png b/icons/luna/res/32x32/file_obj.png
new file mode 100644
index 0000000..ddfc604
Binary files /dev/null and b/icons/luna/res/32x32/file_obj.png differ
diff --git a/icons/luna/res/32x32/file_otf.png b/icons/luna/res/32x32/file_otf.png
new file mode 100644
index 0000000..d3d53fd
Binary files /dev/null and b/icons/luna/res/32x32/file_otf.png differ
diff --git a/icons/luna/res/32x32/file_pdf.png b/icons/luna/res/32x32/file_pdf.png
new file mode 100644
index 0000000..b8edbff
Binary files /dev/null and b/icons/luna/res/32x32/file_pdf.png differ
diff --git a/icons/luna/res/32x32/file_pot.png b/icons/luna/res/32x32/file_pot.png
new file mode 100644
index 0000000..871f242
Binary files /dev/null and b/icons/luna/res/32x32/file_pot.png differ
diff --git a/icons/luna/res/32x32/file_pps.png b/icons/luna/res/32x32/file_pps.png
new file mode 100644
index 0000000..cf84606
Binary files /dev/null and b/icons/luna/res/32x32/file_pps.png differ
diff --git a/icons/luna/res/32x32/file_ppt.png b/icons/luna/res/32x32/file_ppt.png
new file mode 100644
index 0000000..9faded0
Binary files /dev/null and b/icons/luna/res/32x32/file_ppt.png differ
diff --git a/icons/luna/res/32x32/file_pub.png b/icons/luna/res/32x32/file_pub.png
new file mode 100644
index 0000000..df4ea2e
Binary files /dev/null and b/icons/luna/res/32x32/file_pub.png differ
diff --git a/icons/luna/res/32x32/file_resx.png b/icons/luna/res/32x32/file_resx.png
new file mode 100644
index 0000000..4f04dd1
Binary files /dev/null and b/icons/luna/res/32x32/file_resx.png differ
diff --git a/icons/luna/res/32x32/file_rtf.png b/icons/luna/res/32x32/file_rtf.png
new file mode 100644
index 0000000..84539f6
Binary files /dev/null and b/icons/luna/res/32x32/file_rtf.png differ
diff --git a/icons/luna/res/32x32/file_sln.png b/icons/luna/res/32x32/file_sln.png
new file mode 100644
index 0000000..9c8bf63
Binary files /dev/null and b/icons/luna/res/32x32/file_sln.png differ
diff --git a/icons/luna/res/32x32/file_sql.png b/icons/luna/res/32x32/file_sql.png
new file mode 100644
index 0000000..770f373
Binary files /dev/null and b/icons/luna/res/32x32/file_sql.png differ
diff --git a/icons/luna/res/32x32/file_swf.png b/icons/luna/res/32x32/file_swf.png
new file mode 100644
index 0000000..88d03cf
Binary files /dev/null and b/icons/luna/res/32x32/file_swf.png differ
diff --git a/icons/luna/res/32x32/file_tiff.png b/icons/luna/res/32x32/file_tiff.png
new file mode 100644
index 0000000..40d1011
Binary files /dev/null and b/icons/luna/res/32x32/file_tiff.png differ
diff --git a/icons/luna/res/32x32/file_ttf.png b/icons/luna/res/32x32/file_ttf.png
new file mode 100644
index 0000000..f3ac9ed
Binary files /dev/null and b/icons/luna/res/32x32/file_ttf.png differ
diff --git a/icons/luna/res/32x32/file_txt.png b/icons/luna/res/32x32/file_txt.png
new file mode 100644
index 0000000..c237a9d
Binary files /dev/null and b/icons/luna/res/32x32/file_txt.png differ
diff --git a/icons/luna/res/32x32/file_unknown.png b/icons/luna/res/32x32/file_unknown.png
new file mode 100644
index 0000000..1067646
Binary files /dev/null and b/icons/luna/res/32x32/file_unknown.png differ
diff --git a/icons/luna/res/32x32/file_vb.png b/icons/luna/res/32x32/file_vb.png
new file mode 100644
index 0000000..75484ef
Binary files /dev/null and b/icons/luna/res/32x32/file_vb.png differ
diff --git a/icons/luna/res/32x32/file_vbproj.png b/icons/luna/res/32x32/file_vbproj.png
new file mode 100644
index 0000000..f23c023
Binary files /dev/null and b/icons/luna/res/32x32/file_vbproj.png differ
diff --git a/icons/luna/res/32x32/file_vbs.png b/icons/luna/res/32x32/file_vbs.png
new file mode 100644
index 0000000..264c424
Binary files /dev/null and b/icons/luna/res/32x32/file_vbs.png differ
diff --git a/icons/luna/res/32x32/file_vsd.png b/icons/luna/res/32x32/file_vsd.png
new file mode 100644
index 0000000..ec78a41
Binary files /dev/null and b/icons/luna/res/32x32/file_vsd.png differ
diff --git a/icons/luna/res/32x32/file_vst.png b/icons/luna/res/32x32/file_vst.png
new file mode 100644
index 0000000..d504126
Binary files /dev/null and b/icons/luna/res/32x32/file_vst.png differ
diff --git a/icons/luna/res/32x32/file_web_config.png b/icons/luna/res/32x32/file_web_config.png
new file mode 100644
index 0000000..4abf9b5
Binary files /dev/null and b/icons/luna/res/32x32/file_web_config.png differ
diff --git a/icons/luna/res/32x32/file_xls.png b/icons/luna/res/32x32/file_xls.png
new file mode 100644
index 0000000..52eb7eb
Binary files /dev/null and b/icons/luna/res/32x32/file_xls.png differ
diff --git a/icons/luna/res/32x32/file_xlt.png b/icons/luna/res/32x32/file_xlt.png
new file mode 100644
index 0000000..60efa0b
Binary files /dev/null and b/icons/luna/res/32x32/file_xlt.png differ
diff --git a/icons/luna/res/32x32/find.png b/icons/luna/res/32x32/find.png
new file mode 100644
index 0000000..932037d
Binary files /dev/null and b/icons/luna/res/32x32/find.png differ
diff --git a/icons/luna/32x32/apps/firefox.png b/icons/luna/res/32x32/firefox.png
similarity index 100%
rename from icons/luna/32x32/apps/firefox.png
rename to icons/luna/res/32x32/firefox.png
diff --git a/icons/luna/32x32/places/folder.png b/icons/luna/res/32x32/folder.png
similarity index 100%
rename from icons/luna/32x32/places/folder.png
rename to icons/luna/res/32x32/folder.png
diff --git a/icons/luna/res/32x32/folder_compressed.png b/icons/luna/res/32x32/folder_compressed.png
new file mode 100644
index 0000000..f308916
Binary files /dev/null and b/icons/luna/res/32x32/folder_compressed.png differ
diff --git a/icons/luna/32x32/places/folder-documents.png b/icons/luna/res/32x32/folder_documents.png
similarity index 100%
rename from icons/luna/32x32/places/folder-documents.png
rename to icons/luna/res/32x32/folder_documents.png
diff --git a/icons/luna/res/32x32/folder_fonts.png b/icons/luna/res/32x32/folder_fonts.png
new file mode 100644
index 0000000..bbe2df7
Binary files /dev/null and b/icons/luna/res/32x32/folder_fonts.png differ
diff --git a/icons/luna/32x32/places/folder-music.png b/icons/luna/res/32x32/folder_music.png
similarity index 100%
rename from icons/luna/32x32/places/folder-music.png
rename to icons/luna/res/32x32/folder_music.png
diff --git a/icons/luna/res/32x32/folder_network.png b/icons/luna/res/32x32/folder_network.png
new file mode 100644
index 0000000..0b1a6d5
Binary files /dev/null and b/icons/luna/res/32x32/folder_network.png differ
diff --git a/icons/luna/res/32x32/folder_new.png b/icons/luna/res/32x32/folder_new.png
new file mode 100644
index 0000000..6c32f96
Binary files /dev/null and b/icons/luna/res/32x32/folder_new.png differ
diff --git a/icons/luna/res/32x32/folder_open.png b/icons/luna/res/32x32/folder_open.png
new file mode 100644
index 0000000..9dbc426
Binary files /dev/null and b/icons/luna/res/32x32/folder_open.png differ
diff --git a/icons/luna/32x32/places/folder-pictures.png b/icons/luna/res/32x32/folder_pictures.png
similarity index 100%
rename from icons/luna/32x32/places/folder-pictures.png
rename to icons/luna/res/32x32/folder_pictures.png
diff --git a/icons/luna/32x32/apps/system-software-install.png b/icons/luna/res/32x32/folder_programs.png
similarity index 100%
rename from icons/luna/32x32/apps/system-software-install.png
rename to icons/luna/res/32x32/folder_programs.png
diff --git a/icons/luna/res/32x32/folder_search.png b/icons/luna/res/32x32/folder_search.png
new file mode 100644
index 0000000..d988373
Binary files /dev/null and b/icons/luna/res/32x32/folder_search.png differ
diff --git a/icons/luna/res/32x32/folder_shared.png b/icons/luna/res/32x32/folder_shared.png
new file mode 100644
index 0000000..b42f608
Binary files /dev/null and b/icons/luna/res/32x32/folder_shared.png differ
diff --git a/icons/luna/32x32/places/folder-videos.png b/icons/luna/res/32x32/folder_videos.png
similarity index 100%
rename from icons/luna/32x32/places/folder-videos.png
rename to icons/luna/res/32x32/folder_videos.png
diff --git a/icons/luna/res/32x32/full_screen.png b/icons/luna/res/32x32/full_screen.png
new file mode 100644
index 0000000..20763ec
Binary files /dev/null and b/icons/luna/res/32x32/full_screen.png differ
diff --git a/icons/luna/res/32x32/gamepad.png b/icons/luna/res/32x32/gamepad.png
new file mode 100644
index 0000000..fac1b4f
Binary files /dev/null and b/icons/luna/res/32x32/gamepad.png differ
diff --git a/icons/luna/res/32x32/hardware.png b/icons/luna/res/32x32/hardware.png
new file mode 100644
index 0000000..c9e05cd
Binary files /dev/null and b/icons/luna/res/32x32/hardware.png differ
diff --git a/icons/luna/32x32/apps/help-browser.png b/icons/luna/res/32x32/help.png
similarity index 100%
rename from icons/luna/32x32/apps/help-browser.png
rename to icons/luna/res/32x32/help.png
diff --git a/icons/luna/res/32x32/indent_decrease.png b/icons/luna/res/32x32/indent_decrease.png
new file mode 100644
index 0000000..95cbc4c
Binary files /dev/null and b/icons/luna/res/32x32/indent_decrease.png differ
diff --git a/icons/luna/res/32x32/indent_increase.png b/icons/luna/res/32x32/indent_increase.png
new file mode 100644
index 0000000..2096a1c
Binary files /dev/null and b/icons/luna/res/32x32/indent_increase.png differ
diff --git a/icons/luna/res/32x32/internet_software.png b/icons/luna/res/32x32/internet_software.png
new file mode 100644
index 0000000..aa85f96
Binary files /dev/null and b/icons/luna/res/32x32/internet_software.png differ
diff --git a/icons/luna/res/32x32/italic.png b/icons/luna/res/32x32/italic.png
new file mode 100644
index 0000000..82ab677
Binary files /dev/null and b/icons/luna/res/32x32/italic.png differ
diff --git a/icons/luna/res/32x32/keyboard.png b/icons/luna/res/32x32/keyboard.png
new file mode 100644
index 0000000..9287410
Binary files /dev/null and b/icons/luna/res/32x32/keyboard.png differ
diff --git a/icons/luna/res/32x32/keyboard_shortcuts.png b/icons/luna/res/32x32/keyboard_shortcuts.png
new file mode 100644
index 0000000..f6efa8d
Binary files /dev/null and b/icons/luna/res/32x32/keyboard_shortcuts.png differ
diff --git a/icons/luna/res/32x32/left.png b/icons/luna/res/32x32/left.png
new file mode 100644
index 0000000..5c5a3ee
Binary files /dev/null and b/icons/luna/res/32x32/left.png differ
diff --git a/icons/luna/res/32x32/lock.png b/icons/luna/res/32x32/lock.png
new file mode 100644
index 0000000..7d0cb1c
Binary files /dev/null and b/icons/luna/res/32x32/lock.png differ
diff --git a/icons/luna/32x32/actions/system-log-out.png b/icons/luna/res/32x32/logoff.png
similarity index 100%
rename from icons/luna/32x32/actions/system-log-out.png
rename to icons/luna/res/32x32/logoff.png
diff --git a/icons/luna/res/32x32/media_player.png b/icons/luna/res/32x32/media_player.png
new file mode 100644
index 0000000..2c282fd
Binary files /dev/null and b/icons/luna/res/32x32/media_player.png differ
diff --git a/icons/luna/32x32/apps/preferences-desktop-default-applications.png b/icons/luna/res/32x32/mimetypes.png
similarity index 100%
rename from icons/luna/32x32/apps/preferences-desktop-default-applications.png
rename to icons/luna/res/32x32/mimetypes.png
diff --git a/icons/luna/res/32x32/mouse.png b/icons/luna/res/32x32/mouse.png
new file mode 100644
index 0000000..e1b84f2
Binary files /dev/null and b/icons/luna/res/32x32/mouse.png differ
diff --git a/icons/luna/32x32/apps/preferences-system-network.png b/icons/luna/res/32x32/net_connections.png
similarity index 100%
rename from icons/luna/32x32/apps/preferences-system-network.png
rename to icons/luna/res/32x32/net_connections.png
diff --git a/icons/luna/res/32x32/net_internet.png b/icons/luna/res/32x32/net_internet.png
new file mode 100644
index 0000000..bc62ae1
Binary files /dev/null and b/icons/luna/res/32x32/net_internet.png differ
diff --git a/icons/luna/res/32x32/net_lan.png b/icons/luna/res/32x32/net_lan.png
new file mode 100644
index 0000000..78f7603
Binary files /dev/null and b/icons/luna/res/32x32/net_lan.png differ
diff --git a/icons/luna/res/32x32/net_places.png b/icons/luna/res/32x32/net_places.png
new file mode 100644
index 0000000..b1ead22
Binary files /dev/null and b/icons/luna/res/32x32/net_places.png differ
diff --git a/icons/luna/res/32x32/net_remote.png b/icons/luna/res/32x32/net_remote.png
new file mode 100644
index 0000000..7e1cbb2
Binary files /dev/null and b/icons/luna/res/32x32/net_remote.png differ
diff --git a/icons/luna/res/32x32/net_search.png b/icons/luna/res/32x32/net_search.png
new file mode 100644
index 0000000..f98ba04
Binary files /dev/null and b/icons/luna/res/32x32/net_search.png differ
diff --git a/icons/luna/res/32x32/net_upload.png b/icons/luna/res/32x32/net_upload.png
new file mode 100644
index 0000000..c86fb5e
Binary files /dev/null and b/icons/luna/res/32x32/net_upload.png differ
diff --git a/icons/luna/res/32x32/net_wan.png b/icons/luna/res/32x32/net_wan.png
new file mode 100644
index 0000000..83ec598
Binary files /dev/null and b/icons/luna/res/32x32/net_wan.png differ
diff --git a/icons/luna/32x32/places/folder-remote.png b/icons/luna/res/32x32/network_share.png
similarity index 100%
rename from icons/luna/32x32/places/folder-remote.png
rename to icons/luna/res/32x32/network_share.png
diff --git a/icons/luna/res/32x32/network_share_disconnected.png b/icons/luna/res/32x32/network_share_disconnected.png
new file mode 100644
index 0000000..91a26c5
Binary files /dev/null and b/icons/luna/res/32x32/network_share_disconnected.png differ
diff --git a/icons/luna/res/32x32/new.png b/icons/luna/res/32x32/new.png
new file mode 100644
index 0000000..8ed3b5e
Binary files /dev/null and b/icons/luna/res/32x32/new.png differ
diff --git a/icons/luna/res/32x32/null.png b/icons/luna/res/32x32/null.png
new file mode 100644
index 0000000..4942a54
Binary files /dev/null and b/icons/luna/res/32x32/null.png differ
diff --git a/icons/luna/res/32x32/open.png b/icons/luna/res/32x32/open.png
new file mode 100644
index 0000000..575553c
Binary files /dev/null and b/icons/luna/res/32x32/open.png differ
diff --git a/icons/luna/res/32x32/page_setup.png b/icons/luna/res/32x32/page_setup.png
new file mode 100644
index 0000000..9f88fd4
Binary files /dev/null and b/icons/luna/res/32x32/page_setup.png differ
diff --git a/icons/luna/res/32x32/paste.png b/icons/luna/res/32x32/paste.png
new file mode 100644
index 0000000..42efd94
Binary files /dev/null and b/icons/luna/res/32x32/paste.png differ
diff --git a/icons/luna/res/32x32/pda.png b/icons/luna/res/32x32/pda.png
new file mode 100644
index 0000000..40a93b7
Binary files /dev/null and b/icons/luna/res/32x32/pda.png differ
diff --git a/icons/luna/res/32x32/people.png b/icons/luna/res/32x32/people.png
new file mode 100644
index 0000000..aa1dcd3
Binary files /dev/null and b/icons/luna/res/32x32/people.png differ
diff --git a/icons/luna/res/32x32/personal.png b/icons/luna/res/32x32/personal.png
new file mode 100644
index 0000000..0e333c3
Binary files /dev/null and b/icons/luna/res/32x32/personal.png differ
diff --git a/icons/luna/res/32x32/print.png b/icons/luna/res/32x32/print.png
new file mode 100644
index 0000000..f8de832
Binary files /dev/null and b/icons/luna/res/32x32/print.png differ
diff --git a/icons/luna/res/32x32/print_preview.png b/icons/luna/res/32x32/print_preview.png
new file mode 100644
index 0000000..b593774
Binary files /dev/null and b/icons/luna/res/32x32/print_preview.png differ
diff --git a/icons/luna/32x32/devices/printer.png b/icons/luna/res/32x32/printer.png
similarity index 100%
rename from icons/luna/32x32/devices/printer.png
rename to icons/luna/res/32x32/printer.png
diff --git a/icons/luna/32x32/actions/document-open-recent.png b/icons/luna/res/32x32/recent_docs.png
similarity index 100%
rename from icons/luna/32x32/actions/document-open-recent.png
rename to icons/luna/res/32x32/recent_docs.png
diff --git a/icons/luna/res/32x32/refresh.png b/icons/luna/res/32x32/refresh.png
new file mode 100644
index 0000000..37d1960
Binary files /dev/null and b/icons/luna/res/32x32/refresh.png differ
diff --git a/icons/luna/res/32x32/refresh_all.png b/icons/luna/res/32x32/refresh_all.png
new file mode 100644
index 0000000..98941be
Binary files /dev/null and b/icons/luna/res/32x32/refresh_all.png differ
diff --git a/icons/luna/res/32x32/remove.png b/icons/luna/res/32x32/remove.png
new file mode 100644
index 0000000..f7a03f1
Binary files /dev/null and b/icons/luna/res/32x32/remove.png differ
diff --git a/icons/luna/res/32x32/revert.png b/icons/luna/res/32x32/revert.png
new file mode 100644
index 0000000..53909d3
Binary files /dev/null and b/icons/luna/res/32x32/revert.png differ
diff --git a/icons/luna/res/32x32/revert_rtl.png b/icons/luna/res/32x32/revert_rtl.png
new file mode 100644
index 0000000..62a60ea
Binary files /dev/null and b/icons/luna/res/32x32/revert_rtl.png differ
diff --git a/icons/luna/res/32x32/right.png b/icons/luna/res/32x32/right.png
new file mode 100644
index 0000000..b85a300
Binary files /dev/null and b/icons/luna/res/32x32/right.png differ
diff --git a/icons/luna/32x32/actions/system-run.png b/icons/luna/res/32x32/run.png
similarity index 100%
rename from icons/luna/32x32/actions/system-run.png
rename to icons/luna/res/32x32/run.png
diff --git a/icons/luna/res/32x32/save.png b/icons/luna/res/32x32/save.png
new file mode 100644
index 0000000..daef843
Binary files /dev/null and b/icons/luna/res/32x32/save.png differ
diff --git a/icons/luna/res/32x32/save_as.png b/icons/luna/res/32x32/save_as.png
new file mode 100644
index 0000000..7c07cae
Binary files /dev/null and b/icons/luna/res/32x32/save_as.png differ
diff --git a/icons/luna/res/32x32/scanner.png b/icons/luna/res/32x32/scanner.png
new file mode 100644
index 0000000..2fb1512
Binary files /dev/null and b/icons/luna/res/32x32/scanner.png differ
diff --git a/icons/luna/res/32x32/screensaver.png b/icons/luna/res/32x32/screensaver.png
new file mode 100644
index 0000000..8d2d3db
Binary files /dev/null and b/icons/luna/res/32x32/screensaver.png differ
diff --git a/icons/luna/32x32/actions/system-search.png b/icons/luna/res/32x32/search.png
similarity index 100%
rename from icons/luna/32x32/actions/system-search.png
rename to icons/luna/res/32x32/search.png
diff --git a/icons/luna/res/32x32/settings.png b/icons/luna/res/32x32/settings.png
new file mode 100644
index 0000000..4ace5a6
Binary files /dev/null and b/icons/luna/res/32x32/settings.png differ
diff --git a/icons/luna/32x32/actions/system-shutdown.png b/icons/luna/res/32x32/shutdown.png
similarity index 100%
rename from icons/luna/32x32/actions/system-shutdown.png
rename to icons/luna/res/32x32/shutdown.png
diff --git a/icons/luna/res/32x32/strikethrough.png b/icons/luna/res/32x32/strikethrough.png
new file mode 100644
index 0000000..28bf6ed
Binary files /dev/null and b/icons/luna/res/32x32/strikethrough.png differ
diff --git a/icons/luna/res/32x32/tablet_pc.png b/icons/luna/res/32x32/tablet_pc.png
new file mode 100644
index 0000000..679f145
Binary files /dev/null and b/icons/luna/res/32x32/tablet_pc.png differ
diff --git a/icons/luna/res/32x32/text_dir_ltr.png b/icons/luna/res/32x32/text_dir_ltr.png
new file mode 100644
index 0000000..1669c47
Binary files /dev/null and b/icons/luna/res/32x32/text_dir_ltr.png differ
diff --git a/icons/luna/res/32x32/text_dir_rtl.png b/icons/luna/res/32x32/text_dir_rtl.png
new file mode 100644
index 0000000..f901be6
Binary files /dev/null and b/icons/luna/res/32x32/text_dir_rtl.png differ
diff --git a/icons/luna/32x32/apps/thunderbird.png b/icons/luna/res/32x32/thunderbird.png
similarity index 100%
rename from icons/luna/32x32/apps/thunderbird.png
rename to icons/luna/res/32x32/thunderbird.png
diff --git a/icons/luna/res/32x32/underline.png b/icons/luna/res/32x32/underline.png
new file mode 100644
index 0000000..18a4208
Binary files /dev/null and b/icons/luna/res/32x32/underline.png differ
diff --git a/icons/luna/res/32x32/volume_off.png b/icons/luna/res/32x32/volume_off.png
new file mode 100644
index 0000000..5e3ba10
Binary files /dev/null and b/icons/luna/res/32x32/volume_off.png differ
diff --git a/icons/luna/res/32x32/volume_on.png b/icons/luna/res/32x32/volume_on.png
new file mode 100644
index 0000000..e7f9701
Binary files /dev/null and b/icons/luna/res/32x32/volume_on.png differ
diff --git a/icons/luna/res/48x48/accessibility.png b/icons/luna/res/48x48/accessibility.png
new file mode 100644
index 0000000..3c2a267
Binary files /dev/null and b/icons/luna/res/48x48/accessibility.png differ
diff --git a/icons/luna/res/48x48/address_book.png b/icons/luna/res/48x48/address_book.png
new file mode 100644
index 0000000..d922930
Binary files /dev/null and b/icons/luna/res/48x48/address_book.png differ
diff --git a/icons/luna/res/48x48/auth.png b/icons/luna/res/48x48/auth.png
new file mode 100644
index 0000000..f14ffd9
Binary files /dev/null and b/icons/luna/res/48x48/auth.png differ
diff --git a/icons/luna/48x48/places/user-trash.png b/icons/luna/res/48x48/bin.png
similarity index 100%
rename from icons/luna/48x48/places/user-trash.png
rename to icons/luna/res/48x48/bin.png
diff --git a/icons/luna/48x48/status/user-trash-full.png b/icons/luna/res/48x48/bin_full.png
similarity index 100%
rename from icons/luna/48x48/status/user-trash-full.png
rename to icons/luna/res/48x48/bin_full.png
diff --git a/icons/luna/res/48x48/bluetooth.png b/icons/luna/res/48x48/bluetooth.png
new file mode 100644
index 0000000..84d77eb
Binary files /dev/null and b/icons/luna/res/48x48/bluetooth.png differ
diff --git a/icons/luna/res/48x48/calendar.png b/icons/luna/res/48x48/calendar.png
new file mode 100644
index 0000000..2f0582b
Binary files /dev/null and b/icons/luna/res/48x48/calendar.png differ
diff --git a/icons/luna/res/48x48/camcorder.png b/icons/luna/res/48x48/camcorder.png
new file mode 100644
index 0000000..7f576f6
Binary files /dev/null and b/icons/luna/res/48x48/camcorder.png differ
diff --git a/icons/luna/res/48x48/camera.png b/icons/luna/res/48x48/camera.png
new file mode 100644
index 0000000..c49697f
Binary files /dev/null and b/icons/luna/res/48x48/camera.png differ
diff --git a/icons/luna/res/48x48/cli.png b/icons/luna/res/48x48/cli.png
new file mode 100644
index 0000000..232e2e3
Binary files /dev/null and b/icons/luna/res/48x48/cli.png differ
diff --git a/icons/luna/48x48/devices/computer.png b/icons/luna/res/48x48/computer.png
similarity index 100%
rename from icons/luna/48x48/devices/computer.png
rename to icons/luna/res/48x48/computer.png
diff --git a/icons/luna/res/48x48/contact.png b/icons/luna/res/48x48/contact.png
new file mode 100644
index 0000000..2a4e5c8
Binary files /dev/null and b/icons/luna/res/48x48/contact.png differ
diff --git a/icons/luna/res/48x48/control_appearance.png b/icons/luna/res/48x48/control_appearance.png
new file mode 100644
index 0000000..a4e1994
Binary files /dev/null and b/icons/luna/res/48x48/control_appearance.png differ
diff --git a/icons/luna/res/48x48/control_display.png b/icons/luna/res/48x48/control_display.png
new file mode 100644
index 0000000..9eccbf6
Binary files /dev/null and b/icons/luna/res/48x48/control_display.png differ
diff --git a/icons/luna/res/48x48/control_notifications.png b/icons/luna/res/48x48/control_notifications.png
new file mode 100644
index 0000000..234c51c
Binary files /dev/null and b/icons/luna/res/48x48/control_notifications.png differ
diff --git a/icons/luna/48x48/apps/preferences-other.png b/icons/luna/res/48x48/control_panel.png
similarity index 100%
rename from icons/luna/48x48/apps/preferences-other.png
rename to icons/luna/res/48x48/control_panel.png
diff --git a/icons/luna/48x48/places/user-desktop.png b/icons/luna/res/48x48/desktop.png
similarity index 100%
rename from icons/luna/48x48/places/user-desktop.png
rename to icons/luna/res/48x48/desktop.png
diff --git a/icons/luna/res/48x48/dialog_error.png b/icons/luna/res/48x48/dialog_error.png
new file mode 100644
index 0000000..bc7cea3
Binary files /dev/null and b/icons/luna/res/48x48/dialog_error.png differ
diff --git a/icons/luna/res/48x48/dialog_info.png b/icons/luna/res/48x48/dialog_info.png
new file mode 100644
index 0000000..20680c8
Binary files /dev/null and b/icons/luna/res/48x48/dialog_info.png differ
diff --git a/icons/luna/res/48x48/dialog_warning.png b/icons/luna/res/48x48/dialog_warning.png
new file mode 100644
index 0000000..4e36774
Binary files /dev/null and b/icons/luna/res/48x48/dialog_warning.png differ
diff --git a/icons/luna/res/48x48/disc.png b/icons/luna/res/48x48/disc.png
new file mode 100644
index 0000000..b7c5706
Binary files /dev/null and b/icons/luna/res/48x48/disc.png differ
diff --git a/icons/luna/48x48/devices/drive-harddisk.png b/icons/luna/res/48x48/drive_disk.png
similarity index 100%
rename from icons/luna/48x48/devices/drive-harddisk.png
rename to icons/luna/res/48x48/drive_disk.png
diff --git a/icons/luna/48x48/devices/drive-removable-media.png b/icons/luna/res/48x48/drive_external.png
similarity index 100%
rename from icons/luna/48x48/devices/drive-removable-media.png
rename to icons/luna/res/48x48/drive_external.png
diff --git a/icons/luna/res/48x48/drive_floppy.png b/icons/luna/res/48x48/drive_floppy.png
new file mode 100644
index 0000000..afd882c
Binary files /dev/null and b/icons/luna/res/48x48/drive_floppy.png differ
diff --git a/icons/luna/48x48/devices/drive-optical.png b/icons/luna/res/48x48/drive_optical.png
similarity index 100%
rename from icons/luna/48x48/devices/drive-optical.png
rename to icons/luna/res/48x48/drive_optical.png
diff --git a/icons/luna/res/48x48/fave.png b/icons/luna/res/48x48/fave.png
new file mode 100644
index 0000000..1d18684
Binary files /dev/null and b/icons/luna/res/48x48/fave.png differ
diff --git a/icons/luna/res/48x48/file_bmp.png b/icons/luna/res/48x48/file_bmp.png
new file mode 100644
index 0000000..99c9bd1
Binary files /dev/null and b/icons/luna/res/48x48/file_bmp.png differ
diff --git a/icons/luna/res/48x48/file_cab.png b/icons/luna/res/48x48/file_cab.png
new file mode 100644
index 0000000..564df54
Binary files /dev/null and b/icons/luna/res/48x48/file_cab.png differ
diff --git a/icons/luna/res/48x48/file_doc.png b/icons/luna/res/48x48/file_doc.png
new file mode 100644
index 0000000..ded4e68
Binary files /dev/null and b/icons/luna/res/48x48/file_doc.png differ
diff --git a/icons/luna/res/48x48/file_dot.png b/icons/luna/res/48x48/file_dot.png
new file mode 100644
index 0000000..c9b19f0
Binary files /dev/null and b/icons/luna/res/48x48/file_dot.png differ
diff --git a/icons/luna/res/48x48/file_generic.png b/icons/luna/res/48x48/file_generic.png
new file mode 100644
index 0000000..1b206d0
Binary files /dev/null and b/icons/luna/res/48x48/file_generic.png differ
diff --git a/icons/luna/res/48x48/file_generic_audio_project.png b/icons/luna/res/48x48/file_generic_audio_project.png
new file mode 100644
index 0000000..df77813
Binary files /dev/null and b/icons/luna/res/48x48/file_generic_audio_project.png differ
diff --git a/icons/luna/res/48x48/file_generic_config.png b/icons/luna/res/48x48/file_generic_config.png
new file mode 100644
index 0000000..3aa0b9f
Binary files /dev/null and b/icons/luna/res/48x48/file_generic_config.png differ
diff --git a/icons/luna/res/48x48/file_generic_executable.png b/icons/luna/res/48x48/file_generic_executable.png
new file mode 100644
index 0000000..3399100
Binary files /dev/null and b/icons/luna/res/48x48/file_generic_executable.png differ
diff --git a/icons/luna/res/48x48/file_generic_font.png b/icons/luna/res/48x48/file_generic_font.png
new file mode 100644
index 0000000..0a614b1
Binary files /dev/null and b/icons/luna/res/48x48/file_generic_font.png differ
diff --git a/icons/luna/res/48x48/file_generic_installer.png b/icons/luna/res/48x48/file_generic_installer.png
new file mode 100644
index 0000000..7df901a
Binary files /dev/null and b/icons/luna/res/48x48/file_generic_installer.png differ
diff --git a/icons/luna/res/48x48/file_generic_library.png b/icons/luna/res/48x48/file_generic_library.png
new file mode 100644
index 0000000..540bace
Binary files /dev/null and b/icons/luna/res/48x48/file_generic_library.png differ
diff --git a/icons/luna/res/48x48/file_generic_media.png b/icons/luna/res/48x48/file_generic_media.png
new file mode 100644
index 0000000..9b8b103
Binary files /dev/null and b/icons/luna/res/48x48/file_generic_media.png differ
diff --git a/icons/luna/res/48x48/file_generic_shell.png b/icons/luna/res/48x48/file_generic_shell.png
new file mode 100644
index 0000000..95edb43
Binary files /dev/null and b/icons/luna/res/48x48/file_generic_shell.png differ
diff --git a/icons/luna/res/48x48/file_generic_vector_drawing.png b/icons/luna/res/48x48/file_generic_vector_drawing.png
new file mode 100644
index 0000000..d275fcb
Binary files /dev/null and b/icons/luna/res/48x48/file_generic_vector_drawing.png differ
diff --git a/icons/luna/res/48x48/file_generic_video_project.png b/icons/luna/res/48x48/file_generic_video_project.png
new file mode 100644
index 0000000..990d097
Binary files /dev/null and b/icons/luna/res/48x48/file_generic_video_project.png differ
diff --git a/icons/luna/res/48x48/file_jpg.png b/icons/luna/res/48x48/file_jpg.png
new file mode 100644
index 0000000..ad433cd
Binary files /dev/null and b/icons/luna/res/48x48/file_jpg.png differ
diff --git a/icons/luna/res/48x48/file_mdb.png b/icons/luna/res/48x48/file_mdb.png
new file mode 100644
index 0000000..7a9f212
Binary files /dev/null and b/icons/luna/res/48x48/file_mdb.png differ
diff --git a/icons/luna/res/48x48/file_msg.png b/icons/luna/res/48x48/file_msg.png
new file mode 100644
index 0000000..8390bea
Binary files /dev/null and b/icons/luna/res/48x48/file_msg.png differ
diff --git a/icons/luna/res/48x48/file_msstyles.png b/icons/luna/res/48x48/file_msstyles.png
new file mode 100644
index 0000000..36e8127
Binary files /dev/null and b/icons/luna/res/48x48/file_msstyles.png differ
diff --git a/icons/luna/res/48x48/file_otf.png b/icons/luna/res/48x48/file_otf.png
new file mode 100644
index 0000000..5753b8b
Binary files /dev/null and b/icons/luna/res/48x48/file_otf.png differ
diff --git a/icons/luna/res/48x48/file_pot.png b/icons/luna/res/48x48/file_pot.png
new file mode 100644
index 0000000..0bc6c11
Binary files /dev/null and b/icons/luna/res/48x48/file_pot.png differ
diff --git a/icons/luna/res/48x48/file_pps.png b/icons/luna/res/48x48/file_pps.png
new file mode 100644
index 0000000..e889c93
Binary files /dev/null and b/icons/luna/res/48x48/file_pps.png differ
diff --git a/icons/luna/res/48x48/file_ppt.png b/icons/luna/res/48x48/file_ppt.png
new file mode 100644
index 0000000..4500292
Binary files /dev/null and b/icons/luna/res/48x48/file_ppt.png differ
diff --git a/icons/luna/res/48x48/file_pub.png b/icons/luna/res/48x48/file_pub.png
new file mode 100644
index 0000000..7aef52d
Binary files /dev/null and b/icons/luna/res/48x48/file_pub.png differ
diff --git a/icons/luna/res/48x48/file_tiff.png b/icons/luna/res/48x48/file_tiff.png
new file mode 100644
index 0000000..6150494
Binary files /dev/null and b/icons/luna/res/48x48/file_tiff.png differ
diff --git a/icons/luna/res/48x48/file_ttf.png b/icons/luna/res/48x48/file_ttf.png
new file mode 100644
index 0000000..8ae8056
Binary files /dev/null and b/icons/luna/res/48x48/file_ttf.png differ
diff --git a/icons/luna/res/48x48/file_txt.png b/icons/luna/res/48x48/file_txt.png
new file mode 100644
index 0000000..1f01657
Binary files /dev/null and b/icons/luna/res/48x48/file_txt.png differ
diff --git a/icons/luna/res/48x48/file_unknown.png b/icons/luna/res/48x48/file_unknown.png
new file mode 100644
index 0000000..e77c150
Binary files /dev/null and b/icons/luna/res/48x48/file_unknown.png differ
diff --git a/icons/luna/res/48x48/file_vsd.png b/icons/luna/res/48x48/file_vsd.png
new file mode 100644
index 0000000..64ad7a1
Binary files /dev/null and b/icons/luna/res/48x48/file_vsd.png differ
diff --git a/icons/luna/res/48x48/file_vst.png b/icons/luna/res/48x48/file_vst.png
new file mode 100644
index 0000000..1cd038d
Binary files /dev/null and b/icons/luna/res/48x48/file_vst.png differ
diff --git a/icons/luna/res/48x48/file_xls.png b/icons/luna/res/48x48/file_xls.png
new file mode 100644
index 0000000..1d46d38
Binary files /dev/null and b/icons/luna/res/48x48/file_xls.png differ
diff --git a/icons/luna/res/48x48/file_xlt.png b/icons/luna/res/48x48/file_xlt.png
new file mode 100644
index 0000000..023e7c7
Binary files /dev/null and b/icons/luna/res/48x48/file_xlt.png differ
diff --git a/icons/luna/48x48/apps/firefox.png b/icons/luna/res/48x48/firefox.png
similarity index 100%
rename from icons/luna/48x48/apps/firefox.png
rename to icons/luna/res/48x48/firefox.png
diff --git a/icons/luna/48x48/places/folder.png b/icons/luna/res/48x48/folder.png
similarity index 100%
rename from icons/luna/48x48/places/folder.png
rename to icons/luna/res/48x48/folder.png
diff --git a/icons/luna/res/48x48/folder_compressed.png b/icons/luna/res/48x48/folder_compressed.png
new file mode 100644
index 0000000..ae2e53a
Binary files /dev/null and b/icons/luna/res/48x48/folder_compressed.png differ
diff --git a/icons/luna/48x48/places/folder-documents.png b/icons/luna/res/48x48/folder_documents.png
similarity index 100%
rename from icons/luna/48x48/places/folder-documents.png
rename to icons/luna/res/48x48/folder_documents.png
diff --git a/icons/luna/res/48x48/folder_fonts.png b/icons/luna/res/48x48/folder_fonts.png
new file mode 100644
index 0000000..f2eeabb
Binary files /dev/null and b/icons/luna/res/48x48/folder_fonts.png differ
diff --git a/icons/luna/48x48/places/folder-music.png b/icons/luna/res/48x48/folder_music.png
similarity index 100%
rename from icons/luna/48x48/places/folder-music.png
rename to icons/luna/res/48x48/folder_music.png
diff --git a/icons/luna/res/48x48/folder_network.png b/icons/luna/res/48x48/folder_network.png
new file mode 100644
index 0000000..1dc66fd
Binary files /dev/null and b/icons/luna/res/48x48/folder_network.png differ
diff --git a/icons/luna/res/48x48/folder_new.png b/icons/luna/res/48x48/folder_new.png
new file mode 100644
index 0000000..94db387
Binary files /dev/null and b/icons/luna/res/48x48/folder_new.png differ
diff --git a/icons/luna/res/48x48/folder_open.png b/icons/luna/res/48x48/folder_open.png
new file mode 100644
index 0000000..b8c0d9b
Binary files /dev/null and b/icons/luna/res/48x48/folder_open.png differ
diff --git a/icons/luna/48x48/places/folder-pictures.png b/icons/luna/res/48x48/folder_pictures.png
similarity index 100%
rename from icons/luna/48x48/places/folder-pictures.png
rename to icons/luna/res/48x48/folder_pictures.png
diff --git a/icons/luna/48x48/apps/system-software-install.png b/icons/luna/res/48x48/folder_programs.png
similarity index 100%
rename from icons/luna/48x48/apps/system-software-install.png
rename to icons/luna/res/48x48/folder_programs.png
diff --git a/icons/luna/res/48x48/folder_search.png b/icons/luna/res/48x48/folder_search.png
new file mode 100644
index 0000000..afa0016
Binary files /dev/null and b/icons/luna/res/48x48/folder_search.png differ
diff --git a/icons/luna/res/48x48/folder_shared.png b/icons/luna/res/48x48/folder_shared.png
new file mode 100644
index 0000000..96056db
Binary files /dev/null and b/icons/luna/res/48x48/folder_shared.png differ
diff --git a/icons/luna/48x48/places/folder-videos.png b/icons/luna/res/48x48/folder_videos.png
similarity index 100%
rename from icons/luna/48x48/places/folder-videos.png
rename to icons/luna/res/48x48/folder_videos.png
diff --git a/icons/luna/res/48x48/gamepad.png b/icons/luna/res/48x48/gamepad.png
new file mode 100644
index 0000000..ec5a371
Binary files /dev/null and b/icons/luna/res/48x48/gamepad.png differ
diff --git a/icons/luna/res/48x48/hardware.png b/icons/luna/res/48x48/hardware.png
new file mode 100644
index 0000000..72981a8
Binary files /dev/null and b/icons/luna/res/48x48/hardware.png differ
diff --git a/icons/luna/48x48/apps/help-browser.png b/icons/luna/res/48x48/help.png
similarity index 100%
rename from icons/luna/48x48/apps/help-browser.png
rename to icons/luna/res/48x48/help.png
diff --git a/icons/luna/res/48x48/keyboard.png b/icons/luna/res/48x48/keyboard.png
new file mode 100644
index 0000000..0064d7d
Binary files /dev/null and b/icons/luna/res/48x48/keyboard.png differ
diff --git a/icons/luna/res/48x48/keyboard_shortcuts.png b/icons/luna/res/48x48/keyboard_shortcuts.png
new file mode 100644
index 0000000..9f7b7df
Binary files /dev/null and b/icons/luna/res/48x48/keyboard_shortcuts.png differ
diff --git a/icons/luna/res/48x48/lock.png b/icons/luna/res/48x48/lock.png
new file mode 100644
index 0000000..0348cbd
Binary files /dev/null and b/icons/luna/res/48x48/lock.png differ
diff --git a/icons/luna/48x48/actions/system-log-out.png b/icons/luna/res/48x48/logoff.png
similarity index 100%
rename from icons/luna/48x48/actions/system-log-out.png
rename to icons/luna/res/48x48/logoff.png
diff --git a/icons/luna/res/48x48/media_player.png b/icons/luna/res/48x48/media_player.png
new file mode 100644
index 0000000..d7c4b7f
Binary files /dev/null and b/icons/luna/res/48x48/media_player.png differ
diff --git a/icons/luna/48x48/apps/preferences-desktop-default-applications.png b/icons/luna/res/48x48/mimetypes.png
similarity index 100%
rename from icons/luna/48x48/apps/preferences-desktop-default-applications.png
rename to icons/luna/res/48x48/mimetypes.png
diff --git a/icons/luna/res/48x48/mouse.png b/icons/luna/res/48x48/mouse.png
new file mode 100644
index 0000000..7fcf44b
Binary files /dev/null and b/icons/luna/res/48x48/mouse.png differ
diff --git a/icons/luna/48x48/apps/preferences-system-network.png b/icons/luna/res/48x48/net_connections.png
similarity index 100%
rename from icons/luna/48x48/apps/preferences-system-network.png
rename to icons/luna/res/48x48/net_connections.png
diff --git a/icons/luna/res/48x48/net_internet.png b/icons/luna/res/48x48/net_internet.png
new file mode 100644
index 0000000..68eabd7
Binary files /dev/null and b/icons/luna/res/48x48/net_internet.png differ
diff --git a/icons/luna/res/48x48/net_lan.png b/icons/luna/res/48x48/net_lan.png
new file mode 100644
index 0000000..dcf272f
Binary files /dev/null and b/icons/luna/res/48x48/net_lan.png differ
diff --git a/icons/luna/res/48x48/net_places.png b/icons/luna/res/48x48/net_places.png
new file mode 100644
index 0000000..22a7e38
Binary files /dev/null and b/icons/luna/res/48x48/net_places.png differ
diff --git a/icons/luna/res/48x48/net_remote.png b/icons/luna/res/48x48/net_remote.png
new file mode 100644
index 0000000..b1fc8aa
Binary files /dev/null and b/icons/luna/res/48x48/net_remote.png differ
diff --git a/icons/luna/res/48x48/net_search.png b/icons/luna/res/48x48/net_search.png
new file mode 100644
index 0000000..905d0fa
Binary files /dev/null and b/icons/luna/res/48x48/net_search.png differ
diff --git a/icons/luna/res/48x48/net_upload.png b/icons/luna/res/48x48/net_upload.png
new file mode 100644
index 0000000..f68ffdb
Binary files /dev/null and b/icons/luna/res/48x48/net_upload.png differ
diff --git a/icons/luna/res/48x48/net_wan.png b/icons/luna/res/48x48/net_wan.png
new file mode 100644
index 0000000..1e10c5c
Binary files /dev/null and b/icons/luna/res/48x48/net_wan.png differ
diff --git a/icons/luna/48x48/places/folder-remote.png b/icons/luna/res/48x48/network_share.png
similarity index 100%
rename from icons/luna/48x48/places/folder-remote.png
rename to icons/luna/res/48x48/network_share.png
diff --git a/icons/luna/res/48x48/network_share_disconnected.png b/icons/luna/res/48x48/network_share_disconnected.png
new file mode 100644
index 0000000..b4c797b
Binary files /dev/null and b/icons/luna/res/48x48/network_share_disconnected.png differ
diff --git a/icons/luna/res/48x48/null.png b/icons/luna/res/48x48/null.png
new file mode 100644
index 0000000..b0c3948
Binary files /dev/null and b/icons/luna/res/48x48/null.png differ
diff --git a/icons/luna/res/48x48/pda.png b/icons/luna/res/48x48/pda.png
new file mode 100644
index 0000000..f20af62
Binary files /dev/null and b/icons/luna/res/48x48/pda.png differ
diff --git a/icons/luna/res/48x48/people.png b/icons/luna/res/48x48/people.png
new file mode 100644
index 0000000..632225d
Binary files /dev/null and b/icons/luna/res/48x48/people.png differ
diff --git a/icons/luna/res/48x48/personal.png b/icons/luna/res/48x48/personal.png
new file mode 100644
index 0000000..6df7bf3
Binary files /dev/null and b/icons/luna/res/48x48/personal.png differ
diff --git a/icons/luna/48x48/devices/printer.png b/icons/luna/res/48x48/printer.png
similarity index 100%
rename from icons/luna/48x48/devices/printer.png
rename to icons/luna/res/48x48/printer.png
diff --git a/icons/luna/48x48/actions/document-open-recent.png b/icons/luna/res/48x48/recent_docs.png
similarity index 100%
rename from icons/luna/48x48/actions/document-open-recent.png
rename to icons/luna/res/48x48/recent_docs.png
diff --git a/icons/luna/48x48/actions/system-run.png b/icons/luna/res/48x48/run.png
similarity index 100%
rename from icons/luna/48x48/actions/system-run.png
rename to icons/luna/res/48x48/run.png
diff --git a/icons/luna/res/48x48/scanner.png b/icons/luna/res/48x48/scanner.png
new file mode 100644
index 0000000..986c629
Binary files /dev/null and b/icons/luna/res/48x48/scanner.png differ
diff --git a/icons/luna/48x48/actions/system-search.png b/icons/luna/res/48x48/search.png
similarity index 100%
rename from icons/luna/48x48/actions/system-search.png
rename to icons/luna/res/48x48/search.png
diff --git a/icons/luna/res/48x48/settings.png b/icons/luna/res/48x48/settings.png
new file mode 100644
index 0000000..7b17769
Binary files /dev/null and b/icons/luna/res/48x48/settings.png differ
diff --git a/icons/luna/48x48/actions/system-shutdown.png b/icons/luna/res/48x48/shutdown.png
similarity index 100%
rename from icons/luna/48x48/actions/system-shutdown.png
rename to icons/luna/res/48x48/shutdown.png
diff --git a/icons/luna/res/48x48/tablet_pc.png b/icons/luna/res/48x48/tablet_pc.png
new file mode 100644
index 0000000..93aebd5
Binary files /dev/null and b/icons/luna/res/48x48/tablet_pc.png differ
diff --git a/icons/luna/48x48/apps/thunderbird.png b/icons/luna/res/48x48/thunderbird.png
similarity index 100%
rename from icons/luna/48x48/apps/thunderbird.png
rename to icons/luna/res/48x48/thunderbird.png
diff --git a/icons/luna/res/48x48/volume_off.png b/icons/luna/res/48x48/volume_off.png
new file mode 100644
index 0000000..6992c62
Binary files /dev/null and b/icons/luna/res/48x48/volume_off.png differ
diff --git a/icons/luna/res/48x48/volume_on.png b/icons/luna/res/48x48/volume_on.png
new file mode 100644
index 0000000..72a2d9c
Binary files /dev/null and b/icons/luna/res/48x48/volume_on.png differ
diff --git a/packaging/deb/icons/packicon.sh b/packaging/deb/icons/packicon.sh
new file mode 100755
index 0000000..76cc497
--- /dev/null
+++ b/packaging/deb/icons/packicon.sh
@@ -0,0 +1,153 @@
+#!/bin/bash
+
+#
+# packicon.sh - Icon Packaging Script (Debian)
+#
+# This source-code is part of Windows XP stuff for XFCE:
+# <<https://www.oddmatics.uk>>
+#
+# Author(s): Rory Fewell <roryf@oddmaics.uk>
+#
+
+#
+# CONSTANTS
+#
+L_SCRIPTDIR=`dirname "$0"`
+
+CURDIR=`realpath -s "./"`
+MAPPINGS_FILENAME='mappings'
+PKG_DIR=`realpath -s "./tmp.ico-pkg"`
+REQUIRED_PACKAGES=(
+    'fakeroot'
+)
+SCRIPTDIR=`realpath -s "${L_SCRIPTDIR}"`
+
+REPO_ROOT=`realpath -s "${SCRIPTDIR}/../../.."`
+ICONS_ROOT="${REPO_ROOT}/icons"
+
+
+#
+# PRE-FLIGHT CHECKS
+#
+for package in "${REQUIRED_PACKAGES[@]}"
+do
+    dpkg -s $package > /dev/null 2>&1
+
+    if [[ $? -gt 0 ]]
+    then
+        echo "You are missing package: ${package}"
+        exit 1
+    fi
+done
+
+
+#
+# MAIN SCRIPT
+#
+
+# The arguments passed to this script should specify the icon themes to build, for
+# example:
+#
+#     ./packicon.sh luna professional
+#
+for themestr in "$@"
+do
+    theme_dir="${ICONS_ROOT}/${themestr}"
+    theme_map_path="${theme_dir}/mappings"
+    theme_res="${theme_dir}/res"
+
+    if [[ ! -d "${theme_dir}" ]]
+    then
+        echo "Can't find icon theme: ${themestr}."
+        continue
+    fi
+
+    # Set up our package's working directory
+    #
+    pkg_theme_dir="${PKG_DIR}/usr/share/icons/${themestr}"
+    pkg_debian_dir="${PKG_DIR}/DEBIAN"
+    pkg_icores_dir="${pkg_theme_dir}/res"
+
+    if [[ -d "${PKG_DIR}" ]]
+    then
+        rm -rf "${PKG_DIR}"
+    fi
+
+    mkdir "${PKG_DIR}"
+    mkdir -p "${pkg_icores_dir}"
+    mkdir "${pkg_debian_dir}"
+
+    # Copy resources to package
+    #
+    cp -r "${theme_res}"/* "${pkg_icores_dir}"
+
+    # Create size dirs
+    #
+    mkdir "${pkg_theme_dir}/16x16"
+    mkdir "${pkg_theme_dir}/24x24"
+    mkdir "${pkg_theme_dir}/32x32"
+    mkdir "${pkg_theme_dir}/48x48"
+
+    # Create symbolic links
+    #
+    readarray -t mappings < $theme_map_path
+
+    for mapping in ${mappings[*]}
+    do
+        if [[ $mapping =~ ([a-z]+)/([a-z0-9.+_-]+)--\>([A-Za-z_]+) ]]
+        then
+            icon_context="${BASH_REMATCH[1]}"
+            icon_name="${BASH_REMATCH[2]}"
+            target_icon="${BASH_REMATCH[3]}"
+
+            for size in 16x16 24x24 32x32 48x48;
+            do
+                link_dir="${pkg_theme_dir}/${size}/${icon_context}"
+                link_fullpath="${link_dir}/${icon_name}.png"
+                link_target="../../res/${size}/${target_icon}.png"
+
+                mkdir -p "${link_dir}"
+
+                ln -s "${link_target}" "${link_fullpath}"
+            done
+        else
+            echo "Invalid mapping '${mapping}' in ${theme_map_path}"
+            continue
+        fi
+    done
+
+    # Copy across index.theme
+    #
+    cp "${theme_dir}/index.theme" "${pkg_theme_dir}"
+    cp "${theme_dir}/debian-control" "${pkg_debian_dir}/control"
+
+    # Create postinst script to do the icon cache
+    #
+    debian_postinst=`cat <<EOF
+#!/bin/bash
+
+gtk-update-icon-cache /usr/share/icons/${themestr}/
+EOF
+`
+
+    echo "${debian_postinst}" > "${pkg_debian_dir}/postinst"
+    chmod +x "${pkg_debian_dir}/postinst"
+
+    # Compile package
+    #
+    fakeroot dpkg-deb -v --build "${PKG_DIR}" > /dev/null 2>&1
+
+    if [[ $? -gt 0 ]]
+    then
+        echo "Failed to build package for ${themestr}."
+        continue
+    fi
+
+    mv "${PKG_DIR}.deb" "icon-theme-${themestr}.deb"
+
+    rm -rf "${PKG_DIR}"
+
+    echo "Built ${themestr}."
+done
+
+echo "Packaging complete."