137 files changed, 132 insertions, 177 deletions

diff --git a/src/Authoring/Q3DStudio.pro b/src/Authoring/Q3DStudio.pro
index 7dbbb22e..713f59d1 100644
--- a/src/Authoring/Q3DStudio.pro
+++ b/src/Authoring/Q3DStudio.pro
@@ -224,4 +224,4 @@ RESOURCES += \
 target.path = $$[QT_INSTALL_BINS]
 INSTALLS += target
 
-RC_ICONS = Studio/res/Studio.ico
+RC_ICONS = Studio/images/Studio.ico
diff --git a/src/Authoring/Studio/Application/StudioTutorialWidget.cpp b/src/Authoring/Studio/Application/StudioTutorialWidget.cpp
index d354d731..27a4e342 100644
--- a/src/Authoring/Studio/Application/StudioTutorialWidget.cpp
+++ b/src/Authoring/Studio/Application/StudioTutorialWidget.cpp
@@ -173,7 +173,7 @@ void StudioTutorialWidget::handleCreateNew()
 
 void StudioTutorialWidget::getImageList()
 {
-    QDirIterator *it = new QDirIterator(":/res/Tutorial/screens/",
+    QDirIterator *it = new QDirIterator(":/images/Tutorial/screens/",
                                         QDirIterator::NoIteratorFlags);
 
     while (it->hasNext())
diff --git a/src/Authoring/Studio/Application/StudioTutorialWidget.ui b/src/Authoring/Studio/Application/StudioTutorialWidget.ui
index cb83a5ce..e650df97 100644
--- a/src/Authoring/Studio/Application/StudioTutorialWidget.ui
+++ b/src/Authoring/Studio/Application/StudioTutorialWidget.ui
@@ -116,7 +116,7 @@
       </property>
       <property name="icon">
        <iconset resource="../qt3dstudio.qrc">
-        <normaloff>:/res/Tutorial/button_back.png</normaloff>:/res/Tutorial/button_back.png</iconset>
+        <normaloff>:/images/Tutorial/button_back.png</normaloff>:/images/Tutorial/button_back.png</iconset>
       </property>
       <property name="iconSize">
        <size>
@@ -161,7 +161,7 @@
       </property>
       <property name="icon">
        <iconset resource="../qt3dstudio.qrc">
-        <normaloff>:/res/Tutorial/button_next.png</normaloff>:/res/Tutorial/button_next.png</iconset>
+        <normaloff>:/images/Tutorial/button_next.png</normaloff>:/images/Tutorial/button_next.png</iconset>
       </property>
       <property name="iconSize">
        <size>
diff --git a/src/Authoring/Studio/MainFrm.qrc b/src/Authoring/Studio/MainFrm.qrc
index cb91ad47..af38405b 100644
--- a/src/Authoring/Studio/MainFrm.qrc
+++ b/src/Authoring/Studio/MainFrm.qrc
@@ -1,83 +1,5 @@
 <RCC>
     <qresource prefix="/">
-        <file>res/prefstab-00.png</file>
-        <file>res/prefstab-01.png</file>
-        <file>res/client_tools_hi_color-00.png</file>
-        <file>res/client_tools_hi_color-01.png</file>
-        <file>res/client_tools_hi_color-02.png</file>
-        <file>res/client_tools_hi_color-03.png</file>
-        <file>res/client_tools_hi_color-04.png</file>
-        <file>res/client_tools_hi_color-05.png</file>
-        <file>res/client_tools_hi_color-06.png</file>
-        <file>res/editcamera_tools_hi-00.png</file>
-        <file>res/editcamera_tools_hi-01.png</file>
-        <file>res/editcamera_tools_hi-02.png</file>
-        <file>res/editcamera_tools_hi-03.png</file>
-        <file>res/editcamera_tools_hi-04.png</file>
-        <file>res/editcamera_tools_hi-05.png</file>
-        <file>res/playback_tools_low-00.png</file>
-        <file>res/playback_tools_low-01.png</file>
-        <file>res/playback_tools_low-02.png</file>
-        <file>res/playback_tools_low-03.png</file>
-        <file>res/Toolbar-00.png</file>
-        <file>res/Toolbar-01.png</file>
-        <file>res/Toolbar-02.png</file>
-        <file>res/Toolbar-03.png</file>
-        <file>res/Toolbar-04.png</file>
-        <file>res/Toolbar-05.png</file>
-        <file>res/Toolbar-06.png</file>
-        <file>res/Toolbar-07.png</file>
-        <file>res/About Icon.bmp</file>
-        <file>res/Studio.png</file>
         <file>style.qss</file>
-        <file>res/separator.png</file>
-        <file>res/editcamera_tools_hi-00_disabled.png</file>
-        <file>res/editcamera_tools_hi-01_disabled.png</file>
-        <file>res/editcamera_tools_hi-02_disabled.png</file>
-        <file>res/editcamera_tools_hi-03_disabled.png</file>
-        <file>res/editcamera_tools_hi-04_disabled.png</file>
-        <file>res/editcamera_tools_hi-05_disabled.png</file>
-        <file>res/editcamera_tools_hi-00@2x.png</file>
-        <file>res/editcamera_tools_hi-00_disabled@2x.png</file>
-        <file>res/editcamera_tools_hi-01@2x.png</file>
-        <file>res/editcamera_tools_hi-01_disabled@2x.png</file>
-        <file>res/editcamera_tools_hi-02@2x.png</file>
-        <file>res/editcamera_tools_hi-02_disabled@2x.png</file>
-        <file>res/editcamera_tools_hi-03@2x.png</file>
-        <file>res/editcamera_tools_hi-03_disabled@2x.png</file>
-        <file>res/editcamera_tools_hi-04@2x.png</file>
-        <file>res/editcamera_tools_hi-04_disabled@2x.png</file>
-        <file>res/editcamera_tools_hi-05@2x.png</file>
-        <file>res/editcamera_tools_hi-05_disabled@2x.png</file>
-        <file>res/playback_tools_low-00@2x.png</file>
-        <file>res/playback_tools_low-01@2x.png</file>
-        <file>res/playback_tools_low-02@2x.png</file>
-        <file>res/prefstab-01@2x.png</file>
-        <file>res/separator@2x.png</file>
-        <file>res/client_tools_hi_color-00@2x.png</file>
-        <file>res/client_tools_hi_color-01@2x.png</file>
-        <file>res/client_tools_hi_color-02@2x.png</file>
-        <file>res/client_tools_hi_color-03@2x.png</file>
-        <file>res/client_tools_hi_color-04@2x.png</file>
-        <file>res/client_tools_hi_color-05@2x.png</file>
-        <file>res/client_tools_hi_color-06@2x.png</file>
-        <file>res/prefstab-00@2x.png</file>
-        <file>res/arrow_down.png</file>
-        <file>res/arrow_down@2x.png</file>
-        <file>res/playback_tools_low-03@2x.png</file>
-    </qresource>
-    <qresource prefix="/startup">
-        <file alias="open_dialog.png">res/open_dialog.png</file>
-    </qresource>
-    <qresource prefix="/cursors">
-        <file alias="edit_camera_rot.png">res/edit_camera_rot.png</file>
-        <file alias="edit_camera_pan.png">res/edit_camera_pan.png</file>
-        <file alias="edit_camera_zoom.png">res/edit_camera_zoom.png</file>
-        <file alias="group_move.png">res/group_move.png</file>
-        <file alias="group_rotate.png">res/group_rotate.png</file>
-        <file alias="group_scale.png">res/group_scale.png</file>
-        <file alias="item_move.png">res/item_move.png</file>
-        <file alias="item_rotate.png">res/item_rotate.png</file>
-        <file alias="item_scale.png">res/item_scale.png</file>
     </qresource>
 </RCC>
diff --git a/src/Authoring/Studio/MainFrm.ui b/src/Authoring/Studio/MainFrm.ui
index 3f626236..e838cf40 100644
--- a/src/Authoring/Studio/MainFrm.ui
+++ b/src/Authoring/Studio/MainFrm.ui
@@ -15,7 +15,7 @@
   </property>
   <property name="windowIcon">
    <iconset resource="MainFrm.qrc">
-    <normaloff>:/res/Studio.png</normaloff>:/res/Studio.png</iconset>
+    <normaloff>:/images/Studio.png</normaloff>:/images/Studio.png</iconset>
   </property>
   <widget class="QWidget" name="centralwidget"/>
   <widget class="QMenuBar" name="menubar">
@@ -260,7 +260,7 @@
    </property>
    <property name="icon">
     <iconset resource="MainFrm.qrc">
-     <normaloff>:/res/client_tools_hi_color-06.png</normaloff>:/res/client_tools_hi_color-06.png</iconset>
+     <normaloff>:/images/client_tools_hi_color-06.png</normaloff>:/images/client_tools_hi_color-06.png</iconset>
    </property>
    <property name="text">
     <string>Autoset Keyframes</string>
@@ -363,8 +363,8 @@
    </property>
    <property name="icon">
     <iconset resource="MainFrm.qrc">
-     <normaloff>:/res/editcamera_tools_hi-05.png</normaloff>
-     <disabledoff>:/res/editcamera_tools_hi-05_disabled.png</disabledoff>:/res/editcamera_tools_hi-05.png</iconset>
+     <normaloff>:/images/editcamera_tools_hi-05.png</normaloff>
+     <disabledoff>:/images/editcamera_tools_hi-05_disabled.png</disabledoff>:/images/editcamera_tools_hi-05.png</iconset>
    </property>
    <property name="text">
     <string>Wireframe</string>
@@ -411,7 +411,7 @@
   <action name="action_Undo">
    <property name="icon">
     <iconset resource="MainFrm.qrc">
-     <normaloff>:/res/Toolbar-06.png</normaloff>:/res/Toolbar-06.png</iconset>
+     <normaloff>:/images/Toolbar-06.png</normaloff>:/images/Toolbar-06.png</iconset>
    </property>
    <property name="text">
     <string>&amp;Undo</string>
@@ -423,7 +423,7 @@
   <action name="action_Redo">
    <property name="icon">
     <iconset resource="MainFrm.qrc">
-     <normaloff>:/res/Toolbar-07.png</normaloff>:/res/Toolbar-07.png</iconset>
+     <normaloff>:/images/Toolbar-07.png</normaloff>:/images/Toolbar-07.png</iconset>
    </property>
    <property name="text">
     <string>&amp;Redo</string>
@@ -435,7 +435,7 @@
   <action name="action_Cut">
    <property name="icon">
     <iconset resource="MainFrm.qrc">
-     <normaloff>:/res/Toolbar-03.png</normaloff>:/res/Toolbar-03.png</iconset>
+     <normaloff>:/images/Toolbar-03.png</normaloff>:/images/Toolbar-03.png</iconset>
    </property>
    <property name="text">
     <string>Cu&amp;t</string>
@@ -447,7 +447,7 @@
   <action name="action_Copy">
    <property name="icon">
     <iconset resource="MainFrm.qrc">
-     <normaloff>:/res/Toolbar-04.png</normaloff>:/res/Toolbar-04.png</iconset>
+     <normaloff>:/images/Toolbar-04.png</normaloff>:/images/Toolbar-04.png</iconset>
    </property>
    <property name="text">
     <string>&amp;Copy</string>
@@ -459,7 +459,7 @@
   <action name="action_Paste">
    <property name="icon">
     <iconset resource="MainFrm.qrc">
-     <normaloff>:/res/Toolbar-05.png</normaloff>:/res/Toolbar-05.png</iconset>
+     <normaloff>:/images/Toolbar-05.png</normaloff>:/images/Toolbar-05.png</iconset>
    </property>
    <property name="text">
     <string>P&amp;aste</string>
@@ -495,7 +495,7 @@
   <action name="action_New">
    <property name="icon">
     <iconset resource="MainFrm.qrc">
-     <normaloff>:/res/Toolbar-00.png</normaloff>:/res/Toolbar-00.png</iconset>
+     <normaloff>:/images/Toolbar-00.png</normaloff>:/images/Toolbar-00.png</iconset>
    </property>
    <property name="text">
     <string>&amp;New</string>
@@ -507,7 +507,7 @@
   <action name="action_Open">
    <property name="icon">
     <iconset resource="MainFrm.qrc">
-     <normaloff>:/res/Toolbar-01.png</normaloff>:/res/Toolbar-01.png</iconset>
+     <normaloff>:/images/Toolbar-01.png</normaloff>:/images/Toolbar-01.png</iconset>
    </property>
    <property name="text">
     <string>&amp;Open</string>
@@ -519,7 +519,7 @@
   <action name="action_Save">
    <property name="icon">
     <iconset resource="MainFrm.qrc">
-     <normaloff>:/res/Toolbar-02.png</normaloff>:/res/Toolbar-02.png</iconset>
+     <normaloff>:/images/Toolbar-02.png</normaloff>:/images/Toolbar-02.png</iconset>
    </property>
    <property name="text">
     <string>&amp;Save</string>
@@ -573,7 +573,7 @@
    </property>
    <property name="icon">
     <iconset resource="MainFrm.qrc">
-     <normaloff>:/res/client_tools_hi_color-00.png</normaloff>:/res/client_tools_hi_color-00.png</iconset>
+     <normaloff>:/images/client_tools_hi_color-00.png</normaloff>:/images/client_tools_hi_color-00.png</iconset>
    </property>
    <property name="text">
     <string>Group Select Tool</string>
@@ -588,7 +588,7 @@
    </property>
    <property name="icon">
     <iconset resource="MainFrm.qrc">
-     <normaloff>:/res/client_tools_hi_color-01.png</normaloff>:/res/client_tools_hi_color-01.png</iconset>
+     <normaloff>:/images/client_tools_hi_color-01.png</normaloff>:/images/client_tools_hi_color-01.png</iconset>
    </property>
    <property name="text">
     <string>Item Select Tool</string>
@@ -603,7 +603,7 @@
    </property>
    <property name="icon">
     <iconset resource="MainFrm.qrc">
-     <normaloff>:/res/client_tools_hi_color-04.png</normaloff>:/res/client_tools_hi_color-04.png</iconset>
+     <normaloff>:/images/client_tools_hi_color-04.png</normaloff>:/images/client_tools_hi_color-04.png</iconset>
    </property>
    <property name="text">
     <string>Rotation Tool</string>
@@ -618,7 +618,7 @@
    </property>
    <property name="icon">
     <iconset resource="MainFrm.qrc">
-     <normaloff>:/res/client_tools_hi_color-02.png</normaloff>:/res/client_tools_hi_color-02.png</iconset>
+     <normaloff>:/images/client_tools_hi_color-02.png</normaloff>:/images/client_tools_hi_color-02.png</iconset>
    </property>
    <property name="text">
     <string>Position Tool</string>
@@ -633,7 +633,7 @@
    </property>
    <property name="icon">
     <iconset resource="MainFrm.qrc">
-     <normaloff>:/res/client_tools_hi_color-03.png</normaloff>:/res/client_tools_hi_color-03.png</iconset>
+     <normaloff>:/images/client_tools_hi_color-03.png</normaloff>:/images/client_tools_hi_color-03.png</iconset>
    </property>
    <property name="text">
     <string>Scale Tool</string>
@@ -648,7 +648,7 @@
    </property>
    <property name="icon">
     <iconset resource="MainFrm.qrc">
-     <normaloff>:/res/client_tools_hi_color-05.png</normaloff>:/res/client_tools_hi_color-05.png</iconset>
+     <normaloff>:/images/client_tools_hi_color-05.png</normaloff>:/images/client_tools_hi_color-05.png</iconset>
    </property>
    <property name="text">
     <string>Local/Global Manipulators</string>
@@ -663,8 +663,8 @@
    </property>
    <property name="icon">
     <iconset resource="MainFrm.qrc">
-     <normaloff>:/res/editcamera_tools_hi-00.png</normaloff>
-     <disabledoff>:/res/editcamera_tools_hi-00_disabled.png</disabledoff>:/res/editcamera_tools_hi-00.png</iconset>
+     <normaloff>:/images/editcamera_tools_hi-00.png</normaloff>
+     <disabledoff>:/images/editcamera_tools_hi-00_disabled.png</disabledoff>:/images/editcamera_tools_hi-00.png</iconset>
    </property>
    <property name="text">
     <string>Fit Selected (F)</string>
@@ -679,8 +679,8 @@
    </property>
    <property name="icon">
     <iconset resource="MainFrm.qrc">
-     <normaloff>:/res/editcamera_tools_hi-01.png</normaloff>
-     <disabledoff>:/res/editcamera_tools_hi-01_disabled.png</disabledoff>:/res/editcamera_tools_hi-01.png</iconset>
+     <normaloff>:/images/editcamera_tools_hi-01.png</normaloff>
+     <disabledoff>:/images/editcamera_tools_hi-01_disabled.png</disabledoff>:/images/editcamera_tools_hi-01.png</iconset>
    </property>
    <property name="text">
     <string>Pan Tool (Middle Mouse Drag)</string>
@@ -695,8 +695,8 @@
    </property>
    <property name="icon">
     <iconset resource="MainFrm.qrc">
-     <normaloff>:/res/editcamera_tools_hi-02.png</normaloff>
-     <disabledoff>:/res/editcamera_tools_hi-02_disabled.png</disabledoff>:/res/editcamera_tools_hi-02.png</iconset>
+     <normaloff>:/images/editcamera_tools_hi-02.png</normaloff>
+     <disabledoff>:/images/editcamera_tools_hi-02_disabled.png</disabledoff>:/images/editcamera_tools_hi-02.png</iconset>
    </property>
    <property name="text">
     <string>Zoom Tool (Mouse Wheel)</string>
@@ -711,8 +711,8 @@
    </property>
    <property name="icon">
     <iconset resource="MainFrm.qrc">
-     <normaloff>:/res/editcamera_tools_hi-03.png</normaloff>
-     <disabledoff>:/res/editcamera_tools_hi-03_disabled.png</disabledoff>:/res/editcamera_tools_hi-03.png</iconset>
+     <normaloff>:/images/editcamera_tools_hi-03.png</normaloff>
+     <disabledoff>:/images/editcamera_tools_hi-03_disabled.png</disabledoff>:/images/editcamera_tools_hi-03.png</iconset>
    </property>
    <property name="text">
     <string>Orbit Tool (Alt+Middle Mouse Drag)</string>
@@ -727,8 +727,8 @@
    </property>
    <property name="icon">
     <iconset resource="MainFrm.qrc">
-     <normaloff>:/res/editcamera_tools_hi-04.png</normaloff>
-     <disabledoff>:/res/editcamera_tools_hi-04_disabled.png</disabledoff>:/res/editcamera_tools_hi-04.png</iconset>
+     <normaloff>:/images/editcamera_tools_hi-04.png</normaloff>
+     <disabledoff>:/images/editcamera_tools_hi-04_disabled.png</disabledoff>:/images/editcamera_tools_hi-04.png</iconset>
    </property>
    <property name="text">
     <string>Shading Mode (F3)</string>
@@ -743,7 +743,7 @@
   <action name="actionRewind">
    <property name="icon">
     <iconset resource="MainFrm.qrc">
-     <normaloff>:/res/playback_tools_low-00.png</normaloff>:/res/playback_tools_low-00.png</iconset>
+     <normaloff>:/images/playback_tools_low-00.png</normaloff>:/images/playback_tools_low-00.png</iconset>
    </property>
    <property name="text">
     <string>Rewind</string>
@@ -752,7 +752,7 @@
   <action name="actionStop">
    <property name="icon">
     <iconset resource="MainFrm.qrc">
-     <normaloff>:/res/playback_tools_low-01.png</normaloff>:/res/playback_tools_low-01.png</iconset>
+     <normaloff>:/images/playback_tools_low-01.png</normaloff>:/images/playback_tools_low-01.png</iconset>
    </property>
    <property name="text">
     <string>Stop</string>
@@ -764,7 +764,7 @@
    </property>
    <property name="icon">
     <iconset resource="MainFrm.qrc">
-     <normaloff>:/res/playback_tools_low-02.png</normaloff>:/res/playback_tools_low-02.png</iconset>
+     <normaloff>:/images/playback_tools_low-02.png</normaloff>:/images/playback_tools_low-02.png</iconset>
    </property>
    <property name="text">
     <string>Play</string>
@@ -773,7 +773,7 @@
   <action name="actionPreview">
    <property name="icon">
     <iconset resource="MainFrm.qrc">
-     <normaloff>:/res/playback_tools_low-03.png</normaloff>:/res/playback_tools_low-03.png</iconset>
+     <normaloff>:/images/playback_tools_low-03.png</normaloff>:/images/playback_tools_low-03.png</iconset>
    </property>
    <property name="text">
     <string>Preview</string>
diff --git a/src/Authoring/Studio/_Win/Application/AboutDlg.ui b/src/Authoring/Studio/_Win/Application/AboutDlg.ui
index a5fe3433..57232790 100644
--- a/src/Authoring/Studio/_Win/Application/AboutDlg.ui
+++ b/src/Authoring/Studio/_Win/Application/AboutDlg.ui
@@ -29,7 +29,7 @@
    <item>
     <widget class="QLabel" name="icon">
      <property name="pixmap">
-      <pixmap resource="../../MainFrm.qrc">:/res/About Icon.bmp</pixmap>
+      <pixmap resource="../../MainFrm.qrc">:/images/About Icon.bmp</pixmap>
      </property>
     </widget>
    </item>
diff --git a/src/Authoring/Studio/_Win/UI/StartupDlg.ui b/src/Authoring/Studio/_Win/UI/StartupDlg.ui
index 619c857a..973e1a7b 100644
--- a/src/Authoring/Studio/_Win/UI/StartupDlg.ui
+++ b/src/Authoring/Studio/_Win/UI/StartupDlg.ui
@@ -120,7 +120,7 @@
       </property>
       <property name="icon">
        <iconset resource="../../MainFrm.qrc">
-        <normaloff>:/res/Toolbar-00.png</normaloff>:/res/Toolbar-00.png</iconset>
+        <normaloff>:/images/Toolbar-00.png</normaloff>:/images/Toolbar-00.png</iconset>
       </property>
       <property name="flat">
        <bool>true</bool>
@@ -134,7 +134,7 @@
       </property>
       <property name="icon">
        <iconset resource="../../MainFrm.qrc">
-        <normaloff>:/res/Toolbar-01.png</normaloff>:/res/Toolbar-01.png</iconset>
+        <normaloff>:/images/Toolbar-01.png</normaloff>:/images/Toolbar-01.png</iconset>
       </property>
       <property name="flat">
        <bool>true</bool>
diff --git a/src/Authoring/Studio/_Win/UI/StudioPreferencesPropSheet.ui b/src/Authoring/Studio/_Win/UI/StudioPreferencesPropSheet.ui
index 813d6016..759090a1 100644
--- a/src/Authoring/Studio/_Win/UI/StudioPreferencesPropSheet.ui
+++ b/src/Authoring/Studio/_Win/UI/StudioPreferencesPropSheet.ui
@@ -19,7 +19,7 @@
      <widget class="CStudioAppPrefsPage" name="m_AppPrefsPage">
       <attribute name="icon">
        <iconset resource="../../MainFrm.qrc">
-        <normaloff>:/res/prefstab-00.png</normaloff>:/res/prefstab-00.png</iconset>
+        <normaloff>:/images/prefstab-00.png</normaloff>:/images/prefstab-00.png</iconset>
       </attribute>
       <attribute name="title">
        <string>Studio</string>
@@ -28,7 +28,7 @@
      <widget class="CStudioProjectSettingsPage" name="m_ProjectSettingsPage">
       <attribute name="icon">
        <iconset resource="../../MainFrm.qrc">
-        <normaloff>:/res/prefstab-01.png</normaloff>:/res/prefstab-01.png</iconset>
+        <normaloff>:/images/prefstab-01.png</normaloff>:/images/prefstab-01.png</iconset>
       </attribute>
       <attribute name="title">
        <string>Presentation Settings</string>
diff --git a/src/Authoring/Studio/images.qrc b/src/Authoring/Studio/images.qrc
index cc099144..6305ec6d 100644
--- a/src/Authoring/Studio/images.qrc
+++ b/src/Authoring/Studio/images.qrc
@@ -163,12 +163,100 @@
         <file>images/Objects-Text-Disabled@2x.png</file>
         <file>images/Slide-Master-Active@2x.png</file>
         <file>images/Slide-Normal@2x.png</file>
-        <file>images/progress-screen.png</file>
         <file>images/breadcrumb_component_button@2x.png</file>
         <file>images/breadcrumb_component_colon_button@2x.png</file>
         <file>images/breadcrumb_component_grey_button@2x.png</file>
         <file>images/breadcrumb_component_scene@2x.png</file>
         <file>images/checkbox-checked@2x.png</file>
         <file>images/checkbox-unchecked@2x.png</file>
+        <file>images/anim_progress.png</file>
+        <file>images/anim_progress@2x.png</file>
+        <file>images/prefstab-00.png</file>
+        <file>images/prefstab-01.png</file>
+        <file>images/client_tools_hi_color-00.png</file>
+        <file>images/client_tools_hi_color-01.png</file>
+        <file>images/client_tools_hi_color-02.png</file>
+        <file>images/client_tools_hi_color-03.png</file>
+        <file>images/client_tools_hi_color-04.png</file>
+        <file>images/client_tools_hi_color-05.png</file>
+        <file>images/client_tools_hi_color-06.png</file>
+        <file>images/editcamera_tools_hi-00.png</file>
+        <file>images/editcamera_tools_hi-01.png</file>
+        <file>images/editcamera_tools_hi-02.png</file>
+        <file>images/editcamera_tools_hi-03.png</file>
+        <file>images/editcamera_tools_hi-04.png</file>
+        <file>images/editcamera_tools_hi-05.png</file>
+        <file>images/playback_tools_low-00.png</file>
+        <file>images/playback_tools_low-01.png</file>
+        <file>images/playback_tools_low-02.png</file>
+        <file>images/playback_tools_low-03.png</file>
+        <file>images/Toolbar-00.png</file>
+        <file>images/Toolbar-01.png</file>
+        <file>images/Toolbar-02.png</file>
+        <file>images/Toolbar-03.png</file>
+        <file>images/Toolbar-04.png</file>
+        <file>images/Toolbar-05.png</file>
+        <file>images/Toolbar-06.png</file>
+        <file>images/Toolbar-07.png</file>
+        <file>images/About Icon.bmp</file>
+        <file>images/Studio.png</file>
+        <file>images/separator.png</file>
+        <file>images/editcamera_tools_hi-00_disabled.png</file>
+        <file>images/editcamera_tools_hi-01_disabled.png</file>
+        <file>images/editcamera_tools_hi-02_disabled.png</file>
+        <file>images/editcamera_tools_hi-03_disabled.png</file>
+        <file>images/editcamera_tools_hi-04_disabled.png</file>
+        <file>images/editcamera_tools_hi-05_disabled.png</file>
+        <file>images/editcamera_tools_hi-00@2x.png</file>
+        <file>images/editcamera_tools_hi-00_disabled@2x.png</file>
+        <file>images/editcamera_tools_hi-01@2x.png</file>
+        <file>images/editcamera_tools_hi-01_disabled@2x.png</file>
+        <file>images/editcamera_tools_hi-02@2x.png</file>
+        <file>images/editcamera_tools_hi-02_disabled@2x.png</file>
+        <file>images/editcamera_tools_hi-03@2x.png</file>
+        <file>images/editcamera_tools_hi-03_disabled@2x.png</file>
+        <file>images/editcamera_tools_hi-04@2x.png</file>
+        <file>images/editcamera_tools_hi-04_disabled@2x.png</file>
+        <file>images/editcamera_tools_hi-05@2x.png</file>
+        <file>images/editcamera_tools_hi-05_disabled@2x.png</file>
+        <file>images/playback_tools_low-00@2x.png</file>
+        <file>images/playback_tools_low-01@2x.png</file>
+        <file>images/playback_tools_low-02@2x.png</file>
+        <file>images/prefstab-01@2x.png</file>
+        <file>images/separator@2x.png</file>
+        <file>images/client_tools_hi_color-00@2x.png</file>
+        <file>images/client_tools_hi_color-01@2x.png</file>
+        <file>images/client_tools_hi_color-02@2x.png</file>
+        <file>images/client_tools_hi_color-03@2x.png</file>
+        <file>images/client_tools_hi_color-04@2x.png</file>
+        <file>images/client_tools_hi_color-05@2x.png</file>
+        <file>images/client_tools_hi_color-06@2x.png</file>
+        <file>images/prefstab-00@2x.png</file>
+        <file>images/playback_tools_low-03@2x.png</file>
+        <file>images/Tutorial/button_back.png</file>
+        <file>images/Tutorial/button_next.png</file>
+        <file>images/Tutorial/screens/1.png</file>
+        <file>images/Tutorial/screens/2.png</file>
+        <file>images/Tutorial/screens/3.png</file>
+        <file>images/Tutorial/screens/4.png</file>
+        <file>images/Tutorial/screens/5.png</file>
+        <file>images/Tutorial/screens/6.png</file>
+        <file>images/Tutorial/screens/7.png</file>
+        <file>images/Tutorial/button_back@2x.png</file>
+        <file>images/Tutorial/button_next@2x.png</file>
+    </qresource>
+    <qresource prefix="/startup">
+        <file alias="open_dialog.png">images/open_dialog.png</file>
+    </qresource>
+    <qresource prefix="/cursors">
+        <file alias="edit_camera_rot.png">images/edit_camera_rot.png</file>
+        <file alias="edit_camera_pan.png">images/edit_camera_pan.png</file>
+        <file alias="edit_camera_zoom.png">images/edit_camera_zoom.png</file>
+        <file alias="group_move.png">images/group_move.png</file>
+        <file alias="group_rotate.png">images/group_rotate.png</file>
+        <file alias="group_scale.png">images/group_scale.png</file>
+        <file alias="item_move.png">images/item_move.png</file>
+        <file alias="item_rotate.png">images/item_rotate.png</file>
+        <file alias="item_scale.png">images/item_scale.png</file>
     </qresource>
 </RCC>
diff --git a/src/Authoring/Studio/res/About Icon.bmp b/src/Authoring/Studio/images/About Icon.bmp
index 97764f42..97764f42 100644
--- a/src/Authoring/Studio/res/About Icon.bmp
+++ b/src/Authoring/Studio/images/About Icon.bmp
diff --git a/src/Authoring/Studio/res/Studio.ico b/src/Authoring/Studio/images/Studio.ico
index 0911ac1f..0911ac1f 100644
--- a/src/Authoring/Studio/res/Studio.ico
+++ b/src/Authoring/Studio/images/Studio.ico
diff --git a/src/Authoring/Studio/res/Studio.png b/src/Authoring/Studio/images/Studio.png
index 11c6e526..11c6e526 100644
--- a/src/Authoring/Studio/res/Studio.png
+++ b/src/Authoring/Studio/images/Studio.png
diff --git a/src/Authoring/Studio/res/Toolbar-00.png b/src/Authoring/Studio/images/Toolbar-00.png
index 4111f8f0..4111f8f0 100644
--- a/src/Authoring/Studio/res/Toolbar-00.png
+++ b/src/Authoring/Studio/images/Toolbar-00.png
diff --git a/src/Authoring/Studio/res/Toolbar-01.png b/src/Authoring/Studio/images/Toolbar-01.png
index 76e3b5c2..76e3b5c2 100644
--- a/src/Authoring/Studio/res/Toolbar-01.png
+++ b/src/Authoring/Studio/images/Toolbar-01.png
diff --git a/src/Authoring/Studio/res/Toolbar-02.png b/src/Authoring/Studio/images/Toolbar-02.png
index 3cd03094..3cd03094 100644
--- a/src/Authoring/Studio/res/Toolbar-02.png
+++ b/src/Authoring/Studio/images/Toolbar-02.png
diff --git a/src/Authoring/Studio/res/Toolbar-03.png b/src/Authoring/Studio/images/Toolbar-03.png
index 3cde7c2e..3cde7c2e 100644
--- a/src/Authoring/Studio/res/Toolbar-03.png
+++ b/src/Authoring/Studio/images/Toolbar-03.png
diff --git a/src/Authoring/Studio/res/Toolbar-04.png b/src/Authoring/Studio/images/Toolbar-04.png
index 3e04587b..3e04587b 100644
--- a/src/Authoring/Studio/res/Toolbar-04.png
+++ b/src/Authoring/Studio/images/Toolbar-04.png
diff --git a/src/Authoring/Studio/res/Toolbar-05.png b/src/Authoring/Studio/images/Toolbar-05.png
index 8b4dbb5c..8b4dbb5c 100644
--- a/src/Authoring/Studio/res/Toolbar-05.png
+++ b/src/Authoring/Studio/images/Toolbar-05.png
diff --git a/src/Authoring/Studio/res/Toolbar-06.png b/src/Authoring/Studio/images/Toolbar-06.png
index b4cdcc3c..b4cdcc3c 100644
--- a/src/Authoring/Studio/res/Toolbar-06.png
+++ b/src/Authoring/Studio/images/Toolbar-06.png
diff --git a/src/Authoring/Studio/res/Toolbar-07.png b/src/Authoring/Studio/images/Toolbar-07.png
index 27e904f8..27e904f8 100644
--- a/src/Authoring/Studio/res/Toolbar-07.png
+++ b/src/Authoring/Studio/images/Toolbar-07.png
diff --git a/src/Authoring/Studio/res/Tutorial/button_back.png b/src/Authoring/Studio/images/Tutorial/button_back.png
index 8113df5b..8113df5b 100644
--- a/src/Authoring/Studio/res/Tutorial/button_back.png
+++ b/src/Authoring/Studio/images/Tutorial/button_back.png
diff --git a/src/Authoring/Studio/res/Tutorial/button_back@2x.png b/src/Authoring/Studio/images/Tutorial/button_back@2x.png
index ec6a2f13..ec6a2f13 100644
--- a/src/Authoring/Studio/res/Tutorial/button_back@2x.png
+++ b/src/Authoring/Studio/images/Tutorial/button_back@2x.png
diff --git a/src/Authoring/Studio/res/Tutorial/button_next.png b/src/Authoring/Studio/images/Tutorial/button_next.png
index 857dcada..857dcada 100644
--- a/src/Authoring/Studio/res/Tutorial/button_next.png
+++ b/src/Authoring/Studio/images/Tutorial/button_next.png
diff --git a/src/Authoring/Studio/res/Tutorial/button_next@2x.png b/src/Authoring/Studio/images/Tutorial/button_next@2x.png
index f32c4f26..f32c4f26 100644
--- a/src/Authoring/Studio/res/Tutorial/button_next@2x.png
+++ b/src/Authoring/Studio/images/Tutorial/button_next@2x.png
diff --git a/src/Authoring/Studio/res/Tutorial/screens/1.png b/src/Authoring/Studio/images/Tutorial/screens/1.png
index 028f939f..028f939f 100644
--- a/src/Authoring/Studio/res/Tutorial/screens/1.png
+++ b/src/Authoring/Studio/images/Tutorial/screens/1.png
diff --git a/src/Authoring/Studio/res/Tutorial/screens/2.png b/src/Authoring/Studio/images/Tutorial/screens/2.png
index 9ba67e3b..9ba67e3b 100644
--- a/src/Authoring/Studio/res/Tutorial/screens/2.png
+++ b/src/Authoring/Studio/images/Tutorial/screens/2.png
diff --git a/src/Authoring/Studio/res/Tutorial/screens/3.png b/src/Authoring/Studio/images/Tutorial/screens/3.png
index 849dfce7..849dfce7 100644
--- a/src/Authoring/Studio/res/Tutorial/screens/3.png
+++ b/src/Authoring/Studio/images/Tutorial/screens/3.png
diff --git a/src/Authoring/Studio/res/Tutorial/screens/4.png b/src/Authoring/Studio/images/Tutorial/screens/4.png
index 4933f401..4933f401 100644
--- a/src/Authoring/Studio/res/Tutorial/screens/4.png
+++ b/src/Authoring/Studio/images/Tutorial/screens/4.png
diff --git a/src/Authoring/Studio/res/Tutorial/screens/5.png b/src/Authoring/Studio/images/Tutorial/screens/5.png
index 26adcf4b..26adcf4b 100644
--- a/src/Authoring/Studio/res/Tutorial/screens/5.png
+++ b/src/Authoring/Studio/images/Tutorial/screens/5.png
diff --git a/src/Authoring/Studio/res/Tutorial/screens/6.png b/src/Authoring/Studio/images/Tutorial/screens/6.png
index 25b7a5bf..25b7a5bf 100644
--- a/src/Authoring/Studio/res/Tutorial/screens/6.png
+++ b/src/Authoring/Studio/images/Tutorial/screens/6.png
diff --git a/src/Authoring/Studio/res/Tutorial/screens/7.png b/src/Authoring/Studio/images/Tutorial/screens/7.png
index 9ed864a3..9ed864a3 100644
--- a/src/Authoring/Studio/res/Tutorial/screens/7.png
+++ b/src/Authoring/Studio/images/Tutorial/screens/7.png
diff --git a/src/Authoring/Studio/images/anim_progress.png b/src/Authoring/Studio/images/anim_progress.png
new file mode 100644
index 00000000..6f0b5a83
--- /dev/null
+++ b/src/Authoring/Studio/images/anim_progress.png
diff --git a/src/Authoring/Studio/images/anim_progress@2x.png b/src/Authoring/Studio/images/anim_progress@2x.png
new file mode 100644
index 00000000..28f20fd6
--- /dev/null
+++ b/src/Authoring/Studio/images/anim_progress@2x.png
diff --git a/src/Authoring/Studio/res/arrow_up.png b/src/Authoring/Studio/images/arrow_up.png
index 284caf9e..284caf9e 100644
--- a/src/Authoring/Studio/res/arrow_up.png
+++ b/src/Authoring/Studio/images/arrow_up.png
diff --git a/src/Authoring/Studio/res/arrow_up@2x.png b/src/Authoring/Studio/images/arrow_up@2x.png
index 303fa926..303fa926 100644
--- a/src/Authoring/Studio/res/arrow_up@2x.png
+++ b/src/Authoring/Studio/images/arrow_up@2x.png
diff --git a/src/Authoring/Studio/res/client_tools_hi_color-00.png b/src/Authoring/Studio/images/client_tools_hi_color-00.png
index f466a1c3..f466a1c3 100644
--- a/src/Authoring/Studio/res/client_tools_hi_color-00.png
+++ b/src/Authoring/Studio/images/client_tools_hi_color-00.png
diff --git a/src/Authoring/Studio/res/client_tools_hi_color-00@2x.png b/src/Authoring/Studio/images/client_tools_hi_color-00@2x.png
index 0b68e6b3..0b68e6b3 100644
--- a/src/Authoring/Studio/res/client_tools_hi_color-00@2x.png
+++ b/src/Authoring/Studio/images/client_tools_hi_color-00@2x.png
diff --git a/src/Authoring/Studio/res/client_tools_hi_color-01.png b/src/Authoring/Studio/images/client_tools_hi_color-01.png
index aad1b000..aad1b000 100644
--- a/src/Authoring/Studio/res/client_tools_hi_color-01.png
+++ b/src/Authoring/Studio/images/client_tools_hi_color-01.png
diff --git a/src/Authoring/Studio/res/client_tools_hi_color-01@2x.png b/src/Authoring/Studio/images/client_tools_hi_color-01@2x.png
index e9589689..e9589689 100644
--- a/src/Authoring/Studio/res/client_tools_hi_color-01@2x.png
+++ b/src/Authoring/Studio/images/client_tools_hi_color-01@2x.png
diff --git a/src/Authoring/Studio/res/client_tools_hi_color-02.png b/src/Authoring/Studio/images/client_tools_hi_color-02.png
index 871a5e7d..871a5e7d 100644
--- a/src/Authoring/Studio/res/client_tools_hi_color-02.png
+++ b/src/Authoring/Studio/images/client_tools_hi_color-02.png
diff --git a/src/Authoring/Studio/res/client_tools_hi_color-02@2x.png b/src/Authoring/Studio/images/client_tools_hi_color-02@2x.png
index 235d6804..235d6804 100644
--- a/src/Authoring/Studio/res/client_tools_hi_color-02@2x.png
+++ b/src/Authoring/Studio/images/client_tools_hi_color-02@2x.png
diff --git a/src/Authoring/Studio/res/client_tools_hi_color-03.png b/src/Authoring/Studio/images/client_tools_hi_color-03.png
index 68a7848a..68a7848a 100644
--- a/src/Authoring/Studio/res/client_tools_hi_color-03.png
+++ b/src/Authoring/Studio/images/client_tools_hi_color-03.png
diff --git a/src/Authoring/Studio/res/client_tools_hi_color-03@2x.png b/src/Authoring/Studio/images/client_tools_hi_color-03@2x.png
index bc861678..bc861678 100644
--- a/src/Authoring/Studio/res/client_tools_hi_color-03@2x.png
+++ b/src/Authoring/Studio/images/client_tools_hi_color-03@2x.png
diff --git a/src/Authoring/Studio/res/client_tools_hi_color-04.png b/src/Authoring/Studio/images/client_tools_hi_color-04.png
index 0a2a7bc9..0a2a7bc9 100644
--- a/src/Authoring/Studio/res/client_tools_hi_color-04.png
+++ b/src/Authoring/Studio/images/client_tools_hi_color-04.png
diff --git a/src/Authoring/Studio/res/client_tools_hi_color-04@2x.png b/src/Authoring/Studio/images/client_tools_hi_color-04@2x.png
index bdf10c1f..bdf10c1f 100644
--- a/src/Authoring/Studio/res/client_tools_hi_color-04@2x.png
+++ b/src/Authoring/Studio/images/client_tools_hi_color-04@2x.png
diff --git a/src/Authoring/Studio/res/client_tools_hi_color-05.png b/src/Authoring/Studio/images/client_tools_hi_color-05.png
index de315cab..de315cab 100644
--- a/src/Authoring/Studio/res/client_tools_hi_color-05.png
+++ b/src/Authoring/Studio/images/client_tools_hi_color-05.png
diff --git a/src/Authoring/Studio/res/client_tools_hi_color-05@2x.png b/src/Authoring/Studio/images/client_tools_hi_color-05@2x.png
index 89ba3fba..89ba3fba 100644
--- a/src/Authoring/Studio/res/client_tools_hi_color-05@2x.png
+++ b/src/Authoring/Studio/images/client_tools_hi_color-05@2x.png
diff --git a/src/Authoring/Studio/res/client_tools_hi_color-06.png b/src/Authoring/Studio/images/client_tools_hi_color-06.png
index eeb93638..eeb93638 100644
--- a/src/Authoring/Studio/res/client_tools_hi_color-06.png
+++ b/src/Authoring/Studio/images/client_tools_hi_color-06.png
diff --git a/src/Authoring/Studio/res/client_tools_hi_color-06@2x.png b/src/Authoring/Studio/images/client_tools_hi_color-06@2x.png
index 5fe71abb..5fe71abb 100644
--- a/src/Authoring/Studio/res/client_tools_hi_color-06@2x.png
+++ b/src/Authoring/Studio/images/client_tools_hi_color-06@2x.png
diff --git a/src/Authoring/Studio/res/edit_camera_pan.png b/src/Authoring/Studio/images/edit_camera_pan.png
index 9248a875..9248a875 100644
--- a/src/Authoring/Studio/res/edit_camera_pan.png
+++ b/src/Authoring/Studio/images/edit_camera_pan.png
diff --git a/src/Authoring/Studio/res/edit_camera_rot.png b/src/Authoring/Studio/images/edit_camera_rot.png
index 55c6ddac..55c6ddac 100644
--- a/src/Authoring/Studio/res/edit_camera_rot.png
+++ b/src/Authoring/Studio/images/edit_camera_rot.png
diff --git a/src/Authoring/Studio/res/edit_camera_zoom.png b/src/Authoring/Studio/images/edit_camera_zoom.png
index 46f69c43..46f69c43 100644
--- a/src/Authoring/Studio/res/edit_camera_zoom.png
+++ b/src/Authoring/Studio/images/edit_camera_zoom.png
diff --git a/src/Authoring/Studio/res/editcamera_tools_hi-00.png b/src/Authoring/Studio/images/editcamera_tools_hi-00.png
index ad07bf8f..ad07bf8f 100644
--- a/src/Authoring/Studio/res/editcamera_tools_hi-00.png
+++ b/src/Authoring/Studio/images/editcamera_tools_hi-00.png
diff --git a/src/Authoring/Studio/res/editcamera_tools_hi-00@2x.png b/src/Authoring/Studio/images/editcamera_tools_hi-00@2x.png
index d8c5fc46..d8c5fc46 100644
--- a/src/Authoring/Studio/res/editcamera_tools_hi-00@2x.png
+++ b/src/Authoring/Studio/images/editcamera_tools_hi-00@2x.png
diff --git a/src/Authoring/Studio/res/editcamera_tools_hi-00_disabled.png b/src/Authoring/Studio/images/editcamera_tools_hi-00_disabled.png
index f8499e9d..f8499e9d 100644
--- a/src/Authoring/Studio/res/editcamera_tools_hi-00_disabled.png
+++ b/src/Authoring/Studio/images/editcamera_tools_hi-00_disabled.png
diff --git a/src/Authoring/Studio/res/editcamera_tools_hi-00_disabled@2x.png b/src/Authoring/Studio/images/editcamera_tools_hi-00_disabled@2x.png
index 96564a1c..96564a1c 100644
--- a/src/Authoring/Studio/res/editcamera_tools_hi-00_disabled@2x.png
+++ b/src/Authoring/Studio/images/editcamera_tools_hi-00_disabled@2x.png
diff --git a/src/Authoring/Studio/res/editcamera_tools_hi-01.png b/src/Authoring/Studio/images/editcamera_tools_hi-01.png
index 10b16c6d..10b16c6d 100644
--- a/src/Authoring/Studio/res/editcamera_tools_hi-01.png
+++ b/src/Authoring/Studio/images/editcamera_tools_hi-01.png
diff --git a/src/Authoring/Studio/res/editcamera_tools_hi-01@2x.png b/src/Authoring/Studio/images/editcamera_tools_hi-01@2x.png
index b872a674..b872a674 100644
--- a/src/Authoring/Studio/res/editcamera_tools_hi-01@2x.png
+++ b/src/Authoring/Studio/images/editcamera_tools_hi-01@2x.png
diff --git a/src/Authoring/Studio/res/editcamera_tools_hi-01_disabled.png b/src/Authoring/Studio/images/editcamera_tools_hi-01_disabled.png
index ce5d85d2..ce5d85d2 100644
--- a/src/Authoring/Studio/res/editcamera_tools_hi-01_disabled.png
+++ b/src/Authoring/Studio/images/editcamera_tools_hi-01_disabled.png
diff --git a/src/Authoring/Studio/res/editcamera_tools_hi-01_disabled@2x.png b/src/Authoring/Studio/images/editcamera_tools_hi-01_disabled@2x.png
index a4a93e53..a4a93e53 100644
--- a/src/Authoring/Studio/res/editcamera_tools_hi-01_disabled@2x.png
+++ b/src/Authoring/Studio/images/editcamera_tools_hi-01_disabled@2x.png
diff --git a/src/Authoring/Studio/res/editcamera_tools_hi-02.png b/src/Authoring/Studio/images/editcamera_tools_hi-02.png
index 77b5a93e..77b5a93e 100644
--- a/src/Authoring/Studio/res/editcamera_tools_hi-02.png
+++ b/src/Authoring/Studio/images/editcamera_tools_hi-02.png
diff --git a/src/Authoring/Studio/res/editcamera_tools_hi-02@2x.png b/src/Authoring/Studio/images/editcamera_tools_hi-02@2x.png
index 13b2ce61..13b2ce61 100644
--- a/src/Authoring/Studio/res/editcamera_tools_hi-02@2x.png
+++ b/src/Authoring/Studio/images/editcamera_tools_hi-02@2x.png
diff --git a/src/Authoring/Studio/res/editcamera_tools_hi-02_disabled.png b/src/Authoring/Studio/images/editcamera_tools_hi-02_disabled.png
index a21cea23..a21cea23 100644
--- a/src/Authoring/Studio/res/editcamera_tools_hi-02_disabled.png
+++ b/src/Authoring/Studio/images/editcamera_tools_hi-02_disabled.png
diff --git a/src/Authoring/Studio/res/editcamera_tools_hi-02_disabled@2x.png b/src/Authoring/Studio/images/editcamera_tools_hi-02_disabled@2x.png
index bba1b104..bba1b104 100644
--- a/src/Authoring/Studio/res/editcamera_tools_hi-02_disabled@2x.png
+++ b/src/Authoring/Studio/images/editcamera_tools_hi-02_disabled@2x.png
diff --git a/src/Authoring/Studio/res/editcamera_tools_hi-03.png b/src/Authoring/Studio/images/editcamera_tools_hi-03.png
index c8929b76..c8929b76 100644
--- a/src/Authoring/Studio/res/editcamera_tools_hi-03.png
+++ b/src/Authoring/Studio/images/editcamera_tools_hi-03.png
diff --git a/src/Authoring/Studio/res/editcamera_tools_hi-03@2x.png b/src/Authoring/Studio/images/editcamera_tools_hi-03@2x.png
index 26292608..26292608 100644
--- a/src/Authoring/Studio/res/editcamera_tools_hi-03@2x.png
+++ b/src/Authoring/Studio/images/editcamera_tools_hi-03@2x.png
diff --git a/src/Authoring/Studio/res/editcamera_tools_hi-03_disabled.png b/src/Authoring/Studio/images/editcamera_tools_hi-03_disabled.png
index db8944b2..db8944b2 100644
--- a/src/Authoring/Studio/res/editcamera_tools_hi-03_disabled.png
+++ b/src/Authoring/Studio/images/editcamera_tools_hi-03_disabled.png
diff --git a/src/Authoring/Studio/res/editcamera_tools_hi-03_disabled@2x.png b/src/Authoring/Studio/images/editcamera_tools_hi-03_disabled@2x.png
index 15904fee..15904fee 100644
--- a/src/Authoring/Studio/res/editcamera_tools_hi-03_disabled@2x.png
+++ b/src/Authoring/Studio/images/editcamera_tools_hi-03_disabled@2x.png
diff --git a/src/Authoring/Studio/res/editcamera_tools_hi-04.png b/src/Authoring/Studio/images/editcamera_tools_hi-04.png
index 22da1b6d..22da1b6d 100644
--- a/src/Authoring/Studio/res/editcamera_tools_hi-04.png
+++ b/src/Authoring/Studio/images/editcamera_tools_hi-04.png
diff --git a/src/Authoring/Studio/res/editcamera_tools_hi-04@2x.png b/src/Authoring/Studio/images/editcamera_tools_hi-04@2x.png
index 9110519b..9110519b 100644
--- a/src/Authoring/Studio/res/editcamera_tools_hi-04@2x.png
+++ b/src/Authoring/Studio/images/editcamera_tools_hi-04@2x.png
diff --git a/src/Authoring/Studio/res/editcamera_tools_hi-04_disabled.png b/src/Authoring/Studio/images/editcamera_tools_hi-04_disabled.png
index 1d9e0ac0..1d9e0ac0 100644
--- a/src/Authoring/Studio/res/editcamera_tools_hi-04_disabled.png
+++ b/src/Authoring/Studio/images/editcamera_tools_hi-04_disabled.png
diff --git a/src/Authoring/Studio/res/editcamera_tools_hi-04_disabled@2x.png b/src/Authoring/Studio/images/editcamera_tools_hi-04_disabled@2x.png
index 0a3f5527..0a3f5527 100644
--- a/src/Authoring/Studio/res/editcamera_tools_hi-04_disabled@2x.png
+++ b/src/Authoring/Studio/images/editcamera_tools_hi-04_disabled@2x.png
diff --git a/src/Authoring/Studio/res/editcamera_tools_hi-05.png b/src/Authoring/Studio/images/editcamera_tools_hi-05.png
index 147f8e29..147f8e29 100644
--- a/src/Authoring/Studio/res/editcamera_tools_hi-05.png
+++ b/src/Authoring/Studio/images/editcamera_tools_hi-05.png
diff --git a/src/Authoring/Studio/res/editcamera_tools_hi-05@2x.png b/src/Authoring/Studio/images/editcamera_tools_hi-05@2x.png
index 844a61e4..844a61e4 100644
--- a/src/Authoring/Studio/res/editcamera_tools_hi-05@2x.png
+++ b/src/Authoring/Studio/images/editcamera_tools_hi-05@2x.png
diff --git a/src/Authoring/Studio/res/editcamera_tools_hi-05_disabled.png b/src/Authoring/Studio/images/editcamera_tools_hi-05_disabled.png
index ee55b391..ee55b391 100644
--- a/src/Authoring/Studio/res/editcamera_tools_hi-05_disabled.png
+++ b/src/Authoring/Studio/images/editcamera_tools_hi-05_disabled.png
diff --git a/src/Authoring/Studio/res/editcamera_tools_hi-05_disabled@2x.png b/src/Authoring/Studio/images/editcamera_tools_hi-05_disabled@2x.png
index 072be7ed..072be7ed 100644
--- a/src/Authoring/Studio/res/editcamera_tools_hi-05_disabled@2x.png
+++ b/src/Authoring/Studio/images/editcamera_tools_hi-05_disabled@2x.png
diff --git a/src/Authoring/Studio/res/group_move.png b/src/Authoring/Studio/images/group_move.png
index d7d06770..d7d06770 100644
--- a/src/Authoring/Studio/res/group_move.png
+++ b/src/Authoring/Studio/images/group_move.png
diff --git a/src/Authoring/Studio/res/group_rotate.png b/src/Authoring/Studio/images/group_rotate.png
index 23a3eb3e..23a3eb3e 100644
--- a/src/Authoring/Studio/res/group_rotate.png
+++ b/src/Authoring/Studio/images/group_rotate.png
diff --git a/src/Authoring/Studio/res/group_scale.png b/src/Authoring/Studio/images/group_scale.png
index 64024dfe..64024dfe 100644
--- a/src/Authoring/Studio/res/group_scale.png
+++ b/src/Authoring/Studio/images/group_scale.png
diff --git a/src/Authoring/Studio/res/item_move.png b/src/Authoring/Studio/images/item_move.png
index d7b923bf..d7b923bf 100644
--- a/src/Authoring/Studio/res/item_move.png
+++ b/src/Authoring/Studio/images/item_move.png
diff --git a/src/Authoring/Studio/res/item_rotate.png b/src/Authoring/Studio/images/item_rotate.png
index 514c567c..514c567c 100644
--- a/src/Authoring/Studio/res/item_rotate.png
+++ b/src/Authoring/Studio/images/item_rotate.png
diff --git a/src/Authoring/Studio/res/item_scale.png b/src/Authoring/Studio/images/item_scale.png
index 6ef8acdb..6ef8acdb 100644
--- a/src/Authoring/Studio/res/item_scale.png
+++ b/src/Authoring/Studio/images/item_scale.png
diff --git a/src/Authoring/Studio/res/open_dialog.png b/src/Authoring/Studio/images/open_dialog.png
index c7e74ef0..c7e74ef0 100644
--- a/src/Authoring/Studio/res/open_dialog.png
+++ b/src/Authoring/Studio/images/open_dialog.png
diff --git a/src/Authoring/Studio/res/playback_tools_low-00.png b/src/Authoring/Studio/images/playback_tools_low-00.png
index d7cae98d..d7cae98d 100644
--- a/src/Authoring/Studio/res/playback_tools_low-00.png
+++ b/src/Authoring/Studio/images/playback_tools_low-00.png
diff --git a/src/Authoring/Studio/res/playback_tools_low-00@2x.png b/src/Authoring/Studio/images/playback_tools_low-00@2x.png
index 88d6cf17..88d6cf17 100644
--- a/src/Authoring/Studio/res/playback_tools_low-00@2x.png
+++ b/src/Authoring/Studio/images/playback_tools_low-00@2x.png
diff --git a/src/Authoring/Studio/res/playback_tools_low-01.png b/src/Authoring/Studio/images/playback_tools_low-01.png
index bf4d7f59..bf4d7f59 100644
--- a/src/Authoring/Studio/res/playback_tools_low-01.png
+++ b/src/Authoring/Studio/images/playback_tools_low-01.png
diff --git a/src/Authoring/Studio/res/playback_tools_low-01@2x.png b/src/Authoring/Studio/images/playback_tools_low-01@2x.png
index 8230c6e8..8230c6e8 100644
--- a/src/Authoring/Studio/res/playback_tools_low-01@2x.png
+++ b/src/Authoring/Studio/images/playback_tools_low-01@2x.png
diff --git a/src/Authoring/Studio/res/playback_tools_low-02.png b/src/Authoring/Studio/images/playback_tools_low-02.png
index 471b2573..471b2573 100644
--- a/src/Authoring/Studio/res/playback_tools_low-02.png
+++ b/src/Authoring/Studio/images/playback_tools_low-02.png
diff --git a/src/Authoring/Studio/res/playback_tools_low-02@2x.png b/src/Authoring/Studio/images/playback_tools_low-02@2x.png
index 02370d25..02370d25 100644
--- a/src/Authoring/Studio/res/playback_tools_low-02@2x.png
+++ b/src/Authoring/Studio/images/playback_tools_low-02@2x.png
diff --git a/src/Authoring/Studio/res/playback_tools_low-03.png b/src/Authoring/Studio/images/playback_tools_low-03.png
index 5c5f9018..5c5f9018 100644
--- a/src/Authoring/Studio/res/playback_tools_low-03.png
+++ b/src/Authoring/Studio/images/playback_tools_low-03.png
diff --git a/src/Authoring/Studio/res/playback_tools_low-03@2x.png b/src/Authoring/Studio/images/playback_tools_low-03@2x.png
index e6fe8e10..e6fe8e10 100644
--- a/src/Authoring/Studio/res/playback_tools_low-03@2x.png
+++ b/src/Authoring/Studio/images/playback_tools_low-03@2x.png
diff --git a/src/Authoring/Studio/res/prefstab-00.png b/src/Authoring/Studio/images/prefstab-00.png
index 8a452d15..8a452d15 100644
--- a/src/Authoring/Studio/res/prefstab-00.png
+++ b/src/Authoring/Studio/images/prefstab-00.png
diff --git a/src/Authoring/Studio/res/prefstab-00@2x.png b/src/Authoring/Studio/images/prefstab-00@2x.png
index 5703d0be..5703d0be 100644
--- a/src/Authoring/Studio/res/prefstab-00@2x.png
+++ b/src/Authoring/Studio/images/prefstab-00@2x.png
diff --git a/src/Authoring/Studio/res/prefstab-01.png b/src/Authoring/Studio/images/prefstab-01.png
index 35c99cea..35c99cea 100644
--- a/src/Authoring/Studio/res/prefstab-01.png
+++ b/src/Authoring/Studio/images/prefstab-01.png
diff --git a/src/Authoring/Studio/res/prefstab-01@2x.png b/src/Authoring/Studio/images/prefstab-01@2x.png
index 4c35e2b0..4c35e2b0 100644
--- a/src/Authoring/Studio/res/prefstab-01@2x.png
+++ b/src/Authoring/Studio/images/prefstab-01@2x.png
diff --git a/src/Authoring/Studio/res/separator.png b/src/Authoring/Studio/images/separator.png
index c86aac17..c86aac17 100644
--- a/src/Authoring/Studio/res/separator.png
+++ b/src/Authoring/Studio/images/separator.png
diff --git a/src/Authoring/Studio/res/separator@2x.png b/src/Authoring/Studio/images/separator@2x.png
index 052003a4..052003a4 100644
--- a/src/Authoring/Studio/res/separator@2x.png
+++ b/src/Authoring/Studio/images/separator@2x.png
diff --git a/src/Authoring/Studio/qt3dstudio.qrc b/src/Authoring/Studio/qt3dstudio.qrc
index dba77f4a..3d073e66 100644
--- a/src/Authoring/Studio/qt3dstudio.qrc
+++ b/src/Authoring/Studio/qt3dstudio.qrc
@@ -1,16 +1,5 @@
 <RCC>
     <qresource prefix="/">
-        <file>res/Tutorial/button_back.png</file>
-        <file>res/Tutorial/button_next.png</file>
-        <file>res/Tutorial/screens/1.png</file>
-        <file>res/Tutorial/screens/2.png</file>
-        <file>res/Tutorial/screens/3.png</file>
-        <file>res/Tutorial/screens/4.png</file>
-        <file>res/Tutorial/screens/5.png</file>
-        <file>res/Tutorial/screens/6.png</file>
-        <file>res/Tutorial/screens/7.png</file>
-        <file>res/Tutorial/button_back@2x.png</file>
-        <file>res/Tutorial/button_next@2x.png</file>
         <file alias="res/strings/Static.stro">English.lproj/Strings/Static.stro</file>
     </qresource>
 </RCC>
diff --git a/src/Authoring/Studio/res/Flippy-Right.bmp b/src/Authoring/Studio/res/Flippy-Right.bmp
deleted file mode 100644
index e4471ec6..00000000
--- a/src/Authoring/Studio/res/Flippy-Right.bmp
+++ /dev/null
diff --git a/src/Authoring/Studio/res/Flippy-down.bmp b/src/Authoring/Studio/res/Flippy-down.bmp
deleted file mode 100644
index 4c1dd0d2..00000000
--- a/src/Authoring/Studio/res/Flippy-down.bmp
+++ /dev/null
diff --git a/src/Authoring/Studio/res/Studio.manifest b/src/Authoring/Studio/res/Studio.manifest
deleted file mode 100644
index 6386fac9..00000000
--- a/src/Authoring/Studio/res/Studio.manifest
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> 
-<assemblyIdentity 
-    version="1.0.0.0" 
-    processorArchitecture="X86" 
-    name="Microsoft.Windows.Studio"
-    type="win32" 
-/> 
-<description>Your app description here</description> 
-<dependency> 
-    <dependentAssembly> 
-        <assemblyIdentity 
-            type="win32" 
-            name="Microsoft.Windows.Common-Controls" 
-            version="6.0.0.0" 
-            processorArchitecture="X86" 
-            publicKeyToken="6595b64144ccf1df" 
-            language="*" 
-        /> 
-    </dependentAssembly> 
-</dependency> 
-</assembly>
diff --git a/src/Authoring/Studio/res/StudioDoc.ico b/src/Authoring/Studio/res/StudioDoc.ico
deleted file mode 100644
index 0d531110..00000000
--- a/src/Authoring/Studio/res/StudioDoc.ico
+++ /dev/null
diff --git a/src/Authoring/Studio/res/Toolbar.bmp b/src/Authoring/Studio/res/Toolbar.bmp
deleted file mode 100644
index 8b7a3424..00000000
--- a/src/Authoring/Studio/res/Toolbar.bmp
+++ /dev/null
diff --git a/src/Authoring/Studio/res/arrow_down.png b/src/Authoring/Studio/res/arrow_down.png
deleted file mode 100644
index b6cfcf77..00000000
--- a/src/Authoring/Studio/res/arrow_down.png
+++ /dev/null
diff --git a/src/Authoring/Studio/res/arrow_down@2x.png b/src/Authoring/Studio/res/arrow_down@2x.png
deleted file mode 100644
index 5c409dcb..00000000
--- a/src/Authoring/Studio/res/arrow_down@2x.png
+++ /dev/null
diff --git a/src/Authoring/Studio/res/client_tools_grayed_out.bmp b/src/Authoring/Studio/res/client_tools_grayed_out.bmp
deleted file mode 100644
index da15cc18..00000000
--- a/src/Authoring/Studio/res/client_tools_grayed_out.bmp
+++ /dev/null
diff --git a/src/Authoring/Studio/res/client_tools_hi_color.bmp b/src/Authoring/Studio/res/client_tools_hi_color.bmp
deleted file mode 100644
index 50f90ab7..00000000
--- a/src/Authoring/Studio/res/client_tools_hi_color.bmp
+++ /dev/null
diff --git a/src/Authoring/Studio/res/client_tools_low_color.bmp b/src/Authoring/Studio/res/client_tools_low_color.bmp
deleted file mode 100644
index 7dccd64e..00000000
--- a/src/Authoring/Studio/res/client_tools_low_color.bmp
+++ /dev/null
diff --git a/src/Authoring/Studio/res/cursors.bmp b/src/Authoring/Studio/res/cursors.bmp
deleted file mode 100644
index dff7330e..00000000
--- a/src/Authoring/Studio/res/cursors.bmp
+++ /dev/null
diff --git a/src/Authoring/Studio/res/editcamera_tools_disabled.bmp b/src/Authoring/Studio/res/editcamera_tools_disabled.bmp
deleted file mode 100644
index 53709e04..00000000
--- a/src/Authoring/Studio/res/editcamera_tools_disabled.bmp
+++ /dev/null
diff --git a/src/Authoring/Studio/res/editcamera_tools_hi.bmp b/src/Authoring/Studio/res/editcamera_tools_hi.bmp
deleted file mode 100644
index c2b73a43..00000000
--- a/src/Authoring/Studio/res/editcamera_tools_hi.bmp
+++ /dev/null
diff --git a/src/Authoring/Studio/res/editcamera_tools_low.bmp b/src/Authoring/Studio/res/editcamera_tools_low.bmp
deleted file mode 100644
index 66bf41a4..00000000
--- a/src/Authoring/Studio/res/editcamera_tools_low.bmp
+++ /dev/null
diff --git a/src/Authoring/Studio/res/keyframe.bmp b/src/Authoring/Studio/res/keyframe.bmp
deleted file mode 100644
index 39a5fa17..00000000
--- a/src/Authoring/Studio/res/keyframe.bmp
+++ /dev/null
diff --git a/src/Authoring/Studio/res/library_buttons_hi_color.bmp b/src/Authoring/Studio/res/library_buttons_hi_color.bmp
deleted file mode 100644
index b648bcae..00000000
--- a/src/Authoring/Studio/res/library_buttons_hi_color.bmp
+++ /dev/null
diff --git a/src/Authoring/Studio/res/library_buttons_low_color.bmp b/src/Authoring/Studio/res/library_buttons_low_color.bmp
deleted file mode 100644
index 682f3a2c..00000000
--- a/src/Authoring/Studio/res/library_buttons_low_color.bmp
+++ /dev/null
diff --git a/src/Authoring/Studio/res/libtoolb.bmp b/src/Authoring/Studio/res/libtoolb.bmp
deleted file mode 100644
index 2a07520a..00000000
--- a/src/Authoring/Studio/res/libtoolb.bmp
+++ /dev/null
diff --git a/src/Authoring/Studio/res/menubtn_down.bmp b/src/Authoring/Studio/res/menubtn_down.bmp
deleted file mode 100644
index 84df200b..00000000
--- a/src/Authoring/Studio/res/menubtn_down.bmp
+++ /dev/null
diff --git a/src/Authoring/Studio/res/menubtn_normal.bmp b/src/Authoring/Studio/res/menubtn_normal.bmp
deleted file mode 100644
index f2357600..00000000
--- a/src/Authoring/Studio/res/menubtn_normal.bmp
+++ /dev/null
diff --git a/src/Authoring/Studio/res/menubtn_selected.bmp b/src/Authoring/Studio/res/menubtn_selected.bmp
deleted file mode 100644
index 7bc4618d..00000000
--- a/src/Authoring/Studio/res/menubtn_selected.bmp
+++ /dev/null
diff --git a/src/Authoring/Studio/res/menuedit.bmp b/src/Authoring/Studio/res/menuedit.bmp
deleted file mode 100644
index de0869ad..00000000
--- a/src/Authoring/Studio/res/menuedit.bmp
+++ /dev/null
diff --git a/src/Authoring/Studio/res/menutool.bmp b/src/Authoring/Studio/res/menutool.bmp
deleted file mode 100644
index 73b54017..00000000
--- a/src/Authoring/Studio/res/menutool.bmp
+++ /dev/null
diff --git a/src/Authoring/Studio/res/playback_tools_grayed.bmp b/src/Authoring/Studio/res/playback_tools_grayed.bmp
deleted file mode 100644
index 0225b6db..00000000
--- a/src/Authoring/Studio/res/playback_tools_grayed.bmp
+++ /dev/null
diff --git a/src/Authoring/Studio/res/playback_tools_hi.bmp b/src/Authoring/Studio/res/playback_tools_hi.bmp
deleted file mode 100644
index 2047ac6b..00000000
--- a/src/Authoring/Studio/res/playback_tools_hi.bmp
+++ /dev/null
diff --git a/src/Authoring/Studio/res/playback_tools_low.bmp b/src/Authoring/Studio/res/playback_tools_low.bmp
deleted file mode 100644
index cb9b6b29..00000000
--- a/src/Authoring/Studio/res/playback_tools_low.bmp
+++ /dev/null
diff --git a/src/Authoring/Studio/res/prefstab.bmp b/src/Authoring/Studio/res/prefstab.bmp
deleted file mode 100644
index 3201d15e..00000000
--- a/src/Authoring/Studio/res/prefstab.bmp
+++ /dev/null
diff --git a/src/Authoring/Studio/res/preview_tools.bmp b/src/Authoring/Studio/res/preview_tools.bmp
deleted file mode 100644
index 2cfdbfd9..00000000
--- a/src/Authoring/Studio/res/preview_tools.bmp
+++ /dev/null
diff --git a/src/Authoring/Studio/res/project-icon-new.bmp b/src/Authoring/Studio/res/project-icon-new.bmp
deleted file mode 100644
index 01123652..00000000
--- a/src/Authoring/Studio/res/project-icon-new.bmp
+++ /dev/null
diff --git a/src/Authoring/Studio/res/project-icon-open.bmp b/src/Authoring/Studio/res/project-icon-open.bmp
deleted file mode 100644
index 50b279f7..00000000
--- a/src/Authoring/Studio/res/project-icon-open.bmp
+++ /dev/null
diff --git a/src/Authoring/Studio/res/qt3ds_header.bmp b/src/Authoring/Studio/res/qt3ds_header.bmp
deleted file mode 100644
index cfe81cc2..00000000
--- a/src/Authoring/Studio/res/qt3ds_header.bmp
+++ /dev/null
diff --git a/src/Authoring/Studio/res/stmtool.bmp b/src/Authoring/Studio/res/stmtool.bmp
deleted file mode 100644
index 71ed95fc..00000000
--- a/src/Authoring/Studio/res/stmtool.bmp
+++ /dev/null
diff --git a/src/Authoring/Studio/res/storagep.bmp b/src/Authoring/Studio/res/storagep.bmp
deleted file mode 100644
index d784a3dc..00000000
--- a/src/Authoring/Studio/res/storagep.bmp
+++ /dev/null
diff --git a/src/Authoring/Studio/res/tmchmenu.bmp b/src/Authoring/Studio/res/tmchmenu.bmp
deleted file mode 100644
index 329bbf96..00000000
--- a/src/Authoring/Studio/res/tmchmenu.bmp
+++ /dev/null
diff --git a/src/Authoring/Studio/res/tmlntool.bmp b/src/Authoring/Studio/res/tmlntool.bmp
deleted file mode 100644
index 6678d093..00000000
--- a/src/Authoring/Studio/res/tmlntool.bmp
+++ /dev/null
diff --git a/src/Authoring/Studio/res/tmtbmenu.bmp b/src/Authoring/Studio/res/tmtbmenu.bmp
deleted file mode 100644
index ddf00990..00000000
--- a/src/Authoring/Studio/res/tmtbmenu.bmp
+++ /dev/null
diff --git a/src/Authoring/Studio/res/weblinkc.bmp b/src/Authoring/Studio/res/weblinkc.bmp
deleted file mode 100644
index e9f941b4..00000000
--- a/src/Authoring/Studio/res/weblinkc.bmp
+++ /dev/null
diff --git a/src/Authoring/Studio/res/winxp1.bin b/src/Authoring/Studio/res/winxp1.bin
deleted file mode 100644
index 065c2edf..00000000
--- a/src/Authoring/Studio/res/winxp1.bin
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?> 
-<assembly 
-   xmlns="urn:schemas-microsoft-com:asm.v1" 
-   manifestVersion="1.0">
-<assemblyIdentity 
-    processorArchitecture="x86" 
-    version="5.1.0.0"
-    type="win32"
-    name="test.exe"/>
-    <description>Test Application</description>
-    <dependency>
-    <dependentAssembly>
-    <assemblyIdentity
-         type="win32"
-         name="Microsoft.Windows.Common-Controls"
-         version="6.0.0.0"
-         publicKeyToken="6595b64144ccf1df"
-         language="*"
-         processorArchitecture="x86"/>
-    </dependentAssembly>
-    </dependency>
-</assembly>
diff --git a/src/Authoring/Studio/style.qss b/src/Authoring/Studio/style.qss
index 4ad8cdaf..b7ae3113 100644
--- a/src/Authoring/Studio/style.qss
+++ b/src/Authoring/Studio/style.qss
@@ -116,7 +116,7 @@ QToolBar {
 }
 
 QToolBar::handle {
-    image: url(:/res/separator.png);
+    image: url(:/images/separator.png);
 }
 
 QToolBar::separator {
@@ -178,7 +178,7 @@ QComboBox::drop-down {
 }
 
 QComboBox::down-arrow {
-    image: url(:/res/arrow_down.png);
+    image: url(:/images/arrow_down.png);
 }
 
 QGroupBox {